diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 6cd9d18c8dfa..aec2e34e729c 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -89,6 +89,7 @@ codyopel = "Cody Opel "; colemickens = "Cole Mickens "; copumpkin = "Dan Peebles "; + corngood = "David McFarland "; coroa = "Jonas Hörsch "; couchemar = "Andrey Pavlov "; cransom = "Casey Ransom "; @@ -348,6 +349,7 @@ roblabla = "Robin Lambertz "; roconnor = "Russell O'Connor "; romildo = "José Romildo Malaquias "; + ronny = "Ronny Pfannschmidt "; rszibele = "Richard Szibele "; rushmorem = "Rushmore Mushambi "; rvl = "Rodney Lorrimar "; diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml index 56d08bf1c2d6..43fb2b0a3a30 100644 --- a/nixos/doc/manual/release-notes/rl-1609.xml +++ b/nixos/doc/manual/release-notes/rl-1609.xml @@ -49,7 +49,62 @@ has the following highlights: The following new services were added since the last release: - (this will get automatically generated at release time) + hardware/video/amdgpu.nix + hardware/video/displaylink.nix + programs/info.nix + programs/mosh.nix + programs/spacefm.nix + programs/tmux.nix + programs/xonsh.nix + security/chromium-suid-sandbox.nix + security/hidepid.nix + services/audio/squeezelite.nix + services/backup/znapzend.nix + services/continuous-integration/buildkite-agent.nix + services/continuous-integration/hydra/default.nix + services/continuous-integration/gocd-agent/default.nix + services/continuous-integration/gocd-server/default.nix + services/development/hoogle.nix + services/editors/emacs.nix + services/games/factorio.nix + services/games/terraria.nix + services/logging/awstats.nix + services/logging/graylog.nix + services/misc/emby.nix + services/misc/mantisbt.nix + services/misc/nzbget.nix + services/misc/packagekit.nix + services/misc/sonarr.nix + services/misc/spice-vdagentd.nix + services/misc/taskserver + services/network-filesystems/tahoe.nix + services/networking/coturn.nix + services/networking/ferm.nix + services/networking/gdomap.nix + services/networking/libreswan.nix + services/networking/logmein-hamachi.nix + services/networking/mfi.nix + services/networking/mjpg-streamer.nix + services/networking/mosquitto.nix + services/networking/nntp-proxy.nix + services/networking/offlineimap.nix + services/networking/pptpd.nix + services/networking/sniproxy.nix + services/networking/smokeping.nix + services/networking/toxvpn.nix + services/networking/xl2tpd.nix + services/networking/zerobin.nix + services/security/oauth2_proxy.nix + services/torrent/flexget.nix + services/web-apps/mattermost.nix + services/web-apps/tt-rss.nix + services/web-servers/caddy.nix + services/web-servers/lighttpd/inginious.nix + services/x11/compton.nix + services/x11/xbanish.nix + system/boot/loader/systemd-boot/systemd-boot.nix + system/boot/plymouth.nix + virtualisation/xe-guest-utilities.nix When upgrading from a previous release, please be aware of the @@ -108,6 +163,13 @@ following incompatible changes: + + + Using packages compiled with older Wayland may yield an error "undefined reference to `wl_proxy_*`". + Please upgrade those packages and see bug report for more details. + + + Gitlab's maintainance script gitlab-runner was removed and split up into the diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 109959cd5126..7fad5cbc3cd9 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -181,9 +181,11 @@ rec { eval $i2=/tmp/xchg/$_basename ${coreutils}/bin/ls -la $xchg done - unset i i2 _basename xchg - export > $xchg/saved-env + unset i i2 _basename + export | ${gnugrep}/bin/grep -v '^xchg=' > $xchg/saved-env + unset xchg + export tests='${testScript}' ${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm ''; # */ diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix index b9844b4adade..39a45042c6cc 100644 --- a/nixos/modules/config/timezone.nix +++ b/nixos/modules/config/timezone.nix @@ -37,14 +37,15 @@ in environment.sessionVariables.TZDIR = "/etc/zoneinfo"; + # This way services are restarted when tzdata changes. systemd.globalEnvironment.TZDIR = tzdir; environment.etc.localtime = - { source = "${tzdir}/${config.time.timeZone}"; + { source = "/etc/zoneinfo/${config.time.timeZone}"; mode = "direct-symlink"; }; - environment.etc.zoneinfo.source = "${pkgs.tzdata}/share/zoneinfo"; + environment.etc.zoneinfo.source = tzdir; }; diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix new file mode 100644 index 000000000000..3723d7690dc6 --- /dev/null +++ b/nixos/modules/hardware/video/amdgpu-pro.nix @@ -0,0 +1,56 @@ +# This module provides the proprietary AMDGPU-PRO drivers. + +{ config, lib, pkgs, pkgs_i686, ... }: + +with lib; + +let + + drivers = config.services.xserver.videoDrivers; + + enabled = elem "amdgpu-pro" drivers; + + package = config.boot.kernelPackages.amdgpu-pro; + package32 = pkgs_i686.linuxPackages.amdgpu-pro.override { libsOnly = true; kernel = null; }; + + opengl = config.hardware.opengl; + +in + +{ + + config = mkIf enabled { + + services.xserver.drivers = singleton + { name = "amdgpu"; modules = [ package ]; libPath = [ package ]; }; + + hardware.opengl.package = package; + hardware.opengl.package32 = package32; + + boot.extraModulePackages = [ package ]; + + boot.blacklistedKernelModules = [ "radeon" ]; + + hardware.firmware = [ package ]; + + system.activationScripts.setup-amdgpu-pro = '' + mkdir -p /run/lib + ln -sfn ${package}/lib ${package.libCompatDir} + '' + optionalString opengl.driSupport32Bit '' + ln -sfn ${package32}/lib ${package32.libCompatDir} + ''; + + environment.etc = { + "amd/amdrc".source = package + "/etc/amd/amdrc"; + "amd/amdapfxx.blb".source = package + "/etc/amd/amdapfxx.blb"; + "gbm/gbm.conf".source = package + "/etc/gbm/gbm.conf"; + "OpenCL/vendors/amdocl64.icd".source = package + "/etc/OpenCL/vendors/amdocl64.icd"; + "vulkan/icd.d/amd_icd64.json".source = package + "/etc/vulkan/icd.d/amd_icd64.json"; + } // optionalAttrs opengl.driSupport32Bit { + "OpenCL/vendors/amdocl32.icd".source = package32 + "/etc/OpenCL/vendors/amdocl32.icd"; + "vulkan/icd.d/amd_icd32.json".source = package32 + "/etc/vulkan/icd.d/amd_icd32.json"; + }; + + }; + +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2bde36ecbec8..6c9619004fc1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -38,6 +38,7 @@ ./hardware/opengl.nix ./hardware/pcmcia.nix ./hardware/video/amdgpu.nix + ./hardware/video/amdgpu-pro.nix ./hardware/video/ati.nix ./hardware/video/bumblebee.nix ./hardware/video/displaylink.nix diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 45e8f64046b0..37e785b548bf 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -283,6 +283,7 @@ in timerConfig = { OnCalendar = cfg.renewInterval; Unit = "acme-${cert}.service"; + Persistent = "yes"; }; }) ); diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix index 5f3efcd133a1..1e7f7437b8a1 100644 --- a/nixos/modules/services/networking/kippo.nix +++ b/nixos/modules/services/networking/kippo.nix @@ -54,7 +54,7 @@ rec { }; config = mkIf cfg.enable { environment.systemPackages = with pkgs.pythonPackages; [ - python twisted_11 pycrypto pyasn1 ]; + python pkgs.kippo.twisted pycrypto pyasn1 ]; environment.etc."kippo.cfg".text = '' # Automatically generated by NixOS. @@ -84,7 +84,7 @@ rec { description = "Kippo Web Server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - environment.PYTHONPATH = "${pkgs.kippo}/src/:${pkgs.pythonPackages.pycrypto}/lib/python2.7/site-packages/:${pkgs.pythonPackages.pyasn1}/lib/python2.7/site-packages/:${pkgs.pythonPackages.python}/lib/python2.7/site-packages/:${pkgs.pythonPackages.twisted_11}/lib/python2.7/site-packages/:."; + environment.PYTHONPATH = "${pkgs.kippo}/src/:${pkgs.pythonPackages.pycrypto}/lib/python2.7/site-packages/:${pkgs.pythonPackages.pyasn1}/lib/python2.7/site-packages/:${pkgs.pythonPackages.python}/lib/python2.7/site-packages/:${pkgs.kippo.twisted}/lib/python2.7/site-packages/:."; preStart = '' if [ ! -d ${cfg.varPath}/ ] ; then mkdir -p ${cfg.logPath}/tty @@ -107,7 +107,7 @@ rec { fi ''; - serviceConfig.ExecStart = "${pkgs.pythonPackages.twisted_11}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n"; + serviceConfig.ExecStart = "${pkgs.kippo.twisted}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n"; serviceConfig.PermissionsStartOnly = true; serviceConfig.User = "kippo"; serviceConfig.Group = "kippo"; diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 16d1e89e8d96..c12fb6ed31ca 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -14,7 +14,7 @@ let xserverWrapper = pkgs.writeScript "xserver-wrapper" '' #!/bin/sh ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)} - exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs} "$@" + exec systemd-cat ${dmcfg.xserverBin} ${dmcfg.xserverArgs} "$@" ''; Xsetup = pkgs.writeScript "Xsetup" '' diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 6c6a1e79ed0e..8fb8701e5d87 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -529,6 +529,10 @@ in Restart = "always"; RestartSec = "200ms"; SyslogIdentifier = "display-manager"; + # Stop restarting if the display manager stops (crashes) 2 times + # in one minute. Starting X typically takes 3-4s. + StartLimitInterval = "30s"; + StartLimitBurst = "3"; }; }; diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index 4c3d30e346c5..f8741e16fc86 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -145,6 +145,7 @@ in ${pkgs.e2fsprogs}/bin/chattr -f -i /var/empty || true find /var/empty -mindepth 1 -delete chmod 0555 /var/empty + chown root:root /var/empty ${pkgs.e2fsprogs}/bin/chattr -f +i /var/empty || true ''; diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index bdf6ed4dcd29..ffd1cbec3ce3 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -1,4 +1,4 @@ -{ +let self = { "14.04".ap-northeast-1.hvm-ebs = "ami-71c6f470"; "14.04".ap-northeast-1.pv-ebs = "ami-4dcbf84c"; "14.04".ap-northeast-1.pv-s3 = "ami-8fc4f68e"; @@ -134,4 +134,52 @@ "16.03".us-west-2.hvm-s3 = "ami-925c9ff2"; "16.03".us-west-2.pv-ebs = "ami-5e61a23e"; "16.03".us-west-2.pv-s3 = "ami-734c8f13"; -} + + # 16.09.666.3738950 + "16.09".ap-northeast-1.hvm-ebs = "ami-35578954"; + "16.09".ap-northeast-1.hvm-s3 = "ami-d6528cb7"; + "16.09".ap-northeast-1.pv-ebs = "ami-07548a66"; + "16.09".ap-northeast-1.pv-s3 = "ami-f1548a90"; + "16.09".ap-northeast-2.hvm-ebs = "ami-d48753ba"; + "16.09".ap-northeast-2.hvm-s3 = "ami-4c865222"; + "16.09".ap-northeast-2.pv-ebs = "ami-ca8551a4"; + "16.09".ap-northeast-2.pv-s3 = "ami-9c8551f2"; + "16.09".ap-south-1.hvm-ebs = "ami-922450fd"; + "16.09".ap-south-1.hvm-s3 = "ami-6d3a4e02"; + "16.09".ap-south-1.pv-ebs = "ami-4d394d22"; + "16.09".ap-south-1.pv-s3 = "ami-17384c78"; + "16.09".ap-southeast-1.hvm-ebs = "ami-f824809b"; + "16.09".ap-southeast-1.hvm-s3 = "ami-f924809a"; + "16.09".ap-southeast-1.pv-ebs = "ami-af2480cc"; + "16.09".ap-southeast-1.pv-s3 = "ami-5826823b"; + "16.09".ap-southeast-2.hvm-ebs = "ami-40fecd23"; + "16.09".ap-southeast-2.hvm-s3 = "ami-48fecd2b"; + "16.09".ap-southeast-2.pv-ebs = "ami-dffecdbc"; + "16.09".ap-southeast-2.pv-s3 = "ami-e0fccf83"; + "16.09".eu-central-1.hvm-ebs = "ami-1d8b7472"; + "16.09".eu-central-1.hvm-s3 = "ami-1c8b7473"; + "16.09".eu-central-1.pv-ebs = "ami-8c8d72e3"; + "16.09".eu-central-1.pv-s3 = "ami-3488775b"; + "16.09".eu-west-1.hvm-ebs = "ami-15662766"; + "16.09".eu-west-1.hvm-s3 = "ami-476b2a34"; + "16.09".eu-west-1.pv-ebs = "ami-876928f4"; + "16.09".eu-west-1.pv-s3 = "ami-70682903"; + "16.09".sa-east-1.hvm-ebs = "ami-27bc2e4b"; + "16.09".sa-east-1.hvm-s3 = "ami-e4b92b88"; + "16.09".sa-east-1.pv-ebs = "ami-4dbe2c21"; + "16.09".sa-east-1.pv-s3 = "ami-77fc6e1b"; + "16.09".us-east-1.hvm-ebs = "ami-93347684"; + "16.09".us-east-1.hvm-s3 = "ami-5e347649"; + "16.09".us-east-1.pv-ebs = "ami-b0387aa7"; + "16.09".us-east-1.pv-s3 = "ami-51357746"; + "16.09".us-west-1.hvm-ebs = "ami-06337a66"; + "16.09".us-west-1.hvm-s3 = "ami-76307916"; + "16.09".us-west-1.pv-ebs = "ami-fd327b9d"; + "16.09".us-west-1.pv-s3 = "ami-cc347dac"; + "16.09".us-west-2.hvm-ebs = "ami-49fe2729"; + "16.09".us-west-2.hvm-s3 = "ami-93fc25f3"; + "16.09".us-west-2.pv-ebs = "ami-14fe2774"; + "16.09".us-west-2.pv-s3 = "ami-74f12814"; + + latest = self."16.09"; +}; in self diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index c061b30def8a..77f91a49f309 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -16203,6 +16203,27 @@ license = lib.licenses.free; }; }) {}; + inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "inherit-local"; + version = "1.1"; + src = fetchFromGitHub { + owner = "shlevy"; + repo = "inherit-local"; + rev = "e687c702adb27ce5f69fb28a47fe21a86cf84063"; + sha256 = "11z3b1xwg6r769w3scd29lqg62fx8mp81g8dbx4klmj3clvyn69i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local"; + sha256 = "1v3q3s6qq64k1f4ck6rfgsy1arnf9cxg2kw6d1ahfrwr4ixsqm87"; + name = "inherit-local"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/inherit-local"; + license = lib.licenses.free; + }; + }) {}; init-loader = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "init-loader"; @@ -20413,6 +20434,27 @@ license = lib.licenses.free; }; }) {}; + nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nix-buffer"; + version = "1.2.2"; + src = fetchFromGitHub { + owner = "shlevy"; + repo = "nix-buffer"; + rev = "eb28bf99c3562cfda07f312ca49e0b594f0ff81b"; + sha256 = "148iyy8ma1n5a3biyal5rafxpp0zzn81nyy06jlzrkzjy44iyzwi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; + sha256 = "1fjkf88345v9l2v2mk8a057mw0p0rckf6rjf00y5464dyhh58vcd"; + name = "nix-buffer"; + }; + packageRequires = [ emacs f ]; + meta = { + homepage = "https://melpa.org/#/nix-buffer"; + license = lib.licenses.free; + }; + }) {}; nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index b39b73c830ff..fa0097272ffb 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -1,6 +1,41 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages, fetchurl }: -pythonPackages.buildPythonApplication rec { +let + + tornado_4_0_1 = pythonPackages.buildPythonPackage rec { + name = "tornado-${version}"; + version = "4.0.1"; + + propagatedBuildInputs = with pythonPackages; [ backports_ssl_match_hostname_3_4_0_2 certifi ]; + + src = fetchurl { + url = "mirror://pypi/t/tornado/${name}.tar.gz"; + sha256 = "00crp5vnasxg7qyjv89qgssb69vd7qr13jfghdryrcbnn9l8c1df"; + }; + }; + + sockjs-tornado = pythonPackages.buildPythonPackage rec { + name = "sockjs-tornado-${version}"; + version = "1.0.2"; + + src = fetchurl { + url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz"; + sha256 = "15lcy40h2cm0l8aknbrk48p2sni5wzybsqjx1hxwpk9lfa1xryyv"; + }; + + # This is needed for compatibility with OctoPrint + propagatedBuildInputs = [ tornado_4_0_1 ]; + + meta = with stdenv.lib; { + description = "SockJS python server implementation on top of Tornado framework"; + homepage = http://github.com/mrjoes/sockjs-tornado/; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ abbradar ]; + }; + }; + +in pythonPackages.buildPythonApplication rec { name = "OctoPrint-${version}"; version = "1.2.15"; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 567a6aa7d182..1ed53c0500f0 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1wpcl6cgiv02s3zgxvgsmrws454g81lnvyfjmhhcdckkwyljcv5l"; - sha256bin64 = "0snr5rd2r5jfjqhqwkxcw26j53fivmf60g3qfnp5xz5b6nlsab9g"; - version = "54.0.2840.34"; + sha256 = "1lix5wzcwf666vsdbdzz071rynswlxg5414k3nsrmlxwxhyh6qi4"; + sha256bin64 = "02cv9vc1l2nlwa4a0lc7cj9c9czrwp1jd8d024bq16a5fvmhl01l"; + version = "54.0.2840.50"; }; dev = { - sha256 = "1lbpj1wm35l2qf4fxfivd9drwwdrylv3knh8db889dyz5hrh3j5y"; - sha256bin64 = "0rkvrrcr1j9662v00kf7x7qmdps1pd4hq818x7crkilczybd05pr"; - version = "55.0.2868.3"; + sha256 = "06kcymwi0wfir7w10g8viayk2h0b5a66dav76mlia4lm30p502kz"; + sha256bin64 = "0mgamiffnnkaw8c68b5kyna84x7hlhrzmqfc36kzf434fmm8v5d6"; + version = "55.0.2873.0"; }; stable = { - sha256 = "0qk0y457l91yzxradpinayzw3947s5s4axd75h968vrl0jan51vs"; - sha256bin64 = "0sz4dfwxvkffcj4rrqh3vn2xxp2vvjzdjsy0s9wcvam01igmy261"; - version = "53.0.2785.116"; + sha256 = "1hyw0z7dsfaxyy8b4mvnfjy5yj0160hzz9m0wj3vn9zvkfvmhan5"; + sha256bin64 = "0n0px7yi94gdxq7p6pjqfdz04bnh3mcvbaccjaglj6h5p0jc8abq"; + version = "53.0.2785.143"; }; } 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 61eca26555b4..487b7fb56881 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -70,11 +70,11 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "11.2.202.635"; + version = "11.2.202.637"; src = fetchurl { url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip"; - sha256 = "0xlaf6152ksknigrv6fsasscyfnjkxml4nl22apiwzb34nrbzk3m"; + sha256 = "0xp1pxhrnam4yi8wfwaifqx7m2im0zx2xv8xgbdm0llrzbkc57mh"; }; nativeBuildInputs = [ unzip ]; @@ -94,6 +94,8 @@ stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; + preferLocalBuild = true; + outputs = [ "out" ] ++ lib.optional is-i686 "sa"; installPhase = '' diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 1b4e3e7d19f0..90c6bce65060 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "11.4.20"; + version = "11.4.22"; sha256 = { - "x86_64-linux" = "1mnjc00y1vs3c22hqf328idgsrrlq097kld67ab9q8d6l8r8qkr6"; - "i686-linux" = "1s7m56if2wq34sc8aq46xnhrrnbhnsfi85jw0yp4dpcdwv6s38v5"; + "x86_64-linux" = "1fpwknf8as2h6d8d11nb8i0q4ap5r6fvii919b3pj5d29jgfd25l"; + "i686-linux" = "1dv60ijb93464js34vk3l8hm8a57zdpkzhrfkv2kp3v3172cqj8s"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 02d0267fcaf7..e2f99f20e7cc 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -4,7 +4,7 @@ let - version = "4.26.0.1657"; + version = "4.27.0.1658"; rpath = stdenv.lib.makeLibraryPath [ xdg_utils @@ -44,7 +44,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "1ififcy1lhm0g4x9sprwfxlg34pkarkypww5ywsf8hvbcdnj02gp"; + sha256 = "1f0rgy5p9xcxfll6prir49vb7hjlnqx6xjaxlimhca4l30jvdsvn"; } else throw "HipChat is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix index 38c2c3c2930c..4d73648edf78 100644 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -1,5 +1,11 @@ -{ stdenv, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: +{ stdenv, fetchurl, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: +let + versionFix = fetchurl { + url = https://patch-diff.githubusercontent.com/raw/cryptodotis/irssi-otr/pull/60.patch; + sha256 = "18fk9nbzf3fvhvvvkrxv5l004hhimapqb6ra09m83268kbl4q3jy"; + }; +in with stdenv.lib; stdenv.mkDerivation rec { name = "irssi-otr-${version}"; @@ -12,12 +18,14 @@ stdenv.mkDerivation rec { sha256 = "1hm1whx1wzlx4fh4xf2y68rx9x6whi8bsbrhd6hqjhskg5msssrg"; }; - patchPhase = '' + prePatch = '' sed -i 's,/usr/include/irssi,${irssi}/include/irssi,' src/Makefile.am sed -i "s,/usr/lib/irssi,$out/lib/irssi," configure.ac sed -i "s,/usr/share/irssi,$out/share/irssi," help/Makefile.am ''; + patches = [ versionFix ]; + preConfigure = "sh ./bootstrap"; buildInputs = [ libotr automake autoconf libtool glib pkgconfig irssi ]; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 6257c5f95ebc..90c80db0a02a 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,9 +1,13 @@ -{ stdenv, fetchurl, cmake, pkgconfig, makeWrapper -, glib, gtk, gettext, libxkbfile, libgnome_keyring, libX11 -, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper +, glib, gtk3, gettext, libxkbfile, libgnome_keyring, libX11 +, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem +, pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3 +, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon +, libsecret, spice_protocol, spice_gtk, epoxy, at_spi2_core +, openssl }: let - version = "1.0.0"; + version = "1.2.0-rcgit.15"; desktopItem = makeDesktopItem { name = "remmina"; @@ -15,29 +19,45 @@ let categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;"; }; + # Latest release of remmina refers to thing that aren't yet in + # a FreeRDP release so we need to build one from git source + # See also https://github.com/FreeRDP/Remmina/pull/731 + # Remove when FreeRDP release catches up with this commit + freerdp_git = stdenv.lib.overrideDerivation freerdp (args: { + name = "freerdp-git-2016-09-30"; + src = fetchFromGitHub { + owner = "FreeRDP"; + repo = "FreeRDP"; + rev = "dbb353db92e7a5cb0be3c73aa950fb1113e627ec"; + sha256 = "1nhm4v6z9var9hasp4bkmhvlrksbdizx95swx19shizfc82s9g4y"; + }; + }); + in stdenv.mkDerivation { name = "remmina-${version}"; - src = fetchurl { - url = "https://github.com/downloads/FreeRDP/Remmina/Remmina-${version}.tar.gz"; - sha256 = "7cd0d2d6adbd96c7139da8c4bfc4cf4821e1fa97242bb9cc9db32a53df289731"; + src = fetchFromGitHub { + owner = "FreeRDP"; + repo = "Remmina"; + rev = "v${version}"; + sha256 = "07lj6a7x9cqcff18pwfkx8c8iml015zp6sq29dfcxpfg4ai578h0"; }; buildInputs = [ cmake pkgconfig makeWrapper - glib gtk gettext libxkbfile libgnome_keyring libX11 - freerdp libssh libgcrypt gnutls ]; + glib gtk3 gettext libxkbfile libgnome_keyring libX11 + freerdp_git libssh libgcrypt gnutls + pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3 + libvncserver libpthreadstubs libXdmcp libxkbcommon + libsecret spice_protocol spice_gtk epoxy at_spi2_core + openssl ]; - cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF"; - - patches = [ ./lgthread.patch ]; + cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF -DWINPR_INCLUDE_DIR=${freerdp_git}/include/winpr2"; postInstall = '' mkdir -pv $out/share/applications - mkdir -pv $out/share/icons cp ${desktopItem}/share/applications/* $out/share/applications - cp -r $out/share/remmina/icons/* $out/share/icons wrapProgram $out/bin/remmina --prefix LD_LIBRARY_PATH : "${libX11.out}/lib" ''; diff --git a/pkgs/applications/networking/remote/remmina/lgthread.patch b/pkgs/applications/networking/remote/remmina/lgthread.patch deleted file mode 100644 index 2d8e60f75726..000000000000 --- a/pkgs/applications/networking/remote/remmina/lgthread.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix [undefined reference to `g_thread_init'] as suggested by -http://ragnermagalhaes.blogspot.ru/2007/09/undefined-reference-to-gthreadinit.html - -diff -ru FreeRDP-Remmina-356c033.orig/remmina/CMakeLists.txt FreeRDP-Remmina-356c033/remmina/CMakeLists.txt ---- FreeRDP-Remmina-356c033.orig/remmina/CMakeLists.txt 2013-11-05 12:43:27.660276912 +0400 -+++ FreeRDP-Remmina-356c033/remmina/CMakeLists.txt 2013-11-05 12:53:39.607018349 +0400 -@@ -132,6 +132,8 @@ - endif() - endif() - -+set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgthread-2.0" ) -+ - add_subdirectory(po) - add_subdirectory(icons) - add_subdirectory(desktop) - diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 276550e3afd1..82e0cce47d66 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, go }: stdenv.mkDerivation rec { - version = "0.14.5"; + version = "0.14.7"; name = "syncthing-${version}"; src = fetchFromGitHub { - owner = "syncthing"; - repo = "syncthing"; - rev = "v${version}"; - sha256 = "172ca3xgc3dp9yiqm3fmq696615jnclgfg521sh5mk78na1r4mgz"; + owner = "syncthing"; + repo = "syncthing"; + rev = "v${version}"; + sha256 = "1mcn2vmv3hvp0ni9jxbjj3qp0l6ls07qmq33amhvjhpfafqzn279"; }; buildInputs = [ go ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 38ba14e83cf8..6c4211178077 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -14,8 +14,8 @@ let substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" '' else ""; -in +self = stdenv.mkDerivation { name = "coq-${version}"; @@ -62,6 +62,22 @@ stdenv.mkDerivation { envHooks=(''${envHooks[@]} addCoqPath) ''; + passthru = { + emacsBufferSetup = pkgs: '' + ; Propagate coq paths to children + (inherit-local-permanent coq-prog-name "${self}/bin/coqtop") + (inherit-local-permanent coq-dependency-analyzer "${self}/bin/coqdep") + (inherit-local-permanent coq-compiler "${self}/bin/coqc") + ; If the coq-library path was already set, re-set it based on our current coq + (when (fboundp 'get-coq-library-directory) + (inherit-local-permanent coq-library-directory (get-coq-library-directory)) + (coq-prog-args)) + ; Pass proof-general's coq flags to flycheck command (pretty ugly, should probably be part of PG) + (inherit-local-permanent flycheck-command-wrapper-function (lambda (cmd) + (append (funcall (default-value 'flycheck-command-wrapper-function) cmd) (coq-coqtop-prog-args coq-load-path)))) + ''; + }; + meta = with stdenv.lib; { description = "Formal proof management system"; longDescription = '' @@ -76,4 +92,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ roconnor thoughtpolice vbgl ]; platforms = platforms.unix; }; -} +}; in self diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 1fc0182a68ac..eb184933964b 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { name = "openshot-qt-${version}"; - version = "2.0.7"; + version = "2.1.0"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - sha256 = "1s4b61fd8cyjy8kvc25mqd97dkxx6gqmz02i42rrcriz51pw8wgh"; + sha256 = "1cyr5m1n6qcb9bzkhh3v6ka91a6x9c50dl5j0ilrc8vj0mb43g8c"; }; buildInputs = [doxygen python3Packages.python makeWrapper ffmpeg]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { echo "exec ${python3Packages.python.interpreter} $(toPythonPath $out)/launch.py" >>$out/bin/openshot-qt chmod +x $out/bin/openshot-qt wrapProgram $out/bin/openshot-qt \ - --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip}):$(toPythonPath ${python3Packages.httplib2}):$PYTHONPATH" + --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip}):$(toPythonPath ${python3Packages.httplib2}):$(toPythonPath ${python3Packages.pyzmq}):$PYTHONPATH" ''; doCheck = false; diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index 8b583d4ec5cb..fdaa049fa428 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libopenshot-audio-${version}"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot-audio"; rev = "v${version}"; - sha256 = "0pgw7vzx3znglwm58187ybhg5maa13n4xcy5hrhzfsp8bqhrwkc7"; + sha256 = "0dxyhnqkjc5y4hra8s17q9lafll6fx0pgibmmjznjm70whqcj8a6"; }; buildInputs = [ diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 2737c48ec83d..841587fcab30 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, fetchFromGitHub, callPackage, cmake, doxygen -, imagemagick, ffmpeg, qt55, swig, python3, ruby, unittest-cpp}: +, imagemagick, ffmpeg, qt55, swig, python3, ruby, unittest-cpp +, cppzmq, czmqpp +}: with stdenv.lib; @@ -8,13 +10,13 @@ let in stdenv.mkDerivation rec { name = "libopenshot-${version}"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${version}"; - sha256 = "12nfkris7spn8n4s8fvy2f6yk1hqh97wzh1z3fsdxldg4gppi903"; + sha256 = "00051ipb8y4z9j5m5smwm1ahv755k0glarwic8fv5b9fzryfbrdm"; }; patchPhase = '' @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake doxygen imagemagick ffmpeg qt55.qtbase qt55.qtmultimedia swig python3 ruby - unittest-cpp + unittest-cpp cppzmq czmqpp ]; LIBOPENSHOT_AUDIO_DIR = "${libopenshot_audio}"; diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index efab9703df3d..34c5650e9f78 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -5,11 +5,11 @@ qmakeHook, makeQtWrapper }: stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "16.08"; + version = "16.10"; src = fetchurl { url = "https://github.com/mltframework/shotcut/archive/v${version}.tar.gz"; - sha256 = "10f32mfj3f8mjp0yi0jb7wc5d3inycn5c1pvqdagjhyyv3rvx9zy"; + sha256 = "0brskci86bwdj2ahjfvv3v254ligjn97bm0f6c8yg46r0jb8q5xw"; }; buildInputs = [ SDL frei0r gettext mlt pkgconfig qtbase qtmultimedia qtwebkit diff --git a/pkgs/applications/virtualization/cbfstool/default.nix b/pkgs/applications/virtualization/cbfstool/default.nix index 1a45dc3c44d9..2312f99891c3 100644 --- a/pkgs/applications/virtualization/cbfstool/default.nix +++ b/pkgs/applications/virtualization/cbfstool/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ iasl flex bison ]; hardeningDisable = [ "fortify" ]; + CFLAGS = "-Wno-error=sign-compare"; buildPhase = '' export LEX=${flex}/bin/flex @@ -34,4 +35,3 @@ stdenv.mkDerivation rec { platforms = platforms.linux; }; } - diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 1dc71987f543..8bc34d672c96 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -89,6 +89,7 @@ let # symlink other core stuff ln -s /host/etc/localtime localtime + ln -s /host/etc/zoneinfo zoneinfo ln -s /host/etc/machine-id machine-id ln -s /host/etc/os-release os-release diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 8a746ea016ef..8a9bd3ecb4d5 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -46,7 +46,20 @@ stdenv.mkDerivation { inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin; gnugrep_bin = if nativeTools then "" else gnugrep; - passthru = { inherit libc nativeTools nativeLibc nativePrefix isGNU isClang; }; + passthru = { + inherit libc nativeTools nativeLibc nativePrefix isGNU isClang; + + emacsBufferSetup = pkgs: '' + ; We should handle propagation here too + (mapc (lambda (arg) + (when (file-directory-p (concat arg "/include")) + (setenv "NIX_CFLAGS_COMPILE" (concat (getenv "NIX_CFLAGS_COMPILE") " -isystem " arg "/include"))) + (when (file-directory-p (concat arg "/lib")) + (setenv "NIX_LDFLAGS" (concat (getenv "NIX_LDFLAGS") " -L" arg "/lib"))) + (when (file-directory-p (concat arg "/lib64")) + (setenv "NIX_LDFLAGS" (concat (getenv "NIX_LDFLAGS") " -L" arg "/lib64")))) '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) + ''; + }; buildCommand = '' diff --git a/pkgs/build-support/emacs/buffer.nix b/pkgs/build-support/emacs/buffer.nix index 5632eae944c0..e366fd1f739f 100644 --- a/pkgs/build-support/emacs/buffer.nix +++ b/pkgs/build-support/emacs/buffer.nix @@ -1,23 +1,47 @@ # Functions to build elisp files to locally configure emcas buffers. # See https://github.com/shlevy/nix-buffer -{ lib, writeText }: +{ lib, writeText, inherit-local }: { withPackages = pkgs: let - coqs = builtins.filter (x: (builtins.parseDrvName x.name).name == "coq") pkgs; - coq = builtins.head coqs; - pg-setup = if builtins.length coqs == 0 then "" else '' - (setq-local coq-prog-name "${coq}/bin/coqtop") - (setq-local coq-dependency-analyzer "${coq}/bin/coqdep") - (setq-local coq-compiler "${coq}/bin/coqc") - (setq-local coq-library-directory (get-coq-library-directory)) - (coq-prog-args) - ''; + extras = map (x: x.emacsBufferSetup pkgs) (builtins.filter (builtins.hasAttr "emacsBufferSetup") pkgs); in writeText "dir-locals.el" '' + (require 'inherit-local "${inherit-local}/share/emacs/site-lisp/elpa/inherit-local-${inherit-local.version}/inherit-local.elc") + + ; Only set up nixpkgs buffer handling when we have some buffers active + (defvar nixpkgs--buffer-count 0) + (when (eq nixpkgs--buffer-count 0) + ; When generating a new temporary buffer (one whose name starts with a space), do inherit-local inheritance and make it a nixpkgs buffer + (defun nixpkgs--around-generate (orig name) + (if (eq (aref name 0) ?\s) + (let ((buf (funcall orig name))) + (when (inherit-local-inherit-child buf) + (with-current-buffer buf + (make-local-variable 'kill-buffer-hook) + (setq nixpkgs--buffer-count (1+ nixpkgs--buffer-count)) + (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count))) + buf) + (funcall orig name))) + (advice-add 'generate-new-buffer :around #'nixpkgs--around-generate) + ; When we have no more nixpkgs buffers, tear down the buffer handling + (defun nixpkgs--decrement-buffer-count () + (setq nixpkgs--buffer-count (1- nixpkgs--buffer-count)) + (when (eq nixpkgs--buffer-count 0) + (advice-remove 'generate-new-buffer #'nixpkgs--around-generate) + (fmakunbound 'nixpkgs--around-generate) + (fmakunbound 'nixpkgs--decrement-buffer-count)))) + (setq nixpkgs--buffer-count (1+ nixpkgs--buffer-count)) + (make-local-variable 'kill-buffer-hook) + (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count) + + ; Add packages to PATH and exec-path (make-local-variable 'process-environment) + (put 'process-environment 'permanent-local t) + (inherit-local 'process-environment) (setenv "PATH" (concat "${lib.makeSearchPath "bin" pkgs}:" (getenv "PATH"))) - (setq-local exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path)) - ${pg-setup} + (inherit-local-permanent exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path)) + + ${lib.concatStringsSep "\n" extras} ''; } diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 6d9abdad2fa4..267a0b80a1f8 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { # See http://dejavu-fonts.org/wiki/License for details license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix index caff53dcc1d6..8625f21f3db7 100644 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3 , gobjectIntrospection, gdk_pixbuf, librsvg, autoreconfHook -, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup }: +, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup +, webkitgtk }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -12,7 +13,8 @@ stdenv.mkDerivation rec { gnome3.geocode_glib libchamplain file libsoup gdk_pixbuf librsvg autoreconfHook gnome3.gsettings_desktop_schemas gnome3.evolution_data_server - gnome3.gnome_online_accounts gnome3.defaultIconTheme ]; + gnome3.gnome_online_accounts gnome3.defaultIconTheme + webkitgtk ]; patches = [ ./soup.patch ]; diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index bc298924eb86..d623d800bd79 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.7"; + version = "1.7.1"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "03wc4r5pgxrlh3lp8l0hb1bhsrwv4hfq1fcj8n82bfk3hvj43am2"; + sha256 = "121cvpjpbyl3lyd6j5lnnq6pr8vl7ar5zvap1132c522lxgxw356"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/remove-tools-1.7.patch b/pkgs/development/compilers/go/remove-tools-1.7.patch index b2e380f34fc5..b53e48e1a515 100644 --- a/pkgs/development/compilers/go/remove-tools-1.7.patch +++ b/pkgs/development/compilers/go/remove-tools-1.7.patch @@ -1,8 +1,8 @@ diff --git a/src/go/build/build.go b/src/go/build/build.go -index 496fe11..8c81dbd 100644 +index 9706b8b..f250751 100644 --- a/src/go/build/build.go +++ b/src/go/build/build.go -@@ -1388,7 +1388,7 @@ func init() { +@@ -1513,7 +1513,7 @@ func init() { } // ToolDir is the directory containing build tools. @@ -12,11 +12,11 @@ index 496fe11..8c81dbd 100644 // IsLocalImport reports whether the import path is // a local import path, like ".", "..", "./foo", or "../foo". diff --git a/src/runtime/extern.go b/src/runtime/extern.go -index d346362..fb22b6e 100644 +index 441dcd9..a50277e 100644 --- a/src/runtime/extern.go +++ b/src/runtime/extern.go -@@ -194,6 +194,17 @@ func GOROOT() string { - return defaultGoroot +@@ -230,6 +230,17 @@ func GOROOT() string { + return sys.DefaultGoroot } +// GOTOOLDIR returns the root of the Go tree. diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 71420d4cdccd..d8459e514190 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -6,7 +6,7 @@ let name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "1ybcac8hlr9vl3wg8s4v6cp0c0qgqnwprsv85lihbkq3vqv94504"} + unpackFile ${fetch "cfe" "1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc"} mv cfe-${version}.src clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix index a2a702a617ee..df1a775ef968 100644 --- a/pkgs/development/compilers/llvm/3.8/default.nix +++ b/pkgs/development/compilers/llvm/3.8/default.nix @@ -2,7 +2,7 @@ let callPackage = newScope (self // { inherit stdenv isl version fetch; }); - version = "3.8.0"; + version = "3.8.1"; fetch = fetch_v version; fetch_v = ver: name: sha256: fetchurl { @@ -10,8 +10,8 @@ let inherit sha256; }; - compiler-rt_src = fetch "compiler-rt" "1c2nkp9563873ffz22qmhc0wakgj428pch8rmhym8agjamz3ily8"; - clang-tools-extra_src = fetch "clang-tools-extra" "1i0yrgj8qrzjjswraz0i55lg92ljpqhvjr619d268vka208aigdg"; + compiler-rt_src = fetch "compiler-rt" "0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d"; + clang-tools-extra_src = fetch "clang-tools-extra" "15n39r4ssphpaq4a0wzyjm7ilwxb0bch6nrapy8c5s8d49h5qjk6"; self = { llvm = callPackage ./llvm.nix { diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix index f10dcb6784ca..a65a84e9b7ea 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "0yr3fh8vj38289b9cwk37zsy7x98dcd3kjy7xxy8mg20p48lb01n"; + src = fetch "libcxx" "1k7f9qk5bgwa02ksh6yr9hccwcbhmcdzl1fpbdw6s2c89iwg7mvp"; postUnpack = '' unpackFile ${libcxxabi.src} diff --git a/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/pkgs/development/compilers/llvm/3.8/libc++abi.nix index fdbc002688e9..61ff6341c30a 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++abi.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "0175rv2ynkklbg96kpw13iwhnzyrlw3r12f4h09p9v7nmxqhivn5"; + src = fetch "libcxxabi" "1qfs2iis1i0ppv11jndc98cvd7s25pj46pq2sfyldmzswdxmzdg1"; buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; diff --git a/pkgs/development/compilers/llvm/3.8/lldb.nix b/pkgs/development/compilers/llvm/3.8/lldb.nix index ca8a74c28bb6..4661ecd32962 100644 --- a/pkgs/development/compilers/llvm/3.8/lldb.nix +++ b/pkgs/development/compilers/llvm/3.8/lldb.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "0dasg12gf5crrd9pbi5rd1y8vwlgqp8nxgw9g4z47w3x2i28zxp3"; + src = fetch "lldb" "18z8vhfgh4m57hl66i83cp4d4mv3i86z2hjhbp5rvqs7d88li49l"; postUnpack = '' # Hack around broken standalone builf as of 3.8 @@ -25,12 +25,9 @@ stdenv.mkDerivation { cp "$(ls -d llvm-*.src)/lib/Support/regex_impl.h" "$srcDir/tools/lib/Support/" ''; - buildInputs = [ cmake python which swig ncurses zlib libedit ]; + buildInputs = [ cmake python which swig ncurses zlib libedit llvm ]; - preConfigure = '' - export CXXFLAGS="-pthread" - export LDFLAGS="-ldl" - ''; + hardeningDisable = [ "format" ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index fc29d00a5245..6112228bf4fc 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -18,7 +18,7 @@ }: let - src = fetch "llvm" "0ikfq0gxac8xpvxj23l4hk8f12ydx48fljgrz1gl9xp0ks704nsm"; + src = fetch "llvm" "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf"; in stdenv.mkDerivation rec { name = "llvm-${version}"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 02c7b40485be..c05345494f1a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -273,6 +273,7 @@ self: super: { xmlgen = dontCheck super.xmlgen; hapistrano = dontCheck super.hapistrano; HerbiePlugin = dontCheck super.HerbiePlugin; + wai-cors = dontCheck super.wai-cors; # These packages try to access the network. amqp = dontCheck super.amqp; @@ -971,11 +972,17 @@ self: super: { }); # https://github.com/commercialhaskell/stack/issues/2263 - stack = appendPatch super.stack (pkgs.fetchpatch { - url = "https://github.com/commercialhaskell/stack/commit/7f7f1a5f67f4ecdd1f3009495f1ff101dd38047e.patch"; - sha256 = "1yh2g45mkfpwxq0vyzcbc4nbxh6wmb2xpp0k7r5byd8jicgvli29"; + stack = (dontJailbreak super.stack).overrideScope (self: super: { + http-client = self.http-client_0_5_3_2; + http-client-tls = self.http-client-tls_0_3_3; + http-conduit = self.http-conduit_2_2_2_1; + optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0; + criterion = super.criterion.override { inherit (super) optparse-applicative; }; }); + # Test suite fails a QuickCheck property. + optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0; + # GLUT uses `dlopen` to link to freeglut, so we need to set the RUNPATH correctly for # it to find `libglut.so` from the nix store. We do this by patching GLUT.cabal to pkg-config # depend on freeglut, which provides GHC to necessary information to generate a correct RPATH. @@ -1008,4 +1015,7 @@ self: super: { # https://github.com/pontarius/pontarius-xmpp/issues/105 pontarius-xmpp = dontCheck super.pontarius-xmpp; + # https://github.com/fpco/store/issues/77 + store = dontCheck super.store; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index a0f8056c081c..b68c91790ad1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -190,6 +190,7 @@ self: super: { hackage-security = dontHaddock (dontCheck super.hackage-security); # GHC versions prior to 8.x require additional build inputs. + attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]); Glob = addBuildDepends super.Glob (with self; [semigroups]); Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]); aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale"; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 73dc41fae3d4..7adc5a89dd2a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -32,7 +32,7 @@ core-packages: - xhtml-3000.2.1 default-package-overrides: - # LTS Haskell 7.1 + # LTS Haskell 7.2 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -286,7 +286,7 @@ default-package-overrides: - Chart ==1.8 - Chart-cairo ==1.8 - Chart-diagrams ==1.8 - - ChasingBottoms ==1.3.1.1 + - ChasingBottoms ==1.3.1.2 - cheapskate ==0.1.0.5 - cheapskate-highlight ==0.1.0.0 - cheapskate-lucid ==0.1.0.0 @@ -343,8 +343,8 @@ default-package-overrides: - concurrent-extra ==0.7.0.10 - concurrent-output ==1.7.7 - concurrent-supply ==0.1.8 - - conduit ==1.2.7 - - conduit-combinators ==1.0.7 + - conduit ==1.2.8 + - conduit-combinators ==1.0.8 - conduit-extra ==1.1.13.3 - conduit-iconv ==0.1.1.1 - conduit-parse ==0.1.2.0 @@ -460,7 +460,7 @@ default-package-overrides: - djinn-lib ==0.0.1.2 - dlist ==0.8.0.2 - dlist-instances ==0.1.1.1 - - dns ==2.0.5 + - dns ==2.0.6 - do-list ==1.0.1 - dockerfile ==0.1.0.1 - docopt ==0.7.0.4 @@ -535,7 +535,7 @@ default-package-overrides: - farmhash ==0.1.0.5 - fast-builder ==0.0.0.6 - fast-digits ==0.2.1.0 - - fast-logger ==2.4.6 + - fast-logger ==2.4.7 - fasta ==0.10.4.0 - fay ==0.23.1.12 - fay-base ==0.20.0.1 @@ -579,7 +579,7 @@ default-package-overrides: - forecast-io ==0.2.0.0 - foreign-store ==0.2 - formatting ==6.2.2 - - fortran-src ==0.1.0.3 + - fortran-src ==0.1.0.4 - Frames ==0.1.6 - free ==4.12.4 - free-vl ==0.1.4 @@ -611,9 +611,9 @@ default-package-overrides: - ghc-paths ==0.1.0.9 - ghc-syb-utils ==0.2.3 - ghc-tcplugins-extra ==0.2 - - ghc-typelits-extra ==0.2 - - ghc-typelits-knownnat ==0.2.1 - - ghc-typelits-natnormalise ==0.5 + - ghc-typelits-extra ==0.2.1 + - ghc-typelits-knownnat ==0.2.2 + - ghc-typelits-natnormalise ==0.5.1 - ghcid ==0.6.5 - ghcjs-codemirror ==0.0.0.1 - ghcjs-hplay ==0.3.4.2 @@ -773,7 +773,7 @@ default-package-overrides: - hackmanager ==0.1.0.0 - haddock-api ==2.17.3 - haddock-library ==1.4.2 - - hailgun ==0.4.1.0 + - hailgun ==0.4.1.1 - half ==0.2.2.3 - hamlet ==1.2.0 - HandsomeSoup ==0.4.2 @@ -949,7 +949,7 @@ default-package-overrides: - hvect ==0.3.1.0 - hw-bits ==0.1.0.1 - hw-conduit ==0.0.0.11 - - hw-diagnostics ==0.0.0.3 + - hw-diagnostics ==0.0.0.4 - hw-parser ==0.0.0.1 - hw-prim ==0.1.0.3 - hw-rankselect ==0.3.0.0 @@ -978,7 +978,7 @@ default-package-overrides: - imm ==1.0.1.0 - immortal ==0.2.2 - include-file ==0.1.0.3 - - incremental-parser ==0.2.4.1 + - incremental-parser ==0.2.5 - indentation-core ==0.0 - indentation-parsec ==0.0 - indents ==0.3.3 @@ -1306,7 +1306,7 @@ default-package-overrides: - pdfinfo ==1.5.4 - pem ==0.2.2 - permutation ==0.5.0.5 - - persistable-record ==0.4.0.2 + - persistable-record ==0.4.0.3 - persistable-types-HDBC-pg ==0.0.1.4 - persistent ==2.6 - persistent-postgresql ==2.6 @@ -1386,7 +1386,7 @@ default-package-overrides: - prometheus-metrics-ghc ==0.1.0.1 - prompt ==0.1.1.2 - protobuf ==0.2.1.1 - - protobuf-simple ==0.1.0.1 + - protobuf-simple ==0.1.0.2 - protocol-buffers ==2.4.0 - protocol-buffers-descriptor ==2.4.0 - protolude ==0.1.7 @@ -1480,7 +1480,7 @@ default-package-overrides: - rest-types ==1.14.1.1 - rest-wai ==0.2.0.1 - result ==0.2.5.1 - - rethinkdb ==2.2.0.6 + - rethinkdb ==2.2.0.7 - rethinkdb-client-driver ==0.0.23 - retry ==0.7.4.1 - rev-state ==0.1.2 @@ -1522,7 +1522,7 @@ default-package-overrides: - seqloc ==0.6.1.1 - serf ==0.1.1.0 - servant ==0.8.1 - - servant-aeson-specs ==0.5.1.1 + - servant-aeson-specs ==0.5.2.0 - servant-auth-cookie ==0.3.2 - servant-blaze ==0.7.1 - servant-cassava ==0.8 @@ -1715,7 +1715,7 @@ default-package-overrides: - texmath ==0.8.6.5 - text ==1.2.2.1 - text-all ==0.3.0.2 - - text-binary ==0.2.1 + - text-binary ==0.2.1.1 - text-conversions ==0.3.0 - text-format ==0.3.1.1 - text-icu ==0.7.0.1 @@ -1864,7 +1864,7 @@ default-package-overrides: - wai-conduit ==3.0.0.3 - wai-cors ==0.2.5 - wai-eventsource ==3.0.0 - - wai-extra ==3.0.17 + - wai-extra ==3.0.18 - wai-logger ==2.3.0 - wai-middleware-caching ==0.1.0.2 - wai-middleware-caching-lru ==0.1.0.0 @@ -1893,7 +1893,7 @@ default-package-overrides: - web-routes-hsp ==0.24.6.1 - web-routes-th ==0.22.5 - web-routes-wai ==0.24.3 - - webdriver ==0.8.3 + - webdriver ==0.8.4 - webdriver-angular ==0.1.11 - webkitgtk3 ==0.14.2.0 - webkitgtk3-javascriptcore ==0.14.2.0 @@ -1962,8 +1962,8 @@ default-package-overrides: - yesod-auth-basic ==0.1.0.2 - yesod-auth-hashdb ==1.5.1.3 - yesod-auth-oauth2 ==0.2.2 - - yesod-bin ==1.4.18.3 - - yesod-core ==1.4.24 + - yesod-bin ==1.4.18.5 + - yesod-core ==1.4.25 - yesod-eventsource ==1.4.0.1 - yesod-fay ==0.8.0 - yesod-fb ==0.3.4 @@ -2197,8 +2197,11 @@ dont-distribute-packages: amazon-emailer: [ i686-linux, x86_64-linux, x86_64-darwin ] amazon-products: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-apigateway: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-ec2: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-rds: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] amazonka-sqs: [ i686-linux, x86_64-linux, x86_64-darwin ] + amazonka-swf: [ i686-linux, x86_64-linux, x86_64-darwin ] AMI: [ i686-linux, x86_64-linux, x86_64-darwin ] ampersand: [ i686-linux, x86_64-linux, x86_64-darwin ] amqp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2532,6 +2535,7 @@ dont-distribute-packages: car-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] carboncopy: [ i686-linux, x86_64-linux, x86_64-darwin ] carettah: [ i686-linux, x86_64-linux, x86_64-darwin ] + Cartesian: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-control: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-core: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-internal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2604,6 +2608,7 @@ dont-distribute-packages: clafer: [ i686-linux, x86_64-linux, x86_64-darwin ] claferIG: [ i686-linux, x86_64-linux, x86_64-darwin ] claferwiki: [ i686-linux, x86_64-linux, x86_64-darwin ] + clang-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] CLASE: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3028,6 +3033,7 @@ dont-distribute-packages: easyplot: [ i686-linux, x86_64-linux, x86_64-darwin ] easyrender: [ i686-linux, x86_64-linux, x86_64-darwin ] ebnf-bff: [ i686-linux, x86_64-linux, x86_64-darwin ] + ec2-unikernel: [ i686-linux, x86_64-linux, x86_64-darwin ] ecdsa: [ i686-linux, x86_64-linux, x86_64-darwin ] ecma262: [ i686-linux, x86_64-linux, x86_64-darwin ] ecu: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3201,6 +3207,7 @@ dont-distribute-packages: FModExRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] fn-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] foldl-incremental: [ i686-linux, x86_64-linux, x86_64-darwin ] + foldl-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ] folds-common: [ i686-linux, x86_64-linux, x86_64-darwin ] follower: [ i686-linux, x86_64-linux, x86_64-darwin ] foma: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3537,6 +3544,7 @@ dont-distribute-packages: halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ] halma: [ i686-linux, x86_64-linux, x86_64-darwin ] hampp: [ i686-linux, x86_64-linux, x86_64-darwin ] + hamsql: [ i686-linux, x86_64-linux, x86_64-darwin ] hamtmap: [ i686-linux, x86_64-linux, x86_64-darwin ] hamusic: [ i686-linux, x86_64-linux, x86_64-darwin ] handsy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3935,6 +3943,8 @@ dont-distribute-packages: hoovie: [ i686-linux, x86_64-linux, x86_64-darwin ] hopencc: [ i686-linux, x86_64-linux, x86_64-darwin ] hopencl: [ i686-linux, x86_64-linux, x86_64-darwin ] + hopenpgp-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + hOpenPGP: [ i686-linux, x86_64-linux, x86_64-darwin ] hopfield: [ i686-linux, x86_64-linux, x86_64-darwin ] hops: [ i686-linux, x86_64-linux, x86_64-darwin ] hoq: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3980,6 +3990,7 @@ dont-distribute-packages: hruby: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-carbon-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-cdb: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-di: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-dotnet: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-duktape: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-ffmpeg: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4017,6 +4028,7 @@ dont-distribute-packages: hscamwire: [ i686-linux, x86_64-linux, x86_64-darwin ] hscassandra: [ i686-linux, x86_64-linux, x86_64-darwin ] hsclock: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsdev: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdip: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdns-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] Hsed: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4232,6 +4244,7 @@ dont-distribute-packages: invertible: [ i686-linux, x86_64-linux, x86_64-darwin ] io-capture: [ i686-linux, x86_64-linux, x86_64-darwin ] io-reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] + ion: [ i686-linux, x86_64-linux, x86_64-darwin ] IOR: [ i686-linux, x86_64-linux, x86_64-darwin ] IORefCAS: [ i686-linux, x86_64-linux, x86_64-darwin ] iotransaction: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4293,6 +4306,7 @@ dont-distribute-packages: joinlist: [ i686-linux, x86_64-linux, x86_64-darwin ] jonathanscard: [ i686-linux, x86_64-linux, x86_64-darwin ] jort: [ i686-linux, x86_64-linux, x86_64-darwin ] + jose-jwt: [ i686-linux, x86_64-linux, x86_64-darwin ] js-good-parts: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] jsaddle-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4369,6 +4383,7 @@ dont-distribute-packages: knots: [ i686-linux, x86_64-linux, x86_64-darwin ] koellner-phonetic: [ i686-linux, x86_64-linux, x86_64-darwin ] Konf: [ i686-linux, x86_64-linux, x86_64-darwin ] + kontra-config: [ i686-linux, x86_64-linux, x86_64-darwin ] korfu: [ i686-linux, x86_64-linux, x86_64-darwin ] kqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] krpc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4693,6 +4708,7 @@ dont-distribute-packages: mmtl-base: [ i686-linux, x86_64-linux, x86_64-darwin ] mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ] moan: [ i686-linux, x86_64-linux, x86_64-darwin ] + modbus-tcp: [ i686-linux, x86_64-linux, x86_64-darwin ] modelicaparser: [ i686-linux, x86_64-linux, x86_64-darwin ] modify-fasta: [ i686-linux, x86_64-linux, x86_64-darwin ] modsplit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4837,6 +4853,7 @@ dont-distribute-packages: nettle-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-netkit: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] + nettle: [ i686-linux, x86_64-linux, x86_64-darwin ] network-address: [ i686-linux, x86_64-linux, x86_64-darwin ] network-anonymous-i2p: [ i686-linux, x86_64-linux, x86_64-darwin ] network-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5389,6 +5406,7 @@ dont-distribute-packages: rivet-simple-deploy: [ i686-linux, x86_64-linux, x86_64-darwin ] rivet: [ i686-linux, x86_64-linux, x86_64-darwin ] RJson: [ i686-linux, x86_64-linux, x86_64-darwin ] + rl-satton: [ i686-linux, x86_64-linux, x86_64-darwin ] Rlang-QQ: [ i686-linux, x86_64-linux, x86_64-darwin ] rlwe-challenges: [ i686-linux, x86_64-linux, x86_64-darwin ] rmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5407,6 +5425,7 @@ dont-distribute-packages: rope: [ i686-linux, x86_64-linux, x86_64-darwin ] rose-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] roshask: [ i686-linux, x86_64-linux, x86_64-darwin ] + rosmsg-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] rosso: [ i686-linux, x86_64-linux, x86_64-darwin ] rounding: [ i686-linux, x86_64-linux, x86_64-darwin ] roundtrip-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5540,6 +5559,7 @@ dont-distribute-packages: servant-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-smsc-ru: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-subscriber: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-swagger-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5685,6 +5705,8 @@ dont-distribute-packages: SNet: [ i686-linux, x86_64-linux, x86_64-darwin ] snm: [ i686-linux, x86_64-linux, x86_64-darwin ] snow-white: [ i686-linux, x86_64-linux, x86_64-darwin ] + snowflake-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + snowflake-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Snusmumrik: [ i686-linux, x86_64-linux, x86_64-darwin ] SoccerFun: [ i686-linux, x86_64-linux, x86_64-darwin ] SoccerFunGL: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6069,6 +6091,7 @@ dont-distribute-packages: unittyped: [ i686-linux, x86_64-linux, x86_64-darwin ] universe-th: [ i686-linux, x86_64-linux, x86_64-darwin ] unix-process-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + unjson: [ i686-linux, x86_64-linux, x86_64-darwin ] unlit: [ i686-linux, x86_64-linux, x86_64-darwin ] unordered-containers-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] unpack-funcs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6372,6 +6395,12 @@ dont-distribute-packages: YFrob: [ i686-linux, x86_64-linux, x86_64-darwin ] yhccore: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-keymap-cua: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-keymap-emacs: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-keymap-vim: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-misc-modes: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-mode-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-mode-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] yices: [ i686-linux, x86_64-linux, x86_64-darwin ] yjftp: [ i686-linux, x86_64-linux, x86_64-darwin ] Yogurt-Standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6392,6 +6421,7 @@ dont-distribute-packages: zeromq3-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] zeroth: [ i686-linux, x86_64-linux, x86_64-darwin ] ZFS: [ i686-linux, x86_64-linux, x86_64-darwin ] + zip: [ i686-linux, x86_64-linux, x86_64-darwin ] zipedit: [ i686-linux, x86_64-linux, x86_64-darwin ] ZMachine: [ i686-linux, x86_64-linux, x86_64-darwin ] zmcat: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index 19940bd70bea..9020f1ee4671 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -6,12 +6,13 @@ let - allCabalFiles = pkgs.fetchFromGitHub { - owner = "commercialhaskell"; - repo = "all-cabal-hashes"; - rev = "72f1318540eff69544eb8c14a16f630d0c5448b8"; - sha256 = "1czi1rajk2726mqrw3qp7a43h26acbjw54ll3ns063yzg9hg469m"; - }; + allCabalFiles = stdenv.mkDerivation { + name = "all-cabal-hashes-0"; + buildCommand = '' + mkdir -p $out + tar -C $out --strip-components=1 -x -f ${builtins.fetchurl "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz"} + ''; + }; inherit (stdenv.lib) fix' extends; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8cf9836fc45f..229b4d482a01 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2466,6 +2466,7 @@ self: { jailbreak = true; description = "Coordinate systems"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Cascade" = callPackage @@ -2597,24 +2598,6 @@ self: { }) {}; "ChasingBottoms" = callPackage - ({ mkDerivation, array, base, containers, mtl, QuickCheck, random - , syb - }: - mkDerivation { - pname = "ChasingBottoms"; - version = "1.3.1.1"; - sha256 = "1d8cdde87ec1fb29dfc77d3234bf9f604c1849c1562e99de9a94c96a441f1925"; - libraryHaskellDepends = [ - base containers mtl QuickCheck random syb - ]; - testHaskellDepends = [ - array base containers mtl QuickCheck random syb - ]; - description = "For testing partial and infinite values"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ChasingBottoms_1_3_1_2" = callPackage ({ mkDerivation, array, base, containers, mtl, QuickCheck, random , syb }: @@ -2630,7 +2613,6 @@ self: { ]; description = "For testing partial and infinite values"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CheatSheet" = callPackage @@ -5596,6 +5578,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "GLFW-b_1_4_8_1" = callPackage + ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "GLFW-b"; + version = "1.4.8.1"; + sha256 = "438a49ec5cf6cbda95966fcc42750b9245f54fe7daf69a6493e7703c3f178ae9"; + libraryHaskellDepends = [ base bindings-GLFW ]; + testHaskellDepends = [ + base bindings-GLFW HUnit test-framework test-framework-hunit + ]; + description = "Bindings to GLFW OpenGL library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "GLFW-b-demo" = callPackage ({ mkDerivation, base, GLFW-b, mtl, OpenGL, pretty, stm , transformers @@ -9339,6 +9338,27 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {inherit (pkgs) openssl;}; + "HsOpenSSL_0_11_2" = callPackage + ({ mkDerivation, base, bytestring, HUnit, integer-gmp, network + , openssl, test-framework, test-framework-hunit, time + }: + mkDerivation { + pname = "HsOpenSSL"; + version = "0.11.2"; + sha256 = "c4221211ae284eed7e3d97e0753f4a62444c865fab2b6bfd5b83af56bb99ccb3"; + libraryHaskellDepends = [ + base bytestring integer-gmp network time + ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit + ]; + homepage = "https://github.com/vshabanov/HsOpenSSL"; + description = "Partial OpenSSL binding for Haskell"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "HsOpenSSL-x509-system" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { @@ -11978,6 +11998,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "NameGenerator" = callPackage + ({ mkDerivation, base, containers, random }: + mkDerivation { + pname = "NameGenerator"; + version = "0.0.1"; + sha256 = "2e7983afdeebabd32562b26cfc1b133aa7967174c65a671ac5b4bbd60949ecff"; + libraryHaskellDepends = [ base containers random ]; + jailbreak = true; + homepage = "http://github.com/pommicket/name-generator-haskell"; + description = "A name generator written in Haskell"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "NanoProlog" = callPackage ({ mkDerivation, base, containers, ListLike, uu-parsinglib }: mkDerivation { @@ -14772,8 +14805,8 @@ self: { }: mkDerivation { pname = "SFML"; - version = "2.3.2.3"; - sha256 = "a8d38a6be04c8eb31c6dbf889e383afb25f7a8bb29b398ab948d6c3d773391b4"; + version = "2.3.2.4"; + sha256 = "0aad64bf7b91f5cc212e80982578c626e8d1aedc97a1487aa3bb45460a5f5bc3"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ csfml-audio csfml-graphics csfml-network csfml-system csfml-window @@ -22270,6 +22303,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ecr" = callPackage @@ -22793,6 +22827,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sdb" = callPackage @@ -22956,6 +22991,7 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-test" = callPackage @@ -23324,6 +23360,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "anki-tools" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, directory + , exceptions, filepath, mtl, scientific, sqlite-simple, text, time + , unordered-containers + }: + mkDerivation { + pname = "anki-tools"; + version = "0.1.0.0"; + sha256 = "a90256daf1b04e8c85d95bed5f58708ea4a03bfec4abd81e90db4b375374db3b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring data-default directory exceptions filepath + mtl scientific sqlite-simple text time unordered-containers + ]; + executableHaskellDepends = [ base data-default ]; + description = "Tools for interacting with Anki database"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "annah" = callPackage ({ mkDerivation, alex, array, base, Earley, lens-family-core, morte , optparse-applicative, pipes, system-fileio, system-filepath, text @@ -23680,8 +23736,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ap-reflect"; - version = "0.2"; - sha256 = "42087f76e791ecc541b1156e967517ab078468978b878ce535691b21938d00c6"; + version = "0.3"; + sha256 = "fae1845bea949bd04ed83fd508ab80947587056c0f2902bce08861a0b61a109a"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/cmc-msu-ai/ap-reflect"; description = "Partial evaluation reflection a la simple-reflect"; @@ -24744,8 +24800,8 @@ self: { }: mkDerivation { pname = "argon2"; - version = "1.1.0"; - sha256 = "42fc5495434739408115cd932e7b3a6853e4f999e86bd408422ed0abfa19837a"; + version = "1.2.0"; + sha256 = "a579557bf24cc5d3cfd787dea648e6b94c6a89abffdaa7af8978fa4316a4fcff"; libraryHaskellDepends = [ base bytestring text transformers ]; testHaskellDepends = [ base bytestring QuickCheck tasty tasty-quickcheck text @@ -24958,6 +25014,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "arpack" = callPackage + ({ mkDerivation, arpack, base, concurrent-extra, containers + , control-monad-loop, data-default, hmatrix, hspec, ieee754 + , QuickCheck, storable-complex, transformers, vector + , vector-algorithms + }: + mkDerivation { + pname = "arpack"; + version = "0.1.0.0"; + sha256 = "166ab4f3172c51ef666c09947feed28e35f6f7f6a4d53e46b7d0a4a6a56c4a10"; + libraryHaskellDepends = [ + base concurrent-extra containers control-monad-loop data-default + hmatrix ieee754 storable-complex transformers vector + vector-algorithms + ]; + libraryPkgconfigDepends = [ arpack ]; + testHaskellDepends = [ + base hmatrix hspec QuickCheck vector vector-algorithms + ]; + description = "Solve large scale eigenvalue problems"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) arpack;}; + "array_0_5_1_1" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -26685,8 +26764,8 @@ self: { }: mkDerivation { pname = "avers"; - version = "0.0.15"; - sha256 = "538d2461859dae2edd6a6b2abcd5ca45447a1927017fa94cb777c896c2bf7e5e"; + version = "0.0.16"; + sha256 = "04221c75c07aa82789ce79674a0ba5add253855087fd42c123f1d77fb94f1c85"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash filepath inflections MonadRandom mtl network network-uri @@ -26699,6 +26778,7 @@ self: { rethinkdb-client-driver scrypt stm text time unordered-containers vector ]; + jailbreak = true; description = "empty"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -26782,8 +26862,8 @@ self: { }: mkDerivation { pname = "avwx"; - version = "0.3.0.1"; - sha256 = "427b80127d3fc6e5fe71b90c40bf02e59d297333b8dd96da663585043431b4e5"; + version = "0.3.0.2"; + sha256 = "b4299cc4e05a4c94f53d06f05b30baac1e15c59663b59afd1dd32417a280fb0a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base HTTP lens parsers text ]; @@ -29737,6 +29817,32 @@ self: { inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm; inherit (pkgs) mesa;}; + "bindings-GLFW_3_1_2_2" = callPackage + ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXcursor + , libXext, libXfixes, libXi, libXinerama, libXrandr, libXxf86vm + , mesa, template-haskell, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "bindings-GLFW"; + version = "3.1.2.2"; + sha256 = "537385a35b0ca0f6980f9a785434dcca5e0f8b75475dafa2e9c9d719dd503fc9"; + libraryHaskellDepends = [ base bindings-DSL template-haskell ]; + librarySystemDepends = [ + libX11 libXcursor libXext libXfixes libXi libXinerama libXrandr + libXxf86vm mesa + ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; + description = "Low-level bindings to GLFW OpenGL library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; + inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; + inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; + inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm; + inherit (pkgs) mesa;}; + "bindings-K8055" = callPackage ({ mkDerivation, base, K8055D }: mkDerivation { @@ -30745,8 +30851,8 @@ self: { ({ mkDerivation, base, directory, doctest, filepath, numeric-qq }: mkDerivation { pname = "bit-array"; - version = "0.1.1"; - sha256 = "0c3ce1c19f6830a083b39590a8e9015b1fb430f4fb97dc5349c21c03eec72c14"; + version = "0.1.2"; + sha256 = "1607bc652aea885589414071dd290657296bbec21c235f4f1f2889715bc87e3c"; libraryHaskellDepends = [ base numeric-qq ]; testHaskellDepends = [ base directory doctest filepath ]; jailbreak = true; @@ -31131,7 +31237,7 @@ self: { description = "Proof-of-concept tool for writing using binary choices"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs.gnome2) pango;}; + }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs.gnome) pango;}; "bitstream" = callPackage ({ mkDerivation, base, base-unicode-symbols, bytestring, QuickCheck @@ -33740,6 +33846,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytestring-progress_1_0_7" = callPackage + ({ mkDerivation, base, bytestring, terminal-progress-bar, time }: + mkDerivation { + pname = "bytestring-progress"; + version = "1.0.7"; + sha256 = "97b0950b6dff0154aa463f1e2921dc560478e1156e482bd5bde8a62bd3f83730"; + libraryHaskellDepends = [ + base bytestring terminal-progress-bar time + ]; + homepage = "http://github.com/acw/bytestring-progress"; + description = "A library for tracking the consumption of a lazy ByteString"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bytestring-read" = callPackage ({ mkDerivation, base, bytestring, doctest, tasty, tasty-quickcheck , types-compat @@ -35467,6 +35588,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "call-stack" = callPackage + ({ mkDerivation, base, nanospec }: + mkDerivation { + pname = "call-stack"; + version = "0.1.0"; + sha256 = "f25f5e0992a39371079cc25c2a14b5abb872fa7d868a32753aac3a258b83b1e2"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base nanospec ]; + homepage = "https://github.com/sol/call-stack#readme"; + description = "Use GHC call-stacks in a backward compatible way"; + license = stdenv.lib.licenses.mit; + }) {}; + "camfort" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim @@ -35525,7 +35659,6 @@ self: { array base bytestring containers directory filepath fortran-src hmatrix hspec mtl QuickCheck text uniplate ]; - jailbreak = true; description = "CamFort - Cambridge Fortran infrastructure"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -35596,13 +35729,12 @@ self: { }: mkDerivation { pname = "canteven-http"; - version = "0.1.1.1"; - sha256 = "584a33ae1543afab727d6f22d3895432df3c8bea9e23e5e9c69dd93e5c4e7690"; + version = "0.1.1.2"; + sha256 = "378a453137fa9d1d1ad8f4771c02bb74b5a634624d437fbec00356a153f4b874"; libraryHaskellDepends = [ base bytestring canteven-log exceptions http-types monad-logger text time transformers uuid wai ]; - jailbreak = true; homepage = "https://github.com/SumAll/canteven-http"; description = "Utilities for HTTP programming"; license = stdenv.lib.licenses.mit; @@ -35627,13 +35759,12 @@ self: { }: mkDerivation { pname = "canteven-log"; - version = "1.0.0.0"; - sha256 = "67d58599b7ed949606208aab1c17d333d4793a911405e349c710db4267d2e098"; + version = "2.0.0.1"; + sha256 = "11cd21b4912b5ddd32515f8a0097fff5fc6642371647269a200d3063cf7452c9"; libraryHaskellDepends = [ aeson base bytestring directory fast-logger filepath monad-logger template-haskell text time transformers yaml ]; - jailbreak = true; homepage = "https://github.com/SumAll/haskell-canteven-log"; description = "A canteven way of setting up logging for your program"; license = stdenv.lib.licenses.asl20; @@ -35830,22 +35961,23 @@ self: { }) {}; "carettah" = callPackage - ({ mkDerivation, base, cairo, directory, filepath, gtk, hcwiid - , highlighting-kate, mtl, pandoc, pango, process, text, time + ({ mkDerivation, base, cairo, directory, filepath, gtk + , gtk2hs-buildtools, hcwiid, highlighting-kate, mtl, pandoc, pango + , process, text, time }: mkDerivation { pname = "carettah"; - version = "0.4.2"; - sha256 = "e698dc362f8f6c3fb62bfaecbd56484faa4d2ff84e5fabe8747312970d91f35b"; + version = "0.5.1"; + sha256 = "aabf95661b42aac4a3cefdf352c3de545e822f2bb6d8d7609f1033c34cc41f4c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base cairo directory filepath gtk hcwiid highlighting-kate mtl - pandoc pango process text time + base cairo directory filepath gtk gtk2hs-buildtools hcwiid + highlighting-kate mtl pandoc pango process text time ]; homepage = "https://github.com/master-q/carettah"; description = "A presentation tool written with Haskell"; - license = stdenv.lib.licenses.gpl2; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -36700,10 +36832,11 @@ self: { }: mkDerivation { pname = "cblrepo"; - version = "0.21.0"; - sha256 = "a69470286432b822b2aca531c147794b3e8a5a2702cf9f2170aeda9e4058549f"; + version = "0.23.0"; + sha256 = "bbb17315e0618e121f8c339a4758d41a0a4b9d7b594168978fdc13d7fff93281"; isLibrary = false; isExecutable = true; + setupHaskellDepends = [ base Cabal ]; executableHaskellDepends = [ aeson ansi-wl-pprint base bytestring Cabal containers directory filepath mtl optparse-applicative process safe stringsearch tar @@ -37412,6 +37545,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "chart-unit" = callPackage + ({ mkDerivation, base, colour, containers, data-default, diagrams + , diagrams-core, diagrams-lib, diagrams-rasterific, diagrams-svg + , foldl, lens, primitive, protolude, random-fu, text + }: + mkDerivation { + pname = "chart-unit"; + version = "0.1.0.0"; + sha256 = "623d5e89b846bacc55a659e1e976da6c5c9de686ae5b088d5b9660dc082d5e8e"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base colour containers data-default diagrams diagrams-core + diagrams-lib diagrams-rasterific diagrams-svg foldl lens primitive + protolude text + ]; + executableHaskellDepends = [ + base containers diagrams diagrams-core diagrams-lib + diagrams-rasterific diagrams-svg foldl lens primitive protolude + random-fu text + ]; + homepage = "https://github.com/tonyday567/chart-unit"; + description = "A set of native haskell charts"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "chaselev-deque" = callPackage ({ mkDerivation, abstract-deque, abstract-deque-tests, array , atomic-primops, base, containers, ghc-prim, HUnit, test-framework @@ -38441,6 +38600,7 @@ self: { librarySystemDepends = [ clang ]; description = "Pure C++ code analysis with libclang"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (self.llvmPackages) clang;}; "clanki" = callPackage @@ -39504,7 +39664,7 @@ self: { description = "Bindings to the Clutter animation library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) clutter; inherit (pkgs.gnome2) pango;}; + }) {inherit (pkgs) clutter; inherit (pkgs.gnome) pango;}; "cmaes" = callPackage ({ mkDerivation, base, doctest, doctest-prop, mtl, process, random @@ -41596,28 +41756,6 @@ self: { }) {}; "conduit" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, lifted-base - , mmorph, mtl, QuickCheck, resourcet, safe, transformers - , transformers-base - }: - mkDerivation { - pname = "conduit"; - version = "1.2.7"; - sha256 = "36b21db556cf81d3080edd50f417ce5dd8391f32cf2f8078b48110cfd6ed3be5"; - libraryHaskellDepends = [ - base exceptions lifted-base mmorph mtl resourcet transformers - transformers-base - ]; - testHaskellDepends = [ - base containers exceptions hspec mtl QuickCheck resourcet safe - transformers - ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Streaming data processing library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit_1_2_8" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base , mmorph, monad-control, mtl, QuickCheck, resourcet, safe , transformers, transformers-base @@ -41637,7 +41775,6 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-audio" = callPackage @@ -41725,8 +41862,8 @@ self: { }: mkDerivation { pname = "conduit-combinators"; - version = "1.0.7"; - sha256 = "b5fbdcb33f9425bcc8a0beee1953076922cd94492ce4d40afcf33861f32a3ac7"; + version = "1.0.8"; + sha256 = "c486be3d35d85ca697beffce0ef68ae28c1c4fb94e3884f4cfb6df5ecb5ad04b"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring chunked-data conduit conduit-extra filepath monad-control mono-traversable @@ -41743,7 +41880,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "conduit-combinators_1_0_8" = callPackage + "conduit-combinators_1_0_8_1" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, chunked-data, conduit, conduit-extra, containers , directory, filepath, hspec, monad-control, mono-traversable, mtl @@ -41753,8 +41890,8 @@ self: { }: mkDerivation { pname = "conduit-combinators"; - version = "1.0.8"; - sha256 = "c486be3d35d85ca697beffce0ef68ae28c1c4fb94e3884f4cfb6df5ecb5ad04b"; + version = "1.0.8.1"; + sha256 = "cf347790f173dce64ebf7ef1b364686fee2d890bfa38caa9145494a5909a7637"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring chunked-data conduit conduit-extra filepath monad-control mono-traversable @@ -41766,7 +41903,6 @@ self: { conduit containers directory filepath hspec mono-traversable mtl mwc-random QuickCheck safe silently text transformers vector ]; - jailbreak = true; homepage = "https://github.com/snoyberg/mono-traversable"; description = "Commonly used conduit functions, for both chunked and unchunked data"; license = stdenv.lib.licenses.mit; @@ -43600,6 +43736,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "countable-inflections" = callPackage + ({ mkDerivation, base, bytestring, exceptions, hspec, pcre-light + , QuickCheck, text + }: + mkDerivation { + pname = "countable-inflections"; + version = "0.1.0"; + sha256 = "24bb1f350cfbab09c8de1ededab28f138038d04c86e3614d8dc8514f8c8f1db9"; + libraryHaskellDepends = [ + base bytestring exceptions pcre-light text + ]; + testHaskellDepends = [ base hspec QuickCheck text ]; + homepage = "https://github.com/tippenein/countable-inflections"; + description = "Countable Text Inflections"; + license = stdenv.lib.licenses.mit; + }) {}; + "counter" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -52028,6 +52181,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "distributed-closure_0_3_3_0" = callPackage + ({ mkDerivation, base, binary, bytestring, constraints, hspec + , QuickCheck, syb, template-haskell + }: + mkDerivation { + pname = "distributed-closure"; + version = "0.3.3.0"; + sha256 = "bc675fd3b93c7e51a923969220821ea1676c639ff9fd4e742bd864e90f2e368f"; + libraryHaskellDepends = [ + base binary bytestring constraints syb template-haskell + ]; + testHaskellDepends = [ base binary hspec QuickCheck ]; + homepage = "https://github.com/tweag/distributed-closure"; + description = "Serializable closures for distributed programming"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "distributed-process" = callPackage ({ mkDerivation, base, binary, bytestring, containers , data-accessor, deepseq, distributed-static, exceptions, hashable @@ -52748,29 +52919,6 @@ self: { }) {}; "dns" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring - , bytestring-builder, conduit, conduit-extra, containers, doctest - , hspec, iproute, mtl, network, random, resourcet, safe, word8 - }: - mkDerivation { - pname = "dns"; - version = "2.0.5"; - sha256 = "b2de8a536e96db022aaa2d368689e8cad7cbd1c8bfb1cc7c56b517e5633a8879"; - libraryHaskellDepends = [ - attoparsec base binary bytestring bytestring-builder conduit - conduit-extra containers iproute mtl network random resourcet safe - ]; - testHaskellDepends = [ - attoparsec base binary bytestring bytestring-builder conduit - conduit-extra containers doctest hspec iproute mtl network random - resourcet safe word8 - ]; - testTarget = "spec"; - description = "DNS library in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dns_2_0_6" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , bytestring-builder, conduit, conduit-extra, containers, doctest , hspec, iproute, mtl, network, random, resourcet, safe, word8 @@ -52791,7 +52939,6 @@ self: { testTarget = "spec"; description = "DNS library in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dnscache" = callPackage @@ -53013,6 +53160,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "doctemplates" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, hspec, parsec, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "doctemplates"; + version = "0.1.0.2"; + sha256 = "b752f52350daaa9bcf261a1f1af5852f75572093c3d0cdeb4822282fb3a18a6b"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers parsec + scientific text unordered-containers vector + ]; + testHaskellDepends = [ aeson base hspec text ]; + homepage = "https://github.com/jgm/doctemplates#readme"; + description = "Pandoc-style document templates"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "doctest" = callPackage ({ mkDerivation, base, base-compat, deepseq, directory, filepath , ghc, ghc-paths, hspec, HUnit, process, QuickCheck, setenv @@ -54783,6 +54949,7 @@ self: { homepage = "http://github.com/GaloisInc/ec2-unikernel"; description = "A handy tool for uploading unikernels to Amazon's EC2"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "eccrypto" = callPackage @@ -57790,24 +57957,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "eventstore_0_13_1_5" = callPackage - ({ mkDerivation, aeson, array, base, cereal, classy-prelude + "eventstore_0_13_1_6" = callPackage + ({ mkDerivation, aeson, array, async, base, cereal, classy-prelude , connection, containers, dns, dotnet-timespan, http-client , protobuf, random, semigroups, stm, tasty, tasty-hunit, text, time , unordered-containers, uuid }: mkDerivation { pname = "eventstore"; - version = "0.13.1.5"; - sha256 = "1ddf2d5d5a3cf4ffb167c351751eb7a9faa21eef399c54476d3cf045d4c344bc"; + version = "0.13.1.6"; + sha256 = "5d5b966a6852d94764712b137e6f8a4c90fd15cc700b1f8e0d5b184301664ad1"; libraryHaskellDepends = [ aeson array base cereal classy-prelude connection containers dns dotnet-timespan http-client protobuf random semigroups stm time unordered-containers uuid ]; testHaskellDepends = [ - aeson base connection dotnet-timespan stm tasty tasty-hunit text - time + aeson async base connection dotnet-timespan stm tasty tasty-hunit + text time ]; jailbreak = true; homepage = "http://github.com/YoEight/eventstore"; @@ -59068,24 +59235,6 @@ self: { }) {}; "fast-logger" = callPackage - ({ mkDerivation, array, auto-update, base, bytestring - , bytestring-builder, directory, easy-file, filepath, hspec, text - , unix, unix-time - }: - mkDerivation { - pname = "fast-logger"; - version = "2.4.6"; - sha256 = "d45640acb40bf9b6f81cbe63e3587b6e59d9ec24a15401e52bdc7969b6f2cfd1"; - libraryHaskellDepends = [ - array auto-update base bytestring bytestring-builder directory - easy-file filepath text unix unix-time - ]; - testHaskellDepends = [ base bytestring directory hspec ]; - description = "A fast logging system"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fast-logger_2_4_7" = callPackage ({ mkDerivation, array, auto-update, base, bytestring , bytestring-builder, directory, easy-file, filepath, hspec, text , unix, unix-time @@ -59102,7 +59251,6 @@ self: { homepage = "https://github.com/kazu-yamamoto/logger"; description = "A fast logging system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fast-math" = callPackage @@ -60477,6 +60625,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fileneglect" = callPackage + ({ mkDerivation, base, hinotify, stm }: + mkDerivation { + pname = "fileneglect"; + version = "0.0.0.1"; + sha256 = "659cc5d7b6fa5949bc6a8a28d2c830f1d3386c78cf82ae95034b2d66309500e8"; + libraryHaskellDepends = [ base hinotify stm ]; + description = "Block thread until a file stops being modified"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "filepath_1_4_1_0" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -60723,22 +60882,20 @@ self: { }) {}; "finite-field" = callPackage - ({ mkDerivation, base, containers, deepseq, hashable, HUnit, primes - , QuickCheck, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck2 - , test-framework-th, type-level-numbers + ({ mkDerivation, base, containers, deepseq, hashable, primes + , QuickCheck, singletons, tasty, tasty-hunit, tasty-quickcheck + , tasty-th, template-haskell }: mkDerivation { pname = "finite-field"; - version = "0.8.0"; - sha256 = "d15294156f47de63f76c9e9a1b1eaaa9cbcac0bd174b6c5b2fa49075dbc18b72"; + version = "0.9.0"; + sha256 = "8318c793c43cb30c8bf7f6fbea19e7d3e94cc1e81d849f821655efc3322ed408"; libraryHaskellDepends = [ - base deepseq hashable template-haskell type-level-numbers + base deepseq hashable singletons template-haskell ]; testHaskellDepends = [ - base containers HUnit primes QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 test-framework-th - type-level-numbers + base containers deepseq hashable primes QuickCheck singletons tasty + tasty-hunit tasty-quickcheck tasty-th ]; description = "Finite Fields"; license = stdenv.lib.licenses.bsd3; @@ -62025,6 +62182,7 @@ self: { homepage = "http://github.com/Data61/foldl-statistics#readme"; description = "Statistical functions from the statistics package implemented as Folds"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foldl-transduce" = callPackage @@ -62531,34 +62689,6 @@ self: { }) {}; "fortran-src" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers, derive - , directory, fgl, filepath, GenericPretty, happy, hspec, mtl - , pretty, text, uniplate - }: - mkDerivation { - pname = "fortran-src"; - version = "0.1.0.3"; - sha256 = "c3c3a2de98e4d08c23907092311f69869577850842cfb1b5fce53176cfb4a06e"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring containers fgl GenericPretty mtl pretty text - uniplate - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ - array base bytestring containers fgl GenericPretty mtl pretty text - uniplate - ]; - testHaskellDepends = [ - array base bytestring containers derive directory fgl filepath - GenericPretty hspec mtl pretty text uniplate - ]; - description = "Parser and anlyses for Fortran standards 66, 77, 90"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "fortran-src_0_1_0_4" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , directory, fgl, filepath, GenericPretty, happy, hspec, mtl , pretty, text, uniplate @@ -62584,7 +62714,6 @@ self: { ]; description = "Parser and anlyses for Fortran standards 66, 77, 90"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foscam-directory" = callPackage @@ -64621,7 +64750,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GNOME configuration database system"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome2) GConf;}; + }) {inherit (pkgs.gnome) GConf;}; "gd" = callPackage ({ mkDerivation, base, bytestring, expat, fontconfig, freetype, gd @@ -65891,8 +66020,8 @@ self: { }: mkDerivation { pname = "ghc-dump-tree"; - version = "0.2.0.1"; - sha256 = "784a983d6d887f5d36b6169a7d1bdd41800699ef79f74e3806c081ce1e2074a8"; + version = "0.2.0.2"; + sha256 = "a89a52e448926eab7ecd97ba7081b858486bcaf487cd800403c3e2a0a76a9cc3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65952,8 +66081,8 @@ self: { }: mkDerivation { pname = "ghc-events-analyze"; - version = "0.2.2"; - sha256 = "0cbcf66eae454ea672bec6f23b97b295fe9a7312c33f7e6b0272c270a7e8e0f3"; + version = "0.2.4"; + sha256 = "6161f5491a34252289c8265c7c48c5a70c1e2a69ffbfe64800cfdc3a8d3d4dd9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -65961,7 +66090,6 @@ self: { mtl optparse-applicative parsec SVGFonts template-haskell th-lift transformers ]; - jailbreak = true; description = "Analyze and visualize event logs"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -66454,30 +66582,6 @@ self: { }) {}; "ghc-typelits-extra" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra - , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp - , singletons, tasty, tasty-hunit, transformers - }: - mkDerivation { - pname = "ghc-typelits-extra"; - version = "0.2"; - sha256 = "7ea3126b4dcf8de6dacd4654bbed1eb019cd088a70f79434d34193d93fac2c17"; - revision = "1"; - editedCabalFile = "52861a8d689da7f12990a870c6f3c0a219e9b2946570733710e21841947afdbc"; - libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra ghc-typelits-knownnat - ghc-typelits-natnormalise integer-gmp singletons transformers - ]; - testHaskellDepends = [ - base ghc-typelits-knownnat ghc-typelits-natnormalise tasty - tasty-hunit - ]; - homepage = "http://www.clash-lang.org/"; - description = "Additional type-level operations on GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "ghc-typelits-extra_0_2_1" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp , singletons, tasty, tasty-hunit, template-haskell, transformers @@ -66497,31 +66601,9 @@ self: { homepage = "http://www.clash-lang.org/"; description = "Additional type-level operations on GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-typelits-knownnat" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra - , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit - , template-haskell, transformers - }: - mkDerivation { - pname = "ghc-typelits-knownnat"; - version = "0.2.1"; - sha256 = "5c4e3f8be0fe29e523c1129cea98a18d46950ea53178b57fd06ae3b0057271ee"; - libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra ghc-typelits-natnormalise singletons - template-haskell transformers - ]; - testHaskellDepends = [ - base ghc-typelits-natnormalise singletons tasty tasty-hunit - ]; - homepage = "http://clash-lang.org/"; - description = "Derive KnownNat constraints from other KnownNat constraints"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "ghc-typelits-knownnat_0_2_2" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra , ghc-typelits-natnormalise, singletons, tasty, tasty-hunit , template-haskell, transformers @@ -66540,27 +66622,9 @@ self: { homepage = "http://clash-lang.org/"; description = "Derive KnownNat constraints from other KnownNat constraints"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-typelits-natnormalise" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty - , tasty-hunit - }: - mkDerivation { - pname = "ghc-typelits-natnormalise"; - version = "0.5"; - sha256 = "3ac6b6c46b41dba1cf06f9dc3a6180939401a318612f81087241dd7bc7e755f5"; - libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra integer-gmp - ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - homepage = "http://www.clash-lang.org/"; - description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "ghc-typelits-natnormalise_0_5_1" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty , tasty-hunit, template-haskell }: @@ -66575,7 +66639,6 @@ self: { homepage = "http://www.clash-lang.org/"; description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-typelits-presburger" = callPackage @@ -66785,13 +66848,13 @@ self: { ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }: mkDerivation { pname = "ghcjs-dom"; - version = "0.3.1.0"; - sha256 = "74a02471ecc57f3de7e4e85f34630daa663aee2b358522833c305eca81f9c32a"; + version = "0.4.0.0"; + sha256 = "a21735e316465e7d11e38443edcd5b07b4bef6aabdfac84dca6ca5f67f01d02e"; libraryHaskellDepends = [ base ghcjs-dom-jsaddle text transformers ]; doHaddock = false; - description = "DOM library that supports both GHCJS and WebKitGTK"; + description = "DOM library that supports both GHCJS and GHC"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -66800,12 +66863,11 @@ self: { ({ mkDerivation, base, ghcjs-dom, mtl }: mkDerivation { pname = "ghcjs-dom-hello"; - version = "2.0.0.0"; - sha256 = "34bd62641aa6913d04baeb1ab347f6f867080e001f7cacfb841a5f14abf46fe7"; + version = "3.0.0.0"; + sha256 = "1cf743f986fe9cd97951efb6182ebf6e5d7b6c920cb92354c11ebea86273b7e5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ghcjs-dom mtl ]; - jailbreak = true; homepage = "https://github.com/ghcjs/ghcjs-dom-hello"; description = "GHCJS DOM Hello World, an example package"; license = stdenv.lib.licenses.mit; @@ -66816,11 +66878,11 @@ self: { ({ mkDerivation, jsaddle-dom }: mkDerivation { pname = "ghcjs-dom-jsaddle"; - version = "0.3.1.0"; - sha256 = "82ab76c520ad821755c6343d66977cdf7ac728be888717621a03fd999ccaf02e"; + version = "0.4.0.0"; + sha256 = "b5e5737fa1c41b72c2c2fc99df2deb715d6088f5d9ac149f95b930b42cc7dff7"; libraryHaskellDepends = [ jsaddle-dom ]; doHaddock = false; - description = "DOM library that supports both GHCJS and WebKitGTK using jsaddle"; + description = "DOM library that supports both GHCJS and GHC using jsaddle"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -66829,8 +66891,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-jsffi"; - version = "0.3.1.0"; - sha256 = "afa04fa73727c0cfe2c80b88cc25d96555021465b022533b328e2ddab00680fc"; + version = "0.4.0.0"; + sha256 = "d405a444dd65233e1006c2b4a41e81320a1f05300c72602abee3bd4ef0f7347f"; isLibrary = false; isExecutable = false; description = "DOM library using JSFFI and GHCJS"; @@ -67507,7 +67569,7 @@ self: { description = "GtkSource bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) gtksourceview;}; + }) {inherit (pkgs.gnome) gtksourceview;}; "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, containers, haskell-gi @@ -67598,7 +67660,7 @@ self: { license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection; - inherit (pkgs.gnome2) pango;}; + inherit (pkgs.gnome) pango;}; "gi-pango_1_0_6" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers @@ -67626,7 +67688,7 @@ self: { license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection; - inherit (pkgs.gnome2) pango;}; + inherit (pkgs.gnome) pango;}; "gi-pangocairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -67648,7 +67710,7 @@ self: { description = "PangoCairo bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) pango;}; + }) {inherit (pkgs.gnome) pango;}; "gi-poppler" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -67690,7 +67752,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Libsoup bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome2) libsoup;}; + }) {inherit (pkgs.gnome) libsoup;}; "gi-soup_2_4_6" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -67712,7 +67774,7 @@ self: { description = "Libsoup bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) libsoup;}; + }) {inherit (pkgs.gnome) libsoup;}; "gi-vte" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -67734,7 +67796,7 @@ self: { description = "Vte bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) vte;}; + }) {inherit (pkgs.gnome) vte;}; "gi-webkit" = callPackage ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo @@ -67985,6 +68047,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "giphy-api_0_5_0_0" = callPackage + ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers + , directory, hspec, http-api-data, http-client, http-client-tls + , lens, microlens, microlens-th, mtl, network-uri, servant + , servant-client, text, transformers + }: + mkDerivation { + pname = "giphy-api"; + version = "0.5.0.0"; + sha256 = "12ad1a1080348dfd4033d4c97e5b2a7c3d3da8d342c78c520a5d51396474b16e"; + libraryHaskellDepends = [ + aeson base containers http-api-data http-client http-client-tls + microlens microlens-th mtl network-uri servant servant-client text + transformers + ]; + testHaskellDepends = [ + aeson base basic-prelude bytestring containers directory hspec lens + network-uri text + ]; + jailbreak = true; + homepage = "http://github.com/passy/giphy-api#readme"; + description = "Giphy HTTP API wrapper and CLI search tool"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gist" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, http-conduit , text @@ -68185,6 +68273,8 @@ self: { pname = "git-fmt"; version = "0.4.1.0"; sha256 = "a9c10f79f92b6a1650f4eac002542a35dda0048ed68d670602e97615b879e97d"; + revision = "1"; + editedCabalFile = "96d1979715bb9d13c2ac5a2698a47c58c755cf6177bd84178fd646efc16f7fa9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -68970,7 +69060,7 @@ self: { description = "Binding to the glade library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) libglade;}; + }) {inherit (pkgs.gnome) libglade;}; "gladexml-accessor" = callPackage ({ mkDerivation, base, glade, HaXml, template-haskell }: @@ -69077,14 +69167,13 @@ self: { }) {}; "glider-nlp" = callPackage - ({ mkDerivation, base, Cabal, containers, HUnit, text }: + ({ mkDerivation, base, Cabal, containers, hspec, text }: mkDerivation { pname = "glider-nlp"; - version = "0.1"; - sha256 = "cba1bce586c0bf71c9e4a7111928c7fa92060474cf68c5dac84b693de423c0c4"; + version = "0.4"; + sha256 = "84b8d06e47dcbfba91bcbfe22caee05e9e1db034a03ebde4d4d6054fb30d5588"; libraryHaskellDepends = [ base containers text ]; - testHaskellDepends = [ base Cabal containers HUnit text ]; - jailbreak = true; + testHaskellDepends = [ base Cabal containers hspec text ]; homepage = "https://github.com/klangner/glider-nlp"; description = "Natural Language Processing library"; license = stdenv.lib.licenses.bsd3; @@ -69658,7 +69747,7 @@ self: { description = "Bindings for libgnome-keyring"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) gnome_keyring;}; + }) {inherit (pkgs.gnome) gnome_keyring;}; "gnomevfs" = callPackage ({ mkDerivation, array, base, containers, glib, gnome_vfs @@ -69678,7 +69767,7 @@ self: { description = "Binding to the GNOME Virtual File System library"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) gnome_vfs; gnome_vfs_module = null;}; + }) {inherit (pkgs.gnome) gnome_vfs; gnome_vfs_module = null;}; "gnss-converters" = callPackage ({ mkDerivation, base, basic-prelude, binary-conduit, bytestring @@ -73279,7 +73368,7 @@ self: { description = "Binding to the GTK+ OpenGL Extension"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) gtkglext;}; + }) {inherit (pkgs.gnome) gtkglext;}; "gtkimageview" = callPackage ({ mkDerivation, array, base, containers, glib, gtk @@ -73336,7 +73425,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome2) gtksourceview;}; + }) {inherit (pkgs.gnome) gtksourceview;}; "gtksourceview3" = callPackage ({ mkDerivation, array, base, Cabal, containers, glib @@ -73354,7 +73443,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome2) gtksourceview;}; + }) {inherit (pkgs.gnome) gtksourceview;}; "guarded-rewriting" = callPackage ({ mkDerivation, base, instant-generics }: @@ -73707,6 +73796,7 @@ self: { homepage = "http://floss.scru.org/hOpenPGP/"; description = "native Haskell implementation of OpenPGP (RFC4880)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hPDB" = callPackage @@ -75159,24 +75249,6 @@ self: { }) {}; "hailgun" = callPackage - ({ mkDerivation, aeson, base, bytestring, email-validate - , exceptions, filepath, http-client, http-client-tls, http-types - , tagsoup, text, time, transformers - }: - mkDerivation { - pname = "hailgun"; - version = "0.4.1.0"; - sha256 = "9700d1718e92ffb55b457ed21bc21731fefe71990d21bc36b92bb6a5e08c869b"; - libraryHaskellDepends = [ - aeson base bytestring email-validate exceptions filepath - http-client http-client-tls http-types tagsoup text time - transformers - ]; - description = "Mailgun REST api interface for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hailgun_0_4_1_1" = callPackage ({ mkDerivation, aeson, base, bytestring, email-validate , exceptions, filepath, http-client, http-client-tls, http-types , tagsoup, text, time, transformers @@ -75192,7 +75264,6 @@ self: { ]; description = "Mailgun REST api interface for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hailgun-send" = callPackage @@ -75852,21 +75923,21 @@ self: { }) {}; "hamsql" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, file-embed - , filepath, frontmatter, groom, network-uri, optparse-applicative - , pandoc, postgresql-simple, semigroups, text, transformers + ({ mkDerivation, aeson, base, bytestring, directory, doctemplates + , file-embed, filepath, frontmatter, groom, network-uri + , optparse-applicative, postgresql-simple, text, transformers , unordered-containers, yaml }: mkDerivation { pname = "hamsql"; - version = "0.7.0.0"; - sha256 = "bde760cd857cd601b8f9cd737752cd172f7cdf360b5cbed13c0acba18c80433d"; + version = "0.8.0.0"; + sha256 = "fd12ea140ecf7f175ba1896c2aa53bba66cbfb93d8033dfa8432f0381062983b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring directory file-embed filepath frontmatter - groom network-uri optparse-applicative pandoc postgresql-simple - semigroups text transformers unordered-containers yaml + aeson base bytestring directory doctemplates file-embed filepath + frontmatter groom network-uri optparse-applicative + postgresql-simple text transformers unordered-containers yaml ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; @@ -75874,6 +75945,7 @@ self: { homepage = "https://git.hemio.de/hemio/hamsql"; description = "HamSql"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hamtmap" = callPackage @@ -78704,6 +78776,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-meta_0_7_0" = callPackage + ({ mkDerivation, base, haskell-src-exts, pretty, syb + , template-haskell, th-orphans + }: + mkDerivation { + pname = "haskell-src-meta"; + version = "0.7.0"; + sha256 = "2a6735cc3379171a722f2a1df15dc67f216a404db4396b05f5e06ac82ab89856"; + libraryHaskellDepends = [ + base haskell-src-exts pretty syb template-haskell th-orphans + ]; + description = "Parse source to template-haskell abstract syntax"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-src-meta-mwotton" = callPackage ({ mkDerivation, base, containers, ghc-prim, haskell-src-exts , pretty, syb, template-haskell @@ -80116,6 +80204,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql_0_19_15_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring + , bytestring-tree-builder, contravariant, contravariant-extras + , data-default-class, dlist, either, hashable, hashtables, loch-th + , mtl, placeholders, postgresql-binary, postgresql-libpq + , profunctors, QuickCheck, quickcheck-instances, rebase, scientific + , semigroups, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, text, time, transformers, uuid, vector + }: + mkDerivation { + pname = "hasql"; + version = "0.19.15.2"; + sha256 = "b025bd613d23444f18f1196ca51fb2bdbb4b10bf779c1db85685eeb755c8bb34"; + libraryHaskellDepends = [ + aeson attoparsec base base-prelude bytestring + bytestring-tree-builder contravariant contravariant-extras + data-default-class dlist either hashable hashtables loch-th mtl + placeholders postgresql-binary postgresql-libpq profunctors + scientific semigroups text time transformers uuid vector + ]; + testHaskellDepends = [ + data-default-class QuickCheck quickcheck-instances rebase tasty + tasty-hunit tasty-quickcheck tasty-smallcheck + ]; + jailbreak = true; + homepage = "https://github.com/nikita-volkov/hasql"; + description = "An efficient PostgreSQL driver and a flexible mapping API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-backend" = callPackage ({ mkDerivation, base-prelude, bytestring, either, free, list-t , text, transformers, vector @@ -80660,8 +80779,8 @@ self: { }: mkDerivation { pname = "haxl"; - version = "0.4.0.0"; - sha256 = "fb63805d17f920efc59f16452f4b4a6e501880123505d73fa5d17c1b1554d7b6"; + version = "0.4.0.1"; + sha256 = "15bc6c2ed641b3c1f1e8f8cfc377fe5ae8ec3e1f4a8eb03be8e154f981cfd6a3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82240,24 +82359,23 @@ self: { }) {}; "helm" = callPackage - ({ mkDerivation, base, cairo, containers, cpu, elerea, filepath - , HUnit, mtl, pango, random, sdl2, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , transformers + ({ mkDerivation, base, cairo, containers, elerea, hspec, linear + , mtl, pango, random, sdl2, stm, text, transformers }: mkDerivation { pname = "helm"; - version = "0.7.1"; - sha256 = "eff90ae15a7af236bc0f431686409869c6a5881e6978bee523f29329b0e95513"; + version = "1.0.0"; + sha256 = "2db4102c179de11b62551c2e73477773fb603c5749dda0caac53bf038bef630c"; + revision = "1"; + editedCabalFile = "d302a857ec4bfaf720ba5f2345fe2cc3df5d61d920173172ca092671340f700f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base cairo containers cpu elerea filepath mtl pango random sdl2 - text time transformers + base cairo containers elerea linear mtl pango sdl2 stm text + transformers ]; - testHaskellDepends = [ - base cairo containers elerea HUnit sdl2 test-framework - test-framework-hunit test-framework-quickcheck2 time - ]; - jailbreak = true; + executableHaskellDepends = [ base linear random ]; + testHaskellDepends = [ base hspec ]; homepage = "http://github.com/switchface/helm"; description = "A functionally reactive game engine"; license = stdenv.lib.licenses.mit; @@ -83520,8 +83638,8 @@ self: { }: mkDerivation { pname = "hi"; - version = "1.2.0.0"; - sha256 = "091e82568ffada19e196eeead484f4764399288b0ba5f9729abd1ec4ee918399"; + version = "1.2.0.1"; + sha256 = "c2758df75bec2f971d85f4f681d56c42f28adb013058e445851cbc94a209828e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83539,8 +83657,7 @@ self: { HUnit optparse-applicative parsec process silently split template temporary text time ]; - jailbreak = true; - homepage = "https://github.com/fujimura/hi"; + homepage = "https://github.com/fujimura/hi.git#readme"; description = "Generate scaffold for cabal project"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -85785,21 +85902,21 @@ self: { "hnix" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, data-fix - , parsers, tasty, tasty-hunit, tasty-th, text, transformers - , trifecta, unordered-containers + , deepseq, deriving-compat, parsers, semigroups, tasty, tasty-hunit + , tasty-th, text, transformers, trifecta, unordered-containers }: mkDerivation { pname = "hnix"; - version = "0.2.1"; - sha256 = "2a1a0fbb24288ff74b4380ca792bfd7b369c4970e20c158ef0afe547bde120f8"; + version = "0.3.3"; + sha256 = "8c14d3e86b3b2a0e9834ade0f2c3595a96b27d1cc114873887a84f6ed8bee44f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base containers data-fix parsers text transformers - trifecta unordered-containers + ansi-wl-pprint base containers data-fix deepseq deriving-compat + parsers semigroups text transformers trifecta unordered-containers ]; executableHaskellDepends = [ - ansi-wl-pprint base containers data-fix + ansi-wl-pprint base containers data-fix deepseq ]; testHaskellDepends = [ base containers data-fix tasty tasty-hunit tasty-th text @@ -85998,6 +86115,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {ocilib = null;}; + "hocilib_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, c2hs, containers, inline-c + , ocilib, tasty, tasty-hunit, template-haskell + }: + mkDerivation { + pname = "hocilib"; + version = "0.2.0"; + sha256 = "7c29cc84e7ac320cd1ddfb9d387d19c7c03fea3eedfb41713115d0e94aeafb78"; + libraryHaskellDepends = [ + base bytestring containers inline-c template-haskell + ]; + librarySystemDepends = [ ocilib ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit ]; + testSystemDepends = [ ocilib ]; + homepage = "https://github.com/fpinsight/hocilib"; + description = "FFI binding to OCILIB"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {ocilib = null;}; + "hoe" = callPackage ({ mkDerivation, base, exceptions, hint, mtl, optparse-declarative , regex-posix, split, text, time @@ -86837,6 +86975,7 @@ self: { homepage = "http://floss.scru.org/hopenpgp-tools"; description = "hOpenPGP-based command-line tools"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hopenssl" = callPackage @@ -86928,12 +87067,11 @@ self: { }: mkDerivation { pname = "hoppy-docs"; - version = "0.2.0"; - sha256 = "232b8bb781b6599228b3222ecb74478ad957ce97ce659e29b9d685e7e0343ab4"; + version = "0.2.1"; + sha256 = "213baa6a2a53f9b0efec11affcdf0ddb24e86a462a333f7a9d81df829f4d55a0"; libraryHaskellDepends = [ base haskell-src hoppy-generator hoppy-runtime ]; - jailbreak = true; homepage = "http://khumba.net/projects/hoppy"; description = "C++ FFI generator - Documentation"; license = stdenv.lib.licenses.agpl3; @@ -86946,12 +87084,11 @@ self: { }: mkDerivation { pname = "hoppy-generator"; - version = "0.2.0"; - sha256 = "fa30639c66be9e3fb976602c13d6d89fc9945d7af7f21f1377d15a8e1549ac2b"; + version = "0.2.1"; + sha256 = "b03dacf5d0b85b859d01c8cb29045092ad64cb983ec162d37f87ecabc9d052ba"; libraryHaskellDepends = [ base containers directory filepath haskell-src mtl ]; - jailbreak = true; homepage = "http://khumba.net/projects/hoppy"; description = "C++ FFI generator - Code generator"; license = stdenv.lib.licenses.agpl3; @@ -86962,10 +87099,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "hoppy-runtime"; - version = "0.2.0"; - sha256 = "b0f451727c8fa175bce3b8d4d7af04d52b17a25a9bcab5f33d039daa6463b51d"; + version = "0.2.1"; + sha256 = "f4969d7cd352399d2f76739cf4ab75e23b1ff491437400ca2e3bc4bbe4505392"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://khumba.net/projects/hoppy"; description = "C++ FFI generator - Runtime support"; license = stdenv.lib.licenses.asl20; @@ -86976,12 +87112,11 @@ self: { ({ mkDerivation, base, filepath, haskell-src, hoppy-generator }: mkDerivation { pname = "hoppy-std"; - version = "0.2.0"; - sha256 = "00f374c6a1539ff67b2e673c6e43d1ff7dd8b88e8534741b3991254886bea3ab"; + version = "0.2.1"; + sha256 = "13eee9e5d2f993d8486f2c9125c109d89ba5d6ec13b3165e7f733b04e8c677cc"; libraryHaskellDepends = [ base filepath haskell-src hoppy-generator ]; - jailbreak = true; homepage = "http://khumba.net/projects/hoppy"; description = "C++ FFI generator - Standard library bindings"; license = stdenv.lib.licenses.asl20; @@ -88232,6 +88367,7 @@ self: { homepage = "https://github.com/Wizek/hs-di#readme"; description = "Dependency Injection library for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-dotnet" = callPackage @@ -88459,7 +88595,7 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) mesos; inherit (pkgs) protobuf;}; + }) {mesos = null; inherit (pkgs) protobuf;}; "hs-nombre-generator" = callPackage ({ mkDerivation, base, HandsomeSoup, hxt, random }: @@ -89494,6 +89630,7 @@ self: { homepage = "https://github.com/mvoidex/hsdev"; description = "Haskell development library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsdif" = callPackage @@ -89873,6 +90010,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsinstall" = callPackage + ({ mkDerivation, base, directory, filepath }: + mkDerivation { + pname = "hsinstall"; + version = "1.0"; + sha256 = "198fd23264669c03fcca24a1fbbd898ae30e40ab188375d22f9b26c4ff96e378"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + description = "Install Haskell software"; + license = stdenv.lib.licenses.isc; + }) {}; + "hskeleton" = callPackage ({ mkDerivation, base, Cabal }: mkDerivation { @@ -92582,18 +92733,18 @@ self: { "http-conduit-downloader" = callPackage ({ mkDerivation, base, bytestring, conduit, connection , data-default, HsOpenSSL, http-client, http-conduit, http-types - , lifted-base, mtl, network, network-uri, old-locale, resourcet - , time, zlib + , lifted-base, mtl, network, network-uri, resourcet, time, zlib }: mkDerivation { pname = "http-conduit-downloader"; - version = "1.0.25"; - sha256 = "6ae6f5a6ac130225d2fae5f123ff89c547de3b549efe016c0464dd352b1b693c"; + version = "1.0.30"; + sha256 = "aaecfd7acae1a6d75fc0c9c115e897c3b5dbba52d210a991bd57334746e41cd4"; libraryHaskellDepends = [ base bytestring conduit connection data-default HsOpenSSL http-client http-conduit http-types lifted-base mtl network - network-uri old-locale resourcet time zlib + network-uri resourcet time zlib ]; + jailbreak = true; homepage = "https://github.com/bazqux/http-conduit-downloader"; description = "HTTP downloader tailored for web-crawler needs"; license = stdenv.lib.licenses.bsd3; @@ -93801,22 +93952,6 @@ self: { }) {}; "hw-diagnostics" = callPackage - ({ mkDerivation, base, hspec, QuickCheck }: - mkDerivation { - pname = "hw-diagnostics"; - version = "0.0.0.3"; - sha256 = "e69688c5cc40280cb0eaabb23ee36416fc794d88473e53fb8973359cc21fef43"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "http://github.com/haskell-works/hw-diagnostics#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-diagnostics_0_0_0_4" = callPackage ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "hw-diagnostics"; @@ -93830,7 +93965,6 @@ self: { homepage = "http://github.com/haskell-works/hw-diagnostics#readme"; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-json" = callPackage @@ -96608,23 +96742,6 @@ self: { }) {}; "incremental-parser" = callPackage - ({ mkDerivation, base, checkers, monoid-subclasses, QuickCheck - , tasty, tasty-quickcheck - }: - mkDerivation { - pname = "incremental-parser"; - version = "0.2.4.1"; - sha256 = "1630a763db0808cfa4c1439365e21a53a378b38c2c02957539a9f75bb482b054"; - libraryHaskellDepends = [ base monoid-subclasses ]; - testHaskellDepends = [ - base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck - ]; - homepage = "https://github.com/blamario/incremental-parser"; - description = "Generic parser library capable of providing partial results from partial input"; - license = "GPL"; - }) {}; - - "incremental-parser_0_2_5" = callPackage ({ mkDerivation, base, checkers, monoid-subclasses, QuickCheck , tasty, tasty-quickcheck }: @@ -96639,7 +96756,6 @@ self: { homepage = "https://github.com/blamario/incremental-parser"; description = "Generic parser library capable of providing partial results from partial input"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "incremental-sat-solver" = callPackage @@ -97648,8 +97764,8 @@ self: { }: mkDerivation { pname = "interlude-l"; - version = "0.1.0.6"; - sha256 = "d2871aaf50275fc6ecf17e151e181d30c1619048b693574fbfddb6b211548acf"; + version = "0.1.0.7"; + sha256 = "0cef80ef63038b398438f8e3ab60760ef17fab380f5d8534d595237a07cb0bb7"; libraryHaskellDepends = [ aeson base exceptions lens monad-control MonadRandom mtl protolude string-conv text transformers witherable @@ -98230,6 +98346,7 @@ self: { homepage = "https://haskellembedded.github.io/"; description = "EDSL for concurrent, realtime, embedded programming on top of Ivory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ioref-stable" = callPackage @@ -100159,6 +100276,39 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "jose_0_5_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , byteable, bytestring, containers, cryptonite, hspec, lens, memory + , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances + , safe, tasty, tasty-hspec, tasty-quickcheck, template-haskell + , text, time, unordered-containers, vector, x509 + }: + mkDerivation { + pname = "jose"; + version = "0.5.0.0"; + sha256 = "cb2da4049b288be97e1a7530fbf0ff86cf98a3277b13cd84ba352519741b36ce"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring byteable bytestring + containers cryptonite lens memory monad-time mtl network-uri + QuickCheck quickcheck-instances safe template-haskell text time + unordered-containers vector x509 + ]; + executableHaskellDepends = [ aeson base bytestring lens mtl ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring byteable bytestring + containers cryptonite hspec lens memory monad-time mtl network-uri + QuickCheck quickcheck-instances safe tasty tasty-hspec + tasty-quickcheck template-haskell text time unordered-containers + vector x509 + ]; + homepage = "https://github.com/frasertweedale/hs-jose"; + description = "Javascript Object Signing and Encryption and JSON Web Token library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jose-jwt" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, containers , cryptonite, doctest, either, hspec, HUnit, memory, mtl @@ -100179,6 +100329,7 @@ self: { homepage = "http://github.com/tekul/jose-jwt"; description = "JSON Object Signing and Encryption Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jpeg" = callPackage @@ -100232,56 +100383,70 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "js-jquery_3_1_1" = callPackage + ({ mkDerivation, base, HTTP }: + mkDerivation { + pname = "js-jquery"; + version = "3.1.1"; + sha256 = "d72f67d72bd71d675bcdc75dd280c4a27d90784eb51c661a3da567e0186f2a04"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base HTTP ]; + doCheck = false; + homepage = "https://github.com/ndmitchell/js-jquery#readme"; + description = "Obtain minified jQuery code"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jsaddle" = callPackage - ({ mkDerivation, base, doctest, gi-glib, gi-gtk, gi-javascriptcore - , gi-webkit, haskell-gi-base, lens, QuickCheck, template-haskell - , text, transformers, vector, webkitgtk3-javascriptcore + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , filepath, http-types, lens, primitive, process, QuickCheck, stm + , template-haskell, text, transformers, vector, wai, wai-app-static + , wai-websockets, warp, websockets }: mkDerivation { pname = "jsaddle"; - version = "0.4.0.5"; - sha256 = "b1c77d083ae9ccb1eadde1b63599c29460c6623fe000061168e92f3b8f01a333"; + version = "0.5.0.1"; + sha256 = "0e69a4c59be060a7026dc322741f5c3d3245d17a795ce02ebb08fecf97692862"; libraryHaskellDepends = [ - base gi-glib gi-gtk gi-javascriptcore gi-webkit haskell-gi-base - lens template-haskell text transformers webkitgtk3-javascriptcore + aeson base bytestring containers filepath http-types lens primitive + process stm template-haskell text transformers wai wai-app-static + wai-websockets warp websockets ]; testHaskellDepends = [ - base doctest gi-glib gi-gtk gi-javascriptcore gi-webkit - haskell-gi-base QuickCheck text vector webkitgtk3-javascriptcore + base bytestring doctest filepath http-types process QuickCheck text + vector wai wai-app-static wai-websockets warp websockets ]; - description = "High level interface for webkit-javascriptcore"; + description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsaddle-dom" = callPackage - ({ mkDerivation, base, base-compat, gi-glib, gi-gtk, gi-webkit - , haskell-gi-base, jsaddle, lens, text, transformers + ({ mkDerivation, base, base-compat, jsaddle, lens, text + , transformers }: mkDerivation { pname = "jsaddle-dom"; - version = "0.2.0.1"; - sha256 = "2cfdbf281e29c9b1e3ea2f4db59f80263309bad6f080ceb9cbf4072cfa3ff7f3"; + version = "0.4.0.0"; + sha256 = "c4e9624ebebd0815a8715753ba1a179ba469f61915d8b45b468e5deb55ab5b77"; libraryHaskellDepends = [ - base base-compat gi-glib gi-gtk gi-webkit haskell-gi-base jsaddle - lens text transformers + base base-compat jsaddle lens text transformers ]; - jailbreak = true; - description = "DOM library that uses jsaddle to support both GHCJS and WebKitGTK"; + description = "DOM library that uses jsaddle to support both GHCJS and GHC"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsaddle-hello" = callPackage - ({ mkDerivation, base, ghcjs-dom, jsaddle, lens }: + ({ mkDerivation, base, jsaddle, lens, text }: mkDerivation { pname = "jsaddle-hello"; - version = "1.0.0.0"; - sha256 = "b78158a85e4b8006c1b2fe738dec2ba011b9f67289c4f43d9494af5dc6956f1e"; + version = "2.0.0.0"; + sha256 = "941a047559384486151b6a1ec58a4cb5ad8663c636f2de9a70b739f52eeac0ae"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ base ghcjs-dom jsaddle lens ]; - jailbreak = true; + executableHaskellDepends = [ base jsaddle lens text ]; homepage = "https://github.com/ghcjs/jsaddle-hello"; description = "JSaddle Hello World, an example package"; license = stdenv.lib.licenses.mit; @@ -100689,9 +100854,12 @@ self: { pname = "json-qq"; version = "0.4.1"; sha256 = "a61e1dcd911f8f24b1ae050d7728a19170a06b426b68d6d3c053424922d8ee66"; + revision = "1"; + editedCabalFile = "e070ffde0263105ed21f178ab669dcfeb9593302a2971b76d99bb0b5aac9f85b"; libraryHaskellDepends = [ base haskell-src-meta parsec template-haskell ]; + jailbreak = true; homepage = "http://github.com/finnsson/json-qq"; description = "Json Quasiquatation library for Haskell"; license = "unknown"; @@ -102618,6 +102786,7 @@ self: { homepage = "https://github.com/scrive/kontra-config"; description = "JSON config file parsing based on unjson"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kontrakcja-templates" = callPackage @@ -102704,6 +102873,8 @@ self: { pname = "kraken"; version = "0.0.3"; sha256 = "4001e1c545155434985f7ca93b5d1bcc6a465c83c58d4bb41a60bbfe521b1e9d"; + revision = "1"; + editedCabalFile = "03085f9b1e839e82a6bfef3778f95f327c55bbd247727d0929b0758bd801a136"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls mtl ]; @@ -105328,10 +105499,8 @@ self: { }: mkDerivation { pname = "legion"; - version = "0.4.0.0"; - sha256 = "c2be3fecb0f5609e1c8edd03efde16090eed390691f32a8d180622443bffbe13"; - revision = "1"; - editedCabalFile = "9a134c1d2fba2d6eba65a24be6f21c5d27badbfa8c6a8bf74a537efb2e2affd6"; + version = "0.5.0.0"; + sha256 = "d9361ee7d554b7700d71ca13a258773513f5931ebfa5d7874cfbb45b6f794c44"; libraryHaskellDepends = [ aeson attoparsec base binary binary-conduit bytestring canteven-http canteven-log conduit conduit-extra containers @@ -105340,7 +105509,7 @@ self: { time transformers unix uuid wai wai-extra warp ]; jailbreak = true; - homepage = "https://github.com/owensmurray/legion"; + homepage = "https://github.com/owensmurray/legion#readme"; description = "Distributed, stateful, homogeneous microservice framework"; license = stdenv.lib.licenses.asl20; }) {}; @@ -105351,8 +105520,8 @@ self: { }: mkDerivation { pname = "legion-extra"; - version = "0.1.0.0"; - sha256 = "46e72afd74eedbfa16a6809056e97695a074fff347954f645224a4e87774115e"; + version = "0.1.0.1"; + sha256 = "62687c1c0f6175338fe9bbfbb1c94befddf8f580baf7b603e11308a23e999f5d"; libraryHaskellDepends = [ aeson base bytestring canteven-log containers data-default-class legion network safe split yaml @@ -106492,12 +106661,12 @@ self: { }) {}; "libroman" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, split }: + ({ mkDerivation, base, hspec, markdown-unlit, QuickCheck, split }: mkDerivation { pname = "libroman"; - version = "3.0.1"; - sha256 = "49aa95b2a3dbde344f84a94ef96636df028ec04384ea1b7e40d6eff33e55f64d"; - libraryHaskellDepends = [ base split ]; + version = "3.1.0"; + sha256 = "8b083c38b589a229bd86f010038a103285f6073ce4955a6ec58087cbf86d3add"; + libraryHaskellDepends = [ base markdown-unlit split ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://ahakki.xyz"; description = "Use Roman Numerals as a Numeric Datatype (sort of)"; @@ -112497,6 +112666,30 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "megaparsec_5_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, exceptions + , hspec, hspec-expectations, mtl, QuickCheck, scientific, text + , transformers + }: + mkDerivation { + pname = "megaparsec"; + version = "5.1.0"; + sha256 = "714c17fdff5fb683bd5f8e5f14542d395b6a52e7ef91e3ad6d39c27910561b48"; + libraryHaskellDepends = [ + base bytestring containers deepseq exceptions mtl QuickCheck + scientific text transformers + ]; + testHaskellDepends = [ + base bytestring containers exceptions hspec hspec-expectations mtl + QuickCheck scientific text transformers + ]; + jailbreak = true; + homepage = "https://github.com/mrkkrp/megaparsec"; + description = "Monadic parser combinators"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "meldable-heap" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -114364,6 +114557,7 @@ self: { homepage = "https://github.com/roelvandijk/modbus-tcp"; description = "Communicate with Modbus devices over TCP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "modelicaparser" = callPackage @@ -115013,6 +115207,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger_0_3_20" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, conduit + , conduit-extra, exceptions, fast-logger, lifted-base + , monad-control, monad-loops, mtl, resourcet, stm, stm-chans + , template-haskell, text, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.20"; + sha256 = "58be0b1e04d1cce4a40e9502448de8ae2c72eff98a6c173539653bacbb3c9fe9"; + libraryHaskellDepends = [ + base blaze-builder bytestring conduit conduit-extra exceptions + fast-logger lifted-base monad-control monad-loops mtl resourcet stm + stm-chans template-haskell text transformers transformers-base + transformers-compat + ]; + homepage = "https://github.com/kazu-yamamoto/logger"; + description = "A class of monads which can log messages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-json" = callPackage ({ mkDerivation, aeson, base, monad-logger, template-haskell, text }: @@ -119525,6 +119742,7 @@ self: { homepage = "https://github.com/stbuehler/haskell-nettle"; description = "safe nettle binding"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) nettle;}; "nettle-frp" = callPackage @@ -119623,6 +119841,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "netwire-input-javascript" = callPackage + ({ mkDerivation, base, containers, ghcjs-base, netwire + , netwire-input, transformers + }: + mkDerivation { + pname = "netwire-input-javascript"; + version = "0.0.1"; + sha256 = "1a42871c804d946290aa3139febe82394a35ae04fd3cc3fa958152e5647085a3"; + libraryHaskellDepends = [ + base containers ghcjs-base netwire netwire-input transformers + ]; + jailbreak = true; + homepage = "https://github.com/ziocroc/netwire-input-javascript"; + description = "JavaScript instance of netwire-input"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {ghcjs-base = null;}; + "network" = callPackage ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework , test-framework-hunit, unix @@ -123674,6 +123910,35 @@ self: { license = "unknown"; }) {}; + "opml-conduit_0_6_0_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, conduit + , conduit-combinators, containers, data-default, hlint, lens-simple + , mono-traversable, monoid-subclasses, mtl, parsers, QuickCheck + , quickcheck-instances, resourcet, safe-exceptions, semigroups + , tasty, tasty-hunit, tasty-quickcheck, text, time, timerep + , uri-bytestring, xml-conduit, xml-types + }: + mkDerivation { + pname = "opml-conduit"; + version = "0.6.0.0"; + sha256 = "57a82d4baedf2f4a3be1a745f4870e26ded41bc1ceb1ed20788c92ba52c96ab3"; + libraryHaskellDepends = [ + base case-insensitive conduit conduit-combinators containers + lens-simple mono-traversable monoid-subclasses safe-exceptions + semigroups text time timerep uri-bytestring xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring conduit conduit-combinators containers data-default + hlint lens-simple mono-traversable mtl parsers QuickCheck + quickcheck-instances resourcet semigroups tasty tasty-hunit + tasty-quickcheck text time uri-bytestring xml-conduit + ]; + homepage = "https://github.com/k0ral/opml-conduit"; + description = "Streaming parser/renderer for the OPML 2.0 format."; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opn" = callPackage ({ mkDerivation, base, directory, filepath, ini, network-uri , optparse-applicative, process, text, unordered-containers @@ -125165,7 +125430,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Pango text rendering engine"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome2) pango;}; + }) {inherit (pkgs.gnome) pango;}; "papa" = callPackage ({ mkDerivation, base, directory, doctest, filepath, papa-base @@ -125596,8 +125861,8 @@ self: { }: mkDerivation { pname = "parconc-examples"; - version = "0.4.4"; - sha256 = "bc05ccd125a23c4698904186b9ce9082f93ce689b533c1dc1627013a348393c8"; + version = "0.4.5"; + sha256 = "90df61563ec9268a93b6313f4bcb9b25e9c2c4c3c54eef8066a44b72f4185e9c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -126166,13 +126431,12 @@ self: { }: mkDerivation { pname = "pasta"; - version = "0.1.0.1"; - sha256 = "19a2b39efebef3faedf7cff7434e2d1f6c9a09e1a4c49d1d7ef49f8d6d3f9e83"; + version = "0.1.0.2"; + sha256 = "53b5ebc2887e4f7e466a6a4824c2fb2fad03bd9a8a38bd0d37901df28edc8b79"; libraryHaskellDepends = [ base microlens microlens-th protolude semigroups text text-show ]; testHaskellDepends = [ base hspec microlens protolude ]; - jailbreak = true; homepage = "http://github.com/diogob/pasta#readme"; description = "PostgreSQL Abstract Syntax Tree Assember"; license = stdenv.lib.licenses.bsd3; @@ -126206,6 +126470,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "patat" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers + , directory, filepath, mtl, optparse-applicative, pandoc + , terminal-size, time + }: + mkDerivation { + pname = "patat"; + version = "0.1.0.0"; + sha256 = "565b5885113d5805e15cb29be37feb1a45b10bd3202b474acc04a14bfe82c87e"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal ansi-wl-pprint base containers directory filepath mtl + optparse-applicative pandoc terminal-size time + ]; + homepage = "http://github.com/jaspervdj/patat"; + description = "Terminal-based presentations using Pandoc"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "patch-combinators" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -127256,23 +127540,6 @@ self: { }) {}; "persistable-record" = callPackage - ({ mkDerivation, array, base, containers, dlist, names-th - , template-haskell, th-data-compat, transformers - }: - mkDerivation { - pname = "persistable-record"; - version = "0.4.0.2"; - sha256 = "aedb118290a52a9b5ff035247862675bad6a3f06f7019411cdbcf942bde8fa77"; - libraryHaskellDepends = [ - array base containers dlist names-th template-haskell - th-data-compat transformers - ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "Binding between SQL database values and haskell records"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "persistable-record_0_4_0_3" = callPackage ({ mkDerivation, array, base, containers, dlist, names-th , template-haskell, th-data-compat, transformers }: @@ -127287,7 +127554,6 @@ self: { homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Binding between SQL database values and haskell records"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistable-types-HDBC-pg" = callPackage @@ -128159,6 +128425,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "phaser" = callPackage + ({ mkDerivation, base, bytestring, text }: + mkDerivation { + pname = "phaser"; + version = "0.1.0.0"; + sha256 = "6cb8dfd56d6d464f63962f5799485aef05c97da0868d21ffe0ce95e323b8a323"; + libraryHaskellDepends = [ base bytestring text ]; + homepage = "https://github.com/quickdudley/phaser"; + description = "Incremental multiple pass parser library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "phash" = callPackage ({ mkDerivation, base, doctest, HUnit, pHash, smallcheck, tasty , tasty-hunit, tasty-smallcheck @@ -128322,8 +128600,8 @@ self: { }: mkDerivation { pname = "photoname"; - version = "3.1"; - sha256 = "37935445c01a19e9a6505b7d660ddf01543af14ddc26eb5d2689fb4bdd778434"; + version = "3.2"; + sha256 = "6a4ee3e631d005b6904444d025ec1ccd9aa4dd0e841f4068806567998e86fcf9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -130998,7 +131276,7 @@ self: { license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gdk_pixbuf; gtk2 = pkgs.gnome2.gtk; - inherit (pkgs.gnome2) pango; inherit (pkgs) poppler;}; + inherit (pkgs.gnome) pango; inherit (pkgs) poppler;}; "populate-setup-exe-cache" = callPackage ({ mkDerivation, base }: @@ -131301,6 +131579,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "postgresql-binary_0_9_1_1" = callPackage + ({ mkDerivation, aeson, base, base-prelude, binary-parser + , bytestring, conversion, conversion-bytestring, conversion-text + , either, foldl, json-ast, loch-th, placeholders, postgresql-libpq + , QuickCheck, quickcheck-instances, rebase, scientific, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time + , transformers, uuid, vector + }: + mkDerivation { + pname = "postgresql-binary"; + version = "0.9.1.1"; + sha256 = "e9aeb3abc2e191ecde5f6112221fe0957364c72779dbcbe8eba6bc5c830ddac2"; + libraryHaskellDepends = [ + aeson base base-prelude binary-parser bytestring foldl loch-th + placeholders scientific text time transformers uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring conversion conversion-bytestring + conversion-text either json-ast loch-th placeholders + postgresql-libpq QuickCheck quickcheck-instances rebase scientific + tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time + transformers uuid vector + ]; + jailbreak = true; + homepage = "https://github.com/nikita-volkov/postgresql-binary"; + description = "Encoders and decoders for the PostgreSQL's binary format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "postgresql-config" = callPackage ({ mkDerivation, aeson, base, bytestring, monad-control, mtl , postgresql-simple, resource-pool, time @@ -131602,22 +131910,25 @@ self: { "postgresql-typed" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring - , containers, cryptonite, haskell-src-meta, memory, network - , old-locale, postgresql-binary, QuickCheck, scientific - , template-haskell, text, time, utf8-string, uuid + , containers, convertible, cryptonite, haskell-src-meta, HDBC + , HUnit, memory, network, old-locale, postgresql-binary, QuickCheck + , scientific, template-haskell, text, time, utf8-string, uuid }: mkDerivation { pname = "postgresql-typed"; - version = "0.4.4"; - sha256 = "b440545a710f17995a9e52384e1d1ef0b64202fac129d0bb44eb95c746e4f1f6"; + version = "0.4.5"; + sha256 = "bc60941a88edb91045e1b18c6d94d8466ecaa3eb763facefa9c65d579a5576c4"; libraryHaskellDepends = [ aeson array attoparsec base binary bytestring containers cryptonite - haskell-src-meta memory network old-locale postgresql-binary + haskell-src-meta HDBC memory network old-locale postgresql-binary scientific template-haskell text time utf8-string uuid ]; - testHaskellDepends = [ base bytestring network QuickCheck time ]; + testHaskellDepends = [ + base bytestring containers convertible HDBC HUnit network + QuickCheck time + ]; homepage = "https://github.com/dylex/postgresql-typed"; - description = "A PostgreSQL access library with compile-time SQL type inference"; + description = "A PostgreSQL library with compile-time SQL type inference and optional HDBC backend"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -131841,6 +132152,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pptable" = callPackage + ({ mkDerivation, base, boxes, containers, generic-deriving, HUnit + , pretty, QuickCheck, syb, tasty, tasty-hunit, tasty-quickcheck + , vector + }: + mkDerivation { + pname = "pptable"; + version = "0.1.0.1"; + sha256 = "3b1ef3b8ed3ada99fdd4811e1d8a56764c9ceabdb920ee735b89fe349cdf6484"; + libraryHaskellDepends = [ + base boxes containers generic-deriving pretty syb vector + ]; + testHaskellDepends = [ + base boxes containers HUnit QuickCheck tasty tasty-hunit + tasty-quickcheck vector + ]; + homepage = "https://github.com/gdevanla/pptable#readme"; + description = "Pretty Print containers in a tabular format"; + license = stdenv.lib.licenses.mit; + }) {}; + "pqc" = callPackage ({ mkDerivation, base, QuickCheck, random, stm }: mkDerivation { @@ -133509,8 +133841,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "3.2.0"; - sha256 = "6fac41cf8b4cb5a6eab97afe583f27810f6bce89b78ab0985bb11114725cd9e9"; + version = "3.2.1"; + sha256 = "757188dbf42e595e3b2eee8df4b30076ae929df636e83750ae99777612cc0cf2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133768,32 +134100,6 @@ self: { }) {}; "protobuf-simple" = callPackage - ({ mkDerivation, base, binary, bytestring, containers - , data-binary-ieee754, directory, filepath, hspec, mtl, parsec - , QuickCheck, quickcheck-instances, split, text - }: - mkDerivation { - pname = "protobuf-simple"; - version = "0.1.0.1"; - sha256 = "3186d3372b6621d7b92dd5043187bee4cb329e644632a7888fd8689d5441fcae"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers data-binary-ieee754 mtl text - ]; - executableHaskellDepends = [ - base containers directory filepath mtl parsec split text - ]; - testHaskellDepends = [ - base binary bytestring containers data-binary-ieee754 filepath - hspec parsec QuickCheck quickcheck-instances split text - ]; - homepage = "https://github.com/sru-systems/protobuf-simple"; - description = "Simple Protocol Buffers library (proto2)"; - license = stdenv.lib.licenses.mit; - }) {}; - - "protobuf-simple_0_1_0_2" = callPackage ({ mkDerivation, base, binary, bytestring, containers , data-binary-ieee754, directory, filepath, hspec, mtl, parsec , QuickCheck, quickcheck-instances, split, text @@ -133817,7 +134123,6 @@ self: { homepage = "https://github.com/sru-systems/protobuf-simple"; description = "Simple Protocol Buffers library (proto2)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protocol-buffers" = callPackage @@ -134066,8 +134371,8 @@ self: { ({ mkDerivation, base, bytestring, deepseq, semigroups, text }: mkDerivation { pname = "psi"; - version = "0.1.0.0"; - sha256 = "c8f6a8bf9359362817ae4f1f3464cb20bd70429eb2366039fba71b7828e30831"; + version = "0.1.1.0"; + sha256 = "4fbd37a54cbbf64a2ce827c8d055ff6b497df36057643abcaac499dd481fd07c"; libraryHaskellDepends = [ base bytestring deepseq semigroups text ]; @@ -134155,6 +134460,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "publicsuffix_0_20161003" = callPackage + ({ mkDerivation, base, filepath, hspec, template-haskell }: + mkDerivation { + pname = "publicsuffix"; + version = "0.20161003"; + sha256 = "f3a94499b546da47dea02e260ada8d0ca7444d3261a88fdaf13dad7041999ce7"; + libraryHaskellDepends = [ base filepath template-haskell ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; + description = "The publicsuffix list exposed as proper Haskell types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "publicsuffixlist" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, data-default , HUnit, idna, text, utf8-string @@ -134624,7 +134943,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "purescript_0_10_0" = callPackage + "purescript_0_10_1" = callPackage ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal , ansi-wl-pprint, base, base-compat, bower-json, boxes, bytestring , clock, containers, data-ordlist, directory, dlist, edit-distance @@ -134640,8 +134959,8 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.10.0"; - sha256 = "1c4881f7a57458e3c5ba64acefad7e50299fe2ed549b42cb32edfa07bc7ac76a"; + version = "0.10.1"; + sha256 = "954e333a0f7c860941384289de241b683cbdd606c5c71ab300fe7ac7b3573df0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134669,7 +134988,7 @@ self: { ]; homepage = "http://www.purescript.org/"; description = "PureScript Programming Language Compiler"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -135222,14 +135541,13 @@ self: { }: mkDerivation { pname = "qtah-examples"; - version = "0.1.1"; - sha256 = "2af216f46beaf1c491b5fee0cd25876561ecd3af98bad87e45e3f4210e6bf55f"; + version = "0.1.2"; + sha256 = "eebe064bfa0b93dd850c127632ca59ffa8f269f886ec7e247ec22530e007b442"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base binary bytestring filepath hoppy-runtime qtah-qt5 ]; - jailbreak = true; homepage = "http://khumba.net/projects/qtah"; description = "Example programs for Qtah Qt bindings"; license = stdenv.lib.licenses.lgpl3; @@ -135264,8 +135582,8 @@ self: { }: mkDerivation { pname = "qtah-qt5"; - version = "0.1.1"; - sha256 = "1b6cf51a5e9bb730e3465b6ed6a2bf044c1e7122f948c59234ec20651dbc7033"; + version = "0.1.2"; + sha256 = "320c98e0d90381f56ce992fea845839bd966e030d6afa066c83123d40c73da5e"; libraryHaskellDepends = [ base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator ]; @@ -135273,7 +135591,6 @@ self: { libraryToolDepends = [ qtbase ]; testHaskellDepends = [ base hoppy-runtime HUnit ]; testSystemDepends = [ qtah ]; - jailbreak = true; homepage = "http://khumba.net/projects/qtah"; description = "Qt bindings for Haskell"; license = stdenv.lib.licenses.lgpl3; @@ -137696,6 +138013,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "readme-lhs" = callPackage + ({ mkDerivation, attoparsec, base, containers, filepath, foldl + , HUnit, optparse-applicative, protolude, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "readme-lhs"; + version = "0.1.0.0"; + sha256 = "d2686c8149e1eec2e0a1db662e611508498dbb04151b3592656f127e8655c0de"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ attoparsec base foldl protolude text ]; + executableHaskellDepends = [ + base containers filepath foldl optparse-applicative protolude text + ]; + testHaskellDepends = [ + base HUnit protolude tasty tasty-hunit text + ]; + homepage = "https://github.com/tonyday567/readme-lhs"; + description = "See readme.lhs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "readpyc" = callPackage ({ mkDerivation, base, bliplib, parseargs }: mkDerivation { @@ -140881,6 +141220,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "result_0_2_6_0" = callPackage + ({ mkDerivation, base, bifunctors, keys, mtl, transformers }: + mkDerivation { + pname = "result"; + version = "0.2.6.0"; + sha256 = "f526d97cdab851f24e215e346f6d54d3a504a6ac5d9264f580c4f72d606178c5"; + libraryHaskellDepends = [ base bifunctors keys mtl transformers ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/srijs/haskell-result"; + description = "Encode success or at least one error"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "resumable-exceptions" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -140895,26 +141248,6 @@ self: { }) {}; "rethinkdb" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring - , containers, data-default, doctest, mtl, network, scientific, text - , time, unordered-containers, utf8-string, vector - }: - mkDerivation { - pname = "rethinkdb"; - version = "2.2.0.6"; - sha256 = "5afb37a760a893be64812955f1d5e4a6a45a139806bd1da9e4117af29b4c0e5e"; - libraryHaskellDepends = [ - aeson base base64-bytestring binary bytestring containers - data-default mtl network scientific text time unordered-containers - utf8-string vector - ]; - testHaskellDepends = [ base doctest ]; - homepage = "http://github.com/atnnn/haskell-rethinkdb"; - description = "A driver for RethinkDB 2.2"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "rethinkdb_2_2_0_7" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring , containers, data-default, doctest, mtl, network, scientific, text , time, unordered-containers, utf8-string, vector @@ -140932,7 +141265,6 @@ self: { homepage = "http://github.com/atnnn/haskell-rethinkdb"; description = "A driver for RethinkDB 2.2"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rethinkdb-client-driver" = callPackage @@ -141541,22 +141873,22 @@ self: { }) {}; "rl-satton" = callPackage - ({ mkDerivation, base, binary, containers, deepseq, directory - , filepath, free, hashable, heredocs, lens, mersenne-random-pure64 - , monad-loops, MonadRandom, mtl, pretty-show, process, random, stm - , text, time, transformers, unordered-containers + ({ mkDerivation, base, containers, directory, filepath, hashable + , lens, mersenne-random-pure64, monad-loops, MonadRandom, mtl + , parsec, pretty-show, process, random, stm, template-haskell, text + , time, transformers, unordered-containers }: mkDerivation { pname = "rl-satton"; - version = "0.1.2"; - sha256 = "5490d60a6522ba9821e937a6a531102dfed7953f7b007639aa1f5dbaf21b4770"; + version = "0.1.2.3"; + sha256 = "b5a1adec41b130c900249be51a76c0630d780dadf20ba9af82d0743dd1d34b66"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary containers deepseq directory filepath free hashable - heredocs lens mersenne-random-pure64 monad-loops MonadRandom mtl - pretty-show process random stm text time transformers - unordered-containers + base containers directory filepath hashable lens + mersenne-random-pure64 monad-loops MonadRandom mtl parsec + pretty-show process random stm template-haskell text time + transformers unordered-containers ]; executableHaskellDepends = [ base containers mtl unordered-containers @@ -141564,6 +141896,7 @@ self: { homepage = "https://github.com/grwlf/rl"; description = "Collection of Reinforcement Learning algorithms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rlglue" = callPackage @@ -142083,6 +142416,7 @@ self: { homepage = "https://github.com/RoboticsHS/rosmsg-bin#readme"; description = "ROS message management tools"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rospkg" = callPackage @@ -144580,12 +144914,11 @@ self: { }: mkDerivation { pname = "scotty-resource"; - version = "0.1.1.0"; - sha256 = "c45125749a42b90b2ccb2378c7a4f4c77078e0e479fd694abc6b6cf3d4c06b83"; + version = "0.2.0.0"; + sha256 = "249d100a8a39da8168c342ee9397072e8b57ca2f9fb64099641aa0a600fd2008"; libraryHaskellDepends = [ base containers http-types scotty text transformers wai ]; - jailbreak = true; homepage = "https://github.com/taphu/scotty-resource"; description = "A Better way of modeling web resources"; license = stdenv.lib.licenses.asl20; @@ -146114,33 +146447,6 @@ self: { }) {}; "servant-aeson-specs" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , doctest, filepath, hspec, hspec-core, hspec-golden-aeson, mockery - , QuickCheck, quickcheck-arbitrary-adt, quickcheck-instances - , random, servant, silently, string-conversions, temporary, text - }: - mkDerivation { - pname = "servant-aeson-specs"; - version = "0.5.1.1"; - sha256 = "7eb183abf9e6e19d1dfec3f1c2ac6da149ec5371aad41950ee3dcef268aaa5e0"; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring directory filepath hspec - hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt random - servant - ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring directory doctest filepath hspec - hspec-core hspec-golden-aeson mockery QuickCheck - quickcheck-arbitrary-adt quickcheck-instances random servant - silently string-conversions temporary text - ]; - homepage = "https://github.com/plow-technologies/servant-aeson-specs#readme"; - description = "generic tests for aeson serialization in servant"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "servant-aeson-specs_0_5_2_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , doctest, filepath, hspec, hspec-core, hspec-golden-aeson, mockery , QuickCheck, quickcheck-arbitrary-adt, quickcheck-instances @@ -146270,14 +146576,13 @@ self: { }: mkDerivation { pname = "servant-auth-token"; - version = "0.3.1.0"; - sha256 = "b67564a2f93db0b3b53fc9059f42579b38cebad106b8ac28f344b7a798ffd85f"; + version = "0.3.2.0"; + sha256 = "e15307d04c1011f118696c791d641d2a22844737d2484138147beb49f1abcae2"; libraryHaskellDepends = [ aeson-injector base bytestring containers mtl persistent persistent-postgresql persistent-template pwstore-fast servant-auth-token-api servant-server text time transformers uuid ]; - jailbreak = true; homepage = "https://github.com/ncrashed/servant-auth-token#readme"; description = "Servant based API and server for token based authorisation"; license = stdenv.lib.licenses.bsd3; @@ -146290,8 +146595,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-api"; - version = "0.3.1.0"; - sha256 = "f85a81c0c859807ba1ae058ab409ce3e61ce3bfa713621e8e16e7a2bbf6b6241"; + version = "0.3.2.0"; + sha256 = "f2fe6ed30518036c9866095521fc9212877e3760ea9a57fd40543d601b8c5e4e"; libraryHaskellDepends = [ aeson aeson-injector base lens raw-strings-qq servant servant-docs servant-swagger swagger2 text @@ -147083,6 +147388,7 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-subscriber" = callPackage @@ -148519,6 +148825,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shelly_1_6_8_1" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , enclosed-exceptions, exceptions, hspec, HUnit, lifted-async + , lifted-base, monad-control, mtl, process, system-fileio + , system-filepath, text, time, transformers, transformers-base + , unix-compat + }: + mkDerivation { + pname = "shelly"; + version = "1.6.8.1"; + sha256 = "e5a32f7552779667d1f0164d271e99c9ddcabdf1a7a1503cd6fc8ba0bb4445cd"; + libraryHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions lifted-async lifted-base monad-control mtl process + system-fileio system-filepath text time transformers + transformers-base unix-compat + ]; + testHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions hspec HUnit lifted-async lifted-base monad-control mtl + process system-fileio system-filepath text time transformers + transformers-base unix-compat + ]; + homepage = "https://github.com/yesodweb/Shelly.hs"; + description = "shell-like (systems) programming in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shelly-extra" = callPackage ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore , shelly, text @@ -148563,6 +148898,8 @@ self: { pname = "shine-varying"; version = "0.1.0.0"; sha256 = "80301d12099fa02193881457cf80603b00d8c0fe59ef3a8e75f1f81491fbb68e"; + revision = "1"; + editedCabalFile = "fb542604b1af45c5cc7af83446a69b309d6b00f6c6070b0bde09843d4d1e718c"; libraryHaskellDepends = [ base ghcjs-dom keycode shine varying ]; testHaskellDepends = [ base ghcjs-dom keycode shine varying ]; homepage = "https://github.com/fgaz/shine-varying"; @@ -152357,6 +152694,7 @@ self: { homepage = "https://github.com/jiakai0419/snowflake#readme"; description = "twitter's snowflake"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snowflake-server" = callPackage @@ -152375,6 +152713,7 @@ self: { ]; description = "snowflake http server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snowglobe" = callPackage @@ -153466,7 +153805,7 @@ self: { description = "Experimental web browser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) libsoup;}; + }) {inherit (pkgs.gnome) libsoup;}; "spine" = callPackage ({ mkDerivation, base }: @@ -157823,6 +158162,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "swagger2_2_1_3" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring + , containers, doctest, generics-sop, Glob, hashable, hspec + , http-media, HUnit, insert-ordered-containers, lens, mtl, network + , QuickCheck, scientific, template-haskell, text, time + , transformers, unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "swagger2"; + version = "2.1.3"; + sha256 = "4d14f30ab538fc48d6b621f3082da6cf225d812f534a641babae0afebcc644ef"; + libraryHaskellDepends = [ + aeson base base-compat bytestring containers generics-sop hashable + http-media insert-ordered-containers lens mtl network scientific + template-haskell text time transformers unordered-containers + uuid-types vector + ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat bytestring containers doctest Glob + hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck + text time unordered-containers vector + ]; + homepage = "https://github.com/GetShopTV/swagger2"; + description = "Swagger 2.0 data model"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "swapper" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, happstack-data , happstack-state, parallel, tokyocabinet @@ -161064,14 +161431,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "terminal-progress-bar_0_1_0" = callPackage + "terminal-progress-bar_0_1_1" = callPackage ({ mkDerivation, base, HUnit, stm, stm-chans, test-framework , test-framework-hunit }: mkDerivation { pname = "terminal-progress-bar"; - version = "0.1.0"; - sha256 = "55efcd2125f3551bb06ef1e9619cb4007bd78d4c52fa9f43a8313ad33ad50a77"; + version = "0.1.1"; + sha256 = "2053a7ac9113378a6ae8852447b4e7ba430c014776443046788e84183dc9f380"; libraryHaskellDepends = [ base stm stm-chans ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -161844,18 +162211,6 @@ self: { }) {}; "text-binary" = callPackage - ({ mkDerivation, base, binary, text }: - mkDerivation { - pname = "text-binary"; - version = "0.2.1"; - sha256 = "df22f237ebfe8c813be289d40e86ce3590ccc9c33c41053f4234b5672dc7ea02"; - libraryHaskellDepends = [ base binary text ]; - homepage = "https://github.com/kawu/text-binary"; - description = "Binary instances for text types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-binary_0_2_1_1" = callPackage ({ mkDerivation, base, binary, text }: mkDerivation { pname = "text-binary"; @@ -161865,7 +162220,6 @@ self: { homepage = "https://github.com/kawu/text-binary"; description = "Binary instances for text types"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-conversions" = callPackage @@ -165097,6 +165451,8 @@ self: { pname = "toysolver"; version = "0.4.0"; sha256 = "e9633a7854e6b67d947da02128098f7a29100e9a185be1a5d267e1d4fbf8e3bf"; + revision = "1"; + editedCabalFile = "7d55fc9a8b47c61fab64b636ea94028f01d971e0e2b8b075aa73a04b9ed8a52e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165120,6 +165476,7 @@ self: { tasty tasty-hunit tasty-quickcheck tasty-th transformers transformers-compat vector vector-space ]; + jailbreak = true; description = "Assorted decision procedures for SAT, Max-SAT, PB, MIP, etc"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -165248,10 +165605,11 @@ self: { pname = "tracetree"; version = "0.1.0.1"; sha256 = "12d0eb7923a905fff4b92c7f4f187a4715ba95883ac1df5e0a7efb59427f5115"; + revision = "1"; + editedCabalFile = "9e20b69ed0c5280699565c000bcd8f8b70ae6bc2275e37669af70bbca5d4f77a"; libraryHaskellDepends = [ base bifunctors containers json mtl transformers ]; - jailbreak = true; description = "Visualize Haskell data structures as edge-labeled trees"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -166255,6 +166613,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tttool_1_6_1_3" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , directory, executable-path, filepath, hashable, haskeline, HPDF + , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec + , process, random, split, spool, template-haskell, time, vector + , yaml, zlib + }: + mkDerivation { + pname = "tttool"; + version = "1.6.1.3"; + sha256 = "7ca01c73dad41aab3b002db4c6f4e929be01c982c397dbca0e65315171339d45"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base binary bytestring containers directory executable-path + filepath hashable haskeline HPDF JuicyPixels mtl natural-sort + optparse-applicative parsec process random split spool + template-haskell time vector yaml zlib + ]; + jailbreak = true; + homepage = "https://github.com/entropia/tip-toi-reveng"; + description = "Working with files for the Tiptoi® pen"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tubes" = callPackage ({ mkDerivation, base, comonad, contravariant, free, mtl , profunctors, semigroups, transformers @@ -169319,6 +169703,7 @@ self: { jailbreak = true; description = "Bidirectional JSON parsing and generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unlambda" = callPackage @@ -172300,7 +172685,7 @@ self: { description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) vte;}; + }) {inherit (pkgs.gnome) vte;}; "vtegtk3" = callPackage ({ mkDerivation, base, Cabal, glib, gtk2hs-buildtools, gtk3, pango @@ -172317,7 +172702,7 @@ self: { description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) vte;}; + }) {inherit (pkgs.gnome) vte;}; "vty" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers @@ -172735,35 +173120,6 @@ self: { }) {}; "wai-extra" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , data-default-class, deepseq, directory, fast-logger, hspec - , http-types, HUnit, iproute, lifted-base, network, old-locale - , resourcet, streaming-commons, stringsearch, text, time - , transformers, unix, unix-compat, vault, void, wai, wai-logger - , word8, zlib - }: - mkDerivation { - pname = "wai-extra"; - version = "3.0.17"; - sha256 = "48bbec6a692dac25972f84da1669a69f7c7c7741dd0d978aa9992bbdf809b671"; - libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie data-default-class deepseq - directory fast-logger http-types iproute lifted-base network - old-locale resourcet streaming-commons stringsearch text time - transformers unix unix-compat vault void wai wai-logger word8 zlib - ]; - testHaskellDepends = [ - base blaze-builder bytestring case-insensitive cookie fast-logger - hspec http-types HUnit resourcet text time transformers wai zlib - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "Provides some basic WAI handlers and middleware"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-extra_3_0_18" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , data-default-class, deepseq, directory, fast-logger, hspec @@ -172790,7 +173146,6 @@ self: { homepage = "http://github.com/yesodweb/wai"; description = "Provides some basic WAI handlers and middleware"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-frontend-monadcgi" = callPackage @@ -174722,8 +175077,8 @@ self: { }: mkDerivation { pname = "webdriver"; - version = "0.8.3"; - sha256 = "56cc40adcee9ea173ba051992fbd3009e63e66d2bcf9f275b0dc2bcddb1d1ae2"; + version = "0.8.4"; + sha256 = "347f2935e7b9498d1a0391f929b347e295fa8b19a3ea0ac7b81802fda4164f23"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring data-default-class directory directory-tree exceptions filepath @@ -176150,37 +176505,47 @@ self: { }) {}; "wrecker" = callPackage - ({ mkDerivation, aeson, aeson-qq, ansi-terminal, ansigraph, base - , bytestring, clock, clock-extras, connection, deepseq, hspec - , hspec-discover, http-client, http-types, immortal, markdown-unlit - , network, next-ref, optparse-applicative, scotty, statistics, stm - , stm-chans, tabular, text, threads, threads-extras, time + ({ mkDerivation, aeson, aeson-qq, ansi-terminal, ansigraph, array + , base, base64-bytestring, blaze-builder, bytestring + , case-insensitive, clock, clock-extras, connection, containers + , cookie, cryptonite, data-default, data-default-class, deepseq + , exceptions, filepath, hspec, hspec-discover, http-client + , http-types, immortal, lens, markdown-unlit, memory, mime-types + , network, network-uri, next-ref, optparse-applicative, random + , scotty, statistics, stm, stm-chans, streaming-commons, tabular + , text, threads, threads-extras, time, tls, transformers , unagi-chan, unix, unordered-containers, vector, vty, wai, warp , wreq }: mkDerivation { pname = "wrecker"; - version = "0.1.1.1"; - sha256 = "6e36a140f1460cf68758bf8d81c50ea34fe5e31605e94e90cb26869a4f19811c"; + version = "0.1.2.0"; + sha256 = "62563a387d2f7873845c477cd171ca7d2bc2f1e789e6a6e8dc9f4a54b7205001"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal ansigraph base bytestring clock clock-extras - deepseq http-client http-types immortal next-ref - optparse-applicative statistics stm stm-chans tabular text threads - threads-extras time unagi-chan unix unordered-containers vector vty + aeson ansi-terminal ansigraph array base base64-bytestring + blaze-builder bytestring case-insensitive clock clock-extras + connection containers cookie cryptonite data-default + data-default-class deepseq exceptions filepath http-client + http-types immortal memory mime-types network network-uri next-ref + optparse-applicative random statistics stm stm-chans + streaming-commons tabular text threads threads-extras time tls + transformers unagi-chan unix unordered-containers vector vty wreq ]; executableHaskellDepends = [ - aeson aeson-qq base bytestring connection http-client immortal - markdown-unlit network next-ref scotty text wai warp wreq + aeson aeson-qq base bytestring connection http-client immortal lens + markdown-unlit network next-ref optparse-applicative scotty text + wai warp wreq ]; testHaskellDepends = [ - aeson aeson-qq base bytestring hspec hspec-discover http-client - immortal markdown-unlit network next-ref scotty text + aeson aeson-qq base bytestring connection hspec hspec-discover + http-client immortal markdown-unlit network next-ref scotty text unordered-containers wai warp wreq ]; + jailbreak = true; homepage = "https://github.com/skedgeme/wrecker#readme"; - description = "A HTTP Performance Benchmarker"; + description = "An HTTP Performance Benchmarker"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -176749,6 +177114,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "x509-store_1_6_2" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring + , containers, cryptonite, directory, filepath, mtl, pem, x509 + }: + mkDerivation { + pname = "x509-store"; + version = "1.6.2"; + sha256 = "49fd261c7e55a45fd357931a6d9f81e22f242e6047304d3e2662e43db94d807b"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base bytestring containers cryptonite + directory filepath mtl pem x509 + ]; + homepage = "http://github.com/vincenthz/hs-certificate"; + description = "X.509 collection accessing and storing methods"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "x509-system" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pem, process, x509, x509-store @@ -176766,6 +177149,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "x509-system_1_6_4" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pem, process, x509, x509-store + }: + mkDerivation { + pname = "x509-system"; + version = "1.6.4"; + sha256 = "d98ef028855ad73a872ed86026f205aba383378bf1e63462c5d3e4733b60ff4c"; + libraryHaskellDepends = [ + base bytestring containers directory filepath mtl pem process x509 + x509-store + ]; + jailbreak = true; + homepage = "http://github.com/vincenthz/hs-certificate"; + description = "Handle per-operating-system X.509 accessors and storage"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "x509-util" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring , cryptonite, directory, hourglass, pem, x509, x509-store @@ -176805,6 +177207,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "x509-validation_1_6_5" = callPackage + ({ mkDerivation, asn1-encoding, asn1-types, base, byteable + , bytestring, containers, cryptonite, data-default-class, hourglass + , memory, mtl, pem, x509, x509-store + }: + mkDerivation { + pname = "x509-validation"; + version = "1.6.5"; + sha256 = "d1f73197677b6d19795fc80e4a1fa93e810d567ee4e3edc74e841b3eb20e1ca4"; + libraryHaskellDepends = [ + asn1-encoding asn1-types base byteable bytestring containers + cryptonite data-default-class hourglass memory mtl pem x509 + x509-store + ]; + homepage = "http://github.com/vincenthz/hs-certificate"; + description = "X.509 Certificate and CRL validation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "x86-64bit" = callPackage ({ mkDerivation, base, deepseq, monads-tf, QuickCheck, tardis , vector @@ -177220,14 +177642,17 @@ self: { }) {}; "xkbcommon" = callPackage - ({ mkDerivation, base, bytestring, cpphs, data-flags, filepath - , libxkbcommon, process, storable-record, template-haskell, text - , transformers, unix + ({ mkDerivation, base, bytestring, Cabal, cpphs, data-flags + , directory, filepath, libxkbcommon, process, storable-record + , template-haskell, text, transformers, unix }: mkDerivation { pname = "xkbcommon"; - version = "0.0.2"; - sha256 = "98e0a2e42bc6a08a56416882a89165adfdf12a762fd93ece076edf37b814dfd8"; + version = "0.0.3"; + sha256 = "00b4160ed6078386e4a4d6b6fed33c71bde8e3ef5a64d9f040432b550cbb3afe"; + setupHaskellDepends = [ + base Cabal cpphs directory filepath process template-haskell text + ]; libraryHaskellDepends = [ base bytestring cpphs data-flags filepath process storable-record template-haskell text transformers @@ -179634,39 +180059,6 @@ self: { }) {}; "yesod-bin" = callPackage - ({ mkDerivation, async, attoparsec, base, base64-bytestring - , blaze-builder, bytestring, Cabal, conduit, conduit-extra - , containers, data-default-class, deepseq, directory, file-embed - , filepath, fsnotify, ghc, ghc-paths, http-client, http-conduit - , http-reverse-proxy, http-types, lifted-base, network - , optparse-applicative, parsec, process, project-template - , resourcet, shakespeare, split, streaming-commons, tar - , template-haskell, text, time, transformers, transformers-compat - , unix-compat, unordered-containers, wai, wai-extra, warp, warp-tls - , yaml, zlib - }: - mkDerivation { - pname = "yesod-bin"; - version = "1.4.18.3"; - sha256 = "404f145f6dc46df6a196002810608715bc192163a2b9a8fc191bcc82e0ce2b13"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - async attoparsec base base64-bytestring blaze-builder bytestring - Cabal conduit conduit-extra containers data-default-class deepseq - directory file-embed filepath fsnotify ghc ghc-paths http-client - http-conduit http-reverse-proxy http-types lifted-base network - optparse-applicative parsec process project-template resourcet - shakespeare split streaming-commons tar template-haskell text time - transformers transformers-compat unix-compat unordered-containers - wai wai-extra warp warp-tls yaml zlib - ]; - homepage = "http://www.yesodweb.com/"; - description = "The yesod helper executable"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-bin_1_4_18_5" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, bytestring, Cabal, conduit, conduit-extra , containers, data-default-class, deepseq, directory, file-embed @@ -179697,7 +180089,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "The yesod helper executable"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-bootstrap" = callPackage @@ -179786,46 +180177,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , blaze-html, blaze-markup, byteable, bytestring, case-insensitive - , cereal, clientsession, conduit, conduit-extra, containers, cookie - , data-default, deepseq, deepseq-generics, directory, exceptions - , fast-logger, hspec, hspec-expectations, http-types, HUnit - , lifted-base, monad-control, monad-logger, mtl, mwc-random - , network, old-locale, parsec, path-pieces, primitive, QuickCheck - , random, resourcet, safe, semigroups, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , transformers-base, unix-compat, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.4.24"; - sha256 = "3472469f56e8d5b280389bc40247f6bc1bc42da6e2b87e6865780ae93127b0d2"; - libraryHaskellDepends = [ - aeson auto-update base blaze-builder blaze-html blaze-markup - byteable bytestring case-insensitive cereal clientsession conduit - conduit-extra containers cookie data-default deepseq - deepseq-generics directory exceptions fast-logger http-types - lifted-base monad-control monad-logger mtl mwc-random old-locale - parsec path-pieces primitive random resourcet safe semigroups - shakespeare template-haskell text time transformers - transformers-base unix-compat unordered-containers vector wai - wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base blaze-builder bytestring clientsession conduit - conduit-extra containers cookie hspec hspec-expectations http-types - HUnit lifted-base mwc-random network path-pieces QuickCheck random - resourcet shakespeare streaming-commons template-haskell text - transformers wai wai-extra - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_4_25" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , blaze-html, blaze-markup, byteable, bytestring, case-insensitive , cereal, clientsession, conduit, conduit-extra, containers, cookie @@ -179863,7 +180214,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -181130,16 +181480,22 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi_0_13_0_1" = callPackage - ({ mkDerivation, base, yi-core }: + "yi_0_13_0_2" = callPackage + ({ mkDerivation, base, mtl, yi-core, yi-frontend-vty + , yi-keymap-emacs, yi-misc-modes, yi-mode-haskell + , yi-mode-javascript + }: mkDerivation { pname = "yi"; - version = "0.13.0.1"; - sha256 = "c689370d1121626e0d2d17dce9aeaad65c6191b3215a26c37014b1900dd23a15"; + version = "0.13.0.2"; + sha256 = "d352d9db13684dc2625c7197678198f8646af8697987e453e7662f33a6ffe279"; configureFlags = [ "-fpango" "-fvty" ]; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ base yi-core ]; + executableHaskellDepends = [ + base mtl yi-core yi-frontend-vty yi-keymap-emacs yi-misc-modes + yi-mode-haskell yi-mode-javascript + ]; homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor"; license = stdenv.lib.licenses.gpl2; @@ -181179,8 +181535,8 @@ self: { }: mkDerivation { pname = "yi-core"; - version = "0.13.0.1"; - sha256 = "59d1032027339aed25d8ba0e294d83d5f12416becf8d36ab22e03f30085fc3f3"; + version = "0.13.0.2"; + sha256 = "c23a5a0bafeed12e9374d6c065c19eff8938a6798fbb83f51509cd1c2e1b89d4"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-default directory dlist dynamic-state dyre exceptions filepath hashable @@ -181222,8 +181578,8 @@ self: { }: mkDerivation { pname = "yi-frontend-pango"; - version = "0.13.0.1"; - sha256 = "f0526c0014fc888ab0d1d9b6240b88fd6eae7554053818d8fff9725c0a8cd8be"; + version = "0.13.0.2"; + sha256 = "db59fae93027466fde5eafc93c3809e78c82bdd176ca2c03c8799210fd681933"; libraryHaskellDepends = [ base containers filepath glib gtk microlens-platform mtl oo-prototypes pango pointedlist text transformers-base yi-core @@ -181241,8 +181597,8 @@ self: { }: mkDerivation { pname = "yi-frontend-vty"; - version = "0.13.0.1"; - sha256 = "68f94ba76109463a7c544c529635c8fc5652cdd424cdab9e55da1077e569477b"; + version = "0.13.0.2"; + sha256 = "8cb5c1d11d26ce5bf4578719311f10a9b293388ef44b74c0e630a526f26f49b7"; libraryHaskellDepends = [ base containers data-default dlist microlens-platform pointedlist stm text vty yi-core yi-language @@ -181288,8 +181644,8 @@ self: { }: mkDerivation { pname = "yi-ireader"; - version = "0.13.0.1"; - sha256 = "abd842857424d10e13643ea9dd118cb8b9a77452fca17e6e1c274ed7c3203d70"; + version = "0.13.0.2"; + sha256 = "3a957d1bae944213ab0ceb773cab65151df10114817eb0dec83e94b35a51a7af"; libraryHaskellDepends = [ base binary bytestring containers data-default microlens-platform text yi-core yi-language yi-rope @@ -181305,14 +181661,15 @@ self: { }: mkDerivation { pname = "yi-keymap-cua"; - version = "0.13.0.1"; - sha256 = "130b7a1583ce80edbbc7227463dbaf5e1330b9927b6f512ed1b066ea1b8c6692"; + version = "0.13.0.2"; + sha256 = "04c0c801acdf5bb19ffa215ca56ab422b64b8baf4fad211a57162b6d49390df5"; libraryHaskellDepends = [ base microlens-platform text yi-core yi-keymap-emacs yi-rope ]; homepage = "https://github.com/yi-editor/yi#readme"; description = "Cua keymap for Yi editor"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-keymap-emacs" = callPackage @@ -181322,8 +181679,8 @@ self: { }: mkDerivation { pname = "yi-keymap-emacs"; - version = "0.13.0.1"; - sha256 = "495db9fa6efe1d628b078d384547deb2fd537f36db0daa5ebc9c149ed9fd7a9f"; + version = "0.13.0.2"; + sha256 = "b8c30daffe5bc16bfda46930409b51cb7fb6309d2639df7bea1a55e91bd30c72"; libraryHaskellDepends = [ base containers filepath Hclip microlens-platform mtl oo-prototypes semigroups text transformers-base yi-core yi-language yi-misc-modes @@ -181332,6 +181689,7 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Emacs keymap for Yi editor"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-keymap-vim" = callPackage @@ -181343,8 +181701,8 @@ self: { }: mkDerivation { pname = "yi-keymap-vim"; - version = "0.13.0.1"; - sha256 = "a3f2360e2a5f17a71448cc2ab7d669f9d17553a97fb97bddcc731528b441a3b1"; + version = "0.13.0.2"; + sha256 = "41273f20b52ea612b829f3c85d63f521eab1c87e204d684f0e351e2ce3faf621"; libraryHaskellDepends = [ attoparsec base binary containers data-default directory filepath Hclip microlens-platform mtl oo-prototypes pointedlist safe @@ -181360,6 +181718,7 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Vim keymap for Yi editor"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-language" = callPackage @@ -181388,7 +181747,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-language_0_13_0_1" = callPackage + "yi-language_0_13_0_2" = callPackage ({ mkDerivation, alex, array, base, binary, containers , data-default, hashable, microlens-platform, oo-prototypes , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec @@ -181397,8 +181756,8 @@ self: { }: mkDerivation { pname = "yi-language"; - version = "0.13.0.1"; - sha256 = "1fee232d0e3cd9565d6d504b1c70b465aacfe2b3460f86560c8d19ba9ae81c9c"; + version = "0.13.0.2"; + sha256 = "30ea9d0e2233d110ffba7bc10ecdfa8b2cf0aaf13a400e57c2c0aca742b900fb"; libraryHaskellDepends = [ array base binary containers data-default hashable microlens-platform oo-prototypes pointedlist regex-base regex-tdfa @@ -181424,8 +181783,8 @@ self: { }: mkDerivation { pname = "yi-misc-modes"; - version = "0.13.0.1"; - sha256 = "fea111c983d93f6bdd66bede3846e17d4e9d88eecf21118cb60827454ba4c323"; + version = "0.13.0.2"; + sha256 = "681e77764274f0c68a491749171a9b7b0b3a696f05ddf1540bb986c5892b77cd"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform semigroups text yi-core yi-language yi-rope @@ -181433,6 +181792,7 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor miscellaneous modes"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-mode-haskell" = callPackage @@ -181444,8 +181804,8 @@ self: { }: mkDerivation { pname = "yi-mode-haskell"; - version = "0.13.0.1"; - sha256 = "4727944e57b89a988ab7af57dff0ed2bbd926105b5035ceb9343c8dd2be84f8e"; + version = "0.13.0.2"; + sha256 = "29882f295c6b29306e50a80138756d2af87b2c9eb8e61534c66d067b455966fd"; libraryHaskellDepends = [ array base binary data-default microlens-platform text yi-core yi-language yi-rope @@ -181459,6 +181819,7 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor haskell mode"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-mode-javascript" = callPackage @@ -181467,8 +181828,8 @@ self: { }: mkDerivation { pname = "yi-mode-javascript"; - version = "0.13.0.1"; - sha256 = "b952219ba83d27b4fe292fe6bcbc8b0a14b95c849f35fd1b74ff1c81a464ae8c"; + version = "0.13.0.2"; + sha256 = "e5ac7b9cec20f02289143868d4d877f5c9d2a7c303450562cb8e9f4a7c4c69c0"; libraryHaskellDepends = [ array base binary data-default dlist filepath microlens-platform mtl text yi-core yi-language yi-rope @@ -181476,6 +181837,7 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor javascript mode"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-monokai" = callPackage @@ -182222,6 +182584,7 @@ self: { homepage = "https://github.com/mrkkrp/zip"; description = "Operations on zip archives"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zip-archive" = callPackage diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index 278191bf839f..b8359488725a 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, clang }: stdenv.mkDerivation rec { - name = "mujs-2016-02-22"; + name = "mujs-2016-09-21"; src = fetchgit { url = git://git.ghostscript.com/mujs.git; - rev = "624f975aae6b451e35406d8cdde808626052ce2c"; - sha256 = "0cab7x73v380wklpkbrc1k4iyh4q2jyx3zxbymlfi1spmrpn6skl"; + rev = "5c337af4b3df80cf967e4f9f6a21522de84b392a"; + sha256 = "1x5g6nycggc83md2dbr2nahjbkkmmn64bg25a8hih7z72sw41dgw"; }; buildInputs = [ clang ]; diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index eb68a7b9a910..482cf9fdfadd 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "c-ares-1.10.0"; + name = "c-ares-1.12.0"; src = fetchurl { url = "http://c-ares.haxx.se/download/${name}.tar.gz"; - sha256 = "1nyka87yf2jfd0y6sspll0yxwb8zi7kyvajrdbjmh4axc5s1cw1x"; + sha256 = "1yv5ygkd813glz8hbagykgp1hlb6450chig061hr7pyw7i0gk4l6"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/czmqpp/default.nix b/pkgs/development/libraries/czmqpp/default.nix new file mode 100644 index 000000000000..672a89cc3c02 --- /dev/null +++ b/pkgs/development/libraries/czmqpp/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, czmq }: + +stdenv.mkDerivation rec { + name = "czmqpp-${version}"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "zeromq"; + repo = "czmqpp"; + rev = "v${version}"; + sha256 = "0z8lwq53yk4h7pgibicx3q9idz15qb95r0pjpz0j5vql6qh46rja"; + }; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent"; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ chris-martin ]; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + propagatedBuildInputs = [ czmq ]; + + # https://github.com/zeromq/czmqpp/issues/42 + patches = [ ./socket.patch ]; +} diff --git a/pkgs/development/libraries/czmqpp/socket.patch b/pkgs/development/libraries/czmqpp/socket.patch new file mode 100644 index 000000000000..0464bcf77971 --- /dev/null +++ b/pkgs/development/libraries/czmqpp/socket.patch @@ -0,0 +1,17 @@ +--- /src/socket.cpp ++++ /src/socket.cpp +@@ -60,12 +60,12 @@ + int socket::bind(const std::string& address) + { + // format-security: format not a string literal and no format arguments. +- return zsocket_bind(self_, address.c_str()); ++ return zsocket_bind(self_, "%s", address.c_str()); + } + int socket::connect(const std::string& address) + { + // format-security: format not a string literal and no format arguments. +- return zsocket_connect(self_, address.c_str()); ++ return zsocket_connect(self_, "%s", address.c_str()); + } + + bool operator==(const socket& sock_a, const socket& sock_b) diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 4b579524a528..3528edcba123 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -19,11 +19,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libass-${version}"; - version = "0.13.2"; + version = "0.13.4"; src = fetchurl { url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz"; - sha256 = "1kpsw4zw95v4cjvild9wpk73dzavn1khsm3bm32kcz6amnkd166n"; + sha256 = "1dlzkjybnpl2fkvyjq0qblb7qw12cs893bs7zj3rvf8ij342yjnq"; }; configureFlags = [ diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index ec10619ba567..9989990e35da 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libelf }: stdenv.mkDerivation rec { - name = "libdwarf-20160613"; + name = "libdwarf-20161001"; src = fetchurl { url = "http://www.prevanders.net/${name}.tar.gz"; - sha256 = "1nfdfn5xf3n485pvpb853awyxxnvrg207i0wmrr7bhk8fcxdxbn0"; + sha512 = "2c522ae0b6e2afffd09e2e79562987fd819b197c9bce4900b6a4fd176b5ff229e88c6b755cfbae7831e7160ddeb3bfe2afbf39d756d7e75ec31ace0668554048"; }; configureFlags = " --enable-shared --disable-nonshared"; diff --git a/pkgs/development/libraries/openjpeg/2.0.nix b/pkgs/development/libraries/openjpeg/2.0.nix index 80026af7be04..dd30b18e97c7 100644 --- a/pkgs/development/libraries/openjpeg/2.0.nix +++ b/pkgs/development/libraries/openjpeg/2.0.nix @@ -4,5 +4,5 @@ callPackage ./generic.nix (args // rec { version = "2.0.1"; branch = "2"; revision = "version.2.0.1"; - sha256 = "1r81hq0hx2papjs3hfmpsl0024f6lblk0bq53dfm2wcpi916q7pw"; + sha256 = "03d0r8x66cxri9i20nr9gm1jnkp85yyd8mkrbmawv5nvybd0r7wv"; }) diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.1.nix index d59ceb9f7a9d..00cd4103c8f7 100644 --- a/pkgs/development/libraries/openjpeg/2.1.nix +++ b/pkgs/development/libraries/openjpeg/2.1.nix @@ -1,8 +1,8 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2.1.1"; + version = "2.1.2"; branch = "2.1"; - revision = "v2.1.1"; - sha256 = "1hrn10byrlw7hb7hwv2zvff89rxy3bsbn0im5ki4kdk63jw5p601"; + revision = "v2.1.2"; + sha256 = "0kdcl9sqjz0vagli4ad6bxq1r8ma086m0prpkm5x3dxp37hpjp8h"; }) diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix new file mode 100644 index 000000000000..61ac651256a2 --- /dev/null +++ b/pkgs/development/libraries/uri/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, cmake, doxygen }: + +stdenv.mkDerivation { + name = "uri-2016-09-04"; + + src = fetchFromGitHub { + owner = "cpp-netlib"; + repo = "uri"; + rev = "8b1eec80621ea7be1db3b28f1621e531cc72855c"; + sha256 = "0f77y79b11pp31y0qpydki2nnxd6gpycp24fmrapi70fsni2ah0d"; + }; + + buildInputs = [ cmake doxygen ]; + + cmakeFlags = [ "-DUri_BUILD_TESTS=OFF" "-DBUILD_SHARED_LIBS=ON" ]; + + postBuild = '' + make doc + ''; + + # https://github.com/cpp-netlib/uri/issues/90 + postInstall = '' + mv $out/include $out/include2 + mv $out/include2/include $out/ + rmdir $out/include2 + mkdir -p $out/share/doc + mv html $out/share/doc/uri + ''; + + meta = { + description = "C++ URI library"; + homepage = http://cpp-netlib.org; + license = stdenv.lib.licenses.boost; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/perl-modules/dbiclassx-fix.patch b/pkgs/development/perl-modules/dbiclassx-fix.patch new file mode 100644 index 000000000000..a46ffaa7bd9e --- /dev/null +++ b/pkgs/development/perl-modules/dbiclassx-fix.patch @@ -0,0 +1,24 @@ +From adcc1df0049e0093cb94c867bd2be8c9fe242a61 Mon Sep 17 00:00:00 2001 +From: Peter Rabbitson +Date: Tue, 13 Sep 2016 17:15:48 +0200 +Subject: [PATCH] Fix for upcoming (not yet available via DBD::SQLite) + libsqlite version + +--- + Changes | 2 ++ + t/prefetch/grouped.t | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/t/prefetch/grouped.t b/t/prefetch/grouped.t +index 4aad6b1..c0d2224 100644 +--- a/t/prefetch/grouped.t ++++ b/t/prefetch/grouped.t +@@ -101,7 +101,7 @@ my @cdids = sort $cd_rs->get_column ('cdid')->all; + + # add an extra track to one of the cds, and then make sure we can get it on top + # (check if limit works) +- my $top_cd = $cd_rs->slice (1,1)->next; ++ my $top_cd = $cd_rs->search({}, { order_by => 'cdid' })->slice (1,1)->next; + $top_cd->create_related ('tracks', { + title => 'over the top', + }); diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix index a4ed3a44f350..f552fe00566b 100644 --- a/pkgs/development/tools/misc/gpshell/default.nix +++ b/pkgs/development/tools/misc/gpshell/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite }: +{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite, gppcscconnectionplugin +, makeWrapper +}: stdenv.mkDerivation rec { name = "gpshell-${version}"; @@ -9,7 +11,11 @@ stdenv.mkDerivation rec { sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi"; }; - buildInputs = [ pkgconfig globalplatform pcsclite ]; + buildInputs = [ pkgconfig globalplatform pcsclite makeWrapper ]; + + postFixup = '' + wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib" + ''; meta = with stdenv.lib; { homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index d851741405ff..677ffa49c998 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -3,8 +3,12 @@ with stdenv.lib; let inherit (builtins) elemAt; + archOverrides = { + "i686" = "x86"; + }; info = splitString "-" stdenv.system; - arch = elemAt info 0; + arch = (elemAt info 0); + elasticArch = archOverrides."${arch}" or arch; plat = elemAt info 1; shas = { "x86_64-linux" = "1md3y3a8rxvf37lnfc56kbirv2rjl68pa5672yxhfmjngrr20rcw"; @@ -16,7 +20,7 @@ in stdenv.mkDerivation rec { version = "4.6.0"; src = fetchurl { - url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${arch}.tar.gz"; + url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${elasticArch}.tar.gz"; sha256 = shas."${stdenv.system}"; }; diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 3f3fd88580fa..cf4f34cbdfee 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -4,7 +4,7 @@ assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; let - version = "1.8.5"; + version = "1.8.6"; rake = buildRubyGem { inherit ruby; gemName = "rake"; @@ -13,8 +13,8 @@ let }; sha256 = { - "x86_64-linux" = "1na5hxm3ilx268hk68dpgkks1jjh9q7p3ksjx8ssiijq6df47vih"; - "i686-linux" = "16psr5s0azpzavizh74085z7wygkfs4ribsfalvbd96phkrkp2wp"; + "x86_64-linux" = "1nkhf160hcl02yvafj6hq53j204qqxyvxjngnmf4f5md8dmkpn76"; + "i686-linux" = "0mr4pn7nggjdsqyxh1z2mflvvmpzhbxh5gax501d2hi8xr0y68df"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = builtins.replaceStrings ["-linux"] [""] stdenv.system; @@ -28,22 +28,11 @@ in stdenv.mkDerivation rec { inherit sha256; }; - # Remove the patchFlags/patches when 1.8.6 is released - patchFlags = [ - "-p1" - "-d ./opt/vagrant/embedded/gems/gems/vagrant-${version}" - ]; - patches = (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/mitchellh/vagrant/pull/7611.diff"; - name = "fix_incorrect_ssh_keys_permissions.patch"; - sha256 = "0lqa9xpg79ggp9fc8gzb5lv675ydj2p8l55bx4hs1hf8zz2c1hjf"; - }); - meta = with stdenv.lib; { description = "A tool for building complete development environments"; homepage = http://vagrantup.com; license = licenses.mit; - maintainers = with maintainers; [ lovek323 globin jgeerds ]; + maintainers = with maintainers; [ lovek323 globin jgeerds kamilchm ]; platforms = platforms.linux; }; diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 0f85331bdd5b..f7d94bcad471 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -1,24 +1,18 @@ { stdenv, fetchurl, pkgconfig -, gettext, gtk, SDL, zlib, glib, openal, mesa, lua, freetype }: +, gettext, gtk2, SDL2, zlib, glib, openal, mesa, lua, freetype, libmpeg2, zip }: with stdenv.lib; -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { name = "fs-uae-${version}"; - version = "2.4.3"; + version = "2.8.0"; src = fetchurl { - urls = [ "http://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz" ]; - sha256 = "05wngvpqj8kj4wzi5jzzhvs19iljb3m6ba1l2hk4rz68b400ndv6"; + url = "http://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz"; + sha256 = "1cvvlkzhh4rrpax7505bngw990rx86l1nhad174zpqc9ah93il25"; }; - buildInputs = [ pkgconfig gettext gtk SDL zlib glib openal mesa lua freetype ]; - - phases = "unpackPhase buildPhase installPhase"; - - # Strange: the docs recommend SDL2, but it does compile only with SDL1 - buildPhase = "make sdl=1"; - installPhase = "make install prefix=$out"; + buildInputs = [ pkgconfig gettext gtk2 SDL2 zlib glib openal mesa lua freetype libmpeg2 zip ]; meta = { description = "An accurate, customizable Amiga Emulator"; @@ -30,9 +24,8 @@ stdenv.mkDerivation rec{ ''; license = licenses.gpl2Plus; homepage = http://fs-uae.net; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with stdenv.lib; [ maintainers.AndersonTorres ]; platforms = stdenv.lib.platforms.linux; }; } # TODO: testing and Python GUI support -# TODO: SDL2 support diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix new file mode 100644 index 000000000000..17a066640410 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -0,0 +1,155 @@ +{ stdenv, fetchurl, elfutils, mesa_noglu +, xorg, patchelf, openssl, libdrm, libudev +, libxcb, libxshmfence, epoxy, perl, zlib +, libsOnly ? false, kernel ? null +}: + +assert (!libsOnly) -> kernel != null; + +with stdenv.lib; + +let + + kernelDir = if libsOnly then null else kernel.dev; + + inherit (mesa_noglu) driverLink; + + bitness = if stdenv.is64bit then "64" else "32"; + + libArch = + if stdenv.system == "i686-linux" then + "i386-linux-gnu" + else if stdenv.system == "x86_64-linux" then + "x86_64-linux-gnu" + else throw "amdgpu-pro is Linux only. Sorry. The build was stopped."; + + libReplaceDir = "/usr/lib/${libArch}"; + +in stdenv.mkDerivation rec { + + version = "16.30"; + pname = "amdgpu-pro"; + build = "16.30.3-315407"; + + libCompatDir = "/run/lib/${libArch}"; + + name = pname + "-" + version + (optionalString (!libsOnly) "-${kernelDir.version}"); + + src = fetchurl { + url = + "https://www2.ati.com/drivers/linux/amdgpu-pro_${build}.tar.xz"; + sha256 = "97d6fb64617cf2cefe780e5fb83b29d8ee4e3e7886b71fe3d92b0113847b2354"; + curlOpts = "--referer http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx"; + }; + + hardeningDisable = [ "pic" "format" ]; + + inherit libsOnly; + + postUnpack = '' + cd $sourceRoot + mkdir root + cd root + for deb in ../*.deb; do echo $deb; ar p $deb data.tar.xz | tar -xJ; done + sourceRoot=. + ''; + + modulePatches = [ + ./patches/0001-add-OS-detection-for-arch.patch + ./patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch + ./patches/0003-add-kcl_drm_gem_object_lookup.patch + ./patches/0004-paging-changes-for-linux-4.6.patch + ./patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch + ./patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch + ./patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch + ./patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch + ./patches/0009-disable-dal-by-default.patch + ./patches/0010-remove-dependency-on-System.map.patch + ]; + + patchPhase = optionalString (!libsOnly) '' + pushd usr/src/amdgpu-pro-${build} + for patch in $modulePatches; do echo $patch; patch -p1 < $patch; done + popd + ''; + + preBuild = optionalString (!libsOnly) '' + makeFlags="$makeFlags M=$(pwd)/usr/src/amdgpu-pro-${build}" + ''; + + postBuild = optionalString (!libsOnly) '' + xz usr/src/amdgpu-pro-${build}/amd/amdgpu/amdgpu.ko + ''; + + makeFlags = optionalString (!libsOnly) + "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build modules"; + + depLibPath = makeLibraryPath [ + stdenv.cc.cc.lib xorg.libXext xorg.libX11 xorg.libXdamage xorg.libXfixes zlib + xorg.libXxf86vm libxcb libxshmfence epoxy openssl libdrm elfutils libudev + ]; + + installPhase = '' + mkdir -p $out + cp -r usr/bin $out/bin + cp -r etc $out/etc + cp -r usr/include $out/include + cp -r usr/lib/${libArch} $out/lib + mv $out/lib/amdgpu-pro/* $out/lib/ + rmdir $out/lib/amdgpu-pro + cp -r usr/share $out/share + '' + optionalString (!libsOnly) '' + if [ -d $out/lib/xorg ]; then + rm $out/lib/xorg + mv $out/lib/1.18 $out/lib/xorg + rm -r $out/lib/1.* + fi + cp -r lib/firmware $out/lib/firmware + mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko.xz + cp usr/src/amdgpu-pro-${build}/amd/amdgpu/amdgpu.ko.xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko.xz + '' + '' + interpreter="$(cat $NIX_CC/nix-support/dynamic-linker)" + libPath="$out/lib:$out/lib/gbm:$depLibPath" + echo patching with $interpreter $libPath + for prog in "$out"/bin/*; do + echo patching program $prog + patchelf --interpreter "$interpreter" --set-rpath "$libPath" "$prog" + done + for lib in `find "$out/lib/" -name '*.so*'`; do + echo patching library $lib + patchelf --set-rpath "$libPath" "$lib" + done + ''; + + postFixup = assert (stringLength libReplaceDir == stringLength libCompatDir); '' + libPath="$out/lib:$out/lib/gbm:$depLibPath" + for lib in libgbm.so.1.0.0 ${optionalString (!libsOnly) "xorg/modules/drivers/amdgpu_drv.so"} amdvlk${bitness}.so vdpau/libvdpau_amdgpu.so; do + if [ -e "$out/lib/$lib" ]; then + patchelf --set-rpath "$libPath" "$out/lib/$lib" + fi + done + for lib in libEGL.so.1 libGL.so.1.2 ${optionalString (!libsOnly) "xorg/modules/extensions/libglx.so"} dri/amdgpu_dri.so; do + if [ -e "$out/lib/$lib" ]; then + perl -pi -e 's:${libReplaceDir}:${libCompatDir}:g' "$out/lib/$lib" + fi + done + substituteInPlace "$out/etc/vulkan/icd.d/amd_icd${bitness}.json" --replace "/usr/lib/${libArch}" "$out/lib" + ''; + + buildInputs = [ + patchelf + perl + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "AMDGPU-PRO drivers"; + homepage = http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx ; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ corngood ]; + # Copied from the nvidia default.nix to prevent a store collision. + priority = 4; + }; +} diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch new file mode 100644 index 000000000000..46302ae0ea89 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch @@ -0,0 +1,26 @@ +From e78ede724fff53fc0220999f6381242142ce8c33 Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Sun, 21 Aug 2016 16:30:25 -0300 +Subject: [PATCH 1/8] add OS detection for arch + +--- + amd/backport/Makefile | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/amd/backport/Makefile b/amd/backport/Makefile +index 0c285ef..6447a15 100644 +--- a/amd/backport/Makefile ++++ b/amd/backport/Makefile +@@ -17,6 +17,9 @@ else ifeq ("ubuntu",$(OS_NAME)) + ccflags-y += -DOS_NAME_UBUNTU + else ifeq ("steamos",$(OS_NAME)) + ccflags-y += -DOS_NAME_STEAMOS ++else ifeq ("arch",$(OS_NAME)) ++ccflags-y += -DOS_NAME_ARCH ++OS_VERSION = "0.0" + else + ccflags-y += -DOS_NAME_UNKNOWN + endif +-- +2.9.3 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch new file mode 100644 index 000000000000..4101662a4ebe --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch @@ -0,0 +1,25 @@ +From d84bd62a10308efb6a414e8f6582a7b1e9860638 Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Sun, 21 Aug 2016 16:31:12 -0300 +Subject: [PATCH 2/8] update kcl_ttm_bo_reserve for linux-4.7 + +--- + amd/backport/include/kcl/kcl_ttm.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/amd/backport/include/kcl/kcl_ttm.h b/amd/backport/include/kcl/kcl_ttm.h +index 3575004..0d1560d 100644 +--- a/amd/backport/include/kcl/kcl_ttm.h ++++ b/amd/backport/include/kcl/kcl_ttm.h +@@ -84,7 +84,7 @@ static inline int kcl_ttm_bo_reserve(struct ttm_buffer_object *bo, + bool interruptible, bool no_wait, + struct ww_acquire_ctx *ticket) + { +-#if defined(BUILD_AS_DKMS) ++#if defined(BUILD_AS_DKMS) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) + return ttm_bo_reserve(bo, interruptible, no_wait, false, ticket); + #else + return ttm_bo_reserve(bo, interruptible, no_wait, ticket); +-- +2.9.3 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch new file mode 100644 index 000000000000..214b8effd9d3 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch @@ -0,0 +1,204 @@ +From 2637dfe990e4c277bc724f6ba48e6661506805ec Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Sun, 21 Aug 2016 16:37:34 -0300 +Subject: [PATCH 3/8] add kcl_drm_gem_object_lookup + +--- + amd/amdgpu/amdgpu_atpx_handler.c | 4 ++++ + amd/amdgpu/amdgpu_bo_list.c | 2 +- + amd/amdgpu/amdgpu_cs.c | 2 +- + amd/amdgpu/amdgpu_display.c | 2 +- + amd/amdgpu/amdgpu_gem.c | 10 +++++----- + amd/amdgpu/dce_v10_0.c | 2 +- + amd/amdgpu/dce_v11_0.c | 2 +- + amd/amdgpu/dce_v8_0.c | 2 +- + amd/backport/include/kcl/kcl_drm.h | 11 +++++++++++ + amd/dal/amdgpu_dm/amdgpu_dm_types.c | 2 +- + 10 files changed, 27 insertions(+), 12 deletions(-) + +diff --git a/amd/amdgpu/amdgpu_atpx_handler.c b/amd/amdgpu/amdgpu_atpx_handler.c +index cc9b998..7e47478 100644 +--- a/amd/amdgpu/amdgpu_atpx_handler.c ++++ b/amd/amdgpu/amdgpu_atpx_handler.c +@@ -565,7 +565,11 @@ void amdgpu_register_atpx_handler(void) + if (!r) + return; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++ vga_switcheroo_register_handler(&amdgpu_atpx_handler, 0); ++#else + vga_switcheroo_register_handler(&amdgpu_atpx_handler); ++#endif + } + + /** +diff --git a/amd/amdgpu/amdgpu_bo_list.c b/amd/amdgpu/amdgpu_bo_list.c +index 35d0856..1d163ec 100644 +--- a/amd/amdgpu/amdgpu_bo_list.c ++++ b/amd/amdgpu/amdgpu_bo_list.c +@@ -106,7 +106,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev, + struct amdgpu_bo *bo; + struct mm_struct *usermm; + +- gobj = drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle); ++ gobj = kcl_drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle); + if (!gobj) { + r = -ENOENT; + goto error_free; +diff --git a/amd/amdgpu/amdgpu_cs.c b/amd/amdgpu/amdgpu_cs.c +index d16ed26..b0390b5 100644 +--- a/amd/amdgpu/amdgpu_cs.c ++++ b/amd/amdgpu/amdgpu_cs.c +@@ -92,7 +92,7 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p, + { + struct drm_gem_object *gobj; + +- gobj = drm_gem_object_lookup(p->adev->ddev, p->filp, ++ gobj = kcl_drm_gem_object_lookup(p->adev->ddev, p->filp, + data->handle); + if (gobj == NULL) + return -EINVAL; +diff --git a/amd/amdgpu/amdgpu_display.c b/amd/amdgpu/amdgpu_display.c +index 46326b3..9b5441f 100644 +--- a/amd/amdgpu/amdgpu_display.c ++++ b/amd/amdgpu/amdgpu_display.c +@@ -594,7 +594,7 @@ amdgpu_user_framebuffer_create(struct drm_device *dev, + struct amdgpu_framebuffer *amdgpu_fb; + int ret; + +- obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); ++ obj = kcl_drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); + if (obj == NULL) { + dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, " + "can't create framebuffer\n", mode_cmd->handles[0]); +diff --git a/amd/amdgpu/amdgpu_gem.c b/amd/amdgpu/amdgpu_gem.c +index 0069aec..d10c282 100644 +--- a/amd/amdgpu/amdgpu_gem.c ++++ b/amd/amdgpu/amdgpu_gem.c +@@ -397,7 +397,7 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp, + struct drm_gem_object *gobj; + struct amdgpu_bo *robj; + +- gobj = drm_gem_object_lookup(dev, filp, handle); ++ gobj = kcl_drm_gem_object_lookup(dev, filp, handle); + if (gobj == NULL) { + return -ENOENT; + } +@@ -461,7 +461,7 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data, + int r = 0; + long ret; + +- gobj = drm_gem_object_lookup(dev, filp, handle); ++ gobj = kcl_drm_gem_object_lookup(dev, filp, handle); + if (gobj == NULL) { + return -ENOENT; + } +@@ -495,7 +495,7 @@ int amdgpu_gem_metadata_ioctl(struct drm_device *dev, void *data, + int r = -1; + + DRM_DEBUG("%d \n", args->handle); +- gobj = drm_gem_object_lookup(dev, filp, args->handle); ++ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle); + if (gobj == NULL) + return -ENOENT; + robj = gem_to_amdgpu_bo(gobj); +@@ -643,7 +643,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, + return -EINVAL; + } + +- gobj = drm_gem_object_lookup(dev, filp, args->handle); ++ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle); + if (gobj == NULL) + return -ENOENT; + rbo = gem_to_amdgpu_bo(gobj); +@@ -705,7 +705,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, + struct amdgpu_bo *robj; + int r; + +- gobj = drm_gem_object_lookup(dev, filp, args->handle); ++ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle); + if (gobj == NULL) { + return -ENOENT; + } +diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c +index 7554dd7..6d38754 100644 +--- a/amd/amdgpu/dce_v10_0.c ++++ b/amd/amdgpu/dce_v10_0.c +@@ -2594,7 +2594,7 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc, + return -EINVAL; + } + +- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); ++ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle); + if (!obj) { + DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); + return -ENOENT; +diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c +index d9c9b88..93dbc1a 100644 +--- a/amd/amdgpu/dce_v11_0.c ++++ b/amd/amdgpu/dce_v11_0.c +@@ -2604,7 +2604,7 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc, + return -EINVAL; + } + +- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); ++ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle); + if (!obj) { + DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); + return -ENOENT; +diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c +index 7a027ce..c56a298 100644 +--- a/amd/amdgpu/dce_v8_0.c ++++ b/amd/amdgpu/dce_v8_0.c +@@ -2501,7 +2501,7 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc, + return -EINVAL; + } + +- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); ++ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle); + if (!obj) { + DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); + return -ENOENT; +diff --git a/amd/backport/include/kcl/kcl_drm.h b/amd/backport/include/kcl/kcl_drm.h +index a65ee25..5a8a7b3 100644 +--- a/amd/backport/include/kcl/kcl_drm.h ++++ b/amd/backport/include/kcl/kcl_drm.h +@@ -3,6 +3,7 @@ + + #include + #include ++#include + + #if defined(BUILD_AS_DKMS) + extern int drm_pcie_get_max_link_width(struct drm_device *dev, u32 *mlw); +@@ -123,4 +124,14 @@ static inline int kcl_drm_universal_plane_init(struct drm_device *dev, struct dr + #endif + } + ++static inline struct drm_gem_object *kcl_drm_gem_object_lookup(struct drm_device *dev, ++ struct drm_file *filp, ++ u32 handle) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ return drm_gem_object_lookup(filp, handle); ++#else ++ return drm_gem_object_lookup(dev, filp, handle); ++#endif ++} ++ + #endif /* AMDGPU_BACKPORT_KCL_DRM_H */ +diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +index 3f357a5..2e2d2e6 100644 +--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c ++++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +@@ -152,7 +152,7 @@ static int dm_crtc_pin_cursor_bo_new( + + amdgpu_crtc = to_amdgpu_crtc(crtc); + +- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); ++ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle); + + if (!obj) { + DRM_ERROR( +-- +2.9.3 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch new file mode 100644 index 000000000000..54394b7879be --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch @@ -0,0 +1,42 @@ +From 2bd83488ccea22bb9e399986c171cccc3b6beb93 Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Sun, 21 Aug 2016 16:40:32 -0300 +Subject: [PATCH 4/8] paging changes for linux-4.6 + +--- + amd/amdgpu/amdgpu_ttm.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c +index 7bdebde..8b676c2 100644 +--- a/amd/amdgpu/amdgpu_ttm.c ++++ b/amd/amdgpu/amdgpu_ttm.c +@@ -548,8 +548,12 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages) + list_add(&guptask.list, >t->guptasks); + spin_unlock(>t->guptasklock); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++ r = get_user_pages(userptr, num_pages, write, 0, p, NULL); ++#else + r = get_user_pages(current, current->mm, userptr, num_pages, +- write, 0, p, NULL); ++ write, 0, p, NULL); ++#endif + + spin_lock(>t->guptasklock); + list_del(&guptask.list); +@@ -625,7 +629,11 @@ static void amdgpu_ttm_tt_unpin_userptr(struct ttm_tt *ttm) + set_page_dirty(page); + + mark_page_accessed(page); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++ put_page(page); ++#else + page_cache_release(page); ++#endif + } + + sg_free_table(ttm->sg); +-- +2.9.3 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch new file mode 100644 index 000000000000..6da3e46a3ee6 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch @@ -0,0 +1,48 @@ +From c41c15fa04e363c41272e7b5d767710170691347 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Mon, 4 Jul 2016 19:19:45 +0100 +Subject: [PATCH 5/8] LRU stuff isn't available until >= 4.7.x + +--- + amd/amdgpu/amdgpu_ttm.c | 4 ++-- + amd/backport/kcl_ttm.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c +index 8b676c2..752d065 100644 +--- a/amd/amdgpu/amdgpu_ttm.c ++++ b/amd/amdgpu/amdgpu_ttm.c +@@ -907,7 +907,7 @@ uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm, + return flags; + } + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) + + static void amdgpu_ttm_lru_removal(struct ttm_buffer_object *tbo) + { +@@ -969,7 +969,7 @@ static struct ttm_bo_driver amdgpu_bo_driver = { + .fault_reserve_notify = &amdgpu_bo_fault_reserve_notify, + .io_mem_reserve = &amdgpu_ttm_io_mem_reserve, + .io_mem_free = &amdgpu_ttm_io_mem_free, +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) + .lru_removal = &amdgpu_ttm_lru_removal, + .lru_tail = &amdgpu_ttm_lru_tail, + .swap_lru_tail = &amdgpu_ttm_swap_lru_tail, +diff --git a/amd/backport/kcl_ttm.c b/amd/backport/kcl_ttm.c +index 24f7a83..1a2cb7b 100644 +--- a/amd/backport/kcl_ttm.c ++++ b/amd/backport/kcl_ttm.c +@@ -7,7 +7,7 @@ static int _kcl_ttm_bo_del_from_lru(struct ttm_buffer_object *bo) + { + int put_count = 0; + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) + struct ttm_bo_device *bdev = bo->bdev; + + if (bdev->driver->lru_removal) +-- +2.9.3 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch new file mode 100644 index 000000000000..5be5acad00d6 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch @@ -0,0 +1,29 @@ +From 5b90b8d8ab44637c707623b25ee98aa4ebded308 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Mon, 4 Jul 2016 19:30:08 +0100 +Subject: [PATCH 6/8] Change name of vblank_disable_allowed to + vblank_disable_immediate under 4.7.x. + +--- + amd/amdgpu/amdgpu_irq.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/amd/amdgpu/amdgpu_irq.c b/amd/amdgpu/amdgpu_irq.c +index d13865a..5cfa69f 100644 +--- a/amd/amdgpu/amdgpu_irq.c ++++ b/amd/amdgpu/amdgpu_irq.c +@@ -240,7 +240,11 @@ int amdgpu_irq_init(struct amdgpu_device *adev) + INIT_WORK(&adev->hotplug_work, + amdgpu_hotplug_work_func); + } ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ adev->ddev->vblank_disable_immediate = true; ++#else + adev->ddev->vblank_disable_allowed = true; ++#endif + + INIT_WORK(&adev->reset_work, amdgpu_irq_reset_work_func); + +-- +2.9.3 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch new file mode 100644 index 000000000000..13d4a282ac82 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch @@ -0,0 +1,29 @@ +From 27ef2ce0d4d8eeb3bca32ddeae503f0a334832aa Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Mon, 4 Jul 2016 19:41:08 +0100 +Subject: [PATCH 7/8] Remove connector parameter from + __drm_atomic_helper_connector_destroy_state for 4.7.x kernels. + +--- + amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +index 2e2d2e6..cd34607 100644 +--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c ++++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +@@ -1205,7 +1205,11 @@ void amdgpu_dm_connector_atomic_destroy_state( + struct dm_connector_state *dm_state = + to_dm_connector_state(state); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ __drm_atomic_helper_connector_destroy_state(state); ++#else + __drm_atomic_helper_connector_destroy_state(connector, state); ++#endif + + kfree(dm_state); + } +-- +2.9.3 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch new file mode 100644 index 000000000000..693ad8b2f40d --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch @@ -0,0 +1,25 @@ +From c9f2501131da0d9173e21f7e8ff5741a7fcfedb6 Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Sun, 21 Aug 2016 16:58:45 -0300 +Subject: [PATCH 8/8] fix apparent typo in bandwidth_calcs causing array error + +--- + amd/dal/dc/calcs/bandwidth_calcs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/amd/dal/dc/calcs/bandwidth_calcs.c b/amd/dal/dc/calcs/bandwidth_calcs.c +index 8a19139..c4ededd 100644 +--- a/amd/dal/dc/calcs/bandwidth_calcs.c ++++ b/amd/dal/dc/calcs/bandwidth_calcs.c +@@ -3181,7 +3181,7 @@ static void calculate_bandwidth( + bw_int_to_fixed( + 2), + vbios->mcifwrmc_urgent_latency), +- results->dmif_burst_time[i][j]), ++ results->dmif_burst_time[results->y_clk_level][results->sclk_level]), + results->mcifwr_burst_time[results->y_clk_level][results->sclk_level])), + results->dispclk), + bw_int_to_fixed( +-- +2.9.3 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0009-disable-dal-by-default.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0009-disable-dal-by-default.patch new file mode 100644 index 000000000000..05bcbf8bd061 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0009-disable-dal-by-default.patch @@ -0,0 +1,25 @@ +From 49d45957ddaafe13a9cc7bacd1b9665fe9c517ac Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Thu, 25 Aug 2016 22:17:06 -0300 +Subject: [PATCH] disable dal by default + +--- + amd/amdgpu/amdgpu_drv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/amd/amdgpu/amdgpu_drv.c b/amd/amdgpu/amdgpu_drv.c +index 793528b..9a4dfcc 100644 +--- a/amd/amdgpu/amdgpu_drv.c ++++ b/amd/amdgpu/amdgpu_drv.c +@@ -79,7 +79,7 @@ int amdgpu_vm_block_size = -1; + int amdgpu_vm_fault_stop = 0; + int amdgpu_vm_debug = 0; + int amdgpu_exp_hw_support = 0; +-int amdgpu_dal = -1; ++int amdgpu_dal = 0; + int amdgpu_sched_jobs = 32; + int amdgpu_sched_hw_submission = 2; + int amdgpu_powerplay = -1; +-- +2.9.3 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0010-remove-dependency-on-System.map.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0010-remove-dependency-on-System.map.patch new file mode 100644 index 000000000000..ec8f2c5a5999 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0010-remove-dependency-on-System.map.patch @@ -0,0 +1,112 @@ +From fbc0d704f47526ca38f518b60237962cc6b08305 Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Thu, 25 Aug 2016 23:08:02 -0300 +Subject: [PATCH] remove dependency on System.map + +--- + amd/backport/Makefile | 3 +-- + amd/backport/kcl_fence.c | 10 ++++++++-- + amd/backport/symbols | 3 --- + dkms.conf | 1 - + pre-build.sh | 32 -------------------------------- + 5 files changed, 9 insertions(+), 40 deletions(-) + delete mode 100644 amd/backport/symbols + delete mode 100755 pre-build.sh + +diff --git a/amd/backport/Makefile b/amd/backport/Makefile +index 6447a15..4682e0f 100644 +--- a/amd/backport/Makefile ++++ b/amd/backport/Makefile +@@ -53,10 +53,9 @@ ccflags-y += -DOS_NAME_RHEL_7 + endif + endif + +-BACKPORT_OBJS = symbols.o + endif + +-BACKPORT_OBJS += kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o ++BACKPORT_OBJS = kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o + + amdgpu-y += $(addprefix ../backport/,$(BACKPORT_OBJS)) + +diff --git a/amd/backport/kcl_fence.c b/amd/backport/kcl_fence.c +index 2141eef..ceef1fe 100644 +--- a/amd/backport/kcl_fence.c ++++ b/amd/backport/kcl_fence.c +@@ -22,8 +22,14 @@ struct default_wait_cb { + struct task_struct *task; + }; + +-extern void +-(*fence_default_wait_cb)(struct fence *fence, struct fence_cb *cb); ++static void ++fence_default_wait_cb(struct fence *fence, struct fence_cb *cb) ++{ ++ struct default_wait_cb *wait = ++ container_of(cb, struct default_wait_cb, base); ++ ++ wake_up_process(wait->task); ++} + + signed long + _kcl_fence_wait_any_timeout(struct fence **fences, uint32_t count, +diff --git a/amd/backport/symbols b/amd/backport/symbols +deleted file mode 100644 +index 2d3f2ee..0000000 +--- a/amd/backport/symbols ++++ /dev/null +@@ -1,3 +0,0 @@ +-SYMS="" +- +-SYMS+="fence_default_wait_cb" +diff --git a/dkms.conf b/dkms.conf +index 9ca148e..36be480 100644 +--- a/dkms.conf ++++ b/dkms.conf +@@ -4,4 +4,3 @@ BUILT_MODULE_NAME[0]="amdgpu" + BUILT_MODULE_LOCATION[0]="amd/amdgpu" + DEST_MODULE_LOCATION[0]="/extra" + AUTOINSTALL="yes" +-PRE_BUILD="pre-build.sh $kernelver" +\ No newline at end of file +diff --git a/pre-build.sh b/pre-build.sh +deleted file mode 100755 +index 88ec680..0000000 +--- a/pre-build.sh ++++ /dev/null +@@ -1,32 +0,0 @@ +-#!/bin/bash +- +-KERNELVER=$1 +-KERNELVER_BASE=${KERNELVER%%-*} +- +-version_lt () { +- newest=$((echo "$1"; echo "$2") | sort -V | tail -n1) +- [ "$1" != "$newest" ] +-} +- +-version_ge () { +- newest=$((echo "$1"; echo "$2") | sort -V | tail -n1) +- [ "$1" = "$newest" ] +-} +- +-version_gt () { +- oldest=$((echo "$1"; echo "$2") | sort -V | head -n1) +- [ "$1" != "$oldest" ] +-} +- +-version_le () { +- oldest=$((echo "$1"; echo "$2") | sort -V | head -n1) +- [ "$1" = "$oldest" ] +-} +- +-source amd/backport/symbols +- +-echo '// auto generated by DKMS pre-build.sh' > amd/backport/symbols.c +-for sym in $SYMS; do +- addr=$(grep $sym /boot/System.map-$KERNELVER | awk -F' ' '{print $1}') +- echo "void *$sym = (void *)0x$addr;" >> amd/backport/symbols.c +-done +-- +2.9.3 + diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix new file mode 100644 index 000000000000..fdc5cc802a1a --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, perl, buildLinux, ... } @ args: + +import ./generic.nix (args // rec { + version = "3.14.77"; + extraMeta.branch = "3.14"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "1v3cc3ddla2b8gkwbms4x3lbjygw87r13150nikf1gc0hf64rqp0"; + }; + + kernelPatches = args.kernelPatches; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 04b759ae0e6b..246068f09ea4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.23"; + version = "4.4.24"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1ljvga8c6p3aww3jpi810rvf4m9qr1rjy8ya6s1xq07b08g5hpbk"; + sha256 = "0yhs1742wrl0ip9wsayparjpr7vccljnhfjimgy4fjp3w6aync1k"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.7.nix b/pkgs/os-specific/linux/kernel/linux-4.7.nix index 85be8019dfca..139ae20d8c96 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.7.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.7.5"; + version = "4.7.7"; extraMeta.branch = "4.7"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14nh37v2ankal763zrwd3yrdpbg2ni1yr33kdqjiqrja4vqazc4p"; + sha256 = "079gvv91a0mymzxx1h9bbn4snk6xz0cyk1bf8pjkhdyyad90v17d"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix new file mode 100644 index 000000000000..d7164d729402 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, perl, buildLinux, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.8.1"; + extraMeta.branch = "4.8"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "0rcqgi91jz5iyx1nrd4qjmvh0sgqjpqj94bwjh56c21nkxxiahg6"; + }; + + kernelPatches = args.kernelPatches; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index 85be8019dfca..139ae20d8c96 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.7.5"; + version = "4.7.7"; extraMeta.branch = "4.7"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "14nh37v2ankal763zrwd3yrdpbg2ni1yr33kdqjiqrja4vqazc4p"; + sha256 = "079gvv91a0mymzxx1h9bbn4snk6xz0cyk1bf8pjkhdyyad90v17d"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index d4e9f1e72750..29d622cd3c38 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -86,9 +86,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.7.5"; - grrev = "201609261522"; - sha256 = "1306lw3byw6cyi0dqh0dcl67l0bi043zmp3582hjpkwj934bahf7"; + { kver = "4.7.7"; + grrev = "201610101902"; + sha256 = "18x8grxj03bh9gqlm3sfgjl8vy5gpyrjr8nmdnrnas6ycmbvyjx4"; }; # This patch relaxes grsec constraints on the location of usermode helpers, diff --git a/pkgs/os-specific/linux/kmod/aggregator.nix b/pkgs/os-specific/linux/kmod/aggregator.nix index 88069ba4bf13..9bd7c8480c1c 100644 --- a/pkgs/os-specific/linux/kmod/aggregator.nix +++ b/pkgs/os-specific/linux/kmod/aggregator.nix @@ -17,10 +17,12 @@ buildEnv { echo "kernel version is $kernelVersion" + shopt -s extglob + # Regenerate the depmod map files. Be sure to pass an explicit # kernel version number, otherwise depmod will use `uname -r'. if test -w $out/lib/modules/$kernelVersion; then - rm -f $out/lib/modules/$kernelVersion/modules.* + rm -f $out/lib/modules/$kernelVersion/modules.!(builtin*|order*) ${kmod}/bin/depmod -b $out -a $kernelVersion fi ''; diff --git a/pkgs/os-specific/linux/nvidia-x11/365.35-kernel-4.7.patch b/pkgs/os-specific/linux/nvidia-x11/365.35-kernel-4.7.patch deleted file mode 100644 index 8d1436c50940..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/365.35-kernel-4.7.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Naur NVIDIA-Linux-x86_64-367.35-no-compat32-upstream/kernel/nvidia-drm/nvidia-drm-fb.c NVIDIA-Linux-x86_64-367.35-no-compat32/kernel/nvidia-drm/nvidia-drm-fb.c ---- NVIDIA-Linux-x86_64-367.35-no-compat32-upstream/kernel/nvidia-drm/nvidia-drm-fb.c 2016-07-31 19:07:06.595038290 -0400 -+++ NVIDIA-Linux-x86_64-367.35-no-compat32/kernel/nvidia-drm/nvidia-drm-fb.c 2016-07-31 19:09:18.532197060 -0400 -@@ -114,7 +114,7 @@ - * We don't support any planar format, pick up first buffer only. - */ - -- gem = drm_gem_object_lookup(dev, file, cmd->handles[0]); -+ gem = drm_gem_object_lookup(file, cmd->handles[0]); - - if (gem == NULL) - { -diff -Naur NVIDIA-Linux-x86_64-367.35-no-compat32-upstream/kernel/nvidia-drm/nvidia-drm-gem.c NVIDIA-Linux-x86_64-367.35-no-compat32/kernel/nvidia-drm/nvidia-drm-gem.c ---- NVIDIA-Linux-x86_64-367.35-no-compat32-upstream/kernel/nvidia-drm/nvidia-drm-gem.c 2016-07-31 19:07:06.595038290 -0400 -+++ NVIDIA-Linux-x86_64-367.35-no-compat32/kernel/nvidia-drm/nvidia-drm-gem.c 2016-07-31 19:08:56.187492736 -0400 -@@ -408,7 +408,7 @@ - - mutex_lock(&dev->struct_mutex); - -- gem = drm_gem_object_lookup(dev, file, handle); -+ gem = drm_gem_object_lookup(file, handle); - - if (gem == NULL) - { -diff -Naur NVIDIA-Linux-x86_64-367.35-no-compat32-upstream/kernel/nvidia-uvm/uvm_linux.h NVIDIA-Linux-x86_64-367.35-no-compat32/kernel/nvidia-uvm/uvm_linux.h ---- NVIDIA-Linux-x86_64-367.35-no-compat32-upstream/kernel/nvidia-uvm/uvm_linux.h 2016-07-31 19:07:06.600038448 -0400 -+++ NVIDIA-Linux-x86_64-367.35-no-compat32/kernel/nvidia-uvm/uvm_linux.h 2016-07-31 19:08:06.506926763 -0400 -@@ -554,12 +554,6 @@ - INIT_RADIX_TREE(tree, GFP_NOWAIT); - } - --static bool radix_tree_empty(struct radix_tree_root *tree) --{ -- void *dummy; -- return radix_tree_gang_lookup(tree, &dummy, 0, 1) == 0; --} -- - - #if !defined(NV_USLEEP_RANGE_PRESENT) - static void __sched usleep_range(unsigned long min, unsigned long max) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f561c0addc87..315a7037da7a 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -12,28 +12,30 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "367.35"; + versionNumber = "367.57"; # Policy: use the highest stable version as the default (on our master). inherit (stdenv.lib) makeLibraryPath; + nameSuffix = optionalString (!libsOnly) "-${kernel.version}"; + in stdenv.mkDerivation { - name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; + name = "nvidia-x11-${versionNumber}${nameSuffix}"; builder = ./builder.sh; src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "05g36bxcfk21ab8b0ay3zy21k5nd71468p9y1nbflx7ghpx25jrq"; + url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; + sha256 = "1fw87nvbf8dmy7clwmm7jwp842c78mkz9bcb060wbihsywkfkm23"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0m4k8f0212l63h22wk6hgi8fbfsgxqih5mizsw4ixqqmjd75av4a"; + url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}.run"; + sha256 = "0lc87bgr29l9idhy2a4bsplkwx9r0dz9kjhcc5xq2xqkkyr5sqd1"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; @@ -55,7 +57,7 @@ stdenv.mkDerivation { [ gtk atk pango glib gdk_pixbuf cairo ] ); programPath = makeLibraryPath [ xorg.libXv ]; - patches = if (!libsOnly) && (versionAtLeast kernel.dev.version "4.7") then [ ./365.35-kernel-4.7.patch ] else []; + buildInputs = [ perl nukeReferences ]; diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix index fe392fb08410..8174a42f5fb5 100644 --- a/pkgs/os-specific/linux/rtkit/default.nix +++ b/pkgs/os-specific/linux/rtkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus, libcap }: +{ stdenv, fetchurl, pkgconfig, dbus, libcap, fetchpatch }: stdenv.mkDerivation rec { name = "rtkit-0.11"; @@ -12,6 +12,20 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; + patches = [ + # Drop removed ControlGroup stanza + (fetchpatch { + url = "http://git.0pointer.net/rtkit.git/patch/?id=6c28e20c0be2f616a025059fda0ffac84e7f4f17"; + sha256 = "0lsxk5nv08i1wjb4xh20i5fcwg3x0qq0k4f8bc0r9cczph2sv7ck"; + }) + + # security patch: Pass uid of caller to polkit + (fetchpatch { + url = "http://git.0pointer.net/rtkit.git/patch/?id=88d4082ef6caf6b071d749dca1c50e7edde914cc"; + sha256 = "0hp1blbi359qz8fmr6nj4w9yc0jf3dd176f8pn25wdj38n13qkix"; + }) + ]; + buildInputs = [ pkgconfig dbus libcap ]; meta = { diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index b777042d6011..f84611139033 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, zlib, ncurses ? null, perl ? null, pam, systemd, minimal ? false }: +{ lib, stdenv, fetchurl, pkgconfig, zlib, libseccomp, fetchpatch, autoreconfHook, ncurses ? null, perl ? null, pam, systemd, minimal ? false }: stdenv.mkDerivation rec { name = "util-linux-${version}"; @@ -14,7 +14,11 @@ stdenv.mkDerivation rec { patches = [ ./rtcwake-search-PATH-for-shutdown.patch - ]; + (fetchpatch { + name = "CVE-2016-2779.diff"; + url = https://github.com/karelzak/util-linux/commit/8e4925016875c6a4f2ab4f833ba66f0fc57396a2.patch; + sha256 = "0kmigkq4s1b1ijrq8vcg2a5cw4qnm065m7cb1jn1q1f4x99ycy60"; + })]; outputs = [ "bin" "dev" "out" "man" ]; @@ -50,9 +54,11 @@ stdenv.mkDerivation rec { makeFlags = "usrbin_execdir=$(bin)/bin usrsbin_execdir=$(bin)/sbin"; - nativeBuildInputs = [ pkgconfig ]; + # autoreconfHook is required for CVE-2016-2779 + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + # libseccomp is required for CVE-2016-2779 buildInputs = - [ zlib pam ] + [ zlib pam libseccomp ] ++ lib.optional (ncurses != null) ncurses ++ lib.optional (systemd != null) systemd ++ lib.optional (perl != null) perl; diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix index 51630b4231ce..2e2923e17c39 100644 --- a/pkgs/servers/kippo/default.nix +++ b/pkgs/servers/kippo/default.nix @@ -25,16 +25,48 @@ # # Use this package at your own risk. -{stdenv, pkgs, config, fetchurl, ... }: +{stdenv, fetchurl, pythonPackages }: -stdenv.mkDerivation rec { +let + + twisted_13 = pythonPackages.buildPythonPackage rec { + # NOTE: When updating please check if new versions still cause issues + # to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem) + disabled = pythonPackages.isPy3k; + + name = "Twisted-13.2.0"; + src = fetchurl { + url = "mirror://pypi/T/Twisted/${name}.tar.bz2"; + sha256 = "1wrcqv5lvgwk2aq83qb2s2ng2vx14hbjjk2gc30cg6h1iiipal89"; + }; + + propagatedBuildInputs = with pythonPackages; [ zope_interface ]; + + # Generate Twisted's plug-in cache. Twited users must do it as well. See + # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 + # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for + # details. + postInstall = "$out/bin/twistd --help > /dev/null"; + + meta = with stdenv.lib; { + homepage = http://twistedmatrix.com/; + description = "Twisted, an event-driven networking engine written in Python"; + longDescription = '' + Twisted is an event-driven networking engine written in Python + and licensed under the MIT license. + ''; + license = licenses.mit; + }; + }; + +in stdenv.mkDerivation rec { name = "kippo-${version}"; version = "0.8"; src = fetchurl { url = "https://kippo.googlecode.com/files/kippo-${version}.tar.gz"; sha1 = "f57a5cf88171cb005afe44a4b33cb16f825c33d6"; }; - buildInputs = with pkgs.pythonPackages; [ pycrypto pyasn1 twisted_11 ]; + buildInputs = with pythonPackages; [ pycrypto pyasn1 twisted_13 ]; installPhase = '' substituteInPlace ./kippo.tac --replace "kippo.cfg" "$out/src/kippo.cfg" substituteInPlace ./kippo.cfg --replace "log_path = log" "log_path = /var/log/kippo" \ @@ -51,6 +83,8 @@ stdenv.mkDerivation rec { mv $out/src/utils/* $out/bin ''; + passthru.twisted = twisted_13; + meta = with stdenv.lib; { homepage = https://code.google.com/p/kippo; description = "SSH Honeypot"; diff --git a/pkgs/servers/web-apps/pump.io/composition.nix b/pkgs/servers/web-apps/pump.io/composition.nix new file mode 100644 index 000000000000..36815198d67b --- /dev/null +++ b/pkgs/servers/web-apps/pump.io/composition.nix @@ -0,0 +1,16 @@ +# This file has been generated by node2nix 1.1.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}: + +let + nodeEnv = import ../../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv python utillinux runCommand writeTextFile; + inherit nodejs; + }; +in +import ./node-packages.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} \ No newline at end of file diff --git a/pkgs/servers/web-apps/pump.io/default.nix b/pkgs/servers/web-apps/pump.io/default.nix index 2d3765936623..f888566cad66 100644 --- a/pkgs/servers/web-apps/pump.io/default.nix +++ b/pkgs/servers/web-apps/pump.io/default.nix @@ -1,34 +1,19 @@ -{ stdenv, fetchFromGitHub, makeWrapper, callPackage, nodejs, python, utillinux, graphicsmagick }: +{ pkgs, system, stdenv, fetchurl, makeWrapper, nodejs, graphicsmagick }: with stdenv.lib; let - nodePackages = callPackage (import ../../../top-level/node-packages.nix) { - inherit stdenv nodejs fetchurl fetchgit; - neededNatives = [ python ] ++ optional stdenv.isLinux utillinux; - self = nodePackages; - generated = ./node-packages.nix; + # To regenerate composition.nix, run generate.sh. + nodePackages = import ./composition.nix { + inherit pkgs system nodejs; }; - -in nodePackages.buildNodePackage rec { - version = "git-2015-11-09"; - name = "pump.io-${version}"; - - src = fetchFromGitHub { - owner = "e14n"; - repo = "pump.io"; - rev = "2f8d6b3518607ed02b594aee0db6ccacbe631b2d"; - sha256 = "1xym3jzpxlni1n2i0ixwrnpkx5fbnd1p6sm1hf9n3w5m2lx6gdw5"; - }; - - deps = (filter (v: nixType v == "derivation") (attrValues nodePackages)); - - buildInputs = [ makeWrapper ]; +in +nodePackages.package.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ makeWrapper ]; postInstall = '' for prog in pump pump-authorize pump-follow pump-post-note pump-register-app pump-register-user pump-stop-following; do wrapProgram "$out/bin/$prog" \ - --set NODE_PATH "$out/lib/node_modules/pump.io/node_modules/" \ --prefix PATH : ${graphicsmagick}/bin:$out/bin done ''; @@ -65,4 +50,4 @@ in nodePackages.buildNodePackage rec { * Experimenting with social software ''; }; -} +}) diff --git a/pkgs/servers/web-apps/pump.io/generate.sh b/pkgs/servers/web-apps/pump.io/generate.sh new file mode 100755 index 000000000000..51e05ce37d6b --- /dev/null +++ b/pkgs/servers/web-apps/pump.io/generate.sh @@ -0,0 +1,29 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix curl jshon + +set -e + +# Normally, this node2nix invocation would be sufficient: +# exec node2nix --input node-packages.json --composition composition.nix +# +# But pump.io soft-depends on extra modules, which have to be *inside* +# its own node_modules, not beside them. +# +# So we hack these extra deps into package.json and feed that into +# node2nix. +# +# Also jshon does funny things with slashes in strings, which can be +# fixed with sed. + +curl https://raw.githubusercontent.com/e14n/pump.io/v1.0.0/package.json | \ + jshon -e dependencies \ + -s '*' -i databank-mongodb \ + -s '*' -i databank-redis \ + -s '*' -i databank-memcached \ + -s '*' -i databank-lrucache \ + -p | sed 's=\\/=/=g' > full-package.json + +node2nix --input full-package.json --composition composition.nix --node-env ../../../development/node-packages/node-env.nix + +# overriding nodePackages src doesn't seem to work, so... +sed -i 's|src = ./.|src = fetchurl { url = "https://registry.npmjs.org/pump.io/-/pump.io-1.0.0.tgz"; sha1 = "404mzdqzknrv7pl9qasksi791cc00bbd"; }|' node-packages.nix diff --git a/pkgs/servers/web-apps/pump.io/node-packages.json b/pkgs/servers/web-apps/pump.io/node-packages.json index 10d50a0c72ea..294da7ab2f1c 100644 --- a/pkgs/servers/web-apps/pump.io/node-packages.json +++ b/pkgs/servers/web-apps/pump.io/node-packages.json @@ -1,36 +1,7 @@ -{ - "name": "pump.io", - "dependencies": { - "bcrypt": "0.8.x", - "bunyan": "0.16.x", - "connect": "1.x", - "connect-auth": "0.5.3", - "connect-databank": "0.13.x", - "crypto-cacerts": "0.1.x", - "databank": "0.19.x", - "databank-lrucache": "^0.1.2", - "databank-memcached": "^0.15.0", - "databank-mongodb": "^0.18.10", - "databank-redis": "^0.19.6", - "dateformat": "1.x", - "dialback-client": "~0.1.5", - "emailjs": "0.3.x", - "express": "2.5.x", - "gm": "1.9.x", - "jankyqueue": "0.1.x", - "mkdirp": "0.3.x", - "node-uuid": "1.3.x", - "oauth-evanp": "~0.9.10-evanp.2", - "optimist": "0.3.x", - "schlock": "~0.2.1", - "set-immediate": "0.1.x", - "showdown": "0.3.x", - "sockjs": "0.3.x", - "step": "0.0.x", - "underscore": "1.4.x", - "underscore-contrib": "0.1.x", - "utml": "0.2.x", - "validator": "0.4.x", - "webfinger": "~0.4.2" - } -} +[ + "pump.io", + "databank-mongodb", + "databank-redis", + "databank-memcached", + "databank-lrucache" +] diff --git a/pkgs/servers/web-apps/pump.io/node-packages.nix b/pkgs/servers/web-apps/pump.io/node-packages.nix index 4d6272511aa8..ec05cc8c13b9 100644 --- a/pkgs/servers/web-apps/pump.io/node-packages.nix +++ b/pkgs/servers/web-apps/pump.io/node-packages.nix @@ -1,2734 +1,4392 @@ -{ self, fetchurl, fetchgit ? null, lib }: +# This file has been generated by node2nix 1.1.0. Do not edit! +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: + +let + sources = { + "bcrypt-0.8.7" = { + name = "bcrypt"; + packageName = "bcrypt"; + version = "0.8.7"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz"; + sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093"; + }; + }; + "bunyan-1.8.1" = { + name = "bunyan"; + packageName = "bunyan"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.1.tgz"; + sha1 = "68c6a4a502d5620bc9f72d6736810c1b1898097f"; + }; + }; + "connect-2.30.2" = { + name = "connect"; + packageName = "connect"; + version = "2.30.2"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz"; + sha1 = "8da9bcbe8a054d3d318d74dfec903b5c39a1b609"; + }; + }; + "connect-auth-0.6.1" = { + name = "connect-auth"; + packageName = "connect-auth"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-auth/-/connect-auth-0.6.1.tgz"; + sha1 = "8d798153d6c8e78cb809de82a436f1de7c79868f"; + }; + }; + "connect-databank-1.0.3" = { + name = "connect-databank"; + packageName = "connect-databank"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-databank/-/connect-databank-1.0.3.tgz"; + sha1 = "dad24f08dc385d9c3a94f1a52730aec0c7d13b02"; + }; + }; + "crypto-cacerts-0.1.0" = { + name = "crypto-cacerts"; + packageName = "crypto-cacerts"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-cacerts/-/crypto-cacerts-0.1.0.tgz"; + sha1 = "3499c6dff949ab005d4ad4a3f09c48ced6c88a41"; + }; + }; + "databank-0.19.5" = { + name = "databank"; + packageName = "databank"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/databank/-/databank-0.19.5.tgz"; + sha1 = "edcbd954b84730c0c5d0de551e004b92f1f53119"; + }; + }; + "dateformat-1.0.12" = { + name = "dateformat"; + packageName = "dateformat"; + version = "1.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz"; + sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9"; + }; + }; + "dialback-client-0.2.0" = { + name = "dialback-client"; + packageName = "dialback-client"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dialback-client/-/dialback-client-0.2.0.tgz"; + sha1 = "051806a88a6cc18ffb25adf13eda232e354ebcb6"; + }; + }; + "dompurify-0.8.3" = { + name = "dompurify"; + packageName = "dompurify"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dompurify/-/dompurify-0.8.3.tgz"; + sha1 = "06bdc074b91306d09f7f150bfeb96a11e0be64c1"; + }; + }; + "emailjs-1.0.8" = { + name = "emailjs"; + packageName = "emailjs"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/emailjs/-/emailjs-1.0.8.tgz"; + sha1 = "d4240db7670dc78aff97352092d8460edc130f66"; + }; + }; + "express-2.5.11" = { + name = "express"; + packageName = "express"; + version = "2.5.11"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-2.5.11.tgz"; + sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"; + }; + }; + "express-session-1.14.1" = { + name = "express-session"; + packageName = "express-session"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express-session/-/express-session-1.14.1.tgz"; + sha1 = "600364f0f6bf5dce32649e006770bdeee80aec99"; + }; + }; + "gm-1.23.0" = { + name = "gm"; + packageName = "gm"; + version = "1.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gm/-/gm-1.23.0.tgz"; + sha1 = "80a2fe9cbf131515024846444658461269f52661"; + }; + }; + "helmet-2.2.0" = { + name = "helmet"; + packageName = "helmet"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/helmet/-/helmet-2.2.0.tgz"; + sha1 = "fa0737d113fba4bd29d1b39650ac679ad673b948"; + }; + }; + "jankyqueue-0.1.1" = { + name = "jankyqueue"; + packageName = "jankyqueue"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jankyqueue/-/jankyqueue-0.1.1.tgz"; + sha1 = "4181b0318fb32e77aee8c54af73f97660f2e88d2"; + }; + }; + "jsdom-7.2.2" = { + name = "jsdom"; + packageName = "jsdom"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz"; + sha1 = "40b402770c2bda23469096bee91ab675e3b1fc6e"; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "node-uuid-1.4.7" = { + name = "node-uuid"; + packageName = "node-uuid"; + version = "1.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; + sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; + }; + }; + "oauth-evanp-0.9.10-evanp.2" = { + name = "oauth-evanp"; + packageName = "oauth-evanp"; + version = "0.9.10-evanp.2"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-evanp/-/oauth-evanp-0.9.10-evanp.2.tgz"; + sha1 = "9b5fb3508cea584420855957d56531405cf53a02"; + }; + }; + "optimist-0.6.1" = { + name = "optimist"; + packageName = "optimist"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; + sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; + }; + }; + "rimraf-2.5.4" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"; + sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04"; + }; + }; + "sanitize-html-1.13.0" = { + name = "sanitize-html"; + packageName = "sanitize-html"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.13.0.tgz"; + sha1 = "4ee17cbec516bfe32f2ce6686a569d7e6b4f3631"; + }; + }; + "schlock-0.2.1" = { + name = "schlock"; + packageName = "schlock"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/schlock/-/schlock-0.2.1.tgz"; + sha1 = "2a9aaeaa209a5422eadc5dfc005e2c2f15241f99"; + }; + }; + "send-0.13.2" = { + name = "send"; + packageName = "send"; + version = "0.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.13.2.tgz"; + sha1 = "765e7607c8055452bba6f0b052595350986036de"; + }; + }; + "showdown-1.4.3" = { + name = "showdown"; + packageName = "showdown"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/showdown/-/showdown-1.4.3.tgz"; + sha1 = "91d29f4728dbdf76034b7555355e9b30974df447"; + }; + }; + "sockjs-0.3.17" = { + name = "sockjs"; + packageName = "sockjs"; + version = "0.3.17"; + src = fetchurl { + url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.17.tgz"; + sha1 = "ef1b88f5d73e6278fad8e9476ac91064382f3b44"; + }; + }; + "step-0.0.6" = { + name = "step"; + packageName = "step"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/step/-/step-0.0.6.tgz"; + sha1 = "143e7849a5d7d3f4a088fe29af94915216eeede2"; + }; + }; + "ua-parser-js-0.7.10" = { + name = "ua-parser-js"; + packageName = "ua-parser-js"; + version = "0.7.10"; + src = fetchurl { + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.10.tgz"; + sha1 = "917559ddcce07cbc09ece7d80495e4c268f4ef9f"; + }; + }; + "underscore-1.8.3" = { + name = "underscore"; + packageName = "underscore"; + version = "1.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; + sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; + }; + }; + "underscore-contrib-0.3.0" = { + name = "underscore-contrib"; + packageName = "underscore-contrib"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz"; + sha1 = "665b66c24783f8fa2b18c9f8cbb0e2c7d48c26c7"; + }; + }; + "utml-0.2.0" = { + name = "utml"; + packageName = "utml"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utml/-/utml-0.2.0.tgz"; + sha1 = "6a546741823b2a9c17598a57e8eb4c08738dee48"; + }; + }; + "validator-4.4.0" = { + name = "validator"; + packageName = "validator"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/validator/-/validator-4.4.0.tgz"; + sha1 = "35e29555dd5f7826f970a4eaecff9e6df6df3da6"; + }; + }; + "webfinger-0.4.2" = { + name = "webfinger"; + packageName = "webfinger"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webfinger/-/webfinger-0.4.2.tgz"; + sha1 = "3477a6d97799461896039fcffc650b73468ee76d"; + }; + }; + "databank-mongodb-0.19.0" = { + name = "databank-mongodb"; + packageName = "databank-mongodb"; + version = "0.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/databank-mongodb/-/databank-mongodb-0.19.0.tgz"; + sha1 = "66ffa32848986d0e138403396506d64895fefc45"; + }; + }; + "databank-redis-0.19.6" = { + name = "databank-redis"; + packageName = "databank-redis"; + version = "0.19.6"; + src = fetchurl { + url = "https://registry.npmjs.org/databank-redis/-/databank-redis-0.19.6.tgz"; + sha1 = "dd476b81b8200269ea0cc85f6b6decd05799bce9"; + }; + }; + "databank-memcached-0.15.0" = { + name = "databank-memcached"; + packageName = "databank-memcached"; + version = "0.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/databank-memcached/-/databank-memcached-0.15.0.tgz"; + sha1 = "0817452dfb2b09267cd1c8bbec95363ec14f14f2"; + }; + }; + "databank-lrucache-0.1.2" = { + name = "databank-lrucache"; + packageName = "databank-lrucache"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/databank-lrucache/-/databank-lrucache-0.1.2.tgz"; + sha1 = "846d3bbc3d908ea2880baf9a611d86a28697c640"; + }; + }; + "bindings-1.2.1" = { + name = "bindings"; + packageName = "bindings"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; + sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; + }; + }; + "nan-2.3.5" = { + name = "nan"; + packageName = "nan"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"; + sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; + }; + }; + "dtrace-provider-0.6.0" = { + name = "dtrace-provider"; + packageName = "dtrace-provider"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz"; + sha1 = "0b078d5517937d873101452d9146737557b75e51"; + }; + }; + "mv-2.1.1" = { + name = "mv"; + packageName = "mv"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz"; + sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"; + }; + }; + "safe-json-stringify-1.0.3" = { + name = "safe-json-stringify"; + packageName = "safe-json-stringify"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz"; + sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e"; + }; + }; + "moment-2.15.0" = { + name = "moment"; + packageName = "moment"; + version = "2.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.15.0.tgz"; + sha1 = "cc9e33958bf4a99dea7111d5e62ed3c13fc96440"; + }; + }; + "nan-2.4.0" = { + name = "nan"; + packageName = "nan"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"; + sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232"; + }; + }; + "ncp-2.0.0" = { + name = "ncp"; + packageName = "ncp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; + sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; + }; + }; + "rimraf-2.4.5" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"; + sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"; + }; + }; + "glob-6.0.4" = { + name = "glob"; + packageName = "glob"; + version = "6.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"; + sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"; + }; + }; + "inflight-1.0.5" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz"; + sha1 = "db3204cd5a9de2e6cd890b85c6e2f66bcf4f620a"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "minimatch-3.0.3" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz"; + sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774"; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "path-is-absolute-1.0.0" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"; + sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "brace-expansion-1.1.6" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"; + sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9"; + }; + }; + "balanced-match-0.4.2" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"; + sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838"; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "basic-auth-connect-1.0.0" = { + name = "basic-auth-connect"; + packageName = "basic-auth-connect"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"; + sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122"; + }; + }; + "body-parser-1.13.3" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.13.3"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz"; + sha1 = "c08cf330c3358e151016a05746f13f029c97fa97"; + }; + }; + "bytes-2.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz"; + sha1 = "ac93c410e2ffc9cc7cf4b464b38289067f5e47b4"; + }; + }; + "cookie-0.1.3" = { + name = "cookie"; + packageName = "cookie"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz"; + sha1 = "e734a5c1417fce472d5aef82c381cabb64d1a435"; + }; + }; + "cookie-parser-1.3.5" = { + name = "cookie-parser"; + packageName = "cookie-parser"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz"; + sha1 = "9d755570fb5d17890771227a02314d9be7cf8356"; + }; + }; + "cookie-signature-1.0.6" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + }; + "compression-1.5.2" = { + name = "compression"; + packageName = "compression"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz"; + sha1 = "b03b8d86e6f8ad29683cba8df91ddc6ffc77b395"; + }; + }; + "connect-timeout-1.6.2" = { + name = "connect-timeout"; + packageName = "connect-timeout"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz"; + sha1 = "de9a5ec61e33a12b6edaab7b5f062e98c599b88e"; + }; + }; + "content-type-1.0.2" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz"; + sha1 = "b7d113aee7a8dd27bd21133c4dc2529df1721eed"; + }; + }; + "csurf-1.8.3" = { + name = "csurf"; + packageName = "csurf"; + version = "1.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz"; + sha1 = "23f2a13bf1d8fce1d0c996588394442cba86a56a"; + }; + }; + "debug-2.2.0" = { + name = "debug"; + packageName = "debug"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + }; + }; + "depd-1.0.1" = { + name = "depd"; + packageName = "depd"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; + sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; + }; + }; + "errorhandler-1.4.3" = { + name = "errorhandler"; + packageName = "errorhandler"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz"; + sha1 = "b7b70ed8f359e9db88092f2d20c0f831420ad83f"; + }; + }; + "express-session-1.11.3" = { + name = "express-session"; + packageName = "express-session"; + version = "1.11.3"; + src = fetchurl { + url = "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz"; + sha1 = "5cc98f3f5ff84ed835f91cbf0aabd0c7107400af"; + }; + }; + "finalhandler-0.4.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz"; + sha1 = "965a52d9e8d05d2b857548541fb89b53a2497d9b"; + }; + }; + "fresh-0.3.0" = { + name = "fresh"; + packageName = "fresh"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz"; + sha1 = "651f838e22424e7566de161d8358caa199f83d4f"; + }; + }; + "http-errors-1.3.1" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz"; + sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; + }; + }; + "method-override-2.3.6" = { + name = "method-override"; + packageName = "method-override"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz"; + sha1 = "209261cc588d45d9d5a022ff20d7d5eb8e92179e"; + }; + }; + "morgan-1.6.1" = { + name = "morgan"; + packageName = "morgan"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz"; + sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2"; + }; + }; + "multiparty-3.3.2" = { + name = "multiparty"; + packageName = "multiparty"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz"; + sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f"; + }; + }; + "on-headers-1.0.1" = { + name = "on-headers"; + packageName = "on-headers"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz"; + sha1 = "928f5d0f470d49342651ea6794b0857c100693f7"; + }; + }; + "parseurl-1.3.1" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz"; + sha1 = "c8ab8c9223ba34888aa64a297b28853bec18da56"; + }; + }; + "pause-0.1.0" = { + name = "pause"; + packageName = "pause"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz"; + sha1 = "ebc8a4a8619ff0b8a81ac1513c3434ff469fdb74"; + }; + }; + "qs-4.0.0" = { + name = "qs"; + packageName = "qs"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz"; + sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; + }; + }; + "response-time-2.3.1" = { + name = "response-time"; + packageName = "response-time"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/response-time/-/response-time-2.3.1.tgz"; + sha1 = "2bde19181de6c81ab95e3207a28d61d965b31797"; + }; + }; + "serve-favicon-2.3.0" = { + name = "serve-favicon"; + packageName = "serve-favicon"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz"; + sha1 = "aed36cc6834069a6f189cc7222c6a1a811dc5b39"; + }; + }; + "serve-index-1.7.3" = { + name = "serve-index"; + packageName = "serve-index"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz"; + sha1 = "7a057fc6ee28dc63f64566e5fa57b111a86aecd2"; + }; + }; + "serve-static-1.10.3" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz"; + sha1 = "ce5a6ecd3101fed5ec09827dac22a9c29bfb0535"; + }; + }; + "type-is-1.6.13" = { + name = "type-is"; + packageName = "type-is"; + version = "1.6.13"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz"; + sha1 = "6e83ba7bc30cd33a7bb0b7fb00737a2085bf9d08"; + }; + }; + "utils-merge-1.0.0" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; + sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; + }; + }; + "vhost-3.0.2" = { + name = "vhost"; + packageName = "vhost"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz"; + sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5"; + }; + }; + "iconv-lite-0.4.11" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.11"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz"; + sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade"; + }; + }; + "on-finished-2.3.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + }; + "raw-body-2.1.7" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz"; + sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; + }; + }; + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + }; + "bytes-2.4.0" = { + name = "bytes"; + packageName = "bytes"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz"; + sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339"; + }; + }; + "iconv-lite-0.4.13" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.13"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"; + sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2"; + }; + }; + "unpipe-1.0.0" = { + name = "unpipe"; + packageName = "unpipe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + }; + "accepts-1.2.13" = { + name = "accepts"; + packageName = "accepts"; + version = "1.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz"; + sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; + }; + }; + "compressible-2.0.8" = { + name = "compressible"; + packageName = "compressible"; + version = "2.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.8.tgz"; + sha1 = "7162e6c46d3b9d200ffb45cb4e4a0f7832732503"; + }; + }; + "vary-1.0.1" = { + name = "vary"; + packageName = "vary"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz"; + sha1 = "99e4981566a286118dfb2b817357df7993376d10"; + }; + }; + "mime-types-2.1.11" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz"; + sha1 = "c259c471bda808a85d6cd193b430a5fae4473b3c"; + }; + }; + "negotiator-0.5.3" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; + sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; + }; + }; + "mime-db-1.23.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"; + sha1 = "a31b4070adaea27d732ea333740a64d0ec9a6659"; + }; + }; + "ms-0.7.1" = { + name = "ms"; + packageName = "ms"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + }; + }; + "csrf-3.0.3" = { + name = "csrf"; + packageName = "csrf"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz"; + sha1 = "69d13220de95762808bb120f7533a994fc4293b5"; + }; + }; + "base64-url-1.2.2" = { + name = "base64-url"; + packageName = "base64-url"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz"; + sha1 = "90af26ef8b0b67bc801b05eccf943345649008b3"; + }; + }; + "rndm-1.2.0" = { + name = "rndm"; + packageName = "rndm"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz"; + sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c"; + }; + }; + "tsscmp-1.0.5" = { + name = "tsscmp"; + packageName = "tsscmp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz"; + sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; + }; + }; + "uid-safe-2.1.1" = { + name = "uid-safe"; + packageName = "uid-safe"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz"; + sha1 = "3dbf9436b528be9f52882c05a6216c3763db3666"; + }; + }; + "random-bytes-1.0.0" = { + name = "random-bytes"; + packageName = "random-bytes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz"; + sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; + }; + }; + "accepts-1.3.3" = { + name = "accepts"; + packageName = "accepts"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz"; + sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca"; + }; + }; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + }; + "negotiator-0.6.1" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz"; + sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; + }; + }; + "crc-3.3.0" = { + name = "crc"; + packageName = "crc"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz"; + sha1 = "fa622e1bc388bf257309082d6b65200ce67090ba"; + }; + }; + "uid-safe-2.0.0" = { + name = "uid-safe"; + packageName = "uid-safe"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz"; + sha1 = "a7f3c6ca64a1f6a5d04ec0ef3e4c3d5367317137"; + }; + }; + "base64-url-1.2.1" = { + name = "base64-url"; + packageName = "base64-url"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz"; + sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78"; + }; + }; + "escape-html-1.0.2" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz"; + sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c"; + }; + }; + "statuses-1.3.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz"; + sha1 = "8e55758cb20e7682c1f4fce8dcab30bf01d1e07a"; + }; + }; + "methods-1.1.2" = { + name = "methods"; + packageName = "methods"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + }; + "vary-1.1.0" = { + name = "vary"; + packageName = "vary"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz"; + sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140"; + }; + }; + "basic-auth-1.0.4" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"; + sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; + }; + }; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + }; + "stream-counter-0.2.0" = { + name = "stream-counter"; + packageName = "stream-counter"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz"; + sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de"; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; + "string_decoder-0.10.31" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + }; + "etag-1.7.0" = { + name = "etag"; + packageName = "etag"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz"; + sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8"; + }; + }; + "batch-0.5.3" = { + name = "batch"; + packageName = "batch"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz"; + sha1 = "3f3414f380321743bfc1042f9a83ff1d5824d464"; + }; + }; + "media-typer-0.3.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + }; + "connect-2.7.11" = { + name = "connect"; + packageName = "connect"; + version = "2.7.11"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-2.7.11.tgz"; + sha1 = "f561d5eef70b8d719c397f724d34ba4065c77a3e"; + }; + }; + "oauth-0.9.10" = { + name = "oauth"; + packageName = "oauth"; + version = "0.9.10"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth/-/oauth-0.9.10.tgz"; + sha1 = "7d356af319a16d889e581fa80f86bbd5ab454646"; + }; + }; + "openid-0.4.1" = { + name = "openid"; + packageName = "openid"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openid/-/openid-0.4.1.tgz"; + sha1 = "de0eb5e381d34dc4aa5a77a98678bedafd11f387"; + }; + }; + "qs-0.6.5" = { + name = "qs"; + packageName = "qs"; + version = "0.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-0.6.5.tgz"; + sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef"; + }; + }; + "formidable-1.0.14" = { + name = "formidable"; + packageName = "formidable"; + version = "1.0.14"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; + sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; + }; + }; + "cookie-signature-1.0.1" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz"; + sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb"; + }; + }; + "buffer-crc32-0.2.1" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"; + sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c"; + }; + }; + "cookie-0.0.5" = { + name = "cookie"; + packageName = "cookie"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz"; + sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81"; + }; + }; + "send-0.1.1" = { + name = "send"; + packageName = "send"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.1.1.tgz"; + sha1 = "0bcfcbd03def6e2d8612e1abf8f4895b450c60c8"; + }; + }; + "bytes-0.2.0" = { + name = "bytes"; + packageName = "bytes"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz"; + sha1 = "aad33ec14e3dc2ca74e8e7d451f9ba053ad4f7a0"; + }; + }; + "fresh-0.1.0" = { + name = "fresh"; + packageName = "fresh"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz"; + sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850"; + }; + }; + "pause-0.0.1" = { + name = "pause"; + packageName = "pause"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; + sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; + }; + }; + "mime-1.2.11" = { + name = "mime"; + packageName = "mime"; + version = "1.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }; + }; + "range-parser-0.0.4" = { + name = "range-parser"; + packageName = "range-parser"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz"; + sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b"; + }; + }; + "async-1.5.2" = { + name = "async"; + packageName = "async"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz"; + sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; + }; + }; + "set-immediate-0.1.1" = { + name = "set-immediate"; + packageName = "set-immediate"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/set-immediate/-/set-immediate-0.1.1.tgz"; + sha1 = "8986e4a773bf8ec165f24d579107673bfac141de"; + }; + }; + "vows-0.7.0" = { + name = "vows"; + packageName = "vows"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vows/-/vows-0.7.0.tgz"; + sha1 = "dd0065f110ba0c0a6d63e844851c3208176d5867"; + }; + }; + "setimmediate-1.0.5" = { + name = "setimmediate"; + packageName = "setimmediate"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; + sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + }; + }; + "eyes-0.1.8" = { + name = "eyes"; + packageName = "eyes"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; + sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + }; + }; + "diff-1.0.8" = { + name = "diff"; + packageName = "diff"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; + sha1 = "343276308ec991b7bc82267ed55bc1411f971666"; + }; + }; + "get-stdin-4.0.1" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; + sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; + }; + }; + "meow-3.7.0" = { + name = "meow"; + packageName = "meow"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz"; + sha1 = "72cb668b425228290abbfa856892587308a801fb"; + }; + }; + "camelcase-keys-2.1.0" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; + sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "loud-rejection-1.6.0" = { + name = "loud-rejection"; + packageName = "loud-rejection"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; + sha1 = "5b46f80147edee578870f086d04821cf998e551f"; + }; + }; + "map-obj-1.0.1" = { + name = "map-obj"; + packageName = "map-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + }; + }; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + }; + "normalize-package-data-2.3.5" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz"; + sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df"; + }; + }; + "object-assign-4.1.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"; + sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"; + }; + }; + "read-pkg-up-1.0.1" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; + sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + }; + }; + "redent-1.0.0" = { + name = "redent"; + packageName = "redent"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; + sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; + }; + }; + "trim-newlines-1.0.0" = { + name = "trim-newlines"; + packageName = "trim-newlines"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; + sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; + }; + }; + "camelcase-2.1.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; + sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; + }; + }; + "currently-unhandled-0.4.1" = { + name = "currently-unhandled"; + packageName = "currently-unhandled"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; + sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; + }; + }; + "signal-exit-3.0.1" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz"; + sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81"; + }; + }; + "array-find-index-1.0.1" = { + name = "array-find-index"; + packageName = "array-find-index"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.1.tgz"; + sha1 = "0bc25ddac941ec8a496ae258fd4ac188003ef3af"; + }; + }; + "hosted-git-info-2.1.5" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz"; + sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b"; + }; + }; + "is-builtin-module-1.0.0" = { + name = "is-builtin-module"; + packageName = "is-builtin-module"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; + sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; + }; + }; + "semver-5.3.0" = { + name = "semver"; + packageName = "semver"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; + sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + }; + }; + "validate-npm-package-license-3.0.1" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; + sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; + }; + }; + "builtin-modules-1.1.1" = { + name = "builtin-modules"; + packageName = "builtin-modules"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; + sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; + }; + }; + "spdx-correct-1.0.2" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; + sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; + }; + }; + "spdx-expression-parse-1.0.3" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.3.tgz"; + sha1 = "ca3c3828c4fea8aa44997884b398fc5d67436442"; + }; + }; + "spdx-license-ids-1.2.2" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"; + sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57"; + }; + }; + "find-up-1.1.2" = { + name = "find-up"; + packageName = "find-up"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; + sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; + }; + }; + "read-pkg-1.1.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; + sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + }; + }; + "path-exists-2.1.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; + sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + }; + }; + "pinkie-promise-2.0.1" = { + name = "pinkie-promise"; + packageName = "pinkie-promise"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; + sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + }; + }; + "pinkie-2.0.4" = { + name = "pinkie"; + packageName = "pinkie"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; + sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + }; + }; + "load-json-file-1.1.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; + sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; + }; + }; + "path-type-1.1.0" = { + name = "path-type"; + packageName = "path-type"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; + sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; + }; + }; + "graceful-fs-4.1.6" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.6.tgz"; + sha1 = "514c38772b31bee2e08bedc21a0aeb3abf54c19e"; + }; + }; + "parse-json-2.2.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + }; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + }; + "strip-bom-2.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; + sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + }; + }; + "error-ex-1.3.0" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz"; + sha1 = "e67b43f3e82c96ea3a584ffee0b9fc3325d802d9"; + }; + }; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + }; + "is-utf8-0.2.1" = { + name = "is-utf8"; + packageName = "is-utf8"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; + sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; + }; + }; + "indent-string-2.1.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; + sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; + }; + }; + "strip-indent-1.0.1" = { + name = "strip-indent"; + packageName = "strip-indent"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; + sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; + }; + }; + "repeating-2.0.1" = { + name = "repeating"; + packageName = "repeating"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; + sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; + }; + }; + "is-finite-1.0.1" = { + name = "is-finite"; + packageName = "is-finite"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz"; + sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b"; + }; + }; + "number-is-nan-1.0.0" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"; + sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b"; + }; + }; + "underscore-1.5.2" = { + name = "underscore"; + packageName = "underscore"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; + sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; + }; + }; + "addressparser-0.3.2" = { + name = "addressparser"; + packageName = "addressparser"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz"; + sha1 = "59873f35e8fcf6c7361c10239261d76e15348bb2"; + }; + }; + "mimelib-0.2.14" = { + name = "mimelib"; + packageName = "mimelib"; + version = "0.2.14"; + src = fetchurl { + url = "https://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz"; + sha1 = "2a1aa724bd190b85bd526e6317ab6106edfd6831"; + }; + }; + "moment-2.11.2" = { + name = "moment"; + packageName = "moment"; + version = "2.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.11.2.tgz"; + sha1 = "87968e5f95ac038c2e42ac959c75819cd3f52901"; + }; + }; + "starttls-1.0.1" = { + name = "starttls"; + packageName = "starttls"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/starttls/-/starttls-1.0.1.tgz"; + sha1 = "e6081c25de6b178f5a75f8f271c1487449183b42"; + }; + }; + "bufferjs-1.1.0" = { + name = "bufferjs"; + packageName = "bufferjs"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bufferjs/-/bufferjs-1.1.0.tgz"; + sha1 = "095ffa39c5e6b40a2178a1169c9effc584a73201"; + }; + }; + "encoding-0.1.12" = { + name = "encoding"; + packageName = "encoding"; + version = "0.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz"; + sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; + }; + }; + "addressparser-0.2.1" = { + name = "addressparser"; + packageName = "addressparser"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/addressparser/-/addressparser-0.2.1.tgz"; + sha1 = "d11a5b2eeda04cfefebdf3196c10ae13db6cd607"; + }; + }; + "connect-1.9.2" = { + name = "connect"; + packageName = "connect"; + version = "1.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz"; + sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807"; + }; + }; + "mime-1.2.4" = { + name = "mime"; + packageName = "mime"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz"; + sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7"; + }; + }; + "qs-0.4.2" = { + name = "qs"; + packageName = "qs"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz"; + sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f"; + }; + }; + "mkdirp-0.3.0" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; + sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; + }; + }; + "formidable-1.0.17" = { + name = "formidable"; + packageName = "formidable"; + version = "1.0.17"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz"; + sha1 = "ef5491490f9433b705faa77249c99029ae348559"; + }; + }; + "cookie-0.3.1" = { + name = "cookie"; + packageName = "cookie"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz"; + sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; + }; + }; + "crc-3.4.0" = { + name = "crc"; + packageName = "crc"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crc/-/crc-3.4.0.tgz"; + sha1 = "4258e351613a74ef1153dfcb05e820c3e9715d7f"; + }; + }; + "depd-1.1.0" = { + name = "depd"; + packageName = "depd"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"; + sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"; + }; + }; + "uid-safe-2.1.2" = { + name = "uid-safe"; + packageName = "uid-safe"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.2.tgz"; + sha1 = "c934b3caead0fdcd0fb2cff3a8876d06fe0ee0fd"; + }; + }; + "base64-url-1.3.2" = { + name = "base64-url"; + packageName = "base64-url"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.2.tgz"; + sha1 = "4b08113b49d23889f306be64372762d31412f7a8"; + }; + }; + "array-parallel-0.1.3" = { + name = "array-parallel"; + packageName = "array-parallel"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz"; + sha1 = "8f785308926ed5aa478c47e64d1b334b6c0c947d"; + }; + }; + "array-series-0.1.5" = { + name = "array-series"; + packageName = "array-series"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz"; + sha1 = "df5d37bfc5c2ef0755e2aa4f92feae7d4b5a972f"; + }; + }; + "cross-spawn-4.0.0" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.0.tgz"; + sha1 = "8254774ab4786b8c5b3cf4dfba66ce563932c252"; + }; + }; + "lru-cache-4.0.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz"; + sha1 = "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be"; + }; + }; + "which-1.2.11" = { + name = "which"; + packageName = "which"; + version = "1.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.2.11.tgz"; + sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b"; + }; + }; + "pseudomap-1.0.2" = { + name = "pseudomap"; + packageName = "pseudomap"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + }; + "yallist-2.0.0" = { + name = "yallist"; + packageName = "yallist"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz"; + sha1 = "306c543835f09ee1a4cb23b7bce9ab341c91cdd4"; + }; + }; + "isexe-1.1.2" = { + name = "isexe"; + packageName = "isexe"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz"; + sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0"; + }; + }; + "connect-3.4.1" = { + name = "connect"; + packageName = "connect"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-3.4.1.tgz"; + sha1 = "a21361d3f4099ef761cda6dc4a973bb1ebb0a34d"; + }; + }; + "dns-prefetch-control-0.1.0" = { + name = "dns-prefetch-control"; + packageName = "dns-prefetch-control"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-prefetch-control/-/dns-prefetch-control-0.1.0.tgz"; + sha1 = "60ddb457774e178f1f9415f0cabb0e85b0b300b2"; + }; + }; + "dont-sniff-mimetype-1.0.0" = { + name = "dont-sniff-mimetype"; + packageName = "dont-sniff-mimetype"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.0.0.tgz"; + sha1 = "5932890dc9f4e2f19e5eb02a20026e5e5efc8f58"; + }; + }; + "frameguard-2.0.0" = { + name = "frameguard"; + packageName = "frameguard"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/frameguard/-/frameguard-2.0.0.tgz"; + sha1 = "30c2c149e5e3505f9e156f9bc491a438420e487e"; + }; + }; + "helmet-csp-1.2.2" = { + name = "helmet-csp"; + packageName = "helmet-csp"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/helmet-csp/-/helmet-csp-1.2.2.tgz"; + sha1 = "085c0307d57fc96cd97337f170ab8bfea99e5df7"; + }; + }; + "hide-powered-by-1.0.0" = { + name = "hide-powered-by"; + packageName = "hide-powered-by"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hide-powered-by/-/hide-powered-by-1.0.0.tgz"; + sha1 = "4a85ad65881f62857fc70af7174a1184dccce32b"; + }; + }; + "hpkp-1.1.0" = { + name = "hpkp"; + packageName = "hpkp"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hpkp/-/hpkp-1.1.0.tgz"; + sha1 = "77bdff1f331847fb9f40839d00a45032baed4df4"; + }; + }; + "hsts-1.0.0" = { + name = "hsts"; + packageName = "hsts"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hsts/-/hsts-1.0.0.tgz"; + sha1 = "98e1039ef7aba554057b6b0e32584c0b1143a414"; + }; + }; + "ienoopen-1.0.0" = { + name = "ienoopen"; + packageName = "ienoopen"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ienoopen/-/ienoopen-1.0.0.tgz"; + sha1 = "346a428f474aac8f50cf3784ea2d0f16f62bda6b"; + }; + }; + "nocache-1.0.1" = { + name = "nocache"; + packageName = "nocache"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nocache/-/nocache-1.0.1.tgz"; + sha1 = "695c9f736926a7554f7365fa25e087941065bd36"; + }; + }; + "referrer-policy-1.0.0" = { + name = "referrer-policy"; + packageName = "referrer-policy"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.0.0.tgz"; + sha1 = "f60eedc92f942b01a6118121ec932d66e8fd7e14"; + }; + }; + "x-xss-protection-1.0.0" = { + name = "x-xss-protection"; + packageName = "x-xss-protection"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.0.0.tgz"; + sha1 = "898afb93869b24661cf9c52f9ee8db8ed0764dd9"; + }; + }; + "finalhandler-0.4.1" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz"; + sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d"; + }; + }; + "camelize-1.0.0" = { + name = "camelize"; + packageName = "camelize"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz"; + sha1 = "164a5483e630fa4321e5af07020e531831b2609b"; + }; + }; + "content-security-policy-builder-1.0.0" = { + name = "content-security-policy-builder"; + packageName = "content-security-policy-builder"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-1.0.0.tgz"; + sha1 = "11fd40c5cc298a6c725a35f9acf71e82ab5d3243"; + }; + }; + "lodash.reduce-4.5.0" = { + name = "lodash.reduce"; + packageName = "lodash.reduce"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.5.0.tgz"; + sha1 = "af7d2ec621062441e77d5bf408a1e071ef86691c"; + }; + }; + "platform-1.3.1" = { + name = "platform"; + packageName = "platform"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/platform/-/platform-1.3.1.tgz"; + sha1 = "492210892335bd3131c0a08dda2d93ec3543e423"; + }; + }; + "dashify-0.2.2" = { + name = "dashify"; + packageName = "dashify"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dashify/-/dashify-0.2.2.tgz"; + sha1 = "6a07415a01c91faf4a32e38d9dfba71f61cb20fe"; + }; + }; + "abab-1.0.3" = { + name = "abab"; + packageName = "abab"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz"; + sha1 = "b81de5f7274ec4e756d797cd834f303642724e5d"; + }; + }; + "acorn-2.7.0" = { + name = "acorn"; + packageName = "acorn"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz"; + sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7"; + }; + }; + "acorn-globals-1.0.9" = { + name = "acorn-globals"; + packageName = "acorn-globals"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz"; + sha1 = "55bb5e98691507b74579d0513413217c380c54cf"; + }; + }; + "cssom-0.3.1" = { + name = "cssom"; + packageName = "cssom"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cssom/-/cssom-0.3.1.tgz"; + sha1 = "c9e37ef2490e64f6d1baa10fda852257082c25d3"; + }; + }; + "cssstyle-0.2.37" = { + name = "cssstyle"; + packageName = "cssstyle"; + version = "0.2.37"; + src = fetchurl { + url = "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz"; + sha1 = "541097234cb2513c83ceed3acddc27ff27987d54"; + }; + }; + "escodegen-1.8.1" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz"; + sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; + }; + }; + "nwmatcher-1.3.8" = { + name = "nwmatcher"; + packageName = "nwmatcher"; + version = "1.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.8.tgz"; + sha1 = "34edb93de1aa6cb4448b573c9f2a059300241157"; + }; + }; + "parse5-1.5.1" = { + name = "parse5"; + packageName = "parse5"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz"; + sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"; + }; + }; + "request-2.74.0" = { + name = "request"; + packageName = "request"; + version = "2.74.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; + sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; + }; + }; + "sax-1.2.1" = { + name = "sax"; + packageName = "sax"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; + sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; + }; + }; + "symbol-tree-3.1.4" = { + name = "symbol-tree"; + packageName = "symbol-tree"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.1.4.tgz"; + sha1 = "02b279348d337debc39694c5c95f882d448a312a"; + }; + }; + "tough-cookie-2.3.1" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"; + sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd"; + }; + }; + "webidl-conversions-2.0.1" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-2.0.1.tgz"; + sha1 = "3bf8258f7d318c7443c36f2e169402a1a6703506"; + }; + }; + "whatwg-url-compat-0.6.5" = { + name = "whatwg-url-compat"; + packageName = "whatwg-url-compat"; + version = "0.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz"; + sha1 = "00898111af689bb097541cd5a45ca6c8798445bf"; + }; + }; + "xml-name-validator-2.0.1" = { + name = "xml-name-validator"; + packageName = "xml-name-validator"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz"; + sha1 = "4d8b8f1eccd3419aa362061becef515e1e559635"; + }; + }; + "estraverse-1.9.3" = { + name = "estraverse"; + packageName = "estraverse"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"; + sha1 = "af67f2dc922582415950926091a4005d29c9bb44"; + }; + }; + "esutils-2.0.2" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; + sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; + }; + }; + "esprima-2.7.3" = { + name = "esprima"; + packageName = "esprima"; + version = "2.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"; + sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; + }; + }; + "optionator-0.8.1" = { + name = "optionator"; + packageName = "optionator"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.1.tgz"; + sha1 = "e31b4932cdd5fb862a8b0d10bc63d3ee1ec7d78b"; + }; + }; + "source-map-0.2.0" = { + name = "source-map"; + packageName = "source-map"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"; + sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; + }; + }; + "prelude-ls-1.1.2" = { + name = "prelude-ls"; + packageName = "prelude-ls"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + }; + "deep-is-0.1.3" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + }; + "wordwrap-1.0.0" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; + sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + }; + }; + "type-check-0.3.2" = { + name = "type-check"; + packageName = "type-check"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + }; + "levn-0.3.0" = { + name = "levn"; + packageName = "levn"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + }; + "fast-levenshtein-1.1.4" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz"; + sha1 = "e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9"; + }; + }; + "amdefine-1.0.0" = { + name = "amdefine"; + packageName = "amdefine"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"; + sha1 = "fd17474700cb5cc9c2b709f0be9d23ce3c198c33"; + }; + }; + "aws-sign2-0.6.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; + sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; + }; + }; + "aws4-1.4.1" = { + name = "aws4"; + packageName = "aws4"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz"; + sha1 = "fde7d5292466d230e5ee0f4e038d9dfaab08fc61"; + }; + }; + "bl-1.1.2" = { + name = "bl"; + packageName = "bl"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz"; + sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398"; + }; + }; + "caseless-0.11.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; + sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; + }; + }; + "combined-stream-1.0.5" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; + sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; + }; + }; + "extend-3.0.0" = { + name = "extend"; + packageName = "extend"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"; + sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4"; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "form-data-1.0.1" = { + name = "form-data"; + packageName = "form-data"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz"; + sha1 = "ae315db9a4907fa065502304a66d7733475ee37c"; + }; + }; + "har-validator-2.0.6" = { + name = "har-validator"; + packageName = "har-validator"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; + sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; + }; + }; + "hawk-3.1.3" = { + name = "hawk"; + packageName = "hawk"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; + sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; + }; + }; + "http-signature-1.1.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; + sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "oauth-sign-0.8.2" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; + sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; + }; + }; + "qs-6.2.1" = { + name = "qs"; + packageName = "qs"; + version = "6.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"; + sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; + }; + }; + "stringstream-0.0.5" = { + name = "stringstream"; + packageName = "stringstream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; + sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; + }; + }; + "tunnel-agent-0.4.3" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; + sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; + }; + }; + "readable-stream-2.0.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; + sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "process-nextick-args-1.0.7" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; + sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "async-2.0.1" = { + name = "async"; + packageName = "async"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz"; + sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25"; + }; + }; + "lodash-4.15.0" = { + name = "lodash"; + packageName = "lodash"; + version = "4.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.15.0.tgz"; + sha1 = "3162391d8f0140aa22cf8f6b3c34d6b7f63d3aa9"; + }; + }; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + }; + "commander-2.9.0" = { + name = "commander"; + packageName = "commander"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + }; + }; + "is-my-json-valid-2.13.1" = { + name = "is-my-json-valid"; + packageName = "is-my-json-valid"; + version = "2.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"; + sha1 = "d55778a82feb6b0963ff4be111d5d1684e890707"; + }; + }; + "ansi-styles-2.2.1" = { + name = "ansi-styles"; + packageName = "ansi-styles"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; + sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; + "strip-ansi-3.0.1" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; + sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + }; + }; + "supports-color-2.0.0" = { + name = "supports-color"; + packageName = "supports-color"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; + sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + }; + }; + "ansi-regex-2.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"; + sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107"; + }; + }; + "graceful-readlink-1.0.1" = { + name = "graceful-readlink"; + packageName = "graceful-readlink"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + }; + }; + "generate-function-2.0.0" = { + name = "generate-function"; + packageName = "generate-function"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; + sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; + }; + }; + "generate-object-property-1.2.0" = { + name = "generate-object-property"; + packageName = "generate-object-property"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; + sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; + }; + }; + "jsonpointer-2.0.0" = { + name = "jsonpointer"; + packageName = "jsonpointer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"; + sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9"; + }; + }; + "xtend-4.0.1" = { + name = "xtend"; + packageName = "xtend"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; + sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + }; + }; + "is-property-1.0.2" = { + name = "is-property"; + packageName = "is-property"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; + sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; + }; + }; + "hoek-2.16.3" = { + name = "hoek"; + packageName = "hoek"; + version = "2.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; + sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; + }; + }; + "boom-2.10.1" = { + name = "boom"; + packageName = "boom"; + version = "2.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; + sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; + }; + }; + "cryptiles-2.0.5" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; + sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; + }; + }; + "sntp-1.0.9" = { + name = "sntp"; + packageName = "sntp"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; + sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + }; + }; + "assert-plus-0.2.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; + sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; + }; + }; + "jsprim-1.3.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; + sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; + }; + }; + "sshpk-1.10.0" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.0.tgz"; + sha1 = "104d6ba2afb2ac099ab9567c0d193977f29c6dfa"; + }; + }; + "extsprintf-1.0.2" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; + sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "verror-1.3.6" = { + name = "verror"; + packageName = "verror"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; + sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; + }; + }; + "asn1-0.2.3" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; + sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; + }; + }; + "assert-plus-1.0.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; + sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + }; + }; + "dashdash-1.14.0" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz"; + sha1 = "29e486c5418bf0f356034a993d51686a33e84141"; + }; + }; + "getpass-0.1.6" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"; + sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; + }; + }; + "jsbn-0.1.0" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"; + sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; + }; + }; + "tweetnacl-0.13.3" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.13.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"; + sha1 = "d628b56f3bcc3d5ae74ba9d4c1a704def5ab4b56"; + }; + }; + "jodid25519-1.0.2" = { + name = "jodid25519"; + packageName = "jodid25519"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; + sha1 = "06d4912255093419477d425633606e0e90782967"; + }; + }; + "ecc-jsbn-0.1.1" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; + sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + }; + }; + "bcrypt-pbkdf-1.0.0" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"; + sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; + }; + }; + "tweetnacl-0.14.3" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"; + sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d"; + }; + }; + "tr46-0.0.3" = { + name = "tr46"; + packageName = "tr46"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; + sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "wordwrap-0.0.3" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + }; + "minimist-0.0.10" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; + sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + }; + }; + "glob-7.0.6" = { + name = "glob"; + packageName = "glob"; + version = "7.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; + sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "htmlparser2-3.9.1" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "3.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.1.tgz"; + sha1 = "621b7a58bc9acd003f7af0a2c9a00aa67c8505d2"; + }; + }; + "regexp-quote-0.0.0" = { + name = "regexp-quote"; + packageName = "regexp-quote"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexp-quote/-/regexp-quote-0.0.0.tgz"; + sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2"; + }; + }; + "domelementtype-1.3.0" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; + sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; + }; + }; + "domhandler-2.3.0" = { + name = "domhandler"; + packageName = "domhandler"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"; + sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738"; + }; + }; + "domutils-1.5.1" = { + name = "domutils"; + packageName = "domutils"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; + sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; + }; + }; + "entities-1.1.1" = { + name = "entities"; + packageName = "entities"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"; + sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; + }; + }; + "readable-stream-2.1.5" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"; + sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; + }; + }; + "dom-serializer-0.1.0" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; + sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; + }; + }; + "domelementtype-1.1.3" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"; + sha1 = "bd28773e2642881aec51544924299c5cd822185b"; + }; + }; + "buffer-shims-1.0.0" = { + name = "buffer-shims"; + packageName = "buffer-shims"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"; + sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; + }; + }; + "destroy-1.0.4" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + }; + "mime-1.3.4" = { + name = "mime"; + packageName = "mime"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; + sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + }; + }; + "range-parser-1.0.3" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"; + sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175"; + }; + }; + "statuses-1.2.1" = { + name = "statuses"; + packageName = "statuses"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"; + sha1 = "dded45cc18256d51ed40aec142489d5c61026d28"; + }; + }; + "yargs-3.32.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.32.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz"; + sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995"; + }; + }; + "cliui-3.2.0" = { + name = "cliui"; + packageName = "cliui"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; + sha1 = "120601537a916d29940f934da3b48d585a39213d"; + }; + }; + "os-locale-1.4.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; + sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "window-size-0.1.4" = { + name = "window-size"; + packageName = "window-size"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"; + sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"; + }; + }; + "y18n-3.2.1" = { + name = "y18n"; + packageName = "y18n"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; + sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; + }; + }; + "wrap-ansi-2.0.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz"; + sha1 = "7d30f8f873f9a5bbc3a64dabc8d177e071ae426f"; + }; + }; + "lcid-1.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; + sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; + }; + }; + "invert-kv-1.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; + sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; + }; + }; + "code-point-at-1.0.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz"; + sha1 = "f69b192d3f7d91e382e4b71bddb77878619ab0c6"; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "faye-websocket-0.10.0" = { + name = "faye-websocket"; + packageName = "faye-websocket"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"; + sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; + }; + }; + "uuid-2.0.2" = { + name = "uuid"; + packageName = "uuid"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-2.0.2.tgz"; + sha1 = "48bd5698f0677e3c7901a1c46ef15b1643794726"; + }; + }; + "websocket-driver-0.6.5" = { + name = "websocket-driver"; + packageName = "websocket-driver"; + version = "0.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"; + sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36"; + }; + }; + "websocket-extensions-0.1.1" = { + name = "websocket-extensions"; + packageName = "websocket-extensions"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz"; + sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7"; + }; + }; + "underscore-1.6.0" = { + name = "underscore"; + packageName = "underscore"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; + sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; + }; + }; + "xml2js-0.1.14" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz"; + sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; + }; + }; + "mongodb-2.2.10" = { + name = "mongodb"; + packageName = "mongodb"; + version = "2.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.10.tgz"; + sha1 = "d11273a5a53b08e17bcc4c8a295ded0f151ccae6"; + }; + }; + "es6-promise-3.2.1" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz"; + sha1 = "ec56233868032909207170c39448e24449dd1fc4"; + }; + }; + "mongodb-core-2.0.12" = { + name = "mongodb-core"; + packageName = "mongodb-core"; + version = "2.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.0.12.tgz"; + sha1 = "bb66aad550e252731f8ad49276815264a91c337c"; + }; + }; + "bson-0.5.5" = { + name = "bson"; + packageName = "bson"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bson/-/bson-0.5.5.tgz"; + sha1 = "1d6725d400f0fbf0271bf6bafc8fa1126c29983b"; + }; + }; + "require_optional-1.0.0" = { + name = "require_optional"; + packageName = "require_optional"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/require_optional/-/require_optional-1.0.0.tgz"; + sha1 = "52a86137a849728eb60a55533617f8f914f59abf"; + }; + }; + "resolve-from-2.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz"; + sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57"; + }; + }; + "async-0.9.2" = { + name = "async"; + packageName = "async"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + }; + "redis-0.10.3" = { + name = "redis"; + packageName = "redis"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/redis/-/redis-0.10.3.tgz"; + sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; + }; + }; + "memcached-0.2.8" = { + name = "memcached"; + packageName = "memcached"; + version = "0.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/memcached/-/memcached-0.2.8.tgz"; + sha1 = "ffbf9498cbc30779625b77e77770bd50dc525212"; + }; + }; + "databank-0.18.2" = { + name = "databank"; + packageName = "databank"; + version = "0.18.2"; + src = fetchurl { + url = "https://registry.npmjs.org/databank/-/databank-0.18.2.tgz"; + sha1 = "b1f85bafa329cdb415589c0ee819a04c989a03ed"; + }; + }; + "underscore-1.4.4" = { + name = "underscore"; + packageName = "underscore"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; + sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + }; + }; + "hashring-0.0.8" = { + name = "hashring"; + packageName = "hashring"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/hashring/-/hashring-0.0.8.tgz"; + sha1 = "203ab13c364119f10106526d2eaf7bd42b484c31"; + }; + }; + "jackpot-0.0.6" = { + name = "jackpot"; + packageName = "jackpot"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/jackpot/-/jackpot-0.0.6.tgz"; + sha1 = "3cff064285cbf66f4eab2593c90bce816a821849"; + }; + }; + "bisection-0.0.3" = { + name = "bisection"; + packageName = "bisection"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bisection/-/bisection-0.0.3.tgz"; + sha1 = "9891d506d86ec7d50910c5157bb592dbb03f33db"; + }; + }; + "simple-lru-cache-0.0.2" = { + name = "simple-lru-cache"; + packageName = "simple-lru-cache"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; + sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; + }; + }; + "retry-0.6.0" = { + name = "retry"; + packageName = "retry"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz"; + sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537"; + }; + }; + "lru-cache-2.3.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz"; + sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6"; + }; + }; + }; + args = { + name = "pump.io"; + packageName = "pump.io"; + version = "1.0.0"; + src = fetchurl { url = "https://registry.npmjs.org/pump.io/-/pump.io-1.0.0.tgz"; sha1 = "404mzdqzknrv7pl9qasksi791cc00bbd"; }; + dependencies = [ + (sources."bcrypt-0.8.7" // { + dependencies = [ + sources."bindings-1.2.1" + sources."nan-2.3.5" + ]; + }) + (sources."bunyan-1.8.1" // { + dependencies = [ + (sources."dtrace-provider-0.6.0" // { + dependencies = [ + sources."nan-2.4.0" + ]; + }) + (sources."mv-2.1.1" // { + dependencies = [ + sources."ncp-2.0.0" + (sources."rimraf-2.4.5" // { + dependencies = [ + (sources."glob-6.0.4" // { + dependencies = [ + (sources."inflight-1.0.5" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."inherits-2.0.3" + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.0" + ]; + }) + ]; + }) + ]; + }) + sources."safe-json-stringify-1.0.3" + sources."moment-2.15.0" + ]; + }) + (sources."connect-2.30.2" // { + dependencies = [ + sources."basic-auth-connect-1.0.0" + (sources."body-parser-1.13.3" // { + dependencies = [ + sources."iconv-lite-0.4.11" + (sources."on-finished-2.3.0" // { + dependencies = [ + sources."ee-first-1.1.1" + ]; + }) + (sources."raw-body-2.1.7" // { + dependencies = [ + sources."bytes-2.4.0" + sources."iconv-lite-0.4.13" + sources."unpipe-1.0.0" + ]; + }) + ]; + }) + sources."bytes-2.1.0" + sources."cookie-0.1.3" + sources."cookie-parser-1.3.5" + sources."cookie-signature-1.0.6" + (sources."compression-1.5.2" // { + dependencies = [ + (sources."accepts-1.2.13" // { + dependencies = [ + (sources."mime-types-2.1.11" // { + dependencies = [ + sources."mime-db-1.23.0" + ]; + }) + sources."negotiator-0.5.3" + ]; + }) + (sources."compressible-2.0.8" // { + dependencies = [ + sources."mime-db-1.23.0" + ]; + }) + sources."vary-1.0.1" + ]; + }) + (sources."connect-timeout-1.6.2" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + sources."content-type-1.0.2" + (sources."csurf-1.8.3" // { + dependencies = [ + (sources."csrf-3.0.3" // { + dependencies = [ + sources."base64-url-1.2.2" + sources."rndm-1.2.0" + sources."tsscmp-1.0.5" + (sources."uid-safe-2.1.1" // { + dependencies = [ + sources."random-bytes-1.0.0" + ]; + }) + ]; + }) + ]; + }) + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + sources."depd-1.0.1" + (sources."errorhandler-1.4.3" // { + dependencies = [ + (sources."accepts-1.3.3" // { + dependencies = [ + (sources."mime-types-2.1.11" // { + dependencies = [ + sources."mime-db-1.23.0" + ]; + }) + sources."negotiator-0.6.1" + ]; + }) + sources."escape-html-1.0.3" + ]; + }) + (sources."express-session-1.11.3" // { + dependencies = [ + sources."crc-3.3.0" + (sources."uid-safe-2.0.0" // { + dependencies = [ + sources."base64-url-1.2.1" + ]; + }) + ]; + }) + (sources."finalhandler-0.4.0" // { + dependencies = [ + sources."escape-html-1.0.2" + (sources."on-finished-2.3.0" // { + dependencies = [ + sources."ee-first-1.1.1" + ]; + }) + sources."unpipe-1.0.0" + ]; + }) + sources."fresh-0.3.0" + (sources."http-errors-1.3.1" // { + dependencies = [ + sources."inherits-2.0.3" + sources."statuses-1.3.0" + ]; + }) + (sources."method-override-2.3.6" // { + dependencies = [ + sources."methods-1.1.2" + sources."vary-1.1.0" + ]; + }) + (sources."morgan-1.6.1" // { + dependencies = [ + sources."basic-auth-1.0.4" + (sources."on-finished-2.3.0" // { + dependencies = [ + sources."ee-first-1.1.1" + ]; + }) + ]; + }) + (sources."multiparty-3.3.2" // { + dependencies = [ + (sources."readable-stream-1.1.14" // { + dependencies = [ + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."inherits-2.0.3" + ]; + }) + sources."stream-counter-0.2.0" + ]; + }) + sources."on-headers-1.0.1" + sources."parseurl-1.3.1" + sources."pause-0.1.0" + sources."qs-4.0.0" + sources."response-time-2.3.1" + (sources."serve-favicon-2.3.0" // { + dependencies = [ + sources."etag-1.7.0" + sources."ms-0.7.1" + ]; + }) + (sources."serve-index-1.7.3" // { + dependencies = [ + (sources."accepts-1.2.13" // { + dependencies = [ + sources."negotiator-0.5.3" + ]; + }) + sources."batch-0.5.3" + sources."escape-html-1.0.3" + (sources."mime-types-2.1.11" // { + dependencies = [ + sources."mime-db-1.23.0" + ]; + }) + ]; + }) + (sources."serve-static-1.10.3" // { + dependencies = [ + sources."escape-html-1.0.3" + ]; + }) + (sources."type-is-1.6.13" // { + dependencies = [ + sources."media-typer-0.3.0" + (sources."mime-types-2.1.11" // { + dependencies = [ + sources."mime-db-1.23.0" + ]; + }) + ]; + }) + sources."utils-merge-1.0.0" + sources."vhost-3.0.2" + ]; + }) + (sources."connect-auth-0.6.1" // { + dependencies = [ + (sources."connect-2.7.11" // { + dependencies = [ + sources."qs-0.6.5" + sources."formidable-1.0.14" + sources."cookie-signature-1.0.1" + sources."buffer-crc32-0.2.1" + sources."cookie-0.0.5" + (sources."send-0.1.1" // { + dependencies = [ + sources."mime-1.2.11" + sources."range-parser-0.0.4" + ]; + }) + sources."bytes-0.2.0" + sources."fresh-0.1.0" + sources."pause-0.0.1" + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + ]; + }) + sources."oauth-0.9.10" + sources."openid-0.4.1" + ]; + }) + (sources."connect-databank-1.0.3" // { + dependencies = [ + sources."async-1.5.2" + sources."set-immediate-0.1.1" + ]; + }) + sources."crypto-cacerts-0.1.0" + (sources."databank-0.19.5" // { + dependencies = [ + (sources."vows-0.7.0" // { + dependencies = [ + sources."eyes-0.1.8" + sources."diff-1.0.8" + ]; + }) + sources."setimmediate-1.0.5" + ]; + }) + (sources."dateformat-1.0.12" // { + dependencies = [ + sources."get-stdin-4.0.1" + (sources."meow-3.7.0" // { + dependencies = [ + (sources."camelcase-keys-2.1.0" // { + dependencies = [ + sources."camelcase-2.1.1" + ]; + }) + sources."decamelize-1.2.0" + (sources."loud-rejection-1.6.0" // { + dependencies = [ + (sources."currently-unhandled-0.4.1" // { + dependencies = [ + sources."array-find-index-1.0.1" + ]; + }) + sources."signal-exit-3.0.1" + ]; + }) + sources."map-obj-1.0.1" + sources."minimist-1.2.0" + (sources."normalize-package-data-2.3.5" // { + dependencies = [ + sources."hosted-git-info-2.1.5" + (sources."is-builtin-module-1.0.0" // { + dependencies = [ + sources."builtin-modules-1.1.1" + ]; + }) + sources."semver-5.3.0" + (sources."validate-npm-package-license-3.0.1" // { + dependencies = [ + (sources."spdx-correct-1.0.2" // { + dependencies = [ + sources."spdx-license-ids-1.2.2" + ]; + }) + sources."spdx-expression-parse-1.0.3" + ]; + }) + ]; + }) + sources."object-assign-4.1.0" + (sources."read-pkg-up-1.0.1" // { + dependencies = [ + (sources."find-up-1.1.2" // { + dependencies = [ + sources."path-exists-2.1.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."read-pkg-1.1.0" // { + dependencies = [ + (sources."load-json-file-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.6" + (sources."parse-json-2.2.0" // { + dependencies = [ + (sources."error-ex-1.3.0" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) + ]; + }) + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + (sources."strip-bom-2.0.0" // { + dependencies = [ + sources."is-utf8-0.2.1" + ]; + }) + ]; + }) + (sources."path-type-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.6" + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + (sources."redent-1.0.0" // { + dependencies = [ + (sources."indent-string-2.1.0" // { + dependencies = [ + (sources."repeating-2.0.1" // { + dependencies = [ + (sources."is-finite-1.0.1" // { + dependencies = [ + sources."number-is-nan-1.0.0" + ]; + }) + ]; + }) + ]; + }) + sources."strip-indent-1.0.1" + ]; + }) + sources."trim-newlines-1.0.0" + ]; + }) + ]; + }) + (sources."dialback-client-0.2.0" // { + dependencies = [ + sources."underscore-1.5.2" + ]; + }) + sources."dompurify-0.8.3" + (sources."emailjs-1.0.8" // { + dependencies = [ + sources."addressparser-0.3.2" + (sources."mimelib-0.2.14" // { + dependencies = [ + (sources."encoding-0.1.12" // { + dependencies = [ + sources."iconv-lite-0.4.13" + ]; + }) + sources."addressparser-0.2.1" + ]; + }) + sources."moment-2.11.2" + sources."starttls-1.0.1" + sources."bufferjs-1.1.0" + ]; + }) + (sources."express-2.5.11" // { + dependencies = [ + (sources."connect-1.9.2" // { + dependencies = [ + sources."formidable-1.0.17" + ]; + }) + sources."mime-1.2.4" + sources."qs-0.4.2" + sources."mkdirp-0.3.0" + ]; + }) + (sources."express-session-1.14.1" // { + dependencies = [ + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."crc-3.4.0" + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + sources."depd-1.1.0" + sources."on-headers-1.0.1" + sources."parseurl-1.3.1" + (sources."uid-safe-2.1.2" // { + dependencies = [ + sources."base64-url-1.3.2" + sources."random-bytes-1.0.0" + ]; + }) + sources."utils-merge-1.0.0" + ]; + }) + (sources."gm-1.23.0" // { + dependencies = [ + sources."array-parallel-0.1.3" + sources."array-series-0.1.5" + (sources."cross-spawn-4.0.0" // { + dependencies = [ + (sources."lru-cache-4.0.1" // { + dependencies = [ + sources."pseudomap-1.0.2" + sources."yallist-2.0.0" + ]; + }) + (sources."which-1.2.11" // { + dependencies = [ + sources."isexe-1.1.2" + ]; + }) + ]; + }) + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + ]; + }) + (sources."helmet-2.2.0" // { + dependencies = [ + (sources."connect-3.4.1" // { + dependencies = [ + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + (sources."finalhandler-0.4.1" // { + dependencies = [ + sources."escape-html-1.0.3" + (sources."on-finished-2.3.0" // { + dependencies = [ + sources."ee-first-1.1.1" + ]; + }) + sources."unpipe-1.0.0" + ]; + }) + sources."parseurl-1.3.1" + sources."utils-merge-1.0.0" + ]; + }) + sources."dns-prefetch-control-0.1.0" + sources."dont-sniff-mimetype-1.0.0" + sources."frameguard-2.0.0" + (sources."helmet-csp-1.2.2" // { + dependencies = [ + sources."camelize-1.0.0" + (sources."content-security-policy-builder-1.0.0" // { + dependencies = [ + sources."dashify-0.2.2" + ]; + }) + sources."lodash.reduce-4.5.0" + sources."platform-1.3.1" + ]; + }) + sources."hide-powered-by-1.0.0" + sources."hpkp-1.1.0" + (sources."hsts-1.0.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) + sources."ienoopen-1.0.0" + (sources."nocache-1.0.1" // { + dependencies = [ + sources."depd-1.1.0" + ]; + }) + sources."referrer-policy-1.0.0" + sources."x-xss-protection-1.0.0" + ]; + }) + sources."jankyqueue-0.1.1" + (sources."jsdom-7.2.2" // { + dependencies = [ + sources."abab-1.0.3" + sources."acorn-2.7.0" + sources."acorn-globals-1.0.9" + sources."cssom-0.3.1" + sources."cssstyle-0.2.37" + (sources."escodegen-1.8.1" // { + dependencies = [ + sources."estraverse-1.9.3" + sources."esutils-2.0.2" + sources."esprima-2.7.3" + (sources."optionator-0.8.1" // { + dependencies = [ + sources."prelude-ls-1.1.2" + sources."deep-is-0.1.3" + sources."wordwrap-1.0.0" + sources."type-check-0.3.2" + sources."levn-0.3.0" + sources."fast-levenshtein-1.1.4" + ]; + }) + (sources."source-map-0.2.0" // { + dependencies = [ + sources."amdefine-1.0.0" + ]; + }) + ]; + }) + sources."nwmatcher-1.3.8" + sources."parse5-1.5.1" + (sources."request-2.74.0" // { + dependencies = [ + sources."aws-sign2-0.6.0" + sources."aws4-1.4.1" + (sources."bl-1.1.2" // { + dependencies = [ + (sources."readable-stream-2.0.6" // { + dependencies = [ + sources."core-util-is-1.0.2" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + ]; + }) + sources."caseless-0.11.0" + (sources."combined-stream-1.0.5" // { + dependencies = [ + sources."delayed-stream-1.0.0" + ]; + }) + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + (sources."form-data-1.0.1" // { + dependencies = [ + (sources."async-2.0.1" // { + dependencies = [ + sources."lodash-4.15.0" + ]; + }) + ]; + }) + (sources."har-validator-2.0.6" // { + dependencies = [ + (sources."chalk-1.1.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + sources."supports-color-2.0.0" + ]; + }) + (sources."commander-2.9.0" // { + dependencies = [ + sources."graceful-readlink-1.0.1" + ]; + }) + (sources."is-my-json-valid-2.13.1" // { + dependencies = [ + sources."generate-function-2.0.0" + (sources."generate-object-property-1.2.0" // { + dependencies = [ + sources."is-property-1.0.2" + ]; + }) + sources."jsonpointer-2.0.0" + sources."xtend-4.0.1" + ]; + }) + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."hawk-3.1.3" // { + dependencies = [ + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + ]; + }) + (sources."http-signature-1.1.1" // { + dependencies = [ + sources."assert-plus-0.2.0" + (sources."jsprim-1.3.1" // { + dependencies = [ + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + ]; + }) + (sources."sshpk-1.10.0" // { + dependencies = [ + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."dashdash-1.14.0" + sources."getpass-0.1.6" + sources."jsbn-0.1.0" + sources."tweetnacl-0.13.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + (sources."bcrypt-pbkdf-1.0.0" // { + dependencies = [ + sources."tweetnacl-0.14.3" + ]; + }) + ]; + }) + ]; + }) + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + (sources."mime-types-2.1.11" // { + dependencies = [ + sources."mime-db-1.23.0" + ]; + }) + sources."oauth-sign-0.8.2" + sources."qs-6.2.1" + sources."stringstream-0.0.5" + sources."tunnel-agent-0.4.3" + ]; + }) + sources."sax-1.2.1" + sources."symbol-tree-3.1.4" + sources."tough-cookie-2.3.1" + sources."webidl-conversions-2.0.1" + (sources."whatwg-url-compat-0.6.5" // { + dependencies = [ + sources."tr46-0.0.3" + ]; + }) + sources."xml-name-validator-2.0.1" + ]; + }) + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."node-uuid-1.4.7" + sources."oauth-evanp-0.9.10-evanp.2" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."wordwrap-0.0.3" + sources."minimist-0.0.10" + ]; + }) + (sources."rimraf-2.5.4" // { + dependencies = [ + (sources."glob-7.0.6" // { + dependencies = [ + sources."fs.realpath-1.0.0" + (sources."inflight-1.0.5" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."inherits-2.0.3" + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.0" + ]; + }) + ]; + }) + (sources."sanitize-html-1.13.0" // { + dependencies = [ + (sources."htmlparser2-3.9.1" // { + dependencies = [ + sources."domelementtype-1.3.0" + sources."domhandler-2.3.0" + (sources."domutils-1.5.1" // { + dependencies = [ + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + ]; + }) + ]; + }) + sources."entities-1.1.1" + sources."inherits-2.0.3" + (sources."readable-stream-2.1.5" // { + dependencies = [ + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + ]; + }) + sources."regexp-quote-0.0.0" + sources."xtend-4.0.1" + ]; + }) + sources."schlock-0.2.1" + (sources."send-0.13.2" // { + dependencies = [ + sources."debug-2.2.0" + sources."depd-1.1.0" + sources."destroy-1.0.4" + sources."escape-html-1.0.3" + sources."etag-1.7.0" + sources."fresh-0.3.0" + (sources."http-errors-1.3.1" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."mime-1.3.4" + sources."ms-0.7.1" + (sources."on-finished-2.3.0" // { + dependencies = [ + sources."ee-first-1.1.1" + ]; + }) + sources."range-parser-1.0.3" + sources."statuses-1.2.1" + ]; + }) + (sources."showdown-1.4.3" // { + dependencies = [ + (sources."yargs-3.32.0" // { + dependencies = [ + sources."camelcase-2.1.1" + (sources."cliui-3.2.0" // { + dependencies = [ + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + sources."wrap-ansi-2.0.0" + ]; + }) + sources."decamelize-1.2.0" + (sources."os-locale-1.4.0" // { + dependencies = [ + (sources."lcid-1.0.0" // { + dependencies = [ + sources."invert-kv-1.0.0" + ]; + }) + ]; + }) + (sources."string-width-1.0.2" // { + dependencies = [ + (sources."code-point-at-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.0" + ]; + }) + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.0" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + ]; + }) + sources."window-size-0.1.4" + sources."y18n-3.2.1" + ]; + }) + ]; + }) + (sources."sockjs-0.3.17" // { + dependencies = [ + (sources."faye-websocket-0.10.0" // { + dependencies = [ + (sources."websocket-driver-0.6.5" // { + dependencies = [ + sources."websocket-extensions-0.1.1" + ]; + }) + ]; + }) + sources."uuid-2.0.2" + ]; + }) + sources."step-0.0.6" + sources."ua-parser-js-0.7.10" + sources."underscore-1.8.3" + (sources."underscore-contrib-0.3.0" // { + dependencies = [ + sources."underscore-1.6.0" + ]; + }) + sources."utml-0.2.0" + sources."validator-4.4.0" + (sources."webfinger-0.4.2" // { + dependencies = [ + (sources."xml2js-0.1.14" // { + dependencies = [ + sources."sax-1.2.1" + ]; + }) + ]; + }) + (sources."databank-mongodb-0.19.0" // { + dependencies = [ + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + (sources."mongodb-2.2.10" // { + dependencies = [ + sources."es6-promise-3.2.1" + (sources."mongodb-core-2.0.12" // { + dependencies = [ + sources."bson-0.5.5" + (sources."require_optional-1.0.0" // { + dependencies = [ + sources."semver-5.3.0" + sources."resolve-from-2.0.0" + ]; + }) + ]; + }) + (sources."readable-stream-2.1.5" // { + dependencies = [ + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."inherits-2.0.3" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."string_decoder-0.10.31" + sources."util-deprecate-1.0.2" + ]; + }) + ]; + }) + ]; + }) + (sources."databank-redis-0.19.6" // { + dependencies = [ + sources."async-0.9.2" + sources."redis-0.10.3" + sources."underscore-1.6.0" + ]; + }) + (sources."databank-memcached-0.15.0" // { + dependencies = [ + (sources."memcached-0.2.8" // { + dependencies = [ + (sources."hashring-0.0.8" // { + dependencies = [ + sources."bisection-0.0.3" + sources."simple-lru-cache-0.0.2" + ]; + }) + (sources."jackpot-0.0.6" // { + dependencies = [ + sources."retry-0.6.0" + ]; + }) + ]; + }) + (sources."databank-0.18.2" // { + dependencies = [ + (sources."vows-0.7.0" // { + dependencies = [ + sources."eyes-0.1.8" + sources."diff-1.0.8" + ]; + }) + sources."set-immediate-0.1.1" + ]; + }) + sources."underscore-1.4.4" + ]; + }) + (sources."databank-lrucache-0.1.2" // { + dependencies = [ + sources."underscore-1.5.2" + sources."lru-cache-2.3.1" + sources."set-immediate-0.1.1" + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + homepage = http://pump.io/; + license = "Apache-2.0"; + }; + production = true; + }; +in { - by-spec."addressparser"."^0.3.2" = - self.by-version."addressparser"."0.3.2"; - by-version."addressparser"."0.3.2" = self.buildNodePackage { - name = "addressparser-0.3.2"; - version = "0.3.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz"; - name = "addressparser-0.3.2.tgz"; - sha1 = "59873f35e8fcf6c7361c10239261d76e15348bb2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."addressparser"."~0.2.0" = - self.by-version."addressparser"."0.2.1"; - by-version."addressparser"."0.2.1" = self.buildNodePackage { - name = "addressparser-0.2.1"; - version = "0.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/addressparser/-/addressparser-0.2.1.tgz"; - name = "addressparser-0.2.1.tgz"; - sha1 = "d11a5b2eeda04cfefebdf3196c10ae13db6cd607"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."array-parallel"."~0.1.0" = - self.by-version."array-parallel"."0.1.3"; - by-version."array-parallel"."0.1.3" = self.buildNodePackage { - name = "array-parallel-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz"; - name = "array-parallel-0.1.3.tgz"; - sha1 = "8f785308926ed5aa478c47e64d1b334b6c0c947d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."array-series"."~0.1.0" = - self.by-version."array-series"."0.1.5"; - by-version."array-series"."0.1.5" = self.buildNodePackage { - name = "array-series-0.1.5"; - version = "0.1.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz"; - name = "array-series-0.1.5.tgz"; - sha1 = "df5d37bfc5c2ef0755e2aa4f92feae7d4b5a972f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."async"."0.2.x" = - self.by-version."async"."0.2.10"; - by-version."async"."0.2.10" = self.buildNodePackage { - name = "async-0.2.10"; - version = "0.2.10"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; - name = "async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."async"."0.9.x" = - self.by-version."async"."0.9.2"; - by-version."async"."0.9.2" = self.buildNodePackage { - name = "async-0.9.2"; - version = "0.9.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz"; - name = "async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bcrypt"."0.8.x" = - self.by-version."bcrypt"."0.8.5"; - by-version."bcrypt"."0.8.5" = self.buildNodePackage { - name = "bcrypt-0.8.5"; - version = "0.8.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.8.5.tgz"; - name = "bcrypt-0.8.5.tgz"; - sha1 = "8e5b81b4db80e944f440005979ca8d58a961861d"; - }; - deps = { - "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; - "nan-2.0.5" = self.by-version."nan"."2.0.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "bcrypt" = self.by-version."bcrypt"."0.8.5"; - by-spec."bindings"."1.2.1" = - self.by-version."bindings"."1.2.1"; - by-version."bindings"."1.2.1" = self.buildNodePackage { - name = "bindings-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; - name = "bindings-1.2.1.tgz"; - sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bisection"."*" = - self.by-version."bisection"."0.0.3"; - by-version."bisection"."0.0.3" = self.buildNodePackage { - name = "bisection-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bisection/-/bisection-0.0.3.tgz"; - name = "bisection-0.0.3.tgz"; - sha1 = "9891d506d86ec7d50910c5157bb592dbb03f33db"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bson"."~0.2" = - self.by-version."bson"."0.2.22"; - by-version."bson"."0.2.22" = self.buildNodePackage { - name = "bson-0.2.22"; - version = "0.2.22"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bson/-/bson-0.2.22.tgz"; - name = "bson-0.2.22.tgz"; - sha1 = "fcda103f26d0c074d5a52d50927db80fd02b4b39"; - }; - deps = { - "nan-1.8.4" = self.by-version."nan"."1.8.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bufferjs"."=1.1.0" = - self.by-version."bufferjs"."1.1.0"; - by-version."bufferjs"."1.1.0" = self.buildNodePackage { - name = "bufferjs-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bufferjs/-/bufferjs-1.1.0.tgz"; - name = "bufferjs-1.1.0.tgz"; - sha1 = "095ffa39c5e6b40a2178a1169c9effc584a73201"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."builtin-modules"."^1.0.0" = - self.by-version."builtin-modules"."1.1.0"; - by-version."builtin-modules"."1.1.0" = self.buildNodePackage { - name = "builtin-modules-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"; - name = "builtin-modules-1.1.0.tgz"; - sha1 = "1053955fd994a5746e525e4ac717b81caf07491c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bunyan"."0.16.x" = - self.by-version."bunyan"."0.16.8"; - by-version."bunyan"."0.16.8" = self.buildNodePackage { - name = "bunyan-0.16.8"; - version = "0.16.8"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/bunyan/-/bunyan-0.16.8.tgz"; - name = "bunyan-0.16.8.tgz"; - sha1 = "3b3f6cdca262fa31aba43eb0eb6fb58e7bdde547"; - }; - deps = { - "dtrace-provider-0.2.4" = self.by-version."dtrace-provider"."0.2.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "bunyan" = self.by-version."bunyan"."0.16.8"; - by-spec."camelcase"."^2.0.0" = - self.by-version."camelcase"."2.0.1"; - by-version."camelcase"."2.0.1" = self.buildNodePackage { - name = "camelcase-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz"; - name = "camelcase-2.0.1.tgz"; - sha1 = "57568d687b8da56c4c1d17b4c74a3cee26d73aeb"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."camelcase-keys"."^2.0.0" = - self.by-version."camelcase-keys"."2.0.0"; - by-version."camelcase-keys"."2.0.0" = self.buildNodePackage { - name = "camelcase-keys-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.0.0.tgz"; - name = "camelcase-keys-2.0.0.tgz"; - sha1 = "ab87e740d72a1ffcb12a43cc04c14b39d549eab9"; - }; - deps = { - "camelcase-2.0.1" = self.by-version."camelcase"."2.0.1"; - "map-obj-1.0.1" = self.by-version."map-obj"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."connect"."1.x" = - self.by-version."connect"."1.9.2"; - by-version."connect"."1.9.2" = self.buildNodePackage { - name = "connect-1.9.2"; - version = "1.9.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-1.9.2.tgz"; - name = "connect-1.9.2.tgz"; - sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807"; - }; - deps = { - "qs-6.0.1" = self.by-version."qs"."6.0.1"; - "mime-1.3.4" = self.by-version."mime"."1.3.4"; - "formidable-1.0.17" = self.by-version."formidable"."1.0.17"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "connect" = self.by-version."connect"."1.9.2"; - by-spec."connect"."2.0.0" = - self.by-version."connect"."2.0.0"; - by-version."connect"."2.0.0" = self.buildNodePackage { - name = "connect-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.0.0.tgz"; - name = "connect-2.0.0.tgz"; - sha1 = "be0f8fcee7c1a0e2caa2e246a278dbbe250b9f27"; - }; - deps = { - "qs-0.4.2" = self.by-version."qs"."0.4.2"; - "mime-1.2.4" = self.by-version."mime"."1.2.4"; - "formidable-1.0.17" = self.by-version."formidable"."1.0.17"; - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."connect-auth"."0.5.3" = - self.by-version."connect-auth"."0.5.3"; - by-version."connect-auth"."0.5.3" = self.buildNodePackage { - name = "connect-auth-0.5.3"; - version = "0.5.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/connect-auth/-/connect-auth-0.5.3.tgz"; - name = "connect-auth-0.5.3.tgz"; - sha1 = "2af00ac6f67ac1c5f451a0ff841a8d20a725091e"; - }; - deps = { - "connect-2.0.0" = self.by-version."connect"."2.0.0"; - "oauth-0.9.7" = self.by-version."oauth"."0.9.7"; - "openid-0.4.1" = self.by-version."openid"."0.4.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "connect-auth" = self.by-version."connect-auth"."0.5.3"; - by-spec."connect-databank"."0.13.x" = - self.by-version."connect-databank"."0.13.0"; - by-version."connect-databank"."0.13.0" = self.buildNodePackage { - name = "connect-databank-0.13.0"; - version = "0.13.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/connect-databank/-/connect-databank-0.13.0.tgz"; - name = "connect-databank-0.13.0.tgz"; - sha1 = "0d5063e9402381073e0242fd7c6ef28b2d61676b"; - }; - deps = { - "async-0.2.10" = self.by-version."async"."0.2.10"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - "databank-0.19.1" = self.by-version."databank"."0.19.1"; - "set-immediate-0.1.1" = self.by-version."set-immediate"."0.1.1"; - "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "connect-databank" = self.by-version."connect-databank"."0.13.0"; - by-spec."core-util-is"."~1.0.0" = - self.by-version."core-util-is"."1.0.2"; - by-version."core-util-is"."1.0.2" = self.buildNodePackage { - name = "core-util-is-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - name = "core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."crypto-cacerts"."0.1.x" = - self.by-version."crypto-cacerts"."0.1.0"; - by-version."crypto-cacerts"."0.1.0" = self.buildNodePackage { - name = "crypto-cacerts-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/crypto-cacerts/-/crypto-cacerts-0.1.0.tgz"; - name = "crypto-cacerts-0.1.0.tgz"; - sha1 = "3499c6dff949ab005d4ad4a3f09c48ced6c88a41"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "crypto-cacerts" = self.by-version."crypto-cacerts"."0.1.0"; - by-spec."databank"."0.18.x" = - self.by-version."databank"."0.18.2"; - by-version."databank"."0.18.2" = self.buildNodePackage { - name = "databank-0.18.2"; - version = "0.18.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/databank/-/databank-0.18.2.tgz"; - name = "databank-0.18.2.tgz"; - sha1 = "b1f85bafa329cdb415589c0ee819a04c989a03ed"; - }; - deps = { - "vows-0.7.0" = self.by-version."vows"."0.7.0"; - "step-0.0.6" = self.by-version."step"."0.0.6"; - "set-immediate-0.1.1" = self.by-version."set-immediate"."0.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."databank"."0.19.x" = - self.by-version."databank"."0.19.1"; - by-version."databank"."0.19.1" = self.buildNodePackage { - name = "databank-0.19.1"; - version = "0.19.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/databank/-/databank-0.19.1.tgz"; - name = "databank-0.19.1.tgz"; - sha1 = "95c6f662927b891f62c6f07fefe5e690fbe666e0"; - }; - deps = { - "vows-0.7.0" = self.by-version."vows"."0.7.0"; - "step-0.0.6" = self.by-version."step"."0.0.6"; - "set-immediate-0.1.1" = self.by-version."set-immediate"."0.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "databank" = self.by-version."databank"."0.19.1"; - by-spec."databank"."~0.19.1" = - self.by-version."databank"."0.19.1"; - by-spec."databank-lrucache"."^0.1.2" = - self.by-version."databank-lrucache"."0.1.2"; - by-version."databank-lrucache"."0.1.2" = self.buildNodePackage { - name = "databank-lrucache-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/databank-lrucache/-/databank-lrucache-0.1.2.tgz"; - name = "databank-lrucache-0.1.2.tgz"; - sha1 = "846d3bbc3d908ea2880baf9a611d86a28697c640"; - }; - deps = { - "databank-0.19.1" = self.by-version."databank"."0.19.1"; - "underscore-1.5.2" = self.by-version."underscore"."1.5.2"; - "lru-cache-2.3.1" = self.by-version."lru-cache"."2.3.1"; - "set-immediate-0.1.1" = self.by-version."set-immediate"."0.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "databank-lrucache" = self.by-version."databank-lrucache"."0.1.2"; - by-spec."databank-memcached"."^0.15.0" = - self.by-version."databank-memcached"."0.15.0"; - by-version."databank-memcached"."0.15.0" = self.buildNodePackage { - name = "databank-memcached-0.15.0"; - version = "0.15.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/databank-memcached/-/databank-memcached-0.15.0.tgz"; - name = "databank-memcached-0.15.0.tgz"; - sha1 = "0817452dfb2b09267cd1c8bbec95363ec14f14f2"; - }; - deps = { - "memcached-0.2.8" = self.by-version."memcached"."0.2.8"; - "databank-0.18.2" = self.by-version."databank"."0.18.2"; - "step-0.0.6" = self.by-version."step"."0.0.6"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "databank-memcached" = self.by-version."databank-memcached"."0.15.0"; - by-spec."databank-mongodb"."^0.18.10" = - self.by-version."databank-mongodb"."0.18.10"; - by-version."databank-mongodb"."0.18.10" = self.buildNodePackage { - name = "databank-mongodb-0.18.10"; - version = "0.18.10"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/databank-mongodb/-/databank-mongodb-0.18.10.tgz"; - name = "databank-mongodb-0.18.10.tgz"; - sha1 = "5f9d37059d024f1116bdca05459f9c033b0d8ae5"; - }; - deps = { - "databank-0.19.1" = self.by-version."databank"."0.19.1"; - "mongodb-1.4.39" = self.by-version."mongodb"."1.4.39"; - "step-0.0.6" = self.by-version."step"."0.0.6"; - "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "databank-mongodb" = self.by-version."databank-mongodb"."0.18.10"; - by-spec."databank-redis"."^0.19.6" = - self.by-version."databank-redis"."0.19.6"; - by-version."databank-redis"."0.19.6" = self.buildNodePackage { - name = "databank-redis-0.19.6"; - version = "0.19.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/databank-redis/-/databank-redis-0.19.6.tgz"; - name = "databank-redis-0.19.6.tgz"; - sha1 = "dd476b81b8200269ea0cc85f6b6decd05799bce9"; - }; - deps = { - "async-0.9.2" = self.by-version."async"."0.9.2"; - "databank-0.19.1" = self.by-version."databank"."0.19.1"; - "redis-0.10.3" = self.by-version."redis"."0.10.3"; - "underscore-1.6.0" = self.by-version."underscore"."1.6.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "databank-redis" = self.by-version."databank-redis"."0.19.6"; - by-spec."dateformat"."1.x" = - self.by-version."dateformat"."1.0.12"; - by-version."dateformat"."1.0.12" = self.buildNodePackage { - name = "dateformat-1.0.12"; - version = "1.0.12"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz"; - name = "dateformat-1.0.12.tgz"; - sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9"; - }; - deps = { - "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; - "meow-3.6.0" = self.by-version."meow"."3.6.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "dateformat" = self.by-version."dateformat"."1.0.12"; - by-spec."debug"."*" = - self.by-version."debug"."2.2.0"; - by-version."debug"."2.2.0" = self.buildNodePackage { - name = "debug-2.2.0"; - version = "2.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - name = "debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; - }; - deps = { - "ms-0.7.1" = self.by-version."ms"."0.7.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."0.7.0" = - self.by-version."debug"."0.7.0"; - by-version."debug"."0.7.0" = self.buildNodePackage { - name = "debug-0.7.0"; - version = "0.7.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-0.7.0.tgz"; - name = "debug-0.7.0.tgz"; - sha1 = "f5be05ec0434c992d79940e50b2695cfb2e01b08"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."dialback-client"."~0.1.5" = - self.by-version."dialback-client"."0.1.5"; - by-version."dialback-client"."0.1.5" = self.buildNodePackage { - name = "dialback-client-0.1.5"; - version = "0.1.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/dialback-client/-/dialback-client-0.1.5.tgz"; - name = "dialback-client-0.1.5.tgz"; - sha1 = "ff37f58554ac7dca79a219ba3e6e7c5ed4cc0745"; - }; - deps = { - "express-2.5.11" = self.by-version."express"."2.5.11"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - "databank-0.18.2" = self.by-version."databank"."0.18.2"; - "step-0.0.6" = self.by-version."step"."0.0.6"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "dialback-client" = self.by-version."dialback-client"."0.1.5"; - by-spec."diff"."~1.0.3" = - self.by-version."diff"."1.0.8"; - by-version."diff"."1.0.8" = self.buildNodePackage { - name = "diff-1.0.8"; - version = "1.0.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; - name = "diff-1.0.8.tgz"; - sha1 = "343276308ec991b7bc82267ed55bc1411f971666"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."dtrace-provider"."0.2.4" = - self.by-version."dtrace-provider"."0.2.4"; - by-version."dtrace-provider"."0.2.4" = self.buildNodePackage { - name = "dtrace-provider-0.2.4"; - version = "0.2.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.2.4.tgz"; - name = "dtrace-provider-0.2.4.tgz"; - sha1 = "0719d4449c8994cc89e317cf0d732213f94653d7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."emailjs"."0.3.x" = - self.by-version."emailjs"."0.3.16"; - by-version."emailjs"."0.3.16" = self.buildNodePackage { - name = "emailjs-0.3.16"; - version = "0.3.16"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/emailjs/-/emailjs-0.3.16.tgz"; - name = "emailjs-0.3.16.tgz"; - sha1 = "f162735352ce7b6615a5d811714051f90f23331d"; - }; - deps = { - "addressparser-0.3.2" = self.by-version."addressparser"."0.3.2"; - "mimelib-0.2.14" = self.by-version."mimelib"."0.2.14"; - "moment-1.7.0" = self.by-version."moment"."1.7.0"; - "starttls-0.2.1" = self.by-version."starttls"."0.2.1"; - }; - optionalDependencies = { - "bufferjs-1.1.0" = self.by-version."bufferjs"."1.1.0"; - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "emailjs" = self.by-version."emailjs"."0.3.16"; - by-spec."encoding"."~0.1" = - self.by-version."encoding"."0.1.11"; - by-version."encoding"."0.1.11" = self.buildNodePackage { - name = "encoding-0.1.11"; - version = "0.1.11"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/encoding/-/encoding-0.1.11.tgz"; - name = "encoding-0.1.11.tgz"; - sha1 = "52c65ac15aab467f1338451e2615f988eccc0258"; - }; - deps = { - "iconv-lite-0.4.13" = self.by-version."iconv-lite"."0.4.13"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."error-ex"."^1.2.0" = - self.by-version."error-ex"."1.3.0"; - by-version."error-ex"."1.3.0" = self.buildNodePackage { - name = "error-ex-1.3.0"; - version = "1.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz"; - name = "error-ex-1.3.0.tgz"; - sha1 = "e67b43f3e82c96ea3a584ffee0b9fc3325d802d9"; - }; - deps = { - "is-arrayish-0.2.1" = self.by-version."is-arrayish"."0.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."express"."2.5.x" = - self.by-version."express"."2.5.11"; - by-version."express"."2.5.11" = self.buildNodePackage { - name = "express-2.5.11"; - version = "2.5.11"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/express/-/express-2.5.11.tgz"; - name = "express-2.5.11.tgz"; - sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"; - }; - deps = { - "connect-1.9.2" = self.by-version."connect"."1.9.2"; - "mime-1.2.4" = self.by-version."mime"."1.2.4"; - "qs-0.4.2" = self.by-version."qs"."0.4.2"; - "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "express" = self.by-version."express"."2.5.11"; - by-spec."eyes".">=0.1.6" = - self.by-version."eyes"."0.1.8"; - by-version."eyes"."0.1.8" = self.buildNodePackage { - name = "eyes-0.1.8"; - version = "0.1.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; - name = "eyes-0.1.8.tgz"; - sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."faye-websocket"."^0.9.3" = - self.by-version."faye-websocket"."0.9.4"; - by-version."faye-websocket"."0.9.4" = self.buildNodePackage { - name = "faye-websocket-0.9.4"; - version = "0.9.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.4.tgz"; - name = "faye-websocket-0.9.4.tgz"; - sha1 = "885934c79effb0409549e0c0a3801ed17a40cdad"; - }; - deps = { - "websocket-driver-0.6.3" = self.by-version."websocket-driver"."0.6.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."find-up"."^1.0.0" = - self.by-version."find-up"."1.1.0"; - by-version."find-up"."1.1.0" = self.buildNodePackage { - name = "find-up-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/find-up/-/find-up-1.1.0.tgz"; - name = "find-up-1.1.0.tgz"; - sha1 = "a63b0eec4625a2902534898a5f9eec8aaed046e9"; - }; - deps = { - "path-exists-2.1.0" = self.by-version."path-exists"."2.1.0"; - "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."formidable"."1.0.x" = - self.by-version."formidable"."1.0.17"; - by-version."formidable"."1.0.17" = self.buildNodePackage { - name = "formidable-1.0.17"; - version = "1.0.17"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz"; - name = "formidable-1.0.17.tgz"; - sha1 = "ef5491490f9433b705faa77249c99029ae348559"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."get-stdin"."^4.0.1" = - self.by-version."get-stdin"."4.0.1"; - by-version."get-stdin"."4.0.1" = self.buildNodePackage { - name = "get-stdin-4.0.1"; - version = "4.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; - name = "get-stdin-4.0.1.tgz"; - sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."gm"."1.9.x" = - self.by-version."gm"."1.9.2"; - by-version."gm"."1.9.2" = self.buildNodePackage { - name = "gm-1.9.2"; - version = "1.9.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/gm/-/gm-1.9.2.tgz"; - name = "gm-1.9.2.tgz"; - sha1 = "00443279fe959a10fa23025e0c8401e710215845"; - }; - deps = { - "debug-0.7.0" = self.by-version."debug"."0.7.0"; - "array-series-0.1.5" = self.by-version."array-series"."0.1.5"; - "array-parallel-0.1.3" = self.by-version."array-parallel"."0.1.3"; - "through-2.3.8" = self.by-version."through"."2.3.8"; - "stream-to-buffer-0.0.1" = self.by-version."stream-to-buffer"."0.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "gm" = self.by-version."gm"."1.9.2"; - by-spec."graceful-fs"."^4.1.2" = - self.by-version."graceful-fs"."4.1.2"; - by-version."graceful-fs"."4.1.2" = self.buildNodePackage { - name = "graceful-fs-4.1.2"; - version = "4.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"; - name = "graceful-fs-4.1.2.tgz"; - sha1 = "fe2239b7574972e67e41f808823f9bfa4a991e37"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hashring"."0.0.x" = - self.by-version."hashring"."0.0.8"; - by-version."hashring"."0.0.8" = self.buildNodePackage { - name = "hashring-0.0.8"; - version = "0.0.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hashring/-/hashring-0.0.8.tgz"; - name = "hashring-0.0.8.tgz"; - sha1 = "203ab13c364119f10106526d2eaf7bd42b484c31"; - }; - deps = { - "bisection-0.0.3" = self.by-version."bisection"."0.0.3"; - "simple-lru-cache-0.0.2" = self.by-version."simple-lru-cache"."0.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hosted-git-info"."^2.1.4" = - self.by-version."hosted-git-info"."2.1.4"; - by-version."hosted-git-info"."2.1.4" = self.buildNodePackage { - name = "hosted-git-info-2.1.4"; - version = "2.1.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"; - name = "hosted-git-info-2.1.4.tgz"; - sha1 = "d9e953b26988be88096c46e926494d9604c300f8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."iconv-lite"."~0.4.4" = - self.by-version."iconv-lite"."0.4.13"; - by-version."iconv-lite"."0.4.13" = self.buildNodePackage { - name = "iconv-lite-0.4.13"; - version = "0.4.13"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"; - name = "iconv-lite-0.4.13.tgz"; - sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."indent-string"."^2.1.0" = - self.by-version."indent-string"."2.1.0"; - by-version."indent-string"."2.1.0" = self.buildNodePackage { - name = "indent-string-2.1.0"; - version = "2.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; - name = "indent-string-2.1.0.tgz"; - sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; - }; - deps = { - "repeating-2.0.0" = self.by-version."repeating"."2.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."inherits"."~2.0.1" = - self.by-version."inherits"."2.0.1"; - by-version."inherits"."2.0.1" = self.buildNodePackage { - name = "inherits-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - name = "inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."is-arrayish"."^0.2.1" = - self.by-version."is-arrayish"."0.2.1"; - by-version."is-arrayish"."0.2.1" = self.buildNodePackage { - name = "is-arrayish-0.2.1"; - version = "0.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; - name = "is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."is-builtin-module"."^1.0.0" = - self.by-version."is-builtin-module"."1.0.0"; - by-version."is-builtin-module"."1.0.0" = self.buildNodePackage { - name = "is-builtin-module-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; - name = "is-builtin-module-1.0.0.tgz"; - sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; - }; - deps = { - "builtin-modules-1.1.0" = self.by-version."builtin-modules"."1.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."is-finite"."^1.0.0" = - self.by-version."is-finite"."1.0.1"; - by-version."is-finite"."1.0.1" = self.buildNodePackage { - name = "is-finite-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz"; - name = "is-finite-1.0.1.tgz"; - sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b"; - }; - deps = { - "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."is-utf8"."^0.2.0" = - self.by-version."is-utf8"."0.2.0"; - by-version."is-utf8"."0.2.0" = self.buildNodePackage { - name = "is-utf8-0.2.0"; - version = "0.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"; - name = "is-utf8-0.2.0.tgz"; - sha1 = "b8aa54125ae626bfe4e3beb965f16a89c58a1137"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."isarray"."0.0.1" = - self.by-version."isarray"."0.0.1"; - by-version."isarray"."0.0.1" = self.buildNodePackage { - name = "isarray-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - name = "isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jackpot".">=0.0.6" = - self.by-version."jackpot"."0.0.6"; - by-version."jackpot"."0.0.6" = self.buildNodePackage { - name = "jackpot-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jackpot/-/jackpot-0.0.6.tgz"; - name = "jackpot-0.0.6.tgz"; - sha1 = "3cff064285cbf66f4eab2593c90bce816a821849"; - }; - deps = { - "retry-0.6.0" = self.by-version."retry"."0.6.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jankyqueue"."0.1.x" = - self.by-version."jankyqueue"."0.1.1"; - by-version."jankyqueue"."0.1.1" = self.buildNodePackage { - name = "jankyqueue-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jankyqueue/-/jankyqueue-0.1.1.tgz"; - name = "jankyqueue-0.1.1.tgz"; - sha1 = "4181b0318fb32e77aee8c54af73f97660f2e88d2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "jankyqueue" = self.by-version."jankyqueue"."0.1.1"; - by-spec."kerberos"."0.0.11" = - self.by-version."kerberos"."0.0.11"; - by-version."kerberos"."0.0.11" = self.buildNodePackage { - name = "kerberos-0.0.11"; - version = "0.0.11"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.11.tgz"; - name = "kerberos-0.0.11.tgz"; - sha1 = "cb29891c21c22ac195f3140b97dd12204fea7dc2"; - }; - deps = { - "nan-1.8.4" = self.by-version."nan"."1.8.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."load-json-file"."^1.0.0" = - self.by-version."load-json-file"."1.1.0"; - by-version."load-json-file"."1.1.0" = self.buildNodePackage { - name = "load-json-file-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; - name = "load-json-file-1.1.0.tgz"; - sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; - }; - deps = { - "graceful-fs-4.1.2" = self.by-version."graceful-fs"."4.1.2"; - "parse-json-2.2.0" = self.by-version."parse-json"."2.2.0"; - "pify-2.3.0" = self.by-version."pify"."2.3.0"; - "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; - "strip-bom-2.0.0" = self.by-version."strip-bom"."2.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."loud-rejection"."^1.0.0" = - self.by-version."loud-rejection"."1.2.0"; - by-version."loud-rejection"."1.2.0" = self.buildNodePackage { - name = "loud-rejection-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/loud-rejection/-/loud-rejection-1.2.0.tgz"; - name = "loud-rejection-1.2.0.tgz"; - sha1 = "f4f87db6abec3b7fe47834531ecf6a011143e58d"; - }; - deps = { - "signal-exit-2.1.2" = self.by-version."signal-exit"."2.1.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lru-cache"."2.3.x" = - self.by-version."lru-cache"."2.3.1"; - by-version."lru-cache"."2.3.1" = self.buildNodePackage { - name = "lru-cache-2.3.1"; - version = "2.3.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz"; - name = "lru-cache-2.3.1.tgz"; - sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."map-obj"."^1.0.0" = - self.by-version."map-obj"."1.0.1"; - by-version."map-obj"."1.0.1" = self.buildNodePackage { - name = "map-obj-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - name = "map-obj-1.0.1.tgz"; - sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."memcached"."0.2.x" = - self.by-version."memcached"."0.2.8"; - by-version."memcached"."0.2.8" = self.buildNodePackage { - name = "memcached-0.2.8"; - version = "0.2.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/memcached/-/memcached-0.2.8.tgz"; - name = "memcached-0.2.8.tgz"; - sha1 = "ffbf9498cbc30779625b77e77770bd50dc525212"; - }; - deps = { - "hashring-0.0.8" = self.by-version."hashring"."0.0.8"; - "jackpot-0.0.6" = self.by-version."jackpot"."0.0.6"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."meow"."^3.3.0" = - self.by-version."meow"."3.6.0"; - by-version."meow"."3.6.0" = self.buildNodePackage { - name = "meow-3.6.0"; - version = "3.6.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/meow/-/meow-3.6.0.tgz"; - name = "meow-3.6.0.tgz"; - sha1 = "e7a535295cb89db0e0782428e55fa8615bf9e150"; - }; - deps = { - "camelcase-keys-2.0.0" = self.by-version."camelcase-keys"."2.0.0"; - "loud-rejection-1.2.0" = self.by-version."loud-rejection"."1.2.0"; - "minimist-1.2.0" = self.by-version."minimist"."1.2.0"; - "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5"; - "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1"; - "read-pkg-up-1.0.1" = self.by-version."read-pkg-up"."1.0.1"; - "redent-1.0.0" = self.by-version."redent"."1.0.0"; - "trim-newlines-1.0.0" = self.by-version."trim-newlines"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime"."1.2.4" = - self.by-version."mime"."1.2.4"; - by-version."mime"."1.2.4" = self.buildNodePackage { - name = "mime-1.2.4"; - version = "1.2.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.4.tgz"; - name = "mime-1.2.4.tgz"; - sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime".">= 0.0.1" = - self.by-version."mime"."1.3.4"; - by-version."mime"."1.3.4" = self.buildNodePackage { - name = "mime-1.3.4"; - version = "1.3.4"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; - name = "mime-1.3.4.tgz"; - sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mimelib"."0.2.14" = - self.by-version."mimelib"."0.2.14"; - by-version."mimelib"."0.2.14" = self.buildNodePackage { - name = "mimelib-0.2.14"; - version = "0.2.14"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz"; - name = "mimelib-0.2.14.tgz"; - sha1 = "2a1aa724bd190b85bd526e6317ab6106edfd6831"; - }; - deps = { - "encoding-0.1.11" = self.by-version."encoding"."0.1.11"; - "addressparser-0.2.1" = self.by-version."addressparser"."0.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."minimist"."^1.1.3" = - self.by-version."minimist"."1.2.0"; - by-version."minimist"."1.2.0" = self.buildNodePackage { - name = "minimist-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - name = "minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mkdirp"."0.3.0" = - self.by-version."mkdirp"."0.3.0"; - by-version."mkdirp"."0.3.0" = self.buildNodePackage { - name = "mkdirp-0.3.0"; - version = "0.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; - name = "mkdirp-0.3.0.tgz"; - sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mkdirp"."0.3.x" = - self.by-version."mkdirp"."0.3.5"; - by-version."mkdirp"."0.3.5" = self.buildNodePackage { - name = "mkdirp-0.3.5"; - version = "0.3.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - name = "mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "mkdirp" = self.by-version."mkdirp"."0.3.5"; - by-spec."moment"."= 1.7.0" = - self.by-version."moment"."1.7.0"; - by-version."moment"."1.7.0" = self.buildNodePackage { - name = "moment-1.7.0"; - version = "1.7.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/moment/-/moment-1.7.0.tgz"; - name = "moment-1.7.0.tgz"; - sha1 = "6f3d73a446c6bd6af1b993801d0b8071efad5e28"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mongodb"."1.4.x" = - self.by-version."mongodb"."1.4.39"; - by-version."mongodb"."1.4.39" = self.buildNodePackage { - name = "mongodb-1.4.39"; - version = "1.4.39"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.39.tgz"; - name = "mongodb-1.4.39.tgz"; - sha1 = "f5b25c7f7df06c968cd5d3c68280adc9a6404591"; - }; - deps = { - "bson-0.2.22" = self.by-version."bson"."0.2.22"; - }; - optionalDependencies = { - "kerberos-0.0.11" = self.by-version."kerberos"."0.0.11"; - "readable-stream-2.0.4" = self.by-version."readable-stream"."2.0.4"; - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ms"."0.7.1" = - self.by-version."ms"."0.7.1"; - by-version."ms"."0.7.1" = self.buildNodePackage { - name = "ms-0.7.1"; - version = "0.7.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - name = "ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."nan"."2.0.5" = - self.by-version."nan"."2.0.5"; - by-version."nan"."2.0.5" = self.buildNodePackage { - name = "nan-2.0.5"; - version = "2.0.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-2.0.5.tgz"; - name = "nan-2.0.5.tgz"; - sha1 = "365888014be1fd178db0cbfa258edf7b0cb1c408"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."nan"."~1.8" = - self.by-version."nan"."1.8.4"; - by-version."nan"."1.8.4" = self.buildNodePackage { - name = "nan-1.8.4"; - version = "1.8.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-1.8.4.tgz"; - name = "nan-1.8.4.tgz"; - sha1 = "3c76b5382eab33e44b758d2813ca9d92e9342f34"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."node-uuid"."1.3.x" = - self.by-version."node-uuid"."1.3.3"; - by-version."node-uuid"."1.3.3" = self.buildNodePackage { - name = "node-uuid-1.3.3"; - version = "1.3.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz"; - name = "node-uuid-1.3.3.tgz"; - sha1 = "d3db4d7b56810d9e4032342766282af07391729b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "node-uuid" = self.by-version."node-uuid"."1.3.3"; - by-spec."node-uuid"."1.4.x" = - self.by-version."node-uuid"."1.4.7"; - by-version."node-uuid"."1.4.7" = self.buildNodePackage { - name = "node-uuid-1.4.7"; - version = "1.4.7"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; - name = "node-uuid-1.4.7.tgz"; - sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."node-uuid"."^1.4.1" = - self.by-version."node-uuid"."1.4.7"; - by-spec."normalize-package-data"."^2.3.2" = - self.by-version."normalize-package-data"."2.3.5"; - by-version."normalize-package-data"."2.3.5" = self.buildNodePackage { - name = "normalize-package-data-2.3.5"; - version = "2.3.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz"; - name = "normalize-package-data-2.3.5.tgz"; - sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df"; - }; - deps = { - "hosted-git-info-2.1.4" = self.by-version."hosted-git-info"."2.1.4"; - "is-builtin-module-1.0.0" = self.by-version."is-builtin-module"."1.0.0"; - "semver-5.1.0" = self.by-version."semver"."5.1.0"; - "validate-npm-package-license-3.0.1" = self.by-version."validate-npm-package-license"."3.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."normalize-package-data"."^2.3.4" = - self.by-version."normalize-package-data"."2.3.5"; - by-spec."number-is-nan"."^1.0.0" = - self.by-version."number-is-nan"."1.0.0"; - by-version."number-is-nan"."1.0.0" = self.buildNodePackage { - name = "number-is-nan-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"; - name = "number-is-nan-1.0.0.tgz"; - sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."oauth"."0.9.7" = - self.by-version."oauth"."0.9.7"; - by-version."oauth"."0.9.7" = self.buildNodePackage { - name = "oauth-0.9.7"; - version = "0.9.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/oauth/-/oauth-0.9.7.tgz"; - name = "oauth-0.9.7.tgz"; - sha1 = "c2554d0368c966eb3050bec96584625577ad1ecd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."oauth-evanp"."~0.9.10-evanp.2" = - self.by-version."oauth-evanp"."0.9.10-evanp.2"; - by-version."oauth-evanp"."0.9.10-evanp.2" = self.buildNodePackage { - name = "oauth-evanp-0.9.10-evanp.2"; - version = "0.9.10-evanp.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/oauth-evanp/-/oauth-evanp-0.9.10-evanp.2.tgz"; - name = "oauth-evanp-0.9.10-evanp.2.tgz"; - sha1 = "9b5fb3508cea584420855957d56531405cf53a02"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "oauth-evanp" = self.by-version."oauth-evanp"."0.9.10-evanp.2"; - by-spec."object-assign"."^4.0.1" = - self.by-version."object-assign"."4.0.1"; - by-version."object-assign"."4.0.1" = self.buildNodePackage { - name = "object-assign-4.0.1"; - version = "4.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"; - name = "object-assign-4.0.1.tgz"; - sha1 = "99504456c3598b5cad4fc59c26e8a9bb107fe0bd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."openid"."0.4.1" = - self.by-version."openid"."0.4.1"; - by-version."openid"."0.4.1" = self.buildNodePackage { - name = "openid-0.4.1"; - version = "0.4.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/openid/-/openid-0.4.1.tgz"; - name = "openid-0.4.1.tgz"; - sha1 = "de0eb5e381d34dc4aa5a77a98678bedafd11f387"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."optimist"."0.3.x" = - self.by-version."optimist"."0.3.7"; - by-version."optimist"."0.3.7" = self.buildNodePackage { - name = "optimist-0.3.7"; - version = "0.3.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; - name = "optimist-0.3.7.tgz"; - sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; - }; - deps = { - "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "optimist" = self.by-version."optimist"."0.3.7"; - by-spec."parse-json"."^2.2.0" = - self.by-version."parse-json"."2.2.0"; - by-version."parse-json"."2.2.0" = self.buildNodePackage { - name = "parse-json-2.2.0"; - version = "2.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; - name = "parse-json-2.2.0.tgz"; - sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; - }; - deps = { - "error-ex-1.3.0" = self.by-version."error-ex"."1.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."path-exists"."^2.0.0" = - self.by-version."path-exists"."2.1.0"; - by-version."path-exists"."2.1.0" = self.buildNodePackage { - name = "path-exists-2.1.0"; - version = "2.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; - name = "path-exists-2.1.0.tgz"; - sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; - }; - deps = { - "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."path-type"."^1.0.0" = - self.by-version."path-type"."1.1.0"; - by-version."path-type"."1.1.0" = self.buildNodePackage { - name = "path-type-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; - name = "path-type-1.1.0.tgz"; - sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; - }; - deps = { - "graceful-fs-4.1.2" = self.by-version."graceful-fs"."4.1.2"; - "pify-2.3.0" = self.by-version."pify"."2.3.0"; - "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."pify"."^2.0.0" = - self.by-version."pify"."2.3.0"; - by-version."pify"."2.3.0" = self.buildNodePackage { - name = "pify-2.3.0"; - version = "2.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; - name = "pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."pinkie"."^2.0.0" = - self.by-version."pinkie"."2.0.1"; - by-version."pinkie"."2.0.1" = self.buildNodePackage { - name = "pinkie-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"; - name = "pinkie-2.0.1.tgz"; - sha1 = "4236c86fc29f261c2045bbe81f78cbb2a5e8306c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."pinkie-promise"."^2.0.0" = - self.by-version."pinkie-promise"."2.0.0"; - by-version."pinkie-promise"."2.0.0" = self.buildNodePackage { - name = "pinkie-promise-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz"; - name = "pinkie-promise-2.0.0.tgz"; - sha1 = "4c83538de1f6e660c29e0a13446844f7a7e88259"; - }; - deps = { - "pinkie-2.0.1" = self.by-version."pinkie"."2.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."process-nextick-args"."~1.0.0" = - self.by-version."process-nextick-args"."1.0.6"; - by-version."process-nextick-args"."1.0.6" = self.buildNodePackage { - name = "process-nextick-args-1.0.6"; - version = "1.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"; - name = "process-nextick-args-1.0.6.tgz"; - sha1 = "0f96b001cea90b12592ce566edb97ec11e69bd05"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."0.4.x" = - self.by-version."qs"."0.4.2"; - by-version."qs"."0.4.2" = self.buildNodePackage { - name = "qs-0.4.2"; - version = "0.4.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-0.4.2.tgz"; - name = "qs-0.4.2.tgz"; - sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs".">= 0.4.0" = - self.by-version."qs"."6.0.1"; - by-version."qs"."6.0.1" = self.buildNodePackage { - name = "qs-6.0.1"; - version = "6.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-6.0.1.tgz"; - name = "qs-6.0.1.tgz"; - sha1 = "ee8b7fcd64fcbe6e36c922bd2c464ee7c54766c3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."read-pkg"."^1.0.0" = - self.by-version."read-pkg"."1.1.0"; - by-version."read-pkg"."1.1.0" = self.buildNodePackage { - name = "read-pkg-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; - name = "read-pkg-1.1.0.tgz"; - sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; - }; - deps = { - "load-json-file-1.1.0" = self.by-version."load-json-file"."1.1.0"; - "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5"; - "path-type-1.1.0" = self.by-version."path-type"."1.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."read-pkg-up"."^1.0.1" = - self.by-version."read-pkg-up"."1.0.1"; - by-version."read-pkg-up"."1.0.1" = self.buildNodePackage { - name = "read-pkg-up-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; - name = "read-pkg-up-1.0.1.tgz"; - sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; - }; - deps = { - "find-up-1.1.0" = self.by-version."find-up"."1.1.0"; - "read-pkg-1.1.0" = self.by-version."read-pkg"."1.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."readable-stream"."*" = - self.by-version."readable-stream"."2.0.4"; - by-version."readable-stream"."2.0.4" = self.buildNodePackage { - name = "readable-stream-2.0.4"; - version = "2.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz"; - name = "readable-stream-2.0.4.tgz"; - sha1 = "2523ef27ffa339d7ba9da8603f2d0599d06edbd8"; - }; - deps = { - "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "process-nextick-args-1.0.6" = self.by-version."process-nextick-args"."1.0.6"; - "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; - "util-deprecate-1.0.2" = self.by-version."util-deprecate"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."redent"."^1.0.0" = - self.by-version."redent"."1.0.0"; - by-version."redent"."1.0.0" = self.buildNodePackage { - name = "redent-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; - name = "redent-1.0.0.tgz"; - sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; - }; - deps = { - "indent-string-2.1.0" = self.by-version."indent-string"."2.1.0"; - "strip-indent-1.0.1" = self.by-version."strip-indent"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."redis"."~0.10.3" = - self.by-version."redis"."0.10.3"; - by-version."redis"."0.10.3" = self.buildNodePackage { - name = "redis-0.10.3"; - version = "0.10.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/redis/-/redis-0.10.3.tgz"; - name = "redis-0.10.3.tgz"; - sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."repeating"."^2.0.0" = - self.by-version."repeating"."2.0.0"; - by-version."repeating"."2.0.0" = self.buildNodePackage { - name = "repeating-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz"; - name = "repeating-2.0.0.tgz"; - sha1 = "fd27d6d264d18fbebfaa56553dd7b82535a5034e"; - }; - deps = { - "is-finite-1.0.1" = self.by-version."is-finite"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."retry"."0.6.0" = - self.by-version."retry"."0.6.0"; - by-version."retry"."0.6.0" = self.buildNodePackage { - name = "retry-0.6.0"; - version = "0.6.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz"; - name = "retry-0.6.0.tgz"; - sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sax".">=0.1.1" = - self.by-version."sax"."1.1.4"; - by-version."sax"."1.1.4" = self.buildNodePackage { - name = "sax-1.1.4"; - version = "1.1.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sax/-/sax-1.1.4.tgz"; - name = "sax-1.1.4.tgz"; - sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."schlock"."~0.2.1" = - self.by-version."schlock"."0.2.1"; - by-version."schlock"."0.2.1" = self.buildNodePackage { - name = "schlock-0.2.1"; - version = "0.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/schlock/-/schlock-0.2.1.tgz"; - name = "schlock-0.2.1.tgz"; - sha1 = "2a9aaeaa209a5422eadc5dfc005e2c2f15241f99"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "schlock" = self.by-version."schlock"."0.2.1"; - by-spec."semver"."2 || 3 || 4 || 5" = - self.by-version."semver"."5.1.0"; - by-version."semver"."5.1.0" = self.buildNodePackage { - name = "semver-5.1.0"; - version = "5.1.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-5.1.0.tgz"; - name = "semver-5.1.0.tgz"; - sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."set-immediate"."0.1.x" = - self.by-version."set-immediate"."0.1.1"; - by-version."set-immediate"."0.1.1" = self.buildNodePackage { - name = "set-immediate-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/set-immediate/-/set-immediate-0.1.1.tgz"; - name = "set-immediate-0.1.1.tgz"; - sha1 = "8986e4a773bf8ec165f24d579107673bfac141de"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "set-immediate" = self.by-version."set-immediate"."0.1.1"; - by-spec."set-immediate"."~0.1.1" = - self.by-version."set-immediate"."0.1.1"; - by-spec."showdown"."0.3.x" = - self.by-version."showdown"."0.3.4"; - by-version."showdown"."0.3.4" = self.buildNodePackage { - name = "showdown-0.3.4"; - version = "0.3.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/showdown/-/showdown-0.3.4.tgz"; - name = "showdown-0.3.4.tgz"; - sha1 = "b056fa0209d44ac55c90331b44a934774976ac55"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "showdown" = self.by-version."showdown"."0.3.4"; - by-spec."signal-exit"."^2.1.2" = - self.by-version."signal-exit"."2.1.2"; - by-version."signal-exit"."2.1.2" = self.buildNodePackage { - name = "signal-exit-2.1.2"; - version = "2.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz"; - name = "signal-exit-2.1.2.tgz"; - sha1 = "375879b1f92ebc3b334480d038dc546a6d558564"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."simple-lru-cache"."0.0.x" = - self.by-version."simple-lru-cache"."0.0.2"; - by-version."simple-lru-cache"."0.0.2" = self.buildNodePackage { - name = "simple-lru-cache-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; - name = "simple-lru-cache-0.0.2.tgz"; - sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sockjs"."0.3.x" = - self.by-version."sockjs"."0.3.15"; - by-version."sockjs"."0.3.15" = self.buildNodePackage { - name = "sockjs-0.3.15"; - version = "0.3.15"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.15.tgz"; - name = "sockjs-0.3.15.tgz"; - sha1 = "e19b577e59e0fbdb21a0ae4f46203ca24cad8db8"; - }; - deps = { - "faye-websocket-0.9.4" = self.by-version."faye-websocket"."0.9.4"; - "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "sockjs" = self.by-version."sockjs"."0.3.15"; - by-spec."spdx-correct"."~1.0.0" = - self.by-version."spdx-correct"."1.0.2"; - by-version."spdx-correct"."1.0.2" = self.buildNodePackage { - name = "spdx-correct-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; - name = "spdx-correct-1.0.2.tgz"; - sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; - }; - deps = { - "spdx-license-ids-1.1.0" = self.by-version."spdx-license-ids"."1.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."spdx-exceptions"."^1.0.4" = - self.by-version."spdx-exceptions"."1.0.4"; - by-version."spdx-exceptions"."1.0.4" = self.buildNodePackage { - name = "spdx-exceptions-1.0.4"; - version = "1.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"; - name = "spdx-exceptions-1.0.4.tgz"; - sha1 = "220b84239119ae9045a892db81a83f4ce16f80fd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."spdx-expression-parse"."~1.0.0" = - self.by-version."spdx-expression-parse"."1.0.2"; - by-version."spdx-expression-parse"."1.0.2" = self.buildNodePackage { - name = "spdx-expression-parse-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz"; - name = "spdx-expression-parse-1.0.2.tgz"; - sha1 = "d52b14b5e9670771440af225bcb563122ac452f6"; - }; - deps = { - "spdx-exceptions-1.0.4" = self.by-version."spdx-exceptions"."1.0.4"; - "spdx-license-ids-1.1.0" = self.by-version."spdx-license-ids"."1.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."spdx-license-ids"."^1.0.0" = - self.by-version."spdx-license-ids"."1.1.0"; - by-version."spdx-license-ids"."1.1.0" = self.buildNodePackage { - name = "spdx-license-ids-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"; - name = "spdx-license-ids-1.1.0.tgz"; - sha1 = "28694acdf39fe27de45143fff81f21f6c66d44ac"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."spdx-license-ids"."^1.0.2" = - self.by-version."spdx-license-ids"."1.1.0"; - by-spec."starttls"."0.2.1" = - self.by-version."starttls"."0.2.1"; - by-version."starttls"."0.2.1" = self.buildNodePackage { - name = "starttls-0.2.1"; - version = "0.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/starttls/-/starttls-0.2.1.tgz"; - name = "starttls-0.2.1.tgz"; - sha1 = "b98d3e5e778d46f199c843a64f889f0347c6d19a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."step"."0.0.x" = - self.by-version."step"."0.0.6"; - by-version."step"."0.0.6" = self.buildNodePackage { - name = "step-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/step/-/step-0.0.6.tgz"; - name = "step-0.0.6.tgz"; - sha1 = "143e7849a5d7d3f4a088fe29af94915216eeede2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "step" = self.by-version."step"."0.0.6"; - by-spec."stream-to-buffer"."~0.0.1" = - self.by-version."stream-to-buffer"."0.0.1"; - by-version."stream-to-buffer"."0.0.1" = self.buildNodePackage { - name = "stream-to-buffer-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/stream-to-buffer/-/stream-to-buffer-0.0.1.tgz"; - name = "stream-to-buffer-0.0.1.tgz"; - sha1 = "ab483d59a1ca71832de379a255f465b665af45c1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."string_decoder"."~0.10.x" = - self.by-version."string_decoder"."0.10.31"; - by-version."string_decoder"."0.10.31" = self.buildNodePackage { - name = "string_decoder-0.10.31"; - version = "0.10.31"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - name = "string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."strip-bom"."^2.0.0" = - self.by-version."strip-bom"."2.0.0"; - by-version."strip-bom"."2.0.0" = self.buildNodePackage { - name = "strip-bom-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; - name = "strip-bom-2.0.0.tgz"; - sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; - }; - deps = { - "is-utf8-0.2.0" = self.by-version."is-utf8"."0.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."strip-indent"."^1.0.1" = - self.by-version."strip-indent"."1.0.1"; - by-version."strip-indent"."1.0.1" = self.buildNodePackage { - name = "strip-indent-1.0.1"; - version = "1.0.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; - name = "strip-indent-1.0.1.tgz"; - sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; - }; - deps = { - "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."through"."~2.3.1" = - self.by-version."through"."2.3.8"; - by-version."through"."2.3.8" = self.buildNodePackage { - name = "through-2.3.8"; - version = "2.3.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/through/-/through-2.3.8.tgz"; - name = "through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."trim-newlines"."^1.0.0" = - self.by-version."trim-newlines"."1.0.0"; - by-version."trim-newlines"."1.0.0" = self.buildNodePackage { - name = "trim-newlines-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; - name = "trim-newlines-1.0.0.tgz"; - sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."underscore"."*" = - self.by-version."underscore"."1.8.3"; - by-version."underscore"."1.8.3" = self.buildNodePackage { - name = "underscore-1.8.3"; - version = "1.8.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; - name = "underscore-1.8.3.tgz"; - sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."underscore"."1.4.x" = - self.by-version."underscore"."1.4.4"; - by-version."underscore"."1.4.4" = self.buildNodePackage { - name = "underscore-1.4.4"; - version = "1.4.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - name = "underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "underscore" = self.by-version."underscore"."1.4.4"; - by-spec."underscore"."1.5.x" = - self.by-version."underscore"."1.5.2"; - by-version."underscore"."1.5.2" = self.buildNodePackage { - name = "underscore-1.5.2"; - version = "1.5.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; - name = "underscore-1.5.2.tgz"; - sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."underscore"."1.6.x" = - self.by-version."underscore"."1.6.0"; - by-version."underscore"."1.6.0" = self.buildNodePackage { - name = "underscore-1.6.0"; - version = "1.6.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; - name = "underscore-1.6.0.tgz"; - sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."underscore".">=1.1.3" = - self.by-version."underscore"."1.8.3"; - by-spec."underscore"."^1.8.3" = - self.by-version."underscore"."1.8.3"; - by-spec."underscore-contrib"."0.1.x" = - self.by-version."underscore-contrib"."0.1.4"; - by-version."underscore-contrib"."0.1.4" = self.buildNodePackage { - name = "underscore-contrib-0.1.4"; - version = "0.1.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.1.4.tgz"; - name = "underscore-contrib-0.1.4.tgz"; - sha1 = "db40f37f2e66961d2e0326bf65fb76887a1ca1c6"; - }; - deps = { - "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "underscore-contrib" = self.by-version."underscore-contrib"."0.1.4"; - by-spec."util-deprecate"."~1.0.1" = - self.by-version."util-deprecate"."1.0.2"; - by-version."util-deprecate"."1.0.2" = self.buildNodePackage { - name = "util-deprecate-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - name = "util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."utml"."0.2.x" = - self.by-version."utml"."0.2.0"; - by-version."utml"."0.2.0" = self.buildNodePackage { - name = "utml-0.2.0"; - version = "0.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/utml/-/utml-0.2.0.tgz"; - name = "utml-0.2.0.tgz"; - sha1 = "6a546741823b2a9c17598a57e8eb4c08738dee48"; - }; - deps = { - "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "utml" = self.by-version."utml"."0.2.0"; - by-spec."validate-npm-package-license"."^3.0.1" = - self.by-version."validate-npm-package-license"."3.0.1"; - by-version."validate-npm-package-license"."3.0.1" = self.buildNodePackage { - name = "validate-npm-package-license-3.0.1"; - version = "3.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; - name = "validate-npm-package-license-3.0.1.tgz"; - sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; - }; - deps = { - "spdx-correct-1.0.2" = self.by-version."spdx-correct"."1.0.2"; - "spdx-expression-parse-1.0.2" = self.by-version."spdx-expression-parse"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."validator"."0.4.x" = - self.by-version."validator"."0.4.28"; - by-version."validator"."0.4.28" = self.buildNodePackage { - name = "validator-0.4.28"; - version = "0.4.28"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/validator/-/validator-0.4.28.tgz"; - name = "validator-0.4.28.tgz"; - sha1 = "311d439ae6cf3fbe6f85da6ebaccd0c7007986f4"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "validator" = self.by-version."validator"."0.4.28"; - by-spec."vows"."0.7.x" = - self.by-version."vows"."0.7.0"; - by-version."vows"."0.7.0" = self.buildNodePackage { - name = "vows-0.7.0"; - version = "0.7.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/vows/-/vows-0.7.0.tgz"; - name = "vows-0.7.0.tgz"; - sha1 = "dd0065f110ba0c0a6d63e844851c3208176d5867"; - }; - deps = { - "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; - "diff-1.0.8" = self.by-version."diff"."1.0.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."webfinger"."~0.4.2" = - self.by-version."webfinger"."0.4.2"; - by-version."webfinger"."0.4.2" = self.buildNodePackage { - name = "webfinger-0.4.2"; - version = "0.4.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/webfinger/-/webfinger-0.4.2.tgz"; - name = "webfinger-0.4.2.tgz"; - sha1 = "3477a6d97799461896039fcffc650b73468ee76d"; - }; - deps = { - "step-0.0.6" = self.by-version."step"."0.0.6"; - "xml2js-0.1.14" = self.by-version."xml2js"."0.1.14"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "webfinger" = self.by-version."webfinger"."0.4.2"; - by-spec."websocket-driver".">=0.5.1" = - self.by-version."websocket-driver"."0.6.3"; - by-version."websocket-driver"."0.6.3" = self.buildNodePackage { - name = "websocket-driver-0.6.3"; - version = "0.6.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.3.tgz"; - name = "websocket-driver-0.6.3.tgz"; - sha1 = "fd21911bb46dee34ad85bdbc5676bf9024ed087b"; - }; - deps = { - "websocket-extensions-0.1.1" = self.by-version."websocket-extensions"."0.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."websocket-extensions".">=0.1.1" = - self.by-version."websocket-extensions"."0.1.1"; - by-version."websocket-extensions"."0.1.1" = self.buildNodePackage { - name = "websocket-extensions-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz"; - name = "websocket-extensions-0.1.1.tgz"; - sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."wordwrap"."~0.0.2" = - self.by-version."wordwrap"."0.0.3"; - by-version."wordwrap"."0.0.3" = self.buildNodePackage { - name = "wordwrap-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; - name = "wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."xml2js"."0.1.x" = - self.by-version."xml2js"."0.1.14"; - by-version."xml2js"."0.1.14" = self.buildNodePackage { - name = "xml2js-0.1.14"; - version = "0.1.14"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz"; - name = "xml2js-0.1.14.tgz"; - sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; - }; - deps = { - "sax-1.1.4" = self.by-version."sax"."1.1.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; -} + tarball = nodeEnv.buildNodeSourceDist args; + package = nodeEnv.buildNodePackage args; + shell = nodeEnv.buildNodeShell args; +} \ No newline at end of file diff --git a/pkgs/shells/bash/bash-4.3-patches.nix b/pkgs/shells/bash/bash-4.3-patches.nix index 83743938de32..a09e56e46993 100644 --- a/pkgs/shells/bash/bash-4.3-patches.nix +++ b/pkgs/shells/bash/bash-4.3-patches.nix @@ -47,4 +47,6 @@ patch: [ (patch "044" "16bzaq9fs2kaw2n2k6vvljkjw5k5kx06isnq8hxkfrxz60384f4k") (patch "045" "08q02mj9imp2njpgm6f5q5m61i7qzp33rbxxzarixalyisbw6vms") (patch "046" "13v8dymwj83wcvrfayjqrs5kqar05bcj4zpiacrjkkchnsk5dd5k") +(patch "047" "0jkwqviwkqdc13wv3q0g0kapjr68ggs1xzhqy696pfkqgvg4i4n6") +(patch "048" "18nzlk1idwkq0xd54s83lx8kam8kcvz7yc0mw6hnq2ax3i2ib0jv") ] diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 9649e35c074b..911819f48aae 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { preConfigure = '' export BORG_OPENSSL_PREFIX="${openssl.dev}" - export BORG_LZ4_PREFIX="${lz4}" + export BORG_LZ4_PREFIX="${lz4.dev}" ''; postInstall = '' diff --git a/pkgs/tools/compression/lhasa/default.nix b/pkgs/tools/compression/lhasa/default.nix new file mode 100644 index 000000000000..f270d29a694f --- /dev/null +++ b/pkgs/tools/compression/lhasa/default.nix @@ -0,0 +1,21 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "lhasa-0.3.1"; + src = fetchurl { + url = https://soulsphere.org/projects/lhasa/lhasa-0.3.1.tar.gz; + sha256 = "092zi9av18ma20c6h9448k0bapvx2plnp292741dvfd9hmgqxc1z"; + }; + meta = { + description = "Free Software replacement for the Unix LHA tool"; + longDescription = '' + Lhasa is a Free Software replacement for the Unix LHA tool, for + decompressing .lzh (LHA / LHarc) and .lzs (LArc) archives. The backend for + the tool is a library, so that it can be reused for other purposes. + ''; + license = stdenv.lib.licenses.isc; + homepage = http://fragglet.github.io/lhasa; + maintainers = with stdenv.lib; [ maintainers.sander ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 1f1ec0437f86..3ca01d7e5eb9 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -2,20 +2,17 @@ pythonPackages.buildPythonApplication rec { name = "tmuxp-${version}"; - version = "1.2.0"; + version = "1.2.2"; namePrefix = ""; src = fetchurl { url = "mirror://pypi/t/tmuxp/${name}.tar.gz"; - sha256 = "05z5ssv9glsqmcy9fdq06bawy1274dnzqsqd3a4z4jd0w6j09smn"; + sha256 = "1g37pdxs0wmnskqm7qsqm0ygwpc1dxk1d7lrzpgs717zxaak8vln"; }; patchPhase = '' - # Dependencies required for testing shouldn't pinned to - # a specific version. - substituteInPlace requirements/test.txt \ - --replace "==" ">=" + sed -i 's/==.*$//' requirements/test.txt ''; buildInputs = with pythonPackages; [ diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix index 4ccd09ac555a..72efc703b108 100644 --- a/pkgs/tools/networking/gmvault/default.nix +++ b/pkgs/tools/networking/gmvault/default.nix @@ -1,19 +1,19 @@ -{ pkgs, fetchurl, buildPythonApplication, pythonPackages }: +{ pkgs, fetchurl, pythonPackages }: -buildPythonApplication rec { - version = "1.8.1-beta"; +pythonPackages.buildPythonApplication rec { + version = "1.9.1"; name = "gmvault-${version}"; src = fetchurl { url = "https://bitbucket.org/gaubert/gmvault-official-download/downloads/gmvault-v${version}-src.tar.gz"; name = "${name}.tar.bz"; - sha256 = "0b575cnrd6jzcpa05mbn2swzcy0r9ck09pkhs4ydj6d3ir52j80c"; + sha256 = "0ffp8df3gdf6lf3pj75hzsmxmvmscppb6bjda58my1n4ppxp1rji"; }; doCheck = false; propagatedBuildInputs = with pythonPackages; [ gdata IMAPClient Logbook - argparse ]; + argparse chardet ]; startScript = ./gmvault.py; diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 213051bdf8db..cc17022d2656 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -42,14 +42,15 @@ stdenv.mkDerivation { # Fix python script to use the correct python sed -i -e 's|#!/usr/bin/python|#!/usr/bin/env python|' -e 's/^\(\W*\)installstartcheck()/\1sscmd = "ss"\n\0/' programs/verify/verify.in ''; - + # Set appropriate paths for build preBuild = "export INC_USRLOCAL=\${out}"; - makeFlags = [ + makeFlags = [ "INITSYSTEM=systemd" (if docs then "all" else "base") ]; + CFLAGS = "-Wno-error=sign-compare"; installTargets = [ (if docs then "install" else "install-base") ]; # Hack to make install work diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 77c71f38331c..ab2a2a89a7cb 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ModemManager-${version}"; - version = "1.4.6"; + version = "1.4.16"; src = fetchurl { url = "http://www.freedesktop.org/software/ModemManager/${name}.tar.xz"; - sha256 = "1kd5nn5rm88c8rgmzwy2fsf3cr7fai7r85mi61kcby0hcgsapv8c"; + sha256 = "1qhbi1mv8l2dvpw7fmw2p2fd51y0x3v1pqgnahd1ndfial3vqwss"; }; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 7f6620af4c95..2c7ba9e3dc9a 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "network-manager-applet"; - version = networkmanager.version; + version = "1.2.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${name}.tar.xz"; - sha256 = "02b42e7c17c9cd6c840563750da92ce58da1ec621df7f0c2402016026e727756"; + sha256 = "0ym31m55hj65mmbq2yihy49z5x5z1qpx7jalk64kwx1rr5b2kxyz"; }; configureFlags = [ "--sysconfdir=/etc" ]; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 57bf1a51a1ae..619832942cc2 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "network-manager-${version}"; pname = "NetworkManager"; major = "1.2"; - version = "${major}.2"; + version = "${major}.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; - sha256 = "41d8082e027f58bb5fa4181f93742606ab99c659794a18e2823eff22df0eecd9"; + sha256 = "1alglc7xwi9q12l4xan5w3k0zmcz3zcjg01s8h8d0wnldlqbggqr"; }; preConfigure = '' diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index b1b24bceb576..b277cc354bbe 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-openconnect"; - version = networkmanager.version; + version = "1.2.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz"; diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index 6fd1a666f0e8..8563b627afcb 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-openvpn"; - version = networkmanager.version; + version = "1.2.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz"; - sha256 = "47a6d219a781eff8491c7876b7fb95b12dcfb8f8a05f916f95afc65c7babddef"; + sha256 = "1c0z7x5kkxi1mjimww7kpvci4071sviv1n3wk6r6r1wa1axy4wr3"; }; buildInputs = [ openvpn networkmanager libsecret ] diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index a9bee0c74811..cbd9560b8dc1 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-pptp"; - version = networkmanager.version; + version = "1.2.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz"; - sha256 = "a72cb88ecc0a9edec836e8042c592d68b8b290c0d78082e6b25cf08b46c6be5d"; + sha256 = "0phc0fksxl6ql133yyirak3vw043k8a82dnlnpaydk1liivcx5xx"; }; buildInputs = [ networkmanager pptp ppp libsecret ] diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix index b760fe6e4f7d..894f19bc28ba 100644 --- a/pkgs/tools/networking/network-manager/vpnc.nix +++ b/pkgs/tools/networking/network-manager/vpnc.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-vpnc"; - version = networkmanager.version; + version = "1.2.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz"; - sha256 = "e900f6500026f8c3ee4feb92e1d0a0c0abbee9ba507dad915b47a8ab7df9e1f3"; + sha256 = "01gv205p51fsz2pfpch81ax0xm8gwj6646acag5hh0p931j53irr"; }; buildInputs = [ vpnc networkmanager libsecret ] diff --git a/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch b/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch new file mode 100644 index 000000000000..665eff864530 --- /dev/null +++ b/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch @@ -0,0 +1,37 @@ +diff --git a/kex.c b/kex.c +index 50c7a0f..823668b 100644 +--- a/kex.c ++++ b/kex.c +@@ -419,6 +419,8 @@ kex_input_newkeys(int type, u_int32_t seq, void *ctxt) + ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_protocol_error); + if ((r = sshpkt_get_end(ssh)) != 0) + return r; ++ if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0) ++ return r; + kex->done = 1; + sshbuf_reset(kex->peer); + /* sshbuf_reset(kex->my); */ +diff --git a/packet.c b/packet.c +index d6dad2d..f96566b 100644 +--- a/packet.c ++++ b/packet.c +@@ -38,7 +38,7 @@ + */ + + #include "includes.h" +- ++ + #include /* MIN roundup */ + #include + #include "openbsd-compat/sys-queue.h" +@@ -1907,9 +1907,7 @@ ssh_packet_read_poll2(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) + return r; + return SSH_ERR_PROTOCOL_ERROR; + } +- if (*typep == SSH2_MSG_NEWKEYS) +- r = ssh_set_newkeys(ssh, MODE_IN); +- else if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side) ++ if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side) + r = ssh_packet_enable_delayed_compress(ssh); + else + r = 0; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index a6e4b7c4c209..ea63e5609272 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { patches = [ + ./RH-1380296-NEWKEYS-null-pointer-deref.patch ./locale_archive.patch ./fix-host-key-algorithms-plus.patch diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/tools/security/enpass/data.json new file mode 100644 index 000000000000..4e245d1c80fc --- /dev/null +++ b/pkgs/tools/security/enpass/data.json @@ -0,0 +1,12 @@ +{ + "amd64": { + "path": "pool/main/e/enpass/enpass_5.3.0_amd64.deb", + "sha256": "d9da061c6456281da836bdd78bdb7baeced4b7f1805bb2495e4f1d15038cf86b", + "version": "5.3.0" + }, + "i386": { + "path": "pool/main/e/enpass/enpass_5.3.0_i386.deb", + "sha256": "58d9f3b83c2da477c13976e1826d112236eabd46a389de7e8767ee99ac41f469", + "version": "5.3.0" + } +} \ No newline at end of file diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix new file mode 100644 index 000000000000..b7f7282d2929 --- /dev/null +++ b/pkgs/tools/security/enpass/default.nix @@ -0,0 +1,106 @@ +{stdenv, system, fetchurl, dpkg, openssl, xorg +, glib, mesa, libpulseaudio, zlib, dbus, fontconfig, freetype +, gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig +, makeWrapper , makeDesktopItem, python, pythonPackages, lib}: +assert system == "i686-linux" || system == "x86_64-linux"; +let + all_data = (with builtins; fromJSON (readFile ./data.json)); + system_map = { + i686-linux = "i386"; + x86_64-linux = "amd64"; + }; + + data = (with builtins; getAttr (getAttr system system_map) all_data); + + baseUrl = http://repo.sinew.in; + + # used of both wrappers and libpath + libPath = lib.makeLibraryPath (with xorg; [ + openssl + mesa + fontconfig + freetype + libpulseaudio + zlib + dbus + libX11 + libXi + libSM + libICE + libXext + libXrender + libXScrnSaver + glib + gtk2 + pango + cairo + atk + gdk_pixbuf + jasper + stdenv.cc.cc + ]); + package = stdenv.mkDerivation rec { + + inherit (data) version; + name = "enpass-${version}"; + + desktopItem = makeDesktopItem { + name = "Enpass"; + exec = "$out/bin/Enpass"; + #icon = "Enpass"; + desktopName = "Enpass"; + genericName = "Password manager"; + categories = "Application;Security;"; + }; + + + src = fetchurl { + inherit (data) sha256; + url = "${baseUrl}/${data.path}"; + }; + + meta = { + description = "a well known password manager"; + homepage = https://www.enpass.io/; + maintainer = lib.maintainers.ronny; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + }; + + buildInputs = [makeWrapper dpkg]; + phases = [ "unpackPhase" "installPhase" ]; + + unpackPhase = "dpkg -X $src ."; + installPhase='' + mkdir $out + cp -r opt/Enpass/* $out + + # Make desktop item + mkdir -p "$out"/share/applications + cp "$desktopItem"/share/applications/* "$out"/share/applications/ + mkdir -p "$out"/share/icons + + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/bin/Enpass + + wrapProgram $out/bin/Enpass \ + --set LD_LIBRARY_PATH "${libPath}:$out/lib:$out/plugins/sqldrivers" \ + --set QT_PLUGIN_PATH "$out/plugins" \ + --set QT_QPA_PLATFORM_PLUGIN_PATH "$out/plugins/platforms" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" + ''; + }; + updater = { + update = stdenv.mkDerivation rec { + name = "enpass-update-script"; + SCRIPT =./update_script.py; + + buildInputs = with pythonPackages; [python requests pathlib2 six attrs ]; + shellHook = '' + exec python $SCRIPT --target pkgs/tools/security/enpass/data.json --repo ${baseUrl} + ''; + + }; + }; +in (package // {refresh = updater;}) diff --git a/pkgs/tools/security/enpass/update_script.py b/pkgs/tools/security/enpass/update_script.py new file mode 100644 index 000000000000..f8ec715cb5e4 --- /dev/null +++ b/pkgs/tools/security/enpass/update_script.py @@ -0,0 +1,95 @@ +from __future__ import print_function + + +import argparse +import bz2 +import email +import json +import logging + +from itertools import product +from operator import itemgetter + +import attr +import pkg_resources + +from pathlib2 import Path +from requests import Session +from six.moves.urllib_parse import urljoin + + +@attr.s +class ReleaseElement(object): + sha256 = attr.ib(repr=False) + size = attr.ib(convert=int) + path = attr.ib() + +log = logging.getLogger('enpass.updater') + + +parser = argparse.ArgumentParser() +parser.add_argument('--repo') +parser.add_argument('--target', type=Path) + + +session = Session() + + +def parse_bz2_msg(msg): + msg = bz2.decompress(msg) + if '\n\n' in msg: + parts = msg.split('\n\n') + return list(map(email.message_from_string, parts)) + return email.message_from_string(msg) + + +def fetch_meta(repo, name, parse=email.message_from_string, split=False): + url = urljoin(repo, 'dists/stable', name) + response = session.get("{repo}/dists/stable/{name}".format(**locals())) + return parse(response.content) + + +def fetch_filehashes(repo, path): + meta = fetch_meta(repo, path, parse=parse_bz2_msg) + for item in meta: + yield { + 'version': pkg_resources.parse_version(str(item['Version'])), + 'path': item['Filename'], + 'sha256': item['sha256'], + } + + +def fetch_archs(repo): + m = fetch_meta(repo, 'Release') + + architectures = m['Architectures'].split() + elements = [ReleaseElement(*x.split()) for x in m['SHA256'].splitlines()] + elements = [x for x in elements if x.path.endswith('bz2')] + + for arch, elem in product(architectures, elements): + if arch in elem.path: + yield arch, max(fetch_filehashes(repo, elem.path), + key=itemgetter('version')) + + +class OurVersionEncoder(json.JSONEncoder): + def default(self, obj): + # the other way around to avoid issues with + # newer setuptools having strict/legacy versions + if not isinstance(obj, (dict, str)): + return str(obj) + return json.JSONEncoder.default(self, obj) + + +def main(repo, target): + logging.basicConfig(level=logging.DEBUG) + with target.open(mode='wb') as fp: + json.dump( + dict(fetch_archs(repo)), fp, + cls=OurVersionEncoder, + indent=2, + sort_keys=True) + + +opts = parser.parse_args() +main(opts.repo, opts.target) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 46fa8a580e15..d6fccb7647e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -287,7 +287,7 @@ in inherit kernel rootModules allowMissing; }; - nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; }; + nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackagesNg) inherit-local; }; pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; @@ -497,6 +497,8 @@ in elvish = callPackage ../shells/elvish { }; + enpass = callPackage ../tools/security/enpass { }; + genymotion = callPackage ../development/mobile/genymotion { }; grc = callPackage ../tools/misc/grc { }; @@ -2250,6 +2252,8 @@ in less = callPackage ../tools/misc/less { }; + lhasa = callPackage ../tools/compression/lhasa {}; + libcpuid = callPackage ../tools/misc/libcpuid { }; lesspipe = callPackage ../tools/misc/lesspipe { }; @@ -7083,6 +7087,7 @@ in cpp-hocon = callPackage ../development/libraries/cpp-hocon { }; cpp-netlib = callPackage ../development/libraries/cpp-netlib { }; + uri = callPackage ../development/libraries/uri { }; cppcms = callPackage ../development/libraries/cppcms { }; @@ -8785,7 +8790,6 @@ in mesa_drivers = mesaDarwinOr ( let mo = mesa_noglu.override { grsecEnabled = config.grsecurity or false; - wayland = wayland_1_9; # work-around for #16779 }; in mo.drivers ); @@ -9901,6 +9905,8 @@ in czmq = callPackage ../development/libraries/czmq { }; + czmqpp = callPackage ../development/libraries/czmqpp { }; + zimlib = callPackage ../development/libraries/zimlib { }; zita-convolver = callPackage ../development/libraries/audio/zita-convolver { }; @@ -11183,6 +11189,15 @@ in ]; }; + linux_3_14 = callPackage ../os-specific/linux/kernel/linux-3.14.nix { + kernelPatches = [ kernelPatches.bridge_stp_helper ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_3_18 = callPackage ../os-specific/linux/kernel/linux-3.18.nix { kernelPatches = [ kernelPatches.bridge_stp_helper ] ++ lib.optionals ((platform.kernelArch or null) == "mips") @@ -11229,6 +11244,22 @@ in ]; }; + linux_4_8 = callPackage ../os-specific/linux/kernel/linux-4.8.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + # !!! 4.7 patch doesn't apply, 4.8 patch not up yet, will keep checking + # kernelPatches.cpu-cgroup-v2."4.7" + kernelPatches.modinst_arg_list_too_long + ] + ++ lib.optionals ((platform.kernelArch or null) == "mips") + [ kernelPatches.mips_fpureg_emu + kernelPatches.mips_fpu_sigill + kernelPatches.mips_ext3_n32 + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -11270,6 +11301,8 @@ in acpi_call = callPackage ../os-specific/linux/acpi-call {}; + amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; + batman_adv = callPackage ../os-specific/linux/batman-adv {}; bcc = callPackage ../os-specific/linux/bcc { }; @@ -11382,7 +11415,7 @@ in linux = self.linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = self.linuxPackages_4_7; + linuxPackages_latest = self.linuxPackages_4_8; linux_latest = self.linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -11391,10 +11424,12 @@ in linuxPackages_3_10 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_10 linuxPackages_3_10); linuxPackages_3_10_tuxonice = self.linuxPackagesFor self.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; linuxPackages_3_12 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_12 linuxPackages_3_12); + linuxPackages_3_14 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_12 linuxPackages_3_14); linuxPackages_3_18 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_18 linuxPackages_3_18); linuxPackages_4_1 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_1 linuxPackages_4_1); linuxPackages_4_4 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_4 linuxPackages_4_4); linuxPackages_4_7 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_7 linuxPackages_4_7); + linuxPackages_4_8 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_8 linuxPackages_4_8); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. @@ -15369,7 +15404,9 @@ in gtk = gtk2; }; - kodiPlain = callPackage ../applications/video/kodi { }; + kodiPlain = callPackage ../applications/video/kodi { + libva = libva-full; + }; xbmcPlain = self.kodiPlain; kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d914bb14f85a..c80ee76c8583 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3608,6 +3608,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; sha256 = "4049afd175e315ebcab945b19030aec40bcec46cc5611b0286a5a267ca7181ef"; }; + patches = [ ../development/perl-modules/dbiclassx-fix.patch ]; # Remove after next release buildInputs = [ DBDSQLite PackageStash SQLTranslator TestDeep TestException TestWarn ]; propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName TryTiny namespaceclean ]; meta = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ccc4ef6e880c..0e4e54bec78c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5127,16 +5127,16 @@ in modules // { libtmux = buildPythonPackage rec { name = "libtmux-${version}"; - version = "0.5.0"; + version = "0.6.0"; src = pkgs.fetchurl { url = "mirror://pypi/l/libtmux/${name}.tar.gz"; - sha256 = "0fwydaahgflz9w753v1cmkfzrlfq1vb8zp4i20m2d3lvkm4crv93"; + sha256 = "117savw47c2givq9vxr5m02nyxmsk34l2ihxyy5axlaiqyxyf20s"; }; buildInputs = with self; [ pytest ]; patchPhase = '' - sed -i 's/==2.9.1//' requirements/test.txt + sed -i 's/==.*$//' requirements/test.txt ''; meta = with stdenv.lib; { @@ -9220,12 +9220,12 @@ in modules // { django_1_10 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.10.1"; + version = "1.10.2"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz"; - sha256 = "1wr438yykg0m5s9xini36hc826di55jm6by8syplczxnbjrcbrnn"; + sha256 = "1qdwgkwlq5wl0wn247d9gid49xpz4qggk0lcdqxq8d7v1cmg29z1"; }; patches = [ @@ -17599,8 +17599,14 @@ in modules // { buildInputs = with self; [ mock scripttest virtualenv pretend pytest ]; # Pip wants pytest, but tests are not distributed doCheck = false; - }; + meta = { + description = "The PyPA recommended tool for installing Python packages"; + license = licenses.mit; + homepage = https://pip.pypa.io/; + priority = 10; + }; + }; pika = buildPythonPackage rec { name = "pika-${version}"; @@ -22210,26 +22216,7 @@ in modules // { }; }; - sockjs-tornado = buildPythonPackage rec { - name = "sockjs-tornado-${version}"; - version = "1.0.2"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz"; - sha256 = "15lcy40h2cm0l8aknbrk48p2sni5wzybsqjx1hxwpk9lfa1xryyv"; - }; - - # This is needed for compatibility with OctoPrint - propagatedBuildInputs = with self; [ tornado_4_0_1 ]; - - meta = { - description = "SockJS python server implementation on top of Tornado framework"; - homepage = http://github.com/mrjoes/sockjs-tornado/; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ abbradar ]; - }; - }; sopel = buildPythonPackage rec { name = "sopel-6.3.1"; @@ -24322,34 +24309,25 @@ in modules // { }; }; - twisted_11 = buildPythonPackage rec { - # NOTE: When updating please check if new versions still cause issues - # to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem) - disabled = isPy3k; + twine = buildPythonPackage rec { + name = "twine-${version}"; + version = "1.8.1"; - name = "Twisted-13.2.0"; src = pkgs.fetchurl { - url = "mirror://pypi/T/Twisted/${name}.tar.bz2"; - sha256 = "1wrcqv5lvgwk2aq83qb2s2ng2vx14hbjjk2gc30cg6h1iiipal89"; + url = "mirror://pypi/t/twine/${name}.tar.gz"; + sha256 = "68b663691a947b844f92853c992d42bb68b6333bffc9ab7f661346b001c1da82"; }; - propagatedBuildInputs = with self; [ zope_interface ]; + propagatedBuildInputs = with self; [ clint pkginfo requests2 requests_toolbelt ]; - # Generate Twisted's plug-in cache. Twited users must do it as well. See - # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 - # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for - # details. - postInstall = "$out/bin/twistd --help > /dev/null"; + # Requires network + doCheck = false; meta = { - homepage = http://twistedmatrix.com/; - description = "Twisted, an event-driven networking engine written in Python"; - longDescription = '' - Twisted is an event-driven networking engine written in Python - and licensed under the MIT license. - ''; - license = licenses.mit; - maintainers = [ ]; + description = "Collection of utilities for interacting with PyPI"; + homepage = https://github.com/pypa/twine; + license = licenses.asl20; + maintainer = with maintainers; [ fridh ]; }; }; @@ -26069,7 +26047,7 @@ in modules // { tornado = buildPythonPackage rec { name = "tornado-${version}"; - version = "4.4.1"; + version = "4.4.2"; propagatedBuildInputs = with self; [ backports_abc backports_ssl_match_hostname_3_4_0_2 certifi singledispatch ]; @@ -26081,19 +26059,7 @@ in modules // { src = pkgs.fetchurl { url = "mirror://pypi/t/tornado/${name}.tar.gz"; - sha256 = "371d0cf3d56c47accc66116a77ad558d76eebaa8458a6b677af71ca606522146"; - }; - }; - - tornado_4_0_1 = buildPythonPackage rec { - name = "tornado-${version}"; - version = "4.0.1"; - - propagatedBuildInputs = with self; [ backports_ssl_match_hostname_3_4_0_2 certifi ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tornado/${name}.tar.gz"; - sha256 = "00crp5vnasxg7qyjv89qgssb69vd7qr13jfghdryrcbnn9l8c1df"; + sha256 = "1k7d90afm5pivam90a37nqiz9wlmakvnsfymp3p43kcqz29gk618"; }; }; @@ -26945,12 +26911,12 @@ in modules // { IMAPClient = buildPythonPackage rec { name = "IMAPClient-${version}"; - version = "0.11"; + version = "0.13"; disabled = isPy34 || isPy35; src = pkgs.fetchurl { url = "http://freshfoo.com/projects/IMAPClient/${name}.tar.gz"; - sha256 = "1w54h8gz25qf6ggazzp6xf7kvsyiadsjfkkk17gm0p6pmzvvccbn"; + sha256 = "0v7kd1crdbff0rmh4ddm5qszkis6hpk9084qh94al8h7g4y9l3is"; }; buildInputs = with self; [ mock ];