diff --git a/.travis.yml b/.travis.yml index d34a7831d65d..6fa426d36de5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ language: python python: "3.4" -script: ./maintainers/scripts/travis-nox-review-pr.sh +before_install: ./maintainers/scripts/travis-nox-review-pr.sh nix +install: ./maintainers/scripts/travis-nox-review-pr.sh nox +script: ./maintainers/scripts/travis-nox-review-pr.sh build diff --git a/.version b/.version index d3a61dbd8309..eab812293140 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -14.10 \ No newline at end of file +14.11 \ No newline at end of file diff --git a/lib/customisation.nix b/lib/customisation.nix index 90a0c65058d0..04a5cb420335 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -62,6 +62,8 @@ rec { makeOverridable f (origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs)); deepOverride = newArgs: makeOverridable f (lib.overrideExisting (lib.mapAttrs (deepOverrider newArgs) origArgs) newArgs); + overrideDerivation = fdrv: + makeOverridable (args: overrideDerivation (f args) fdrv) origArgs; }) else ff; diff --git a/lib/licenses.nix b/lib/licenses.nix index 9546f83844c3..fd9b4eaeb315 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -285,6 +285,12 @@ rec { unfreeRedistributableFirmware = "unfree-redistributable-firmware"; + unlicense = { + shortName = "Unlicense"; + fullName = "Unlicense"; + url = http://unlicense.org/; + }; + wadalab = { shortName = "wadalab"; fullName = "Wadalab Font License"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 18e949ae2c22..effcfb36e9d2 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -57,6 +57,7 @@ ertes = "Ertugrul Söylemez "; falsifian = "James Cook "; flosse = "Markus Kohlhase "; + fpletz = "Franz Pletz "; ftrvxmtrx = "Siarhei Zirukin "; funfunctor = "Edward O'Callaghan "; fuuzetsu = "Mateusz Kowalczyk "; diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh index 927cdfa375f7..baee1baa11f5 100755 --- a/maintainers/scripts/travis-nox-review-pr.sh +++ b/maintainers/scripts/travis-nox-review-pr.sh @@ -3,33 +3,40 @@ set -e export NIX_CURL_FLAGS=-sS -# Install Nix -echo "=== Installing Nix..." -bash <(curl -sS https://nixos.org/nix/install) >/dev/null 2>&1 -source $HOME/.nix-profile/etc/profile.d/nix.sh +if [[ $1 == nix ]]; then + echo "=== Installing Nix..." + # Install Nix + bash <(curl -sS https://nixos.org/nix/install) + source $HOME/.nix-profile/etc/profile.d/nix.sh -# Make sure we can use hydra's binary cache -sudo mkdir /etc/nix -sudo tee /etc/nix/nix.conf </dev/null + # Make sure we can use hydra's binary cache + sudo mkdir /etc/nix + sudo tee /etc/nix/nix.conf </dev/null binary-caches = http://cache.nixos.org http://hydra.nixos.org trusted-binary-caches = http://hydra.nixos.org build-max-jobs = 4 EOF -echo "=== Checking evaluation, including meta" -nix-env -f. -qa --json >/dev/null + # Verify evaluation + echo "=== Verifying that nixpkgs evaluates..." + nix-env -f. -qa --json >/dev/null +elif [[ $1 == nox ]]; then + echo "=== Installing nox..." + git clone -q https://github.com/madjar/nox + pip --quiet install -e nox +elif [[ $1 == build ]]; then + source $HOME/.nix-profile/etc/profile.d/nix.sh -if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then - echo "===> Not a pull request, checking evaluation" - nix-build pkgs/top-level/release.nix -A tarball - exit 0 + if [[ $TRAVIS_PULL_REQUEST == false ]]; then + echo "===> Not a pull request, checking evaluation" + nix-build pkgs/top-level/release.nix -A tarball + else + echo "=== Checking PR" + # The current HEAD is the PR merged into origin/master, so we compare + # against origin/master + nox-review wip --against origin/master + fi +else + echo "$0: Unknown option $1" >&2 + false fi - -echo "=== Installing nox" -git clone -q https://github.com/madjar/nox -pip --quiet install -e nox - -echo "=== Reviewing PR" -# The current HEAD is the PR merged into origin/master, so we compare -# against origin/master -nox-review wip --against origin/master diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index fb82d5adcefb..9034dba1fb5a 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -10,7 +10,7 @@ This section lists the release notes for each stable version of NixOS. - + diff --git a/nixos/doc/manual/release-notes/rl-1410.xml b/nixos/doc/manual/release-notes/rl-1411.xml similarity index 83% rename from nixos/doc/manual/release-notes/rl-1410.xml rename to nixos/doc/manual/release-notes/rl-1411.xml index 09da15ce2361..74cf8323e692 100644 --- a/nixos/doc/manual/release-notes/rl-1410.xml +++ b/nixos/doc/manual/release-notes/rl-1411.xml @@ -2,9 +2,9 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" - xml:id="sec-release-14.10"> + xml:id="sec-release-14.11"> -Release 14.10 (“Caterpillar”, 2014/10/??) +Release 14.11 (“Caterpillar”, 2014/11/??) When upgrading from a previous release, please be aware of the following incompatible changes: @@ -19,4 +19,4 @@ following incompatible changes: - \ No newline at end of file + diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 0d3273fe0539..773f9b412afe 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -184,7 +184,7 @@ let type = with types; uniq (nullOr string); default = null; description = '' - The path to a file that contains the user's password. The password + The full path to a file that contains the user's password. The password file is read on each system activation. The file should contain exactly one line, which should be the password in an encrypted form that is suitable for the chpasswd -e command. diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 4d87c20559d6..0a39e8dde9de 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -42,6 +42,9 @@ with lib; # Get a console as soon as the initrd loads fbcon on EFI boot. boot.initrd.kernelModules = [ "fbcon" ]; + # Add support for cow filesystems and their utilities + boot.supportedFilesystems = [ "zfs" "btrfs" ]; + # Allow the user to log in as root without a password. security.initialRootPassword = ""; } diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix index 65aa11670893..b1e1d16c610d 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix @@ -11,6 +11,9 @@ with lib; # Provide wicd for easy wireless configuration. #networking.wicd.enable = true; + # Include gparted for partitioning disks + environment.systemPackages = [ pkgs.gparted ]; + # KDE complains if power management is disabled (to be precise, if # there is no power management backend such as upower). powerManagement.enable = true; @@ -27,4 +30,70 @@ with lib; AutoLoginUser=root AutoLoginPass="" ''; + + # Custom kde-workspace adding some icons on the desktop + + system.activationScripts.installerDesktop = let + openManual = pkgs.writeScript "nixos-manual.sh" '' + #!${pkgs.stdenv.shell} + cd ${config.system.build.manual.manual}/share/doc/nixos/ + konqueror ./index.html + ''; + + desktopFile = pkgs.writeText "nixos-manual.desktop" '' + [Desktop Entry] + Version=1.0 + Type=Application + Name=NixOS Manual + Exec=${openManual} + Icon=konqueror + ''; + + in '' + mkdir -p /root/Desktop + ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop + ln -sfT ${pkgs.kde4.konsole}/share/applications/kde4/konsole.desktop /root/Desktop/konsole.desktop + ln -sfT ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop + ''; + + services.xserver.desktopManager.kde4.kdeWorkspacePackage = let + pkg = pkgs.kde4.kde_workspace; + + plasmaInit = pkgs.writeText "00-defaultLayout.js" '' + loadTemplate("org.kde.plasma-desktop.defaultPanel") + + for (var i = 0; i < screenCount; ++i) { + var desktop = new Activity + desktop.name = i18n("Desktop") + desktop.screen = i + desktop.wallpaperPlugin = 'image' + desktop.wallpaperMode = 'SingleImage' + + var folderview = desktop.addWidget("folderview"); + folderview.writeConfig("url", "desktop:/"); + + //Create more panels for other screens + if (i > 0){ + var panel = new Panel + panel.screen = i + panel.location = 'bottom' + panel.height = screenGeometry(i).height > 1024 ? 35 : 27 + var tasks = panel.addWidget("tasks") + tasks.writeConfig("showOnlyCurrentScreen", true); + } + } + ''; + + in + pkgs.stdenv.mkDerivation { + inherit (pkg) name meta; + + buildCommand = '' + mkdir -p $out + cp -prf ${pkg}/* $out/ + chmod a+w $out/share/apps/plasma-desktop/init + cp -f ${plasmaInit} $out/share/apps/plasma-desktop/init/00-defaultLayout.js + ''; + }; + } diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 91a30695a7a5..2c796250a982 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -1,7 +1,7 @@ # This module generates nixos-install, nixos-rebuild, # nixos-generate-config, etc. -{ config, pkgs, modulesPath, lib, ... }: +{ config, pkgs, modulesPath, ... }: let diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index d28624c4326f..22997b7a159f 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -156,8 +156,7 @@ mailpile = 146; redmine = 147; seeks = 148; - - prosody = 148; + prosody = 149; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -281,8 +280,7 @@ mailpile = 146; redmine = 147; seeks = 148; - - prosody = 148; + prosody = 149; # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399! diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 17d3140b087f..d65691c43790 100755 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -364,6 +364,7 @@ ./tasks/filesystems/cifs.nix ./tasks/filesystems/ext.nix ./tasks/filesystems/f2fs.nix + ./tasks/filesystems/jfs.nix ./tasks/filesystems/nfs.nix ./tasks/filesystems/reiserfs.nix ./tasks/filesystems/unionfs-fuse.nix diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix index 9e5983691370..3773d822b16b 100644 --- a/nixos/modules/security/grsecurity.nix +++ b/nixos/modules/security/grsecurity.nix @@ -30,7 +30,7 @@ in type = types.bool; default = false; description = '' - Enable the stable grsecurity patch, based on Linux 3.2. + Enable the stable grsecurity patch, based on Linux 3.14. ''; }; @@ -38,7 +38,7 @@ in type = types.bool; default = false; description = '' - Enable the testing grsecurity patch, based on Linux 3.13. + Enable the testing grsecurity patch, based on Linux 3.17. ''; }; diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index 2ef49a95166e..575034c93ab2 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -19,7 +19,7 @@ let org.neo4j.server.webadmin.rrdb.location=${cfg.dataDir}/data/rrd org.neo4j.server.webadmin.data.uri=/db/data/ org.neo4j.server.webadmin.management.uri=/db/manage/ - org.neo4j.server.db.tuning.properties=${pkgs.neo4j}/share/neo4j/conf/neo4j.properties + org.neo4j.server.db.tuning.properties=${cfg.package}/share/neo4j/conf/neo4j.properties org.neo4j.server.manage.console_engines=shell ${cfg.extraServerConfig} ''; @@ -46,6 +46,12 @@ in { type = types.uniq types.bool; }; + package = mkOption { + description = "Neo4j package to use."; + default = pkgs.neo4j; + type = types.package; + }; + host = mkOption { description = "Neo4j listen address."; default = "127.0.0.1"; @@ -119,7 +125,7 @@ in { after = [ "network-interfaces.target" ]; environment = { NEO4J_INSTANCE = cfg.dataDir; }; serviceConfig = { - ExecStart = "${pkgs.neo4j}/bin/neo4j console"; + ExecStart = "${cfg.package}/bin/neo4j console"; User = "neo4j"; PermissionsStartOnly = true; }; diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 068d14217a2c..095a97338d52 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -168,7 +168,6 @@ in hardware.firmware = mkOption { type = types.listOf types.path; default = []; - example = [ "/root/my-firmware" ]; description = '' List of directories containing firmware files. Such files will be loaded automatically if the kernel asks for them @@ -177,10 +176,10 @@ in firmware file with the same name, the first path in the list takes precedence. Note that you must rebuild your system if you add files to any of these directories. For quick testing, - put firmware files in /root/test-firmware and add that - directory to the list. - Note that you can also add firmware packages to this - list as these are directories in the nix store. + put firmware files in /root/test-firmware + and add that directory to the list. Note that you can also + add firmware packages to this list as these are directories in + the nix store. ''; apply = list: pkgs.buildEnv { name = "firmware"; @@ -244,6 +243,11 @@ in echo "regenerating udev hardware database..." ${config.systemd.package}/bin/udevadm hwdb --update && ln -sfn ${config.systemd.package} /var/lib/udev/prev-systemd fi + + # Allow the kernel to find our firmware. + if [ -e /sys/module/firmware_class/parameters/path ]; then + echo -n "${config.hardware.firmware}" > /sys/module/firmware_class/parameters/path + fi ''; systemd.services.systemd-udevd = diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix index 6887ab1e8052..0186452de95e 100644 --- a/nixos/modules/services/logging/logrotate.nix +++ b/nixos/modules/services/logging/logrotate.nix @@ -21,6 +21,7 @@ in config = mkOption { default = ""; + type = types.lines; description = '' The contents of the logrotate config file ''; diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix index 64b288a11cd3..f3991a411ec4 100644 --- a/nixos/modules/services/logging/syslog-ng.nix +++ b/nixos/modules/services/logging/syslog-ng.nix @@ -7,8 +7,7 @@ let cfg = config.services.syslog-ng; syslogngConfig = pkgs.writeText "syslog-ng.conf" '' - @version: 3.5 - @include "scl.conf" + ${cfg.configHeader} ${cfg.extraConfig} ''; @@ -72,6 +71,17 @@ in { Configuration added to the end of syslog-ng.conf. ''; }; + configHeader = mkOption { + type = types.lines; + default = '' + @version: 3.5 + @include "scl.conf" + ''; + description = '' + The very first lines of the configuration file. Should usually contain + the syslog-ng version header. + ''; + }; }; }; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 3d97c31b7a17..e21ef167a4ec 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -24,6 +24,8 @@ let GRAPHITE_URL = cfg.seyren.graphiteUrl; } // cfg.seyren.extraConfig; + pagerConfig = pkgs.writeText "alarms.yaml" cfg.pager.alerts; + configDir = pkgs.buildEnv { name = "graphite-config"; paths = lists.filter (el: el != null) [ @@ -83,13 +85,21 @@ in { api = { enable = mkOption { - description = "Whether to enable graphite api."; + description = '' + Whether to enable graphite api. Graphite api is lightweight alternative + to graphite web, with api and without dashboard. It's advised to use + grafana as alternative dashboard and influxdb as alternative to + graphite carbon. + + For more information visit + + ''; default = false; type = types.uniq types.bool; }; finders = mkOption { - description = "List of finder plugins load."; + description = "List of finder plugins to load."; default = []; example = [ pkgs.python27Packages.graphite_influxdb ]; type = types.listOf types.package; @@ -301,170 +311,238 @@ in { ''; }; }; + + pager = { + enable = mkOption { + description = '' + Whether to enable graphite-pager service. For more information visit + + ''; + default = false; + type = types.uniq types.bool; + }; + + redisUrl = mkOption { + description = "Redis connection string."; + default = "redis://localhost:${toString config.services.redis.port}/"; + type = types.str; + }; + + graphiteUrl = mkOption { + description = "URL to your graphite service."; + default = "http://${cfg.web.host}:${toString cfg.web.port}"; + type = types.str; + }; + + alerts = mkOption { + description = "Alerts configuration for graphite-pager."; + default = '' + alerts: + - target: constantLine(100) + warning: 90 + critical: 200 + name: Test + ''; + example = literalExample '' + pushbullet_key: pushbullet_api_key + alerts: + - target: stats.seatgeek.app.deal_quality.venue_info_cache.hit + warning: .5 + critical: 1 + name: Deal quality venue cache hits + ''; + type = types.lines; + }; + }; }; ###### implementation - config = mkIf ( - cfg.carbon.enableAggregator || - cfg.carbon.enableCache || - cfg.carbon.enableRelay || - cfg.web.enable || - cfg.api.enable || - cfg.seyren.enable - ) { - systemd.services.carbonCache = { - enable = cfg.carbon.enableCache; - description = "Graphite Data Storage Backend"; - wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; - environment = carbonEnv; - serviceConfig = { - ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-cache"}"; - User = "graphite"; - Group = "graphite"; - PermissionsStartOnly = true; - }; - preStart = '' - mkdir -p ${cfg.dataDir}/whisper - chmod 0700 ${cfg.dataDir}/whisper - chown -R graphite:graphite ${cfg.dataDir} - ''; - }; - - systemd.services.carbonAggregator = { - enable = cfg.carbon.enableAggregator; - description = "Carbon Data Aggregator"; - wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; - environment = carbonEnv; - serviceConfig = { - ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-aggregator"}"; - User = "graphite"; - Group = "graphite"; - }; - }; - - systemd.services.carbonRelay = { - enable = cfg.carbon.enableRelay; - description = "Carbon Data Relay"; - wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; - environment = carbonEnv; - serviceConfig = { - ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-relay"}"; - User = "graphite"; - Group = "graphite"; - }; - }; - - systemd.services.graphiteWeb = { - enable = cfg.web.enable; - description = "Graphite Web Interface"; - wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; - path = [ pkgs.perl ]; - environment = { - PYTHONPATH = "${pkgs.python27Packages.graphite_web}/lib/python2.7/site-packages"; - DJANGO_SETTINGS_MODULE = "graphite.settings"; - GRAPHITE_CONF_DIR = configDir; - GRAPHITE_STORAGE_DIR = dataDir; - }; - serviceConfig = { - ExecStart = '' - ${pkgs.python27Packages.waitress}/bin/waitress-serve \ - --host=${cfg.web.host} --port=${toString cfg.web.port} \ - --call django.core.handlers.wsgi:WSGIHandler''; - User = "graphite"; - Group = "graphite"; - PermissionsStartOnly = true; - }; - preStart = '' - if ! test -e ${dataDir}/db-created; then - mkdir -p ${dataDir}/{whisper/,log/webapp/} - chmod 0700 ${dataDir}/{whisper/,log/webapp/} - - # populate database - ${pkgs.python27Packages.graphite_web}/bin/manage-graphite.py syncdb --noinput - - # create index - ${pkgs.python27Packages.graphite_web}/bin/build-index.sh - - touch ${dataDir}/db-created - + config = mkMerge [ + (mkIf cfg.carbon.enableCache { + systemd.services.carbonCache = { + description = "Graphite Data Storage Backend"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-interfaces.target" ]; + environment = carbonEnv; + serviceConfig = { + ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-cache"}"; + User = "graphite"; + Group = "graphite"; + PermissionsStartOnly = true; + }; + preStart = '' + mkdir -p ${cfg.dataDir}/whisper + chmod 0700 ${cfg.dataDir}/whisper chown -R graphite:graphite ${cfg.dataDir} - fi - ''; - }; - - systemd.services.graphiteApi = { - enable = cfg.api.enable; - description = "Graphite Api Interface"; - wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; - environment = { - PYTHONPATH = - "${cfg.api.package}/lib/python2.7/site-packages:" + - concatMapStringsSep ":" (f: f + "/lib/python2.7/site-packages") cfg.api.finders; - GRAPHITE_API_CONFIG = graphiteApiConfig; - LD_LIBRARY_PATH = "${pkgs.cairo}/lib"; - }; - serviceConfig = { - ExecStart = '' - ${pkgs.python27Packages.waitress}/bin/waitress-serve \ - --host=${cfg.api.host} --port=${toString cfg.api.port} \ - graphite_api.app:app ''; - User = "graphite"; - Group = "graphite"; - PermissionsStartOnly = true; }; - preStart = '' - if ! test -e ${dataDir}/db-created; then - mkdir -p ${dataDir}/cache/ - chmod 0700 ${dataDir}/cache/ + }) - touch ${dataDir}/db-created - - chown -R graphite:graphite ${cfg.dataDir} - fi - ''; - }; - - systemd.services.seyren = { - enable = cfg.seyren.enable; - description = "Graphite Alerting Dashboard"; - wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" "mongodb.service" ]; - environment = seyrenConfig; - serviceConfig = { - ExecStart = "${pkgs.seyren}/bin/seyren -httpPort ${toString cfg.seyren.port}"; - WorkingDirectory = dataDir; - User = "graphite"; - Group = "graphite"; + (mkIf cfg.carbon.enableAggregator { + systemd.services.carbonAggregator = { + enable = cfg.carbon.enableAggregator; + description = "Carbon Data Aggregator"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-interfaces.target" ]; + environment = carbonEnv; + serviceConfig = { + ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-aggregator"}"; + User = "graphite"; + Group = "graphite"; + }; }; - preStart = '' - if ! test -e ${dataDir}/db-created; then - mkdir -p ${dataDir} - chown -R graphite:graphite ${dataDir} - fi - ''; - }; + }) - services.mongodb.enable = mkDefault cfg.seyren.enable; + (mkIf cfg.carbon.enableRelay { + systemd.services.carbonRelay = { + description = "Carbon Data Relay"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-interfaces.target" ]; + environment = carbonEnv; + serviceConfig = { + ExecStart = "${pkgs.twisted}/bin/twistd ${carbonOpts "carbon-relay"}"; + User = "graphite"; + Group = "graphite"; + }; + }; + }) - environment.systemPackages = [ - pkgs.pythonPackages.carbon - pkgs.python27Packages.graphite_web - pkgs.python27Packages.waitress - ]; + (mkIf (cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay) { + environment.systemPackages = [ + pkgs.pythonPackages.carbon + ]; + }) - users.extraUsers = singleton { - name = "graphite"; - uid = config.ids.uids.graphite; - description = "Graphite daemon user"; - home = dataDir; - }; - users.extraGroups.graphite.gid = config.ids.gids.graphite; - }; + (mkIf cfg.web.enable { + systemd.services.graphiteWeb = { + description = "Graphite Web Interface"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-interfaces.target" ]; + path = [ pkgs.perl ]; + environment = { + PYTHONPATH = "${pkgs.python27Packages.graphite_web}/lib/python2.7/site-packages"; + DJANGO_SETTINGS_MODULE = "graphite.settings"; + GRAPHITE_CONF_DIR = configDir; + GRAPHITE_STORAGE_DIR = dataDir; + }; + serviceConfig = { + ExecStart = '' + ${pkgs.python27Packages.waitress}/bin/waitress-serve \ + --host=${cfg.web.host} --port=${toString cfg.web.port} \ + --call django.core.handlers.wsgi:WSGIHandler''; + User = "graphite"; + Group = "graphite"; + PermissionsStartOnly = true; + }; + preStart = '' + if ! test -e ${dataDir}/db-created; then + mkdir -p ${dataDir}/{whisper/,log/webapp/} + chmod 0700 ${dataDir}/{whisper/,log/webapp/} + + # populate database + ${pkgs.python27Packages.graphite_web}/bin/manage-graphite.py syncdb --noinput + + # create index + ${pkgs.python27Packages.graphite_web}/bin/build-index.sh + + touch ${dataDir}/db-created + + chown -R graphite:graphite ${cfg.dataDir} + fi + ''; + }; + + environment.systemPackages = [ pkgs.python27Packages.graphite_web ]; + }) + + (mkIf cfg.api.enable { + systemd.services.graphiteApi = { + description = "Graphite Api Interface"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-interfaces.target" ]; + environment = { + PYTHONPATH = + "${cfg.api.package}/lib/python2.7/site-packages:" + + concatMapStringsSep ":" (f: f + "/lib/python2.7/site-packages") cfg.api.finders; + GRAPHITE_API_CONFIG = graphiteApiConfig; + LD_LIBRARY_PATH = "${pkgs.cairo}/lib"; + }; + serviceConfig = { + ExecStart = '' + ${pkgs.python27Packages.waitress}/bin/waitress-serve \ + --host=${cfg.api.host} --port=${toString cfg.api.port} \ + graphite_api.app:app + ''; + User = "graphite"; + Group = "graphite"; + PermissionsStartOnly = true; + }; + preStart = '' + if ! test -e ${dataDir}/db-created; then + mkdir -p ${dataDir}/cache/ + chmod 0700 ${dataDir}/cache/ + + touch ${dataDir}/db-created + + chown -R graphite:graphite ${cfg.dataDir} + fi + ''; + }; + }) + + (mkIf cfg.seyren.enable { + systemd.services.seyren = { + description = "Graphite Alerting Dashboard"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-interfaces.target" "mongodb.service" ]; + environment = seyrenConfig; + serviceConfig = { + ExecStart = "${pkgs.seyren}/bin/seyren -httpPort ${toString cfg.seyren.port}"; + WorkingDirectory = dataDir; + User = "graphite"; + Group = "graphite"; + }; + preStart = '' + if ! test -e ${dataDir}/db-created; then + mkdir -p ${dataDir} + chown -R graphite:graphite ${dataDir} + fi + ''; + }; + + services.mongodb.enable = mkDefault true; + }) + + (mkIf cfg.pager.enable { + systemd.services.graphitePager = { + description = "Graphite Pager Alerting Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-interfaces.target" "redis.service" ]; + environment = { + REDIS_URL = cfg.pager.redisUrl; + GRAPHITE_URL = cfg.pager.graphiteUrl; + }; + serviceConfig = { + ExecStart = "${pkgs.pythonPackages.graphite_pager}/bin/graphite-pager --config ${pagerConfig}"; + User = "graphite"; + Group = "graphite"; + }; + }; + + services.redis.enable = mkDefault true; + + environment.systemPackages = [ pkgs.pythonPackages.graphite_pager ]; + }) + + { + users.extraUsers = singleton { + name = "graphite"; + uid = config.ids.uids.graphite; + description = "Graphite daemon user"; + home = dataDir; + }; + users.extraGroups.graphite.gid = config.ids.gids.graphite; + } + ]; } diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix index 57d56cd72877..893df51fc1f6 100644 --- a/nixos/modules/services/network-filesystems/nfsd.nix +++ b/nixos/modules/services/network-filesystems/nfsd.nix @@ -64,6 +64,13 @@ in Use fixed port for rpc.mountd, usefull if server is behind firewall. ''; }; + + lockdPort = mkOption { + default = 0; + description = '' + Fix the lockd port number. This can help setting firewall rules for NFS. + ''; + }; }; }; @@ -104,6 +111,9 @@ in # Create a state directory required by NFSv4. mkdir -p /var/lib/nfs/v4recovery + ${pkgs.procps}/sbin/sysctl -w fs.nfs.nlm_tcpport=${builtins.toString cfg.lockdPort} + ${pkgs.procps}/sbin/sysctl -w fs.nfs.nlm_udpport=${builtins.toString cfg.lockdPort} + rpc.nfsd \ ${if cfg.hostName != null then "-H ${cfg.hostName}" else ""} \ ${builtins.toString cfg.nproc} diff --git a/nixos/modules/services/networking/cjdns-hosts.sh b/nixos/modules/services/networking/cjdns-hosts.sh new file mode 100644 index 000000000000..8a2b47e52143 --- /dev/null +++ b/nixos/modules/services/networking/cjdns-hosts.sh @@ -0,0 +1,11 @@ +pubs=($pubs) +hosts=($hosts) + +lines="''\n" +for ((i = 0; i < ${#pubs[*]}; i++)); do + addr=$($cjdns/bin/publictoip6 ${pubs[i]}) + lines="${lines}$addr ${hosts[i]}\n" +done +lines="${lines}''" + +echo -ne $lines > $out diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index 7192b8b7a0e0..9888419309c1 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -4,8 +4,46 @@ with lib; let + pkg = pkgs.cjdns; + cfg = config.services.cjdns; + connectToSubmodule = + { options, ... }: + { options = + { password = mkOption { + type = types.str; + description = "Authorized password to the opposite end of the tunnel."; + }; + publicKey = mkOption { + type = types.str; + description = "Public key at the opposite end of the tunnel."; + }; + hostname = mkOption { + default = ""; + example = "foobar.hype"; + type = types.str; + description = "Optional hostname to add to /etc/hosts; prevents reverse lookup failures."; + }; + }; + }; + + peers = mapAttrsToList (n: v: v) (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo); + + pubs = toString (map (p: if p.hostname == "" then "" else p.publicKey) peers); + hosts = toString (map (p: if p.hostname == "" then "" else p.hostname) peers); + + cjdnsHosts = + if hosts != "" then + import (pkgs.stdenv.mkDerivation { + name = "cjdns-hosts"; + builder = ./cjdns-hosts.sh; + + inherit (pkgs) cjdns; + inherit pubs hosts; + }) + else ""; + # would be nice to merge 'cfg' with a //, # but the json nesting is wacky. cjdrouteConf = builtins.toJSON ( { @@ -44,7 +82,7 @@ in enable = mkOption { type = types.bool; - default = false; + default = false; description = '' Whether to enable the cjdns network encryption and routing engine. A file at /etc/cjdns.keys will @@ -53,84 +91,80 @@ in ''; }; + confFile = mkOption { + type = types.str; + default = ""; + example = "/etc/cjdroute.conf"; + description = '' + Ignore all other cjdns options and load configuration from this file. + ''; + }; + authorizedPasswords = mkOption { type = types.listOf types.str; - default = [ ]; - example = [ + default = [ ]; + example = [ "snyrfgkqsc98qh1y4s5hbu0j57xw5s0" - "z9md3t4p45mfrjzdjurxn4wuj0d8swv" - "49275fut6tmzu354pq70sr5b95qq0vj" + "z9md3t4p45mfrjzdjurxn4wuj0d8swv" + "49275fut6tmzu354pq70sr5b95qq0vj" ]; - description = '' - Any remote cjdns nodes that offer these passwords on - connection will be allowed to route through this node. + description = '' + Any remote cjdns nodes that offer these passwords on + connection will be allowed to route through this node. ''; }; admin = { bind = mkOption { type = types.string; - default = "127.0.0.1:11234"; - description = '' + default = "127.0.0.1:11234"; + description = '' Bind the administration port to this address and port. - ''; + ''; }; }; UDPInterface = { bind = mkOption { type = types.string; - default = ""; + default = ""; example = "192.168.1.32:43211"; description = '' - Address and port to bind UDP tunnels to. - ''; - }; + Address and port to bind UDP tunnels to. + ''; + }; connectTo = mkOption { - type = types.attrsOf ( types.submodule ( - { options, ... }: - { options = { - # TODO make host an option, and add it to networking.extraHosts - password = mkOption { - type = types.str; - description = "Authorized password to the opposite end of the tunnel."; - }; - publicKey = mkOption { - type = types.str; - description = "Public key at the opposite end of the tunnel."; - }; - }; - } - )); - default = { }; + type = types.attrsOf ( types.submodule ( connectToSubmodule ) ); + default = { }; example = { "192.168.1.1:27313" = { - password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; + hostname = "homer.hype"; + password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k"; }; }; description = '' - Credentials for making UDP tunnels. - ''; - }; + Credentials for making UDP tunnels. + ''; + }; }; ETHInterface = { bind = mkOption { - default = ""; - example = "eth0"; - description = '' - Bind to this device for native ethernet operation. - ''; - }; + default = ""; + example = "eth0"; + description = '' + Bind to this device for native ethernet operation. + ''; + }; beacon = mkOption { - type = types.int; + type = types.int; default = 2; description = '' Auto-connect to other cjdns nodes on the same network. Options: - 0: Disabled. + 0: Disabled. 1: Accept beacons, this will cause cjdns to accept incoming beacon messages and try connecting to the sender. 2: Accept and send beacons, this will cause cjdns to broadcast @@ -142,32 +176,20 @@ in }; connectTo = mkOption { - type = types.attrsOf ( types.submodule ( - { options, ... }: - { options = { - password = mkOption { - type = types.str; - description = "Authorized password to the opposite end of the tunnel."; - }; - publicKey = mkOption { - type = types.str; - description = "Public key at the opposite end of the tunnel."; - }; - }; - } - )); - default = { }; + type = types.attrsOf ( types.submodule ( connectToSubmodule ) ); + default = { }; example = { "01:02:03:04:05:06" = { - password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; + hostname = "homer.hype"; + password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k"; }; }; - description = '' - Credentials for connecting look similar to UDP credientials + description = '' + Credentials for connecting look similar to UDP credientials except they begin with the mac address. - ''; - }; + ''; + }; }; }; @@ -185,34 +207,48 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" ]; - script = '' - source /etc/cjdns.keys - echo '${cjdrouteConf}' | sed \ - -e "s/@CJDNS_ADMIN_PASSWORD@/$CJDNS_ADMIN_PASSWORD/g" \ - -e "s/@CJDNS_PRIVATE_KEY@/$CJDNS_PRIVATE_KEY/g" \ - | ${pkgs.cjdns}/bin/cjdroute - ''; + script = ( + if cfg.confFile != "" then "${pkg}/bin/cjdroute < ${cfg.confFile}" else + '' + source /etc/cjdns.keys + echo '${cjdrouteConf}' | sed \ + -e "s/@CJDNS_ADMIN_PASSWORD@/$CJDNS_ADMIN_PASSWORD/g" \ + -e "s/@CJDNS_PRIVATE_KEY@/$CJDNS_PRIVATE_KEY/g" \ + | ${pkg}/bin/cjdroute + '' + ); serviceConfig = { Type = "forking"; - Restart = "on-failure"; + Restart = "on-failure"; }; }; - system.activationScripts.cjdns = '' + system.activationScripts.cjdns = if (cfg.confFile == "") then "" else '' + cjdnsWriteKeys() { + private=$1 + ipv6=$2 + public=$3 + + echo "CJDNS_PRIVATE_KEY=$1" >> /etc/cjdns.keys + echo -e "CJDNS_IPV6=$2\nCJDNS_PUBLIC_KEY=$3" > /etc/cjdns.public + + chmod 600 /etc/cjdns.keys + chmod 444 /etc/cjdns.public + } + grep -q "CJDNS_PRIVATE_KEY=" /etc/cjdns.keys || \ - echo "CJDNS_PRIVATE_KEY=$(${pkgs.cjdns}/bin/makekey)" \ - >> /etc/cjdns.keys + cjdnsWriteKeys $(${pkg}/bin/makekeys) grep -q "CJDNS_ADMIN_PASSWORD=" /etc/cjdns.keys || \ - echo "CJDNS_ADMIN_PASSWORD=$(${pkgs.coreutils}/bin/head -c 96 /dev/urandom | ${pkgs.coreutils}/bin/tr -dc A-Za-z0-9)" \ - >> /etc/cjdns.keys - - chmod 600 /etc/cjdns.keys + echo "CJDNS_ADMIN_PASSWORD=$(${pkgs.coreutils}/bin/head -c 96 /dev/urandom | ${pkgs.coreutils}/bin/tr -dc A-Za-z0-9)" \ + >> /etc/cjdns.keys ''; + networking.extraHosts = "${cjdnsHosts}"; + assertions = [ - { assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" ); + { assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" || cfg.confFile == "" ); message = "Neither cjdns.ETHInterface.bind nor cjdns.UDPInterface.bind defined."; } { assertion = config.networking.enableIPv6; diff --git a/nixos/modules/services/networking/polipo.nix b/nixos/modules/services/networking/polipo.nix index 05ded84625d0..51179d9120fe 100644 --- a/nixos/modules/services/networking/polipo.nix +++ b/nixos/modules/services/networking/polipo.nix @@ -103,12 +103,8 @@ in description = "caching web proxy"; after = [ "network.target" "nss-lookup.target" ]; wantedBy = [ "multi-user.target"]; - preStart = '' - ${pkgs.coreutils}/bin/chown polipo:polipo /var/cache/polipo -R - ''; serviceConfig = { ExecStart = "${pkgs.polipo}/bin/polipo -c ${polipoConfig}"; - ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; User = "polipo"; }; }; diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 51089d00244c..f82f8bfddbb7 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -91,6 +91,11 @@ let description = "Serve static files from a directory over HTTP"; }; + websocket = mkOption { + default = false; + description = "Enable WebSocket support"; + }; + }; createSSLOptsStr = o: diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 43e04a3076c6..ebdb2ad06491 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -18,7 +18,7 @@ in # determines the default: later modules (if enabled) are preferred. # E.g., if KDE is enabled, it supersedes xterm. imports = [ - ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde4_next.nix + ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./e17.nix ./e18.nix ./e19.nix ./gnome3.nix ./xbmc.nix ]; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 5f46e2f1ef84..5ac1a9591fdf 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -81,7 +81,7 @@ in { services.upower.enable = config.powerManagement.enable; services.upower.package = gnome3.upower; - fonts.fonts = [ pkgs.dejavu_fonts ]; + fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ]; services.xserver.desktopManager.session = singleton { name = "gnome3"; diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix index 669ddbd904f0..5c783fdbcedd 100644 --- a/nixos/modules/services/x11/desktop-managers/kde4.nix +++ b/nixos/modules/services/x11/desktop-managers/kde4.nix @@ -7,6 +7,7 @@ let xcfg = config.services.xserver; cfg = xcfg.desktopManager.kde4; xorg = pkgs.xorg; + kde_workspace = config.services.xserver.desktopManager.kde4.kdeWorkspacePackage; # Disable Nepomuk and Strigi by default. As of KDE 4.7, they don't # really work very well (e.g. searching files often fails to find @@ -61,6 +62,13 @@ in example = ["gstreamer" "vlc"]; description = "Which phonon multimedia backend kde should use"; }; + + kdeWorkspacePackage = mkOption { + internal = true; + default = pkgs.kde4.kde_workspace; + type = types.package; + description = "Custom kde-workspace, used for NixOS rebranding."; + }; }; environment.kdePackages = mkOption { @@ -108,13 +116,13 @@ in fi # Start KDE. - exec ${pkgs.kde4.kdebase_workspace}/bin/startkde + exec ${kde_workspace}/bin/startkde ''; }; security.setuidOwners = singleton { program = "kcheckpass"; - source = "${pkgs.kde4.kdebase_workspace}/lib/kde4/libexec/kcheckpass"; + source = "${kde_workspace}/lib/kde4/libexec/kcheckpass"; owner = "root"; group = "root"; setuid = true; @@ -124,7 +132,7 @@ in [ pkgs.kde4.kdelibs pkgs.kde4.kde_baseapps # Splitted kdebase - pkgs.kde4.kde_workspace + kde_workspace pkgs.kde4.kde_runtime pkgs.kde4.konsole pkgs.kde4.kate @@ -146,8 +154,10 @@ in pkgs.strigi # used by nepomuk pkgs.mysql # used by akonadi ] - ++ [ nepomukConfig ] ++ phononBackendPackages - ++ config.environment.kdePackages; + ++ lib.optional config.hardware.pulseaudio.enable pkgs.kde4.kmix # Perhaps this should always be enabled + ++ lib.optional config.hardware.bluetooth.enable pkgs.kde4.bluedevil + ++ lib.optional config.networking.networkmanager.enable pkgs.kde4.plasma-nm + ++ [ nepomukConfig ] ++ phononBackendPackages; environment.pathsToLink = [ "/share" ]; diff --git a/nixos/modules/services/x11/desktop-managers/kde4_next.nix b/nixos/modules/services/x11/desktop-managers/kde4_next.nix deleted file mode 100644 index 568094358ba0..000000000000 --- a/nixos/modules/services/x11/desktop-managers/kde4_next.nix +++ /dev/null @@ -1,163 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - xcfg = config.services.xserver; - cfg = xcfg.desktopManager.kde4_next; - xorg = pkgs.xorg; - kde = pkgs.kde4_next; - - # Disable Nepomuk and Strigi by default. As of KDE 4.7, they don't - # really work very well (e.g. searching files often fails to find - # files), segfault sometimes and consume significant resources. - # They can be re-enabled in the KDE System Settings under "Desktop - # Search". - nepomukConfig = pkgs.writeTextFile - { name = "nepomuk-config"; - destination = "/share/config/nepomukserverrc"; - text = - '' - [Basic Settings] - Start Nepomuk=false - - [Service-nepomukstrigiservice] - autostart=false - ''; - }; - - phononBackends = { - gstreamer = [ - pkgs.phonon_backend_gstreamer - pkgs.gst_all.gstPluginsBase - pkgs.gst_all.gstPluginsGood - pkgs.gst_all.gstPluginsUgly - pkgs.gst_all.gstPluginsBad - pkgs.gst_all.gstFfmpeg # for mp3 playback - pkgs.gst_all.gstreamer # needed? - ]; - - vlc = [pkgs.phonon_backend_vlc]; - }; - - phononBackendPackages = flip concatMap cfg.phononBackends - (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends); - -in - -{ - options = { - - services.xserver.desktopManager.kde4_next = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable the KDE 4 desktop environment."; - }; - - phononBackends = mkOption { - type = types.listOf types.str; - default = ["gstreamer"]; - example = ["gstreamer" "vlc"]; - description = "Which phonon multimedia backend kde should use"; - }; - }; - - }; - - - config = mkIf (xcfg.enable && cfg.enable) { - - # If KDE 4 is enabled, make it the default desktop manager (unless - # overridden by the user's configuration). - # !!! doesn't work yet ("Multiple definitions. Only one is allowed - # for this option.") - # services.xserver.desktopManager.default = mkOverride 900 "kde4"; - - services.xserver.desktopManager.session = singleton - { name = "kde4_next"; - bgSupport = true; - start = - '' - # The KDE icon cache is supposed to update itself - # automatically, but it uses the timestamp on the icon - # theme directory as a trigger. Since in Nix the - # timestamp is always the same, this doesn't work. So as - # a workaround, nuke the icon cache on login. This isn't - # perfect, since it may require logging out after - # installing new applications to update the cache. - # See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html - rm -fv $HOME/.kde/cache-*/icon-cache.kcache - - # Qt writes a weird ‘libraryPath’ line to - # ~/.config/Trolltech.conf that causes the KDE plugin - # paths of previous KDE invocations to be searched. - # Obviously using mismatching KDE libraries is potentially - # disastrous, so here we nuke references to the Nix store - # in Trolltech.conf. A better solution would be to stop - # Qt from doing this wackiness in the first place. - if [ -e $HOME/.config/Trolltech.conf ]; then - sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf - fi - - # Start KDE. - exec ${kde.kdebase_workspace}/bin/startkde - ''; - }; - - security.setuidOwners = singleton - { program = "kcheckpass"; - source = "${kde.kdebase_workspace}/lib/kde4/libexec/kcheckpass"; - owner = "root"; - group = "root"; - setuid = true; - }; - - environment.systemPackages = - [ kde.kdelibs - - kde.kde_baseapps # Splitted kdebase - kde.kde_workspace - kde.kde_runtime - kde.konsole - kde.kate - - kde.kde_wallpapers # contains kdm's default background - kde.oxygen_icons - pkgs.virtuoso # to enable Nepomuk to find Virtuoso - - # Starts KDE's Polkit authentication agent. - kde.polkit_kde_agent - - # Miscellaneous runtime dependencies. - kde.qt4 # needed for qdbus - pkgs.shared_mime_info - xorg.xmessage # so that startkde can show error messages - xorg.xset # used by startkde, non-essential - xorg.xauth # used by kdesu - pkgs.shared_desktop_ontologies # used by nepomuk - pkgs.strigi # used by nepomuk - pkgs.mysql # used by akonadi - ] - ++ lib.optional config.hardware.pulseaudio.enable kde.kmix # Perhaps this should always be enabled - ++ lib.optional config.hardware.bluetooth.enable kde.bluedevil - ++ lib.optional config.networking.networkmanager.enable kde.networkmanagement - ++ [ nepomukConfig ] ++ phononBackendPackages; - - environment.pathsToLink = [ "/share" ]; - - environment.etc = singleton - { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; - target = "X11/xkb"; - }; - - # Enable helpful DBus services. - services.udisks2.enable = true; - services.upower.enable = config.powerManagement.enable; - - security.pam.services.kde = { allowNullPassword = true; }; - - }; - -} diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index d0fe69c15dd5..c1205dc0c447 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -10,15 +10,19 @@ let systemd = cfg.package; + makeUnit = name: unit: + let + pathSafeName = lib.replaceChars ["@" "\\"] ["-" "-"] name; + in if unit.enable then - pkgs.runCommand "unit" { preferLocalBuild = true; inherit (unit) text; } + pkgs.runCommand "unit-${pathSafeName}" { preferLocalBuild = true; inherit (unit) text; } '' mkdir -p $out echo -n "$text" > $out/${shellEscape name} '' else - pkgs.runCommand "unit" { preferLocalBuild = true; } + pkgs.runCommand "unit-${pathSafeName}-disabled" { preferLocalBuild = true; } '' mkdir -p $out ln -s /dev/null $out/${shellEscape name} diff --git a/nixos/modules/tasks/filesystems/jfs.nix b/nixos/modules/tasks/filesystems/jfs.nix new file mode 100644 index 000000000000..b7091ce9b184 --- /dev/null +++ b/nixos/modules/tasks/filesystems/jfs.nix @@ -0,0 +1,19 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + inInitrd = any (fs: fs == "jfs") config.boot.initrd.supportedFilesystems; +in +{ + config = mkIf (any (fs: fs == "jfs") config.boot.supportedFilesystems) { + + system.fsPackages = [ pkgs.jfsutils ]; + + boot.initrd.kernelModules = mkIf inInitrd [ "jfs" ]; + + boot.initrd.extraUtilsCommands = mkIf inInitrd '' + cp -v ${pkgs.jfsutils}/sbin/fsck.jfs "$out/bin/" + ''; + }; +} diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 33f48d65d43e..a7610b3e11a0 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -383,7 +383,7 @@ in # When building a regular system configuration, override whatever # video driver the host uses. - services.xserver.videoDrivers = mkVMOverride [ "vesa" ]; + services.xserver.videoDrivers = mkVMOverride [ "modesetting" ]; services.xserver.defaultDepth = mkVMOverride 0; services.xserver.resolutions = mkVMOverride [ { x = 1024; y = 768; } ]; services.xserver.monitorSection = diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 243dddcd12cf..4099d9147422 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -65,6 +65,7 @@ in rec { mysql51 mysql55 nginx + openjdk openssh php postgresql92 diff --git a/nixos/release.nix b/nixos/release.nix index e782b0b7c63c..cb79dd3a226b 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -234,6 +234,7 @@ in rec { # ‘nix-build tests/login.nix -A result’. tests.avahi = callTest tests/avahi.nix {}; tests.bittorrent = callTest tests/bittorrent.nix {}; + tests.blivet = callTest tests/blivet.nix {}; tests.containers = callTest tests/containers.nix {}; tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; diff --git a/nixos/tests/blivet.nix b/nixos/tests/blivet.nix new file mode 100644 index 000000000000..acaf4fec614f --- /dev/null +++ b/nixos/tests/blivet.nix @@ -0,0 +1,85 @@ +import ./make-test.nix ({ pkgs, ... }: with pkgs.pythonPackages; rec { + name = "blivet"; + + machine = { + environment.systemPackages = [ pkgs.python blivet mock ]; + boot.supportedFilesystems = [ "btrfs" "jfs" "reiserfs" "xfs" ]; + virtualisation.memorySize = 768; + }; + + debugBlivet = false; + debugProgramCalls = false; + + pythonTestRunner = pkgs.writeText "run-blivet-tests.py" '' + import sys + import logging + + from unittest import TestLoader + from unittest.runner import TextTestRunner + + ${pkgs.lib.optionalString debugProgramCalls '' + blivet_program_log = logging.getLogger("program") + blivet_program_log.setLevel(logging.DEBUG) + blivet_program_log.addHandler(logging.StreamHandler(sys.stderr)) + ''} + + ${pkgs.lib.optionalString debugBlivet '' + blivet_log = logging.getLogger("blivet") + blivet_log.setLevel(logging.DEBUG) + blivet_log.addHandler(logging.StreamHandler(sys.stderr)) + ''} + + runner = TextTestRunner(verbosity=2, failfast=False, buffer=False) + result = runner.run(TestLoader().discover('tests/', pattern='*_test.py')) + sys.exit(not result.wasSuccessful()) + ''; + + blivetTest = pkgs.writeScript "blivet-test.sh" '' + #!${pkgs.stdenv.shell} -e + + # Use the hosts temporary directory, because we have a tmpfs within the VM + # and we don't want to increase the memory size of the VM for no reason. + mkdir -p /tmp/xchg/bigtmp + TMPDIR=/tmp/xchg/bigtmp + export TMPDIR + + mkPythonPath() { + nix-store -qR "$@" \ + | sed -e 's|$|/lib/${pkgs.python.libPrefix}/site-packages|' + } + + cp -Rd "${blivet.src}/tests" . + + # Skip SELinux tests + rm -f tests/formats_test/selinux_test.py + + # Race conditions in growing/shrinking during resync + rm -f tests/devicelibs_test/mdraid_* + + # Deactivate small BTRFS device test, because it fails with newer btrfsprogs + sed -i -e '/^class *BTRFSAsRootTestCase3(/,/^[^ ]/ { + /^class *BTRFSAsRootTestCase3(/d + /^$/d + /^ /d + }' tests/devicelibs_test/btrfs_test.py + + # How on earth can these tests ever work even upstream? O_o + sed -i -e '/def testDiskChunk[12]/,/^ *[^ ]/{n; s/^ */&return # /}' \ + tests/partitioning_test.py + + # fix hardcoded temporary directory + sed -i \ + -e '1i import tempfile' \ + -e 's|_STORE_FILE_PATH = .*|_STORE_FILE_PATH = tempfile.gettempdir()|' \ + tests/loopbackedtestcase.py + + PYTHONPATH=".:$(mkPythonPath "${blivet}" "${mock}" | paste -sd :)" \ + python "${pythonTestRunner}" + ''; + + testScript = '' + $machine->waitForUnit("multi-user.target"); + $machine->succeed("${blivetTest}"); + $machine->execute("rm -rf /tmp/xchg/bigtmp"); + ''; +}) diff --git a/nixos/tests/partition.nix b/nixos/tests/partition.nix index 72fd37e041e5..5e94b263d5b8 100644 --- a/nixos/tests/partition.nix +++ b/nixos/tests/partition.nix @@ -67,7 +67,7 @@ in { machine = { config, pkgs, ... }: { environment.systemPackages = [ - pkgs.pythonPackages.nixpart + pkgs.pythonPackages.nixpart0 pkgs.file pkgs.btrfsProgs pkgs.xfsprogs pkgs.lvm2 ]; virtualisation.emptyDiskImages = [ 4096 4096 ]; @@ -209,7 +209,7 @@ in { ensurePartition("swap", "swap"); ensurePartition("boot", "f2fs"); ensurePartition("root", "f2fs"); - remoteAndCheck; + remountAndCheck; ensureMountPoint("/mnt/boot", "f2fs"); }; diff --git a/pkgs/applications/audio/ncmpcpp/beta.nix b/pkgs/applications/audio/ncmpcpp/beta.nix new file mode 100644 index 000000000000..7398d2ded82f --- /dev/null +++ b/pkgs/applications/audio/ncmpcpp/beta.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, ncurses, curl, taglib, fftw, mpd_clientlib, pkgconfig +, boost, readline, libiconvOrEmpty }: + +stdenv.mkDerivation rec { + version = "0.6_beta5"; + name = "ncmpcpp-${version}"; + + src = fetchurl { + url = "http://ncmpcpp.rybczak.net/stable/ncmpcpp-${version}.tar.bz2"; + sha256 = "05h4mahnh39y9ab333whsgspj5mnbdkqfssgfi4r0zf1fvjwlwj6"; + }; + + buildInputs = [ ncurses curl taglib fftw mpd_clientlib pkgconfig boost readline ] + ++ libiconvOrEmpty; + + configureFlags = [ + "BOOST_LIB_SUFFIX=" + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Curses-based interface for MPD (music player daemon)"; + homepage = http://unkart.ovh.org/ncmpcpp/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fpletz ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix index e598fa19c5ea..f3f44f769a99 100644 --- a/pkgs/applications/editors/bvi/default.nix +++ b/pkgs/applications/editors/bvi/default.nix @@ -1,18 +1,21 @@ { stdenv, fetchurl, ncurses }: -stdenv.mkDerivation { - name = "bvi-1.3.2"; +stdenv.mkDerivation rec { + name = "bvi-${version}"; + version = "1.4.0"; src = fetchurl { - url = mirror://sourceforge/bvi/bvi-1.3.2.src.tar.gz; - sha256 = "110wxqnyianqamxq4y53drqqxb9vp4k2fcvic45qggvlqkqhlfgz"; + url = "mirror://sourceforge/bvi/${name}.src.tar.gz"; + sha256 = "00pq9rv7s8inqxq2m3xshxi58691i3pxw9smibcrgh6768l3qnh1"; }; buildInputs = [ ncurses ]; - meta = { + meta = with stdenv.lib; { description = "Hex editor with vim style keybindings"; homepage = http://bvi.sourceforge.net/download.html; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 3bfee481c9c0..8f954515b8f2 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -9,13 +9,13 @@ assert (libXft != null) -> libpng != null; # probably a bug assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise stdenv.mkDerivation rec { - name = "emacs-24.3"; + name = "emacs-24.4"; builder = ./builder.sh; src = fetchurl { url = "mirror://gnu/emacs/${name}.tar.xz"; - sha256 = "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh"; + sha256 = "1zflm6ac34s6v166p58ilxrxbxjm0q2wfc25f8y0mjml1lbr3qs7"; }; patches = [ ./darwin-new-sections.patch ]; @@ -35,10 +35,7 @@ stdenv.mkDerivation rec { [ "--with-x-toolkit=lucid" "--with-xft" ] else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" - "--with-gif=no" "--with-tiff=no" ] ) ) - # On NixOS, help Emacs find `crt*.o'. - ++ stdenv.lib.optional (stdenv ? glibc) - [ "--with-crt-dir=${stdenv.glibc}/lib" ]; + "--with-gif=no" "--with-tiff=no" ] ) ); NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isDarwin && withX) "-I${cairo}/include/cairo"; diff --git a/pkgs/applications/editors/emacs-24/macport.nix b/pkgs/applications/editors/emacs-24/macport.nix index d9b32351040b..b357d19b6746 100644 --- a/pkgs/applications/editors/emacs-24/macport.nix +++ b/pkgs/applications/editors/emacs-24/macport.nix @@ -2,19 +2,19 @@ }: stdenv.mkDerivation rec { - emacsName = "emacs-24.3"; - name = "${emacsName}-mac-4.8"; + emacsName = "emacs-24.4"; + name = "${emacsName}-mac-5.0"; #builder = ./builder.sh; src = fetchurl { url = "mirror://gnu/emacs/${emacsName}.tar.xz"; - sha256 = "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh"; + sha256 = "1zflm6ac34s6v166p58ilxrxbxjm0q2wfc25f8y0mjml1lbr3qs7"; }; macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; - sha256 = "194y341zrpjp75mc3099kjc0inr1d379wwsnav257bwsc967h8yx"; + sha256 = "14ipkwmzv0b02sclhgp2xj0cvhl3gk40sc2l21s87621kk640dzv"; }; patches = [ ./darwin-new-sections.patch ]; diff --git a/pkgs/applications/editors/emacs-modes/git-modes/default.nix b/pkgs/applications/editors/emacs-modes/git-modes/default.nix new file mode 100644 index 000000000000..8a2ca6eb9090 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/git-modes/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, emacs }: + +let + version = "0.15.0-8-g4e10851"; +in +stdenv.mkDerivation { + name = "git-modes-${version}"; + + src = fetchFromGitHub { + owner = "magit"; + repo = "git-modes"; + rev = "4e10851843145e0c05fc665683d3b487a57ad114"; + sha256 = "13j794a2p4ql9dnw2z0c1m0ybclxsicbk8cmmfqcchs4ygiyc6ag"; + }; + + buildInputs = [ emacs ]; + + installPhase = '' + mkdir -p $out/share/emacs/site-lisp + mv *.el *.elc $out/share/emacs/site-lisp/ + ''; + + meta = { + homepage = "https://github.com/magit/git-modes"; + description = "Emacs modes for various Git-related files"; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ simons ]; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix index 076caf5235b2..4a8d8b20d04a 100644 --- a/pkgs/applications/editors/emacs-modes/magit/default.nix +++ b/pkgs/applications/editors/emacs-modes/magit/default.nix @@ -1,25 +1,35 @@ -{ stdenv, fetchurl, emacs, texinfo }: +{ stdenv, fetchFromGitHub, emacs, texinfo, gitModes, git }: let - version = "1.2.0"; + version = "90141016"; in stdenv.mkDerivation rec { name = "magit-${version}"; - src = fetchurl { - url = "https://github.com/downloads/magit/magit/${name}.tar.gz"; - sha256 = "1a8vvilhd5y5vmlpsh194qpl4qlg0a1brylfscxcacpfp0cmhlzg"; + src = fetchFromGitHub { + owner = "magit"; + repo = "magit"; + rev = version; + sha256 = "11d3gzj0hlb7wqsjzjb0vf9i0ik4xzwdyayjy4hfgx0gjmymkfx3"; }; - buildInputs = [ emacs texinfo ]; + buildInputs = [ emacs texinfo git ]; + propagatedUserEnvPkgs = [ gitModes ]; - configurePhase = "makeFlagsArray=( PREFIX=$out SYSCONFDIR=$out/etc )"; + configurePhase = '' + makeFlagsArray=( + PREFIX="$out" + EFLAGS="-L ${gitModes}/share/emacs/site-lisp" + lispdir="$out/share/emacs/site-lisp" + ) + ''; + + doCheck = true; + checkTarget = "test"; - # Add (require 'magit-site-init) to your ~/.emacs file to set-up magit mode. postInstall = '' - mv $out/etc/emacs/site-start.d/50magit.el $out/share/emacs/site-lisp/magit-site-init.el - sed -i -e 's|50magit|magit-site-init|' $out/share/emacs/site-lisp/magit-site-init.el - rmdir $out/etc/emacs/site-start.d $out/etc/emacs $out/etc + mkdir -p $out/bin + mv "bin/"* $out/bin/ ''; meta = { @@ -39,7 +49,6 @@ stdenv.mkDerivation rec { save you from learning Git itself. ''; - platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ simons ]; }; } diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix new file mode 100644 index 000000000000..fc35a993badf --- /dev/null +++ b/pkgs/applications/editors/leafpad/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, intltool, pkgconfig, gtk }: + +stdenv.mkDerivation rec { + version = "0.8.18.1"; + name = "leafpad-${version}"; + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/leafpad/${name}.tar.gz"; + sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; + }; + + buildInputs = [ intltool pkgconfig gtk ]; + + configureFlags = [ + "--enable-chooser" + ]; + + meta = with stdenv.lib; { + description = "A notepad clone for GTK+ 2.0"; + homepage = http://tarot.freeshell.org/leafpad; + platforms = platforms.linux; + maintainers = [ maintainers.flosse ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index feafa7b99777..8fc3a4108d2d 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -1,17 +1,16 @@ -{ stdenv, stdenvAdapters, gccApple, fetchFromGitHub, ncurses, gettext, +{ stdenv, fetchFromGitHub, ncurses, gettext, pkgconfig, cscope, python, ruby, tcl, perl, luajit }: -let inherit (stdenvAdapters.overrideGCC stdenv gccApple) mkDerivation; -in mkDerivation rec { +stdenv.mkDerivation rec { name = "macvim-${version}"; - version = "7.4.355"; + version = "7.4.479"; src = fetchFromGitHub { owner = "genoma"; repo = "macvim"; - rev = "c18a61f9723565664ffc2eda9179e96c95860e25"; + rev = "f9c084b97fa9d5cad2448dfd3eff3d9b7f0fac59"; sha256 = "190bngg8m4bwqcia7w24gn7mmqkhk0mavxy81ziwysam1f652ymf"; }; @@ -46,6 +45,7 @@ in mkDerivation rec { "--enable-perlinterp=dynamic" "--enable-rubyinterp=dynamic" "--enable-tclinterp=yes" + "--without-local-dir" "--with-luajit" "--with-lua-prefix=${luajit}" "--with-ruby-command=${ruby}/bin/ruby" @@ -54,6 +54,8 @@ in mkDerivation rec { "--with-compiledby=Nix" ]; + makeFlags = ''PREFIX=$(out) CPPFLAGS="-Wno-error"''; + preConfigure = '' DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer configureFlagsArray+=( diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch index a789b9952d2b..a42ebd4cc03c 100644 --- a/pkgs/applications/editors/vim/macvim.patch +++ b/pkgs/applications/editors/vim/macvim.patch @@ -187,3 +187,36 @@ index bc9f074..9b9125e 100755 # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. $ac_cs_success || as_fn_exit 1 + +diff --git a/src/Makefile b/src/Makefile +index 1c4d104..fff2015 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -1298,7 +1298,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ + MacVim/MacVim.m + MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o objects/pty.o \ + objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o +-MACVIMGUI_DEFS = -DFEAT_GUI_MACVIM -Wall -Wno-unknown-pragmas -pipe ++MACVIMGUI_DEFS = -DMACOS_X_UNIX -DFEAT_GUI_MACVIM -Wall -Wno-unknown-pragmas -pipe + MACVIMGUI_IPATH = + MACVIMGUI_LIBS_DIR = + MACVIMGUI_LIBS1 = -framework Cocoa -framework Carbon + +diff --git a/src/if_python.c b/src/if_python.c +index b356bf7..b7bfa78 100644 +--- a/src/if_python.c ++++ b/src/if_python.c +@@ -55,11 +55,7 @@ + + #define PY_SSIZE_T_CLEAN + +-#ifdef FEAT_GUI_MACVIM +-# include +-#else +-# include +-#endif ++#include + + #if !defined(PY_VERSION_HEX) || PY_VERSION_HEX < 0x02050000 + # undef PY_SSIZE_T_CLEAN + MACVIMGUI_LIBS1 = -framework Cocoa -framework Carbon diff --git a/pkgs/applications/editors/yi/yi-custom-cabal/LICENSE b/pkgs/applications/editors/yi/yi-custom-cabal/LICENSE new file mode 100644 index 000000000000..cf1ab25da034 --- /dev/null +++ b/pkgs/applications/editors/yi/yi-custom-cabal/LICENSE @@ -0,0 +1,24 @@ +This is free and unencumbered software released into the public domain. + +Anyone is free to copy, modify, publish, use, compile, sell, or +distribute this software, either in source code form or as a compiled +binary, for any purpose, commercial or non-commercial, and by any +means. + +In jurisdictions that recognize copyright laws, the author or authors +of this software dedicate any and all copyright interest in the +software to the public domain. We make this dedication for the benefit +of the public at large and to the detriment of our heirs and +successors. We intend this dedication to be an overt act of +relinquishment in perpetuity of all present and future rights to this +software under copyright law. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +For more information, please refer to diff --git a/pkgs/applications/editors/yi/yi-custom-cabal/yi-custom.cabal b/pkgs/applications/editors/yi/yi-custom-cabal/yi-custom.cabal new file mode 100644 index 000000000000..d9ffbb8e4817 --- /dev/null +++ b/pkgs/applications/editors/yi/yi-custom-cabal/yi-custom.cabal @@ -0,0 +1,17 @@ +name: yi-custom +version: 0.0.0.1 +category: Yi +synopsis: Convenience wrapper for nix +description: Convenience wrapper for nix +license: PublicDomain +license-file: LICENSE +author: Mateusz Kowalczyk +maintainer: fuuzetsu@fuuzetsu.co.uk +Cabal-Version: >= 1.10 +build-type: Simple + +library + hs-source-dirs: . + default-language: Haskell2010 + build-depends: base, yi + ghc-options: -threaded diff --git a/pkgs/applications/editors/yi/yi-custom.nix b/pkgs/applications/editors/yi/yi-custom.nix new file mode 100644 index 000000000000..3dbd46119988 --- /dev/null +++ b/pkgs/applications/editors/yi/yi-custom.nix @@ -0,0 +1,40 @@ +# This is a manually-written expression over an in-tree cabal file. +# It's awkward but this way allows the package user to pass in +# extraPackages without much extra hassle on their end, similarly how +# the XMonad service handles it: the difference is that we don't have +# anything like XMONAD_GHC… +# +# The idea is that the user changes their configs using any libraries +# he likes and then builds it using this expression. Once that's done, +# ‘reload’ and similar functions should all work as long as the user +# doesn't need new libraries at which point they should add them to +# extraPackages and rebuild from the expression. +{ cabal, yi, extraPackages, makeWrapper, ghcWithPackages }: +let + w = ghcWithPackages (self: [ yi ] ++ extraPackages self); + wrappedGhc = w.override { ignoreCollisions = true; }; +in +cabal.mkDerivation (self: rec { + pname = "yi-custom"; + version = "0.0.0.1"; + src = ./yi-custom-cabal; + isLibrary = true; + buildDepends = [ yi ]; + buildTools = [ makeWrapper ]; + noHaddock = true; + doCheck = false; + + postInstall = '' + makeWrapper ${yi}/bin/yi $out/bin/yi \ + --set NIX_GHC ${wrappedGhc}/bin/ghc \ + --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${self.ghc.version} + ''; + meta = { + homepage = "http://haskell.org/haskellwiki/Yi"; + description = "Wrapper over user-specified Haskell libraries for use in Yi config"; + license = self.stdenv.lib.licenses.publicDomain; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; + +}) \ No newline at end of file diff --git a/pkgs/applications/editors/yi/yi.nix b/pkgs/applications/editors/yi/yi.nix index 9b9287a50f12..d6a601a0aef3 100644 --- a/pkgs/applications/editors/yi/yi.nix +++ b/pkgs/applications/editors/yi/yi.nix @@ -1,65 +1,39 @@ -{ cabal, alex, binary, Cabal, cautiousFile, concreteTyperep -, dataDefault, derive, Diff, dlist, dyre, filepath, fingertree -, glib, gtk, hashable, hint, HUnit, lens, mtl, pango, parsec -, pointedlist, QuickCheck, random, regexBase, regexTdfa, safe -, split, tasty, tastyHunit, tastyQuickcheck, time, transformersBase -, uniplate, unixCompat, unorderedContainers, utf8String, vty -, xdgBasedir -, withPango ? true +# This file was auto-generated by cabal2nix. Please do NOT edit manually! -# User may need extra dependencies for their configuration file so we -# want to specify it here to have them available when wrapping the -# produced binary. -, extraDepends ? [ ] +{ cabal, binary, Cabal, cautiousFile, dataDefault, derive, dlist +, dynamicState, dyre, filepath, glib, gtk, hashable, hint, HUnit +, lens, mtl, ooPrototypes, pango, parsec, pointedlist, QuickCheck +, random, regexBase, regexTdfa, safe, semigroups, split, tagged +, tasty, tastyHunit, tastyQuickcheck, text, time, transformersBase +, unixCompat, unorderedContainers, utf8String, vty, wordTrie +, xdgBasedir, yiLanguage, yiRope }: cabal.mkDerivation (self: { pname = "yi"; - version = "0.8.2"; - sha256 = "18rnyswsdzkh0jdcqfg8pr90mpm6xf11siv598svqkxg12d2qql9"; + version = "0.10.1"; + sha256 = "1vj4ndp43w7xlji4p2px79a8g90p64g54sr3hx4pzimwrlpmifk8"; isLibrary = true; isExecutable = true; buildDepends = [ - binary Cabal cautiousFile concreteTyperep dataDefault derive Diff - dlist dyre filepath fingertree hashable hint lens mtl + binary Cabal cautiousFile dataDefault derive dlist dynamicState + dyre filepath glib gtk hashable hint lens mtl ooPrototypes pango parsec pointedlist QuickCheck random regexBase regexTdfa safe - split time transformersBase uniplate unixCompat unorderedContainers - utf8String vty xdgBasedir - ] ++ (if withPango then [ pango gtk glib ] else [ ]) ++ extraDepends; - testDepends = [ - filepath HUnit QuickCheck tasty tastyHunit tastyQuickcheck + semigroups split tagged text time transformersBase unixCompat + unorderedContainers utf8String vty wordTrie xdgBasedir yiLanguage + yiRope ]; - buildTools = [ alex ]; - configureFlags = if withPango then "-fpango" else "-f-pango"; - doCheck = false; - - # https://ghc.haskell.org/trac/ghc/ticket/9170 - noHaddock = self.ghc.version == "7.6.3"; - - # Allows Yi to find the libraries it needs at runtime. - postInstall = '' - mv $out/bin/yi $out/bin/.yi-wrapped - cat - > $out/bin/yi <!'"$out/bin"'/&!g' dmenu_run + ''; + + preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ]; + + meta = { + description = "A patched fork of the original dmenu - an efficient dynamic menu for X"; + homepage = https://bitbucket.org/melek/dmenu2; + license = stdenv.lib.licenses.mit; + maintainers = with maintainers; [ cstrahan ]; + platforms = with platforms; all; + }; +} diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index b25d347ec873..3a7e5da1e737 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, gtk, gettext }: +{ stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses }: stdenv.mkDerivation rec { - name = "girara-0.2.2"; + name = "girara-0.2.3"; src = fetchurl { url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; - sha256 = "0lv6wqhx2avdxj6yx111jfs4j32r0xzmmkhy7pgzxpf73kgxz0k3"; + sha256 = "1phfmqp8y17zcy9yi6pm2f80x8ldbk60iswpm4bmjz5217jwqzxh"; }; buildInputs = [ pkgconfig gtk gettext ]; - makeFlags = "PREFIX=$(out)"; + makeFlags = [ + "PREFIX=$(out)" + "TPUT=${ncurses}/bin/tput" + ]; meta = { homepage = http://pwmt.org/projects/girara/; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix new file mode 100644 index 000000000000..34bef86f4380 --- /dev/null +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -0,0 +1,110 @@ +# Build procedure lifted from https://aur.archlinux.org/packages/k2/k2pdfopt/PKGBUILD +{ stdenv, fetchzip, fetchurl, writeScript, libX11, libXext, autoconf, automake, libtool + , leptonica, libpng, libtiff, zlib, openjpeg, freetype, jbig2dec, djvulibre + , openssl }: + +let + mupdf_src = fetchurl { + url = http://www.mupdf.com/downloads/archive/mupdf-1.5-source.tar.gz; + sha256 = "0sl47zqf4c9fhs4h5zg046vixjmwgy4vhljhr5g4md733nash7z4"; + }; + + tess_src = fetchurl { + url = http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02.tar.gz; + sha256 = "0g81m9y4iydp7kgr56mlkvjdwpp3mb01q385yhdnyvra7z5kkk96"; + }; + + gocr_src = fetchurl { + url = http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz; + sha256 = "06hpzp7rkkwfr1fvmc8kcfz9v490i9yir7f7imh13gmka0fr6afc"; + }; + +in stdenv.mkDerivation rec { + name = "k2pdfopt"; + src = fetchzip { + url = http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.21_src.zip; + sha256 = "1vy0yw41z6p95gmivjk4r534zbg0kqap4lr9ps56kvjw51q8r54j"; + }; + + buildInputs = [ libX11 libXext autoconf automake libtool leptonica libpng libtiff zlib + openjpeg freetype jbig2dec djvulibre openssl ]; + NIX_LDFLAGS = "-lX11 -lXext"; + + k2_pa = ./k2pdfopt.patch; + tess_pa = ./tesseract.patch; + + builder = writeScript "builder.sh" '' + . ${stdenv}/setup + set -e + + plibs=`pwd`/patched_libraries + + tar zxf ${mupdf_src} + cp $src/mupdf_mod/font.c $src/mupdf_mod/string.c mupdf-1.5-source/source/fitz/ + cp $src/mupdf_mod/pdf-* mupdf-1.5-source/source/pdf + + tar zxf ${tess_src} + cp $src/tesseract_mod/dawg.cpp tesseract-ocr/dict + cp $src/tesseract_mod/tessdatamanager.cpp tesseract-ocr/ccutil + cp $src/tesseract_mod/tessedit.cpp tesseract-ocr/ccmain + cp $src/tesseract_mod/tesscapi.cpp tesseract-ocr/api + cp $src/include_mod/tesseract.h $src/include_mod/leptonica.h tesseract-ocr/api + + cp -a $src k2pdfopt_v2.21 + chmod -R +w k2pdfopt_v2.21 + + patch -p0 -i $tess_pa + patch -p0 -i $k2_pa + + cd tesseract-ocr + ./autogen.sh + substituteInPlace "configure" \ + --replace 'LIBLEPT_HEADERSDIR="/usr/local/include /usr/include"' \ + 'LIBLEPT_HEADERSDIR=${leptonica}/include' + ./configure --prefix=$plibs --disable-shared + make install + + cd .. + tar zxf ${gocr_src} + cd gocr-0.49 + ./configure + cp src/{gocr.h,pnm.h,unicode.h,list.h} $plibs/include + cp include/config.h $plibs/include + make libs + cp src/libPgm2asc.a $plibs/lib + + cd ../mupdf-1.5-source + make prefix=$plibs install + install -Dm644 build/debug/libmujs.a $plibs/lib + + cd ../k2pdfopt_v2.21/k2pdfoptlib + gcc -Ofast -Wall -c *.c -I ../include_mod/ -I $plibs/include \ + -I . -I ../willuslib + ar rcs libk2pdfopt.a *.o + + cd ../willuslib + gcc -Ofast -Wall -c *.c -I ../include_mod/ -I $plibs/include + ar rcs libwillus.a *.o + + cd .. + gcc -Wall -Ofast -o k2pdfopt.o -c k2pdfopt.c -I k2pdfoptlib/ -I willuslib/ \ + -I include_mod/ -I $plibs/include + g++ -Ofast k2pdfopt.o -o k2pdfopt -I willuslib/ -I k2pdfoptlib/ -I include_mod/ \ + -I $plibs/include -L $plibs/lib/ \ + -L willuslib/ -L k2pdfoptlib/ -lk2pdfopt -lwillus -ldjvulibre -lz -lmupdf \ + -ljbig2dec -ljpeg -lopenjp2 -lpng -lfreetype -lpthread -lmujs \ + -lPgm2asc -llept -ltesseract -lcrypto + + mkdir -p $out/bin + cp k2pdfopt $out/bin + ''; + + meta = with stdenv.lib; { + description = "K2pdfopt optimizes PDF/DJVU files for mobile e-readers (e.g. the Kindle) and smartphones."; + homepage = http://www.willus.com/k2pdfopt; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.bosu ]; + }; +} + diff --git a/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch new file mode 100644 index 000000000000..00ac5770ea42 --- /dev/null +++ b/pkgs/applications/misc/k2pdfopt/k2pdfopt.patch @@ -0,0 +1,95 @@ +diff -aur k2pdfopt_v2.21/willuslib/array.c k2pdfopt_v2.21.new/willuslib/array.c +--- k2pdfopt_v2.21/willuslib/array.c 2014-05-23 16:29:58.000000000 -0300 ++++ k2pdfopt_v2.21.new/willuslib/array.c 2014-07-26 11:35:49.829825567 -0300 +@@ -1055,7 +1055,7 @@ + void arrayf_sort(float *a,int n) + + { +- sort(a,(long)n); ++ willus_sort(a,(long)n); + } + + +diff -aur k2pdfopt_v2.21/willuslib/math.c k2pdfopt_v2.21.new/willuslib/math.c +--- k2pdfopt_v2.21/willuslib/math.c 2013-08-15 21:33:50.000000000 -0300 ++++ k2pdfopt_v2.21.new/willuslib/math.c 2014-07-26 11:36:02.853170659 -0300 +@@ -532,7 +532,7 @@ + + + +-void sort(float *x,int n) ++void willus_sort(float *x,int n) + + { + int top,n1; +diff -aur k2pdfopt_v2.21/willuslib/ocrjocr.c k2pdfopt_v2.21.new/willuslib/ocrjocr.c +--- k2pdfopt_v2.21/willuslib/ocrjocr.c 2012-11-12 13:09:42.000000000 -0300 ++++ k2pdfopt_v2.21.new/willuslib/ocrjocr.c 2014-07-26 11:36:46.699837185 -0300 +@@ -29,6 +29,8 @@ + #ifdef HAVE_GOCR_LIB + #include + ++job_t *JOB; ++ + /* + ** bmp8 must be grayscale + ** (x1,y1) and (x2,y2) from top left of bitmap +@@ -66,6 +68,7 @@ + h=y2-y1+1; + dh=h+bw*2; + job=&_job; ++ JOB=job; + job_init(job); + job_init_image(job); + // willus_mem_alloc_warn((void **)&job->src.p.p,w*h,funcname,10); +diff -aur k2pdfopt_v2.21/willuslib/string.c k2pdfopt_v2.21.new/willuslib/string.c +--- k2pdfopt_v2.21/willuslib/string.c 2014-02-03 00:37:44.000000000 -0300 ++++ k2pdfopt_v2.21.new/willuslib/string.c 2014-07-26 11:37:01.766506277 -0300 +@@ -81,7 +81,7 @@ + ** Returns NULL if EOF, otherwise returns pointer to the string. + ** + */ +-char *get_line(char *buf,int max,FILE *f) ++char *willus_get_line(char *buf,int max,FILE *f) + + { + int i; +diff -aur k2pdfopt_v2.21/willuslib/willus.h k2pdfopt_v2.21.new/willuslib/willus.h +--- k2pdfopt_v2.21/willuslib/willus.h 2014-07-25 15:03:51.000000000 -0300 ++++ k2pdfopt_v2.21.new/willuslib/willus.h 2014-07-26 11:37:56.316506038 -0300 +@@ -214,9 +214,6 @@ + ** CMAKE handles the defines, not this source + ** (Mod from Dirk Thierbach, 31-Dec-2013) + */ +-#ifdef USE_CMAKE +-#include "config.h" +-#else /* USE_CMAKE */ + + #ifndef HAVE_Z_LIB + #define HAVE_Z_LIB +@@ -268,7 +265,6 @@ + #undef HAVE_GSL_LIB + #endif + +-#endif /* USE_CMAKE */ + /* + ** Consistency check + */ +@@ -533,7 +529,7 @@ + int *n,FILE *err); + int readxyz_ex (char *filename,double **x,double **y,double **z, + int *n,FILE *err,int ignore_after_semicolon); +-void sort (float *x,int n); ++void willus_sort (float *x,int n); + void sortd (double *x,int n); + void sorti (int *x,int n); + void sortxy (float *x,float *y,int n); +@@ -602,7 +598,7 @@ + /* string.c */ + void clean_line (char *buf); + void clean_line_end(char *buf); +-char *get_line (char *buf,int max,FILE *f); ++char *willus_get_line (char *buf,int max,FILE *f); + char *get_line_cf (char *buf,int max,FILE *f); + int mem_get_line_cf(char *buf,int maxlen,char *cptr,long *cindex,long csize); + int in_string (char *buffer,char *pattern); diff --git a/pkgs/applications/misc/k2pdfopt/tesseract.patch b/pkgs/applications/misc/k2pdfopt/tesseract.patch new file mode 100644 index 000000000000..5cb6e0fe3176 --- /dev/null +++ b/pkgs/applications/misc/k2pdfopt/tesseract.patch @@ -0,0 +1,12 @@ +diff -aur tesseract-ocr/api/Makefile.am tesseract-ocr.new/api/Makefile.am +--- tesseract-ocr/api/Makefile.am 2012-10-09 14:18:39.000000000 -0300 ++++ tesseract-ocr.new/api/Makefile.am 2014-03-20 18:43:13.926030341 -0300 +@@ -36,7 +36,7 @@ + if VISIBILITY + libtesseract_api_la_CPPFLAGS += -DTESS_EXPORTS + endif +-libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp ++libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp tesscapi.cpp + + lib_LTLIBRARIES += libtesseract.la + libtesseract_la_LDFLAGS = diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix new file mode 100644 index 000000000000..17da22cbaafc --- /dev/null +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -0,0 +1,39 @@ +{stdenv, fetchurl, qt4, pkgconfig, popplerQt4, djvulibre, libspectre, cups +, file, ghostscript +}: +let + s = # Generated upstream information + rec { + baseName="qpdfview"; + version="0.4.12"; + name="${baseName}-${version}"; + url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; + sha256="1h6lrrh1vblqkxrd89nmid7d21anyn30iahj24z62yny35lidf0g"; + }; + buildInputs = [ + qt4 popplerQt4 pkgconfig djvulibre libspectre cups file ghostscript + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + configurePhase = '' + qmake *.pro + for i in *.pro; do + qmake "$i" -o "Makefile.$(basename "$i" .pro)" + done + sed -e "s@/usr/@$out/@g" -i Makefile* + ''; + meta = { + inherit (s) version; + description = "A tabbed document viewer"; + license = stdenv.lib.licenses.gpl2; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://launchpad.net/qpdfview"; + updateWalker = true; + }; +} diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index a8338b80c9e4..60322c2b911e 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { "-I${dbus_libs}/lib/dbus-1.0/include" ]; # Fix up python path so the lockfile library is on it. - PYTHONPATH = stdenv.lib.makeSearchPath "lib/${pythonFull.python.libPrefix}/site-packages" [ + PYTHONPATH = stdenv.lib.makeSearchPath "lib/${pythonFull.libPrefix}/site-packages" [ pythonPackages.curses pythonPackages.lockfile ]; diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix new file mode 100644 index 000000000000..98f2e0d61083 --- /dev/null +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation { + name = "urxvt-perls"; + + src = fetchgit { + url = "https://github.com/muennich/urxvt-perls"; + rev = "4dec629b3631297d17855c35be1b723e2d9e7591"; + sha256 = "c61bc8819b4e6655ed4a3ce3b347cb6dbebcb484d5d3973cbe9aa7f2c98d372f"; + }; + + installPhase = '' + mkdir -p $out/lib/urxvt/perl + cp clipboard \ + keyboard-select \ + url-select \ + $out/lib/urxvt/perl + ''; + + meta = with stdenv.lib; { + description = "Perl extensions for the rxvt-unicode terminal emulator"; + homepage = "https://github.com/muennich/urxvt-perls"; + license = licenses.gpl2; + maintainers = maintainers.abbradar; + }; +} \ No newline at end of file diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix new file mode 100644 index 000000000000..a636c3bcfe56 --- /dev/null +++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-tabbedex/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation { + name = "urxvt-tabbedex"; + + src = fetchgit { + url = "https://github.com/mina86/urxvt-tabbedex"; + rev = "54c8d6beb4d65278ed6db24693ca56e1ee65bb42"; + sha256 = "f8734ee289e1cfc517d0699627191c98d32ae3549e0f1935af2a5ccb86d4dc1e"; + }; + + installPhase = '' + install -D tabbedex $out/lib/urxvt/perl/tabbedex + ''; + + meta = with stdenv.lib; { + description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)"; + homepage = "https://github.com/mina86/urxvt-tabbedex"; + maintainers = maintainers.abbradar; + }; +} \ No newline at end of file diff --git a/pkgs/applications/misc/rxvt_unicode/wrapper.nix b/pkgs/applications/misc/rxvt_unicode/wrapper.nix new file mode 100644 index 000000000000..140113de64a3 --- /dev/null +++ b/pkgs/applications/misc/rxvt_unicode/wrapper.nix @@ -0,0 +1,26 @@ +{ stdenv, buildEnv, rxvt_unicode, makeWrapper, plugins }: + +let + rxvt = rxvt_unicode.override { + perlSupport = true; + }; + + drv = buildEnv { + name = "${rxvt.name}-with-plugins"; + + paths = [ rxvt ] ++ plugins; + + postBuild = '' + # TODO: This could be avoided if buildEnv could be forced to create all directories + if [ -L $out/bin ]; then + rm $out/bin + mkdir $out/bin + for i in ${rxvt}/bin/*; do + ln -s $i $out/bin + done + fi + wrapProgram $out/bin/urxvt \ + --suffix-each URXVT_PERL_LIB ':' "$out/lib/urxvt/perl" + ''; + }; +in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) \ No newline at end of file diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 96ca38f581f8..37076d242c44 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "termite-${version}"; - version = "v7"; + version = "8"; src = fetchgit { - url = "https://github.com/thestinger/termite"; - rev = "f0ff025c1bb6a1e3fd83072f00c2dc42a0701f46"; - sha256 = "057yzlqvp84fkmhn4bz9071glj4rh4187xhg48cdppf2w6phcbxp"; + url = "https://github.com/thestinger/termite.git"; + rev = "05f3bbf626245a344eb74859ef2aa49f715ebd55"; + sha256 = "01dfg4zg7sgw0cbh0j9sbwdvn43rw7xfcnijfh1dhd6n5yx00b18"; }; - makeFlags = "VERSION=${version}"; + makeFlags = "VERSION=v${version}"; buildInputs = [pkgconfig vte gtk ncurses]; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index 5f44f79ebcdd..718670f569b7 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,17 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, gtk, girara, gettext, docutils, file, makeWrapper, zathura_icon }: +{ stdenv, fetchurl, pkgconfig, gtk, girara, ncurses, gettext, docutils, file, makeWrapper, zathura_icon }: stdenv.mkDerivation rec { - version = "0.2.9"; + version = "0.3.1"; name = "zathura-core-${version}"; src = fetchurl { url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz"; - sha256 = "17z05skjk95115ajp6459k1djadza1w8kck7jn1qnd697r01s1rc"; + sha256 = "1wwjj7vnzpkvn83674mapapvl2qsn7y44w17lq63283j1lic00mm"; }; buildInputs = [ pkgconfig file gtk girara gettext makeWrapper ]; - makeFlags = [ "PREFIX=$(out)" "RSTTOMAN=${docutils}/bin/rst2man.py" "VERBOSE=1" ]; + makeFlags = [ + "PREFIX=$(out)" + "RSTTOMAN=${docutils}/bin/rst2man.py" + "VERBOSE=1" + "TPUT=${ncurses}/bin/tput" + ]; postInstall = '' wrapProgram "$out/bin/zathura" \ diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix index 1a4ab3d772c5..6f1b5f400dd1 100644 --- a/pkgs/applications/misc/zathura/default.nix +++ b/pkgs/applications/misc/zathura/default.nix @@ -1,7 +1,7 @@ -{ callPackage, pkgs, fetchurl, useMupdf }: +{ callPackage, pkgs, fetchurl, stdenv, useMupdf }: rec { - inherit (pkgs) stdenv; + inherit stdenv; icon = ./icon.xpm; diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index 1a2347f27277..00c5464b7d13 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: stdenv.mkDerivation rec { - name = "zathura-djvu-0.2.3"; + name = "zathura-djvu-0.2.4"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "12gd8kb0al5mknh4rlvxzgzwz3vhjggqjh8ws27phaq14paq4vn1"; + sha256 = "1g1lafmrjbx0xv7fljdmyqxx0k334sq4q6jy4a0q5xfrgz0bh45c"; }; buildInputs = [ pkgconfig djvulibre gettext zathura_core gtk girara ]; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/config.patch b/pkgs/applications/misc/zathura/pdf-mupdf/config.patch index c7d172c92634..6445fab22989 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/config.patch +++ b/pkgs/applications/misc/zathura/pdf-mupdf/config.patch @@ -1,10 +1,10 @@ ---- zathura-pdf-mupdf-0.2.6/config.mk -+++ zathura-pdf-mupdf-0.2.6/config.mk +--- zathura-pdf-mupdf-0.2.7/config.mk ++++ zathura-pdf-mupdf-0.2.7/config.mk @@ -32,10 +32,11 @@ OPENSSL_INC ?= $(shell pkg-config --cflags libcrypto) OPENSSL_LIB ?= $(shell pkg-config --libs libcrypto) --MUPDF_LIB ?= -lmupdf -lmupdf-js-none +-MUPDF_LIB ?= -lmupdf -lmujs +MUPDF_INC ?= $(shell pkg-config --cflags mupdf) +MUPDF_LIB ?= $(shell pkg-config --libs mupdf) diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 4e585d852a2a..a6f12a64cf00 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl, openjpeg, libjpeg, jbig2dec }: stdenv.mkDerivation rec { - version = "0.2.6"; + version = "0.2.7"; name = "zathura-pdf-mupdf-${version}"; src = fetchurl { url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz"; - sha256 = "5df94b6f906008b5f3bca770a552da6d2917d6b8d3e4b3049cb7001302041b20"; + sha256 = "0gr5kkk75hn7sz9kmzynhhcdd9xb9sz5gdb8p1iz9g0fjhskyd5i"; }; buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf openjpeg libjpeg jbig2dec ]; diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index 47381f06d68d..4cb356fcab1a 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchgit, unzip, xulrunner, makeWrapper }: +{ stdenv, fetchgit, unzip, firefox, makeWrapper }: stdenv.mkDerivation { name = "conkeror-1.0pre-20140616"; src = fetchgit { url = git://repo.or.cz/conkeror.git; - rev = "8a26fff5896a3360549e2adfbf06b1d57e909266"; - sha256 = "56f1c71ca1753a63d7599d3e8bf52277711b2693e7709ed7c146f34940441cb4"; + rev = "98e89c7e5ff3a1069a0984338da01273cdb189a2"; + sha256 = "284ba966efebfa0aaa768abc1a4f901e2ecf5db9d0391d904a49118b0b94fcd7"; }; buildInputs = [ unzip makeWrapper ]; @@ -15,8 +15,8 @@ stdenv.mkDerivation { mkdir -p $out/libexec/conkeror cp -r * $out/libexec/conkeror - makeWrapper ${xulrunner}/bin/xulrunner $out/bin/conkeror \ - --add-flags $out/libexec/conkeror/application.ini + makeWrapper ${firefox}/bin/firefox $out/bin/conkeror \ + --add-flags "-app $out/libexec/conkeror/application.ini" ''; meta = { diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 32baa0b6a868..2a23d90f8443 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.406"; + version = "11.2.202.411"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "05akcw89kz0cnhan6wp72banz2asmvqfhb2cw1krn66qgd7bl0x0"; + sha256 = "1983rj824bhzk48yhgminsiil778vwq0217hfrhbmymhrq3p7gzd"; } else if stdenv.system == "i686-linux" then if debug then @@ -60,7 +60,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "10f3842vi80kszj42f4c8sw7plrmvsin5k860cqvlzgdhndz8i4b"; + sha256 = "1bxp94s63i3136pjxgcm8106mqzaj4h096mkf7iq6ddkcvi0cxzn"; } else throw "Flash Player is not supported on this platform"; diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix new file mode 100644 index 000000000000..a7b5ef6972ef --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pythonPackages, pyqt4, cython, libvncserver, zlib, twisted, gnutls }: + +pythonPackages.buildPythonPackage rec { + name = "blink-${version}"; + version = "0.9.1"; + + src = fetchurl { + url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz"; + sha256 = "f578e5186893c3488e7773fbb775028ae54540433a0c51aefa5af983ca2bfdae"; + }; + + patches = [ ./pythonpath.patch ]; + + propagatedBuildInputs = [ pyqt4 pythonPackages.cjson pythonPackages.sipsimple twisted ]; + + buildInputs = [ cython zlib libvncserver ]; + + postInstall = '' + wrapProgram $out/bin/blink \ + --prefix LD_LIBRARY_PATH : ${gnutls}/lib + ''; + + meta = { + homepage = http://icanblink.com/; + description = "A state of the art, easy to use SIP client"; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch b/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch new file mode 100644 index 000000000000..2cf7ba19d383 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/blink/pythonpath.patch @@ -0,0 +1,12 @@ +diff --git a/blink/resources.py b/blink/resources.py +index 524d9e5..c271887 100644 +--- a/blink/resources.py ++++ b/blink/resources.py +@@ -64,6 +64,7 @@ class Resources(object): + if script == '': + application_directory = os.path.realpath(script) # executed in interactive interpreter + else: ++ script = os.path.join(sys.path[0], script) + binary_directory = os.path.dirname(os.path.realpath(script)) + if os.path.basename(binary_directory) == 'bin': + application_directory = os.path.dirname(binary_directory) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/add-search-path.patch b/pkgs/applications/networking/instant-messengers/pidgin/add-search-path.patch new file mode 100644 index 000000000000..b0758777186a --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin/add-search-path.patch @@ -0,0 +1,20 @@ +diff --git a/libpurple/plugin.c b/libpurple/plugin.c +index 4f2b402..fda9add 100644 +--- a/libpurple/plugin.c ++++ b/libpurple/plugin.c +@@ -1181,8 +1181,15 @@ purple_plugins_get_handle(void) { + void + purple_plugins_init(void) { + void *handle = purple_plugins_get_handle(); ++ gchar **paths, **p; + + purple_plugins_add_search_path(LIBDIR); ++ paths = g_strsplit(g_getenv("PURPLE_PLUGIN_PATH"), ":", -1); ++ if (paths) { ++ for (p = paths; *p; ++p) ++ if (**p) purple_plugins_add_search_path(*p); ++ } ++ g_strfreev(paths); + + purple_signal_register(handle, "plugin-load", + purple_marshal_VOID__POINTER, diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 814a191c457a..d5061e6f4314 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -20,11 +20,14 @@ , libgcrypt ? null } : +# FIXME: clean the mess around choosing the SSL library (nss by default) + stdenv.mkDerivation rec { - name = "pidgin-2.10.9"; + majorVersion = "2"; + name = "pidgin-${majorVersion}.10.10"; src = fetchurl { url = "mirror://sourceforge/pidgin/${name}.tar.bz2"; - sha256 = "06gka47myl9f5x0flkq74ml75akkf28rx9sl8pm3wqkzazc2wdnw"; + sha256 = "0bc2bk2g3w90mpz9sn9j95c71z4i2i3wxaqa2zpmmixf5r8rasyw"; }; inherit nss ncurses; @@ -46,7 +49,7 @@ stdenv.mkDerivation rec { pkgconfig gtk perl perlXMLParser gettext ]; - patches = [./pidgin-makefile.patch ]; + patches = [./pidgin-makefile.patch ./add-search-path.patch ]; configureFlags="--with-nspr-includes=${nspr}/include/nspr --with-nspr-libs=${nspr}/lib --with-nss-includes=${nss}/include/nss --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include --disable-meanwhile --disable-nm --disable-tcl" + (lib.optionalString (gnutls != null) " --enable-gnutls=yes --enable-nss=no") diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix new file mode 100644 index 000000000000..a10eb6864cca --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix @@ -0,0 +1,21 @@ +{ stdenv, buildEnv, pidgin, makeWrapper, plugins }: + +let drv = buildEnv { + name = "${pidgin.name}-with-plugins"; + + paths = [ pidgin ] ++ plugins; + + postBuild = '' + # TODO: This could be avoided if buildEnv could be forced to create all directories + if [ -L $out/bin ]; then + rm $out/bin + mkdir $out/bin + for i in ${pidgin}/bin/*; do + ln -s $i $out/bin + done + fi + wrapProgram $out/bin/pidgin \ + --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.majorVersion} $out/lib/pidgin" + ''; + }; +in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; }) \ No newline at end of file diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix index 2010d064f0d9..765066bb4371 100644 --- a/pkgs/applications/networking/irc/chatzilla/default.nix +++ b/pkgs/applications/networking/irc/chatzilla/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, unzip, xulrunner, makeWrapper }: +{ stdenv, fetchurl, unzip, firefox, makeWrapper }: stdenv.mkDerivation rec { - name = "chatzilla-0.9.90.1"; + name = "chatzilla-0.9.91"; src = fetchurl { # Obtained from http://chatzilla.rdmsoft.com/xulrunner/. url = "http://chatzilla.rdmsoft.com/xulrunner/download/${name}.en-US.xulapp"; - sha256 = "0z38jig91h10cb14rvs30rpg2pgn3v890nyxyy8lxzbv5ncxmngw"; + sha256 = "1bmjw2wvp8gh7fdl8czkxc55iari6dy672446hps20xixrh8hl8r"; }; buildInputs = [ unzip makeWrapper ]; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { mkdir -p $out/libexec/chatzilla unzip $src -d $out/libexec/chatzilla - makeWrapper ${xulrunner}/bin/xulrunner $out/bin/chatzilla \ - --add-flags $out/libexec/chatzilla/application.ini + makeWrapper ${firefox}/bin/firefox $out/bin/chatzilla \ + --add-flags "-app $out/libexec/chatzilla/application.ini" sed -i $out/libexec/chatzilla/application.ini -e 's/.*MaxVersion.*/MaxVersion=99.*/' ''; diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index ba3d7b8c368a..f3fd39e84a72 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -12,12 +12,12 @@ let in with stdenv; mkDerivation rec { - version = "0.10.0"; + version = "0.10.1"; name = "quassel${tag}-${version}"; src = fetchurl { url = "http://quassel-irc.org/pub/quassel-${version}.tar.bz2"; - sha256 = "08vwxkwnzlgnxn0wi6ga9fk8qgc6nklb236hsfnr5ad37bi8q8k8"; + sha256 = "106zjn705vyh0msqwg3v4dhaahffhkn1bmfsljdz57jd539bf5qd"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 75ccb93ca954..75eca10d9aa5 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,60 +1,24 @@ -{ fetchurl, stdenv, bash, emacs, gdb, glib, gmime, gnupg, +{ fetchurl, stdenv, bash, emacs, fixDarwinDylibNames, + gdb, glib, gmime, gnupg, pkgconfig, talloc, xapian }: stdenv.mkDerivation rec { - name = "notmuch-0.18.1"; + name = "notmuch-0.18.2"; src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "1pdp9l7yv71d3fjb30qyccva8h03hvg88q4a00yi50v2j70kvmgj"; + sha256 = "175wzrw1mfpl4h72n9ims66zn5l34zn2dn857vraj2i5w7z7p7z9"; }; - buildInputs = [ bash emacs gdb glib gmime gnupg pkgconfig talloc xapian ]; + buildInputs = [ bash emacs gdb glib gmime gnupg pkgconfig talloc xapian ] + ++ stdenv.lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; patchPhase = '' - (cd test && for prg in \ - aggregate-results.sh \ - argument-parsing \ - atomicity \ - author-order \ - basic \ - crypto \ - count \ - dump-restore \ - emacs \ - emacs-large-search-buffer \ - encoding \ - from-guessing \ - help-test \ - hooks \ - json \ - long-id \ - maildir-sync \ - multipart \ - new \ - notmuch-test \ - python \ - raw \ - reply \ - search \ - search-by-folder \ - search-insufficient-from-quoting \ - search-folder-coherence \ - search-limiting \ - search-output \ - search-position-overlap-bug \ - symbol-hiding \ - tagging \ - test-lib.sh \ - test-verbose \ - thread-naming \ - thread-order \ - uuencode \ - ;do - substituteInPlace "$prg" \ - --replace "#!/usr/bin/env bash" "#!${bash}/bin/bash" - done) + find test -type f -exec \ + sed -i \ + "1s_#!/usr/bin/env bash_#!${bash}/bin/bash_" \ + "{}" ";" for src in \ crypto.c \ @@ -65,6 +29,16 @@ stdenv.mkDerivation rec { done ''; + preFixup = if stdenv.isDarwin then + '' + prg="$out/bin/notmuch" + target="libnotmuch.3.dylib" + echo "$prg: fixing link to $target" + install_name_tool -change "$target" "$out/lib/$target" "$prg" + '' + else + ""; + # XXX: emacs tests broken doCheck = false; checkTarget = "test"; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index fbf8955765aa..4d5a49ac5f63 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,14 +6,14 @@ }: let pname = "liferea"; - version = "1.10.11"; + version = "1.10.12"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0mf5mpdj60j8if4qi5656l4pzhgwzhshf31yp0h53l1j442v109a"; + sha256 = "0c046r3cgf2adcjkgcny1gf2yj3hs0fhrc1zmcz2ja7grcbx46si"; }; buildInputs = with gst_all_1; [ diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index a8388b4829af..00e5a4f93ee6 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -1,77 +1,42 @@ -{ stdenv -, fetchgit -, cmake -, openssl -, printerSupport ? true, cups -, pkgconfig -, zlib -, libX11 -, libXcursor -, libXdamage -, libXext -, alsaLib -, ffmpeg -, libxkbfile -#, xmlto, docbook_xml_dtd_412, docbook_xml_xslt -, libXinerama -#, directfb -#, cunit -, libXv -, pulseaudioSupport ? true, pulseaudio +{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor +, libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv +, pulseaudio ? null, cups ? null, pcsclite ? null }: -assert printerSupport -> cups != null; - -let rev = "ec6effcb1e7759551cf31f5b18d768afc67db97d"; in - stdenv.mkDerivation rec { - name = "freerdp-1.1pre-${stdenv.lib.strings.substring 0 7 rev}"; + name = "freerdp-1.2.0-beta1"; - src = fetchgit { - url = git://github.com/FreeRDP/FreeRDP.git; - inherit rev; - sha256 = "4e5af9a6769c4b34c6b75dffe83a385d1d86068c523ea9f62fabc651a2958455"; + src = fetchFromGitHub { + owner = "FreeRDP"; + repo = "FreeRDP"; + rev = "1.2.0-beta1+android7"; + sha256 = "08nn18jydblrif1qs92pakzd3ww7inr0i378ssn1bjp09lm1bkk0"; }; buildInputs = [ - cmake - openssl - pkgconfig - zlib - libX11 - libXcursor - libXdamage - libXext -# directfb -# cunit - alsaLib - ffmpeg - libxkbfile -# xmlto docbook_xml_dtd_412 docbook_xml_xslt - libXinerama - libXv - ] ++ stdenv.lib.optional printerSupport cups; + cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib + alsaLib ffmpeg libxkbfile libXinerama libXv cups pulseaudio pcsclite + ]; doCheck = false; - checkPhase = ''LD_LIBRARY_PATH="libfreerdp-cache:libfreerdp-chanman:libfreerdp-common:libfreerdp-core:libfreerdp-gdi:libfreerdp-kbd:libfreerdp-rail:libfreerdp-rfx:libfreerdp-utils" cunit/test_freerdp''; + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DWITH_CUNIT=OFF" + ] ++ stdenv.lib.optional (pulseaudio != null) "-DWITH_PULSE=ON" + ++ stdenv.lib.optional (cups != null) "-DWITH_CUPS=ON" + ++ stdenv.lib.optional (pcsclite != null) "-DWITH_PCSC=ON"; - cmakeFlags = [ "-DWITH_DIRECTFB=OFF" "-DWITH_CUNIT=OFF" "-DWITH_MANPAGES=OFF" - ] ++ stdenv.lib.optional pulseaudioSupport "-DWITH_PULSEAUDIO=ON"; - - meta = { + meta = with stdenv.lib; { description = "A Remote Desktop Protocol Client"; - longDescription = '' FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP) following the Microsoft Open Specifications. ''; - homepage = http://www.freerdp.com/; - - license = "free-non-copyleft"; - - broken = true; # fails to build + license = licenses.asl20; + maintainers = with maintainers; [ wkennington ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index 7d2b7990d3f9..fbbc85108a15 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation (rec { sha256 = "0y0s0qjfsflp4drcn75ykx6as7mn13092bcvlp2ibhilkpa27gzv"; }; + patches = [ ./enable_windows_key.patch ]; + buildInputs = [openssl libX11]; configureFlags = [ diff --git a/pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch b/pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch new file mode 100644 index 000000000000..fff84c599636 --- /dev/null +++ b/pkgs/applications/networking/remote/rdesktop/enable_windows_key.patch @@ -0,0 +1,29 @@ +http://sourceforge.net/p/rdesktop/code/1816/ +Fix constant naming and enabled windowskey by default. + +Index: trunk/rdesktop.c +=================================================================== +--- trunk/rdesktop.c (revision 1815) ++++ trunk/rdesktop.c (revision 1816) +@@ -554,7 +554,7 @@ + act.sa_flags = 0; + sigaction(SIGPIPE, &act, NULL); + +- flags = RDP_LOGON_NORMAL; ++ flags = RDP_LOGON_NORMAL | RDP_LOGON_ENABLEWINDOWSKEY; + prompt_password = False; + g_seamless_spawn_cmd[0] = domain[0] = g_password[0] = shell[0] = directory[0] = 0; + g_embed_wnd = 0; +Index: trunk/constants.h +=================================================================== +--- trunk/constants.h (revision 1815) ++++ trunk/constants.h (revision 1816) +@@ -321,7 +321,7 @@ + #define RDP_LOGON_AUTO 0x0008 + #define RDP_LOGON_NORMAL 0x0033 + #define RDP_LOGON_COMPRESSION 0x0080 /* mppc compression with 8kB histroy buffer */ +-#define RDP_LOGON_BLOB 0x0100 ++#define RDP_LOGON_ENABLEWINDOWSKEY 0x0100 + #define RDP_LOGON_COMPRESSION2 0x0200 /* rdp5 mppc compression with 64kB history buffer */ + #define RDP_LOGON_LEAVE_AUDIO 0x2000 + #define RDP_LOGON_PASSWORD_IS_SC_PIN 0x40000 diff --git a/pkgs/applications/networking/remote/teamviewer/9.nix b/pkgs/applications/networking/remote/teamviewer/9.nix new file mode 100644 index 000000000000..76fb1f68fc76 --- /dev/null +++ b/pkgs/applications/networking/remote/teamviewer/9.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau +, bash, patchelf }: + +let + topath = "${wineUnstable}/bin"; + + toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") + [ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); +in +stdenv.mkDerivation { + name = "teamviewer-9.0.32150"; + src = fetchurl { + url = "http://download.teamviewer.com/download/version_9x/teamviewer_linux_x64.deb"; + sha256 = "0wpwbx0xzn3vlzavszxhfvfcaj3pijlpwvlz5m7w19mb6cky3q13"; + }; + + buildInputs = [ makeWrapper patchelf ]; + + unpackPhase = '' + ar x $src + tar xf data.tar.gz + ''; + + installPhase = '' + mkdir -p $out/share/teamviewer9 $out/bin + cp -a opt/teamviewer9/* $out/share/teamviewer9 + rm -R $out/share/teamviewer9/tv_bin/wine/{bin,lib,share} + + cat > $out/bin/teamviewer << EOF + #!${bash}/bin/sh + export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH} + export PATH=${topath}\''${PATH:+:\$PATH} + $out/share/teamviewer9/tv_bin/script/teamviewer "\$@" + EOF + chmod +x $out/bin/teamviewer + + patchelf --set-rpath "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer9/tv_bin/teamviewerd + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/share/teamviewer9/tv_bin/teamviewerd + ln -s $out/share/teamviewer9/tv_bin/teamviewerd $out/bin/ + ''; + + meta = { + homepage = "http://www.teamviewer.com"; + license = stdenv.lib.licenses.unfree; + description = "Desktop sharing application, providing remote support and online meetings"; + }; +} diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 00fda8bf1c45..1b4bec3c24b8 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -3,7 +3,7 @@ assert (stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"); let - version = "4.0.22"; + version = "4.0.23"; arch = if stdenv.system == "x86_64-linux" then "linux-x86_64" else "linux-i686"; @@ -14,8 +14,8 @@ stdenv.mkDerivation { src = fetchurl { url = "https://download.zotero.org/standalone/${version}/Zotero-${version}_${arch}.tar.bz2"; sha256 = if stdenv.system == "x86_64-linux" - then "0dq4x1cc0lnhs7g6w85qjdlb7sajr13mr2zcf4yvrciwhwy3r1i1" - else "0s4j2karaq85fwnd1niz8hzx5k71cqs493g38pg337i3iwxad9hg"; + then "1fz5xn69vapfw8d20207zr9p5r1h9x5kahh334pl2dn1h8il0sm8" + else "1kmsvvg2lh881rzy3rxbigzivixjamyrwf5x7vmn1kzhvsvifrng"; }; # Strip the bundled xulrunner diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 434e8063ad97..93a444407354 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -17,8 +17,8 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20140927"; - sha256 = "02zmg8pcrdavfna2xy51n6chn6i5g0b8p20rba1vj29rlfj3cask"; + version = "5.20141013"; + sha256 = "1p2hvw2x0rm9nhk176mzwisl75xphqxv7mhd43mvwlb3q9f57lnc"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -48,6 +48,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ simons ]; - broken = true; }; }) diff --git a/pkgs/applications/video/byzanz/add-amflags.patch b/pkgs/applications/video/byzanz/add-amflags.patch new file mode 100644 index 000000000000..aeaa195798a4 --- /dev/null +++ b/pkgs/applications/video/byzanz/add-amflags.patch @@ -0,0 +1,12 @@ +diff --git a/Makefile.am b/Makefile.am +index 6eedb51..7b54313 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,7 @@ + SUBDIRS = macros data gifenc src po + ++ACLOCAL_AMFLAGS = -I macros ++ + EXTRA_DIST = \ + MAINTAINERS \ + depcomp \ diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix new file mode 100644 index 000000000000..69b0ffbe1314 --- /dev/null +++ b/pkgs/applications/video/byzanz/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, which, gnome3_12, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1 }: + +stdenv.mkDerivation rec { + version = "0.2.3.alpha"; + name = "byzanz-${version}"; + + src = fetchgit { + url = git://github.com/GNOME/byzanz; + rev = "1875a7f6a3903b83f6b1d666965800f47db9286a"; + sha256 = "1b7hyilwj9wf2ri5zq63889bvskagdnqjc91hvyjmx1aj7vdkzd4"; + }; + + patches = [ ./add-amflags.patch ]; + + preBuild = '' + ./autogen.sh --prefix=$out + ''; + + buildInputs = [ which gnome3_12.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; + + meta = with stdenv.lib; { + description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser"; + homepage = https://github.com/GNOME/byzanz; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.DamienCassou ]; + }; +} diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index c58ac268b670..46595c5609fa 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -58,11 +58,11 @@ in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.5.4"; + version = "0.6.1"; src = fetchurl { url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"; - sha256 = "1n992nvylnh27jc6425daasq0nsxjfc1mxhhlhvlwzxm724x94xp"; + sha256 = "03vzsvvb1dvm4rn70m97fdbzhlqj9crk7zpvcp00bcl956xjfc9s"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/applications/video/xbmc/plugins.nix b/pkgs/applications/video/xbmc/plugins.nix index fe1be7a1e24c..16484e018335 100644 --- a/pkgs/applications/video/xbmc/plugins.nix +++ b/pkgs/applications/video/xbmc/plugins.nix @@ -81,13 +81,13 @@ in plugin = "svtplay"; namespace = "plugin.video.svtplay"; - version = "4.0.6"; + version = "4.0.8"; src = fetchFromGitHub { owner = "nilzen"; repo = "xbmc-" + plugin; - rev = "4f27254edbd6dc48350152832833c5b164ca58de"; - sha256 = "11r8vljpx9fxwdx20cvkb5szlaypfrn6c235jwcg61s4hmjy4kl8"; + rev = "967dc429201200200dba0e755ede3a0e9cb1b137"; + sha256 = "0kaxcci9zbblpkn1mrmdl49844r90agww41frz9vw6q2ajq1z16k"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/zdfmediathk/default.nix b/pkgs/applications/video/zdfmediathk/default.nix new file mode 100644 index 000000000000..105bbbfbacd5 --- /dev/null +++ b/pkgs/applications/video/zdfmediathk/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, unzip, jre }: + +with stdenv; + +mkDerivation rec { + + version = "8"; + name = "zdfmediathk"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/zdfmediathk/Mediathek/Mediathek%208/MediathekView_${version}.zip"; + sha256 = "1sglzk8zh6cyijyw82k49yqzjv0ywglp03w09s7wr4mzk48mfjj9"; + }; + + buildInputs = [ unzip ]; + + unpackPhase = "unzip $src"; + + installPhase = '' + mkdir -p $out/{lib,bin,share/{doc,licenses}} + install -m644 MediathekView.jar $out/ + install -m644 -t $out/lib lib/* + install -m755 bin/flv.sh $out/bin/ + install -m644 -t $out/share/doc Anleitung/*.pdf + install -m644 -t $out/share/licenses Copyright/{*.*,_copyright} + bin="$out/bin/mediathek" + cat >> "$bin" << EOF + #!/bin/sh + exec ${jre}/bin/java -cp "$out/lib/*" -Xms128M -Xmx1G -jar "$out/MediathekView.jar" "\$@" + EOF + chmod +x "$bin" + ''; + + meta = with stdenv.lib; { + description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)"; + homepage = "http://zdfmediathk.sourceforge.net/"; + license = licenses.gpl3; + maintainers = [ maintainers.flosse ]; + platforms = platforms.all; + }; + +} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index dafc093bf05a..b5292b908f7b 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -3,11 +3,11 @@ btrfsProgs, iptables, bash, e2fsprogs, xz}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; - sha256 = "1nk74p9k17bllgw4992ixx7z3w87icp2wabbpbgfyi20k2q9mayp"; + sha256 = "09bn88i8acv7kw39js1p7mgf3sglq7d782xnafkp0i97svf0x4y9"; }; buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables e2fsprogs]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildPhase = '' patchShebangs ./hack export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="fa7b24f" + export DOCKER_GITCOMMIT="c78088f" ./hack/make.sh dynbinary ''; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 309cfe1f35a1..3fa97e78835e 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -5,6 +5,7 @@ , javaBindings ? false, jdk ? null , pythonBindings ? false, python ? null , enableExtensionPack ? false, requireFile ? null, patchelf ? null +, pulseSupport ? false, pulseaudio ? null }: with stdenv.lib; @@ -64,7 +65,8 @@ in stdenv.mkDerivation { libcap glib lvm2 python alsaLib curl libvpx pam xorriso makeself perl pkgconfig which libXmu ] ++ optional javaBindings jdk - ++ optional pythonBindings python; + ++ optional pythonBindings python + ++ optional pulseSupport pulseaudio; prePatch = '' set -x @@ -86,7 +88,8 @@ in stdenv.mkDerivation { ./configure --with-qt4-dir=${qt4} \ ${optionalString (!javaBindings) "--disable-java"} \ ${optionalString (!pythonBindings) "--disable-python"} \ - --disable-pulse --disable-hardening --disable-kmods \ + ${optionalString (!pulseSupport) "--disable-pulse"} \ + --disable-hardening --disable-kmods \ --with-mkisofs=${xorriso}/bin/xorrisofs sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \ -i AutoConfig.kmk diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 73a6412afabc..9a6708f1b140 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,33 +1,44 @@ -{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon -, cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev -, libjpeg, pam, autoconf, automake, libtool, dbus }: +{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb +, libXcursor, x11, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput +, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null +, libwebp ? null +}: -let version = "1.5.0"; in +let version = "1.6.0"; in stdenv.mkDerivation rec { name = "weston-${version}"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "113nig2dmbgrjhi79k0zw77vicnx8vkaihawd0nsg6n79ah8nf06"; + sha256 = "0kb1mb54l7adihmr2y77xgsdb00dvifnq886q2mmy0mz7g8sagnw"; }; - #ToDo: libinput can be split away buildInputs = [ - pkgconfig wayland mesa libxkbcommon - cairo libxcb libXcursor x11 udev libdrm mtdev libjpeg pam dbus.libs + pkgconfig wayland mesa libxkbcommon cairo libxcb libXcursor x11 udev libdrm + mtdev libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva + libwebp ]; - NIX_CFLAGS_COMPILE = "-I${libdrm}/include/libdrm"; - configureFlags = [ + "--enable-xwayland" + "--enable-x11-compositor" + "--enable-drm-compositor" + "--enable-wayland-compositor" + "--enable-headless-compositor" + "--enable-fbdev-compositor" + "--enable-screen-sharing" + "--enable-clients" + "--enable-weston-launch" "--disable-setuid-install" # prevent install target to chown root weston-launch, which fails - ]; + ] ++ stdenv.lib.optional (freerdp != null) "--enable-rdp-compositor" + ++ stdenv.lib.optional (vaapi != null) "--enabe-vaapi-recorder"; - meta = { + meta = with stdenv.lib; { description = "Reference implementation of a Wayland compositor"; homepage = http://wayland.freedesktop.org/; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/build-support/build-fhs-chrootenv/mount.sh.in b/pkgs/build-support/build-fhs-chrootenv/mount.sh.in index c64f9356283b..ef2cac21c21a 100644 --- a/pkgs/build-support/build-fhs-chrootenv/mount.sh.in +++ b/pkgs/build-support/build-fhs-chrootenv/mount.sh.in @@ -23,4 +23,4 @@ mount --rbind /run $chrootenvDest/run mount --bind /etc $chrootenvDest/host-etc # Bind mount /tmp -mount --bind /tmp/chrootenv-@name@ /run/chrootenv/steam/tmp +mount --bind /tmp/chrootenv-@name@ $chrootenvDest/tmp diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index d73b4a1f364c..3fa833876921 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -57,6 +57,13 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs; doCheck = enableCheckPhase && x.doCheck; hyperlinkSource = enableHyperlinkSource && x.hyperlinkSource; + # Disable Darwin builds: . + meta = let meta = x.meta or {}; + hydraPlatforms = meta.hydraPlatforms or meta.platforms or []; + noElem = p: ps: !stdenv.lib.elem p ps; + noDarwin = p: noElem p stdenv.lib.platforms.darwin; + in + meta // { hydraPlatforms = filter noDarwin hydraPlatforms; }; }; defaults = @@ -210,9 +217,6 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; ${optionalString (self.enableSharedExecutables && self.stdenv.isDarwin) '' configureFlags+=" --ghc-option=-optl=-Wl,-headerpad_max_install_names" ''} - ${optionalString (versionOlder "7.8" ghc.version) '' - configureFlags+=" --ghc-option=-j$NIX_BUILD_CORES" - ''} echo "configure flags: $extraConfigureFlags $configureFlags" ./Setup configure --verbose --prefix="$out" --libdir='$prefix/lib/$compiler' \ diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 080dfea2505f..741c8c0d5460 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -385,4 +385,11 @@ rec { http://hdiff.luite.com/packages/archive/package/ ]; + # Roy marples mirrors + roy = [ + http://roy.marples.name/downloads/ + http://roy.aydogan.net/ + http://cflags.cc/roy/ + ]; + } diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index bd6ac84a0f8d..e268c046ac63 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -32,7 +32,7 @@ let grKernel = if cfg.stable then mkKernel pkgs.linux_3_14 stable-patch - else mkKernel pkgs.linux_3_16 test-patch; + else mkKernel pkgs.linux_3_17 test-patch; ## -- grsecurity configuration --------------------------------------------- diff --git a/pkgs/build-support/substitute-files/substitute-all-files.nix b/pkgs/build-support/substitute-files/substitute-all-files.nix new file mode 100644 index 000000000000..642919016037 --- /dev/null +++ b/pkgs/build-support/substitute-files/substitute-all-files.nix @@ -0,0 +1,22 @@ +{ stdenv }: + +args: + +stdenv.mkDerivation ({ + name = if args ? name then args.name else baseNameOf (toString args.src); + builder = with stdenv.lib; builtins.toFile "builder.sh" '' + source $stdenv/setup + set -o pipefail + + eval "$preInstall" + + args= + + cd "$src" + echo -ne "${concatStringsSep "\\0" args.files}" | xargs -0 -n1 -I {} -- find {} -type f -print0 | while read -d "" line; do + mkdir -p "$out/$(dirname "$line")" + substituteAll "$line" "$out/$line" + done + ''; + preferLocalBuild = true; +} // args) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 72cc7f68b090..18b5b3063f0a 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1586,7 +1586,7 @@ rec { fullName = "Debian 7.6 Wheezy (i386)"; packagesList = fetchurl { url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2; - sha256 = "773ba601513cd7ef1d5192ad8baa795fa050573d82568c577cdf79adade698a3"; + sha256 = "1j093d6dwixyrk87sdvaayh3ffcn5aqwik36blndiw5njw2qkzgj"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; @@ -1597,7 +1597,7 @@ rec { fullName = "Debian 7.6 Wheezy (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2; - sha256 = "11a8bd3648d51f51e56c9f5382168cc47267d67ef6a050826e1cd358ed46cc17"; + sha256 = "1n46fxq8a2dm1i7ysc80s5lg10z5dh0hyd8k3h532n5wzs44xqcc"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 6a4427bea404..23a04a78a45a 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl }: -let version = "2014g"; in +let version = "2014i"; in stdenv.mkDerivation rec { name = "tzdata-${version}"; @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { srcs = [ (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"; - sha256 = "0w52hafnf82vy678rm8p39ckymcj6shv5376zwzzbxw2m6vxaism"; + sha256 = "0lv1i3ikibf9yn1l3hcy00x5ghwxn87k1myyp1cyr55psayk3wra"; }) (fetchurl { url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz"; - sha256 = "0ymg0cscpbfj9jpnx4g9apmfrixq6z8dch99h6a77k2pmnj5ymfz"; + sha256 = "10s7x24lh2vm3magl7dq2xs9pw47hhyaq6xpi6c4aiqdzdsi0nb2"; }) ]; diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/e19/econnman.nix index 1e42895b4e22..0c09317d24f7 100644 --- a/pkgs/desktops/e19/econnman.nix +++ b/pkgs/desktops/e19/econnman.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Econnman is a user interface for the connman network connection manager"; homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl3; }; diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix index 2252bc919919..2367f47bac4d 100644 --- a/pkgs/desktops/e19/efl.nix +++ b/pkgs/desktops/e19/efl.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.11.2"; + version = "1.11.3"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; - sha256 = "123jrcifd7i0r9zh8qllqiz3d378fyy7fzkanyki9wbxlz91rk7k"; + sha256 = "0s9pm3lfp7f2yf877xywjw8ihgr2yrns3gibak0gcwx7d8bfljfr"; }; buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto xlibs.libX11 libdrm udev utillinuxCurses luajit ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Enlightenment Core libraries"; homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl3; }; diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/e19/elementary.nix index db335a156202..4ee8c0b1a951 100644 --- a/pkgs/desktops/e19/elementary.nix +++ b/pkgs/desktops/e19/elementary.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, libcap, gdbm }: stdenv.mkDerivation rec { name = "elementary-${version}"; - version = "1.11.2"; + version = "1.11.3"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz"; - sha256 = "041hwp81qyq4wsw483g2jh52gcanqg046f91pmd0vzgwcgxyixqq"; + sha256 = "1yr96imam9sckgagnp7wdvwmvr1xwakw29dih3gxp7nz7xsa0j8k"; }; buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; preConfigure = '' @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Widget set/toolkit"; homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl2; }; diff --git a/pkgs/desktops/e19/emotion.nix b/pkgs/desktops/e19/emotion.nix index 781d884fe3bd..269bfe32dbcb 100644 --- a/pkgs/desktops/e19/emotion.nix +++ b/pkgs/desktops/e19/emotion.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Extra video decoders"; homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; }; diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix index 95c5abdfa58c..9faa03a63380 100644 --- a/pkgs/desktops/e19/enlightenment.nix +++ b/pkgs/desktops/e19/enlightenment.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "0d9s8gwma32hj8h000k1bzibr3zj8qajcf14va3w81k87gkilxfp"; + sha256 = "016z1vilhjarpxzn5bwcw696d8b66rklnhkrwzfa5mcxn8gpmvap"; }; buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; preConfigure = '' @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "The Compositing Window Manager and Desktop Shell"; homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; }; diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/e19/evas.nix index 98b035f94e40..756c7badb072 100644 --- a/pkgs/desktops/e19/evas.nix +++ b/pkgs/desktops/e19/evas.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "Extra image decoders"; homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/desktops/e19/terminology.nix b/pkgs/desktops/e19/terminology.nix index 97bf07b298d5..7b3bcbc5e401 100644 --- a/pkgs/desktops/e19/terminology.nix +++ b/pkgs/desktops/e19/terminology.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19 }: stdenv.mkDerivation rec { name = "terminology-${version}"; - version = "0.6.1"; + version = "0.7.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz"; - sha256 = "1wi9njyfs95y4nb9jd30032qqka5cg7k0wacck8s1yqxwg5ng38x"; + sha256 = "1x248dh9r292r8ycvf43vrfk4l8wpli50sgywp0zy3q93f8ljgs5"; }; buildInputs = [ pkgconfig e19.efl e19.elementary ]; preConfigure = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "The best terminal emulator written with the EFL"; homepage = http://enlightenment.org/; - maintainers = [ stdenv.lib.maintainers.matejc ]; + maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; }; diff --git a/pkgs/desktops/gnome-3/3.10/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.10/core/libgnome-keyring/default.nix index 28c7b80c0d4f..ed37f013e16d 100644 --- a/pkgs/desktops/gnome-3/3.10/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/libgnome-keyring/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Framework for managing passwords and other secrets"; homepage = http://live.gnome.org/GnomeKeyring; - # TODO license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; + license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; inherit (glib.meta) platforms maintainers; longDescription = '' diff --git a/pkgs/desktops/gnome-3/3.10/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.10/core/yelp-xsl/default.nix index c5060bdba75c..708a8ff32d6c 100644 --- a/pkgs/desktops/gnome-3/3.10/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/yelp-xsl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Apps/Yelp; description = "Yelp's universal stylesheets for Mallard and DocBook"; maintainers = with maintainers; [ lethalman ]; - # TODO license = [licenses.gpl2 licenses.lgpl2]; + license = [licenses.gpl2 licenses.lgpl2]; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/3.10/default.nix b/pkgs/desktops/gnome-3/3.10/default.nix index e1783be3b7fb..ceece3957332 100644 --- a/pkgs/desktops/gnome-3/3.10/default.nix +++ b/pkgs/desktops/gnome-3/3.10/default.nix @@ -102,7 +102,7 @@ rec { gucharmap = callPackage ./core/gucharmap { }; - gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; lightWeight = false; }; + gvfs = pkgs.gvfs.override { gnome = pkgs.gnome3; gnomeSupport = true; }; eog = callPackage ./core/eog { }; @@ -183,7 +183,9 @@ rec { gitg = callPackage ./misc/gitg { }; - libgit2-glib = callPackage ./misc/libgit2-glib { }; + libgit2-glib = callPackage ./misc/libgit2-glib { + libgit2 = pkgs.libgit2.override { libssh2 = null; }; + }; libmediaart = callPackage ./misc/libmediaart { }; diff --git a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix index 65d1c9d14939..c6c9323c010a 100644 --- a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Framework for managing passwords and other secrets"; homepage = http://live.gnome.org/GnomeKeyring; - # TODO license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; + license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; inherit (glib.meta) platforms maintainers; longDescription = '' diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix index f63ae98c4866..51051918f105 100644 --- a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix @@ -2,25 +2,27 @@ , selectTextPatch ? false }: stdenv.mkDerivation rec { - versionMajor = "0.36"; - versionMinor = "3"; + versionMajor = "0.38"; + versionMinor = "0"; moduleName = "vte"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c"; + sha256 = "1llg2xnjpn630vd86ci8csbjjacj3ia6syck2bsq4kinr66z5zsw"; }; patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.patch; - buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ]; + buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses vala libxml2 ]; configureFlags = [ "--enable-introspection" ]; enableParallelBuilding = true; + preBuild = "patchShebangs ./src"; + postInstall = '' substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses" ''; diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch b/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch index 80a2a445ec03..7f72b17c3378 100644 --- a/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch +++ b/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch @@ -1,7 +1,20 @@ -diff -aur vte-0.32.2-old/src/vte.c vte-0.32.2/src/vte.c ---- vte-0.32.2-old/src/vte.c 2012-07-13 21:09:04.003969877 -0400 -+++ vte-0.32.2/src/vte.c 2012-08-30 04:30:04.285924831 -0400 -@@ -129,7 +129,6 @@ +Only in vte-0.38.0.new: expose_select_text.patch +diff -aur vte-0.38.0/src/vteaccess.c vte-0.38.0.new/src/vteaccess.c +--- vte-0.38.0/src/vteaccess.c 2014-08-13 08:00:38.000000000 -0400 ++++ vte-0.38.0.new/src/vteaccess.c 2014-09-21 17:05:23.934641193 -0400 +@@ -1427,7 +1427,7 @@ + *start_offset = offset_from_xy (priv, start_x, start_y); + _vte_terminal_get_end_selection (terminal, &end_x, &end_y); + *end_offset = offset_from_xy (priv, end_x, end_y); +- return _vte_terminal_get_selection (terminal); ++ return vte_terminal_get_selection (terminal); + } + + static gboolean +diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c +--- vte-0.38.0/src/vte.c 2014-09-13 03:23:47.000000000 -0400 ++++ vte-0.38.0.new/src/vte.c 2014-09-21 17:03:04.671656749 -0400 +@@ -122,7 +122,6 @@ gpointer data, GArray *attributes, gboolean include_trailing_spaces); @@ -9,7 +22,7 @@ diff -aur vte-0.32.2-old/src/vte.c vte-0.32.2/src/vte.c static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal); static void vte_terminal_stop_processing (VteTerminal *terminal); -@@ -3508,8 +3507,8 @@ +@@ -3267,9 +3266,10 @@ _vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n"); terminal->pvt->pty_input_source = 0; } @@ -18,9 +31,11 @@ diff -aur vte-0.32.2-old/src/vte.c vte-0.32.2/src/vte.c +void +vte_terminal_connect_pty_read(VteTerminal *terminal) { ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); if (terminal->pvt->pty_channel == NULL) { return; -@@ -3560,8 +3559,8 @@ + } +@@ -3321,9 +3321,10 @@ } } @@ -29,29 +44,11 @@ diff -aur vte-0.32.2-old/src/vte.c vte-0.32.2/src/vte.c +void +vte_terminal_disconnect_pty_read(VteTerminal *terminal) { ++ g_return_if_fail(VTE_IS_TERMINAL(terminal)); if (terminal->pvt->pty_input_source != 0) { _vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n"); -@@ -3708,8 +3707,8 @@ - return NULL; - } - --static char * --_vte_terminal_get_user_shell_with_fallback (void) -+char * -+vte_terminal_get_user_shell_with_fallback (void) - { - char *command; - const gchar *env; -@@ -3744,7 +3743,7 @@ - char **argv2; - char *shell = NULL; - -- argv2 = __vte_pty_get_argv(command ? command : (shell = _vte_terminal_get_user_shell_with_fallback ()), -+ argv2 = __vte_pty_get_argv(command ? command : (shell = vte_terminal_get_user_shell_with_fallback ()), - argv, - flags); - g_free(shell); -@@ -6545,6 +6544,28 @@ + g_source_remove(terminal->pvt->pty_input_source); +@@ -6154,6 +6155,28 @@ } } @@ -80,8 +77,8 @@ diff -aur vte-0.32.2-old/src/vte.c vte-0.32.2/src/vte.c static GtkClipboard * vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board) { -@@ -6676,7 +6697,7 @@ - terminal->pvt->selection_start.row); +@@ -6319,7 +6342,7 @@ + vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE); /* Temporarily stop caring about input from the child. */ - _vte_terminal_disconnect_pty_read(terminal); @@ -89,7 +86,7 @@ diff -aur vte-0.32.2-old/src/vte.c vte-0.32.2/src/vte.c } static gboolean -@@ -6693,7 +6714,7 @@ +@@ -6336,7 +6359,7 @@ terminal->pvt->selecting = FALSE; /* Reconnect to input from the child if we paused it. */ @@ -98,35 +95,8 @@ diff -aur vte-0.32.2-old/src/vte.c vte-0.32.2/src/vte.c return TRUE; } -@@ -8994,7 +9015,7 @@ - #endif - kill(terminal->pvt->pty_pid, SIGHUP); - } -- _vte_terminal_disconnect_pty_read(terminal); -+ vte_terminal_disconnect_pty_read(terminal); - _vte_terminal_disconnect_pty_write(terminal); - if (terminal->pvt->pty_channel != NULL) { - g_io_channel_unref (terminal->pvt->pty_channel); -@@ -14384,7 +14405,7 @@ - g_object_freeze_notify(object); - - if (pvt->pty != NULL) { -- _vte_terminal_disconnect_pty_read(terminal); -+ vte_terminal_disconnect_pty_read(terminal); - _vte_terminal_disconnect_pty_write(terminal); - - if (terminal->pvt->pty_channel != NULL) { -@@ -14440,7 +14461,7 @@ - _vte_terminal_setup_utf8 (terminal); - - /* Open channels to listen for input on. */ -- _vte_terminal_connect_pty_read (terminal); -+ vte_terminal_connect_pty_read (terminal); - - g_object_notify(object, "pty"); - g_object_notify(object, "pty-object"); -@@ -14567,6 +14588,50 @@ - } +@@ -6834,6 +6857,50 @@ + vte_terminal_deselect_all (terminal); } +/** @@ -173,21 +143,72 @@ diff -aur vte-0.32.2-old/src/vte.c vte-0.32.2/src/vte.c + _vte_terminal_select_text(terminal, start_col, start_row, end_col, end_row, 0, 0); +} + - void - _vte_terminal_select_text(VteTerminal *terminal, - long start_col, long start_row, -diff -aur vte-0.32.2-old/src/vte.h vte-0.32.2/src/vte.h ---- vte-0.32.2-old/src/vte.h 2012-07-13 21:09:04.003969877 -0400 -+++ vte-0.32.2/src/vte.h 2012-08-30 04:30:09.695999432 -0400 -@@ -296,6 +296,15 @@ - /* simple manipulation of selection */ - void vte_terminal_select_all(VteTerminal *terminal); - void vte_terminal_select_none(VteTerminal *terminal); -+gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal); -+void vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode); + /* Autoscroll a bit. */ + static gboolean + vte_terminal_autoscroll(VteTerminal *terminal) +@@ -8476,7 +8543,7 @@ + #endif + kill(terminal->pvt->pty_pid, SIGHUP); + } +- _vte_terminal_disconnect_pty_read(terminal); ++ vte_terminal_disconnect_pty_read(terminal); + _vte_terminal_disconnect_pty_write(terminal); + if (terminal->pvt->pty_channel != NULL) { + g_io_channel_unref (terminal->pvt->pty_channel); +@@ -12533,7 +12600,7 @@ + g_object_freeze_notify(object); + + if (pvt->pty != NULL) { +- _vte_terminal_disconnect_pty_read(terminal); ++ vte_terminal_disconnect_pty_read(terminal); + _vte_terminal_disconnect_pty_write(terminal); + + if (terminal->pvt->pty_channel != NULL) { +@@ -12588,7 +12655,7 @@ + _vte_terminal_setup_utf8 (terminal); + + /* Open channels to listen for input on. */ +- _vte_terminal_connect_pty_read (terminal); ++ vte_terminal_connect_pty_read (terminal); + + g_object_notify(object, "pty"); + +@@ -12623,7 +12690,7 @@ + } + + char * +-_vte_terminal_get_selection(VteTerminal *terminal) ++vte_terminal_get_selection(VteTerminal *terminal) + { + g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL); + +Only in vte-0.38.0.new/src: .vte.c.swp +diff -aur vte-0.38.0/src/vteint.h vte-0.38.0.new/src/vteint.h +--- vte-0.38.0/src/vteint.h 2014-05-16 13:51:26.000000000 -0400 ++++ vte-0.38.0.new/src/vteint.h 2014-09-21 17:05:44.934589281 -0400 +@@ -25,7 +25,6 @@ + G_BEGIN_DECLS + + void _vte_terminal_accessible_ref(VteTerminal *terminal); +-char* _vte_terminal_get_selection(VteTerminal *terminal); + void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y); + void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y); + void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset); +diff -aur vte-0.38.0/src/vteterminal.h vte-0.38.0.new/src/vteterminal.h +--- vte-0.38.0/src/vteterminal.h 2014-09-13 03:23:47.000000000 -0400 ++++ vte-0.38.0.new/src/vteterminal.h 2014-09-21 17:03:39.094903032 -0400 +@@ -170,6 +170,18 @@ + + void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); + void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); ++gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); ++void vte_terminal_set_selection_block_mode(VteTerminal *terminal, ++ gboolean block_mode) _VTE_GNUC_NONNULL(1); +void vte_terminal_select_text(VteTerminal *terminal, + long start_col, long start_row, -+ long end_col, long end_row); ++ long end_col, long end_row) _VTE_GNUC_NONNULL(1); ++char * ++vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1); + +/* pause and unpause output */ +void vte_terminal_disconnect_pty_read(VteTerminal *vte); @@ -195,20 +216,13 @@ diff -aur vte-0.32.2-old/src/vte.h vte-0.32.2/src/vte.h /* Set the terminal's size. */ void vte_terminal_set_size(VteTerminal *terminal, -@@ -435,6 +444,8 @@ - GArray *attributes); +@@ -276,6 +288,8 @@ void vte_terminal_get_cursor_position(VteTerminal *terminal, - glong *column, glong *row); + glong *column, + glong *row) _VTE_GNUC_NONNULL(1); +void vte_terminal_set_cursor_position(VteTerminal *terminal, -+ long column, long row); - /* Display string matching: clear all matching expressions. */ - void vte_terminal_match_clear_all(VteTerminal *terminal); ++ long column, long row) _VTE_GNUC_NONNULL(1); -@@ -484,6 +495,7 @@ - VtePty *vte_terminal_get_pty_object(VteTerminal *terminal); - - char *vte_get_user_shell (void); -+char *vte_terminal_get_user_shell_with_fallback(void); - - /* Accessors for bindings. */ - #if !GTK_CHECK_VERSION (2, 91, 2) + /* Add a matching expression, returning the tag the widget assigns to that + * expression. */ +Only in vte-0.38.0.new/src: .vteterminal.h.swp diff --git a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix index 0a5bc78af478..e99118230738 100644 --- a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Apps/Yelp; description = "Yelp's universal stylesheets for Mallard and DocBook"; maintainers = with maintainers; [ lethalman ]; - # TODO license = [licenses.gpl2 licenses.lgpl2]; + license = [licenses.gpl2 licenses.lgpl2]; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index a46f49cbb5a3..cff592cd063e 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -112,7 +112,7 @@ rec { gucharmap = callPackage ./core/gucharmap { }; - gvfs = pkgs.gvfs.override { gnome = gnome3; lightWeight = false; }; + gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; eog = callPackage ./core/eog { }; @@ -233,7 +233,9 @@ rec { libgda = callPackage ./misc/libgda { }; - libgit2-glib = callPackage ./misc/libgit2-glib { }; + libgit2-glib = callPackage ./misc/libgit2-glib { + libgit2 = pkgs.libgit2.override { libssh2 = null; }; + }; libmediaart = callPackage ./misc/libmediaart { }; diff --git a/pkgs/desktops/xfce/applications/xfce4-mixer.nix b/pkgs/desktops/xfce/applications/xfce4-mixer.nix index f486373ee17d..d9be20150b86 100644 --- a/pkgs/desktops/xfce/applications/xfce4-mixer.nix +++ b/pkgs/desktops/xfce/applications/xfce4-mixer.nix @@ -9,6 +9,7 @@ let gst_plugins_minimal = gst_plugins_base.override { minimalDeps = true; }; + gst_plugins = [ gst_plugins_minimal ]; in @@ -34,6 +35,8 @@ stdenv.mkDerivation rec { --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" ''; + passthru = { inherit gst_plugins; }; + meta = { homepage = http://www.xfce.org/projects/xfce4-mixer; # referenced but inactive description = "A volume control application for the Xfce desktop environment"; diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index e654b2f7dfbe..7fa8862ea3be 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui -, libwnck, exo, garcon, xfconf, libstartup_notification }: +, libwnck, exo, garcon, xfconf, libstartup_notification +, makeWrapper, xfce4mixer }: stdenv.mkDerivation rec { p_name = "xfce4-panel"; @@ -17,10 +18,15 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig intltool gtk libxfce4util exo libwnck - garcon xfconf libstartup_notification - ]; + garcon xfconf libstartup_notification makeWrapper + ] ++ xfce4mixer.gst_plugins; propagatedBuildInputs = [ libxfce4ui ]; + postInstall = '' + wrapProgram "$out/bin/xfce4-panel" \ + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" + ''; + preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/agda/default.nix b/pkgs/development/compilers/agda/default.nix index 3a44baa489a7..c930fa1b193a 100644 --- a/pkgs/development/compilers/agda/default.nix +++ b/pkgs/development/compilers/agda/default.nix @@ -30,5 +30,6 @@ cabal.mkDerivation (self: { description = "A dependently typed functional programming language and proof assistant"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; }) diff --git a/pkgs/development/compilers/agda/stdlib.nix b/pkgs/development/compilers/agda/stdlib.nix index 7305fbb5397b..638b45951c89 100644 --- a/pkgs/development/compilers/agda/stdlib.nix +++ b/pkgs/development/compilers/agda/stdlib.nix @@ -21,6 +21,6 @@ agda.mkDerivation (self: rec { description = "A standard library for use with the Agda compiler."; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; - maintainers = with maintainers; [ jwiegley ]; + maintainers = with maintainers; [ jwiegley fuuzetsu ]; }; }) diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index 8564175d363d..3ac5f1696ce8 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -1,14 +1,16 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, gmp }: stdenv.mkDerivation rec { name = "bigloo-${version}"; - version = "3.7a"; + version = "4.1a-2"; src = fetchurl { url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo${version}.tar.gz"; - sha256 = "0y8i87c2bpqzap8rhzgpyfgdzq21py5xq6mgp0w6xv4rjcj9d0v1"; + sha256 = "09yrz8r0jpj7bda39fdxzrrdyhi851nlfajsyf0b6jxanz6ygcjx"; }; + buildInputs = [ gmp ]; + preConfigure = # Help libgc's configure. '' export CXXCPP="g++ -E" @@ -32,6 +34,10 @@ stdenv.mkDerivation rec { meta = { description = "Efficient Scheme compiler"; + homepage = http://www-sop.inria.fr/indes/fp/Bigloo/; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ ludo thoughtpolice ]; longDescription = '' Bigloo is a Scheme implementation devoted to one goal: enabling @@ -44,11 +50,5 @@ stdenv.mkDerivation rec { Scheme and C programs, between Scheme and Java programs, and between Scheme and C# programs. ''; - - homepage = http://www-sop.inria.fr/indes/fp/Bigloo/; - license = stdenv.lib.licenses.gpl2Plus; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 3d9f2596c96c..cc8c80653ba2 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,28 +1,22 @@ -x@{stdenv, fetchurl, builderDefsPackage, ...}: -builderDefsPackage -(a : -let - s = import ./src-for-default.nix; - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ []; - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); -in -rec { - src = a.fetchUrlFromSrcInfo s; +{ stdenv, fetchurl }: - inherit (s) name; - inherit buildInputs; - configureFlags = ["--enable-shared"]; +stdenv.mkDerivation rec { + name = "gambit-${version}"; + version = "4.7.3"; + devver = "4_7_3"; - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - - meta = { - description = "Scheme to C compiler"; - maintainers = [ - a.lib.maintainers.raskin - ]; - platforms = with a.lib.platforms; - linux ++ freebsd; + src = fetchurl { + url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.7/source/gambc-v${devver}-devel.tgz"; + sha256 = "12jbr6bc0zmc7vw07a9pliadbvqgwkpmw6cj8awz73clv1j7pxha"; }; -}) x + + configureFlags = [ "--enable-shared" "--enable-single-host" ]; + + meta = { + description = "Optimizing Scheme to C compiler"; + homepage = "http://gambitscheme.org"; + license = stdenv.lib.licenses.lgpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; + }; +} diff --git a/pkgs/development/compilers/gambit/src-for-default.nix b/pkgs/development/compilers/gambit/src-for-default.nix deleted file mode 100644 index 83d0c764561c..000000000000 --- a/pkgs/development/compilers/gambit/src-for-default.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="v4_6_1"; - name="gambit-v4_6_1"; - hash="0ad6c63dg5ggaamixxinvlf3128mra8xzss5chh66lkii4dc3m7g"; - url="http://www.iro.umontreal.ca/~gambit/download/gambit/v4.6/source/gambc-${version}-devel.tgz"; - advertisedUrl="http://www.iro.umontreal.ca/~gambit/download/gambit/v4.6/source/gambc-v4_6_1-devel.tgz"; - - -} diff --git a/pkgs/development/compilers/gambit/src-info-for-default.nix b/pkgs/development/compilers/gambit/src-info-for-default.nix deleted file mode 100644 index cd32f9d3f821..000000000000 --- a/pkgs/development/compilers/gambit/src-info-for-default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - downloadPage = "http://dynamo.iro.umontreal.ca/~gambit/wiki/index.php/Main_Page"; - baseName = "gambit"; - sourceRegexp = "[.]tgz"; - versionExtractorSedScript = ''s/.*-(v[_0-9]+)-devel[.].*/\1/''; - versionReferenceCreator = ''$(replaceAllVersionOccurences)''; -} diff --git a/pkgs/development/compilers/ghc/7.8.3.nix b/pkgs/development/compilers/ghc/7.8.3.nix index dbcba36fa8ff..0c142883e65a 100644 --- a/pkgs/development/compilers/ghc/7.8.3.nix +++ b/pkgs/development/compilers/ghc/7.8.3.nix @@ -32,15 +32,15 @@ stdenv.mkDerivation rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" "--keep-file-symbols" ]; - meta = { + meta = with stdenv.lib; { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = [ - stdenv.lib.maintainers.marcweber - stdenv.lib.maintainers.andres - stdenv.lib.maintainers.simons - ]; - inherit (ghc.meta) license platforms; + maintainers = [ maintainers.marcweber maintainers.andres maintainers.simons ]; + inherit (ghc.meta) license; + # Filter old "i686-darwin" platform which is unsupported these days. + platforms = filter (x: elem x platforms.all) ghc.meta.platforms; + # Disable Darwin builds: . + hydraPlatforms = filter (x: !elem x platforms.darwin) meta.platforms; }; } diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index 2af8ec1b022a..c6e3c4caa609 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -31,5 +31,6 @@ cabal.mkDerivation (self: { description = "Functional Programming Language with Dependent Types"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ aycanirican ]; }; }) diff --git a/pkgs/development/compilers/julia/0.3.1.nix b/pkgs/development/compilers/julia/0.3.1.nix new file mode 100644 index 000000000000..0818c64a7e2a --- /dev/null +++ b/pkgs/development/compilers/julia/0.3.1.nix @@ -0,0 +1,157 @@ +{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib + , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl + , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack + , tcl, tk, xproto, libX11, git, mpfr, which + } : + +assert stdenv.isLinux; + +let + realGcc = stdenv.gcc.gcc; +in +stdenv.mkDerivation rec { + pname = "julia"; + version = "0.3.1"; + name = "${pname}-${version}"; + + dsfmt_ver = "2.2"; + grisu_ver = "1.1.1"; + openblas_ver = "v0.2.10"; + lapack_ver = "3.5.0"; + arpack_ver = "3.1.5"; + lighttpd_ver = "1.4.29"; + patchelf_ver = "0.6"; + pcre_ver = "8.31"; + utf8proc_ver = "1.1.6"; + + dsfmt_src = fetchurl { + url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz"; + name = "dsfmt-${dsfmt_ver}.tar.gz"; + sha256 = "bc3947a9b2253a869fcbab8ff395416cb12958be9dba10793db2cd7e37b26899"; + }; + grisu_src = fetchurl { + url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz"; + sha256 = "e1cabb73fd69e74f145aea91100cde483aef8b79dc730fcda0a34466730d4d1d"; + }; + openblas_src = fetchurl { + url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}"; + name = "openblas-${openblas_ver}.tar.gz"; + sha256 = "06i0q4qnd5q5xljzrgvda0gjsczc6l2pl9hw6dn2qjpw38al73za"; + }; + arpack_src = fetchurl rec { + url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/arpack-ng_${arpack_ver}.tar.gz"; + sha256 = "05fmg4m0yri47rzgsl2mnr1qbzrs7qyd557p3v9wwxxw0rwcwsd2"; + }; + lapack_src = fetchurl { + url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz"; + name = "lapack-${lapack_ver}.tgz"; + sha256 = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s"; + }; + lighttpd_src = fetchurl { + url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${lighttpd_ver}.tar.gz"; + sha256 = "ff9f4de3901d03bb285634c5b149191223d17f1c269a16c863bac44238119c85"; + }; + patchelf_src = fetchurl { + url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2"; + sha256 = "00bw29vdsscsili65wcb5ay0gvg1w0ljd00sb5xc6br8bylpyzpw"; + }; + pcre_src = fetchurl { + url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${pcre_ver}.tar.bz2"; + sha256 = "0g4c0z4h30v8g8qg02zcbv7n67j5kz0ri9cfhgkpwg276ljs0y2p"; + }; + utf8proc_src = fetchurl { + url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz"; + sha256 = "1rwr84pw92ajjlbcxq0da7yxgg3ijngmrj7vhh2qzsr2h2kqzp7y"; + }; + + src = fetchgit { + url = "git://github.com/JuliaLang/julia.git"; + rev = "refs/tags/v0.3.1"; + sha256 = "1m6jyh7dn03q00gpwb64pq6dypglj4yqac7rkw21z2jknb5x33vb"; + }; + + buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib + fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf + openblas liblapack tcl tk xproto libX11 git mpfr which + ]; + + configurePhase = '' + for i in GMP LLVM PCRE READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB MPFR; + do + makeFlags="$makeFlags USE_SYSTEM_$i=1 " + done + + copy_kill_hash(){ + cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')" + } + + for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${patchelf_src}" \ + "${pcre_src}" "${utf8proc_src}" "${lapack_src}" "${openblas_src}"; do + copy_kill_hash "$i" deps + done + + ${if realGcc ==null then "" else + ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr -lblas -lopenblas -L$out/lib"''} + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC " + + export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia" + + export GLPK_PREFIX="${glpk}/include" + + mkdir -p "$out/lib" + sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile + sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile + + export makeFlags="$makeFlags PREFIX=$out SHELL=${stdenv.shell} prefix=$out" + + export dontPatchELF=1 + + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia" + + patchShebangs . contrib + + export PATH="$PATH:${stdenv.gcc.libc}/sbin" + + # ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache + # is probably not what we want anyway on non-NixOS + sed -e "s@/sbin/ldconfig@true@" -i src/ccall.* + + ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so" + ''; + + preBuild = '' + mkdir -p usr/lib + + echo "$out" + mkdir -p "$out/lib" + ( + cd "$(mktemp -d)" + for i in "${suitesparse}"/lib/lib*.a; do + ar -x $i + done + gcc *.o --shared -o "$out/lib/libsuitesparse.so" + ) + cp "$out/lib/libsuitesparse.so" usr/lib + for i in umfpack cholmod amd camd colamd spqr; do + ln -s libsuitesparse.so "$out"/lib/lib$i.so; + ln -s libsuitesparse.so "usr"/lib/lib$i.so; + done + ''; + + dontStrip = true; + + enableParallelBuilding = true; + + postInstall = '' + rm -f "$out"/lib/julia/sys.{so,dylib,dll} + ''; + + meta = { + description = "High-level performance-oriented dynamical language for technical computing"; + homepage = "http://julialang.org/"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = with stdenv.lib.platforms; linux; + broken = false; + }; +} diff --git a/pkgs/development/compilers/lessc/default.nix b/pkgs/development/compilers/lessc/default.nix index 266e9eb5255f..84a3a37de488 100644 --- a/pkgs/development/compilers/lessc/default.nix +++ b/pkgs/development/compilers/lessc/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "lessc-${version}"; - version = "1.4.2"; + version = "1.7.5"; src = fetchgit { url = https://github.com/less/less.js.git; rev = "refs/tags/v${version}"; - sha256 = "1v3b4f1np3mxkj0irh1pk52r26nzpf4k2ax14cbn7mxx16mqjp50"; + sha256 = "0r8bcad247v5fyh543a7dppmfbf49ai4my3vcizk42fsbnjs8q2x"; }; phases = [ "installPhase" ]; diff --git a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix index cf4990c33b5f..0b574670eace 100644 --- a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix @@ -1,9 +1,9 @@ import ./jdk-linux-base.nix { productVersion = "7"; - patchVersion = "67"; + patchVersion = "72"; downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html; - sha256_i686 = "0p58pag1x85r911lxhmr4blk687ivjqigflx175vp7rcmmj108xn"; - sha256_x86_64 = "0db36jg08qy8712qy6lgyifdqlqb468rrnjm3aa6937ixl9ixpal"; + sha256_i686 = "01zl82hnb9pynxw04zaq4745av42cga97cbckcwb8lh752hchxh3"; + sha256_x86_64 = "13nyx8p27crnnybkzdaiv9l1azap7c8g4na6xasrnjvx3f7467fx"; jceName = "UnlimitedJCEPolicyJDK7.zip"; jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html; sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d"; diff --git a/pkgs/development/compilers/rustc/0.11.nix b/pkgs/development/compilers/rustc/0.12.nix similarity index 78% rename from pkgs/development/compilers/rustc/0.11.nix rename to pkgs/development/compilers/rustc/0.12.nix index a7246e44a73d..d26e8ba4ddad 100644 --- a/pkgs/development/compilers/rustc/0.11.nix +++ b/pkgs/development/compilers/rustc/0.12.nix @@ -16,19 +16,19 @@ assert stdenv.gcc.gcc != null; */ -with ((import ./common.nix) {inherit stdenv; version = "0.11.0"; }); +with ((import ./common.nix) {inherit stdenv; version = "0.12.0"; }); let snapshot = if stdenv.system == "i686-linux" - then "84339ea0f796ae468ef86797ef4587274bec19ea" + then "555aca74f9a268f80cab2df1147dc6406403e9e4" else if stdenv.system == "x86_64-linux" - then "bd8a6bc1f28845b7f4b768f6bfa06e7fbdcfcaae" + then "6a43c2f6c8ba2cbbcb9da1f7b58f748aef99f431" else if stdenv.system == "i686-darwin" - then "3f25b2680efbab16ad074477a19d49dcce475977" + then "331bd7ef519cbb424188c546273e8c7d738f0894" else if stdenv.system == "x86_64-darwin" - then "4a8c2e1b7634d73406bac32a1a97893ec3ed818d" + then "2c83a79a9febfe1d326acb17c3af76ba053c6ca9" else abort "no-snapshot for platform ${stdenv.system}"; - snapshotDate = "2014-06-21"; - snapshotRev = "db9af1d"; + snapshotDate = "2014-10-04"; + snapshotRev = "749ff5e"; snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in stdenv.mkDerivation { @@ -37,8 +37,8 @@ in stdenv.mkDerivation { inherit meta; src = fetchurl { - url = http://static.rust-lang.org/dist/rust-0.11.0.tar.gz; - sha256 = "1fhi8iiyyj5j48fpnp93sfv781z1dm0xy94h534vh4mz91jf7cyi"; + url = http://static.rust-lang.org/dist/rust-0.12.0.tar.gz; + sha256 = "1dv9wxh41230zknbwj34zgjnh1kgvvy6k12kbiy9bnch9nr6cgl8"; }; # We need rust to build rust. If we don't provide it, configure will try to download it. @@ -65,7 +65,8 @@ in stdenv.mkDerivation { patches = [ ./hardcode_paths.patch ./local_stage0.patch ]; postPatch = '' substituteInPlace src/librustc/back/link.rs \ - --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" \ + --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" + substituteInPlace src/librustc_back/archive.rs \ --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar" ''; diff --git a/pkgs/development/compilers/rustc/hardcode_paths.patch b/pkgs/development/compilers/rustc/hardcode_paths.patch index 77e4c3f37887..8701cd3c9829 100644 --- a/pkgs/development/compilers/rustc/hardcode_paths.patch +++ b/pkgs/development/compilers/rustc/hardcode_paths.patch @@ -1,8 +1,8 @@ diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs -index 7a3e912..ced75fa 100644 +index 1cc60fc..2e94b99 100644 --- a/src/librustc/back/link.rs +++ b/src/librustc/back/link.rs -@@ -766,24 +766,15 @@ pub fn output_lib_filename(id: &CrateId) -> String { +@@ -383,18 +383,9 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri pub fn get_cc_prog(sess: &Session) -> String { match sess.opts.cg.linker { @@ -15,18 +15,23 @@ index 7a3e912..ced75fa 100644 - // In the future, FreeBSD will use clang as default compiler. - // It would be flexible to use cc (system's default C compiler) - // instead of hard-coded gcc. -- // For win32, there is no cc command, so we add a condition to make it use gcc. +- // For Windows, there is no cc command, so we add a condition to make it use gcc. - match sess.targ_cfg.os { -- abi::OsWin32 => "gcc", +- abi::OsWindows => "gcc", - _ => "cc", - }.to_string() } - pub fn get_ar_prog(sess: &Session) -> String { - match sess.opts.cg.ar { - Some(ref ar) => (*ar).clone(), -- None => "ar".to_string() -+ None => "@arPath@".to_string() - } - } - + pub fn remove(sess: &Session, path: &Path) { +diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs +index 060dda5..fecf76b 100644 +--- a/src/librustc_back/archive.rs ++++ b/src/librustc_back/archive.rs +@@ -53,7 +53,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option, + paths: &[&Path]) -> ProcessOutput { + let ar = match *maybe_ar_prog { + Some(ref ar) => ar.as_slice(), +- None => "ar" ++ None => "@arPath@" + }; + let mut cmd = Command::new(ar); diff --git a/pkgs/development/compilers/rustc/local_stage0.patch b/pkgs/development/compilers/rustc/local_stage0.patch index 1261b2d458da..2f38d7c1757c 100644 --- a/pkgs/development/compilers/rustc/local_stage0.patch +++ b/pkgs/development/compilers/rustc/local_stage0.patch @@ -2,12 +2,15 @@ diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh index e78f231..6b6773b 100755 --- a/src/etc/local_stage0.sh +++ b/src/etc/local_stage0.sh -@@ -53,8 +53,3 @@ if [ -z $TARG_DIR ]; then +@@ -53,11 +53,6 @@ fi - + cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/ -cp ${PREFIX}/${LIB_DIR}/${RUSTLIBDIR}/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/ -cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ -cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ -cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ -cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}syntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/ + + # do not fail if one of the above fails, as all we need is a working rustc! + exit 0 diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index c556870d519f..b1b8cc1fcab8 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "scala-2.11.1"; + name = "scala-2.11.2"; src = fetchurl { url = "http://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "1vjsmqjwpxavyj29wrbvvx7799fsa65d4iha5mj63cgs8qp605gk"; + sha256 = "0mnjhjiixjphr9v101v408815hkl6hlghx9h7lmmylv5z7gk3p8k"; }; buildInputs = [ jre makeWrapper ] ; diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix new file mode 100644 index 000000000000..c26c22b0a6dd --- /dev/null +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -0,0 +1,33 @@ +{stdenv, bash, which, autoconf, automake, fetchurl, coq}: + +stdenv.mkDerivation rec { + + name = "coq-flocq-${coq.coq-version}-${version}"; + version = "2.4.0"; + + src = fetchurl { + url = https://gforge.inria.fr/frs/download.php/file/33979/flocq-2.4.0.tar.gz; + sha256 = "020x4nkkrvndkvp5zwb9vads8a2jh603khcwrm40yhqldgfd8zlv"; + }; + + buildInputs = [ coq.ocaml coq.camlp5 bash which autoconf automake ]; + propagatedBuildInputs = [ coq ]; + + buildPhase = '' + ${bash}/bin/bash autogen.sh + ${bash}/bin/bash configure --libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Flocq + ./remake + ''; + + installPhase = '' + ./remake install + ''; + + meta = with stdenv.lib; { + homepage = http://flocq.gforge.inria.fr/; + description = "Flocq (Floats for Coq) is a floating-point formalization for the Coq system"; + maintainers = with maintainers; [ jwiegley ]; + platforms = coq.meta.platforms; + }; + +} diff --git a/pkgs/development/interpreters/clisp/2.33.2.nix b/pkgs/development/interpreters/clisp/2.33.2.nix new file mode 100644 index 000000000000..18b325684ca5 --- /dev/null +++ b/pkgs/development/interpreters/clisp/2.33.2.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11 +, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto +, libffi, libffcall, coreutils, automake, autoconf, linuxHeaders +, groff +}: + +stdenv.mkDerivation rec { + version = "2.33.2"; + name = "clisp-${version}"; + + src = fetchurl { + url = "mirror://gnu/clisp/release/${version}/${name}.tar.gz"; + sha256 = "0rqyggviixaa68n5ll092ll4a2xy4y7jraq65l0gn0hkjhjnm5zh"; + }; + + buildInputs = + [ libsigsegv gettext ncurses readline libX11 libXau libXt pcre + zlib libXpm xproto libXext xextproto libffi libffcall + automake autoconf groff + ] + ++ (stdenv.lib.optional stdenv.isLinux linuxHeaders) + ; + + # First, replace port 9090 (rather low, can be used) + # with 64237 (much higher, IANA private area, not + # anything rememberable). + # Also remove reference to a type that disappeared from recent glibc + # (seems the correct thing to do, found no reference to any solution) + postPatch = '' + sed -i 's@/bin/pwd@${coreutils}&@' src/clisp-link.in + find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i + + substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" "" + ''; + + configureFlags = + '' + builddir + --with-readline --with-ffcall --with-dynamic-ffi + --with-module=readline --with-module=i18n --with-module=pcre + --with-module=syscalls --with-modules=zlib --with-module=curses + ''; + + preBuild = '' + echo Pre-build starting! + sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d + sed -e '/asm\/page.h/d' -i src/unix.d + cd builddir + ./makemake $configureFlags > Makefile + make config.lisp + cat config.lisp + ''; + + NIX_CFLAGS_COMPILE="-O0 -lreadline -lncursesw"; + + # TODO : make mod-check fails + doCheck = false; + + meta = { + description = "ANSI Common Lisp Implementation"; + homepage = http://clisp.cons.org; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + branch = "2.44"; + }; +} diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 9a5d2417df7b..378edfaf3432 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, erlang, rebar, makeWrapper, coreutils, curl, bash, cacert }: let - version = "1.0.0"; + version = "1.0.2"; in stdenv.mkDerivation { name = "elixir-${version}"; src = fetchurl { url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz"; - sha256 = "1ci8g6nh89xnn0ax9kazcs47w406nqsj1d4rf8sb1b6abfq78xsj"; + sha256 = "6156ee396e85045358d11a6839e157e8fa9573b7414bddbd2c91843ed2b4b962"; }; buildInputs = [ erlang rebar makeWrapper ]; @@ -28,8 +28,9 @@ stdenv.mkDerivation { # Elixir binaries are shell scripts which run erl. Add some stuff # to PATH so the scripts can run without problems. - for f in $out/bin/* - do + for f in $out/bin/*; do + b=$(basename $f) + if [ $b == "mix" ]; then continue; fi wrapProgram $f \ --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \ --set CURL_CA_BUNDLE "${cacert}/etc/ca-bundle.crt" diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index d4a1ab85b139..9c09038051ef 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -29,12 +29,12 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doUnpack" "doBuildJ" "doDeploy"]; - bits = if a.stdenv.system == "i686-linux" then - "32" - else if a.stdenv.system == "x86_64-linux" then + bits = if a.stdenv.is64bit then "64" - else - throw "Oops, unknown system: ${a.stdenv.system}"; + else if a.stdenv.isi686 then + "32" + else + builtins.trace "assuming ${a.stdenv.system} is 32 bits" "32"; doBuildJ = a.fullDepEntry '' sed -i bin/jconfig -e 's@bits=32@bits=${bits}@g; s@readline=0@readline=1@; s@LIBREADLINE=""@LIBREADLINE=" -lreadline "@' @@ -69,7 +69,7 @@ rec { raskin ]; platforms = with a.lib.platforms; - linux; + unix; license = a.lib.licenses.gpl3Plus; }; passthru = { diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index 21d203f8e63f..ef4b3e2d4a24 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, nix }: let - version = "1.0.0"; +{ stdenv, fetchurl, pkgconfig, nix, git }: let + version = "2.0.0"; in stdenv.mkDerivation { name = "nix-exec-${version}"; src = fetchurl { url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz"; - sha256 = "0w89ma69iil1ki68zvs1l0ii0d87in64791l3a4yzyv9d3ncl3w6"; + sha256 = "09ik0cvplwdb426vz7wllp86hv9milpz33pqcxdxhnkxcrizldnn"; }; - buildInputs = [ pkgconfig nix ]; + buildInputs = [ pkgconfig nix git ]; meta = { description = "Run programs defined in nix expressions"; diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index c2cd71b999e1..bfa47693de0c 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -4,18 +4,23 @@ stdenv.mkDerivation rec { baseName="pure"; project="pure-lang"; - version="0.62"; + version="0.63"; name="${baseName}-${version}"; extension="tar.gz"; src = fetchurl { url="https://bitbucket.org/purelang/${project}/downloads/${name}.${extension}"; - sha256="77df64e8154ef6f8fac66f8bcc471dc8f994862d1ee77b7c98003607757a013b"; + sha256="33acb2d560b21813f5e856973b493d9cfafba82bd6f539425ce07aa22f84ee29"; }; buildInputs = [ bison flex makeWrapper ]; propagatedBuildInputs = [ llvm gmp mpfr readline ]; + configureFlags = [ "--enable-release" ]; + doCheck = true; + checkPhase = '' + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${llvm}/lib make check + ''; postInstall = '' wrapProgram $out/bin/pure --prefix LD_LIBRARY_PATH : ${llvm}/lib ''; @@ -25,6 +30,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin + asppsa ]; platforms = with lib.platforms; linux; diff --git a/pkgs/development/interpreters/pypy/2.4/default.nix b/pkgs/development/interpreters/pypy/2.4/default.nix index 8f9647c21342..786622fe4cce 100644 --- a/pkgs/development/interpreters/pypy/2.4/default.nix +++ b/pkgs/development/interpreters/pypy/2.4/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi , sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, x11, libX11 -, makeWrapper }: +, makeWrapper, callPackage, self }: assert zlibSupport -> zlib != null; @@ -71,7 +71,8 @@ let # disable test_multiprocessing due to transient errors # disable test_os because test_urandom_failure fails # disable test_urllib2net and test_urllibnet because it requires networking (example.com) - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not (test_sqlite or test_urllib2net or test_urllibnet or test_socket or test_os or test_shutil or test_mhlib or test_multiprocessing)' lib-python + # disable test_zipfile64 because it randomly timeouts + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not (test_sqlite or test_urllib2net or test_urllibnet or test_socket or test_os or test_shutil or test_mhlib or test_multiprocessing or test_zipfile64)' lib-python ''; installPhase = '' @@ -98,6 +99,7 @@ let inherit zlibSupport libPrefix; executable = "pypy"; isPypy = true; + buildEnv = callPackage ../../python/wrapper.nix { python = self; }; }; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 3b2239791ae0..bb6dea2a4a3e 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -1,13 +1,11 @@ -{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2 -, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm -}: +{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false +, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, self, callPackage }: assert zlibSupport -> zlib != null; with stdenv.lib; let - majorVersion = "2.6"; version = "${majorVersion}.9"; @@ -27,54 +25,71 @@ let # the Nix store to 1. So treat that as a special case. ./nix-store-mtime.patch ]; + + preConfigure = '' + # Purity. + for i in /usr /sw /opt /pkg; do + substituteInPlace ./setup.py --replace $i /no-such-path + done + '' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) '' + for i in Lib/plat-*/regen; do + substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/ + done + '' + optionalString stdenv.isCygwin '' + # On Cygwin, `make install' tries to read this Makefile. + mkdir -p $out/lib/python${majorVersion}/config + touch $out/lib/python${majorVersion}/config/Makefile + mkdir -p $out/include/python${majorVersion} + touch $out/include/python${majorVersion}/pyconfig.h + ''; buildInputs = optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ - [ bzip2 openssl ] + [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline x11 tcl tk sqlite ] ++ optional zlibSupport zlib; # Build the basic Python interpreter without modules that have # external dependencies. python = stdenv.mkDerivation { - name = "python-${version}"; + name = "python${if includeModules then "" else "-minimal"}-${version}"; - inherit majorVersion version src patches buildInputs; + inherit majorVersion version src patches buildInputs preConfigure; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); configureFlags = "--enable-shared --with-threads --enable-unicode"; - preConfigure = - '' - # Purity. - for i in /usr /sw /opt /pkg; do - substituteInPlace ./setup.py --replace $i /no-such-path - done - '' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) '' - for i in Lib/plat-*/regen; do - substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/ - done - ''; - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; setupHook = ./setup-hook.sh; postInstall = '' - rm -rf "$out/lib/python${majorVersion}/test" + # needed for some packages, especially packages that backport + # functionality to 2.x from 3.x + for item in $out/lib/python${majorVersion}/test/*; do + if [[ "$item" != */test_support.py* ]]; then + rm -rf "$item" + fi + done + touch $out/lib/python${majorVersion}/test/__init__.py ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} mv $out/share/man/man1/{python.1,python2.6.1} ln -s $out/share/man/man1/{python2.6.1,python.1} + + paxmark E $out/bin/python${majorVersion} + + ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"} ''; passthru = rec { inherit zlibSupport; isPy2 = true; isPy26 = true; + buildEnv = callPackage ../wrapper.nix { python = self; }; libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; @@ -96,7 +111,7 @@ let ''; license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ simons chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ]; }; }; @@ -108,25 +123,18 @@ let , internalName ? "_" + moduleName , deps }: - stdenv.mkDerivation rec { + if includeModules then null else stdenv.mkDerivation rec { name = "python-${moduleName}-${python.version}"; - inherit src patches; + inherit src patches preConfigure; buildInputs = [ python ] ++ deps; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - configurePhase = "true"; - buildPhase = '' - # Fake the build environment that setup.py expects. - ln -s ${python}/include/python*/pyconfig.h . - ln -s ${python}/lib/python*/config/Setup Modules/ - ln -s ${python}/lib/python*/config/Setup.local Modules/ - substituteInPlace setup.py --replace 'self.extensions = extensions' \ 'self.extensions = [ext for ext in self.extensions if ext.name in ["${internalName}"]]' diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index cf1d4bdc8da7..7ebc9d3e3566 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -1,12 +1,11 @@ -{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2 -, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, libX11 }: +{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false +, sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, libX11, self, callPackage }: assert zlibSupport -> zlib != null; with stdenv.lib; let - majorVersion = "2.7"; version = "${majorVersion}.8"; @@ -28,33 +27,39 @@ let # patch python to put zero timestamp into pyc # if DETERMINISTIC_BUILD env var is set ./deterministic-build.patch + + # http://bugs.python.org/issue21963 + ./remove-avoid-daemon-thread-shutdown.patch ]; - - postPatch = stdenv.lib.optionalString (stdenv.gcc.libc != null) '' - substituteInPlace ./Lib/plat-generic/regen \ - --replace /usr/include/netinet/in.h \ - ${stdenv.gcc.libc}/include/netinet/in.h - ''; - - buildInputs = - optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ - [ bzip2 openssl ] - ++ optional zlibSupport zlib; - - ensurePurity = - '' + + preConfigure = '' # Purity. for i in /usr /sw /opt /pkg; do substituteInPlace ./setup.py --replace $i /no-such-path done + '' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) '' + for i in Lib/plat-*/regen; do + substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/ + done + '' + optionalString stdenv.isCygwin '' + # On Cygwin, `make install' tries to read this Makefile. + mkdir -p $out/lib/python${majorVersion}/config + touch $out/lib/python${majorVersion}/config/Makefile + mkdir -p $out/include/python${majorVersion} + touch $out/include/python${majorVersion}/pyconfig.h ''; + buildInputs = + optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ + [ bzip2 openssl ] ++ optionals includeModules [ db openssl ncurses gdbm libX11 readline x11 tcl tk sqlite ] + ++ optional zlibSupport zlib; + # Build the basic Python interpreter without modules that have # external dependencies. python = stdenv.mkDerivation { name = "python-${version}"; - inherit majorVersion version src patches postPatch buildInputs; + inherit majorVersion version src patches buildInputs preConfigure; LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); @@ -62,33 +67,36 @@ let configureFlags = "--enable-shared --with-threads --enable-unicode"; - preConfigure = "${ensurePurity}" + optionalString stdenv.isCygwin - '' - # On Cygwin, `make install' tries to read this Makefile. - mkdir -p $out/lib/python${majorVersion}/config - touch $out/lib/python${majorVersion}/config/Makefile - mkdir -p $out/include/python${majorVersion} - touch $out/include/python${majorVersion}/pyconfig.h - ''; - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; setupHook = ./setup-hook.sh; postInstall = '' - rm -rf "$out/lib/python${majorVersion}/test" + # needed for some packages, especially packages that backport + # functionality to 2.x from 3.x + for item in $out/lib/python${majorVersion}/test/*; do + if [[ "$item" != */test_support.py* ]]; then + rm -rf "$item" + else + echo $item + fi + done + touch $out/lib/python${majorVersion}/test/__init__.py ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz} paxmark E $out/bin/python${majorVersion} + + ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"} ''; passthru = rec { inherit zlibSupport; isPy2 = true; isPy27 = true; + buildEnv = callPackage ../wrapper.nix { python = self; }; libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; @@ -110,7 +118,7 @@ let ''; license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ simons chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric ]; }; }; @@ -122,25 +130,17 @@ let , internalName ? "_" + moduleName , deps }: - stdenv.mkDerivation rec { + if includeModules then null else stdenv.mkDerivation rec { name = "python-${moduleName}-${python.version}"; - inherit src patches postPatch; + inherit src patches preConfigure; buildInputs = [ python ] ++ deps; C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs); - configurePhase = "${ensurePurity}"; - - buildPhase = - '' - # Fake the build environment that setup.py expects. - ln -s ${python}/include/python*/pyconfig.h . - ln -s ${python}/lib/python*/config/Setup Modules/ - ln -s ${python}/lib/python*/config/Setup.local Modules/ - + buildPhase = '' substituteInPlace setup.py --replace 'self.extensions = extensions' \ 'self.extensions = [ext for ext in self.extensions if ext.name in ["${internalName}"]]' diff --git a/pkgs/development/interpreters/python/2.7/remove-avoid-daemon-thread-shutdown.patch b/pkgs/development/interpreters/python/2.7/remove-avoid-daemon-thread-shutdown.patch new file mode 100644 index 000000000000..650f276f08a3 --- /dev/null +++ b/pkgs/development/interpreters/python/2.7/remove-avoid-daemon-thread-shutdown.patch @@ -0,0 +1,170 @@ +changeset: 93046:61ad2208a5ce +branch: 2.7 +tag: tip +user: William A. Kennington III +date: Mon Oct 13 13:57:12 2014 -0700 +summary: Revert: 91229:7741d0dd66ca to fix i21963 + +diff -r ed4098380799 -r 61ad2208a5ce Include/pythonrun.h +--- a/Include/pythonrun.h Mon Oct 13 12:58:03 2014 -0700 ++++ b/Include/pythonrun.h Mon Oct 13 13:57:12 2014 -0700 +@@ -147,8 +147,6 @@ + PyAPI_FUNC(void) PyByteArray_Fini(void); + PyAPI_FUNC(void) _PyRandom_Fini(void); + +-PyAPI_DATA(PyThreadState *) _Py_Finalizing; +- + /* Stuff with no proper home (yet) */ + PyAPI_FUNC(char *) PyOS_Readline(FILE *, FILE *, char *); + PyAPI_DATA(int) (*PyOS_InputHook)(void); +diff -r ed4098380799 -r 61ad2208a5ce Lib/test/test_threading.py +--- a/Lib/test/test_threading.py Mon Oct 13 12:58:03 2014 -0700 ++++ b/Lib/test/test_threading.py Mon Oct 13 13:57:12 2014 -0700 +@@ -700,49 +700,6 @@ + output = "end of worker thread\nend of main thread\n" + self.assertScriptHasOutput(script, output) + +- @unittest.skipIf(sys.platform in platforms_to_skip, "due to known OS bug") +- def test_6_daemon_threads(self): +- # Check that a daemon thread cannot crash the interpreter on shutdown +- # by manipulating internal structures that are being disposed of in +- # the main thread. +- script = """if True: +- import os +- import random +- import sys +- import time +- import threading +- +- thread_has_run = set() +- +- def random_io(): +- '''Loop for a while sleeping random tiny amounts and doing some I/O.''' +- while True: +- in_f = open(os.__file__, 'rb') +- stuff = in_f.read(200) +- null_f = open(os.devnull, 'wb') +- null_f.write(stuff) +- time.sleep(random.random() / 1995) +- null_f.close() +- in_f.close() +- thread_has_run.add(threading.current_thread()) +- +- def main(): +- count = 0 +- for _ in range(40): +- new_thread = threading.Thread(target=random_io) +- new_thread.daemon = True +- new_thread.start() +- count += 1 +- while len(thread_has_run) < count: +- time.sleep(0.001) +- # Trigger process shutdown +- sys.exit(0) +- +- main() +- """ +- rc, out, err = assert_python_ok('-c', script) +- self.assertFalse(err) +- + @unittest.skipUnless(hasattr(os, 'fork'), "needs os.fork()") + @unittest.skipIf(sys.platform in platforms_to_skip, "due to known OS bug") + def test_reinit_tls_after_fork(self): +diff -r ed4098380799 -r 61ad2208a5ce Misc/NEWS +--- a/Misc/NEWS Mon Oct 13 12:58:03 2014 -0700 ++++ b/Misc/NEWS Mon Oct 13 13:57:12 2014 -0700 +@@ -96,10 +96,6 @@ + - Issue #21831: Avoid integer overflow when large sizes and offsets are given to + the buffer type. + +-- Issue #1856: Avoid crashes and lockups when daemon threads run while the +- interpreter is shutting down; instead, these threads are now killed when they +- try to take the GIL. +- + - Issue #19656: Running Python with the -3 option now also warns about + non-ascii bytes literals. + +diff -r ed4098380799 -r 61ad2208a5ce Python/ceval.c +--- a/Python/ceval.c Mon Oct 13 12:58:03 2014 -0700 ++++ b/Python/ceval.c Mon Oct 13 13:57:12 2014 -0700 +@@ -355,12 +355,6 @@ + if (interpreter_lock) { + int err = errno; + PyThread_acquire_lock(interpreter_lock, 1); +- /* _Py_Finalizing is protected by the GIL */ +- if (_Py_Finalizing && tstate != _Py_Finalizing) { +- PyThread_release_lock(interpreter_lock); +- PyThread_exit_thread(); +- assert(0); /* unreachable */ +- } + errno = err; + } + #endif +@@ -1024,13 +1018,6 @@ + /* Other threads may run now */ + + PyThread_acquire_lock(interpreter_lock, 1); +- +- /* Check if we should make a quick exit. */ +- if (_Py_Finalizing && _Py_Finalizing != tstate) { +- PyThread_release_lock(interpreter_lock); +- PyThread_exit_thread(); +- } +- + if (PyThreadState_Swap(tstate) != NULL) + Py_FatalError("ceval: orphan tstate"); + +diff -r ed4098380799 -r 61ad2208a5ce Python/pythonrun.c +--- a/Python/pythonrun.c Mon Oct 13 12:58:03 2014 -0700 ++++ b/Python/pythonrun.c Mon Oct 13 13:57:12 2014 -0700 +@@ -91,8 +91,6 @@ + int Py_NoUserSiteDirectory = 0; /* for -s and site.py */ + int Py_HashRandomizationFlag = 0; /* for -R and PYTHONHASHSEED */ + +-PyThreadState *_Py_Finalizing = NULL; +- + + /* Hack to force loading of object files */ + int (*_PyOS_mystrnicmp_hack)(const char *, const char *, Py_ssize_t) = \ +@@ -165,7 +163,6 @@ + if (initialized) + return; + initialized = 1; +- _Py_Finalizing = NULL; + + if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '\0') + Py_DebugFlag = add_flag(Py_DebugFlag, p); +@@ -425,16 +422,12 @@ + * the threads created via Threading. + */ + call_sys_exitfunc(); ++ initialized = 0; + + /* Get current thread state and interpreter pointer */ + tstate = PyThreadState_GET(); + interp = tstate->interp; + +- /* Remaining threads (e.g. daemon threads) will automatically exit +- after taking the GIL (in PyEval_RestoreThread()). */ +- _Py_Finalizing = tstate; +- initialized = 0; +- + /* Disable signal handling */ + PyOS_FiniInterrupts(); + +diff -r ed4098380799 -r 61ad2208a5ce Python/thread_pthread.h +--- a/Python/thread_pthread.h Mon Oct 13 12:58:03 2014 -0700 ++++ b/Python/thread_pthread.h Mon Oct 13 13:57:12 2014 -0700 +@@ -242,9 +242,9 @@ + PyThread_exit_thread(void) + { + dprintf(("PyThread_exit_thread called\n")); +- if (!initialized) ++ if (!initialized) { + exit(0); +- pthread_exit(0); ++ } + } + + #ifdef USE_SEMAPHORES + diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index 489d0509c1a4..c684266f8225 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -9,6 +9,8 @@ , sqlite , tcl, tk , zlib +, callPackage +, self }: assert readline != null -> ncurses != null; @@ -56,14 +58,25 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; postInstall = '' - rm -rf "$out/lib/python${majorVersion}/test" + # needed for some packages, especially packages that backport functionality + # to 2.x from 3.x + for item in $out/lib/python${majorVersion}/test/*; do + if [[ "$item" != */test_support.py* ]]; then + rm -rf "$item" + else + echo $item + fi + done + touch $out/lib/python${majorVersion}/test/__init__.py ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" + paxmark E $out/bin/python${majorVersion} ''; passthru = rec { zlibSupport = zlib != null; sqliteSupport = sqlite != null; dbSupport = db != null; + buildEnv = callPackage ../wrapper.nix { python = self; }; readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index fcc033803498..b9ab82316135 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -10,6 +10,8 @@ , sqlite , tcl, tk , zlib +, callPackage +, self }: assert readline != null -> ncurses != null; @@ -51,9 +53,17 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; postInstall = '' - rm -rf "$out/lib/python${majorVersion}/test" + # needed for some packages, especially packages that backport functionality + # to 2.x from 3.x + for item in $out/lib/python${majorVersion}/test/*; do + if [[ "$item" != */test_support.py* ]]; then + rm -rf "$item" + else + echo $item + fi + done + touch $out/lib/python${majorVersion}/test/__init__.py ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" - paxmark E $out/bin/python${majorVersion} ''; @@ -66,6 +76,7 @@ stdenv.mkDerivation { tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; executable = "python3.3m"; + buildEnv = callPackage ../wrapper.nix { python = self; }; isPy3 = true; isPy33 = true; is_py3k = true; # deprecated diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index 4ce659389ec6..e585c6c148dd 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -10,6 +10,8 @@ , sqlite , tcl, tk , zlib +, callPackage +, self }: assert readline != null -> ncurses != null; @@ -52,9 +54,18 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; postInstall = '' - rm -rf "$out/lib/python${majorVersion}/test" - ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" + # needed for some packages, especially packages that backport functionality + # to 2.x from 3.x + for item in $out/lib/python${majorVersion}/test/*; do + if [[ "$item" != */test_support.py* ]]; then + rm -rf "$item" + else + echo $item + fi + done + touch $out/lib/python${majorVersion}/test/__init__.py + ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" paxmark E $out/bin/python${majorVersion} ''; @@ -67,6 +78,7 @@ stdenv.mkDerivation { tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); libPrefix = "python${majorVersion}"; executable = "python3.4m"; + buildEnv = callPackage ../wrapper.nix { python = self; }; isPy3 = true; isPy34 = true; is_py3k = true; # deprecated diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index ccfbcfcdd42f..163e8d7194ba 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -1,12 +1,15 @@ -{ stdenv, python, buildEnv, makeWrapper, recursivePthLoader, extraLibs ? [], postBuild ? "" -, stdLibs ? stdenv.lib.attrValues python.modules, ignoreCollisions ? false -}: +{ stdenv, python, buildEnv, makeWrapper +, extraLibs ? [] +, postBuild ? "" +, ignoreCollisions ? false }: # Create a python executable that knows about additional packages. - +let + recursivePthLoader = import ../../python-modules/recursive-pth-loader/default.nix { stdenv = stdenv; python = python; }; +in (buildEnv { - name = "python-${python.version}-wrapper"; - paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ stdLibs ++ [ python recursivePthLoader ]; + name = "${python.name}-env"; + paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ [ python recursivePthLoader ]; inherit ignoreCollisions; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 469ef118310a..310b0d935420 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "racket"; - version = "6.0.1"; + version = "6.1"; name = "${pname}-${version}"; src = fetchurl { url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "e2bc0d4d0fcdfc3327a58c931f203c07a06d4724703f9708ba2e4c8ea0f9694d"; + sha256 = "fde283bf5899bb9266ce721db44631c9bac4a4864a7c3211de413fd9503178c6"; }; # Various racket executables do run-time searches for these. diff --git a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix index e361824bb532..77880870dd95 100644 --- a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix +++ b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix @@ -48,6 +48,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Fix a build failure on systems with nix store optimisation. + # (The build process attempted to copy file a overwriting file b, where a and + # b are hard-linked, which results in cp returning a non-zero exit code.) + # https://github.com/NixOS/nixpkgs/issues/4266 + postUnpack = ''rm "$sourceRoot/enc/unicode/name2ctype.h"''; + patches = [ ./ruby19-parallel-install.patch ./bitperfect-rdoc.patch diff --git a/pkgs/development/interpreters/ruby/ruby-2.0.0.nix b/pkgs/development/interpreters/ruby/ruby-2.0.0.nix index 22b13717cfcb..4b1240ebf751 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.0.0.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.0.0.nix @@ -48,6 +48,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Fix a build failure on systems with nix store optimisation. + # (The build process attempted to copy file a overwriting file b, where a and + # b are hard-linked, which results in cp returning a non-zero exit code.) + # https://github.com/NixOS/nixpkgs/issues/4266 + postUnpack = ''rm "$sourceRoot/enc/unicode/name2ctype.h"''; + patches = ops useRailsExpress [ "${patchSet}/patches/ruby/2.0.0/p481/01-zero-broken-tests.patch" "${patchSet}/patches/ruby/2.0.0/p481/02-railsexpress-gc.patch" diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix index fd0c278133bc..91c21016b242 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.0.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.0.nix @@ -49,6 +49,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Fix a build failure on systems with nix store optimisation. + # (The build process attempted to copy file a overwriting file b, where a and + # b are hard-linked, which results in cp returning a non-zero exit code.) + # https://github.com/NixOS/nixpkgs/issues/4266 + postUnpack = ''rm "$sourceRoot/enc/unicode/name2ctype.h"''; + patches = ops useRailsExpress [ "${patchSet}/patches/ruby/2.1.0/railsexpress/01-current-2.1.1-fixes.patch" "${patchSet}/patches/ruby/2.1.0/railsexpress/02-zero-broken-tests.patch" diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix index c60a6cb313d4..e70678e27ecc 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix @@ -49,6 +49,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Fix a build failure on systems with nix store optimisation. + # (The build process attempted to copy file a overwriting file b, where a and + # b are hard-linked, which results in cp returning a non-zero exit code.) + # https://github.com/NixOS/nixpkgs/issues/4266 + postUnpack = ''rm "$sourceRoot/enc/unicode/name2ctype.h"''; + patches = ops useRailsExpress [ "${patchSet}/patches/ruby/2.1.0/railsexpress/01-zero-broken-tests.patch" "${patchSet}/patches/ruby/2.1.0/railsexpress/02-improve-gc-stats.patch" diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix index 1738606bf140..929a14f8242b 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix @@ -49,6 +49,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Fix a build failure on systems with nix store optimisation. + # (The build process attempted to copy file a overwriting file b, where a and + # b are hard-linked, which results in cp returning a non-zero exit code.) + # https://github.com/NixOS/nixpkgs/issues/4266 + postUnpack = ''rm "$sourceRoot/enc/unicode/name2ctype.h"''; + patches = ops useRailsExpress [ "${patchSet}/patches/ruby/2.1.2/railsexpress/01-zero-broken-tests.patch" "${patchSet}/patches/ruby/2.1.2/railsexpress/02-improve-gc-stats.patch" diff --git a/pkgs/development/interpreters/xulrunner/default.nix b/pkgs/development/interpreters/xulrunner/default.nix index 47dea40eba22..4dd1095c0ce8 100644 --- a/pkgs/development/interpreters/xulrunner/default.nix +++ b/pkgs/development/interpreters/xulrunner/default.nix @@ -3,21 +3,18 @@ , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx -, cairo, gstreamer, gst_plugins_base, icu +, cairo, gstreamer, gst_plugins_base, icu, firefox , debugBuild ? false }: assert stdenv.gcc ? libc && stdenv.gcc.libc != null; -let version = "31.0"; in +let version = firefox.version; in stdenv.mkDerivation rec { name = "xulrunner-${version}"; - src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "a6c3e25ee3aeb7da42db2aaeb50a385d63532beb"; - }; + src = firefox.src; buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 @@ -58,9 +55,10 @@ stdenv.mkDerivation rec { "--disable-updater" "--disable-pulseaudio" ] - ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] - else [ "--disable-debug" "--enable-release" - "--enable-optimize" "--enable-strip" ]); + ++ (if debugBuild + then [ "--enable-debug" "--enable-profiling"] + else [ "--disable-debug" "--enable-release" "--enable-strip" + "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}" ]); enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix index 1dadf1be1276..d3c56a8b0e08 100644 --- a/pkgs/development/libraries/ffmpeg/1.x.nix +++ b/pkgs/development/libraries/ffmpeg/1.x.nix @@ -31,11 +31,11 @@ assert playSupport -> SDL != null; assert freetypeSupport -> freetype != null; stdenv.mkDerivation rec { - name = "ffmpeg-1.2.8"; + name = "ffmpeg-1.2.9"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "0n9fklr8zqkd60dc5ai161l6k4dbiac5hqy0pi1w82yamc25k6s2"; + sha256 = "02wsnlix92a9k8wf3b4bad3a14v1c5iiz0fv6wlk1zn82cp93paw"; }; # `--enable-gpl' (as well as the `postproc' and `swscale') mean that @@ -100,7 +100,9 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ffmpeg.org/; description = "A complete, cross-platform solution to record, convert and stream audio and video"; + license = if faacSupport then stdenv.lib.licenses.unfree else stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + platforms = stdenv.lib.platforms.unix; branch = "1"; }; } diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 7cab317380e8..ccd795ef2907 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, cmake, zlib, python}: +{stdenv, fetchurl, cmake, zlib, python, libssh2, openssl, http-parser}: stdenv.mkDerivation rec { version = "0.21.1"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cmakeFlags = "-DTHREADSAFE=ON"; nativeBuildInputs = [ cmake python ]; - buildInputs = [ zlib ]; + buildInputs = [ zlib libssh2 openssl http-parser ]; meta = { description = "the Git linkable library"; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 3f20147d0e97..0cd8e19cee92 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pkgconfig, intltool, libtool , glib, dbus, udev, udisks2, libgcrypt , libgphoto2, avahi, libarchive, fuse, libcdio -, libxml2, libxslt, docbook_xsl -, lightWeight ? true, gnome, samba, libgnome_keyring, gconf, makeWrapper }: +, libxml2, libxslt, docbook_xsl, samba +, gnomeSupport ? false, gnome,libgnome_keyring, gconf, makeWrapper }: let ver_maj = "1.18"; @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper glib dbus.libs udev udisks2 libgcrypt libgphoto2 avahi libarchive fuse libcdio - libxml2 libxslt docbook_xsl + libxml2 libxslt docbook_xsl samba # ToDo: a ligther version of libsoup to have FTP/HTTP support? - ] ++ stdenv.lib.optionals (!lightWeight) (with gnome; [ - gtk libsoup libgnome_keyring gconf samba + ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ + gtk libsoup libgnome_keyring gconf # ToDo: not working and probably useless until gnome3 from x-updates ]); @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Virtual Filesystem support library" + stdenv.lib.optionalString lightWeight " (light-weight)"; + description = "Virtual Filesystem support library" + stdenv.lib.optionalString gnomeSupport " (full GNOME support)"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/haskell/DAV/default.nix b/pkgs/development/libraries/haskell/DAV/default.nix index 9c64b2377338..b361ae045fbf 100644 --- a/pkgs/development/libraries/haskell/DAV/default.nix +++ b/pkgs/development/libraries/haskell/DAV/default.nix @@ -2,26 +2,26 @@ { cabal, caseInsensitive, dataDefault, either, errors, exceptions , httpClient, httpClientTls, httpTypes, lens, mtl, network -, optparseApplicative, transformers, transformersBase, utf8String -, xmlConduit, xmlHamlet +, networkUri, optparseApplicative, transformers, transformersBase +, utf8String, xmlConduit, xmlHamlet }: cabal.mkDerivation (self: { pname = "DAV"; - version = "1.0.2"; - sha256 = "0xbiq3q8w1cjnh71sfnincir8igvwig734r8schbsps993p2d24b"; + version = "1.0.3"; + sha256 = "1wrs3rdk4sarzi4w1pma8h751mjw5x1l8c6w30wv7fg0rmk2cayd"; isLibrary = true; isExecutable = true; buildDepends = [ caseInsensitive dataDefault either errors exceptions httpClient - httpClientTls httpTypes lens mtl network optparseApplicative - transformers transformersBase utf8String xmlConduit xmlHamlet + httpClientTls httpTypes lens mtl network networkUri + optparseApplicative transformers transformersBase utf8String + xmlConduit xmlHamlet ]; meta = { homepage = "http://floss.scru.org/hDAV"; description = "RFC 4918 WebDAV support"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/Decimal/default.nix b/pkgs/development/libraries/haskell/Decimal/default.nix new file mode 100644 index 000000000000..03ae15a24d14 --- /dev/null +++ b/pkgs/development/libraries/haskell/Decimal/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, deepseq, HUnit, QuickCheck, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2 +}: + +cabal.mkDerivation (self: { + pname = "Decimal"; + version = "0.4.2"; + sha256 = "0qa2z2lq1hrvakhyhj624mg8sd05ikhb66zwpa6x9vcyji93dxf5"; + buildDepends = [ deepseq ]; + testDepends = [ + deepseq HUnit QuickCheck testFramework testFrameworkHunit + testFrameworkQuickcheck2 + ]; + meta = { + homepage = "https://github.com/PaulJohnson/Haskell-Decimal"; + description = "Decimal numbers with variable precision"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/Extra/default.nix b/pkgs/development/libraries/haskell/Extra-lib/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/Extra/default.nix rename to pkgs/development/libraries/haskell/Extra-lib/default.nix diff --git a/pkgs/development/libraries/haskell/HSH/default.nix b/pkgs/development/libraries/haskell/HSH/default.nix index bcc297812104..9bcd1f5a21ba 100644 --- a/pkgs/development/libraries/haskell/HSH/default.nix +++ b/pkgs/development/libraries/haskell/HSH/default.nix @@ -1,22 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, filepath, hslogger, MissingH, mtl, regexBase, regexCompat -, regexPosix, fetchpatch +, regexPosix }: cabal.mkDerivation (self: { pname = "HSH"; - version = "2.1.0"; - sha256 = "0gz2hzdvf0gqv33jihn67bvry38c6hkjapb1prxmb3w12lisr4l5"; + version = "2.1.1"; + sha256 = "14aijsafd8mkh46dy071haix16p31ppdn2s3r9kxdbjjas6qh13g"; isLibrary = true; isExecutable = true; buildDepends = [ filepath hslogger MissingH mtl regexBase regexCompat regexPosix ]; - patches = [ (fetchpatch { url = "https://github.com/jgoerzen/hsh/pull/10.patch"; sha256 = "0ddb3vf8ipf37zg4hkqh0frff1a7sv9ils3lw6qd3irpbwna1hdz"; }) ]; meta = { homepage = "http://software.complete.org/hsh"; description = "Library to mix shell scripting with Haskell programs"; license = "LGPL"; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/HTF/default.nix b/pkgs/development/libraries/haskell/HTF/default.nix index 76ba94e8bfca..de264de01982 100644 --- a/pkgs/development/libraries/haskell/HTF/default.nix +++ b/pkgs/development/libraries/haskell/HTF/default.nix @@ -1,25 +1,25 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, base64Bytestring, cpphs, Diff, filepath -, haskellSrcExts, HUnit, liftedBase, monadControl, mtl, QuickCheck -, random, regexCompat, temporary, text, time, unorderedContainers -, vector, xmlgen +{ cabal, aeson, aesonPretty, base64Bytestring, cpphs, Diff +, filepath, haskellLexer, haskellSrc, HUnit, liftedBase +, monadControl, mtl, QuickCheck, random, regexCompat, temporary +, text, time, unorderedContainers, vector, xmlgen }: cabal.mkDerivation (self: { pname = "HTF"; - version = "0.12.1.0"; - sha256 = "1symg1y6i47rd1jshj84cwpn5vgmvh6v07jidjg5w5w3syyxqnz4"; + version = "0.12.2.2"; + sha256 = "02n3nqghcl9wmcr2iar9bg8nziddsvp43rzyasq4fnh166y87gc4"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson base64Bytestring cpphs Diff haskellSrcExts HUnit liftedBase - monadControl mtl QuickCheck random regexCompat text time vector - xmlgen + aeson base64Bytestring cpphs Diff haskellLexer haskellSrc HUnit + liftedBase monadControl mtl QuickCheck random regexCompat text time + vector xmlgen ]; testDepends = [ - aeson filepath HUnit mtl random regexCompat temporary text - unorderedContainers + aeson aesonPretty filepath HUnit mtl random regexCompat temporary + text unorderedContainers ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/HaTeX/default.nix b/pkgs/development/libraries/haskell/HaTeX/default.nix index 3712dda87eb8..370c371eb8ce 100644 --- a/pkgs/development/libraries/haskell/HaTeX/default.nix +++ b/pkgs/development/libraries/haskell/HaTeX/default.nix @@ -6,12 +6,12 @@ cabal.mkDerivation (self: { pname = "HaTeX"; - version = "3.13.1.0"; - sha256 = "1ciifdb7yd79lvwdcxj8dq98dfmm9pg25rx9rc2wjn2jnp8j85r7"; + version = "3.14.0.0"; + sha256 = "0vbwhj031ny2vkp5hjxihlmpxaqy1far2nmxfzl1bv6rx0sqfjbg"; buildDepends = [ matrix parsec QuickCheck text transformers wlPprintExtras ]; - testDepends = [ QuickCheck tasty tastyQuickcheck ]; + testDepends = [ QuickCheck tasty tastyQuickcheck text ]; meta = { homepage = "http://daniel-diaz.github.io/projects/hatex"; description = "The Haskell LaTeX library"; diff --git a/pkgs/development/libraries/haskell/HandsomeSoup/default.nix b/pkgs/development/libraries/haskell/HandsomeSoup/default.nix index c5f1d1ee97aa..ab2c56516c98 100644 --- a/pkgs/development/libraries/haskell/HandsomeSoup/default.nix +++ b/pkgs/development/libraries/haskell/HandsomeSoup/default.nix @@ -1,21 +1,24 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, HTTP, hxt, hxtHttp, MaybeT, mtl, network, parsec -, transformers +{ cabal, hspec, HTTP, hxt, hxtHttp, MaybeT, mtl, network +, networkUri, parsec, transformers }: cabal.mkDerivation (self: { pname = "HandsomeSoup"; - version = "0.3.2"; - sha256 = "0ixqk32sfv6kj41vc6fzflv6f6jwvnkvcdf9pmgkc675218ggh53"; + version = "0.3.3"; + sha256 = "0g2b3mw0asam005kz77zm3bsrjaa7q3n6wdj3ahr7hppivsdwizk"; + isLibrary = true; + isExecutable = true; buildDepends = [ - HTTP hxt hxtHttp MaybeT mtl network parsec transformers + HTTP hxt hxtHttp MaybeT mtl network networkUri parsec transformers ]; + testDepends = [ hspec hxt ]; + doCheck = false; meta = { homepage = "https://github.com/egonSchiele/HandsomeSoup"; description = "Work with HTML more easily in HXT"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix b/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix index 4e680b26caed..ca3e10682fa1 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels-util/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "JuicyPixels-util"; - version = "0.1"; - sha256 = "181wryax2k43qlblink9vcg2hk8f2qxn02ifmgxa2fl95z5ar0dc"; + version = "0.2"; + sha256 = "1b2rx5g8kd83hl50carr02mz21gvkasnsddw1f3pfvfsyfv3yyrc"; buildDepends = [ JuicyPixels vector ]; meta = { homepage = "https://github.com/fumieval/JuicyPixels-util"; diff --git a/pkgs/development/libraries/haskell/aeson/0.8.0.1.nix b/pkgs/development/libraries/haskell/aeson/0.8.0.2.nix similarity index 90% rename from pkgs/development/libraries/haskell/aeson/0.8.0.1.nix rename to pkgs/development/libraries/haskell/aeson/0.8.0.2.nix index 32cc221d5b4a..0625dcf19136 100644 --- a/pkgs/development/libraries/haskell/aeson/0.8.0.1.nix +++ b/pkgs/development/libraries/haskell/aeson/0.8.0.2.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "aeson"; - version = "0.8.0.1"; - sha256 = "0363pzla3kjk2ckmm7j07hav3bgq31jkrya5jhl9dn0nv4l4slxk"; + version = "0.8.0.2"; + sha256 = "1mc8cwmswx69r77wv7dfim525jqajnlxbcx5xf3ygpszzf6mh1q7"; buildDepends = [ attoparsec blazeBuilder deepseq dlist hashable mtl scientific syb text time unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/asn1-encoding/default.nix b/pkgs/development/libraries/haskell/asn1-encoding/default.nix index 1cc87f5ce5e8..cb35f70d1b58 100644 --- a/pkgs/development/libraries/haskell/asn1-encoding/default.nix +++ b/pkgs/development/libraries/haskell/asn1-encoding/default.nix @@ -1,14 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, asn1Types, mtl, text, time }: +{ cabal, asn1Types, hourglass, mtl, tasty, tastyQuickcheck, text }: cabal.mkDerivation (self: { pname = "asn1-encoding"; - version = "0.8.1.3"; - sha256 = "000rajx9gdxfyx521yg2mvp1z8h61sr96w1lzwawiw7n5ng6v8ni"; - isLibrary = true; - isExecutable = true; - buildDepends = [ asn1Types mtl text time ]; + version = "0.9.0"; + sha256 = "02x3lzyl4gavl3lc2lrg8rknyvs6r2hf8kmm7xrmma5m857iks8p"; + buildDepends = [ asn1Types hourglass mtl ]; + testDepends = [ + asn1Types hourglass mtl tasty tastyQuickcheck text + ]; + doCheck = false; meta = { homepage = "http://github.com/vincenthz/hs-asn1"; description = "ASN1 data reader and writer in RAW, BER and DER forms"; diff --git a/pkgs/development/libraries/haskell/asn1-parse/default.nix b/pkgs/development/libraries/haskell/asn1-parse/default.nix index 5786823ce7b8..5d6bf33bb268 100644 --- a/pkgs/development/libraries/haskell/asn1-parse/default.nix +++ b/pkgs/development/libraries/haskell/asn1-parse/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, asn1Encoding, asn1Types, mtl, text, time }: +{ cabal, asn1Encoding, asn1Types, mtl, text }: cabal.mkDerivation (self: { pname = "asn1-parse"; - version = "0.8.1"; - sha256 = "021mbm5aayfx9vhxq4x1jj3gpnzq0bqaqcl1zsaa2a6l0qzpnmh9"; - buildDepends = [ asn1Encoding asn1Types mtl text time ]; + version = "0.9.0"; + sha256 = "0m093wwndyxvy72qlnb70bp8w5ahimrlv1dp972l9s9l5jc4pjg3"; + buildDepends = [ asn1Encoding asn1Types mtl text ]; meta = { homepage = "http://github.com/vincenthz/hs-asn1"; description = "Simple monadic parser for ASN1 stream types"; diff --git a/pkgs/development/libraries/haskell/asn1-types/default.nix b/pkgs/development/libraries/haskell/asn1-types/default.nix index ad9492bf3fad..d2566add400b 100644 --- a/pkgs/development/libraries/haskell/asn1-types/default.nix +++ b/pkgs/development/libraries/haskell/asn1-types/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, time }: +{ cabal, hourglass }: cabal.mkDerivation (self: { pname = "asn1-types"; - version = "0.2.3"; - sha256 = "1cdzhj6zls6qmy82218cj2a25b7rkxsjbcqnx4zng3wp6s5pghw4"; - buildDepends = [ time ]; + version = "0.3.0"; + sha256 = "1am8nmfarv7ymy3rqm0js2i82v6n6qwz0lnzb1qdmy4ligcdm65r"; + buildDepends = [ hourglass ]; meta = { homepage = "http://github.com/vincenthz/hs-asn1-types"; description = "ASN.1 types"; diff --git a/pkgs/development/libraries/haskell/auto-update/default.nix b/pkgs/development/libraries/haskell/auto-update/default.nix index 9d2ccdfb11ba..3ca150892447 100644 --- a/pkgs/development/libraries/haskell/auto-update/default.nix +++ b/pkgs/development/libraries/haskell/auto-update/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "auto-update"; - version = "0.1.1.5"; - sha256 = "1gwx9k953nhw6n4d8a4jw3sfp51761s5qjsql73pr8i6gri0849h"; + version = "0.1.2"; + sha256 = "0ccix41jjpqkzvnfr5md1cbhsa9fkv6dy7yw73j8dnvqbqnz1z0l"; meta = { homepage = "https://github.com/yesodweb/wai"; description = "Efficiently run periodic, on-demand actions"; diff --git a/pkgs/development/libraries/haskell/basic-prelude/default.nix b/pkgs/development/libraries/haskell/basic-prelude/default.nix index d5a33db11ac7..5cbd6c9fe143 100644 --- a/pkgs/development/libraries/haskell/basic-prelude/default.nix +++ b/pkgs/development/libraries/haskell/basic-prelude/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "basic-prelude"; - version = "0.3.9"; - sha256 = "0f2l8xryagl1f0d30gq1hhydjnn77qhhwgg9l44gvqn30y2n66h7"; + version = "0.3.10"; + sha256 = "10013ni7kpqlc6s3ryfvmklw3ic5h48rm4wsrb31pcp5xja0qk59"; buildDepends = [ hashable liftedBase ReadArgs safe systemFilepath text transformers unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/binary-conduit/default.nix b/pkgs/development/libraries/haskell/binary-conduit/default.nix index 848004ca6afd..c7547a7b12b7 100644 --- a/pkgs/development/libraries/haskell/binary-conduit/default.nix +++ b/pkgs/development/libraries/haskell/binary-conduit/default.nix @@ -6,15 +6,15 @@ cabal.mkDerivation (self: { pname = "binary-conduit"; - version = "1.2.2"; - sha256 = "12dgqydc4zj1ffrcfqpd1dg40dc9hpynj1j69611kzpcqbj275pf"; + version = "1.2.3"; + sha256 = "0ymhxyf754j1pki7ap2vay8f9j49rzsjzp5yr253sn5wpw3qg8fr"; buildDepends = [ binary conduit resourcet vector ]; testDepends = [ binary conduit hspec QuickCheck quickcheckAssertions resourcet ]; jailbreak = true; meta = { - homepage = "http://github.com/qnikst/binary-conduit"; + homepage = "http://github.com/qnikst/binary-conduit/"; description = "data serialization/deserialization conduit library"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/boomerang/default.nix b/pkgs/development/libraries/haskell/boomerang/default.nix index 3747b2cc877c..82d45baf88ae 100644 --- a/pkgs/development/libraries/haskell/boomerang/default.nix +++ b/pkgs/development/libraries/haskell/boomerang/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "boomerang"; - version = "1.4.4"; - sha256 = "0ik2wxcvz2y3bn3r2p9kzjiy78vjhxyz4fn3nkaz5wl3jmh4gydf"; + version = "1.4.5"; + sha256 = "03iaasyg2idvq25wzzjk2yr9lyql7bcgmfkycy1cy4ms5dg91k6q"; buildDepends = [ mtl text ]; meta = { description = "Library for invertible parsing and printing"; diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index 45981490749f..10eedda6f24d 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "cairo"; - version = "0.13.0.3"; - sha256 = "0jlxgxsby8qscyfq517xlaib8xkp310gbjbmk9yyi7sd5bnmblh9"; + version = "0.13.0.4"; + sha256 = "0sj6c83md51qvjpp3dckv3hvg9dm2qkiw1wzlvdypdd1c09957n2"; buildDepends = [ mtl text utf8String ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ cairo libc pkgconfig zlib ]; diff --git a/pkgs/development/libraries/haskell/charsetdetect-ae/default.nix b/pkgs/development/libraries/haskell/charsetdetect-ae/default.nix new file mode 100644 index 000000000000..39571e4a87c7 --- /dev/null +++ b/pkgs/development/libraries/haskell/charsetdetect-ae/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "charsetdetect-ae"; + version = "1.0.1"; + sha256 = "0bvdnv608glim8yn4dvh3av7x0fxxp3z6719j0n005bygdfgjxna"; + meta = { + homepage = "http://github.com/Aelve/charsetdetect-ae"; + description = "Character set detection using Mozilla's Universal Character Set Detector"; + license = "LGPL"; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index d96166817c2f..2072a91afb1a 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude-conduit"; - version = "0.10.0"; - sha256 = "0ziggymy37iz68c2rjdjdzjsamnvn81r836a6xx2nhqjivmfmlav"; + version = "0.10.1"; + sha256 = "0q6x0mb24yslgqjazg443v9w15x3j4xn32m6p9iwbmafyfbp9vs4"; buildDepends = [ classyPrelude conduit conduitCombinators monadControl resourcet systemFileio transformers void diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index ccd784175153..b8e6d06ed32c 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.10.0"; - sha256 = "007a1gs9wgfw7gkm4jyh0fndcnxwkffzdm5rgxw08f1g8s0yqwf3"; + version = "0.10.1"; + sha256 = "1x22kq808ncgbi32idwn2232fy0hji3a7p9l9ardpg7hb6q1w76g"; buildDepends = [ basicPrelude bifunctors chunkedData enclosedExceptions exceptions hashable liftedBase monoTraversable mtl primitive semigroups stm diff --git a/pkgs/development/libraries/haskell/concreteTyperep/default.nix b/pkgs/development/libraries/haskell/concreteTyperep/default.nix index 896496dc4a39..24e2569ad0ea 100644 --- a/pkgs/development/libraries/haskell/concreteTyperep/default.nix +++ b/pkgs/development/libraries/haskell/concreteTyperep/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { testDepends = [ binary hashable QuickCheck testFramework testFrameworkQuickcheck2 ]; + doCheck = false; meta = { description = "Binary and Hashable instances for TypeRep"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix index f8a51f4fa5b8..6c0060e52a8d 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey-types/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey-types"; - version = "0.4.2.2"; - sha256 = "18z1fnh2xjq600ya8m175m64nwr6bwscr2q47zjy7k38zlm9c8h5"; + version = "0.4.2.3"; + sha256 = "1isfyr1ly9hv8idslpjbyc9hhgb1zqd9gfc1s4kvwy4gcdsvrx52"; buildDepends = [ asn1Types ]; meta = { homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types"; diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix index 9d1087e2b6e0..5b8c5297316a 100644 --- a/pkgs/development/libraries/haskell/derive/default.nix +++ b/pkgs/development/libraries/haskell/derive/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "derive"; - version = "2.5.17"; - sha256 = "0mafdigpfjkh9nwfqyma5k9449vzyybybp637wgxbxrz3rk4jm3m"; + version = "2.5.18"; + sha256 = "1jqng8v1d4rac8xmrpm7h1pkyr9pfwsbb0ap6pnwzpwz9fns9c3k"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix index 4c1ca9cd9aeb..29ed05048067 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-heist/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-heist"; - version = "0.8.6.0"; - sha256 = "0n73hw8xl70x7c3hn4hz1qqijvvhv0qk30q0c22lnbjaf4n8dki2"; + version = "0.8.6.1"; + sha256 = "1l8ppn2h1nxzn5wxnglc2fyi7r90177v75yf4n7cyvzrcxdaz4bb"; buildDepends = [ blazeBuilder digestiveFunctors heist mtl text xmlhtml ]; diff --git a/pkgs/development/libraries/haskell/dynamic-cabal/default.nix b/pkgs/development/libraries/haskell/dynamic-cabal/default.nix index 40f52b50904c..066c11e5a361 100644 --- a/pkgs/development/libraries/haskell/dynamic-cabal/default.nix +++ b/pkgs/development/libraries/haskell/dynamic-cabal/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "dynamic-cabal"; - version = "0.3.2"; - sha256 = "0f0g4kml17j1j101gnpjjpdmny4m2wgr0dbjq18fw1s3nxc3jagm"; + version = "0.3.3"; + sha256 = "0fq6q0j2fx7ygarzgsvb7scssjnrxjrq188d0habfar6bdm0vqdg"; buildDepends = [ dataDefault filepath ghcPaths haskellGenerate haskellSrcExts time void diff --git a/pkgs/development/libraries/haskell/ekg/default.nix b/pkgs/development/libraries/haskell/ekg/default.nix index 4bf39315dad9..c19ec4ec8811 100644 --- a/pkgs/development/libraries/haskell/ekg/default.nix +++ b/pkgs/development/libraries/haskell/ekg/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ekg"; - version = "0.4.0.3"; - sha256 = "0fynng6r0aj25k4j8ba3fvq4a6kgijil4m9ygd99xq8c1cvj2zyy"; + version = "0.4.0.4"; + sha256 = "1v1kskl1fwwpv72lay8c7nlvg2dswf6wij176fjfml1v8lmll2lr"; buildDepends = [ aeson ekgCore filepath network snapCore snapServer text time transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/extra/default.nix b/pkgs/development/libraries/haskell/extra/default.nix new file mode 100644 index 000000000000..b17ea4ecc416 --- /dev/null +++ b/pkgs/development/libraries/haskell/extra/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, filepath, QuickCheck, time }: + +cabal.mkDerivation (self: { + pname = "extra"; + version = "0.3.2"; + sha256 = "0in340mmbgqkafj60pas7dm6bn080nimxk8b9b6xzv0giih6dx66"; + buildDepends = [ filepath time ]; + testDepends = [ QuickCheck time ]; + meta = { + homepage = "https://github.com/ndmitchell/extra#readme"; + description = "Extra functions I use"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ aycanirican ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/fast-logger/default.nix b/pkgs/development/libraries/haskell/fast-logger/default.nix index b4e32fa2bb0c..b0cd40e48fc2 100644 --- a/pkgs/development/libraries/haskell/fast-logger/default.nix +++ b/pkgs/development/libraries/haskell/fast-logger/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "fast-logger"; - version = "2.2.0"; - sha256 = "02gc5f7vgwfdlhfawki4xxrl33lbdl05wh64qm3mb3h2dv1gnwrr"; + version = "2.2.3"; + sha256 = "0zap61gz0snbq42h8nyjh637fr2cm1ny9f77sqd6v3yfqjq0ljh3"; buildDepends = [ autoUpdate blazeBuilder filepath text ]; testDepends = [ hspec ]; meta = { diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index fd1df306be7c..bcb58a44e08e 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "fay"; - version = "0.21.0.1"; - sha256 = "0lrnn73xqgkgh5zd4ngvl0lyzqbx5kp52j14dj2xbkbxnnivwgl4"; + version = "0.21.0.2"; + sha256 = "0hq9jfyl5ki3jcwffb9q7cxrgpchajgwk4j44kz37y1wji63lk96"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/fb/default.nix b/pkgs/development/libraries/haskell/fb/default.nix index 0eb53c9165ac..f257d26c7d32 100644 --- a/pkgs/development/libraries/haskell/fb/default.nix +++ b/pkgs/development/libraries/haskell/fb/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "fb"; - version = "1.0.6"; - sha256 = "16dwvh2xn14gpni0qpabqfifywrkdz1p0mmq6yyf3k19ix3xg9im"; + version = "1.0.7"; + sha256 = "0ghyddxf4aqidqvbm93pjgaban0whfj4y1w11b7nxy89srhyjhh8"; buildDepends = [ aeson attoparsec base16Bytestring base64Bytestring cereal conduit conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault diff --git a/pkgs/development/libraries/haskell/focus/default.nix b/pkgs/development/libraries/haskell/focus/default.nix index 480d974e2b88..9a890587f848 100644 --- a/pkgs/development/libraries/haskell/focus/default.nix +++ b/pkgs/development/libraries/haskell/focus/default.nix @@ -1,12 +1,11 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, lochTh, placeholders }: +{ cabal }: cabal.mkDerivation (self: { pname = "focus"; - version = "0.1.2"; - sha256 = "0j157nv668621i94iqg923bfg7594bpfn0q9scb62cik2yikc1p0"; - buildDepends = [ lochTh placeholders ]; + version = "0.1.3"; + sha256 = "11l6rlr22m0z41c9fynpisj0cnx70zzcxhsakz9b09ap8wj0raqy"; meta = { homepage = "https://github.com/nikita-volkov/focus"; description = "A general abstraction for manipulating elements of container data structures"; diff --git a/pkgs/development/libraries/haskell/gio/default.nix b/pkgs/development/libraries/haskell/gio/default.nix index 443a15ff7a9e..7b53ccf1179b 100644 --- a/pkgs/development/libraries/haskell/gio/default.nix +++ b/pkgs/development/libraries/haskell/gio/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gio"; - version = "0.13.0.1"; - sha256 = "03194npzv48flg6pba3m8c5gfmmy34z0545y84wa979z21fbv22m"; + version = "0.13.0.2"; + sha256 = "12wcgycljlrxbf9hdp0c9n6d2h709wb3jk94v3lngwc7z5lnv5hs"; buildDepends = [ glib mtl ]; buildTools = [ gtk2hsBuildtools ]; pkgconfigDepends = [ glib ]; diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index 57a0b05dcd77..1229b7c8506e 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "glib"; - version = "0.13.0.4"; - sha256 = "1ckl6liw6x4hqirki1vcxrvdca0cf17kpxnngrfnxvndlwghly68"; + version = "0.13.0.5"; + sha256 = "0drpsdzdk47qkcn9jca8i4xrhhcql5gphm9wx2xaavqs8g7aqkg3"; buildDepends = [ text utf8String ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index 03c814d359f1..e9a90659a95f 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "gtk"; - version = "0.13.0.2"; - sha256 = "0m5gvs2zsm8y742yvfcd8h6qqihgjjyhhz8f4dxg589bhckv3amj"; + version = "0.13.0.3"; + sha256 = "1l42hn3mhycq2b7z517jjyz3s8kvf5nyy0m674da0h2rixw9r5fh"; buildDepends = [ cairo gio glib mtl pango text ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/gtk3/default.nix b/pkgs/development/libraries/haskell/gtk3/default.nix index c6365eb8000c..52604727d8a5 100644 --- a/pkgs/development/libraries/haskell/gtk3/default.nix +++ b/pkgs/development/libraries/haskell/gtk3/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "gtk3"; - version = "0.13.0.2"; - sha256 = "0j5df9xah5ya91x3d7cyy5zw7mkw3j2y7n0vv5s78w0adchaxzzl"; + version = "0.13.0.3"; + sha256 = "12ywqxvmakcdmfj5y4jpn91rxa4xskd0w3hn2l679dk6lxyl15q7"; isLibrary = true; isExecutable = true; buildDepends = [ cairo gio glib mtl pango text time transformers ]; diff --git a/pkgs/development/libraries/haskell/gtksourceview2/default.nix b/pkgs/development/libraries/haskell/gtksourceview2/default.nix index cee7f9737fd0..d3f0f3136f83 100644 --- a/pkgs/development/libraries/haskell/gtksourceview2/default.nix +++ b/pkgs/development/libraries/haskell/gtksourceview2/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "gtksourceview2"; - version = "0.13.1.0"; - sha256 = "1znmr694jxam9n5lgikrhf8wb4jwdml82a3mgnpfr482a8knndbn"; + version = "0.13.1.1"; + sha256 = "09439drmwfy5bqni1clcn0nng30irn9x43fjak9jljggg1yij9xw"; buildDepends = [ glib gtk mtl text ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index d8ac50c85a0f..b5fc3115142d 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -15,6 +15,8 @@ cabal.mkDerivation (self: { sha256 = "1igna446dsidlq3f9myclgcdawgvyyjxjk3r3icjra6zgdqd6j4l"; isLibrary = true; isExecutable = true; + patches = [ ./deps.patch ]; + doCheck = !self.stdenv.isDarwin; buildDepends = [ binary blazeHtml blazeMarkup cmdargs cryptohash dataDefault deepseq filepath fsnotify httpConduit httpTypes lrucache mtl network @@ -26,14 +28,14 @@ cabal.mkDerivation (self: { filepath fsnotify httpConduit httpTypes HUnit lrucache mtl network networkUri pandoc pandocCiteproc parsec QuickCheck random regexBase regexTdfa snapCore snapServer systemFilepath tagsoup testFramework - testFrameworkHunit testFrameworkQuickcheck2 text time utillinux - ]; + testFrameworkHunit testFrameworkQuickcheck2 text time + ] ++ (self.stdenv.lib.optional self.stdenv.isLinux utillinux); meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; - broken = true; + broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version; }; }) diff --git a/pkgs/development/libraries/haskell/hakyll/deps.patch b/pkgs/development/libraries/haskell/hakyll/deps.patch new file mode 100644 index 000000000000..873d3159f9ab --- /dev/null +++ b/pkgs/development/libraries/haskell/hakyll/deps.patch @@ -0,0 +1,20 @@ +--- a/hakyll.cabal.orig 2014-10-16 17:34:22.000000000 -0500 ++++ b/hakyll.cabal 2014-10-16 17:34:30.000000000 -0500 +@@ -163,7 +163,7 @@ + pandoc-citeproc >= 0.4 && < 0.5, + parsec >= 3.0 && < 3.2, + process >= 1.0 && < 1.3, +- random >= 1.0 && < 1.1, ++ random >= 1.0 && < 1.2, + regex-base >= 0.93 && < 0.94, + regex-tdfa >= 1.1 && < 1.3, + tagsoup >= 0.13.1 && < 0.14, +@@ -250,7 +250,7 @@ + pandoc-citeproc >= 0.4 && < 0.5, + parsec >= 3.0 && < 3.2, + process >= 1.0 && < 1.3, +- random >= 1.0 && < 1.1, ++ random >= 1.0 && < 1.2, + regex-base >= 0.93 && < 0.94, + regex-tdfa >= 1.1 && < 1.3, + tagsoup >= 0.13.1 && < 0.14, diff --git a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix index 610220cc09ec..fa904e0434a4 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-lite.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-lite.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "happstack-lite"; - version = "7.3.4"; - sha256 = "06ndqfd4x49yi17kgiz5xr05l1k6sj5g1f6kir10wgsqhmd0q811"; + version = "7.3.5"; + sha256 = "1gkzkmg1ad5k9hb4gix2afq1k4j996qpp8mm1jzqk03a5njdpb4b"; buildDepends = [ happstackServer mtl text ]; meta = { homepage = "http://www.happstack.com/"; diff --git a/pkgs/development/libraries/haskell/happstack/happstack-server.nix b/pkgs/development/libraries/haskell/happstack/happstack-server.nix index 1bc0b36f1204..24b740736bf7 100644 --- a/pkgs/development/libraries/haskell/happstack/happstack-server.nix +++ b/pkgs/development/libraries/haskell/happstack/happstack-server.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "happstack-server"; - version = "7.3.8"; - sha256 = "11jy4r4ih6sndyga3fjg298f5ww8806180dm3fgzsm0xfsjw1ac2"; + version = "7.3.9"; + sha256 = "10js2kmxw5lyy1h5xyz7qx852d29cl48qxyvadc4bdad6w06gdlz"; buildDepends = [ base64Bytestring blazeHtml extensibleExceptions filepath hslogger html monadControl mtl network networkUri parsec sendfile syb diff --git a/pkgs/development/libraries/haskell/haskell-generate/default.nix b/pkgs/development/libraries/haskell/haskell-generate/default.nix index 342e8d7c9328..7ca03476110b 100644 --- a/pkgs/development/libraries/haskell/haskell-generate/default.nix +++ b/pkgs/development/libraries/haskell/haskell-generate/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "haskell-generate"; - version = "0.2.1"; - sha256 = "1b7jy4a83lv9zwkzsgbipv7vlzcj27g1h3az7nxxc2gbmyrc15f4"; + version = "0.2.2"; + sha256 = "1wdfs28p195szg6jxq0qbyj4jdbqnsp9frgjnp25mzf14y9i1yid"; buildDepends = [ haskellSrcExts transformers ]; testDepends = [ doctest filepath ]; meta = { diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.15.0.1.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.15.0.1.nix index 617378e31c64..93e07dede858 100644 --- a/pkgs/development/libraries/haskell/haskell-src-exts/1.15.0.1.nix +++ b/pkgs/development/libraries/haskell/haskell-src-exts/1.15.0.1.nix @@ -19,5 +19,6 @@ cabal.mkDerivation (self: { description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/haskintex/default.nix b/pkgs/development/libraries/haskell/haskintex/default.nix index d5a9a5ff3a28..c659d3966f0c 100644 --- a/pkgs/development/libraries/haskell/haskintex/default.nix +++ b/pkgs/development/libraries/haskell/haskintex/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "haskintex"; - version = "0.5.0.1"; - sha256 = "14x1n7x0dqcj14qkv0lmf2jcrswyjjjygqj5vdj6w29a8v9zr296"; + version = "0.5.0.2"; + sha256 = "1qfqslr8pxks3qmfarmscgvc0q8zn72prqyk5xhmfvkf6q35pmfn"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hcltest/default.nix b/pkgs/development/libraries/haskell/hcltest/default.nix index 01f683b55683..25cefc13625f 100644 --- a/pkgs/development/libraries/haskell/hcltest/default.nix +++ b/pkgs/development/libraries/haskell/hcltest/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hcltest"; - version = "0.3.4"; - sha256 = "0p8skabp6z4i5xr22qxk1sij2ayla2iqylvlzxfxa8yw1fxs8wsq"; + version = "0.3.6"; + sha256 = "145l3kfxi1slngcmh4dnn09hhpr5v6s5nppk0i5a5jzxpp2yx6sd"; buildDepends = [ dlist either filepath free lens mmorph monadControl mtl optparseApplicative randomShuffle split stm tagged tasty temporary @@ -20,7 +20,5 @@ cabal.mkDerivation (self: { description = "A testing library for command line applications"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/hindent/default.nix b/pkgs/development/libraries/haskell/hindent/default.nix index 577c4bd69526..7d003289c7a2 100644 --- a/pkgs/development/libraries/haskell/hindent/default.nix +++ b/pkgs/development/libraries/haskell/hindent/default.nix @@ -1,18 +1,22 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, dataDefault, haskellSrcExts, monadLoops, mtl, text }: +{ cabal, dataDefault, haskellSrcExts, hspec, monadLoops, mtl, text +}: cabal.mkDerivation (self: { pname = "hindent"; - version = "3.7"; - sha256 = "1ca6shxklr6vzfm565ibmrm6g6f1zwhclld781wb2w6hzbknh0c1"; + version = "3.9"; + sha256 = "0x8qm39rmaw1s0fbljr9zp6vnqxfcs1w6a3ylrknwqgwbzzr5hbn"; isLibrary = true; isExecutable = true; buildDepends = [ dataDefault haskellSrcExts monadLoops mtl text ]; + testDepends = [ + dataDefault haskellSrcExts hspec monadLoops mtl text + ]; + doCheck = false; meta = { description = "Extensible Haskell pretty printer"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/hoogle/4.2.34.nix b/pkgs/development/libraries/haskell/hoogle/4.2.34.nix new file mode 100644 index 000000000000..d498095f8b32 --- /dev/null +++ b/pkgs/development/libraries/haskell/hoogle/4.2.34.nix @@ -0,0 +1,30 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, binary, blazeBuilder, Cabal, caseInsensitive +, cmdargs, conduit, deepseq, filepath, haskellSrcExts, httpTypes +, parsec, QuickCheck, random, resourcet, safe, shake, tagsoup, text +, time, transformers, uniplate, vector, vectorAlgorithms, wai, warp +}: + +cabal.mkDerivation (self: { + pname = "hoogle"; + version = "4.2.34"; + sha256 = "0vldc7s3nq70jxmnxdzlfrlwg0pxw0lq1lcd53klj2ksjkqhm5jg"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson binary blazeBuilder Cabal caseInsensitive cmdargs conduit + deepseq filepath haskellSrcExts httpTypes parsec QuickCheck random + resourcet safe shake tagsoup text time transformers uniplate vector + vectorAlgorithms wai warp + ]; + testDepends = [ filepath ]; + testTarget = "--test-option=--no-net"; + meta = { + homepage = "http://www.haskell.org/hoogle/"; + description = "Haskell API Search"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + }; +}) diff --git a/pkgs/development/libraries/haskell/hoogle/default.nix b/pkgs/development/libraries/haskell/hoogle/4.2.36.nix similarity index 100% rename from pkgs/development/libraries/haskell/hoogle/default.nix rename to pkgs/development/libraries/haskell/hoogle/4.2.36.nix diff --git a/pkgs/development/libraries/haskell/hourglass/default.nix b/pkgs/development/libraries/haskell/hourglass/default.nix index 16b8adfa31db..92e3806b8cd1 100644 --- a/pkgs/development/libraries/haskell/hourglass/default.nix +++ b/pkgs/development/libraries/haskell/hourglass/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hourglass"; - version = "0.2.5"; - sha256 = "08nw9zqa0y09lw0c6qlh9pn8vr6h03mw1i7n7w0y3fv94az9vg9v"; + version = "0.2.6"; + sha256 = "029fmx5r6krj7y7mn4b4m2lpaa3iw6vhyznrib5lhf469i1jp9m3"; buildDepends = [ deepseq ]; testDepends = [ deepseq mtl tasty tastyHunit tastyQuickcheck time diff --git a/pkgs/development/libraries/haskell/hspec-checkers/default.nix b/pkgs/development/libraries/haskell/hspec-checkers/default.nix new file mode 100644 index 000000000000..7e5022e19b53 --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec-checkers/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, checkers, hspec }: + +cabal.mkDerivation (self: { + pname = "hspec-checkers"; + version = "0.1.0"; + sha256 = "043qzgjp9ch9wqm269dd87jn8wk5c90q25098hnz8ilv5pnywk6d"; + buildDepends = [ checkers hspec ]; + testDepends = [ checkers hspec ]; + meta = { + description = "Allows to use checkers properties from hspec"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix index 09d3a8425220..346c3bab94b6 100644 --- a/pkgs/development/libraries/haskell/hspec-meta/default.nix +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hspec-meta"; - version = "1.11.4"; - sha256 = "047vp6wibkwgs9rryjpys2qqn4s5p91mh36w0gnxwhggp8nhfqg3"; + version = "1.12.1"; + sha256 = "1920gpcam7y3slg1an8ywhw6lxammgy21nmxbxlh77iz65rldzls"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 1df977dbf57f..ee2db1fdc343 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -2,13 +2,14 @@ { cabal, ansiTerminal, async, deepseq, filepath, ghcPaths , hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo -, random, setenv, silently, tfRandom, time, transformers +, random, setenv, silently, stringbuilder, tfRandom, time +, transformers }: cabal.mkDerivation (self: { pname = "hspec"; - version = "1.11.4"; - sha256 = "044vr6xyk0ih20faa4gbl4y4v6vkss0x2gmxgkk96ha6chws2svn"; + version = "1.12.1"; + sha256 = "0w42lsl5qs452f04qpbr6nvs4qgp7cwd9262f34vzjq8m83nhjwk"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -18,7 +19,7 @@ cabal.mkDerivation (self: { testDepends = [ ansiTerminal async deepseq filepath ghcPaths hspecExpectations hspecMeta HUnit QuickCheck quickcheckIo random setenv silently - tfRandom time transformers + stringbuilder tfRandom time transformers ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix index e459e99e2fe8..da6ed933c1dc 100644 --- a/pkgs/development/libraries/haskell/hspec2/default.nix +++ b/pkgs/development/libraries/haskell/hspec2/default.nix @@ -2,13 +2,14 @@ { cabal, ansiTerminal, async, deepseq, filepath, ghcPaths , hspecExpectations, hspecMeta, HUnit, QuickCheck, quickcheckIo -, random, setenv, silently, tfRandom, time, transformers +, random, setenv, silently, stringbuilder, tfRandom, time +, transformers }: cabal.mkDerivation (self: { pname = "hspec2"; - version = "0.4.2"; - sha256 = "1wk1lvy3lngfa60n0dyllfqbj4gd4v0qxjw7gpvzknfk2y10536x"; + version = "0.5.1"; + sha256 = "1ax507vb0zm5jalp6pvlk1fjfil766pf7w61d1igpxr0s00lnvlq"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -18,7 +19,7 @@ cabal.mkDerivation (self: { testDepends = [ ansiTerminal async deepseq filepath ghcPaths hspecExpectations hspecMeta HUnit QuickCheck quickcheckIo random setenv silently - tfRandom time transformers + stringbuilder tfRandom time transformers ]; meta = { homepage = "http://hspec.github.io/"; diff --git a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix index 9f600fd195dc..71d6765f93f3 100644 --- a/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix +++ b/pkgs/development/libraries/haskell/hxt-regex-xmlschema/default.nix @@ -1,12 +1,13 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, hxtCharproperties, parsec }: +{ cabal, HUnit, hxtCharproperties, parsec, text }: cabal.mkDerivation (self: { pname = "hxt-regex-xmlschema"; - version = "9.1.0"; - sha256 = "0l97rkrvl6pmxdgiwbwh2s3l00lyaihrhsffhh69639bgs67zgwr"; - buildDepends = [ hxtCharproperties parsec ]; + version = "9.2.0"; + sha256 = "0pcbyvc71173ad0zkgpdpyyljngrk4p1jjjaw5wbwcvm4ijh44g3"; + buildDepends = [ hxtCharproperties parsec text ]; + testDepends = [ HUnit parsec text ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"; description = "A regular expression library for W3C XML Schema regular expressions"; diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix index 6d1d3cbfb6b3..a046c234e63f 100644 --- a/pkgs/development/libraries/haskell/io-streams/default.nix +++ b/pkgs/development/libraries/haskell/io-streams/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "io-streams"; - version = "1.2.0.0"; - sha256 = "1lisvwy4pj0ywm1i61qan3vxisl4xazz7z8i8iybww1dv3j6mrn2"; + version = "1.2.0.1"; + sha256 = "12r7j8dzj80f4s9942a6pi60pd9jh44sqyl6hcn0npzmdyl7hg1k"; buildDepends = [ attoparsec blazeBuilder network primitive text time transformers vector zlibBindings diff --git a/pkgs/development/libraries/haskell/ixset/default.nix b/pkgs/development/libraries/haskell/ixset/default.nix index eb118834e34d..24bbde7098d4 100644 --- a/pkgs/development/libraries/haskell/ixset/default.nix +++ b/pkgs/development/libraries/haskell/ixset/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ixset"; - version = "1.0.5"; - sha256 = "1hznn7f8f13x5125n76dchayi16z72050qbwifnkrca54nf9q2ns"; + version = "1.0.6"; + sha256 = "097f9fkm9a2n67bzagr9h2v7acdn8h1ayv9c83n7nv1dh157bpyv"; buildDepends = [ safecopy syb sybWithClass ]; meta = { homepage = "http://happstack.com"; diff --git a/pkgs/development/libraries/haskell/json-rpc/default.nix b/pkgs/development/libraries/haskell/json-rpc/default.nix index 1062a0b35239..c7e5c3373c5e 100644 --- a/pkgs/development/libraries/haskell/json-rpc/default.nix +++ b/pkgs/development/libraries/haskell/json-rpc/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "json-rpc"; - version = "0.2.0.2"; - sha256 = "00ha6hjg9ccwa48ab5ibnkiiri7ki3rv7ms2h9qbwr30lxyb0r88"; + version = "0.2.1.1"; + sha256 = "0h6dkb1rgd6qxzcxvqvgwilmibkdbqpjvflijwf54fx2z687fjld"; buildDepends = [ aeson async conduit conduitExtra deepseq hashable mtl stm stmConduit text unorderedContainers diff --git a/pkgs/development/libraries/haskell/jwt/default.nix b/pkgs/development/libraries/haskell/jwt/default.nix index c53a6465096a..27eb104f4dff 100644 --- a/pkgs/development/libraries/haskell/jwt/default.nix +++ b/pkgs/development/libraries/haskell/jwt/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "jwt"; - version = "0.4.1"; - sha256 = "0rzy85ziljvmw62zlnifpy5g7l9m1pms331svaylj00ny17bq803"; + version = "0.4.2"; + sha256 = "167qm37y5f3d05spr0z2jwkbm2sszz3khs6zd1p0az5q4nhq295w"; buildDepends = [ aeson base64Bytestring cryptohash dataDefault httpTypes network networkUri scientific text time unorderedContainers @@ -24,6 +24,5 @@ cabal.mkDerivation (self: { description = "JSON Web Token (JWT) decoding and encoding"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/lambdabot/default.nix b/pkgs/development/libraries/haskell/lambdabot/default.nix index 88cd164ae4e9..6b09752f7d46 100644 --- a/pkgs/development/libraries/haskell/lambdabot/default.nix +++ b/pkgs/development/libraries/haskell/lambdabot/default.nix @@ -16,6 +16,7 @@ cabal.mkDerivation (self: { sha256 = "19pkm4m2xk9ziai3ka4scxjavi0as8dmivz9q6vg3npmv0kyhkhb"; isLibrary = true; isExecutable = true; + patches = [ ./deps.patch ]; buildDepends = [ arrows binary brainfuck dataMemocombinators dependentMap dependentSum dependentSumTemplate dice editDistance filepath diff --git a/pkgs/development/libraries/haskell/lambdabot/deps.patch b/pkgs/development/libraries/haskell/lambdabot/deps.patch new file mode 100644 index 000000000000..a92228067194 --- /dev/null +++ b/pkgs/development/libraries/haskell/lambdabot/deps.patch @@ -0,0 +1,21 @@ +--- a/lambdabot.cabal.orig 2014-10-16 17:39:16.000000000 -0500 ++++ b/lambdabot.cabal 2014-10-16 18:26:58.000000000 -0500 +@@ -166,7 +166,7 @@ + edit-distance >= 0.2, + filepath >= 1.3, + haskeline >= 0.7, +- haskell-src-exts >= 1.14.0, ++ haskell-src-exts >= 1.14.0 && < 1.16, + hstatsd >= 0.1, + hslogger >= 1.2.1, + HTTP >= 4000, +@@ -174,7 +174,8 @@ + misfortune >= 0.1, + monad-control >= 0.3, + mtl >= 2, +- network >= 2.3.0.13, ++ network >= 2.6, ++ network-uri >= 2.6, + oeis >= 0.3.1, + time >= 1.4, + parsec >= 3, diff --git a/pkgs/development/libraries/haskell/language-c-quote/default.nix b/pkgs/development/libraries/haskell/language-c-quote/default.nix index d08a5c7fab9b..03b1d62546b1 100644 --- a/pkgs/development/libraries/haskell/language-c-quote/default.nix +++ b/pkgs/development/libraries/haskell/language-c-quote/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "language-c-quote"; - version = "0.8.0"; - sha256 = "0k171hbwj108azhlwpnvkl0r4n0kg4yg2mxqvg8cpf47i9bigw5g"; + version = "0.10.1.3"; + sha256 = "0kbnqrplwb5w9jfljsrjxisnrnxbc0221hpznvq4m1ldx2mkrh1k"; buildDepends = [ exceptionMtl exceptionTransformers filepath haskellSrcMeta mainlandPretty mtl srcloc syb symbol diff --git a/pkgs/development/libraries/haskell/leveldb-haskell/default.nix b/pkgs/development/libraries/haskell/leveldb-haskell/default.nix index 67cddbfac4b4..2e3ba0032335 100644 --- a/pkgs/development/libraries/haskell/leveldb-haskell/default.nix +++ b/pkgs/development/libraries/haskell/leveldb-haskell/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "leveldb-haskell"; - version = "0.5.1"; - sha256 = "132r23svaazb26jnapgr3r8v8xmr8ln3w5r0iv8fg7pm55gsixx5"; + version = "0.6"; + sha256 = "1r76dvn8scnjfdw1i5cj3s5s1nqf2yib4jdydjnr8p6c8yvpp3z5"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -24,6 +24,5 @@ cabal.mkDerivation (self: { description = "Haskell bindings to LevelDB"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/monad-supply/default.nix b/pkgs/development/libraries/haskell/monad-supply/default.nix index d2b2266b681e..e8c598d3a302 100644 --- a/pkgs/development/libraries/haskell/monad-supply/default.nix +++ b/pkgs/development/libraries/haskell/monad-supply/default.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "monad-supply"; - version = "0.5"; - sha256 = "1f4l7sh0p7cxlg3wr5agpflycl4g9zh8chc4bilzglwx3xffbqqp"; + version = "0.6"; + sha256 = "1gg4r7fwaq2fa0lz8pz301mk3q16xpbs7qv54hhggxrv3i1h33ir"; buildDepends = [ mtl ]; meta = { description = "Stateful supply monad"; license = "unknown"; platforms = self.ghc.meta.platforms; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/monadloc-pp/default.nix b/pkgs/development/libraries/haskell/monadloc-pp/default.nix index 37855b131866..9ff5d5079cef 100644 --- a/pkgs/development/libraries/haskell/monadloc-pp/default.nix +++ b/pkgs/development/libraries/haskell/monadloc-pp/default.nix @@ -4,18 +4,17 @@ cabal.mkDerivation (self: { pname = "monadloc-pp"; - version = "0.3"; - sha256 = "0jr9ngcj3l6kd5cscll5kr3a4bp52sdjgrdxd1j5a21jyc3gdyvn"; + version = "0.3.1"; + sha256 = "0ch25kcz63xhinwd6mjqbhm282hfh280s3z910wnvdp3krgx0mpc"; isLibrary = false; isExecutable = true; buildDepends = [ filepath haskellSrcExts monadloc syb ]; jailbreak = true; meta = { - homepage = "http://github.com/pepeiborra/monadloc"; + homepage = "http://github.com/pepeiborra/monadloc-pp"; description = "A preprocessor for generating monadic call traces"; license = self.stdenv.lib.licenses.publicDomain; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ tomberek ]; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix b/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix new file mode 100644 index 000000000000..372c8706cc91 --- /dev/null +++ b/pkgs/development/libraries/haskell/mtl/2.1.3.1.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, transformers }: + +cabal.mkDerivation (self: { + pname = "mtl"; + version = "2.1.3.1"; + sha256 = "1xpn2wjmqbh2cg1yssc6749xpgcqlrrg4iilwqgkcjgvaxlpdbvp"; + buildDepends = [ transformers ]; + meta = { + homepage = "http://github.com/ekmett/mtl"; + description = "Monad classes, using functional dependencies"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + }; +}) diff --git a/pkgs/development/libraries/haskell/mysql/default.nix b/pkgs/development/libraries/haskell/mysql/default.nix index a9801f6415fd..5422443d2fe5 100644 --- a/pkgs/development/libraries/haskell/mysql/default.nix +++ b/pkgs/development/libraries/haskell/mysql/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "mysql"; - version = "0.1.1.6"; - sha256 = "1sxzx5f4ysxhq1nimkj4xwf87i7prwp5wg0kjbhv9pbn65zc9mmj"; + version = "0.1.1.7"; + sha256 = "0hl8z8ynadvvhn4garjrax2b59iqddj884mv3s6804lcjjyc49d0"; buildTools = [ mysqlConfig ]; extraLibraries = [ zlib ]; meta = { diff --git a/pkgs/development/libraries/haskell/network-simple/default.nix b/pkgs/development/libraries/haskell/network-simple/default.nix index 41077efed0b8..ba7b0a01f5f4 100644 --- a/pkgs/development/libraries/haskell/network-simple/default.nix +++ b/pkgs/development/libraries/haskell/network-simple/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "network-simple"; - version = "0.4.0.1"; - sha256 = "113vaxgsfny9iv6hnbywk97qr1y6qkap49p803anakamss4bdmyj"; + version = "0.4.0.2"; + sha256 = "0k155m1s7k157rpsz8ww9cs7jyw3faybwfmw97agvskhb4axw6hf"; buildDepends = [ exceptions network transformers ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix new file mode 100644 index 000000000000..c4706634eccd --- /dev/null +++ b/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix @@ -0,0 +1,29 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, aesonPretty, attoparsec, filepath, hexpat +, hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb +, tagsoup, temporary, text, time, vector, yaml +}: + +cabal.mkDerivation (self: { + pname = "pandoc-citeproc"; + version = "0.4.0.1"; + sha256 = "1z21mdxa2hrwqdclriyn3s1qqij3ccbkg7hb0acxrk3pzgidcinx"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson aesonPretty attoparsec filepath hexpat hsBibutils mtl pandoc + pandocTypes parsec rfc5051 split syb tagsoup temporary text time + vector yaml + ]; + testDepends = [ + aeson filepath pandoc pandocTypes temporary text yaml + ]; + doCheck = false; + meta = { + description = "Supports using pandoc with citeproc"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + }; +}) diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix new file mode 100644 index 000000000000..c6dc859ed8df --- /dev/null +++ b/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix @@ -0,0 +1,29 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, aesonPretty, attoparsec, filepath, hexpat +, hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb +, tagsoup, temporary, text, time, vector, yaml +}: + +cabal.mkDerivation (self: { + pname = "pandoc-citeproc"; + version = "0.5"; + sha256 = "00azhpll0xnb9nnkh7c3hbfk0fzmvh5cgdxlgx7jvaglrmsnvzw3"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson aesonPretty attoparsec filepath hexpat hsBibutils mtl pandoc + pandocTypes parsec rfc5051 split syb tagsoup temporary text time + vector yaml + ]; + testDepends = [ + aeson filepath pandoc pandocTypes temporary text yaml + ]; + doCheck = false; + meta = { + description = "Supports using pandoc with citeproc"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + }; +}) diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/0.6.nix similarity index 100% rename from pkgs/development/libraries/haskell/pandoc-citeproc/default.nix rename to pkgs/development/libraries/haskell/pandoc-citeproc/0.6.nix diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix index 11323122676d..c3ce339f7d55 100644 --- a/pkgs/development/libraries/haskell/pango/default.nix +++ b/pkgs/development/libraries/haskell/pango/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pango"; - version = "0.13.0.2"; - sha256 = "1f546k53j5ymb1321n31na0fpm69idx5l0nh9s75yallbij3gyfg"; + version = "0.13.0.3"; + sha256 = "0xvmv1r7lh727w1pag8myp069s4wnvgsqlr3c3ir1gyzxy5jq69f"; buildDepends = [ cairo glib mtl text ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix index f9f631827d89..5ca5ab956228 100644 --- a/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix +++ b/pkgs/development/libraries/haskell/pdf-toolbox-content/default.nix @@ -6,12 +6,13 @@ cabal.mkDerivation (self: { pname = "pdf-toolbox-content"; - version = "0.0.3.0"; - sha256 = "0glcm6mrgg8ixzhp09kfkk3ra3qblvrp1wcsa2nhqlypg3ca8r3h"; + version = "0.0.3.1"; + sha256 = "08icj65l6hjl2r07ipr6c65n7ny771zq714bswhv2q0iwdigz1iz"; buildDepends = [ attoparsec base16Bytestring ioStreams pdfToolboxCore text ]; meta = { + homepage = "https://github.com/Yuras/pdf-toolbox"; description = "A collection of tools for processing PDF files"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix index bfccb645fbb2..bc7b179a0da2 100644 --- a/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix +++ b/pkgs/development/libraries/haskell/pdf-toolbox-core/default.nix @@ -1,14 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, attoparsec, errors, ioStreams, transformers, zlibBindings +{ cabal, attoparsec, errors, ioStreams, scientific, transformers +, zlibBindings }: cabal.mkDerivation (self: { pname = "pdf-toolbox-core"; - version = "0.0.2.1"; - sha256 = "14jj6xprzh2k1njal0mgapkm3xivy8370p9kdjxha9gnwmc581df"; + version = "0.0.3.0"; + sha256 = "1d9c275gdr2byri6nbabh2ap6lnq0wnfqfqq76fnb0fj92ydmxc6"; buildDepends = [ - attoparsec errors ioStreams transformers zlibBindings + attoparsec errors ioStreams scientific transformers zlibBindings ]; meta = { homepage = "https://github.com/Yuras/pdf-toolbox"; diff --git a/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix b/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix index b62d3e92e5ef..77615ed86650 100644 --- a/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix +++ b/pkgs/development/libraries/haskell/pdf-toolbox-document/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pdf-toolbox-document"; - version = "0.0.3.0"; - sha256 = "0y1kb2hf420jx6r81c431avgar32wzx2xr747akcs4rypf6w53fn"; + version = "0.0.4.0"; + sha256 = "1fjchlknkxxgy6rm2q4f9fhy53ip06kzvcv5876gxswdchi6kxwa"; buildDepends = [ cipherRc4 cryptohash ioStreams pdfToolboxContent pdfToolboxCore text transformers diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index 1161017bbbfe..1343404a15d5 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "persistent-postgresql"; - version = "2.1"; - sha256 = "0458z9n61wn8g55cp8a9061qgc99i5yp3wmwmf3x4p4vfkl5kw9c"; + version = "2.1.0.1"; + sha256 = "0ndy8vbzxqcdx9hqmpmp9f7b8cd6lpgzzc8m7jlwzjz4agc51767"; buildDepends = [ aeson blazeBuilder conduit monadControl monadLogger persistent postgresqlLibpq postgresqlSimple resourcet text time transformers diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index a8aca43f65d7..805068f900f2 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "2.1"; - sha256 = "0ybjjya8q4kwnq6lksahpm0g8wzxwzfqxqmkrw18vw4fb7kry58k"; + version = "2.1.0.1"; + sha256 = "0506w53shy0ck7vyncrhh5prp9jri8bbp2awzbkavfxiwzra1l83"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit exceptions fastLogger liftedBase monadControl monadLogger mtl diff --git a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix index 51eba83bb82b..d9d5caf4d29e 100644 --- a/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix +++ b/pkgs/development/libraries/haskell/pipes-attoparsec/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pipes-attoparsec"; - version = "0.5.1"; - sha256 = "0qvsvbcn211xp4c669cpljmnsqn9zk1rn94ya1dbq77l970s8xah"; + version = "0.5.1.1"; + sha256 = "1ns8s3p6jh4iya71z3j81cqnrfnr4n92kblwgkjlapb23dykl2qz"; buildDepends = [ attoparsec pipes pipesParse text transformers ]; testDepends = [ attoparsec HUnit mmorph pipes pipesParse tasty tastyHunit text diff --git a/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix b/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix index 46d7fbbdcfb3..4f6d728122c7 100644 --- a/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix +++ b/pkgs/development/libraries/haskell/primitive/0.5.3.0.nix @@ -11,5 +11,6 @@ cabal.mkDerivation (self: { description = "Primitive memory-related operations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/rest-gen/default.nix b/pkgs/development/libraries/haskell/rest-gen/default.nix index 708122b92f35..4a75f3508faf 100644 --- a/pkgs/development/libraries/haskell/rest-gen/default.nix +++ b/pkgs/development/libraries/haskell/rest-gen/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "rest-gen"; - version = "0.16.0.2"; - sha256 = "0sh3sgv02x49pr02yb9jsd694g27xifnclrcc6npkkbkcvy9m7y7"; + version = "0.16.0.3"; + sha256 = "1gl0dhl2dajlgms8f297x1763dqbrp9cszfq2qggzcdn896zxxgn"; buildDepends = [ aeson blazeHtml Cabal codeBuilder fclabels filepath hashable haskellSrcExts hslogger HStringTemplate hxt jsonSchema restCore diff --git a/pkgs/development/libraries/haskell/rethinkdb/default.nix b/pkgs/development/libraries/haskell/rethinkdb/default.nix index f0260034aded..794dd5fb9287 100644 --- a/pkgs/development/libraries/haskell/rethinkdb/default.nix +++ b/pkgs/development/libraries/haskell/rethinkdb/default.nix @@ -7,18 +7,19 @@ cabal.mkDerivation (self: { pname = "rethinkdb"; - version = "1.15.0.0"; - sha256 = "0zswbz73c8h7h31ppw5251l6spn6y5ha3hm9hb90j04hjg8g235i"; + version = "1.15.1.0"; + sha256 = "139a5xii9fkywr1fq7z37wvs732w6j06005z6r7ycr99swrzpgvq"; buildDepends = [ aeson base64Bytestring binary dataDefault mtl network scientific text time unorderedContainers utf8String vector ]; testDepends = [ doctest ]; + jailbreak = true; + doCheck = false; meta = { homepage = "http://github.com/atnnn/haskell-rethinkdb"; - description = "A driver for the RethinkDB database server"; + description = "A driver for RethinkDB 1.15"; license = self.stdenv.lib.licenses.asl20; platforms = self.ghc.meta.platforms; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/sdl2/default.nix b/pkgs/development/libraries/haskell/sdl2/default.nix index dc8ef033c028..d433fb59b839 100644 --- a/pkgs/development/libraries/haskell/sdl2/default.nix +++ b/pkgs/development/libraries/haskell/sdl2/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "sdl2"; - version = "1.1.2"; - sha256 = "1viy6f8iqbw264hmsvfqjf8b27h8klyybywd5976yin6ianbqm2a"; + version = "1.1.3"; + sha256 = "111kbairf50j8kkndcc54i0gsfaffnyla7zw49gbqlqs4kgxj6b5"; extraLibraries = [ SDL2 ]; pkgconfigDepends = [ SDL2 ]; meta = { diff --git a/pkgs/development/libraries/haskell/shell-conduit/default.nix b/pkgs/development/libraries/haskell/shell-conduit/default.nix index bbac214625e2..7cbe69021473 100644 --- a/pkgs/development/libraries/haskell/shell-conduit/default.nix +++ b/pkgs/development/libraries/haskell/shell-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "shell-conduit"; - version = "4.2"; - sha256 = "1ac1imsz1ffm0ldi29ylprgs4zh0qhn52ka17zn8f9301hfx9vhc"; + version = "4.3"; + sha256 = "1f82ncdsi4w63r48aj7679hii0hkd46drdz3bdgwxqx2yynjmlj8"; buildDepends = [ async conduit conduitExtra controlMonadLoop filepath monadControl monadsTf resourcet semigroups split text these transformers diff --git a/pkgs/development/libraries/haskell/tasty-hspec/default.nix b/pkgs/development/libraries/haskell/tasty-hspec/default.nix index 6afcdd67b948..6f8ff2e9add9 100644 --- a/pkgs/development/libraries/haskell/tasty-hspec/default.nix +++ b/pkgs/development/libraries/haskell/tasty-hspec/default.nix @@ -17,5 +17,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/tasty-th/default.nix b/pkgs/development/libraries/haskell/tasty-th/default.nix index 2679c57cff07..98d62036e835 100644 --- a/pkgs/development/libraries/haskell/tasty-th/default.nix +++ b/pkgs/development/libraries/haskell/tasty-th/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty-th"; - version = "0.1.2"; - sha256 = "1x3kixv0hnb7icigz2kfq959pivdc4jaaalvdgn8dlyqzkvfjzx4"; + version = "0.1.3"; + sha256 = "1fl5pagm9bdqvp7v54ilkr91m667rxw1jifwfdhrikr938aqrzx3"; buildDepends = [ languageHaskellExtract tasty ]; meta = { homepage = "http://github.com/bennofs/tasty-th"; diff --git a/pkgs/development/libraries/haskell/template/default.nix b/pkgs/development/libraries/haskell/template/default.nix index f51ae4f0a3d1..4eceef5729d4 100644 --- a/pkgs/development/libraries/haskell/template/default.nix +++ b/pkgs/development/libraries/haskell/template/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "template"; - version = "0.2.0.9"; - sha256 = "0i1xq6nj240gddbd8d5m42gzix16k81wqmirpy5a4fssnkpwjqnb"; + version = "0.2.0.10"; + sha256 = "10mcnhi2rdflmv79z0359nn5sylifvk9ih38xnjqqby6n4hs7mcg"; buildDepends = [ mtl text ]; meta = { description = "Simple string substitution"; diff --git a/pkgs/development/libraries/haskell/th-lift-instances/default.nix b/pkgs/development/libraries/haskell/th-lift-instances/default.nix index 0ecd9d70989a..36e994a8bb8b 100644 --- a/pkgs/development/libraries/haskell/th-lift-instances/default.nix +++ b/pkgs/development/libraries/haskell/th-lift-instances/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "th-lift-instances"; - version = "0.1.3"; - sha256 = "0snqgcdkskwvrsw239j3xq84mwnf5x79kfsn495kprdc6yh3qdkx"; + version = "0.1.4"; + sha256 = "02sf7qn1rs33cdf1dl7vpwkhqzhmj8h3naw0ngh2kz05ymk2qng4"; buildDepends = [ text thLift vector ]; testDepends = [ doctest filepath QuickCheck text vector ]; meta = { diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix index 187637011264..110f9f396c1d 100644 --- a/pkgs/development/libraries/haskell/thyme/default.nix +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "thyme"; - version = "0.3.5.2"; - sha256 = "1vb5qn9m88y9738d9znim5lprb8z10am5yjaksdjl151li8apd6x"; + version = "0.3.5.3"; + sha256 = "1gfqj9rsjmc8gdg2qrzdnjnjdwdls55k061qh82ihwa6l7nfkjv1"; buildDepends = [ aeson attoparsec deepseq mtl profunctors QuickCheck random text time vector vectorSpace vectorThUnbox diff --git a/pkgs/development/libraries/haskell/tls/default.nix b/pkgs/development/libraries/haskell/tls/default.nix index 45cb3c693944..d9b82d137693 100644 --- a/pkgs/development/libraries/haskell/tls/default.nix +++ b/pkgs/development/libraries/haskell/tls/default.nix @@ -1,26 +1,26 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, asn1Encoding, asn1Types, byteable, cereal, cipherAes -, cipherDes, cipherRc4, cprngAes, cryptoCipherTypes, cryptohash -, cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes, cryptoRandom -, dataDefaultClass, mtl, network, QuickCheck, testFramework -, testFrameworkQuickcheck2, time, x509, x509Store, x509Validation +{ cabal, asn1Encoding, asn1Types, async, byteable, cereal +, cipherAes, cipherDes, cipherRc4, cprngAes, cryptoCipherTypes +, cryptohash, cryptoNumbers, cryptoPubkey, cryptoPubkeyTypes +, cryptoRandom, dataDefaultClass, hourglass, mtl, network +, QuickCheck, tasty, tastyQuickcheck, transformers, x509, x509Store +, x509Validation }: cabal.mkDerivation (self: { pname = "tls"; - version = "1.2.9"; - sha256 = "1cwhwxpsxx9x5hv2c66d3yvbs84lrgaxmaz18skidmhqhs4i0sjy"; + version = "1.2.13"; + sha256 = "1djjscmyn3wcnlzz1r0clz2nxa2y23rlyjk30xjsdp0m1sq0vdc3"; buildDepends = [ - asn1Encoding asn1Types byteable cereal cipherAes cipherDes + asn1Encoding asn1Types async byteable cereal cipherAes cipherDes cipherRc4 cryptoCipherTypes cryptohash cryptoNumbers cryptoPubkey - cryptoPubkeyTypes cryptoRandom dataDefaultClass mtl network x509 - x509Store x509Validation + cryptoPubkeyTypes cryptoRandom dataDefaultClass mtl network + transformers x509 x509Store x509Validation ]; testDepends = [ - cereal cprngAes cryptoPubkey cryptoRandom dataDefaultClass mtl - QuickCheck testFramework testFrameworkQuickcheck2 time x509 - x509Validation + cereal cprngAes cryptoPubkey cryptoRandom dataDefaultClass + hourglass mtl QuickCheck tasty tastyQuickcheck x509 x509Validation ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/validation/default.nix b/pkgs/development/libraries/haskell/validation/default.nix new file mode 100644 index 000000000000..2ae7e9c66e52 --- /dev/null +++ b/pkgs/development/libraries/haskell/validation/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bifunctors, doctest, filepath, lens, QuickCheck +, semigroupoids, semigroups, transformers +}: + +cabal.mkDerivation (self: { + pname = "validation"; + version = "0.4.1"; + sha256 = "05mws9gqlqjmzcw6d3kclrh9dybchhp61qsfwg77h31n44j7w0mh"; + buildDepends = [ + bifunctors lens semigroupoids semigroups transformers + ]; + testDepends = [ doctest filepath QuickCheck ]; + meta = { + homepage = "https://github.com/tonymorris/validation"; + description = "A data-type like Either but with an accumulating Applicative"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix index 0f48fbecf063..634116b3d9b7 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.0.1.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.0.1.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.10.0.1"; sha256 = "1bq8am8qnpnsla315i21f1kikikalyz9ps1izxgpr9q1ic2lbsgc"; buildDepends = [ deepseq primitive ]; + configureFlags = "${self.stdenv.lib.optionalString self.stdenv.isi686 "--ghc-options=-msse2"}"; meta = { homepage = "http://code.haskell.org/vector"; description = "Efficient Arrays"; diff --git a/pkgs/development/libraries/haskell/vector/0.10.11.0.nix b/pkgs/development/libraries/haskell/vector/0.10.11.0.nix index e93160ff6d0e..6929594c62ba 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.11.0.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.11.0.nix @@ -7,10 +7,12 @@ cabal.mkDerivation (self: { version = "0.10.11.0"; sha256 = "0f5jks8q0287zgzlfg3x7akpahck6dm1c37hb8kk6qn51csx515j"; buildDepends = [ deepseq primitive ]; + configureFlags = "${self.stdenv.lib.optionalString self.stdenv.isi686 "--ghc-options=-msse2"}"; meta = { homepage = "https://github.com/haskell/vector"; description = "Efficient Arrays"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/vector/0.10.12.1.nix b/pkgs/development/libraries/haskell/vector/0.10.12.1.nix index 0011b35b7dbb..e83a53b57a1d 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.12.1.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.12.1.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { QuickCheck random testFramework testFrameworkQuickcheck2 transformers ]; + configureFlags = "${self.stdenv.lib.optionalString self.stdenv.isi686 "--ghc-options=-msse2"}"; meta = { homepage = "https://github.com/haskell/vector"; description = "Efficient Arrays"; diff --git a/pkgs/development/libraries/haskell/vector/0.10.9.3.nix b/pkgs/development/libraries/haskell/vector/0.10.9.3.nix index d07f27bee310..42796bea5481 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.9.3.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.9.3.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.10.9.3"; sha256 = "08mlg0v7an6mm04skvxrgfndab0wikfs4glv7jj8ylxwc8959kdx"; buildDepends = [ deepseq primitive ]; + configureFlags = "${self.stdenv.lib.optionalString self.stdenv.isi686 "--ghc-options=-msse2"}"; meta = { homepage = "https://github.com/haskell/vector"; description = "Efficient Arrays"; diff --git a/pkgs/development/libraries/haskell/vty-ui/default.nix b/pkgs/development/libraries/haskell/vty-ui/default.nix index e8775c7d112c..0e419afdfbf9 100644 --- a/pkgs/development/libraries/haskell/vty-ui/default.nix +++ b/pkgs/development/libraries/haskell/vty-ui/default.nix @@ -19,5 +19,6 @@ cabal.mkDerivation (self: { description = "An interactive terminal user interface library for Vty"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/vty/4.7.5.nix b/pkgs/development/libraries/haskell/vty/4.7.5.nix deleted file mode 100644 index 1eccdd58fefc..000000000000 --- a/pkgs/development/libraries/haskell/vty/4.7.5.nix +++ /dev/null @@ -1,29 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, Cabal, deepseq, mtl, parallel, parsec, QuickCheck, random -, stringQq, terminfo, utf8String, vector -}: - -cabal.mkDerivation (self: { - pname = "vty"; - version = "4.7.5"; - sha256 = "0ahd5qjszfw1xbl5jxhzfw31mny8hp8clw9qciv15xn442prvvpr"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - deepseq mtl parallel parsec stringQq terminfo utf8String vector - ]; - testDepends = [ - Cabal deepseq mtl parallel parsec QuickCheck random terminfo - utf8String vector - ]; - jailbreak = true; - doCheck = false; - meta = { - homepage = "https://github.com/coreyoconnor/vty"; - description = "A simple terminal UI library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/vty/5.2.3.nix b/pkgs/development/libraries/haskell/vty/default.nix similarity index 93% rename from pkgs/development/libraries/haskell/vty/5.2.3.nix rename to pkgs/development/libraries/haskell/vty/default.nix index f4685d3e50ca..c5b7ffa6c0e8 100644 --- a/pkgs/development/libraries/haskell/vty/5.2.3.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "5.2.3"; - sha256 = "0afgysliv7bi3x46cj8bcmahfc1lz2niyfmvnzrf9brhxf7l9y76"; + version = "5.2.4"; + sha256 = "0dqp54sf6pl7magjhd91k87z50zi83x6w27kmyzp55112aiy7bf6"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 055802ad04e8..8d4b598e2b87 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "3.0.0.1"; - sha256 = "1xqw7xvbq38m19337vpalnz5c5mvc57mfp53vqbah3lalxy9mqby"; + version = "3.0.0.2"; + sha256 = "1y8x8gb60330mxzp649xp8dhancimmraf2h7py76wjmjp5vc5cx4"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix index bed9467a9d25..88f268782805 100644 --- a/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix +++ b/pkgs/development/libraries/haskell/web-routes-boomerang/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "web-routes-boomerang"; - version = "0.28.2"; - sha256 = "17237xq8nvy0c1mxzf7pad5kw0mrgbzazy0rflp382ig9q6ipd05"; + version = "0.28.3"; + sha256 = "0d3ccp4hbzjhqzqy901da8dpz23sylwg54xs5iyjhmqvw0v7ljpn"; buildDepends = [ boomerang mtl parsec text webRoutes ]; meta = { description = "Library for maintaining correctness and composability of URLs within an application"; diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix index 12f2212c8e35..b29d42dc9611 100644 --- a/pkgs/development/libraries/haskell/web-routes/default.nix +++ b/pkgs/development/libraries/haskell/web-routes/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "web-routes"; - version = "0.27.6"; - sha256 = "16jmiwnwmq9bkifk14dfs88a2kyy7rqybyq68ybrjq1x84x6pkkp"; + version = "0.27.7"; + sha256 = "0q6rl8vasbkq24jdfdq6jrjivcqqmdy34w8zw5zczmscpyjqf0zb"; buildDepends = [ blazeBuilder httpTypes mtl parsec split text utf8String ]; diff --git a/pkgs/development/libraries/haskell/webkit/default.nix b/pkgs/development/libraries/haskell/webkit/default.nix index 10cd225cee41..2c3cdb39d80d 100644 --- a/pkgs/development/libraries/haskell/webkit/default.nix +++ b/pkgs/development/libraries/haskell/webkit/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "webkit"; - version = "0.13.0.2"; - sha256 = "1dagfc5v5ihg7hm8vkymg1jyhxqhlxb8f4bnbmjcv4sffbm9q14f"; + version = "0.13.0.3"; + sha256 = "0l05cg6krafpcfszcka03x7gay8wg1fhd0gpbn2cchfshfkicgxc"; buildDepends = [ cairo glib gtk mtl pango text ]; buildTools = [ gtk2hsBuildtools ]; pkgconfigDepends = [ webkit ]; diff --git a/pkgs/development/libraries/haskell/x509-store/default.nix b/pkgs/development/libraries/haskell/x509-store/default.nix index 9b060630edb7..36486dbf40e7 100644 --- a/pkgs/development/libraries/haskell/x509-store/default.nix +++ b/pkgs/development/libraries/haskell/x509-store/default.nix @@ -1,15 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, asn1Encoding, asn1Types, cryptoPubkeyTypes, filepath, mtl -, pem, time, x509 +, pem, x509 }: cabal.mkDerivation (self: { pname = "x509-store"; - version = "1.4.4"; - sha256 = "0i3hfrddr0wpfl75a76a1j24az08z4x7ya8l5qcdk7c1lr2c2bw8"; + version = "1.5.0"; + sha256 = "1w9sqb007s4avjzvrdwq13a4c528h7h2lg3m8cl31syrgznc9ny5"; buildDepends = [ - asn1Encoding asn1Types cryptoPubkeyTypes filepath mtl pem time x509 + asn1Encoding asn1Types cryptoPubkeyTypes filepath mtl pem x509 ]; meta = { homepage = "http://github.com/vincenthz/hs-certificate"; diff --git a/pkgs/development/libraries/haskell/x509-system/default.nix b/pkgs/development/libraries/haskell/x509-system/default.nix index c50e83449bba..87bb4ed1fecc 100644 --- a/pkgs/development/libraries/haskell/x509-system/default.nix +++ b/pkgs/development/libraries/haskell/x509-system/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, filepath, mtl, pem, time, x509, x509Store }: +{ cabal, filepath, mtl, pem, x509, x509Store }: cabal.mkDerivation (self: { pname = "x509-system"; - version = "1.4.6"; - sha256 = "0h462dgc0jf88yfd4nx9xpqx5kfzc3z6ps8akw13pfy92xdxj28c"; - buildDepends = [ filepath mtl pem time x509 x509Store ]; + version = "1.5.0"; + sha256 = "159zwg35nq42j1rl0p4x00hdf3iy48hd7kavz0rnpwd2p7ljamr3"; + buildDepends = [ filepath mtl pem x509 x509Store ]; meta = { homepage = "http://github.com/vincenthz/hs-certificate"; description = "Handle per-operating-system X.509 accessors and storage"; diff --git a/pkgs/development/libraries/haskell/x509-validation/default.nix b/pkgs/development/libraries/haskell/x509-validation/default.nix index 32176c8f4b8f..1caec0606bc6 100644 --- a/pkgs/development/libraries/haskell/x509-validation/default.nix +++ b/pkgs/development/libraries/haskell/x509-validation/default.nix @@ -1,18 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, asn1Encoding, asn1Types, byteable, cryptohash -, cryptoPubkey, cryptoPubkeyTypes, dataDefaultClass, filepath, mtl -, network, pem, time, x509, x509Store +, cryptoPubkey, cryptoPubkeyTypes, dataDefaultClass, filepath +, hourglass, mtl, network, pem, x509, x509Store }: cabal.mkDerivation (self: { pname = "x509-validation"; - version = "1.5.0"; - sha256 = "1xarn00ipi77whly5yjlpqa0xd25lj0jf4xk8ylp4ba58hvcxqrn"; + version = "1.5.1"; + sha256 = "19cp187id9hdlzkr7sbv2sdxqxnpjv0db09hwf3zdqqqxr30mn6x"; buildDepends = [ asn1Encoding asn1Types byteable cryptohash cryptoPubkey - cryptoPubkeyTypes dataDefaultClass filepath mtl network pem time - x509 x509Store + cryptoPubkeyTypes dataDefaultClass filepath hourglass mtl network + pem x509 x509Store ]; meta = { homepage = "http://github.com/vincenthz/hs-certificate"; diff --git a/pkgs/development/libraries/haskell/x509/default.nix b/pkgs/development/libraries/haskell/x509/default.nix index c49a0e75fcf0..201b727e2fc3 100644 --- a/pkgs/development/libraries/haskell/x509/default.nix +++ b/pkgs/development/libraries/haskell/x509/default.nix @@ -1,21 +1,20 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, asn1Encoding, asn1Parse, asn1Types, cryptohash -, cryptoPubkeyTypes, filepath, HUnit, mtl, pem, QuickCheck -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time +, cryptoPubkeyTypes, filepath, hourglass, mtl, pem, tasty +, tastyQuickcheck }: cabal.mkDerivation (self: { pname = "x509"; - version = "1.4.13"; - sha256 = "1cl2ygk38jh803aplsg68q6njzb0wcd1syb182amxqn8jlwh8a7c"; + version = "1.5.0.1"; + sha256 = "03gj4190f0ql1ghn2mri8901xdydhhnwijyfn8lmpjyn7pgpl3ba"; buildDepends = [ asn1Encoding asn1Parse asn1Types cryptohash cryptoPubkeyTypes - filepath mtl pem time + filepath hourglass mtl pem ]; testDepends = [ - asn1Types cryptoPubkeyTypes HUnit mtl QuickCheck testFramework - testFrameworkHunit testFrameworkQuickcheck2 time + asn1Types cryptoPubkeyTypes hourglass mtl tasty tastyQuickcheck ]; meta = { homepage = "http://github.com/vincenthz/hs-certificate"; diff --git a/pkgs/development/libraries/haskell/xdot/default.nix b/pkgs/development/libraries/haskell/xdot/default.nix index 297bc8130306..6242ffea4bf1 100644 --- a/pkgs/development/libraries/haskell/xdot/default.nix +++ b/pkgs/development/libraries/haskell/xdot/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "xdot"; - version = "0.2.4.4"; - sha256 = "1bv2n1pzn58kqf9k5qbyzlkddhx2v2c9gc50c7q7yd7wxxpml7gi"; + version = "0.2.4.5"; + sha256 = "0dv9y5i3707pnx4c0gf9y3zv6p02az4rvspd84hprfvnhd8qfdcp"; isLibrary = true; isExecutable = true; buildDepends = [ cairo graphviz gtk mtl polyparse text ]; diff --git a/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix b/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix index 3ccab6ece5ea..e2cb4dd582b0 100644 --- a/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix @@ -1,19 +1,20 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cryptohash, persistent, pwstoreFast, text, yesodAuth -, yesodCore, yesodForm, yesodPersistent +{ cabal, cryptohash, hspec, persistent, pwstoreFast, text +, yesodAuth, yesodCore, yesodForm, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod-auth-hashdb"; - version = "1.4.0"; - sha256 = "0z6gfm1dk03ap2ra7b9wd2jcsnfazcpk6vxcsx94vmb3a9jqx22l"; + version = "1.4.1"; + sha256 = "11biiylg2366vymx37asr7ibw8migwnkf3nj6lx1i94ldvs9kfd4"; buildDepends = [ cryptohash persistent pwstoreFast text yesodAuth yesodCore yesodForm yesodPersistent ]; + testDepends = [ hspec text ]; meta = { - homepage = "http://www.yesodweb.com/"; + homepage = "https://github.com/paul-rouse/yesod-auth-hashdb"; description = "Authentication plugin for Yesod"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index ffec55a1da42..0d9edaa8b386 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.4.0.1"; - sha256 = "062jr3g32rsljscq7bq9bgwwfx7vijx3cmhakwcxw17yh5405ks5"; + version = "1.4.0.4"; + sha256 = "1f05y5nh218c2r7d67r3lpxkbf6f6irhy7mg8pvbgy9yz90k0j8b"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 8c55c35181b4..c93f238a66a0 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -4,27 +4,28 @@ , caseInsensitive, cereal, clientsession, conduit, conduitExtra , cookie, dataDefault, deepseq, exceptions, fastLogger, hspec , httpTypes, HUnit, liftedBase, monadControl, monadLogger, mtl -, network, parsec, pathPieces, QuickCheck, random, resourcet, safe -, shakespeare, streamingCommons, text, time, transformers -, transformersBase, unixCompat, unorderedContainers, vector, wai -, waiExtra, waiLogger, warp +, mwcRandom, network, parsec, pathPieces, primitive, QuickCheck +, random, resourcet, safe, shakespeare, streamingCommons, text +, time, transformers, transformersBase, unixCompat +, unorderedContainers, vector, wai, waiExtra, waiLogger, warp +, word8 }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.4.2"; - sha256 = "0qi1shmbsi8vkxzvyzqzgmdapnbfkkjvhkshkmr7rrdhkdbnkbxl"; + version = "1.4.3"; + sha256 = "1mglavffzvav4dzwqq70agz5rd4bdb66p40qa445fq1dxwbwcq6i"; buildDepends = [ aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit conduitExtra cookie dataDefault deepseq exceptions fastLogger httpTypes liftedBase monadControl monadLogger - mtl parsec pathPieces random resourcet safe shakespeare text time - transformers transformersBase unixCompat unorderedContainers vector - wai waiExtra waiLogger warp + mtl mwcRandom parsec pathPieces primitive random resourcet safe + shakespeare text time transformers transformersBase unixCompat + unorderedContainers vector wai waiExtra waiLogger warp word8 ]; testDepends = [ async blazeBuilder conduit conduitExtra hspec httpTypes HUnit - liftedBase network pathPieces QuickCheck random resourcet + liftedBase mwcRandom network pathPieces QuickCheck random resourcet shakespeare streamingCommons text transformers wai waiExtra ]; jailbreak = true; diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 45650de0df53..84f8d0ca7a66 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.4.0.2"; - sha256 = "1y2585pdph2vl42ig6fvzpyy1p3n4v1i1xqnlkb2cfsyssswh5d4"; + version = "1.4.1"; + sha256 = "034bgkr5fmfjbxwy6kkz36als51jyq0ksx8wknwxf7pr07zwbl3x"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable dataDefault emailValidate networkUri persistent resourcet diff --git a/pkgs/applications/editors/yi/yi-contrib.nix b/pkgs/development/libraries/haskell/yi-contrib/default.nix similarity index 54% rename from pkgs/applications/editors/yi/yi-contrib.nix rename to pkgs/development/libraries/haskell/yi-contrib/default.nix index 2678f0a00489..40c6dddc8cfe 100644 --- a/pkgs/applications/editors/yi/yi-contrib.nix +++ b/pkgs/development/libraries/haskell/yi-contrib/default.nix @@ -1,21 +1,22 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, filepath, lens, mtl, split, time, transformersBase, yi }: +{ cabal, filepath, lens, mtl, ooPrototypes, split, text, time +, transformersBase, yi, yiLanguage, yiRope +}: cabal.mkDerivation (self: { pname = "yi-contrib"; - version = "0.8.2"; - sha256 = "17rbgrra1ghlywiraadf16n7igxp1k8jqqmb0iw8sc15y7825qqm"; + version = "0.10.1"; + sha256 = "053hsahkxwg2mnf3h4j95gj18x5791dqqji43l310i4l7mliw91k"; buildDepends = [ - filepath lens mtl split time transformersBase yi + filepath lens mtl ooPrototypes split text time transformersBase yi + yiLanguage yiRope ]; meta = { homepage = "http://haskell.org/haskellwiki/Yi"; description = "Add-ons to Yi, the Haskell-Scriptable Editor"; - license = "GPL"; - broken = true; + license = self.stdenv.lib.licenses.gpl2; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; }) diff --git a/pkgs/development/libraries/haskell/yi-fuzzy-open/default.nix b/pkgs/development/libraries/haskell/yi-fuzzy-open/default.nix new file mode 100644 index 000000000000..4685a08511ae --- /dev/null +++ b/pkgs/development/libraries/haskell/yi-fuzzy-open/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, dataDefault, filepath, mtl, text, transformersBase +, vector, yi, yiLanguage, yiRope +}: + +cabal.mkDerivation (self: { + pname = "yi-fuzzy-open"; + version = "0.1.0"; + sha256 = "03y7ddas8w380asx4ldafp1r3h4nlyjky7n4n5sdyvwbi0rix1gc"; + buildDepends = [ + binary dataDefault filepath mtl text transformersBase vector yi + yiLanguage yiRope + ]; + meta = { + homepage = "https://github.com/yi-editor/yi-fuzzy-open"; + description = "Fuzzy open plugin for Yi"; + license = self.stdenv.lib.licenses.gpl2; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/yi-monokai/default.nix b/pkgs/development/libraries/haskell/yi-monokai/default.nix new file mode 100644 index 000000000000..ddae06b7f22b --- /dev/null +++ b/pkgs/development/libraries/haskell/yi-monokai/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, yi }: + +cabal.mkDerivation (self: { + pname = "yi-monokai"; + version = "0.1.1.2"; + sha256 = "1nghfyiy8jdz144nbw0c2cdy8n6xyjmk31g6z24jk8dij7iwb60l"; + buildDepends = [ yi ]; + meta = { + homepage = "https://github.com/Fuuzetsu/yi-monokai"; + description = "Monokai colour theme for the Yi text editor"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix new file mode 100644 index 000000000000..a6259ac23cc9 --- /dev/null +++ b/pkgs/development/libraries/hidapi/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, udev, libusb }: + +stdenv.mkDerivation rec { + name = "hidapi-0.8.0-rc1"; + + src = fetchFromGitHub { + owner = "signal11"; + repo = "hidapi"; + rev = name; + sha256 = "13d5jkmh9nh4c2kjch8k8amslnxapa9vkqzrk1z6rqmw8qgvzbkj"; + }; + + buildInputs = [ autoreconfHook pkgconfig udev libusb ]; + + meta = with stdenv.lib; { + homepage = https://github.com/signal11/hidapi; + description = "for communicating with USB and Bluetooth HID devices"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index 981dcd13a626..89b276102192 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "libevdev-1.2.1"; + name = "libevdev-1.3"; src = fetchurl { url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz"; - sha256 = "0f0yvfg9bwl5xgpcz4kj37l5awcd4l9c78ghxiq3w32gwaz25ibw"; + sha256 = "0iil4pnla0kjdx52ay7igq65sx32sjbzn1wx9q3v74m5g7712m16"; }; buildInputs = [ python ]; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix new file mode 100644 index 000000000000..9c825f42166b --- /dev/null +++ b/pkgs/development/libraries/libinput/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, mtdev, udev, libevdev }: + +stdenv.mkDerivation rec { + name = "libinput-0.6.0"; + + src = fetchurl { + url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; + sha256 = "1g5za42f60vw87982vjh0n6r78qajj34l323p7623fbw3rvmbd9h"; + }; + + buildInputs = [ pkgconfig mtdev udev libevdev ]; + + meta = with stdenv.lib; { + homepage = http://www.freedesktop.org/wiki/Software/libinput; + description = "handles input devices in Wayland compositors and to provide a generic X.Org input driver"; + platforms = platforms.unix; + license = licenses.mit; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 77b0d3975c0b..c6f1f1a1ddcb 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -10,8 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex bison ]; - # Apparently, 32 bit systems need this forced? Not verified if still needed. - configureFlags = stdenv.lib.optionals (stdenv.system == "i686-linux") "--with-pcap=linux"; + configureFlags = stdenv.lib.optionals stdenv.isLinux "--with-pcap=linux"; preInstall = ''mkdir -p $out/bin''; diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index a3b549e83b4b..a0050daec343 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig }: stdenv.mkDerivation rec{ - name = "libqb-0.16.0"; + name = "libqb-0.17.1"; src = fetchurl { url = "https://fedorahosted.org/releases/q/u/quarterback/${name}.tar.xz"; - sha256 = "0j3zl5g5nnx98jb16p89q8w61har3gbvnlnmma8yj31xngps3kdq"; + sha256 = "0a9fy4hb6ixs875fbqw77dfj7519ixg27vg4yajyl87y7gw1a8bs"; }; buildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix new file mode 100644 index 000000000000..e2c92d5f10d0 --- /dev/null +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, json_c, hidapi }: + +stdenv.mkDerivation rec { + name = "libu2f-host-0.0"; + + src = fetchurl { + url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz"; + sha256 = "02pjald2j6syvxm5pszxcpqhpp7c80hblnzh6wrafkmpkpzi3rq5"; + }; + + buildInputs = [ pkgconfig json_c hidapi ]; + + meta = with stdenv.lib; { + homepage = https://developers.yubico.com/libu2f-host; + description = "a C library and command-line tool thati mplements the host-side of the U2F protocol"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix new file mode 100644 index 000000000000..0356d7c1f4c1 --- /dev/null +++ b/pkgs/development/libraries/libykneomgr/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, pcsclite, libzip, help2man }: + +stdenv.mkDerivation rec { + name = "libykneomgr-0.1.6"; + + src = fetchurl { + url = "https://developers.yubico.com/libykneomgr/Releases/${name}.tar.gz"; + sha256 = "15fa4sslbzhzmkf0xik36as9lsmys1apqwjxv8sx7qlpacmxy3bw"; + }; + + buildInputs = [ pkgconfig pcsclite libzip help2man ]; + + configureFlags = [ + "--with-backend=pcsc" + ]; + + meta = with stdenv.lib; { + homepage = https://developers.yubico.com/libykneomgr; + description = "a C library to interact with the CCID-part of the Yubikey NEO"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix index 106106c0915f..9d71c33cb305 100644 --- a/pkgs/development/libraries/libyubikey/default.nix +++ b/pkgs/development/libraries/libyubikey/default.nix @@ -1,21 +1,18 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: -stdenv.mkDerivation rec -{ - version = "1.12"; - name = "libyubikey-${version}"; +stdenv.mkDerivation rec { + name = "libyubikey-1.12"; - src = fetchurl - { - url = "http://opensource.yubico.com/yubico-c/releases/${name}.tar.gz"; + src = fetchurl { + url = "https://developers.yubico.com/yubico-c/Releases/${name}.tar.gz"; sha256 = "1f0plzmr1gwry4rfgq9q70v6qwqny009hac289ad5m6sj7vqflxr"; }; - meta = - { + meta = with stdenv.lib; { homepage = "http://opensource.yubico.com/yubico-c/"; description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)"; - license = "bsd"; - maintainers = [ stdenv.lib.maintainers.calrama ]; + license = licenses.bsd2; + maintainers = with maintainers; [ calrama wkennington ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix index 2363f33de079..51a66b4b92cc 100644 --- a/pkgs/development/libraries/mtdev/default.nix +++ b/pkgs/development/libraries/mtdev/default.nix @@ -1,18 +1,16 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mtdev-1.1.2"; + name = "mtdev-1.1.5"; src = fetchurl { url = "http://bitmath.org/code/mtdev/${name}.tar.bz2"; - sha256 = "0c2sfxxymf20ylvblgmdmybqs0cydmphg9fq6fnp6flbl0fd33b9"; + sha256 = "0zxs7shzgbalkvlaiibi25bd902rbmkv9n1lww6q8j3ri9qdaxv6"; }; - meta = { + meta = with stdenv.lib; { homepage = http://bitmath.org/code/mtdev/; - description = "Multitouch Protocol Translation Library"; - longDescription = '' The mtdev is a stand-alone library which transforms all variants of kernel MT events to the slotted type B protocol. The events put into @@ -20,7 +18,8 @@ stdenv.mkDerivation rec { tracking, type A with contact tracking, or type B with contact tracking. See the kernel documentation for further details. ''; - - license = stdenv.lib.licenses.mit; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 01a4e2e21daf..8ab9becf3461 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssl, cyrus_sasl, db, groff}: stdenv.mkDerivation rec { - name = "openldap-2.4.39"; + name = "openldap-2.4.40"; src = fetchurl { url = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; - sha256 = "19zq9dc7dl03wmqd11fbsdii1npyq1vlicl3nxbfygqh8xrwhrw2"; + sha256 = "1nyslrgwxwilgv5sixc37svls5rbvhsv9drb7hlrjr2vqaji29ni"; }; buildInputs = [ openssl cyrus_sasl db groff ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index c972635c9c72..2ea94ef50453 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -2,7 +2,7 @@ , withCryptodev ? false, cryptodevHeaders }: let - name = "openssl-1.0.1i"; + name = "openssl-1.0.1j"; opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) @@ -43,7 +43,7 @@ stdenv.mkDerivation { "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha256 = "1izwv1wzqdw8aqnvb70jcqpqp0rvkcm22w5c1dm9l1kpr939y5rw"; + sha256 = "1wzdaiix40lz0rsyf51qv0wiq4ywp29j5ni0xzl06vxsi63wlq0v"; }; patches = patchesCross false; diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index ab598f47a52d..f71c52e670bf 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ interface to the Pango text rendering library"; homepage = http://www.pango.org/; - # TODO license = with licenses; [ lgpl2 lgpl21 ]; + license = with licenses; [ lgpl2 lgpl21 ]; maintainers = with maintainers; [ lovek323 raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index f649401c5ca8..e7a048f0a312 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "spice-gtk-0.24"; + name = "spice-gtk-0.25"; src = fetchurl { url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2"; - sha256 = "1l8y1pbaqyzb6w8w8xa097dvj4zxhksn85pif1b9847r8l451zkf"; + sha256 = "11yh593frbafp0ywkk7pfc2k17q1fwrl8zcjclph3xfr1alccc07"; }; buildInputs = [ diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index a460db82b7f6..e1e2be3137bf 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,21 +1,20 @@ -{ stdenv, fetchurl, readline ? null, ncurses ? null }: +{ lib, stdenv, fetchurl, interactive ? false, readline ? null, ncurses ? null }: -assert readline != null -> ncurses != null; +assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.8.6"; + name = "sqlite-3.8.7"; src = fetchurl { - url = "http://www.sqlite.org/2014/sqlite-autoconf-3080600.tar.gz"; - sha1 = "c4b2911bc4a6e1dc2b411aa21d8c4f524113eb64"; + url = "http://www.sqlite.org/2014/sqlite-autoconf-3080700.tar.gz"; + sha1 = "8b773b006db46f3ffcbabe065e927823d13bf5c0"; }; - buildInputs = [ readline ncurses ]; + buildInputs = lib.optionals interactive [ readline ncurses ]; configureFlags = "--enable-threadsafe"; - CFLAGS = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"; - LDFLAGS = if readline != null then "-lncurses" else ""; + NIX_CFLAGS_COMPILE = "-DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_SECURE_DELETE=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY=1"; meta = { homepage = http://www.sqlite.org/; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 55ae69e6e643..a8975e29b4b3 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # https://bugzilla.samba.org/show_bug.cgi?id=7000 postConfigure = if stdenv.isDarwin then '' - substituteInPlace "Makefile" --replace "SONAMEFLAG = #" "SONAMEFLAG = -install_name" + substituteInPlace "Makefile" --replace "SONAMEFLAG = #" "SONAMEFLAG = -Wl,-install_name," '' else ""; meta = { diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 4f2b6ec49d7c..53c3ddc35393 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { patches = [ ./yylex.patch ]; # Workaround to make the python wrapper not drop this package: - # pythonFull.override { extraLibs = [ thrift ]; } + # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } pythonPath = []; buildInputs = [ diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix index bdc2b4da6e3e..e33234304d2f 100644 --- a/pkgs/development/libraries/tsocks/default.nix +++ b/pkgs/development/libraries/tsocks/default.nix @@ -2,14 +2,18 @@ stdenv.mkDerivation rec { name = "tsocks-${version}"; version = "1.8beta5"; - + src = fetchurl { url = "mirror://sourceforge/tsocks/${name}.tar.gz"; sha256 = "0ixkymiph771dcdzvssi9dr2pk1bzaw9zv85riv3xl40mzspx7c4"; }; + patches = [ ./poll.patch ]; + preConfigure = '' - export configureFlags="$configureFlags --libdir=$out/lib" + sed -i -e "s,\\\/usr,"$(echo $out|sed -e "s,\\/,\\\\\\\/,g")",g" tsocks + substituteInPlace tsocks --replace /usr $out + export configureFlags="$configureFlags --libdir=$out/lib" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/tsocks/poll.patch b/pkgs/development/libraries/tsocks/poll.patch new file mode 100644 index 000000000000..2bfeb9f779ca --- /dev/null +++ b/pkgs/development/libraries/tsocks/poll.patch @@ -0,0 +1,26 @@ +From Ingo Hadan Fri, 02 Apr 2010 21:08:50 +0200 +From: Julien Moutinho +Date: Fri, 26 Apr 2013 01:57:26 +0200 +Subject: tsocks fails if socksified application uses poll(2) (e.g. subversion-1.5) + +--- +diff --git a/tsocks.c b/tsocks.c +index 9cfdfff..470babd 100644 +--- a/tsocks.c ++++ b/tsocks.c +@@ -657,10 +657,11 @@ int poll(POLL_SIGNATURE) { + * be ready for writing), otherwise we'll just let the select loop + * come around again (since we can't flag it for read, we don't know + * if there is any data to be read and can't be bothered checking) */ +- if (conn->selectevents & WRITE) { +- setevents |= POLLOUT; ++ if (conn->selectevents & POLLOUT) { ++ ufds[i].revents |= POLLOUT; + nevents++; + } ++ ufds[i].events = conn->selectevents; + } + } + } while (nevents == 0); + + diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index ae9fac06eeec..8c1ac2deb66a 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }: -let version = "1.5.0"; in +let version = "1.6.0"; in stdenv.mkDerivation rec { name = "wayland-${version}"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1da179livkkmfsds32yhh4zflxn9qs6av023702kx2w8mzly2s80"; + sha256 = "0zzwlrmxil10g9rvdgha0y1d8z0x97g65g14kl2qrl2krwni1md7"; }; buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ]; diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix index faa17c08363f..9e9bf9c83dd3 100644 --- a/pkgs/development/libraries/wxGTK-3.0/default.nix +++ b/pkgs/development/libraries/wxGTK-3.0/default.nix @@ -8,14 +8,14 @@ assert withMesa -> mesa != null; with stdenv.lib; let - version = "3.0.1"; + version = "3.0.2"; in stdenv.mkDerivation { name = "wxwidgets-${version}"; src = fetchurl { url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; - sha256 = "1xf5s8cnq6xr0r6l0y9cn1pjg961xbycl4afhjrqzbsnxiwinrxx"; + sha256 = "0paq27brw4lv8kspxh9iklpa415mxi8zc117vbbbhfjgapf7js1l"; }; buildInputs = diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix index 13198922c754..a2cc690267c7 100644 --- a/pkgs/development/mobile/titaniumenv/examples/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/default.nix @@ -66,18 +66,11 @@ rec { target = "iphone"; }; - simulate_kitchensink_iphone = import ./simulate-kitchensink { + simulate_kitchensink = import ./simulate-kitchensink { inherit (pkgs) stdenv; xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; inherit xcodeBaseDir; }; kitchensink = kitchensink_ios_development; - device = "iPhone"; - }; - - simulate_kitchensink_ipad = import ./simulate-kitchensink { - inherit (pkgs) stdenv; - xcodeenv = pkgs.xcodeenv.override { version = xcodeVersion; inherit xcodeBaseDir; }; - kitchensink = kitchensink_ios_development; - device = "iPad"; + bundleId = if rename then newBundleId else "com.appcelerator.kitchensink"; }; } else {}) // (if rename then let diff --git a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix index a5ab8d59a743..15a86e338dea 100644 --- a/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/simulate-kitchensink/default.nix @@ -1,9 +1,7 @@ -{stdenv, xcodeenv, kitchensink, device}: +{stdenv, xcodeenv, kitchensink, bundleId}: xcodeenv.simulateApp { - name = "simulate-${kitchensink.name}-${stdenv.lib.replaceChars [" " "(" ")"] ["_" "" ""] device}"; - appName = "KitchenSink"; - app = kitchensink; - inherit device; - baseDir = "build/iphone/build/Debug-iphonesimulator"; + name = "simulate-${kitchensink.name}"; + inherit bundleId; + app = "${kitchensink}/build/iphone/build/Debug-iphonesimulator"; } diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix index c999497d8c09..645bcd69da0c 100644 --- a/pkgs/development/mobile/xcodeenv/simulate-app.nix +++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix @@ -1,22 +1,47 @@ {stdenv, xcodewrapper}: -{ name, appName ? null, app -, device ? "iPhone", baseDir ? "" -, sdkVersion ? "7.0" -}: +{name, bundleId, app}: -let - _appName = if appName == null then name else appName; -in stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; buildCommand = '' mkdir -p $out/bin cat > $out/bin/run-test-simulator << "EOF" #! ${stdenv.shell} -e - - cd "${app}/${baseDir}/${_appName}.app" - "$(readlink "${xcodewrapper}/bin/iPhone Simulator")" -SimulateApplication './${_appName}' -SimulateDevice '${device}' -currentSDKRoot "$(readlink "${xcodewrapper}/SDKs")/iPhoneSimulator${sdkVersion}.sdk" + + if [ "$1" = "" ] + then + # Show the user the possibile UDIDs and let him pick one, if none is provided as a command-line parameter + xcrun simctl list + + echo "Please provide a UDID of a simulator:" + read udid + else + # If a parameter has been provided, consider that a device UDID an use that + udid="$1" + fi + + # Open the simulator instance + open -a "$(readlink "${xcodewrapper}/bin/iOS Simulator")" --args -CurrentDeviceUDID $udid + + # Copy the app and restore the write permissions + appTmpDir=$(mktemp -d -t appTmpDir) + cp -r "$(echo ${app}/*.app)" $appTmpDir + chmod -R 755 "$(echo $appTmpDir/*.app)" + + # Wait for the simulator to start + echo "Press enter when the simulator is started..." + read + + # Install the app + xcrun simctl install $udid "$(echo $appTmpDir/*.app)" + + # Remove the app tempdir + rm -Rf $appTmpDir + + # Launch the app in the simulator + xcrun simctl launch $udid "${bundleId}" EOF + chmod +x $out/bin/run-test-simulator ''; } diff --git a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix index 4545ea8dae15..4be204d5dc52 100644 --- a/pkgs/development/mobile/xcodeenv/xcodewrapper.nix +++ b/pkgs/development/mobile/xcodeenv/xcodewrapper.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { ln -s /usr/bin/codesign ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild" ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcrun" - ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app/Contents/MacOS/iPhone Simulator" + ln -s "${xcodeBaseDir}/Contents/Developer/Applications/iOS Simulator.app/Contents/MacOS/iOS Simulator" cd .. ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs" diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix index 7b1741c3d1e9..fbdcec06d0dd 100644 --- a/pkgs/development/perl-modules/DBD-SQLite/default.nix +++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, buildPerlPackage, DBI, sqlite }: buildPerlPackage rec { - name = "DBD-SQLite-1.42"; + name = "DBD-SQLite-1.44"; src = fetchurl { url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/${name}.tar.gz"; - sha256 = "14x9cjsc8dz8ad1nad0bqiq9cbk1rjfb8h5y0rpk3pdl38y6afxb"; + sha256 = "10r7wv5x4vzn9zbk3c7mhbx6kz76xxd9p357592c0wamj458qlml"; }; propagatedBuildInputs = [ DBI ]; diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index c1b36bf909de..f84c836c056f 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -1,52 +1,42 @@ -{ stdenv, fetchurl, buildPythonPackage, pykickstart, pyparted, pyblock -, libselinux, cryptsetup, multipath_tools, lsof, utillinux -, useNixUdev ? true, udev ? null -# This is only used when useNixUdev is false -, udevSoMajor ? 1 +{ stdenv, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock +, pyudev, six, libselinux, cryptsetup, multipath_tools, lsof, utillinux }: -assert useNixUdev -> udev != null; - let pyenable = { enablePython = true; }; selinuxWithPython = libselinux.override pyenable; cryptsetupWithPython = cryptsetup.override pyenable; in buildPythonPackage rec { name = "blivet-${version}"; - version = "0.17-1"; + version = "0.67"; - src = fetchurl { - url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/" - + "${name}.tar.bz2"; - sha256 = "1k3mws2q0ryb7422mml6idmaasz2i2v6ngyvg6d976dx090qnmci"; + src = fetchFromGitHub { + owner = "dwlehman"; + repo = "blivet"; + rev = name; + sha256 = "1gk94ghjrxfqnx53hph1j2s7qcv86fjz48is7l099q9c24rjv8ky"; }; postPatch = '' - sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \ - blivet/devicelibs/mpath.py blivet/devices.py + sed -i \ + -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \ + -e '/^def set_friendly_names/a \ return False' \ + blivet/devicelibs/mpath.py sed -i -e '/"wipefs"/ { s|wipefs|${utillinux}/sbin/wipefs| s/-f/--force/ }' blivet/formats/__init__.py sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py - sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py - '' + (if useNixUdev then '' - sed -i -e '/find_library/,/find_library/ { - c libudev = "${udev}/lib/libudev.so.1" - }' blivet/pyudev.py - '' else '' - sed -i \ - -e '/^somajor *=/s/=.*/= ${toString udevSoMajor}/p' \ - -e 's|common =.*|& + ["/lib/x86_64-linux-gnu", "/lib/i686-linux-gnu"]|' \ - blivet/pyudev.py - ''); + sed -i -e '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py + ''; propagatedBuildInputs = [ - pykickstart pyparted pyblock selinuxWithPython cryptsetupWithPython - ] ++ stdenv.lib.optional useNixUdev udev; + pykickstart pyparted pyblock pyudev selinuxWithPython cryptsetupWithPython + six + ]; - # tests are currently _heavily_ broken upstream + # Tests are in . doCheck = false; meta = { diff --git a/pkgs/development/python-modules/box2d/disable-test.patch b/pkgs/development/python-modules/box2d/disable-test.patch new file mode 100644 index 000000000000..bc2897a8b100 --- /dev/null +++ b/pkgs/development/python-modules/box2d/disable-test.patch @@ -0,0 +1,14 @@ +Common subdirectories: Box2D-2.3b0/Box2D and Box2D-2.3b0.new/Box2D +Common subdirectories: Box2D-2.3b0/examples and Box2D-2.3b0.new/examples +Common subdirectories: Box2D-2.3b0/library and Box2D-2.3b0.new/library +diff -u Box2D-2.3b0/setup.py Box2D-2.3b0.new/setup.py +--- Box2D-2.3b0/setup.py 2013-02-02 18:09:34.000000000 +0100 ++++ Box2D-2.3b0.new/setup.py 2014-10-25 13:32:07.136922343 +0200 +@@ -176,7 +176,6 @@ + package_dir = {'Box2D': library_path, + 'Box2D.b2': os.path.join(library_path, 'b2'), + 'Box2D.tests' : 'tests'}, +- test_suite = 'tests', + options = { 'build_ext': { 'swig_opts' : swig_arguments }, + 'egg_info' : { 'egg_base' : library_base }, + }, diff --git a/pkgs/development/python-modules/rhpl/builder.sh b/pkgs/development/python-modules/rhpl/builder.sh index b37e9081832f..dc93effe802f 100644 --- a/pkgs/development/python-modules/rhpl/builder.sh +++ b/pkgs/development/python-modules/rhpl/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -rpm2cpio $src | cpio -idv +rpmextract $src tar xfvj rhpl-*.tar.bz2 rm rhpl-*.tar.bz2 cd rhpl-* diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix index 92330a378c89..ee1d0ec1738b 100644 --- a/pkgs/development/python-modules/rhpl/default.nix +++ b/pkgs/development/python-modules/rhpl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, rpm, cpio, python, wirelesstools, gettext}: +{stdenv, fetchurl, rpmextract, python, wirelesstools, gettext}: stdenv.mkDerivation { name = "rhpl-0.218"; @@ -12,5 +12,5 @@ stdenv.mkDerivation { builder = ./builder.sh; - buildInputs = [ rpm cpio python wirelesstools gettext ]; + buildInputs = [ rpmextract python wirelesstools gettext ]; } diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index 2e5701375a47..b1692407e1da 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit }: stdenv.mkDerivation { - name = "gnulib-0.1-83-g8008cac"; + name = "gnulib-0.1-228-gb155b06"; src = fetchgit { url = "http://git.savannah.gnu.org/r/gnulib.git"; - rev = "8008cac0568ee76a4a9b7002f839e1abbad78af6"; - sha256 = "1w8wh5ljh1qpssnj2lxizf45ggd7fgk5ggwhrnzjxxhn9m7rdvwm"; + rev = "b155b0649814b20e635a2db305696710fa1037ce"; + sha256 = "06r0cpm97k82hx6qqm9nbwyp5mr8g9qqdiw2ak2pndymc66v233l"; }; buildPhase = ":"; diff --git a/pkgs/development/tools/haskell/PastePipe/default.nix b/pkgs/development/tools/haskell/PastePipe/default.nix index cff021f898c5..92d985ecc6e2 100644 --- a/pkgs/development/tools/haskell/PastePipe/default.nix +++ b/pkgs/development/tools/haskell/PastePipe/default.nix @@ -1,20 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cmdargs, HTTP, network }: +{ cabal, cmdargs, HTTP, network, networkUri }: cabal.mkDerivation (self: { pname = "PastePipe"; - version = "1.5"; - sha256 = "1jqfk6d22vi0vrwx0whjkh4pxwagr4hmi79bid6bffn72c7ygm8f"; + version = "1.6"; + sha256 = "08rsq2j3gy98a69pjldvbhawmnzxgld7abh9kszrb0kpjmd9sgc4"; isLibrary = true; isExecutable = true; - buildDepends = [ cmdargs HTTP network ]; + buildDepends = [ cmdargs HTTP network networkUri ]; meta = { - homepage = "http://github.com/creswick/pastepipe"; + homepage = "http://github.com/Fuuzetsu/pastepipe"; description = "CLI for pasting to lpaste.net"; - license = "GPL"; + license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; - broken = true; }; }) diff --git a/pkgs/development/tools/haskell/cabal-db/default.nix b/pkgs/development/tools/haskell/cabal-db/default.nix index 215be2d43632..61699f8db7db 100644 --- a/pkgs/development/tools/haskell/cabal-db/default.nix +++ b/pkgs/development/tools/haskell/cabal-db/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "cabal-db"; - version = "0.1.9"; - sha256 = "19mw5ycc2y5wkn1h7wkdm2gb29pq2sh0n8z52dbxlkf0rwcgjbfq"; + version = "0.1.10"; + sha256 = "0j9xnf23zrpyrfkcx321rqbabzsm4208idpvfy7sdnnvw9a2k5xw"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -15,9 +15,8 @@ cabal.mkDerivation (self: { ]; meta = { homepage = "http://github.com/vincenthz/cabal-db"; - description = "query tools for the local cabal database (revdeps, graph, info, search-by, license, bounds)"; + description = "query tools for the local cabal database"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - broken = true; }; }) diff --git a/pkgs/development/tools/haskell/graphmod/default.nix b/pkgs/development/tools/haskell/graphmod/default.nix index 6165e46dd5bd..496e854fb864 100644 --- a/pkgs/development/tools/haskell/graphmod/default.nix +++ b/pkgs/development/tools/haskell/graphmod/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "graphmod"; - version = "1.2.5"; - sha256 = "1rmrsfvajzrak7jlhwnvhrgszgyg1b6z5wp21k0d7pv2cbfdkp8s"; + version = "1.2.6"; + sha256 = "02p1x44ywv2mb4l2dsz9z3ybnvv4nns3882lqm3nc8sw2hkib8z3"; isLibrary = false; isExecutable = true; buildDepends = [ dotgen filepath haskellLexer ]; diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index e6d99fdebfbb..a79dbb9a1332 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.9.8"; - sha256 = "0n89iinn669jcxnh3k76cja1z78bnl84rmak37xgqcbvwd46dr34"; + version = "1.9.10"; + sha256 = "08pfc0mhqkhali0hjxpa26hr5ykfdmyldh0r04v1b42a1c60k1id"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/ihaskell/default.nix b/pkgs/development/tools/haskell/ihaskell/default.nix index a9b1347517fb..0dd20f30f70d 100644 --- a/pkgs/development/tools/haskell/ihaskell/default.nix +++ b/pkgs/development/tools/haskell/ihaskell/default.nix @@ -16,7 +16,7 @@ cabal.mkDerivation (self: { sha256 = "012rmasdc167w6gl18ysr53737j4p4afk0qcsv81hif92vvg5j1c"; isLibrary = true; isExecutable = true; - patches = [ (fetchpatch { url = "https://github.com/gibiansky/IHaskell/pull/288.patch"; sha256 = "022zdz4wnyra6cfa7mq0w2ycsb007cvppn2f1360nr3fa5s9wibg"; }) ]; + patches = [ (fetchpatch { url = "https://github.com/gibiansky/IHaskell/pull/296.patch"; sha256 = "1h9gxq9l3j949prcwqkdkrc3q3sxai4b345hfp5hfi0mhfbysfn6"; }) ]; prePatch = '' tar xvf profile/profile.tar -C profile sed -i -e '1iexe = "'$out'/bin/IHaskell".replace(" ", "\\ ")\' profile/ipython_config.py @@ -45,6 +45,7 @@ cabal.mkDerivation (self: { description = "A Haskell backend kernel for the IPython project"; license = licenses.mit; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; maintainers = with maintainers; [ edwtjo ]; }; }) diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index f98de4af2290..7a5b24ce0393 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -20,7 +20,5 @@ stdenv.mkDerivation rec { --set GHC_PACKAGE_PATH "\$GHC_PACKAGE_PATH:" # always end with : to include base packages ''; - meta = { - description = ihaskell.meta.description; - }; -} \ No newline at end of file + inherit (ihaskell) meta; +} diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index 22b52975cde5..807ce70ef040 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "keter"; - version = "1.3.4"; - sha256 = "127sv155kgwz64adylfn2dmpnqh833pa53lnc8ahhwa63xwf9pzk"; + version = "1.3.5"; + sha256 = "0jbf9x50gy9qja6gazh0lgyffz46a3wps6hbxppqmcicjhwbpvr5"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index c3b44ca56863..29939a423af5 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/pkgs/development/tools/misc/autoconf/2.13.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "autoconf-2.13"; - + src = fetchurl { url = "mirror://gnu/autoconf/${name}.tar.gz"; sha256 = "07krzl4czczdsgzrrw9fiqx35xcf32naf751khg821g5pqv12qgh"; @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { # "fixed" path in generated files! dontPatchShebangs = true; + postInstall = ''ln -s autoconf "$out"/bin/autoconf-2.13''; + meta = { homepage = http://www.gnu.org/software/autoconf/; description = "Part of the GNU Build System"; diff --git a/pkgs/development/tools/misc/cpphs/default.nix b/pkgs/development/tools/misc/cpphs/default.nix index f3a724f30399..8167ae924165 100644 --- a/pkgs/development/tools/misc/cpphs/default.nix +++ b/pkgs/development/tools/misc/cpphs/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cpphs"; - version = "1.18.5"; - sha256 = "0bqfz0wkfnxvv711fgmhmh6rbwffgna1pfqbj7whb6crqji9w7g7"; + version = "1.18.6"; + sha256 = "0ds712zabigswf3cljzh7f2ys4rl1fj2cf76lbw856adm8514gxc"; isLibrary = true; isExecutable = true; buildDepends = [ polyparse ]; diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index 91150255bdaa..a57840827c1f 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -7,12 +7,14 @@ stdenv.mkDerivation rec { sha256 = "0p5nx387857w3v2jbgvps2p6mlm0chajcdw5sfrddcglsxkwvmis"; }; buildInputs = [lesstif ncurses libX11 libXt]; - configureFlags = "--with-x"; + configureFlags = "--with-x"; patches = [ ./gcc44.patch ]; - meta = { - homepage = http://www.gnu.org/software/ddd; - description = "Graphical front-end for command-line debuggers"; - license = stdenv.lib.licenses.gpl2; - }; + + meta = { + homepage = http://www.gnu.org/software/ddd; + description = "Graphical front-end for command-line debuggers"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix index 0096cbdbabf5..5cf8b6649418 100644 --- a/pkgs/development/tools/misc/lttv/default.nix +++ b/pkgs/development/tools/misc/lttv/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = http://lttng.org/; # liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1. # The rest of the LTTV package is distributed under the GNU GPL v2. - # TODO license = with licenses; [ gpl2 lgpl21 ]; + license = with licenses; [ gpl2 lgpl21 ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix index 7ac4f6d39b7d..da806a77fa4a 100644 --- a/pkgs/development/tools/quilt/default.nix +++ b/pkgs/development/tools/quilt/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { ''; license = "GPLv2+"; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index deb5188750ae..3356a04729ee 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -10,12 +10,14 @@ let # !!! Should we also do shared libuv? deps = { - inherit openssl zlib http-parser; + inherit openssl zlib; cares = c-ares; # disabled system v8 because v8 3.14 no longer receives security fixes # we fall back to nodejs' internal v8 copy which receives backports for now # inherit v8 + } // stdenv.lib.optionalAttrs (!stdenv.isDarwin) { + inherit http-parser; }; sharedConfigureFlags = name: [ diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index 9df7e3126d55..1057e9708654 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, lessc, closurecompiler }: +{ stdenv, fetchFromGitHub, lessc, closurecompiler }: stdenv.mkDerivation rec { name = "twitter-bootstrap-${version}"; version = "2.3.2"; - src = fetchgit { - url = https://github.com/twitter/bootstrap.git; - rev = "refs/tags/v${version}"; - sha256 = "093z4yxqhrr30vna67ksxz3bq146q2xr05hinh78pg2ls88k77la"; + src = fetchFromGitHub { + owner = "twitter"; + repo = "bootstrap"; + rev = "v${version}"; + sha256 = "0b4dsk9sqlkwwfgqqjlgi6p05qz2jssmmz4adm83f31sx70lgh4g"; }; buildInputs = [ lessc closurecompiler ]; diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 7c8c2bd23776..5d50d25194a3 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -6,13 +6,16 @@ let py = pythonPackages; - version = "2.0.29"; + version = "2.0.31"; in stdenv.mkDerivation rec { name = "anki-${version}"; src = fetchurl { - url = "http://ankisrs.net/download/mirror/${name}.tgz"; - sha256 = "12qw0as5cdgh4hi0vyl0zpdzha93x8rid5xrhpjgiyj5s9fisf40"; + urls = [ + "http://ankisrs.net/download/mirror/${name}.tgz" + "http://ankisrs.net/download/mirror/archive/${name}.tgz" + ]; + sha256 = "0bxy4pq9yq78g0ffnlkpqj91ri0w4xqgv8mqksddn02v4llrd5jb"; }; pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ] diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index bd8d926769e6..ce38d06d6550 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -1,10 +1,10 @@ { stdenv, autoconf, automake, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }: stdenv.mkDerivation rec { - name = "chocolate-doom-2.0.0"; + name = "chocolate-doom-2.1.0"; src = fetchurl { - url = https://github.com/chocolate-doom/chocolate-doom/archive/chocolate-doom-2.0.0.tar.gz; - sha256 = "1n9lkx97h987bq8z586jgissdhs07xyfr0xfdk7m2wpw4yhw10k1"; + url = "https://github.com/chocolate-doom/chocolate-doom/archive/${name}.tar.gz"; + sha256 = "1qwnc5j3n99jk35c487mxsij04m4kpkqzkbrb8qwqlsnqllyh1s1"; }; buildInputs = [ autoconf automake pkgconfig SDL SDL_mixer SDL_net ]; patchPhase = '' diff --git a/pkgs/games/chocolate-doom/master.nix b/pkgs/games/chocolate-doom/master.nix deleted file mode 100644 index 3681a6781d87..000000000000 --- a/pkgs/games/chocolate-doom/master.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, autoconf, automake, pkgconfig, SDL, SDL_mixer, SDL_net, git, fetchgit }: - -stdenv.mkDerivation rec { - name = "chocolate-doom-20141008"; - src = fetchgit { - url = git://github.com/fragglet/chocolate-doom.git; - rev = "63e1c884911f9e3382936f84a388e941b29343e6"; - sha256 = "1855a70widf1ni7lrfvp3hwxs1fhg1v5l738ckai88xpbak8i14m"; - }; - buildInputs = [ autoconf automake pkgconfig SDL SDL_mixer SDL_net git ]; - patchPhase = '' - sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am - ./autogen.sh --prefix=$out - ''; - - enableParallelBuilding = true; - - meta = { - homepage = http://chocolate-doom.org/; - description = "A Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ MP2E ]; - }; -} diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix index 2fc09c498e3c..ce097bd5f231 100644 --- a/pkgs/misc/beep/default.nix +++ b/pkgs/misc/beep/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { description = "The advanced PC speaker beeper"; homepage = http://www.johnath.com/beep/; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index db412eb883de..a371e5ab7718 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -9,7 +9,7 @@ let stdenv.lib.makeOverridable stdenv.mkDerivation rec { name = "libretro-${core}-${version}"; - version = "20140902"; + version = "20141009"; inherit src; buildInputs = [ makeWrapper retroarch zlib ] ++ a.extraBuildInputs or []; @@ -53,8 +53,8 @@ in core = "4do"; src = fetchRetro { repo = core + "-libretro"; - rev = "961812bc421f3fbfd83ea211783bb511a0b6d31c"; - sha256 = "0217iq8sj8gn161c3mj632csl1da8ir2ffxxdillpcddv6ppsayl"; + rev = "700e5c2b28252ed7d3fb086ab016b3b964a5030a"; + sha256 = "0wxiapbp6i3r9ir75xgmah0jhrfvy9jgqr6i22grgmnga1qv5pcf"; }; description = "Port of 4DO/libfreedo to libretro"; }).override { @@ -65,30 +65,32 @@ in core = "bsnes-mercury"; src = fetchRetro { repo = core; - rev = "cc44e91bfba6f7b3d1d3d51a9fa28b39a579f5e0"; - sha256 = "0nzwjrbfvzywsimrvp4vbpj7zxf9iwpghd9z7f9f1q027l0vj42f"; + rev = "5fa7c035a604cd207c5833af0fdd55d7cf68acb0"; + sha256 = "19drxpspid0y3wi3zp3ls4jlhx1ndqmr51jici7w2vsajk9x9dyg"; }; description = "Fork of bsnes with HLE DSP emulation restored"; }).override { buildPhase = "make && cd out"; }; - desmume = mkLibRetroCore rec { + desmume = (mkLibRetroCore rec { core = "desmume"; src = fetchRetro { - repo = core + "-libretro"; - rev = "1dd58e4a9fa375b6909cd8718165a429d4b8bd6d"; - sha256 = "137bw9316qxm8s6p0bzyvk39dv5b5bn60fgllmyj9z5y8x5lrc9l"; + repo = core; + rev = "57bbabfe71fb8e131fa14ab1504f1959937b8ce5"; + sha256 = "19kbl361ggzhmmc5alsfwq9gcl0zc9zhz0nx562l6k2lj7fwwr0g"; }; description = "libretro wrapper for desmume NDS emulator"; + }).override { + configurePhase = "cd desmume"; }; fceumm = mkLibRetroCore rec { core = "fceumm"; src = fetchRetro { repo = "libretro-" + core; - rev = "17e081541c9d36d0658e7139afa5b085aa0316c9"; - sha256 = "0cn74z976rgjh7hf0yb1sdjlm347157893s2z397rgjvks8xssb0"; + rev = "1b27f5abafa4ace43badebea82a8374be3a5a96b"; + sha256 = "04v0in7nazmkfsbvl0wn5klnz4f8rpjsar1v3c07j2qrma42k60w"; }; description = "FCEUmm libretro port"; }; @@ -97,8 +99,8 @@ in core = "fba"; src = fetchRetro { repo = core + "-libretro"; - rev = "da6355526a9b02a642447994414baababe904c1e"; - sha256 = "14kba506m9dnldmkpq3vgw416pm7cgc167hgm3f0l59ylp2592ff"; + rev = "21a78df085a0d964828c5c0940c03e656e2ad808"; + sha256 = "01ycszinral19ni22a3x8afiz23y9xw6idzx9a22xnc6zqvj0fjm"; }; description = "Port of Final Burn Alpha to libretro"; }).override { @@ -113,8 +115,8 @@ in core = "gambatte"; src = fetchRetro { repo = core + "-libretro"; - rev = "267a4e09bf8f0877483abdffde6295f29d7235ee"; - sha256 = "1swx3mjb6qmlg6grcakhl17vrmy4vdvimxkv5gbv6gnj5riya4vl"; + rev = "6f3c97d86483368ec446b6b08ae21b1cb644312c"; + sha256 = "19kbisbl5lqxfsaff4knp2rrl17af21c1kgccxhgp5liqnqk92k5"; }; description = "Gambatte libretro port"; }).override { @@ -125,8 +127,8 @@ in core = "genesis-plus-gx"; src = fetchRetro { repo = "Genesis-Plus-GX"; - rev = "c0015e27e3ae607ea0490b2accfe31097ef3cbce"; - sha256 = "1k4b5wib7nqzk53qwvhkh4a70gc4pq7vkrpvmfzp5f2c4vrbw1i7"; + rev = "d634da83d29d39d293c1aba3c14f6259e13e525e"; + sha256 = "0mhn2h2wr2kh5rgda5rj7xkmg4b6glg4rnd0f1ak6rp3sh8dfhv1"; }; description = "Enhanced Genesis Plus libretro port"; }; @@ -135,8 +137,8 @@ in core = "mupen64plus"; src = fetchRetro { repo = core + "-libretro"; - rev = "2251b3aba2a5bb233ff49dd9b6472f2c0feb9b83"; - sha256 = "04g93kj6n5vddbzfb30d8n711kg0yxfnl5v567aa854misn6gfxd"; + rev = "021ab383e2ac44533e9babd3e7f5fed97a988225"; + sha256 = "13hph19b24bbp9d6s8zm4a939dhy96n2fbkcknmsp473kfnm9mf6"; }; description = "Libretro port of Mupen64 Plus, GL only"; @@ -145,12 +147,24 @@ in buildPhase = "make WITH_DYNAREC=${if stdenv.system == "x86_64-linux" then "x86_64" else "x86"}"; }; + nestopia = (mkLibRetroCore rec { + core = "nestopia"; + src = fetchRetro { + repo = core; + rev = "3468f3c16c80935e8c4078a5771e9379a981989c"; + sha256 = "1k9kd25z4hyna48gwxb8rkm9q402xzhw18wmgbzkf8y6zqxn50j0"; + }; + description = "nestopia undead libretro port"; + }).override { + buildPhase = "cd libretro && make"; + }; + picodrive = (mkLibRetroCore rec { core = "picodrive"; src = fetchRetro { repo = core; - rev = "d84817550ac064fbba7ee718fb3baeda7d5546da"; - sha256 = "17zh9m2v7h1cifzz8dcwqm4wn94zyhz6g85gf0aw6xylxahza627"; + rev = "3f4b091194d29dd90a3cb88fd6520f677ffece65"; + sha256 = "0jb89g5xmq7nzx4gm1mam1hym20fcyzp95k9as0k2gnwxrd4ymxv"; }; description = "Fast MegaDrive/MegaCD/32X emulator"; @@ -164,8 +178,8 @@ in core = "prboom"; src = fetchRetro { repo = "libretro-" + core; - rev = "de2f0a0fab1a73a28cd501fdb9291ffc7dc357f5"; - sha256 = "01gxa6hh9vijic2n44q1lndhdyw0kdpmajabs0nizn7bni51b29c"; + rev = "7c5e74a8f8a973278d46604f2816aae538e9cce7"; + sha256 = "1mkxc7zcyc2nj7spsrasbnz6k182g8i1snahbbwj4qi41db6cjc9"; }; description = "Prboom libretro port"; }).override { @@ -176,13 +190,25 @@ in core = "ppsspp"; src = fetchRetro { repo = "libretro-" + core; - rev = "6ee828171218b26e124c5e8fa7877e6ee1d5ff79"; - sha256 = "1559d4k3h0a2dv3684j4w924p2dg8z2j1fwhy7w9mhb5z4kddjhk"; + rev = "af5050be6b421e08be42d4edf0015693ceba1f06"; + sha256 = "0h4crdq6n6npbv6sidp3bgz5g2z3ws6ikg37f0amshh3rj36p7q0"; }; description = "ppsspp libretro port"; extraBuildInputs = [ mesa ffmpeg ]; - }).override{ + }).override { + buildPhase = "cd libretro && make"; + }; + + quicknes = (mkLibRetroCore rec { + core = "quicknes"; + src = fetchRetro { + repo = "QuickNES_Core"; + rev = "3e8935cc937d3bf64dc44b63cef5d584ec2673fa"; + sha256 = "003hrxkskrkqv5h39p4gd9mg2k3ki5l1cmm0kxq7c454yliljjxc"; + }; + description = "QuickNES libretro port"; + }).override { buildPhase = "cd libretro && make"; }; @@ -190,22 +216,34 @@ in core = "scummvm"; src = fetchRetro { repo = core; - rev = "c00247171ba8201614e85556c638b8825dc9f225"; - sha256 = "1wir3x928b37va6gn14bmwsydkpk4afma5hppmbivw4qp8mj25pa"; + rev = "0a703f6546c5a0d8ef835aa624681f7877c36df6"; + sha256 = "1v1a6zvc1sjvvnvcarcmdym7qwyqyvl4b6ianjgzbpaxwmw457g0"; }; description = "Libretro port of ScummVM"; extraBuildInputs = [ fluidsynth libjpeg libvorbis mesa SDL ]; }).override { - buildPhase = "cd backends/platform/libretro/build/;make"; + buildPhase = "cd backends/platform/libretro/build && make"; + }; + + snes9x = (mkLibRetroCore rec { + core = "snes9x"; + src = fetchRetro { + repo = core; + rev = "0724786eb2ed1436946a2e2b42c77cddf8412a63"; + sha256 = "15wnq12mkfz766dzafhlmmh8a8b463ybssj84fhijj8c1x75scd1"; + }; + description = " Port of SNES9x git to libretro"; + }).override { + buildPhase = "cd libretro && make"; }; snes9x-next = mkLibRetroCore rec { core = "snes9x-next"; src = fetchRetro { repo = core; - rev = "461d92be09e1857d215f51aeea448a8e180bbfdd"; - sha256 = "0ci453qsyrv3brmy2szngis2xyvxilcv9yhc2qjz285mirg6fj57"; + rev = "c701a1e4357bc80e46cae5bdfa0d359bcbce23ad"; + sha256 = "0410dj7rxcadvyghc1yqwqidn1g3scm52i3gb9d8haymg9q1zbjs"; }; description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro"; }; @@ -214,22 +252,33 @@ in core = "stella"; src = fetchRetro { repo = core + "-libretro"; - rev = "c7ee7ca7e8a29c986f49306c75832972f5749f72"; - sha256 = "15wy9h3a2qk66lh8x40b3a9il0zkdflqil1h51zjmhq2zzsq8p95"; + rev = "394ef8c10b8057fe3f92ff9d7c73886ae2eefec2"; + sha256 = "1a5m157fqpspi2zafmqhcd6864dvfpwh44d4n47ngswp6ii9bq0f"; }; description = "Port of Stella to libretro"; }).override { buildPhase = "make"; }; + vba-m = (mkLibRetroCore rec { + core = "vbam"; + src = fetchRetro { + repo = core + "-libretro"; + rev = "26a030ce01a6473d35bac2a6db4f0a360989d72f"; + sha256 = "065gljk2nijnjg2c2zbnpg25s5zam7x0z8lq7kbz9zb87sp73ha1"; + }; + description = "vanilla VBA-M libretro port"; + }).override { + buildPhase = "cd src/libretro && make"; + }; + vba-next = mkLibRetroCore rec { core = "vba-next"; src = fetchRetro { repo = core; - rev = "fb095107f83df5f93b8ba4833eaf43901f42c0c0"; - sha256 = "0fvq1dfll27vjbmyh4qsp2nw166jsd91sjmf1sl84z56ab3q3iw8"; + rev = "136fe2020e941f27036754dd0524bfec750025dc"; + sha256 = "17bvx2wp2r5lkgffvqrirhgic1bfy39m7c1v74z245hg6z1jvqcf"; }; - description = "VBA-M libretro port"; + description = "VBA-M libretro port with modifications for speed"; }; - } \ No newline at end of file diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index d110f2b789e2..616fab44d6fc 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,31 +1,31 @@ -{ stdenv, fetchgit, pkgconfig, which -, SDL, mesa, alsaLib -, libXxf86vm, libXinerama, libXv -}: +{ stdenv, fetchgit, pkgconfig, ffmpeg, mesa, nvidia_cg_toolkit +, freetype, libxml2, libv4l, coreutils, python34, which, udev, alsaLib +, libX11, libXext, libXxf86vm, libXdmcp, SDL, pulseaudio ? null }: stdenv.mkDerivation rec { - name = "retroarch-bare-0.9.9.7"; + name = "retroarch-bare-${version}"; + version = "20141009"; src = fetchgit { - url = "https://github.com/libretro/RetroArch.git"; - rev = "ea0c4880556e0f9d1fe8253ddc713bc743b00e1b"; - sha256 = "1jhyh7f8ijy67fxslxqsp8pjl2lwayjljp06hp4n5cn33yajpbd7"; + url = git://github.com/libretro/RetroArch.git; + rev = "72f26dfb49f236294c52eb9cb4c9d5c15da4837a"; + sha256 = "0dn9fh1frnbxykhw3q229ck50a800p8r4va8nssfcdxh8cys385w"; }; - buildInputs = [ - pkgconfig which SDL mesa alsaLib - libXxf86vm libXinerama libXv - ]; + buildInputs = [ pkgconfig ffmpeg mesa nvidia_cg_toolkit freetype libxml2 libv4l coreutils + python34 which udev alsaLib libX11 libXext libXxf86vm libXdmcp SDL pulseaudio ]; - preConfigure = '' - configureFlags="--global-config-dir=$out/etc" + patchPhase = '' + export GLOBAL_CONFIG_DIR=$out/etc + sed -e 's#/bin/true#${coreutils}/bin/true#' -i qb/qb.libs.sh ''; - meta = { - description = "Modular multi-system game/emulator system"; - homepage = "http://www.libretro.com/"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ iyzsong ]; + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://libretro.org/; + description = "Multi-platform emulator frontend for libretro cores"; + license = licenses.gpl3; + maintainers = with maintainers; [ MP2E ]; }; } diff --git a/pkgs/misc/emulators/retroarch/master.nix b/pkgs/misc/emulators/retroarch/master.nix deleted file mode 100644 index 2efb43e5d5ee..000000000000 --- a/pkgs/misc/emulators/retroarch/master.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchgit, pkgconfig, ffmpeg, mesa, nvidia_cg_toolkit -, freetype, libxml2, libv4l, coreutils, python34, which, udev, alsaLib -, libX11, libXext, libXxf86vm, libXdmcp, SDL, pulseaudio ? null }: - -stdenv.mkDerivation rec { - name = "retroarch-bare-${version}"; - version = "20140902"; - - src = fetchgit { - url = git://github.com/libretro/RetroArch.git; - rev = "0856091296c2e47409f36e13007805d71db69483"; - sha256 = "152dfp6jd7yzvasqrqw4ydjbdcwq4khisia2dax3gydvxkq87nl4"; - }; - - buildInputs = [ pkgconfig ffmpeg mesa nvidia_cg_toolkit freetype libxml2 libv4l coreutils - python34 which udev alsaLib libX11 libXext libXxf86vm libXdmcp SDL pulseaudio ]; - - patchPhase = '' - export GLOBAL_CONFIG_DIR=$out/etc - sed -e 's#/bin/true#${coreutils}/bin/true#' -i qb/qb.libs.sh - ''; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = http://libretro.org/; - description = "Multi-platform emulator frontend for libretro cores"; - license = licenses.gpl3; - maintainers = with maintainers; [ MP2E ]; - }; -} diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index 36437c4e57bf..4d6435c808f6 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; let - version = "1.7.28"; + version = "1.7.29"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "04r3zk3dz2vzly2a4nqbcvppjs5iy3lq5ibx3wfrf877p5bz3hv7"; + sha256 = "0qnyp1svzh2yyc3p34dg8hf21lwzxn4xkgpa3s0rfcak6l6ijj5f"; }; gecko = fetchurl { diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 7177f10e3a23..59ff877f0a3f 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, bash, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit, clang }: +{ fetchurl, bash, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit, fetchzip, clang, zip }: /* About Vim and plugins @@ -18,12 +18,11 @@ Traditionally plugins were installed into ~/.vim/* so it was your task to keep t of which files belong to what plugin. Now this problem is "fixed" by nix which assembles your profile for you. - Vim offers the :h rtp setting which works for most plugins. Thus adding adding this to your .vimrc should make most plugins work: - set rtp+=~/.nix-profile/vim-plugins/YouCompleteMe - " or for p in ["YouCompleteMe"] | exec 'set rtp+=~/.nix-profile/vim-plugins/'.p | endfor + set rtp+=~/.nix-profile/vim-plugins/youcompleteme + " or for p in ["youcompleteme"] | exec 'set rtp+=~/.nix-profile/vim-plugins/'.p | endfor Its what pathogen, vundle, vim-addon-manager (VAM) use. @@ -68,7 +67,7 @@ outdated ones. So which plugins to add here according to what Marc Weber thinks is best? Complicated plugins requiring dependencies, such as YouCompleteMe. -Then its best to symlink ~/.nix-profile/vim-plugins/YouCompleteMe to +Then its best to symlink ~/.nix-profile/vim-plugins/youcompleteme to ~/.vim/{vim-addons,bundle} or whatever plugin management solution you use. If you feel differently change the comments and proceed. @@ -83,11 +82,12 @@ let vimHelpTags = '' } ''; - # install a simple standard vim plugin - simpleDerivation = a@{name, src, path, buildPhase ? "", ...} : stdenv.mkDerivation (a // { + buildVimPlugin = a@{name, namePrefix ? "vimplugin-", src, buildPhase ? "", ...}: stdenv.mkDerivation (a // { + name = namePrefix + name; + inherit buildPhase; - installPhase = '' + installPhase = let path = (builtins.parseDrvName name).name; in '' target=$out/share/vim-plugins/${path} mkdir -p $out/share/vim-plugins cp -r . $target @@ -99,88 +99,105 @@ let vimHelpTags = '' in rec { - - vimAddonNix = { - # github.com/MarcWeber/vim-addon-nix provides some additional support for - # editing .nix files - - # This is a placeholder, because I think you always should be using latest - # git version. It also depends on some additional plugins (see addon-info.json) - }; - - YouCompleteMe = stdenv.mkDerivation { + a = buildVimPlugin { + name = "a-git-2010-11-06"; src = fetchgit { - url = "https://github.com/Valloric/YouCompleteMe.git"; - rev = "a2cae90f7ba1746bf1209edd6739f87d5914b375"; - sha256 = "1yxrxskxnr2da5awm59ra4s9wg67rimcbazvln9bayg9saxs540d"; + url = "https://github.com/vim-scripts/a.vim.git"; + rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885"; + sha256 = "ca0982873ed81e7f6545a6623b735104c574fe580d5f21b0aa3dc1557edac240"; }; - - name = "youcompleteme-20140929"; # commit date - buildInputs = [ python cmake clang.clang ]; - - configurePhase = ":"; - - buildPhase = '' - patchShebangs . - - target=$out/share/vim-plugins/YouCompleteMe - mkdir -p $target - cp -a ./ $target - - mkdir $target/build - cd $target/build - cmake -G "Unix Makefiles" . $target/third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON - make ycm_support_libs -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} - ${bash}/bin/bash $target/install.sh --clang-completer --system-libclang - - ${vimHelpTags} - vimHelpTags $target - ''; - - # TODO: implement proper install phase rather than keeping everything in store - # TODO: support llvm based C completion, See README of git repository - installPhase = ":"; - - path = "YouCompleteMe"; - meta = { - description = "fastest non utf-8 aware word and C completion engine for Vim"; - homepage = http://github.com/Valloric/YouCompleteMe; - license = stdenv.lib.licenses.gpl3; - maintainers = [stdenv.lib.maintainers.marcweber]; - platforms = stdenv.lib.platforms.linux; + homepage = https://github.com/vim-scripts/a.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; - syntastic = simpleDerivation rec { - version = "3.4.0"; - name = "vim-syntastic-${version}"; + alternative = a; # backwards compat, added 2014-10-21 - src = fetchurl { - url = "https://github.com/scrooloose/syntastic/archive/${version}.tar.gz"; - sha256 = "0h8vfs6icpfwc41qx6n6rc1m35haxp2gaswg9fhcki2w2ikp6knb"; + airline = buildVimPlugin { + name = "airline-git-2014-10-18"; + src = fetchgit { + url = "https://github.com/bling/vim-airline.git"; + rev = "616daceb735771ed27535abe8a6e4907320f1e82"; + sha256 = "05ee7f6d58b14c35edda36183745e508bab19d2289b02af73f980062e51316e7"; + }; + meta = { + homepage = https://github.com/bling/vim-airline; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; - - path = "syntastic"; }; - coffeeScript = simpleDerivation { - name = "vim-coffee-script-v002"; + align = buildVimPlugin { + name = "align-git-2012-08-07"; + src = fetchgit { + url = "https://github.com/vim-scripts/align.git"; + rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77"; + sha256 = "f7b5764357370f03546556bd45558837f3790b0e86afadb63cd04d714a668a29"; + }; + meta = { + homepage = https://github.com/vim-scripts/align; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + calendar = buildVimPlugin { + name = "calendar-git-2014-10-19"; + src = fetchgit { + url = "https://github.com/itchyny/calendar.vim.git"; + rev = "44890a96d80bcd5fe62307e4bcb4d4085010e324"; + sha256 = "55f38e3e0af0f95229c654420c332668f93ac941f044c0573c7f1b26030e9202"; + }; + meta = { + homepage = https://github.com/itchyny/calendar.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + coffee-script = buildVimPlugin { + name = "coffee-script-002"; src = fetchurl { url = "https://github.com/vim-scripts/vim-coffee-script/archive/v002.tar.gz"; sha256 = "1xln6i6jbbihcyp5bsdylr2146y41hmp2xf7wi001g2ymj1zdsc0"; }; - path = "vim-coffee-script"; }; - command_T = simpleDerivation rec { - version = "1.8"; - name = "vim-command-t-${version}"; - src = fetchurl { - url = "https://github.com/wincent/Command-T/archive/${version}.tar.gz"; - sha256 = "ad8664292e6eee40fbe195d856d20d93a8630e8c0149317ad72cc39423630800"; + coffeeScript = coffee-script; # backwards compat, added 2014-10-18 + + colors-solarized = buildVimPlugin { + name = "colors-solarized-git-2011-05-09"; + src = fetchgit { + url = "https://github.com/altercation/vim-colors-solarized.git"; + rev = "528a59f26d12278698bb946f8fb82a63711eec21"; + sha256 = "a1b2ef696eee94dafa76431c31ee260acdd13a7cf87939f27eca431d5aa5a315"; + }; + meta = { + homepage = https://github.com/altercation/vim-colors-solarized; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + colorsamplerpack = buildVimPlugin rec { + version = "2012.10.28"; + name = "colorsamplerpack-${version}"; + + setSourceRoot = "sourceRoot=."; + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=18915"; + name = "colorsamplerpack.zip"; + sha256 = "1wsrb3vpqn9fncnalfpvc8r92wk1mcskm4shb3s2h9x5dyihf2rd"; + }; + + buildInputs = [ unzip ]; + }; + + command-t = buildVimPlugin rec { + version = "1.8"; + name = "command-t-${version}"; + src = fetchzip { + inherit name; + url = "https://github.com/wincent/Command-T/archive/${version}.tar.gz"; + sha256 = "186qz1smf7w91r68p724whg6d821f7ph6ks63l2vkhff8f9qqhrc"; }; - path = "Command-T"; buildInputs = [ perl ruby ]; buildPhase = '' pushd ruby/command-t @@ -190,14 +207,68 @@ in rec ''; }; - eighties = simpleDerivation rec { + command_T = command-t; # backwards compat, added 2014-10-18 + + commentary = buildVimPlugin { + name = "commentary-git-2014-06-27"; + src = fetchgit { + url = "https://github.com/tpope/vim-commentary.git"; + rev = "8b4df6ca0ba9cd117d97a8fd26b44b2439d5e3f1"; + sha256 = "5496ed31706552957d4caa76669ecd04e9b2853cf7a7e40bd0164726b21fcca0"; + }; + meta = { + homepage = https://github.com/tpope/vim-commentary; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + ctrlp = buildVimPlugin rec { + version = "1.79"; + name = "ctrlp-${version}"; + + setSourceRoot = "sourceRoot=."; + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=19448"; + name = "ctrlp_180.zip"; + sha256 = "1x9im8g0g27mxc3c9k7v0jg5bb1dmnbjygmqif5bizab5g69n2mi"; + }; + + buildInputs = [ unzip ]; + }; + + easy-align = buildVimPlugin { + name = "easy-align-git-2014-10-03"; + src = fetchgit { + url = "https://github.com/junegunn/vim-easy-align.git"; + rev = "2595ebf9333f3598502276b29f78ad39965bc595"; + sha256 = "1223b587c515169d4b735bf56f109f7bfc4f7c1327e76865f498309f7472ef78"; + }; + meta = { + homepage = https://github.com/junegunn/vim-easy-align; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + easymotion = buildVimPlugin { + name = "easymotion-git-2014-09-29"; + src = fetchgit { + url = "https://github.com/lokaltog/vim-easymotion.git"; + rev = "868cd71710a48e8ec8acffeabd1eebfb10812c77"; + sha256 = "13c8b93c257fcbb0f6e0eb197700b4f8cbe4cf4846d29f1aba65f625202b9d77"; + }; + meta = { + homepage = https://github.com/lokaltog/vim-easymotion; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + eighties = buildVimPlugin rec { version = "1.0.4"; - name = "vim-eighties-${version}"; + name = "eighties-${version}"; src = fetchurl { url = "https://github.com/justincampbell/vim-eighties/archive/${version}.tar.gz"; sha256 = "0cjd9hbg2qd7jjkvyi15f9ysp7m3aa2sg8nvbf80yb890rfkwaqr"; }; - path = "eighties"; meta = with stdenv.lib; { description = "Automatically resizes your windows to 80 characters"; homepage = https://github.com/justincampbell/vim-eighties; @@ -207,42 +278,487 @@ in rec }; }; - golang = simpleDerivation { - name = "vim-golang-20131127"; + extradite = buildVimPlugin { + name = "extradite-git-2014-06-18"; + src = fetchgit { + url = "https://github.com/int3/vim-extradite.git"; + rev = "af4f3a51b6b654d655121b93c0cd9d8fe9a0c85d"; + sha256 = "d1d29cfbc654134be383747f2cd6b14b7a87de75f997af6a041f14d7ef61ade6"; + }; + meta = { + homepage = https://github.com/int3/vim-extradite; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + fugitive = buildVimPlugin { + name = "fugitive-git-2014-09-02"; + src = fetchgit { + url = "https://github.com/tpope/vim-fugitive.git"; + rev = "0374322ba5d85ae44dd9dc44ef31ca015a59097e"; + sha256 = "3bb09693726c4f9fc1695bc8b40c45d64a6a0f1d9a4243b4a79add841013ad6c"; + }; + meta = { + homepage = https://github.com/tpope/vim-fugitive; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + ghcmod-vim = buildVimPlugin { + name = "ghcmod-vim-git-2014-10-19"; + src = fetchgit { + url = "https://github.com/eagletmt/ghcmod-vim.git"; + rev = "d5c6c7f3c85608b5b76dc3e7e001f60b86c32cb9"; + sha256 = "ab56d470ea18da3fae021e22bba14460505e61a94f8bf707778dff5eec51cd6d"; + }; + meta = { + homepage = https://github.com/eagletmt/ghcmod-vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + gist-vim = buildVimPlugin { + name = "gist-vim-git-2014-10-19"; + src = fetchgit { + url = "https://github.com/mattn/gist-vim.git"; + rev = "9265aaa3fb3f090a292c3fb883eab4cea9d2a722"; + sha256 = "2a1b6c589a60af7acd68f7686d1cbadc60a1da8a407b02d96f86ddfe8bc70c18"; + }; + buildInputs = [ zip ]; + meta = { + homepage = https://github.com/mattn/gist-vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + gitgutter = buildVimPlugin { + name = "gitgutter-git-2014-10-17"; + src = fetchgit { + url = "https://github.com/airblade/vim-gitgutter.git"; + rev = "39f011909620e0c7ae555efdace20c3963ac88af"; + sha256 = "585c367c8cf72d7ef511b3beca3d1eae1d68bbd61b9a8d4dc7aea6e0caa4813a"; + }; + meta = { + homepage = https://github.com/airblade/vim-gitgutter; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + golang = buildVimPlugin { + name = "golang-git-2014-08-06"; src = fetchgit { url = "https://github.com/jnwhiteh/vim-golang.git"; - rev = "832d64e5a813511ed52217aa24f0255c49671bab"; - sha256 = "6858eb674be132477c5dc7f7d3cbe550371f90d1aba480547a614965412a7b3c"; - }; - path = "golang"; - meta = with stdenv.lib; { - description = "Vim plugins for Go"; - homepage = https://github.com/jnwhiteh/vim-golang; - license = licenses.publicDomain; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + rev = "e6d0c6a72a66af2674b96233c4747661e0f47a8c"; + sha256 = "1231a2eff780dbff4f885fcb4f656f7dd70597e1037ca800470de03bf0c5e7af"; + }; + meta = { + homepage = https://github.com/jnwhiteh/vim-golang; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; - ipython = simpleDerivation { - name = "vim-ipython-ff8f88f3fe518851a91dc88aaa5a75f8f352a960"; - src = fetchurl { - url = "https://github.com/ivanov/vim-ipython/archive/ff8f88f3fe518851a91dc88aaa5a75f8f352a960.tar.gz"; - sha256 = "0hlx526dm8amrvh41kwnmgvvdzs6sh5yc5sfq4nk1zjkfcp1ah5j"; - }; - path = "ipython"; - meta = with stdenv.lib; { - description = "A two-way integration between vim and iPython"; - homepage = https://github.com/ivanov/vim-ipython; - repositories.git = https://github.com/ivanov/vim-ipython.git; - license = licenses.publicDomain; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + gundo = buildVimPlugin { + name = "gundo-git-2013-08-11"; + src = fetchgit { + url = "https://github.com/vim-scripts/gundo.git"; + rev = "f443470b96364c24a775629418a6b2562ec9173e"; + sha256 = "b7a949167e59c936d6eae0d23635b87491b2cd2f46a197683b171d30165a90f9"; + }; + meta = { + homepage = https://github.com/vim-scripts/gundo; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; }; - taglist = simpleDerivation { - name = "vim-taglist-4.6"; + hardtime = buildVimPlugin { + name = "hardtime-git-2014-10-21"; + src = fetchgit { + url = "https://github.com/takac/vim-hardtime.git"; + rev = "b401c72528d1c23e4cc9bc9585fda4361d0199bf"; + sha256 = "65e4bda7531076147fc46f496c8e56c740d1fcf8fe85c18cb2d2070d0c3803cd"; + }; + meta = { + homepage = https://github.com/takac/vim-hardtime; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + haskellconceal = buildVimPlugin { + name = "haskellconceal-git-2014-08-07"; + src = fetchgit { + url = "https://github.com/twinside/vim-haskellconceal.git"; + rev = "1d85e8f10b675d38ec117368ec8032f486c27f98"; + sha256 = "8ae762939ea435333031a094f3c63e6edd534ac849f0008fa0440440f1f2f633"; + }; + meta = { + homepage = https://github.com/twinside/vim-haskellconceal; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + haskellConceal = haskellconceal; # backwards compat, added 2014-10-18 + + hasksyn = buildVimPlugin { + name = "hasksyn-git-2014-09-03"; + src = fetchgit { + url = "https://github.com/travitch/hasksyn.git"; + rev = "c434040bf13a17ca20a551223021b3ace7e453b9"; + sha256 = "b1a735928aeca7011b83133959d59b9c95ab8535fd00ce9968fae4c3b1381931"; + }; + meta = { + homepage = https://github.com/travitch/hasksyn; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + hdevtools = buildVimPlugin { + name = "hdevtools-git-2012-12-29"; + src = fetchgit { + url = "https://github.com/bitc/vim-hdevtools.git"; + rev = "474947c52ff9c93dd36f3c49de90bd9a78f0baa1"; + sha256 = "bf5f096b665c51ce611c6c1bfddc3267c4b2f94af84b04482b07272a6a5a92f3"; + }; + meta = { + homepage = https://github.com/bitc/vim-hdevtools; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + hier = buildVimPlugin { + name = "hier-git-2011-08-27"; + src = fetchgit { + url = "https://github.com/jceb/vim-hier.git"; + rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7"; + sha256 = "f62836545abfe379f9c5410da28409947407cd282ef784b2db89aed0756a1785"; + }; + buildInputs = [ vim ]; + meta = { + homepage = https://github.com/jceb/vim-hier; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + + hoogle = buildVimPlugin { + name = "hoogle-git-2013-11-26"; + src = fetchgit { + url = "https://github.com/twinside/vim-hoogle.git"; + rev = "81f28318b0d4174984c33df99db7752891c5c4e9"; + sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0"; + }; + meta = { + homepage = https://github.com/twinside/vim-hoogle; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + idris-vim = buildVimPlugin { + name = "idris-vim-git-2014-10-14"; + src = fetchgit { + url = "https://github.com/idris-hackers/idris-vim.git"; + rev = "78730e511cae0a067f79da1168466601553f619b"; + sha256 = "47638b25fa53203e053e27ec6f135fd63ae640edbe37e62d7450a8c434a4cc6b"; + }; + meta = { + homepage = https://github.com/idris-hackers/idris-vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + ipython = buildVimPlugin { + name = "ipython-git-2014-07-17"; + src = fetchgit { + url = "https://github.com/ivanov/vim-ipython.git"; + rev = "9ce4f201ce26e9f01d56a6040ddf9255aab27272"; + sha256 = "444dede544f9b519143ecc3a6cdfef0c4c32043fc3cd69f92fdcd86c1010e824"; + }; + meta = { + homepage = https://github.com/ivanov/vim-ipython; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + latex-box = buildVimPlugin { + name = "latex-box-git-2014-10-05"; + src = fetchgit { + url = "https://github.com/latex-box-team/latex-box.git"; + rev = "3e000fb161bdf6efe7aef517aef276554aeabb65"; + sha256 = "462803aceec5904943074e11888482ef6c49c8a5e26d6728ebcb2c4f5dbbb6a4"; + }; + meta = { + homepage = https://github.com/latex-box-team/latex-box; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + latex-live-preview = buildVimPlugin { + name = "latex-live-preview-git-2013-11-25"; + src = fetchgit { + url = "https://github.com/xuhdev/vim-latex-live-preview.git"; + rev = "18625ceca4de5984f3df50cdd0202fc13eb9e37c"; + sha256 = "261852d3830189a50176f997a4c6b4ec7e25893c5b7842a3eb57eb7771158722"; + }; + meta = { + homepage = https://github.com/xuhdev/vim-latex-live-preview; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + lushtags = buildVimPlugin { + name = "lushtags-git-2013-12-27"; + src = fetchgit { + url = "https://github.com/bitc/lushtags.git"; + rev = "429fab3b748ae04ee5de0cbf75d947f15441e798"; + sha256 = "5170019fbe64b15be30a0ba82e6b01364d115ccad6ef690a6df86f73af22a0a7"; + }; + meta = { + homepage = https://github.com/bitc/lushtags; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + neco-ghc = buildVimPlugin { + name = "neco-ghc-git-2014-10-17"; + src = fetchgit { + url = "https://github.com/eagletmt/neco-ghc.git"; + rev = "fffdf57dcb312f874a43a202157b5efecfe3d9de"; + sha256 = "464b24e3151ebaf0e95c25f09cb047e2542d5dd9100087e538d0a5e46bd0e638"; + }; + meta = { + homepage = https://github.com/eagletmt/neco-ghc; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + necoGhc = neco-ghc; # backwards compat, added 2014-10-18 + + nerdcommenter = buildVimPlugin { + name = "nerdcommenter-git-2014-07-08"; + src = fetchgit { + url = "https://github.com/scrooloose/nerdcommenter.git"; + rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6"; + sha256 = "ef270ae5617237d68b3d618068e758af8ffd8d3ba27a3799149f7a106cfd178e"; + }; + meta = { + homepage = https://github.com/scrooloose/nerdcommenter; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + nerdtree = buildVimPlugin { + name = "nerdtree-git-2014-08-06"; + src = fetchgit { + url = "https://github.com/scrooloose/nerdtree.git"; + rev = "4f1e6ecb057fc0bac189171c1430d71ef25f6bb1"; + sha256 = "67ff2e7b9a7f39e58e9e334b1b79343a4c11aae10a657ab4fece289d8fe59300"; + }; + meta = { + homepage = https://github.com/scrooloose/nerdtree; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + pathogen = buildVimPlugin { + name = "pathogen-git-2014-07-19"; + src = fetchgit { + url = "https://github.com/tpope/vim-pathogen.git"; + rev = "91e6378908721d20514bbe5d18d292a0a15faf0c"; + sha256 = "24c1897d6b58576b2189c90050a7f8ede72a51343c752e9d030e833dbe5cac6f"; + }; + meta = { + homepage = https://github.com/tpope/vim-pathogen; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + quickfixstatus = buildVimPlugin { + name = "quickfixstatus-git-2011-09-02"; + src = fetchgit { + url = "https://github.com/dannyob/quickfixstatus.git"; + rev = "fd3875b914fc51bbefefa8c4995588c088163053"; + sha256 = "7b6831d5da1c23d95f3158c67e4376d32c2f62ab2e30d02d3f3e14dcfd867d9b"; + }; + meta = { + homepage = https://github.com/dannyob/quickfixstatus; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + quickrun = buildVimPlugin { + name = "quickrun-git-2014-10-08"; + src = fetchgit { + url = "https://github.com/thinca/vim-quickrun.git"; + rev = "ae97cef42ae142306e9431dce9ab97c4353e5254"; + sha256 = "3219fadb3732c895c82b8bcff1d6e86f0917cd5ac7bf34180c27bb3f75ed1787"; + }; + meta = { + homepage = https://github.com/thinca/vim-quickrun; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + + rainbow_parentheses = buildVimPlugin { + name = "rainbow_parentheses-git-2013-03-04"; + src = fetchgit { + url = "https://github.com/kien/rainbow_parentheses.vim.git"; + rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; + sha256 = "47975a426d06f41811882691d8a51f32bc72f590477ed52b298660486b2488e3"; + }; + meta = { + homepage = https://github.com/kien/rainbow_parentheses.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + rust = buildVimPlugin { + name = "rust-git-2014-10-15"; + src = fetchgit { + url = "https://github.com/wting/rust.vim.git"; + rev = "aaeb7b51f1b188fb1edc29c3a3824053b3e5e265"; + sha256 = "be858b1e2cb0b37091a3d79a51e264b3101229b007cfc16bcd28c740f3823c01"; + }; + meta = { + homepage = https://github.com/wting/rust.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + shabadou = buildVimPlugin { + name = "shabadou-git-2014-07-27"; + src = fetchgit { + url = "https://github.com/osyo-manga/shabadou.vim.git"; + rev = "c5af30bb0c028d53cfd89e00cab636c844034a9a"; + sha256 = "392efa8a5e725219e478b571d9a30ddba88d47662467ed3123a168e8b55c4de6"; + }; + meta = { + homepage = https://github.com/osyo-manga/shabadou.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + stylish-haskell = buildVimPlugin { + name = "stylish-haskell-git-2014-07-14"; + src = fetchgit { + url = "https://github.com/nbouscal/vim-stylish-haskell.git"; + rev = "453fd203aee3d7305ea8e4088ff53bd1f5933d75"; + sha256 = "c0e5010e1e8e56b179ce500387afb569f051c45b37ce92feb4350f293df96a8c"; + }; + meta = { + homepage = https://github.com/nbouscal/vim-stylish-haskell; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18 + + supertab = buildVimPlugin { + name = "supertab-git-2014-10-17"; + src = fetchgit { + url = "https://github.com/ervandew/supertab.git"; + rev = "fd4e0d06c2b1d9bff2eef1d15e7895b3b4da7cd7"; + sha256 = "5919521b95519d4baa8ed146c340ca739fa7f31dfd305c74ca0ace324ba93d74"; + }; + buildInputs = [ vim ]; + meta = { + homepage = https://github.com/ervandew/supertab; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + surround = buildVimPlugin { + name = "surround-git-2014-07-26"; + src = fetchgit { + url = "https://github.com/tpope/vim-surround.git"; + rev = "fa433e0b7330753688f715f3be5d10dc480f20e5"; + sha256 = "5f01daf72d23fc065f4e4e8eac734275474f32bfa276a9d90ce0d20dfe24058d"; + }; + meta = { + homepage = https://github.com/tpope/vim-surround; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + signature = buildVimPlugin { + name = "signature-git-2014-10-17"; + src = fetchgit { + url = "https://github.com/kshenoy/vim-signature.git"; + rev = "f012d6f4d288ef6006f61b06f5240bc461a1f89e"; + sha256 = "bef5254e343758d609856c745fe9d83639546f3af4ca50542429c1cb91ab577a"; + }; + meta = { + homepage = https://github.com/kshenoy/vim-signature; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + syntastic = buildVimPlugin { + name = "syntastic-git-2014-10-17"; + src = fetchgit { + url = "https://github.com/scrooloose/syntastic.git"; + rev = "77c125170aa6b8c553d58f876021b0cedd8ac820"; + sha256 = "ec9b1e22134cb16d07bef842be26b4f1f74a9f8b9a0afd9ab771ff79935920af"; + }; + meta = { + homepage = https://github.com/scrooloose/syntastic; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + table-mode = buildVimPlugin { + name = "table-mode-git-2014-09-17"; + src = fetchgit { + url = "https://github.com/dhruvasagar/vim-table-mode.git"; + rev = "ef0eef0f35f2ca172907f6d696dc8859acd8a0da"; + sha256 = "0377059972580f621f1bb4b35738e0e00d386b23d839115e8c5fa8fd3acbc98d"; + }; + meta = { + homepage = https://github.com/dhruvasagar/vim-table-mode; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + tabmerge = buildVimPlugin { + name = "tabmerge-git-2010-10-17"; + src = fetchgit { + url = "https://github.com/vim-scripts/tabmerge.git"; + rev = "074e5f06f26e7108a0570071a0f938a821768c06"; + sha256 = "b84501b0fc5cd51bbb58f12f4c2b3a7c97b03fe2a76446b56a2c111bd4f7335f"; + }; + meta = { + homepage = https://github.com/vim-scripts/tabmerge; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + tabular = buildVimPlugin { + name = "tabular-git-2013-05-16"; + src = fetchgit { + url = "https://github.com/godlygeek/tabular.git"; + rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb"; + sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f"; + }; + meta = { + homepage = https://github.com/godlygeek/tabular; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + tagbar = buildVimPlugin { + name = "tagbar-git-2014-10-14"; + src = fetchgit { + url = "https://github.com/majutsushi/tagbar.git"; + rev = "64e935fe5812d3b7022aba1dee63ec9f7456b02f"; + sha256 = "2a66b86328e395bd594c8673a6420307a32468e4040dafe2b877ad4afcf6b7f9"; + }; + meta = { + homepage = https://github.com/majutsushi/tagbar; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + taglist = buildVimPlugin { + name = "taglist-4.6"; meta = with stdenv.lib; { description = "Source code browser plugin"; homepage = "http://www.vim.org/scripts/script.php?script_id=273"; @@ -262,40 +778,122 @@ in rec mv plugin taglist ''; buildInputs = [ unzip ]; - path = "taglist"; }; - tagbar = simpleDerivation rec { - version = "2.6.1"; - name = "vim-tagbar-${version}"; - - meta = with stdenv.lib; { - description = "A vim plugin for browsing the tags of source code files"; - homepage = https://github.com/majutsushi/tagbar; - license = licenses.gpl3; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + thumbnail = buildVimPlugin { + name = "thumbnail-git-2014-07-24"; + src = fetchgit { + url = "https://github.com/itchyny/thumbnail.vim.git"; + rev = "e59a1791862ed470510a58456cc001226e177a39"; + sha256 = "f36d915804e36b5f2dcea7db481da97ec60d0c90df87599a5d5499e649d97f66"; + }; + meta = { + homepage = https://github.com/itchyny/thumbnail.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; - - src = fetchurl { - url = "https://github.com/majutsushi/tagbar/archive/v${version}.tar.gz"; - sha256 = "c061a7e0a45a166f4558b31e6c47b9fd701f5fa1319527b65a268ea054dea5fb"; - }; - - path = "tagbar"; }; - xdebug = simpleDerivation { - name = "vim-xdebug-a4980fa65f7f159780593ee37c178281691ba2c4"; - src = fetchurl { - url = "https://github.com/joonty/vim-xdebug/archive/a4980fa65f7f159780593ee37c178281691ba2c4.tar.gz"; - sha256 = "1348gzp0zhc2wifvs5vmf92m9y8ik8ldnvy7bawsxahy8hmhiksk"; + tmux-navigator = buildVimPlugin { + name = "tmux-navigator-git-2014-09-09"; + src = fetchgit { + url = "https://github.com/christoomey/vim-tmux-navigator.git"; + rev = "195cdf087fea7beaf6274d0a655d157dfab3130c"; + sha256 = "4235c2bfb64a9094b854cdd7303a64bbb994717f24704911c4b358b2373dfaa9"; + }; + meta = { + homepage = https://github.com/christoomey/vim-tmux-navigator; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; - path = "xdebug"; - postInstall = false; }; - vimshell = simpleDerivation rec { + tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18 + + tslime = buildVimPlugin { + name = "tslime-git-2014-06-12"; + src = fetchgit { + url = "https://github.com/jgdavey/tslime.vim.git"; + rev = "e801a32b27d83cb5d91afbf7c3d71bb6220f32bd"; + sha256 = "47fb7165c1dcc444285cdff6fa89bbd4ace82ca79ec14ba0da6091c5f78d1251"; + }; + meta = { + homepage = https://github.com/jgdavey/tslime.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + ultisnips = buildVimPlugin { + name = "ultisnips-git-2014-10-11"; + src = fetchgit { + url = "https://github.com/sirver/ultisnips.git"; + rev = "1ad970379edaec1a386bab5ff26c385b9e89a0ff"; + sha256 = "5d6858a153d79f596513d01d4ed9cd6dcff853e2c42c4b4546d38bd15423af98"; + }; + meta = { + homepage = https://github.com/sirver/ultisnips; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + undotree = buildVimPlugin { + name = "undotree-git-2014-09-17"; + src = fetchgit { + url = "https://github.com/mbbill/undotree.git"; + rev = "14655d87774b1f35b5bd23c6de64f535d90ed48d"; + sha256 = "ad55b88db051f57d0c7ddc226a7b7778daab58fa67dc8ac1d78432c0e7d38520"; + }; + meta = { + homepage = https://github.com/mbbill/undotree; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + vim2hs = buildVimPlugin { + name = "vim2hs-git-2014-04-16"; + src = fetchgit { + url = "https://github.com/dag/vim2hs.git"; + rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; + sha256 = "485fc58595bb4e50f2239bec5a4cbb0d8f5662aa3f744e42c110cd1d66b7e5b0"; + }; + meta = { + homepage = https://github.com/dag/vim2hs; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + vimoutliner = buildVimPlugin { + name = "vimoutliner-git-2014-10-20"; + src = fetchgit { + url = "https://github.com/vimoutliner/vimoutliner.git"; + rev = "4e924d9e42b6955a696e087d22795f5fe0e6c857"; + sha256 = "6a9a27526c51202fb15374b40c5a759df0e10977dbe3045dabef0439c3e62c72"; + }; + meta = { + homepage = https://github.com/vimoutliner/vimoutliner; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + vimproc = buildVimPlugin { + name = "vimproc-git-2014-10-03"; + src = fetchgit { + url = "https://github.com/shougo/vimproc.vim.git"; + rev = "3e055023dfab4f5a4dfa05a834f9d0cb7294a82e"; + sha256 = "63c2786897e8315eed2473822879b7ceb847e6021695a861892d7b9ab15a69fb"; + }; + buildInputs = [ which ]; + + buildPhase = '' + sed -i 's/vimproc_mac\.so/vimproc_unix\.so/' autoload/vimproc.vim + make -f make_unix.mak + ''; + + meta = { + homepage = https://github.com/shougo/vimproc.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + vimshell = buildVimPlugin rec { version = "9.2"; name = "vimshell-${version}"; @@ -320,58 +918,78 @@ in rec set runtimepath+=${vimproc}/share/vim-plugins/vimproc\ ' autoload/vimshell.vim ''; - - path = "vimshell"; }; - vimproc = simpleDerivation rec { - version = "21a79bf4edca3ae97555df3fc729d208c7e19b9c"; - name = "vimproc-${version}"; - - meta = with stdenv.lib; { - description = "An asynchronous execution library for Vim"; - homepage = https://github.com/Shougo/vimproc.vim; - repositories.git = https://github.com/Shougo/vimproc.vim.git; - license = licenses.gpl3; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - }; - + vundle = buildVimPlugin { + name = "vundle-git-2014-07-18"; src = fetchgit { - url = "https://github.com/Shougo/vimproc.vim.git"; - rev = "${version}"; - sha256 = "16mlrhmd1hq4rgg7bl9gajhb4nmn1x8jxfaxfwiy2bm1phgljgq0"; + url = "https://github.com/gmarik/vundle.vim.git"; + rev = "0b28e334e65b6628b0a61c412fcb45204a2f2bab"; + sha256 = "9681d471d1391626cb9ad22b2b469003d9980cd23c5c3a8d34666376447e6204"; }; - - buildInputs = [ which ]; - - buildPhase = '' - sed -i 's/vimproc_mac\.so/vimproc_unix\.so/' autoload/vimproc.vim - make -f make_unix.mak - ''; - - path = "vimproc"; - }; - - colorsamplerpack = simpleDerivation rec { - version = "2012.10.28"; - name = "vim-colorsamplerpack-${version}"; - - setSourceRoot = "sourceRoot=."; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=18915"; - name = "colorsamplerpack.zip"; - sha256 = "1wsrb3vpqn9fncnalfpvc8r92wk1mcskm4shb3s2h9x5dyihf2rd"; + meta = { + homepage = https://github.com/gmarik/vundle.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; }; - - buildInputs = [ unzip ]; - - path = "colorsamplerpack"; }; - yankring = simpleDerivation rec { + watchdogs = buildVimPlugin { + name = "watchdogs-git-2014-10-18"; + src = fetchgit { + url = "https://github.com/osyo-manga/vim-watchdogs.git"; + rev = "ad222796eb88b44954340c19c39938046af26e05"; + sha256 = "4c621ac2834864cf0c46f776029837913e1ba0c725a12d7cb24bf92e04ed1279"; + }; + meta = { + homepage = https://github.com/osyo-manga/vim-watchdogs; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + webapi-vim = buildVimPlugin { + name = "webapi-vim-git-2014-10-19"; + src = fetchgit { + url = "https://github.com/mattn/webapi-vim.git"; + rev = "99e11199838ccbeb7213cbc30698200170d355c9"; + sha256 = "599e282ef45bf6587c34579ab08d4e4a1f2cb54589e1e386c75d701880c90b9e"; + }; + buildInputs = [ zip ]; + meta = { + homepage = https://github.com/mattn/webapi-vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + wombat256 = buildVimPlugin { + name = "wombat256-git-2010-10-17"; + src = fetchgit { + url = "https://github.com/vim-scripts/wombat256.vim.git"; + rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2"; + sha256 = "2feb7d57ab0a9f2ea44ccd606e540db64ab3285956398a50ecc562d7b8dbcd05"; + }; + meta = { + homepage = https://github.com/vim-scripts/wombat256.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + xdebug = buildVimPlugin { + name = "xdebug-git-2012-08-15"; + src = fetchgit { + url = "https://github.com/joonty/vim-xdebug.git"; + rev = "a4980fa65f7f159780593ee37c178281691ba2c4"; + sha256 = "1ccb0e63eaf68548feb1c37b09c07c84b6bea9b350c4257549f091aa414601e2"; + }; + postInstall = false; + meta = { + homepage = https://github.com/joonty/vim-xdebug; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + yankring = buildVimPlugin rec { version = "18.0"; - name = "vim-yankring-${version}"; + name = "yankring-${version}"; setSourceRoot = "sourceRoot=."; src = fetchurl { @@ -381,282 +999,59 @@ in rec }; buildInputs = [ unzip ]; - - path = "yankring"; }; - ctrlp = simpleDerivation rec { - version = "1.79"; - name = "vim-ctrlp-${version}"; + vim-addon-nix = { + # github.com/MarcWeber/vim-addon-nix provides some additional support for + # editing .nix files - setSourceRoot = "sourceRoot=."; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=19448"; - name = "ctrlp_180.zip"; - sha256 = "1x9im8g0g27mxc3c9k7v0jg5bb1dmnbjygmqif5bizab5g69n2mi"; - }; - - buildInputs = [ unzip ]; - - path = "ctrlp"; + # This is a placeholder, because I think you always should be using latest + # git version. It also depends on some additional plugins (see addon-info.json) }; - alternate = stdenv.mkDerivation rec { - version = "2.18"; - name = "vim-a-${version}"; + youcompleteme = stdenv.mkDerivation { + src = fetchgit { + url = "https://github.com/Valloric/YouCompleteMe.git"; + rev = "87b42c689391b69968950ae99c3aaacf2e14c329"; + sha256 = "1f3pywv8bsqyyakvyarg7z9m73gmvp1lfbfp2f2jj73jmmlzb2kv"; + }; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=7218"; - name = "a.vim"; - sha256 = "1q22vfkv60sshp9yj3mmfc8azavgzz7rpmaf72iznzq4wccy6gac"; - }; - unpackPhase = ":"; - installPhase = '' - mkdir -p $out/share/vim-plugins/vim-a - cp ${src} $out/share/vim-plugins/vim-a/a.vim + name = "vimplugin-youcompleteme-2014-10-06"; + + buildInputs = [ python cmake clang.clang ]; + + configurePhase = ":"; + + buildPhase = '' + patchShebangs . + + target=$out/share/vim-plugins/youcompleteme + mkdir -p $target + cp -a ./ $target + + mkdir $target/build + cd $target/build + cmake -G "Unix Makefiles" . $target/third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON + make ycm_support_libs -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} + ${bash}/bin/bash $target/install.sh --clang-completer --system-libclang + + ${vimHelpTags} + vimHelpTags $target ''; + + # TODO: implement proper install phase rather than keeping everything in store + # TODO: support llvm based C completion, See README of git repository + installPhase = ":"; + + meta = { + description = "fastest non utf-8 aware word and C completion engine for Vim"; + homepage = http://github.com/Valloric/YouCompleteMe; + license = stdenv.lib.licenses.gpl3; + maintainers = [stdenv.lib.maintainers.marcweber]; + platforms = stdenv.lib.platforms.linux; + }; }; - vundle = simpleDerivation { - name = "vundle-vim-git-0b28e334"; - src = fetchgit { - url = "https://github.com/gmarik/Vundle.vim.git"; - rev = "0b28e334e65b6628b0a61c412fcb45204a2f2bab"; - sha256 = "9681d471d1391626cb9ad22b2b469003d9980cd23c5c3a8d34666376447e6204"; - }; - path = "vundle"; - }; - - tslime = simpleDerivation { - name = "tslime-vim-git-e801a32b"; - src = fetchgit { - url = "https://github.com/jgdavey/tslime.vim.git"; - rev = "e801a32b27d83cb5d91afbf7c3d71bb6220f32bd"; - sha256 = "47fb7165c1dcc444285cdff6fa89bbd4ace82ca79ec14ba0da6091c5f78d1251"; - }; - path = "tslime"; - }; - - supertab = simpleDerivation { - name = "supertab-git-23db5585"; - src = fetchgit { - url = "https://github.com/ervandew/supertab.git"; - rev = "23db558596d4a73e4afa8fbedcde23b95bf72251"; - sha256 = "21fa675969f4cfd2686ab3b63cba632fa55d62481e61d36193403bea9c02ebde"; - }; - path = "supertab"; - buildInputs = [ vim ]; - }; - - fugitive = simpleDerivation { - name = "vim-fugitive-git-90ee6fb5"; - src = fetchgit { - url = "https://github.com/tpope/vim-fugitive.git"; - rev = "90ee6fb5d255d14d9f12f2469f92ee50149f5b44"; - sha256 = "0297512f7fee62af601a99a68617591ecb2e244475ff0d79ebee9c7e6eff2eaf"; - }; - path = "fugitive"; - }; - - extradite = simpleDerivation { - name = "vim-extradite-git-af4f3a51"; - src = fetchgit { - url = "https://github.com/int3/vim-extradite.git"; - rev = "af4f3a51b6b654d655121b93c0cd9d8fe9a0c85d"; - sha256 = "d1d29cfbc654134be383747f2cd6b14b7a87de75f997af6a041f14d7ef61ade6"; - }; - path = "extradite"; - }; - - nerdtree = simpleDerivation { - name = "nerdtree-git-4f1e6ecb"; - src = fetchgit { - url = "https://github.com/scrooloose/nerdtree.git"; - rev = "4f1e6ecb057fc0bac189171c1430d71ef25f6bb1"; - sha256 = "67ff2e7b9a7f39e58e9e334b1b79343a4c11aae10a657ab4fece289d8fe59300"; - }; - path = "nerdtree"; - }; - - airline = simpleDerivation { - name = "vim-airline-git-2114e702"; - src = fetchgit { - url = "https://github.com/bling/vim-airline.git"; - rev = "2114e7025188a941e5c63b1f942d576adb98d8a4"; - sha256 = "b6fc4d0545f8b7e107c5f80b94cf536a2b1fdd55d9f2484a29a007911e96130f"; - }; - path = "airline"; - }; - - ultisnips = simpleDerivation { - name = "ultisnips-git-279d6e63"; - src = fetchgit { - url = "https://github.com/SirVer/ultisnips.git"; - rev = "279d6e63c9a8dbaa20ffc43c3c5f057dfc8f1121"; - sha256 = "f8d93849ef2bce798aa599ba860694ced37d12450010a48dd6bd3004bc52b503"; - }; - path = "ultisnips"; - }; - - align = simpleDerivation { - name = "align-git-787662fe"; - src = fetchgit { - url = "https://github.com/vim-scripts/Align.git"; - rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77"; - sha256 = "f7b5764357370f03546556bd45558837f3790b0e86afadb63cd04d714a668a29"; - }; - path = "align"; - }; - - gundo = simpleDerivation { - name = "gundo-git-f443470b"; - src = fetchgit { - url = "https://github.com/vim-scripts/Gundo.git"; - rev = "f443470b96364c24a775629418a6b2562ec9173e"; - sha256 = "b7a949167e59c936d6eae0d23635b87491b2cd2f46a197683b171d30165a90f9"; - }; - path = "gundo"; - }; - - commentary = simpleDerivation { - name = "vim-commentary-git-8b4df6ca"; - src = fetchgit { - url = "https://github.com/tpope/vim-commentary.git"; - rev = "8b4df6ca0ba9cd117d97a8fd26b44b2439d5e3f1"; - sha256 = "5496ed31706552957d4caa76669ecd04e9b2853cf7a7e40bd0164726b21fcca0"; - }; - path = "commentary"; - }; - - tabular = simpleDerivation { - name = "tabular-git-60f25648"; - src = fetchgit { - url = "https://github.com/godlygeek/tabular.git"; - rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb"; - sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f"; - }; - path = "tabular"; - }; - - vim2hs = simpleDerivation { - name = "vim2hs-git-f2afd557"; - src = fetchgit { - url = "https://github.com/dag/vim2hs.git"; - rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; - sha256 = "485fc58595bb4e50f2239bec5a4cbb0d8f5662aa3f744e42c110cd1d66b7e5b0"; - }; - path = "vim2hs"; - }; - - hasksyn = simpleDerivation { - name = "hasksyn-git-175cd460"; - src = fetchgit { - url = "https://github.com/travitch/hasksyn.git"; - rev = "175cd4605afa5d9b9c75758112c8159fd118c631"; - sha256 = "3488e38d1f45a9a3363da62c1c946591621151a0a9cdaedd22b3fe8f666bbdb9"; - }; - path = "hasksyn"; - }; - - haskellConceal = simpleDerivation { - name = "vim-haskellConceal-git-73a8d712"; - src = fetchgit { - url = "https://github.com/begriffs/vim-haskellConceal.git"; - rev = "73a8d712d3342b2ffdc087b12924f1cf81053860"; - sha256 = "be60ca030e2d39e972a8c71c0ab3b75b893589d26d5dd78a20cd6779f1f5cfa8"; - }; - path = "haskellConceal"; - }; - - ghcmod = simpleDerivation { - name = "ghcmod-vim-git-0c4e9428"; - src = fetchgit { - url = "https://github.com/eagletmt/ghcmod-vim.git"; - rev = "0c4e94281e57c475752e799adc261f7d5e4ab124"; - sha256 = "f6a085f7b8198747fae3fff0bc38e4d030e5c97aaeb84958fbf96fa658bbe862"; - }; - patches = [ (fetchurl { url = "https://github.com/eagletmt/ghcmod-vim/pull/57.diff"; md5 = "cafbb9f725afbba26b52b6c3344ee89a"; }) ]; - path = "ghcmod"; - }; - - necoGhc = simpleDerivation { - name = "neco-ghc-git-0311f31b"; - src = fetchgit { - url = "https://github.com/eagletmt/neco-ghc.git"; - rev = "0311f31b3acaccec5b651ae7089d627a3a49239b"; - sha256 = "302f29f54c56e9cee647745a8355aeafe323c4efe2f3593d5e4f586acc1c06a5"; - }; - path = "neco-ghc"; - }; - - hoogle = simpleDerivation { - name = "vim-hoogle-git-81f28318"; - src = fetchgit { - url = "https://github.com/Twinside/vim-hoogle.git"; - rev = "81f28318b0d4174984c33df99db7752891c5c4e9"; - sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0"; - }; - path = "hoogle"; - }; - - hdevtools = simpleDerivation { - name = "vim-hdevtools-git-474947c5"; - src = fetchgit { - url = "https://github.com/bitc/vim-hdevtools.git"; - rev = "474947c52ff9c93dd36f3c49de90bd9a78f0baa1"; - sha256 = "bf5f096b665c51ce611c6c1bfddc3267c4b2f94af84b04482b07272a6a5a92f3"; - }; - path = "hdevtools"; - }; - - stylishHaskell = simpleDerivation { - name = "vim-stylish-haskell-git-453fd203"; - src = fetchgit { - url = "https://github.com/nbouscal/vim-stylish-haskell.git"; - rev = "453fd203aee3d7305ea8e4088ff53bd1f5933d75"; - sha256 = "c0e5010e1e8e56b179ce500387afb569f051c45b37ce92feb4350f293df96a8c"; - }; - path = "stylish-haskell"; - }; - - wombat256 = simpleDerivation { - name = "wombat256-vim-git-8734ba45"; - src = fetchgit { - url = "https://github.com/vim-scripts/wombat256.vim.git"; - rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2"; - sha256 = "2feb7d57ab0a9f2ea44ccd606e540db64ab3285956398a50ecc562d7b8dbcd05"; - }; - path = "wombat256"; - }; - - tmuxNavigator = simpleDerivation { - name = "vim-tmux-navigator-git-3de98bfc"; - src = fetchgit { - url = "https://github.com/christoomey/vim-tmux-navigator.git"; - rev = "3de98bfcee1289ce8edc6daf9a18f243180c7168"; - sha256 = "3843f92e0a21fe5ccf613f8a561abd06c822b2ee98bd82c98937548144e4e8df"; - }; - path = "tmux-navigator"; - }; - - pathogen = simpleDerivation { - name = "vim-pathogen-git-3de98bfc"; - src = fetchgit { - url = "https://github.com/tpope/vim-pathogen.git"; - rev = "91e6378908721d20514bbe5d18d292a0a15faf0c"; - sha256 = "24c1897d6b58576b2189c90050a7f8ede72a51343c752e9d030e833dbe5cac6f"; - }; - path = "pathogen"; - }; - - vimoutliner = simpleDerivation { - name = "vimoutliner-git-dce383e7"; - src = fetchgit { - url = "https://github.com/vimoutliner/vimoutliner"; - rev = "2fc82976683c8770bece157ae3ada55251b6ddeb"; - sha256 = "dce383e7842c42bcfa8e7c3329fa426cb0fb05786d40a733da705c03aabd196b"; - }; - path = "vimoutliner"; - }; + YouCompleteMe = youcompleteme; # backwards compat, added 2014-10-18 } diff --git a/pkgs/os-specific/darwin/otool/default.nix b/pkgs/os-specific/darwin/otool/default.nix index e0793664a9c8..671e51542d06 100644 --- a/pkgs/os-specific/darwin/otool/default.nix +++ b/pkgs/os-specific/darwin/otool/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Object file displaying tool"; homepage = https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man1/otool.1.html; - # TODO license = with licenses; [ apsl20 gpl2Plus ]; + license = with licenses; [ apsl20 gpl2Plus ]; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.darwin; diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index c91274c50bf1..325fb869a707 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -264,7 +264,7 @@ if test -z "$libsOnly"; then cp $BIN/* $out/bin for prog in $BIN/*; do patchelf --set-interpreter $(echo $glibc/lib/ld-linux*.so.2) $out/bin/$(basename $prog) - wrapProgram $out/bin/$(basename $prog) --prefix LD_LIBRARY_PATH : $out/lib:$LD_LIBRARY_PATH + wrapProgram $out/bin/$(basename $prog) --prefix LD_LIBRARY_PATH : $out/lib:$gcc/lib:$qt4/lib:$LD_LIBRARY_PATH done } diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 45452c1ea6d2..11657d342917 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -3,6 +3,7 @@ , libXxf86vm, xf86vidmodeproto # for fglrx_gamma , xorg, makeWrapper, glibc, patchelf , unzip +, qt4 # for amdcccle , # Whether to build the libraries only (i.e. not the kernel module or # driver utils). Used to support 32-bit binaries on 64-bit # Linux. @@ -53,6 +54,7 @@ stdenv.mkDerivation { patchelf unzip mesa + qt4 ]; inherit libsOnly; @@ -74,13 +76,13 @@ stdenv.mkDerivation { # appear in /run/opengl-driver/lib which get's added to LD_LIBRARY_PATH extraDRIlibs = [ xorg.libXext ]; - inherit mesa; # only required to build examples + inherit mesa qt4; # only required to build examples and amdcccle meta = with stdenv.lib; { description = "ATI drivers"; homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx; license = licenses.unfree; - maintainers = with maintainers; [marcweber offline]; + maintainers = with maintainers; [ marcweber offline jgeerds ]; platforms = platforms.linux; hydraPlatforms = []; }; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index cf602a46f81d..d6b3231ec460 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,28 +1,30 @@ -{ fetchurl, stdenv, flex, bison, db, iptables, pkgconfig }: +{ fetchgit, stdenv, flex, bison, db, iptables, pkgconfig }: stdenv.mkDerivation rec { - name = "iproute2-3.16.0"; + name = "iproute2-3.17.0"; - src = fetchurl { - url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "0ybv29m88lccpfrh2dgiqash4c3gfvwwpx9kakvnc8c71rn8l2hz"; + src = fetchgit { + url = "git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"; + rev = "refs/tags/v3.17.0"; + sha256 = "113ayyy7cjxn0bf67fh4is4z0jysgif016kv7ig0jp6r68xp2spa"; }; - patch = [ - ./vpnc.patch - ./device-checking.patch # Remove after 3.16.0 + patch = [ ./vpnc.patch ]; + + preConfigure = '' + patchShebangs ./configure + sed -e '/ARPDDIR/d' -i Makefile + ''; + + makeFlags = [ + "DESTDIR=" + "LIBDIR=$(out)/lib" + "SBINDIR=$(out)/sbin" + "CONFDIR=$(out)/etc" + "DOCDIR=$(out)/share/doc/${name}" + "MANDIR=$(out)/share/man" ]; - preConfigure = - '' - patchShebangs ./configure - sed -e '/ARPDDIR/d' -i Makefile - ''; - - makeFlags = "DESTDIR= LIBDIR=$(out)/lib SBINDIR=$(out)/sbin" - + " CONFDIR=$(out)/etc DOCDIR=$(out)/share/doc/${name}" - + " MANDIR=$(out)/share/man"; - buildInputs = [ db iptables ]; nativeBuildInputs = [ bison flex pkgconfig ]; @@ -31,10 +33,11 @@ stdenv.mkDerivation rec { # Get rid of useless TeX/SGML docs. postInstall = "rm -rf $out/share/doc"; - meta = { + meta = with stdenv.lib; { homepage = http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2; description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ eelco wkennington ]; }; } diff --git a/pkgs/os-specific/linux/iproute/device-checking.patch b/pkgs/os-specific/linux/iproute/device-checking.patch deleted file mode 100644 index a55423be38c3..000000000000 --- a/pkgs/os-specific/linux/iproute/device-checking.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f1b66ff83a0babbe99fef81b3a960d7a4ce8dbc6 Mon Sep 17 00:00:00 2001 -From: vadimk -Date: Sat, 30 Aug 2014 15:06:00 +0300 -Subject: ip link: Remove unnecessary device checking - -The real checking is performed later in iplink_modify(..) func which -checks device existence if NLM_F_CREATE flag is set. - -Also it fixes the case when impossible to add veth link which was -caused by 9a02651a87 (ip: check for missing dev arg when doing VF rate) -because these devices are not exist yet. - -Signed-off-by: Vadim Kochan -Acked-by: Oliver Hartkopp -Signed-off-by: Stephen Hemminger - -diff --git a/ip/iplink.c b/ip/iplink.c -index 1a907d9..ea06871 100644 ---- a/ip/iplink.c -+++ b/ip/iplink.c -@@ -593,8 +593,6 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, - duparg2("dev", *argv); - *dev = *argv; - dev_index = ll_name_to_index(*dev); -- if (dev_index == 0) -- invarg("Unknown device", *argv); - } - argc--; argv++; - } --- -cgit v0.10.1 - diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index d5c754eebc7b..0cb305551b64 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -59,6 +59,7 @@ with stdenv.lib; ''} SCSI_LOWLEVEL y # enable lots of SCSI devices SCSI_LOWLEVEL_PCMCIA y + SCSI_SAS_ATA y # added to enable detection of hard drive SPI y # needed for many devices SPI_MASTER y WAN y @@ -332,14 +333,20 @@ with stdenv.lib; TRANSPARENT_HUGEPAGE_ALWAYS? n TRANSPARENT_HUGEPAGE_MADVISE? y - # zram support (e.g for in-memory compressed swap) + # zram support (e.g for in-memory compressed swap). ${optionalString (versionAtLeast version "3.4") '' ZSMALLOC y ''} ZRAM m - + ${optionalString (versionAtLeast version "3.17") "NFC? n"} + # Enable firmware loading via udev. Only needed for non-declarative + # firmware in /root/test-firmware. + ${optionalString (versionAtLeast version "3.17") '' + FW_LOADER_USER_HELPER_FALLBACK y + ''} + ${kernelPlatform.kernelExtraConfig or ""} ${extraConfig} '' diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index a7913fea091c..21898fe448a4 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.56"; + version = "3.10.58"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "02q0rda1dsapfi2d3nz398fhlk0gvr2q6mj6jcck2izcxzqhsz9a"; + sha256 = "06wn2ghqjcna517dmqj4yx5c5vl1mnn610xs5wdsyv2ikpr5mzfz"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index b0da31ff0748..cfcb25ee5b9c 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.29"; + version = "3.12.30"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1ckzd9s64iahlnv7wh687m827f94q8hw0s4h8s69ijhay6igqqzm"; + sha256 = "101lcf83y93pwz96glr93gnkkrx4xvwkxrjr1l45didrwnkim514"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index b3d7fb1e7f33..29dd565696b6 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.20"; + version = "3.14.22"; extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "090i8drjwhxawn7jfg9mrmvqik13j58v0hb272b457k48qyc070y"; + sha256 = "115hcaxavgqz549y0ly5ijf7cwc0z549wlwwjlm27i0z3fjcg83p"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.16.nix b/pkgs/os-specific/linux/kernel/linux-3.16.nix index 06079716a81a..324cd501e60b 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.16.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.16.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.16.4"; + version = "3.16.6"; extraMeta.branch = "3.16"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0x8jh9j7kdfbxcf3f69p28j5dwjjdxf92sjnlhk3mp016yv02i99"; + sha256 = "1wh662krzgcgkhymqrjn8rasv92zsz0nmlwii85h8cwrszzxrs9i"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.17.nix b/pkgs/os-specific/linux/kernel/linux-3.17.nix index 736973d3c4d9..df0d8729f7ab 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.17.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.17"; - modDirVersion = "3.17.0"; + version = "3.17.1"; extraMeta.branch = "3.17"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0lb2yyh3j932789jq4gxx9xshgy6rfdnl3lm8yr43kaz7k4kw5gm"; + sha256 = "1hhxsb4gsaj2mlmshivild7ayagam8f3xfl27n4652b1z4n0171c"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index 13205e048ca6..42996548b36a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.2.62"; + version = "3.2.63"; extraMeta.branch = "3.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1yrmar14p5y9xaj9df388xwjmwz8fnsxnid6rkxxk7dni5di8nqf"; + sha256 = "0fxfk1dppmgv5pwy7jjyih03i9rz5acp0pww4g5sy2d59rzfpbn8"; }; # We don't provide these patches if grsecurity is enabled, because diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 30bb873501b8..868918ef9459 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.103"; + version = "3.4.104"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1ldga9l7dydwv5zvl3xgk8833cjv73yasyy2qmgimkbs03s8q4ig"; + sha256 = "0xf2w4lccws2pps89hmh7ry8n43wr9p65yvdajba4qfxxy5jvx4b"; }; kernelPatches = args.kernelPatches ++ diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 50bc13191981..10bc141c11db 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -60,17 +60,17 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.20"; - revision = "201410062037"; + { kversion = "3.14.22"; + revision = "201410192047"; branch = "stable"; - sha256 = "0vs5s7xlnsrs5w59vhi57xhsnx3fryqfpvdgsfg2rxqnc1a5b3sp"; + sha256 = "0f6mdc0m89idlygm75x3z01rqacla4r26cgz1ai1c6sm5vp9yvw1"; }; grsecurity_unstable = grsecPatch - { kversion = "3.16.4"; - revision = "201410062041"; + { kversion = "3.17.1"; + revision = "201410192051"; branch = "test"; - sha256 = "17g993gwjbj10gp2in534ycsv5hwggi5hrbqrsar1lm95m3d6pbc"; + sha256 = "1ny8h6dd5mijg7lwi7zwqc6x5n5wkv19avl1d5qx8g2fs6qxbg0m"; }; grsec_fix_path = diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index a520db334266..315265f82033 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,17 +1,16 @@ -{ stdenv, fetchgit, kernel }: +{ stdenv, fetchurl, kernel }: assert stdenv.lib.versionAtLeast kernel.version "3.4"; # fails on 3.2 +assert builtins.substring 0 4 kernel.version != "3.12"; stdenv.mkDerivation rec { pname = "lttng-modules-${version}"; name = "${pname}-${kernel.version}"; - # Support for linux 3.16 and 3.17 was added just after the 2.5.0 release - version = "2.5.0-58-gbf2ba31"; # "git describe bf2ba318fff" + version = "2.6.0-rc1"; # "git describe bf2ba318fff" - src = fetchgit { - url = "https://github.com/lttng/lttng-modules.git"; - sha256 = "0x70xp463g208rdz5b9b0wdwr2v8px1bwa589knvp4j7zi8d2gj9"; - rev = "bf2ba318fff"; + src = fetchurl { + url = "https://github.com/lttng/lttng-modules/archive/v${version}.tar.gz"; + sha256 = "01gha02ybbzr86v6s6bqn649jiw5k89kb363b9s1iv8igrdlzhl1"; }; preConfigure = '' @@ -26,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux kernel modules for LTTng tracing"; homepage = http://lttng.org/; - # TODO license = with licenses; [ lgpl21 gpl2 mit ]; + license = with licenses; [ lgpl21 gpl2 mit ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 83f0dc1e82d2..635402a35f0e 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pax-utils-${version}"; - version = "0.8.1"; + version = "0.9.1"; src = fetchurl { url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; - sha256 = "1fgm70s52x48dxjihs0rcwmpfsi2dxbjzcilxy9fzg0i39dz4kw4"; + sha256 = "034b365il58bd01ld8r5493x7qkxbxzavmgwm916r0rgjpvclg34"; }; makeFlags = [ diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 241d605ec132..bfcb99b7e78a 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation { CC = stdenv.cross.config + "-gcc"; }; + # Too red + configureFlags = [ "--disable-modern-top" ]; + meta = { homepage = http://sourceforge.net/projects/procps-ng/; description = "Utilities that give information about processes using the /proc filesystem"; diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 62fbd3337f7a..17325ccb2914 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { buildPhase = '' patchShebangs . mkdir -p "$out" - sed -e "s|python_lib_dir = .*|python_lib_dir = \"$out/lib/${pythonFull.python.libPrefix}/site-packages\"|" -i SConstruct + sed -e "s|python_lib_dir = .*|python_lib_dir = \"$out/lib/${pythonFull.libPrefix}/site-packages\"|" -i SConstruct scons prefix="$out" leapfetch=no gpsd_user=${gpsdUser} gpsd_group=${gpsdGroup} \ systemd=yes udevdir="$out/lib/udev" chrpath=no ''; diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix index 0c12b6ba3dbd..ebae8a9b0727 100644 --- a/pkgs/servers/mail/dovecot/2.2.x.nix +++ b/pkgs/servers/mail/dovecot/2.2.x.nix @@ -2,14 +2,14 @@ , inotifyTools, clucene_core_2, sqlite }: stdenv.mkDerivation rec { - name = "dovecot-2.2.13"; + name = "dovecot-2.2.14"; buildInputs = [perl openssl bzip2 zlib openldap clucene_core_2 sqlite] ++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotifyTools ]; src = fetchurl { url = "http://dovecot.org/releases/2.2/${name}.tar.gz"; - sha256 = "1klxbnlgqvq4v2inp18yv3x04xp0vf8nr67ci1k3yww1mb9g6g0k"; + sha256 = "1w7bd2yhzk4jg1b5946r84yx10jrj7scr0zyl4li21660nhhzb38"; }; preConfigure = '' diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index 1e46ffdbc85b..ca4df9ce340a 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -2,11 +2,11 @@ let - version = "1.8.20"; + version = "1.8.21"; src = fetchurl { url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "0psdvzg5c3yhdqqmy5m1b0j3nrvcshjywhl56igy0j8vj16zxi86"; + sha256 = "1ssqi31blkl1lyv9vjrsrrn494grdng187s8xwfv79adk2w94paw"; }; preConfigure = diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 1621a494c7a5..928eb3fe152f 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, systemd +{ stdenv, fetchurl, pkgconfig, glib, systemd, boost , alsaSupport ? true, alsaLib , flacSupport ? true, flac , vorbisSupport ? true, libvorbis @@ -18,22 +18,23 @@ , mpg123Support ? true, mpg123 , aacSupport ? true, faad2 , pulseaudioSupport ? true, pulseaudio +, icuSupport ? true, icu }: let - opt = stdenv.lib.optional; - mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; + major = "0.19"; + minor = "1"; in stdenv.mkDerivation rec { - name = "mpd-0.18.16"; + name = "mpd-${major}.${minor}"; src = fetchurl { - url = "http://www.musicpd.org/download/mpd/0.18/${name}.tar.gz"; - sha256 = "0xpmc70ccp0s2s10vsi4hkijiv497dy42a7g225y77axp5ncf364"; + url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.gz"; + sha256 = "08a8wgr1kp86nnf9xbc71l9py1plslp10xw0ah344imkwyfg0nj8"; }; - buildInputs = [ pkgconfig glib ] + buildInputs = [ pkgconfig glib boost ] ++ opt stdenv.isLinux systemd ++ opt (stdenv.isLinux && alsaSupport) alsaLib ++ opt flacSupport flac @@ -55,7 +56,8 @@ in stdenv.mkDerivation rec { ++ opt mpg123Support mpg123 ++ opt aacSupport faad2 ++ opt zipSupport zziplib - ++ opt pulseaudioSupport pulseaudio; + ++ opt pulseaudioSupport pulseaudio + ++ opt icuSupport icu; configureFlags = [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa") @@ -79,6 +81,7 @@ in stdenv.mkDerivation rec { (mkFlag aacSupport "aac") (mkFlag pulseaudioSupport "pulse") (mkFlag stdenv.isDarwin "osx") + (mkFlag icuSupport "icu") "--enable-debug" ] ++ opt stdenv.isLinux diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 7266727fdad8..5987222361ae 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -21,7 +21,22 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = "-DWITH_SSL=yes -DWITH_READLINE=yes -DWITH_EMBEDDED_SERVER=yes -DWITH_ZLIB=yes -DINSTALL_SCRIPTDIR=bin -DHAVE_IPV6=yes"; + cmakeFlags = [ + "-DWITH_SSL=yes" + "-DWITH_READLINE=yes" + "-DWITH_EMBEDDED_SERVER=yes" + "-DWITH_ZLIB=yes" + "-DHAVE_IPV6=yes" + "-DINSTALL_DOCDIR=share/doc/mysql" + "-DINSTALL_DOCREADMEDIR=share/doc/mysql" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_INFODIR=share/doc/mysql" + "-DINSTALL_MANDIR=share/man" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_MYSQLPLUGINDIR=lib/mysql/plugin" + "-DINSTALL_SCRIPTDIR=bin" + "-DINSTALL_SUPPORTFILESDIR=share/mysql" + ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; @@ -30,7 +45,8 @@ stdenv.mkDerivation rec { ''; postInstall = '' sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db - rm -rf $out/mysql-test $out/sql-bench + rm -r $out/mysql-test $out/sql-bench $out/data + rm $out/share/man/man1/mysql-test-run.pl.1 ''; passthru.mysqlVersion = "5.5"; diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix index 57ff50175bb5..cd333152a2ae 100644 --- a/pkgs/servers/sql/oracle-xe/default.nix +++ b/pkgs/servers/sql/oracle-xe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, requireFile, patchelf, rpm, cpio, libaio }: +{ stdenv, makeWrapper, requireFile, patchelf, rpmextract, libaio }: assert stdenv.system == "x86_64-linux"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { unpackCmd = '' (mkdir -p "${name}" && cd "${name}" && - ${rpm}/bin/rpm2cpio "$curSrc" | ${cpio}/bin/cpio -id) + ${rpmextract}/bin/rpmextract "$curSrc") ''; buildPhase = let diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 4bd1b594c268..d8d44ec8a4c8 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, lua5, luasocket, luasec, luaexpat, luafilesystem, libidn, openssl, makeWrapper }: +{ stdenv, fetchurl, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, libidn, openssl, makeWrapper, fetchhg }: let - libs = [ luasocket luasec luaexpat luafilesystem ]; + libs = [ luasocket luasec luaexpat luafilesystem luabitop ]; getPath = lib : type : "${lib}/lib/lua/${lua5.luaversion}/?.${type};${lib}/share/lua/${lua5.luaversion}/?.${type}"; getLuaPath = lib : getPath lib "lua"; getLuaCPath = lib : getPath lib "so"; @@ -10,14 +10,20 @@ let in stdenv.mkDerivation rec { - version = "0.9.4"; + version = "0.9.5"; name = "prosody-${version}"; src = fetchurl { url = "http://prosody.im/downloads/source/${name}.tar.gz"; - sha256 = "be87cf31901a25477869b4ebd52e298f63a5effacae526911a0be876cc82e1c6"; + sha256 = "1gcvmdsyx3fjiqybgkp8vr847p9rlfz42lywxpph3jc14yh63z3n"; }; - buildInputs = [ lua5 luasocket luasec luaexpat libidn openssl makeWrapper ]; + communityModules = fetchhg { + url = "http://prosody-modules.googlecode.com/hg/"; + rev = "4b55110b0aa8"; + sha256 = "0010x2rl9f9ihy2nwqan2jdlz25433srj2zna1xh10490mc28hij"; + }; + + buildInputs = [ lua5 luasocket luasec luaexpat luabitop libidn openssl makeWrapper ]; configureFlags = [ "--ostype=linux" @@ -26,6 +32,7 @@ stdenv.mkDerivation rec { ]; postInstall = '' + cp $communityModules/mod_websocket/mod_websocket.lua $out/lib/prosody/modules/ wrapProgram $out/bin/prosody \ --set LUA_PATH '"${luaPath};"' \ --set LUA_CPATH '"${luaCPath};"' diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index c0acb2f70c84..9224c3b2d9cd 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, libX11, perl, libXtst, xextproto, libXi }: +{ stdenv, fetchurl, libX11, perl, libXtst, xextproto, libXi, libXinerama }: -let version = "2.20101012.3049"; in +let version = "2.20110530.1"; in stdenv.mkDerivation { name = "xdotool-${version}"; src = fetchurl { url = "http://semicomplete.googlecode.com/files/xdotool-${version}.tar.gz"; - sha256 = "0amkb1zvdk0gj7va3rjw9arbyj8pgprkdik05yl6rghq21q076ls"; + sha256 = "0rxggg1cy7nnkwidx8x2w3c5f3pk6dh2b6q0q7hp069r3n5jrd77"; }; - buildInputs = [ libX11 perl libXtst xextproto libXi ]; + buildInputs = [ libX11 perl libXtst xextproto libXi libXinerama ]; configurePhase = '' export makeFlags="PREFIX=$out"; diff --git a/pkgs/tools/archivers/rpmextract/default.nix b/pkgs/tools/archivers/rpmextract/default.nix new file mode 100644 index 000000000000..c5f982c955cc --- /dev/null +++ b/pkgs/tools/archivers/rpmextract/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, rpm, cpio, substituteAll }: + +stdenv.mkDerivation rec { + name = "rpmextract"; + + buildCommand = '' + install -Dm755 $script $out/bin/rpmextract + ''; + + script = substituteAll { + src = ./rpmextract.sh; + inherit rpm cpio; + }; + + meta = with stdenv.lib; { + description = "Script to extract RPM archives"; + platforms = platforms.all; + license = licenses.gpl2; + maintainers = maintainers.abbradar; + }; +} diff --git a/pkgs/tools/archivers/rpmextract/rpmextract.sh b/pkgs/tools/archivers/rpmextract/rpmextract.sh new file mode 100644 index 000000000000..04f57f6e6045 --- /dev/null +++ b/pkgs/tools/archivers/rpmextract/rpmextract.sh @@ -0,0 +1,10 @@ +#!/bin/sh -e + +if [ "$1" = "" ]; then + echo "usage: rpmextract package_name..." 1>&2 + exit 1 +fi + +for i in "$@"; do + @rpm@/bin/rpm2cpio "$i" | @cpio@/bin/cpio -idv +done diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 9bf9ee0d2245..3e97d11fffb0 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -4,8 +4,8 @@ stdenv.mkDerivation { name = "gvolicon"; src = fetchgit { url = "https://github.com/Unia/gvolicon"; - rev = "26343415de836e0b05aa0b480c0c69cc2ed9e419"; - sha256 = "68858840a45b5f74803e85116c6219f805d6d944c00354662889549910856cdd"; + rev = "c04cafb88124e1e5edc61dd52f76bf13381d5167"; + sha256 = "31cf770dca0d216e3108b258b4c150cbeb3b127002d53fd6ddddfcf9e3e293aa"; }; buildInputs = [ pkgconfig makeWrapper alsaLib gnome3.gtk ]; @@ -24,4 +24,4 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bennofs ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix index 61553566d6c9..6a59fc49a954 100644 --- a/pkgs/tools/audio/mpdcron/default.nix +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, glib, libdaemon -, mpd_clientlib, curl, sqlite, ruby, rubyLibs, libnotify }: +, mpd_clientlib, curl, sqlite, ruby, rubyLibs, libnotify, haskellPackages }: stdenv.mkDerivation rec { version = "20130809"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ autoconf automake libtool pkgconfig glib libdaemon + [ autoconf automake libtool pkgconfig glib libdaemon haskellPackages.pandoc mpd_clientlib curl sqlite ruby rubyLibs.nokogiri libnotify ]; preConfigure = '' diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix new file mode 100644 index 000000000000..44333b519cbe --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -0,0 +1,54 @@ +{ stdenv, fetchurl, buildPythonPackage, pykickstart, pyparted, pyblock +, libselinux, cryptsetup, multipath_tools, lsof, utillinux +, useNixUdev ? true, udev ? null +# This is only used when useNixUdev is false +, udevSoMajor ? 1 +}: + +assert useNixUdev -> udev != null; + +buildPythonPackage rec { + name = "blivet-${version}"; + version = "0.17-1"; + + src = fetchurl { + url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/" + + "${name}.tar.bz2"; + sha256 = "1k3mws2q0ryb7422mml6idmaasz2i2v6ngyvg6d976dx090qnmci"; + }; + + postPatch = '' + sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \ + blivet/devicelibs/mpath.py blivet/devices.py + sed -i -e '/"wipefs"/ { + s|wipefs|${utillinux}/sbin/wipefs| + s/-f/--force/ + }' blivet/formats/__init__.py + sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py + sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py + sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py + '' + (if useNixUdev then '' + sed -i -e '/find_library/,/find_library/ { + c libudev = "${udev}/lib/libudev.so.1" + }' blivet/pyudev.py + '' else '' + sed -i \ + -e '/^somajor *=/s/=.*/= ${toString udevSoMajor}/p' \ + -e 's|common =.*|& + ["/lib/x86_64-linux-gnu", "/lib/i686-linux-gnu"]|' \ + blivet/pyudev.py + ''); + + propagatedBuildInputs = [ + pykickstart pyparted pyblock libselinux cryptsetup + ] ++ stdenv.lib.optional useNixUdev udev; + + # tests are currently _heavily_ broken upstream + doCheck = false; + + meta = { + homepage = "https://fedoraproject.org/wiki/Blivet"; + description = "Module for management of a system's storage configuration"; + license = [ "GPLv2+" "LGPLv2.1+" ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix new file mode 100644 index 000000000000..c612512b8cc9 --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, devicemapper, libgcrypt, libuuid, pkgconfig, popt +, enablePython ? true, python ? null +}: + +assert enablePython -> python != null; + +stdenv.mkDerivation rec { + name = "cryptsetup-1.6.3"; + + src = fetchurl { + url = "http://cryptsetup.googlecode.com/files/${name}.tar.bz2"; + sha256 = "1n1qk5chyjspbiianrdb55fhb4wl0vfyqz2br05vfb24v4qlgbx2"; + }; + + configureFlags = [ "--enable-cryptsetup-reencrypt" ] + ++ stdenv.lib.optional enablePython "--enable-python"; + + buildInputs = [ devicemapper libgcrypt libuuid pkgconfig popt ] + ++ stdenv.lib.optional enablePython python; + + meta = { + homepage = http://code.google.com/p/cryptsetup/; + description = "LUKS for dm-crypt"; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ viric chaoflow ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix new file mode 100644 index 000000000000..9ea2f9bfdc77 --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix @@ -0,0 +1,76 @@ +{ stdenv, fetchurl, python, buildPythonPackage +# Propagated to blivet +, useNixUdev ? true, udevSoMajor ? null +# Propagated dependencies +, pkgs, urlgrabber +}: + +let + blivet = import ./blivet.nix { + inherit stdenv fetchurl buildPythonPackage; + inherit pykickstart pyparted pyblock cryptsetup multipath_tools; + inherit useNixUdev udevSoMajor; + inherit (pkgs) lsof utillinux udev; + libselinux = pkgs.libselinux.override { enablePython = true; }; + }; + + cryptsetup = import ./cryptsetup.nix { + inherit stdenv fetchurl python; + inherit (pkgs) pkgconfig libgcrypt libuuid popt; + devicemapper = lvm2; + }; + + dmraid = import ./dmraid.nix { + inherit stdenv fetchurl; + devicemapper = lvm2; + }; + + lvm2 = import ./lvm2.nix { + inherit stdenv fetchurl; + inherit (pkgs) pkgconfig utillinux udev coreutils; + }; + + multipath_tools = import ./multipath-tools.nix { + inherit stdenv fetchurl lvm2; + inherit (pkgs) readline udev libaio gzip; + }; + + parted = import ./parted.nix { + inherit stdenv fetchurl; + inherit (pkgs) utillinux readline libuuid gettext check; + devicemapper = lvm2; + }; + + pyblock = import ./pyblock.nix { + inherit stdenv fetchurl python lvm2 dmraid; + }; + + pykickstart = import ./pykickstart.nix { + inherit stdenv fetchurl python buildPythonPackage urlgrabber; + }; + + pyparted = import ./pyparted.nix { + inherit stdenv fetchurl python buildPythonPackage parted; + inherit (pkgs) pkgconfig e2fsprogs; + }; + +in buildPythonPackage rec { + name = "nixpart-${version}"; + version = "0.4.1"; + + src = fetchurl { + url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz"; + sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp"; + }; + + propagatedBuildInputs = [ blivet ]; + + doCheck = false; + + meta = { + description = "NixOS storage manager/partitioner"; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.aszlig ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix new file mode 100644 index 000000000000..35efa8533ab1 --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/dmraid.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, devicemapper }: + +stdenv.mkDerivation rec { + name = "dmraid-1.0.0.rc15"; + + src = fetchurl { + url = "http://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2"; + sha256 = "01bcaq0sc329ghgj7f182xws7jgjpdc41bvris8fsiprnxc7511h"; + }; + + preConfigure = "cd */"; + + buildInputs = [ devicemapper ]; + + meta = { + description = "Old-style RAID configuration utility"; + longDescritipn = '' + Old RAID configuration utility (still under development, though). + It is fully compatible with modern kernels and mdadm recognizes + its volumes. May be needed for rescuing an older system or nuking + the metadata when reformatting. + ''; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix new file mode 100644 index 000000000000..9e2b0c900794 --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }: + +let + v = "2.02.106"; +in + +stdenv.mkDerivation { + name = "lvm2-${v}"; + + src = fetchurl { + url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${v}.tgz"; + sha256 = "0nr833bl0q4zq52drjxmmpf7bs6kqxwa5kahwwxm9411khkxz0vc"; + }; + + configureFlags = + "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib"; + + buildInputs = [ pkgconfig udev ]; + + preConfigure = + '' + substituteInPlace scripts/lvmdump.sh \ + --replace /usr/bin/tr ${coreutils}/bin/tr + substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ + --replace /usr/sbin/lvm $out/sbin/lvm \ + --replace /usr/bin/udevadm ${udev}/bin/udevadm + + sed -i /DEFAULT_SYS_DIR/d Makefile.in + sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in + ''; + + enableParallelBuilding = true; + + #patches = [ ./purity.patch ]; + + # To prevent make install from failing. + preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\""; + + # Install systemd stuff. + #installTargets = "install install_systemd_generators install_systemd_units install_tmpfiles_configuration"; + + postInstall = + '' + substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \ + --replace $out/sbin/blkid ${utillinux}/sbin/blkid + + # Systemd stuff + mkdir -p $out/etc/systemd/system $out/lib/systemd/system-generators + cp scripts/blk_availability_systemd_red_hat.service $out/etc/systemd/system + cp scripts/lvm2_activation_generator_systemd_red_hat $out/lib/systemd/system-generators + ''; + + meta = { + homepage = http://sourceware.org/lvm2/; + descriptions = "Tools to support Logical Volume Management (LVM) on Linux"; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix new file mode 100644 index 000000000000..90722d74ace1 --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, lvm2, libaio, gzip, readline, udev }: + +stdenv.mkDerivation rec { + name = "multipath-tools-0.4.9"; + + src = fetchurl { + url = "http://christophe.varoqui.free.fr/multipath-tools/${name}.tar.bz2"; + sha256 = "04n7kazp1zrlqfza32phmqla0xkcq4zwn176qff5ida4a60whi4d"; + }; + + sourceRoot = "."; + + buildInputs = [ lvm2 libaio readline ]; + + preBuild = + '' + makeFlagsArray=(GZIP="${gzip}/bin/gzip -9 -c" prefix=$out mandir=$out/share/man/man8 man5dir=$out/share/man/man5 LIB=lib) + + substituteInPlace multipath/Makefile --replace /etc $out/etc + substituteInPlace kpartx/Makefile --replace /etc $out/etc + + substituteInPlace kpartx/kpartx.rules --replace /sbin/kpartx $out/sbin/kpartx + substituteInPlace kpartx/kpartx_id --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup + + substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${udev}/lib/udev/scsi_id + substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${udev}/lib/udev/scsi_id + ''; + + meta = { + description = "Tools for the Linux multipathing driver"; + homepage = http://christophe.varoqui.free.fr/; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix new file mode 100644 index 000000000000..01b9f391a443 --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline +, utillinux, check, enableStatic ? false, hurd ? null }: + +stdenv.mkDerivation rec { + name = "parted-3.1"; + + src = fetchurl { + url = "mirror://gnu/parted/${name}.tar.xz"; + sha256 = "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y"; + }; + + buildInputs = [ libuuid ] + ++ stdenv.lib.optional (readline != null) readline + ++ stdenv.lib.optional (gettext != null) gettext + ++ stdenv.lib.optional (devicemapper != null) devicemapper + ++ stdenv.lib.optional (hurd != null) hurd + ++ stdenv.lib.optional doCheck check; + + configureFlags = + (if (readline != null) + then [ "--with-readline" ] + else [ "--without-readline" ]) + ++ stdenv.lib.optional (devicemapper == null) "--disable-device-mapper" + ++ stdenv.lib.optional enableStatic "--enable-static"; + + doCheck = true; + + preCheck = + stdenv.lib.optionalString doCheck + # The `t0400-loop-clobber-infloop.sh' test wants `mkswap'. + "export PATH=\"${utillinux}/sbin:$PATH\""; + + meta = { + description = "Create, destroy, resize, check, and copy partitions"; + + longDescription = '' + GNU Parted is an industrial-strength package for creating, destroying, + resizing, checking and copying partitions, and the file systems on + them. This is useful for creating space for new operating systems, + reorganising disk usage, copying data on hard disks and disk imaging. + + It contains a library, libparted, and a command-line frontend, parted, + which also serves as a sample implementation and script backend. + ''; + + homepage = http://www.gnu.org/software/parted/; + license = stdenv.lib.licenses.gpl3Plus; + + maintainers = [ + # Add your name here! + stdenv.lib.maintainers.ludo + ]; + + # GNU Parted requires libuuid, which is part of util-linux-ng. + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix new file mode 100644 index 000000000000..2ce126d7169f --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/pyblock.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, python, lvm2, dmraid }: + +stdenv.mkDerivation rec { + name = "pyblock-${version}"; + version = "0.53"; + + src = fetchurl rec { + url = "http://pkgs.fedoraproject.org/repo/pkgs/python-pyblock/" + + "${name}.tar.bz2/${md5}/${name}.tar.bz2"; + md5 = "f6d33a8362dee358517d0a9e2ebdd044"; + }; + + postPatch = '' + sed -i -e 's|/usr/include/python|${python}/include/python|' \ + -e 's/-Werror *//' -e 's|/usr/|'"$out"'/|' Makefile + ''; + + buildInputs = [ python lvm2 dmraid ]; + + makeFlags = [ + "USESELINUX=0" + "SITELIB=$(out)/lib/${python.libPrefix}/site-packages" + ]; + + meta = { + description = "Interface for working with block devices"; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix new file mode 100644 index 000000000000..7bc3f54c2363 --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix @@ -0,0 +1,30 @@ +{ stdenv, python, buildPythonPackage, fetchurl, urlgrabber }: + +buildPythonPackage rec { + name = "pykickstart-${version}"; + version = "1.99.39"; + + src = fetchurl rec { + url = "http://pkgs.fedoraproject.org/repo/pkgs/pykickstart/" + + "${name}.tar.gz/${md5}/${name}.tar.gz"; + md5 = "d249f60aa89b1b4facd63f776925116d"; + }; + + postPatch = '' + sed -i -e "s/for tst in tstList/for tst in sorted(tstList, \ + key=lambda m: m.__name__)/" tests/baseclass.py + ''; + + propagatedBuildInputs = [ urlgrabber ]; + + checkPhase = '' + export PYTHONPATH="$PYTHONPATH:." + ${python}/bin/${python.executable} tests/baseclass.py -vv + ''; + + meta = { + homepage = "http://fedoraproject.org/wiki/Pykickstart"; + description = "Read and write Fedora kickstart files"; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix new file mode 100644 index 000000000000..67f318c863e1 --- /dev/null +++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, pkgconfig, python, buildPythonPackage, parted, e2fsprogs }: + +buildPythonPackage rec { + name = "pyparted-${version}"; + version = "3.10"; + + src = fetchurl { + url = "https://fedorahosted.org/releases/p/y/pyparted/${name}.tar.gz"; + sha256 = "17wq4invmv1nfazaksf59ymqyvgv3i8h4q03ry2az0s9lldyg3dv"; + }; + + postPatch = '' + sed -i -e 's|/sbin/mke2fs|${e2fsprogs}&|' tests/baseclass.py + sed -i -e ' + s|e\.path\.startswith("/tmp/temp-device-")|"temp-device-" in e.path| + ' tests/test__ped_ped.py + '' + stdenv.lib.optionalString stdenv.isi686 '' + # remove some integers in this test case which overflow on 32bit systems + sed -i -r -e '/class *UnitGetSizeTestCase/,/^$/{/[0-9]{11}/d}' \ + tests/test__ped_ped.py + ''; + + preConfigure = '' + PATH="${parted}/sbin:$PATH" + ''; + + buildInputs = [ pkgconfig ]; + + propagatedBuildInputs = [ parted ]; + + checkPhase = '' + patchShebangs Makefile + make test PYTHON=${python.executable} + ''; + + meta = { + homepage = "https://fedorahosted.org/pyparted/"; + description = "Python interface for libparted"; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix index 633f04320c37..895ae99c3093 100644 --- a/pkgs/tools/filesystems/nixpart/default.nix +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -1,29 +1,21 @@ -{ stdenv, fetchurl, buildPythonPackage, blivet -# Propagated to blivet -, useNixUdev ? null, udevSoMajor ? null -}: +{ stdenv, fetchurl, buildPythonPackage, blivet }: -let - blivetOverrides = stdenv.lib.filterAttrs (k: v: v != null) { - inherit useNixUdev udevSoMajor; - }; -in buildPythonPackage rec { +buildPythonPackage rec { name = "nixpart-${version}"; - version = "0.4.1"; + version = "1.0.0"; src = fetchurl { url = "https://github.com/aszlig/nixpart/archive/v${version}.tar.gz"; sha256 = "0avwd8p47xy9cydlbjxk8pj8q75zyl68gw2w6fnkk78dcb1a3swp"; }; - propagatedBuildInputs = [ (blivet.override blivetOverrides) ]; - - doCheck = false; + propagatedBuildInputs = [ blivet ]; meta = { description = "NixOS storage manager/partitioner"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.aszlig ]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index facaac8cea79..a016627b7a47 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, zlib, xz }: +{ stdenv, fetchgit, zlib, xz }: stdenv.mkDerivation rec { - name = "squashfs-4.3"; + name = "squashfs-4.4dev"; - src = fetchurl { - url = mirror://sourceforge/squashfs/squashfs4.3.tar.gz; - sha256 = "1xpklm0y43nd9i6jw43y2xh5zvlmj9ar2rvknh0bh7kv8c95aq0d"; + src = fetchgit { + url = https://github.com/plougher/squashfs-tools.git; + sha256 = "059pa2shdysr3zfmwrhq28s12zbi5nyzbpzyaf5lmspgfh1493ks"; + rev = "9c1db6d13a51a2e009f0027ef336ce03624eac0d"; }; buildInputs = [ zlib xz ]; preBuild = "cd squashfs-tools"; - + NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel installFlags = "INSTALL_DIR=\${out}/bin"; @@ -21,5 +22,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://squashfs.sourceforge.net/; description = "Tool for creating and unpacking squashfs filesystems"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index e33f46ea9ccd..8b0b3a9898b2 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, writeText, zlib, rpm, cpio, patchelf, which }: +{ stdenv, fetchurl, writeText, zlib, rpmextract, patchelf, which }: assert stdenv.isLinux; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { mkdir -pv unpacked cd unpacked - ${rpm}/bin/rpm2cpio $src | ${cpio}/bin/cpio -imd + ${rpmextract}/bin/rpmextract $src cp -r -t $out/bin usr/bin/* cp -r -t $out/share usr/share/* diff --git a/pkgs/tools/graphics/dmtx-utils/default.nix b/pkgs/tools/graphics/dmtx-utils/default.nix new file mode 100644 index 000000000000..0fe473f5d634 --- /dev/null +++ b/pkgs/tools/graphics/dmtx-utils/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchurl, libdmtx, pkgconfig}: +let + s = # Generated upstream information + rec { + baseName="dmtx-utils"; + version="0.7.4"; + name="${baseName}-${version}"; + hash="1di8ymlziy9856abd6rb72z0zqzmrff4r3vql0q9r5sk5ax4s417"; + url="mirror://sourceforge/project/libdmtx/libdmtx/0.7.4/dmtx-utils-0.7.4.tar.gz"; + sha256="1di8ymlziy9856abd6rb72z0zqzmrff4r3vql0q9r5sk5ax4s417"; + }; + buildInputs = [ + libdmtx pkgconfig + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + meta = { + inherit (s) version; + description = "Data matrix command-line utilities"; + license = stdenv.lib.licenses.lgpl2 ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/dmtx-utils/default.upstream b/pkgs/tools/graphics/dmtx-utils/default.upstream new file mode 100644 index 000000000000..8768681642e5 --- /dev/null +++ b/pkgs/tools/graphics/dmtx-utils/default.upstream @@ -0,0 +1,4 @@ +url http://sourceforge.net/projects/libdmtx/files/libdmtx/ +SF_version_dir +version_link 'dmtx-utils-.*[.]tar[.][a-z0-9]+/download$' +SF_redirect diff --git a/pkgs/tools/graphics/dmtx/default.nix b/pkgs/tools/graphics/dmtx/default.nix deleted file mode 100644 index 30b3baa4690b..000000000000 --- a/pkgs/tools/graphics/dmtx/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -args : -let - lib = args.lib; - fetchurl = args.fetchurl; - - version = lib.attrByPath ["version"] "0.7.4" args; - buildInputs = with args; [ - libpng libtiff libjpeg librsvg imagemagick pkgconfig - zlib libX11 bzip2 libtool freetype fontconfig - ghostscript jasper xz - ]; -in -rec { - src = fetchurl { - url = "mirror://sourceforge/libdmtx/libdmtx-${version}.tar.bz2"; - sha256 = "0xnxx075ycy58n92yfda2z9zgd41h3d4ik5d9l197lzsqim5hb5n"; - }; - - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be specified separately */ - phaseNames = ["doConfigure" "doMakeInstall"]; - - name = "dmtx-" + version; - meta = { - description = "DataMatrix (2D bar code) processing tools"; - maintainers = [args.lib.maintainers.raskin]; - platforms = args.lib.platforms.linux; - }; -} diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index 9ab36b582eb9..25a2f60c48fe 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "logstalgia-${version}"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { url = "https://github.com/acaudwell/Logstalgia/releases/download/${name}/${name}.tar.gz"; - sha256 = "0hm4fcakz05j95kb9f14qpspb31xi07paka390dz3g5k980hm9sc"; + sha256 = "0d2zhn0q26rv2nb3hdbg0mb69l66g8pkys5is6rb0r6f5is986x8"; }; buildInputs = [ glew SDL ftgl pkgconfig libpng libjpeg pcre SDL_image mesa boost diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix new file mode 100644 index 000000000000..8bbd28f82a31 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, cmake, fcitx, gtk3, isocodes }: + +stdenv.mkDerivation rec { + name = "fcitx-configtool-0.4.8"; + + meta = with stdenv.lib; { + description = "GTK-based config tool for Fcitx"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ cdepillabout ]; + }; + + src = fetchurl { + url = "http://download.fcitx-im.org/fcitx-configtool/${name}.tar.xz"; + sha256 = "1vaim0namw58bfafbvws1vgd4010p19zwqfbx6bd1zi5sgchdg0f"; + }; + + buildInputs = [ fcitx cmake isocodes pkgconfig gtk3 ]; +} + diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix new file mode 100644 index 000000000000..9f897d7e93a2 --- /dev/null +++ b/pkgs/tools/misc/grub/trusted.nix @@ -0,0 +1,26 @@ +{stdenv, fetchgit, autoconf, automake, buggyBiosCDSupport ? true}: + +stdenv.mkDerivation { + name = "trustedGRUB-1.1.5"; + + src = fetchgit { + url = "https://github.com/ts468/TrustedGRUB"; + rev = "954941c17e14c8f7b18e6cd3043ef5f946866f1c"; + sha256 = "30c21765dc44f02275e66220d6724ec9cd45496226ca28c6db59a9147aa22685"; + }; + + # Autoconf/automake required for the splashimage patch. + buildInputs = [autoconf automake]; + + preConfigure = '' + autoreconf + ''; + + meta = { + homepage = "http://sourceforge.net/projects/trustedgrub/"; + repositories.git = https://github.com/ts468/TrustedGRUB; + description = "Legacy GRUB bootloader extended with TCG support"; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ tstrobel ]; + }; +} diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index 7fd6ce966d6d..2d45bee49076 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rpm, cpio, ncurses, patchelf, makeWrapper, requireFile, unzip }: +{ stdenv, rpmextract, ncurses, patchelf, makeWrapper, requireFile, unzip }: assert stdenv.system == "x86_64-linux"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "11jzvh25mlygflazd37gi05xv67im4rgq7sbs5nwgw3gxdh4xfjj"; }; - buildInputs = [rpm cpio ncurses unzip makeWrapper]; + buildInputs = [rpmextract ncurses unzip makeWrapper]; libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.gcc.libc ncurses ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cd $out unzip ${src} - rpm2cpio linux/MegaCli-8.07.07-1.noarch.rpm | cpio -idmv + rpmextract linux/MegaCli-8.07.07-1.noarch.rpm ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib opt/MegaRAID/MegaCli/MegaCli64 wrapProgram $out/opt/MegaRAID/MegaCli/MegaCli64 --set LD_LIBRARY_PATH $out/opt/lsi/3rdpartylibs/x86_64 ln -s $out/opt/MegaRAID/MegaCli/MegaCli64 $out/bin/MegaCli64 diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 01b9f391a443..0763532260a9 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -1,20 +1,26 @@ -{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline +{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline, perl, python , utillinux, check, enableStatic ? false, hurd ? null }: stdenv.mkDerivation rec { - name = "parted-3.1"; + name = "parted-3.2"; src = fetchurl { url = "mirror://gnu/parted/${name}.tar.xz"; - sha256 = "05fa4m1bky9d13hqv91jlnngzlyn7y4rnnyq6d86w0dg3vww372y"; + sha256 = "1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5"; }; + patches = stdenv.lib.optional doCheck ./gpt-unicode-test-fix.patch; + + postPatch = stdenv.lib.optionalString doCheck '' + patchShebangs tests + ''; + buildInputs = [ libuuid ] ++ stdenv.lib.optional (readline != null) readline ++ stdenv.lib.optional (gettext != null) gettext ++ stdenv.lib.optional (devicemapper != null) devicemapper ++ stdenv.lib.optional (hurd != null) hurd - ++ stdenv.lib.optional doCheck check; + ++ stdenv.lib.optionals doCheck [ check perl python ]; configureFlags = (if (readline != null) diff --git a/pkgs/tools/misc/parted/gpt-unicode-test-fix.patch b/pkgs/tools/misc/parted/gpt-unicode-test-fix.patch new file mode 100644 index 000000000000..470188bf55e5 --- /dev/null +++ b/pkgs/tools/misc/parted/gpt-unicode-test-fix.patch @@ -0,0 +1,38 @@ +From Ludo's suggestion at: + + http://debbugs.gnu.org/cgi/bugreport.cgi?msg=8;bug=18258 + +diff --git a/tests/.t0251-gpt-unicode.sh.swp b/tests/.t0251-gpt-unicode.sh.swp +deleted file mode 100644 +index b41c337..0000000 +Binary files a/tests/.t0251-gpt-unicode.sh.swp and /dev/null differ +diff --git a/tests/t0251-gpt-unicode.sh b/tests/t0251-gpt-unicode.sh +index c845950..fa63a72 100755 +--- a/tests/t0251-gpt-unicode.sh ++++ b/tests/t0251-gpt-unicode.sh +@@ -22,7 +22,24 @@ dev=loop-file + # create zeroed device + truncate -s 10m $dev || fail=1 + +-export LC_ALL=C.UTF-8 ++found_locale=no ++for locale in en_US de_DE fr_FR es_ES ++do ++ LC_ALL="$locale.UTF-8" ++ export LC_ALL ++ ++ # In a UTF-8 locale, the string below prints as 4 characters. ++ if [ `printf 'foo\341\264\244' | wc -m` -eq 4 ]; then ++ found_locale=yes ++ break ++ fi ++done ++ ++if [ "$found_locale" != "yes" ]; then ++ echo "no valid UTF-8 locale found; skipping" >&2 ++ exit 77 ++fi ++ + # create gpt label with named partition + part_name=$(printf 'foo\341\264\244') + parted -s $dev mklabel gpt mkpart primary ext2 1MiB 2MiB name 1 $part_name > empty 2>&1 || fail=1 diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix new file mode 100644 index 000000000000..c2ae62ff688d --- /dev/null +++ b/pkgs/tools/misc/pipelight/default.nix @@ -0,0 +1,97 @@ +{ stdenv, fetchurl, fetchgit, autoconf, automake, wineUnstable, perl, xlibs + , gnupg, gcc48_multi, mesa, curl, bash, cacert, cabextract, utillinux, attr + }: + +let + wine_patches_version = "1.7.28"; + wine_hash = "04r3zk3dz2vzly2a4nqbcvppjs5iy3lq5ibx3wfrf877p5bz3hv7"; + + wine_patches = fetchgit { + url = "git://github.com/compholio/wine-compholio.git"; + rev = "refs/tags/v${wine_patches_version}"; + sha256 = "17f1wmxbx6ly1ws4p528ijf9b4yvmnmap5k7npw9icvkyaky5xi9"; + }; + + wine_custom = + stdenv.lib.overrideDerivation wineUnstable (args: rec { + name = "wine-${wine_patches_version}"; + version = "${wine_patches_version}"; + src = null; + srcs = [ + (fetchurl { + url = "mirror://sourceforge/wine/${name}.tar.bz2"; + sha256 = wine_hash; + }) + wine_patches ]; + sourceRoot = "./${name}"; + buildInputs = args.buildInputs ++ [ + autoconf perl utillinux automake attr + ]; + nativeBuildInputs = args.nativeBuildInputs ++ [ + autoconf perl utillinux automake attr + ]; + postPatch = '' + export wineDir=$(pwd) + patchShebangs $wineDir/tools/ + chmod u+w $wineDir/../git-export/debian/tools/ + patchShebangs $wineDir/../git-export/debian/tools/ + chmod -R +rwx ../git-export/ + make -C ../git-export/patches DESTDIR=$wineDir install + ''; + }); + + mozillaPluginPath = "/lib/mozilla/plugins"; + + +in stdenv.mkDerivation rec { + + version = "0.2.7.2"; + + name = "pipelight-${version}"; + + src = fetchurl { + url = "https://bitbucket.org/mmueller2012/pipelight/get/v${version}.tar.gz"; + sha256 = "02132151091f1f62d7409a537649efc86deb0eb4a323fd66907fc22947e2cfbd"; + }; + + buildInputs = [ wine_custom xlibs.libX11 gcc48_multi mesa curl ]; + propagatedbuildInputs = [ curl cabextract ]; + + patches = [ ./pipelight.patch ]; + + configurePhase = '' + patchShebangs . + ./configure \ + --prefix=$out \ + --moz-plugin-path=$out/${mozillaPluginPath} \ + --wine-path=${wine_custom} \ + --gpg-exec=${gnupg}/bin/gpg2 \ + --bash-interp=${bash}/bin/bash \ + --downloader=${curl}/bin/curl + $configureFlags + ''; + + passthru = { + mozillaPlugin = mozillaPluginPath; + wine = wine_custom; + }; + + postInstall = '' + $out/bin/pipelight-plugin --create-mozilla-plugins + ''; + + preFixup = '' + substituteInPlace $out/share/pipelight/install-dependency \ + --replace cabextract ${cabextract}/bin/cabextract + ''; + + enableParallelBuilding = true; + + meta = { + homepage = "http://pipelight.net/"; + licenses = with stdenv.lib.licenses; [ mpl11 gpl2 lgpl21 ]; + description = "A wrapper for using Windows plugins in Linux browsers"; + maintainers = with stdenv.lib.maintainers; [skeidel]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/tools/misc/pipelight/pipelight.patch b/pkgs/tools/misc/pipelight/pipelight.patch new file mode 100644 index 000000000000..84f1b137b72b --- /dev/null +++ b/pkgs/tools/misc/pipelight/pipelight.patch @@ -0,0 +1,149 @@ +diff -urN pipelight.old/bin/pipelight-plugin.in pipelight.new/bin/pipelight-plugin.in +--- pipelight.old/bin/pipelight-plugin.in 2014-07-19 22:53:02.000000000 +0200 ++++ pipelight.new/bin/pipelight-plugin.in 2014-07-27 00:02:39.275834030 +0200 +@@ -92,7 +92,7 @@ + PLUGIN_PATH=$(realpath "$PLUGIN_PATH") + + # Global installation +- if [ $(/usr/bin/id -u) -eq 0 ]; then ++ if [ $(id -u) -eq 0 ]; then + INSTALLDIR="$PLUGIN_PATH" + + # Use environment variable (only if it doesn't point to the global directory) +@@ -594,7 +594,7 @@ + fi + + # Ensure the signature is valid, extract the content +- if ! @@GPG@@ --batch --no-default-keyring --keyring "$PIPELIGHT_SHARE_PATH/sig-install-dependency.gpg" --decrypt "$tmpfile" > "$decfile"; then ++ if ! @@GPG@@ --homedir /tmp --batch --no-default-keyring --keyring "$PIPELIGHT_SHARE_PATH/sig-install-dependency.gpg" --decrypt "$tmpfile" > "$decfile"; then + rm "$tmpfile" + rm "$decfile" + echo "" +@@ -630,24 +630,10 @@ + return 0 + } + +-# Use fetch on FreeBSD if wget is not available +-if command -v wget >/dev/null 2>&1; then +- download_file() +- { +- wget -O "$1" "$2" +- } +-elif command -v fetch >/dev/null 2>&1; then +- download_file() +- { +- fetch -o "$1" "$2" +- } +-else +- download_file() +- { +- echo "ERROR: Could neither find wget nor fetch. Unable to download file!" >&2 +- return 1 +- } +-fi ++download_file() ++{ ++ curl --cacert /etc/ssl/certs/ca-bundle.crt -o "$1" "$2" ++} + + # Use shasum instead of sha256sum on MacOS / *BSD + if ! command -v sha256sum >/dev/null 2>&1 && command -v shasum >/dev/null 2>&1; then +diff -urN pipelight.old/configure pipelight.new/configure +--- pipelight.old/configure 2014-07-19 22:53:02.000000000 +0200 ++++ pipelight.new/configure 2014-07-26 23:52:13.690881447 +0200 +@@ -66,12 +66,8 @@ + datadir="" + libdir="" + mandir="" +-bash_interp="$(which bash)" +-if which gpg &> /dev/null; then +- gpg_exec="$(which gpg)" +-else +- gpg_exec="/usr/bin/gpg" +-fi ++bash_interp=bash ++gpg_exec=gpg2 + moz_plugin_path="" + gcc_runtime_dlls="" + so_mode="0644" +diff -urN pipelight.old/Makefile pipelight.new/Makefile +--- pipelight.old/Makefile 2014-07-19 22:53:02.000000000 +0200 ++++ pipelight.new/Makefile 2014-07-26 23:25:22.020707765 +0200 +@@ -29,7 +29,7 @@ + -e 's|@@BINDIR@@|$(bindir)|g' \ + -e 's|@@DATADIR@@|$(datadir)|g' \ + -e 's|@@GCC_RUNTIME_DLLS@@|$(gcc_runtime_dlls)|g' \ +- -e 's|@@GPG@@|$(gpgexec)|g' \ ++ -e 's|@@GPG@@|$(gpg_exec)|g' \ + -e 's|@@LIBDIR@@|$(libdir)|g' \ + -e 's|@@MANDIR@@|$(mandir)|g' \ + -e 's|@@MOZ_PLUGIN_PATH@@|$(moz_plugin_path)|g' \ +@@ -69,12 +69,12 @@ + + .PHONY: prebuilt32 + prebuilt32: config.make pluginloader-$(git_commit).tar.gz pluginloader-$(git_commit).tar.gz.sig +- $(gpgexec) --batch --no-default-keyring --keyring "share/sig-pluginloader.gpg" --verify "pluginloader-$(git_commit).tar.gz.sig" ++ $(gpg_exec) --batch --no-default-keyring --keyring "share/sig-pluginloader.gpg" --verify "pluginloader-$(git_commit).tar.gz.sig" + tar -xvf "pluginloader-$(git_commit).tar.gz" src/windows/pluginloader.exe src/winecheck/winecheck.exe + + .PHONY: prebuilt64 + prebuilt64: config.make pluginloader-$(git_commit).tar.gz pluginloader-$(git_commit).tar.gz.sig +- $(gpgexec) --batch --no-default-keyring --keyring "share/sig-pluginloader.gpg" --verify "pluginloader-$(git_commit).tar.gz.sig" ++ $(gpg_exec) --batch --no-default-keyring --keyring "share/sig-pluginloader.gpg" --verify "pluginloader-$(git_commit).tar.gz.sig" + tar -xvf "pluginloader-$(git_commit).tar.gz" src/windows/pluginloader64.exe src/winecheck/winecheck64.exe + + .PHONY: pluginloader32 +diff -urN pipelight.old/share/install-dependency pipelight.new/share/install-dependency +--- pipelight.old/share/install-dependency 2014-07-19 22:53:02.000000000 +0200 ++++ pipelight.new/share/install-dependency 2014-07-26 23:26:18.431938546 +0200 +@@ -734,42 +734,14 @@ + return 0 + } + +-# Use fetch on FreeBSD if wget is not available +-if command -v wget >/dev/null 2>&1; then +- download_file() +- { +- wget -O "$1" "$2" +- } +- get_download_size() +- { +- local filesize="$(wget -O- "$1" --spider --server-response 2>&1 | sed -ne '/Content-Length/{s/.*: //;p}')" +- local re='^[0-9]+$' +- if [[ "$filesize" -ne "0" ]] && [[ "$filesize" =~ $re ]]; then +- echo "$(($filesize/(1024*1024)))" +- else +- echo "N/A" +- fi +- } +-elif command -v fetch >/dev/null 2>&1; then +- download_file() +- { +- fetch -o "$1" "$2" +- } +- get_download_size() +- { +- echo "N/A" +- } +-else +- download_file() +- { +- echo "ERROR: Could neither find wget nor fetch. Unable to download file!" >&2 +- return 1 +- } +- get_download_size() +- { +- echo "N/A" +- } +-fi ++download_file() ++{ ++ curl --cacert /etc/ssl/certs/ca-bundle.crt -o "$1" "$2" ++} ++get_download_size() ++{ ++ echo "N/A" ++} + + # Use shasum instead of sha256sum on MacOS / *BSD + if ! command -v sha256sum >/dev/null 2>&1 && command -v shasum >/dev/null 2>&1; then diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 823374771696..7180665bd3d5 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ncurses, libevent, pkgconfig, makeWrapper}: +{stdenv, fetchurl, ncurses, libevent, pkgconfig}: stdenv.mkDerivation rec { pname = "tmux"; @@ -12,13 +12,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses libevent makeWrapper ]; + buildInputs = [ ncurses libevent ]; postInstall = '' mkdir -p $out/etc/bash_completion.d cp -v examples/bash_completion_tmux.sh $out/etc/bash_completion.d/tmux - wrapProgram $out/bin/tmux --prefix TERMINFO : $out/share/terminfo ''; meta = { @@ -36,7 +35,7 @@ stdenv.mkDerivation rec { * Interactive menus to select windows, sessions or clients. * Change the current window by searching for text in the target. * Terminal locking, manually or after a timeout. - * A clean, easily extended, BSD-licensed codebase, under active development. + * A clean, easily extended, BSD-licensed codebase, under active development. ''; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index bf23fbcf2cf1..d9e47dd6eedc 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2014.09.19"; + version = "2014.10.13"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0xyn9rszvv0k0rqgwqzr69bk4n2crfxkwmmi8k26aw52yggba24k"; + sha256 = "0nvcdshsqky3dcyypp86bix0iam7v5hmpl0fy817qwndyi8s0djd"; }; buildInputs = [ python ]; @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { homepage = "http://rg3.github.com/youtube-dl/"; repositories.git = https://github.com/rg3/youtube-dl.git; description = "Command-line tool to download videos from YouTube.com and other sites"; + license = stdenv.lib.licenses.unlicense; platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ bluescreen303 simons phreedom ]; diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix new file mode 100644 index 000000000000..d0ffcc0d69e4 --- /dev/null +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qt, libyubikey }: + +stdenv.mkDerivation rec { + name = "yubikey-personalization-gui-3.1.16"; + + src = fetchurl { + url = "https://developers.yubico.com/yubikey-personalization-gui/Releases/${name}.tar.gz"; + sha256 = "0sdiy2jn0anjvhnz47mrkblhh3paf0gmbgdmrkm21kws4f6sb4kh"; + }; + + buildInputs = [ pkgconfig yubikey-personalization qt libyubikey ]; + + configurePhase = '' + qmake + ''; + + installPhase = '' + mkdir -p $out/bin + cp build/release/yubikey-personalization-gui $out/bin + ''; + + meta = with stdenv.lib; { + homepage = https://developers.yubico.com/yubikey-personalization-gui; + description = "a QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix new file mode 100644 index 000000000000..c80cedd46068 --- /dev/null +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, pkgconfig, libusb, libyubikey, json_c }: + +stdenv.mkDerivation rec { + name = "yubikey-personalization-${version}"; + version = "1.16.0"; + + src = fetchurl { + url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz"; + sha256 = "1zspbb10k9x9mjv8hadmwwgzjlign372al3zshypj9ri55ky0xs3"; + }; + + buildInputs = [ pkgconfig libusb libyubikey json_c ]; + + configureFlags = [ + "--with-backend=libusb-1.0" + ]; + + meta = with stdenv.lib; { + homepage = https://developers.yubico.com/yubikey-personalization; + description = "a library and command line tool to personalize YubiKeys"; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix index a37bf2d0a56d..a6752606da69 100644 --- a/pkgs/tools/networking/cadaver/default.nix +++ b/pkgs/tools/networking/cadaver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, openssl }: stdenv.mkDerivation rec { name = "cadaver-0.23.3"; @@ -8,6 +8,9 @@ stdenv.mkDerivation rec { sha256 = "1jizq69ifrjbjvz5y79wh1ny94gsdby4gdxwjad4bfih6a5fck7x"; }; + buildInputs = [openssl]; + configureFlags = ["--with-ssl"]; + meta = with stdenv.lib; { description = "A command-line WebDAV client for Unix"; homepage = http://www.webdav.org/cadaver; diff --git a/pkgs/tools/networking/cjdns/builder.sh b/pkgs/tools/networking/cjdns/builder.sh deleted file mode 100644 index c2e3701c0468..000000000000 --- a/pkgs/tools/networking/cjdns/builder.sh +++ /dev/null @@ -1,9 +0,0 @@ -source $stdenv/setup - -unpackPhase -cd git-export - -bash do - -mkdir -p $out/sbin -cp cjdroute $out/sbin diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index c56faac690c3..c32bc224bdde 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,30 +1,39 @@ -{ stdenv, fetchgit, nodejs, which, python27 }: +{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: let - date = "20140922"; - rev = "5ebca772b0582173127e8c1e61ee235c5ab3fb50"; + date = "20141023"; + rev = "c7eed6b14688458e16fab368f68904e530651a30"; in stdenv.mkDerivation { name = "cjdns-${date}-${stdenv.lib.strings.substring 0 7 rev}"; - src = fetchgit { - url = "https://github.com/cjdelisle/cjdns.git"; + src = fetchFromGitHub { + owner = "cjdelisle"; + repo = "cjdns"; inherit rev; - sha256 = "04abf73f4aede12c35b70ae09a367b3d6352a63f818185f788ed13356d06197a"; + sha256 = "11z8dk7byxh9pfv7mhfvnk465qln1g7z8c8f822623d59lwjpbs1"; }; - buildInputs = [ which python27 nodejs]; - - patches = [ ./makekey.patch ]; + buildInputs = [ which python27 nodejs ] ++ + # for flock + stdenv.lib.optional stdenv.isLinux [ utillinux ]; buildPhase = "bash do"; - installPhase = "installBin cjdroute makekey"; + installPhase = '' + installBin cjdroute makekeys privatetopublic publictoip6 + sed -i 's,/usr/bin/env node,'$(type -P node), \ + $(find contrib -name "*.js") + sed -i 's,/usr/bin/env python,'$(type -P python), \ + $(find contrib -type f) + mkdir -p $out/share/cjdns + cp -R contrib node_build node_modules $out/share/cjdns/ + ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/cjdelisle/cjdns; description = "Encrypted networking for regular people"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ viric emery ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = with maintainers; [ viric emery ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/cjdns/makekey.patch b/pkgs/tools/networking/cjdns/makekey.patch deleted file mode 100644 index fcce5e3e728e..000000000000 --- a/pkgs/tools/networking/cjdns/makekey.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/contrib/c/makekey.c b/contrib/c/makekey.c -new file mode 100644 -index 0000000..c7184e5 ---- /dev/null -+++ b/contrib/c/makekey.c -@@ -0,0 +1,46 @@ -+/* vim: set expandtab ts=4 sw=4: */ -+/* -+ * You may redistribute this program and/or modify it under the terms of -+ * the GNU General Public License as published by the Free Software Foundation, -+ * either version 3 of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program. If not, see . -+ */ -+#include "crypto/random/Random.h" -+#include "memory/MallocAllocator.h" -+#include "crypto/AddressCalc.h" -+#include "util/AddrTools.h" -+#include "util/Hex.h" -+ -+#include "crypto_scalarmult_curve25519.h" -+ -+#include -+ -+int main(int argc, char** argv) -+{ -+ struct Allocator* alloc = MallocAllocator_new(1<<22); -+ struct Random* rand = Random_new(alloc, NULL, NULL); -+ -+ uint8_t privateKey[32]; -+ uint8_t publicKey[32]; -+ uint8_t ip[16]; -+ uint8_t hexPrivateKey[65]; -+ -+ for (;;) { -+ Random_bytes(rand, privateKey, 32); -+ crypto_scalarmult_curve25519_base(publicKey, privateKey); -+ if (AddressCalc_addressForPublicKey(ip, publicKey)) { -+ Hex_encode(hexPrivateKey, 65, privateKey, 32); -+ printf(hexPrivateKey); -+ return 0; -+ } -+ } -+ return 0; -+} -+ -diff --git a/node_build/make.js b/node_build/make.js -index 5e51645..11465e3 100644 ---- a/node_build/make.js -+++ b/node_build/make.js -@@ -339,6 +339,7 @@ Builder.configure({ - builder.buildExecutable('contrib/c/privatetopublic.c'); - builder.buildExecutable('contrib/c/sybilsim.c'); - builder.buildExecutable('contrib/c/makekeys.c'); -+ builder.buildExecutable('contrib/c/makekey.c'); - - builder.buildExecutable('crypto/random/randombytes.c'); - diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 3a6249744f3d..927d60e81249 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.4.7"; + name = "dhcpcd-6.5.1"; src = fetchurl { - url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2"; - sha256 = "11z14nxk91g232zk4j17b822b7lvrzaa9kaxz0n6nhvihsb8025v"; + url = "mirror://roy/dhcpcd/${name}.tar.bz2"; + sha256 = "0y0falxxlahr2i630ydraq4ldr7d5mg8ar0s5np5ddl76w58dlrp"; }; patches = [ /* ./lxc_ro_promote_secondaries.patch */ ]; diff --git a/pkgs/tools/networking/nc6/default.nix b/pkgs/tools/networking/nc6/default.nix index 348fc2e26a64..9c0979294715 100644 --- a/pkgs/tools/networking/nc6/default.nix +++ b/pkgs/tools/networking/nc6/default.nix @@ -4,7 +4,10 @@ stdenv.mkDerivation { name = "nc6-1.0"; src = fetchurl { - url = ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-1.0.tar.bz2; + urls = [ + ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-1.0.tar.bz2 + http://fossies.org/linux/privat/nc6-1.0.tar.bz2 + ]; sha256 = "01l28zv1yal58ilfnz6albdzqqxzsx3a58vmc14r9gv0bahffdgb"; }; diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index b81c46c0b616..ee5241bfcad8 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "openresolv-3.5.7"; src = fetchurl { - url = "http://roy.marples.name/downloads/openresolv/${name}.tar.bz2"; + url = "mirror://roy/openresolv/${name}.tar.bz2"; sha256 = "14n51wqnh49zdvx11l79s3fh1jhg7kg9cfny5vk7zsix78spmyx7"; }; diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 76a4a0eae62d..e82b7b8050ef 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -66,9 +66,7 @@ buildPythonPackage { ''; homepage = http://allmydata.org/; - - # TODO license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; - + license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; maintainers = [ lib.maintainers.simons ]; platforms = lib.platforms.gnu; # arbitrary choice }; diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index b1c116266f2f..4929b93ab0f3 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }: stdenv.mkDerivation rec { - name = "radvd-2.7"; + name = "radvd-2.8"; src = fetchurl { url = "http://www.litech.org/radvd/dist/${name}.tar.xz"; - sha256 = "09rzw96cjkzywadxmhbhaw52ahawzjp3pv7pblcsnb0mrwaawny0"; + sha256 = "1y8d8k457apc5wrzc80sdkbvwynvvax31z5rh9ca9bsd0jr4240a"; }; buildInputs = [ pkgconfig libdaemon bison flex check ]; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index a9f87c8ccf3b..23ecf9ac6e03 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.8pre3843_3f8576"; + name = "nix-1.8pre3866_6062b12"; src = fetchurl { - url = "http://hydra.nixos.org/build/15588665/download/4/${name}.tar.xz"; - sha256 = "23befe1b5ecff38cc1088b98f221893f87d47e3335b381090ce13e9dd6c6eb87"; + url = http://hydra.nixos.org/build/16392832/download/4/nix-1.8pre3866_6062b12.tar.xz; + sha256 = "2038e0285ee4690c80e220642794b02d611b81c578593042ab8557d30a0d0d3b"; }; nativeBuildInputs = [ perl pkgconfig ]; diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix new file mode 100644 index 000000000000..c1b6fe197a15 --- /dev/null +++ b/pkgs/tools/security/aide/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, flex, bison, libmhash, zlib, acl, attr, libselinux }: +stdenv.mkDerivation rec { + name = "aide-${version}"; + version = "0.16a2"; + + src = fetchurl { + url = "mirror://sourceforge/aide/devel/0.16a2/aide-${version}.tar.gz"; + sha256 = "11qvp6l2x4ajq9485lmg722gfdikh8r2wqfw17m0jm68df0m295m"; + }; + + buildInputs = [ flex bison libmhash zlib acl attr libselinux ]; + + + configureFlags = [ + "--with-posix-acl" + "--with-selinux" + "--with-xattr" + ]; + + meta = with stdenv.lib; { + homepage = "http://aide.sourceforge.net/"; + description = "Advanced Intrusion Detection Environment (AIDE) is a file and directory integrity checker"; + license = licenses.free; + maintainers = [ maintainers.tstrobel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/security/opencryptoki/default.nix b/pkgs/tools/security/opencryptoki/default.nix new file mode 100644 index 000000000000..9ea9c2f4892b --- /dev/null +++ b/pkgs/tools/security/opencryptoki/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, openssl, trousers, automake, autoconf, libtool, bison, flex }: + +stdenv.mkDerivation rec { + version = "3.2"; + name = "opencryptoki-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/opencryptoki/opencryptoki/v${version}/opencryptoki-v${version}.tgz"; + sha256 = "06r6zp299vxdspl6k65myzgjv0bihg7kc500v7s4jd3mcrkngd6h"; + }; + + buildInputs = [ automake autoconf libtool openssl trousers bison flex ]; + + preConfigure = '' + substituteInPlace configure.in --replace "chown" "true" + substituteInPlace configure.in --replace "chgrp" "true" + sh bootstrap.sh --prefix=$out + ''; + + configureFlags = [ "--disable-ccatok" "--disable-icatok" ]; + + makeFlags = "DESTDIR=$(out)"; + + # work around the build script of opencryptoki + postInstall = '' + cp -r $out/$out/* $out + rm -r $out/nix + ''; + + meta = with stdenv.lib; { + description = "PKCS#11 implementation for Linux"; + homepage = http://opencryptoki.sourceforge.net/; + license = licenses.cpl10; + maintainers = [ maintainers.tstrobel ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index 446e25772f17..989b84ef957f 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "rng-tools-4"; + name = "rng-tools-5"; src = fetchurl { url = "mirror://sourceforge/gkernel/${name}.tar.gz"; - sha256 = "15f17j3lxn1v2mhdxvy3pahz41hn1vlnnm81c0qyh19c4bady6xp"; + sha256 = "13h7lc8wl9khhvkr0i3bl5j9bapf8anhqis1lcnwxg1vc2v058b0"; }; meta = { diff --git a/pkgs/tools/security/simple-tpm-pk11/default.nix b/pkgs/tools/security/simple-tpm-pk11/default.nix new file mode 100644 index 000000000000..811618d66028 --- /dev/null +++ b/pkgs/tools/security/simple-tpm-pk11/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchgit, trousers, openssl, opencryptoki, automake, autoconf, libtool }: + +stdenv.mkDerivation rec { + name = "simple-tpm-pk11-2014-09-25"; + + src = fetchgit { + url = "https://github.com/ThomasHabets/simple-tpm-pk11"; + rev = "f26f10e11344560ff6e1479e6795dc0e5dc49a26"; + sha256 = "8c9501ceed0557113ce3facf7b22b8baf6f32ebb092008c089b80334ed03cec9"; + }; + + buildInputs = [ trousers openssl opencryptoki automake autoconf libtool ]; + + preConfigure = "sh bootstrap.sh"; + + meta = with stdenv.lib; { + description = "Simple PKCS11 provider for TPM chips"; + longDescription = '' + A simple library for using the TPM chip to secure SSH keys. + ''; + homepage = https://github.com/ThomasHabets/simple-tpm-pk11; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib; [ maintainers.tstrobel ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 3318d0c1102d..b7bde895439b 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl, zlib }: stdenv.mkDerivation rec { - name = "tor-0.2.4.23"; + name = "tor-0.2.4.24"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "0a8l6d82hk4wbn7nlphd3c1maxhgdli8338wbg5r9dk6zcy7k8q5"; + sha256 = "1l8aczqz8injzcj3mabx4figl8ahkzb0vs9s3nir6kn0b1l5rccr"; }; buildInputs = [ libevent openssl zlib ]; diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix index 6e7ff75a6a48..a17bff9e32c8 100644 --- a/pkgs/tools/security/tpm-tools/default.nix +++ b/pkgs/tools/security/tpm-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, trousers, openssl }: +{ stdenv, fetchurl, trousers, openssl, opencryptoki }: let version = "1.3.8"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "10za1gi89vi9m2lmm7jfzs281h55x1sbbm2bdgdh692ljpq4zsv6"; }; - buildInputs = [ trousers openssl ]; + buildInputs = [ trousers openssl opencryptoki ]; meta = with stdenv.lib; { description = "Management tools for TPM hardware"; diff --git a/pkgs/tools/security/wipe/default.nix b/pkgs/tools/security/wipe/default.nix new file mode 100644 index 000000000000..a7c337dc1222 --- /dev/null +++ b/pkgs/tools/security/wipe/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "wipe-${version}"; + version = "2.3.1"; + + src = fetchurl { + url = "mirror://sourceforge/wipe/${version}/${name}.tar.bz2"; + sha256 = "180snqvh6k6il6prb19fncflf2jcvkihlb4w84sbndcv1wvicfa6"; + }; + + patches = [ ./fix-install.patch ]; + + meta = with stdenv.lib; { + description = "Secure file wiping utility"; + homepage = http://wipe.sourceforge.net/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.abbradar ]; + }; +} diff --git a/pkgs/tools/security/wipe/fix-install.patch b/pkgs/tools/security/wipe/fix-install.patch new file mode 100644 index 000000000000..2df3a1eec6a0 --- /dev/null +++ b/pkgs/tools/security/wipe/fix-install.patch @@ -0,0 +1,18 @@ +diff -ru3 wipe-2.3.1/Makefile.in wipe-2.3.1-new/Makefile.in +--- wipe-2.3.1/Makefile.in 2009-11-02 00:11:30.000000000 +0300 ++++ wipe-2.3.1-new/Makefile.in 2014-10-18 02:51:10.088966232 +0400 +@@ -60,12 +60,12 @@ + $(INSTALL_BIN) -d $(bindir) + $(INSTALL_BIN) -s $(BIN_OUT) $(bindir) + $(INSTALL) -d $(mandir)/man1 +- $(INSTALL) -o root -m 0644 wipe.1 $(mandir)/man1/ ++ $(INSTALL) -m 0644 wipe.1 $(mandir)/man1/ + rm -rf $(datadir)/doc/wipe* + $(INSTALL) -d $(datadir)/doc/wipe + + for file in $(DOCS); do \ +- $(INSTALL) -o root -m 0644 $$file $(datadir)/doc/wipe/; \ ++ $(INSTALL) -m 0644 $$file $(datadir)/doc/wipe/; \ + done + + install_home: $(BIN_OUT) diff --git a/pkgs/tools/system/runit/Makefile.patch b/pkgs/tools/system/runit/Makefile.patch new file mode 100644 index 000000000000..43257728e928 --- /dev/null +++ b/pkgs/tools/system/runit/Makefile.patch @@ -0,0 +1,11 @@ +diff -ur admin.orig/runit-2.1.2/src/Makefile admin/runit-2.1.2/src/Makefile +--- admin.orig/runit-2.1.2/src/Makefile 2014-08-10 20:22:35.000000000 +0200 ++++ admin/runit-2.1.2/src/Makefile 2014-10-15 13:04:02.892937939 +0200 +@@ -234,7 +234,6 @@ + + hasshsgr.h: chkshsgr choose compile hasshsgr.h1 hasshsgr.h2 load \ + tryshsgr.c warn-shsgr +- ./chkshsgr || ( cat warn-shsgr; exit 1 ) + ./choose clr tryshsgr hasshsgr.h1 hasshsgr.h2 > hasshsgr.h + + haswaitp.h: choose compile haswaitp.h1 haswaitp.h2 load trywaitp.c diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix new file mode 100644 index 000000000000..28a0fa52d277 --- /dev/null +++ b/pkgs/tools/system/runit/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "runit-${version}"; + version = "2.1.2"; + + src = fetchurl { + url = "http://smarden.org/runit/${name}.tar.gz"; + sha256 = "065s8w62r6chjjs6m9hapcagy33m75nlnxb69vg0f4ngn061dl3g"; + }; + + phases = [ "unpackPhase" "patchPhase" "buildPhase" "checkPhase" "installPhase" ]; + + patches = [ ./Makefile.patch ]; + + buildPhase = '' + cd ${name} + make -C 'src' + ''; + + checkPhase = '' + make -C 'src' check + ''; + + installPhase = '' + mkdir -p $out/bin + for f in $(cat package/commands); do + mv src/$f $out/bin/ + done + ''; + + meta = with stdenv.lib; { + description = "UNIX init scheme with service supervision"; + license = licenses.bsd3; + homePage = "http://smarden.org/runit"; + maintainers = with maintainers; [ rickynils ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/tools/system/safe-rm/default.nix new file mode 100644 index 000000000000..418817332e92 --- /dev/null +++ b/pkgs/tools/system/safe-rm/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchgit, perl, coreutils }: + +stdenv.mkDerivation rec { + name = "safe-rm-${version}"; + version = "0.11"; + + src = fetchgit { + url = "https://gitorious.org/safe-rm/mainline.git"; + rev = "refs/tags/${name}"; + sha256 = "1csnqq22pfbg9dwhv13x60jih0gn07bn5rwg2nhi0dsslzk4l496"; + }; + + propagatedBuildInputs = [ perl coreutils ]; + + postFixup = '' + sed -e 's@/bin/rm@${coreutils}/bin/rm@' -i $out/bin/safe-rm + ''; + + installPhase = '' + mkdir -p $out/bin + cp safe-rm $out/bin + + mkdir -p $out/share/man/man1 + pod2man safe-rm > $out/share/man/man1/safe-rm.1 + ''; + + meta = with stdenv.lib; { + description = "Tool intended to prevent the accidental deletion of important files."; + homepage = https://launchpad.net/safe-rm; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.koral ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c925e91952ae..86daac05bf51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -401,6 +401,10 @@ let inherit stdenv; }; + substituteAllFiles = import ../build-support/substitute-files/substitute-all-files.nix { + inherit stdenv; + }; + replaceDependency = import ../build-support/replace-dependency.nix { inherit runCommand nix lib; }; @@ -464,6 +468,8 @@ let ahcpd = callPackage ../tools/networking/ahcpd { }; + aide = callPackage ../tools/security/aide { }; + aircrackng = callPackage ../tools/networking/aircrack-ng { }; airfield = callPackage ../tools/networking/airfield { }; @@ -617,6 +623,8 @@ let bitbucket-cli = pythonPackages.bitbucket-cli; + blink = callPackage ../applications/networking/instant-messengers/blink { }; + blockdiag = pythonPackages.blockdiag; bmon = callPackage ../tools/misc/bmon { }; @@ -764,6 +772,8 @@ let par2Support = (config.bup.par2Support or false); }; + byzanz = callPackage ../applications/video/byzanz {}; + ori = callPackage ../tools/backup/ori { }; atool = callPackage ../tools/archivers/atool { }; @@ -805,8 +815,6 @@ let chkrootkit = callPackage ../tools/security/chkrootkit { }; chocolateDoom = callPackage ../games/chocolate-doom { }; - # master is here because chocolateDoom v2.0 has broken netplay - chocolateDoomMaster = callPackage ../games/chocolate-doom/master.nix { }; chrony = callPackage ../tools/networking/chrony { }; @@ -1103,6 +1111,8 @@ let fcitx-anthy = callPackage ../tools/inputmethods/fcitx/fcitx-anthy.nix { }; + fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { }; + fcron = callPackage ../tools/system/fcron { }; fdm = callPackage ../tools/networking/fdm {}; @@ -1308,6 +1318,10 @@ let buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; }; + trustedGrub = callPackage_i686 ../tools/misc/grub/trusted.nix { + buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; + }; + grub2 = callPackage ../tools/misc/grub/2.0x.nix { }; grub2_efi = grub2.override { efiSupport = true; }; @@ -1479,6 +1493,8 @@ let jwhois = callPackage ../tools/networking/jwhois { }; + k2pdfopt = callPackage ../applications/misc/k2pdfopt { }; + kazam = callPackage ../applications/video/kazam { }; kalibrate-rtl = callPackage ../tools/misc/kalibrate-rtl { }; @@ -1533,6 +1549,8 @@ let ldns = callPackage ../development/libraries/ldns { }; + leafpad = callPackage ../applications/editors/leafpad { }; + lftp = callPackage ../tools/networking/lftp { }; libconfig = callPackage ../development/libraries/libconfig { }; @@ -1851,6 +1869,8 @@ let inherit (pythonPackages) sqlite3; }; + opencryptoki = callPackage ../tools/security/opencryptoki { }; + opendbx = callPackage ../development/libraries/opendbx { }; opendkim = callPackage ../development/libraries/opendkim { }; @@ -1868,7 +1888,7 @@ let openobex = callPackage ../tools/bluetooth/openobex { }; openopc = callPackage ../tools/misc/openopc { - pythonFull = python27Full.override { + pythonFull = python27.buildEnv.override { extraLibs = [ python27Packages.pyro3 ]; }; }; @@ -2046,6 +2066,8 @@ let projectm = callPackage ../applications/audio/projectm { }; + proot = callPackage ../tools/system/proot { }; + proxychains = callPackage ../tools/networking/proxychains { }; proxytunnel = callPackage ../tools/misc/proxytunnel { }; @@ -2162,6 +2184,8 @@ let rpm = callPackage ../tools/package-management/rpm { }; + rpmextract = callPackage ../tools/archivers/rpmextract { }; + rrdtool = callPackage ../tools/misc/rrdtool { }; rtorrent = callPackage ../tools/networking/p2p/rtorrent { }; @@ -2196,6 +2220,8 @@ let safecopy = callPackage ../tools/system/safecopy { }; + safe-rm = callPackage ../tools/system/safe-rm { }; + salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {}; samplicator = callPackage ../tools/networking/samplicator { }; @@ -2371,6 +2397,8 @@ let # Work In Progress: it doesn't start unless running a daemon as root teamviewer8 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/8.nix { }); + teamviewer9 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/9.nix { }); + telnet = callPackage ../tools/networking/telnet { }; texmacs = callPackage ../applications/editors/texmacs { @@ -2629,6 +2657,8 @@ let wicd = callPackage ../tools/networking/wicd { }; + wipe = callPackage ../tools/security/wipe { }; + wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf { overrideDerivation = lib.overrideDerivation; inherit (xlibs) libX11 libXext libXrender; @@ -3320,7 +3350,17 @@ let llvm = llvm_34; openblas = openblas_0_2_10; }; - julia = julia030; + julia031 = let + liblapack = liblapack_3_5_0.override {shared = true;}; + in callPackage ../development/compilers/julia/0.3.1.nix { + inherit liblapack; + suitesparse = suitesparse.override { + inherit liblapack; + }; + llvm = llvm_34; + openblas = openblas_0_2_10; + }; + julia = julia031; lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) { inherit makeWrapper gtk glib pango atk gdk_pixbuf; @@ -3647,7 +3687,7 @@ let roadsend = callPackage ../development/compilers/roadsend { }; - rustc = callPackage ../development/compilers/rustc/0.11.nix {}; + rustc = callPackage ../development/compilers/rustc/0.12.nix {}; rustcMaster = callPackage ../development/compilers/rustc/head.nix {}; rust = rustc; @@ -3762,7 +3802,8 @@ let clisp = callPackage ../development/interpreters/clisp { }; # compatibility issues in 2.47 - at list 2.44.1 is known good - # for sbcl bootstrap + # for sbcl bootstrap. + # SBCL page recommends 2.33.2, though. Not sure when was it last tested clisp_2_44_1 = callPackage ../development/interpreters/clisp/2.44.1.nix { libsigsegv = libsigsegv_25; }; @@ -3914,10 +3955,7 @@ let polyml = callPackage ../development/compilers/polyml { }; - pure = callPackage ../development/interpreters/pure { - llvm = llvm_34 ; - }; - + pure = callPackage ../development/interpreters/pure { }; pure-gsl = callPackage ../development/pure-modules/pure-gsl { }; python = python2; @@ -3929,28 +3967,35 @@ let python2Packages = python27Packages; python3Packages = python34Packages; + python26 = callPackage ../development/interpreters/python/2.6 { + db = db47; + self = python26; + }; + python27 = callPackage ../development/interpreters/python/2.7 { + self = python27; + }; + python32 = callPackage ../development/interpreters/python/3.2 { + self = python32; + }; + python33 = callPackage ../development/interpreters/python/3.3 { + self = python33; + }; + python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { + self = python34; + }); + pypy = callPackage ../development/interpreters/pypy/2.4 { + self = pypy; + }; + pythonFull = python2Full; python2Full = python27Full; - - python26 = callPackage ../development/interpreters/python/2.6 { db = db47; }; - python27 = callPackage ../development/interpreters/python/2.7 { }; - python32 = callPackage ../development/interpreters/python/3.2 { }; - python33 = callPackage ../development/interpreters/python/3.3 { }; - python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { }); - - pypy = callPackage ../development/interpreters/pypy/2.4 { }; - - python26Full = callPackage ../development/interpreters/python/wrapper.nix { - extraLibs = []; - postBuild = ""; - python = python26; - inherit (python26Packages) recursivePthLoader; + python26Full = python26.override { + includeModules = true; + self = python26Full; }; - python27Full = callPackage ../development/interpreters/python/wrapper.nix { - extraLibs = []; - postBuild = ""; - python = python27; - inherit (python27Packages) recursivePthLoader; + python27Full = python27.override { + includeModules = true; + self = python27Full; }; python2nix = callPackage ../tools/package-management/python2nix { }; @@ -4038,6 +4083,7 @@ let tcl = callPackage ../development/interpreters/tcl { }; xulrunner = callPackage ../development/interpreters/xulrunner { + stdenv = if stdenv.isLinux then useGoldLinker stdenv else stdenv; inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; }; @@ -4516,6 +4562,8 @@ let sigrok-cli = callPackage ../development/tools/sigrok-cli { }; + simpleTpmPk11 = callPackage ../tools/security/simple-tpm-pk11 { }; + slimerjs = callPackage ../development/tools/slimerjs {}; sloccount = callPackage ../development/tools/misc/sloccount { }; @@ -5286,6 +5334,10 @@ let herqq = callPackage ../development/libraries/herqq { }; + hidapi = callPackage ../development/libraries/hidapi { + libusb = libusb1; + }; + hspell = callPackage ../development/libraries/hspell { }; hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { }; @@ -5718,6 +5770,8 @@ let inherit (gnome) gtkdoc; }; + libinput = callPackage ../development/libraries/libinput { }; + libiptcdata = callPackage ../development/libraries/libiptcdata { }; libjpeg_original = callPackage ../development/libraries/libjpeg { }; @@ -5930,6 +5984,8 @@ let libgeotiff = callPackage ../development/libraries/libgeotiff { }; + libu2f-host = callPackage ../development/libraries/libu2f-host { }; + libunistring = callPackage ../development/libraries/libunistring { }; libupnp = callPackage ../development/libraries/pupnp { }; @@ -6031,7 +6087,9 @@ let libyamlcpp = callPackage ../development/libraries/libyaml-cpp { }; - libyubikey = callPackage ../development/libraries/libyubikey {}; + libykneomgr = callPackage ../development/libraries/libykneomgr { }; + + libyubikey = callPackage ../development/libraries/libyubikey { }; libzip = callPackage ../development/libraries/libzip { }; @@ -6319,6 +6377,8 @@ let physfs = callPackage ../development/libraries/physfs { }; + pipelight = callPackage ../tools/misc/pipelight { }; + pkcs11helper = callPackage ../development/libraries/pkcs11helper { }; plib = callPackage ../development/libraries/plib { }; @@ -6621,14 +6681,9 @@ let srtp_linphone = callPackage ../development/libraries/srtp/linphone.nix { }; - sqlite = lowPrio (callPackage ../development/libraries/sqlite { - readline = null; - ncurses = null; - }); + sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); - sqliteInteractive = appendToName "interactive" (sqlite.override { - inherit readline ncurses; - }); + sqliteInteractive = appendToName "interactive" (sqlite.override { interactive = true; }); sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher { readline = null; @@ -6850,6 +6905,14 @@ let yajl = callPackage ../development/libraries/yajl { }; + yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { + libusb = libusb1; + }; + + yubikey-personalization-gui = callPackage ../tools/misc/yubikey-personalization-gui { + qt = qt4; + }; + zangband = builderDefsPackage (import ../games/zangband) { inherit ncurses flex bison autoconf automake m4 coreutils; }; @@ -7226,7 +7289,7 @@ let prosody = recurseIntoAttrs ( callPackage ../servers/xmpp/prosody { lua5 = lua5_1; - inherit (lua51Packages) luasocket luasec luaexpat luafilesystem; + inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop; }); elasticmq = callPackage ../servers/elasticmq { }; @@ -8008,6 +8071,7 @@ let stdenv = stdenv_32bit; inherit (gnome) libIDL; enableExtensionPack = config.virtualbox.enableExtensionPack or false; + pulseSupport = config.pulseaudio or false; }; virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; @@ -8018,7 +8082,7 @@ let # The current default kernel / kernel modules. linux = linuxPackages.kernel; - linuxPackages = linuxPackages_3_12; + linuxPackages = linuxPackages_3_14; # Update this when adding the newest kernel major version! linux_latest = pkgs.linux_3_17; @@ -8916,11 +8980,11 @@ let enableXft = config.dmenu.enableXft or false; }; - dmtx = builderDefsPackage (import ../tools/graphics/dmtx) { - inherit libpng libtiff libjpeg imagemagick librsvg - pkgconfig bzip2 zlib libtool freetype fontconfig - ghostscript jasper xz; - inherit (xlibs) libX11; + dmenu2 = callPackage ../applications/misc/dmenu2 { }; + + dmtx = dmtx-utils; + + dmtx-utils = callPackage (import ../tools/graphics/dmtx-utils) { }; docker = callPackage ../applications/virtualization/docker { }; @@ -8966,7 +9030,6 @@ let libXaw = xlibs.libXaw; Xaw3d = null; gconf = null; - librsvg = null; alsaLib = null; imagemagick = null; }; @@ -9028,6 +9091,8 @@ let gist = callPackage ../applications/editors/emacs-modes/gist { }; + gitModes = callPackage ../applications/editors/emacs-modes/git-modes { }; + haskellMode = callPackage ../applications/editors/emacs-modes/haskell { }; hol_light_mode = callPackage ../applications/editors/emacs-modes/hol_light { }; @@ -9106,7 +9171,8 @@ let stratego = callPackage ../applications/editors/emacs-modes/stratego { }; structuredHaskellMode = callPackage ../applications/editors/emacs-modes/structured-haskell-mode { - inherit (haskellPackages) cabal haskellSrcExts; + inherit (haskellPackages) cabal ; + haskellSrcExts = haskellPackages.haskellSrcExts_1_15_0_1; }; sunriseCommander = callPackage ../applications/editors/emacs-modes/sunrise-commander { }; @@ -9253,6 +9319,7 @@ let firefox13Wrapper = wrapFirefox { browser = firefox13Pkgs.firefox; }; firefox = callPackage ../applications/networking/browsers/firefox { + stdenv = if stdenv.isLinux then useGoldLinker stdenv else stdenv; inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; }; @@ -9827,6 +9894,8 @@ let ncmpcpp = callPackage ../applications/audio/ncmpcpp { }; + ncmpcppBeta = callPackage ../applications/audio/ncmpcpp/beta.nix { }; + normalize = callPackage ../applications/audio/normalize { }; mplayer = callPackage ../applications/video/mplayer { @@ -10057,6 +10126,10 @@ let startupnotification = libstartup_notification; }; + pidginWrapper = callPackage ../applications/networking/instant-messengers/pidgin/wrapper.nix { + plugins = []; + }; + pidginlatex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex { imagemagick = imagemagickBig; }; @@ -10182,6 +10255,14 @@ let unicode3Support = true; }; + # urxvt plugins + urxvt_perls = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-perls { }; + urxvt_tabbedex = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-tabbedex { }; + + rxvt_unicode_with-plugins = callPackage ../applications/misc/rxvt_unicode/wrapper.nix { + plugins = [ urxvt_perls urxvt_tabbedex ]; + }; + sakura = callPackage ../applications/misc/sakura { inherit (gnome) vte; }; @@ -10238,7 +10319,9 @@ let }) ); - sxiv = callPackage ../applications/graphics/sxiv { }; + sxiv = callPackage ../applications/graphics/sxiv { + giflib = giflib_5_0; + }; bittorrentSync = callPackage ../applications/networking/bittorrentsync { }; @@ -10503,7 +10586,7 @@ let vim = callPackage ../applications/editors/vim { }; - macvim = callPackage ../applications/editors/vim/macvim.nix { }; + macvim = callPackage ../applications/editors/vim/macvim.nix { stdenv = clangStdenv; }; vimHugeX = vim_configurable; @@ -10526,6 +10609,8 @@ let vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; }); + qpdfview = callPackage ../applications/misc/qpdfview {}; + qvim = lowPrio (callPackage ../applications/editors/vim/qvim.nix { inherit (pkgs) fetchgit stdenv ncurses pkgconfig gettext composableDerivation lib config python perl tcl ruby qt4; @@ -10589,7 +10674,18 @@ let weechatDevel = lowPrio (callPackage ../applications/networking/irc/weechat/devel.nix { }); - weston = callPackage ../applications/window-managers/weston { }; + westonLite = callPackage ../applications/window-managers/weston { + pango = null; + freerdp = null; + libunwind = null; + vaapi = null; + libva = null; + libwebp = null; + }; + + weston = callPackage ../applications/window-managers/weston { + freerdp = freerdpUnstable; + }; windowmaker = callPackage ../applications/window-managers/windowmaker { }; @@ -10667,13 +10763,17 @@ let ++ optional (cfg.enableGambatte or false) gambatte ++ optional (cfg.enableGenesisPlusGX or false) genesis-plus-gx ++ optional (cfg.enableMupen64Plus or false) mupen64plus + ++ optional (cfg.enableNestopia or false) nestopia ++ optional (cfg.enablePicodrive or false) picodrive ++ optional (cfg.enablePrboom or false) prboom ++ optional (cfg.enablePPSSPP or false) ppsspp + ++ optional (cfg.enableQuickNES or false) quicknes ++ optional (cfg.enableScummVM or false) scummvm + ++ optional (cfg.enableSnes9x or false) snes9x ++ optional (cfg.enableSnes9xNext or false) snes9x-next ++ optional (cfg.enableStella or false) stella ++ optional (cfg.enableVbaNext or false) vba-next + ++ optional (cfg.enableVbaM or false) vba-m ); wrapRetroArch = { retroarch }: import ../misc/emulators/retroarch/wrapper.nix { @@ -10852,6 +10952,7 @@ let (let callPackage = newScope pkgs.zathuraCollection; in import ../applications/misc/zathura { inherit callPackage pkgs fetchurl; + stdenv = overrideGCC stdenv gcc49; useMupdf = config.zathura.useMupdf or false; }); @@ -10863,6 +10964,7 @@ let girara = callPackage ../applications/misc/girara { gtk = gtk3; + stdenv = overrideGCC stdenv gcc49; }; zgrviewer = callPackage ../applications/graphics/zgrviewer {}; @@ -11620,6 +11722,8 @@ let domains = callPackage ../development/coq-modules/domains {}; + flocq = callPackage ../development/coq-modules/flocq {}; + heq = callPackage ../development/coq-modules/heq {}; mathcomp = callPackage ../development/coq-modules/mathcomp {}; @@ -12050,16 +12154,16 @@ let retroarchBare = callPackage ../misc/emulators/retroarch { }; - retroarchBareMaster = callPackage ../misc/emulators/retroarch/master.nix { }; - - retroarch = wrapRetroArch { retroarch = retroarchBareMaster; }; + retroarch = wrapRetroArch { retroarch = retroarchBare; }; libretro = recurseIntoAttrs (callPackage ../misc/emulators/retroarch/cores.nix { - retroarch = retroarchBareMaster; + retroarch = retroarchBare; }); rssglx = callPackage ../misc/screensavers/rss-glx { }; + runit = callPackage ../tools/system/runit { }; + xlockmore = callPackage ../misc/screensavers/xlockmore { }; sails = callPackage ../misc/sails { }; @@ -12252,6 +12356,8 @@ let yandex-disk = callPackage ../tools/filesystems/yandex-disk { }; + zdfmediathk = callPackage ../applications/video/zdfmediathk { }; + myEnvFun = import ../misc/my-env { inherit substituteAll pkgs; inherit (stdenv) mkDerivation; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index d37eedb6c9e1..e62222bb4c97 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -24,7 +24,7 @@ cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_2; }; codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; }; MonadRandom = self.MonadRandom_0_1_13; # requires transformers >= 0.4.x - mtl = self.mtl_2_1_2; + mtl = self.mtl_2_1_3_1; }; ghc763Prefs = self : super : ghc783Prefs self super // { @@ -47,7 +47,6 @@ vectorBinaryInstances = self.vectorBinaryInstances.override { binary = self.binary_0_7_2_2; }; }; }; - Elm = super.Elm.override { pandoc = self.pandoc.override { zipArchive = self.zipArchive.override { binary = self.binary_0_7_2_2; }; }; }; gloss = null; # requires base >= 4.7 haddock = self.haddock_2_13_2; modularArithmetic = null; # requires base >= 4.7 diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index edcc88de1919..34c5359a82ef 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -143,8 +143,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; }; aeson_0_7_0_6 = callPackage ../development/libraries/haskell/aeson/0.7.0.6.nix { blazeBuilder = null; }; - aeson_0_8_0_1 = callPackage ../development/libraries/haskell/aeson/0.8.0.1.nix { blazeBuilder = null; }; - aeson = self.aeson_0_8_0_1; + aeson_0_8_0_2 = callPackage ../development/libraries/haskell/aeson/0.8.0.2.nix { blazeBuilder = null; }; + aeson = self.aeson_0_8_0_2; aesonPretty = callPackage ../development/libraries/haskell/aeson-pretty {}; @@ -396,6 +396,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in charset = callPackage ../development/libraries/haskell/charset {}; + charsetdetectAe = callPackage ../development/libraries/haskell/charsetdetect-ae {}; + Chart = callPackage ../development/libraries/haskell/Chart {}; ChartCairo = callPackage ../development/libraries/haskell/Chart-cairo {}; ChartDiagrams = callPackage ../development/libraries/haskell/Chart-diagrams {}; @@ -615,6 +617,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in dbus = callPackage ../development/libraries/haskell/dbus {}; + Decimal = callPackage ../development/libraries/haskell/Decimal {}; + deepseq_1_1_0_0 = callPackage ../development/libraries/haskell/deepseq/1.1.0.0.nix {}; deepseq_1_1_0_2 = callPackage ../development/libraries/haskell/deepseq/1.1.0.2.nix {}; deepseq_1_2_0_1 = callPackage ../development/libraries/haskell/deepseq/1.2.0.1.nix {}; @@ -788,7 +792,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in executablePath = callPackage ../development/libraries/haskell/executable-path {}; - Extra = callPackage ../development/libraries/haskell/Extra {}; + Extra = callPackage ../development/libraries/haskell/Extra-lib {}; fay = callPackage ../development/libraries/haskell/fay {}; @@ -814,6 +818,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in extensibleExceptions_0_1_1_4 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.4.nix {}; extensibleExceptions = self.extensibleExceptions_0_1_1_4; + extra = callPackage ../development/libraries/haskell/extra {}; + failure = callPackage ../development/libraries/haskell/failure {}; fastcgi = callPackage ../development/libraries/haskell/fastcgi {}; @@ -1041,7 +1047,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in groupoids = callPackage ../development/libraries/haskell/groupoids {}; - hakyll = callPackage ../development/libraries/haskell/hakyll {}; + hakyll = callPackage ../development/libraries/haskell/hakyll { + pandocCiteproc = self.pandocCiteproc_0_4; + }; hamlet = callPackage ../development/libraries/haskell/hamlet {}; @@ -1202,7 +1210,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hi = callPackage ../development/libraries/haskell/hi {}; - hindent = callPackage ../development/libraries/haskell/hindent {}; + hindent = callPackage ../development/libraries/haskell/hindent { + haskellSrcExts = self.haskellSrcExts_1_15_0_1; + }; hint = callPackage ../development/libraries/haskell/hint {}; @@ -1242,7 +1252,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hoodleTypes = callPackage ../development/libraries/haskell/hoodle-types {}; - hoogle = callPackage ../development/libraries/haskell/hoogle {}; + hoogle_4_2_34 = callPackage ../development/libraries/haskell/hoogle/4.2.34.nix { haskellSrcExts = self.haskellSrcExts_1_15_0_1; }; + hoogle_4_2_36 = callPackage ../development/libraries/haskell/hoogle/4.2.36.nix {}; + hoogle = self.hoogle_4_2_36; + hoogleLocal = callPackage ../development/libraries/haskell/hoogle/local.nix {}; hopenssl = callPackage ../development/libraries/haskell/hopenssl {}; @@ -1297,6 +1310,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hspecMeta = callPackage ../development/libraries/haskell/hspec-meta {}; + hspecCheckers = callPackage ../development/libraries/haskell/hspec-checkers {}; + hstatsd = callPackage ../development/libraries/haskell/hstatsd {}; hsyslog = callPackage ../development/libraries/haskell/hsyslog {}; @@ -1466,7 +1481,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in languageHaskellExtract = callPackage ../development/libraries/haskell/language-haskell-extract {}; - lambdabot = callPackage ../development/libraries/haskell/lambdabot {}; + lambdabot = callPackage ../development/libraries/haskell/lambdabot { + haskellSrcExts = self.haskellSrcExts_1_15_0_1; + hoogle = self.hoogle_4_2_34.override { + haskellSrcExts = self.haskellSrcExts_1_15_0_1; + }; + }; lambdabotWrapper = callPackage ../development/libraries/haskell/lambdabot/wrapper.nix { mueval = self.muevalWrapper.override { @@ -1698,6 +1718,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in mtl_2_0_1_0 = callPackage ../development/libraries/haskell/mtl/2.0.1.0.nix {}; mtl_2_1_1 = callPackage ../development/libraries/haskell/mtl/2.1.1.nix {}; mtl_2_1_2 = callPackage ../development/libraries/haskell/mtl/2.1.2.nix {}; + mtl_2_1_3_1 = callPackage ../development/libraries/haskell/mtl/2.1.3.1.nix {}; mtl_2_2_1 = callPackage ../development/libraries/haskell/mtl/2.2.1.nix {}; mtl = null; # tightly coupled with 'transformers' which is a core package @@ -1843,7 +1864,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pandoc = callPackage ../development/libraries/haskell/pandoc {}; - pandocCiteproc = callPackage ../development/libraries/haskell/pandoc-citeproc {}; + pandocCiteproc_0_4 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.4.nix {}; + pandocCiteproc_0_5 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.5.nix {}; + pandocCiteproc_0_6 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.6.nix {}; + pandocCiteproc = self.pandocCiteproc_0_6; pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {}; @@ -2753,13 +2777,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in void = callPackage ../development/libraries/haskell/void {}; - vty_4_7_5 = callPackage ../development/libraries/haskell/vty/4.7.5.nix {}; - vty_5_2_3 = callPackage ../development/libraries/haskell/vty/5.2.3.nix {}; - vty = self.vty_5_2_3; + vty = callPackage ../development/libraries/haskell/vty {}; - vtyUi = callPackage ../development/libraries/haskell/vty-ui { - vty = self.vty_4_7_5; - }; + vtyUi = callPackage ../development/libraries/haskell/vty-ui {}; wai = callPackage ../development/libraries/haskell/wai {}; @@ -3072,6 +3092,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in taffybar = callPackage ../applications/misc/taffybar {}; + validation = callPackage ../development/libraries/haskell/validation {}; + xlsx = callPackage ../development/libraries/haskell/xlsx {}; xmobar = callPackage ../applications/misc/xmobar {}; @@ -3090,11 +3112,19 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in wordTrie = callPackage ../development/libraries/haskell/word-trie {}; - yi = callPackage ../applications/editors/yi/yi.nix { - vty = self.vty_4_7_5; + # This is an unwrapped version of Yi, it will not behave well (no + # M-x or reload). Use ‘yiCustom’ instead. + yi = callPackage ../applications/editors/yi/yi.nix { }; + + yiContrib = callPackage ../development/libraries/haskell/yi-contrib {}; + + yiCustom = callPackage ../applications/editors/yi/yi-custom.nix { + extraPackages = pkgs: []; }; - yiContrib = callPackage ../applications/editors/yi/yi-contrib.nix {}; + yiFuzzyOpen = callPackage ../development/libraries/haskell/yi-fuzzy-open {}; + + yiMonokai = callPackage ../development/libraries/haskell/yi-monokai {}; yiLanguage = callPackage ../development/libraries/haskell/yi-language {}; @@ -3119,20 +3149,21 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in buildCommand = '' export HOME="$TMPDIR" - ${nativePkgs.haskellPackages.cabal2nix}/bin/cabal2nix ${src + "/${name}.cabal"} --sha256=FILTERME \ - | grep -v FILTERME | sed \ - -e 's/licenses.proprietary/licenses.unfree/' \ - -e 's/{ cabal/{ cabal, cabalInstall, cabalDrvArgs ? {}, src/' \ - -e 's/cabal.mkDerivation (self: {/cabal.mkDerivation (self: cabalDrvArgs \/\/ {/' \ - -e 's/buildDepends = \[/buildDepends = \[ cabalInstall/' \ - -e 's/pname = \([^\n]*\)/pname = \1\n inherit src;\n/' > $out + ${nativePkgs.haskellPackages.cabal2nix}/bin/cabal2nix ${src} \ + | sed -e 's/licenses.proprietary/licenses.unfree/' > $out ''; } // pkgs.lib.optionalAttrs nativePkgs.stdenv.isLinux { LANG = "en_US.UTF-8"; LOCALE_ARCHIVE = "${nativePkgs.glibcLocales}/lib/locale/locale-archive"; }); - in callPackage cabalExpr ({ inherit src cabalDrvArgs; } // args); + in callPackage cabalExpr { + cabal = self.cabal.override { + extension = eself: esuper: { + buildDepends = [ self.cabalInstall ] ++ esuper.buildDepends; + } // cabalDrvArgs; + }; + }; buildLocalCabal = src: name: self.buildLocalCabalWithArgs { inherit src name; }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 6a9b5c09555e..19cb2b6e24f0 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -23,6 +23,31 @@ let inherit lua; }; + luabitop = buildLuaPackage rec { + version = "1.0.2"; + name = "bitop-${version}"; + src = fetchurl { + url = "http://bitop.luajit.org/download/LuaBitOp-${version}.tar.gz"; + sha256 = "16fffbrgfcw40kskh2bn9q7m3gajffwd2f35rafynlnd7llwj1qj"; + }; + + preBuild = '' + makeFlagsArray=( + INCLUDES="-I${lua}/include" + LUA="${lua}/bin/lua"); + ''; + + installPhase = '' + mkdir -p $out/lib/lua/${lua.luaversion} + install -p bit.so $out/lib/lua/${lua.luaversion} + ''; + + meta = { + homepage = "http://bitop.luajit.org"; + maintainers = with maintainers; [ flosse ]; + }; + }; + luaexpat = buildLuaPackage rec { version = "1.3.0"; name = "expat-${version}"; diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index a709eb65419a..75694d51655e 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -157,23 +157,23 @@ ]; passthru.names = [ "accepts" ]; }; - by-spec."accepts"."~1.1.0" = - self.by-version."accepts"."1.1.1"; - by-version."accepts"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "accepts-1.1.1"; + by-spec."accepts"."~1.1.2" = + self.by-version."accepts"."1.1.2"; + by-version."accepts"."1.1.2" = lib.makeOverridable self.buildNodePackage { + name = "accepts-1.1.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.1.1.tgz"; - name = "accepts-1.1.1.tgz"; - sha1 = "3b40bf6abc3fe3bc004534f4672ae1efd0063a96"; + url = "http://registry.npmjs.org/accepts/-/accepts-1.1.2.tgz"; + name = "accepts-1.1.2.tgz"; + sha1 = "8469a0a0a215b50cb0d156d351662f8978b00876"; }) ]; buildInputs = (self.nativeDeps."accepts" or []); deps = { "mime-types-2.0.2" = self.by-version."mime-types"."2.0.2"; - "negotiator-0.4.8" = self.by-version."negotiator"."0.4.8"; + "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9"; }; peerDependencies = [ ]; @@ -490,7 +490,7 @@ "glob-3.2.11" = self.by-version."glob"."3.2.11"; "lazystream-0.1.0" = self.by-version."lazystream"."0.1.0"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; + "readable-stream-1.0.33-1" = self.by-version."readable-stream"."1.0.33-1"; "tar-stream-0.4.7" = self.by-version."tar-stream"."0.4.7"; "zip-stream-0.4.1" = self.by-version."zip-stream"."0.4.1"; }; @@ -498,7 +498,7 @@ ]; passthru.names = [ "archiver" ]; }; - by-spec."archy"."0" = + by-spec."archy"."0.0.2" = self.by-version."archy"."0.0.2"; by-version."archy"."0.0.2" = lib.makeOverridable self.buildNodePackage { name = "archy-0.0.2"; @@ -518,10 +518,28 @@ ]; passthru.names = [ "archy" ]; }; - by-spec."archy"."0.0.2" = - self.by-version."archy"."0.0.2"; by-spec."archy"."^0.0.2" = self.by-version."archy"."0.0.2"; + by-spec."archy"."~1.0.0" = + self.by-version."archy"."1.0.0"; + by-version."archy"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "archy-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/archy/-/archy-1.0.0.tgz"; + name = "archy-1.0.0.tgz"; + sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"; + }) + ]; + buildInputs = + (self.nativeDeps."archy" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "archy" ]; + }; by-spec."argparse"."0.1.15" = self.by-version."argparse"."0.1.15"; by-version."argparse"."0.1.15" = lib.makeOverridable self.buildNodePackage { @@ -626,6 +644,8 @@ ]; passthru.names = [ "asap" ]; }; + by-spec."asap"."~1.0.0" = + self.by-version."asap"."1.0.0"; by-spec."ascii-json"."~0.2" = self.by-version."ascii-json"."0.2.0"; by-version."ascii-json"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -936,21 +956,20 @@ passthru.names = [ "async-some" ]; }; by-spec."aws-sdk"."*" = - self.by-version."aws-sdk"."2.0.18"; - by-version."aws-sdk"."2.0.18" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-2.0.18"; + self.by-version."aws-sdk"."2.0.21"; + by-version."aws-sdk"."2.0.21" = lib.makeOverridable self.buildNodePackage { + name = "aws-sdk-2.0.21"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.18.tgz"; - name = "aws-sdk-2.0.18.tgz"; - sha1 = "aea83ffff08de9dd167f785d04b463025078c790"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.21.tgz"; + name = "aws-sdk-2.0.21.tgz"; + sha1 = "aece051188e5d4a13f2432eb1d00f9dd9a81ef54"; }) ]; buildInputs = (self.nativeDeps."aws-sdk" or []); deps = { - "aws-sdk-apis-3.1.9" = self.by-version."aws-sdk-apis"."3.1.9"; "xml2js-0.2.6" = self.by-version."xml2js"."0.2.6"; "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2"; }; @@ -958,7 +977,7 @@ ]; passthru.names = [ "aws-sdk" ]; }; - "aws-sdk" = self.by-version."aws-sdk"."2.0.18"; + "aws-sdk" = self.by-version."aws-sdk"."2.0.21"; by-spec."aws-sdk".">=1.2.0 <2" = self.by-version."aws-sdk"."1.18.0"; by-version."aws-sdk"."1.18.0" = lib.makeOverridable self.buildNodePackage { @@ -981,26 +1000,6 @@ ]; passthru.names = [ "aws-sdk" ]; }; - by-spec."aws-sdk-apis".">=3.1.0 <4.0.0" = - self.by-version."aws-sdk-apis"."3.1.9"; - by-version."aws-sdk-apis"."3.1.9" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-apis-3.1.9"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/aws-sdk-apis/-/aws-sdk-apis-3.1.9.tgz"; - name = "aws-sdk-apis-3.1.9.tgz"; - sha1 = "abd017548bb9eab0472d3c729d512aba3fc16a67"; - }) - ]; - buildInputs = - (self.nativeDeps."aws-sdk-apis" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "aws-sdk-apis" ]; - }; by-spec."aws-sign"."~0.2.0" = self.by-version."aws-sign"."0.2.0"; by-version."aws-sign"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -1389,7 +1388,7 @@ buildInputs = (self.nativeDeps."bl" or []); deps = { - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; + "readable-stream-1.0.33-1" = self.by-version."readable-stream"."1.0.33-1"; }; peerDependencies = [ ]; @@ -1421,15 +1420,15 @@ by-spec."block-stream"."0.0.7" = self.by-version."block-stream"."0.0.7"; by-spec."bluebird".">= 1.2.1" = - self.by-version."bluebird"."2.3.5"; - by-version."bluebird"."2.3.5" = lib.makeOverridable self.buildNodePackage { - name = "bluebird-2.3.5"; + self.by-version."bluebird"."2.3.6"; + by-version."bluebird"."2.3.6" = lib.makeOverridable self.buildNodePackage { + name = "bluebird-2.3.6"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/bluebird/-/bluebird-2.3.5.tgz"; - name = "bluebird-2.3.5.tgz"; - sha1 = "551366d041fdd09030109c2cab990ec444bf78b6"; + url = "http://registry.npmjs.org/bluebird/-/bluebird-2.3.6.tgz"; + name = "bluebird-2.3.6.tgz"; + sha1 = "aa090a29c1bfbc01089609358f4b1c37683515f9"; }) ]; buildInputs = @@ -1488,23 +1487,23 @@ ]; passthru.names = [ "body-parser" ]; }; - by-spec."body-parser"."~1.8.4" = - self.by-version."body-parser"."1.8.4"; - by-version."body-parser"."1.8.4" = lib.makeOverridable self.buildNodePackage { - name = "body-parser-1.8.4"; + by-spec."body-parser"."~1.9.0" = + self.by-version."body-parser"."1.9.0"; + by-version."body-parser"."1.9.0" = lib.makeOverridable self.buildNodePackage { + name = "body-parser-1.9.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/body-parser/-/body-parser-1.8.4.tgz"; - name = "body-parser-1.8.4.tgz"; - sha1 = "d497e04bc13b3f9a8bd8c70bb0cdc16f2e028898"; + url = "http://registry.npmjs.org/body-parser/-/body-parser-1.9.0.tgz"; + name = "body-parser-1.9.0.tgz"; + sha1 = "95d72943b1a4f67f56bbac9e0dcc837b68703605"; }) ]; buildInputs = (self.nativeDeps."body-parser" or []); deps = { "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; - "depd-0.4.5" = self.by-version."depd"."0.4.5"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; "iconv-lite-0.4.4" = self.by-version."iconv-lite"."0.4.4"; "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0"; @@ -1587,7 +1586,7 @@ "fstream-1.0.2" = self.by-version."fstream"."1.0.2"; "fstream-ignore-1.0.1" = self.by-version."fstream-ignore"."1.0.1"; "glob-4.0.6" = self.by-version."glob"."4.0.6"; - "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; "handlebars-2.0.0" = self.by-version."handlebars"."2.0.0"; "inquirer-0.7.1" = self.by-version."inquirer"."0.7.1"; "insight-0.4.3" = self.by-version."insight"."0.4.3"; @@ -1952,7 +1951,7 @@ (self.nativeDeps."browserchannel" or []); deps = { "hat-0.0.3" = self.by-version."hat"."0.0.3"; - "connect-2.26.4" = self.by-version."connect"."2.26.4"; + "connect-2.27.0" = self.by-version."connect"."2.27.0"; "request-2.45.0" = self.by-version."request"."2.45.0"; "ascii-json-0.2.0" = self.by-version."ascii-json"."0.2.0"; }; @@ -1962,15 +1961,15 @@ }; "browserchannel" = self.by-version."browserchannel"."2.0.0"; by-spec."browserify"."*" = - self.by-version."browserify"."6.0.2"; - by-version."browserify"."6.0.2" = lib.makeOverridable self.buildNodePackage { - name = "browserify-6.0.2"; + self.by-version."browserify"."6.1.0"; + by-version."browserify"."6.1.0" = lib.makeOverridable self.buildNodePackage { + name = "browserify-6.1.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/browserify/-/browserify-6.0.2.tgz"; - name = "browserify-6.0.2.tgz"; - sha1 = "d6dd7a9f9e909f2e84163e544a9d1f358ddd9d58"; + url = "http://registry.npmjs.org/browserify/-/browserify-6.1.0.tgz"; + name = "browserify-6.1.0.tgz"; + sha1 = "8da16d98a0be638b5e53d1cd560f7f344d238cdb"; }) ]; buildInputs = @@ -1987,11 +1986,11 @@ "concat-stream-1.4.6" = self.by-version."concat-stream"."1.4.6"; "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0"; "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1"; - "crypto-browserify-3.2.6" = self.by-version."crypto-browserify"."3.2.6"; + "crypto-browserify-3.2.8" = self.by-version."crypto-browserify"."3.2.8"; "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1"; "defined-0.0.0" = self.by-version."defined"."0.0.0"; "deps-sort-1.3.5" = self.by-version."deps-sort"."1.3.5"; - "domain-browser-1.1.2" = self.by-version."domain-browser"."1.1.2"; + "domain-browser-1.1.3" = self.by-version."domain-browser"."1.1.3"; "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2"; "events-1.0.2" = self.by-version."events"."1.0.2"; "glob-4.0.6" = self.by-version."glob"."4.0.6"; @@ -2007,7 +2006,7 @@ "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0"; "process-0.8.0" = self.by-version."process"."0.8.0"; "punycode-1.2.4" = self.by-version."punycode"."1.2.4"; - "querystring-es3-0.2.1-0" = self.by-version."querystring-es3"."0.2.1-0"; + "querystring-es3-0.2.1" = self.by-version."querystring-es3"."0.2.1"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; "resolve-0.7.4" = self.by-version."resolve"."0.7.4"; "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1"; @@ -2030,7 +2029,7 @@ ]; passthru.names = [ "browserify" ]; }; - "browserify" = self.by-version."browserify"."6.0.2"; + "browserify" = self.by-version."browserify"."6.1.0"; by-spec."browserify-zlib"."^0.1.4" = self.by-version."browserify-zlib"."0.1.4"; by-version."browserify-zlib"."0.1.4" = lib.makeOverridable self.buildNodePackage { @@ -2693,22 +2692,22 @@ by-spec."chmodr"."~0.1.0" = self.by-version."chmodr"."0.1.0"; by-spec."chokidar".">=0.8.2" = - self.by-version."chokidar"."0.9.0"; - by-version."chokidar"."0.9.0" = lib.makeOverridable self.buildNodePackage { - name = "chokidar-0.9.0"; + self.by-version."chokidar"."0.10.1"; + by-version."chokidar"."0.10.1" = lib.makeOverridable self.buildNodePackage { + name = "chokidar-0.10.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/chokidar/-/chokidar-0.9.0.tgz"; - name = "chokidar-0.9.0.tgz"; - sha1 = "c1ae41561dbdb89dd5fac615453d20b48a946c2f"; + url = "http://registry.npmjs.org/chokidar/-/chokidar-0.10.1.tgz"; + name = "chokidar-0.10.1.tgz"; + sha1 = "ec2b4e9910c75a2b2e09ff5fdf283029b73af199"; }) ]; buildInputs = (self.nativeDeps."chokidar" or []); deps = { "fsevents-0.3.0" = self.by-version."fsevents"."0.3.0"; - "recursive-readdir-0.0.2" = self.by-version."recursive-readdir"."0.0.2"; + "readdirp-1.1.0" = self.by-version."readdirp"."1.1.0"; }; peerDependencies = [ ]; @@ -2758,15 +2757,15 @@ by-spec."clean-css"."~2.2.0" = self.by-version."clean-css"."2.2.16"; by-spec."cli"."0.6.x" = - self.by-version."cli"."0.6.4"; - by-version."cli"."0.6.4" = lib.makeOverridable self.buildNodePackage { - name = "cli-0.6.4"; + self.by-version."cli"."0.6.5"; + by-version."cli"."0.6.5" = lib.makeOverridable self.buildNodePackage { + name = "cli-0.6.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/cli/-/cli-0.6.4.tgz"; - name = "cli-0.6.4.tgz"; - sha1 = "105c4e9b29ecdbc1ee0c8e418276f62d8351f88e"; + url = "http://registry.npmjs.org/cli/-/cli-0.6.5.tgz"; + name = "cli-0.6.5.tgz"; + sha1 = "f4edda12dfa8d56d726b43b0b558e089b0d2a85c"; }) ]; buildInputs = @@ -2796,7 +2795,7 @@ deps = { "d-0.1.1" = self.by-version."d"."0.1.1"; "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4"; - "memoizee-0.3.7" = self.by-version."memoizee"."0.3.7"; + "memoizee-0.3.8" = self.by-version."memoizee"."0.3.8"; "timers-ext-0.1.0" = self.by-version."timers-ext"."0.1.0"; }; peerDependencies = [ @@ -2843,7 +2842,7 @@ deps = { "colors-0.6.2" = self.by-version."colors"."0.6.2"; "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; - "winston-0.8.0" = self.by-version."winston"."0.8.0"; + "winston-0.8.1" = self.by-version."winston"."0.8.1"; }; peerDependencies = [ ]; @@ -2966,7 +2965,7 @@ buildInputs = (self.nativeDeps."cmd-shim" or []); deps = { - "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; }; peerDependencies = [ @@ -3111,21 +3110,21 @@ passthru.names = [ "collections" ]; }; by-spec."color"."~0.7.1" = - self.by-version."color"."0.7.1"; - by-version."color"."0.7.1" = lib.makeOverridable self.buildNodePackage { - name = "color-0.7.1"; + self.by-version."color"."0.7.3"; + by-version."color"."0.7.3" = lib.makeOverridable self.buildNodePackage { + name = "color-0.7.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/color/-/color-0.7.1.tgz"; - name = "color-0.7.1.tgz"; - sha1 = "a2676f19c6ccb708b7586dc98b5c6e37dc9a199c"; + url = "http://registry.npmjs.org/color/-/color-0.7.3.tgz"; + name = "color-0.7.3.tgz"; + sha1 = "ab3ae4bc6cb8cfadb5d749c40f34aea088104f89"; }) ]; buildInputs = (self.nativeDeps."color" or []); deps = { - "color-convert-0.5.0" = self.by-version."color-convert"."0.5.0"; + "color-convert-0.5.2" = self.by-version."color-convert"."0.5.2"; "color-string-0.2.1" = self.by-version."color-string"."0.2.1"; }; peerDependencies = [ @@ -3133,15 +3132,15 @@ passthru.names = [ "color" ]; }; by-spec."color-convert"."0.5.x" = - self.by-version."color-convert"."0.5.0"; - by-version."color-convert"."0.5.0" = lib.makeOverridable self.buildNodePackage { - name = "color-convert-0.5.0"; + self.by-version."color-convert"."0.5.2"; + by-version."color-convert"."0.5.2" = lib.makeOverridable self.buildNodePackage { + name = "color-convert-0.5.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/color-convert/-/color-convert-0.5.0.tgz"; - name = "color-convert-0.5.0.tgz"; - sha1 = "4032cab2128c81670c7b394d77b6783f49caaaf7"; + url = "http://registry.npmjs.org/color-convert/-/color-convert-0.5.2.tgz"; + name = "color-convert-0.5.2.tgz"; + sha1 = "febd9efc33674df3374ff8eeaec3bc56c79a9b35"; }) ]; buildInputs = @@ -3167,7 +3166,7 @@ buildInputs = (self.nativeDeps."color-string" or []); deps = { - "color-convert-0.5.0" = self.by-version."color-convert"."0.5.0"; + "color-convert-0.5.2" = self.by-version."color-convert"."0.5.2"; }; peerDependencies = [ ]; @@ -3405,7 +3404,7 @@ ]; passthru.names = [ "commander" ]; }; - by-spec."commander"."2.x" = + by-spec."commander"."2.3.0" = self.by-version."commander"."2.3.0"; by-version."commander"."2.3.0" = lib.makeOverridable self.buildNodePackage { name = "commander-2.3.0"; @@ -3425,6 +3424,26 @@ ]; passthru.names = [ "commander" ]; }; + by-spec."commander"."2.x" = + self.by-version."commander"."2.4.0"; + by-version."commander"."2.4.0" = lib.makeOverridable self.buildNodePackage { + name = "commander-2.4.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.4.0.tgz"; + name = "commander-2.4.0.tgz"; + sha1 = "fad884ce8f09509b10a5ec931332cb97786e2fd6"; + }) + ]; + buildInputs = + (self.nativeDeps."commander" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "commander" ]; + }; by-spec."commander"."~2.0.0" = self.by-version."commander"."2.0.0"; by-spec."commander"."~2.1.0" = @@ -3486,13 +3505,13 @@ deps = { "buffer-crc32-0.2.3" = self.by-version."buffer-crc32"."0.2.3"; "crc32-stream-0.3.1" = self.by-version."crc32-stream"."0.3.1"; - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; + "readable-stream-1.0.33-1" = self.by-version."readable-stream"."1.0.33-1"; }; peerDependencies = [ ]; passthru.names = [ "compress-commons" ]; }; - by-spec."compressible"."~2.0.0" = + by-spec."compressible"."~2.0.1" = self.by-version."compressible"."2.0.1"; by-version."compressible"."2.0.1" = lib.makeOverridable self.buildNodePackage { name = "compressible-2.0.1"; @@ -3507,31 +3526,31 @@ buildInputs = (self.nativeDeps."compressible" or []); deps = { - "mime-db-1.1.0" = self.by-version."mime-db"."1.1.0"; + "mime-db-1.1.1" = self.by-version."mime-db"."1.1.1"; }; peerDependencies = [ ]; passthru.names = [ "compressible" ]; }; - by-spec."compression"."~1.1.0" = - self.by-version."compression"."1.1.0"; - by-version."compression"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "compression-1.1.0"; + by-spec."compression"."~1.2.0" = + self.by-version."compression"."1.2.0"; + by-version."compression"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "compression-1.2.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/compression/-/compression-1.1.0.tgz"; - name = "compression-1.1.0.tgz"; - sha1 = "58243eded272fc531d7c744d8e8daa7cc0b99215"; + url = "http://registry.npmjs.org/compression/-/compression-1.2.0.tgz"; + name = "compression-1.2.0.tgz"; + sha1 = "c6951ca9ad90588ada7617da693c6bbbe8736866"; }) ]; buildInputs = (self.nativeDeps."compression" or []); deps = { - "accepts-1.1.1" = self.by-version."accepts"."1.1.1"; + "accepts-1.1.2" = self.by-version."accepts"."1.1.2"; "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; "compressible-2.0.1" = self.by-version."compressible"."2.0.1"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; }; @@ -3628,7 +3647,7 @@ buildInputs = (self.nativeDeps."configstore" or []); deps = { - "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; "js-yaml-3.0.2" = self.by-version."js-yaml"."3.0.2"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "object-assign-0.3.1" = self.by-version."object-assign"."0.3.1"; @@ -3688,7 +3707,7 @@ "fresh-0.2.0" = self.by-version."fresh"."0.2.0"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; "uid2-0.0.3" = self.by-version."uid2"."0.0.3"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; "methods-0.0.1" = self.by-version."methods"."0.0.1"; "raw-body-0.0.3" = self.by-version."raw-body"."0.0.3"; "negotiator-0.3.0" = self.by-version."negotiator"."0.3.0"; @@ -3698,48 +3717,50 @@ ]; passthru.names = [ "connect" ]; }; - by-spec."connect"."2.26.4" = - self.by-version."connect"."2.26.4"; - by-version."connect"."2.26.4" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.26.4"; + by-spec."connect"."2.27.0" = + self.by-version."connect"."2.27.0"; + by-version."connect"."2.27.0" = lib.makeOverridable self.buildNodePackage { + name = "connect-2.27.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.26.4.tgz"; - name = "connect-2.26.4.tgz"; - sha1 = "1ad3477cb90e590f1778ac17b51475af376bece0"; + url = "http://registry.npmjs.org/connect/-/connect-2.27.0.tgz"; + name = "connect-2.27.0.tgz"; + sha1 = "04a2922c7cbe12455c9466f93bd719c37c433dfa"; }) ]; buildInputs = (self.nativeDeps."connect" or []); deps = { "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0"; - "body-parser-1.8.4" = self.by-version."body-parser"."1.8.4"; + "body-parser-1.9.0" = self.by-version."body-parser"."1.9.0"; "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "cookie-parser-1.3.3" = self.by-version."cookie-parser"."1.3.3"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; - "compression-1.1.0" = self.by-version."compression"."1.1.0"; - "connect-timeout-1.3.0" = self.by-version."connect-timeout"."1.3.0"; - "csurf-1.6.1" = self.by-version."csurf"."1.6.1"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; - "depd-0.4.5" = self.by-version."depd"."0.4.5"; - "errorhandler-1.2.0" = self.by-version."errorhandler"."1.2.0"; - "express-session-1.8.2" = self.by-version."express-session"."1.8.2"; - "finalhandler-0.2.0" = self.by-version."finalhandler"."0.2.0"; + "compression-1.2.0" = self.by-version."compression"."1.2.0"; + "connect-timeout-1.4.0" = self.by-version."connect-timeout"."1.4.0"; + "csurf-1.6.2" = self.by-version."csurf"."1.6.2"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "errorhandler-1.2.2" = self.by-version."errorhandler"."1.2.2"; + "express-session-1.9.0" = self.by-version."express-session"."1.9.0"; + "finalhandler-0.3.1" = self.by-version."finalhandler"."0.3.1"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "http-errors-1.2.7" = self.by-version."http-errors"."1.2.7"; "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "method-override-2.2.0" = self.by-version."method-override"."2.2.0"; - "morgan-1.3.2" = self.by-version."morgan"."1.3.2"; + "method-override-2.3.0" = self.by-version."method-override"."2.3.0"; + "morgan-1.4.0" = self.by-version."morgan"."1.4.0"; "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2"; "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; "qs-2.2.4" = self.by-version."qs"."2.2.4"; - "response-time-2.0.1" = self.by-version."response-time"."2.0.1"; - "serve-favicon-2.1.5" = self.by-version."serve-favicon"."2.1.5"; - "serve-index-1.2.1" = self.by-version."serve-index"."1.2.1"; - "serve-static-1.6.3" = self.by-version."serve-static"."1.6.3"; + "response-time-2.2.0" = self.by-version."response-time"."2.2.0"; + "serve-favicon-2.1.6" = self.by-version."serve-favicon"."2.1.6"; + "serve-index-1.5.0" = self.by-version."serve-index"."1.5.0"; + "serve-static-1.7.0" = self.by-version."serve-static"."1.7.0"; "type-is-1.5.2" = self.by-version."type-is"."1.5.2"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; "vhost-3.0.0" = self.by-version."vhost"."3.0.0"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; }; @@ -3769,7 +3790,7 @@ "bytes-0.1.0" = self.by-version."bytes"."0.1.0"; "send-0.0.3" = self.by-version."send"."0.0.3"; "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; }; peerDependencies = [ ]; @@ -3799,7 +3820,7 @@ "bytes-0.2.0" = self.by-version."bytes"."0.2.0"; "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; }; peerDependencies = [ ]; @@ -3829,14 +3850,14 @@ "bytes-0.2.0" = self.by-version."bytes"."0.2.0"; "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; }; peerDependencies = [ ]; passthru.names = [ "connect" ]; }; by-spec."connect"."~2" = - self.by-version."connect"."2.26.4"; + self.by-version."connect"."2.27.0"; by-spec."connect"."~2.12.0" = self.by-version."connect"."2.12.0"; by-version."connect"."2.12.0" = lib.makeOverridable self.buildNodePackage { @@ -3957,22 +3978,23 @@ passthru.names = [ "connect-mongo" ]; }; "connect-mongo" = self.by-version."connect-mongo"."0.4.1"; - by-spec."connect-timeout"."~1.3.0" = - self.by-version."connect-timeout"."1.3.0"; - by-version."connect-timeout"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "connect-timeout-1.3.0"; + by-spec."connect-timeout"."~1.4.0" = + self.by-version."connect-timeout"."1.4.0"; + by-version."connect-timeout"."1.4.0" = lib.makeOverridable self.buildNodePackage { + name = "connect-timeout-1.4.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.3.0.tgz"; - name = "connect-timeout-1.3.0.tgz"; - sha1 = "d9d1d2df2900d490ed54190809f37e6b4508a1ec"; + url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.4.0.tgz"; + name = "connect-timeout-1.4.0.tgz"; + sha1 = "b8003ea155abd18bbdd8a19c91e5284ddc2e465e"; }) ]; buildInputs = (self.nativeDeps."connect-timeout" or []); deps = { - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "http-errors-1.2.7" = self.by-version."http-errors"."1.2.7"; "ms-0.6.2" = self.by-version."ms"."0.6.2"; "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; }; @@ -4087,6 +4109,26 @@ ]; passthru.names = [ "constants-browserify" ]; }; + by-spec."content-disposition"."0.5.0" = + self.by-version."content-disposition"."0.5.0"; + by-version."content-disposition"."0.5.0" = lib.makeOverridable self.buildNodePackage { + name = "content-disposition-0.5.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; + name = "content-disposition-0.5.0.tgz"; + sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; + }) + ]; + buildInputs = + (self.nativeDeps."content-disposition" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "content-disposition" ]; + }; by-spec."convert-source-map"."~0.3.0" = self.by-version."convert-source-map"."0.3.5"; by-version."convert-source-map"."0.3.5" = lib.makeOverridable self.buildNodePackage { @@ -4533,7 +4575,7 @@ buildInputs = (self.nativeDeps."crc32-stream" or []); deps = { - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; + "readable-stream-1.0.33-1" = self.by-version."readable-stream"."1.0.33-1"; "buffer-crc32-0.2.3" = self.by-version."buffer-crc32"."0.2.3"; }; peerDependencies = [ @@ -4624,15 +4666,15 @@ passthru.names = [ "crypto" ]; }; by-spec."crypto-browserify"."^3.0.0" = - self.by-version."crypto-browserify"."3.2.6"; - by-version."crypto-browserify"."3.2.6" = lib.makeOverridable self.buildNodePackage { - name = "crypto-browserify-3.2.6"; + self.by-version."crypto-browserify"."3.2.8"; + by-version."crypto-browserify"."3.2.8" = lib.makeOverridable self.buildNodePackage { + name = "crypto-browserify-3.2.8"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.6.tgz"; - name = "crypto-browserify-3.2.6.tgz"; - sha1 = "e65a44893ad85138dbf0eaf515675adfd917cdb4"; + url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.8.tgz"; + name = "crypto-browserify-3.2.8.tgz"; + sha1 = "b9b11dbe6d9651dd882a01e6cc467df718ecf189"; }) ]; buildInputs = @@ -4772,16 +4814,16 @@ ]; passthru.names = [ "css-stringify" ]; }; - by-spec."csurf"."~1.6.1" = - self.by-version."csurf"."1.6.1"; - by-version."csurf"."1.6.1" = lib.makeOverridable self.buildNodePackage { - name = "csurf-1.6.1"; + by-spec."csurf"."~1.6.2" = + self.by-version."csurf"."1.6.2"; + by-version."csurf"."1.6.2" = lib.makeOverridable self.buildNodePackage { + name = "csurf-1.6.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/csurf/-/csurf-1.6.1.tgz"; - name = "csurf-1.6.1.tgz"; - sha1 = "78da376f016bcaa48275d553d133585e478f4054"; + url = "http://registry.npmjs.org/csurf/-/csurf-1.6.2.tgz"; + name = "csurf-1.6.2.tgz"; + sha1 = "e732b7478b4bef654337fd8bb363d0422a71d9f1"; }) ]; buildInputs = @@ -4790,6 +4832,7 @@ "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; "csrf-2.0.1" = self.by-version."csrf"."2.0.1"; + "http-errors-1.2.7" = self.by-version."http-errors"."1.2.7"; }; peerDependencies = [ ]; @@ -4981,15 +5024,15 @@ by-spec."dateformat"."~1.0.6" = self.by-version."dateformat"."1.0.8"; by-spec."debug"."*" = - self.by-version."debug"."2.0.0"; - by-version."debug"."2.0.0" = lib.makeOverridable self.buildNodePackage { - name = "debug-2.0.0"; + self.by-version."debug"."2.1.0"; + by-version."debug"."2.1.0" = lib.makeOverridable self.buildNodePackage { + name = "debug-2.1.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz"; - name = "debug-2.0.0.tgz"; - sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef"; + url = "http://registry.npmjs.org/debug/-/debug-2.1.0.tgz"; + name = "debug-2.1.0.tgz"; + sha1 = "33ab915659d8c2cc8a41443d94d6ebd37697ed21"; }) ]; buildInputs = @@ -5062,6 +5105,27 @@ ]; passthru.names = [ "debug" ]; }; + by-spec."debug"."2.0.0" = + self.by-version."debug"."2.0.0"; + by-version."debug"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "debug-2.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz"; + name = "debug-2.0.0.tgz"; + sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef"; + }) + ]; + buildInputs = + (self.nativeDeps."debug" or []); + deps = { + "ms-0.6.2" = self.by-version."ms"."0.6.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "debug" ]; + }; by-spec."debug".">= 0.7.3 < 1" = self.by-version."debug"."0.8.1"; by-version."debug"."0.8.1" = lib.makeOverridable self.buildNodePackage { @@ -5090,6 +5154,8 @@ self.by-version."debug"."1.0.4"; by-spec."debug"."~2.0.0" = self.by-version."debug"."2.0.0"; + by-spec."debug"."~2.1.0" = + self.by-version."debug"."2.1.0"; by-spec."debuglog"."^1.0.1" = self.by-version."debuglog"."1.0.1"; by-version."debuglog"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -5131,7 +5197,7 @@ "touch-0.0.2" = self.by-version."touch"."0.0.2"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; "nopt-2.2.1" = self.by-version."nopt"."2.2.1"; - "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; }; peerDependencies = [ ]; @@ -5346,6 +5412,26 @@ ]; passthru.names = [ "depd" ]; }; + by-spec."depd"."~1.0.0" = + self.by-version."depd"."1.0.0"; + by-version."depd"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "depd-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/depd/-/depd-1.0.0.tgz"; + name = "depd-1.0.0.tgz"; + sha1 = "2fda0d00e98aae2845d4991ab1bf1f2a199073d5"; + }) + ]; + buildInputs = + (self.nativeDeps."depd" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "depd" ]; + }; by-spec."deprecated"."^0.0.1" = self.by-version."deprecated"."0.0.1"; by-version."deprecated"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -5499,7 +5585,7 @@ ]; passthru.names = [ "diff" ]; }; - by-spec."diff"."~1.0.3" = + by-spec."diff"."1.0.8" = self.by-version."diff"."1.0.8"; by-version."diff"."1.0.8" = lib.makeOverridable self.buildNodePackage { name = "diff-1.0.8"; @@ -5519,6 +5605,8 @@ ]; passthru.names = [ "diff" ]; }; + by-spec."diff"."~1.0.3" = + self.by-version."diff"."1.0.8"; by-spec."diff"."~1.0.7" = self.by-version."diff"."1.0.8"; by-spec."director"."1.1.10" = @@ -5584,15 +5672,15 @@ passthru.names = [ "dkim-signer" ]; }; by-spec."domain-browser"."~1.1.0" = - self.by-version."domain-browser"."1.1.2"; - by-version."domain-browser"."1.1.2" = lib.makeOverridable self.buildNodePackage { - name = "domain-browser-1.1.2"; + self.by-version."domain-browser"."1.1.3"; + by-version."domain-browser"."1.1.3" = lib.makeOverridable self.buildNodePackage { + name = "domain-browser-1.1.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.2.tgz"; - name = "domain-browser-1.1.2.tgz"; - sha1 = "5a21f30a29a9891533915061426974dc2f14e56b"; + url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.3.tgz"; + name = "domain-browser-1.1.3.tgz"; + sha1 = "ee8b336f1c53dc990b302eac12b4c7fee24923c1"; }) ]; buildInputs = @@ -5811,15 +5899,15 @@ passthru.names = [ "emitter-component" ]; }; by-spec."encoding"."~0.1.7" = - self.by-version."encoding"."0.1.8"; - by-version."encoding"."0.1.8" = lib.makeOverridable self.buildNodePackage { - name = "encoding-0.1.8"; + self.by-version."encoding"."0.1.10"; + by-version."encoding"."0.1.10" = lib.makeOverridable self.buildNodePackage { + name = "encoding-0.1.10"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/encoding/-/encoding-0.1.8.tgz"; - name = "encoding-0.1.8.tgz"; - sha1 = "3c48d355f6f4da0545de88c6f2673ccf70df11e7"; + url = "http://registry.npmjs.org/encoding/-/encoding-0.1.10.tgz"; + name = "encoding-0.1.10.tgz"; + sha1 = "4463122033a7e3fdae4e81bf306f675dd8e4612c"; }) ]; buildInputs = @@ -5914,16 +6002,16 @@ ]; passthru.names = [ "entities" ]; }; - by-spec."envify"."^2.0.0" = - self.by-version."envify"."2.0.1"; - by-version."envify"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "envify-2.0.1"; + by-spec."envify"."^3.0.0" = + self.by-version."envify"."3.0.0"; + by-version."envify"."3.0.0" = lib.makeOverridable self.buildNodePackage { + name = "envify-3.0.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/envify/-/envify-2.0.1.tgz"; - name = "envify-2.0.1.tgz"; - sha1 = "abab827e063efd8e6f4d485aa82b66688dd056b2"; + url = "http://registry.npmjs.org/envify/-/envify-3.0.0.tgz"; + name = "envify-3.0.0.tgz"; + sha1 = "af81202306f69df13845d0bfcb25a19abcb5f510"; }) ]; buildInputs = @@ -5931,29 +6019,29 @@ deps = { "xtend-2.1.2" = self.by-version."xtend"."2.1.2"; "through-2.3.6" = self.by-version."through"."2.3.6"; - "esprima-fb-3001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"; - "jstransform-3.0.0" = self.by-version."jstransform"."3.0.0"; + "esprima-fb-4001.3001.0-dev-harmony-fb" = self.by-version."esprima-fb"."4001.3001.0-dev-harmony-fb"; + "jstransform-6.3.2" = self.by-version."jstransform"."6.3.2"; }; peerDependencies = [ ]; passthru.names = [ "envify" ]; }; - by-spec."errorhandler"."~1.2.0" = - self.by-version."errorhandler"."1.2.0"; - by-version."errorhandler"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "errorhandler-1.2.0"; + by-spec."errorhandler"."~1.2.2" = + self.by-version."errorhandler"."1.2.2"; + by-version."errorhandler"."1.2.2" = lib.makeOverridable self.buildNodePackage { + name = "errorhandler-1.2.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.2.0.tgz"; - name = "errorhandler-1.2.0.tgz"; - sha1 = "2f89db72c150580c65e8dd5180504f5b8a398bd9"; + url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.2.2.tgz"; + name = "errorhandler-1.2.2.tgz"; + sha1 = "be0249eee868cf21649648e346da8899d0195984"; }) ]; buildInputs = (self.nativeDeps."errorhandler" or []); deps = { - "accepts-1.1.1" = self.by-version."accepts"."1.1.1"; + "accepts-1.1.2" = self.by-version."accepts"."1.1.2"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; }; peerDependencies = [ @@ -5976,7 +6064,7 @@ (self.nativeDeps."es5-ext" or []); deps = { "es6-iterator-0.1.1" = self.by-version."es6-iterator"."0.1.1"; - "es6-symbol-0.1.0" = self.by-version."es6-symbol"."0.1.0"; + "es6-symbol-0.1.1" = self.by-version."es6-symbol"."0.1.1"; }; peerDependencies = [ ]; @@ -6001,22 +6089,22 @@ deps = { "d-0.1.1" = self.by-version."d"."0.1.1"; "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4"; - "es6-symbol-0.1.0" = self.by-version."es6-symbol"."0.1.0"; + "es6-symbol-0.1.1" = self.by-version."es6-symbol"."0.1.1"; }; peerDependencies = [ ]; passthru.names = [ "es6-iterator" ]; }; by-spec."es6-symbol"."0.1.x" = - self.by-version."es6-symbol"."0.1.0"; - by-version."es6-symbol"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "es6-symbol-0.1.0"; + self.by-version."es6-symbol"."0.1.1"; + by-version."es6-symbol"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "es6-symbol-0.1.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/es6-symbol/-/es6-symbol-0.1.0.tgz"; - name = "es6-symbol-0.1.0.tgz"; - sha1 = "ba5878f37a652f6c713244716fc7b24d61d2dc39"; + url = "http://registry.npmjs.org/es6-symbol/-/es6-symbol-0.1.1.tgz"; + name = "es6-symbol-0.1.1.tgz"; + sha1 = "9cf7fab2edaff1b1da8fe8e68bfe3f5aca6ca218"; }) ]; buildInputs = @@ -6029,6 +6117,30 @@ ]; passthru.names = [ "es6-symbol" ]; }; + by-spec."es6-weak-map"."~0.1.2" = + self.by-version."es6-weak-map"."0.1.2"; + by-version."es6-weak-map"."0.1.2" = lib.makeOverridable self.buildNodePackage { + name = "es6-weak-map-0.1.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/es6-weak-map/-/es6-weak-map-0.1.2.tgz"; + name = "es6-weak-map-0.1.2.tgz"; + sha1 = "bc5b5fab73f68f6f77a6b39c481fce3d7856d385"; + }) + ]; + buildInputs = + (self.nativeDeps."es6-weak-map" or []); + deps = { + "d-0.1.1" = self.by-version."d"."0.1.1"; + "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4"; + "es6-iterator-0.1.1" = self.by-version."es6-iterator"."0.1.1"; + "es6-symbol-0.1.1" = self.by-version."es6-symbol"."0.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "es6-weak-map" ]; + }; by-spec."escape-html"."*" = self.by-version."escape-html"."1.0.1"; by-version."escape-html"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -6052,7 +6164,7 @@ "escape-html" = self.by-version."escape-html"."1.0.1"; by-spec."escape-html"."1.0.1" = self.by-version."escape-html"."1.0.1"; - by-spec."escape-string-regexp"."^1.0.0" = + by-spec."escape-string-regexp"."1.0.2" = self.by-version."escape-string-regexp"."1.0.2"; by-version."escape-string-regexp"."1.0.2" = lib.makeOverridable self.buildNodePackage { name = "escape-string-regexp-1.0.2"; @@ -6072,6 +6184,8 @@ ]; passthru.names = [ "escape-string-regexp" ]; }; + by-spec."escape-string-regexp"."^1.0.0" = + self.by-version."escape-string-regexp"."1.0.2"; by-spec."escodegen"."1.3.x" = self.by-version."escodegen"."1.3.3"; by-version."escodegen"."1.3.3" = lib.makeOverridable self.buildNodePackage { @@ -6160,7 +6274,7 @@ buildInputs = (self.nativeDeps."escope" or []); deps = { - "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1"; + "estraverse-1.7.0" = self.by-version."estraverse"."1.7.0"; }; peerDependencies = [ ]; @@ -6277,8 +6391,46 @@ ]; passthru.names = [ "esprima-fb" ]; }; - by-spec."esprima-fb"."~3001.1.0-dev-harmony-fb" = - self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"; + by-spec."esprima-fb"."^4001.3001.0-dev-harmony-fb" = + self.by-version."esprima-fb"."4001.3001.0-dev-harmony-fb"; + by-version."esprima-fb"."4001.3001.0-dev-harmony-fb" = lib.makeOverridable self.buildNodePackage { + name = "esprima-fb-4001.3001.0-dev-harmony-fb"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-4001.3001.0-dev-harmony-fb.tgz"; + name = "esprima-fb-4001.3001.0-dev-harmony-fb.tgz"; + sha1 = "659f1f5dc87f2f474db234a7db2a1b6c3e40af14"; + }) + ]; + buildInputs = + (self.nativeDeps."esprima-fb" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "esprima-fb" ]; + }; + by-spec."esprima-fb"."~6001.1.0-dev-harmony-fb" = + self.by-version."esprima-fb"."6001.1.0-dev-harmony-fb"; + by-version."esprima-fb"."6001.1.0-dev-harmony-fb" = lib.makeOverridable self.buildNodePackage { + name = "esprima-fb-6001.1.0-dev-harmony-fb"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-6001.1.0-dev-harmony-fb.tgz"; + name = "esprima-fb-6001.1.0-dev-harmony-fb.tgz"; + sha1 = "72705de7030b45ca41bbf16400a3636ffa0ca4eb"; + }) + ]; + buildInputs = + (self.nativeDeps."esprima-fb" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "esprima-fb" ]; + }; by-spec."esshorten"."~ 0.0.2" = self.by-version."esshorten"."0.0.2"; by-version."esshorten"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -6302,15 +6454,15 @@ passthru.names = [ "esshorten" ]; }; by-spec."estraverse".">= 0.0.2" = - self.by-version."estraverse"."1.5.1"; - by-version."estraverse"."1.5.1" = lib.makeOverridable self.buildNodePackage { - name = "estraverse-1.5.1"; + self.by-version."estraverse"."1.7.0"; + by-version."estraverse"."1.7.0" = lib.makeOverridable self.buildNodePackage { + name = "estraverse-1.7.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz"; - name = "estraverse-1.5.1.tgz"; - sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"; + url = "http://registry.npmjs.org/estraverse/-/estraverse-1.7.0.tgz"; + name = "estraverse-1.7.0.tgz"; + sha1 = "05dbae27f44ee7cd795e16d118ceff05f1b6a413"; }) ]; buildInputs = @@ -6365,6 +6517,24 @@ self.by-version."estraverse"."1.3.2"; by-spec."estraverse"."~1.5.0" = self.by-version."estraverse"."1.5.1"; + by-version."estraverse"."1.5.1" = lib.makeOverridable self.buildNodePackage { + name = "estraverse-1.5.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz"; + name = "estraverse-1.5.1.tgz"; + sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"; + }) + ]; + buildInputs = + (self.nativeDeps."estraverse" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "estraverse" ]; + }; by-spec."esutils"."~1.0.0" = self.by-version."esutils"."1.0.0"; by-version."esutils"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -6406,6 +6576,27 @@ ]; passthru.names = [ "etag" ]; }; + by-spec."etag"."~1.5.0" = + self.by-version."etag"."1.5.0"; + by-version."etag"."1.5.0" = lib.makeOverridable self.buildNodePackage { + name = "etag-1.5.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/etag/-/etag-1.5.0.tgz"; + name = "etag-1.5.0.tgz"; + sha1 = "8ca0f7a30b4b7305f034e8902fb8ec3c321491e4"; + }) + ]; + buildInputs = + (self.nativeDeps."etag" or []); + deps = { + "crc-3.0.0" = self.by-version."crc"."3.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "etag" ]; + }; by-spec."event-emitter"."~0.3.1" = self.by-version."event-emitter"."0.3.1"; by-version."event-emitter"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -6576,7 +6767,7 @@ "node-swt-0.1.1" = self.by-version."node-swt"."0.1.1"; "node-wsfederation-0.1.1" = self.by-version."node-wsfederation"."0.1.1"; "debug-0.5.0" = self.by-version."debug"."0.5.0"; - "express-3.17.6" = self.by-version."express"."3.17.6"; + "express-3.18.0" = self.by-version."express"."3.18.0"; }; peerDependencies = [ ]; @@ -6607,21 +6798,21 @@ by-spec."exit"."~0.1.1" = self.by-version."exit"."0.1.2"; by-spec."express"."*" = - self.by-version."express"."4.9.5"; - by-version."express"."4.9.5" = lib.makeOverridable self.buildNodePackage { - name = "express-4.9.5"; + self.by-version."express"."4.9.8"; + by-version."express"."4.9.8" = lib.makeOverridable self.buildNodePackage { + name = "express-4.9.8"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.9.5.tgz"; - name = "express-4.9.5.tgz"; - sha1 = "7f62aa84ac8f5e96acfb98e2944dde0bf1cf8688"; + url = "http://registry.npmjs.org/express/-/express-4.9.8.tgz"; + name = "express-4.9.8.tgz"; + sha1 = "f360f596baeabbd0e5223b603d6eb578d9d2d10d"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = { - "accepts-1.1.1" = self.by-version."accepts"."1.1.1"; + "accepts-1.1.2" = self.by-version."accepts"."1.1.2"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; "debug-2.0.0" = self.by-version."debug"."2.0.0"; "depd-0.4.5" = self.by-version."depd"."0.4.5"; @@ -6638,7 +6829,7 @@ "qs-2.2.4" = self.by-version."qs"."2.2.4"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; "send-0.9.3" = self.by-version."send"."0.9.3"; - "serve-static-1.6.3" = self.by-version."serve-static"."1.6.3"; + "serve-static-1.6.4" = self.by-version."serve-static"."1.6.4"; "type-is-1.5.2" = self.by-version."type-is"."1.5.2"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; @@ -6649,7 +6840,7 @@ ]; passthru.names = [ "express" ]; }; - "express" = self.by-version."express"."4.9.5"; + "express" = self.by-version."express"."4.9.8"; by-spec."express"."2.5.11" = self.by-version."express"."2.5.11"; by-version."express"."2.5.11" = lib.makeOverridable self.buildNodePackage { @@ -6699,7 +6890,7 @@ "methods-0.0.1" = self.by-version."methods"."0.0.1"; "send-0.1.0" = self.by-version."send"."0.1.0"; "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; }; peerDependencies = [ ]; @@ -6730,35 +6921,36 @@ "methods-0.1.0" = self.by-version."methods"."0.1.0"; "send-0.1.4" = self.by-version."send"."0.1.4"; "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; }; peerDependencies = [ ]; passthru.names = [ "express" ]; }; by-spec."express"."3.x" = - self.by-version."express"."3.17.6"; - by-version."express"."3.17.6" = lib.makeOverridable self.buildNodePackage { - name = "express-3.17.6"; + self.by-version."express"."3.18.0"; + by-version."express"."3.18.0" = lib.makeOverridable self.buildNodePackage { + name = "express-3.18.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.17.6.tgz"; - name = "express-3.17.6.tgz"; - sha1 = "e2f9a6a48b85233afc4f7b6c5cd6799c53f5f46f"; + url = "http://registry.npmjs.org/express/-/express-3.18.0.tgz"; + name = "express-3.18.0.tgz"; + sha1 = "ff1f4ee689ba6e622a087e397994f7c2115c5c57"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = { "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0"; - "connect-2.26.4" = self.by-version."connect"."2.26.4"; + "connect-2.27.0" = self.by-version."connect"."2.27.0"; + "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; "commander-1.3.2" = self.by-version."commander"."1.3.2"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; - "crc-3.0.0" = self.by-version."crc"."3.0.0"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; - "depd-0.4.5" = self.by-version."depd"."0.4.5"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "etag-1.5.0" = self.by-version."etag"."1.5.0"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; "methods-1.1.0" = self.by-version."methods"."1.1.0"; @@ -6766,7 +6958,7 @@ "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; "proxy-addr-1.0.3" = self.by-version."proxy-addr"."1.0.3"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; - "send-0.9.3" = self.by-version."send"."0.9.3"; + "send-0.10.0" = self.by-version."send"."0.10.0"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; @@ -6776,7 +6968,7 @@ passthru.names = [ "express" ]; }; by-spec."express".">=3.0.0" = - self.by-version."express"."4.9.5"; + self.by-version."express"."4.9.8"; by-spec."express"."~3.1.1" = self.by-version."express"."3.1.2"; by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage { @@ -6802,7 +6994,7 @@ "methods-0.0.1" = self.by-version."methods"."0.0.1"; "send-0.1.0" = self.by-version."send"."0.1.0"; "cookie-signature-1.0.0" = self.by-version."cookie-signature"."1.0.0"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; }; peerDependencies = [ ]; @@ -6907,7 +7099,7 @@ "async-0.7.0" = self.by-version."async"."0.7.0"; }; peerDependencies = [ - self.by-version."express"."4.9.5" + self.by-version."express"."4.9.8" ]; passthru.names = [ "express-form" ]; }; @@ -6961,16 +7153,16 @@ ]; passthru.names = [ "express-session" ]; }; - by-spec."express-session"."~1.8.2" = - self.by-version."express-session"."1.8.2"; - by-version."express-session"."1.8.2" = lib.makeOverridable self.buildNodePackage { - name = "express-session-1.8.2"; + by-spec."express-session"."~1.9.0" = + self.by-version."express-session"."1.9.0"; + by-version."express-session"."1.9.0" = lib.makeOverridable self.buildNodePackage { + name = "express-session-1.9.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/express-session/-/express-session-1.8.2.tgz"; - name = "express-session-1.8.2.tgz"; - sha1 = "c4011e728a2349b3c18f117a5409908985e83483"; + url = "http://registry.npmjs.org/express-session/-/express-session-1.9.0.tgz"; + name = "express-session-1.9.0.tgz"; + sha1 = "75ceb80194e5f3d0c71922e4affb90bc40c119f1"; }) ]; buildInputs = @@ -6979,8 +7171,8 @@ "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; "crc-3.0.0" = self.by-version."crc"."3.0.0"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; - "depd-0.4.5" = self.by-version."depd"."0.4.5"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; "uid-safe-1.0.1" = self.by-version."uid-safe"."1.0.1"; @@ -7202,15 +7394,15 @@ passthru.names = [ "fetch-bower" ]; }; by-spec."fields"."~0.1.11" = - self.by-version."fields"."0.1.16"; - by-version."fields"."0.1.16" = lib.makeOverridable self.buildNodePackage { - name = "fields-0.1.16"; + self.by-version."fields"."0.1.17"; + by-version."fields"."0.1.17" = lib.makeOverridable self.buildNodePackage { + name = "fields-0.1.17"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/fields/-/fields-0.1.16.tgz"; - name = "fields-0.1.16.tgz"; - sha1 = "a6d127f93636050c7407bd7a5e26265f82f58c22"; + url = "http://registry.npmjs.org/fields/-/fields-0.1.17.tgz"; + name = "fields-0.1.17.tgz"; + sha1 = "4d5d87d68f7e6f5b46098546821aa939a248cdbf"; }) ]; buildInputs = @@ -7312,6 +7504,29 @@ ]; passthru.names = [ "finalhandler" ]; }; + by-spec."finalhandler"."0.3.1" = + self.by-version."finalhandler"."0.3.1"; + by-version."finalhandler"."0.3.1" = lib.makeOverridable self.buildNodePackage { + name = "finalhandler-0.3.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.1.tgz"; + name = "finalhandler-0.3.1.tgz"; + sha1 = "ffda7643228678c6b088c89421a8381663961808"; + }) + ]; + buildInputs = + (self.nativeDeps."finalhandler" or []); + deps = { + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "finalhandler" ]; + }; by-spec."findit".">=1.1.0 <2.0.0" = self.by-version."findit"."1.2.0"; by-version."findit"."1.2.0" = lib.makeOverridable self.buildNodePackage { @@ -7376,6 +7591,26 @@ ]; passthru.names = [ "first-chunk-stream" ]; }; + by-spec."flagged-respawn"."~0.3.0" = + self.by-version."flagged-respawn"."0.3.1"; + by-version."flagged-respawn"."0.3.1" = lib.makeOverridable self.buildNodePackage { + name = "flagged-respawn-0.3.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.1.tgz"; + name = "flagged-respawn-0.3.1.tgz"; + sha1 = "397700925df6e12452202a71e89d89545fbbbe9d"; + }) + ]; + buildInputs = + (self.nativeDeps."flagged-respawn" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "flagged-respawn" ]; + }; by-spec."flatiron"."*" = self.by-version."flatiron"."0.4.2"; by-version."flatiron"."0.4.2" = lib.makeOverridable self.buildNodePackage { @@ -7970,7 +8205,7 @@ buildInputs = (self.nativeDeps."fs-vacuum" or []); deps = { - "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; peerDependencies = [ @@ -8014,7 +8249,7 @@ buildInputs = (self.nativeDeps."fs-write-stream-atomic" or []); deps = { - "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; }; peerDependencies = [ ]; @@ -8081,7 +8316,7 @@ buildInputs = (self.nativeDeps."fstream" or []); deps = { - "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; @@ -8107,7 +8342,7 @@ buildInputs = (self.nativeDeps."fstream" or []); deps = { - "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; @@ -8144,15 +8379,15 @@ by-spec."fstream-ignore"."~1.0.1" = self.by-version."fstream-ignore"."1.0.1"; by-spec."fstream-npm"."~1.0.0" = - self.by-version."fstream-npm"."1.0.0"; - by-version."fstream-npm"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "fstream-npm-1.0.0"; + self.by-version."fstream-npm"."1.0.1"; + by-version."fstream-npm"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "fstream-npm-1.0.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-1.0.0.tgz"; - name = "fstream-npm-1.0.0.tgz"; - sha1 = "0262c95c771d393e7cf59fcfeabce621703f3d27"; + url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-1.0.1.tgz"; + name = "fstream-npm-1.0.1.tgz"; + sha1 = "1e35c77f0fa24f5d6367e6d447ae7d6ddb482db2"; }) ]; buildInputs = @@ -8331,7 +8566,7 @@ buildInputs = (self.nativeDeps."glob" or []); deps = { - "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; "once-1.3.1" = self.by-version."once"."1.3.1"; @@ -8432,7 +8667,7 @@ self.by-version."glob"."3.2.11"; by-spec."glob"."~4.0.2" = self.by-version."glob"."4.0.6"; - by-spec."glob"."~4.0.5" = + by-spec."glob"."~4.0.6" = self.by-version."glob"."4.0.6"; by-spec."glob-stream"."^3.1.5" = self.by-version."glob-stream"."3.1.15"; @@ -8454,7 +8689,7 @@ "ordered-read-streams-0.0.8" = self.by-version."ordered-read-streams"."0.0.8"; "glob2base-0.0.11" = self.by-version."glob2base"."0.0.11"; "unique-stream-1.0.0" = self.by-version."unique-stream"."1.0.0"; - "through2-0.6.2" = self.by-version."through2"."0.6.2"; + "through2-0.6.3" = self.by-version."through2"."0.6.3"; }; peerDependencies = [ ]; @@ -8547,15 +8782,15 @@ passthru.names = [ "got" ]; }; by-spec."graceful-fs"."2 || 3" = - self.by-version."graceful-fs"."3.0.3"; - by-version."graceful-fs"."3.0.3" = lib.makeOverridable self.buildNodePackage { - name = "graceful-fs-3.0.3"; + self.by-version."graceful-fs"."3.0.4"; + by-version."graceful-fs"."3.0.4" = lib.makeOverridable self.buildNodePackage { + name = "graceful-fs-3.0.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.3.tgz"; - name = "graceful-fs-3.0.3.tgz"; - sha1 = "277141085e739ae7d54361119a62797b08a1d8c0"; + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.4.tgz"; + name = "graceful-fs-3.0.4.tgz"; + sha1 = "a0306d9b0940e0fc512d33b5df1014e88e0637a3"; }) ]; buildInputs = @@ -8567,13 +8802,13 @@ passthru.names = [ "graceful-fs" ]; }; by-spec."graceful-fs"."3" = - self.by-version."graceful-fs"."3.0.3"; + self.by-version."graceful-fs"."3.0.4"; by-spec."graceful-fs".">3.0.1 <4.0.0-0" = - self.by-version."graceful-fs"."3.0.3"; + self.by-version."graceful-fs"."3.0.4"; by-spec."graceful-fs"."^3.0.0" = - self.by-version."graceful-fs"."3.0.3"; + self.by-version."graceful-fs"."3.0.4"; by-spec."graceful-fs"."^3.0.2" = - self.by-version."graceful-fs"."3.0.3"; + self.by-version."graceful-fs"."3.0.4"; by-spec."graceful-fs"."~1" = self.by-version."graceful-fs"."1.2.3"; by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage { @@ -8619,11 +8854,13 @@ by-spec."graceful-fs"."~2.0.1" = self.by-version."graceful-fs"."2.0.3"; by-spec."graceful-fs"."~3.0.0" = - self.by-version."graceful-fs"."3.0.3"; + self.by-version."graceful-fs"."3.0.4"; by-spec."graceful-fs"."~3.0.1" = - self.by-version."graceful-fs"."3.0.3"; + self.by-version."graceful-fs"."3.0.4"; by-spec."graceful-fs"."~3.0.2" = - self.by-version."graceful-fs"."3.0.3"; + self.by-version."graceful-fs"."3.0.4"; + by-spec."graceful-fs"."~3.0.4" = + self.by-version."graceful-fs"."3.0.4"; by-spec."gridfs-stream"."*" = self.by-version."gridfs-stream"."0.5.1"; by-version."gridfs-stream"."0.5.1" = lib.makeOverridable self.buildNodePackage { @@ -8665,7 +8902,7 @@ ]; passthru.names = [ "growl" ]; }; - by-spec."growl"."1.8.x" = + by-spec."growl"."1.8.1" = self.by-version."growl"."1.8.1"; by-version."growl"."1.8.1" = lib.makeOverridable self.buildNodePackage { name = "growl-1.8.1"; @@ -9006,15 +9243,15 @@ }; "guifi-earth" = self.by-version."guifi-earth"."0.2.1"; by-spec."gulp"."*" = - self.by-version."gulp"."3.8.8"; - by-version."gulp"."3.8.8" = lib.makeOverridable self.buildNodePackage { - name = "gulp-3.8.8"; + self.by-version."gulp"."3.8.9"; + by-version."gulp"."3.8.9" = lib.makeOverridable self.buildNodePackage { + name = "gulp-3.8.9"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/gulp/-/gulp-3.8.8.tgz"; - name = "gulp-3.8.8.tgz"; - sha1 = "0b0473e7cdfd04c785184513938397d4552cfe96"; + url = "http://registry.npmjs.org/gulp/-/gulp-3.8.9.tgz"; + name = "gulp-3.8.9.tgz"; + sha1 = "90773dc79cb0b3087e5443c695b0f5a21548ccce"; }) ]; buildInputs = @@ -9025,19 +9262,20 @@ "deprecated-0.0.1" = self.by-version."deprecated"."0.0.1"; "gulp-util-3.0.1" = self.by-version."gulp-util"."3.0.1"; "interpret-0.3.7" = self.by-version."interpret"."0.3.7"; - "liftoff-0.12.1" = self.by-version."liftoff"."0.12.1"; + "liftoff-0.13.5" = self.by-version."liftoff"."0.13.5"; "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "orchestrator-0.3.7" = self.by-version."orchestrator"."0.3.7"; "pretty-hrtime-0.2.2" = self.by-version."pretty-hrtime"."0.2.2"; "semver-3.0.1" = self.by-version."semver"."3.0.1"; "tildify-1.0.0" = self.by-version."tildify"."1.0.0"; - "vinyl-fs-0.3.8" = self.by-version."vinyl-fs"."0.3.8"; + "v8flags-1.0.1" = self.by-version."v8flags"."1.0.1"; + "vinyl-fs-0.3.10" = self.by-version."vinyl-fs"."0.3.10"; }; peerDependencies = [ ]; passthru.names = [ "gulp" ]; }; - "gulp" = self.by-version."gulp"."3.8.8"; + "gulp" = self.by-version."gulp"."3.8.9"; by-spec."gulp-util"."^3.0.0" = self.by-version."gulp-util"."3.0.1"; by-version."gulp-util"."3.0.1" = lib.makeOverridable self.buildNodePackage { @@ -9060,7 +9298,7 @@ "lodash.template-2.4.1" = self.by-version."lodash.template"."2.4.1"; "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "multipipe-0.1.1" = self.by-version."multipipe"."0.1.1"; - "through2-0.6.2" = self.by-version."through2"."0.6.2"; + "through2-0.6.3" = self.by-version."through2"."0.6.3"; "vinyl-0.4.3" = self.by-version."vinyl"."0.4.3"; }; peerDependencies = [ @@ -9148,7 +9386,7 @@ buildInputs = (self.nativeDeps."gzippo" or []); deps = { - "send-0.9.3" = self.by-version."send"."0.9.3"; + "send-0.10.0" = self.by-version."send"."0.10.0"; }; peerDependencies = [ ]; @@ -9591,6 +9829,30 @@ ]; passthru.names = [ "http-browserify" ]; }; + by-spec."http-errors"."~1.2.6" = + self.by-version."http-errors"."1.2.7"; + by-version."http-errors"."1.2.7" = lib.makeOverridable self.buildNodePackage { + name = "http-errors-1.2.7"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/http-errors/-/http-errors-1.2.7.tgz"; + name = "http-errors-1.2.7.tgz"; + sha1 = "b881fa12c59b0079fd4ced456bf8dbc9610d3b78"; + }) + ]; + buildInputs = + (self.nativeDeps."http-errors" or []); + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "statuses-1.2.0" = self.by-version."statuses"."1.2.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "http-errors" ]; + }; + by-spec."http-errors"."~1.2.7" = + self.by-version."http-errors"."1.2.7"; by-spec."http-proxy"."1.0.2" = self.by-version."http-proxy"."1.0.2"; by-version."http-proxy"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -9832,7 +10094,7 @@ ]; passthru.names = [ "iconv-lite" ]; }; - by-spec."iconv-lite"."~0.4.3" = + by-spec."iconv-lite"."~0.4.4" = self.by-version."iconv-lite"."0.4.4"; by-spec."ieee754"."^1.1.4" = self.by-version."ieee754"."1.1.4"; @@ -9874,7 +10136,7 @@ ]; passthru.names = [ "indexof" ]; }; - by-spec."inflight"."~1.0.3" = + by-spec."inflight"."~1.0.4" = self.by-version."inflight"."1.0.4"; by-version."inflight"."1.0.4" = lib.makeOverridable self.buildNodePackage { name = "inflight-1.0.4"; @@ -9992,26 +10254,8 @@ ]; passthru.names = [ "ini" ]; }; - by-spec."ini"."~1.2.0" = - self.by-version."ini"."1.2.1"; - by-version."ini"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "ini-1.2.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ini/-/ini-1.2.1.tgz"; - name = "ini-1.2.1.tgz"; - sha1 = "7f774e2f22752cd1dacbf9c63323df2a164ebca3"; - }) - ]; - buildInputs = - (self.nativeDeps."ini" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "ini" ]; - }; + by-spec."ini"."~1.3.0" = + self.by-version."ini"."1.3.0"; by-spec."init-package-json"."~1.1.0" = self.by-version."init-package-json"."1.1.0"; by-version."init-package-json"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -10031,7 +10275,7 @@ "promzard-0.2.2" = self.by-version."promzard"."0.2.2"; "read-1.0.5" = self.by-version."read"."1.0.5"; "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; - "semver-4.0.3" = self.by-version."semver"."4.0.3"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; }; peerDependencies = [ ]; @@ -10079,7 +10323,7 @@ "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; "readline2-0.1.0" = self.by-version."readline2"."0.1.0"; - "rx-2.3.12" = self.by-version."rx"."2.3.12"; + "rx-2.3.13" = self.by-version."rx"."2.3.13"; "through-2.3.6" = self.by-version."through"."2.3.6"; }; peerDependencies = [ @@ -10106,7 +10350,7 @@ "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; "readline2-0.1.0" = self.by-version."readline2"."0.1.0"; - "rx-2.3.12" = self.by-version."rx"."2.3.12"; + "rx-2.3.13" = self.by-version."rx"."2.3.13"; "through-2.3.6" = self.by-version."through"."2.3.6"; }; peerDependencies = [ @@ -10264,11 +10508,11 @@ (self.nativeDeps."ironhorse" or []); deps = { "underscore-1.5.2" = self.by-version."underscore"."1.5.2"; - "winston-0.8.0" = self.by-version."winston"."0.8.0"; + "winston-0.8.1" = self.by-version."winston"."0.8.1"; "nconf-0.6.9" = self.by-version."nconf"."0.6.9"; "fs-walk-0.0.1" = self.by-version."fs-walk"."0.0.1"; "async-0.9.0" = self.by-version."async"."0.9.0"; - "express-4.9.5" = self.by-version."express"."4.9.5"; + "express-4.9.8" = self.by-version."express"."4.9.8"; "jade-1.7.0" = self.by-version."jade"."1.7.0"; "passport-0.2.1" = self.by-version."passport"."0.2.1"; "passport-http-0.2.2" = self.by-version."passport-http"."0.2.2"; @@ -10778,12 +11022,12 @@ deps = { "shelljs-0.3.0" = self.by-version."shelljs"."0.3.0"; "underscore-1.6.0" = self.by-version."underscore"."1.6.0"; - "cli-0.6.4" = self.by-version."cli"."0.6.4"; + "cli-0.6.5" = self.by-version."cli"."0.6.5"; "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; "htmlparser2-3.7.3" = self.by-version."htmlparser2"."3.7.3"; "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0"; "exit-0.1.2" = self.by-version."exit"."0.1.2"; - "strip-json-comments-1.0.1" = self.by-version."strip-json-comments"."1.0.1"; + "strip-json-comments-1.0.2" = self.by-version."strip-json-comments"."1.0.2"; }; peerDependencies = [ ]; @@ -10977,23 +11221,23 @@ ]; passthru.names = [ "jsprim" ]; }; - by-spec."jstransform"."~3.0.0" = - self.by-version."jstransform"."3.0.0"; - by-version."jstransform"."3.0.0" = lib.makeOverridable self.buildNodePackage { - name = "jstransform-3.0.0"; + by-spec."jstransform"."^6.1.0" = + self.by-version."jstransform"."6.3.2"; + by-version."jstransform"."6.3.2" = lib.makeOverridable self.buildNodePackage { + name = "jstransform-6.3.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/jstransform/-/jstransform-3.0.0.tgz"; - name = "jstransform-3.0.0.tgz"; - sha1 = "a2591ab6cee8d97bf3be830dbfa2313b87cd640b"; + url = "http://registry.npmjs.org/jstransform/-/jstransform-6.3.2.tgz"; + name = "jstransform-6.3.2.tgz"; + sha1 = "1e7a99ca7540b26676d972ab75f1d2e74e6b23a9"; }) ]; buildInputs = (self.nativeDeps."jstransform" or []); deps = { "base62-0.1.1" = self.by-version."base62"."0.1.1"; - "esprima-fb-3001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb"; + "esprima-fb-6001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."6001.1.0-dev-harmony-fb"; "source-map-0.1.31" = self.by-version."source-map"."0.1.31"; }; peerDependencies = [ @@ -11037,7 +11281,7 @@ deps = { "di-0.0.1" = self.by-version."di"."0.0.1"; "socket.io-0.9.17" = self.by-version."socket.io"."0.9.17"; - "chokidar-0.9.0" = self.by-version."chokidar"."0.9.0"; + "chokidar-0.10.1" = self.by-version."chokidar"."0.10.1"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; "http-proxy-0.10.4" = self.by-version."http-proxy"."0.10.4"; @@ -11157,7 +11401,7 @@ }; peerDependencies = [ self.by-version."karma"."0.12.24" - self.by-version."mocha"."1.21.4" + self.by-version."mocha"."2.0.0" ]; passthru.names = [ "karma-mocha" ]; }; @@ -11200,7 +11444,7 @@ buildInputs = (self.nativeDeps."karma-sauce-launcher" or []); deps = { - "wd-0.3.8" = self.by-version."wd"."0.3.8"; + "wd-0.3.9" = self.by-version."wd"."0.3.9"; "sauce-connect-launcher-0.6.1" = self.by-version."sauce-connect-launcher"."0.6.1"; "q-0.9.7" = self.by-version."q"."0.9.7"; "saucelabs-0.1.1" = self.by-version."saucelabs"."0.1.1"; @@ -11548,7 +11792,7 @@ buildInputs = (self.nativeDeps."lazystream" or []); deps = { - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; + "readable-stream-1.0.33-1" = self.by-version."readable-stream"."1.0.33-1"; }; peerDependencies = [ ]; @@ -11591,7 +11835,7 @@ deps = { "through2-0.5.1" = self.by-version."through2"."0.5.1"; "vinyl-0.2.3" = self.by-version."vinyl"."0.2.3"; - "vinyl-fs-0.3.8" = self.by-version."vinyl-fs"."0.3.8"; + "vinyl-fs-0.3.10" = self.by-version."vinyl-fs"."0.3.10"; }; peerDependencies = [ ]; @@ -11599,6 +11843,33 @@ }; "lcov-result-merger" = self.by-version."lcov-result-merger"."1.0.0"; by-spec."less"."*" = + self.by-version."less"."2.0.0-b1"; + by-version."less"."2.0.0-b1" = lib.makeOverridable self.buildNodePackage { + name = "less-2.0.0-b1"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/less/-/less-2.0.0-b1.tgz"; + name = "less-2.0.0-b1.tgz"; + sha1 = "3dcb5815b2052c89435c00def2aeb58ddb321b6a"; + }) + ]; + buildInputs = + (self.nativeDeps."less" or []); + deps = { + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "request-2.45.0" = self.by-version."request"."2.45.0"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "promise-6.0.1" = self.by-version."promise"."6.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "less" ]; + }; + "less" = self.by-version."less"."2.0.0-b1"; + by-spec."less"."^1.7.2" = self.by-version."less"."1.7.5"; by-version."less"."1.7.5" = lib.makeOverridable self.buildNodePackage { name = "less-1.7.5"; @@ -11613,7 +11884,7 @@ buildInputs = (self.nativeDeps."less" or []); deps = { - "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "request-2.40.0" = self.by-version."request"."2.40.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; @@ -11624,9 +11895,6 @@ ]; passthru.names = [ "less" ]; }; - "less" = self.by-version."less"."1.7.5"; - by-spec."less"."^1.7.2" = - self.by-version."less"."1.7.5"; by-spec."lexical-scope"."~1.1.0" = self.by-version."lexical-scope"."1.1.0"; by-version."lexical-scope"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -11691,25 +11959,26 @@ passthru.names = [ "libyaml" ]; }; "libyaml" = self.by-version."libyaml"."0.2.5"; - by-spec."liftoff"."^0.12.0" = - self.by-version."liftoff"."0.12.1"; - by-version."liftoff"."0.12.1" = lib.makeOverridable self.buildNodePackage { - name = "liftoff-0.12.1"; + by-spec."liftoff"."^0.13.2" = + self.by-version."liftoff"."0.13.5"; + by-version."liftoff"."0.13.5" = lib.makeOverridable self.buildNodePackage { + name = "liftoff-0.13.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/liftoff/-/liftoff-0.12.1.tgz"; - name = "liftoff-0.12.1.tgz"; - sha1 = "bcaa49759c68396b83b984ad0b2d8cc226f9526d"; + url = "http://registry.npmjs.org/liftoff/-/liftoff-0.13.5.tgz"; + name = "liftoff-0.13.5.tgz"; + sha1 = "fb603b0ba34e9ab77a3737529f452d344562386c"; }) ]; buildInputs = (self.nativeDeps."liftoff" or []); deps = { "findup-sync-0.1.3" = self.by-version."findup-sync"."0.1.3"; - "resolve-0.7.4" = self.by-version."resolve"."0.7.4"; - "minimist-0.2.0" = self.by-version."minimist"."0.2.0"; + "resolve-1.0.0" = self.by-version."resolve"."1.0.0"; + "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "extend-1.3.0" = self.by-version."extend"."1.3.0"; + "flagged-respawn-0.3.1" = self.by-version."flagged-respawn"."0.3.1"; }; peerDependencies = [ ]; @@ -12267,7 +12536,7 @@ (self.nativeDeps."log4js" or []); deps = { "async-0.2.10" = self.by-version."async"."0.2.10"; - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; + "readable-stream-1.0.33-1" = self.by-version."readable-stream"."1.0.33-1"; "semver-1.1.4" = self.by-version."semver"."1.1.4"; }; peerDependencies = [ @@ -12418,7 +12687,7 @@ }; by-spec."lru-cache"."~2.5.0" = self.by-version."lru-cache"."2.5.0"; - by-spec."lru-queue"."0.1.x" = + by-spec."lru-queue"."0.1" = self.by-version."lru-queue"."0.1.0"; by-version."lru-queue"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "lru-queue-0.1.0"; @@ -12646,15 +12915,15 @@ passthru.names = [ "media-typer" ]; }; by-spec."memoizee"."0.3.x" = - self.by-version."memoizee"."0.3.7"; - by-version."memoizee"."0.3.7" = lib.makeOverridable self.buildNodePackage { - name = "memoizee-0.3.7"; + self.by-version."memoizee"."0.3.8"; + by-version."memoizee"."0.3.8" = lib.makeOverridable self.buildNodePackage { + name = "memoizee-0.3.8"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/memoizee/-/memoizee-0.3.7.tgz"; - name = "memoizee-0.3.7.tgz"; - sha1 = "13ccfdd580e56cf7c10f4b6342a6800ef87e975b"; + url = "http://registry.npmjs.org/memoizee/-/memoizee-0.3.8.tgz"; + name = "memoizee-0.3.8.tgz"; + sha1 = "b5faf419f02fafe3c2cc1cf5d3907c210fc7efdc"; }) ]; buildInputs = @@ -12662,6 +12931,7 @@ deps = { "d-0.1.1" = self.by-version."d"."0.1.1"; "es5-ext-0.10.4" = self.by-version."es5-ext"."0.10.4"; + "es6-weak-map-0.1.2" = self.by-version."es6-weak-map"."0.1.2"; "event-emitter-0.3.1" = self.by-version."event-emitter"."0.3.1"; "lru-queue-0.1.0" = self.by-version."lru-queue"."0.1.0"; "next-tick-0.2.2" = self.by-version."next-tick"."0.2.2"; @@ -12691,22 +12961,22 @@ ]; passthru.names = [ "merge-descriptors" ]; }; - by-spec."method-override"."~2.2.0" = - self.by-version."method-override"."2.2.0"; - by-version."method-override"."2.2.0" = lib.makeOverridable self.buildNodePackage { - name = "method-override-2.2.0"; + by-spec."method-override"."~2.3.0" = + self.by-version."method-override"."2.3.0"; + by-version."method-override"."2.3.0" = lib.makeOverridable self.buildNodePackage { + name = "method-override-2.3.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/method-override/-/method-override-2.2.0.tgz"; - name = "method-override-2.2.0.tgz"; - sha1 = "177e852b6add3b4f9177033a9446b01e7801a0c0"; + url = "http://registry.npmjs.org/method-override/-/method-override-2.3.0.tgz"; + name = "method-override-2.3.0.tgz"; + sha1 = "fe820769594247ede8a6ca87b8eaa413084e595e"; }) ]; buildInputs = (self.nativeDeps."method-override" or []); deps = { - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; "methods-1.1.0" = self.by-version."methods"."1.1.0"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; @@ -12928,15 +13198,15 @@ by-spec."mime"."~1.2.9" = self.by-version."mime"."1.2.11"; by-spec."mime-db"."1.x" = - self.by-version."mime-db"."1.1.0"; - by-version."mime-db"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "mime-db-1.1.0"; + self.by-version."mime-db"."1.1.1"; + by-version."mime-db"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "mime-db-1.1.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.1.0.tgz"; - name = "mime-db-1.1.0.tgz"; - sha1 = "4613f418ab995450bf4bda240cd0ab38016a07a9"; + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.1.1.tgz"; + name = "mime-db-1.1.1.tgz"; + sha1 = "0fc890cda05d0edadefde73d241ef7e28d110a98"; }) ]; buildInputs = @@ -12948,7 +13218,7 @@ passthru.names = [ "mime-db" ]; }; by-spec."mime-db"."~1.1.0" = - self.by-version."mime-db"."1.1.0"; + self.by-version."mime-db"."1.1.1"; by-spec."mime-types"."~1.0.0" = self.by-version."mime-types"."1.0.2"; by-version."mime-types"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -12986,7 +13256,7 @@ buildInputs = (self.nativeDeps."mime-types" or []); deps = { - "mime-db-1.1.0" = self.by-version."mime-db"."1.1.0"; + "mime-db-1.1.1" = self.by-version."mime-db"."1.1.1"; }; peerDependencies = [ ]; @@ -13007,7 +13277,7 @@ buildInputs = (self.nativeDeps."mimelib" or []); deps = { - "encoding-0.1.8" = self.by-version."encoding"."0.1.8"; + "encoding-0.1.10" = self.by-version."encoding"."0.1.10"; "addressparser-0.2.1" = self.by-version."addressparser"."0.2.1"; }; peerDependencies = [ @@ -13264,6 +13534,8 @@ ]; passthru.names = [ "minimist" ]; }; + by-spec."minimist"."~1.1.0" = + self.by-version."minimist"."1.1.0"; by-spec."ministyle"."~0.1.3" = self.by-version."ministyle"."0.1.4"; by-version."ministyle"."0.1.4" = lib.makeOverridable self.buildNodePackage { @@ -13410,33 +13682,34 @@ passthru.names = [ "mkpath" ]; }; by-spec."mocha"."*" = - self.by-version."mocha"."1.21.4"; - by-version."mocha"."1.21.4" = lib.makeOverridable self.buildNodePackage { - name = "mocha-1.21.4"; + self.by-version."mocha"."2.0.0"; + by-version."mocha"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "mocha-2.0.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha/-/mocha-1.21.4.tgz"; - name = "mocha-1.21.4.tgz"; - sha1 = "e77d69c3773ba3e2b4fe6b628c28b5dd43880adc"; + url = "http://registry.npmjs.org/mocha/-/mocha-2.0.0.tgz"; + name = "mocha-2.0.0.tgz"; + sha1 = "4f737685475046533432494b76c3e81cb5005c54"; }) ]; buildInputs = (self.nativeDeps."mocha" or []); deps = { - "commander-2.0.0" = self.by-version."commander"."2.0.0"; + "commander-2.3.0" = self.by-version."commander"."2.3.0"; + "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "diff-1.0.8" = self.by-version."diff"."1.0.8"; + "escape-string-regexp-1.0.2" = self.by-version."escape-string-regexp"."1.0.2"; + "glob-3.2.3" = self.by-version."glob"."3.2.3"; "growl-1.8.1" = self.by-version."growl"."1.8.1"; "jade-0.26.3" = self.by-version."jade"."0.26.3"; - "diff-1.0.7" = self.by-version."diff"."1.0.7"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; - "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; - "glob-3.2.3" = self.by-version."glob"."3.2.3"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; }; peerDependencies = [ ]; passthru.names = [ "mocha" ]; }; - "mocha" = self.by-version."mocha"."1.21.4"; + "mocha" = self.by-version."mocha"."2.0.0"; by-spec."mocha"."~1.20.1" = self.by-version."mocha"."1.20.1"; by-version."mocha"."1.20.1" = lib.makeOverridable self.buildNodePackage { @@ -13456,7 +13729,7 @@ "growl-1.7.0" = self.by-version."growl"."1.7.0"; "jade-0.26.3" = self.by-version."jade"."0.26.3"; "diff-1.0.7" = self.by-version."diff"."1.0.7"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; "glob-3.2.3" = self.by-version."glob"."3.2.3"; }; @@ -13465,15 +13738,15 @@ passthru.names = [ "mocha" ]; }; by-spec."mocha-phantomjs"."*" = - self.by-version."mocha-phantomjs"."3.5.0"; - by-version."mocha-phantomjs"."3.5.0" = lib.makeOverridable self.buildNodePackage { - name = "mocha-phantomjs-3.5.0"; + self.by-version."mocha-phantomjs"."3.5.1"; + by-version."mocha-phantomjs"."3.5.1" = lib.makeOverridable self.buildNodePackage { + name = "mocha-phantomjs-3.5.1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.5.0.tgz"; - name = "mocha-phantomjs-3.5.0.tgz"; - sha1 = "56fb4072122b4061b21e9c3901e35f4a7c58a93e"; + url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.5.1.tgz"; + name = "mocha-phantomjs-3.5.1.tgz"; + sha1 = "e5460eff3e859b98be73a743f11cb5cae3c58d00"; }) ]; buildInputs = @@ -13483,11 +13756,11 @@ "commander-2.0.0" = self.by-version."commander"."2.0.0"; }; peerDependencies = [ - self.by-version."phantomjs"."1.9.10" + self.by-version."phantomjs"."1.9.11" ]; passthru.names = [ "mocha-phantomjs" ]; }; - "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.5.0"; + "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.5.1"; by-spec."mocha-unfunk-reporter"."*" = self.by-version."mocha-unfunk-reporter"."0.4.0"; by-version."mocha-unfunk-reporter"."0.4.0" = lib.makeOverridable self.buildNodePackage { @@ -13608,28 +13881,28 @@ passthru.names = [ "moment" ]; }; by-spec."mongodb"."*" = - self.by-version."mongodb"."2.0.0-alpha2"; - by-version."mongodb"."2.0.0-alpha2" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-2.0.0-alpha2"; + self.by-version."mongodb"."2.0.3"; + by-version."mongodb"."2.0.3" = lib.makeOverridable self.buildNodePackage { + name = "mongodb-2.0.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-2.0.0-alpha2.tgz"; - name = "mongodb-2.0.0-alpha2.tgz"; - sha1 = "04541787b29a7db6a03ca4e44e593dd726d03d91"; + url = "http://registry.npmjs.org/mongodb/-/mongodb-2.0.3.tgz"; + name = "mongodb-2.0.3.tgz"; + sha1 = "78dd12c11aaa8cf8666c16128fd19f55a8f9b313"; }) ]; buildInputs = (self.nativeDeps."mongodb" or []); deps = { - "mongodb-core-1.0.0-alpha9" = self.by-version."mongodb-core"."1.0.0-alpha9"; + "mongodb-core-1.0.3" = self.by-version."mongodb-core"."1.0.3"; "readable-stream-1.0.31" = self.by-version."readable-stream"."1.0.31"; }; peerDependencies = [ ]; passthru.names = [ "mongodb" ]; }; - "mongodb" = self.by-version."mongodb"."2.0.0-alpha2"; + "mongodb" = self.by-version."mongodb"."2.0.3"; by-spec."mongodb"."1.2.14" = self.by-version."mongodb"."1.2.14"; by-version."mongodb"."1.2.14" = lib.makeOverridable self.buildNodePackage { @@ -13719,15 +13992,15 @@ passthru.names = [ "mongodb" ]; }; by-spec."mongodb-core"."~1.0" = - self.by-version."mongodb-core"."1.0.0-alpha9"; - by-version."mongodb-core"."1.0.0-alpha9" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-core-1.0.0-alpha9"; + self.by-version."mongodb-core"."1.0.3"; + by-version."mongodb-core"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "mongodb-core-1.0.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongodb-core/-/mongodb-core-1.0.0-alpha9.tgz"; - name = "mongodb-core-1.0.0-alpha9.tgz"; - sha1 = "895cf88ad00d20462c417cc2f59d261ec15f0c23"; + url = "http://registry.npmjs.org/mongodb-core/-/mongodb-core-1.0.3.tgz"; + name = "mongodb-core-1.0.3.tgz"; + sha1 = "387649e432368dcd02c983f39454700d6958619a"; }) ]; buildInputs = @@ -13911,23 +14184,24 @@ ]; passthru.names = [ "monocle" ]; }; - by-spec."morgan"."~1.3.2" = - self.by-version."morgan"."1.3.2"; - by-version."morgan"."1.3.2" = lib.makeOverridable self.buildNodePackage { - name = "morgan-1.3.2"; + by-spec."morgan"."~1.4.0" = + self.by-version."morgan"."1.4.0"; + by-version."morgan"."1.4.0" = lib.makeOverridable self.buildNodePackage { + name = "morgan-1.4.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/morgan/-/morgan-1.3.2.tgz"; - name = "morgan-1.3.2.tgz"; - sha1 = "ac41aa15221ee4e5f2ac843896b6918139a18efd"; + url = "http://registry.npmjs.org/morgan/-/morgan-1.4.0.tgz"; + name = "morgan-1.4.0.tgz"; + sha1 = "ce3c6ee28f794f85f59165476575b70ed386eb3d"; }) ]; buildInputs = (self.nativeDeps."morgan" or []); deps = { "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0"; - "depd-0.4.5" = self.by-version."depd"."0.4.5"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0"; }; peerDependencies = [ @@ -14227,15 +14501,15 @@ passthru.names = [ "mv" ]; }; by-spec."mz"."1" = - self.by-version."mz"."1.0.1"; - by-version."mz"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "mz-1.0.1"; + self.by-version."mz"."1.0.2"; + by-version."mz"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "mz-1.0.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mz/-/mz-1.0.1.tgz"; - name = "mz-1.0.1.tgz"; - sha1 = "5ce1d3fe5cb3267c9c3141fb6a070f8d17f215d8"; + url = "http://registry.npmjs.org/mz/-/mz-1.0.2.tgz"; + name = "mz-1.0.2.tgz"; + sha1 = "1c861e902ed75527399ca0d95152b9726aea73ac"; }) ]; buildInputs = @@ -14528,16 +14802,16 @@ ]; passthru.names = [ "negotiator" ]; }; - by-spec."negotiator"."0.4.8" = - self.by-version."negotiator"."0.4.8"; - by-version."negotiator"."0.4.8" = lib.makeOverridable self.buildNodePackage { - name = "negotiator-0.4.8"; + by-spec."negotiator"."0.4.9" = + self.by-version."negotiator"."0.4.9"; + by-version."negotiator"."0.4.9" = lib.makeOverridable self.buildNodePackage { + name = "negotiator-0.4.9"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.8.tgz"; - name = "negotiator-0.4.8.tgz"; - sha1 = "96010b23b63c387f47a4bed96762a831cda39eab"; + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz"; + name = "negotiator-0.4.9.tgz"; + sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f"; }) ]; buildInputs = @@ -14612,15 +14886,15 @@ passthru.names = [ "nib" ]; }; by-spec."nijs"."*" = - self.by-version."nijs"."0.0.18"; - by-version."nijs"."0.0.18" = lib.makeOverridable self.buildNodePackage { - name = "nijs-0.0.18"; + self.by-version."nijs"."0.0.20"; + by-version."nijs"."0.0.20" = lib.makeOverridable self.buildNodePackage { + name = "nijs-0.0.20"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/nijs/-/nijs-0.0.18.tgz"; - name = "nijs-0.0.18.tgz"; - sha1 = "bfdf140350d2bb3edae6b094dbc31035d6c7bec8"; + url = "http://registry.npmjs.org/nijs/-/nijs-0.0.20.tgz"; + name = "nijs-0.0.20.tgz"; + sha1 = "db193f4ed5fc9571ee6fb58542778e96e38f0f7e"; }) ]; buildInputs = @@ -14633,7 +14907,7 @@ ]; passthru.names = [ "nijs" ]; }; - "nijs" = self.by-version."nijs"."0.0.18"; + "nijs" = self.by-version."nijs"."0.0.20"; by-spec."node-appc"."0.2.14" = self.by-version."node-appc"."0.2.14"; by-version."node-appc"."0.2.14" = lib.makeOverridable self.buildNodePackage { @@ -14709,7 +14983,7 @@ deps = { "fstream-1.0.2" = self.by-version."fstream"."1.0.2"; "glob-4.0.6" = self.by-version."glob"."4.0.6"; - "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; @@ -14717,7 +14991,7 @@ "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; "request-2.45.0" = self.by-version."request"."2.45.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.0.3" = self.by-version."semver"."4.0.3"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; "tar-1.0.1" = self.by-version."tar"."1.0.1"; "which-1.0.5" = self.by-version."which"."1.0.5"; }; @@ -14760,15 +15034,15 @@ }; "node-inspector" = self.by-version."node-inspector"."0.7.4"; by-spec."node-protobuf"."*" = - self.by-version."node-protobuf"."1.2.1"; - by-version."node-protobuf"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "node-protobuf-1.2.1"; + self.by-version."node-protobuf"."1.2.2"; + by-version."node-protobuf"."1.2.2" = lib.makeOverridable self.buildNodePackage { + name = "node-protobuf-1.2.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.1.tgz"; - name = "node-protobuf-1.2.1.tgz"; - sha1 = "d517eb4cdcfac002390ace6b8f0b865322eef049"; + url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.2.tgz"; + name = "node-protobuf-1.2.2.tgz"; + sha1 = "8d512499fe012358c1fd89d6b4d84ad80317acb3"; }) ]; buildInputs = @@ -14781,7 +15055,7 @@ ]; passthru.names = [ "node-protobuf" ]; }; - "node-protobuf" = self.by-version."node-protobuf"."1.2.1"; + "node-protobuf" = self.by-version."node-protobuf"."1.2.2"; by-spec."node-swt".">=0.1.1" = self.by-version."node-swt"."0.1.1"; by-version."node-swt"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -15164,7 +15438,7 @@ deps = { "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0"; "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; - "semver-4.0.3" = self.by-version."semver"."4.0.3"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; }; peerDependencies = [ ]; @@ -15175,15 +15449,15 @@ by-spec."normalize-package-data"."~1.0.3" = self.by-version."normalize-package-data"."1.0.3"; by-spec."npm"."*" = - self.by-version."npm"."2.1.3"; - by-version."npm"."2.1.3" = lib.makeOverridable self.buildNodePackage { - name = "npm-2.1.3"; + self.by-version."npm"."2.1.5"; + by-version."npm"."2.1.5" = lib.makeOverridable self.buildNodePackage { + name = "npm-2.1.5"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-2.1.3.tgz"; - name = "npm-2.1.3.tgz"; - sha1 = "f6dfc9d4bdaefe712a50bb75ae5c8bbdf2cd3a3b"; + url = "http://registry.npmjs.org/npm/-/npm-2.1.5.tgz"; + name = "npm-2.1.5.tgz"; + sha1 = "ce343163a56f1ff14ffa295c140d99833b9764cb"; }) ]; buildInputs = @@ -15193,7 +15467,7 @@ "ansi-0.3.0" = self.by-version."ansi"."0.3.0"; "ansicolors-0.3.2" = self.by-version."ansicolors"."0.3.2"; "ansistyles-0.1.3" = self.by-version."ansistyles"."0.1.3"; - "archy-0.0.2" = self.by-version."archy"."0.0.2"; + "archy-1.0.0" = self.by-version."archy"."1.0.0"; "async-some-1.0.1" = self.by-version."async-some"."1.0.1"; "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; "char-spinner-1.0.1" = self.by-version."char-spinner"."1.0.1"; @@ -15202,19 +15476,20 @@ "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; "cmd-shim-2.0.1" = self.by-version."cmd-shim"."2.0.1"; "columnify-1.2.1" = self.by-version."columnify"."1.2.1"; + "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8"; "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1"; "editor-0.1.0" = self.by-version."editor"."0.1.0"; "fs-vacuum-1.2.1" = self.by-version."fs-vacuum"."1.2.1"; "fs-write-stream-atomic-1.0.2" = self.by-version."fs-write-stream-atomic"."1.0.2"; "fstream-1.0.2" = self.by-version."fstream"."1.0.2"; - "fstream-npm-1.0.0" = self.by-version."fstream-npm"."1.0.0"; + "fstream-npm-1.0.1" = self.by-version."fstream-npm"."1.0.1"; "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0"; "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; "glob-4.0.6" = self.by-version."glob"."4.0.6"; - "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "ini-1.2.1" = self.by-version."ini"."1.2.1"; + "ini-1.3.0" = self.by-version."ini"."1.3.0"; "init-package-json-1.1.0" = self.by-version."init-package-json"."1.1.0"; "lockfile-1.0.0" = self.by-version."lockfile"."1.0.0"; "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; @@ -15226,24 +15501,23 @@ "npm-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1"; "npm-install-checks-1.0.4" = self.by-version."npm-install-checks"."1.0.4"; "npm-package-arg-2.1.3" = self.by-version."npm-package-arg"."2.1.3"; - "npm-registry-client-3.2.2" = self.by-version."npm-registry-client"."3.2.2"; - "npm-user-validate-0.1.0" = self.by-version."npm-user-validate"."0.1.0"; - "npmconf-2.1.0" = self.by-version."npmconf"."2.1.0"; + "npm-registry-client-3.2.4" = self.by-version."npm-registry-client"."3.2.4"; + "npm-user-validate-0.1.1" = self.by-version."npm-user-validate"."0.1.1"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; - "opener-1.3.0" = self.by-version."opener"."1.3.0"; + "opener-1.4.0" = self.by-version."opener"."1.4.0"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1"; "read-1.0.5" = self.by-version."read"."1.0.5"; "read-installed-3.1.3" = self.by-version."read-installed"."3.1.3"; "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; - "realize-package-specifier-1.1.0" = self.by-version."realize-package-specifier"."1.1.0"; - "request-2.44.0" = self.by-version."request"."2.44.0"; + "readable-stream-1.0.33-1" = self.by-version."readable-stream"."1.0.33-1"; + "realize-package-specifier-1.2.0" = self.by-version."realize-package-specifier"."1.2.0"; + "request-2.45.0" = self.by-version."request"."2.45.0"; "retry-0.6.1" = self.by-version."retry"."0.6.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.0.3" = self.by-version."semver"."4.0.3"; - "sha-1.2.4" = self.by-version."sha"."1.2.4"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "sha-1.3.0" = self.by-version."sha"."1.3.0"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "sorted-object-1.0.0" = self.by-version."sorted-object"."1.0.0"; "tar-1.0.1" = self.by-version."tar"."1.0.1"; @@ -15257,7 +15531,7 @@ ]; passthru.names = [ "npm" ]; }; - "npm" = self.by-version."npm"."2.1.3"; + "npm" = self.by-version."npm"."2.1.5"; by-spec."npm-cache-filename"."^1.0.0" = self.by-version."npm-cache-filename"."1.0.1"; by-version."npm-cache-filename"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -15296,7 +15570,7 @@ (self.nativeDeps."npm-install-checks" or []); deps = { "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; - "semver-4.0.3" = self.by-version."semver"."4.0.3"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; }; peerDependencies = [ ]; @@ -15317,7 +15591,7 @@ buildInputs = (self.nativeDeps."npm-package-arg" or []); deps = { - "semver-4.0.3" = self.by-version."semver"."4.0.3"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; }; peerDependencies = [ ]; @@ -15371,7 +15645,7 @@ (self.nativeDeps."npm-registry-client" or []); deps = { "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; - "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3"; "npm-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1"; @@ -15379,7 +15653,7 @@ "request-2.45.0" = self.by-version."request"."2.45.0"; "retry-0.6.0" = self.by-version."retry"."0.6.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.0.3" = self.by-version."semver"."4.0.3"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; }; @@ -15387,49 +15661,48 @@ ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-registry-client"."~3.2.2" = - self.by-version."npm-registry-client"."3.2.2"; - by-version."npm-registry-client"."3.2.2" = lib.makeOverridable self.buildNodePackage { - name = "npm-registry-client-3.2.2"; + by-spec."npm-registry-client"."~3.2.4" = + self.by-version."npm-registry-client"."3.2.4"; + by-version."npm-registry-client"."3.2.4" = lib.makeOverridable self.buildNodePackage { + name = "npm-registry-client-3.2.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-3.2.2.tgz"; - name = "npm-registry-client-3.2.2.tgz"; - sha1 = "7c4ef979cf61b411d15421a24ac2b3b846f8bd53"; + url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-3.2.4.tgz"; + name = "npm-registry-client-3.2.4.tgz"; + sha1 = "8659b3449e1c9a9f8181dad142cadb048bfe521f"; }) ]; buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = { "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; - "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3"; "npm-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; "request-2.45.0" = self.by-version."request"."2.45.0"; - "retry-0.6.0" = self.by-version."retry"."0.6.0"; + "retry-0.6.1" = self.by-version."retry"."0.6.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.0.3" = self.by-version."semver"."4.0.3"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; }; peerDependencies = [ - self.by-version."npmconf"."2.1.0" ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-user-validate"."~0.1.0" = - self.by-version."npm-user-validate"."0.1.0"; - by-version."npm-user-validate"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "npm-user-validate-0.1.0"; + by-spec."npm-user-validate"."~0.1.1" = + self.by-version."npm-user-validate"."0.1.1"; + by-version."npm-user-validate"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "npm-user-validate-0.1.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.0.tgz"; - name = "npm-user-validate-0.1.0.tgz"; - sha1 = "358a5b5148ed3f79771d980388c6e34c4a61f638"; + url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.1.tgz"; + name = "npm-user-validate-0.1.1.tgz"; + sha1 = "ea7774636c3c8fe6d01e174bd9f2ee0e22eeed57"; }) ]; buildInputs = @@ -15519,23 +15792,23 @@ "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "semver-4.0.3" = self.by-version."semver"."4.0.3"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5"; }; peerDependencies = [ ]; passthru.names = [ "npmconf" ]; }; - by-spec."npmconf".">=2.1.0-0 >=2.1.0-0 <2.2.0-0" = - self.by-version."npmconf"."2.1.0"; - by-version."npmconf"."2.1.0" = lib.makeOverridable self.buildNodePackage { - name = "npmconf-2.1.0"; + by-spec."npmconf"."^2.0.1" = + self.by-version."npmconf"."2.1.1"; + by-version."npmconf"."2.1.1" = lib.makeOverridable self.buildNodePackage { + name = "npmconf-2.1.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/npmconf/-/npmconf-2.1.0.tgz"; - name = "npmconf-2.1.0.tgz"; - sha1 = "6dcdbd1fe3d7373b78ec74ab69e919d4954f76b0"; + url = "http://registry.npmjs.org/npmconf/-/npmconf-2.1.1.tgz"; + name = "npmconf-2.1.1.tgz"; + sha1 = "a266c7e5c56695eb7f55caf3a5a7328f24510dae"; }) ]; buildInputs = @@ -15548,17 +15821,13 @@ "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "semver-4.0.3" = self.by-version."semver"."4.0.3"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5"; }; peerDependencies = [ ]; passthru.names = [ "npmconf" ]; }; - by-spec."npmconf"."^2.0.1" = - self.by-version."npmconf"."2.1.0"; - by-spec."npmconf"."^2.1.0" = - self.by-version."npmconf"."2.1.0"; by-spec."npmconf"."~0.1.2" = self.by-version."npmconf"."0.1.16"; by-version."npmconf"."0.1.16" = lib.makeOverridable self.buildNodePackage { @@ -15589,8 +15858,6 @@ }; by-spec."npmconf"."~2.0.5" = self.by-version."npmconf"."2.0.9"; - by-spec."npmconf"."~2.1.0" = - self.by-version."npmconf"."2.1.0"; by-spec."npmlog"."*" = self.by-version."npmlog"."0.1.1"; by-version."npmlog"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -15649,7 +15916,7 @@ (fetchurl { url = "https://github.com/ciaranj/node-oauth/tarball/master"; name = "oauth-0.9.11.tgz"; - sha256 = "81deda1451b8103f278cbede8aab0a929a63882dbc604214fd7690d72390d083"; + sha256 = "783dead39b8df22dfff8961fcfb3e65622375d4308c12c1fbce2ae2e4da20184"; }) ]; buildInputs = @@ -15912,6 +16179,8 @@ }; by-spec."once"."~1.3.0" = self.by-version."once"."1.3.1"; + by-spec."once"."~1.3.1" = + self.by-version."once"."1.3.1"; by-spec."open"."0.0.2" = self.by-version."open"."0.0.2"; by-version."open"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -15972,6 +16241,26 @@ ]; passthru.names = [ "opener" ]; }; + by-spec."opener"."~1.4.0" = + self.by-version."opener"."1.4.0"; + by-version."opener"."1.4.0" = lib.makeOverridable self.buildNodePackage { + name = "opener-1.4.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/opener/-/opener-1.4.0.tgz"; + name = "opener-1.4.0.tgz"; + sha1 = "d11f86eeeb076883735c9d509f538fe82d10b941"; + }) + ]; + buildInputs = + (self.nativeDeps."opener" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "opener" ]; + }; by-spec."openid".">=0.2.0" = self.by-version."openid"."0.5.9"; by-version."openid"."0.5.9" = lib.makeOverridable self.buildNodePackage { @@ -16725,15 +17014,15 @@ passthru.names = [ "pbkdf2-compat" ]; }; by-spec."phantomjs"."*" = - self.by-version."phantomjs"."1.9.10"; - by-version."phantomjs"."1.9.10" = lib.makeOverridable self.buildNodePackage { - name = "phantomjs-1.9.10"; + self.by-version."phantomjs"."1.9.11"; + by-version."phantomjs"."1.9.11" = lib.makeOverridable self.buildNodePackage { + name = "phantomjs-1.9.11"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.10.tgz"; - name = "phantomjs-1.9.10.tgz"; - sha1 = "be174e20b03f42c39beaaf84cc153fb65b225a4a"; + url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.11.tgz"; + name = "phantomjs-1.9.11.tgz"; + sha1 = "de822affca7858382b6ab9c931ba4541e5b8a0ae"; }) ]; buildInputs = @@ -16754,11 +17043,11 @@ ]; passthru.names = [ "phantomjs" ]; }; - "phantomjs" = self.by-version."phantomjs"."1.9.10"; + "phantomjs" = self.by-version."phantomjs"."1.9.11"; by-spec."phantomjs"."~1.9.1" = - self.by-version."phantomjs"."1.9.10"; + self.by-version."phantomjs"."1.9.11"; by-spec."phantomjs"."~1.9.10" = - self.by-version."phantomjs"."1.9.10"; + self.by-version."phantomjs"."1.9.11"; by-spec."pkginfo"."0.2.x" = self.by-version."pkginfo"."0.2.3"; by-version."pkginfo"."0.2.3" = lib.makeOverridable self.buildNodePackage { @@ -17048,6 +17337,27 @@ ]; passthru.names = [ "promise" ]; }; + by-spec."promise"."~6.0.1" = + self.by-version."promise"."6.0.1"; + by-version."promise"."6.0.1" = lib.makeOverridable self.buildNodePackage { + name = "promise-6.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/promise/-/promise-6.0.1.tgz"; + name = "promise-6.0.1.tgz"; + sha1 = "d475cff81c083a27fe87ae19952b72c1a6936237"; + }) + ]; + buildInputs = + (self.nativeDeps."promise" or []); + deps = { + "asap-1.0.0" = self.by-version."asap"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "promise" ]; + }; by-spec."prompt"."0.2.11" = self.by-version."prompt"."0.2.11"; by-version."prompt"."0.2.11" = lib.makeOverridable self.buildNodePackage { @@ -17092,7 +17402,7 @@ "read-1.0.5" = self.by-version."read"."1.0.5"; "revalidator-0.1.8" = self.by-version."revalidator"."0.1.8"; "utile-0.2.1" = self.by-version."utile"."0.2.1"; - "winston-0.8.0" = self.by-version."winston"."0.8.0"; + "winston-0.8.1" = self.by-version."winston"."0.8.1"; }; peerDependencies = [ ]; @@ -17269,15 +17579,15 @@ passthru.names = [ "punycode" ]; }; by-spec."punycode".">=0.2.0" = - self.by-version."punycode"."1.3.1"; - by-version."punycode"."1.3.1" = lib.makeOverridable self.buildNodePackage { - name = "punycode-1.3.1"; + self.by-version."punycode"."1.3.2"; + by-version."punycode"."1.3.2" = lib.makeOverridable self.buildNodePackage { + name = "punycode-1.3.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"; - name = "punycode-1.3.1.tgz"; - sha1 = "710afe5123c20a1530b712e3e682b9118fe8058e"; + url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; + name = "punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; }) ]; buildInputs = @@ -17628,15 +17938,15 @@ passthru.names = [ "qs" ]; }; by-spec."querystring-es3"."~0.2.0" = - self.by-version."querystring-es3"."0.2.1-0"; - by-version."querystring-es3"."0.2.1-0" = lib.makeOverridable self.buildNodePackage { - name = "querystring-es3-0.2.1-0"; + self.by-version."querystring-es3"."0.2.1"; + by-version."querystring-es3"."0.2.1" = lib.makeOverridable self.buildNodePackage { + name = "querystring-es3-0.2.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1-0.tgz"; - name = "querystring-es3-0.2.1-0.tgz"; - sha1 = "bd38cbd701040e7ef66c94a93db4a5b45be39565"; + url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"; + name = "querystring-es3-0.2.1.tgz"; + sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; }) ]; buildInputs = @@ -17905,27 +18215,27 @@ passthru.names = [ "rc" ]; }; by-spec."react"."*" = - self.by-version."react"."0.11.2"; - by-version."react"."0.11.2" = lib.makeOverridable self.buildNodePackage { - name = "react-0.11.2"; + self.by-version."react"."0.12.0-rc1"; + by-version."react"."0.12.0-rc1" = lib.makeOverridable self.buildNodePackage { + name = "react-0.12.0-rc1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/react/-/react-0.11.2.tgz"; - name = "react-0.11.2.tgz"; - sha1 = "eaeb787e9b1e266a3540c07c06f4ea80fe1e3766"; + url = "http://registry.npmjs.org/react/-/react-0.12.0-rc1.tgz"; + name = "react-0.12.0-rc1.tgz"; + sha1 = "de56afc07e834fdf2f988a9c1026c25b93a61636"; }) ]; buildInputs = (self.nativeDeps."react" or []); deps = { - "envify-2.0.1" = self.by-version."envify"."2.0.1"; + "envify-3.0.0" = self.by-version."envify"."3.0.0"; }; peerDependencies = [ ]; passthru.names = [ "react" ]; }; - "react" = self.by-version."react"."0.11.2"; + "react" = self.by-version."react"."0.12.0-rc1"; by-spec."read"."1" = self.by-version."read"."1.0.5"; by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage { @@ -17971,10 +18281,10 @@ "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1"; "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; "readdir-scoped-modules-1.0.0" = self.by-version."readdir-scoped-modules"."1.0.0"; - "semver-4.0.3" = self.by-version."semver"."4.0.3"; + "semver-4.1.0" = self.by-version."semver"."4.1.0"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "util-extend-1.0.1" = self.by-version."util-extend"."1.0.1"; - "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; }; peerDependencies = [ ]; @@ -18000,7 +18310,7 @@ "glob-4.0.6" = self.by-version."glob"."4.0.6"; "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3"; - "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; }; peerDependencies = [ ]; @@ -18032,30 +18342,6 @@ ]; passthru.names = [ "readable-stream" ]; }; - by-spec."readable-stream"."1.0" = - self.by-version."readable-stream"."1.0.32"; - by-version."readable-stream"."1.0.32" = lib.makeOverridable self.buildNodePackage { - name = "readable-stream-1.0.32"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.32.tgz"; - name = "readable-stream-1.0.32.tgz"; - sha1 = "6b44a88ba984cd0ec0834ae7d59a47c39aef48ec"; - }) - ]; - buildInputs = - (self.nativeDeps."readable-stream" or []); - deps = { - "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "readable-stream" ]; - }; by-spec."readable-stream"."1.0.27-1" = self.by-version."readable-stream"."1.0.27-1"; by-version."readable-stream"."1.0.27-1" = lib.makeOverridable self.buildNodePackage { @@ -18106,8 +18392,30 @@ }; by-spec."readable-stream"."1.1" = self.by-version."readable-stream"."1.1.13"; - by-spec."readable-stream".">=1.0.28 <1.1.0-0" = - self.by-version."readable-stream"."1.0.32"; + by-spec."readable-stream".">=1.0.33-1 <1.1.0-0" = + self.by-version."readable-stream"."1.0.33-1"; + by-version."readable-stream"."1.0.33-1" = lib.makeOverridable self.buildNodePackage { + name = "readable-stream-1.0.33-1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33-1.tgz"; + name = "readable-stream-1.0.33-1.tgz"; + sha1 = "40d0d91338691291a9117c05d78adb5497c37810"; + }) + ]; + buildInputs = + (self.nativeDeps."readable-stream" or []); + deps = { + "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; + "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; + "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "readable-stream" ]; + }; by-spec."readable-stream".">=1.1.13-1 <1.2.0-0" = self.by-version."readable-stream"."1.1.13"; by-spec."readable-stream"."^1.0.27-1" = @@ -18115,15 +18423,19 @@ by-spec."readable-stream"."^1.1.13-1" = self.by-version."readable-stream"."1.1.13"; by-spec."readable-stream"."~1.0.17" = - self.by-version."readable-stream"."1.0.32"; + self.by-version."readable-stream"."1.0.33-1"; by-spec."readable-stream"."~1.0.2" = - self.by-version."readable-stream"."1.0.32"; + self.by-version."readable-stream"."1.0.33-1"; by-spec."readable-stream"."~1.0.24" = - self.by-version."readable-stream"."1.0.32"; + self.by-version."readable-stream"."1.0.33-1"; by-spec."readable-stream"."~1.0.26" = - self.by-version."readable-stream"."1.0.32"; + self.by-version."readable-stream"."1.0.33-1"; + by-spec."readable-stream"."~1.0.26-2" = + self.by-version."readable-stream"."1.0.33-1"; by-spec."readable-stream"."~1.0.32" = - self.by-version."readable-stream"."1.0.32"; + self.by-version."readable-stream"."1.0.33-1"; + by-spec."readable-stream"."~1.1" = + self.by-version."readable-stream"."1.1.13"; by-spec."readable-stream"."~1.1.8" = self.by-version."readable-stream"."1.1.13"; by-spec."readable-stream"."~1.1.9" = @@ -18193,6 +18505,29 @@ ]; passthru.names = [ "readdirp" ]; }; + by-spec."readdirp"."~1.1.0" = + self.by-version."readdirp"."1.1.0"; + by-version."readdirp"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "readdirp-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/readdirp/-/readdirp-1.1.0.tgz"; + name = "readdirp-1.1.0.tgz"; + sha1 = "6506f9d5d8bb2edc19c855a60bb92feca5fae39c"; + }) + ]; + buildInputs = + (self.nativeDeps."readdirp" or []); + deps = { + "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; + "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; + "readable-stream-1.0.33-1" = self.by-version."readable-stream"."1.0.33-1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "readdirp" ]; + }; by-spec."readline2"."~0.1.0" = self.by-version."readline2"."0.1.0"; by-version."readline2"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -18216,16 +18551,16 @@ ]; passthru.names = [ "readline2" ]; }; - by-spec."realize-package-specifier"."~1.1.0" = - self.by-version."realize-package-specifier"."1.1.0"; - by-version."realize-package-specifier"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "realize-package-specifier-1.1.0"; + by-spec."realize-package-specifier"."~1.2.0" = + self.by-version."realize-package-specifier"."1.2.0"; + by-version."realize-package-specifier"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "realize-package-specifier-1.2.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-1.1.0.tgz"; - name = "realize-package-specifier-1.1.0.tgz"; - sha1 = "b6922638b7224186ae9278bdebbb63cba23a0160"; + url = "http://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-1.2.0.tgz"; + name = "realize-package-specifier-1.2.0.tgz"; + sha1 = "93364e40dee38369f92e9b0c76124500342132f2"; }) ]; buildInputs = @@ -18238,26 +18573,6 @@ ]; passthru.names = [ "realize-package-specifier" ]; }; - by-spec."recursive-readdir"."0.0.2" = - self.by-version."recursive-readdir"."0.0.2"; - by-version."recursive-readdir"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "recursive-readdir-0.0.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/recursive-readdir/-/recursive-readdir-0.0.2.tgz"; - name = "recursive-readdir-0.0.2.tgz"; - sha1 = "0bc47dc4838e646dccfba0507b5e57ffbff35f7c"; - }) - ]; - buildInputs = - (self.nativeDeps."recursive-readdir" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "recursive-readdir" ]; - }; by-spec."redeyed"."~0.4.0" = self.by-version."redeyed"."0.4.4"; by-version."redeyed"."0.4.4" = lib.makeOverridable self.buildNodePackage { @@ -18440,7 +18755,7 @@ buildInputs = (self.nativeDeps."registry-url" or []); deps = { - "npmconf-2.1.0" = self.by-version."npmconf"."2.1.0"; + "npmconf-2.1.1" = self.by-version."npmconf"."2.1.1"; }; peerDependencies = [ ]; @@ -18669,41 +18984,8 @@ self.by-version."request"."2.40.0"; by-spec."request"."~2.42.0" = self.by-version."request"."2.42.0"; - by-spec."request"."~2.44.0" = - self.by-version."request"."2.44.0"; - by-version."request"."2.44.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.44.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.44.0.tgz"; - name = "request-2.44.0.tgz"; - sha1 = "78d62454d68853cadfb07ad31f58b9ec98072ea8"; - }) - ]; - buildInputs = - (self.nativeDeps."request" or []); - deps = { - "bl-0.9.3" = self.by-version."bl"."0.9.3"; - "caseless-0.6.0" = self.by-version."caseless"."0.6.0"; - "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "qs-1.2.2" = self.by-version."qs"."1.2.2"; - "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; - "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; - "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; - "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; - "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; - "http-signature-0.10.0" = self.by-version."http-signature"."0.10.0"; - "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0"; - "hawk-1.1.1" = self.by-version."hawk"."1.1.1"; - "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; - "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; - }; - peerDependencies = [ - ]; - passthru.names = [ "request" ]; - }; + by-spec."request"."~2.45.0" = + self.by-version."request"."2.45.0"; by-spec."request-progress"."0.3.0" = self.by-version."request-progress"."0.3.0"; by-version."request-progress"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -18833,27 +19115,46 @@ }; by-spec."resolve"."~0.3.1" = self.by-version."resolve"."0.3.1"; - by-spec."resolve"."~0.7.0" = - self.by-version."resolve"."0.7.4"; by-spec."resolve"."~0.7.1" = self.by-version."resolve"."0.7.4"; by-spec."resolve"."~0.7.2" = self.by-version."resolve"."0.7.4"; - by-spec."response-time"."~2.0.1" = - self.by-version."response-time"."2.0.1"; - by-version."response-time"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "response-time-2.0.1"; + by-spec."resolve"."~1.0.0" = + self.by-version."resolve"."1.0.0"; + by-version."resolve"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "resolve-1.0.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/response-time/-/response-time-2.0.1.tgz"; - name = "response-time-2.0.1.tgz"; - sha1 = "c6d2cbadeac4cb251b21016fe182640c02aff343"; + url = "http://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz"; + name = "resolve-1.0.0.tgz"; + sha1 = "2a6e3b314dcd57c6519e8e2282af8687e8de61c6"; + }) + ]; + buildInputs = + (self.nativeDeps."resolve" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "resolve" ]; + }; + by-spec."response-time"."~2.2.0" = + self.by-version."response-time"."2.2.0"; + by-version."response-time"."2.2.0" = lib.makeOverridable self.buildNodePackage { + name = "response-time-2.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/response-time/-/response-time-2.2.0.tgz"; + name = "response-time-2.2.0.tgz"; + sha1 = "77ab4688cbf030e9c5f82dc1eac7fe5226d3c8eb"; }) ]; buildInputs = (self.nativeDeps."response-time" or []); deps = { + "depd-1.0.0" = self.by-version."depd"."1.0.0"; "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; }; peerDependencies = [ @@ -18912,7 +19213,7 @@ buildInputs = (self.nativeDeps."rethinkdb" or []); deps = { - "bluebird-2.3.5" = self.by-version."bluebird"."2.3.5"; + "bluebird-2.3.6" = self.by-version."bluebird"."2.3.6"; }; peerDependencies = [ ]; @@ -18939,7 +19240,7 @@ ]; passthru.names = [ "retry" ]; }; - by-spec."retry"."~0.6.0" = + by-spec."retry"."^0.6.1" = self.by-version."retry"."0.6.1"; by-version."retry"."0.6.1" = lib.makeOverridable self.buildNodePackage { name = "retry-0.6.1"; @@ -18959,6 +19260,10 @@ ]; passthru.names = [ "retry" ]; }; + by-spec."retry"."~0.6.0" = + self.by-version."retry"."0.6.1"; + by-spec."retry"."~0.6.1" = + self.by-version."retry"."0.6.1"; by-spec."revalidator"."0.1.x" = self.by-version."revalidator"."0.1.8"; by-version."revalidator"."0.1.8" = lib.makeOverridable self.buildNodePackage { @@ -19092,8 +19397,6 @@ }; by-spec."rimraf"."~2.2.0" = self.by-version."rimraf"."2.2.8"; - by-spec."rimraf"."~2.2.2" = - self.by-version."rimraf"."2.2.8"; by-spec."rimraf"."~2.2.5" = self.by-version."rimraf"."2.2.8"; by-spec."rimraf"."~2.2.6" = @@ -19163,15 +19466,15 @@ passthru.names = [ "ruglify" ]; }; by-spec."rx"."^2.2.27" = - self.by-version."rx"."2.3.12"; - by-version."rx"."2.3.12" = lib.makeOverridable self.buildNodePackage { - name = "rx-2.3.12"; + self.by-version."rx"."2.3.13"; + by-version."rx"."2.3.13" = lib.makeOverridable self.buildNodePackage { + name = "rx-2.3.13"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/rx/-/rx-2.3.12.tgz"; - name = "rx-2.3.12.tgz"; - sha1 = "9bdc2c8e12cb0a62e528947de458277849f0c2f4"; + url = "http://registry.npmjs.org/rx/-/rx-2.3.13.tgz"; + name = "rx-2.3.13.tgz"; + sha1 = "8a42c6079e4bf7a712c17780ed17c408633a6cbc"; }) ]; buildInputs = @@ -19316,15 +19619,15 @@ passthru.names = [ "sax" ]; }; by-spec."sax"."0.6.x" = - self.by-version."sax"."0.6.0"; - by-version."sax"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "sax-0.6.0"; + self.by-version."sax"."0.6.1"; + by-version."sax"."0.6.1" = lib.makeOverridable self.buildNodePackage { + name = "sax-0.6.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/sax/-/sax-0.6.0.tgz"; - name = "sax-0.6.0.tgz"; - sha1 = "7a155519b712e3ec56f102ab984f15e15d3859f0"; + url = "http://registry.npmjs.org/sax/-/sax-0.6.1.tgz"; + name = "sax-0.6.1.tgz"; + sha1 = "563b19c7c1de892e09bfc4f2fc30e3c27f0952b9"; }) ]; buildInputs = @@ -19336,7 +19639,7 @@ passthru.names = [ "sax" ]; }; by-spec."sax".">=0.4.2" = - self.by-version."sax"."0.6.0"; + self.by-version."sax"."0.6.1"; by-spec."scmp"."0.0.3" = self.by-version."scmp"."0.0.3"; by-version."scmp"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -19382,15 +19685,15 @@ }; "selenium-webdriver" = self.by-version."selenium-webdriver"."2.43.5"; by-spec."semver"."*" = - self.by-version."semver"."4.0.3"; - by-version."semver"."4.0.3" = lib.makeOverridable self.buildNodePackage { - name = "semver-4.0.3"; + self.by-version."semver"."4.1.0"; + by-version."semver"."4.1.0" = lib.makeOverridable self.buildNodePackage { + name = "semver-4.1.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-4.0.3.tgz"; - name = "semver-4.0.3.tgz"; - sha1 = "f79c9ba670efccc029d98a5017def64b0ce1644e"; + url = "http://registry.npmjs.org/semver/-/semver-4.1.0.tgz"; + name = "semver-4.1.0.tgz"; + sha1 = "bc80a9ff68532814362cc3cfda3c7b75ed9c321c"; }) ]; buildInputs = @@ -19401,7 +19704,7 @@ ]; passthru.names = [ "semver" ]; }; - "semver" = self.by-version."semver"."4.0.3"; + "semver" = self.by-version."semver"."4.1.0"; by-spec."semver"."1.1.0" = self.by-version."semver"."1.1.0"; by-version."semver"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -19463,15 +19766,15 @@ passthru.names = [ "semver" ]; }; by-spec."semver"."2 >=2.2.1 || 3.x || 4" = - self.by-version."semver"."4.0.3"; + self.by-version."semver"."4.1.0"; by-spec."semver"."2 || 3 || 4" = - self.by-version."semver"."4.0.3"; + self.by-version."semver"."4.1.0"; by-spec."semver"."2.x" = self.by-version."semver"."2.3.2"; by-spec."semver"."2.x || 3.x || 4" = - self.by-version."semver"."4.0.3"; + self.by-version."semver"."4.1.0"; by-spec."semver"."4" = - self.by-version."semver"."4.0.3"; + self.by-version."semver"."4.1.0"; by-spec."semver".">=2.0.10 <3.0.0" = self.by-version."semver"."2.3.2"; by-spec."semver".">=2.2.1 <3" = @@ -19481,7 +19784,7 @@ by-spec."semver"."^2.3.0" = self.by-version."semver"."2.3.2"; by-spec."semver"."^2.3.0 || 3.x || 4" = - self.by-version."semver"."4.0.3"; + self.by-version."semver"."4.1.0"; by-spec."semver"."^3.0.1" = self.by-version."semver"."3.0.1"; by-version."semver"."3.0.1" = lib.makeOverridable self.buildNodePackage { @@ -19568,8 +19871,8 @@ self.by-version."semver"."2.3.2"; by-spec."semver"."~3.0.1" = self.by-version."semver"."3.0.1"; - by-spec."semver"."~4.0.0" = - self.by-version."semver"."4.0.3"; + by-spec."semver"."~4.1.0" = + self.by-version."semver"."4.1.0"; by-spec."semver-diff"."^0.1.0" = self.by-version."semver-diff"."0.1.0"; by-version."semver-diff"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -19592,25 +19895,25 @@ passthru.names = [ "semver-diff" ]; }; by-spec."send"."*" = - self.by-version."send"."0.9.3"; - by-version."send"."0.9.3" = lib.makeOverridable self.buildNodePackage { - name = "send-0.9.3"; + self.by-version."send"."0.10.0"; + by-version."send"."0.10.0" = lib.makeOverridable self.buildNodePackage { + name = "send-0.10.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.9.3.tgz"; - name = "send-0.9.3.tgz"; - sha1 = "b43a7414cd089b7fbec9b755246f7c37b7b85cc0"; + url = "http://registry.npmjs.org/send/-/send-0.10.0.tgz"; + name = "send-0.10.0.tgz"; + sha1 = "2f984b703934c628b72b72d70557b75ca906ea6c"; }) ]; buildInputs = (self.nativeDeps."send" or []); deps = { - "debug-2.0.0" = self.by-version."debug"."2.0.0"; - "depd-0.4.5" = self.by-version."depd"."0.4.5"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "etag-1.4.0" = self.by-version."etag"."1.4.0"; + "etag-1.5.0" = self.by-version."etag"."1.5.0"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "ms-0.6.2" = self.by-version."ms"."0.6.2"; @@ -19636,7 +19939,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = { - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; "mime-1.2.6" = self.by-version."mime"."1.2.6"; "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4"; @@ -19660,7 +19963,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = { - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; "mime-1.2.6" = self.by-version."mime"."1.2.6"; "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4"; @@ -19684,7 +19987,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = { - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "fresh-0.2.0" = self.by-version."fresh"."0.2.0"; "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4"; @@ -19693,6 +19996,8 @@ ]; passthru.names = [ "send" ]; }; + by-spec."send"."0.10.0" = + self.by-version."send"."0.10.0"; by-spec."send"."0.2.0" = self.by-version."send"."0.2.0"; by-version."send"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -19708,7 +20013,7 @@ buildInputs = (self.nativeDeps."send" or []); deps = { - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; @@ -19748,6 +20053,34 @@ }; by-spec."send"."0.9.3" = self.by-version."send"."0.9.3"; + by-version."send"."0.9.3" = lib.makeOverridable self.buildNodePackage { + name = "send-0.9.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/send/-/send-0.9.3.tgz"; + name = "send-0.9.3.tgz"; + sha1 = "b43a7414cd089b7fbec9b755246f7c37b7b85cc0"; + }) + ]; + buildInputs = + (self.nativeDeps."send" or []); + deps = { + "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "depd-0.4.5" = self.by-version."depd"."0.4.5"; + "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "etag-1.4.0" = self.by-version."etag"."1.4.0"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "ms-0.6.2" = self.by-version."ms"."0.6.2"; + "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "send" ]; + }; by-spec."sequence"."2.2.1" = self.by-version."sequence"."2.2.1"; by-version."sequence"."2.2.1" = lib.makeOverridable self.buildNodePackage { @@ -19790,22 +20123,22 @@ ]; passthru.names = [ "sequencify" ]; }; - by-spec."serve-favicon"."~2.1.5" = - self.by-version."serve-favicon"."2.1.5"; - by-version."serve-favicon"."2.1.5" = lib.makeOverridable self.buildNodePackage { - name = "serve-favicon-2.1.5"; + by-spec."serve-favicon"."~2.1.6" = + self.by-version."serve-favicon"."2.1.6"; + by-version."serve-favicon"."2.1.6" = lib.makeOverridable self.buildNodePackage { + name = "serve-favicon-2.1.6"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.1.5.tgz"; - name = "serve-favicon-2.1.5.tgz"; - sha1 = "8eba1830890bddbbf042e8d5c6456c7d004f6175"; + url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.1.6.tgz"; + name = "serve-favicon-2.1.6.tgz"; + sha1 = "46326a9eb64a0fa5cf012a4f85efe9fda95820e5"; }) ]; buildInputs = (self.nativeDeps."serve-favicon" or []); deps = { - "etag-1.4.0" = self.by-version."etag"."1.4.0"; + "etag-1.5.0" = self.by-version."etag"."1.5.0"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; "ms-0.6.2" = self.by-version."ms"."0.6.2"; }; @@ -19813,24 +20146,26 @@ ]; passthru.names = [ "serve-favicon" ]; }; - by-spec."serve-index"."~1.2.1" = - self.by-version."serve-index"."1.2.1"; - by-version."serve-index"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "serve-index-1.2.1"; + by-spec."serve-index"."~1.5.0" = + self.by-version."serve-index"."1.5.0"; + by-version."serve-index"."1.5.0" = lib.makeOverridable self.buildNodePackage { + name = "serve-index-1.5.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/serve-index/-/serve-index-1.2.1.tgz"; - name = "serve-index-1.2.1.tgz"; - sha1 = "854daef00ac9ff2f5bfda1c019b78fb0ed6d2e6f"; + url = "http://registry.npmjs.org/serve-index/-/serve-index-1.5.0.tgz"; + name = "serve-index-1.5.0.tgz"; + sha1 = "066a35ff1564146cceb2105014a5b070af68707e"; }) ]; buildInputs = (self.nativeDeps."serve-index" or []); deps = { - "accepts-1.1.1" = self.by-version."accepts"."1.1.1"; + "accepts-1.1.2" = self.by-version."accepts"."1.1.2"; "batch-0.5.1" = self.by-version."batch"."0.5.1"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "http-errors-1.2.7" = self.by-version."http-errors"."1.2.7"; + "mime-types-2.0.2" = self.by-version."mime-types"."2.0.2"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; }; peerDependencies = [ @@ -19884,16 +20219,16 @@ }; by-spec."serve-static"."~1.5.4" = self.by-version."serve-static"."1.5.4"; - by-spec."serve-static"."~1.6.3" = - self.by-version."serve-static"."1.6.3"; - by-version."serve-static"."1.6.3" = lib.makeOverridable self.buildNodePackage { - name = "serve-static-1.6.3"; + by-spec."serve-static"."~1.6.4" = + self.by-version."serve-static"."1.6.4"; + by-version."serve-static"."1.6.4" = lib.makeOverridable self.buildNodePackage { + name = "serve-static-1.6.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.3.tgz"; - name = "serve-static-1.6.3.tgz"; - sha1 = "b214235d4d4516db050ea9f7b429b46212e79132"; + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.4.tgz"; + name = "serve-static-1.6.4.tgz"; + sha1 = "c512e4188d7a9366672db24e40d294f0c6212367"; }) ]; buildInputs = @@ -19908,23 +20243,47 @@ ]; passthru.names = [ "serve-static" ]; }; - by-spec."sha"."~1.2.1" = - self.by-version."sha"."1.2.4"; - by-version."sha"."1.2.4" = lib.makeOverridable self.buildNodePackage { - name = "sha-1.2.4"; + by-spec."serve-static"."~1.7.0" = + self.by-version."serve-static"."1.7.0"; + by-version."serve-static"."1.7.0" = lib.makeOverridable self.buildNodePackage { + name = "serve-static-1.7.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/sha/-/sha-1.2.4.tgz"; - name = "sha-1.2.4.tgz"; - sha1 = "1f9a377f27b6fdee409b9b858e43da702be48a4d"; + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.7.0.tgz"; + name = "serve-static-1.7.0.tgz"; + sha1 = "af2ad4e619fa2d46dcd19dd59e3b034c92510e4d"; + }) + ]; + buildInputs = + (self.nativeDeps."serve-static" or []); + deps = { + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "send-0.10.0" = self.by-version."send"."0.10.0"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "serve-static" ]; + }; + by-spec."sha"."~1.3.0" = + self.by-version."sha"."1.3.0"; + by-version."sha"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "sha-1.3.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/sha/-/sha-1.3.0.tgz"; + name = "sha-1.3.0.tgz"; + sha1 = "79f4787045d0ede7327d702c25c443460dbc6764"; }) ]; buildInputs = (self.nativeDeps."sha" or []); deps = { - "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; peerDependencies = [ ]; @@ -20059,26 +20418,47 @@ by-spec."shelljs"."0.3.x" = self.by-version."shelljs"."0.3.0"; by-spec."should"."*" = - self.by-version."should"."4.0.4"; - by-version."should"."4.0.4" = lib.makeOverridable self.buildNodePackage { - name = "should-4.0.4"; + self.by-version."should"."4.1.0"; + by-version."should"."4.1.0" = lib.makeOverridable self.buildNodePackage { + name = "should-4.1.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/should/-/should-4.0.4.tgz"; - name = "should-4.0.4.tgz"; - sha1 = "8efaa304f1f148cf3d2e955862990f9ab9ea628f"; + url = "http://registry.npmjs.org/should/-/should-4.1.0.tgz"; + name = "should-4.1.0.tgz"; + sha1 = "ae3335655a1fdbb156e0b338bf191106f59dab21"; }) ]; buildInputs = (self.nativeDeps."should" or []); deps = { + "should-equal-0.0.1" = self.by-version."should-equal"."0.0.1"; }; peerDependencies = [ ]; passthru.names = [ "should" ]; }; - "should" = self.by-version."should"."4.0.4"; + "should" = self.by-version."should"."4.1.0"; + by-spec."should-equal"."0.0.1" = + self.by-version."should-equal"."0.0.1"; + by-version."should-equal"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "should-equal-0.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/should-equal/-/should-equal-0.0.1.tgz"; + name = "should-equal-0.0.1.tgz"; + sha1 = "55066653a9f03211da695a2fea768b19956a9c0b"; + }) + ]; + buildInputs = + (self.nativeDeps."should-equal" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "should-equal" ]; + }; by-spec."sigmund"."~1.0.0" = self.by-version."sigmund"."1.0.0"; by-version."sigmund"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -20828,6 +21208,26 @@ passthru.names = [ "statsd-librato-backend" ]; }; "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.3"; + by-spec."statuses"."1" = + self.by-version."statuses"."1.2.0"; + by-version."statuses"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "statuses-1.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/statuses/-/statuses-1.2.0.tgz"; + name = "statuses-1.2.0.tgz"; + sha1 = "4445790d65bec29184f50d54810f67e290c1679e"; + }) + ]; + buildInputs = + (self.nativeDeps."statuses" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "statuses" ]; + }; by-spec."stream-browserify"."^1.0.0" = self.by-version."stream-browserify"."1.0.0"; by-version."stream-browserify"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -21210,15 +21610,15 @@ passthru.names = [ "strip-json-comments" ]; }; by-spec."strip-json-comments"."1.0.x" = - self.by-version."strip-json-comments"."1.0.1"; - by-version."strip-json-comments"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "strip-json-comments-1.0.1"; + self.by-version."strip-json-comments"."1.0.2"; + by-version."strip-json-comments"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "strip-json-comments-1.0.2"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.1.tgz"; - name = "strip-json-comments-1.0.1.tgz"; - sha1 = "a91252d95ddee4ff38a66135cd6c78de5709f374"; + url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.2.tgz"; + name = "strip-json-comments-1.0.2.tgz"; + sha1 = "5a48ab96023dbac1b7b8d0ffabf6f63f1677be9f"; }) ]; buildInputs = @@ -21244,22 +21644,22 @@ buildInputs = (self.nativeDeps."strong-data-uri" or []); deps = { - "truncate-1.0.2" = self.by-version."truncate"."1.0.2"; + "truncate-1.0.4" = self.by-version."truncate"."1.0.4"; }; peerDependencies = [ ]; passthru.names = [ "strong-data-uri" ]; }; by-spec."stylus"."*" = - self.by-version."stylus"."0.49.1"; - by-version."stylus"."0.49.1" = lib.makeOverridable self.buildNodePackage { - name = "stylus-0.49.1"; + self.by-version."stylus"."0.49.2"; + by-version."stylus"."0.49.2" = lib.makeOverridable self.buildNodePackage { + name = "stylus-0.49.2"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/stylus/-/stylus-0.49.1.tgz"; - name = "stylus-0.49.1.tgz"; - sha1 = "c915495675ca77847a7d4285dd6d6572bae34448"; + url = "http://registry.npmjs.org/stylus/-/stylus-0.49.2.tgz"; + name = "stylus-0.49.2.tgz"; + sha1 = "c72a9ea9d904d24bb07c8fd609e6abc28620000a"; }) ]; buildInputs = @@ -21267,7 +21667,7 @@ deps = { "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0"; "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; "sax-0.5.8" = self.by-version."sax"."0.5.8"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; @@ -21276,7 +21676,7 @@ ]; passthru.names = [ "stylus" ]; }; - "stylus" = self.by-version."stylus"."0.49.1"; + "stylus" = self.by-version."stylus"."0.49.2"; by-spec."stylus"."0.42.2" = self.by-version."stylus"."0.42.2"; by-version."stylus"."0.42.2" = lib.makeOverridable self.buildNodePackage { @@ -21294,7 +21694,7 @@ deps = { "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0"; "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; - "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; "sax-0.5.8" = self.by-version."sax"."0.5.8"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; }; @@ -21808,7 +22208,7 @@ buildInputs = (self.nativeDeps."through2" or []); deps = { - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; + "readable-stream-1.0.33-1" = self.by-version."readable-stream"."1.0.33-1"; "xtend-3.0.0" = self.by-version."xtend"."3.0.0"; }; peerDependencies = [ @@ -21816,21 +22216,21 @@ passthru.names = [ "through2" ]; }; by-spec."through2"."^0.6.1" = - self.by-version."through2"."0.6.2"; - by-version."through2"."0.6.2" = lib.makeOverridable self.buildNodePackage { - name = "through2-0.6.2"; + self.by-version."through2"."0.6.3"; + by-version."through2"."0.6.3" = lib.makeOverridable self.buildNodePackage { + name = "through2-0.6.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/through2/-/through2-0.6.2.tgz"; - name = "through2-0.6.2.tgz"; - sha1 = "53265824c555e7fcdc4111dcdc52c7de64636c75"; + url = "http://registry.npmjs.org/through2/-/through2-0.6.3.tgz"; + name = "through2-0.6.3.tgz"; + sha1 = "795292fde9f254c2a368b38f9cc5d1bd4663afb6"; }) ]; buildInputs = (self.nativeDeps."through2" or []); deps = { - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; + "readable-stream-1.0.33-1" = self.by-version."readable-stream"."1.0.33-1"; "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; }; peerDependencies = [ @@ -21874,7 +22274,7 @@ buildInputs = (self.nativeDeps."through2" or []); deps = { - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; + "readable-stream-1.0.33-1" = self.by-version."readable-stream"."1.0.33-1"; "xtend-2.1.2" = self.by-version."xtend"."2.1.2"; }; peerDependencies = [ @@ -21898,7 +22298,7 @@ buildInputs = (self.nativeDeps."tildify" or []); deps = { - "user-home-1.0.0" = self.by-version."user-home"."1.0.0"; + "user-home-1.1.0" = self.by-version."user-home"."1.1.0"; }; peerDependencies = [ ]; @@ -21925,7 +22325,7 @@ ]; passthru.names = [ "timers-browserify" ]; }; - by-spec."timers-ext"."0.1.x" = + by-spec."timers-ext"."0.1" = self.by-version."timers-ext"."0.1.0"; by-version."timers-ext"."0.1.0" = lib.makeOverridable self.buildNodePackage { name = "timers-ext-0.1.0"; @@ -21947,6 +22347,8 @@ ]; passthru.names = [ "timers-ext" ]; }; + by-spec."timers-ext"."0.1.x" = + self.by-version."timers-ext"."0.1.0"; by-spec."timespan"."~2.3.0" = self.by-version."timespan"."2.3.0"; by-version."timespan"."2.3.0" = lib.makeOverridable self.buildNodePackage { @@ -22025,7 +22427,7 @@ deps = { "async-0.2.10" = self.by-version."async"."0.2.10"; "colors-0.6.2" = self.by-version."colors"."0.6.2"; - "fields-0.1.16" = self.by-version."fields"."0.1.16"; + "fields-0.1.17" = self.by-version."fields"."0.1.17"; "humanize-0.0.9" = self.by-version."humanize"."0.0.9"; "jade-0.35.0" = self.by-version."jade"."0.35.0"; "longjohn-0.2.4" = self.by-version."longjohn"."0.2.4"; @@ -22122,7 +22524,7 @@ buildInputs = (self.nativeDeps."tough-cookie" or []); deps = { - "punycode-1.3.1" = self.by-version."punycode"."1.3.1"; + "punycode-1.3.2" = self.by-version."punycode"."1.3.2"; }; peerDependencies = [ ]; @@ -22145,7 +22547,7 @@ buildInputs = (self.nativeDeps."traceur" or []); deps = { - "commander-2.3.0" = self.by-version."commander"."2.3.0"; + "commander-2.4.0" = self.by-version."commander"."2.4.0"; "glob-4.0.6" = self.by-version."glob"."4.0.6"; "semver-2.3.2" = self.by-version."semver"."2.3.2"; }; @@ -22197,15 +22599,15 @@ passthru.names = [ "traverse" ]; }; by-spec."truncate"."~1.0.2" = - self.by-version."truncate"."1.0.2"; - by-version."truncate"."1.0.2" = lib.makeOverridable self.buildNodePackage { - name = "truncate-1.0.2"; + self.by-version."truncate"."1.0.4"; + by-version."truncate"."1.0.4" = lib.makeOverridable self.buildNodePackage { + name = "truncate-1.0.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/truncate/-/truncate-1.0.2.tgz"; - name = "truncate-1.0.2.tgz"; - sha1 = "3221c41f6e747f83e8613f5466c8bfb596226a66"; + url = "http://registry.npmjs.org/truncate/-/truncate-1.0.4.tgz"; + name = "truncate-1.0.4.tgz"; + sha1 = "2bcfbbff4a97b9089b693c1ae37c5105ec8775aa"; }) ]; buildInputs = @@ -22623,7 +23025,7 @@ buildInputs = (self.nativeDeps."uid-safe" or []); deps = { - "mz-1.0.1" = self.by-version."mz"."1.0.1"; + "mz-1.0.2" = self.by-version."mz"."1.0.2"; "base64-url-1.0.0" = self.by-version."base64-url"."1.0.0"; }; peerDependencies = [ @@ -22867,7 +23269,7 @@ "signals-1.0.0" = self.by-version."signals"."1.0.0"; "hasher-1.2.0" = self.by-version."hasher"."1.2.0"; "blueimp-md5-1.1.0" = self.by-version."blueimp-md5"."1.1.0"; - "color-0.7.1" = self.by-version."color"."0.7.1"; + "color-0.7.3" = self.by-version."color"."0.7.3"; "keen.io-0.1.2" = self.by-version."keen.io"."0.1.2"; "getmac-1.0.6" = self.by-version."getmac"."1.0.6"; "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11"; @@ -22997,15 +23399,15 @@ passthru.names = [ "url" ]; }; by-spec."user-home"."^1.0.0" = - self.by-version."user-home"."1.0.0"; - by-version."user-home"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "user-home-1.0.0"; + self.by-version."user-home"."1.1.0"; + by-version."user-home"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "user-home-1.1.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/user-home/-/user-home-1.0.0.tgz"; - name = "user-home-1.0.0.tgz"; - sha1 = "54ecb631e0fa420e9b0a6b946b158d137825b38b"; + url = "http://registry.npmjs.org/user-home/-/user-home-1.1.0.tgz"; + name = "user-home-1.1.0.tgz"; + sha1 = "1f4e6bce5458aeec4ac80ebcdcc66119c1070cdf"; }) ]; buildInputs = @@ -23219,6 +23621,26 @@ ]; passthru.names = [ "uuid" ]; }; + by-spec."v8flags"."^1.0.1" = + self.by-version."v8flags"."1.0.1"; + by-version."v8flags"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "v8flags-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/v8flags/-/v8flags-1.0.1.tgz"; + name = "v8flags-1.0.1.tgz"; + sha1 = "a35328d86fd040ef9cdeed5387a8e5bcb25216ec"; + }) + ]; + buildInputs = + (self.nativeDeps."v8flags" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "v8flags" ]; + }; by-spec."validator"."0.4.x" = self.by-version."validator"."0.4.28"; by-version."validator"."0.4.28" = lib.makeOverridable self.buildNodePackage { @@ -23491,15 +23913,15 @@ passthru.names = [ "vinyl" ]; }; by-spec."vinyl-fs"."^0.3.0" = - self.by-version."vinyl-fs"."0.3.8"; - by-version."vinyl-fs"."0.3.8" = lib.makeOverridable self.buildNodePackage { - name = "vinyl-fs-0.3.8"; + self.by-version."vinyl-fs"."0.3.10"; + by-version."vinyl-fs"."0.3.10" = lib.makeOverridable self.buildNodePackage { + name = "vinyl-fs-0.3.10"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.8.tgz"; - name = "vinyl-fs-0.3.8.tgz"; - sha1 = "bea09db28e558e5e903a51a5363fcdb59e5aabe4"; + url = "http://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.10.tgz"; + name = "vinyl-fs-0.3.10.tgz"; + sha1 = "f59ac977cb040e95df865ad34cdeb00f57f31f47"; }) ]; buildInputs = @@ -23507,11 +23929,11 @@ deps = { "glob-stream-3.1.15" = self.by-version."glob-stream"."3.1.15"; "glob-watcher-0.0.6" = self.by-version."glob-watcher"."0.0.6"; - "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "strip-bom-1.0.0" = self.by-version."strip-bom"."1.0.0"; - "through2-0.6.2" = self.by-version."through2"."0.6.2"; + "through2-0.6.3" = self.by-version."through2"."0.6.3"; "vinyl-0.4.3" = self.by-version."vinyl"."0.4.3"; }; peerDependencies = [ @@ -23519,7 +23941,7 @@ passthru.names = [ "vinyl-fs" ]; }; by-spec."vinyl-fs"."^0.3.3" = - self.by-version."vinyl-fs"."0.3.8"; + self.by-version."vinyl-fs"."0.3.10"; by-spec."vm-browserify"."~0.0.1" = self.by-version."vm-browserify"."0.0.4"; by-version."vm-browserify"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -23688,15 +24110,15 @@ passthru.names = [ "wcwidth" ]; }; by-spec."wd"."~0.3.4" = - self.by-version."wd"."0.3.8"; - by-version."wd"."0.3.8" = lib.makeOverridable self.buildNodePackage { - name = "wd-0.3.8"; + self.by-version."wd"."0.3.9"; + by-version."wd"."0.3.9" = lib.makeOverridable self.buildNodePackage { + name = "wd-0.3.9"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/wd/-/wd-0.3.8.tgz"; - name = "wd-0.3.8.tgz"; - sha1 = "68c4371561ac32b986dd93f42f89072746c09c84"; + url = "http://registry.npmjs.org/wd/-/wd-0.3.9.tgz"; + name = "wd-0.3.9.tgz"; + sha1 = "857130517e5976203653dd325edc4bdc2dbd946f"; }) ]; buildInputs = @@ -23704,10 +24126,9 @@ deps = { "archiver-0.11.0" = self.by-version."archiver"."0.11.0"; "async-0.9.0" = self.by-version."async"."0.9.0"; - "colors-0.6.2" = self.by-version."colors"."0.6.2"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "q-1.0.1" = self.by-version."q"."1.0.1"; - "request-2.42.0" = self.by-version."request"."2.42.0"; + "request-2.45.0" = self.by-version."request"."2.45.0"; "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3"; "vargs-0.1.0" = self.by-version."vargs"."0.1.0"; }; @@ -23754,7 +24175,7 @@ "kew-0.1.7" = self.by-version."kew"."0.1.7"; "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; "npmconf-0.1.16" = self.by-version."npmconf"."0.1.16"; - "phantomjs-1.9.10" = self.by-version."phantomjs"."1.9.10"; + "phantomjs-1.9.11" = self.by-version."phantomjs"."1.9.11"; "tmp-0.0.24" = self.by-version."tmp"."0.0.24"; "follow-redirects-0.0.3" = self.by-version."follow-redirects"."0.0.3"; }; @@ -23852,15 +24273,15 @@ passthru.names = [ "winser" ]; }; by-spec."winston"."*" = - self.by-version."winston"."0.8.0"; - by-version."winston"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "winston-0.8.0"; + self.by-version."winston"."0.8.1"; + by-version."winston"."0.8.1" = lib.makeOverridable self.buildNodePackage { + name = "winston-0.8.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/winston/-/winston-0.8.0.tgz"; - name = "winston-0.8.0.tgz"; - sha1 = "61d0830fa699706212206b0a2b5ca69a93043668"; + url = "http://registry.npmjs.org/winston/-/winston-0.8.1.tgz"; + name = "winston-0.8.1.tgz"; + sha1 = "86bc9ec6c02aefe5c6dfdb88f3aff1b19d629216"; }) ]; buildInputs = @@ -23877,7 +24298,7 @@ ]; passthru.names = [ "winston" ]; }; - "winston" = self.by-version."winston"."0.8.0"; + "winston" = self.by-version."winston"."0.8.1"; by-spec."winston"."0.6.2" = self.by-version."winston"."0.6.2"; by-version."winston"."0.6.2" = lib.makeOverridable self.buildNodePackage { @@ -23936,8 +24357,32 @@ }; by-spec."winston"."0.8.0" = self.by-version."winston"."0.8.0"; + by-version."winston"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "winston-0.8.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/winston/-/winston-0.8.0.tgz"; + name = "winston-0.8.0.tgz"; + sha1 = "61d0830fa699706212206b0a2b5ca69a93043668"; + }) + ]; + buildInputs = + (self.nativeDeps."winston" or []); + deps = { + "async-0.2.10" = self.by-version."async"."0.2.10"; + "colors-0.6.2" = self.by-version."colors"."0.6.2"; + "cycle-1.0.3" = self.by-version."cycle"."1.0.3"; + "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; + "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; + "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; + }; + peerDependencies = [ + ]; + passthru.names = [ "winston" ]; + }; by-spec."winston"."0.8.x" = - self.by-version."winston"."0.8.0"; + self.by-version."winston"."0.8.1"; by-spec."winston"."~0.7.2" = self.by-version."winston"."0.7.3"; by-version."winston"."0.7.3" = lib.makeOverridable self.buildNodePackage { @@ -24113,7 +24558,7 @@ buildInputs = (self.nativeDeps."write-file-atomic" or []); deps = { - "graceful-fs-3.0.3" = self.by-version."graceful-fs"."3.0.3"; + "graceful-fs-3.0.4" = self.by-version."graceful-fs"."3.0.4"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; }; peerDependencies = [ @@ -24205,7 +24650,7 @@ buildInputs = (self.nativeDeps."xml2js" or []); deps = { - "sax-0.6.0" = self.by-version."sax"."0.6.0"; + "sax-0.6.1" = self.by-version."sax"."0.6.1"; }; peerDependencies = [ ]; @@ -24247,7 +24692,7 @@ buildInputs = (self.nativeDeps."xml2js" or []); deps = { - "sax-0.6.0" = self.by-version."sax"."0.6.0"; + "sax-0.6.1" = self.by-version."sax"."0.6.1"; "xmlbuilder-2.4.4" = self.by-version."xmlbuilder"."2.4.4"; }; peerDependencies = [ @@ -24486,7 +24931,7 @@ deps = { "compress-commons-0.1.6" = self.by-version."compress-commons"."0.1.6"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; - "readable-stream-1.0.32" = self.by-version."readable-stream"."1.0.32"; + "readable-stream-1.0.33-1" = self.by-version."readable-stream"."1.0.33-1"; }; peerDependencies = [ ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b80e5a3c710..cee3368bec07 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -780,13 +780,13 @@ let self = _self // overrides; _self = with self; { }; CatalystModelDBICSchema = buildPerlPackage { - name = "Catalyst-Model-DBIC-Schema-0.60"; + name = "Catalyst-Model-DBIC-Schema-0.65"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/Catalyst-Model-DBIC-Schema-0.60.tar.gz; - sha256 = "176jqvrmhp0wng446m0qlmh1kgqj4z1czg6s418ffr4a7c3jqyld"; + url = mirror://cpan/authors/id/G/GB/GBJK/Catalyst-Model-DBIC-Schema-0.65.tar.gz; + sha256 = "26a911ef5ef7ffc81b6ce65c3156f71fb35083c456ad27e6d82d2dc02493eeea"; }; buildInputs = [ DBDSQLite TestException TestRequires ]; - propagatedBuildInputs = [ CarpClan CatalystComponentInstancePerContext CatalystDevel CatalystRuntime CatalystXComponentTraits DBIxClass DBIxClassCursorCached DBIxClassSchemaLoader HashMerge ListMoreUtils Moose MooseXMarkAsMethods MooseXNonMoose MooseXTypes namespaceautoclean namespaceclean TieIxHash TryTiny ]; + propagatedBuildInputs = [ CarpClan CatalystComponentInstancePerContext CatalystRuntime CatalystXComponentTraits DBIxClass DBIxClassSchemaLoader HashMerge ListMoreUtils ModuleRuntime Moose MooseXMarkAsMethods MooseXNonMoose MooseXTypes MooseXTypesLoadableClass TieIxHash TryTiny namespaceautoclean namespaceclean ]; meta = { description = "DBIx::Class::Schema Model Class"; license = "perl"; @@ -795,13 +795,13 @@ let self = _self // overrides; _self = with self; { }; CatalystRuntime = buildPerlPackage { - name = "Catalyst-Runtime-5.90030"; + name = "Catalyst-Runtime-5.90075"; src = fetchurl { - url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Runtime-5.90030.tar.gz; - sha256 = "c27357f744fa0d2f9b2682c5f86723d90de43f30cd50089306dd13eb8849eb0c"; + url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Runtime-5.90075.tar.gz; + sha256 = "a80ed1b1600a8ababda34bc024756a6fb0275b0fff3fa1bb17104813e3ce8752"; }; - buildInputs = [ ClassDataInheritable DataDump HTTPMessage TestException ]; - propagatedBuildInputs = [ CGISimple CatalystDispatchTypeRegex ClassC3AdoptNEXT ClassLoad DataDump DataOptList HTMLParser HTTPBody HTTPMessage HTTPRequestAsCGI LWP ListMoreUtils MROCompat Moose MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass Plack PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix SubExporter TaskWeaken TextSimpleTable TreeSimple TreeSimpleVisitorFactory TryTiny URI namespaceautoclean namespaceclean ]; + buildInputs = [ DataDump HTTPMessage IOstringy JSONMaybeXS TestFatal ]; + propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT ClassDataInheritable ClassLoad DataDump DataOptList Encode HTMLParser HTTPBody HTTPMessage HTTPRequestAsCGI HashMultiValue JSONMaybeXS LWP ListMoreUtils MROCompat ModulePluggable Moose MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass Plack PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StreamBuffered StringRewritePrefix SubExporter TaskWeaken TextSimpleTable TreeSimple TreeSimpleVisitorFactory TryTiny URI namespaceautoclean namespaceclean ]; meta = { homepage = http://dev.catalyst.perl.org/; description = "The Catalyst Framework Runtime"; @@ -817,6 +817,7 @@ let self = _self // overrides; _self = with self; { sha256 = "0hqvckaw91q5yc25a33bp0d4qqxlgkp7rxlvi8n8svxd1406r55s"; }; propagatedBuildInputs = [ CatalystRuntime DateTime Moose namespaceautoclean ]; + doCheck = false; meta = { description = "Request logging from within Catalyst"; license = "perl"; @@ -1144,6 +1145,19 @@ let self = _self // overrides; _self = with self; { }; }; + CGIStruct = buildPerlPackage { + name = "CGI-Struct-1.21"; + src = fetchurl { + url = mirror://cpan/authors/id/F/FU/FULLERMD/CGI-Struct-1.21.tar.gz; + sha256 = "d13d8da7fdcd6d906054e4760fc28a718aec91bd3cf067a58927fb7cb1c09d6c"; + }; + buildInputs = [ TestDeep ]; + meta = { + description = "Build structures from CGI data"; + license = "bsd"; + }; + }; + ClassAccessor = buildPerlPackage { name = "Class-Accessor-0.34"; src = fetchurl { @@ -1178,13 +1192,13 @@ let self = _self // overrides; _self = with self; { }; ClassAccessorGrouped = buildPerlPackage { - name = "Class-Accessor-Grouped-0.10010"; + name = "Class-Accessor-Grouped-0.10012"; src = fetchurl { - url = mirror://cpan/authors/id/R/RI/RIBASUSHI/Class-Accessor-Grouped-0.10010.tar.gz; - sha256 = "1hlfjfhagsksskv01viq1z14wlr0i4xl3nvznvq1qrnqwqxs4qi1"; + url = mirror://cpan/authors/id/R/RI/RIBASUSHI/Class-Accessor-Grouped-0.10012.tar.gz; + sha256 = "c4613ee3307939f47a9afd40e8b173f3a22f501c3b139799aa030f01b627e7fe"; }; - buildInputs = [ TestException ]; - propagatedBuildInputs = [ ClassXSAccessor ModuleRuntime SubName ]; + buildInputs = [ ClassXSAccessor DevelHide PackageStash SubName TestException ]; + propagatedBuildInputs = [ ModuleRuntime ]; meta = { description = "Lets you build groups of accessors"; license = "perl"; @@ -1640,45 +1654,43 @@ let self = _self // overrides; _self = with self; { }; CPANMeta = buildPerlPackage { - name = "CPAN-Meta-2.120921"; + name = "CPAN-Meta-2.142690"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-2.120921.tar.gz; - sha256 = "12cprk636jaklc97vdh55yjvzcr13h3csdnv3dgna84r2jijka79"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-2.142690.tar.gz; + sha256 = "495770e22e91e3d2bd04dc364f05061cabacfdce35baa3868bc0c05733d145db"; }; - propagatedBuildInputs = [ ParseCPANMeta CPANMetaYAML CPANMetaRequirements ]; + propagatedBuildInputs = [ ParseCPANMeta CPANMetaYAML CPANMetaRequirements JSONPP ]; meta = { - homepage = https://github.com/dagolden/cpan-meta; + homepage = https://github.com/Perl-Toolchain-Gang/CPAN-Meta; description = "The distribution metadata for a CPAN dist"; - license = "perl5"; + license = "perl"; }; }; CPANMetaCheck = buildPerlPackage { - name = "CPAN-Meta-Check-0.004"; + name = "CPAN-Meta-Check-0.009"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.004.tar.gz; - sha256 = "0ccybgfc0p41shmc6nmbg20xljq2ygfjcxmyaf6y07yk6wdcyf7s"; + url = mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.009.tar.gz; + sha256 = "eb2d43afd1da276e4acdebd24937f5171d0aaca8d19a5ef0c3e834b8792b7361"; }; - buildInputs = [ TestDifferences ]; + buildInputs = [ TestDeep ]; propagatedBuildInputs = [ CPANMeta CPANMetaRequirements ]; meta = { - homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; description = "Verify requirements in a CPAN::Meta object"; - license = "perl5"; + license = "perl"; }; }; CPANMetaRequirements = buildPerlPackage { - name = "CPAN-Meta-Requirements-2.125"; + name = "CPAN-Meta-Requirements-2.128"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.125.tar.gz; - sha256 = "1d6sryjkk52n4m8h7l0jc4hr9xrq2d02l8clzm48rq1h6j6q49hq"; + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Meta-Requirements-2.128.tar.gz; + sha256 = "ff0ae309ed76d8c7381fdb8436659a594e6884eeac1c9a742ba9aa7ee2a1d52d"; }; - buildInputs = [ TestMore ]; meta = { - homepage = https://github.com/dagolden/cpan-meta-requirements; + homepage = https://github.com/dagolden/CPAN-Meta-Requirements; description = "A set of version requirements for a CPAN dist"; - license = "perl5"; + license = "perl"; }; }; @@ -2436,14 +2448,13 @@ let self = _self // overrides; _self = with self; { }; DBIxClass = buildPerlPackage { - name = "DBIx-Class-0.08250"; + name = "DBIx-Class-0.082801"; src = fetchurl { - url = mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.08250.tar.gz; - sha256 = "0nsqvj34klc9pf4l5kj3nqkq7agbsn11ys4115100awf7gxjbad6"; + url = mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.082801.tar.gz; + sha256 = "889d6f9139d8e73f5524dfa211019126042e84cb7a0ec30cd2ed7d315d73484b"; }; - patches = [ ../development/perl-modules/dbix-class-fix-tests.patch ]; - buildInputs = [ DBDSQLite PackageStash TestException TestWarn TestDeep ]; - propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ClassMethodModifiers ConfigAny ContextPreserve DataCompare DataDumperConcise DataPage DBI DevelGlobalDestruction HashMerge ModuleFind Moo MROCompat namespaceclean PathClass ScopeGuard SQLAbstract strictures SubName TryTiny ]; + buildInputs = [ DBDSQLite PackageStash TestDeep TestException TestWarn ]; + propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName TryTiny namespaceclean ]; meta = { homepage = http://www.dbix-class.org/; description = "Extensible and flexible object <-> relational mapper"; @@ -2636,13 +2647,13 @@ let self = _self // overrides; _self = with self; { }; DevelStackTrace = buildPerlPackage { - name = "Devel-StackTrace-1.31"; + name = "Devel-StackTrace-1.34"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-1.31.tar.gz; - sha256 = "0djvqfbq9ag1bpw0bcksidfy13n91xbl53py3d7w0y2323hjc957"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-1.34.tar.gz; + sha256 = "e882ccd7f4cbab0d0cdad53897f3f3bf29bdcf47d2bdfde1ac07f1bc7d7ebd16"; }; meta = { - homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + homepage = http://metacpan.org/release/Devel-StackTrace; description = "An object representing a stack trace"; license = "artistic_2"; }; @@ -4440,13 +4451,11 @@ let self = _self // overrides; _self = with self; { }; }; - "if" = buildPerlPackage { - name = "if-0.01000001"; + if_ = buildPerlPackage { + name = "if-0.0601"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/if-0.01000001.tar.gz; - sha256 = "0vb40cb20b22layp5v9xa30hmcnhxidwjkfwcrxwhrvwypy2cmgw"; - }; - meta = { + url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/if-0.0601.tar.gz; + sha256 = "fb2b7329aa111a673cd22dc2889167e52058aead0de2fe0855b32dd658d5c1b7"; }; }; @@ -4796,6 +4805,20 @@ let self = _self // overrides; _self = with self; { }; }; + JSONMaybeXS = buildPerlPackage { + name = "JSON-MaybeXS-1.002005"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/JSON-MaybeXS-1.002005.tar.gz; + sha256 = "f576caf2b10bf3a8eedaf05c0d65e7d3deb52f9c5e1894579ff9ffe71207157f"; + }; + buildInputs = [ TestWithoutModule ]; + propagatedBuildInputs = [ JSONPP ]; + meta = { + description = "Use L with a fallback to L and L"; + license = "perl"; + }; + }; + JSONPP = buildPerlPackage rec { name = "JSON-PP-2.27203"; src = fetchurl { @@ -5490,13 +5513,13 @@ let self = _self // overrides; _self = with self; { }; ModuleBuildTiny = buildPerlModule { - name = "Module-Build-Tiny-0.026"; + name = "Module-Build-Tiny-0.039"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.026.tar.gz; - sha256 = "9a1860325404c4ea20e2a79e7236c5ad9203ab71bacab9667044e3fad1eb31ad"; + url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.039.tar.gz; + sha256 = "7d580ff6ace0cbe555bf36b86dc8ea232581530cbeaaea09bccb57b55797f11c"; }; - buildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP perl ]; - propagatedBuildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP ]; + buildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP TestHarness perl ]; + propagatedBuildInputs = [ ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths JSONPP TestHarness ]; meta = { description = "A tiny replacement for Module::Build"; license = "perl"; @@ -5696,6 +5719,21 @@ let self = _self // overrides; _self = with self; { }; }; + ModuleRuntimeConflicts = buildPerlPackage { + name = "Module-Runtime-Conflicts-0.001"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/Module-Runtime-Conflicts-0.001.tar.gz; + sha256 = "0f73d03846575dd1492d3760deeb9627afaa1f8b04d4d526b1775174201be25f"; + }; + buildInputs = [ ModuleBuildTiny ]; + propagatedBuildInputs = [ DistCheckConflicts ModuleRuntime ]; + meta = { + homepage = https://github.com/karenetheridge/Module-Runtime-Conflicts; + description = "Provide information on conflicts for Module::Runtime"; + license = "perl"; + }; + }; + ModuleScanDeps = buildPerlPackage { name = "Module-ScanDeps-1.10"; src = fetchurl { @@ -5762,17 +5800,19 @@ let self = _self // overrides; _self = with self; { }; Moose = buildPerlPackage { - name = "Moose-2.0604"; + name = "Moose-2.1213"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Moose-2.0604.tar.gz; - sha256 = "0nwvklb8dwf8lskwxik3gi9gsqzrix2jhc56zvfzlf1q5q1s07qj"; + url = mirror://cpan/authors/id/E/ET/ETHER/Moose-2.1213.tar.gz; + sha256 = "0f3b196ae67dc1daaa43c44ae7703f27c4f92c391ad3e252a90e90c50c851e03"; }; - buildInputs = [ DistCheckConflicts TestFatal TestRequires ]; - propagatedBuildInputs = [ ClassLoad ClassLoadXS DataOptList DevelGlobalDestruction DistCheckConflicts EvalClosure ListMoreUtils MROCompat PackageDeprecationManager PackageStash PackageStashXS ParamsUtil SubExporter SubName TaskWeaken TryTiny ]; + buildInputs = [ CPANMetaCheck CPANMetaRequirements DistCheckConflicts TestCleanNamespaces TestFatal TestRequires ]; + propagatedBuildInputs = [ ClassLoad ClassLoadXS DataOptList DevelGlobalDestruction DevelStackTrace DistCheckConflicts EvalClosure ListMoreUtils MROCompat ModuleRuntime ModuleRuntimeConflicts PackageDeprecationManager PackageStash PackageStashXS ParamsUtil SubExporter SubName TaskWeaken TryTiny ]; meta = { - homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + homepage = http://moose.perl.org/; description = "A postmodern object system for Perl 5"; - license = "perl5"; + license = "perl"; + maintainers = [ maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; }; }; @@ -5926,17 +5966,17 @@ let self = _self // overrides; _self = with self; { }; MooseXGetopt = buildPerlPackage { - name = "MooseX-Getopt-0.50"; + name = "MooseX-Getopt-0.65"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Getopt-0.50.tar.gz; - sha256 = "0fwm5vb8z8q4b6fmf7gz4xzw5z713mmfnxzjph6vfyyymlr5bll9"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Getopt-0.65.tar.gz; + sha256 = "c07c2b7312c471bf2d331025c0ad6cc02068633eda1e208cbdb5511ef5da7fda"; }; - buildInputs = [ PathClass TestCheckDeps TestFatal TestMoose TestNoWarnings TestRequires TestTrap TestWarn ]; - propagatedBuildInputs = [ GetoptLongDescriptive Moose MooseXRoleParameterized ]; + buildInputs = [ CPANMeta ModuleBuildTiny ModuleRuntime Moose PathTiny TestDeep TestFatal TestRequires TestTrap TestWarnings if_ ]; + propagatedBuildInputs = [ GetoptLongDescriptive Moose MooseXRoleParameterized TryTiny namespaceautoclean ]; meta = { - homepage = http://metacpan.org/release/MooseX-Getopt; + homepage = https://github.com/moose/MooseX-Getopt; description = "A Moose role for processing command line options"; - license = "perl5"; + license = "perl"; }; }; @@ -6237,16 +6277,20 @@ let self = _self // overrides; _self = with self; { }; }; - MooseXTypesLoadableClass = buildPerlPackage rec { - name = "MooseX-Types-LoadableClass-0.008"; + MooseXTypesLoadableClass = buildPerlPackage { + name = "MooseX-Types-LoadableClass-0.012"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/MooseX-Types-LoadableClass-0.008.tar.gz; - sha256 = "0wh4zxknqv98nrmsp6yg6mazjyl3vacrgywarzjg5gks78c84i8g"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-LoadableClass-0.012.tar.gz; + sha256 = "a1d2b186c2b69f416bb0c9271dc8692c2287c2f6ce144cc3b9b2c922427060df"; }; - propagatedBuildInputs = [ ClassLoad Moose MooseXTypes namespaceclean ]; + buildInputs = [ ModuleBuildTiny Moose TestFatal ]; + propagatedBuildInputs = [ ClassLoad ModuleRuntime Moose MooseXTypes namespaceautoclean ]; meta = { maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; + homepage = https://github.com/moose/MooseX-Types-LoadableClass; + description = "ClassName type constraint with coercion to load the class"; + license = "perl"; }; }; @@ -6414,18 +6458,18 @@ let self = _self // overrides; _self = with self; { doCheck = false; # Test performs network access. }; - namespaceautoclean = buildPerlPackage rec { - name = "namespace-autoclean-0.13"; + namespaceautoclean = buildPerlPackage { + name = "namespace-autoclean-0.20"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/namespace-autoclean-0.13.tar.gz; - sha256 = "1w53k9f9zla90qdn7cyc9dx8zcv26gwy2y87gcazqsq1aj371m04"; + url = mirror://cpan/authors/id/E/ET/ETHER/namespace-autoclean-0.20.tar.gz; + sha256 = "42a199314d07b7a29044d6072529ca53037c75a43550193b1586bd19c690a05f"; }; - buildInputs = [ Moose SubName ]; - propagatedBuildInputs = [ BHooksEndOfScope ClassMOP namespaceclean ]; + buildInputs = [ ModuleBuildTiny TestRequires ]; + propagatedBuildInputs = [ BHooksEndOfScope SubIdentify namespaceclean ]; meta = { - homepage = http://metacpan.org/release/namespace-autoclean; + homepage = https://github.com/moose/namespace-autoclean; description = "Keep imports out of your namespace"; - license = "perl5"; + license = "perl"; }; }; @@ -6500,10 +6544,10 @@ let self = _self // overrides; _self = with self; { }; NetAmazonS3 = buildPerlPackage { - name = "Net-Amazon-S3-0.59"; + name = "Net-Amazon-S3-0.60"; src = fetchurl { - url = mirror://cpan/authors/id/P/PF/PFIG/Net-Amazon-S3-0.59.tar.gz; - sha256 = "94f2bd6b317a9142e400d7d17bd573dc9d22284c3ceaa4864474ba674e0e2e9f"; + url = mirror://cpan/authors/id/P/PF/PFIG/Net-Amazon-S3-0.60.tar.gz; + sha256 = "628937132268e501fb82410f96636e01b183423ea133b6c362894da109d6ac81"; }; buildInputs = [ LWP TestException ]; propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule HTTPDate HTTPMessage LWPUserAgentDetermined MIMETypes Moose MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions PathClass RegexpCommon TermEncoding TermProgressBarSimple URI XMLLibXML JSON ]; @@ -6807,17 +6851,17 @@ let self = _self // overrides; _self = with self; { }; PackageStash = buildPerlPackage { - name = "Package-Stash-0.34"; + name = "Package-Stash-0.37"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-0.34.tar.gz; - sha256 = "1674zs96ndq3czs6v8xkdqqz4fnka0i2835nnns9zbw2q01yirj6"; + url = mirror://cpan/authors/id/D/DO/DOY/Package-Stash-0.37.tar.gz; + sha256 = "06ab05388f9130cd377c0e1d3e3bafeed6ef6a1e22104571a9e1d7bfac787b2c"; }; buildInputs = [ DistCheckConflicts TestFatal TestRequires ]; - propagatedBuildInputs = [ DistCheckConflicts ModuleImplementation PackageDeprecationManager ]; + propagatedBuildInputs = [ DistCheckConflicts ModuleImplementation ]; meta = { homepage = http://metacpan.org/release/Package-Stash; description = "Routines for manipulating stashes"; - license = "perl5"; + license = "perl"; }; }; @@ -7070,6 +7114,50 @@ let self = _self // overrides; _self = with self; { }; }; + PlackMiddlewareFixMissingBodyInRedirect = buildPerlPackage { + name = "Plack-Middleware-FixMissingBodyInRedirect-0.11"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-FixMissingBodyInRedirect-0.11.tar.gz; + sha256 = "eb4d4232344e7da3217347b847736ea55df962d11b870a225315d9241e8fbefb"; + }; + buildInputs = [ HTTPMessage Plack ]; + propagatedBuildInputs = [ HTMLParser Plack ]; + meta = { + homepage = https://github.com/Sweet-kid/Plack-Middleware-FixMissingBodyInRedirect; + description = "Plack::Middleware which sets body for redirect response, if it's not already set"; + license = "perl"; + }; + }; + + PlackMiddlewareMethodOverride = buildPerlModule { + name = "Plack-Middleware-MethodOverride-0.10"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DW/DWHEELER/Plack-Middleware-MethodOverride-0.10.tar.gz; + sha256 = "f8d6a33b56d69dddd5db289f855e100d86ff39099abe31ef40e2672d0dc5568d"; + }; + propagatedBuildInputs = [ Plack URI ]; + meta = { + homepage = http://search.cpan.org/dist/Plack-Middleware-MethodOverride/; + description = "Override REST methods to Plack apps via POST"; + license = "perl"; + }; + }; + + PlackMiddlewareRemoveRedundantBody = buildPerlPackage { + name = "Plack-Middleware-RemoveRedundantBody-0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-RemoveRedundantBody-0.05.tar.gz; + sha256 = "a0676e1c792bea7f25f1d901bee59054d35012d5ea8cd42529d336143fa87cd8"; + }; + buildInputs = [ HTTPMessage Plack ]; + propagatedBuildInputs = [ Plack ]; + meta = { + homepage = https://github.com/Sweet-kid/Plack-Middleware-RemoveRedundantBody; + description = "Plack::Middleware which sets removes body for HTTP response if it's not required"; + license = "perl"; + }; + }; + PlackMiddlewareReverseProxy = buildPerlPackage { name = "Plack-Middleware-ReverseProxy-0.15"; src = fetchurl { @@ -7670,13 +7758,13 @@ let self = _self // overrides; _self = with self; { }; SQLAbstract = buildPerlPackage { - name = "SQL-Abstract-1.73"; + name = "SQL-Abstract-1.80"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/SQL-Abstract-1.73.tar.gz; - sha256 = "081ppyvsc66yshmfr9q9v7hp9g58725nnibd771i9g153vzs49kb"; + url = mirror://cpan/authors/id/R/RI/RIBASUSHI/SQL-Abstract-1.80.tar.gz; + sha256 = "de4d0507fca0c6340c17867abca0632017bd56594443e67ea6ace826ba9a07a2"; }; - buildInputs = [ TestException TestWarn ]; - propagatedBuildInputs = [ ClassAccessorGrouped GetoptLongDescriptive HashMerge ]; + buildInputs = [ TestDeep TestException TestWarn ]; + propagatedBuildInputs = [ HashMerge MROCompat Moo ]; meta = { description = "Generate SQL from Perl data structures"; license = "perl"; @@ -8488,6 +8576,21 @@ let self = _self // overrides; _self = with self; { }; }; + TestCleanNamespaces = buildPerlPackage { + name = "Test-CleanNamespaces-0.16"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.16.tar.gz; + sha256 = "9779378394b9be32cf04129fafe2d40d74f6f200f593f1494998bd128a6ed9fa"; + }; + buildInputs = [ ModuleRuntime TestDeep TestRequires TestTester TestWarnings if_ ]; + propagatedBuildInputs = [ FileFindRule FileFindRulePerl ModuleRuntime PackageStash SubExporter SubIdentify namespaceclean ]; + meta = { + homepage = https://github.com/karenetheridge/Test-CleanNamespaces; + description = "Check for uncleaned imports"; + license = "perl"; + }; + }; + TestCPANMeta = buildPerlPackage { name = "Test-CPAN-Meta-0.23"; src = fetchurl { @@ -8609,11 +8712,17 @@ let self = _self // overrides; _self = with self; { }; }; - TestHarness = buildPerlPackage rec { - name = "Test-Harness-3.17"; + TestHarness = buildPerlPackage { + name = "Test-Harness-3.33"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AN/ANDYA/${name}.tar.gz"; - sha256 = "0j390xx6an88gh49n7zz8mj1s3z0xsxc8dynfq71xf7ba7i1afhr"; + url = mirror://cpan/authors/id/L/LE/LEONT/Test-Harness-3.33.tar.gz; + sha256 = "c22e36287d5cee3c28fd2006e3c8b6e7cc76c6fc39d79c7ab74f1936d35e8fe2"; + }; + doCheck = false; # makes assumptions about path to Perl + meta = { + homepage = http://testanything.org/; + description = "Run Perl standard test scripts with statistics"; + license = "perl"; }; }; @@ -8701,20 +8810,7 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [TestException UNIVERSALisa UNIVERSALcan]; }; - TestMoose = buildPerlPackage { - name = "Test-Moose-2.0604"; - src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Moose-2.0604.tar.gz; - sha256 = "0nwvklb8dwf8lskwxik3gi9gsqzrix2jhc56zvfzlf1q5q1s07qj"; - }; - buildInputs = [ DistCheckConflicts TestFatal TestRequires ]; - propagatedBuildInputs = [ ClassLoad ClassLoadXS DataOptList DevelGlobalDestruction DistCheckConflicts EvalClosure ListMoreUtils MROCompat PackageDeprecationManager PackageStash PackageStashXS ParamsUtil SubExporter SubName TaskWeaken TryTiny ]; - meta = { - homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; - description = "A postmodern object system for Perl 5"; - license = "perl5"; - }; - }; + TestMoose = Moose; TestMockTime = buildPerlPackage rec { name = "Test-MockTime-0.12"; @@ -9014,13 +9110,13 @@ let self = _self // overrides; _self = with self; { }; }; - TestWarnings = buildPerlModule { - name = "Test-Warnings-0.008"; + TestWarnings = buildPerlPackage { + name = "Test-Warnings-0.016"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.008.tar.gz; - sha256 = "119f2a279fe7d0681dcf4517f1bcb056e4596cfbae7b9ee447118f036cf089e4"; + url = mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.016.tar.gz; + sha256 = "09ebc9afa29eb4d1d44fbd974dfcd52e0a2d9ce7ec3e3ee7602394157831aba9"; }; - buildInputs = [ CaptureTiny ModuleBuildTiny TestCheckDeps TestDeep TestTester pkgs.perlPackages."if" ]; + buildInputs = [ TestTester if_ ]; meta = { homepage = https://github.com/karenetheridge/Test-Warnings; description = "Test for warnings and the lack of them"; @@ -9089,6 +9185,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 ]; propagatedBuildInputs = [ Plack TestWWWMechanize TryTiny ]; meta = { description = "Test PSGI programs using WWW::Mechanize"; @@ -9524,13 +9621,16 @@ let self = _self // overrides; _self = with self; { }; TryTiny = buildPerlPackage { - name = "Try-Tiny-0.12"; + name = "Try-Tiny-0.22"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Try-Tiny-0.12.tar.gz; - sha256 = "0awv2w33jb1xw3bsrfwsz53dgwm8s8vnpk4ssxxp3n89i7116p2g"; + url = mirror://cpan/authors/id/D/DO/DOY/Try-Tiny-0.22.tar.gz; + sha256 = "60fba46f4693d33d54539104f9001df008dabb400b6837e9605c39a6ee6a1b19"; }; + buildInputs = [ if_ ]; meta = { - homepage = https://github.com/doy/try-tiny.git; + homepage = http://metacpan.org/release/Try-Tiny; + description = "Minimal try/catch with proper preservation of $@"; + license = "mit"; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ae356dc19250..000ff72bd48d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -102,6 +102,8 @@ let }; ipython = callPackage ../shells/ipython { + inherit pythonPackages; + qtconsoleSupport = !pkgs.stdenv.isDarwin; # qt is not supported on darwin pylabQtSupport = !pkgs.stdenv.isDarwin; pylabSupport = !pkgs.stdenv.isDarwin; # cups is not supported on darwin @@ -121,7 +123,7 @@ let # This is used for NixOps to make sure we won't break it with the next major # version of nixpart. - nixpart0 = self.nixpart; + nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { }; pitz = callPackage ../applications/misc/pitz { }; @@ -393,6 +395,17 @@ let }; + application = buildPythonPackage rec { + name = "python-application-${version}"; + version = "1.4.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/python-application/${name}.tar.gz"; + sha256 = "3ae188e9dfd4bd63c9b43aebbf1d9de5df03fb5ac01e72f3bff5b41007570275"; + }; + }; + + apsw = buildPythonPackage rec { name = "apsw-3.7.6.2-r1"; disabled = isPyPy; @@ -759,7 +772,7 @@ let maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; - + circus = buildPythonPackage rec { name = "circus-0.11.1"; @@ -768,11 +781,30 @@ let md5 = "5c07cdbe9bb4a9b82e52737ad590617b"; }; - doCheck = false; # weird error + doCheck = false; # weird error propagatedBuildInputs = with self; [ iowait psutil pyzmq tornado mock ]; }; + cvxopt = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "cvxopt"; + version = "1.1.7"; + disabled = isPyPy; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/c/${pname}/${name}.tar.gz"; + sha256 = "f856ea2e9e2947abc1a6557625cc6b0e45228984f397a90c420b2f468dc4cb97"; + }; + doCheck = false; + buildInputs = with pkgs; [ liblapack blas ]; + meta = with stdenv.lib; { + homepage = "http://cvxopt.org/"; + description = "Python Software for Convex Optimization"; + maintainers = with maintainers; [ edwtjo ]; + licsense = licenses.gpl3Plus; + }; + }; + iowait = buildPythonPackage rec { name = "iowait-0.2"; @@ -1024,6 +1056,31 @@ let }; }; + box2d = buildPythonPackage rec { + name = "box2d-${version}"; + version = "2.3b0"; + disabled = (!isPy27); + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/B/Box2D/Box2D-2.3b0.zip"; + md5="25fc4f69cd580bdca0022ac3ace53865"; + }; + + patches = [ ../development/python-modules/box2d/disable-test.patch ]; + + propagatedBuildInputs = [ pkgs.swig pkgs.box2d ]; + + meta = with stdenv.lib; { + homepage = https://code.google.com/p/pybox2d/; + description = '' + A 2D game physics library for Python under + the very liberal zlib license + ''; + license = licenses.zlib; + platforms = platforms.all; + maintainers = [ maintainers.sepi ]; + }; + }; # bugz = buildPythonPackage (rec { # name = "bugz-0.9.3"; @@ -1258,6 +1315,25 @@ let }); + cjson = buildPythonPackage rec { + name = "python-cjson-${version}"; + version = "1.1.0"; + disabled = isPy3k || isPyPy; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/python-cjson/${name}.tar.gz"; + sha256 = "a01fabb7593728c3d851e1cd9a3efbd18f72650a31a5aa8a74018640da3de8b3"; + }; + + meta = with stdenv.lib; { + description = "This module implements a very fast JSON encoder/decoder for Python."; + homepage = "http://ag-projects.com/"; + license = licenses.lgpl2; + platforms = platforms.all; + }; + }; + + click = buildPythonPackage { name = "click-2.1"; src = pkgs.fetchurl { @@ -1933,6 +2009,16 @@ let }; }; + dns = buildPythonPackage rec { + name = "dnspython-${version}"; + version = "1.12.0"; + + src = pkgs.fetchurl { + url = "http://www.dnspython.org/kits/1.12.0/dnspython-1.12.0.tar.gz"; + sha256 = "0kvjlkp96qzh3j31szpjlzqbp02brixh4j4clnpw80b0hspq5yq3"; + }; + }; + docker = buildPythonPackage rec { name = "docker-py-0.4.0"; @@ -2099,6 +2185,26 @@ let }; + eventlib = buildPythonPackage rec { + name = "python-eventlib-${version}"; + version = "0.2.0"; + + src = pkgs.fetchurl { + url = "http://download.ag-projects.com/SipClient/${name}.tar.gz"; + sha256 = "0fld5lb85ql4a5bgc38sdxi5pgzqljysp1p8f7abxnd6vymh4rgi"; + }; + + propagatedBuildInputs = with self; [ greenlet ]; + + meta = with stdenv.lib; { + description = "Eventlib bindings for python."; + homepage = "http://ag-projects.com/"; + license = licenses.lgpl2; + platforms = platforms.all; + }; + }; + + eyeD3 = buildPythonPackage rec { version = "0.7.4"; name = "eyeD3-${version}"; @@ -2299,6 +2405,16 @@ let propagatedBuildInputs = with self; [ gflags iso8601_0_1_4 ipaddr httplib2 google_apputils google_api_python_client ]; }; + 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"; + }; + + propagatedBuildInputs = with self; [ pkgs.gnutls ]; + }; + gitdb = buildPythonPackage rec { name = "gitdb-0.5.4"; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; @@ -4041,18 +4157,22 @@ let }; }; + greenlet = buildPythonPackage rec { - name = "greenlet-0.4.3"; + name = "greenlet-${version}"; + version = "0.4.4"; disabled = isPyPy; # builtin for pypy src = pkgs.fetchurl { - url = "http://pypi.python.org/packages/source/g/greenlet/${name}.zip"; - md5 = "a5e467a5876c415cd357c1ab9027e06c"; + url = "https://pypi.python.org/packages/source/g/greenlet/${name}.zip"; + sha256 = "935a76b7ad3c41846af26e136e2fd8ec763794cbc5b5fbc4b7b09d9a8de1d056"; }; - meta = { + meta = with stdenv.lib; { homepage = http://pypi.python.org/pypi/greenlet; description = "Module for lightweight in-process concurrent programming"; + license = licenses.lgpl2; + platforms = platforms.all; }; }; @@ -5077,6 +5197,19 @@ let }; + msrplib = buildPythonPackage rec { + name = "python-msrplib-${version}"; + version = "0.15.0"; + + src = pkgs.fetchurl { + url = "http://download.ag-projects.com/SipClient/${name}.tar.gz"; + sha256 = "1sm03jcz663xkbhfmrk7rr5l3wlkydn8xs56fvqjxyapx0m5sw6f"; + }; + + propagatedBuildInputs = with self; [ eventlib application gnutls ]; + }; + + munkres = buildPythonPackage rec { name = "munkres-1.0.6"; @@ -5755,6 +5888,17 @@ let }); + pagerduty = buildPythonPackage rec { + name = "pagerduty-${version}"; + version = "0.2.1"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pagerduty/pagerduty-${version}.tar.gz"; + md5 = "8109a330d16751a7f4041c0ccedec787"; + }; + }; + pandas = buildPythonPackage rec { name = "pandas-0.14.0"; @@ -6073,7 +6217,7 @@ let md5 = "56b6614499aacb7d6b5983c4914daea7"; }; - buildInputs = with self; [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp ]; + buildInputs = with self; [ pkgs.freetype pkgs.libjpeg pkgs.zlib pkgs.libtiff pkgs.libwebp pkgs.tcl ]; # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp. preConfigure = '' @@ -6082,11 +6226,10 @@ let s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ; s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ; s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include("${pkgs.libwebp}")|g ; - s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ;' + s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ; + s|^TCL_ROOT=.*$|TCL_ROOT = _lib_include("${pkgs.tcl}")|g ;' ''; - - meta = { homepage = http://python-imaging.github.com/Pillow; @@ -6400,6 +6543,7 @@ let }; }; + pycapnp = buildPythonPackage rec { name = "pycapnp-0.4.4"; disabled = isPyPy || isPy3k; @@ -6739,6 +6883,17 @@ let sha256 = "17wq4invmv1nfazaksf59ymqyvgv3i8h4q03ry2az0s9lldyg3dv"; }; + patches = singleton (pkgs.fetchurl { + url = "https://www.redhat.com/archives/pyparted-devel/" + + "2014-April/msg00000.html"; + postFetch = '' + sed -i -ne '//,// { + s/^<[^>]*>//; /^$/!p + }' "$downloadedFile" + ''; + sha256 = "1lakhz3nvx0qacn90bj1nq13zqxphiw4d9dsc44gwa8nj24j2zws"; + }); + postPatch = '' sed -i -e 's|/sbin/mke2fs|${pkgs.e2fsprogs}&|' tests/baseclass.py sed -i -e ' @@ -6889,6 +7044,18 @@ let doCheck = false; }); + python_simple_hipchat = buildPythonPackage rec { + name = "python-simple-hipchat-${version}"; + version = "0.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/python-simple-hipchat/python-simple-hipchat-${version}.zip"; + md5 = "3806b3729a021511bac065360832f197"; + }; + + buildInputs = [ pkgs.unzip ]; + }; + python_keyczar = buildPythonPackage rec { name = "python-keyczar-0.71c"; @@ -7881,6 +8048,28 @@ let }; + scapy = buildPythonPackage rec { + name = "scapy-2.2.0"; + + disabled = isPy3k || isPyPy; + + src = pkgs.fetchurl { + url = "http://www.secdev.org/projects/scapy/files/${name}.tar.gz"; + sha256 = "1bqmp0xglkndrqgmybpwmzkv462mir8qlkfwsxwbvvzh9li3ndn5"; + }; + + propagatedBuildInputs = [ modules.readline ]; + + meta = with stdenv.lib; { + description = "Powerful interactive network packet manipulation program"; + homepage = http://www.secdev.org/projects/scapy/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.bjornfor ]; + }; + }; + + scipy = buildPythonPackage rec { name = "scipy-0.14.0"; @@ -8109,7 +8298,7 @@ let sha256 = "bec9269cbfa58de4f0849ec79bb7d54eeeed9df8b5fbfa1637fbc68062822847"; }; - buildInputs = with self; [ pbr pip ]; + buildInputs = with self; [ pbr pip ] ++ optional isPy26 argparse; propagatedBuildInputs = with self; [ setuptools ]; @@ -8306,12 +8495,34 @@ let }; + sipsimple = buildPythonPackage rec { + name = "sipsimple-${version}"; + version = "1.4.2"; + disabled = isPy3k; + + configurePhase = "find -name 'configure' -exec chmod a+x {} \\; ; find -name 'aconfigure' -exec chmod a+x {} \\; ; ${python}/bin/${python.executable} setup.py build_ext --pjsip-clean-compile"; + + src = pkgs.fetchurl { + url = "http://download.ag-projects.com/SipClient/python-${name}.tar.gz"; + sha256 = "f6e6de7ab5f20e8ae08966b8811462e4271833db4f7fbab58ffba4e5c07ab114"; + }; + + propagatedBuildInputs = with self; [ cython pkgs.openssl dns dateutil xcaplib msrplib]; + + buildInputs = with self; [ pkgs.alsaLib ]; + + installPhase = "${python}/bin/${python.executable} setup.py install --prefix=$out"; + + doCheck = false; + }; + + six = buildPythonPackage rec { - name = "six-1.7.3"; + name = "six-1.8.0"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/s/six/${name}.tar.gz"; - md5 = "784c6e5541c3c4952de9c0a966a0a80b"; + md5 = "1626eb24cc889110c38f7e786ec69885"; }; # error: invalid command 'test' @@ -8422,7 +8633,21 @@ let md5 = "754c5ab9f533e764f931136974b618f1"; }; - doCheck = false; + buildInputs = [ pkgs.bash ]; + + preConfigure = '' + substituteInPlace test_subprocess32.py \ + --replace '/usr/' '${pkgs.bash}/' + ''; + + checkPhase = '' + TMP_PREFIX=`pwd`/tmp/$name + TMP_INSTALL_DIR=$TMP_PREFIX/lib/${pythonPackages.python.libPrefix}/site-packages + PYTHONPATH="$TMP_INSTALL_DIR:$PYTHONPATH" + mkdir -p $TMP_INSTALL_DIR + python setup.py develop --prefix $TMP_PREFIX + python test_subprocess32.py + ''; meta = { homepage = "https://pypi.python.org/pypi/subprocess32"; @@ -9256,7 +9481,11 @@ let preConfigure = "export HOME=$TMPDIR"; buildInputs = with self; [ pbr pip pkgs.which ]; - propagatedBuildInputs = with self; [ stevedore virtualenv virtualenv-clone ]; + propagatedBuildInputs = with self; [ + stevedore + virtualenv + virtualenv-clone + ] ++ optional isPy26 argparse; patchPhase = '' substituteInPlace "virtualenvwrapper.sh" --replace "which" "${pkgs.which}/bin/which" @@ -9492,6 +9721,18 @@ let wxGTK = pkgs.wxGTK30; }; + xcaplib = buildPythonPackage rec { + name = "python-xcaplib-${version}"; + version = "1.0.17"; + + src = pkgs.fetchurl { + url = "http://download.ag-projects.com/SipClient/${name}.tar.gz"; + sha256 = "1bf8n9ghmgxz8kjgnwy4y7ajijy5hi7viabgh0pvzkhz9gfvck86"; + }; + + propagatedBuildInputs = with self; [ eventlib application ]; + }; + xe = buildPythonPackage rec { url = "http://www.blarg.net/%7Esteveha/xe-0.7.4.tar.gz"; name = stdenv.lib.nameFromURL url ".tar"; @@ -10212,24 +10453,22 @@ let }; }; + hgsvn = buildPythonPackage rec { + name = "hgsvn-0.3.5"; + src = pkgs.fetchurl rec { + url = "http://pypi.python.org/packages/source/h/hgsvn/${name}.zip"; + sha256 = "043yvkjf9hgm0xzhmwj1qk3fsmbgwm39f4wsqkscib9wfvxs8wbg"; + }; + disabled = isPy3k || isPyPy; - # XXX: link broken - # hgsvn = buildPythonPackage rec { - # name = "hgsvn-0.1.8"; - # src = pkgs.fetchurl rec { - # name = "hgsvn-0.1.8.tar.gz"; - # url = "http://pypi.python.org/packages/source/h/hgsvn/${name}.tar.gz#md5=56209eae48b955754e09185712123428"; - # sha256 = "18a7bj1i0m4shkxmdvw1ci5i0isq5vqf0bpwgrhnk305rijvbpch"; - # }; - # - # buildInputs = with self; [ pkgs.setuptools ]; - # doCheck = false; - # - # meta = { - # description = "HgSVN"; - # homepage = http://pypi.python.org/pypi/hgsvn; - # }; - # }; + buildInputs = with self; [ pkgs.setuptools ]; + doCheck = false; + + meta = { + description = "HgSVN"; + homepage = http://pypi.python.org/pypi/hgsvn; + }; + }; cliapp = buildPythonPackage rec { name = "cliapp-${version}"; @@ -10746,6 +10985,33 @@ let }; }; + graphite_pager = buildPythonPackage rec { + name = "graphite-pager-${version}"; + version = "2bbfe91220ec1e0ca1cdf4b5564386482a44ed7d"; + + src = pkgs.fetchgit { + url = "https://github.com/offlinehacker/graphite-pager.git"; + sha256 = "aa932f941efe4ed89971fe7572218b020d1a144259739ef78db6397b968eef62"; + rev = version; + }; + + buildInputs = with self; [ nose mock ]; + propagatedBuildInputs = with self; [ + jinja2 pyyaml redis requests pagerduty + python_simple_hipchat pushbullet + ]; + + patchPhase = "> requirements.txt"; + checkPhase = "nosetests"; + + meta = { + description = "A simple alerting application for Graphite metrics"; + homepage = https://github.com/seatgeek/graphite-pager; + maintainers = [ maintainers.offline ]; + license = licenses.bsd2; + }; + }; + pyspotify = buildPythonPackage rec { name = "pyspotify-${version}"; @@ -10936,6 +11202,7 @@ let }; }; + grequests = buildPythonPackage rec { name = "grequests-0.2.0"; @@ -10988,6 +11255,18 @@ let }; }; + pushbullet = buildPythonPackage rec { + name = "pushbullet.py-${version}"; + version = "0.5.0"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pushbullet.py/pushbullet.py-0.5.0.tar.gz"; + md5 = "36c83ba5f7d5208bb86c00eba633f921"; + }; + + propagatedBuildInputs = with self; [requests websocket_client python_magic ]; + }; + power = buildPythonPackage rec { name = "power-1.2"; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 71f51554719c..b07efec5c674 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -12,7 +12,7 @@ { nixpkgs ? { outPath = (import ./all-packages.nix {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false , # The platforms for which we build Nixpkgs. - supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ] + supportedSystems ? [ "x86_64-linux" "i686-linux" /* "x86_64-darwin" */ ] }: with import ./release-lib.nix { inherit supportedSystems; };