diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 174eced43c2..df7a442ac52 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -16,6 +16,7 @@ amiddelk = "Arie Middelkoop "; amorsillo = "Andrew Morsillo "; AndersonTorres = "Anderson Torres "; + anderspapitto = "Anders Papitto "; andres = "Andres Loeh "; antono = "Antono Vasiljev "; ardumont = "Antoine R. Dumont "; @@ -79,6 +80,7 @@ fluffynukeit = "Daniel Austin "; forkk = "Andrew Okin "; fpletz = "Franz Pletz "; + fro_ozen = "fro_ozen "; ftrvxmtrx = "Siarhei Zirukin "; funfunctor = "Edward O'Callaghan "; fuuzetsu = "Mateusz Kowalczyk "; @@ -186,6 +188,7 @@ rickynils = "Rickard Nilsson "; rob = "Rob Vermaas "; robberer = "Longrin Wischnewski "; + robbinch = "Robbin C. "; roconnor = "Russell O'Connor "; roelof = "Roelof Wobben "; romildo = "José Romildo Malaquias "; diff --git a/lib/modules.nix b/lib/modules.nix index dcede0c46c6..3561dd0d1d3 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -17,6 +17,10 @@ rec { evalModules) and the less declarative the module set is. */ evalModules = { modules , prefix ? [] + , # This should only be used for special arguments that need to be evaluated + # when resolving module structure (like in imports). For everything else, + # there's _module.args. + specialArgs ? {} , # This would be remove in the future, Prefer _module.args option instead. args ? {} , # This would be remove in the future, Prefer _module.check option instead. @@ -51,7 +55,7 @@ rec { }; }; - closed = closeModules (modules ++ [ internalModule ]) { inherit config options; lib = import ./.; }; + closed = closeModules (modules ++ [ internalModule ]) (specialArgs // { inherit config options; lib = import ./.; }); # Note: the list of modules is reversed to maintain backward # compatibility with the old module system. Not sure if this is @@ -118,7 +122,7 @@ rec { config = removeAttrs m ["key" "_file" "require" "imports"]; }; - applyIfFunction = f: arg@{ config, options, lib }: if isFunction f then + applyIfFunction = f: arg@{ config, options, lib, ... }: if isFunction f then let # Module arguments are resolved in a strict manner when attribute set # deconstruction is used. As the arguments are now defined with the diff --git a/nixos/doc/manual/installation/installing-uefi.xml b/nixos/doc/manual/installation/installing-uefi.xml index dbd5606c4a5..90d18695447 100644 --- a/nixos/doc/manual/installation/installing-uefi.xml +++ b/nixos/doc/manual/installation/installing-uefi.xml @@ -41,10 +41,6 @@ changes: and as well. - - To see console messages during early boot, add "fbcon" - to your . - diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index adacbd0863e..97cb85a957f 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -47,6 +47,7 @@ in rec { inherit prefix check; modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ]; args = extraArgs; + specialArgs = { modulesPath = ../modules; }; }) config options; # These are the extra arguments passed to every module. In diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index db2c1a68692..6df8ddb9e95 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -21,7 +21,7 @@ sub new { my ($class, $args) = @_; my $startCommand = $args->{startCommand}; - + my $name = $args->{name}; if (!$name) { $startCommand =~ /run-(.*)-vm$/ if defined $startCommand; @@ -34,7 +34,7 @@ sub new { "qemu-kvm -m 384 " . "-net nic,model=virtio \$QEMU_OPTS "; my $iface = $args->{hdaInterface} || "virtio"; - $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=$iface,boot=on,werror=report " + $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=$iface,werror=report " if defined $args->{hda}; $startCommand .= "-cdrom $args->{cdrom} " if defined $args->{cdrom}; @@ -171,7 +171,7 @@ sub start { eval { local $SIG{CHLD} = sub { die "QEMU died prematurely\n"; }; - + # Wait until QEMU connects to the monitor. accept($self->{monitor}, $monitorS) or die; @@ -182,11 +182,11 @@ sub start { $self->{socket}->autoflush(1); }; die "$@" if $@; - + $self->waitForMonitorPrompt; $self->log("QEMU running (pid $pid)"); - + $self->{pid} = $pid; $self->{booted} = 1; } @@ -241,7 +241,7 @@ sub connect { alarm 300; readline $self->{socket} or die "the VM quit before connecting\n"; alarm 0; - + $self->log("connected to guest root shell"); $self->{connected} = 1; @@ -270,7 +270,7 @@ sub isUp { sub execute_ { my ($self, $command) = @_; - + $self->connect; print { $self->{socket} } ("( $command ); echo '|!=EOF' \$?\n"); @@ -453,7 +453,7 @@ sub shutdown { sub crash { my ($self) = @_; return unless $self->{booted}; - + $self->log("forced crash"); $self->sendMonitorCommand("quit"); diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index f2aacf9b292..3622b21626b 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -43,7 +43,7 @@ in consoleFont = mkOption { type = types.str; - default = "lat9w-16"; + default = "Lat2-Terminus16"; example = "LatArCyrHeb-16"; description = '' The font used for the virtual consoles. Leave empty to use diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 566130feb6d..bd010738500 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -12,7 +12,7 @@ let # Forces 32bit pulseaudio and alsaPlugins to be built/supported for apps # using 32bit alsa on 64bit linux. - enable32BitAlsaPlugins = stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.libpulseaudio != null); + enable32BitAlsaPlugins = cfg.support32Bit && stdenv.isx86_64 && (pkgs_i686.alsaLib != null && pkgs_i686.libpulseaudio != null); ids = config.ids; @@ -78,6 +78,12 @@ in { ''; }; + support32Bit = mkOption { + type = types.bool; + default = false; + description = "no"; + }; + configFile = mkOption { type = types.path; description = '' diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 446d79ce220..bc3bd872d2a 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -7,8 +7,7 @@ with lib; { imports = - [ ./channel.nix - ./iso-image.nix + [ ./iso-image.nix # Profiles of this basic installation CD. ../../profiles/all-hardware.nix @@ -21,18 +20,6 @@ with lib; isoImage.volumeID = substring 0 11 "NIXOS_ISO"; - # Make the installer more likely to succeed in low memory - # environments. The kernel's overcommit heustistics bite us - # fairly often, preventing processes such as nix-worker or - # download-using-manifests.pl from forking even if there is - # plenty of free memory. - boot.kernel.sysctl."vm.overcommit_memory" = "1"; - - # To speed up installation a little bit, include the complete stdenv - # in the Nix store on the CD. Archive::Cpio is needed for the - # initrd builder. - isoImage.storeContents = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio ]; - # EFI booting isoImage.makeEfiBootable = true; @@ -42,9 +29,6 @@ with lib; # Add Memtest86+ to the CD. boot.loader.grub.memtest86.enable = true; - # Get a console as soon as the initrd loads fbcon on EFI boot. - boot.initrd.kernelModules = [ "fbcon" ]; - # Allow the user to log in as root without a password. users.extraUsers.root.initialHashedPassword = ""; } diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix index f34e789e28c..4641b8fcf9d 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix @@ -1,14 +1,11 @@ # This module defines a small NixOS installation CD. It does not # contain any graphical stuff. -{ config, pkgs, lib, ... }: +{ config, lib, ... }: { imports = [ ./installation-cd-base.nix ../../profiles/minimal.nix ]; - - # Enable in installer, even if minimal profile disables it - services.nixosManual.enable = lib.mkOverride 999 true; } diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index ec3137ede4f..a929e1eb826 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -495,7 +495,7 @@ $bootLoaderConfig # Select internationalisation properties. # i18n = { - # consoleFont = "lat9w-16"; + # consoleFont = "Lat2-Terminus16"; # consoleKeyMap = "us"; # defaultLocale = "en_US.UTF-8"; # }; diff --git a/nixos/modules/misc/extra-arguments.nix b/nixos/modules/misc/extra-arguments.nix index c2c8903546d..ff2ff7cd432 100644 --- a/nixos/modules/misc/extra-arguments.nix +++ b/nixos/modules/misc/extra-arguments.nix @@ -2,8 +2,6 @@ { _module.args = { - modulesPath = ../.; - pkgs_i686 = import ../../lib/nixpkgs.nix { system = "i686-linux"; config.allowUnfree = true; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index cc1976e236b..d283a633734 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -217,6 +217,9 @@ asterisk = 192; plex = 193; bird = 195; + grafana = 196; + skydns = 197; + ripple-rest = 198; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -412,6 +415,9 @@ plex = 193; sabnzbd = 194; bird = 195; + #grafana = 196; #unused + #skydns = 197; #unused + #ripple-rest = 198; #unused # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d7b8b34aefe..d33d3ca91d4 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -212,6 +212,7 @@ ./services/misc/plex.nix ./services/misc/redmine.nix ./services/misc/rippled.nix + ./services/misc/ripple-rest.nix ./services/misc/ripple-data-api.nix ./services/misc/rogue.nix ./services/misc/siproxd.nix @@ -225,6 +226,7 @@ ./services/monitoring/collectd.nix ./services/monitoring/das_watchdog.nix ./services/monitoring/dd-agent.nix + ./services/monitoring/grafana.nix ./services/monitoring/graphite.nix ./services/monitoring/monit.nix ./services/monitoring/munin.nix @@ -317,6 +319,7 @@ ./services/networking/sabnzbd.nix ./services/networking/searx.nix ./services/networking/seeks.nix + ./services/networking/skydns.nix ./services/networking/spiped.nix ./services/networking/sslh.nix ./services/networking/ssh/lshd.nix diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index a41d17e5182..946032781f4 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -1,5 +1,5 @@ # Provide a basic configuration for installation devices like CDs. -{ config, lib, ... }: +{ config, pkgs, lib, ... }: with lib; @@ -13,10 +13,17 @@ with lib; # Allow "nixos-rebuild" to work properly by providing # /etc/nixos/configuration.nix. ./clone-config.nix + + # Include a copy of Nixpkgs so that nixos-install works out of + # the box. + ../installer/cd-dvd/channel.nix ]; config = { + # Enable in installer, even if the minimal profile disables it. + services.nixosManual.enable = mkForce true; + # Show the manual. services.nixosManual.showManual = true; @@ -43,7 +50,7 @@ with lib; systemd.services.sshd.wantedBy = mkOverride 50 []; # Enable wpa_supplicant, but don't start it by default. - networking.wireless.enable = true; + networking.wireless.enable = mkDefault true; jobs.wpa_supplicant.startOn = mkOverride 50 ""; # Tell the Nix evaluator to garbage collect more aggressively. @@ -51,5 +58,17 @@ with lib; # (yet) have swap set up. environment.variables.GC_INITIAL_HEAP_SIZE = "100000"; + # Make the installer more likely to succeed in low memory + # environments. The kernel's overcommit heustistics bite us + # fairly often, preventing processes such as nix-worker or + # download-using-manifests.pl from forking even if there is + # plenty of free memory. + boot.kernel.sysctl."vm.overcommit_memory" = "1"; + + # To speed up installation a little bit, include the complete + # stdenv in the Nix store on the CD. Archive::Cpio is needed for + # the initrd builder. + system.extraDependencies = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio ]; + }; } diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index 6a775bb159f..a7f4ec7b008 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -286,7 +286,7 @@ in { clusterDomain = mkOption { description = "Use alternative domain."; - default = ""; + default = "kubernetes.io"; type = types.str; }; @@ -322,13 +322,35 @@ in { type = types.str; }; }; + + kube2sky = { + enable = mkEnableOption "Whether to enable kube2sky dns service."; + + domain = mkOption { + description = "Kuberntes kube2sky domain under which all DNS names will be hosted."; + default = cfg.kubelet.clusterDomain; + type = types.str; + }; + + master = mkOption { + description = "Kubernetes apiserver address"; + default = "${cfg.apiserver.address}:${toString cfg.apiserver.port}"; + type = types.str; + }; + + extraOpts = mkOption { + description = "Kubernetes kube2sky extra command line options."; + default = ""; + type = types.str; + }; + }; }; ###### implementation config = mkMerge [ (mkIf cfg.apiserver.enable { - systemd.services.kubernetes-apiserver = { + systemd.services.kube-apiserver = { description = "Kubernetes Api Server"; wantedBy = [ "multi-user.target" ]; requires = ["kubernetes-setup.service"]; @@ -343,26 +365,25 @@ in { (concatImapStringsSep "\n" (i: v: v + "," + (toString i)) (mapAttrsToList (name: token: token + "," + name) cfg.apiserver.tokenAuth)); in ''${cfg.package}/bin/kube-apiserver \ - --etcd_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \ - --address=${cfg.apiserver.address} \ - --port=${toString cfg.apiserver.port} \ - --read_only_port=${toString cfg.apiserver.readOnlyPort} \ - --public_address_override=${cfg.apiserver.publicAddress} \ - --allow_privileged=${if cfg.apiserver.allowPrivileged then "true" else "false"} \ + --etcd-servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \ + --insecure-bind-address=${cfg.apiserver.address} \ + --insecure-port=${toString cfg.apiserver.port} \ + --read-only-port=${toString cfg.apiserver.readOnlyPort} \ + --bind-address=${cfg.apiserver.publicAddress} \ + --allow-privileged=${if cfg.apiserver.allowPrivileged then "true" else "false"} \ ${optionalString (cfg.apiserver.tlsCertFile!="") - "--tls_cert_file=${cfg.apiserver.tlsCertFile}"} \ + "--tls-cert-file=${cfg.apiserver.tlsCertFile}"} \ ${optionalString (cfg.apiserver.tlsPrivateKeyFile!="") - "--tls_private_key_file=${cfg.apiserver.tlsPrivateKeyFile}"} \ + "--tls-private-key-file=${cfg.apiserver.tlsPrivateKeyFile}"} \ ${optionalString (cfg.apiserver.tokenAuth!=[]) - "--token_auth_file=${tokenAuthFile}"} \ - --authorization_mode=${cfg.apiserver.authorizationMode} \ + "--token-auth-file=${tokenAuthFile}"} \ + --authorization-mode=${cfg.apiserver.authorizationMode} \ ${optionalString (cfg.apiserver.authorizationMode == "ABAC") - "--authorization_policy_file=${authorizationPolicyFile}"} \ - --secure_port=${toString cfg.apiserver.securePort} \ - --portal_net=${cfg.apiserver.portalNet} \ + "--authorization-policy-file=${authorizationPolicyFile}"} \ + --secure-port=${toString cfg.apiserver.securePort} \ + --service-cluster-ip-range=${cfg.apiserver.portalNet} \ --logtostderr=true \ - --runtime_config=api/v1beta3 \ - ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ + ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \ ${cfg.apiserver.extraOpts} ''; User = "kubernetes"; @@ -376,7 +397,7 @@ in { }) (mkIf cfg.scheduler.enable { - systemd.services.kubernetes-scheduler = { + systemd.services.kube-scheduler = { description = "Kubernetes Scheduler Service"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" "kubernetes-apiserver.service" ]; @@ -386,7 +407,7 @@ in { --port=${toString cfg.scheduler.port} \ --master=${cfg.scheduler.master} \ --logtostderr=true \ - ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ + ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \ ${cfg.scheduler.extraOpts} ''; User = "kubernetes"; @@ -395,7 +416,7 @@ in { }) (mkIf cfg.controllerManager.enable { - systemd.services.kubernetes-controller-manager = { + systemd.services.kube-controller-manager = { description = "Kubernetes Controller Manager Service"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" "kubernetes-apiserver.service" ]; @@ -406,7 +427,7 @@ in { --master=${cfg.controllerManager.master} \ --machines=${concatStringsSep "," cfg.controllerManager.machines} \ --logtostderr=true \ - ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ + ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \ ${cfg.controllerManager.extraOpts} ''; User = "kubernetes"; @@ -415,7 +436,7 @@ in { }) (mkIf cfg.kubelet.enable { - systemd.services.kubernetes-kubelet = { + systemd.services.kubelet = { description = "Kubernetes Kubelet Service"; wantedBy = [ "multi-user.target" ]; requires = ["kubernetes-setup.service"]; @@ -423,17 +444,17 @@ in { script = '' export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH" exec ${cfg.package}/bin/kubelet \ - --api_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.kubelet.apiServers} \ + --api-servers=${concatMapStringsSep "," (f: "http://${f}") cfg.kubelet.apiServers} \ --address=${cfg.kubelet.address} \ --port=${toString cfg.kubelet.port} \ - --hostname_override=${cfg.kubelet.hostname} \ - --allow_privileged=${if cfg.kubelet.allowPrivileged then "true" else "false"} \ - --root_dir=${cfg.dataDir} \ + --hostname-override=${cfg.kubelet.hostname} \ + --allow-privileged=${if cfg.kubelet.allowPrivileged then "true" else "false"} \ + --root-dir=${cfg.dataDir} \ --cadvisor_port=${toString cfg.kubelet.cadvisorPort} \ ${optionalString (cfg.kubelet.clusterDns != "") - ''--cluster_dns=${cfg.kubelet.clusterDns}''} \ + ''--cluster-dns=${cfg.kubelet.clusterDns}''} \ ${optionalString (cfg.kubelet.clusterDomain != "") - ''--cluster_domain=${cfg.kubelet.clusterDomain}''} \ + ''--cluster-domain=${cfg.kubelet.clusterDomain}''} \ --logtostderr=true \ ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ ${cfg.kubelet.extraOpts} @@ -443,26 +464,49 @@ in { }) (mkIf cfg.proxy.enable { - systemd.services.kubernetes-proxy = { + systemd.services.kube-proxy = { description = "Kubernetes Proxy Service"; wantedBy = [ "multi-user.target" ]; after = [ "network-interfaces.target" "etcd.service" ]; serviceConfig = { ExecStart = ''${cfg.package}/bin/kube-proxy \ --master=${cfg.proxy.master} \ - --bind_address=${cfg.proxy.address} \ + --bind-address=${cfg.proxy.address} \ --logtostderr=true \ - ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \ + ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \ ${cfg.proxy.extraOpts} ''; }; }; }) + (mkIf cfg.kube2sky.enable { + systemd.services.kube2sky = { + description = "Kubernetes Dns Bridge Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "skydns.service" "etcd.service" "kubernetes-apiserver.service" ]; + serviceConfig = { + ExecStart = ''${cfg.package}/bin/kube2sky \ + -etcd-server=http://${head cfg.etcdServers} \ + -domain=${cfg.kube2sky.domain} \ + -kube_master_url=http://${cfg.kube2sky.master} \ + -logtostderr=true \ + ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \ + ${cfg.kube2sky.extraOpts} + ''; + User = "kubernetes"; + }; + }; + + services.skydns.enable = mkDefault true; + services.skydns.domain = mkDefault cfg.kubelet.clusterDomain; + }) + (mkIf (any (el: el == "master") cfg.roles) { services.kubernetes.apiserver.enable = mkDefault true; services.kubernetes.scheduler.enable = mkDefault true; services.kubernetes.controllerManager.enable = mkDefault true; + services.kubernetes.kube2sky.enable = mkDefault true; }) (mkIf (any (el: el == "node") cfg.roles) { diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index b5919047cc1..1cdecedfc77 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -180,7 +180,8 @@ in chown -R ${cfg.user} ${cfg.pidDir} # Make the socket directory - mkdir -m 0755 -p /run/mysqld + mkdir -p /run/mysqld + chmod 0755 /run/mysqld chown -R ${cfg.user} /run/mysqld ''; diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 839da7407ef..24bcc6bb57c 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -380,6 +380,7 @@ in ${pkgs.coreutils}/bin/chmod -R ug+rwX /var/postfix/queue ${pkgs.coreutils}/bin/chown root:root /var/spool/mail ${pkgs.coreutils}/bin/chmod a+rwxt /var/spool/mail + ${pkgs.coreutils}/bin/ln -sf /var/spool/mail /var/mail ln -sf "${pkgs.postfix}/share/postfix/conf/"* /var/postfix/conf diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix index d25fd13a77d..f472e530a70 100644 --- a/nixos/modules/services/misc/docker-registry.nix +++ b/nixos/modules/services/misc/docker-registry.nix @@ -29,7 +29,7 @@ in { storagePath = mkOption { type = types.path; - default = "/var/lib/docker/registry"; + default = "/var/lib/docker-registry"; description = "Docker registry storage path."; }; @@ -61,14 +61,9 @@ in { User = "docker-registry"; Group = "docker"; PermissionsStartOnly = true; + WorkingDirectory = cfg.storagePath; }; - preStart = '' - mkdir -p ${cfg.storagePath} - if [ "$(id -u)" = 0 ]; then - chown -R docker-registry:docker ${cfg.storagePath} - fi - ''; postStart = '' until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/'; do sleep 1; @@ -77,6 +72,10 @@ in { }; users.extraGroups.docker.gid = mkDefault config.ids.gids.docker; - users.extraUsers.docker-registry.uid = config.ids.uids.docker-registry; + users.extraUsers.docker-registry = { + createHome = true; + home = cfg.storagePath; + uid = config.ids.uids.docker-registry; + }; }; } diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix index 23227548039..3f70bceb23b 100644 --- a/nixos/modules/services/misc/mediatomb.nix +++ b/nixos/modules/services/misc/mediatomb.nix @@ -49,10 +49,10 @@ let - /nix/store/cngbzn39vidd6jm4wgzxfafqll74ybfa-mediatomb-0.12.1/share/mediatomb/js/common.js - /nix/store/cngbzn39vidd6jm4wgzxfafqll74ybfa-mediatomb-0.12.1/share/mediatomb/js/playlists.js + ${pkgs.mediatomb}/share/mediatomb/js/common.js + ${pkgs.mediatomb}/share/mediatomb/js/playlists.js - /nix/store/cngbzn39vidd6jm4wgzxfafqll74ybfa-mediatomb-0.12.1/share/mediatomb/js/import.js + ${pkgs.mediatomb}/share/mediatomb/js/import.js diff --git a/nixos/modules/services/misc/mwlib.nix b/nixos/modules/services/misc/mwlib.nix index d02e1e021a7..a8edecff2a1 100644 --- a/nixos/modules/services/misc/mwlib.nix +++ b/nixos/modules/services/misc/mwlib.nix @@ -226,7 +226,7 @@ in chmod -Rc u=rwX,go= '${cfg.nslave.cachedir}' ''; - path = with pkgs; [ imagemagick ]; + path = with pkgs; [ imagemagick pdftk ]; environment = { PYTHONPATH = concatMapStringsSep ":" (m: "${pypkgs.${m}}/lib/${python.libPrefix}/site-packages") diff --git a/nixos/modules/services/misc/ripple-rest.nix b/nixos/modules/services/misc/ripple-rest.nix new file mode 100644 index 00000000000..dc07ee132fa --- /dev/null +++ b/nixos/modules/services/misc/ripple-rest.nix @@ -0,0 +1,110 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.rippleRest; + + configFile = pkgs.writeText "ripple-rest-config.json" (builtins.toJSON { + config_version = "2.0.3"; + debug = cfg.debug; + port = cfg.port; + host = cfg.host; + ssl_enabled = cfg.ssl.enable; + ssl = { + key_path = cfg.ssl.keyPath; + cert_path = cfg.ssl.certPath; + reject_unathorized = cfg.ssl.rejectUnathorized; + }; + db_path = cfg.dbPath; + max_transaction_fee = cfg.maxTransactionFee; + rippled_servers = cfg.rippleds; + }); + +in { + options.services.rippleRest = { + enable = mkEnableOption "Whether to enable ripple rest."; + + debug = mkEnableOption "Wheter to enable debug for ripple-rest."; + + host = mkOption { + description = "Ripple rest host."; + default = "localhost"; + type = types.str; + }; + + port = mkOption { + description = "Ripple rest port."; + default = 5990; + type = types.int; + }; + + ssl = { + enable = mkEnableOption "Whether to enable ssl."; + + keyPath = mkOption { + description = "Path to the ripple rest key file."; + default = null; + type = types.nullOr types.path; + }; + + + certPath = mkOption { + description = "Path to the ripple rest cert file."; + default = null; + type = types.nullOr types.path; + }; + + rejectUnathorized = mkOption { + description = "Whether to reject unatohroized."; + default = true; + type = types.bool; + }; + }; + + dbPath = mkOption { + description = "Ripple rest database path."; + default = "${cfg.dataDir}/ripple-rest.db"; + type = types.path; + }; + + maxTransactionFee = mkOption { + description = "Ripple rest max transaction fee."; + default = 1000000; + type = types.int; + }; + + rippleds = mkOption { + description = "List of rippled servers."; + default = [ + "wss://s1.ripple.com:443" + ]; + type = types.listOf types.str; + }; + + dataDir = mkOption { + description = "Ripple rest data directory."; + default = "/var/lib/ripple-rest"; + type = types.path; + }; + }; + + config = mkIf (cfg.enable) { + systemd.services.ripple-rest = { + wantedBy = [ "multi-user.target"]; + after = ["network.target" ]; + environment.NODE_PATH="${pkgs.ripple-rest}/lib/node_modules/ripple-rest/node_modules"; + serviceConfig = { + ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.ripple-rest}/lib/node_modules/ripple-rest/server/server.js --config ${configFile}"; + User = "ripple-rest"; + }; + }; + + users.extraUsers.postgres = { + name = "ripple-rest"; + uid = config.ids.uids.ripple-rest; + createHome = true; + home = cfg.dataDir; + }; + }; +} diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix index 03fcc003a40..045330eb551 100644 --- a/nixos/modules/services/misc/rippled.nix +++ b/nixos/modules/services/misc/rippled.nix @@ -27,7 +27,7 @@ let protocol=${concatStringsSep "," p.protocol} ${optionalString (p.user != "") "user=${p.user}"} ${optionalString (p.password != "") "user=${p.password}"} - admin=${if p.admin then "allow" else "no"} + admin=${concatStringsSep "," p.admin} ${optionalString (p.ssl.key != null) "ssl_key=${p.ssl.key}"} ${optionalString (p.ssl.cert != null) "ssl_cert=${p.ssl.cert}"} ${optionalString (p.ssl.chain != null) "ssl_chain=${p.ssl.chain}"} @@ -118,9 +118,9 @@ let }; admin = mkOption { - description = "Controls whether or not administrative commands are allowed."; - type = types.bool; - default = false; + description = "A comma-separated list of admin IP addresses."; + type = types.listOf types.str; + default = ["127.0.0.1"]; }; ssl = { @@ -156,7 +156,7 @@ let dbOptions = { type = mkOption { description = "Rippled database type."; - type = types.enum ["rocksdb" "nudb" "sqlite" "hyperleveldb"]; + type = types.enum ["rocksdb" "nudb"]; default = "rocksdb"; }; @@ -217,7 +217,7 @@ in default = { rpc = { port = 5005; - admin = true; + admin = ["127.0.0.1"]; protocol = ["http"]; }; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix new file mode 100644 index 00000000000..ef0cc68a535 --- /dev/null +++ b/nixos/modules/services/monitoring/grafana.nix @@ -0,0 +1,335 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.grafana; + + b2s = val: if val then "true" else "false"; + + cfgFile = pkgs.writeText "grafana.ini" '' + app_name = grafana + app_mode = production + + [server] + ; protocol (http or https) + protocol = ${cfg.protocol} + ; the ip address to bind to, empty will bind to all interfaces + http_addr = ${cfg.addr} + ; the http port to use + http_port = ${toString cfg.port} + ; The public facing domain name used to access grafana from a browser + domain = ${cfg.domain} + ; the full public facing url + root_url = ${cfg.rootUrl} + router_logging = false + ; the path relative to the binary where the static (html/js/css) files are placed + static_root_path = ${cfg.staticRootPath} + ; enable gzip + enable_gzip = false + ; https certs & key file + cert_file = ${cfg.certFile} + cert_key = ${cfg.certKey} + + [analytics] + # Server reporting, sends usage counters to stats.grafana.org every 24 hours. + # No ip addresses are being tracked, only simple counters to track + # running instances, dashboard and error counts. It is very helpful to us. + # Change this option to false to disable reporting. + reporting_enabled = true + ; Google Analytics universal tracking code, only enabled if you specify an id here + google_analytics_ua_id = + + [database] + ; Either "mysql", "postgres" or "sqlite3", it's your choice + type = ${cfg.database.type} + host = ${cfg.database.host} + name = ${cfg.database.name} + user = ${cfg.database.user} + password = ${cfg.database.password} + ; For "postgres" only, either "disable", "require" or "verify-full" + ssl_mode = disable + ; For "sqlite3" only + path = ${cfg.database.path} + + [session] + ; Either "memory", "file", "redis", "mysql", default is "memory" + provider = file + ; Provider config options + ; memory: not have any config yet + ; file: session file path, e.g. `data/sessions` + ; redis: config like redis server addr, poolSize, password, e.g. `127.0.0.1:6379,100,grafana` + ; mysql: go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1)/database_name` + provider_config = data/sessions + ; Session cookie name + cookie_name = grafana_sess + ; If you use session in https only, default is false + cookie_secure = false + ; Session life time, default is 86400 + session_life_time = 86400 + ; session id hash func, Either "sha1", "sha256" or "md5" default is sha1 + session_id_hashfunc = sha1 + ; Session hash key, default is use random string + session_id_hashkey = + + [security] + ; default admin user, created on startup + admin_user = ${cfg.security.adminUser} + ; default admin password, can be changed before first start of grafana, or in profile settings + admin_password = ${cfg.security.adminPassword} + ; used for signing + secret_key = ${cfg.security.secretKey} + ; Auto-login remember days + login_remember_days = 7 + cookie_username = grafana_user + cookie_remember_name = grafana_remember + + [users] + ; disable user signup / registration + allow_sign_up = ${b2s cfg.users.allowSignUp} + ; Allow non admin users to create organizations + allow_org_create = ${b2s cfg.users.allowOrgCreate} + # Set to true to automatically assign new users to the default organization (id 1) + auto_assign_org = ${b2s cfg.users.autoAssignOrg} + ; Default role new users will be automatically assigned (if disabled above is set to true) + auto_assign_org_role = ${cfg.users.autoAssignOrgRole} + + [auth.anonymous] + ; enable anonymous access + enabled = ${b2s cfg.auth.anonymous.enable} + ; specify organization name that should be used for unauthenticated users + org_name = Main Org. + ; specify role for unauthenticated users + org_role = Viewer + + [auth.github] + enabled = false + client_id = some_id + client_secret = some_secret + scopes = user:email + auth_url = https://github.com/login/oauth/authorize + token_url = https://github.com/login/oauth/access_token + + [auth.google] + enabled = false + client_id = some_client_id + client_secret = some_client_secret + scopes = https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email + auth_url = https://accounts.google.com/o/oauth2/auth + token_url = https://accounts.google.com/o/oauth2/token + + [log] + root_path = data/log + ; Either "console", "file", default is "console" + ; Use comma to separate multiple modes, e.g. "console, file" + mode = console + ; Buffer length of channel, keep it as it is if you don't know what it is. + buffer_len = 10000 + ; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace" + level = Info + + ; For "console" mode only + [log.console] + level = + + ; For "file" mode only + [log.file] + level = + ; This enables automated log rotate(switch of following options), default is true + log_rotate = true + ; Max line number of single file, default is 1000000 + max_lines = 1000000 + ; Max size shift of single file, default is 28 means 1 << 28, 256MB + max_lines_shift = 28 + ; Segment log daily, default is true + daily_rotate = true + ; Expired days of log file(delete after max days), default is 7 + max_days = 7 + + [event_publisher] + enabled = false + rabbitmq_url = amqp://localhost/ + exchange = grafana_events + ''; + +in { + options.services.grafana = { + enable = mkEnableOption "Whether to enable grafana."; + + protocol = mkOption { + description = "Which protocol to listen."; + default = "http"; + type = types.enum ["http" "https"]; + }; + + addr = mkOption { + description = "Listening address."; + default = "127.0.0.1"; + type = types.str; + }; + + port = mkOption { + description = "Listening port."; + default = 3000; + type = types.int; + }; + + domain = mkOption { + description = "The public facing domain name used to access grafana from a browser."; + default = "localhost"; + type = types.str; + }; + + rootUrl = mkOption { + description = "Full public facing url."; + default = "%(protocol)s://%(domain)s:%(http_port)s/"; + type = types.str; + }; + + certFile = mkOption { + description = "Cert file for ssl."; + default = ""; + type = types.str; + }; + + certKey = mkOption { + description = "Cert key for ssl."; + default = ""; + type = types.str; + }; + + staticRootPath = mkOption { + description = "Root path for static assets."; + default = "${cfg.package}/share/go/src/github.com/grafana/grafana/public"; + type = types.str; + }; + + package = mkOption { + description = "Package to use."; + default = pkgs.goPackages.grafana; + type = types.package; + }; + + dataDir = mkOption { + description = "Data directory."; + default = "/var/lib/grafana"; + type = types.path; + }; + + database = { + type = mkOption { + description = "Database type."; + default = "sqlite3"; + type = types.enum ["mysql" "sqlite3" "postgresql"]; + }; + + host = mkOption { + description = "Database host."; + default = "127.0.0.1:3306"; + type = types.str; + }; + + name = mkOption { + description = "Database name."; + default = "grafana"; + type = types.str; + }; + + user = mkOption { + description = "Database user."; + default = "root"; + type = types.str; + }; + + password = mkOption { + description = "Database password."; + default = ""; + type = types.str; + }; + + path = mkOption { + description = "Database path."; + default = "${cfg.dataDir}/data/grafana.db"; + type = types.path; + }; + }; + + security = { + adminUser = mkOption { + description = "Default admin username."; + default = "admin"; + type = types.str; + }; + + adminPassword = mkOption { + description = "Default admin password."; + default = "admin"; + type = types.str; + }; + + secretKey = mkOption { + description = "Secret key used for signing."; + default = "SW2YcwTIb9zpOOhoPsMm"; + type = types.str; + }; + }; + + users = { + allowSignUp = mkOption { + description = "Disable user signup / registration"; + default = false; + type = types.bool; + }; + + allowOrgCreate = mkOption { + description = "Whether user is allowed to create organizations."; + default = false; + type = types.bool; + }; + + autoAssignOrg = mkOption { + description = "Whether to automatically assign new users to default org."; + default = true; + type = types.bool; + }; + + autoAssignOrgRole = mkOption { + description = "Default role new users will be auto assigned."; + default = "Viewer"; + type = types.enum ["Viewer" "Editor"]; + }; + }; + + auth.anonymous = { + enable = mkOption { + description = "Whether to allow anonymous access"; + default = false; + type = types.bool; + }; + }; + }; + + config = mkIf cfg.enable { + warnings = [ + "Grafana passwords will be stored as plaintext in nix store!" + ]; + + systemd.services.grafana = { + description = "Grafana Service Daemon"; + wantedBy = ["multi-user.target"]; + after = ["networking.target"]; + serviceConfig = { + ExecStart = "${cfg.package}/bin/grafana --config ${cfgFile} web"; + WorkingDirectory = cfg.dataDir; + User = "grafana"; + }; + }; + + users.extraUsers.grafana = { + uid = config.ids.uids.grafana; + description = "Grafana user"; + home = cfg.dataDir; + createHome = true; + }; + }; +} diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index bbbbcbccb9b..2a572a6a065 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -354,6 +354,16 @@ in { type = types.lines; }; }; + + beacon = { + enable = mkEnableOption "Whether to enable graphite beacon."; + + config = mkOption { + description = "Graphite beacon configuration."; + default = {}; + type = types.attrs; + }; + }; }; ###### implementation @@ -535,10 +545,25 @@ in { environment.systemPackages = [ pkgs.pythonPackages.graphite_pager ]; }) + (mkIf cfg.beacon.enable { + systemd.services.graphite-beacon = { + description = "Grpahite Beacon Alerting Daemon"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${pkgs.pythonPackages.graphite_beacon}/bin/graphite-beacon \ + --config ${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)} + ''; + User = "graphite"; + Group = "graphite"; + }; + }; + }) + (mkIf ( cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay || cfg.web.enable || cfg.api.enable || - cfg.seyren.enable || cfg.pager.enable + cfg.seyren.enable || cfg.pager.enable || cfg.beacon.enable ) { users.extraUsers = singleton { name = "graphite"; diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix index d0123b79e3f..bd7a5bcebe6 100644 --- a/nixos/modules/services/networking/btsync.nix +++ b/nixos/modules/services/networking/btsync.nix @@ -208,8 +208,8 @@ in storagePath = mkOption { type = types.path; - default = "/var/lib/btsync"; - example = "/var/lib/btsync"; + default = "/var/lib/btsync/"; + example = "/var/lib/btsync/"; description = '' Where to store the bittorrent sync files. ''; diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 53a9f462625..31bae628050 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -106,6 +106,12 @@ in alerts = { enable = mkEnableOption "Whether to enable consul-alerts"; + package = mkOption { + description = "Package to use for consul-alerts."; + default = pkgs.consul-alerts; + type = types.package; + }; + listenAddr = mkOption { description = "Api listening address."; default = "localhost:9000"; @@ -135,96 +141,101 @@ in }; - config = mkIf cfg.enable { + config = mkIf cfg.enable ( + mkMerge [{ - users.extraUsers."consul" = { - description = "Consul agent daemon user"; - uid = config.ids.uids.consul; - # The shell is needed for health checks - shell = "/run/current-system/sw/bin/bash"; - }; - - environment = { - etc."consul.json".text = builtins.toJSON configOptions; - # We need consul.d to exist for consul to start - etc."consul.d/dummy.json".text = "{ }"; - systemPackages = with pkgs; [ consul ]; - }; - - systemd.services.consul = { - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ] ++ systemdDevices; - bindsTo = systemdDevices; - restartTriggers = [ config.environment.etc."consul.json".source ] - ++ mapAttrsToList (_: d: d.source) - (filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc); - - serviceConfig = { - ExecStart = "@${pkgs.consul}/bin/consul consul agent -config-dir /etc/consul.d" - + concatMapStrings (n: " -config-file ${n}") configFiles; - ExecReload = "${pkgs.consul}/bin/consul reload"; - PermissionsStartOnly = true; - User = if cfg.dropPrivileges then "consul" else null; - TimeoutStartSec = "0"; - } // (optionalAttrs (cfg.leaveOnStop) { - ExecStop = "${pkgs.consul}/bin/consul leave"; - }); - - path = with pkgs; [ iproute gnugrep gawk consul ]; - preStart = '' - mkdir -m 0700 -p ${dataDir} - chown -R consul ${dataDir} - - # Determine interface addresses - getAddrOnce () { - ip addr show dev "$1" \ - | grep 'inet${optionalString (cfg.forceIpv4) " "}.*scope global' \ - | awk -F '[ /\t]*' '{print $3}' | head -n 1 - } - getAddr () { - ADDR="$(getAddrOnce $1)" - LEFT=60 # Die after 1 minute - while [ -z "$ADDR" ]; do - sleep 1 - LEFT=$(expr $LEFT - 1) - if [ "$LEFT" -eq "0" ]; then - echo "Address lookup timed out" - exit 1 - fi - ADDR="$(getAddrOnce $1)" - done - echo "$ADDR" - } - echo "{" > /etc/consul-addrs.json - delim=" " - '' - + concatStrings (flip mapAttrsToList cfg.interface (name: i: - optionalString (i != null) '' - echo "$delim \"${name}_addr\": \"$(getAddr "${i}")\"" >> /etc/consul-addrs.json - delim="," - '')) - + '' - echo "}" >> /etc/consul-addrs.json - ''; - }; - - systemd.services.consul-alerts = mkIf (cfg.alerts.enable) { - wantedBy = [ "multi-user.target" ]; - after = [ "consul.service" ]; - - path = [ pkgs.consul ]; - - serviceConfig = { - ExecStart = '' - ${pkgs.consul-alerts}/bin/consul-alerts start \ - --alert-addr=${cfg.alerts.listenAddr} \ - --consul-addr=${cfg.alerts.consulAddr} \ - ${optionalString cfg.alerts.watchChecks "--watch-checks"} \ - ${optionalString cfg.alerts.watchEvents "--watch-events"} - ''; - User = if cfg.dropPrivileges then "consul" else null; + users.extraUsers."consul" = { + description = "Consul agent daemon user"; + uid = config.ids.uids.consul; + # The shell is needed for health checks + shell = "/run/current-system/sw/bin/bash"; }; - }; - }; + environment = { + etc."consul.json".text = builtins.toJSON configOptions; + # We need consul.d to exist for consul to start + etc."consul.d/dummy.json".text = "{ }"; + systemPackages = with pkgs; [ consul ]; + }; + + systemd.services.consul = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ] ++ systemdDevices; + bindsTo = systemdDevices; + restartTriggers = [ config.environment.etc."consul.json".source ] + ++ mapAttrsToList (_: d: d.source) + (filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc); + + serviceConfig = { + ExecStart = "@${pkgs.consul}/bin/consul consul agent -config-dir /etc/consul.d" + + concatMapStrings (n: " -config-file ${n}") configFiles; + ExecReload = "${pkgs.consul}/bin/consul reload"; + PermissionsStartOnly = true; + User = if cfg.dropPrivileges then "consul" else null; + TimeoutStartSec = "0"; + } // (optionalAttrs (cfg.leaveOnStop) { + ExecStop = "${pkgs.consul}/bin/consul leave"; + }); + + path = with pkgs; [ iproute gnugrep gawk consul ]; + preStart = '' + mkdir -m 0700 -p ${dataDir} + chown -R consul ${dataDir} + + # Determine interface addresses + getAddrOnce () { + ip addr show dev "$1" \ + | grep 'inet${optionalString (cfg.forceIpv4) " "}.*scope global' \ + | awk -F '[ /\t]*' '{print $3}' | head -n 1 + } + getAddr () { + ADDR="$(getAddrOnce $1)" + LEFT=60 # Die after 1 minute + while [ -z "$ADDR" ]; do + sleep 1 + LEFT=$(expr $LEFT - 1) + if [ "$LEFT" -eq "0" ]; then + echo "Address lookup timed out" + exit 1 + fi + ADDR="$(getAddrOnce $1)" + done + echo "$ADDR" + } + echo "{" > /etc/consul-addrs.json + delim=" " + '' + + concatStrings (flip mapAttrsToList cfg.interface (name: i: + optionalString (i != null) '' + echo "$delim \"${name}_addr\": \"$(getAddr "${i}")\"" >> /etc/consul-addrs.json + delim="," + '')) + + '' + echo "}" >> /etc/consul-addrs.json + ''; + }; + } + + (mkIf (cfg.alerts.enable) { + systemd.services.consul-alerts = { + wantedBy = [ "multi-user.target" ]; + after = [ "consul.service" ]; + + path = [ pkgs.consul ]; + + serviceConfig = { + ExecStart = '' + ${cfg.alerts.package}/bin/consul-alerts start \ + --alert-addr=${cfg.alerts.listenAddr} \ + --consul-addr=${cfg.alerts.consulAddr} \ + ${optionalString cfg.alerts.watchChecks "--watch-checks"} \ + ${optionalString cfg.alerts.watchEvents "--watch-events"} + ''; + User = if cfg.dropPrivileges then "consul" else null; + Restart = "on-failure"; + }; + }; + }) + + ]); } diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index 579d62884c7..005eb7bd761 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -3,7 +3,7 @@ with lib; let - quassel = pkgs.kde4.quasselDaemon; + quassel = pkgs.quasselDaemon_qt5; cfg = config.services.quassel; user = if cfg.user != null then cfg.user else "quassel"; in diff --git a/nixos/modules/services/networking/skydns.nix b/nixos/modules/services/networking/skydns.nix new file mode 100644 index 00000000000..2d0129d6310 --- /dev/null +++ b/nixos/modules/services/networking/skydns.nix @@ -0,0 +1,91 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.skydns; + +in { + options.services.skydns = { + enable = mkEnableOption "Whether to enable skydns service."; + + etcd = { + machines = mkOption { + default = [ "http://localhost:4001" ]; + type = types.listOf types.str; + description = "Skydns list of etcd endpoints to connect to."; + }; + + tlsKey = mkOption { + default = null; + type = types.nullOr types.path; + description = "Skydns path of TLS client certificate - private key."; + }; + + tlsPem = mkOption { + default = null; + type = types.nullOr types.path; + description = "Skydns path of TLS client certificate - public key."; + }; + + caCert = mkOption { + default = null; + type = types.nullOr types.path; + description = "Skydns path of TLS certificate authority public key."; + }; + }; + + address = mkOption { + default = "0.0.0.0:53"; + type = types.str; + description = "Skydns address to bind to."; + }; + + domain = mkOption { + default = "skydns.local."; + type = types.str; + description = "Skydns default domain if not specified by etcd config."; + }; + + nameservers = mkOption { + default = map (n: n + ":53") config.networking.nameservers; + type = types.listOf types.str; + description = "Skydns list of nameservers to forward DNS requests to when not authoritative for a domain."; + example = ["8.8.8.8:53" "8.8.4.4:53"]; + }; + + package = mkOption { + default = pkgs.goPackages.skydns; + type = types.package; + description = "Skydns package to use."; + }; + + extraConfig = mkOption { + default = {}; + type = types.attrsOf types.str; + description = "Skydns attribute set of extra config options passed as environemnt variables."; + }; + }; + + config = mkIf (cfg.enable) { + systemd.services.skydns = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "etcd.service" ]; + description = "Skydns Service"; + environment = { + ETCD_MACHINES = concatStringsSep "," cfg.etcd.machines; + ETCD_TLSKEY = cfg.etcd.tlsKey; + ETCD_TLSPEM = cfg.etcd.tlsPem; + ETCD_CACERT = cfg.etcd.caCert; + SKYDNS_ADDR = cfg.address; + SKYDNS_DOMAIN = cfg.domain; + SKYDNS_NAMESERVER = concatStringsSep "," cfg.nameservers; + }; + serviceConfig = { + ExecStart = "${cfg.package}/bin/skydns"; + }; + }; + + environment.systemPackages = [ cfg.package ]; + }; +} diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index f6de8c02b18..d05edabca62 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -104,7 +104,7 @@ in }; background = mkOption { - default = "${pkgs.nixos-artwork}/gnome/Gnome_Dark.png"; + default = "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png"; description = '' The background image or color to use. ''; diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 0cae9cb844c..63a095be631 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -159,7 +159,7 @@ in boot.kernel.sysctl."kernel.printk" = config.boot.consoleLogLevel; - boot.kernelModules = [ "loop" "configs" ]; + boot.kernelModules = [ "loop" "configs" "atkbd" ]; boot.initrd.availableKernelModules = [ # Note: most of these (especially the SATA/PATA modules) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 22af11b484e..cb01774f9ab 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -28,7 +28,7 @@ let f = x: if x == null then "" else "" + x; grubConfig = args: pkgs.writeText "grub-config.xml" (builtins.toXML - { splashImage = f config.boot.loader.grub.splashImage; + { splashImage = f cfg.splashImage; grub = f grub; grubTarget = f (grub.grubTarget or ""); shell = "${pkgs.stdenv.shell}"; @@ -42,7 +42,7 @@ let inherit (cfg) version extraConfig extraPerEntryConfig extraEntries extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout - default fsIdentifier efiSupport; + default fsIdentifier efiSupport gfxmodeEfi gfxmodeBios; path = (makeSearchPath "bin" ([ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfsProgs pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else []) @@ -242,6 +242,24 @@ in ''; }; + gfxmodeEfi = mkOption { + default = "auto"; + example = "1024x768"; + type = types.str; + description = '' + The gfxmode to pass to grub when loading a graphical boot interface under efi. + ''; + }; + + gfxmodeBios = mkOption { + default = "1024x768"; + example = "auto"; + type = types.str; + description = '' + The gfxmode to pass to grub when loading a graphical boot interface under bios. + ''; + }; + configurationLimit = mkOption { default = 100; example = 120; @@ -337,7 +355,7 @@ in sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59"; } # GRUB 1.97 doesn't support gzipped XPMs. - else "${pkgs.nixos-artwork}/gnome/Gnome_Dark.png"); + else "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png"); } (mkIf cfg.enable { diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index fcf5871203d..016b5a23ed4 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -57,6 +57,8 @@ my $grubTargetEfi = get("grubTargetEfi"); my $bootPath = get("bootPath"); my $canTouchEfiVariables = get("canTouchEfiVariables"); my $efiSysMountPoint = get("efiSysMountPoint"); +my $gfxmodeEfi = get("gfxmodeEfi"); +my $gfxmodeBios = get("gfxmodeBios"); $ENV{'PATH'} = get("path"); die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2; @@ -255,14 +257,22 @@ else { fi # Setup the graphics stack for bios and efi systems - insmod vbe - insmod efi_gop - insmod efi_uga + if [ \"\${grub_platform}\" = \"efi\" ]; then + insmod efi_gop + insmod efi_uga + else + insmod vbe + fi insmod font if loadfont " . $grubBoot->path . "/grub/fonts/unicode.pf2; then insmod gfxterm - set gfxmode=auto - set gfxpayload=keep + if [ \"\${grub_platform}\" = \"efi\" ]; then + set gfxmode=$gfxmodeEfi + set gfxpayload=keep + else + set gfxmode=$gfxmodeBios + set gfxpayload=text + fi terminal_output gfxterm fi "; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 8c7e840910d..dcb498493fa 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -61,8 +61,8 @@ let idx=2 extraDisks="" ${flip concatMapStrings cfg.emptyDiskImages (size: '' - ${pkgs.qemu_kvm}/bin/qemu-img create -f raw "empty$idx" "${toString size}M" - extraDisks="$extraDisks -drive index=$idx,file=$(pwd)/empty$idx,if=virtio,werror=report" + ${pkgs.qemu_kvm}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M" + extraDisks="$extraDisks -drive index=$idx,file=$(pwd)/empty$idx.qcow2,if=virtio,werror=report" idx=$((idx + 1)) '')} @@ -83,7 +83,7 @@ let '' else '' ''} '' else '' - -drive file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \ + -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=virtio,cache=writeback,werror=report \ -kernel ${config.system.build.toplevel}/kernel \ -initrd ${config.system.build.toplevel}/initrd \ -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \ @@ -165,7 +165,7 @@ let ${config.system.build.toplevel}/bin/switch-to-configuration boot umount /boot - '' + '' # */ ); in @@ -204,17 +204,25 @@ in ''; }; + virtualisation.bootDevice = + mkOption { + type = types.str; + default = "/dev/vda"; + description = + '' + The disk to be used for the root filesystem. + ''; + }; + virtualisation.emptyDiskImages = mkOption { default = []; type = types.listOf types.int; description = '' - Additional disk images to provide to the VM, the value is a list of - sizes in megabytes the empty disk should be. - - These disks are writeable by the VM and will be thrown away - afterwards. + Additional disk images to provide to the VM. The value is + a list of size in megabytes of each disk. These disks are + writeable by the VM. ''; }; @@ -341,7 +349,7 @@ in config = { - boot.loader.grub.device = mkVMOverride "/dev/vda"; + boot.loader.grub.device = mkVMOverride cfg.bootDevice; boot.initrd.extraUtilsCommands = '' @@ -353,9 +361,9 @@ in '' # If the disk image appears to be empty, run mke2fs to # initialise. - FSTYPE=$(blkid -o value -s TYPE /dev/vda || true) + FSTYPE=$(blkid -o value -s TYPE ${cfg.bootDevice} || true) if test -z "$FSTYPE"; then - mke2fs -t ext4 /dev/vda + mke2fs -t ext4 ${cfg.bootDevice} fi ''; @@ -396,7 +404,7 @@ in # attribute should be disregarded for the purpose of building a VM # test image (since those filesystems don't exist in the VM). fileSystems = mkVMOverride ( - { "/".device = "/dev/vda"; + { "/".device = cfg.bootDevice; ${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} = { device = "store"; fsType = "9p"; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index d501c2e7c53..ddedcd9fe97 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -62,6 +62,7 @@ in rec { (all nixos.tests.installer.btrfsSimple) (all nixos.tests.installer.btrfsSubvols) (all nixos.tests.installer.btrfsSubvolDefault) + (all nixos.tests.bootBiosCdrom) (all nixos.tests.ipv6) (all nixos.tests.kde4) (all nixos.tests.lightdm) diff --git a/nixos/release.nix b/nixos/release.nix index 3559926eefa..51a58da4454 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -256,7 +256,6 @@ in rec { tests.installer.grub1 = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).grub1.test); tests.installer.lvm = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).lvm.test); tests.installer.luksroot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).luksroot.test); - tests.installer.rebuildCD = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).rebuildCD.test); tests.installer.separateBoot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).separateBoot.test); tests.installer.simple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simple.test); tests.installer.simpleLabels = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleLabels.test); diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index fc65f392a1f..4feed56cd67 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -6,46 +6,9 @@ with pkgs.lib; let - # Build the ISO. This is the regular minimal installation CD but - # with test instrumentation. - iso = - (import ../lib/eval-config.nix { - inherit system; - modules = - [ ../modules/installer/cd-dvd/installation-cd-minimal.nix - ../modules/testing/test-instrumentation.nix - { key = "serial"; - boot.loader.grub.timeout = mkOverride 0 0; - - # The test cannot access the network, so any sources we - # need must be included in the ISO. - isoImage.storeContents = - [ pkgs.glibcLocales - pkgs.sudo - pkgs.docbook5 - pkgs.docbook5_xsl - pkgs.unionfs-fuse - - # Bootloader support - pkgs.grub - pkgs.grub2 - pkgs.grub2_efi - pkgs.gummiboot - pkgs.perlPackages.XMLLibXML - pkgs.perlPackages.ListCompare - ]; - - # Don't use https://cache.nixos.org since the fake - # cache.nixos.org doesn't do https. - nix.binaryCaches = [ http://cache.nixos.org/ ]; - } - ]; - }).config.system.build.isoImage; - - # The configuration to install. - makeConfig = { testChannel, grubVersion, grubDevice, grubIdentifier - , extraConfig, readOnly ? true, forceGrubReinstallCount ? 0 + makeConfig = { grubVersion, grubDevice, grubIdentifier + , extraConfig, forceGrubReinstallCount ? 0 }: pkgs.writeText "configuration.nix" '' { config, lib, pkgs, modulesPath, ... }: @@ -53,7 +16,6 @@ let { imports = [ ./hardware-configuration.nix - ]; boot.loader.grub.version = ${toString grubVersion}; @@ -66,96 +28,39 @@ let boot.loader.grub.configurationLimit = 100 + ${toString forceGrubReinstallCount}; - ${optionalString (!readOnly) "nix.readOnlyStore = false;"} + hardware.enableAllFirmware = lib.mkForce false; - environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ]; - - nix.binaryCaches = [ http://cache.nixos.org/ ]; ${replaceChars ["\n"] ["\n "] extraConfig} } ''; - # Configuration of a web server that simulates the Nixpkgs channel - # distribution server. - webserver = - { config, lib, pkgs, ... }: - - { services.httpd.enable = true; - services.httpd.adminAddr = "foo@example.org"; - services.httpd.servedDirs = singleton - { urlPath = "/"; - dir = "/tmp/channel"; - }; - - virtualisation.writableStore = true; - virtualisation.pathsInNixDB = channelContents ++ [ pkgs.hello.src ]; - virtualisation.memorySize = 768; - - networking.firewall.allowedTCPPorts = [ 80 ]; - }; - channelContents = [ pkgs.rlwrap ]; - # The test script boots the CD, installs NixOS on an empty hard + # The test script boots a NixOS VM, installs NixOS on an empty hard # disk, and then reboot from the hard disk. It's parameterized with # a test script fragment `createPartitions', which must create # partitions and filesystems. - testScriptFun = { createPartitions, testChannel, grubVersion, grubDevice + testScriptFun = { createPartitions, grubVersion, grubDevice , grubIdentifier, preBootCommands, extraConfig }: let - # FIXME: OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html iface = if grubVersion == 1 then "scsi" else "virtio"; qemuFlags = - (if iso.system == "x86_64-linux" then "-m 768 " else "-m 512 ") + - (optionalString (iso.system == "x86_64-linux") "-cpu kvm64 "); - hdFlags =''hda => "harddisk", hdaInterface => "${iface}", ''; + (if system == "x86_64-linux" then "-m 768 " else "-m 512 ") + + (optionalString (system == "x86_64-linux") "-cpu kvm64 "); + hdFlags = ''hda => "vm-state-machine/machine.qcow2", hdaInterface => "${iface}", ''; in '' - createDisk("harddisk", 8 * 1024); - - my $machine = createMachine({ ${hdFlags} - cdrom => glob("${iso}/iso/*.iso"), - qemuFlags => "${qemuFlags} " . '${optionalString testChannel (toString (qemuNICFlags 1 1 2))}' }); $machine->start; - ${optionalString testChannel '' - # Create a channel on the web server containing a few packages - # to simulate the Nixpkgs channel. - $webserver->start; - $webserver->waitForUnit("httpd"); - $webserver->succeed( - "nix-push --bzip2 --dest /tmp/channel --manifest --url-prefix http://nixos.org/channels/nixos-unstable " . - "${toString channelContents} >&2"); - $webserver->succeed("mkdir /tmp/channel/sha256"); - $webserver->succeed("cp ${pkgs.hello.src} /tmp/channel/sha256/${pkgs.hello.src.outputHash}"); - ''} - # Make sure that we get a login prompt etc. $machine->succeed("echo hello"); #$machine->waitForUnit('getty@tty2'); $machine->waitForUnit("rogue"); $machine->waitForUnit("nixos-manual"); - ${optionalString testChannel '' - $machine->waitForUnit("dhcpcd"); - - # Allow the machine to talk to the fake nixos.org. - $machine->succeed( - "rm /etc/hosts", - "echo 192.168.1.1 nixos.org cache.nixos.org tarballs.nixos.org > /etc/hosts", - "ifconfig eth1 up 192.168.1.2", - ); - - # Test nix-env. - $machine->fail("hello"); - $machine->succeed("nix-env -i hello"); - $machine->succeed("hello") =~ /Hello, world/ - or die "bad `hello' output"; - ''} - # Wait for hard disks to appear in /dev $machine->succeed("udevadm settle"); @@ -163,14 +68,12 @@ let ${createPartitions} # Create the NixOS configuration. - $machine->succeed( - "nixos-generate-config --root /mnt", - ); + $machine->succeed("nixos-generate-config --root /mnt"); $machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2"); $machine->copyFileFromHost( - "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier extraConfig; } }", + "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; } }", "/mnt/etc/nixos/configuration.nix"); # Perform the installation. @@ -188,7 +91,7 @@ let # Now see if we can boot the installation. $machine = createMachine({ ${hdFlags} qemuFlags => "${qemuFlags}" }); - # For example to enter LUKS passphrase + # For example to enter LUKS passphrase. ${preBootCommands} # Did /boot get mounted? @@ -209,9 +112,9 @@ let $machine->succeed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/ or die "nix-env failed"; - # We need to a writable nix-store on next boot + # We need to a writable nix-store on next boot. $machine->copyFileFromHost( - "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 1; } }", + "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 1; } }", "/etc/nixos/configuration.nix"); # Check whether nixos-rebuild works. @@ -220,7 +123,7 @@ let # Test nixos-option. $machine->succeed("nixos-option boot.initrd.kernelModules | grep virtio_console"); $machine->succeed("nixos-option boot.initrd.kernelModules | grep 'List of modules'"); - $machine->succeed("nixos-option boot.initrd.kernelModules | grep qemu-guest.nix"); + $machine->succeed("nixos-option boot.initrd.kernelModules | grep qemu-guest.nix"); $machine->shutdown; @@ -229,7 +132,7 @@ let ${preBootCommands} $machine->waitForUnit("multi-user.target"); $machine->copyFileFromHost( - "${ makeConfig { inherit testChannel grubVersion grubDevice grubIdentifier extraConfig; readOnly = false; forceGrubReinstallCount = 2; } }", + "${ makeConfig { inherit grubVersion grubDevice grubIdentifier extraConfig; forceGrubReinstallCount = 2; } }", "/etc/nixos/configuration.nix"); $machine->succeed("nixos-rebuild boot >&2"); $machine->shutdown; @@ -245,16 +148,60 @@ let makeInstallerTest = name: { createPartitions, preBootCommands ? "", extraConfig ? "" - , testChannel ? false, grubVersion ? 2, grubDevice ? "/dev/vda" + , grubVersion ? 2, grubDevice ? "/dev/vda" , grubIdentifier ? "uuid", enableOCR ? false }: makeTest { - inherit iso; - name = "installer-" + name; - nodes = if testChannel then { inherit webserver; } else { }; inherit enableOCR; + name = "installer-" + name; + + nodes = { + + # The configuration of the machine used to run "nixos-install". It + # also has a web server that simulates cache.nixos.org. + machine = + { config, lib, pkgs, ... }: + + { imports = + [ ../modules/profiles/installation-device.nix + ../modules/profiles/base.nix + ]; + + virtualisation.diskSize = 8 * 1024; + virtualisation.memorySize = 768; + virtualisation.writableStore = true; + + # Use a small /dev/vdb as the root disk for the + # installer. This ensures the target disk (/dev/vda) is + # the same during and after installation. + virtualisation.emptyDiskImages = [ 512 ]; + virtualisation.bootDevice = "/dev/vdb"; + + hardware.enableAllFirmware = mkForce false; + + # The test cannot access the network, so any packages we + # need must be included in the VM. + system.extraDependencies = + [ pkgs.sudo + pkgs.docbook5 + pkgs.docbook5_xsl + pkgs.unionfs-fuse + pkgs.ntp + pkgs.nixos-artwork + pkgs.gummiboot + pkgs.perlPackages.XMLLibXML + pkgs.perlPackages.ListCompare + ] + ++ optional (grubVersion == 1) pkgs.grub + ++ optionals (grubVersion == 2) [ pkgs.grub2 pkgs.grub2_efi ]; + + nix.binaryCaches = mkForce [ ]; + }; + + }; + testScript = testScriptFun { - inherit createPartitions preBootCommands testChannel grubVersion + inherit createPartitions preBootCommands grubVersion grubDevice grubIdentifier extraConfig; }; }; @@ -281,7 +228,6 @@ in { "mount LABEL=nixos /mnt", ); ''; - testChannel = true; }; # Same as the previous, but now with a separate /boot partition. @@ -413,40 +359,11 @@ in { "mkfs.ext3 -L nixos /dev/sda2", "mount LABEL=nixos /mnt", ); - ''; grubVersion = 1; grubDevice = "/dev/sda"; }; - # Rebuild the CD configuration with a little modification. - rebuildCD = makeTest - { inherit iso; - name = "rebuild-cd"; - nodes = { }; - testScript = - '' - my $machine = createMachine({ cdrom => glob("${iso}/iso/*.iso"), qemuFlags => '-m 768' }); - $machine->start; - - # Enable sshd service. - $machine->succeed( - "sed -i 's,^}\$,systemd.services.sshd.wantedBy = pkgs.lib.mkOverride 0 [\"multi-user.target\"]; },' /etc/nixos/configuration.nix" - ); - - $machine->succeed("cat /etc/nixos/configuration.nix >&2"); - - # Apply the new CD configuration. - $machine->succeed("nixos-rebuild test"); - - # Connect to it-self. - $machine->waitForUnit("sshd"); - $machine->waitForOpenPort(22); - - $machine->shutdown; - ''; - }; - # Test using labels to identify volumes in grub simpleLabels = makeInstallerTest "simpleLabels" { createPartitions = '' @@ -545,4 +462,5 @@ in { ); ''; }; + } diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/pkgs/applications/audio/AMB-plugins/default.nix new file mode 100644 index 00000000000..3ea7b90f84a --- /dev/null +++ b/pkgs/applications/audio/AMB-plugins/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, ladspaH +}: + +stdenv.mkDerivation rec { + name = "AMB-plugins-${version}"; + version = "0.8.1"; + src = fetchurl { + url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + sha256 = "0x4blm4visjqj0ndqr0cg776v3b7lvplpc8cgi9n51llhavn0jpl"; + }; + + buildInputs = [ ladspaH ]; + + patchPhase = '' + sed -i 's@/usr/bin/install@install@g' Makefile + sed -i 's@/bin/rm@rm@g' Makefile + sed -i 's@/usr/lib/ladspa@$(out)/lib/ladspa@g' Makefile + ''; + + preInstall="mkdir -p $out/lib/ladspa"; + + meta = { + description = ''A set of ambisonics ladspa plugins''; + longDescription = '' + Mono and stereo to B-format panning, horizontal rotator, square, hexagon and cube decoders. + ''; + version = "${version}"; + homepage = http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/CharacterCompressor/default.nix b/pkgs/applications/audio/CharacterCompressor/default.nix new file mode 100644 index 00000000000..3501e04aa97 --- /dev/null +++ b/pkgs/applications/audio/CharacterCompressor/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }: +stdenv.mkDerivation rec { + name = "CharacterCompressor-${version}"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "CharacterCompressor"; + rev = "v${version}"; + sha256 = "0fvi8m4nshcxypn4jgxhnh7pxp68wshhav3k8wn3il7qpw71pdxi"; + }; + + buildInputs = [ faust2jack faust2lv2 ]; + + buildPhase = '' + faust2jack -t 99999 CharacterCompressor.dsp + faust2lv2 -t 99999 CharacterCompressor.dsp + ''; + + installPhase = '' + mkdir -p $out/bin + cp CharacterCompressor $out/bin/ + mkdir -p $out/lib/lv2 + cp -r CharacterCompressor.lv2/ $out/lib/lv2 + ''; + + meta = { + description = "A compressor with character. For jack and lv2"; + homepage = https://github.com/magnetophon/CharacterCompressor; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/CompBus/default.nix b/pkgs/applications/audio/CompBus/default.nix new file mode 100644 index 00000000000..497d1ef5243 --- /dev/null +++ b/pkgs/applications/audio/CompBus/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }: +stdenv.mkDerivation rec { + name = "CompBus-${version}"; + version = "1.1.02"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "CompBus"; + rev = "v${version}"; + sha256 = "025vi60caxk3j2vxxrgbc59xlyr88vgn7k3127s271zvpyy7apwh"; + }; + + buildInputs = [ faust2jack faust2lv2 ]; + + buildPhase = '' + for f in *.dsp; + do + faust2jack -t 99999 $f + faust2lv2 -t 99999 $f + done + ''; + + installPhase = '' + mkdir -p $out/lib/lv2 + mv *.lv2/ $out/lib/lv2 + mkdir -p $out/bin + for f in $(find . -executable -type f); + do + cp $f $out/bin/ + done + ''; + + meta = { + description = "A group of compressors mixed into a bus, sidechained from that mix bus. For jack and lv2"; + homepage = https://github.com/magnetophon/CompBus; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/RhythmDelay/default.nix b/pkgs/applications/audio/RhythmDelay/default.nix new file mode 100644 index 00000000000..e0cfff7c906 --- /dev/null +++ b/pkgs/applications/audio/RhythmDelay/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }: +stdenv.mkDerivation rec { + name = "RhythmDelay-${version}"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "RhythmDelay"; + rev = "v${version}"; + sha256 = "0n938nm08mf3lz92k6v07k1469xxzmfkgclw40jgdssfcfa16bn7"; + }; + + buildInputs = [ faust2jack faust2lv2 ]; + + buildPhase = '' + faust2jack -t 99999 RhythmDelay.dsp + faust2lv2 -t 99999 RhythmDelay.dsp + ''; + + installPhase = '' + mkdir -p $out/bin + cp RhythmDelay $out/bin/ + mkdir -p $out/lib/lv2 + cp -r RhythmDelay.lv2/ $out/lib/lv2 + ''; + + meta = { + description = "Tap a rhythm into your delay! For jack and lv2"; + homepage = https://github.com/magnetophon/RhythmDelay; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix index 49880f6c0f3..b5004291271 100644 --- a/pkgs/applications/audio/caps/default.nix +++ b/pkgs/applications/audio/caps/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { name = "caps-${version}"; - version = "0.9.16"; + version = "0.9.24"; src = fetchurl { url = "http://www.quitte.de/dsp/caps_${version}.tar.bz2"; - sha256 = "117l04w2zwqak856lihmaxg6f22vlz71knpxy0axiyri0x82lbwv"; + sha256 = "081zx0i2ysw5nmy03j60q9j11zdlg1fxws81kwanncdgayxgwipp"; }; configurePhase = '' echo "PREFIX = $out" > defines.make diff --git a/pkgs/applications/audio/constant-detune-chorus/default.nix b/pkgs/applications/audio/constant-detune-chorus/default.nix new file mode 100644 index 00000000000..54fe4c866d5 --- /dev/null +++ b/pkgs/applications/audio/constant-detune-chorus/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, faust2jack, faust2lv2 }: +stdenv.mkDerivation rec { + name = "constant-detune-chorus-${version}"; + version = "0.1.01"; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "constant-detune-chorus"; + rev = "v${version}"; + sha256 = "1z8aj1a36ix9jizk9wl06b3i98hrkg47qxqp8vx930r624pc5z86"; + }; + + buildInputs = [ faust2jack faust2lv2 ]; + + buildPhase = '' + faust2jack -t 99999 constant-detune-chorus.dsp + faust2lv2 -t 99999 constant-detune-chorus.dsp + ''; + + installPhase = '' + mkdir -p $out/bin + cp constant-detune-chorus $out/bin/ + mkdir -p $out/lib/lv2 + cp -r constant-detune-chorus.lv2/ $out/lib/lv2 + ''; + + meta = { + description = "A chorus algorithm that maintains constant and symmetric detuning depth (in cents), regardless of modulation rate. For jack and lv2"; + homepage = https://github.com/magnetophon/constant-detune-chorus; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix index 1db4515ae23..74adf4533fa 100644 --- a/pkgs/applications/audio/dirt/default.nix +++ b/pkgs/applications/audio/dirt/default.nix @@ -9,13 +9,21 @@ stdenv.mkDerivation rec { sha256 = "1shbyp54q64g6bsl6hhch58k3z1dyyy9ph6cq2xvdf8syy00sisz"; }; buildInputs = [ libsndfile libsamplerate liblo jack2 ]; + postPatch = '' + sed -i "s|./samples|$out/share/dirt/samples|" file.h + ''; configurePhase = '' export DESTDIR=$out ''; + postInstall = '' + mkdir -p $out/share/dirt/ + cp -r samples $out/share/dirt/ + ''; - meta = { + meta = with stdenv.lib; { description = "An unimpressive thingie for playing bits of samples with some level of accuracy"; homepage = "https://github.com/tidalcycles/Dirt"; - license = stdenv.lib.licenses.gpl3; + license = licenses.gpl3; + maintainers = with maintainers; [ anderspapitto ]; }; } diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index 9224e21185b..2f798fff7b9 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, mpd_clientlib }: stdenv.mkDerivation rec { - version = "0.26"; + version = "0.27"; name = "mpc-${version}"; src = fetchurl { url = "http://www.musicpd.org/download/mpc/0/${name}.tar.xz"; - sha256 = "0hp2qv6w2v902dhrmck5hg32s1ai6xiv9n61a3n6prfcfdqmywr0"; + sha256 = "0r10wsqxsi07gns6mfnicvpci0sbwwj4qa9iyr1ysrgadl5bx8j5"; }; buildInputs = [ mpd_clientlib ]; diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index 9cd1a3d0345..70162b9d185 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -3,7 +3,7 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, jack2, libX11, liblo , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate , libsndfile, pkgconfig, libpulseaudio, qt5, redland -, rubberband, serd, sord, vampSDK +, rubberband, serd, sord, vampSDK, fftwFloat }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ libsndfile qt5.base fftw /* should be fftw3f ??*/ bzip2 librdf rubberband + [ libsndfile qt5.base fftw fftwFloat bzip2 librdf rubberband libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland serd sord diff --git a/pkgs/applications/audio/wavegain/default.nix b/pkgs/applications/audio/wavegain/default.nix index 2ce59f005fd..5f56fb7297f 100644 --- a/pkgs/applications/audio/wavegain/default.nix +++ b/pkgs/applications/audio/wavegain/default.nix @@ -1,10 +1,12 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation { name = "wavegain-1.3.1"; - src = fetchgit { - url = "https://github.com/MestreLion/wavegain.git"; - sha256 = "1h886xijc9d7h4p6qx12c6kgwmp6s1bdycnyylkayfncczzlbi24"; + src = fetchFromGitHub { + owner = "MestreLion"; + repo = "wavegain"; + rev = "c928eaf97aeec5732625491b64c882e08e314fee"; + sha256 = "0wghqnsbypmr4xcrhb568bfjdnxzzp8qgnws3jslzmzf34dpk5ls"; }; installPhase = '' @@ -17,6 +19,6 @@ stdenv.mkDerivation { homepage = https://github.com/MestreLion/wavegain; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.devhell ]; + maintainers = [ stdenv.lib.maintainers.robbinch ]; }; } diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix index 01895647a6b..e0439f45a9c 100644 --- a/pkgs/applications/editors/emacs-24/default.nix +++ b/pkgs/applications/editors/emacs-24/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, ncurses, x11, libXaw, libXpm, Xaw3d , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls -, alsaLib, cairo +, alsaLib, cairo, acl, gpm , withX ? !stdenv.isDarwin , withGTK3 ? false, gtk3 ? null , withGTK2 ? true, gtk2 @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ]; buildInputs = - [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo ] + [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm ] ++ stdenv.lib.optional stdenv.isLinux dbus ++ stdenv.lib.optionals withX [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index b04e37746e0..b27bc75ed59 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchurl, fetchgit +{ stdenv, fetchurl, fetchgit, fetchNuGet , autoconf, automake, pkgconfig, shared_mime_info, intltool , glib, mono, gtk-sharp, gnome, gnome-sharp, unzip +, dotnetPackages }: stdenv.mkDerivation rec { @@ -13,79 +14,33 @@ stdenv.mkDerivation rec { sha256 = "1bgqvlfi6pilj2zxsviqilh63qq98wsijqdiqwpkqchcw741zlyn"; }; - srcNugetBinary = fetchgit { - url = "https://github.com/mono/nuget-binary.git"; - rev = "da1f2102f8172df6f7a1370a4998e3f88b91c047"; - sha256 = "1hbnckc4gvqkknf8gh1k7iwqb4vdzifdjd19i60fnczly5v8m1c3"; - }; - - srcNUnit = fetchurl { - url = "https://www.nuget.org/api/v2/package/NUnit/2.6.3"; - sha256 = "0bb16i4ggwz32wkxsh485wf014cqqzhbyx0b3wbpmqjw7p4canph"; - }; - - srcNUnitRunners = fetchurl { - url = "https://www.nuget.org/api/v2/package/NUnit.Runners/2.6.3"; - sha256 = "0qwx1i9lxkp9pijj2bsczzgsamz651hngkxraqjap1v4m7d09a3b"; - }; - - srcNUnit2510 = fetchurl { + nunit2510 = fetchurl { url = "http://launchpad.net/nunitv2/2.5/2.5.10/+download/NUnit-2.5.10.11092.zip"; sha256 = "0k5h5bz1p2v3d0w0hpkpbpvdkcszgp8sr9ik498r1bs72w5qlwnc"; }; - srcNugetSystemWebMvcExtensions = fetchurl { - url = https://www.nuget.org/api/v2/package/System.Web.Mvc.Extensions.Mvc.4/1.0.9; - sha256 = "19wi662m8primpimzifv8k560m6ymm73z0mf1r8ixl0xqag1hx6j"; - }; - - srcNugetMicrosoftAspNetMvc = fetchurl { - url = https://www.nuget.org/api/v2/package/Microsoft.AspNet.Mvc/5.2.2; - sha256 = "1jwfmz42kw2yb1g2hgp2h34fc4wx6s8z71da3mw5i4ivs25w9n2b"; - }; - - srcNugetMicrosoftAspNetRazor = fetchurl { - url = https://www.nuget.org/api/v2/package/Microsoft.AspNet.Razor/3.2.2; - sha256 = "1db3apn4vzz1bx6q5fyv6nyx0drz095xgazqbw60qnhfs7z45axd"; - }; - - srcNugetMicrosoftAspNetWebPages = fetchurl { - url = https://www.nuget.org/api/v2/package/Microsoft.AspNet.WebPages/3.2.2; - sha256 = "17fwb5yj165sql80i47zirjnm0gr4n8ypz408mz7p8a1n40r4i5l"; - }; - - srcNugetMicrosoftWebInfrastructure = fetchurl { - url = https://www.nuget.org/api/v2/package/Microsoft.Web.Infrastructure/1.0.0.0; - sha256 = "1mxl9dri5729d0jl84gkpqifqf4xzb6aw1rzcfh6l0r24bix9afn"; - }; - postPatch = '' # From https://bugzilla.xamarin.com/show_bug.cgi?id=23696#c19 - # it seems parts of MonoDevelop 5.2+ need NUnit 2.6.4, which isn't included - # (?), so download it and put it in the right place in the tree - mkdir packages - unzip ${srcNUnit} -d packages/NUnit.2.6.3 - unzip ${srcNUnitRunners} -d packages/NUnit.Runners.2.6.3 - # cecil needs NUnit 2.5.10 - this is also missing from the tar - unzip -j ${srcNUnit2510} -d external/cecil/Test/libs/nunit-2.5.10 NUnit-2.5.10.11092/bin/net-2.0/framework/\* + unzip -j ${nunit2510} -d external/cecil/Test/libs/nunit-2.5.10 NUnit-2.5.10.11092/bin/net-2.0/framework/\* # the tar doesn't include the nuget binary, so grab it from github and copy it # into the right place - cp -vfR ${srcNugetBinary}/* external/nuget-binary/ - - # AspNet plugin requires these packages - unzip ${srcNugetSystemWebMvcExtensions} -d packages/System.Web.Mvc.Extensions.Mvc.4.1.0.9 - unzip ${srcNugetMicrosoftAspNetMvc} -d packages/Microsoft.AspNet.Mvc.5.2.2 - unzip ${srcNugetMicrosoftAspNetRazor} -d packages/Microsoft.AspNet.Razor.3.2.2 - unzip ${srcNugetMicrosoftAspNetWebPages} -d packages/Microsoft.AspNet.WebPages.3.2.2 - unzip ${srcNugetMicrosoftWebInfrastructure} -d packages/Microsoft.Web.Infrastructure.1.0.0.0 + cp -vfR "$(dirname $(pkg-config NuGet.Core --variable=Libraries))"/* external/nuget-binary/ ''; + # Revert this commit which broke the ability to use pkg-config to locate dlls + patchFlags = [ "-p2" ]; + patches = [ ./git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch ]; + buildInputs = [ autoconf automake pkgconfig shared_mime_info intltool mono gtk-sharp gnome-sharp unzip + pkgconfig + dotnetPackages.NUnit + dotnetPackages.NUnitRunners + dotnetPackages.Nuget ]; preConfigure = "patchShebangs ./configure"; @@ -108,6 +63,12 @@ stdenv.mkDerivation rec { > EOF done + + # Without this, you get a missing DLL error any time you install an addin.. + ln -sv `pkg-config nunit.core --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit + ln -sv `pkg-config nunit.core.interfaces --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit + ln -sv `pkg-config nunit.framework --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit + ln -sv `pkg-config nunit.util --variable=Libraries` $out/lib/monodevelop/AddIns/NUnit ''; dontStrip = true; diff --git a/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch b/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch new file mode 100644 index 00000000000..969aad33ec0 --- /dev/null +++ b/pkgs/applications/editors/monodevelop/git-revert-12d610fb3f6dce121df538e36f21d8c2eeb0a6e3.patch @@ -0,0 +1,57 @@ +diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj +index 02d3a01..c6daaad 100644 +--- a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj ++++ b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj +@@ -452,34 +452,6 @@ + + PreserveNewest + +- +- System.Web.Mvc.dll +- PreserveNewest +- +- +- System.Web.Razor.dll +- PreserveNewest +- +- +- System.Web.Helpers.dll +- PreserveNewest +- +- +- System.Web.WebPages.Deployment.dll +- PreserveNewest +- +- +- System.Web.WebPages.dll +- PreserveNewest +- +- +- System.Web.WebPages.Razor.dll +- PreserveNewest +- +- +- Microsoft.Web.Infrastructure.dll +- PreserveNewest +- + + + +diff --git a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml +index eab7c32..4a75311 100644 +--- a/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml ++++ b/main/src/addins/AspNet/Properties/MonoDevelop.AspNet.addin.xml +@@ -1,13 +1,6 @@ + + + +- +- +- +- +- +- +- + + + diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index f19c1b65e13..814b05ced36 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -3,18 +3,18 @@ , luabitop, ncurses, perl, pkgconfig, unibilium , withJemalloc ? true, jemalloc }: -let version = "2015-05-26"; in +let version = "2015-06-09"; in stdenv.mkDerivation rec { name = "neovim-${version}"; src = fetchFromGitHub { - sha256 = "0sszpqlq0yp6r62zgcjcmnllc058wzzh9ccvgb2jh9k19ksszyhc"; - rev = "5a9ad68b258f33ebd7fa0a5da47b308f50f1e5e7"; + sha256 = "1lycql0lwi7ynrsaln4kxybwvxb9fvganiq3ba4pnpcfgl155k1j"; + rev = "6270d431aaeed71e7a8782411f36409ab8e0ee35"; repo = "neovim"; owner = "neovim"; }; - # FIXME: this is NOT the libvterm already in nixpkgs, but some NIH silliness: + # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness: neovimLibvterm = let version = "2015-02-23"; in stdenv.mkDerivation rec { name = "neovim-libvterm-${version}"; diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix new file mode 100644 index 00000000000..589d20cb126 --- /dev/null +++ b/pkgs/applications/graphics/antimony/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchgit, libpng, python3, boost, mesa, qt5, ncurses }: + +let + gitRev = "745eca3a2d2657c495d5509e9083c884e021d09c"; + gitBranch = "master"; + gitTag = "0.8.0b"; +in + stdenv.mkDerivation rec { + name = "antimony-${version}"; + version = gitTag; + + src = fetchgit { + url = "git://github.com/mkeeter/antimony.git"; + rev = gitRev; + sha256 = "19ir3y5ipmfyygcn8mbxika4j3af6dfrv54dvhn6maz7dy8h30f4"; + }; + + patches = [ ./paths-fix.patch ]; + + buildInputs = [ + libpng python3 (boost.override { python = python3; }) + mesa qt5.base ncurses + ]; + + configurePhase = '' + export GITREV=${gitRev} + export GITBRANCH=${gitBranch} + export GITTAG=${gitTag} + + cd qt + export sourceRoot=$sourceRoot/qt + qmake antimony.pro PREFIX=$out + ''; + + meta = with stdenv.lib; { + description = "A computer-aided design (CAD) tool from a parallel universe"; + homepage = "https://github.com/mkeeter/antimony"; + license = licenses.mit; + platforms = platforms.linux; + }; + } diff --git a/pkgs/applications/graphics/antimony/paths-fix.patch b/pkgs/applications/graphics/antimony/paths-fix.patch new file mode 100644 index 00000000000..de8d9e7beb0 --- /dev/null +++ b/pkgs/applications/graphics/antimony/paths-fix.patch @@ -0,0 +1,99 @@ +diff --git a/qt/antimony.pro b/qt/antimony.pro +index 9d586f4..b055a6d 100644 +--- a/qt/antimony.pro ++++ b/qt/antimony.pro +@@ -12,14 +12,9 @@ QMAKE_CXXFLAGS_RELEASE += -O3 + + QMAKE_CXXFLAGS += -Werror=switch + +-GITREV = $$system(git log --pretty=format:'%h' -n 1) +-GITDIFF = $$system(git diff --quiet --exit-code || echo "+") +-GITTAG = $$system(git describe --exact-match --tags 2> /dev/null) +-GITBRANCH = $$system(git rev-parse --abbrev-ref HEAD) +- +-QMAKE_CXXFLAGS += "-D'GITREV=\"$${GITREV}$${GITDIFF}\"'" +-QMAKE_CXXFLAGS += "-D'GITTAG=\"$${GITTAG}\"'" +-QMAKE_CXXFLAGS += "-D'GITBRANCH=\"$${GITBRANCH}\"'" ++QMAKE_CXXFLAGS += "-D'GITREV=\"$$(GITREV)\"'" ++QMAKE_CXXFLAGS += "-D'GITTAG=\"$$(GITTAG)\"'" ++QMAKE_CXXFLAGS += "-D'GITBRANCH=\"$$(GITBRANCH)\"'" + + OLD_GL_SET = $$(OLD_GL) + equals(OLD_GL_SET, "true") { +@@ -125,11 +120,11 @@ macx { + } + + linux { +- executable.path = /usr/local/bin ++ executable.path = $$(out)/bin + executable.files = antimony +- nodes_folder.path = /usr/local/bin/sb/nodes ++ nodes_folder.path = $$(out)/bin/sb/nodes + nodes_folder.files = ../py/nodes/* +- fab_folder.path = /usr/local/bin/sb/fab ++ fab_folder.path = $$(out)/bin/sb/fab + fab_folder.files = ../py/fab/* + INSTALLS += executable nodes_folder fab_folder + } +diff --git a/qt/fab.pri b/qt/fab.pri +index a54813b..b500536 100644 +--- a/qt/fab.pri ++++ b/qt/fab.pri +@@ -54,7 +54,7 @@ DEFINES += '_STATIC_= ' + + linux { + QMAKE_CFLAGS += -std=gnu99 +- QMAKE_CXXFLAGS += $$system(/usr/bin/python3-config --includes) ++ QMAKE_CXXFLAGS += $$system(python3-config --includes) + LIBS += -lpng + } + +diff --git a/qt/shared.pri b/qt/shared.pri +index e7d0e3a..026eae3 100644 +--- a/qt/shared.pri ++++ b/qt/shared.pri +@@ -39,41 +39,11 @@ macx { + } + + linux { +- QMAKE_CXXFLAGS += $$system(/usr/bin/python3-config --includes) +- QMAKE_LFLAGS += $$system(/usr/bin/python3-config --ldflags) ++ QMAKE_CXXFLAGS += $$system(python3-config --includes) ++ QMAKE_LFLAGS += $$system(python3-config --ldflags) + + # Even though this is in QMAKE_LFLAGS, the linker is picky about + # library ordering (so it needs to be here too). + LIBS += -lpython3.4m +- +- # ldconfig is being used to find libboost_python, but it's in a different +- # place in different distros (and is not in the default $PATH on Debian). +- # First, check to see if it's on the default $PATH. +- system(which ldconfig > /dev/null) { +- LDCONFIG_BIN = "ldconfig" +- } +- # If that failed, then search for it in its usual places. +- isEmpty(LDCONFIG_BIN) { +- for(p, $$list(/sbin/ldconfig /usr/bin/ldconfig)) { +- exists($$p): LDCONFIG_BIN = $$p +- } +- } +- # If that search failed too, then exit with an error. +- isEmpty(LDCONFIG_BIN) { +- error("Could not find ldconfig!") +- } +- +- # Check for different boost::python naming schemes +- LDCONFIG_OUT = $$system($$LDCONFIG_BIN -p|grep python) +- for (b, $$list(boost_python-py34 boost_python3)) { +- contains(LDCONFIG_OUT, "lib$${b}.so") { +- LIBS += "-l$$b" +- GOT_BOOST_PYTHON = True +- } +- } +- +- # If we couldn't find boost::python, exit with an error. +- isEmpty(GOT_BOOST_PYTHON) { +- error("Could not find boost::python3") +- } ++ LIBS += -lboost_python3 + } diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix new file mode 100644 index 00000000000..aa312f4c8a9 --- /dev/null +++ b/pkgs/applications/misc/apvlv/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, cmake, pkgconfig, + gtk2 , poppler, freetype, libpthreadstubs, libXdmcp, libxshmfence +}: + +stdenv.mkDerivation rec { + version = "0.1.f7f7b9c"; + name = "apvlv-${version}"; + + src = fetchurl { + url = "https://github.com/downloads/naihe2010/apvlv/${name}-Source.tar.gz"; + sha256 = "125nlcfjdhgzi9jjxh9l2yc9g39l6jahf8qh2555q20xkxf4rl0w"; + }; + + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${poppler}/include/poppler" + ''; + + buildInputs = [ + pkgconfig cmake + poppler + freetype gtk2 + libpthreadstubs libXdmcp libxshmfence # otherwise warnings in compilation + ]; + + installPhase = '' + # binary + mkdir -p $out/bin + cp src/apvlv $out/bin/apvlv + + # displays pdfStartup.pdf as default pdf entry + mkdir -p $out/share/doc/apvlv/ + cp ../Startup.pdf $out/share/doc/apvlv/Startup.pdf + ''; + + meta = with stdenv.lib; { + homepage = "http://naihe2010.github.io/apvlv/"; + description = "PDF viewer with Vim-like behaviour"; + longDescription = '' + apvlv is a PDF/DJVU/UMD/TXT Viewer Under Linux/WIN32 + with Vim-like behaviour. + ''; + + license = licenses.lgpl2; + platforms = platforms.unix; + maintainers = [ maintainers.ardumont ]; + }; + +} diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0e821e92703..b5dbfe207fe 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-2.29.0"; + name = "calibre-2.30.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1n3cfnjnghhhsgzcbcvbr0gh191lhl6az09q1s68jhlcc2lski6l"; + sha256 = "1k2rpn06nfzqjy5k6fh8pwfj8vbhpn7rgkpkkpz5n2fqg3z8ph1j"; }; inherit python; diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index fa5ae99f4fb..eb73f48559a 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, pythonPackages, gettext, pygtksourceview, sqlite }: stdenv.mkDerivation rec { - name = "cherrytree-0.35.7"; + name = "cherrytree-0.35.8"; src = fetchurl { url = "http://www.giuspen.com/software/${name}.tar.xz"; - sha256 = "03p3bx7skc361rmh0axhm0fa0inmxv4bpa9l566wskb3zq4sy4g3"; + sha256 = "0vqc1idzd73f4q5f4zwwypj4jiivwnb4y0r3041h2pm08y1wgsd8"; }; propagatedBuildInputs = [ pythonPackages.sqlite3 ]; diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index d46efc4e5e8..f659e4f6c2d 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -1,17 +1,21 @@ -{ stdenv, fetchurl, unzip, makeDesktopItem, mono }: +{ stdenv, fetchurl, buildDotnetPackage, makeWrapper, unzip, makeDesktopItem }: -stdenv.mkDerivation rec { - name = "keepass-${version}"; +buildDotnetPackage rec { + baseName = "keepass"; version = "2.29"; src = fetchurl { - url = "mirror://sourceforge/keepass/KeePass-${version}.zip"; - sha256 = "16x7m899akpi036c0wlr41w7fz9q0b69yac9q97rqkixb03l4g9d"; + url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; + sha256 = "051s0aznyyhbpdbly6h5rs0ax0zvkp45dh93nmq6lwhicswjwn5m"; }; sourceRoot = "."; - phases = [ "unpackPhase" "installPhase" ]; + buildInputs = [ unzip ]; + + patches = [ ./keepass.patch ]; + + preConfigure = "rm -rvf Build/*"; desktopItem = makeDesktopItem { name = "keepass"; @@ -22,23 +26,19 @@ stdenv.mkDerivation rec { categories = "Application;Other;"; }; + outputFiles = [ "Build/KeePass/Release/*" "Build/KeePassLib/Release/*" ]; + dllFiles = [ "KeePassLib.dll" ]; + exeFiles = [ "KeePass.exe" ]; - installPhase = '' - mkdir -p "$out/bin" - echo "${mono}/bin/mono $out/KeePass.exe" > $out/bin/keepass - chmod +x $out/bin/keepass - echo $out - cp -r ./* $out/ + postInstall = '' mkdir -p "$out/share/applications" cp ${desktopItem}/share/applications/* $out/share/applications ''; - buildInputs = [ unzip ]; - meta = { description = "GUI password manager with strong cryptography"; homepage = http://www.keepass.info/; - maintainers = with stdenv.lib.maintainers; [amorsillo]; + maintainers = with stdenv.lib.maintainers; [ amorsillo obadz ]; platforms = with stdenv.lib.platforms; all; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/misc/keepass/keepass.patch b/pkgs/applications/misc/keepass/keepass.patch new file mode 100644 index 00000000000..6ecf0bb074d --- /dev/null +++ b/pkgs/applications/misc/keepass/keepass.patch @@ -0,0 +1,89 @@ +diff -Naur old/KeePass/KeePass.csproj new/KeePass/KeePass.csproj +--- old/KeePass/KeePass.csproj 2015-04-10 11:00:46.000000000 +0100 ++++ new/KeePass/KeePass.csproj 2015-05-27 16:35:52.196177593 +0100 +@@ -1,4 +1,4 @@ +- ++ + + Debug + AnyCPU +@@ -10,7 +10,7 @@ + KeePass + KeePass + KeePass.ico +- true ++ false + KeePass.pfx + + +@@ -1316,6 +1316,5 @@ + + --> + +- "$(FrameworkSDKDir)bin\sgen.exe" /assembly:"$(TargetPath)" /force /nologo /compiler:/keycontainer:VS_KEY_33430356D8D7D1B8 /compiler:/delaysign- + +- +\ No newline at end of file ++ +diff -Naur old/KeePassLib/KeePassLib.csproj new/KeePassLib/KeePassLib.csproj +--- old/KeePassLib/KeePassLib.csproj 2014-05-08 15:00:24.000000000 +0100 ++++ new/KeePassLib/KeePassLib.csproj 2015-05-27 16:35:52.197177562 +0100 +@@ -1,4 +1,4 @@ +- ++ + + Debug + AnyCPU +@@ -9,7 +9,7 @@ + Properties + KeePassLib + KeePassLib +- true ++ false + KeePassLib.pfx + + +diff -Naur old/KeePass.sln new/KeePass.sln +--- old/KeePass.sln 2009-08-31 19:47:28.000000000 +0100 ++++ new/KeePass.sln 2015-05-27 16:35:59.568953518 +0100 +@@ -1,11 +1,9 @@ +-Microsoft Visual Studio Solution File, Format Version 10.00 ++Microsoft Visual Studio Solution File, Format Version 12.00 + # Visual Studio 2008 + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib", "KeePassLib\KeePassLib.csproj", "{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}" + EndProject + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePass", "KeePass\KeePass.csproj", "{10938016-DEE2-4A25-9A5A-8FD3444379CA}" + EndProject +-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLibSD", "KeePassLibSD\KeePassLibSD.csproj", "{DC15F71A-2117-4DEF-8C10-AA355B5E5979}" +-EndProject + Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrlUtil", "Translation\TrlUtil\TrlUtil.csproj", "{B7E890E7-BF50-4450-9A52-C105BD98651C}" + EndProject + Global +@@ -44,18 +42,6 @@ + {10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|Win32.ActiveCfg = Release|Any CPU + {10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|x64.ActiveCfg = Release|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.Build.0 = Debug|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Win32.ActiveCfg = Debug|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|x64.ActiveCfg = Debug|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.ActiveCfg = Release|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.Build.0 = Release|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.Build.0 = Release|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Win32.ActiveCfg = Release|Any CPU +- {DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|x64.ActiveCfg = Release|Any CPU + {B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU +diff -Naur old/Translation/TrlUtil/TrlUtil.csproj new/Translation/TrlUtil/TrlUtil.csproj +--- old/Translation/TrlUtil/TrlUtil.csproj 2013-07-21 10:06:38.000000000 +0100 ++++ new/Translation/TrlUtil/TrlUtil.csproj 2015-05-27 16:35:52.197177562 +0100 +@@ -1,4 +1,4 @@ +- ++ + + Debug + AnyCPU diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index bbae8aca2b8..601ffe25200 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -4,12 +4,12 @@ let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; in stdenv.mkDerivation rec { name = "llpp-${version}"; - version = "21-git-2015-04-27"; + version = "21-git-2015-06-06"; src = fetchgit { url = "git://repo.or.cz/llpp.git"; - rev = "66868744188151eaa433d42c807e1efc5f623aa4"; - sha256 = "04hjbkzxixw88xmrpbr1smq486wfw3q9hvy7b4bfcb9j32mazk5c"; + rev = "492d761c0c7c8c4ccdd4f0d3fa7c51434ce8acf2"; + sha256 = "14dp5sw7cd6bja9d3zpxmswbk0k0b7x2fzb1fflhnnnhjc39irk9"; }; buildInputs = [ pkgconfig ninja makeWrapper ocaml findlib mupdf lablgl diff --git a/pkgs/applications/misc/rofi/pass.nix b/pkgs/applications/misc/rofi/pass.nix index c6b5666921c..8a7382ae737 100644 --- a/pkgs/applications/misc/rofi/pass.nix +++ b/pkgs/applications/misc/rofi/pass.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "rofi-${version}"; - version = "2015-05-29"; + version = "2015-06-08"; src = fetchgit { url = "https://github.com/carnager/rofi-pass"; - rev = "92c26557ec4b0508c563d596291571bbef402899"; - sha256 = "17k9jmmckqaw75i0qsay2gc8mrjrs6jjfwfxaggspj912sflmjng"; + rev = "7e376b5ec64974c4e8478acf3ada8d111896f391"; + sha256 = "1ywsxdgy5m63a2f5vd7np2f1qffz7y95z7s1gq5d87s8xd8myadl"; }; buildInputs = [ rofi wmctrl xprop xdotool ]; diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 36669dd8ae8..bfbc66cc0b9 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - version = "1.2.6"; + version = "1.2.7"; name = "slic3r-${version}"; src = fetchgit { url = "git://github.com/alexrj/Slic3r"; rev = "refs/tags/${version}"; - sha256 = "1ymk2n9dw1mpizwg6bxbzq60mg1cwljxlncaasdyakqrkkr22r8k"; + sha256 = "1bybbl8b0lfh9wkn1k9cxd11hlc5064wzh0fk6zdmc9vnnay399i"; }; buildInputs = with perlPackages; [ perl makeWrapper which diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 998ea95e8da..62afcc2583a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -131,7 +131,13 @@ stdenv.mkDerivation { for executable in \ firefox firefox-bin plugin-container \ - updater crashreporter webapprt-stub libxul.so + updater crashreporter webapprt-stub \ + components/libdbusservice.so components/libmozgnome.so \ + gmp-clearkey/0.1/libclearkey.so \ + browser/components/libbrowsercomps.so \ + libnssdbm3.so libsmime3.so libxul.so libnss3.so libplc4.so \ + libfreebl3.so libmozsqlite3.so libmozalloc.so libnspr4.so libssl3.so \ + libsoftokn3.so libnssutil3.so libnssckbi.so libplds4.so do patchelf --set-rpath "$libPath" \ "$out/usr/lib/firefox-bin-${version}/$executable" @@ -143,7 +149,7 @@ stdenv.mkDerivation { [Desktop Entry] Type=Application Exec=$out/bin/firefox - Icon=$out/lib/firefox-bin-${version}/chrome/icons/default/default256.png + Icon=$out/usr/lib/firefox-bin-${version}/browser/icons/mozicon128.png Name=Firefox GenericName=Web Browser Categories=Application;Network; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index fbfe4de23b8..a096d43b11c 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -2,27 +2,33 @@ stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "0.15.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1jiczhx01i8czm1gzd232z2ds2f1lvs5ifa9zjabhzw5ykfzdjg8"; + sha256 = "1adbd5n2fs1278f6kz6pd23813w2k4pgcxjl21idflh8jafxsyj7"; }; buildInputs = [ makeWrapper which go iptables rsync ]; buildPhase = '' + GOPATH=$(pwd):$(pwd)/Godeps/_workspace + mkdir -p $(pwd)/Godeps/_workspace/src/github.com/GoogleCloudPlatform + ln -s $(pwd) $(pwd)/Godeps/_workspace/src/github.com/GoogleCloudPlatform/kubernetes + substituteInPlace "hack/lib/golang.sh" --replace "_cgo" "" - GOPATH=$(pwd) patchShebangs ./hack hack/build-go.sh --use_go_build + + (cd cluster/addons/dns/kube2sky && go build ./kube2sky.go) ''; installPhase = '' mkdir -p "$out/bin" cp _output/local/go/bin/* "$out/bin/" + cp cluster/addons/dns/kube2sky/kube2sky "$out/bin/" ''; preFixup = '' diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 6c7e4797841..17ad6c25da7 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ]; configureFlags = "--with-openssl=${openssl} --enable-modules --enable-otr"; + + doCheck = true; meta = with stdenv.lib; { homepage = http://mcabber.com/; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index fd200af0a42..8825e16b90f 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -4,12 +4,12 @@ , extraBuildInputs ? [] }: stdenv.mkDerivation rec { - version = "1.1.1"; + version = "1.2"; name = "weechat-${version}"; src = fetchurl { - url = "http://weechat.org/files/src/weechat-${version}.tar.gz"; - sha256 = "0j8kc2zsv7ybgq6wi0r8siyd3adl3528gymgmidijd78smbpwbx3"; + url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; + sha256 = "0kb8mykhzm7zcxsl6l6cia2n4nc9akiysg0v6d8xb51p3x002ibw"; }; buildInputs = diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index be276a4cfa2..23e4f397e82 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -121,7 +121,12 @@ stdenv.mkDerivation { for executable in \ thunderbird mozilla-xremote-client thunderbird-bin plugin-container \ - updater libxul.so + updater \ + components/libdbusservice.so components/libmozgnome.so \ + libnssdbm3.so libsmime3.so libxul.so libprldap60.so libnss3.so \ + libplc4.so libfreebl3.so libmozsqlite3.so libmozalloc.so libnspr4.so \ + libssl3.so libldif60.so libsoftokn3.so libldap60.so libnssutil3.so \ + libnssckbi.so libplds4.so do patchelf --set-rpath "$libPath" \ "$out/usr/lib/thunderbird-bin-${version}/$executable" diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 1e26e61161c..30fda1e0fac 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -4,12 +4,12 @@ with goPackages; buildGoPackage rec { name = "syncthing-${version}"; - version = "0.11.7"; + version = "0.11.8"; goPackagePath = "github.com/syncthing/syncthing"; src = fetchgit { url = "git://github.com/syncthing/syncthing.git"; rev = "refs/tags/v${version}"; - sha256 = "7d928a255c61c7b89d460cc70c79bd8e85bef3e919c157f59d5709fef4153c8d"; + sha256 = "fed98ac47fd84aecee7770dd59e5e68c5bc429d50b361f13b9ea2e28c3be62cf"; }; subPackages = [ "cmd/syncthing" ]; @@ -26,7 +26,7 @@ buildGoPackage rec { homepage = http://syncthing.net/; description = "Replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ matejc ]; + maintainers = with lib.maintainers; [ matejc theuni ]; platforms = with lib.platforms; unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 60bfaa86199..29ec3b50786 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -9,7 +9,7 @@ }: let - version = "2.4.1"; + version = "2.4.2"; svn = subversionClient.override { perlBindings = true; }; in @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "195d61f98jj53jq0w3kfphpyk51h7fylpahc558id79ccc4ii1bj"; + sha256 = "1rf942v2yk49xgy0asgk4vi4mmshpz823iyvrxc5n5y2v0ffq0a8"; }; patches = [ diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 79b9ab92ad9..abacdf7a2d5 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { ./autogen.sh --prefix=$out ''; + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + buildInputs = [ which gnome3.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ]; meta = with stdenv.lib; { diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 69c4897d1a4..8a871cfeb51 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -7,100 +7,86 @@ , extension ? (self: super: {}) }: +with stdenv.lib.strings; + let - optionalString = stdenv.lib.optionalString; - filter = stdenv.lib.filter; - concatMapStringsSep = stdenv.lib.strings.concatMapStringsSep; - concatMapStrings = stdenv.lib.strings.concatMapStrings; - unwords = stdenv.lib.strings.concatStringsSep " "; - mapInside = xs: unwords (map (x: x + "/*") xs); -in -{ mkDerivation = args: - let - postprocess = x: x // { - sourceDirectories = filter (y: !(y == null)) x.sourceDirectories; - propagatedBuildInputs = filter (y : ! (y == null)) x.propagatedBuildInputs; - propagatedUserEnvPkgs = filter (y : ! (y == null)) x.propagatedUserEnvPkgs; - everythingFile = if x.everythingFile == "" then "Everything.agda" else x.everythingFile; + defaults = self : { + # There is no Hackage for Agda so we require src. + inherit (self) src name; - passthru = { inherit (x) extras; }; - extras = null; - }; + isAgdaPackage = true; - defaults = self : { - # There is no Hackage for Agda so we require src. - inherit (self) src name; + buildInputs = [ Agda ] ++ self.buildDepends; + buildDepends = []; - isAgdaPackage = true; + buildDependsAgda = stdenv.lib.filter + (dep: dep ? isAgdaPackage && dep.isAgdaPackage) + self.buildDepends; + buildDependsAgdaShareAgda = map (x: x + "/share/agda") self.buildDependsAgda; - buildInputs = [ Agda ] ++ self.buildDepends; - buildDepends = []; + # Not much choice here ;) + LANG = "en_US.UTF-8"; + LOCALE_ARCHIVE = stdenv.lib.optionalString + stdenv.isLinux + "${glibcLocales}/lib/locale/locale-archive"; - buildDependsAgda = filter - (dep: dep ? isAgdaPackage && dep.isAgdaPackage) - self.buildDepends; - buildDependsAgdaShareAgda = map (x: x + "/share/agda") self.buildDependsAgda; + everythingFile = "Everything.agda"; - # Not much choice here ;) - LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive"; + propagatedBuildInputs = self.buildDependsAgda; + propagatedUserEnvPkgs = self.buildDependsAgda; - everythingFile = "Everything.agda"; + # Immediate source directories under which modules can be found. + sourceDirectories = [ ]; - propagatedBuildInputs = self.buildDependsAgda; - propagatedUserEnvPkgs = self.buildDependsAgda; + # This is used if we have a top-level element that only serves + # as the container for the source and we only care about its + # contents. The directories put here will have their + # *contents* copied over as opposed to sourceDirectories which + # would make a direct copy of the whole thing. + topSourceDirectories = [ "src" ]; - # Immediate source directories under which modules can be found. - sourceDirectories = [ ]; + # FIXME: `dirOf self.everythingFile` is what we really want, not hardcoded "./" + includeDirs = self.buildDependsAgdaShareAgda + ++ self.sourceDirectories ++ self.topSourceDirectories + ++ [ "." ]; + buildFlags = concatStringsSep " " (map (x: "-i " + x) self.includeDirs); - # This is used if we have a top-level element that only serves - # as the container for the source and we only care about its - # contents. The directories put here will have their - # *contents* copied over as opposed to sourceDirectories which - # would make a direct copy of the whole thing. - topSourceDirectories = [ "src" ]; + agdaWithArgs = "${Agda}/bin/agda ${self.buildFlags}"; - # FIXME: `dirOf self.everythingFile` is what we really want, not hardcoded "./" - includeDirs = self.buildDependsAgdaShareAgda - ++ self.sourceDirectories ++ self.topSourceDirectories - ++ [ "." ]; - buildFlags = unwords (map (x: "-i " + x) self.includeDirs); + buildPhase = '' + runHook preBuild + ${self.agdaWithArgs} ${self.everythingFile} + runHook postBuild + ''; - agdaWithArgs = "${Agda}/bin/agda ${self.buildFlags}"; + installPhase = let + srcFiles = self.sourceDirectories + ++ map (x: x + "/*") self.topSourceDirectories; + in '' + runHook preInstall + mkdir -p $out/share/agda + cp -pR ${concatStringsSep " " srcFiles} $out/share/agda + runHook postInstall + ''; - buildPhase = '' - runHook preBuild - ${self.agdaWithArgs} ${self.everythingFile} - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/agda - cp -pR ${unwords self.sourceDirectories} ${mapInside self.topSourceDirectories} $out/share/agda - runHook postInstall - ''; - - # Optionally-built conveniences - extras = { + passthru = { + env = stdenv.mkDerivation { + name = "interactive-${self.name}"; + inherit (self) LANG LOCALE_ARCHIVE; + AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDependsAgdaShareAgda; + buildInputs = let # Makes a wrapper available to the user. Very useful in # nix-shell where all dependencies are -i'd. agdaWrapper = writeScriptBin "agda" '' ${self.agdaWithArgs} "$@" ''; - - # Use this to stick `agdaWrapper` at the front of the PATH: - # - # agda.mkDerivation (self: { PATH = self.extras.agdaWrapperPATH; }) - # - # Not sure this is the best way to handle conflicts.... - agdaWrapperPATH = "${self.extras.agdaWrapper}/bin:$PATH"; - - AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDependsAgdaShareAgda; - }; + in [agdaWrapper] ++ self.buildDepends; }; - in stdenv.mkDerivation - (postprocess (let super = defaults self // args self; - self = super // extension self super; - in self)); + }; + }; +in +{ mkDerivation = args: let + super = defaults self // args self; + self = super // extension self super; + in stdenv.mkDerivation self; } diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix new file mode 100644 index 00000000000..00be987af75 --- /dev/null +++ b/pkgs/build-support/build-dotnet-package/default.nix @@ -0,0 +1,109 @@ +{ stdenv, lib, makeWrapper, pkgconfig, mono, dotnetbuildhelpers }: + +attrsOrig @ +{ baseName +, version +, buildInputs ? [] +, xBuildFiles ? [ ] +, xBuildFlags ? [ "/p:Configuration=Release" ] +, outputFiles ? [ "bin/Release/*" ] +, dllFiles ? [ "*.dll" ] +, exeFiles ? [ "*.exe" ] +, ... }: + let + arrayToShell = (a: toString (map (lib.escape (lib.stringToCharacters "\\ ';$`()|<>\t") ) a)); + + attrs = { + name = "${baseName}-${version}"; + + buildInputs = [ + pkgconfig + mono + dotnetbuildhelpers + makeWrapper + ] ++ buildInputs; + + configurePhase = '' + runHook preConfigure + + [ -z "$dontPlacateNuget" ] && placate-nuget.sh + [ -z "$dontPlacatePaket" ] && placate-paket.sh + [ -z "$dontPatchFSharpTargets" ] && patch-fsharp-targets.sh + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + echo Building dotNET packages... + + # Probably needs to be moved to fsharp + if pkg-config FSharp.Core + then + export FSharpTargetsPath="$(dirname $(pkg-config FSharp.Core --variable=Libraries))/Microsoft.FSharp.Targets" + fi + + ran="" + for xBuildFile in ${arrayToShell xBuildFiles} ''${xBuildFilesExtra} + do + ran="yes" + xbuild ${arrayToShell xBuildFlags} ''${xBuildFlagsArray} $xBuildFile + done + + [ -z "$ran" ] && xbuild ${arrayToShell xBuildFlags} ''${xBuildFlagsArray} + + runHook postBuild + ''; + + dontStrip = true; + + installPhase = '' + runHook preInstall + + target="$out/lib/dotnet/${baseName}" + mkdir -p "$target" + + cp -rv ${arrayToShell outputFiles} "''${outputFilesArray[@]}" "$target" + + if [ -z "$dontRemoveDuplicatedDlls" ] + then + pushd "$out" + remove-duplicated-dlls.sh + popd + fi + + set -f + for dllPattern in ${arrayToShell dllFiles} ''${dllFilesArray[@]} + do + set +f + for dll in "$target"/$dllPattern + do + [ -f "$dll" ] || continue + if pkg-config $(basename -s .dll "$dll") + then + echo "$dll already exported by a buildInputs, not re-exporting" + else + ${dotnetbuildhelpers}/bin/create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll" + fi + done + done + + set -f + for exePattern in ${arrayToShell exeFiles} ''${exeFilesArray[@]} + do + set +f + for exe in "$target"/$exePattern + do + [ -f "$exe" ] || continue + mkdir -p "$out"/bin + commandName="$(basename -s .exe "$(echo "$exe" | tr "[A-Z]" "[a-z]")")" + makeWrapper "${mono}/bin/mono \"$exe\"" "$out"/bin/"$commandName" + done + done + + runHook postInstall + ''; + }; + in + stdenv.mkDerivation (attrs // (builtins.removeAttrs attrsOrig [ "buildInputs" ] )) diff --git a/pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh b/pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh new file mode 100644 index 00000000000..37914170452 --- /dev/null +++ b/pkgs/build-support/dotnetbuildhelpers/create-pkg-config-for-dll.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash + +targetDir="$1" +dllFullPath="$2" + +dllVersion="$(monodis --assembly "$dllFullPath" | grep ^Version: | cut -f 2 -d : | xargs)" +[ -z "$dllVersion" ] && echo "Defaulting dllVersion to 0.0.0" && dllVersion="0.0.0" +dllFileName="$(basename $dllFullPath)" +dllRootName="$(basename -s .dll $dllFileName)" +targetPcFile="$targetDir"/"$dllRootName".pc + +mkdir -p "$targetDir" + +cat > $targetPcFile << EOF +Libraries=$dllFullPath + +Name: $dllRootName +Description: $dllRootName +Version: $dllVersion +Libs: -r:$dllFileName +EOF + +echo "Created $targetPcFile" diff --git a/pkgs/build-support/dotnetbuildhelpers/default.nix b/pkgs/build-support/dotnetbuildhelpers/default.nix new file mode 100644 index 00000000000..ed0d4f790c8 --- /dev/null +++ b/pkgs/build-support/dotnetbuildhelpers/default.nix @@ -0,0 +1,18 @@ +{ helperFunctions, mono, pkgconfig }: + helperFunctions.runCommand + "dotnetbuildhelpers" + { preferLocalBuild = true; } + '' + target="$out/bin" + mkdir -p "$target" + + for script in ${./create-pkg-config-for-dll.sh} ${./patch-fsharp-targets.sh} ${./remove-duplicated-dlls.sh} ${./placate-nuget.sh} ${./placate-paket.sh} + do + scriptName="$(basename "$script" | cut -f 2- -d -)" + cp -v "$script" "$target"/"$scriptName" + chmod 755 "$target"/"$scriptName" + patchShebangs "$target"/"$scriptName" + substituteInPlace "$target"/"$scriptName" --replace pkg-config ${pkgconfig}/bin/pkg-config + substituteInPlace "$target"/"$scriptName" --replace monodis ${mono}/bin/monodis + done + '' diff --git a/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh b/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh new file mode 100644 index 00000000000..3f81cc73e80 --- /dev/null +++ b/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +# Some project files look for F# targets in $(FSharpTargetsPath) +# so it's a good idea to add something like this to your ~/.bash_profile: + +# export FSharpTargetsPath=$(dirname $(which fsharpc))/../lib/mono/4.0/Microsoft.FSharp.Targets + +# In build scripts, you would add somehting like this: + +# export FSharpTargetsPath="${fsharp}/lib/mono/4.0/Microsoft.FSharp.Targets" + +# However, some project files look for F# targets in the main Mono directory. When that happens +# patch the project files using this script so they will look in $(FSharpTargetsPath) instead. + +echo "Patching F# targets in fsproj files..." + +find -iname \*.fsproj -print -exec \ + sed --in-place=.bak \ + -e 's,\([^<]*\),\1,'g \ + {} \; diff --git a/pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh b/pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh new file mode 100644 index 00000000000..8a7f36522a3 --- /dev/null +++ b/pkgs/build-support/dotnetbuildhelpers/placate-nuget.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +echo Placating Nuget in nuget.targets +find -iname nuget.targets -print -exec sed --in-place=bak -e 's,mono --runtime[^<]*,true NUGET PLACATED BY buildDotnetPackage,g' {} \; + +echo Just to be sure, replacing Nuget executables by empty files. +find . -iname nuget.exe \! -size 0 -exec mv -v {} {}.bak \; -exec touch {} \; diff --git a/pkgs/build-support/dotnetbuildhelpers/placate-paket.sh b/pkgs/build-support/dotnetbuildhelpers/placate-paket.sh new file mode 100644 index 00000000000..0dbf1eecbad --- /dev/null +++ b/pkgs/build-support/dotnetbuildhelpers/placate-paket.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +echo Placating Paket in paket.targets +find -iname paket.targets -print -exec sed --in-place=bak -e 's,mono --runtime[^<]*,true PAKET PLACATED BY buildDotnetPackage,g' {} \; + +echo Just to be sure, replacing Paket executables by empty files. +find . -iname paket\*.exe \! -size 0 -exec mv -v {} {}.bak \; -exec touch {} \; diff --git a/pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh b/pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh new file mode 100644 index 00000000000..d8d29912c8f --- /dev/null +++ b/pkgs/build-support/dotnetbuildhelpers/remove-duplicated-dlls.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env bash + +IFS=" +" + +for dll in $(find -iname \*.dll) +do + baseName="$(basename "$dll" | sed "s/.dll$//i")" + if pkg-config "$baseName" + then + candidateDll="$(pkg-config "$baseName" --variable=Libraries)" + + if diff "$dll" "$candidateDll" >/dev/null + then + echo "$dll is identical to $candidateDll. Substituting..." + rm -vf "$dll" + ln -sv "$candidateDll" "$dll" + else + echo "$dll and $candidateDll share the same name but have different contents, leaving alone." + fi + fi +done diff --git a/pkgs/build-support/fetchnuget/default.nix b/pkgs/build-support/fetchnuget/default.nix new file mode 100644 index 00000000000..803db27c9d5 --- /dev/null +++ b/pkgs/build-support/fetchnuget/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, buildDotnetPackage, unzip }: + +attrs @ +{ baseName +, version +, url ? "https://www.nuget.org/api/v2/package/${baseName}/${version}" +, sha256 ? "" +, md5 ? "" +, ... +}: + buildDotnetPackage ({ + src = fetchurl { + inherit url sha256 md5; + name = "${baseName}.${version}.zip"; + }; + + sourceRoot = "."; + + buildInputs = [ unzip ]; + + phases = [ "unpackPhase" "installPhase" ]; + + preInstall = '' + function traverseRename () { + for e in * + do + t="$(echo "$e" | sed -e "s/%20/\ /g" -e "s/%2B/+/g")" + [ "$t" != "$e" ] && mv -vn "$e" "$t" + if [ -d "$t" ] + then + cd "$t" + traverseRename + cd .. + fi + done + } + + traverseRename + ''; + } // attrs) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 7f61ddc77db..1453af3a62a 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -339,7 +339,6 @@ rec { http://cran.hafro.is/ http://ftp.iitm.ac.in/cran/ http://cran.repo.bppt.go.id/ - http://cran.unej.ac.id/ http://cran.um.ac.ir/ http://ftp.heanet.ie/mirrors/cran.r-project.org/ http://cran.mirror.garr.it/mirrors/CRAN/ diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index e79dcd014d3..be420df4886 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { downloadPage = https://www.donationcoder.com/Software/Jibz/Dina/; license = licenses.free; maintainers = [ maintainers.prikhi ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix new file mode 100644 index 00000000000..dfcc0578f00 --- /dev/null +++ b/pkgs/data/fonts/tewi/default.nix @@ -0,0 +1,47 @@ +{stdenv, fetchgit, bdftopcf, mkfontdir, mkfontscale}: + +stdenv.mkDerivation rec { + date = "2015-06-07"; + name = "tewi-font-${date}"; + + src = fetchgit { + url = "https://github.com/lucy/tewi-font"; + rev = "ff930e66ae471da4fdc226ffe65fd1ccd13d4a69"; + sha256 = "d641b911cc2132a00c311e3d978c1ca454b0fb3bc3ff4b4742b9f765b765a94b"; + }; + + buildInputs = [ bdftopcf mkfontdir mkfontscale ]; + buildPhase = '' + for i in *.bdf; do + bdftopcf -o ''${i/bdf/pcf} $i + done + + gzip *.pcf + ''; + + installPhase = '' + fontDir="$out/share/fonts/misc" + mkdir -p "$fontDir" + mv *.pcf.gz "$fontDir" + + cd "$fontDir" + mkfontdir + mkfontscale + ''; + + meta = with stdenv.lib; { + description = "A nice bitmap font, readable even at small sizes"; + longDescription = '' + Tewi is a bitmap font, readable even at very small font sizes. This is + particularily useful while programming, to fit a lot of code on your + screen. + ''; + homepage = "https://github.com/lucy/tewi-font"; + license = { + fullName = "GNU General Public License with a font exception"; + url = "https://www.gnu.org/licenses/gpl-faq.html#FontException"; + }; + maintainers = [ maintainers.fro_ozen ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/data/misc/nixos-artwork/default.nix b/pkgs/data/misc/nixos-artwork/default.nix new file mode 100644 index 00000000000..99f3e8b1177 --- /dev/null +++ b/pkgs/data/misc/nixos-artwork/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + name = "nixos-artwork-2015-02-27"; + # Remember to check the default lightdm wallpaper when updating + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nixos-artwork"; + rev = "e71b6846023919136795ede22b16d73b2cf1693d"; + sha256 = "167yvhm2qy7qgyrqqs4hv98mmlarhgxpcsyv0r8a9g3vkblfdczb"; + }; + + installPhase = '' + mkdir -p $out/share/artwork + cp -r * $out/share/artwork + find $out -name \*.xcf -exec rm {} \; + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/NixOS/nixos-artwork"; + platforms = platforms.all; + }; +} diff --git a/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix index bce514364ce..ad95b76b2a3 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix @@ -1,34 +1,33 @@ { stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, - dbus_glib, libcanberra, gst_all_1, upower, vala, gnome3, gtk3, gst_plugins_base, - glib, gobjectIntrospection, hicolor_icon_theme + dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, gst_plugins_base, + glib, gobjectIntrospection, hicolor_icon_theme, telepathy_glib }: stdenv.mkDerivation rec { - rev = "0.10.3"; - name = "gnome-shell-pomodoro-${rev}-61df3fa"; + rev = "624945d"; + name = "gnome-shell-pomodoro-${gnome3.version}-${rev}"; src = fetchFromGitHub { owner = "codito"; - repo = "gnome-shell-pomodoro"; + repo = "gnome-pomodoro"; rev = "${rev}"; - sha256 = "0i0glmijalppb5hdb1xd6xnmv824l2w831rpkqmhxi0iqbvaship"; + sha256 = "0vjy95zvd309n8g13fa80qhqlv7k6wswhrjw7gddxrnmr662xdqq"; }; configureScript = ''./autogen.sh''; buildInputs = [ which automake113x intltool glib gobjectIntrospection pkgconfig libtool - makeWrapper dbus_glib libcanberra upower vala gst_all_1.gstreamer + makeWrapper dbus_glib libcanberra vala gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome3.gsettings_desktop_schemas gnome3.gnome_desktop gnome3.gnome_common gnome3.gnome_shell hicolor_icon_theme gtk3 + telepathy_glib ]; preBuild = '' - sed -i \ - -e 's|/usr\(/share/gir-1.0/UPowerGlib\)|${upower}\1|' \ - -e 's|/usr\(/share/gir-1.0/GnomeDesktop\)|${gnome3.gnome_desktop}\1|' \ - vapi/Makefile + sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \ + vapi/Makefile ''; preFixup = '' @@ -42,7 +41,7 @@ stdenv.mkDerivation rec { description = "Personal information management application that provides integrated " + "mail, calendaring and address book functionality"; - maintainers = with maintainers; [ DamienCassou ]; + maintainers = with maintainers; [ DamienCassou jgeerds ]; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix index b3acdee072d..f9d87298fff 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix @@ -11,10 +11,12 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig intltool gnupg p11_kit glib gobjectIntrospection libxslt + pkgconfig intltool gnupg glib gobjectIntrospection libxslt libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala ]; + propagatedBuildInputs = [ p11_kit ]; + #doCheck = true; preFixup = '' diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index 82742cf9af6..92d80deb532 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, mono, pkgconfig, autoconf, automake, which }: +# Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it + +{ stdenv, fetchurl, mono, pkgconfig, dotnetbuildhelpers, autoconf, automake, which }: stdenv.mkDerivation rec { name = "fsharp-${version}"; @@ -9,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16kqgdx0y0lmxv59mc4g7l5ll60nixg5b8bg07vxfnqrf7i6dffd"; }; - buildInputs = [ mono pkgconfig autoconf automake which ]; + buildInputs = [ mono pkgconfig dotnetbuildhelpers autoconf automake which ]; configurePhase = '' substituteInPlace ./autogen.sh --replace "/usr/bin/env sh" "/bin/sh" ./autogen.sh --prefix $out @@ -23,6 +25,10 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/fsharpiAnyCpu --replace " mono " " ${mono}/bin/mono " ln -s $out/bin/fsharpc $out/bin/fsc ln -s $out/bin/fsharpi $out/bin/fsi + for dll in "$out/lib/mono/4.5"/FSharp*.dll + do + create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll" + done ''; # To fix this error when running: diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 45bb4342088..bc59a53bc17 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -17,14 +17,14 @@ let in stdenv.mkDerivation rec { - version = "7.11.20150402"; + version = "7.11.20150607"; name = "ghc-${version}"; - rev = "47f821a1a24553dc29b9581b1a259a9b1394c955"; + rev = "89223ce1340654455a9f3aa9cbf25f30884227fd"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "111a2z6bgn966g04a9n2ns9n2a401rd0zqgndznn2w4fv8a4qzgj"; + sha256 = "1qsv2n5js21kqphq92xlyc91f11fnr9sh1glqzsirc8xr60dg5cs"; }; postUnpack = '' diff --git a/pkgs/development/compilers/go/1.1-darwin.nix b/pkgs/development/compilers/go/1.1-darwin.nix index 5b17f56ac37..776c1e04f08 100644 --- a/pkgs/development/compilers/go/1.1-darwin.nix +++ b/pkgs/development/compilers/go/1.1-darwin.nix @@ -69,11 +69,11 @@ stdenv.mkDerivation { cp ./misc/emacs/* $out/share/emacs/site-lisp/ ''; - meta = { + meta = with stdenv.lib; { homepage = http://golang.org/; description = "The Go Programming language"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [ zef ]; - platforms = stdenv.lib.platforms.darwin; + license = licenses.bsd3; + maintainers = with maintainers; [ zef ]; + platforms = platforms.darwin; }; } diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix index 11640f2393d..de34e3e3cda 100644 --- a/pkgs/development/compilers/go/1.1.nix +++ b/pkgs/development/compilers/go/1.1.nix @@ -90,12 +90,12 @@ stdenv.mkDerivation { cp ./misc/emacs/* $out/share/emacs/site-lisp/ ''; - meta = { + meta = with stdenv.lib; { branch = "1.1"; homepage = http://golang.org/; description = "The Go Programming language"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [ pierron viric ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + maintainers = with maintainers; [ pierron viric ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix index 113e2118efb..bbedea812b8 100644 --- a/pkgs/development/compilers/go/1.2.nix +++ b/pkgs/development/compilers/go/1.2.nix @@ -81,12 +81,12 @@ stdenv.mkDerivation { cp ./misc/emacs/* $out/share/emacs/site-lisp/ ''; - meta = { + meta = with stdenv.lib; { branch = "1.2"; homepage = http://golang.org/; description = "The Go Programming language"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [ pierron viric ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + maintainers = with maintainers; [ pierron viric ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix index 6d88049cfbe..52a388aff1f 100644 --- a/pkgs/development/compilers/go/1.3.nix +++ b/pkgs/development/compilers/go/1.3.nix @@ -102,12 +102,12 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; - meta = { + meta = with stdenv.lib; { branch = "1.3"; homepage = http://golang.org/; description = "The Go Programming language"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [ cstrahan ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = licenses.bsd3; + maintainers = with maintainers; [ cstrahan ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 1feaf68930a..12642eeace5 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -88,12 +88,12 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - meta = { + meta = with stdenv.lib; { branch = "1.4"; homepage = http://golang.org/; description = "The Go Programming language"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [ cstrahan wkennington ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = licenses.bsd3; + maintainers = with maintainers; [ cstrahan wkennington ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/compilers/icedtea/cppflags-include-fix.patch b/pkgs/development/compilers/icedtea/cppflags-include-fix.patch deleted file mode 100644 index 731a8d07548..00000000000 --- a/pkgs/development/compilers/icedtea/cppflags-include-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git openjdk-orig/jdk/make/sun/awt/mawt.gmk openjdk/jdk/make/sun/awt/mawt.gmk -index c6ab06d..23a14da 100644 ---- openjdk-orig/jdk/make/sun/awt/mawt.gmk -+++ openjdk/jdk/make/sun/awt/mawt.gmk -@@ -270,12 +270,6 @@ LDFLAGS += -L$(MOTIF_LIB) -L$(OPENWIN_LIB) - endif # !HEADLESS - endif # PLATFORM - --ifeq ($(PLATFORM), linux) -- # Checking for the X11/extensions headers at the additional location -- CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \ -- $(wildcard /usr/include/X11/extensions)) --endif -- - ifeq ($(PLATFORM), macosx) - CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ - -I$(OPENWIN_HOME)/include diff --git a/pkgs/development/compilers/icedtea/default.nix b/pkgs/development/compilers/icedtea/default.nix deleted file mode 100644 index 8a96d1c380d..00000000000 --- a/pkgs/development/compilers/icedtea/default.nix +++ /dev/null @@ -1,181 +0,0 @@ -{ stdenv, fetchurl, jdk, ant, wget, zip, unzip, cpio, file, libxslt -, xorg, zlib, pkgconfig, libjpeg, libpng, giflib, lcms2, gtk2, kerberos, attr -, alsaLib, procps, automake, autoconf, cups, which, perl, coreutils, binutils -, cacert, setJavaClassPath -}: - -let - - /** - * The JRE libraries are in directories that depend on the CPU. - */ - architecture = - if stdenv.system == "i686-linux" then - "i386" - else if stdenv.system == "x86_64-linux" then - "amd64" - else - throw "icedtea requires i686-linux or x86_64 linux"; - - srcInfo = (import ./sources.nix).icedtea7; - - pkgName = "icedtea7-${srcInfo.version}"; - - defSrc = name: - with (builtins.getAttr name srcInfo.bundles); fetchurl { - inherit url sha256; - name = "${pkgName}-${baseNameOf url}"; - }; - - bundleNames = builtins.attrNames srcInfo.bundles; - - sources = stdenv.lib.genAttrs bundleNames (name: defSrc name); - - bundleFun = name: "--with-${name}-src-zip=" + builtins.getAttr name sources; - bundleFlags = map bundleFun bundleNames; - - icedtea = stdenv.mkDerivation (with srcInfo; { - name = pkgName; - - src = fetchurl { - inherit url sha256; - }; - - outputs = [ "out" "jre" ]; - - # TODO: Probably some more dependencies should be on this list but are being - # propagated instead - buildInputs = [ - jdk ant wget zip unzip cpio file libxslt pkgconfig procps automake - autoconf which perl coreutils xorg.lndir - zlib libjpeg libpng giflib lcms2 kerberos attr alsaLib cups - xorg.libX11 xorg.libXtst gtk2 - ]; - - configureFlags = bundleFlags ++ [ - "--disable-bootstrap" - "--disable-downloading" - - "--without-rhino" - "--with-pax=paxctl" - "--with-jdk-home=${jdk.home}" - ]; - - preConfigure = '' - unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - - substituteInPlace javac.in --replace '#!/usr/bin/perl' '#!${perl}/bin/perl' - substituteInPlace javah.in --replace '#!/usr/bin/perl' '#!${perl}/bin/perl' - - ./autogen.sh - ''; - - preBuild = '' - make stamps/extract.stamp - - substituteInPlace openjdk/jdk/make/common/shared/Defs-utils.gmk --replace '/bin/echo' '${coreutils}/bin/echo' - substituteInPlace openjdk/corba/make/common/shared/Defs-utils.gmk --replace '/bin/echo' '${coreutils}/bin/echo' - - patch -p0 < ${./cppflags-include-fix.patch} - patch -p0 < ${./fix-java-home.patch} - ''; - - NIX_NO_SELF_RPATH = true; - - makeFlags = [ - "ALSA_INCLUDE=${alsaLib}/include/alsa/version.h" - "ALT_UNIXCOMMAND_PATH=" - "ALT_USRBIN_PATH=" - "ALT_DEVTOOLS_PATH=" - "ALT_COMPILER_PATH=" - "ALT_CUPS_HEADERS_PATH=${cups}/include" - "ALT_OBJCOPY=${binutils}/bin/objcopy" - "SORT=${coreutils}/bin/sort" - "UNLIMITED_CRYPTO=1" - ]; - - installPhase = '' - mkdir -p $out/lib/icedtea $out/share $jre/lib/icedtea - - cp -av openjdk.build/j2sdk-image/* $out/lib/icedtea - - # Move some stuff to top-level. - mv $out/lib/icedtea/include $out/include - mv $out/lib/icedtea/man $out/share/man - - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux/*_md.h $out/include/ - - # Remove some broken manpages. - rm -rf $out/share/man/ja* - - # Remove crap from the installation. - rm -rf $out/lib/icedtea/demo $out/lib/icedtea/sample - - # Move the JRE to a separate output. - mv $out/lib/icedtea/jre $jre/lib/icedtea/ - mkdir $out/lib/icedtea/jre - lndir $jre/lib/icedtea/jre $out/lib/icedtea/jre - - # The following files cannot be symlinked, as it seems to violate Java security policies - rm $out/lib/icedtea/jre/lib/ext/* - cp $jre/lib/icedtea/jre/lib/ext/* $out/lib/icedtea/jre/lib/ext/ - - rm -rf $out/lib/icedtea/jre/bin - ln -s $out/lib/icedtea/bin $out/lib/icedtea/jre/bin - - # Remove duplicate binaries. - for i in $(cd $out/lib/icedtea/bin && echo *); do - if [ "$i" = java ]; then continue; fi - if cmp -s $out/lib/icedtea/bin/$i $jre/lib/icedtea/jre/bin/$i; then - ln -sfn $jre/lib/icedtea/jre/bin/$i $out/lib/icedtea/bin/$i - fi - done - - # Generate certificates. - pushd $jre/lib/icedtea/jre/lib/security - rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/icedtea/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt - popd - - ln -s $out/lib/icedtea/bin $out/bin - ln -s $jre/lib/icedtea/jre/bin $jre/bin - ''; - - # FIXME: this is unnecessary once the multiple-outputs branch is merged. - preFixup = '' - prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}" - patchELF $jre - propagatedNativeBuildInputs+=" $jre" - - # Propagate the setJavaClassPath setup hook from the JRE so that - # any package that depends on the JRE has $CLASSPATH set up - # properly. - mkdir -p $jre/nix-support - echo -n "${setJavaClassPath}" > $jre/nix-support/propagated-native-build-inputs - - # Set JAVA_HOME automatically. - mkdir -p $out/nix-support - cat < $out/nix-support/setup-hook - if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out/lib/icedtea; fi - EOF - ''; - - meta = { - description = "Free Java development kit based on OpenJDK 7.0 and the IcedTea project"; - longDescription = '' - Free Java environment based on OpenJDK 7.0 and the IcedTea project. - - Full Java runtime environment - - Needed for executing Java Webstart programs and the free Java web browser plugin. - ''; - homepage = http://icedtea.classpath.org; - maintainers = with stdenv.lib.maintainers; [ wizeman ]; - platforms = stdenv.lib.platforms.linux; - }; - - passthru = { - inherit architecture; - home = "${icedtea}/lib/icedtea"; - }; - }); -in icedtea diff --git a/pkgs/development/compilers/icedtea/fix-java-home.patch b/pkgs/development/compilers/icedtea/fix-java-home.patch deleted file mode 100644 index 5def344f171..00000000000 --- a/pkgs/development/compilers/icedtea/fix-java-home.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ru -x '*~' openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp ---- openjdk-orig/hotspot/src/os/linux/vm/os_linux.cpp 2013-09-06 20:22:03.000000000 +0200 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2014-01-24 22:44:08.223857012 +0100 -@@ -2358,12 +2358,10 @@ - CAST_FROM_FN_PTR(address, os::jvm_path), - dli_fname, sizeof(dli_fname), NULL); - assert(ret, "cannot locate libjvm"); - char *rp = NULL; - if (ret && dli_fname[0] != '\0') { -- rp = realpath(dli_fname, buf); -+ snprintf(buf, buflen, "%s", dli_fname); - } -- if (rp == NULL) -- return; - - if (Arguments::created_by_gamma_launcher()) { - // Support for the gamma launcher. Typical value for buf is diff --git a/pkgs/development/compilers/icedtea/generate-cacerts.pl b/pkgs/development/compilers/icedtea/generate-cacerts.pl deleted file mode 100644 index 3bdd42f7274..00000000000 --- a/pkgs/development/compilers/icedtea/generate-cacerts.pl +++ /dev/null @@ -1,366 +0,0 @@ -#!/usr/bin/perl - -# Copyright (C) 2007, 2008 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# generate-cacerts.pl generates a JKS keystore named 'cacerts' from -# OpenSSL's certificate bundle using OpenJDK's keytool. - -# First extract each of OpenSSL's bundled certificates into its own -# aliased filename. - -# Downloaded from http://cvs.fedoraproject.org/viewvc/rpms/ca-certificates/F-12/generate-cacerts.pl?revision=1.2 -# Check and prevention of duplicate aliases added by Vlastimil Babka - -$file = $ARGV[1]; -open(CERTS, $file); -@certs = ; -close(CERTS); - -$pem_file_count = 0; -$in_cert_block = 0; -$write_current_cert = 1; -foreach $cert (@certs) -{ - if ($cert =~ /Issuer: /) - { - $_ = $cert; - if ($cert =~ /personal-freemail/) - { - $cert_alias = "thawtepersonalfreemailca"; - } - elsif ($cert =~ /personal-basic/) - { - $cert_alias = "thawtepersonalbasicca"; - } - elsif ($cert =~ /personal-premium/) - { - $cert_alias = "thawtepersonalpremiumca"; - } - elsif ($cert =~ /server-certs/) - { - $cert_alias = "thawteserverca"; - } - elsif ($cert =~ /premium-server/) - { - $cert_alias = "thawtepremiumserverca"; - } - elsif ($cert =~ /Class 1 Public Primary Certification Authority$/) - { - $cert_alias = "verisignclass1ca"; - } - elsif ($cert =~ /Class 1 Public Primary Certification Authority - G2/) - { - $cert_alias = "verisignclass1g2ca"; - } - elsif ($cert =~ - /VeriSign Class 1 Public Primary Certification Authority - G3/) - { - $cert_alias = "verisignclass1g3ca"; - } - elsif ($cert =~ /Class 2 Public Primary Certification Authority$/) - { - $cert_alias = "verisignclass2ca"; - } - elsif ($cert =~ /Class 2 Public Primary Certification Authority - G2/) - { - $cert_alias = "verisignclass2g2ca"; - } - elsif ($cert =~ - /VeriSign Class 2 Public Primary Certification Authority - G3/) - { - $cert_alias = "verisignclass2g3ca"; - } - elsif ($cert =~ /Class 3 Public Primary Certification Authority$/) - { - $cert_alias = "verisignclass3ca"; - } - # Version 1 of Class 3 Public Primary Certification Authority - # - G2 is added. Version 3 is excluded. See below. - elsif ($cert =~ - /VeriSign Class 3 Public Primary Certification Authority - G3/) - { - $cert_alias = "verisignclass3g3ca"; - } - elsif ($cert =~ - /RSA Data Security.*Secure Server Certification Authority/) - { - $cert_alias = "verisignserverca"; - } - elsif ($cert =~ /GTE CyberTrust Global Root/) - { - $cert_alias = "gtecybertrustglobalca"; - } - elsif ($cert =~ /Baltimore CyberTrust Root/) - { - $cert_alias = "baltimorecybertrustca"; - } - elsif ($cert =~ /www.entrust.net\/Client_CA_Info\/CPS/) - { - $cert_alias = "entrustclientca"; - } - elsif ($cert =~ /www.entrust.net\/GCCA_CPS/) - { - $cert_alias = "entrustglobalclientca"; - } - elsif ($cert =~ /www.entrust.net\/CPS_2048/) - { - $cert_alias = "entrust2048ca"; - } - elsif ($cert =~ /www.entrust.net\/CPS /) - { - $cert_alias = "entrustsslca"; - } - elsif ($cert =~ /www.entrust.net\/SSL_CPS/) - { - $cert_alias = "entrustgsslca"; - } - elsif ($cert =~ /The Go Daddy Group/) - { - $cert_alias = "godaddyclass2ca"; - } - elsif ($cert =~ /Starfield Class 2 Certification Authority/) - { - $cert_alias = "starfieldclass2ca"; - } - elsif ($cert =~ /ValiCert Class 2 Policy Validation Authority/) - { - $cert_alias = "valicertclass2ca"; - } - elsif ($cert =~ /GeoTrust Global CA$/) - { - $cert_alias = "geotrustglobalca"; - } - elsif ($cert =~ /Equifax Secure Certificate Authority/) - { - $cert_alias = "equifaxsecureca"; - } - elsif ($cert =~ /Equifax Secure eBusiness CA-1/) - { - $cert_alias = "equifaxsecureebusinessca1"; - } - elsif ($cert =~ /Equifax Secure eBusiness CA-2/) - { - $cert_alias = "equifaxsecureebusinessca2"; - } - elsif ($cert =~ /Equifax Secure Global eBusiness CA-1/) - { - $cert_alias = "equifaxsecureglobalebusinessca1"; - } - elsif ($cert =~ /Sonera Class1 CA/) - { - $cert_alias = "soneraclass1ca"; - } - elsif ($cert =~ /Sonera Class2 CA/) - { - $cert_alias = "soneraclass2ca"; - } - elsif ($cert =~ /AAA Certificate Services/) - { - $cert_alias = "comodoaaaca"; - } - elsif ($cert =~ /AddTrust Class 1 CA Root/) - { - $cert_alias = "addtrustclass1ca"; - } - elsif ($cert =~ /AddTrust External CA Root/) - { - $cert_alias = "addtrustexternalca"; - } - elsif ($cert =~ /AddTrust Qualified CA Root/) - { - $cert_alias = "addtrustqualifiedca"; - } - elsif ($cert =~ /UTN-USERFirst-Hardware/) - { - $cert_alias = "utnuserfirsthardwareca"; - } - elsif ($cert =~ /UTN-USERFirst-Client Authentication and Email/) - { - $cert_alias = "utnuserfirstclientauthemailca"; - } - elsif ($cert =~ /UTN - DATACorp SGC/) - { - $cert_alias = "utndatacorpsgcca"; - } - elsif ($cert =~ /UTN-USERFirst-Object/) - { - $cert_alias = "utnuserfirstobjectca"; - } - elsif ($cert =~ /America Online Root Certification Authority 1/) - { - $cert_alias = "aolrootca1"; - } - elsif ($cert =~ /DigiCert Assured ID Root CA/) - { - $cert_alias = "digicertassuredidrootca"; - } - elsif ($cert =~ /DigiCert Global Root CA/) - { - $cert_alias = "digicertglobalrootca"; - } - elsif ($cert =~ /DigiCert High Assurance EV Root CA/) - { - $cert_alias = "digicerthighassuranceevrootca"; - } - elsif ($cert =~ /GlobalSign Root CA$/) - { - $cert_alias = "globalsignca"; - } - elsif ($cert =~ /GlobalSign Root CA - R2/) - { - $cert_alias = "globalsignr2ca"; - } - elsif ($cert =~ /Elektronik.*Kas.*2005/) - { - $cert_alias = "extra-elektronikkas2005"; - } - elsif ($cert =~ /Elektronik/) - { - $cert_alias = "extra-elektronik2005"; - } - # Mozilla does not provide these certificates: - # baltimorecodesigningca - # gtecybertrust5ca - # trustcenterclass2caii - # trustcenterclass4caii - # trustcenteruniversalcai - else - { - # Generate an alias using the OU and CN attributes of the - # Issuer field if both are present, otherwise use only the - # CN attribute. The Issuer field must have either the OU - # or the CN attribute. - $_ = $cert; - if ($cert =~ /OU=/) - { - s/Issuer:.*?OU=//; - # Remove other occurrences of OU=. - s/OU=.*CN=//; - # Remove CN= if there were not other occurrences of OU=. - s/CN=//; - s/\/emailAddress.*//; - s/Certificate Authority/ca/g; - s/Certification Authority/ca/g; - } - elsif ($cert =~ /CN=/) - { - s/Issuer:.*CN=//; - s/\/emailAddress.*//; - s/Certificate Authority/ca/g; - s/Certification Authority/ca/g; - } - s/\W//g; - tr/A-Z/a-z/; - $cert_alias = "extra-$_"; - - } - while (-e "$cert_alias.pem") - { - $cert_alias = "$cert_alias" . "_"; - } - } - # When it attempts to parse: - # - # Class 3 Public Primary Certification Authority - G2, Version 3 - # - # keytool says: - # - # #2: ObjectId: 1.3.6.1.5.5.7.1.1 Criticality=false - # Unparseable AuthorityInfoAccess extension due to - # java.io.IOException: Invalid encoding of URI - # - # If we do not exclude this file - # openjdk/jdk/test/lib/security/cacerts/VerifyCACerts.java fails - # on this cert, printing: - # - # Couldn't verify: java.security.SignatureException: Signature - # does not match. - # - elsif ($cert =~ - /A6:0F:34:C8:62:6C:81:F6:8B:F7:7D:A9:F6:67:58:8A:90:3F:7D:36/) - { - $write_current_cert = 0; - $pem_file_count--; - } - elsif ($cert eq "-----BEGIN CERTIFICATE-----\n") - { - $_ = $cert; - s/\W//g; - tr/A-Z/a-z/; - $cert_alias = "extra-$_"; - while (-e "$cert_alias.pem") - { - $cert_alias = "$cert_alias" . "_"; - } - if ($in_cert_block != 0) - { - die "$file is malformed."; - } - $in_cert_block = 1; - if ($write_current_cert == 1) - { - $pem_file_count++; - if (-e "$cert_alias.pem") - { - print "$cert_alias"; - die "already exists" - } - open(PEM, ">$cert_alias.pem"); - print PEM $cert; - } - } - elsif ($cert eq "-----END CERTIFICATE-----\n") - { - $in_cert_block = 0; - if ($write_current_cert == 1) - { - print PEM $cert; - close(PEM); - } - $write_current_cert = 1 - } - else - { - if ($in_cert_block == 1 && $write_current_cert == 1) - { - print PEM $cert; - } - } -} - -# Check that the correct number of .pem files were produced. -@pem_files = <*.pem>; -if (@pem_files != $pem_file_count) -{ - print "$pem_file_count"; - die "Number of .pem files produced does not match". - " number of certs read from $file."; -} - -# Now store each cert in the 'cacerts' file using keytool. -$certs_written_count = 0; -foreach $pem_file (@pem_files) -{ - system "$ARGV[0] -noprompt -import". - " -alias `basename $pem_file .pem`". - " -keystore cacerts -storepass 'changeit' -file $pem_file"; - unlink($pem_file); - $certs_written_count++; -} - -# Check that the correct number of certs were added to the keystore. -if ($certs_written_count != $pem_file_count) -{ - die "Number of certs added to keystore does not match". - " number of certs read from $file."; -} diff --git a/pkgs/development/compilers/icedtea/sources.nix b/pkgs/development/compilers/icedtea/sources.nix deleted file mode 100644 index 80d96b4660a..00000000000 --- a/pkgs/development/compilers/icedtea/sources.nix +++ /dev/null @@ -1,48 +0,0 @@ -# This file is autogenerated from update.py in the same directory. -{ - icedtea7 = rec { - version = "2.5.5"; - - url = "http://icedtea.wildebeest.org/download/source/icedtea-${version}.tar.xz"; - sha256 = "1irxk2ndwsfk4c1zbzb5h3rpwv2bc9bhfjvz6p4dws5476vsxrq9"; - - common_url = "http://icedtea.classpath.org/download/drops/icedtea7/${version}"; - - bundles = { - openjdk = rec { - url = "${common_url}/openjdk.tar.bz2"; - sha256 = "5301baacfb6b4ee28a3469b8429a0017898615532f727bb50d94777682c5fd0d"; - }; - - corba = rec { - url = "${common_url}/corba.tar.bz2"; - sha256 = "f0576599b474f56e58068071242cedbbf2f181b58c9010b614c9096be764ac51"; - }; - - jaxp = rec { - url = "${common_url}/jaxp.tar.bz2"; - sha256 = "293218d595763f7e02a91ea88860e5314e42330cbc21b73dc5de32e7e26fd256"; - }; - - jaxws = rec { - url = "${common_url}/jaxws.tar.bz2"; - sha256 = "76d6d0670ede806b01d39e07c644e423a50984f1cf0ec560afa23f0fedf575be"; - }; - - jdk = rec { - url = "${common_url}/jdk.tar.bz2"; - sha256 = "c1bc0d25457ccf40fcaeb5311052f6d2fbab8ef316b0381995835827711da483"; - }; - - langtools = rec { - url = "${common_url}/langtools.tar.bz2"; - sha256 = "71b269ea930da36d751c6183816ef53a65c0587b7cf0195f87759b4c02c3b660"; - }; - - hotspot = rec { - url = "${common_url}/hotspot.tar.bz2"; - sha256 = "d724a9749f51a3c66351ad8a27bc4570640720eace33cd03f1a52e2e45731dfb"; - }; - }; - }; -} diff --git a/pkgs/development/compilers/icedtea/update.py b/pkgs/development/compilers/icedtea/update.py deleted file mode 100755 index c41cf3d38d2..00000000000 --- a/pkgs/development/compilers/icedtea/update.py +++ /dev/null @@ -1,261 +0,0 @@ -#!/usr/bin/env python3 - -import subprocess, urllib.request, re, os, tarfile -from html.parser import HTMLParser - -URL = 'http://icedtea.classpath.org/download/drops/icedtea{}/{}' -DOWNLOAD_URL = 'http://icedtea.wildebeest.org/download/source/' -DOWNLOAD_HTML = DOWNLOAD_URL + '?C=M;O=D' - -ICEDTEA_JDKS = [7] - -BUNDLES = ['openjdk', 'corba', 'jaxp', 'jaxws', 'jdk', 'langtools', 'hotspot'] - -SRC_PATH = './sources.nix' - -def get_output(cmd, env = None): - try: - proc = subprocess.Popen(cmd, env = env, stdout = subprocess.PIPE) - out = proc.communicate()[0] - except subprocess.CalledProcessError as e: - return None - - return out.decode('utf-8').strip() - -def nix_prefetch_url(url): - env = os.environ.copy() - env['PRINT_PATH'] = '1' - out = get_output(['nix-prefetch-url', url], env = env) - - return out.split('\n') - -def get_nix_attr(path, attr): - out = get_output(['nix-instantiate', '--eval-only', '-A', attr, path]) - - if len(out) < 2 or out[0] != '"' or out[-1] != '"': - raise Exception('Cannot find Nix attribute "{}" (parsing failure?)'.format(attr)) - - # Strip quotes - return out[1:-1] - -def get_jdk_attr(jdk, attr): - return get_nix_attr(SRC_PATH, 'icedtea{}.{}'.format(jdk, attr)) - -class Parser(HTMLParser): - def __init__(self, link_regex): - HTMLParser.__init__(self) - - self.regex = link_regex - self.href = None - self.version = None - - def handle_starttag(self, tag, attrs): - if self.href != None or tag != 'a': - return - - href = None - for attr in attrs: - if attr[0] == 'href': - href = attr[1] - if href == None: - return - - m = re.match(self.regex, href) - if m != None: - self.href = href - self.version = m.group(1) - -def get_latest_version_url(major): - f = urllib.request.urlopen(DOWNLOAD_HTML) - html = f.read().decode('utf-8') - f.close() - - parser = Parser(r'^icedtea\d?-({}\.\d[\d.]*)\.tar\.xz$'.format(major)) - parser.feed(html) - parser.close() - - if parser.href == None: - raise Exception('Error: could not find download url for major version "{}"'.format(major)) - - return parser.version, DOWNLOAD_URL + parser.href - -def get_old_bundle_attrs(jdk, bundle): - attrs = {} - for attr in ('url', 'sha256'): - attrs[attr] = get_jdk_attr(jdk, 'bundles.{}.{}'.format(bundle, attr)) - - return attrs - -def get_old_attrs(jdk): - attrs = {} - - for attr in ('version', 'url', 'sha256'): - attrs[attr] = get_jdk_attr(jdk, attr) - - attrs['bundles'] = {} - - for bundle in BUNDLES: - attrs['bundles'][bundle] = get_old_bundle_attrs(jdk, bundle) - - return attrs - -def get_member_filename(tarball, name): - for fname in tarball.getnames(): - m = re.match(r'^icedtea\d?-\d[\d.]*/{}$'.format(name), fname) - if m != None: - return m.group(0) - - return None - -def get_member_file(tarball, name): - path = get_member_filename(tarball, name) - if path == None: - raise Exception('Could not find "{}" inside tarball'.format(name)) - - f = tarball.extractfile(path) - data = f.read().decode('utf-8') - f.close() - - return data - -def get_new_bundle_attr(makefile, bundle, attr): - var = '{}_{}'.format(bundle.upper(), attr.upper()) - regex = r'^{} = (.*?)$'.format(var) - - m = re.search(regex, makefile, re.MULTILINE) - if m == None: - raise Exception('Could not find variable "{}" in Makefile.am'.format(var)) - - return m.group(1) - -def get_new_bundle_attrs(jdk, version, path): - url = URL.format(jdk, version) - - attrs = {} - - print('Opening file: "{}"'.format(path)) - tar = tarfile.open(name = path, mode = 'r:xz') - - makefile = get_member_file(tar, 'Makefile.am') - hotspot_map = get_member_file(tar, 'hotspot.map.in') - - hotspot_map = hotspot_map.replace('@ICEDTEA_RELEASE@', version) - - for bundle in BUNDLES: - battrs = {} - - battrs['url'] = '{}/{}.tar.bz2'.format(url, bundle) - if bundle == 'hotspot': - m = re.search(r'^default (.*?) (.*?) (.*?) (.*?)$', hotspot_map, re.MULTILINE) - if m == None: - raise Exception('Could not find info for hotspot bundle in hotspot.map.in') - - battrs['sha256'] = m.group(4) - else: - battrs['sha256'] = get_new_bundle_attr(makefile, bundle, 'sha256sum') - - attrs[bundle] = battrs - - tar.close() - - return attrs - -def get_new_attrs(jdk): - print('Getting old attributes for JDK {}...'.format(jdk)) - old_attrs = get_old_attrs(jdk) - attrs = {} - - # The major version corresponds to a specific JDK (1 = OpenJDK6, 2 = OpenJDK7, 3 = OpenJDK8) - major = jdk - 5 - - print('Getting latest version for JDK {}...'.format(jdk)) - version, url = get_latest_version_url(major) - - print() - print('Old version: {}'.format(old_attrs['version'])) - print('New version: {}'.format(version)) - print() - - if version == old_attrs['version']: - print('No update available, skipping...') - print() - return old_attrs - - print('Update available, generating new attributes for JDK {}...'.format(jdk)) - - attrs['version'] = version - attrs['url'] = url - - print('Downloading tarball from url "{}"...'.format(url)) - print() - attrs['sha256'], path = nix_prefetch_url(url) - print() - - print('Inspecting tarball for bundle information...') - - attrs['bundles'] = get_new_bundle_attrs(jdk, attrs['version'], path) - - print('Done!') - - return attrs - -def generate_jdk(jdk): - attrs = get_new_attrs(jdk) - - version = attrs['version'] - src_url = attrs['url'].replace(version, '${version}') - - common_url = URL.format(jdk, version) - src_common_url = URL.format(jdk, '${version}') - - src = ' icedtea{} = rec {{\n'.format(jdk) - src += ' version = "{}";\n'.format(version) - src += '\n' - src += ' url = "{}";\n'.format(src_url) - src += ' sha256 = "{}";\n'.format(attrs['sha256']) - src += '\n' - src += ' common_url = "{}";\n'.format(src_common_url) - src += '\n' - src += ' bundles = {\n' - - for bundle in BUNDLES: - battrs = attrs['bundles'][bundle] - - b_url = battrs['url'] - b_url = b_url.replace(common_url, '${common_url}') - - src += ' {} = rec {{\n'.format(bundle) - src += ' url = "{}";\n'.format(b_url) - src += ' sha256 = "{}";\n'.format(battrs['sha256']) - src += ' };\n' - - if bundle != BUNDLES[-1]: - src += '\n' - - src += ' };\n' - src += ' };\n' - - return src - -def generate_sources(jdks): - src = '# This file is autogenerated from update.py in the same directory.\n' - src += '{\n' - - for jdk in jdks: - print() - print('Generating sources for JDK {}...'.format(jdk)) - src += generate_jdk(jdk) - - src += '}\n' - return src - -if __name__ == '__main__': - print('Generating {}...'.format(SRC_PATH)) - src = generate_sources(ICEDTEA_JDKS) - - f = open(SRC_PATH, 'w', encoding = 'utf-8') - f.write(src) - f.close() - - print() - print('Update complete!') diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix index ba2ce00cfb5..66939ff1a02 100644 --- a/pkgs/development/compilers/mono/default.nix +++ b/pkgs/development/compilers/mono/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? true }: +{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert }: let llvm = callPackage ./llvm.nix { }; @@ -31,11 +31,16 @@ stdenv.mkDerivation rec { # Parallel building doesn't work, as shows http://hydra.nixos.org/build/2983601 enableParallelBuilding = false; + # We want pkg-config to take priority over the dlls in the Mono framework and the GAC + # because we control pkg-config + patches = [ ./pkgconfig-before-gac.patch ]; + # Patch all the necessary scripts. Also, if we're using LLVM, we fix the default # LLVM path to point into the Mono LLVM build, since it's private anyway. preBuild = '' makeFlagsArray=(INSTALL=`type -tp install`) patchShebangs ./ + substituteInPlace mcs/class/corlib/System/Environment.cs --replace /usr/share "$out/share" '' + stdenv.lib.optionalString withLLVM '' substituteInPlace mono/mini/aot-compiler.c --replace "llvm_path = g_strdup (\"\")" "llvm_path = g_strdup (\"${llvm}/bin/\")" ''; @@ -50,6 +55,14 @@ stdenv.mkDerivation rec { done ''; + # Without this, any Mono application attempting to open an SSL connection will throw with + # The authentication or decryption has failed. + # ---> Mono.Security.Protocol.Tls.TlsException: Invalid certificate received from server. + postInstall = '' + echo "Updating Mono key store" + $out/bin/cert-sync ${cacert}/etc/ssl/certs/ca-bundle.crt + ''; + meta = { homepage = http://mono-project.com/; description = "Cross platform, open source .NET development framework"; diff --git a/pkgs/development/compilers/mono/pkgconfig-before-gac.patch b/pkgs/development/compilers/mono/pkgconfig-before-gac.patch new file mode 100644 index 00000000000..7632d850391 --- /dev/null +++ b/pkgs/development/compilers/mono/pkgconfig-before-gac.patch @@ -0,0 +1,65 @@ +diff -Naur mono-4.0.1.old/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets mono-4.0.1/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets +--- mono-4.0.1.old/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets 2015-04-24 02:26:18.000000000 +0100 ++++ mono-4.0.1/mcs/tools/xbuild/data/12.0/Microsoft.Common.targets 2015-05-26 00:52:33.997847464 +0100 +@@ -229,8 +229,8 @@ + $(ReferencePath); + @(AdditionalReferencePath); + {HintPathFromItem}; +- {TargetFrameworkDirectory}; + {PkgConfig}; ++ {TargetFrameworkDirectory}; + {GAC}; + {RawFileName}; + $(OutDir) +diff -Naur mono-4.0.1.old/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets mono-4.0.1/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets +--- mono-4.0.1.old/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets 2015-04-24 02:26:18.000000000 +0100 ++++ mono-4.0.1/mcs/tools/xbuild/data/14.0/Microsoft.Common.targets 2015-05-26 00:52:41.832612748 +0100 +@@ -214,8 +214,8 @@ + $(ReferencePath); + @(AdditionalReferencePath); + {HintPathFromItem}; +- {TargetFrameworkDirectory}; + {PkgConfig}; ++ {TargetFrameworkDirectory}; + {GAC}; + {RawFileName}; + $(OutDir) +diff -Naur mono-4.0.1.old/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets mono-4.0.1/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets +--- mono-4.0.1.old/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets 2015-04-24 02:26:18.000000000 +0100 ++++ mono-4.0.1/mcs/tools/xbuild/data/2.0/Microsoft.Common.targets 2015-05-26 00:52:46.298478961 +0100 +@@ -139,8 +139,8 @@ + $(ReferencePath); + @(AdditionalReferencePath); + {HintPathFromItem}; +- {TargetFrameworkDirectory}; + {PkgConfig}; ++ {TargetFrameworkDirectory}; + {GAC}; + {RawFileName}; + $(OutDir) +diff -Naur mono-4.0.1.old/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets mono-4.0.1/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets +--- mono-4.0.1.old/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets 2015-04-24 02:26:18.000000000 +0100 ++++ mono-4.0.1/mcs/tools/xbuild/data/3.5/Microsoft.Common.targets 2015-05-26 00:52:52.119304583 +0100 +@@ -167,8 +167,8 @@ + $(ReferencePath); + @(AdditionalReferencePath); + {HintPathFromItem}; +- {TargetFrameworkDirectory}; + {PkgConfig}; ++ {TargetFrameworkDirectory}; + {GAC}; + {RawFileName}; + $(OutDir) +diff -Naur mono-4.0.1.old/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets mono-4.0.1/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets +--- mono-4.0.1.old/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets 2015-04-24 02:26:18.000000000 +0100 ++++ mono-4.0.1/mcs/tools/xbuild/data/4.0/Microsoft.Common.targets 2015-05-26 00:52:56.519172776 +0100 +@@ -229,8 +229,8 @@ + $(ReferencePath); + @(AdditionalReferencePath); + {HintPathFromItem}; +- {TargetFrameworkDirectory}; + {PkgConfig}; ++ {TargetFrameworkDirectory}; + {GAC}; + {RawFileName}; + $(OutDir) diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix index 890064538cc..a9ca7673dfe 100644 --- a/pkgs/development/compilers/openjdk/bootstrap.nix +++ b/pkgs/development/compilers/openjdk/bootstrap.nix @@ -1,33 +1,60 @@ -{ stdenv, runCommand, glibc, fetchurl, file }: +{ stdenv, runCommand, glibc, fetchurl, file + +, version +}: let # !!! These should be on nixos.org src = if glibc.system == "x86_64-linux" then - fetchurl { - url = http://tarballs.nixos.org/openjdk-bootstrap-x86_64-linux-2012-08-24.tar.xz; - sha256 = "0gla9dxrfq2w1hvgsnn8jg8a60k27im6z43a6iidi0qmwa0wah32"; - } + (if version == "8" then + fetchurl { + url = "https://www.dropbox.com/s/a0lsq2ig4uguky5/openjdk8-bootstrap-x86_64-linux.tar.xz?dl=1"; + sha256 = "18zqx6jhm3lizn9hh6ryyqc9dz3i96pwaz8f6nxfllk70qi5gvks"; + } + else if version == "7" then + fetchurl { + url = "https://www.dropbox.com/s/rssfbeommrfbsjf/openjdk7-bootstrap-x86_64-linux.tar.xz?dl=1"; + sha256 = "024gg2sgg4labxbc1nhn8lxls2p7d9h3b82hnsahwaja2pm1hbra"; + } + else throw "No bootstrap for version") else if glibc.system == "i686-linux" then - fetchurl { - url = http://tarballs.nixos.org/openjdk-bootstrap-i686-linux-2012-08-24.tar.xz; - sha256 = "184wq212bycwbbq4ix8cc6jwjxkrqw9b01zb86q95kqpa8zy5206"; - } + (if version == "8" then + fetchurl { + url = "https://www.dropbox.com/s/rneqjhlerijsw74/openjdk8-bootstrap-i686-linux.tar.xz?dl=1"; + sha256 = "1yx04xh8bqz7amg12d13rw5vwa008rav59mxjw1b9s6ynkvfgqq9"; + } + else if version == "7" then + fetchurl { + url = "https://www.dropbox.com/s/6xe64td7eg2wurs/openjdk7-bootstrap-i686-linux.tar.xz?dl=1"; + sha256 = "0xwqjk1zx8akziw8q9sbjc1rs8s7c0w6mw67jdmmi26cwwp8ijnx"; + } + else throw "No bootstrap for version") else throw "No bootstrap for system"; -in -runCommand "openjdk-bootstrap" {} '' - tar xvf ${src} - mv openjdk-bootstrap $out + bootstrap = runCommand "openjdk-bootstrap" { + passthru.home = "${bootstrap}/lib/openjdk"; + } '' + tar xvf ${src} + mv openjdk-bootstrap $out - for i in $out/bin/*; do - patchelf --set-interpreter ${glibc}/lib/ld-linux*.so.2 $i - done + LIBDIRS="$(find $out -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':')" - # Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings: - exes=$(${file}/bin/file $out/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') - for file in $exes; do - paxmark m "$file" - # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. - ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''} - done -'' + for i in $out/bin/*; do + patchelf --set-interpreter ${glibc}/lib/ld-linux*.so.2 $i || true + patchelf --set-rpath "${glibc}/lib:$LIBDIRS" $i || true + done + + find $out -name \*.so\* | while read lib; do + patchelf --set-interpreter ${glibc}/lib/ld-linux*.so.2 $lib || true + patchelf --set-rpath "${glibc}/lib:${stdenv.cc.cc}/lib:$LIBDIRS" $lib || true + done + + # Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings: + exes=$(${file}/bin/file $out/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') + for file in $exes; do + paxmark m "$file" + # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. + ${stdenv.lib.optionalString stdenv.isi686 ''paxmark msp "$file"''} + done + ''; +in bootstrap diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index beab781c88d..be4ca84bd8d 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, unzip, zip, procps, coreutils, alsaLib, ant, freetype -, which, jdk, nettools, xorg, file -, fontconfig, cpio, cacert, perl, setJavaClassPath }: +, which, bootjdk, nettools, xorg, file +, fontconfig, cpio, cacert, perl, setJavaClassPath +, minimal ? false +}: let @@ -15,7 +17,7 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "65"; + update = "80"; build = "32"; @@ -27,13 +29,41 @@ let md5 = "de3006e5cf1ee78a9c6145ce62c4e982"; }; + baseurl = "http://hg.openjdk.java.net/jdk7u/jdk7u"; + repover = "jdk7u${update}-b${build}"; + jdk7 = fetchurl { + url = "${baseurl}/archive/${repover}.tar.gz"; + sha256 = "1r8xnn87nmqaq2f8i3cp3i9ngq66k0c0wgkdq5cf59lkgs8wkcdi"; + }; + langtools = fetchurl { + url = "${baseurl}/langtools/archive/${repover}.tar.gz"; + sha256 = "01alj6pfrjqyf4irll9wg34h4w9nmb3973lvbacs528qm1nxgh9r"; + }; + hotspot = fetchurl { + url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; + sha256 = "14zla8axmg5344zf45i4cj7yyli0kmdjsh9yalmzqaphpkqjqpf2"; + }; + corba = fetchurl { + url = "${baseurl}/corba/archive/${repover}.tar.gz"; + sha256 = "19z3ay3f2q7r2ra03c6wy8b5rbdbrkq5g2dzhrqcg0n4iydd3c40"; + }; + jdk = fetchurl { + url = "${baseurl}/jdk/archive/${repover}.tar.gz"; + sha256 = "1q0r2l9bz2cyx4fq79x6cb2f5xycw83hl5cn1d1mazgsckp590lb"; + }; + jaxws = fetchurl { + url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; + sha256 = "1lp0mww2x3b6xavb7idrzckh6iw8jd6s1fvqgfvzs853z4ifksqj"; + }; + jaxp = fetchurl { + url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; + sha256 = "0pd874dkgxkb7frxg4n9py61kkhhck4x33dcynynwb3vl6k6iy79"; + }; openjdk = stdenv.mkDerivation rec { name = "openjdk-7u${update}b${build}"; - src = fetchurl { - url = "http://tarballs.nixos.org/openjdk-7u${update}-b${build}.tar.xz"; - sha256 = "0lyp75sl5w4b9azphb2nq5cwzli85inpksq4943q4j349rkmdprx"; - }; + srcs = [ jdk7 langtools hotspot corba jdk jaxws jaxp ]; + sourceRoot = "."; outputs = [ "out" "jre" ]; @@ -41,18 +71,23 @@ let [ unzip procps ant which zip cpio nettools alsaLib xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir - fontconfig perl file + fontconfig perl file bootjdk ]; - NIX_LDFLAGS = "-lfontconfig -lXcursor -lXinerama"; + NIX_LDFLAGS = if minimal then null else "-lfontconfig -lXcursor -lXinerama"; postUnpack = '' + ls | grep jdk | grep -v '^jdk7u' | awk -F- '{print $1}' | while read p; do + mv $p-* $(ls | grep '^jdk7u')/$p + done + cd jdk7u-* + sed -i -e "s@/usr/bin/test@${coreutils}/bin/test@" \ -e "s@/bin/ls@${coreutils}/bin/ls@" \ - openjdk*/hotspot/make/linux/makefiles/sa.make + hotspot/make/linux/makefiles/sa.make sed -i "s@/bin/echo -e@${coreutils}/bin/echo -e@" \ - openjdk*/{jdk,corba}/make/common/shared/Defs-utils.gmk + {jdk,corba}/make/common/shared/Defs-utils.gmk tar xf ${cupsSrc} cupsDir=$(echo $(pwd)/cups-*) @@ -75,17 +110,17 @@ let "ALSA_INCLUDE=${alsaLib}/include/alsa/version.h" "FREETYPE_HEADERS_PATH=${freetype}/include" "FREETYPE_LIB_PATH=${freetype}/lib" - "MILESTONE=u${update}" + "MILESTONE=${update}" "BUILD_NUMBER=b${build}" "USRBIN_PATH=" "COMPILER_PATH=" "DEVTOOLS_PATH=" "UNIXCOMMAND_PATH=" - "BOOTDIR=${jdk}" + "BOOTDIR=${bootjdk.home}" "STATIC_CXX=false" "UNLIMITED_CRYPTO=1" "FULL_DEBUG_SYMBOLS=0" - ]; + ] ++ stdenv.lib.optional minimal "BUILD_HEADLESS=1"; configurePhase = "true"; @@ -168,6 +203,32 @@ let EOF ''; + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $outputs; do + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':'):$LIBDIRS" + done + + # Add the local library paths to remove dependencies on the bootstrap + for output in $outputs; do + OUTPUTDIR="$(eval echo \$$output)" + BINLIBS="$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)" + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + + # Test to make sure that we don't depend on the bootstrap + for output in $outputs; do + if grep -q -r '${bootjdk}' $(eval echo \$$output); then + echo "Extraneous references to ${bootjdk} detected" + exit 1 + fi + done + ''; + meta = { homepage = http://openjdk.java.net/; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/compilers/openjdk/make-bootstrap.nix b/pkgs/development/compilers/openjdk/make-bootstrap.nix index 090a1479741..aac54417e2a 100644 --- a/pkgs/development/compilers/openjdk/make-bootstrap.nix +++ b/pkgs/development/compilers/openjdk/make-bootstrap.nix @@ -1,26 +1,31 @@ { runCommand, openjdk, nukeReferences }: -let arch = openjdk.architecture; in - runCommand "${openjdk.name}-bootstrap.tar.xz" {} '' - mkdir -p openjdk-bootstrap/bin - mkdir -p openjdk-bootstrap/lib - mkdir -p openjdk-bootstrap/jre/lib/{security,ext,${arch}/{jli,server,client,headless}} - cp ${openjdk}/bin/{idlj,ja{va{,c,p,h},r},rmic} openjdk-bootstrap/bin - cp ${openjdk}/lib/tools.jar openjdk-bootstrap/lib - cp ${openjdk}/jre/lib/{meta-index,{charsets,jce,jsse,rt,resources}.jar,currency.data} openjdk-bootstrap/jre/lib - cp ${openjdk}/jre/lib/security/java.security openjdk-bootstrap/jre/lib/security - cp ${openjdk}/jre/lib/ext/{meta-index,sunjce_provider.jar} openjdk-bootstrap/jre/lib/ext - cp ${openjdk}/jre/lib/${arch}/{jvm.cfg,lib{awt,java,verify,zip,nio,net}.so} openjdk-bootstrap/jre/lib/${arch} - cp ${openjdk}/jre/lib/${arch}/jli/libjli.so openjdk-bootstrap/jre/lib/${arch}/jli - cp ${openjdk}/jre/lib/${arch}/server/libjvm.so openjdk-bootstrap/jre/lib/${arch}/server - cp ${openjdk}/jre/lib/${arch}/client/libjvm.so openjdk-bootstrap/jre/lib/${arch}/client || - rmdir openjdk-bootstrap/jre/lib/${arch}/client - cp ${openjdk}/jre/lib/${arch}/headless/libmawt.so openjdk-bootstrap/jre/lib/${arch}/headless - cp -a ${openjdk}/include openjdk-bootstrap + mkdir -pv openjdk-bootstrap/lib + + # Do a deep copy of the openjdk + cp -vrL ${openjdk.home} openjdk-bootstrap/lib + + # Includes are needed for building the native jvm + cp -vrL ${openjdk}/include openjdk-bootstrap + + # The binaries are actually stored in the openjdk lib + ln -sv lib/openjdk/bin openjdk-bootstrap/bin + find . -name libjli.so + (cd openjdk-bootstrap/lib; find . -name libjli.so -exec ln -sfv {} libjli.so \;) chmod -R +w openjdk-bootstrap + + # Remove components we don't need + find openjdk-bootstrap -name \*.diz -exec rm {} \; + find openjdk-bootstrap -name \*.ttf -exec rm {} \; + find openjdk-bootstrap -name \*.gif -exec rm {} \; + find openjdk-bootstrap -name src.zip -exec rm {} \; + rm -rf openjdk-bootstrap/lib/openjdk/jre/bin + + # Remove all of the references to the native nix store find openjdk-bootstrap -print0 | xargs -0 ${nukeReferences}/bin/nuke-refs + # Create the output tarball tar cv openjdk-bootstrap | xz > $out '' diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix index 132f0f31b87..530391c8e7d 100644 --- a/pkgs/development/compilers/openjdk/openjdk8.nix +++ b/pkgs/development/compilers/openjdk/openjdk8.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype, alsaLib, openjdk, cacert, perl, liberation_ttf, fontconfig } : +{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype +, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib + +, minimal ? false } : let update = "40"; build = "27"; @@ -38,119 +41,149 @@ let sha256 = "1llf3l4483kd8m1a77n7y9fgvm6fa63nim3qhp5z4gnw68ldbhra"; }; openjdk8 = stdenv.mkDerivation { - name = "openjdk-8u${update}b${build}"; - srcs = [ jdk8 langtools hotspot corba jdk jaxws jaxp nashorn ]; - outputs = [ "out" "jre" ]; - buildInputs = [ cpio file which unzip zip - xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst - xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir - cups freetype alsaLib openjdk perl liberation_ttf fontconfig ]; - setSourceRoot = '' - sourceRoot="jdk8u${update}-jdk8u${update}-b${build}"; - ''; - prePatch = '' - # despite --with-override-jdk the build still searchs here - # GNU Patch bug, --follow-symlinks only follow the last dir part symlink - mv "../jdk-${repover}" "jdk"; - mv "../hotspot-${repover}" "hotspot"; - ''; - postPatch = '' - mv jdk "../jdk-${repover}"; - mv hotspot "../hotspot-${repover}"; - # Patching is over, lets re-add the links - ln -s "../jdk-${repover}" "jdk" - ln -s "../hotspot-${repover}" "hotspot" - ''; - patches = [ - ./fix-java-home-jdk8.patch - ./read-truststore-from-env-jdk8.patch - ./currency-date-range-jdk8.patch - ./JDK-8074312-hotspot.patch + name = "openjdk-8u${update}b${build}"; - ]; - preConfigure = '' - chmod +x configure - substituteInPlace configure --replace /bin/bash "$shell" - substituteInPlace ../hotspot-${repover}/make/linux/adlc_updater --replace /bin/sh "$shell" - ''; - configureFlags = [ - "--with-freetype=${freetype}" - "--with-override-langtools=../langtools-${repover}" - "--with-override-hotspot=../hotspot-${repover}" - "--with-override-corba=../corba-${repover}" - "--with-override-jdk=../jdk-${repover}" - "--with-override-jaxws=../jaxws-${repover}" - "--with-override-jaxp=../jaxp-${repover}" - "--with-override-nashorn=../nashorn-${repover}" - "--with-boot-jdk=${openjdk}/lib/openjdk/" - "--with-update-version=${update}" - "--with-build-number=b${build}" - "--with-milestone=fcs" - ]; - NIX_LDFLAGS= "-lfontconfig"; - buildFlags = "all"; - installPhase = '' - mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk + srcs = [ jdk8 langtools hotspot corba jdk jaxws jaxp nashorn ]; + sourceRoot = "."; - cp -av build"/"*/images/j2sdk-image"/"* $out/lib/openjdk + outputs = [ "out" "jre" ]; - # Move some stuff to top-level. - mv $out/lib/openjdk/include $out/include - mv $out/lib/openjdk/man $out/share/man + buildInputs = [ + cpio file which unzip zip + xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst + xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir + cups freetype alsaLib perl liberation_ttf fontconfig bootjdk zlib + ]; - # jni.h expects jni_md.h to be in the header search path. - ln -s $out/include/linux"/"*_md.h $out/include/ + prePatch = '' + ls | grep jdk | grep -v '^jdk8u' | awk -F- '{print $1}' | while read p; do + mv $p-* $(ls | grep '^jdk8u')/$p + done + cd $(ls | grep '^jdk8u') + ''; - # Remove some broken manpages. - rm -rf $out/share/man/ja* + patches = [ + ./fix-java-home-jdk8.patch + ./read-truststore-from-env-jdk8.patch + ./currency-date-range-jdk8.patch + ./JDK-8074312-hotspot.patch + ]; - # Remove crap from the installation. - rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample + preConfigure = '' + chmod +x configure + substituteInPlace configure --replace /bin/bash "$shell" + substituteInPlace hotspot/make/linux/adlc_updater --replace /bin/sh "$shell" + ''; - # Move the JRE to a separate output and setup fallback fonts - mv $out/lib/openjdk/jre $jre/lib/openjdk/ - mkdir $out/lib/openjdk/jre - mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback - lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback - lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre + configureFlags = [ + "--with-freetype=${freetype}" + "--with-boot-jdk=${bootjdk.home}" + "--with-update-version=${update}" + "--with-build-number=${build}" + "--with-milestone=fcs" + "--enable-unlimited-crypto" + "--disable-debug-symbols" + "--disable-freetype-bundling" + ] ++ (if minimal then [ + "--disable-headful" + "--with-zlib=bundled" + "--with-giflib=bundled" + ] else [ + "--with-zlib=system" + ]); - rm -rf $out/lib/openjdk/jre/bina - ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin + NIX_LDFLAGS= if minimal then null else "-lfontconfig"; - # Set PaX markings - exes=$(file $out/lib/openjdk/bin"/"* $jre/lib/openjdk/jre/bin"/"* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') - echo "to mark: *$exes*" - for file in $exes; do - echo "marking *$file*" - paxmark ${paxflags} "$file" - done + buildFlags = "all"; - # Remove duplicate binaries. - for i in $(cd $out/lib/openjdk/bin && echo *); do - if [ "$i" = java ]; then continue; fi - if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then - ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i - fi - done + installPhase = '' + mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk - # Generate certificates. - pushd $jre/lib/openjdk/jre/lib/security - rm cacerts - perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt - popd + cp -av build"/"*/images/j2sdk-image"/"* $out/lib/openjdk - ln -s $out/lib/openjdk/bin $out/bin - ln -s $jre/lib/openjdk/jre/bin $jre/bin + # Move some stuff to top-level. + mv $out/lib/openjdk/include $out/include + mv $out/lib/openjdk/man $out/share/man - ''; + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/linux"/"*_md.h $out/include/ - meta = with stdenv.lib; { - homepage = http://openjdk.java.net/; - license = licenses.gpl2; - description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo ]; - platforms = platforms.linux; + # Remove some broken manpages. + rm -rf $out/share/man/ja* + + # Remove crap from the installation. + rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample + + # Move the JRE to a separate output and setup fallback fonts + mv $out/lib/openjdk/jre $jre/lib/openjdk/ + mkdir $out/lib/openjdk/jre + mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback + lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback + lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre + + rm -rf $out/lib/openjdk/jre/bina + ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin + + # Set PaX markings + exes=$(file $out/lib/openjdk/bin"/"* $jre/lib/openjdk/jre/bin"/"* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//') + echo "to mark: *$exes*" + for file in $exes; do + echo "marking *$file*" + paxmark ${paxflags} "$file" + done + + # Remove duplicate binaries. + for i in $(cd $out/lib/openjdk/bin && echo *); do + if [ "$i" = java ]; then continue; fi + if cmp -s $out/lib/openjdk/bin/$i $jre/lib/openjdk/jre/bin/$i; then + ln -sfn $jre/lib/openjdk/jre/bin/$i $out/lib/openjdk/bin/$i + fi + done + + # Generate certificates. + pushd $jre/lib/openjdk/jre/lib/security + rm cacerts + perl ${./generate-cacerts.pl} $jre/lib/openjdk/jre/bin/keytool ${cacert}/etc/ssl/certs/ca-bundle.crt + popd + + ln -s $out/lib/openjdk/bin $out/bin + ln -s $jre/lib/openjdk/jre/bin $jre/bin + ''; + + postFixup = '' + # Build the set of output library directories to rpath against + LIBDIRS="" + for output in $outputs; do + LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \; | sort | uniq | tr '\n' ':'):$LIBDIRS" + done + + # Add the local library paths to remove dependencies on the bootstrap + for output in $outputs; do + OUTPUTDIR="$(eval echo \$$output)" + BINLIBS="$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)" + echo "$BINLIBS" | while read i; do + patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true + patchelf --shrink-rpath "$i" || true + done + done + + # Test to make sure that we don't depend on the bootstrap + for output in $outputs; do + if grep -q -r '${bootjdk}' $(eval echo \$$output); then + echo "Extraneous references to ${bootjdk} detected" + exit 1 + fi + done + ''; + + meta = with stdenv.lib; { + homepage = http://openjdk.java.net/; + license = licenses.gpl2; + description = "The open-source Java Development Kit"; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.linux; + }; + + passthru.home = "${openjdk8}/lib/openjdk"; }; - - passthru.home = "${openjdk8}/lib/openjdk"; -}; in openjdk8 +in openjdk8 diff --git a/pkgs/development/coq-modules/fiat/default.nix b/pkgs/development/coq-modules/fiat/default.nix index 92b69319e0b..df4ea133cd9 100644 --- a/pkgs/development/coq-modules/fiat/default.nix +++ b/pkgs/development/coq-modules/fiat/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ coq.ocaml coq.camlp5 ]; propagatedBuildInputs = [ coq ]; - enableParallelBuilding = true; + enableParallelBuilding = false; doCheck = true; unpackPhase = '' diff --git a/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch b/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch new file mode 100644 index 00000000000..a3b2f87f378 --- /dev/null +++ b/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch @@ -0,0 +1,88 @@ +--- fsharpbinding-a09c818/monodevelop/MonoDevelop.FSharpBinding/FSharpBinding.addin.xml.orig.old 2015-06-03 19:53:00.116849746 +0100 ++++ fsharpbinding-a09c818/monodevelop/MonoDevelop.FSharpBinding/FSharpBinding.addin.xml.orig 2015-06-03 19:56:30.112579384 +0100 +@@ -130,6 +130,11 @@ + + + ++ ++ ++ ++ ++ + + + +@@ -182,14 +187,7 @@ + + + +- +- +- +- +- + +- +- + + + +@@ -267,13 +265,7 @@ + + + +- +- +- +- +- + +- + + + +@@ -281,11 +273,6 @@ + + + +- +- +- +- +- + + + +- + + + +- +- +- +- +- + + + + +- + + + +- +- +- +- +- + + + +- + + + diff --git a/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch b/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch new file mode 100644 index 00000000000..e53482e0c00 --- /dev/null +++ b/pkgs/development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch @@ -0,0 +1,43 @@ +--- fsharpbinding-a09c818/monodevelop/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj.orig.old 2015-06-03 18:48:55.345385084 +0100 ++++ fsharpbinding-a09c818/monodevelop/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.fsproj.orig 2015-06-03 19:00:11.453399028 +0100 +@@ -185,19 +185,19 @@ + False + INSERT_FSPROJ_MDROOT\AddIns\NUnit\MonoDevelop.NUnit.dll + +- +- {88F6940F-D300-474C-B2A7-E2ECD5B04B57} +- FSharp.CompilerBinding +- ++ ++ True ++ + + {FD0D1033-9145-48E5-8ED8-E2365252878C} + MonoDevelop.FSharp.Gui + +- ++ + True + + + packages\FSharp.Compiler.Service.0.0.85\lib\net45\FSharp.Compiler.Service.dll ++ True + + + packages\Mono.Cecil.0.9.5.4\lib\net40\Mono.Cecil.dll +@@ -213,12 +213,15 @@ + + + packages\Fantomas.1.6.0\lib\FantomasLib.dll ++ True + + + packages\FSharp.Compiler.CodeDom.0.9.1\lib\net40\FSharp.Compiler.CodeDom.dll ++ True + + + packages\ExtCore.0.8.45\lib\net40\ExtCore.dll ++ True + + + diff --git a/pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch b/pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch new file mode 100644 index 00000000000..ed9b7adbef2 --- /dev/null +++ b/pkgs/development/dotnet-modules/patches/newtonsoft-json.references.patch @@ -0,0 +1,11 @@ +--- Newtonsoft.Json-6.0.8/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj.old 2015-01-11 06:46:39.000000000 +0000 ++++ Newtonsoft.Json-6.0.8/Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj 2015-05-25 21:29:40.546808622 +0100 +@@ -52,6 +52,8 @@ + + + ++ ++ + + + diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ade2055187d..8ee927f6fb8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -841,4 +841,10 @@ self: super: { # https://github.com/ekmett/semigroupoids/issues/35 semigroupoids = disableCabalFlag super.semigroupoids "doctests"; + # https://github.com/jaspervdj/websockets/issues/104 + websockets = dontCheck super.websockets; + + # Avoid spurious test suite failures. + fft = dontCheck super.fft; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 2e95c78c625..4fbb5056837 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -52,7 +52,7 @@ self: super: { haddock-api = super.haddock-api_2_15_0_2; # This is part of bytestring in our compiler. - bytestring-builder = dontHaddock super.bytestring-builder; + bytestring-builder = triggerRebuild (dontHaddock super.bytestring-builder) 1; # Won't compile against mtl 2.1.x. imports = super.imports.override { mtl = self.mtl_2_2_1; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 73da57d7350..37cb69160b0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -42,10 +42,27 @@ self: super: { # haddock: No input file(s). nats = dontHaddock super.nats; + bytestring-builder = dontHaddock super.bytestring-builder; + + alex = dontCheck super.alex; # We have time 1.5 aeson = disableCabalFlag super.aeson "old-locale"; + # Show works differently for record syntax now, breaking haskell-src-exts' parser tests + # https://github.com/haskell-suite/haskell-src-exts/issues/224 + haskell-src-exts = dontCheck super.haskell-src-exts; + + mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch { + url = "https://github.com/snoyberg/mono-traversable/pull/77.patch"; + sha256 = "1qrvrh3cqfkymi5yb9y9z88rq4n7ag0ac2k00mcnqh4dz1vh4fg1"; + }); + yesod-auth = appendPatch super.yesod-auth (pkgs.fetchpatch { + url = "https://github.com/yesodweb/yesod/pull/1006.patch"; + sha256 = "0l6wjj8cfz6jy6j92kywsccafyffhlm5240q82bzirb278adqvar"; + stripLen = 1; + }); + # Setup: At least the following dependencies are missing: base <4.8 hspec-expectations = overrideCabal super.hspec-expectations (drv: { patchPhase = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e049946d44a..d29bddf0c39 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1046,6 +1046,7 @@ self: { ]; description = "Big Contact Map Tools"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BNFC" = callPackage @@ -1078,13 +1079,12 @@ self: { }: mkDerivation { pname = "BNFC-meta"; - version = "0.4.0.2"; - sha256 = "0d59kmbcwsdh34hagmhhcq0d0x49wmzl6kycm9p55i7cf0zw0a5l"; + version = "0.4.0.3"; + sha256 = "10rfljhygdl75ibmj0xqj7qwdk0ppjr8iw4wmvzdpl28mqjshny2"; buildDepends = [ alex-meta array base happy-meta haskell-src-meta syb template-haskell ]; - jailbreak = true; description = "Deriving Parsers and Quasi-Quoters from BNF Grammars"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -7628,8 +7628,8 @@ self: { }: mkDerivation { pname = "HandsomeSoup"; - version = "0.4"; - sha256 = "0h760vfqgg40h50ybqpgpzh0skgbggx4xj1zaag3ca6l22950w36"; + version = "0.4.2"; + sha256 = "1yzfrvivvxwlaiqwbjx27rxwq9mmnnpb512vwklzw7nyzg9xmqha"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -8949,8 +8949,8 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.5.1"; - sha256 = "11wpk4lr7h7s7mhl48i27dq1wwvzjviv2fnq3yl8dnikcl00k6dq"; + version = "3.2.5.2"; + sha256 = "07fyn0ns3g66aqpa1jg1v694yvf5idf7cknrkh30hs312lwm1sjl"; buildDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -9069,6 +9069,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "KSP" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "KSP"; + version = "0.1"; + sha256 = "19sjr9vavxnbv5yp2c01gy6iz1q2abllcsf378n15f3z064ffqn6"; + buildDepends = [ base ]; + jailbreak = true; + homepage = "https://github.com/frosch03/kerbal"; + description = "A library with the kerbal space program universe and demo code"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "Kalman" = callPackage ({ mkDerivation, base, hmatrix }: mkDerivation { @@ -11866,8 +11879,8 @@ self: { }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.5.0.4"; - sha256 = "05pipj20bx9is5snwf5nhavrs8873br4xvs3b1ggrvxgvaf8qhqw"; + version = "0.5.0.5"; + sha256 = "0x8mq7368yjb1q4xmkj6iqrxkf81d0vslfdrhp8cr12k83ydg3g3"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -12917,8 +12930,10 @@ self: { ({ mkDerivation, base, SDL }: mkDerivation { pname = "SDL"; - version = "0.6.5"; - sha256 = "1vlf1bvp4cbgr31qk6aqikhgn9jbgj7lrvnjzv3ibykm1hhd6vdb"; + version = "0.6.5.1"; + revision = "1"; + sha256 = "1sa3zx3vrs1gbinxx33zwq0x2bsf3i964bff7419p7vzidn36k46"; + editedCabalFile = "233e3fde4727ca7b597e0bf86619c6b862c32445191a37b7a536a3188634473e"; buildDepends = [ base ]; extraLibraries = [ SDL ]; description = "Binding to libSDL"; @@ -12930,8 +12945,8 @@ self: { ({ mkDerivation, base, SDL }: mkDerivation { pname = "SDL-gfx"; - version = "0.6.0"; - sha256 = "14d8fz576rwi6x0dxgc29cdmwn48afja3v5qx3x8q5y61fv8w9v1"; + version = "0.6.0.1"; + sha256 = "1ay72r29ybxf4icaqadly02xi03ifz82a8jz3xkvlk26c9bxl4c3"; buildDepends = [ base SDL ]; description = "Binding to libSDL_gfx"; license = stdenv.lib.licenses.bsd3; @@ -12942,8 +12957,8 @@ self: { ({ mkDerivation, base, SDL, SDL_image }: mkDerivation { pname = "SDL-image"; - version = "0.6.1"; - sha256 = "18n6al40db7xalqqr4hp0l26qxxv1kmd8mva0n7vmhg05zypf6ni"; + version = "0.6.1.1"; + sha256 = "1m02q2426qp8m8pzz2jkk4srk2vb3j3ickiaga5jx9rkkhz732zq"; buildDepends = [ base SDL ]; extraLibraries = [ SDL_image ]; description = "Binding to libSDL_image"; @@ -12955,8 +12970,8 @@ self: { ({ mkDerivation, base, SDL, SDL_mixer }: mkDerivation { pname = "SDL-mixer"; - version = "0.6.1"; - sha256 = "1fxp5sz0w6pr5047jjvh81wkljxsl7fca239364i50m44mpcsyn1"; + version = "0.6.1.1"; + sha256 = "0md3238hx79mxb9a7l43kg3b3d28x4mqvj0hjsbsh15ajnvy9x2z"; buildDepends = [ base SDL ]; extraLibraries = [ SDL_mixer ]; description = "Binding to libSDL_mixer"; @@ -12981,8 +12996,8 @@ self: { ({ mkDerivation, base, SDL, SDL_ttf }: mkDerivation { pname = "SDL-ttf"; - version = "0.6.2"; - sha256 = "0jajnbqnhdd4i8pj8j27m53zwgfs1v06kiwy0s0zml02fdkq8j4a"; + version = "0.6.2.1"; + sha256 = "1ld551jgrcs3c7n53zyzlkrxkf01rp81wwvf9ynkm0c5kgll779s"; buildDepends = [ base SDL ]; extraLibraries = [ SDL_ttf ]; description = "Binding to libSDL_ttf"; @@ -16941,10 +16956,10 @@ self: { ({ mkDerivation, base, ghc-prim, mtl, transformers }: mkDerivation { pname = "acme-timemachine"; - version = "0.0.0.1"; - sha256 = "06zhslaa7kp75gvnvh2ln15bqbdqgbgya6i4r2jkqxycnk8sczzl"; + version = "0.0.1.0"; + sha256 = "1dfwn0n4hg6zs4ikz6jzkn2spwsvchs1jgq7662aq4ljyp7f1rvb"; buildDepends = [ base ghc-prim mtl transformers ]; - description = "An easy way to perform and unperform IO actions"; + description = "An easy way to perform and unperform IO and other stateful actions"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -17977,8 +17992,8 @@ self: { ({ mkDerivation, base, stm, time, unbounded-delays }: mkDerivation { pname = "alarmclock"; - version = "0.2.0.6"; - sha256 = "1jr4pxrgz6gq1dcnkkggbaq3gnj0gr1g14mf174f2b4qzgl63cq1"; + version = "0.2.0.8"; + sha256 = "1g06bnbp0y6dcz7zgbh828klk7xc1spwzw3ff6jpqh74cm82vq6f"; buildDepends = [ base stm time unbounded-delays ]; testDepends = [ base time ]; homepage = "https://bitbucket.org/davecturner/alarmclock"; @@ -18025,13 +18040,12 @@ self: { }: mkDerivation { pname = "alex-meta"; - version = "0.3.0.7"; - sha256 = "05a290b997kxm2rl0w98c3fzq33866pi69pmmahqvw631cp2c6ni"; + version = "0.3.0.8"; + sha256 = "1ja5y2dyil4h6j7q9dhrxzhry018fqc7vy3v5mrkvxyp7bhw1n9f"; buildDepends = [ array base containers haskell-src-meta QuickCheck template-haskell ]; buildTools = [ alex happy ]; - jailbreak = true; description = "Quasi-quoter for Alex lexers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -18554,15 +18568,14 @@ self: { }: mkDerivation { pname = "amazonka"; - version = "0.3.5"; - sha256 = "0i4wpkvf0yrgcdgz1pfmnig61d16lywh2mggf6xanp6pcrafh0xr"; + version = "0.3.6"; + sha256 = "1snzrclzs275gks19glrrayiysvywzwpzx6y5hnwmm48z4lh4gsb"; buildDepends = [ amazonka-core base bytestring conduit conduit-extra cryptohash cryptohash-conduit exceptions http-conduit lens mmorph monad-control mtl resourcet retry text time transformers transformers-base transformers-compat ]; - jailbreak = true; homepage = "https://github.com/brendanhay/amazonka"; description = "Comprehensive Amazon Web Services SDK"; license = "unknown"; @@ -18572,8 +18585,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-autoscaling"; - version = "0.3.5"; - sha256 = "0xbvviy5rvwiq0nj3wd420bl9zrb3625sils5y6y4zg9qzy3a7vx"; + version = "0.3.6"; + sha256 = "11dkcf0arjimvdzdin690811hs9klhr4xbhmjxcvqmwjr0z0sbb9"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; @@ -18584,8 +18597,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudformation"; - version = "0.3.5"; - sha256 = "0xhm9lkm80v7i5my8vz6dz1g7zvm0b7kgzsl4swk20359p3fcs84"; + version = "0.3.6"; + sha256 = "0m64p8xgwskv5vyzkkd5cxcwg5a7qa86a8sndan7yffap5b4nzq3"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; @@ -18596,8 +18609,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudfront"; - version = "0.3.5"; - sha256 = "0aln5gk3gj2ma6s51rp4x3ygjsj6zn3abzns4qlb2r5cqcf7r9sb"; + version = "0.3.6"; + sha256 = "09kl01agnmq24r1ip2f047ayrlf95x51nm80l3g40lx91n3mc7rp"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; @@ -18608,8 +18621,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudhsm"; - version = "0.3.5"; - sha256 = "00n8bchifihhijzacs0dmw4bxgl1xb1avbvzk9ic7a025vyp2vh3"; + version = "0.3.6"; + sha256 = "0m17yjilg4d7hm8d5mbs3bqsm9hlxcybk9b49bj06266jcd9rxff"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; @@ -18620,8 +18633,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch"; - version = "0.3.5"; - sha256 = "0jz5ibr170592mz94zimvan7pwli4sp6qimv6hxiqlz3p78qy492"; + version = "0.3.6"; + sha256 = "1hyapllcv5g2s8qxmyigy2k0fha9k07dd2jax69hkwi2qv88cks5"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; @@ -18632,8 +18645,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudsearch-domains"; - version = "0.3.5"; - sha256 = "1yv1q8bkwl1vmvyis2zj4ayy5lwvr5c0waaanaam640v8gnn7qli"; + version = "0.3.6"; + sha256 = "0dfi0flb77zjbjzdsfybr0hxwwdh2qd1pc5pry88l57iibjhmxym"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; @@ -18644,8 +18657,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudtrail"; - version = "0.3.5"; - sha256 = "1k5hmd6vbfm9wndz6ycd8cipds2npdqcfiwi67hq6g8lnvwm3p82"; + version = "0.3.6"; + sha256 = "07b47dy9r1f7dl5zq6z1zx1xa9q4qlack49zy8y48x1im90dnc9x"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; @@ -18656,8 +18669,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch"; - version = "0.3.5"; - sha256 = "1hmckxa3bv1hdrmd097fljfjdpmg1w18bjarppbr1fxd86hdzfr8"; + version = "0.3.6"; + sha256 = "14vx5v9iicxv768637v8smzwj04nhd80dcrwrxq3yqqlq9mbk9nk"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch SDK"; @@ -18668,8 +18681,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cloudwatch-logs"; - version = "0.3.5"; - sha256 = "0b4s87p1d8zhj7fwi29cca472wynqa4nxiskvw3d1dvf37xbzasi"; + version = "0.3.6"; + sha256 = "15xpyfifqm6c5s4ysak1y0sgn6h5g9bapl69s9dpacg7nfpajqvb"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; @@ -18680,8 +18693,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-codedeploy"; - version = "0.3.5"; - sha256 = "03rcyqvsdc63sq9122s5a14gz210kbywv1jx9pqmdifmr2flap6c"; + version = "0.3.6"; + sha256 = "1cp99l1kjm0w0jb1c4brq00dy4mn53pycra5gvlvz9k210g72ndm"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; @@ -18692,8 +18705,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-identity"; - version = "0.3.5"; - sha256 = "0l3izdln529kavybflf544xak510g336lzpkr6n323qjb8b6gjzc"; + version = "0.3.6"; + sha256 = "1ig50w3z85y8g7hiq1hahbv529kq5pfrcpqwsrpf1zwynl50jjkz"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; @@ -18704,8 +18717,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-cognito-sync"; - version = "0.3.5"; - sha256 = "12agwj1jhbb5dad2niycx8yahxhng02clfdpqakbyq7jqbdhrwlk"; + version = "0.3.6"; + sha256 = "1m6nw80ls7rl55ci36y2xvw8a1wfqiv64wm3q4anzmyybl50s133"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; @@ -18716,8 +18729,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-config"; - version = "0.3.5"; - sha256 = "1h4037sbfxkf66z47rizyqbjwhy3c6ny993qcalpdy1lji3m86sp"; + version = "0.3.6"; + sha256 = "0aa73cmlaydayvy6vxbxdz5br8a6hsns3dn3s06r4nzxxy7zmfzg"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; @@ -18735,8 +18748,8 @@ self: { }: mkDerivation { pname = "amazonka-core"; - version = "0.3.5"; - sha256 = "1m1nk4575ccdhx6ysw9n3x2xx6k8z1f0mqifccmry3fjc8nh90z7"; + version = "0.3.6"; + sha256 = "1l60z0fcfbyrhi7r4lfy2a6b2vwc4bn1swd6ddna19qyq9fn67l2"; buildDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bifunctors bytestring case-insensitive conduit conduit-extra @@ -18757,8 +18770,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-datapipeline"; - version = "0.3.5"; - sha256 = "180h89gzmszwqylibjxb7wmsilwfqwazanjcspwl6zf4wh3dy4hv"; + version = "0.3.6"; + sha256 = "0p0k76hiif5nd4kxm1ww6p0srjfmmq8q3xln4sbkq8ss448zfymh"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; @@ -18769,8 +18782,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-directconnect"; - version = "0.3.5"; - sha256 = "1icdc2nhp9fqslv96if5k30xjy60mj7hfidmfqy8126y7f9xg9ip"; + version = "0.3.6"; + sha256 = "0q258fxwklm5xwyzram3kdq3ylayk498a02xzs7v2vb2vd3pmdb6"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; @@ -18781,8 +18794,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-dynamodb"; - version = "0.3.5"; - sha256 = "0qywmfhxjda55002pbcg23l187jnch23lrpdi0bkpm2r9m7f3jz1"; + version = "0.3.6"; + sha256 = "1k6kzip69sjakcw1y7n0xjd0qjpbrk604fs4hng8n6az107vbdjq"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; @@ -18793,8 +18806,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ec2"; - version = "0.3.5"; - sha256 = "1qydhrld9zwjvcz1bcc12i1bxy34sg25q4czb2qg6vas4q17hd7r"; + version = "0.3.6"; + sha256 = "050gspxplhch66awd7gmxyyy3s466ca3jbzp2yq4qh32dn7n1hvi"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; @@ -18805,8 +18818,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ecs"; - version = "0.3.5"; - sha256 = "06v24ii7w0fs3b10lrjdqm4ij06h160vk10db0w7r69s5bcx97wd"; + version = "0.3.6"; + sha256 = "1md59pdqir5prlfwlmlgd78g6c9gq0dszm2lxpa3kbv9zxs1kgfr"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Service SDK"; @@ -18817,8 +18830,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticache"; - version = "0.3.5"; - sha256 = "12acby04a090p11g40awhz2rln187vqlnsk347dapkh42pgjnd1f"; + version = "0.3.6"; + sha256 = "0hapj08jj89gl934zgkfj2lg9bsc71y1mvdl5dmv4vk8qrwp912a"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; @@ -18829,8 +18842,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elasticbeanstalk"; - version = "0.3.5"; - sha256 = "16msbdxqgpf4hwym1jh2zdhsla50w3293m4rgjixgd6bbg3clrdl"; + version = "0.3.6"; + sha256 = "1bpixxvj4rdx3v07f2pdky0xbz0kz5p3afjazwv8w588sj2i6773"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; @@ -18841,8 +18854,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elastictranscoder"; - version = "0.3.5"; - sha256 = "1cv6kvfbwswmlhds26xgxcf3gh7k8lrjw9gvrqckri4jbmksxmsv"; + version = "0.3.6"; + sha256 = "1rfnzwl6z0ym2ln5nbcx6an2iiqcwnb3rjki2jnxpqkv6hj8d1p8"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; @@ -18853,8 +18866,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-elb"; - version = "0.3.5"; - sha256 = "1yhmsmm2f2s1s4pziqyadl8wzygpdb0y0f1qdjajshd33pff4462"; + version = "0.3.6"; + sha256 = "0yriv45wrxw9jns17idiqwxxvh086g3bg2hclzaanzxllir4jb59"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; @@ -18865,8 +18878,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-emr"; - version = "0.3.5"; - sha256 = "0xlb9nry7a0grn9d3qwl135lgl7r5kxqidx9jq67v6sdjh5y0v7y"; + version = "0.3.6"; + sha256 = "0pv0li7823alrgl9w1fjx9i02ndk4k12fbb6z5z50krypcxp8819"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; @@ -18877,8 +18890,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-glacier"; - version = "0.3.5"; - sha256 = "19dgjkggjirz9pbyzjw61ni3gkgbj2fl8y6cbdkazq2h9gg4dgbv"; + version = "0.3.6"; + sha256 = "0i3j1yha1hjj7imqn6m42329p3637v09hbjampq0c500dvy1j5dl"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Glacier SDK"; @@ -18889,8 +18902,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-iam"; - version = "0.3.5"; - sha256 = "0jr7wgs1hhbr4bara8q5xp1k40ffxjfrd79ncf2l6kzlh3vnsgcb"; + version = "0.3.6"; + sha256 = "0nzs9xn70f2a0n3xdnprwdk0mwnr23cgq0rwwxc83gf08i19nl8j"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; @@ -18901,8 +18914,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-importexport"; - version = "0.3.5"; - sha256 = "1ymlxs0icxlqb23jwx9wp3k6n3pld5n7ykzl7fp77c8pnyzq52ia"; + version = "0.3.6"; + sha256 = "1qcqzqg9sxqaf5kb3l91n7zp5brdpyv2mhy7da08wxb16f1v1r9x"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; @@ -18913,8 +18926,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kinesis"; - version = "0.3.5"; - sha256 = "0cqazzfcy1inhnb0g5nf2cqkglc4c9yvd3s1xiz2ihc2rfqanxyf"; + version = "0.3.6"; + sha256 = "0r4s5qfpirapg2gsgk9gbyp3ap4pz3cpnz4wdidlc4ys9v4vfhay"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; @@ -18925,8 +18938,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-kms"; - version = "0.3.5"; - sha256 = "1lx7d5zdj6gqvmcrdmr6rbyj7wmh43d9dnmr755vzwgjk5y47pq5"; + version = "0.3.6"; + sha256 = "1x68jg5m79rapwvb6nb9xmf2hwdv34r63r0aar742igpjwssxzn9"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Key Management Service SDK"; @@ -18937,8 +18950,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-lambda"; - version = "0.3.5"; - sha256 = "15x8y41bjxg2jk6jajnax7nnjy247128zwwzp4j0lqcy3jx0djf2"; + version = "0.3.6"; + sha256 = "1g6gf64k60zanmv787rsg8zxnv6vxzdwv3dibwm5b00fzw7cshlp"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; @@ -18949,8 +18962,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ml"; - version = "0.3.5"; - sha256 = "1ysrlff1mqww5nxm5hlrphafnfisrifqd0czl3slpg0wq4jijpd1"; + version = "0.3.6"; + sha256 = "0ma60mdn14xs3999yg98dzlx96arlwrc9wsvgf0gq6s6c0gnrc04"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Machine Learning SDK"; @@ -18961,8 +18974,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-opsworks"; - version = "0.3.5"; - sha256 = "1m47ymzakcnyjgg9fp6f0k270r6785z3q64g5qn3321sya8rfahz"; + version = "0.3.6"; + sha256 = "1d9qgazp4qk6lc4isggb0rm50crp0s1qmz6m0s3wwfdwd6lvhaql"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; @@ -18973,8 +18986,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-rds"; - version = "0.3.5"; - sha256 = "196z77al765mxrjnilz6ph20nmvdks5mfaqdnfwgk8mvhcigbiwp"; + version = "0.3.6"; + sha256 = "105xj8zrjha5yvpj8m0r7asy0hys17g1gglf95kgnkwdh9zhj3yl"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Relational Database Service SDK"; @@ -18985,8 +18998,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-redshift"; - version = "0.3.5"; - sha256 = "1kh5497azy2qyc6zbh4gznvmrf5hp6rpz5ksbbi78fngcanvfwn9"; + version = "0.3.6"; + sha256 = "195lawjhy6hmfwk05cm9wi2x8pn6f3zr8rhcvrwa0igg8xi39fpr"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; @@ -18997,8 +19010,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53"; - version = "0.3.5"; - sha256 = "0gl0xygsq6vn2xw0ibpmqc2n3c7650756ldv8nxyfmwrxyv37vrv"; + version = "0.3.6"; + sha256 = "1xk44z5zp8pr2hyhdshzgwm572y33f9lvjz6yrglc4vpangslcx3"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; @@ -19009,8 +19022,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-route53-domains"; - version = "0.3.5"; - sha256 = "0mawgxdvlhhvb2jzgsc5w62gfaf1wd0yiy2xzmk10vcrwawhfhig"; + version = "0.3.6"; + sha256 = "13dykx5w35dj3fn7nqs3znisjzqczpsxxyyghh2kfsgfhxna0kqv"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; @@ -19021,8 +19034,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-s3"; - version = "0.3.5"; - sha256 = "09fc51c3zsbpr9b9dbachhyr5v9f1b02w47yv382f70vdk7m7lky"; + version = "0.3.6"; + sha256 = "1q45d6g4wrfjmw9d65bvrin1p9vcfv5xyz47158p9zxm2cvpvcv9"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; @@ -19033,8 +19046,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sdb"; - version = "0.3.5"; - sha256 = "0x5v734q7srn8y7kfk5rrlbhvr1a51z2ak0dqd8qwjhpdam7wigb"; + version = "0.3.6"; + sha256 = "1wswsirmjq1zvhppv4bk4h9k2b94hdl1w8q18c7mh5i4j6kx41lc"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; @@ -19045,8 +19058,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ses"; - version = "0.3.5"; - sha256 = "0vk5hygw8z8cckmv5b95x265c8jkhnaz33n2dvrnyh29q3a5ag6d"; + version = "0.3.6"; + sha256 = "1f7k13mpf1hs27li4fdfv4wsbckyljmhwf9i6r176h6lkkb24vxx"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; @@ -19057,8 +19070,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sns"; - version = "0.3.5"; - sha256 = "0hfl4fwf777l49r7sx85dkp34yy5xijry5z114pbf2mbf7v8pxvn"; + version = "0.3.6"; + sha256 = "00bln36dmxikxgjyib009i3y56nln4i4j58nj89sclc87mdbzbma"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; @@ -19069,8 +19082,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sqs"; - version = "0.3.5"; - sha256 = "0jback1zw7n72pcrwv8d074xygk9hqlzpwfi2m905jz36f1jw889"; + version = "0.3.6"; + sha256 = "04qz8d81xz5pj3ib7cpxrig61n70val2vgjjy3xc0wjki3sk7xw8"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Queue Service SDK"; @@ -19081,8 +19094,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-ssm"; - version = "0.3.5"; - sha256 = "172wvhlk054wvp30f7vsfb6l94m0hbjsiwhnfxamnk7nwv8qzprr"; + version = "0.3.6"; + sha256 = "1xzz82hxh0am6mgzgqx0w8lxm5q8d3zpny2qyyl7bjyjh8k7v370"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Systems Management Service SDK"; @@ -19093,8 +19106,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-storagegateway"; - version = "0.3.5"; - sha256 = "0nxyc8bzphw1pdg9vz55fm9x9p57qd501112p5zykd08pgwaxzna"; + version = "0.3.6"; + sha256 = "1cjajpwf0lfvn3r62n7y4ly16496cn7qhs17grjxv3c9i8pikq2z"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; @@ -19105,8 +19118,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-sts"; - version = "0.3.5"; - sha256 = "03gphzl87qrvi57sncng08sdqlxbxlm3z9q4yz7zwqdigy2r2aic"; + version = "0.3.6"; + sha256 = "096av2p79b4vnb3zzmkbjspvxkcgzx77w96mrziggfj8mxh3x5f1"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; @@ -19117,8 +19130,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-support"; - version = "0.3.5"; - sha256 = "1z9r6v1nvx5d6kda9kxgypwh4y90waxv7ybm6iknp19xqw7y2daz"; + version = "0.3.6"; + sha256 = "0igaq8538vrbwn7pqap5500alx3lp1c37imq75gk9nx7q846gqy6"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; @@ -19129,8 +19142,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-swf"; - version = "0.3.5"; - sha256 = "0hl9crncqs8sijzyppl3q54isq1w3205q716bwqi09g97zi0hik3"; + version = "0.3.6"; + sha256 = "0mijdc797ybdz7g0nkyncahspsl0dpy3g8hkhcj2jdhhdbqn7qfc"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; @@ -19141,8 +19154,8 @@ self: { ({ mkDerivation, amazonka-core, base }: mkDerivation { pname = "amazonka-workspaces"; - version = "0.3.5"; - sha256 = "0afl7xwb45i70j025kmfh7s3v5my86h52zb55h4cxxdcnj9yvca5"; + version = "0.3.6"; + sha256 = "1hwlm2a5fn4hrqqv79iw39xrrgfhl1d1p6236lqqfdyycnq4x5wk"; buildDepends = [ amazonka-core base ]; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon WorkSpaces SDK"; @@ -19261,8 +19274,8 @@ self: { }: mkDerivation { pname = "anansi"; - version = "0.4.7"; - sha256 = "0am6c4chbysgs63n3wbd4lfxdzkg6fzj4xgp6i26z4vhj49qk890"; + version = "0.4.8"; + sha256 = "1fzrry9axri0wcff0zbxq0dbq0pxyq6x6bzw426xkm3ayzfd825a"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -19947,6 +19960,7 @@ self: { resource-pool resourcet transformers transformers-base types-compat web-routing ]; + jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "persistent support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -22086,10 +22100,8 @@ self: { }: mkDerivation { pname = "aws"; - version = "0.12"; - revision = "1"; - sha256 = "1vjqrj3hj92vvik2c3qlld9gyh0an4xl2hx01hnpypgawa1j1180"; - editedCabalFile = "c40b53aee98659e34f2383439dacd26bb98228056283a05d25e55b3c8226f4a7"; + version = "0.12.1"; + sha256 = "0aykch71qakmxn47i6h23h52dp41x7kwcibv527xg57ab71vm1bc"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -22105,7 +22117,6 @@ self: { mtl QuickCheck quickcheck-instances resourcet tagged tasty tasty-quickcheck text time transformers transformers-base ]; - jailbreak = true; homepage = "http://github.com/aristidb/aws"; description = "Amazon Web Services (AWS) for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -22932,8 +22943,8 @@ self: { }: mkDerivation { pname = "banwords"; - version = "0.1.0.0"; - sha256 = "0r35w2kv9nfsz67bmcc9k9pg7k1d1k00cz5y16cpjra200mz847z"; + version = "0.2.0.0"; + sha256 = "18k39zgc5n9bxabv0wkiay9h3phx75mfr4kqpcp1hlpikn4h6wxx"; buildDepends = [ attoparsec base bytestring data-default text vector ]; @@ -25404,8 +25415,8 @@ self: { }: mkDerivation { pname = "bitcoin-api"; - version = "0.11.1"; - sha256 = "16slfsqwmpr8c5sl2zpf763d21sqgii7jgmw0ra1nidv6zl01glb"; + version = "0.12.1"; + sha256 = "0c1ydggik4k3vj93bqk53privyblkwhd32jizw25qk5j34axwy69"; buildDepends = [ aeson base base58string binary bitcoin-block bitcoin-script bitcoin-tx bitcoin-types bytestring hexstring lens lens-aeson text @@ -26342,23 +26353,25 @@ self: { }) {}; "bloodhound" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, containers - , directory, doctest, doctest-prop, filepath, hspec, http-client - , http-types, QuickCheck, semigroups, text, time - , unordered-containers, vector + ({ mkDerivation, aeson, base, bytestring, containers + , data-default-class, directory, doctest, doctest-prop, exceptions + , filepath, hspec, http-client, http-types, mtl, QuickCheck + , quickcheck-properties, semigroups, text, time, transformers + , unordered-containers, uri-bytestring, vector }: mkDerivation { pname = "bloodhound"; - version = "0.5.0.1"; - sha256 = "1wvqj8fz3b6jvhmmi3calx6fsqjyvcpznks67bd0iiz9z0igh0ha"; + version = "0.6.0.0"; + sha256 = "0qybsmfkip5cjanmhj2av4rl5hig6x4wn97cmlajhszqd5ddsis9"; buildDepends = [ - aeson base bytestring conduit containers http-client http-types - semigroups text time vector + aeson base bytestring containers data-default-class exceptions + http-client http-types mtl semigroups text time transformers + uri-bytestring vector ]; testDepends = [ aeson base containers directory doctest doctest-prop filepath hspec - http-client http-types QuickCheck semigroups text time - unordered-containers vector + http-client http-types mtl QuickCheck quickcheck-properties + semigroups text time unordered-containers vector ]; jailbreak = true; homepage = "https://github.com/bitemyapp/bloodhound"; @@ -27596,30 +27609,28 @@ self: { }: mkDerivation { pname = "bytestring-handle"; - version = "0.1.0.2"; - sha256 = "1nnqqcl9zp14q49jwcxhbm85hxk48higpr63qs675802sz0fs01v"; + version = "0.1.0.3"; + sha256 = "0dakwnpymxj2nghqsnq09862czby8hy0xl8m74yzqdnd9ky22g0z"; buildDepends = [ base bytestring ]; testDepends = [ base bytestring HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://hub.darcs.net/ganesh/bytestring-handle"; description = "ByteString-backed Handles"; license = stdenv.lib.licenses.bsd3; }) {}; "bytestring-lexing" = callPackage - ({ mkDerivation, alex, array, base, bytestring }: + ({ mkDerivation, base, bytestring }: mkDerivation { pname = "bytestring-lexing"; - version = "0.4.3.3"; - sha256 = "1gfbmxr91glzxmbl57f3ij9mapdfxal8pql0s7g3v4qxf7km2pq0"; - buildDepends = [ array base bytestring ]; - buildTools = [ alex ]; + version = "0.5.0.2"; + sha256 = "0wrzniawhgpphc6yx1v972gyqxdbv0pizaz9bafahrshyb9svy81"; + buildDepends = [ base bytestring ]; homepage = "http://code.haskell.org/~wren/"; description = "Parse and produce literals efficiently from strict or lazy bytestrings"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.bsd2; }) {}; "bytestring-mmap" = callPackage @@ -27844,8 +27855,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "c-storable-deriving"; - version = "0.1.1"; - sha256 = "19scaffyinyblc3vw3ga22j2z81gd7l2l3nnrsy3k9nsal1rbz3z"; + version = "0.1.2"; + sha256 = "0cdy3fy8lpz5layc0qzixfpbx2jksl9smrf012l5rpl994dwc9x1"; buildDepends = [ base ghc-prim ]; homepage = "https://github.com/maurer/c-storable-deriving"; description = "Generate C-like storable instances from datatypes"; @@ -28062,8 +28073,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.27.2"; - sha256 = "1dmxs06x82pb0x4cyf5lhhgjf5mf0yx2yzl5r6g69awlkq5ylalz"; + version = "4.29"; + sha256 = "1kx8mivm2vm0bgnrzvccnd2x3ww913h64bwcawzpbcgjv7cpihlj"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -28184,20 +28195,20 @@ self: { "cabal-helper" = callPackage ({ mkDerivation, base, bytestring, Cabal, data-default, directory - , filepath, ghc-prim, mtl, process, template-haskell, temporary - , transformers + , extra, filepath, ghc-prim, mtl, process, template-haskell + , temporary, transformers, unix }: mkDerivation { pname = "cabal-helper"; - version = "0.3.4.0"; - sha256 = "1c96zwiz7jn55ijjjy8ip5axk7g0mv7b10bs25b5y3z7iqbblw6c"; + version = "0.3.5.0"; + sha256 = "02qzji8jzbg19pmhmqg0kylvmm0libq7v99rws67bh015gb829kk"; isLibrary = true; isExecutable = true; buildDepends = [ base bytestring Cabal data-default directory filepath ghc-prim mtl process template-haskell temporary transformers ]; - testDepends = [ base ]; + testDepends = [ base extra unix ]; description = "Simple interface to Cabal's configuration state used by ghc-mod"; license = stdenv.lib.licenses.agpl3; }) {}; @@ -28710,9 +28721,9 @@ self: { mkDerivation { pname = "cabal2nix"; version = "1.73"; - revision = "4"; + revision = "5"; sha256 = "1nskcr8k5a8wm9q5is0b1kww574q2nq45f16agya8z44hgk97xiv"; - editedCabalFile = "29ac70f26f4996e06945649693d71c217ed9e5f9b3ec72637c13153961d8f2d9"; + editedCabalFile = "54866b8081ddfc72761c1f38cc96df6782682058cd09b465300562910f57e2ea"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -30180,8 +30191,8 @@ self: { }: mkDerivation { pname = "cf"; - version = "0.3"; - sha256 = "06r289lb3aq9wh2xggpg7pbxf60wkz1fmdy7ibyawa1sxpprrs07"; + version = "0.4"; + sha256 = "172nm38gvjriznnyks958bfzwd2zy59662i6zjzvj3nr0kdkiiap"; buildDepends = [ base ]; testDepends = [ base QuickCheck test-framework test-framework-quickcheck2 @@ -31525,8 +31536,8 @@ self: { }: mkDerivation { pname = "clash-vhdl"; - version = "0.5.5"; - sha256 = "0mwzp12ag98sfspjlh2w9hd1zgsx2bi7bv0lx55x6nmn8gawn0mk"; + version = "0.5.6"; + sha256 = "02pjy1l3irn67jaqy6sp2a8cjy2sw100kssyd0nxsz9k0imjzizy"; buildDepends = [ base clash-lib clash-prelude fgl lens mtl text unordered-containers wl-pprint-text @@ -32372,8 +32383,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, text }: mkDerivation { pname = "cmark"; - version = "0.3.3.1"; - sha256 = "0l42l8bpn69zqz3s2jby1blqg7sx7cxmpnpwr8spkmh5vy8c8m5g"; + version = "0.3.4"; + sha256 = "0cmrh524s2in66vb51hzfrbxq7z8afh243c8x1378s9hxk0r6xya"; buildDepends = [ base bytestring text ]; testDepends = [ base HUnit text ]; homepage = "https://github.com/jgm/commonmark-hs"; @@ -32987,9 +32998,10 @@ self: { mkDerivation { pname = "colors"; version = "0.3.0.2"; + revision = "1"; sha256 = "0gbdqn5wrh9711j5hs5ypbd3w7a3mh37g6aadqiq4m5n7jna6phm"; + editedCabalFile = "b49946d81e0089d4d80191523839f934802975ede3b9fd9521ead9e591142560"; buildDepends = [ base lens linear profunctors ]; - jailbreak = true; homepage = "https://github.com/fumieval/colors"; description = "A type for colors"; license = stdenv.lib.licenses.bsd3; @@ -33103,6 +33115,7 @@ self: { homepage = "http://www.comp.leeds.ac.uk/sc06r2s/Projects/HaskellCombinatorialProblems"; description = "A number of data structures to represent and allow the manipulation of standard combinatorial problems, used as test problems in computer science"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "combinatorics" = callPackage @@ -36376,8 +36389,8 @@ self: { }: mkDerivation { pname = "cron"; - version = "0.2.5"; - sha256 = "0337dq2fqjikdn2fayad66rq8xyh2y6ywn18fn5q5vvrhmvmyrja"; + version = "0.2.6"; + sha256 = "1klxhk12c08ig7n8n8drnvqmggfghr8i9j5bfhakj58bk1x8xfvg"; buildDepends = [ attoparsec base mtl old-locale text time ]; testDepends = [ attoparsec base derive hspec hspec-expectations QuickCheck text @@ -36389,6 +36402,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cron-compat" = callPackage + ({ mkDerivation, attoparsec, base, cron, derive, hspec + , hspec-expectations, mtl, mtl-compat, old-locale, QuickCheck, text + , time, transformers, transformers-compat + }: + mkDerivation { + pname = "cron-compat"; + version = "0.2.6"; + sha256 = "0km70j3xfqvpra9mvbxpvpqd7arjjfcpazmilvmj6kjxk6cw7pfx"; + buildDepends = [ + attoparsec base mtl mtl-compat old-locale text time + transformers-compat + ]; + testDepends = [ + attoparsec base cron derive hspec hspec-expectations QuickCheck + text time transformers + ]; + jailbreak = true; + homepage = "http://github.com/michaelxavier/cron"; + description = "Cron datatypes and Attoparsec parser"; + license = stdenv.lib.licenses.mit; + }) {}; + "cruncher-types" = callPackage ({ mkDerivation, aeson, base, containers, hlint, lens, text }: mkDerivation { @@ -43485,6 +43521,7 @@ self: { ]; description = "SQL backend for Database Supported Haskell (DSH)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dsmc" = callPackage @@ -44891,8 +44928,8 @@ self: { }: mkDerivation { pname = "ekg-push"; - version = "0.0.2"; - sha256 = "1z41x3i7hvrnca3clrrz62kah3a4lik0f3gxhw3vnyqgszzb46l5"; + version = "0.0.3"; + sha256 = "1yxp0s3i87zc205bqkw8arq8n0y225gin94x98csldb9rd0k0s5y"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -44932,12 +44969,11 @@ self: { }: mkDerivation { pname = "ekg-statsd"; - version = "0.2.0.2"; - sha256 = "1jblrhwpv579d51i66bin9zxmwkl899lxwygg4qqpm3cnx5vf859"; + version = "0.2.0.3"; + sha256 = "02sknwz5cqwy5byqjiyc6nfppmbmfnxndp3dcs4lz276221h91hn"; buildDepends = [ base bytestring ekg-core network text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/tibbe/ekg-statsd"; description = "Push metrics to statsd"; license = stdenv.lib.licenses.bsd3; @@ -46327,6 +46363,7 @@ self: { persistent persistent-sqlite persistent-template QuickCheck resourcet text transformers ]; + jailbreak = true; homepage = "https://github.com/prowdsponsor/esqueleto"; description = "Type-safe EDSL for SQL queries on persistent backends"; license = stdenv.lib.licenses.bsd3; @@ -46633,13 +46670,12 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "0.7.2.1"; - sha256 = "0zhasybpvmi3f0kb2pipb03jnv4d710gcr6mphszgkj5179wvad2"; + version = "0.8.0.0"; + sha256 = "0p1z7xs3412s2hnv7pc18y1gx65p5hf09038n96vl22kvc9d84ww"; buildDepends = [ aeson async attoparsec base bytestring cereal containers network protobuf random sodium stm text time unordered-containers uuid ]; - jailbreak = true; homepage = "http://github.com/YoEight/eventstore"; description = "EventStore TCP Client"; license = stdenv.lib.licenses.bsd3; @@ -47618,6 +47654,7 @@ self: { base bytestring containers foldl lens parsec pipes pipes-bytestring pipes-group pipes-text split text ]; + jailbreak = true; homepage = "https://github.com/GregorySchwartz/fasta"; description = "A simple, mindless parser for fasta files"; license = stdenv.lib.licenses.gpl2; @@ -47840,8 +47877,8 @@ self: { }: mkDerivation { pname = "fb"; - version = "1.0.10"; - sha256 = "11h2z8idndhvm1ijp6qylaqyg173qk1rybv9v0d73s2sq7jxbcx7"; + version = "1.0.11"; + sha256 = "19kvsc6ap56b3h1z6wnjqmxgnqs7jqlhd3zx08h6nxkip3ddnzh5"; buildDepends = [ aeson attoparsec base base16-bytestring base64-bytestring bytestring cereal conduit conduit-extra crypto-api cryptohash @@ -47867,6 +47904,7 @@ self: { version = "0.3.4"; sha256 = "07hrifzwvv7fzqh70igfbxzn854yvyx7406s8byn0arhmp21ka3b"; buildDepends = [ base cereal fb persistent text time ]; + jailbreak = true; homepage = "https://github.com/prowdsponsor/fb-persistent"; description = "Provides Persistent instances to Facebook types"; license = stdenv.lib.licenses.bsd3; @@ -48798,8 +48836,8 @@ self: { }: mkDerivation { pname = "fingertree"; - version = "0.1.0.2"; - sha256 = "1krsymv66lnz30hv3j2427vl1wh7vczjb66qviq8mfxgfxf2q8z6"; + version = "0.1.1.0"; + sha256 = "1w6x3kp3by5yjmam6wlrf9vap5l5rrqaip0djbrdp0fpf2imn30n"; buildDepends = [ base ]; testDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -49752,8 +49790,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.0.11"; - sha256 = "0czavxjbf8vafkizw6sdvp2a19qdgpjvjb10f1f52jmd5z8k3rxr"; + version = "1.1.0"; + sha256 = "184arkpffi2z7dayplc47nvyabzr5sig4zs8hc4lilcklv4q9zn6"; buildDepends = [ base bytestring containers mwc-random primitive profunctors text transformers vector @@ -50432,8 +50470,8 @@ self: { }: mkDerivation { pname = "free-game"; - version = "1.1.80"; - sha256 = "1vpwrviwxib22mkaqmwndzfly8iicr85sh1y914gwp5n83lmkava"; + version = "1.1.81"; + sha256 = "1z8l9k70rbcc9jbrnh7xhrnny6wd5l0jfb1a6ki7dnq6m5klivyp"; buildDepends = [ array base boundingboxes colors containers control-bool directory filepath free freetype2 GLFW-b hashable JuicyPixels @@ -51739,8 +51777,8 @@ self: { }: mkDerivation { pname = "generic-accessors"; - version = "0.1.0.1"; - sha256 = "0lkzwbz2kmv7nl6hlys2iqn5nq1a11n18q2apymp517pvkq3if95"; + version = "0.4.0"; + sha256 = "0wpv9i80lai771fws5yg5ri05iskbq2vgar66f72xqwvz3nm44i7"; buildDepends = [ base linear spatial-math ]; testDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -52282,8 +52320,8 @@ self: { }: mkDerivation { pname = "getopt-generics"; - version = "0.7"; - sha256 = "1r1z13n0s5vxxcxwwfmk8dplah12qdyb0jnjx2hx239hvy2l1bzc"; + version = "0.7.1"; + sha256 = "0jrnasd9lw7ffim0ski5b1mdislvs27n0i37lcbv51rgsl5wm458"; buildDepends = [ base base-compat base-orphans generics-sop tagged ]; @@ -52952,22 +52990,23 @@ self: { }) {}; "ghcid" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, directory, extra - , filepath, process, tasty, tasty-hunit, terminal-size, time + ({ mkDerivation, ansi-terminal, base, cmdargs, containers + , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit + , terminal-size, time }: mkDerivation { pname = "ghcid"; - version = "0.3.6"; - sha256 = "15aasq3f8h5nimgd5zz0mhkflslmcadl2f0srbw4q0462flvmjm8"; + version = "0.4"; + sha256 = "0z54444ygxc3irnqjkd9cdzg2b6df9d87lkkazj1cl2qy1x5kbv0"; isLibrary = true; isExecutable = true; buildDepends = [ - ansi-terminal base cmdargs directory extra filepath process - terminal-size time + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process terminal-size time ]; testDepends = [ - ansi-terminal base cmdargs directory extra filepath process tasty - tasty-hunit terminal-size time + ansi-terminal base cmdargs containers directory extra filepath + fsnotify process tasty tasty-hunit terminal-size time ]; homepage = "https://github.com/ndmitchell/ghcid#readme"; description = "GHCi based bare bones IDE"; @@ -54050,8 +54089,8 @@ self: { ({ mkDerivation, array, base, containers, TypeCompose }: mkDerivation { pname = "gll"; - version = "0.2.0.1"; - sha256 = "0f5hiklia5fkddzahq0cjpwdjjk2d5sfs0hd7wwcylylsh0xicd7"; + version = "0.2.0.3"; + sha256 = "1w2z5071idac1jn367dymphqvayd580jlnhapmfrd3s40b6z6xaf"; buildDepends = [ array base containers TypeCompose ]; description = "GLL parser with simple combinator interface"; license = stdenv.lib.licenses.bsd3; @@ -55191,12 +55230,15 @@ self: { }) {}; "graph-wrapper" = callPackage - ({ mkDerivation, array, base, containers }: + ({ mkDerivation, array, base, containers, deepseq, hspec + , QuickCheck + }: mkDerivation { pname = "graph-wrapper"; - version = "0.2.4.4"; - sha256 = "0ks4mj1f3ky8h8p9kc1djslbzs2vvlh9frab8jl09x63b15f8xzd"; + version = "0.2.5.1"; + sha256 = "04z1qbsf1c31r0mhn8bgr8hisffxacq3j61y4fym28idr8zqaqc3"; buildDepends = [ array base containers ]; + testDepends = [ array base containers deepseq hspec QuickCheck ]; homepage = "https://github.com/soenkehahn/graph-wrapper"; description = "A wrapper around the standard Data.Graph with a less awkward interface"; license = stdenv.lib.licenses.bsd3; @@ -58241,6 +58283,7 @@ self: { base containers grid HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; + jailbreak = true; homepage = "https://github.com/timjb/halma"; description = "Library implementing Halma rules"; license = stdenv.lib.licenses.mit; @@ -59189,13 +59232,12 @@ self: { }: mkDerivation { pname = "happy-meta"; - version = "0.2.0.7"; - sha256 = "12599233lh0ffmvlim0gs5jzg8lly1g11i1cg44lb37bz3l7psh9"; + version = "0.2.0.8"; + sha256 = "0hnj039vspqvym70c59y80ygb8ciz5bf18sqm0dbvzr5v2mixbag"; buildDepends = [ array base containers haskell-src-meta mtl template-haskell ]; buildTools = [ happy ]; - jailbreak = true; description = "Quasi-quoter for Happy parsers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -61913,6 +61955,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haverer" = callPackage + ({ mkDerivation, base, basic-prelude, containers, errors, lens + , MonadRandom, mtl, random-shuffle, tasty, tasty-hunit + , tasty-quickcheck, text + }: + mkDerivation { + pname = "haverer"; + version = "0.3.0.0"; + sha256 = "1p4llwjab7h2zg10585jp5a5bfrzmmkziq7in164wk15rb2z5y0p"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base basic-prelude containers errors lens MonadRandom mtl + random-shuffle tasty tasty-quickcheck text + ]; + testDepends = [ + base basic-prelude containers errors mtl random-shuffle tasty + tasty-hunit tasty-quickcheck text + ]; + description = "Implementation of the rules of Love Letter"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hawitter" = callPackage ({ mkDerivation, base, base64-string, bytestring, clock, containers , gconf, glade, gtk, hoauth, HTTP, json, mtl, network, old-locale @@ -62903,8 +62969,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.6.5"; - sha256 = "1kn8i49yxms1bpjwpy4m8vyycgi755zvy4zc66w068nmnd1kiykh"; + version = "0.6.7"; + sha256 = "181anz8f2qi08f96ns0kxy09y18q4854brdycwhdij5yn7fl9kdg"; buildDepends = [ attoparsec base BoundedChan bytestring bytestring-lexing mtl network resource-pool time vector @@ -63033,8 +63099,8 @@ self: { }: mkDerivation { pname = "hein"; - version = "0.1.0.4"; - sha256 = "0agg7nsnhzg3ngiawa9899qg2pwa39dw6rkivdslsv2i67six832"; + version = "0.1.0.5"; + sha256 = "0z3c9pvhnfx9zizzwkyawvzvs4zl7i5w5zkrjpax8rkrh8ai1060"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -64801,17 +64867,18 @@ self: { , either, exceptions, http-client, http-client-tls, http-types, jwt , lens, mtl, network-uri, postgresql-simple, resource-pool, safe , stm, text, time, transformers, unordered-containers, utf8-string - , wai, wai-lens, webcrank-wai, wreq + , wai, wai-lens, webcrank, webcrank-wai, wreq }: mkDerivation { pname = "hipbot"; - version = "0.3.0.2"; - sha256 = "04czq0ix78amd217cf5yj8yvkr4hpsaa38rdmjish40b63crnba3"; + version = "0.5"; + sha256 = "0acy9bp2dwszd01l514nx2crdxgb356k18pm9ravddljxr24n1hs"; buildDepends = [ aeson base bifunctors blaze-builder bytestring either exceptions http-client http-client-tls http-types jwt lens mtl network-uri postgresql-simple resource-pool safe stm text time transformers - unordered-containers utf8-string wai wai-lens webcrank-wai wreq + unordered-containers utf8-string wai wai-lens webcrank webcrank-wai + wreq ]; jailbreak = true; homepage = "https://github.com/purefn/hipbot"; @@ -65541,8 +65608,8 @@ self: { ({ mkDerivation, base, hspec, sass }: mkDerivation { pname = "hlibsass"; - version = "0.1.2.1"; - sha256 = "1fipgxpzzc0jbb2xc2dslhc94xjvd1vkq564g4a1i7axnq90b6dv"; + version = "0.1.3.0"; + sha256 = "10mrvpiwmcaijckrcg45zw2zb17fgx43rm4qfi32glvgkakd2zqf"; buildDepends = [ base ]; testDepends = [ base hspec ]; extraLibraries = [ sass ]; @@ -65906,6 +65973,7 @@ self: { homepage = "http://rd.slavepianos.org/t/hmeap"; description = "Haskell Meapsoft Parser"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hmeap-utils" = callPackage @@ -66505,14 +66573,15 @@ self: { }: mkDerivation { pname = "homplexity"; - version = "0.4.2.0"; - sha256 = "1jxq8fgm1ja0y3h5jj9d4wr96fpb6496xc9sb3q562bxssx6giay"; + version = "0.4.3.0"; + sha256 = "0xw3fkbzb3jqi5sr28a69ga632c30g4xwykgd0cq8imrz70jlvam"; isLibrary = false; isExecutable = true; buildDepends = [ base containers cpphs deepseq directory filepath haskell-src-exts hflags template-haskell uniplate ]; + testDepends = [ base haskell-src-exts uniplate ]; buildTools = [ happy ]; homepage = "https://github.com/mgajda/homplexity"; description = "Haskell code quality tool"; @@ -67329,8 +67398,8 @@ self: { }: mkDerivation { pname = "hpack"; - version = "0.2.0"; - sha256 = "1a1kjawmf61znikdg9kw34rqhlqhijb00b1dk1w9s8nx52rcrlaa"; + version = "0.3.0"; + sha256 = "0hvnb3svs7rh8c6afsp5rs6wdld2pllr5fvjhmlc143p40akck25"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -67598,8 +67667,8 @@ self: { }: mkDerivation { pname = "hpqtypes"; - version = "1.4.1"; - sha256 = "00ira3zsw9m5vm6pqdgf4v276b7y0crqiwlw3nw99f74xj5qds19"; + version = "1.4.2"; + sha256 = "0jmc7m47gidmhnf2dz7hqzlypw1l72n948naccab6j58hkn683kk"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -69875,6 +69944,7 @@ self: { homepage = "http://rd.slavepianos.org/?t=hspear"; description = "Haskell Spear Parser"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec" = callPackage @@ -70169,18 +70239,17 @@ self: { }: mkDerivation { pname = "hspec-snap"; - version = "0.3.2.9"; - sha256 = "1m324bjln2i6qz7ym26m82s1qiaq0i0sq4yfscc3bh1s6p8r5vva"; + version = "0.3.3.0"; + sha256 = "1ch58zz5yhvp4dq91ls05bgraf2p36aixl189zm3ipc9naidjrg4"; buildDepends = [ - base bytestring containers digestive-functors HandsomeSoup hspec - hspec-core hxt lens mtl snap snap-core text transformers + aeson base bytestring containers digestive-functors HandsomeSoup + hspec hspec-core hxt lens mtl snap snap-core text transformers ]; testDepends = [ aeson base bytestring containers digestive-functors directory HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text transformers ]; - jailbreak = true; homepage = "https://github.com/dbp/hspec-snap"; description = "A library for testing with Hspec and the Snap Web Framework"; license = stdenv.lib.licenses.bsd3; @@ -70254,17 +70323,19 @@ self: { }) {}; "hspec-wai-json" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec - , hspec-wai, template-haskell + ({ mkDerivation, aeson, aeson-qq, base, bytestring + , case-insensitive, hspec, hspec-wai, template-haskell }: mkDerivation { pname = "hspec-wai-json"; - version = "0.6.0"; - sha256 = "0r9p8v3cynyx5gnan86cc0l5hrmnm3mx7w2kkc1npv6zq0cj1bgq"; + version = "0.6.1"; + sha256 = "0sbw6iddywxdg4n8npnz6m0lmcf9nrq3ib7kckpx7shpq9khwgih"; buildDepends = [ - aeson aeson-qq base bytestring hspec-wai template-haskell + aeson aeson-qq base bytestring case-insensitive hspec-wai + template-haskell ]; testDepends = [ base hspec hspec-wai ]; + homepage = "https://github.com/hspec/hspec-wai#readme"; description = "Testing JSON APIs with hspec-wai"; license = stdenv.lib.licenses.mit; }) {}; @@ -71312,8 +71383,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.4.11.2"; - sha256 = "074qh0yj3i4q6m88jccp59vpv5prdwglrrcglsr5k89g06hx4xb2"; + version = "0.4.11.3"; + sha256 = "04f9xb1hz5i9sm14nlasia86vjwsx0nmjh1kpk21axvvkbgcnrrq"; buildDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie data-default-class deepseq @@ -71792,8 +71863,8 @@ self: { }: mkDerivation { pname = "http-streams"; - version = "0.8.3.1"; - sha256 = "13fdwyq50d5gipvdxmi125bn7aqhc3zqbi8jikir3l8bigfby5w0"; + version = "0.8.3.2"; + sha256 = "1hyg3fyhysxfbqks3y7rkbzx8j0hxkxlqdcbx77cihvz9j3ddzyk"; buildDepends = [ aeson attoparsec base base64-bytestring blaze-builder bytestring case-insensitive directory HsOpenSSL http-common io-streams mtl @@ -73482,7 +73553,9 @@ self: { mkDerivation { pname = "ide-backend-common"; version = "0.9.1.2"; + revision = "1"; sha256 = "1cj594vq0x87h9mvwsj9mplacrdn999bbsknjwdpvrpsbadlx5q7"; + editedCabalFile = "cdbec9d6422b6888b23622286333a5119e9913f82e49f85676bb56d6ca850b38"; buildDepends = [ aeson async attoparsec base binary bytestring bytestring-trie containers crypto-api data-accessor directory filepath fingertree @@ -73768,24 +73841,22 @@ self: { }) {}; "ig" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, conduit, conduit-extra, crypto-api, cryptohash + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , conduit, conduit-extra, crypto-api, cryptohash , cryptohash-cryptoapi, data-default, http-conduit, http-types , lifted-base, monad-control, resourcet, text, time, transformers , transformers-base, unordered-containers }: mkDerivation { pname = "ig"; - version = "0.2.1"; - sha256 = "0kl44fv3djcrr87gqpcdbsvqiliwxz2iw5fd07h8xrvmls3b1lgj"; + version = "0.2.2"; + sha256 = "0qg9786sih7bcmdvmih5qg8p0j8r7vh78cp5yaw2f9rldica9a4k"; buildDepends = [ - aeson attoparsec base base16-bytestring bytestring conduit - conduit-extra crypto-api cryptohash cryptohash-cryptoapi - data-default http-conduit http-types lifted-base monad-control - resourcet text time transformers transformers-base - unordered-containers + aeson base base16-bytestring bytestring conduit conduit-extra + crypto-api cryptohash cryptohash-cryptoapi data-default + http-conduit http-types lifted-base monad-control resourcet text + time transformers transformers-base unordered-containers ]; - jailbreak = true; homepage = "https://github.com/prowdsponsor/ig"; description = "Bindings to Instagram's API"; license = stdenv.lib.licenses.bsd3; @@ -75282,8 +75353,8 @@ self: { }: mkDerivation { pname = "intricacy"; - version = "0.4.1"; - sha256 = "1gv2kgm3r5b4nh8d58nwrilyzxr7l4awn1qlwl7wnkfi99h5nlz8"; + version = "0.4.3"; + sha256 = "07ha7vl8qzvfyk776f0pr6wb9fjcwmmqplp91bfpmzslifw2k01r"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -75441,8 +75512,8 @@ self: { }: mkDerivation { pname = "io-streams"; - version = "1.3.0.0"; - sha256 = "029qp0jfap6jczxdi2my1g4vcp8pr4zkxp64xfl7cyiigbapkimw"; + version = "1.3.1.0"; + sha256 = "1fic83lgvyji75gyx8c9ik9lj6jf65wbqmzp30siqmkhdp9y1rxf"; buildDepends = [ attoparsec base bytestring bytestring-builder network primitive process text time transformers vector zlib-bindings @@ -78258,8 +78329,8 @@ self: { }: mkDerivation { pname = "keera-hails-reactive-fs"; - version = "0.0.3.3"; - sha256 = "1j8nlzaalmf82jhri8m12hl6vmg6y4amwvb1gv5dld41cz6sdv08"; + version = "0.0.3.4"; + sha256 = "1yinlhp08xxdlbnm90gnwbr1h9sp8r741ihd8kihy1yfqzkp85cy"; buildDepends = [ base directory fsnotify keera-hails-reactivevalues system-filepath ]; @@ -81049,8 +81120,8 @@ self: { }: mkDerivation { pname = "lens-simple"; - version = "0.1.0.2"; - sha256 = "1gsfij0n70wwvcrgr0lq98kwswghv16y1d0gxnyrfgxkpar47fhf"; + version = "0.1.0.3"; + sha256 = "17s7fjggajlamqi2lc2lrhswykbyba6zv5rf0kr24hn3mv8a6yrk"; buildDepends = [ base lens-family lens-family-core lens-family-th ]; @@ -81121,6 +81192,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lentil" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip + , filepath, hspec, natural-sort, optparse-applicative, parsec + , regex-tdfa + }: + mkDerivation { + pname = "lentil"; + version = "0.1.0.2"; + revision = "2"; + sha256 = "104f1hyd9fp0b0ibqr292bpx8zgmw8gi7m3br2zv8m19rrnwgn4v"; + editedCabalFile = "fb144e396ba79b4418a347b981356f5d15a1c33179bc8c7c154de7c5cb0d3d4c"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + ansi-wl-pprint base csv directory filemanip filepath natural-sort + optparse-applicative parsec regex-tdfa + ]; + testDepends = [ + ansi-wl-pprint base csv directory filemanip filepath hspec + natural-sort optparse-applicative parsec regex-tdfa + ]; + homepage = "http://www.ariis.it/static/articles/lentil/page.html"; + description = "frugal issue tracker"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "level-monad" = callPackage ({ mkDerivation, base, fmlist }: mkDerivation { @@ -82174,6 +82271,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lindenmayer" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "lindenmayer"; + version = "0.1.0.1"; + sha256 = "07gz4lbvyzahffcp6f1f87zl20kf834iswh671vb8vxffigrz5y1"; + buildDepends = [ base ]; + homepage = "https://github.com/reinh/hs-lindenmayer"; + description = "L-systems in Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "line-break" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -83516,6 +83625,7 @@ self: { homepage = "http://www.comp.leeds.ac.uk/sc06r2s/Projects/HaskellLocalSearch"; description = "Generalised local search within Haskell, for applications in combinatorial optimisation"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "locators" = callPackage @@ -86947,6 +87057,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mida" = callPackage + ({ mkDerivation, base, containers, directory, filepath, haskeline + , HCodecs, mersenne-random-pure64, mtl, optparse-applicative + , parsec, process, QuickCheck, test-framework + , test-framework-quickcheck2, text, text-format, transformers + }: + mkDerivation { + pname = "mida"; + version = "0.4.3"; + sha256 = "0x71qih8r48kp2anvdnwfkja3sz8iigzprsqkaqi259mn58qd9ch"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + base containers directory filepath haskeline HCodecs + mersenne-random-pure64 mtl optparse-applicative parsec process text + text-format transformers + ]; + testDepends = [ + base containers HCodecs mersenne-random-pure64 mtl parsec + QuickCheck test-framework test-framework-quickcheck2 text + transformers + ]; + homepage = "https://github.com/mrkkrp/mida"; + description = "Language for algorithmic generation of MIDI files"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "midi" = callPackage ({ mkDerivation, base, binary, bytestring, event-list , explicit-exception, monoid-transformer, non-negative, QuickCheck @@ -88452,10 +88590,9 @@ self: { ({ mkDerivation, base, mmorph, mtl, transformers }: mkDerivation { pname = "monad-resumption"; - version = "0.1.1.4"; - sha256 = "0zrzxkzg6fzxiqr9k4kw6r1ivw22qwz2dhl1nd5xqr7lfsqc00zs"; + version = "0.1.1.5"; + sha256 = "08h750qbvzvlw5hyp1d44rkhiqlhgnsfy8sya2ya7p62l80w96sf"; buildDepends = [ base mmorph mtl transformers ]; - jailbreak = true; homepage = "https://github.com/igraves/resumption_monads"; description = "Resumption and reactive resumption monads for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -89065,8 +89202,8 @@ self: { }: mkDerivation { pname = "monoid-subclasses"; - version = "0.4.0.4"; - sha256 = "1wg5yx49gx8j9hxcr3mp3pq40wqpwhh4cccsg7m2fgdnangxd6rh"; + version = "0.4.1"; + sha256 = "0wgy0cqi2x12xn1sbxwfbwzj6bii2b6rhf8gi4q2jja5nh04a4vz"; buildDepends = [ base bytestring containers primes text vector ]; testDepends = [ base bytestring containers primes QuickCheck quickcheck-instances @@ -90597,8 +90734,8 @@ self: { }: mkDerivation { pname = "mvc"; - version = "1.0.5"; - sha256 = "1lrq0nkxi0ljs6pxf7p4awhrf9ix9dqwvwsydph6fw356ypc39r2"; + version = "1.1.0"; + sha256 = "115cg7xlkk0zj3qdhwm35397vbp1s28h3j0ipw2a9i9ap16d7x1i"; buildDepends = [ async base contravariant foldl managed mmorph pipes pipes-concurrency transformers @@ -90614,8 +90751,10 @@ self: { version = "1.2.0"; sha256 = "125bwc79qcmwb8dn8yqkrxlbqf3vwdzhjx66c69j2jbrp70061n6"; buildDepends = [ async base foldl mvc ]; + jailbreak = true; description = "Concurrent and combinable updates"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mvclient" = callPackage @@ -91284,6 +91423,18 @@ self: { license = stdenv.lib.licenses.gpl3; }) { inherit (pkgs) ncurses;}; + "ndjson-conduit" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit }: + mkDerivation { + pname = "ndjson-conduit"; + version = "0.1.0.2"; + sha256 = "0fxxnbccasyhxd5yykzkvrj09zci8is7yqfjw0wg11n1p00hzahj"; + buildDepends = [ aeson attoparsec base bytestring conduit ]; + homepage = "https://github.com/srijs/haskell-ndjson-conduit"; + description = "Conduit-based parsing and serialization for newline delimited JSON"; + license = stdenv.lib.licenses.mit; + }) {}; + "neat" = callPackage ({ mkDerivation, base, filepath, parsec }: mkDerivation { @@ -91528,6 +91679,23 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "nestedmap" = callPackage + ({ mkDerivation, base, base-unicode-symbols, containers + , data-ordlist, hspec, QuickCheck + }: + mkDerivation { + pname = "nestedmap"; + version = "0.1.0.3"; + sha256 = "1his95sqzyr5xb7iihz62vp9y32smf5wy4ck81yrxdvkn6zvhajl"; + buildDepends = [ base base-unicode-symbols containers ]; + testDepends = [ + base base-unicode-symbols containers data-ordlist hspec QuickCheck + ]; + jailbreak = true; + description = "A library for nested maps"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "net-concurrent" = callPackage ({ mkDerivation, base, bytestring, containers, ghc-binary, hslogger , monad-loops, network @@ -94033,6 +94201,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "old-version" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "old-version"; + version = "1.0.1"; + sha256 = "1h5kln84658036sqap9fxxj464gmw8i6dqiba52577055apl62xv"; + buildDepends = [ base ]; + jailbreak = true; + description = "Basic versioning library"; + license = "unknown"; + }) {}; + "olwrapper" = callPackage ({ mkDerivation, base, bytestring, fay, fay-jquery, fay-text, lens , mtl, snap, snap-core, snap-loader-dynamic, snap-loader-static @@ -94778,31 +94958,33 @@ self: { "opml-conduit" = callPackage ({ mkDerivation, base, case-insensitive, conduit - , conduit-combinators, containers, data-default, exceptions - , hashable, hashable-time, hlint, lens, mono-traversable - , monoid-subclasses, mtl, network-uri, QuickCheck - , quickcheck-instances, resourcet, semigroups, tasty, tasty-hunit - , tasty-quickcheck, text, time, timerep, unordered-containers - , xml-conduit, xml-types + , conduit-combinators, conduit-parse, containers, data-default + , exceptions, hashable, hashable-time, hlint, lens + , mono-traversable, monoid-subclasses, mtl, network-uri, parsers + , QuickCheck, quickcheck-instances, resourcet, semigroups, tasty + , tasty-hunit, tasty-quickcheck, text, time, timerep + , unordered-containers, xml-conduit, xml-conduit-parse, xml-types }: mkDerivation { pname = "opml-conduit"; - version = "0.2.0.1"; - sha256 = "1c787c8hq68g2zl1jji6bh2p8hm9fmpdcs898kr8n7b8xbw9jxfk"; + version = "0.3.0.0"; + sha256 = "00kknysgzv1cbrgx1sgb2qg99lr3715mhdx2wcjsi65msk67ngiz"; buildDepends = [ - base case-insensitive conduit containers data-default exceptions - hashable hashable-time lens mono-traversable monoid-subclasses - network-uri QuickCheck quickcheck-instances semigroups text time - timerep unordered-containers xml-conduit xml-types + base case-insensitive conduit conduit-parse containers data-default + exceptions hashable hashable-time lens mono-traversable + monoid-subclasses network-uri parsers QuickCheck + quickcheck-instances semigroups text time timerep + unordered-containers xml-conduit xml-conduit-parse xml-types ]; testDepends = [ - base conduit conduit-combinators containers exceptions hlint lens - mtl network-uri resourcet tasty tasty-hunit tasty-quickcheck - xml-conduit + base conduit conduit-combinators conduit-parse containers + data-default exceptions hlint lens mtl network-uri parsers + resourcet tasty tasty-hunit tasty-quickcheck xml-conduit-parse ]; homepage = "https://github.com/k0ral/opml-conduit"; description = "Streaming parser/renderer for the OPML 2.0 format."; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opn" = callPackage @@ -95720,7 +95902,9 @@ self: { mkDerivation { pname = "pandoc-csv2table"; version = "1.0.1"; + revision = "1"; sha256 = "0b4xszf9bzfhrjgy2cymryab58zhh4jwv9p8g2hiqgrxix8jr1qb"; + editedCabalFile = "0924cc418394f855f93486ee6fb3bae991112c3e63df74f95afa6c2d62b09299"; isLibrary = true; isExecutable = true; buildDepends = [ base csv pandoc pandoc-types text ]; @@ -96673,8 +96857,8 @@ self: { }: mkDerivation { pname = "paypal-adaptive-hoops"; - version = "0.11.0.0"; - sha256 = "0v72ny33mfi29vv4kzld5x01qr9k6i9vdyk9v83dy9zbfb7vkmzv"; + version = "0.11.0.1"; + sha256 = "061vzsncyl0is2d3p8sh3a1wb46g2v6vqgdh390b8d41max1wabg"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -97408,8 +97592,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.1.6"; - sha256 = "17jcj5xvxnck93dk01ac31mbh1b5pk1266x1zqap40glqs247myl"; + version = "2.2"; + sha256 = "04l5394yrnm0d5cz7nq2phmsbm5vxbggn4wp8n0i0ms0y7blfh0p"; buildDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers exceptions fast-logger lifted-base @@ -97517,8 +97701,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.1.3.1"; - sha256 = "1q1h3yrrpw9qzc7myfhwjxn5kxky5bxf918fyllpnprdagf98gd1"; + version = "2.2"; + sha256 = "09hajfvwgjkrmk1qmjfx3z6qkisv4gj0qjcmd1m8n9nb76bmdfz9"; buildDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger mysql mysql-simple persistent resourcet @@ -97559,8 +97743,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.1.6"; - sha256 = "1s3dzwxv1rzfg7f5l9qsypzvm7pk2jiqjzdfksiq0ji37f73v7l6"; + version = "2.2"; + sha256 = "0ydwc2jb8w3wma8f0v7i16pzglx0gv1ffikfvislw3c6wkangwby"; buildDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger persistent postgresql-libpq @@ -97647,8 +97831,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.1.4.2"; - sha256 = "0g0j8yhbr960lvph49x5knwvx86b7kxlihk8n0xvdqbaq04fgiqa"; + version = "2.2"; + sha256 = "1567ja3f87syw6x6x6gl6xzdl3pl8ammlrqy2500gbgr7ni0a47i"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -98014,15 +98198,14 @@ self: { }: mkDerivation { pname = "phash"; - version = "0.0.3"; - sha256 = "0w3c7i4n4f12nkg0bqvm568s2y1fdgaicxqr3ky80lygbz1h20hw"; + version = "0.0.4"; + sha256 = "1bfikigj8bxgqwqz0lxi35s8sck41kjkz2ww1s10bim867h97si0"; buildDepends = [ base ]; testDepends = [ base doctest HUnit pHash smallcheck tasty tasty-hunit tasty-smallcheck ]; extraLibraries = [ pHash ]; - jailbreak = true; homepage = "http://github.com/michaelxavier/phash"; description = "Haskell bindings to pHash, the open source perceptual hash library"; license = stdenv.lib.licenses.gpl3; @@ -100151,13 +100334,12 @@ self: { }: mkDerivation { pname = "postgresql-config"; - version = "0.0.1"; - sha256 = "1hp6ki078d4hvb910403ppvcb8q6ji79z3ccv6alkpnd494wd4wr"; + version = "0.0.2"; + sha256 = "1b7rppzarnmndmgwkcahcrcnxzigfldm50iqd81vj0zkii6w0i43"; buildDepends = [ aeson base bytestring monad-control mtl postgresql-simple resource-pool time ]; - jailbreak = true; homepage = "https://bitbucket.org/s9gf4ult/postgresql-config"; description = "Types for easy adding postgresql configuration to your program"; license = stdenv.lib.licenses.bsd3; @@ -100316,6 +100498,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "postgresql-simple-url" = callPackage + ({ mkDerivation, base, network-uri, postgresql-simple, split, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "postgresql-simple-url"; + version = "0.1.0.1"; + sha256 = "1878zcfgis931nn5pnbixzfj2sbp790rxq294cwjy6g1ab35w5ng"; + buildDepends = [ base network-uri postgresql-simple split ]; + testDepends = [ base postgresql-simple tasty tasty-quickcheck ]; + homepage = "https://github.com/futurice/postgresql-simple-url"; + description = "PostgreSQL"; + license = stdenv.lib.licenses.mit; + }) {}; + "postgresql-typed" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring , containers, cryptohash, haskell-src-meta, network, old-locale @@ -101261,8 +101458,8 @@ self: { }: mkDerivation { pname = "process-extras"; - version = "0.3.3.4"; - sha256 = "1cnq7lzrwckyhd829ir8h1rbh404yw0m40lka7sl23i7mak51mbp"; + version = "0.3.3.5"; + sha256 = "18fyv47xhvw5881is2hk9a1x35fr21jvw36irlc5cxc3vfmnym6s"; buildDepends = [ base bytestring deepseq ListLike process text ]; homepage = "https://github.com/seereason/process-extras"; description = "Process extras"; @@ -101775,8 +101972,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "2.4.0"; - sha256 = "1l2zhj12jwsavljx0r6qmz44w7k5bwckwg2wcz38qd6km4wy3ppw"; + version = "2.5.0"; + sha256 = "120pamm3rg2iahbl23y90wbcwdhgjvvsfzlkhi61c97xfybvb08c"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -101998,8 +102195,8 @@ self: { }: mkDerivation { pname = "proton-haskell"; - version = "0.6"; - sha256 = "0g73lspx5rk8d6axn229im7r8ch5d7afn8fb51haazaqmcw906qg"; + version = "0.7"; + sha256 = "1gn4h8xprq8gkngccyqbbqn8nidwlczlwckxzjgnb190yy3kd7hi"; buildDepends = [ base containers directory filepath ]; testDepends = [ base containers directory filepath HUnit test-framework @@ -103640,6 +103837,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "raml" = callPackage + ({ mkDerivation, aeson, base, bytestring, text + , unordered-containers, yaml + }: + mkDerivation { + pname = "raml"; + version = "0.1.0"; + sha256 = "02c1rki7azfwfiawi29z5gp1zwfdx46rw17bifpklw7zya525pr9"; + buildDepends = [ + aeson base bytestring text unordered-containers yaml + ]; + homepage = "https://github.com/fnoble/raml"; + description = "RESTful API Modeling Language (RAML) library for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "rand-vars" = callPackage ({ mkDerivation, array, base, IntervalMap, mtl, random }: mkDerivation { @@ -103998,8 +104211,8 @@ self: { }: mkDerivation { pname = "rasterific-svg"; - version = "0.2.3"; - sha256 = "1gr050dlvq8pfp77g21ywc6cknbgmkw8bcc4d8klw8jpf0ppar45"; + version = "0.2.3.1"; + sha256 = "00p3l8czj7l9jm6ibn9c6wb99v5j5x9ivgh3pamznqcri3lqy7kk"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -104831,20 +105044,18 @@ self: { }) {}; "reducers" = callPackage - ({ mkDerivation, array, base, bytestring, comonad, containers - , fingertree, hashable, keys, pointed, semigroupoids, semigroups - , text, transformers, unordered-containers + ({ mkDerivation, array, base, bytestring, containers, fingertree + , hashable, semigroupoids, semigroups, text, transformers + , unordered-containers }: mkDerivation { pname = "reducers"; - version = "3.10.3.1"; - sha256 = "0qmd93jdh0qjyc9if9hr2yjanrqx5nlbz5j0daiywzxcb0hi7ri8"; + version = "3.10.3.2"; + sha256 = "1zfryrmz5ajahs4d6dj3fzzkqbgdzqz358jvj4rhqiwa61ylhb42"; buildDepends = [ - array base bytestring comonad containers fingertree hashable keys - pointed semigroupoids semigroups text transformers - unordered-containers + array base bytestring containers fingertree hashable semigroupoids + semigroups text transformers unordered-containers ]; - jailbreak = true; homepage = "http://github.com/ekmett/reducers/"; description = "Semigroups, specialized containers and a general map/reduce framework"; license = stdenv.lib.licenses.bsd3; @@ -105815,8 +106026,8 @@ self: { }: mkDerivation { pname = "relational-query"; - version = "0.5.0.0"; - sha256 = "00q0z4bnic5phhm7xxv059380q23d0fhd8vh32aggjlggzlq01sx"; + version = "0.5.0.1"; + sha256 = "1yhcdc0m839pdwhb2vv25wz1vbhk5ynfkb9d6xgkjymsjvqlp78n"; buildDepends = [ array base bytestring containers dlist names-th persistable-record sql-words template-haskell text time time-locale-compat @@ -106939,8 +107150,8 @@ self: { }: mkDerivation { pname = "rethinkdb"; - version = "1.16.0.0"; - sha256 = "125gg719isf60yv5yj0frkg92bp42cb43d4qzs7jqic1wvhx32yy"; + version = "2.0.0.0"; + sha256 = "09digdn4a9vsmanpj6d2wn6kh59r05cfwjk4xq22iszzjrxami6d"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -106949,9 +107160,8 @@ self: { unordered-containers utf8-string vector ]; testDepends = [ base doctest ]; - jailbreak = true; homepage = "http://github.com/atnnn/haskell-rethinkdb"; - description = "A driver for RethinkDB 1.16"; + description = "A driver for RethinkDB 2.0"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -109323,8 +109533,8 @@ self: { }: mkDerivation { pname = "schedule-planner"; - version = "1.0.0.0"; - sha256 = "0cbx6k3spsdsk8bjwyzyjw9iqdpc7z2vkds51iaxxn3wiwjkxwpq"; + version = "1.0.0.1"; + sha256 = "0p2k67g281f08njhann4yv0vhfbjh4m6rr2x58smxhwqxgpjg399"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -110910,8 +111120,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.4.1"; - sha256 = "0rbbijy1y40msy0ficssfg0krylrma55z500anymjkmpyp3ymnls"; + version = "0.4.2"; + sha256 = "0zna0x70jlxa2nis4v6knqlyxxkyvv2lmwyixp31xhdcp1yl2lqh"; buildDepends = [ aeson attoparsec base bytestring bytestring-conversion case-insensitive http-media http-types network-uri @@ -110922,7 +111132,6 @@ self: { filepath hspec parsec QuickCheck quickcheck-instances string-conversions text url ]; - jailbreak = true; homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; @@ -110932,8 +111141,8 @@ self: { ({ mkDerivation, base, blaze-html, http-media, servant }: mkDerivation { pname = "servant-blaze"; - version = "0.4.1"; - sha256 = "0an5lb3p61i8iahs5rgfy97s3ivqa3q0034iz8zxa4rvhy7k56hp"; + version = "0.4.2"; + sha256 = "0jank0v3cp6cbr571q4pqdfxfbfzm5v8r6rq8csz9yfkhg6x97bg"; buildDepends = [ base blaze-html http-media servant ]; homepage = "http://haskell-servant.github.io/"; description = "Blaze-html support for servant"; @@ -110949,8 +111158,8 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.4.1"; - sha256 = "1h0w9dkngrz9pimz66bc2ij9ik316x0sliyyqf16mmkpn66wcl6r"; + version = "0.4.2"; + sha256 = "0rcjqvx76mih4pfhxgrm30czznz68agdhflanqsslv2g33vzls55"; buildDepends = [ aeson attoparsec base bytestring either exceptions http-client http-client-tls http-media http-types network-uri safe servant @@ -110973,8 +111182,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.4.1"; - sha256 = "0xhj75nbsnlbzp3sf6qkfwh0x6a64lfzzq9m07wfg02nqzn22y92"; + version = "0.4.2"; + sha256 = "1s70zrs8hiphz94vkcm9gim1xs4dj943a73d2jypyijd4p0k5q5j"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -111009,6 +111218,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-examples" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, either + , http-types, js-jquery, lucid, random, servant, servant-client + , servant-docs, servant-jquery, servant-lucid, servant-server, text + , time, transformers, wai, wai-extra, warp + }: + mkDerivation { + pname = "servant-examples"; + version = "0.4.2"; + sha256 = "1nmgzkn0nv3p0bzr5ny0yx0g45fzf5qx7s868jp1nq7wbfd3yc0i"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + aeson base bytestring directory either http-types js-jquery lucid + random servant servant-client servant-docs servant-jquery + servant-lucid servant-server text time transformers wai wai-extra + warp + ]; + homepage = "http://haskell-servant.github.io/"; + description = "Example programs for servant"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-jquery" = callPackage ({ mkDerivation, aeson, base, charset, filepath, hspec , hspec-expectations, language-ecmascript, lens, servant @@ -111016,8 +111248,8 @@ self: { }: mkDerivation { pname = "servant-jquery"; - version = "0.4.1"; - sha256 = "10w4fll46355w21l2jq3kd9lfsncdajc8s40j181s29kw6bq6r6n"; + version = "0.4.2"; + sha256 = "14ixqnxwm24gc457y0z7rw6z31w2s29sg913vvax641nazfr6yfm"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -111036,8 +111268,8 @@ self: { ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { pname = "servant-lucid"; - version = "0.4.1"; - sha256 = "02bggqwmpqznfnprfyfq6ia04byi23zgwvzigymaw1bykfi7z6h0"; + version = "0.4.2"; + sha256 = "1aapj4fwjijg9k56x5n9andfwfkffcv37rfvsbpdxhkvwzvmmdpq"; buildDepends = [ base http-media lucid servant ]; homepage = "http://haskell-servant.github.io/"; description = "Servant support for lucid"; @@ -111133,8 +111365,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.4.1"; - sha256 = "0bc82pn82ymv5wy1plmcgxb0ljkqj48rn9x8gdjdki06yvph63ga"; + version = "0.4.2"; + sha256 = "054xfkl6pxc39ahhch8i9s1aj2p3sd10ah9cknknbkjcyhynjzk4"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -111148,7 +111380,6 @@ self: { network parsec QuickCheck servant string-conversions temporary text transformers wai wai-extra warp ]; - jailbreak = true; homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; @@ -111184,8 +111415,8 @@ self: { }: mkDerivation { pname = "ses-html"; - version = "0.2.1.2"; - sha256 = "0ndw2w8b8zkwsa3qgwr27k2qvv9zrcd6zb1ygf54wzw79v2zpg5f"; + version = "0.3.0.0"; + sha256 = "1clf24kyyp9b8r22bacp44q0gf83zr6k1b33dz4bfy935wbnlshy"; buildDepends = [ base base64-bytestring blaze-html byteable bytestring cryptohash HsOpenSSL http-streams tagsoup time @@ -113081,8 +113312,8 @@ self: { }: mkDerivation { pname = "singletons"; - version = "1.1.2"; - sha256 = "102pxml8k1f94q8vmbsjhv6sjxa316xblfcl8czagcxkpz0sil4d"; + version = "1.1.2.1"; + sha256 = "1lxbajfwq65bkl73cr3zqzcqy67vqbq9sf8w9ckrik4713sx0mhb"; buildDepends = [ base containers mtl template-haskell th-desugar ]; testDepends = [ base Cabal constraints filepath process tasty tasty-golden @@ -114246,17 +114477,18 @@ self: { "snaplet-auth-acid" = callPackage ({ mkDerivation, acid-state, aeson, attoparsec, base, cereal , clientsession, directory, errors, filepath, hashable, lens - , MonadCatchIO-transformers, mtl, safecopy, snap, snap-core, text - , time, unordered-containers, vector + , MonadCatchIO-transformers, mtl, safecopy, scientific, snap + , snap-core, text, time, unordered-containers, vector }: mkDerivation { pname = "snaplet-auth-acid"; - version = "0.0.1"; - sha256 = "1f6p8iqb5cq2yz6c6zdd71p6cfkvnhqkczqiyb7080xira9w5ia3"; + version = "0.1.0"; + sha256 = "0i0py2rj2vkivl97fxnv87bpbsbms2ncdqbq4zs0777nbr717swm"; buildDepends = [ acid-state aeson attoparsec base cereal clientsession directory errors filepath hashable lens MonadCatchIO-transformers mtl - safecopy snap snap-core text time unordered-containers vector + safecopy scientific snap snap-core text time unordered-containers + vector ]; jailbreak = true; description = "Provides an Acid-State backend for the Auth Snaplet"; @@ -114782,18 +115014,17 @@ self: { }) {}; "snaplet-ses-html" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, configurator - , ses-html, snap, text, transformers + ({ mkDerivation, adjunctions, base, blaze-html, bytestring + , configurator, lens, ses-html, snap, text, transformers }: mkDerivation { pname = "snaplet-ses-html"; - version = "0.1.0.0"; - sha256 = "14q577mnyf9r113v4sbfcpqlfd47wcdnbwvz70w5bqp996627jyl"; + version = "0.1.1.0"; + sha256 = "1s5pyhwdnpw1ijy67h4kw052jz4pp73bpjcqii31passybvfd7k6"; buildDepends = [ - base blaze-html bytestring configurator ses-html snap text - transformers + adjunctions base blaze-html bytestring configurator lens ses-html + snap text transformers ]; - jailbreak = true; description = "Snaplet for the ses-html package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -115202,13 +115433,14 @@ self: { ({ mkDerivation, async, base, bytestring }: mkDerivation { pname = "socket"; - version = "0.2.0.0"; - sha256 = "0z9hcbvsalmn7zmmks18v8pq3gnvf868kw44a9s6kp5h6npp05dw"; + version = "0.3.0.1"; + sha256 = "01fz3lng41i9q4r2wh6nsyx27yc7jbhglzb10lg06d2ll7gxakx0"; buildDepends = [ base bytestring ]; testDepends = [ async base bytestring ]; homepage = "https://github.com/lpeterse/haskell-socket"; - description = "A binding to the POSIX sockets interface"; + description = "A portable and extensible sockets library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "socket-activation" = callPackage @@ -115754,6 +115986,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "spdx" = callPackage + ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }: + mkDerivation { + pname = "spdx"; + version = "0.0.1.0"; + sha256 = "0k4lpny0fl6yz92m3040dmsqjcyb5gslf0306hlsqbsbn1gzjjmm"; + buildDepends = [ base transformers ]; + testDepends = [ base tasty tasty-quickcheck ]; + homepage = "https://github.com/phadej/spdx"; + description = "SPDX license expression language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "spe" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -116774,16 +117019,50 @@ self: { }) {}; "stack" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring + , bifunctors, binary, bytestring, Cabal, conduit, conduit-extra + , containers, cpphs, cryptohash, cryptohash-conduit, deepseq + , directory, either, enclosed-exceptions, exceptions, fast-logger + , filepath, hashable, hspec, http-client, http-client-tls + , http-conduit, http-types, lifted-base, monad-control + , monad-logger, monad-loops, mtl, old-locale, optparse-applicative + , optparse-simple, path, persistent, persistent-sqlite + , persistent-template, pretty, process, resourcet, safe, split, stm + , streaming-commons, tar, template-haskell, temporary, text, time + , transformers, transformers-base, unix, unordered-containers + , vector, vector-binary-instances, void, yaml, zlib + }: mkDerivation { pname = "stack"; - version = "0.0.0"; - sha256 = "0829d2yb32gfnn22idhwzpyc2gy3d7lyj19kh20fbq73fp7k9kmb"; - isLibrary = false; + version = "0.0.1"; + sha256 = "04bb0wih2nzqrq8si48w1p6zc4b7nzrgrg4cbnly63hgx64vyhq3"; + isLibrary = true; isExecutable = true; - buildDepends = [ base ]; + buildDepends = [ + aeson async attoparsec base base64-bytestring bifunctors binary + bytestring Cabal conduit conduit-extra containers cryptohash + cryptohash-conduit deepseq directory either enclosed-exceptions + exceptions fast-logger filepath hashable http-client + http-client-tls http-conduit http-types lifted-base monad-control + monad-logger monad-loops mtl old-locale optparse-applicative + optparse-simple path persistent persistent-sqlite + persistent-template pretty process resourcet safe split stm + streaming-commons tar template-haskell temporary text time + transformers transformers-base unix unordered-containers vector + vector-binary-instances void yaml zlib + ]; + testDepends = [ + base Cabal conduit conduit-extra containers cryptohash directory + exceptions filepath hspec http-conduit monad-logger path resourcet + temporary transformers + ]; + buildTools = [ cpphs ]; + homepage = "https://github.com/commercialhaskell/stack +test/package-dump/ghc-7.8.txt +test/package-dump/ghc-7.10.txt"; description = "The Haskell Tool Stack"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack-prism" = callPackage @@ -118584,14 +118863,13 @@ self: { }: mkDerivation { pname = "strive"; - version = "1.0.1"; - sha256 = "0c9zwgsy1s64c2kl1agirm8616rjpp2z9r73ch0ixrf200l6rw0d"; + version = "2.1.0"; + sha256 = "08jirx24wnfpknlgkcz605sn9nwb0g5hv75vgrms5gbq65gkg9s2"; buildDepends = [ aeson base bytestring data-default gpolyline http-conduit http-types template-haskell text time transformers ]; testDepends = [ base bytestring hlint markdown-unlit time ]; - jailbreak = true; homepage = "http://taylor.fausak.me/strive/"; description = "A Haskell client for the Strava V3 API"; license = stdenv.lib.licenses.mit; @@ -123021,14 +123299,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "th-orphans_0_12_0" = callPackage + "th-orphans_0_12_1" = callPackage ({ mkDerivation, base, hspec, mtl, nats, template-haskell, th-lift , th-reify-many }: mkDerivation { pname = "th-orphans"; - version = "0.12.0"; - sha256 = "0dgbk8w81k8d5a9y4nq7h2rz6rvz3vhc0bs0vff7c0iiaglgajvp"; + version = "0.12.1"; + sha256 = "11vndilqcx9scbb988xzpaj823g65a7b7vx6jzf9r3nb808kyb2j"; buildDepends = [ base mtl nats template-haskell th-lift th-reify-many ]; @@ -123610,8 +123888,8 @@ self: { }: mkDerivation { pname = "tidal"; - version = "0.4.32"; - sha256 = "1vb3ziin58gxf8jpjgv1c04bqa0vhkmib4h3v2s1k66gdkj1sxk2"; + version = "0.4.33"; + sha256 = "0xx02wbclq6hh50gz6vj3wmq7d5y7l4d6h48yxg3nwv4kwf44gf6"; buildDepends = [ base binary bytestring colour containers hashable hmt hosc mersenne-random-pure64 mtl parsec process text time transformers @@ -124121,6 +124399,7 @@ self: { ]; description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timers" = callPackage @@ -125738,14 +126017,13 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.1.0"; - sha256 = "0qpw366hyvprgcmxr83in2ay07f7br7bff2zqw9pnm7lkmkxrlkw"; + version = "1.1.1"; + sha256 = "1dgzzsylbri2p8wyf1xfww8la9vccb7yac0b0g2lf0b1ix4gphym"; buildDepends = [ async base clock directory foldl managed process system-fileio system-filepath temporary text time transformers unix ]; testDepends = [ base doctest ]; - jailbreak = true; description = "Shell programming, Haskell-style"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -127431,8 +127709,8 @@ self: { }: mkDerivation { pname = "uni-uDrawGraph"; - version = "2.2.0.3"; - sha256 = "0sh504l3xi9xlmwb28wzsana6c9ahmbdhx05s55w2ffwzbz0ca8a"; + version = "2.2.1.3"; + sha256 = "1gblb969s9al67srxf7rd9dajy6hji91aw5zaxxhaj0vgqsdb90j"; buildDepends = [ base containers uni-events uni-graphs uni-posixutil uni-reactor uni-util @@ -128328,14 +128606,13 @@ self: { }: mkDerivation { pname = "uri-bytestring"; - version = "0.1.2"; - sha256 = "1rd166dsc5cl6bwvd43z08d6j6djnmskg1ddnv1js0z4xxpbs2qf"; + version = "0.1.4"; + sha256 = "19ryx71hyv1jg24yn19nfn6x1956a3a8bjhbdl4fnjnln3h7xkmv"; buildDepends = [ attoparsec base blaze-builder bytestring ]; testDepends = [ - attoparsec base bytestring derive HUnit lens QuickCheck - quickcheck-instances tasty tasty-hunit tasty-quickcheck + attoparsec base blaze-builder bytestring derive HUnit lens + QuickCheck quickcheck-instances tasty tasty-hunit tasty-quickcheck ]; - jailbreak = true; homepage = "https://github.com/Soostone/uri-bytestring"; description = "Haskell URI parsing as ByteStrings"; license = stdenv.lib.licenses.bsd3; @@ -129511,8 +129788,8 @@ self: { }: mkDerivation { pname = "vcache"; - version = "0.2.5"; - sha256 = "0jinysgn4rzh0b4a97wjac6md74vafb7avzprr6yddksmkylkayl"; + version = "0.2.6"; + sha256 = "08vg106dhzam5h0a6pzz4cbyzfg6pfgcgvn6xm1266kj1ipla18d"; buildDepends = [ base bytestring containers direct-murmur-hash easy-file filelock lmdb random stm transformers @@ -130678,20 +130955,26 @@ self: { "wai-cors" = callPackage ({ mkDerivation, attoparsec, base, base-unicode-symbols, bytestring - , case-insensitive, charset, http-types, mtl, parsers, transformers - , wai + , case-insensitive, charset, directory, filepath, http-types, mtl + , network, parsers, process, text, transformers, wai + , wai-websockets, warp, websockets }: mkDerivation { pname = "wai-cors"; - version = "0.2.2"; - sha256 = "174ld61b2hl890m591qfwclnb1jdssi9minksvhp34dmawnfwgvc"; + version = "0.2.3"; + sha256 = "1mnybcf50d0ijbg2a40kf4sl55rb1m4p02nqqid4g7vcanmfjw92"; buildDepends = [ attoparsec base base-unicode-symbols bytestring case-insensitive charset http-types mtl parsers transformers wai ]; - homepage = "https://github.com/alephcloud/wai-cors"; + testDepends = [ + base base-unicode-symbols directory filepath http-types network + process text wai wai-websockets warp websockets + ]; + homepage = "https://github.com/larskuhtz/wai-cors"; description = "CORS for WAI"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-digestive-functors" = callPackage @@ -130972,8 +131255,8 @@ self: { }: mkDerivation { pname = "wai-logger"; - version = "2.2.4"; - sha256 = "0l7jd3fczn1hp5d7bbhkk0qflw320sr2yw9gb10jvsv42rs1kdbv"; + version = "2.2.4.1"; + sha256 = "1s6svvy3ci4j1dj1jaw8hg628miwj8f5gpy9n8d8hpsaxav6nzgk"; buildDepends = [ auto-update base blaze-builder byteorder bytestring case-insensitive easy-file fast-logger http-types network unix @@ -131130,6 +131413,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wai-middleware-gunzip" = callPackage + ({ mkDerivation, base, bytestring, http-types, streaming-commons + , wai + }: + mkDerivation { + pname = "wai-middleware-gunzip"; + version = "0.0.2"; + sha256 = "0rbvpw4y4qr2mhijlybzwwd12mkhrwmxlrhj2q0mq9diwhp597dx"; + buildDepends = [ + base bytestring http-types streaming-commons wai + ]; + homepage = "https://github.com/twittner/wai-middleware-gunzip"; + description = "WAI middleware to unzip request bodies"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "wai-middleware-headers" = callPackage ({ mkDerivation, base, bytestring, http-types, wai }: mkDerivation { @@ -131383,8 +131682,8 @@ self: { }: mkDerivation { pname = "wai-routes"; - version = "0.6.1"; - sha256 = "15j37h3a56fsgmznmw8b1ksp0pkrrqz3kyrwj69hba2bnjcq5n7q"; + version = "0.7.0"; + sha256 = "1adiijvnwgm7j3qdr5ngxcc59amzcphgww3drj308hq278fpac08"; buildDepends = [ aeson base blaze-builder bytestring containers http-types mtl path-pieces random template-haskell text wai @@ -131694,8 +131993,8 @@ self: { }: mkDerivation { pname = "warp-tls"; - version = "3.0.4"; - sha256 = "03k8iynz586cdjjh4nyrlbs8c864d305swrf4xkf55r9l3klsbg4"; + version = "3.0.4.1"; + sha256 = "0p9472j9sa584gw8i1jg89rhbl0kv6r1d6naiqfmmirxii4pmp4y"; buildDepends = [ base bytestring cprng-aes data-default-class network streaming-commons tls wai warp @@ -132152,8 +132451,8 @@ self: { }: mkDerivation { pname = "webcrank"; - version = "0.2.1"; - sha256 = "0px4dy4crivkga0h2ca9j6fxlzwyl8qm8xzd2xyllqm2gzvcc3l7"; + version = "0.2.2"; + sha256 = "1rgvpp2526lmly2fli65mygplfc6wzqcw5fkn7gq4fcrmql2cisj"; buildDepends = [ attoparsec base blaze-builder bytestring case-insensitive either exceptions http-date http-media http-types lens mtl semigroups text @@ -132193,8 +132492,8 @@ self: { }: mkDerivation { pname = "webcrank-wai"; - version = "0.2"; - sha256 = "02d6hsgx70mcghz1xrszf1jnl62alki3ch7wacp35s8jz79xrccw"; + version = "0.2.1"; + sha256 = "13db2hpyvzpx9i43d8pryq7f87zlajpfpf0h6biva28l9qamy1yv"; buildDepends = [ base bytestring exceptions lens mtl unix-compat unordered-containers wai wai-lens webcrank webcrank-dispatch @@ -132905,13 +133204,12 @@ self: { }: mkDerivation { pname = "wl-pprint-extras"; - version = "3.5.0.4"; - sha256 = "0mvg5vff574xvrdbdwnyy71kxv0cp0q5vv8fb12fbgydnvsy3mbl"; + version = "3.5.0.5"; + sha256 = "13wdx7l236yyv9wqsgcjlbrm5gk1bmw1z2lk4b21y699ly2imhm9"; buildDepends = [ base containers nats semigroupoids semigroups text utf8-string ]; testDepends = [ base HUnit test-framework test-framework-hunit ]; - jailbreak = true; homepage = "http://github.com/ekmett/wl-pprint-extras/"; description = "A free monad based on the Wadler/Leijen pretty printer"; license = stdenv.lib.licenses.bsd3; @@ -133439,11 +133737,10 @@ self: { }: mkDerivation { pname = "wuss"; - version = "1.0.0"; - sha256 = "1nv8mkfbgfnlmni0rzlzq7ir27ya3lnhkksfbkywjkbwz2k3yykc"; + version = "1.0.2"; + sha256 = "0i4ln8pvjv1cgqcwid111azrls00g1jdhls3wrhnkw8wjcbiiqps"; buildDepends = [ base bytestring connection network websockets ]; testDepends = [ base doctest ]; - jailbreak = true; homepage = "http://taylor.fausak.me/wuss/"; description = "Secure WebSocket (WSS) clients"; license = stdenv.lib.licenses.mit; @@ -134291,8 +134588,8 @@ self: { }: mkDerivation { pname = "xml-conduit-parse"; - version = "0.1.0.0"; - sha256 = "1vf8yxnfw3mr7sphj69y2yds6k5bj9cycflk6dzbx367j1cihc0v"; + version = "0.2.0.1"; + sha256 = "04cs7bfdyia56vp9khdszxap1ri2riymmhsdb8shkcypf4ndhyyw"; buildDepends = [ base conduit conduit-parse containers exceptions parsers text xml-conduit xml-types @@ -134304,6 +134601,7 @@ self: { homepage = "https://github.com/k0ral/xml-conduit-parse"; description = "Streaming XML parser based on conduits"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-conduit-writer" = callPackage @@ -135456,6 +135754,7 @@ self: { testDepends = [ base doctest ]; description = "Lens interface to yaml-light"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yaml-rpc" = callPackage @@ -135827,6 +136126,7 @@ self: { resourcet safe shakespeare template-haskell text time transformers unordered-containers wai yesod-core yesod-form yesod-persistent ]; + jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "Authentication for Yesod"; license = stdenv.lib.licenses.mit; @@ -135850,6 +136150,7 @@ self: { base bytestring hspec monad-logger mtl persistent-sqlite resourcet text xml-conduit yesod yesod-auth yesod-test ]; + jailbreak = true; homepage = "https://bitbucket.org/wuzzeb/yesod-auth-account"; description = "An account authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; @@ -135875,6 +136176,7 @@ self: { base bytestring hspec monad-logger mtl persistent-sqlite resourcet text xml-conduit yesod yesod-auth yesod-auth-account yesod-test ]; + jailbreak = true; homepage = "https://github.com/meteficha/yesod-auth-account-fork"; description = "An account authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; @@ -135963,8 +136265,8 @@ self: { }: mkDerivation { pname = "yesod-auth-hashdb"; - version = "1.4.2.1"; - sha256 = "1gc8049xvzrkqb91fpdrzr54byxag6rkqvb8650q4scpr09vzdpl"; + version = "1.4.2.2"; + sha256 = "0s2qmpn4iwzdpps7yqcwb63cp8v1za9fp4amg0qc6b0pllzr616r"; buildDepends = [ base bytestring cryptohash persistent pwstore-fast text yesod-auth yesod-core yesod-form yesod-persistent @@ -136194,8 +136496,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.10"; - sha256 = "0wkicd71r87rnfiyx3264a1836mv8asnq2rvmp23qkjdp453ac7w"; + version = "1.4.11"; + sha256 = "1lfbpfv43vjxx8r1yf8py64sai14abwwq7395gs45vk059zi5hfs"; buildDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup bytestring case-insensitive cereal clientsession conduit @@ -136237,6 +136539,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yesod-crud-persist" = callPackage + ({ mkDerivation, base, lens, persistent, text, transformers, wai + , yesod-core, yesod-form, yesod-persistent + }: + mkDerivation { + pname = "yesod-crud-persist"; + version = "0.1.0.0"; + sha256 = "0kzigyggzxv4ps8a15bhk8ngxn15inp630x0v3kn0j1xdmj7inpw"; + buildDepends = [ + base lens persistent text transformers wai yesod-core yesod-form + yesod-persistent + ]; + homepage = "google.com"; + description = "Flexible CRUD subsite usable with Yesod and Persistent"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-datatables" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, data-default , HUnit, monad-control, persistent, persistent-sqlite @@ -136498,15 +136818,15 @@ self: { , containers, country-codes, data-default, directory, fast-logger , hamlet, hjsmin, http-conduit, http-types, lifted-base, mangopay , monad-control, monad-logger, persistent, persistent-postgresql - , persistent-template, resourcet, shakespeare, shakespeare-css - , shakespeare-js, shakespeare-text, template-haskell, text, time - , wai, wai-extra, wai-logger, warp, yaml, yesod, yesod-auth - , yesod-core, yesod-form, yesod-persistent, yesod-static + , persistent-template, resourcet, shakespeare, template-haskell + , text, time, wai, wai-extra, wai-logger, warp, yaml, yesod + , yesod-auth, yesod-core, yesod-form, yesod-persistent + , yesod-static }: mkDerivation { pname = "yesod-mangopay"; - version = "1.11"; - sha256 = "1j6dibg7l0g3hykwvhxm9n898gg06mrgyg89yjbv31pm4mfvycsn"; + version = "1.11.1"; + sha256 = "0haz7zd9s9c12fcz11wkhw50hni08g2an1f65bd6cj871zzz3mnl"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -136514,8 +136834,7 @@ self: { country-codes data-default directory fast-logger hamlet hjsmin http-conduit http-types lifted-base mangopay monad-control monad-logger persistent persistent-postgresql persistent-template - resourcet shakespeare shakespeare-css shakespeare-js - shakespeare-text template-haskell text time wai wai-extra + resourcet shakespeare template-haskell text time wai wai-extra wai-logger warp yaml yesod yesod-auth yesod-core yesod-form yesod-persistent yesod-static ]; @@ -136630,6 +136949,7 @@ self: { base blaze-builder conduit hspec persistent persistent-sqlite text wai-extra yesod-core ]; + jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "Some helpers for using Persistent from Yesod"; license = stdenv.lib.licenses.mit; @@ -136984,6 +137304,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yesod-table" = callPackage + ({ mkDerivation, base, containers, contravariant, text, yesod-core + }: + mkDerivation { + pname = "yesod-table"; + version = "0.1.1"; + sha256 = "0glbdm19bf0pxp0y2831yi0yxjwc3b9xfhsdimxyc5ppm2dqdxsj"; + buildDepends = [ base containers contravariant text yesod-core ]; + jailbreak = true; + homepage = "https://github.com/andrewthad/yesod-table"; + description = "HTML tables for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-tableview" = callPackage ({ mkDerivation, base, hamlet, persistent, yesod }: mkDerivation { @@ -137200,6 +137535,7 @@ self: { homepage = "https://github.com/alephcloud/hs-yet-another-logger"; description = "Yet Another Logger"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yhccore" = callPackage @@ -138014,10 +138350,11 @@ self: { mkDerivation { pname = "zippers"; version = "0.2"; + revision = "1"; sha256 = "1rlf01dc6dcy9sx89npsisdz1yg9v4h2byd6ms602bxnmjllm1ls"; + editedCabalFile = "3e27022f7ed27e35e73ed36f3aa6b396c7e7b52e864965b8d3cd4dab8394e960"; buildDepends = [ base lens profunctors semigroupoids ]; testDepends = [ base directory doctest filepath ]; - jailbreak = true; homepage = "http://github.com/ekmett/zippers/"; description = "Traversal based zippers"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index e601c7665ac..9b47b047bf6 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -77,4 +77,6 @@ rec { buildStrictly = pkg: buildFromSdist (appendConfigureFlag pkg "--ghc-option=-Wall --ghc-option=-Werror"); + triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; }); + } diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index 1ba31a7a6d5..f56bf77abfe 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, boost }: +{ stdenv, fetchurl, cmake, boost, makePIC ? false }: stdenv.mkDerivation { name = "libyaml-cpp-0.5.1"; @@ -10,6 +10,8 @@ stdenv.mkDerivation { buildInputs = [ cmake boost ]; + cmakeFlags = stdenv.lib.optionals makePIC [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ]; + meta = with stdenv.lib; { homepage = http://code.google.com/p/yaml-cpp/; description = "A YAML parser and emitter for C++"; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 389e2385f98..7cfbc8dfb87 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "0.9.2"; + version = "0.9.6"; src = fetchurl { url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; - sha256 = "0vk1i2yrny6dbip4aha25ibgv4m2rdhpxmz6a74q9wz1cgzbb766"; + sha256 = "0s8ypg0q50zfcmq527y8cbdvzxhiqidm1923k28ar8jqmjp45ssh"; }; buildInputs = [ diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix index fce2c7f1b7b..c7e3a5c6123 100644 --- a/pkgs/development/libraries/qt-5/5.4/default.nix +++ b/pkgs/development/libraries/qt-5/5.4/default.nix @@ -30,7 +30,7 @@ let importManifest ./manifest.nix { mirror = "http://download.qt.io"; }; srcs = mapAttrs (name: manifest: manifest.src) manifest; - version = "5.4.1"; + version = "5.4.2"; callPackage = newScope (self // { inherit qtSubmodule; }); diff --git a/pkgs/development/libraries/qt-5/5.4/manifest.nix b/pkgs/development/libraries/qt-5/5.4/manifest.nix index 4647c0eef88..5fdda35f76a 100644 --- a/pkgs/development/libraries/qt-5/5.4/manifest.nix +++ b/pkgs/development/libraries/qt-5/5.4/manifest.nix @@ -2,273 +2,273 @@ { stdenv, fetchurl, mirror }: [ { - name = stdenv.lib.nameFromURL "qtwayland-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/32jn5sn8im7andkd6m15s95n48ald7pw-qtwayland-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtbase-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/60xy2xnsl5kwraqkgh8d950nj1pk3kmi-qtbase-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwayland-opensource-src-5.4.1.tar.xz"; - sha256 = "14npf3lclkb83s8ywla67a1129ia1mbib145s1sk5gqw1dh5wfv5"; - name = "qtwayland-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz"; + sha256 = "0x2szpjjvsrpcqw0dd3gsim7b1jv9p716pnllzjbia5mp0hggi4z"; + name = "qtbase-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtandroidextras-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/604ifwwrzpm96rffszyl11xjirm0w65j-qtandroidextras-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtenginio-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/4iprnq6sm0b1pnxmxb5krip7kk40xqmr-qtenginio-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtandroidextras-opensource-src-5.4.1.tar.xz"; - sha256 = "0s12hmn2lnlbp7y47v344lyli6wh670dwazl3kkzv9vdv52df4wp"; - name = "qtandroidextras-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtenginio-opensource-src-5.4.2.tar.xz"; + sha256 = "082i3fapjw6xs0jkz7x529dn3pb6w1pfli3cjrgvggff86gwlgwn"; + name = "qtenginio-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtgraphicaleffects-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/wcwaylvnlrfy6d6pc0ka7mkcam846cqb-qtgraphicaleffects-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtserialport-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/l9k1v23ddnhjch5b2p3l28xbqkhz63yl-qtserialport-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtgraphicaleffects-opensource-src-5.4.1.tar.xz"; - sha256 = "071mz2w25g5svknb97y6yw55sq9171qqd92n3dp4w2qg2blg1qms"; - name = "qtgraphicaleffects-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtserialport-opensource-src-5.4.2.tar.xz"; + sha256 = "1h6p5rb0ldxgzd4md3n79gy0j9blhj736670xqjd9vlvh1743kck"; + name = "qtserialport-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtenginio-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/k7gayy35qqwbaf2yyr1lfydmsp6p9k3i-qtenginio-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtscript-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/n4ixnakw3fiflyimshkp43h7ijlpiif6-qtscript-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtenginio-opensource-src-5.4.1.tar.xz"; - sha256 = "0yjpx43qy6yc6hblcrkp6g9jv2ipg2hdd27q86y7s30q54f17nxf"; - name = "qtenginio-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtscript-opensource-src-5.4.2.tar.xz"; + sha256 = "0izsmy0cr8iii78r10ndkidyljxqd2k9g03f5xb9nxacvr2f8hp0"; + name = "qtscript-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtwebengine-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/0y1p0ssxbd8wp4vyq5ad2f77inh07p1b-qtwebengine-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtwebchannel-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/qbkqkn4ck0fqbndl9fzp7iaz6c475xq8-qtwebchannel-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebengine-opensource-src-5.4.1.tar.xz"; - sha256 = "1c5akxh6wxgc72md6802fbvd601n03assv6i542siwmmnp5anhij"; - name = "qtwebengine-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebchannel-opensource-src-5.4.2.tar.xz"; + sha256 = "0vy1zjbghfa1wirxd8fd2n2n8yryykzr09913qm2nlfbcxdsgqsn"; + name = "qtwebchannel-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtmacextras-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/0mdhndcp51g2160559kgd5a93c0c3317-qtmacextras-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtwinextras-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/9kmig3lg8d8s5r1jl3xj5q3jrkp3p8sx-qtwinextras-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtmacextras-opensource-src-5.4.1.tar.xz"; - sha256 = "0hivjn3yfidzj4la3rlrqzjawrakxyhc886w2jcf0bjz3vzl9xp2"; - name = "qtmacextras-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwinextras-opensource-src-5.4.2.tar.xz"; + sha256 = "0sgybvr1y2xsddlqc95ninxj3rfmd4gv7a8f7rqcxdynjan5gij0"; + name = "qtwinextras-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qttranslations-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/hhana1500hq2h2l8815wq8rfrp7nizpb-qttranslations-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtwebsockets-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/zk4s5pgp3mh6xdq6z3svi305vn0pli27-qtwebsockets-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qttranslations-opensource-src-5.4.1.tar.xz"; - sha256 = "0hchmz7hjdjx0wn2v9sbgilvi0pigiriklw5pdvfxjabjxgh8k9w"; - name = "qttranslations-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebsockets-opensource-src-5.4.2.tar.xz"; + sha256 = "0lv1la8333qnirxmscs42xnnra0xry1gjbhi3bxrf1hrfs2im9j4"; + name = "qtwebsockets-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtwebchannel-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/qfa1hycl1lh8pm2x65frxlms3waqbsfg-qtwebchannel-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtmultimedia-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/n8wpy6b8jw1rf51z1qhxbbym7j8rr8ay-qtmultimedia-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebchannel-opensource-src-5.4.1.tar.xz"; - sha256 = "0ldjyyp0ym3hndd0bq5mwjry2yilf1cv9iddqb8adz46k3nbkb64"; - name = "qtwebchannel-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtmultimedia-opensource-src-5.4.2.tar.xz"; + sha256 = "0h29cs8ajnjarhjx1aczdnxqwvg6pqs9s8w28hw488s149wqqrnj"; + name = "qtmultimedia-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtdoc-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/hif7dg37sz0yjj09844f0gyqqsf9cpxx-qtdoc-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtgraphicaleffects-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/2q2vk530mf32zzd1v8bpax8iixviw6q5-qtgraphicaleffects-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtdoc-opensource-src-5.4.1.tar.xz"; - sha256 = "1afg2lxyxgqhq02a58c9yshvkinlk5mw19yff1421fma6j925c8q"; - name = "qtdoc-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtgraphicaleffects-opensource-src-5.4.2.tar.xz"; + sha256 = "02p8xm5ajicjam30ry3g1lm2p4nja2q0sls8dzimqrxhw5xlg3xs"; + name = "qtgraphicaleffects-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtwebkit-examples-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/shz5132xvpp2hvmsyl1mhps0qanrgw43-qtwebkit-examples-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtxmlpatterns-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/3fqgpa668hb1xmwjw056cw58qzb3r0g4-qtxmlpatterns-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebkit-examples-opensource-src-5.4.1.tar.xz"; - sha256 = "02kj4rw40s7xhdz1ixfy5fc7n5pr2ipqkpwj1kwng71l3jrpn60r"; - name = "qtwebkit-examples-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtxmlpatterns-opensource-src-5.4.2.tar.xz"; + sha256 = "0ar7znqp1i02ha5ngy2kzk3hlgkafjbn2xa8j2k78gzmwsmdhzxa"; + name = "qtxmlpatterns-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtbase-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/nl8rm1q2sqyq5y91h6d9dbks82krykn1-qtbase-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qttranslations-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/mg9b5z2nznzxrz501hm06b7l27jjwaca-qttranslations-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtbase-opensource-src-5.4.1.tar.xz"; - sha256 = "1dxigzgv6xj5lybs654y57ssfbl38dxff3s3wpvw0n89hf9sax45"; - name = "qtbase-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qttranslations-opensource-src-5.4.2.tar.xz"; + sha256 = "0b4l69c16z8gjd4mq75zz3lj2gxarr9wyk0vk60jg1mi62vxvdls"; + name = "qttranslations-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qttools-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/f9cbf92nhmfkz1q2n4nidh432s5d3pls-qttools-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtdeclarative-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/bjmv4fgphx9bggzcwy4lcdas9phbwjsg-qtdeclarative-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qttools-opensource-src-5.4.1.tar.xz"; - sha256 = "0whzcwgzwh1m6fqb7h2gvkx9hi2ijjaz8ap36jqr8cc4ff2hzphi"; - name = "qttools-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtdeclarative-opensource-src-5.4.2.tar.xz"; + sha256 = "1bj1wwms6lpj8s70y8by3j0hjsw6g9v8m6fybx68krzzizbj2c5p"; + name = "qtdeclarative-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qt5-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/hl5gzwaq43afs2z7ga10161myzz3xrwb-qt5-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtwebkit-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/pfhq8ask8jhzdh2x882d014b10ddywma-qtwebkit-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qt5-opensource-src-5.4.1.tar.xz"; - sha256 = "01xgf3531q60vrkg1pp07q4p0ildj42zgnw63v8fnwjg7c5m59rd"; - name = "qt5-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebkit-opensource-src-5.4.2.tar.xz"; + sha256 = "0vffbpiczag2n2hp5gc0nii8n7vkidr8f8pp8a47px0183hl6hiy"; + name = "qtwebkit-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtquick1-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/9y9qhciiqys5sm502bbflqzrjmvxpqh6-qtquick1-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtquick1-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/n807cxddkvhbzw3ciqs29zc5mw47z2qs-qtquick1-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtquick1-opensource-src-5.4.1.tar.xz"; - sha256 = "0ba3r89j75vrjgh8h3ik64x84bhgbckc4bvy1wympwgfhk3j8lzb"; - name = "qtquick1-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtquick1-opensource-src-5.4.2.tar.xz"; + sha256 = "0178z15a31fw3l6933fwxs7sk0csifpwckydp3rqnn3fg5f2fwvp"; + name = "qtquick1-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtwebsockets-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/cmvv503q10qnmmbb8yxvvjlxpqqaswyb-qtwebsockets-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtquickcontrols-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/gq8afk8zr2vrrsfmp4caqv02209qk9xb-qtquickcontrols-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebsockets-opensource-src-5.4.1.tar.xz"; - sha256 = "0i5bcxlwxbzq9k0kq1m90cbslby05x3j3r6js8xjarz2qnc6zxfs"; - name = "qtwebsockets-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtquickcontrols-opensource-src-5.4.2.tar.xz"; + sha256 = "137z3c3drxlvkdfc7zgcl0xqmavw0ladzqy0i3bq51h756qdc877"; + name = "qtquickcontrols-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtsensors-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/9c4zpbngylc7cqqyai2ysglajapphxp7-qtsensors-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtimageformats-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/cmpx0338z1j0wzk6scfpay5k10023d46-qtimageformats-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtsensors-opensource-src-5.4.1.tar.xz"; - sha256 = "1y6vbvvcgph466whcc896lkyk2lx8lyyqj1qnm76f3jjywp8wjxc"; - name = "qtsensors-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtimageformats-opensource-src-5.4.2.tar.xz"; + sha256 = "1nny6j9pm5ri3n1vwl5lrfrdz0fl81rx127wa49rkg2rjai2aawb"; + name = "qtimageformats-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtx11extras-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/njkpa0ahd4l5307b4qmqlqiv4nw1by7z-qtx11extras-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtdoc-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/jv4wgs6pz9xqmin9m4q4mifr2vfcjn3h-qtdoc-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtx11extras-opensource-src-5.4.1.tar.xz"; - sha256 = "0blcdqccxhdqj4v5zp6m34b74nw5n6pfgldyb6wrlpljkzdir9i0"; - name = "qtx11extras-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtdoc-opensource-src-5.4.2.tar.xz"; + sha256 = "15lamv6jvd7v33ldpcrazcdksv6qibdcgh4ncbyh774k8avgrlh8"; + name = "qtdoc-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtmultimedia-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/q2ji7ilipdvx0p6iyrwhhfczzw1j11ws-qtmultimedia-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtwayland-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/qa3yi9lyx2dm4wqzb3qzvzba1sgnj74z-qtwayland-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtmultimedia-opensource-src-5.4.1.tar.xz"; - sha256 = "0kjk3q7y2lr8a62rdidhn783jrq1rpj11p1jmfiw8z3j255dsc1q"; - name = "qtmultimedia-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwayland-opensource-src-5.4.2.tar.xz"; + sha256 = "14pmpkfq70plw07igxjaiji4vnjg5kg7izlb0wwym1lisg7bwkg0"; + name = "qtwayland-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtactiveqt-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/ikxpk38h1arms4x0qlnd7g5g3fg26fg4-qtactiveqt-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtmacextras-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/wdq1z3bzr9n11yln8avx10sgzgyvp8cl-qtmacextras-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtactiveqt-opensource-src-5.4.1.tar.xz"; - sha256 = "14984cvh9cfnrgls40i28fjdhs015izzlvwck9va4167y3ix4zbx"; - name = "qtactiveqt-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtmacextras-opensource-src-5.4.2.tar.xz"; + sha256 = "0h0p3s0rvd3g9rgr4hwcggdbsav2g30vijqwmdxgxd8c00yply80"; + name = "qtmacextras-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtxmlpatterns-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/0a30a874s507fmrsd1jlggbh9j953jb9-qtxmlpatterns-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtactiveqt-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/0ik7vc3zwdjvrp4fpyqf1zpyqdxvvqvq-qtactiveqt-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtxmlpatterns-opensource-src-5.4.1.tar.xz"; - sha256 = "062kqs8m9js8mlld1lsm01prq57zs88g7p8fad84a5gisgs2y57m"; - name = "qtxmlpatterns-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtactiveqt-opensource-src-5.4.2.tar.xz"; + sha256 = "014kwficqydciwdm1yw88yms81qm8pmi6xfhhfpbc9k85pc6jlla"; + name = "qtactiveqt-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtscript-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/cbb46kpmk6radk9v8cyngxcxr11g06f6-qtscript-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtlocation-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/sa4dawsw2wv45ld3afbz9nfc64qkyx1s-qtlocation-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtscript-opensource-src-5.4.1.tar.xz"; - sha256 = "1bybzcp9smasw0syvb7vrz85jq124r7gywz2msgjg1kb6z4aqcpl"; - name = "qtscript-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtlocation-opensource-src-5.4.2.tar.xz"; + sha256 = "1v43hl2zzi90vaw11y8dvsksrjn0r2v0br7pw6njl8lqadpg4jnw"; + name = "qtlocation-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtquickcontrols-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/h5hg9z346lh2w8whf0zgq5kbwffpmnkk-qtquickcontrols-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtconnectivity-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/v2aiscvf582azyzg696rglway56l7xl2-qtconnectivity-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtquickcontrols-opensource-src-5.4.1.tar.xz"; - sha256 = "1hpvbjr76q9i2idgmblr80khhjgkn78q0s0d648r3axp232m427y"; - name = "qtquickcontrols-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtconnectivity-opensource-src-5.4.2.tar.xz"; + sha256 = "1nj68bzgm3r1gg171kj0acnifzb3jx0m5pf4f81xb7zl4hfxasrs"; + name = "qtconnectivity-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtimageformats-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/7vxgal1cag6cakigc7h3rjvvr64b7sd3-qtimageformats-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtx11extras-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/nz62qld9h96z5a0b7fg52fsh5d6q0kqw-qtx11extras-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtimageformats-opensource-src-5.4.1.tar.xz"; - sha256 = "0vw4bg68kwp48v49ds2vxvgjc82i5q5scff4013y5gpbd2smnv1z"; - name = "qtimageformats-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtx11extras-opensource-src-5.4.2.tar.xz"; + sha256 = "0jgyywjxavfpiz8202g3s0g9izfl185mmak4fs9h80w1i3gn5zzn"; + name = "qtx11extras-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtserialport-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/pgcv75a5x56s88qclqvbw04dzywcxm73-qtserialport-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qttools-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/i8n6xrhalg3z4i0min4w79rq9h9hch0x-qttools-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtserialport-opensource-src-5.4.1.tar.xz"; - sha256 = "1zyhlpmh7yisk9qpk8map0myam4bkm4jvp0wcnd4d7pldf19xnbr"; - name = "qtserialport-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz"; + sha256 = "1d5nx01r7wxhdg9f1i9xhsvsbwgaz3yv516s068riy970bhdgwzd"; + name = "qttools-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtwebkit-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/p8jka7s4la8f83xqnl1a4ivdw95dajb8-qtwebkit-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtsensors-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/0ar28gp8klqxynjnc1r4kj9x7g8cknk2-qtsensors-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwebkit-opensource-src-5.4.1.tar.xz"; - sha256 = "1gqrf5g07q5bgr3vnfnsw5qwqd0fjyh4pgqphrvxq4x9z0g221v6"; - name = "qtwebkit-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtsensors-opensource-src-5.4.2.tar.xz"; + sha256 = "1yawvjbdymgw8af7ir9zcin89xxck9dm2l6hnc43lwrky0frcvcf"; + name = "qtsensors-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtconnectivity-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/ggn5pkvp89qh12vzhhk572s38vg3zn72-qtconnectivity-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtwebengine-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/ikr8cc3bn62jlv9afpzhxvqs5qhsc2yc-qtwebengine-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtconnectivity-opensource-src-5.4.1.tar.xz"; - sha256 = "0q13gg7fmfb7cfq403ql8s5qi6s9a4fd86i7v9r6cwgnj2szzi42"; - name = "qtconnectivity-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebengine-opensource-src-5.4.2.tar.xz"; + sha256 = "06cyl733prakniqrn8sd807lclk5im2vmysjdcijry2mcyah2ih8"; + name = "qtwebengine-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtlocation-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/pnblj6ncfvz4id84asjlnrxb2papsn1v-qtlocation-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtsvg-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/0llm31zpiaqig940a8dsp1dk2npxsnjc-qtsvg-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtlocation-opensource-src-5.4.1.tar.xz"; - sha256 = "113rx43349f7yn4crhgg6ciz6lyvfvfnc0vkdaz09a2r461hr7w8"; - name = "qtlocation-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtsvg-opensource-src-5.4.2.tar.xz"; + sha256 = "1dsyncp154xvb7d82nmnfjm0ngymnhqmliq58ljwxsjmpjlncakz"; + name = "qtsvg-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtdeclarative-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/0bz5yxqc9yg94jyjkvsgn7h7lph99a5v-qtdeclarative-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qt5-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/0jrx1clg8vqid9b2n9z8f0xbwjm0yynr-qt5-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtdeclarative-opensource-src-5.4.1.tar.xz"; - sha256 = "05s4imk7whm2qir9byb35dn2ndqb7c5r2cnxpv2qyjla58j4w4hm"; - name = "qtdeclarative-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qt5-opensource-src-5.4.2.tar.xz"; + sha256 = "17a0pybr4bpyv9pj7cr5hl4g31biv89bjr8zql723h0b12ql1w44"; + name = "qt5-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtwinextras-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/xdbwakyhif8cjwyii7v32zkxlrbrksmc-qtwinextras-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtwebkit-examples-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/6pmmi9bjbdxkbw2xkkc1srk5ambnjcxv-qtwebkit-examples-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtwinextras-opensource-src-5.4.1.tar.xz"; - sha256 = "01ddgvq8wny162njlzqnbphiiw565xsqy6h3s39cipa05c6mxblv"; - name = "qtwinextras-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebkit-examples-opensource-src-5.4.2.tar.xz"; + sha256 = "0pm9ik1j09jfb5xflc16449nff2xsfyfms7vxlcdjg4dhcqfmll8"; + name = "qtwebkit-examples-opensource-src-5.4.2.tar.xz"; }; } { - name = stdenv.lib.nameFromURL "qtsvg-opensource-src-5.4.1.tar.xz" ".tar"; - store = "/nix/store/m3wk5r1ihbrjz9zpi57nllzqzha06c8j-qtsvg-opensource-src-5.4.1.tar.xz"; + name = stdenv.lib.nameFromURL "qtandroidextras-opensource-src-5.4.2.tar.xz" ".tar"; + store = "/nix/store/grrsklibvplaj5pdwjp2zirxmqnq10hf-qtandroidextras-opensource-src-5.4.2.tar.xz"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.4/5.4.1/submodules/qtsvg-opensource-src-5.4.1.tar.xz"; - sha256 = "0b71kngnq7c5ry8bkb0rjlr6xx49h1sd25m4i4s3v1rfrv6912my"; - name = "qtsvg-opensource-src-5.4.1.tar.xz"; + url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtandroidextras-opensource-src-5.4.2.tar.xz"; + sha256 = "0krfm0wg26x7575p8isswdhrkb0jxyp169grwklil7mfw8yg3xhx"; + name = "qtandroidextras-opensource-src-5.4.2.tar.xz"; }; } ] diff --git a/pkgs/development/libraries/qt-5/5.4/manifest.sh b/pkgs/development/libraries/qt-5/5.4/manifest.sh index 0da13f204ba..d4441cecbb3 100755 --- a/pkgs/development/libraries/qt-5/5.4/manifest.sh +++ b/pkgs/development/libraries/qt-5/5.4/manifest.sh @@ -5,7 +5,7 @@ if [ $# -eq 0 ]; then # The extra slash at the end of the URL is necessary to stop wget # from recursing over the whole server! (No, it's not a bug.) $(nix-build ../../../../.. -A autonix.manifest) \ - http://download.qt.io/official_releases/qt/5.4/5.4.1/submodules/ \ + http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/ \ -A '*.tar.xz' else diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index eaa719b92c9..87417d1b77a 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, libuuid }: +{ stdenv, fetchurl, libuuid, pkgconfig, libsodium }: stdenv.mkDerivation rec { - name = "zeromq-4.0.5"; + name = "zeromq-4.1.1"; src = fetchurl { url = "http://download.zeromq.org/${name}.tar.gz"; - sha256 = "0arl8fy8d03xd5h0mgda1s5bajwg8iyh1kk4hd1420rpcxgkrj9v"; + sha256 = "1nxqvb1n8yy6953nv095riirrpmw4w340qd6sjm4cfdl0rbixmj3"; }; - buildInputs = [ libuuid ]; + buildInputs = [ libuuid pkgconfig libsodium ]; meta = with stdenv.lib; { branch = "4"; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index df26db519dc..e13145ee71a 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -3,7 +3,7 @@ , pygobject3, gobjectIntrospection, libwnck3 }: let - version = "${major}.8"; + version = "${major}.9"; major = "0.3"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz"; - sha256 = "e8423feb18fdff9b1465bf8442b78994ba13c12f8fa3b08e6a2f05768b4feee5"; + sha256 = "0lvrrbxkvw495jn4vj64r8vd3hng5v0lvagfzcbk5x1f3ky1gybd"; }; buildInputs = [ diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index 75cee19c680..8bb55702c59 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -1,15 +1,14 @@ -{ stdenv, autoconf, automake, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }: +{ stdenv, autoreconfHook, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }: stdenv.mkDerivation rec { - name = "chocolate-doom-2.1.0"; + name = "chocolate-doom-2.2.0"; src = fetchurl { url = "https://github.com/chocolate-doom/chocolate-doom/archive/${name}.tar.gz"; - sha256 = "1qwnc5j3n99jk35c487mxsij04m4kpkqzkbrb8qwqlsnqllyh1s1"; + sha256 = "0har8zcg3j41byxc3dx6a00aly8vpysf1q7h2qbw39nlrcghag7b"; }; - buildInputs = [ autoconf automake pkgconfig SDL SDL_mixer SDL_net ]; + buildInputs = [ autoreconfHook pkgconfig SDL SDL_mixer SDL_net ]; patchPhase = '' sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am - ./autogen.sh --prefix=$out ''; enableParallelBuilding = true; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index afef33cce2d..903466524fb 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "openttd-${version}"; - version = "1.4.4"; + version = "1.5.1"; src = fetchurl { url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz"; - sha256 = "1xykqb5bx2dzffxhvm4cbn1nf72f7zcdz8hy25i5wky4hfw31x3h"; + sha256 = "0jcg8b0jbiw5kg7rqqw74hdh675r08pgm95grk9ch4z2gpjpd3n9"; }; buildInputs = [ SDL libpng pkgconfig xz zlib freetype fontconfig ]; @@ -17,12 +17,6 @@ stdenv.mkDerivation rec { "--without-liblzo2" ]; - # NOTE: Remove this patch in 1.4.5 or greater - patches = [ - # Adapted from svn r27079 - ./fix-freetype-1.4.4.patch - ]; - makeFlags = "INSTALL_PERSONAL_DIR="; postInstall = '' diff --git a/pkgs/games/openttd/fix-freetype-1.4.4.patch b/pkgs/games/openttd/fix-freetype-1.4.4.patch deleted file mode 100644 index 37706ce05c9..00000000000 --- a/pkgs/games/openttd/fix-freetype-1.4.4.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/src/fontcache.cpp b/src/fontcache.cpp -=================================================================== ---- a/src/fontcache.cpp -+++ b/src/fontcache.cpp -@@ -537,6 +537,6 @@ - - /* Add 1 pixel for the shadow on the medium font. Our sprite must be at least 1x1 pixel */ -- int width = max(1, slot->bitmap.width + (this->fs == FS_NORMAL)); -- int height = max(1, slot->bitmap.rows + (this->fs == FS_NORMAL)); -+ unsigned int width = max(1U, (unsigned int)slot->bitmap.width + (this->fs == FS_NORMAL)); -+ unsigned int height = max(1U, (unsigned int)slot->bitmap.rows + (this->fs == FS_NORMAL)); - - /* Limit glyph size to prevent overflows later on. */ -@@ -554,6 +554,6 @@ - /* Draw shadow for medium size */ - if (this->fs == FS_NORMAL && !aa) { -- for (int y = 0; y < slot->bitmap.rows; y++) { -- for (int x = 0; x < slot->bitmap.width; x++) { -+ for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { -+ for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { - if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { - sprite.data[1 + x + (1 + y) * sprite.width].m = SHADOW_COLOUR; -@@ -564,6 +564,6 @@ - } - -- for (int y = 0; y < slot->bitmap.rows; y++) { -- for (int x = 0; x < slot->bitmap.width; x++) { -+ for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { -+ for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { - if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { - sprite.data[x + y * sprite.width].m = FACE_COLOUR; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index fd293298b45..f742973c08d 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,14 +1,14 @@ -{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib +{ stdenv, gcc5, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib , gettext, git, libpthreadstubs, libXrandr, libXext, readline -, openal, libXdmcp, portaudio, SDL, wxGTK30, fetchgit, libusb +, openal, libXdmcp, portaudio, SDL, fetchgit, libusb , libpulseaudio ? null }: stdenv.mkDerivation rec { - name = "dolphin-emu-20150421"; + name = "dolphin-emu-20150609"; src = fetchgit { url = git://github.com/dolphin-emu/dolphin.git; - rev = "4340927b7f17fa43c5f6c0f204c4bfc2b17a47d5"; - sha256 = "0pc18n88yckmvli27p09xj5kyv4k8bqv92ric8xvi7cqznmmiv9d"; + rev = "e47e4c677ad22895f8c8bc78676dd295e36f2695"; + sha256 = "0g176x0rw9lssw68alr83cakldq1q38mzjwxdaf524bkvnn7fl3r"; fetchSubmodules = false; }; @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib + buildInputs = [ gcc5 pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal - git libXdmcp portaudio SDL wxGTK30 libusb libpulseaudio ]; + git libXdmcp portaudio SDL libusb libpulseaudio ]; meta = { homepage = http://dolphin-emu.org/; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 49935487afe..d693d9df857 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -294,8 +294,8 @@ rec { name = "vim-addon-vim2nix-2015-06-01"; src = fetchgit { url = "git://github.com/JagaJaga/vim-addon-vim2nix"; - rev = "fc2eeffca48b224ef15beda57586f6d1271ff68d"; - sha256 = "b626dab117b9331b6f9ff0bf05ac1f479db82a60dd5cb87a0f3a8d3d7de9220e"; + rev = "cfa1f191b9e427dee77f8054a911a327c3cf4f79"; + sha256 = "9960dd3248ffc8d2d3b9bf322df2369feb7a6bf54d47253bd65de1988d2e5ec3"; }; dependencies = ["vim-addon-manager"]; @@ -517,6 +517,10 @@ rec { rev = "0854ac6a810daae4a5c99bcae61613266ce75c26"; sha256 = "886a173d48340ad0ddeb3c852e4f2bdfc7b513a9d5a954115d081a3e276fa655"; }; + patchPhase = '' + substituteInPlace plugin/xkbswitch.vim \ + --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so + ''; dependencies = []; buildInputs = [ xkb_switch ]; }; diff --git a/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch b/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch new file mode 100644 index 00000000000..00c23c6cac1 --- /dev/null +++ b/pkgs/os-specific/linux/ipsec-tools/CVE-2015-4047.patch @@ -0,0 +1,16 @@ +Index: pkg-ipsec-tools/src/racoon/gssapi.c +=================================================================== +--- pkg-ipsec-tools.orig/src/racoon/gssapi.c ++++ pkg-ipsec-tools/src/racoon/gssapi.c +@@ -192,6 +192,11 @@ gssapi_init(struct ph1handle *iph1) + gss_name_t princ, canon_princ; + OM_uint32 maj_stat, min_stat; + ++ if (iph1->rmconf == NULL) { ++ plog(LLV_ERROR, LOCATION, NULL, "no remote config\n"); ++ return -1; ++ } ++ + gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state)); + if (gps == NULL) { + plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n"); diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix index a6042b1e33b..fc3b0500fed 100644 --- a/pkgs/os-specific/linux/ipsec-tools/default.nix +++ b/pkgs/os-specific/linux/ipsec-tools/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { buildInputs = [ readline openssl flex kerberos pam ]; - patches = [ ./dont-create-localstatedir-during-install.patch ]; + patches = [ ./dont-create-localstatedir-during-install.patch + ./CVE-2015-4047.patch ]; # fix build with newer gcc versions preConfigure = ''substituteInPlace configure --replace "-Werror" "" ''; diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 262b673822b..3cd2567d96f 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -1,18 +1,16 @@ {stdenv, fetchurl, libnl, pkgconfig}: stdenv.mkDerivation rec { - name = "iw-3.15"; + name = "iw-4.1"; src = fetchurl { url = "https://www.kernel.org/pub/software/network/iw/${name}.tar.xz"; - sha256 = "12jby9nv5nypadgdksbqw0y2kfm3j47zw7a3rwmy56d7rs90lp5x"; + sha256 = "0jx3s5wdvm2qxd3h883fnyjsb1c29qcsz1r19bc029g8v2nalr2i"; }; buildInputs = [ libnl pkgconfig ]; - preBuild = " - makeFlagsArray=(PREFIX=$out) - "; + makeFlags = [ "PREFIX=\${out}" ]; meta = { description = "Tool to use nl80211"; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 25b707614ed..a972c4e60f8 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -54,6 +54,7 @@ with stdenv.lib; STANDALONE n # Make /proc/config.gz available. + IKCONFIG y IKCONFIG_PROC y # Optimize with -O2, not -Os. @@ -131,6 +132,8 @@ with stdenv.lib; FB_SIS_300 y FB_SIS_315 y FB_3DFX_ACCEL y + FB_VESA y + FRAMEBUFFER_CONSOLE y ${optionalString (versionOlder version "3.9" || stdenv.system == "i686-linux") '' FB_GEODE y ''} diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index b270f0852f6..6365e133c10 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.79"; + version = "3.10.80"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0m30c9v4pvim72ha8ya8w6y691a8zkcrhxhj43kh668q1yqpqvkp"; + sha256 = "09x4931p2s0m7cngw4wcpiij2392js60ivki476pdyndxi0wh2nm"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 52fa5eba109..66f6d8293ee 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.43"; + version = "3.14.44"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1m5gdzff46xm24p5x5ajxka99g0maf1y50nj59mbjccbqx3s7kvf"; + sha256 = "1kgzvdrxslrmb10cwx64qvzijq41kgiz8qy5xpa858mkynq8ydg8"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix index 9c7fb2c3bd8..b919fc7d901 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.0.4"; + version = "4.0.5"; # Remember to update grsecurity! extraMeta.branch = "4.0"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1j5l87z6gd05cqzg680id0x1nk38kd6sjffd2lifl0fz5k6iqr9h"; + sha256 = "1l9kxicadn980wrypi2qm3nx12g513acvryq58m7a0xjdf6ksjz2"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 3a0d6a926d5..60bc4e51209 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "4.1-rc6"; - modDirVersion = "4.1.0-rc6"; + version = "4.1-rc7"; + modDirVersion = "4.1.0-rc7"; extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0b8ylsrnvwf0fsq6i0iar7h92z7q3356rh1x3a5wb5p0q5j7lldr"; + sha256 = "09bxkm0nl9vzlfb14500bl6zjzhgacy7y32b3mw1d9hx62yknk2f"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index f622bf9c782..4815cae259b 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -65,17 +65,17 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.43"; - revision = "201506021902"; + { kversion = "3.14.44"; + revision = "201506082249"; branch = "stable"; - sha256 = "1b8kp9q9kslxz4adv1h0qahd96wnidpaa3k1mqmcaf8ia1b63dsk"; + sha256 = "11lclmiyg37bq3sgf6d6lky5yngr15hgmgkilrhy3081ifnsf7ax"; }; grsecurity_unstable = grsecPatch - { kversion = "4.0.4"; - revision = "201506021902"; + { kversion = "4.0.5"; + revision = "201506082251"; branch = "test"; - sha256 = "03fbx2vmlvh0bng3l4nxkfdxkgl9sgjkmwd0irq2bvb3gwk2bp03"; + sha256 = "03im0gq8b2n6fdxvrdd5iyi1viwl83zfjwqbamqyvkhmi2vbvhwk"; }; grsec_fix_path = diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index b894908eb13..c750006fcd2 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, gnugrep, findutils }: let - version = "18-3ubuntu1"; # Vivid + version = "3ubuntu1"; # Saucy in stdenv.mkDerivation { name = "kmod-blacklist-${version}"; src = fetchurl { - url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_${version}.debian.tar.xz"; - sha256 = "14ypc1ij9rjnkz4zklbxpgf0ac1bnqlx0mjv0pjjvrrf857fiq94"; + url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_9-${version}.debian.tar.gz"; + sha256 = "0h6h0zw2490iqj9xa2sz4309jyfmcc50jdvkhxa1nw90npxglp67"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index 0a4d3797ce2..1706b8b87fa 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub }: -let version = "118"; in +let version = "119"; in stdenv.mkDerivation { name = "mcelog-${version}"; src = fetchFromGitHub { - sha256 = "04hzadxyqlnhjn328bv711lpkipfn5k3gszswydmvvjpis2vhbrr"; + sha256 = "04zm8pa7r6awjgza8m048srvqcyayzdzw93vl8yrjzhh37p5m4gp"; rev = "v${version}"; repo = "mcelog"; owner = "andikleen"; diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 392a3c4049a..db7017edd43 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "musl-${version}"; - version = "1.1.9"; + version = "1.1.10"; src = fetchurl { url = "http://www.musl-libc.org/releases/${name}.tar.gz"; - sha256 = "0gi8638c5gh9i4gsihfczigg78l2q0hd9c3ws26chwprr9rp3gq0"; + sha256 = "0z4b3j1r0v4zr3v1cpl1v56zx6w8nq1y3wbs8x1zg87pqyqykfs5"; }; enableParallelBuilding = true; diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index ad8685d3d42..e60f6173c0f 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -6,11 +6,11 @@ assert enableCgiScripts -> gd != null; stdenv.mkDerivation rec { pname = "apcupsd"; - name = "${pname}-3.14.12"; + name = "${pname}-3.14.13"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "0h54ahj65nqrgmdcg81h1gp0zlxg9hwwhg8pmx6z9zcwn4y70kqv"; + sha256 = "1y83bly5bgpjbfaxxwmdk2mndbi4cw0svq5z9n6byj043phbvv2p"; }; buildInputs = [ pkgconfig utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd; diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix index c1114232ea8..17a50506fa9 100644 --- a/pkgs/servers/felix/default.nix +++ b/pkgs/servers/felix/default.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation { mkdir -p $out cp -av * $out ''; - meta = { + meta = with stdenv.lib; { description = "An OSGi gateway"; homepage = http://felix.apache.org; - license = "ASF"; - maintainers = [ stdenv.lib.maintainers.sander ]; + license = licenses.asl20; + maintainers = [ maintainers.sander ]; }; } diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index 86d37189887..d0d336ad08e 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, jdk, lib }: +{ stdenv, fetchurl, unzip, jdk }: stdenv.mkDerivation { name = "jboss-as-7.1.1.Final"; @@ -16,10 +16,10 @@ stdenv.mkDerivation { find $out/bin -name \*.sh -print0 | xargs -0 sed -i -e '/#!\/bin\/sh/aJAVA_HOME=${jdk}' ''; - meta = { - homepage = "http://www.jboss.org/"; + meta = with stdenv.lib; { + homepage = http://www.jboss.org/; description = "Open Source J2EE application server"; - license = "GPL/LGPL"; - maintainers = [ lib.maintainers.sander ]; + license = licenses.lgpl21; + maintainers = [ maintainers.sander ]; }; } diff --git a/pkgs/servers/http/tomcat/7.0.nix b/pkgs/servers/http/tomcat/7.0.nix index 87bc57eb2b6..221feb9c30e 100644 --- a/pkgs/servers/http/tomcat/7.0.nix +++ b/pkgs/servers/http/tomcat/7.0.nix @@ -1,6 +1,6 @@ import ./recent.nix { versionMajor = "7"; - versionMinor = "0.55"; - sha256 = "c20934fda63bc7311e2d8e067d67f886890c8be72280425c5f6f8fdd7a376c15"; + versionMinor = "0.62"; + sha256 = "0v8zvyd4h85ynnday58x0ppplw4flxyjsrmrpg78rrv3w49fm1x7"; } diff --git a/pkgs/servers/http/tomcat/8.0.nix b/pkgs/servers/http/tomcat/8.0.nix index 63b8d2bbc94..a6da1198c9a 100644 --- a/pkgs/servers/http/tomcat/8.0.nix +++ b/pkgs/servers/http/tomcat/8.0.nix @@ -1,6 +1,6 @@ import ./recent.nix { versionMajor = "8"; - versionMinor = "0.9"; - sha256 = "5ea3c8260088ee4fd223a532a4b0c23a10e549c34705e2f190279a1a7f1f83d9"; + versionMinor = "0.23"; + sha256 = "0f0s35iqs1zpifya0qvdrk55r77jr074sc0zk5cjivxaxnhik2y9"; } diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 74033be8cf8..294cb003ab4 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { buildInputs = [cyrus_sasl libevent]; - meta = { + meta = with stdenv.lib; { description = "A distributed memory object caching system"; repositories.git = https://github.com/memcached/memcached.git; homepage = http://memcached.org/; - license = "bsd"; - maintainers = [ stdenv.lib.maintainers.coconnor ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.coconnor ]; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index 9ce027409fd..0aa32a66f0a 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -78,13 +78,13 @@ in configureFlags = "--enable-agent"; - meta = { + meta = with stdenv.lib; { inherit branch; description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; homepage = http://www.zabbix.com/; - license = "GPL"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = licenses.gpl2; + maintainers = [ maintainers.eelco ]; + platforms = platforms.linux ++ platforms.darwin; }; }; diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index 1e8d03ec2b6..139786ba59d 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -90,13 +90,13 @@ in configureFlags = "--enable-agent"; - meta = { + meta = with stdenv.lib; { inherit branch; description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; homepage = http://www.zabbix.com/; - license = "GPL"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = licenses.gpl2; + maintainers = [ maintainers.eelco ]; + platforms = platforms.linux ++ platforms.darwin; }; }; diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index 5d8541ab870..0aa74599c3a 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -57,12 +57,12 @@ in configureFlags = "--enable-agent"; - meta = { + meta = with stdenv.lib; { description = "An enterprise-class open source distributed monitoring solution (client-side agent)"; homepage = http://www.zabbix.com/; - license = "GPL"; - maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = licenses.gpl2; + maintainers = [ maintainers.eelco ]; + platforms = platforms.linux ++ platforms.darwin; }; }; diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix index bbac243c7a0..5d99af41cb2 100644 --- a/pkgs/servers/nosql/cassandra/2.1.nix +++ b/pkgs/servers/nosql/cassandra/2.1.nix @@ -10,8 +10,8 @@ let - version = "2.1.5"; - sha256 = "1zrnmwyxcrdphcbi82ps0qp81yrn1gny4iv2wa4n4mwwp8pqwxid"; + version = "2.1.6"; + sha256 = "1xq96h33f4xmld114mrd57z396f9ykcj0xy50fnnhy5mhafkn4n2"; in diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 5de447da0dd..856a22d7bb8 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -45,9 +45,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool autoreconfHook ]; + propagatedBuildInputs = + lib.optionals stdenv.isLinux [ libcap ]; + buildInputs = [ json_c libsndfile speexdsp fftwFloat ] - ++ lib.optionals stdenv.isLinux [ libcap glib dbus.libs ] + ++ lib.optionals stdenv.isLinux [ glib dbus.libs ] ++ lib.optionals (!libOnly) ( [ libasyncns webrtc-audio-processing ] ++ lib.optional jackaudioSupport libjack2 diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 6a09d683f8d..99a6879ab92 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rippled-${version}"; - version = "0.27.4"; + version = "0.28.1"; src = fetchFromGitHub { owner = "ripple"; repo = "rippled"; rev = version; - sha256 = "13xg2baqcf2h1ww2yk371r27726iq8xb4brsj9rqv692aviblqs3"; + sha256 = "0wh8dwdg0gp7smcx40cpqanl2m2hihmx3irqh692svakbl3df3vz"; }; postPatch = '' @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ scons pkgconfig openssl protobuf boost zlib ]; - buildPhase = "scons build/rippled"; + buildPhase = "scons"; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/servers/rippled/package.nix b/pkgs/servers/rippled/package.nix index fd318c979fe..6f5bb1d3a71 100644 --- a/pkgs/servers/rippled/package.nix +++ b/pkgs/servers/rippled/package.nix @@ -1,20 +1,226 @@ { self, fetchurl, fetchgit ? null, lib }: { - by-spec."accepts"."~1.2.5" = - self.by-version."accepts"."1.2.5"; - by-version."accepts"."1.2.5" = self.buildNodePackage { - name = "accepts-1.2.5"; - version = "1.2.5"; + by-spec."abbrev"."1" = + self.by-version."abbrev"."1.0.5"; + by-version."abbrev"."1.0.5" = self.buildNodePackage { + name = "abbrev-1.0.5"; + version = "1.0.5"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.2.5.tgz"; - name = "accepts-1.2.5.tgz"; - sha1 = "bb07dc52c141ae562611a836ff433bcec8871ce9"; + url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"; + name = "abbrev-1.0.5.tgz"; + sha1 = "5d8257bd9ebe435e698b2fa431afde4fe7b10b03"; }; deps = { - "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10"; - "negotiator-0.5.1" = self.by-version."negotiator"."0.5.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."abbrev"."1.0.x" = + self.by-version."abbrev"."1.0.5"; + by-spec."accepts"."~1.2.5" = + self.by-version."accepts"."1.2.7"; + by-version."accepts"."1.2.7" = self.buildNodePackage { + name = "accepts-1.2.7"; + version = "1.2.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/accepts/-/accepts-1.2.7.tgz"; + name = "accepts-1.2.7.tgz"; + sha1 = "efea24e36e0b5b93d001a7598ac441c32ef56003"; + }; + deps = { + "mime-types-2.0.11" = self.by-version."mime-types"."2.0.11"; + "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."accepts"."~1.2.7" = + self.by-version."accepts"."1.2.7"; + by-spec."amdefine".">=0.0.4" = + self.by-version."amdefine"."0.1.0"; + by-version."amdefine"."0.1.0" = self.buildNodePackage { + name = "amdefine-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz"; + name = "amdefine-0.1.0.tgz"; + sha1 = "3ca9735cf1dde0edf7a4bf6641709c8024f9b227"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ansi"."^0.3.0" = + self.by-version."ansi"."0.3.0"; + by-version."ansi"."0.3.0" = self.buildNodePackage { + name = "ansi-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"; + name = "ansi-0.3.0.tgz"; + sha1 = "74b2f1f187c8553c7f95015bcb76009fb43d38e0"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ansi"."~0.3.0" = + self.by-version."ansi"."0.3.0"; + by-spec."ansi-regex"."^0.2.0" = + self.by-version."ansi-regex"."0.2.1"; + by-version."ansi-regex"."0.2.1" = self.buildNodePackage { + name = "ansi-regex-0.2.1"; + version = "0.2.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"; + name = "ansi-regex-0.2.1.tgz"; + sha1 = "0d8e946967a3d8143f93e24e298525fc1b2235f9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ansi-regex"."^0.2.1" = + self.by-version."ansi-regex"."0.2.1"; + by-spec."ansi-regex"."^1.0.0" = + self.by-version."ansi-regex"."1.1.1"; + by-version."ansi-regex"."1.1.1" = self.buildNodePackage { + name = "ansi-regex-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"; + name = "ansi-regex-1.1.1.tgz"; + sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ansi-regex"."^1.1.0" = + self.by-version."ansi-regex"."1.1.1"; + by-spec."ansi-styles"."^1.1.0" = + self.by-version."ansi-styles"."1.1.0"; + by-version."ansi-styles"."1.1.0" = self.buildNodePackage { + name = "ansi-styles-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"; + name = "ansi-styles-1.1.0.tgz"; + sha1 = "eaecbf66cd706882760b2f4691582b8f55d7a7de"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ansi-styles"."^2.0.1" = + self.by-version."ansi-styles"."2.0.1"; + by-version."ansi-styles"."2.0.1" = self.buildNodePackage { + name = "ansi-styles-2.0.1"; + version = "2.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz"; + name = "ansi-styles-2.0.1.tgz"; + sha1 = "b033f57f93e2d28adeb8bc11138fa13da0fd20a3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."are-we-there-yet"."~1.0.0" = + self.by-version."are-we-there-yet"."1.0.4"; + by-version."are-we-there-yet"."1.0.4" = self.buildNodePackage { + name = "are-we-there-yet-1.0.4"; + version = "1.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz"; + name = "are-we-there-yet-1.0.4.tgz"; + sha1 = "527fe389f7bcba90806106b99244eaa07e886f85"; + }; + deps = { + "delegates-0.1.0" = self.by-version."delegates"."0.1.0"; + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."argparse"."~ 0.1.11" = + self.by-version."argparse"."0.1.16"; + by-version."argparse"."0.1.16" = self.buildNodePackage { + name = "argparse-0.1.16"; + version = "0.1.16"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz"; + name = "argparse-0.1.16.tgz"; + sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c"; + }; + deps = { + "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + "underscore.string-2.4.0" = self.by-version."underscore.string"."2.4.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."argparse"."~1.0.2" = + self.by-version."argparse"."1.0.2"; + by-version."argparse"."1.0.2" = self.buildNodePackage { + name = "argparse-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/argparse/-/argparse-1.0.2.tgz"; + name = "argparse-1.0.2.tgz"; + sha1 = "bcfae39059656d1973d0b9e6a1a74154b5a9a136"; + }; + deps = { + "lodash-3.8.0" = self.by-version."lodash"."3.8.0"; + "sprintf-js-1.0.2" = self.by-version."sprintf-js"."1.0.2"; }; optionalDependencies = { }; @@ -41,6 +247,47 @@ os = [ ]; cpu = [ ]; }; + by-spec."assert-diff"."^0.0.4" = + self.by-version."assert-diff"."0.0.4"; + by-version."assert-diff"."0.0.4" = self.buildNodePackage { + name = "assert-diff-0.0.4"; + version = "0.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/assert-diff/-/assert-diff-0.0.4.tgz"; + name = "assert-diff-0.0.4.tgz"; + sha1 = "bf181c1575d5ad7c73df8076a689f4ae19951608"; + }; + deps = { + "assert-plus-0.1.4" = self.by-version."assert-plus"."0.1.4"; + "json-diff-0.3.1" = self.by-version."json-diff"."0.3.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "assert-diff" = self.by-version."assert-diff"."0.0.4"; + by-spec."assert-plus"."0.1.4" = + self.by-version."assert-plus"."0.1.4"; + by-version."assert-plus"."0.1.4" = self.buildNodePackage { + name = "assert-plus-0.1.4"; + version = "0.1.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.4.tgz"; + name = "assert-plus-0.1.4.tgz"; + sha1 = "283eff8b140ecd768529fbf3730a4c09ebec61f7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."assert-plus"."^0.1.5" = self.by-version."assert-plus"."0.1.5"; by-version."assert-plus"."0.1.5" = self.buildNodePackage { @@ -60,16 +307,16 @@ 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"; + by-spec."assertion-error"."1.0.0" = + self.by-version."assertion-error"."1.0.0"; + by-version."assertion-error"."1.0.0" = self.buildNodePackage { + name = "assertion-error-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; - name = "async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + url = "http://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz"; + name = "assertion-error-1.0.0.tgz"; + sha1 = "c7f85438fdd466bc7ca16ab90c81513797a5d23b"; }; deps = { }; @@ -79,14 +326,26 @@ os = [ ]; cpu = [ ]; }; - by-spec."async"."^0.2.10" = - self.by-version."async"."0.2.10"; - by-spec."async"."~0.2.7" = - self.by-version."async"."0.2.10"; - by-spec."async"."~0.2.9" = - self.by-version."async"."0.2.10"; - "async" = self.by-version."async"."0.2.10"; - by-spec."async"."~0.9.0" = + by-spec."async"."0.2.9" = + self.by-version."async"."0.2.9"; + by-version."async"."0.2.9" = self.buildNodePackage { + name = "async-0.2.9"; + version = "0.2.9"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz"; + name = "async-0.2.9.tgz"; + sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."async"."0.9.x" = self.by-version."async"."0.9.0"; by-version."async"."0.9.0" = self.buildNodePackage { name = "async-0.9.0"; @@ -105,16 +364,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."aws-sign"."~0.2.0" = - self.by-version."aws-sign"."0.2.0"; - by-version."aws-sign"."0.2.0" = self.buildNodePackage { - name = "aws-sign-0.2.0"; - version = "0.2.0"; + by-spec."async"."^0.2.9" = + 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/aws-sign/-/aws-sign-0.2.0.tgz"; - name = "aws-sign-0.2.0.tgz"; - sha1 = "c55013856c8194ec854a0cbec90aab5a04ce3ac5"; + url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; + name = "async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; }; deps = { }; @@ -124,6 +383,13 @@ os = [ ]; cpu = [ ]; }; + "async" = self.by-version."async"."0.2.10"; + by-spec."async"."~0.2.6" = + self.by-version."async"."0.2.10"; + by-spec."async"."~0.2.9" = + self.by-version."async"."0.2.10"; + by-spec."async"."~0.9.0" = + self.by-version."async"."0.9.0"; by-spec."aws-sign2"."~0.5.0" = self.by-version."aws-sign2"."0.5.0"; by-version."aws-sign2"."0.5.0" = self.buildNodePackage { @@ -143,16 +409,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."base64-url"."1.2.1" = - self.by-version."base64-url"."1.2.1"; - by-version."base64-url"."1.2.1" = self.buildNodePackage { - name = "base64-url-1.2.1"; - version = "1.2.1"; + by-spec."balanced-match"."^0.2.0" = + self.by-version."balanced-match"."0.2.0"; + by-version."balanced-match"."0.2.0" = self.buildNodePackage { + name = "balanced-match-0.2.0"; + version = "0.2.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz"; - name = "base64-url-1.2.1.tgz"; - sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78"; + url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"; + name = "balanced-match-0.2.0.tgz"; + sha1 = "38f6730c03aab6d5edbb52bd934885e756d71674"; }; deps = { }; @@ -162,16 +428,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."basic-auth"."1.0.0" = - self.by-version."basic-auth"."1.0.0"; - by-version."basic-auth"."1.0.0" = self.buildNodePackage { - name = "basic-auth-1.0.0"; - version = "1.0.0"; + by-spec."basic-auth"."~1.0.1" = + self.by-version."basic-auth"."1.0.1"; + by-version."basic-auth"."1.0.1" = self.buildNodePackage { + name = "basic-auth-1.0.1"; + version = "1.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/basic-auth/-/basic-auth-1.0.0.tgz"; - name = "basic-auth-1.0.0.tgz"; - sha1 = "111b2d9ff8e4e6d136b8c84ea5e096cb87351637"; + url = "http://registry.npmjs.org/basic-auth/-/basic-auth-1.0.1.tgz"; + name = "basic-auth-1.0.1.tgz"; + sha1 = "4bae1dbfbf0aec4dc5dc47a8d3675b50140f3bf8"; }; deps = { }; @@ -181,16 +447,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."basic-auth-connect"."1.0.0" = - self.by-version."basic-auth-connect"."1.0.0"; - by-version."basic-auth-connect"."1.0.0" = self.buildNodePackage { - name = "basic-auth-connect-1.0.0"; - version = "1.0.0"; + by-spec."bignumber.js"."^1.4.0" = + self.by-version."bignumber.js"."1.5.0"; + by-version."bignumber.js"."1.5.0" = self.buildNodePackage { + name = "bignumber.js-1.5.0"; + version = "1.5.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"; - name = "basic-auth-connect-1.0.0.tgz"; - sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122"; + url = "http://registry.npmjs.org/bignumber.js/-/bignumber.js-1.5.0.tgz"; + name = "bignumber.js-1.5.0.tgz"; + sha1 = "ff41453ac7b19ee15cda7977e179ff1b0d11956d"; }; deps = { }; @@ -200,16 +466,17 @@ os = [ ]; cpu = [ ]; }; - by-spec."batch"."0.5.2" = - self.by-version."batch"."0.5.2"; - by-version."batch"."0.5.2" = self.buildNodePackage { - name = "batch-0.5.2"; - version = "0.5.2"; + "bignumber.js" = self.by-version."bignumber.js"."1.5.0"; + by-spec."bignumber.js"."^2.0.3" = + self.by-version."bignumber.js"."2.0.7"; + by-version."bignumber.js"."2.0.7" = self.buildNodePackage { + name = "bignumber.js-2.0.7"; + version = "2.0.7"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/batch/-/batch-0.5.2.tgz"; - name = "batch-0.5.2.tgz"; - sha1 = "546543dbe32118c83c7c7ca33a1f5c5d5ea963e9"; + url = "http://registry.npmjs.org/bignumber.js/-/bignumber.js-2.0.7.tgz"; + name = "bignumber.js-2.0.7.tgz"; + sha1 = "86eb0707cf6a5110909d23e6ea7434c14f500f1c"; }; deps = { }; @@ -219,16 +486,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."bignumber.js"."^2.0.0" = - self.by-version."bignumber.js"."2.0.3"; - by-version."bignumber.js"."2.0.3" = self.buildNodePackage { - name = "bignumber.js-2.0.3"; - version = "2.0.3"; + by-spec."bignumber.js"."~1.4.0" = + self.by-version."bignumber.js"."1.4.1"; + by-version."bignumber.js"."1.4.1" = self.buildNodePackage { + name = "bignumber.js-1.4.1"; + version = "1.4.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/bignumber.js/-/bignumber.js-2.0.3.tgz"; - name = "bignumber.js-2.0.3.tgz"; - sha1 = "1328f1d618f4bfe23587af73577a5a1e4f3cf105"; + url = "http://registry.npmjs.org/bignumber.js/-/bignumber.js-1.4.1.tgz"; + name = "bignumber.js-1.4.1.tgz"; + sha1 = "3d19ac321f8db4ba07aace23ebd4ac976fae6bfa"; }; deps = { }; @@ -277,47 +544,71 @@ os = [ ]; cpu = [ ]; }; - by-spec."body-parser"."~1.12.2" = - self.by-version."body-parser"."1.12.2"; - by-version."body-parser"."1.12.2" = self.buildNodePackage { - name = "body-parser-1.12.2"; - version = "1.12.2"; + by-spec."block-stream"."*" = + self.by-version."block-stream"."0.0.7"; + by-version."block-stream"."0.0.7" = self.buildNodePackage { + name = "block-stream-0.0.7"; + version = "0.0.7"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/body-parser/-/body-parser-1.12.2.tgz"; - name = "body-parser-1.12.2.tgz"; - sha1 = "698368fb4dfc57a05bff1ddb1bebeba3bd2c0e87"; + url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"; + name = "block-stream-0.0.7.tgz"; + sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed"; + }; + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bluebird"."^2.0.0" = + self.by-version."bluebird"."2.9.25"; + by-version."bluebird"."2.9.25" = self.buildNodePackage { + name = "bluebird-2.9.25"; + version = "2.9.25"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.25.tgz"; + name = "bluebird-2.9.25.tgz"; + sha1 = "6e36bd04064d9534c07160b9f7f26c5a738fe16a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."bluebird"."^2.3.4" = + self.by-version."bluebird"."2.9.25"; + "bluebird" = self.by-version."bluebird"."2.9.25"; + by-spec."bluebird"."^2.9.25" = + self.by-version."bluebird"."2.9.25"; + by-spec."body-parser"."^1.7.0" = + self.by-version."body-parser"."1.12.4"; + by-version."body-parser"."1.12.4" = self.buildNodePackage { + name = "body-parser-1.12.4"; + version = "1.12.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/body-parser/-/body-parser-1.12.4.tgz"; + name = "body-parser-1.12.4.tgz"; + sha1 = "090700c4ba28862a8520ef378395fdee5f61c229"; }; deps = { "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "depd-1.0.0" = self.by-version."depd"."1.0.0"; - "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7"; - "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; - "qs-2.4.1" = self.by-version."qs"."2.4.1"; - "raw-body-1.3.3" = self.by-version."raw-body"."1.3.3"; - "type-is-1.6.1" = self.by-version."type-is"."1.6.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."boom"."0.3.x" = - self.by-version."boom"."0.3.8"; - by-version."boom"."0.3.8" = self.buildNodePackage { - name = "boom-0.3.8"; - version = "0.3.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/boom/-/boom-0.3.8.tgz"; - name = "boom-0.3.8.tgz"; - sha1 = "c8cdb041435912741628c044ecc732d1d17c09ea"; - }; - deps = { - "hoek-0.7.6" = self.by-version."hoek"."0.7.6"; + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; + "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; + "qs-2.4.2" = self.by-version."qs"."2.4.2"; + "raw-body-2.0.1" = self.by-version."raw-body"."2.0.1"; + "type-is-1.6.2" = self.by-version."type-is"."1.6.2"; }; optionalDependencies = { }; @@ -325,6 +616,7 @@ os = [ ]; cpu = [ ]; }; + "body-parser" = self.by-version."body-parser"."1.12.4"; by-spec."boom"."0.4.x" = self.by-version."boom"."0.4.2"; by-version."boom"."0.4.2" = self.buildNodePackage { @@ -346,18 +638,18 @@ cpu = [ ]; }; by-spec."boom"."2.x.x" = - self.by-version."boom"."2.6.1"; - by-version."boom"."2.6.1" = self.buildNodePackage { - name = "boom-2.6.1"; - version = "2.6.1"; + self.by-version."boom"."2.7.1"; + by-version."boom"."2.7.1" = self.buildNodePackage { + name = "boom-2.7.1"; + version = "2.7.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/boom/-/boom-2.6.1.tgz"; - name = "boom-2.6.1.tgz"; - sha1 = "4dc8ef9b6dfad9c43bbbfbe71fa4c21419f22753"; + url = "http://registry.npmjs.org/boom/-/boom-2.7.1.tgz"; + name = "boom-2.7.1.tgz"; + sha1 = "fb165c348d337977c61d4363c21e9e1abf526705"; }; deps = { - "hoek-2.11.1" = self.by-version."hoek"."2.11.1"; + "hoek-2.13.0" = self.by-version."hoek"."2.13.0"; }; optionalDependencies = { }; @@ -365,18 +657,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."browser-request"."~0.3.0" = - self.by-version."browser-request"."0.3.3"; - by-version."browser-request"."0.3.3" = self.buildNodePackage { - name = "browser-request-0.3.3"; - version = "0.3.3"; + by-spec."brace-expansion"."^1.0.0" = + self.by-version."brace-expansion"."1.1.0"; + by-version."brace-expansion"."1.1.0" = self.buildNodePackage { + name = "brace-expansion-1.1.0"; + version = "1.1.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz"; - name = "browser-request-0.3.3.tgz"; - sha1 = "9ece5b5aca89a29932242e18bf933def9876cc17"; + url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz"; + name = "brace-expansion-1.1.0.tgz"; + sha1 = "c9b7d03c03f37bc704be100e522b40db8f6cfcd9"; }; deps = { + "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0"; + "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1"; }; optionalDependencies = { }; @@ -424,16 +718,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."caseless"."~0.6.0" = - self.by-version."caseless"."0.6.0"; - by-version."caseless"."0.6.0" = self.buildNodePackage { - name = "caseless-0.6.0"; - version = "0.6.0"; + by-spec."bytes"."2.0.1" = + self.by-version."bytes"."2.0.1"; + by-version."bytes"."2.0.1" = self.buildNodePackage { + name = "bytes-2.0.1"; + version = "2.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"; - name = "caseless-0.6.0.tgz"; - sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"; + url = "http://registry.npmjs.org/bytes/-/bytes-2.0.1.tgz"; + name = "bytes-2.0.1.tgz"; + sha1 = "673743059be43d929f9c225dd7363ee0f8b15d97"; }; deps = { }; @@ -462,18 +756,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."clone"."~0.1.11" = - self.by-version."clone"."0.1.19"; - by-version."clone"."0.1.19" = self.buildNodePackage { - name = "clone-0.1.19"; - version = "0.1.19"; + by-spec."chai".">=1.9.2 <3" = + self.by-version."chai"."2.3.0"; + by-version."chai"."2.3.0" = self.buildNodePackage { + name = "chai-2.3.0"; + version = "2.3.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/clone/-/clone-0.1.19.tgz"; - name = "clone-0.1.19.tgz"; - sha1 = "613fb68639b26a494ac53253e15b1a6bd88ada85"; + url = "http://registry.npmjs.org/chai/-/chai-2.3.0.tgz"; + name = "chai-2.3.0.tgz"; + sha1 = "8a2f6a34748da801090fd73287b2aa739a4e909a"; }; deps = { + "assertion-error-1.0.0" = self.by-version."assertion-error"."1.0.0"; + "deep-eql-0.1.3" = self.by-version."deep-eql"."0.1.3"; }; optionalDependencies = { }; @@ -481,17 +777,106 @@ os = [ ]; cpu = [ ]; }; - "clone" = self.by-version."clone"."0.1.19"; - by-spec."colors"."0.6.x" = - self.by-version."colors"."0.6.2"; - by-version."colors"."0.6.2" = self.buildNodePackage { - name = "colors-0.6.2"; - version = "0.6.2"; + by-spec."chai"."^1.10.0" = + self.by-version."chai"."1.10.0"; + by-version."chai"."1.10.0" = self.buildNodePackage { + name = "chai-1.10.0"; + version = "1.10.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; - name = "colors-0.6.2.tgz"; - sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; + url = "http://registry.npmjs.org/chai/-/chai-1.10.0.tgz"; + name = "chai-1.10.0.tgz"; + sha1 = "e4031cc87654461a75943e5a35ab46eaf39c1eb9"; + }; + deps = { + "assertion-error-1.0.0" = self.by-version."assertion-error"."1.0.0"; + "deep-eql-0.1.3" = self.by-version."deep-eql"."0.1.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "chai" = self.by-version."chai"."1.10.0"; + by-spec."chalk"."^1.0.0" = + self.by-version."chalk"."1.0.0"; + by-version."chalk"."1.0.0" = self.buildNodePackage { + name = "chalk-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz"; + name = "chalk-1.0.0.tgz"; + sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc"; + }; + deps = { + "ansi-styles-2.0.1" = self.by-version."ansi-styles"."2.0.1"; + "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3"; + "has-ansi-1.0.3" = self.by-version."has-ansi"."1.0.3"; + "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1"; + "supports-color-1.3.1" = self.by-version."supports-color"."1.3.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."chalk"."~0.5.1" = + self.by-version."chalk"."0.5.1"; + by-version."chalk"."0.5.1" = self.buildNodePackage { + name = "chalk-0.5.1"; + version = "0.5.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz"; + name = "chalk-0.5.1.tgz"; + sha1 = "663b3a648b68b55d04690d49167aa837858f2174"; + }; + deps = { + "ansi-styles-1.1.0" = self.by-version."ansi-styles"."1.1.0"; + "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3"; + "has-ansi-0.1.0" = self.by-version."has-ansi"."0.1.0"; + "strip-ansi-0.3.0" = self.by-version."strip-ansi"."0.3.0"; + "supports-color-0.2.0" = self.by-version."supports-color"."0.2.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."cli-color"."~0.1.6" = + self.by-version."cli-color"."0.1.7"; + by-version."cli-color"."0.1.7" = self.buildNodePackage { + name = "cli-color-0.1.7"; + version = "0.1.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/cli-color/-/cli-color-0.1.7.tgz"; + name = "cli-color-0.1.7.tgz"; + sha1 = "adc3200fa471cc211b0da7f566b71e98b9d67347"; + }; + deps = { + "es5-ext-0.8.2" = self.by-version."es5-ext"."0.8.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."colors"."1.0.x" = + self.by-version."colors"."1.0.3"; + by-version."colors"."1.0.3" = self.buildNodePackage { + name = "colors-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; + name = "colors-1.0.3.tgz"; + sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; }; deps = { }; @@ -523,16 +908,76 @@ }; by-spec."combined-stream"."~0.0.5" = self.by-version."combined-stream"."0.0.7"; - by-spec."commander"."2.6.0" = - self.by-version."commander"."2.6.0"; - by-version."commander"."2.6.0" = self.buildNodePackage { - name = "commander-2.6.0"; - version = "2.6.0"; + by-spec."commander"."0.6.1" = + self.by-version."commander"."0.6.1"; + by-version."commander"."0.6.1" = self.buildNodePackage { + name = "commander-0.6.1"; + version = "0.6.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.6.0.tgz"; - name = "commander-2.6.0.tgz"; - sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"; + url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz"; + name = "commander-0.6.1.tgz"; + sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."commander"."2.3.0" = + self.by-version."commander"."2.3.0"; + by-version."commander"."2.3.0" = self.buildNodePackage { + name = "commander-2.3.0"; + version = "2.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz"; + name = "commander-2.3.0.tgz"; + sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."commander"."^2.2.0" = + self.by-version."commander"."2.8.1"; + by-version."commander"."2.8.1" = self.buildNodePackage { + name = "commander-2.8.1"; + version = "2.8.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz"; + name = "commander-2.8.1.tgz"; + sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4"; + }; + deps = { + "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."commander"."^2.8.1" = + self.by-version."commander"."2.8.1"; + by-spec."commander"."~2.1.0" = + self.by-version."commander"."2.1.0"; + by-version."commander"."2.1.0" = self.buildNodePackage { + name = "commander-2.1.0"; + version = "2.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz"; + name = "commander-2.1.0.tgz"; + sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; }; deps = { }; @@ -573,7 +1018,7 @@ sha1 = "d0474a6ba6590a43d39c2ce9a6cfbb6479be76a5"; }; deps = { - "mime-db-1.8.0" = self.by-version."mime-db"."1.8.0"; + "mime-db-1.9.1" = self.by-version."mime-db"."1.9.1"; }; optionalDependencies = { }; @@ -581,22 +1026,22 @@ os = [ ]; cpu = [ ]; }; - by-spec."compression"."~1.4.3" = - self.by-version."compression"."1.4.3"; - by-version."compression"."1.4.3" = self.buildNodePackage { - name = "compression-1.4.3"; - version = "1.4.3"; + by-spec."compression"."^1.3.0" = + self.by-version."compression"."1.4.4"; + by-version."compression"."1.4.4" = self.buildNodePackage { + name = "compression-1.4.4"; + version = "1.4.4"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/compression/-/compression-1.4.3.tgz"; - name = "compression-1.4.3.tgz"; - sha1 = "7161bc0441df629273e5c31dd631b8e41e886b4d"; + url = "http://registry.npmjs.org/compression/-/compression-1.4.4.tgz"; + name = "compression-1.4.4.tgz"; + sha1 = "2f9994ca476e4d9ba5fdc67ac929942837d0b6a4"; }; deps = { - "accepts-1.2.5" = self.by-version."accepts"."1.2.5"; + "accepts-1.2.7" = self.by-version."accepts"."1.2.7"; "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; "compressible-2.0.2" = self.by-version."compressible"."2.0.2"; - "debug-2.1.3" = self.by-version."debug"."2.1.3"; + "debug-2.2.0" = self.by-version."debug"."2.2.0"; "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; }; @@ -606,72 +1051,19 @@ os = [ ]; cpu = [ ]; }; - by-spec."connect"."2.29.1" = - self.by-version."connect"."2.29.1"; - by-version."connect"."2.29.1" = self.buildNodePackage { - name = "connect-2.29.1"; - version = "2.29.1"; + "compression" = self.by-version."compression"."1.4.4"; + by-spec."concat-map"."0.0.1" = + self.by-version."concat-map"."0.0.1"; + by-version."concat-map"."0.0.1" = self.buildNodePackage { + name = "concat-map-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.29.1.tgz"; - name = "connect-2.29.1.tgz"; - sha1 = "e0456742d25ed232b573ce156883dd4e6f208538"; + url = "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + name = "concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; deps = { - "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0"; - "body-parser-1.12.2" = self.by-version."body-parser"."1.12.2"; - "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; - "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4"; - "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; - "compression-1.4.3" = self.by-version."compression"."1.4.3"; - "connect-timeout-1.6.1" = self.by-version."connect-timeout"."1.6.1"; - "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; - "csurf-1.7.0" = self.by-version."csurf"."1.7.0"; - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "depd-1.0.0" = self.by-version."depd"."1.0.0"; - "errorhandler-1.3.5" = self.by-version."errorhandler"."1.3.5"; - "express-session-1.10.4" = self.by-version."express-session"."1.10.4"; - "finalhandler-0.3.4" = self.by-version."finalhandler"."0.3.4"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1"; - "method-override-2.3.2" = self.by-version."method-override"."2.3.2"; - "morgan-1.5.2" = self.by-version."morgan"."1.5.2"; - "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2"; - "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "qs-2.4.1" = self.by-version."qs"."2.4.1"; - "response-time-2.3.0" = self.by-version."response-time"."2.3.0"; - "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0"; - "serve-index-1.6.3" = self.by-version."serve-index"."1.6.3"; - "serve-static-1.9.2" = self.by-version."serve-static"."1.9.2"; - "type-is-1.6.1" = self.by-version."type-is"."1.6.1"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - "vhost-3.0.0" = self.by-version."vhost"."3.0.0"; - "pause-0.0.1" = self.by-version."pause"."0.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."connect-timeout"."~1.6.1" = - self.by-version."connect-timeout"."1.6.1"; - by-version."connect-timeout"."1.6.1" = self.buildNodePackage { - name = "connect-timeout-1.6.1"; - version = "1.6.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.1.tgz"; - name = "connect-timeout-1.6.1.tgz"; - sha1 = "1de3a2b853734820a232080b95742494ba4cd067"; - }; - deps = { - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1"; - "ms-0.7.0" = self.by-version."ms"."0.7.0"; - "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; }; optionalDependencies = { }; @@ -736,46 +1128,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."cookie-jar"."~0.2.0" = - self.by-version."cookie-jar"."0.2.0"; - by-version."cookie-jar"."0.2.0" = self.buildNodePackage { - name = "cookie-jar-0.2.0"; - version = "0.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz"; - name = "cookie-jar-0.2.0.tgz"; - sha1 = "64ecc06ac978db795e4b5290cbe48ba3781400fa"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cookie-parser"."~1.3.4" = - self.by-version."cookie-parser"."1.3.4"; - by-version."cookie-parser"."1.3.4" = self.buildNodePackage { - name = "cookie-parser-1.3.4"; - version = "1.3.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.4.tgz"; - name = "cookie-parser-1.3.4.tgz"; - sha1 = "193035a5be97117a21709b3aa737f6132717bda6"; - }; - deps = { - "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."cookie-signature"."1.0.6" = self.by-version."cookie-signature"."1.0.6"; by-version."cookie-signature"."1.0.6" = self.buildNodePackage { @@ -795,16 +1147,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."cookiejar"."2.0.1" = - self.by-version."cookiejar"."2.0.1"; - by-version."cookiejar"."2.0.1" = self.buildNodePackage { - name = "cookiejar-2.0.1"; - version = "2.0.1"; + by-spec."cookiejar"."1.3.2" = + self.by-version."cookiejar"."1.3.2"; + by-version."cookiejar"."1.3.2" = self.buildNodePackage { + name = "cookiejar-1.3.2"; + version = "1.3.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz"; - name = "cookiejar-2.0.1.tgz"; - sha1 = "3d12752f6adf68a892f332433492bd5812bb668f"; + url = "http://registry.npmjs.org/cookiejar/-/cookiejar-1.3.2.tgz"; + name = "cookiejar-1.3.2.tgz"; + sha1 = "61d3229e2da20c859032233502958a9b7df58249"; }; deps = { }; @@ -833,21 +1185,22 @@ os = [ ]; cpu = [ ]; }; - by-spec."couch-compile"."^1.0.1" = - self.by-version."couch-compile"."1.2.0"; - by-version."couch-compile"."1.2.0" = self.buildNodePackage { - name = "couch-compile-1.2.0"; - version = "1.2.0"; + by-spec."coveralls"."^2.10.0" = + self.by-version."coveralls"."2.11.2"; + by-version."coveralls"."2.11.2" = self.buildNodePackage { + name = "coveralls-2.11.2"; + version = "2.11.2"; bin = true; src = fetchurl { - url = "http://registry.npmjs.org/couch-compile/-/couch-compile-1.2.0.tgz"; - name = "couch-compile-1.2.0.tgz"; - sha1 = "c4f7396f3dea38516b4e51d3edc3196de4f2d69c"; + url = "http://registry.npmjs.org/coveralls/-/coveralls-2.11.2.tgz"; + name = "coveralls-2.11.2.tgz"; + sha1 = "d4d982016cb2f9da89d77ab204d86a8537e6a12d"; }; deps = { - "mime-1.3.4" = self.by-version."mime"."1.3.4"; - "async-0.2.10" = self.by-version."async"."0.2.10"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; + "js-yaml-3.0.1" = self.by-version."js-yaml"."3.0.1"; + "lcov-parse-0.0.6" = self.by-version."lcov-parse"."0.0.6"; + "log-driver-1.2.4" = self.by-version."log-driver"."1.2.4"; + "request-2.40.0" = self.by-version."request"."2.40.0"; }; optionalDependencies = { }; @@ -855,7 +1208,7 @@ os = [ ]; cpu = [ ]; }; - "couch-compile" = self.by-version."couch-compile"."1.2.0"; + "coveralls" = self.by-version."coveralls"."2.11.2"; by-spec."crc"."3.2.1" = self.by-version."crc"."3.2.1"; by-version."crc"."3.2.1" = self.buildNodePackage { @@ -875,45 +1228,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."cron-parser"."~0.3.0" = - self.by-version."cron-parser"."0.3.6"; - by-version."cron-parser"."0.3.6" = self.buildNodePackage { - name = "cron-parser-0.3.6"; - version = "0.3.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cron-parser/-/cron-parser-0.3.6.tgz"; - name = "cron-parser-0.3.6.tgz"; - sha1 = "1e4734ebd5fa054f5766693c52468b17df9681c9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cryptiles"."0.1.x" = - self.by-version."cryptiles"."0.1.3"; - by-version."cryptiles"."0.1.3" = self.buildNodePackage { - name = "cryptiles-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz"; - name = "cryptiles-0.1.3.tgz"; - sha1 = "1a556734f06d24ba34862ae9cb9e709a3afbff1c"; - }; - deps = { - "boom-0.3.8" = self.by-version."boom"."0.3.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."cryptiles"."0.2.x" = self.by-version."cryptiles"."0.2.2"; by-version."cryptiles"."0.2.2" = self.buildNodePackage { @@ -946,53 +1260,7 @@ sha1 = "09ea1775b9e1c7de7e60a99d42ab6f08ce1a1285"; }; deps = { - "boom-2.6.1" = self.by-version."boom"."2.6.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."csrf"."~2.0.6" = - self.by-version."csrf"."2.0.6"; - by-version."csrf"."2.0.6" = self.buildNodePackage { - name = "csrf-2.0.6"; - version = "2.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/csrf/-/csrf-2.0.6.tgz"; - name = "csrf-2.0.6.tgz"; - sha1 = "a90a9d88fc7411423cb0c5c13e901a8cc588132e"; - }; - deps = { - "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1"; - "rndm-1.1.0" = self.by-version."rndm"."1.1.0"; - "scmp-1.0.0" = self.by-version."scmp"."1.0.0"; - "uid-safe-1.1.0" = self.by-version."uid-safe"."1.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."csurf"."~1.7.0" = - self.by-version."csurf"."1.7.0"; - by-version."csurf"."1.7.0" = self.buildNodePackage { - name = "csurf-1.7.0"; - version = "1.7.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/csurf/-/csurf-1.7.0.tgz"; - name = "csurf-1.7.0.tgz"; - sha1 = "f24dc53753fccbdce0505f2abc5b57167b65ff18"; - }; - deps = { - "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; - "csrf-2.0.6" = self.by-version."csrf"."2.0.6"; - "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1"; + "boom-2.7.1" = self.by-version."boom"."2.7.1"; }; optionalDependencies = { }; @@ -1038,6 +1306,26 @@ os = [ ]; cpu = [ ]; }; + by-spec."debug"."2.0.0" = + self.by-version."debug"."2.0.0"; + by-version."debug"."2.0.0" = self.buildNodePackage { + name = "debug-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz"; + name = "debug-2.0.0.tgz"; + sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef"; + }; + deps = { + "ms-0.6.2" = self.by-version."ms"."0.6.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."debug"."~0.7.2" = self.by-version."debug"."0.7.4"; by-version."debug"."0.7.4" = self.buildNodePackage { @@ -1057,26 +1345,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."debug"."~1.0.1" = - self.by-version."debug"."1.0.4"; - by-version."debug"."1.0.4" = self.buildNodePackage { - name = "debug-1.0.4"; - version = "1.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz"; - name = "debug-1.0.4.tgz"; - sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8"; - }; - deps = { - "ms-0.6.2" = self.by-version."ms"."0.6.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."debug"."~2.1.3" = self.by-version."debug"."2.1.3"; by-version."debug"."2.1.3" = self.buildNodePackage { @@ -1097,16 +1365,56 @@ os = [ ]; cpu = [ ]; }; - by-spec."deep-diff"."^0.1.4" = - self.by-version."deep-diff"."0.1.7"; - by-version."deep-diff"."0.1.7" = self.buildNodePackage { - name = "deep-diff-0.1.7"; - version = "0.1.7"; + by-spec."debug"."~2.2.0" = + 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/deep-diff/-/deep-diff-0.1.7.tgz"; - name = "deep-diff-0.1.7.tgz"; - sha1 = "d36da978b64429c268116cea941f490e7949cd3d"; + 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."deep-eql"."0.1.3" = + self.by-version."deep-eql"."0.1.3"; + by-version."deep-eql"."0.1.3" = self.buildNodePackage { + name = "deep-eql-0.1.3"; + version = "0.1.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz"; + name = "deep-eql-0.1.3.tgz"; + sha1 = "ef558acab8de25206cd713906d74e56930eb69f2"; + }; + deps = { + "type-detect-0.1.1" = self.by-version."type-detect"."0.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."deep-extend"."~0.2.5" = + self.by-version."deep-extend"."0.2.11"; + by-version."deep-extend"."0.2.11" = self.buildNodePackage { + name = "deep-extend-0.2.11"; + version = "0.2.11"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"; + name = "deep-extend-0.2.11.tgz"; + sha1 = "7a16ba69729132340506170494bc83f7076fe08f"; }; deps = { }; @@ -1116,7 +1424,6 @@ os = [ ]; cpu = [ ]; }; - "deep-diff" = self.by-version."deep-diff"."0.1.7"; by-spec."delayed-stream"."0.0.5" = self.by-version."delayed-stream"."0.0.5"; by-version."delayed-stream"."0.0.5" = self.buildNodePackage { @@ -1136,16 +1443,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."depd"."~1.0.0" = - self.by-version."depd"."1.0.0"; - by-version."depd"."1.0.0" = self.buildNodePackage { - name = "depd-1.0.0"; - version = "1.0.0"; + by-spec."delegates"."^0.1.0" = + self.by-version."delegates"."0.1.0"; + by-version."delegates"."0.1.0" = self.buildNodePackage { + name = "delegates-0.1.0"; + version = "0.1.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/depd/-/depd-1.0.0.tgz"; - name = "depd-1.0.0.tgz"; - sha1 = "2fda0d00e98aae2845d4991ab1bf1f2a199073d5"; + url = "http://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"; + name = "delegates-0.1.0.tgz"; + sha1 = "b4b57be11a1653517a04b27f0949bdc327dfe390"; }; deps = { }; @@ -1155,6 +1462,27 @@ os = [ ]; cpu = [ ]; }; + by-spec."depd"."~1.0.0" = + self.by-version."depd"."1.0.1"; + by-version."depd"."1.0.1" = self.buildNodePackage { + name = "depd-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; + name = "depd-1.0.1.tgz"; + sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."depd"."~1.0.1" = + self.by-version."depd"."1.0.1"; by-spec."destroy"."1.0.3" = self.by-version."destroy"."1.0.3"; by-version."destroy"."1.0.3" = self.buildNodePackage { @@ -1174,6 +1502,65 @@ os = [ ]; cpu = [ ]; }; + by-spec."diff"."1.0.8" = + 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."difflib"."~0.2.1" = + self.by-version."difflib"."0.2.4"; + by-version."difflib"."0.2.4" = self.buildNodePackage { + name = "difflib-0.2.4"; + version = "0.2.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/difflib/-/difflib-0.2.4.tgz"; + name = "difflib-0.2.4.tgz"; + sha1 = "b5e30361a6db023176d562892db85940a718f47e"; + }; + deps = { + "heap-0.2.6" = self.by-version."heap"."0.2.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."dreamopt"."~0.6.0" = + self.by-version."dreamopt"."0.6.0"; + by-version."dreamopt"."0.6.0" = self.buildNodePackage { + name = "dreamopt-0.6.0"; + version = "0.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/dreamopt/-/dreamopt-0.6.0.tgz"; + name = "dreamopt-0.6.0.tgz"; + sha1 = "d813ccdac8d39d8ad526775514a13dda664d6b4b"; + }; + deps = { + "wordwrap-1.0.0" = self.by-version."wordwrap"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."ee-first"."1.1.0" = self.by-version."ee-first"."1.1.0"; by-version."ee-first"."1.1.0" = self.buildNodePackage { @@ -1193,37 +1580,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."errorhandler"."~1.3.5" = - self.by-version."errorhandler"."1.3.5"; - by-version."errorhandler"."1.3.5" = self.buildNodePackage { - name = "errorhandler-1.3.5"; - version = "1.3.5"; + by-spec."es5-ext"."0.8.x" = + self.by-version."es5-ext"."0.8.2"; + by-version."es5-ext"."0.8.2" = self.buildNodePackage { + name = "es5-ext-0.8.2"; + version = "0.8.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.3.5.tgz"; - name = "errorhandler-1.3.5.tgz"; - sha1 = "4ef655dd2c30e1fc1bf9c24805fa34ba20d4f69a"; - }; - deps = { - "accepts-1.2.5" = self.by-version."accepts"."1.2.5"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."errs"."~0.3.0" = - self.by-version."errs"."0.3.2"; - by-version."errs"."0.3.2" = self.buildNodePackage { - name = "errs-0.3.2"; - version = "0.3.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/errs/-/errs-0.3.2.tgz"; - name = "errs-0.3.2.tgz"; - sha1 = "798099b2dbd37ca2bc749e538a7c1307d0b50499"; + url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.8.2.tgz"; + name = "es5-ext-0.8.2.tgz"; + sha1 = "aba8d9e1943a895ac96837a62a39b3f55ecd94ab"; }; deps = { }; @@ -1252,6 +1618,183 @@ os = [ ]; cpu = [ ]; }; + by-spec."escape-string-regexp"."1.0.2" = + self.by-version."escape-string-regexp"."1.0.2"; + by-version."escape-string-regexp"."1.0.2" = self.buildNodePackage { + name = "escape-string-regexp-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz"; + name = "escape-string-regexp-1.0.2.tgz"; + sha1 = "4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."escape-string-regexp"."^1.0.0" = + self.by-version."escape-string-regexp"."1.0.3"; + by-version."escape-string-regexp"."1.0.3" = self.buildNodePackage { + name = "escape-string-regexp-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"; + name = "escape-string-regexp-1.0.3.tgz"; + sha1 = "9e2d8b25bc2555c3336723750e03f099c2735bb5"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."escape-string-regexp"."^1.0.2" = + self.by-version."escape-string-regexp"."1.0.3"; + by-spec."escodegen"."1.3.x" = + self.by-version."escodegen"."1.3.3"; + by-version."escodegen"."1.3.3" = self.buildNodePackage { + name = "escodegen-1.3.3"; + version = "1.3.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz"; + name = "escodegen-1.3.3.tgz"; + sha1 = "f024016f5a88e046fd12005055e939802e6c5f23"; + }; + deps = { + "esutils-1.0.0" = self.by-version."esutils"."1.0.0"; + "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1"; + "esprima-1.1.1" = self.by-version."esprima"."1.1.1"; + }; + optionalDependencies = { + "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."esprima"."1.2.x" = + self.by-version."esprima"."1.2.5"; + by-version."esprima"."1.2.5" = self.buildNodePackage { + name = "esprima-1.2.5"; + version = "1.2.5"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz"; + name = "esprima-1.2.5.tgz"; + sha1 = "0993502feaf668138325756f30f9a51feeec11e9"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."esprima"."~ 1.0.2" = + self.by-version."esprima"."1.0.4"; + by-version."esprima"."1.0.4" = self.buildNodePackage { + name = "esprima-1.0.4"; + version = "1.0.4"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz"; + name = "esprima-1.0.4.tgz"; + sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."esprima"."~1.1.1" = + self.by-version."esprima"."1.1.1"; + by-version."esprima"."1.1.1" = self.buildNodePackage { + name = "esprima-1.1.1"; + version = "1.1.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz"; + name = "esprima-1.1.1.tgz"; + sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."esprima"."~2.2.0" = + self.by-version."esprima"."2.2.0"; + by-version."esprima"."2.2.0" = self.buildNodePackage { + name = "esprima-2.2.0"; + version = "2.2.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/esprima/-/esprima-2.2.0.tgz"; + name = "esprima-2.2.0.tgz"; + sha1 = "4292c1d68e4173d815fa2290dc7afc96d81fcd83"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."estraverse"."~1.5.0" = + self.by-version."estraverse"."1.5.1"; + by-version."estraverse"."1.5.1" = self.buildNodePackage { + name = "estraverse-1.5.1"; + version = "1.5.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz"; + name = "estraverse-1.5.1.tgz"; + sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."esutils"."~1.0.0" = + self.by-version."esutils"."1.0.0"; + by-version."esutils"."1.0.0" = self.buildNodePackage { + name = "esutils-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz"; + name = "esutils-1.0.0.tgz"; + sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."etag"."~1.5.1" = self.by-version."etag"."1.5.1"; by-version."etag"."1.5.1" = self.buildNodePackage { @@ -1272,67 +1815,41 @@ os = [ ]; cpu = [ ]; }; - by-spec."express"."^3.4.8" = - self.by-version."express"."3.20.2"; - by-version."express"."3.20.2" = self.buildNodePackage { - name = "express-3.20.2"; - version = "3.20.2"; - bin = true; + by-spec."express"."^4.8.7" = + self.by-version."express"."4.12.3"; + by-version."express"."4.12.3" = self.buildNodePackage { + name = "express-4.12.3"; + version = "4.12.3"; + bin = false; src = fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.20.2.tgz"; - name = "express-3.20.2.tgz"; - sha1 = "c604027746e60f3da0a4b43063375d21c3235858"; + url = "http://registry.npmjs.org/express/-/express-4.12.3.tgz"; + name = "express-4.12.3.tgz"; + sha1 = "6b9d94aec5ae03270d86d390c277a8c5a5ad0ee2"; }; deps = { - "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0"; - "connect-2.29.1" = self.by-version."connect"."2.29.1"; + "accepts-1.2.7" = self.by-version."accepts"."1.2.7"; "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; "content-type-1.0.1" = self.by-version."content-type"."1.0.1"; - "commander-2.6.0" = self.by-version."commander"."2.6.0"; "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; "etag-1.5.1" = self.by-version."etag"."1.5.1"; + "finalhandler-0.3.4" = self.by-version."finalhandler"."0.3.4"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0"; "methods-1.1.1" = self.by-version."methods"."1.1.1"; - "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "proxy-addr-1.0.7" = self.by-version."proxy-addr"."1.0.7"; + "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; + "proxy-addr-1.0.8" = self.by-version."proxy-addr"."1.0.8"; + "qs-2.4.1" = self.by-version."qs"."2.4.1"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; "send-0.12.2" = self.by-version."send"."0.12.2"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + "serve-static-1.9.2" = self.by-version."serve-static"."1.9.2"; + "type-is-1.6.2" = self.by-version."type-is"."1.6.2"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "express" = self.by-version."express"."3.20.2"; - by-spec."express-session"."~1.10.4" = - self.by-version."express-session"."1.10.4"; - by-version."express-session"."1.10.4" = self.buildNodePackage { - name = "express-session-1.10.4"; - version = "1.10.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/express-session/-/express-session-1.10.4.tgz"; - name = "express-session-1.10.4.tgz"; - sha1 = "04e1d92e00593893e1f76569eb3ad63113daf94c"; - }; - deps = { - "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6"; - "crc-3.2.1" = self.by-version."crc"."3.2.1"; - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "depd-1.0.0" = self.by-version."depd"."1.0.0"; - "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "uid-safe-1.1.0" = self.by-version."uid-safe"."1.1.0"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; }; optionalDependencies = { @@ -1341,6 +1858,7 @@ os = [ ]; cpu = [ ]; }; + "express" = self.by-version."express"."4.12.3"; by-spec."extend"."~1.2.1" = self.by-version."extend"."1.2.1"; by-version."extend"."1.2.1" = self.buildNodePackage { @@ -1360,6 +1878,25 @@ os = [ ]; cpu = [ ]; }; + by-spec."extend"."~1.3.0" = + self.by-version."extend"."1.3.0"; + by-version."extend"."1.3.0" = self.buildNodePackage { + name = "extend-1.3.0"; + version = "1.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/extend/-/extend-1.3.0.tgz"; + name = "extend-1.3.0.tgz"; + sha1 = "d1516fb0ff5624d2ebf9123ea1dac5a1994004f8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."eyes"."0.1.x" = self.by-version."eyes"."0.1.8"; by-version."eyes"."0.1.8" = self.buildNodePackage { @@ -1379,6 +1916,27 @@ os = [ ]; cpu = [ ]; }; + by-spec."fileset"."0.1.x" = + self.by-version."fileset"."0.1.5"; + by-version."fileset"."0.1.5" = self.buildNodePackage { + name = "fileset-0.1.5"; + version = "0.1.5"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/fileset/-/fileset-0.1.5.tgz"; + name = "fileset-0.1.5.tgz"; + sha1 = "acc423bfaf92843385c66bf75822264d11b7bd94"; + }; + deps = { + "minimatch-0.4.0" = self.by-version."minimatch"."0.4.0"; + "glob-3.2.11" = self.by-version."glob"."3.2.11"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."finalhandler"."0.3.4" = self.by-version."finalhandler"."0.3.4"; by-version."finalhandler"."0.3.4" = self.buildNodePackage { @@ -1393,7 +1951,7 @@ deps = { "debug-2.1.3" = self.by-version."debug"."2.1.3"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; }; optionalDependencies = { }; @@ -1401,38 +1959,37 @@ os = [ ]; cpu = [ ]; }; - by-spec."follow"."~0.11.2" = - self.by-version."follow"."0.11.4"; - by-version."follow"."0.11.4" = self.buildNodePackage { - name = "follow-0.11.4"; - version = "0.11.4"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/follow/-/follow-0.11.4.tgz"; - name = "follow-0.11.4.tgz"; - sha1 = "87e9a50d443f921d05704ebac412a14ab9d9232f"; - }; - deps = { - "request-2.53.0" = self.by-version."request"."2.53.0"; - "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3"; - "debug-0.7.4" = self.by-version."debug"."0.7.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."forever-agent"."~0.2.0" = - self.by-version."forever-agent"."0.2.0"; - by-version."forever-agent"."0.2.0" = self.buildNodePackage { - name = "forever-agent-0.2.0"; - version = "0.2.0"; + by-spec."findup-sync"."~0.1.2" = + self.by-version."findup-sync"."0.1.3"; + by-version."findup-sync"."0.1.3" = self.buildNodePackage { + name = "findup-sync-0.1.3"; + version = "0.1.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz"; - name = "forever-agent-0.2.0.tgz"; - sha1 = "e1c25c7ad44e09c38f233876c76fcc24ff843b1f"; + url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz"; + name = "findup-sync-0.1.3.tgz"; + sha1 = "7f3e7a97b82392c653bf06589bd85190e93c3683"; + }; + deps = { + "glob-3.2.11" = self.by-version."glob"."3.2.11"; + "lodash-2.4.2" = self.by-version."lodash"."2.4.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."flagged-respawn"."~0.3.0" = + self.by-version."flagged-respawn"."0.3.1"; + by-version."flagged-respawn"."0.3.1" = self.buildNodePackage { + name = "flagged-respawn-0.3.1"; + version = "0.3.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.1.tgz"; + name = "flagged-respawn-0.3.1.tgz"; + sha1 = "397700925df6e12452202a71e89d89545fbbbe9d"; }; deps = { }; @@ -1461,21 +2018,18 @@ os = [ ]; cpu = [ ]; }; - by-spec."form-data"."0.1.3" = - self.by-version."form-data"."0.1.3"; - by-version."form-data"."0.1.3" = self.buildNodePackage { - name = "form-data-0.1.3"; - version = "0.1.3"; + by-spec."forever-agent"."~0.6.0" = + self.by-version."forever-agent"."0.6.1"; + by-version."forever-agent"."0.6.1" = self.buildNodePackage { + name = "forever-agent-0.6.1"; + version = "0.6.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz"; - name = "form-data-0.1.3.tgz"; - sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea"; + url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + name = "forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; }; deps = { - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "async-0.9.0" = self.by-version."async"."0.9.0"; }; optionalDependencies = { }; @@ -1483,16 +2037,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."form-data"."~0.0.3" = - self.by-version."form-data"."0.0.10"; - by-version."form-data"."0.0.10" = self.buildNodePackage { - name = "form-data-0.0.10"; - version = "0.0.10"; + by-spec."form-data"."0.1.2" = + self.by-version."form-data"."0.1.2"; + by-version."form-data"."0.1.2" = self.buildNodePackage { + name = "form-data-0.1.2"; + version = "0.1.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz"; - name = "form-data-0.0.10.tgz"; - sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed"; + url = "http://registry.npmjs.org/form-data/-/form-data-0.1.2.tgz"; + name = "form-data-0.1.2.tgz"; + sha1 = "1143c21357911a78dd7913b189b4bab5d5d57445"; }; deps = { "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; @@ -1541,7 +2095,47 @@ deps = { "async-0.9.0" = self.by-version."async"."0.9.0"; "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10"; + "mime-types-2.0.11" = self.by-version."mime-types"."2.0.11"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."formatio"."1.1.1" = + self.by-version."formatio"."1.1.1"; + by-version."formatio"."1.1.1" = self.buildNodePackage { + name = "formatio-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz"; + name = "formatio-1.1.1.tgz"; + sha1 = "5ed3ccd636551097383465d996199100e86161e9"; + }; + deps = { + "samsam-1.1.2" = self.by-version."samsam"."1.1.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."formatio"."~1.0" = + self.by-version."formatio"."1.0.2"; + by-version."formatio"."1.0.2" = self.buildNodePackage { + name = "formatio-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/formatio/-/formatio-1.0.2.tgz"; + name = "formatio-1.0.2.tgz"; + sha1 = "e7991ca144ff7d8cff07bb9ac86a9b79c6ba47ef"; + }; + deps = { + "samsam-1.1.2" = self.by-version."samsam"."1.1.2"; }; optionalDependencies = { }; @@ -1606,7 +2200,202 @@ os = [ ]; cpu = [ ]; }; - by-spec."glob"."^3.2.11" = + by-spec."fstream"."^1.0.2" = + self.by-version."fstream"."1.0.6"; + by-version."fstream"."1.0.6" = self.buildNodePackage { + name = "fstream-1.0.6"; + version = "1.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/fstream/-/fstream-1.0.6.tgz"; + name = "fstream-1.0.6.tgz"; + sha1 = "817e50312fb4ed90da865c8eb5ecd1d1d7aed0ec"; + }; + deps = { + "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; + "rimraf-2.3.3" = self.by-version."rimraf"."2.3.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."fstream"."~0.1.17" = + self.by-version."fstream"."0.1.31"; + by-version."fstream"."0.1.31" = self.buildNodePackage { + name = "fstream-0.1.31"; + version = "0.1.31"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz"; + name = "fstream-0.1.31.tgz"; + sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988"; + }; + deps = { + "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; + "rimraf-2.3.3" = self.by-version."rimraf"."2.3.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."fstream"."~0.1.22" = + self.by-version."fstream"."0.1.31"; + by-spec."fstream"."~0.1.28" = + self.by-version."fstream"."0.1.31"; + by-spec."fstream-ignore"."0.0.7" = + self.by-version."fstream-ignore"."0.0.7"; + by-version."fstream-ignore"."0.0.7" = self.buildNodePackage { + name = "fstream-ignore-0.0.7"; + version = "0.0.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz"; + name = "fstream-ignore-0.0.7.tgz"; + sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63"; + }; + deps = { + "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."gauge"."~1.2.0" = + self.by-version."gauge"."1.2.0"; + by-version."gauge"."1.2.0" = self.buildNodePackage { + name = "gauge-1.2.0"; + version = "1.2.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/gauge/-/gauge-1.2.0.tgz"; + name = "gauge-1.2.0.tgz"; + sha1 = "3094ab1285633f799814388fc8f2de67b4c012c5"; + }; + deps = { + "ansi-0.3.0" = self.by-version."ansi"."0.3.0"; + "has-unicode-1.0.0" = self.by-version."has-unicode"."1.0.0"; + "lodash.pad-3.1.0" = self.by-version."lodash.pad"."3.1.0"; + "lodash.padleft-3.1.1" = self.by-version."lodash.padleft"."3.1.1"; + "lodash.padright-3.1.1" = self.by-version."lodash.padright"."3.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."generate-function"."^2.0.0" = + self.by-version."generate-function"."2.0.0"; + by-version."generate-function"."2.0.0" = self.buildNodePackage { + name = "generate-function-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; + name = "generate-function-2.0.0.tgz"; + sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."generate-object-property"."^1.1.0" = + self.by-version."generate-object-property"."1.1.1"; + by-version."generate-object-property"."1.1.1" = self.buildNodePackage { + name = "generate-object-property-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.1.1.tgz"; + name = "generate-object-property-1.1.1.tgz"; + sha1 = "8fda6b4cb69b34a189a6cebee7c4c268af47cc93"; + }; + deps = { + "is-property-1.0.2" = self.by-version."is-property"."1.0.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."generic-pool-redux"."~0.1.0" = + self.by-version."generic-pool-redux"."0.1.0"; + by-version."generic-pool-redux"."0.1.0" = self.buildNodePackage { + name = "generic-pool-redux-0.1.0"; + version = "0.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/generic-pool-redux/-/generic-pool-redux-0.1.0.tgz"; + name = "generic-pool-redux-0.1.0.tgz"; + sha1 = "326c2594e17fba4d4f0622cfe09acc3c84cb3a82"; + }; + 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."glob"."3.2.3" = + self.by-version."glob"."3.2.3"; + by-version."glob"."3.2.3" = self.buildNodePackage { + name = "glob-3.2.3"; + version = "3.2.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz"; + name = "glob-3.2.3.tgz"; + sha1 = "e313eeb249c7affaa5c475286b0e115b59839467"; + }; + deps = { + "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; + "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."glob"."3.x" = self.by-version."glob"."3.2.11"; by-version."glob"."3.2.11" = self.buildNodePackage { name = "glob-3.2.11"; @@ -1627,6 +2416,232 @@ os = [ ]; cpu = [ ]; }; + by-spec."glob"."^4.4.2" = + self.by-version."glob"."4.5.3"; + by-version."glob"."4.5.3" = self.buildNodePackage { + name = "glob-4.5.3"; + version = "4.5.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/glob/-/glob-4.5.3.tgz"; + name = "glob-4.5.3.tgz"; + sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; + }; + deps = { + "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "minimatch-2.0.7" = self.by-version."minimatch"."2.0.7"; + "once-1.3.2" = self.by-version."once"."1.3.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."glob"."~3.2.9" = + self.by-version."glob"."3.2.11"; + by-spec."graceful-fs"."1.2" = + self.by-version."graceful-fs"."1.2.3"; + by-version."graceful-fs"."1.2.3" = self.buildNodePackage { + name = "graceful-fs-1.2.3"; + version = "1.2.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"; + name = "graceful-fs-1.2.3.tgz"; + sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."graceful-fs"."3" = + self.by-version."graceful-fs"."3.0.6"; + by-version."graceful-fs"."3.0.6" = self.buildNodePackage { + name = "graceful-fs-3.0.6"; + version = "3.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz"; + name = "graceful-fs-3.0.6.tgz"; + sha1 = "dce3a18351cb94cdc82e688b2e3dd2842d1b09bb"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."graceful-fs"."~2.0.0" = + self.by-version."graceful-fs"."2.0.3"; + by-version."graceful-fs"."2.0.3" = self.buildNodePackage { + name = "graceful-fs-2.0.3"; + version = "2.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz"; + name = "graceful-fs-2.0.3.tgz"; + sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."graceful-fs"."~3.0.2" = + self.by-version."graceful-fs"."3.0.6"; + by-spec."graceful-readlink".">= 1.0.0" = + self.by-version."graceful-readlink"."1.0.1"; + by-version."graceful-readlink"."1.0.1" = self.buildNodePackage { + name = "graceful-readlink-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + name = "graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."growl"."1.8.1" = + self.by-version."growl"."1.8.1"; + by-version."growl"."1.8.1" = self.buildNodePackage { + name = "growl-1.8.1"; + version = "1.8.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/growl/-/growl-1.8.1.tgz"; + name = "growl-1.8.1.tgz"; + sha1 = "4b2dec8d907e93db336624dcec0183502f8c9428"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."handlebars"."1.3.x" = + self.by-version."handlebars"."1.3.0"; + by-version."handlebars"."1.3.0" = self.buildNodePackage { + name = "handlebars-1.3.0"; + version = "1.3.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/handlebars/-/handlebars-1.3.0.tgz"; + name = "handlebars-1.3.0.tgz"; + sha1 = "9e9b130a93e389491322d975cf3ec1818c37ce34"; + }; + deps = { + "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; + }; + optionalDependencies = { + "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6"; + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."har-validator"."^1.4.0" = + self.by-version."har-validator"."1.7.0"; + by-version."har-validator"."1.7.0" = self.buildNodePackage { + name = "har-validator-1.7.0"; + version = "1.7.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/har-validator/-/har-validator-1.7.0.tgz"; + name = "har-validator-1.7.0.tgz"; + sha1 = "563f8c58edca6410e2e408b0e540161da580dc46"; + }; + deps = { + "bluebird-2.9.25" = self.by-version."bluebird"."2.9.25"; + "chalk-1.0.0" = self.by-version."chalk"."1.0.0"; + "commander-2.8.1" = self.by-version."commander"."2.8.1"; + "is-my-json-valid-2.11.0" = self.by-version."is-my-json-valid"."2.11.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."has-ansi"."^0.1.0" = + self.by-version."has-ansi"."0.1.0"; + by-version."has-ansi"."0.1.0" = self.buildNodePackage { + name = "has-ansi-0.1.0"; + version = "0.1.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz"; + name = "has-ansi-0.1.0.tgz"; + sha1 = "84f265aae8c0e6a88a12d7022894b7568894c62e"; + }; + deps = { + "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."has-ansi"."^1.0.3" = + self.by-version."has-ansi"."1.0.3"; + by-version."has-ansi"."1.0.3" = self.buildNodePackage { + name = "has-ansi-1.0.3"; + version = "1.0.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz"; + name = "has-ansi-1.0.3.tgz"; + sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538"; + }; + deps = { + "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1"; + "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."has-unicode"."^1.0.0" = + self.by-version."has-unicode"."1.0.0"; + by-version."has-unicode"."1.0.0" = self.buildNodePackage { + name = "has-unicode-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz"; + name = "has-unicode-1.0.0.tgz"; + sha1 = "bac5c44e064c2ffc3b8fcbd8c71afe08f9afc8cc"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."hawk"."1.1.1" = self.by-version."hawk"."1.1.1"; by-version."hawk"."1.1.1" = self.buildNodePackage { @@ -1650,29 +2665,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."hawk"."~0.10.2" = - self.by-version."hawk"."0.10.2"; - by-version."hawk"."0.10.2" = self.buildNodePackage { - name = "hawk-0.10.2"; - version = "0.10.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz"; - name = "hawk-0.10.2.tgz"; - sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2"; - }; - deps = { - "hoek-0.7.6" = self.by-version."hoek"."0.7.6"; - "boom-0.3.8" = self.by-version."boom"."0.3.8"; - "cryptiles-0.1.3" = self.by-version."cryptiles"."0.1.3"; - "sntp-0.1.4" = self.by-version."sntp"."0.1.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."hawk"."~2.3.0" = self.by-version."hawk"."2.3.1"; by-version."hawk"."2.3.1" = self.buildNodePackage { @@ -1685,8 +2677,8 @@ sha1 = "1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f"; }; deps = { - "hoek-2.11.1" = self.by-version."hoek"."2.11.1"; - "boom-2.6.1" = self.by-version."boom"."2.6.1"; + "hoek-2.13.0" = self.by-version."hoek"."2.13.0"; + "boom-2.7.1" = self.by-version."boom"."2.7.1"; "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4"; "sntp-1.0.9" = self.by-version."sntp"."1.0.9"; }; @@ -1696,16 +2688,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."hoek"."0.7.x" = - self.by-version."hoek"."0.7.6"; - by-version."hoek"."0.7.6" = self.buildNodePackage { - name = "hoek-0.7.6"; - version = "0.7.6"; + by-spec."heap".">= 0.2.0" = + self.by-version."heap"."0.2.6"; + by-version."heap"."0.2.6" = self.buildNodePackage { + name = "heap-0.2.6"; + version = "0.2.6"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz"; - name = "hoek-0.7.6.tgz"; - sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a"; + url = "http://registry.npmjs.org/heap/-/heap-0.2.6.tgz"; + name = "heap-0.2.6.tgz"; + sha1 = "087e1f10b046932fc8594dd9e6d378afc9d1e5ac"; }; deps = { }; @@ -1735,15 +2727,15 @@ cpu = [ ]; }; by-spec."hoek"."2.x.x" = - self.by-version."hoek"."2.11.1"; - by-version."hoek"."2.11.1" = self.buildNodePackage { - name = "hoek-2.11.1"; - version = "2.11.1"; + self.by-version."hoek"."2.13.0"; + by-version."hoek"."2.13.0" = self.buildNodePackage { + name = "hoek-2.13.0"; + version = "2.13.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/hoek/-/hoek-2.11.1.tgz"; - name = "hoek-2.11.1.tgz"; - sha1 = "3839a8b72f86aade3312100afaf80648af155b38"; + url = "http://registry.npmjs.org/hoek/-/hoek-2.13.0.tgz"; + name = "hoek-2.13.0.tgz"; + sha1 = "cc86b5c1c344b41a7271be449e232fac8d6f450c"; }; deps = { }; @@ -1753,27 +2745,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."http-errors"."~1.3.1" = - self.by-version."http-errors"."1.3.1"; - by-version."http-errors"."1.3.1" = self.buildNodePackage { - name = "http-errors-1.3.1"; - version = "1.3.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz"; - name = "http-errors-1.3.1.tgz"; - sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; - }; - deps = { - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "statuses-1.2.1" = self.by-version."statuses"."1.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."http-signature"."~0.10.0" = self.by-version."http-signature"."0.10.1"; by-version."http-signature"."0.10.1" = self.buildNodePackage { @@ -1796,16 +2767,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."iconv-lite"."0.4.7" = - self.by-version."iconv-lite"."0.4.7"; - by-version."iconv-lite"."0.4.7" = self.buildNodePackage { - name = "iconv-lite-0.4.7"; - version = "0.4.7"; + by-spec."iconv-lite"."0.4.8" = + self.by-version."iconv-lite"."0.4.8"; + by-version."iconv-lite"."0.4.8" = self.buildNodePackage { + name = "iconv-lite-0.4.8"; + version = "0.4.8"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.7.tgz"; - name = "iconv-lite-0.4.7.tgz"; - sha1 = "89d32fec821bf8597f44609b4bc09bed5c209a23"; + url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz"; + name = "iconv-lite-0.4.8.tgz"; + sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20"; }; deps = { }; @@ -1815,6 +2786,27 @@ os = [ ]; cpu = [ ]; }; + by-spec."inflight"."^1.0.4" = + self.by-version."inflight"."1.0.4"; + by-version."inflight"."1.0.4" = self.buildNodePackage { + name = "inflight-1.0.4"; + version = "1.0.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"; + name = "inflight-1.0.4.tgz"; + sha1 = "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a"; + }; + deps = { + "once-1.3.2" = self.by-version."once"."1.3.2"; + "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."inherits"."2" = self.by-version."inherits"."2.0.1"; by-version."inherits"."2.0.1" = self.buildNodePackage { @@ -1834,18 +2826,104 @@ os = [ ]; cpu = [ ]; }; + by-spec."inherits"."2.0.1" = + self.by-version."inherits"."2.0.1"; + by-spec."inherits"."~2.0.0" = + self.by-version."inherits"."2.0.1"; by-spec."inherits"."~2.0.1" = self.by-version."inherits"."2.0.1"; - by-spec."ipaddr.js"."0.1.9" = - self.by-version."ipaddr.js"."0.1.9"; - by-version."ipaddr.js"."0.1.9" = self.buildNodePackage { - name = "ipaddr.js-0.1.9"; - version = "0.1.9"; + by-spec."ini"."1.x.x" = + self.by-version."ini"."1.3.3"; + by-version."ini"."1.3.3" = self.buildNodePackage { + name = "ini-1.3.3"; + version = "1.3.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.9.tgz"; - name = "ipaddr.js-0.1.9.tgz"; - sha1 = "a9c78ccc12dc9010f296ab9aef2f61f432d69efa"; + url = "http://registry.npmjs.org/ini/-/ini-1.3.3.tgz"; + name = "ini-1.3.3.tgz"; + sha1 = "c07e34aef1de06aff21d413b458e52b21533a11e"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ini"."~1.3.0" = + self.by-version."ini"."1.3.3"; + by-spec."interpret"."^0.3.2" = + self.by-version."interpret"."0.3.10"; + by-version."interpret"."0.3.10" = self.buildNodePackage { + name = "interpret-0.3.10"; + version = "0.3.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"; + name = "interpret-0.3.10.tgz"; + sha1 = "088c25de731c6c5b112a90f0071cfaf459e5a7bb"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ipaddr.js"."1.0.1" = + self.by-version."ipaddr.js"."1.0.1"; + by-version."ipaddr.js"."1.0.1" = self.buildNodePackage { + name = "ipaddr.js-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz"; + name = "ipaddr.js-1.0.1.tgz"; + sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."is-my-json-valid"."^2.10.1" = + self.by-version."is-my-json-valid"."2.11.0"; + by-version."is-my-json-valid"."2.11.0" = self.buildNodePackage { + name = "is-my-json-valid-2.11.0"; + version = "2.11.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.11.0.tgz"; + name = "is-my-json-valid-2.11.0.tgz"; + sha1 = "11f130d52c6c0b2ee132a72feb8e3e4c61a2c54f"; + }; + deps = { + "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0"; + "generate-object-property-1.1.1" = self.by-version."generate-object-property"."1.1.1"; + "jsonpointer-1.1.0" = self.by-version."jsonpointer"."1.1.0"; + "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."is-property"."^1.0.0" = + self.by-version."is-property"."1.0.2"; + by-version."is-property"."1.0.2" = self.buildNodePackage { + name = "is-property-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; + name = "is-property-1.0.2.tgz"; + sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; }; deps = { }; @@ -1874,7 +2952,7 @@ os = [ ]; cpu = [ ]; }; - by-spec."isstream"."~0.1.1" = + by-spec."isstream"."0.1.x" = self.by-version."isstream"."0.1.2"; by-version."isstream"."0.1.2" = self.buildNodePackage { name = "isstream-0.1.2"; @@ -1893,18 +2971,159 @@ os = [ ]; cpu = [ ]; }; - by-spec."json-stringify-safe"."~3.0.0" = - self.by-version."json-stringify-safe"."3.0.0"; - by-version."json-stringify-safe"."3.0.0" = self.buildNodePackage { - name = "json-stringify-safe-3.0.0"; - version = "3.0.0"; - bin = false; + by-spec."isstream"."~0.1.1" = + self.by-version."isstream"."0.1.2"; + by-spec."istanbul"."^0.2.10" = + self.by-version."istanbul"."0.2.16"; + by-version."istanbul"."0.2.16" = self.buildNodePackage { + name = "istanbul-0.2.16"; + version = "0.2.16"; + bin = true; src = fetchurl { - url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz"; - name = "json-stringify-safe-3.0.0.tgz"; - sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3"; + url = "http://registry.npmjs.org/istanbul/-/istanbul-0.2.16.tgz"; + name = "istanbul-0.2.16.tgz"; + sha1 = "870545a0d4f4b4ce161039e9e805a98c2c700bd9"; }; deps = { + "esprima-1.2.5" = self.by-version."esprima"."1.2.5"; + "escodegen-1.3.3" = self.by-version."escodegen"."1.3.3"; + "handlebars-1.3.0" = self.by-version."handlebars"."1.3.0"; + "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; + "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; + "fileset-0.1.5" = self.by-version."fileset"."0.1.5"; + "which-1.0.9" = self.by-version."which"."1.0.9"; + "async-0.9.0" = self.by-version."async"."0.9.0"; + "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; + "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3"; + "resolve-0.7.4" = self.by-version."resolve"."0.7.4"; + "js-yaml-3.3.1" = self.by-version."js-yaml"."3.3.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "istanbul" = self.by-version."istanbul"."0.2.16"; + by-spec."jade"."0.26.3" = + self.by-version."jade"."0.26.3"; + by-version."jade"."0.26.3" = self.buildNodePackage { + name = "jade-0.26.3"; + version = "0.26.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz"; + name = "jade-0.26.3.tgz"; + sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c"; + }; + deps = { + "commander-0.6.1" = self.by-version."commander"."0.6.1"; + "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."jayschema"."^0.3.1" = + self.by-version."jayschema"."0.3.1"; + by-version."jayschema"."0.3.1" = self.buildNodePackage { + name = "jayschema-0.3.1"; + version = "0.3.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/jayschema/-/jayschema-0.3.1.tgz"; + name = "jayschema-0.3.1.tgz"; + sha1 = "76f4769f9b172ef7d5dcde4875b49cb736179b58"; + }; + deps = { + "when-3.4.6" = self.by-version."when"."3.4.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "jayschema" = self.by-version."jayschema"."0.3.1"; + by-spec."jayschema-error-messages"."^1.0.2" = + self.by-version."jayschema-error-messages"."1.0.3"; + by-version."jayschema-error-messages"."1.0.3" = self.buildNodePackage { + name = "jayschema-error-messages-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/jayschema-error-messages/-/jayschema-error-messages-1.0.3.tgz"; + name = "jayschema-error-messages-1.0.3.tgz"; + sha1 = "8bac6e52ae89d406fbe1a7db4ae44debfd289066"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "jayschema-error-messages" = self.by-version."jayschema-error-messages"."1.0.3"; + by-spec."js-yaml"."3.0.1" = + self.by-version."js-yaml"."3.0.1"; + by-version."js-yaml"."3.0.1" = self.buildNodePackage { + name = "js-yaml-3.0.1"; + version = "3.0.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz"; + name = "js-yaml-3.0.1.tgz"; + sha1 = "76405fea5bce30fc8f405d48c6dca7f0a32c6afe"; + }; + deps = { + "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; + "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."js-yaml"."3.x" = + self.by-version."js-yaml"."3.3.1"; + by-version."js-yaml"."3.3.1" = self.buildNodePackage { + name = "js-yaml-3.3.1"; + version = "3.3.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.3.1.tgz"; + name = "js-yaml-3.3.1.tgz"; + sha1 = "ca1acd3423ec275d12140a7bab51db015ba0b3c0"; + }; + deps = { + "argparse-1.0.2" = self.by-version."argparse"."1.0.2"; + "esprima-2.2.0" = self.by-version."esprima"."2.2.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."json-diff"."0.3.1" = + self.by-version."json-diff"."0.3.1"; + by-version."json-diff"."0.3.1" = self.buildNodePackage { + name = "json-diff-0.3.1"; + version = "0.3.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/json-diff/-/json-diff-0.3.1.tgz"; + name = "json-diff-0.3.1.tgz"; + sha1 = "6dbc3ae2d25e075a7fd71bcd9874458666fb681b"; + }; + deps = { + "dreamopt-0.6.0" = self.by-version."dreamopt"."0.6.0"; + "difflib-0.2.4" = self.by-version."difflib"."0.2.4"; + "cli-color-0.1.7" = self.by-version."cli-color"."0.1.7"; }; optionalDependencies = { }; @@ -1931,16 +3150,136 @@ os = [ ]; cpu = [ ]; }; + by-spec."jsonpointer"."^1.1.0" = + self.by-version."jsonpointer"."1.1.0"; + by-version."jsonpointer"."1.1.0" = self.buildNodePackage { + name = "jsonpointer-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz"; + name = "jsonpointer-1.1.0.tgz"; + sha1 = "c3c72efaed3b97154163dc01dd349e1cfe0f80fc"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."knex"."^0.7.6" = + self.by-version."knex"."0.7.6"; + by-version."knex"."0.7.6" = self.buildNodePackage { + name = "knex-0.7.6"; + version = "0.7.6"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/knex/-/knex-0.7.6.tgz"; + name = "knex-0.7.6.tgz"; + sha1 = "325d18174b0625658ff0d35aaf1cd9e631696992"; + }; + deps = { + "bluebird-2.9.25" = self.by-version."bluebird"."2.9.25"; + "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; + "commander-2.8.1" = self.by-version."commander"."2.8.1"; + "generic-pool-redux-0.1.0" = self.by-version."generic-pool-redux"."0.1.0"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + "interpret-0.3.10" = self.by-version."interpret"."0.3.10"; + "liftoff-0.13.6" = self.by-version."liftoff"."0.13.6"; + "lodash-2.4.2" = self.by-version."lodash"."2.4.2"; + "minimist-1.1.1" = self.by-version."minimist"."1.1.1"; + "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; + "tildify-1.0.0" = self.by-version."tildify"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "knex" = self.by-version."knex"."0.7.6"; + by-spec."lcov-parse"."0.0.6" = + self.by-version."lcov-parse"."0.0.6"; + by-version."lcov-parse"."0.0.6" = self.buildNodePackage { + name = "lcov-parse-0.0.6"; + version = "0.0.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.6.tgz"; + name = "lcov-parse-0.0.6.tgz"; + sha1 = "819e5da8bf0791f9d3f39eea5ed1868187f11175"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."liftoff"."~0.13.2" = + self.by-version."liftoff"."0.13.6"; + by-version."liftoff"."0.13.6" = self.buildNodePackage { + name = "liftoff-0.13.6"; + version = "0.13.6"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/liftoff/-/liftoff-0.13.6.tgz"; + name = "liftoff-0.13.6.tgz"; + sha1 = "600e8966b92d1e0150eab5b577652569f4c7d1d8"; + }; + deps = { + "findup-sync-0.1.3" = self.by-version."findup-sync"."0.1.3"; + "resolve-1.0.0" = self.by-version."resolve"."1.0.0"; + "minimist-1.1.1" = self.by-version."minimist"."1.1.1"; + "extend-1.3.0" = self.by-version."extend"."1.3.0"; + "flagged-respawn-0.3.1" = self.by-version."flagged-respawn"."0.3.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash".">= 3.2.0 < 4.0.0" = + self.by-version."lodash"."3.8.0"; + by-version."lodash"."3.8.0" = self.buildNodePackage { + name = "lodash-3.8.0"; + version = "3.8.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash/-/lodash-3.8.0.tgz"; + name = "lodash-3.8.0.tgz"; + sha1 = "376eb98bdcd9382a9365c33c4cb8250de1325b91"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."lodash"."^3.1.0" = - self.by-version."lodash"."3.5.0"; - by-version."lodash"."3.5.0" = self.buildNodePackage { - name = "lodash-3.5.0"; - version = "3.5.0"; + self.by-version."lodash"."3.8.0"; + by-spec."lodash"."^3.6" = + self.by-version."lodash"."3.8.0"; + "lodash" = self.by-version."lodash"."3.8.0"; + by-spec."lodash"."^3.6.0" = + self.by-version."lodash"."3.8.0"; + by-spec."lodash"."~2.4.0" = + self.by-version."lodash"."2.4.2"; + by-version."lodash"."2.4.2" = self.buildNodePackage { + name = "lodash-2.4.2"; + version = "2.4.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz"; - name = "lodash-3.5.0.tgz"; - sha1 = "19bb3f4d51278f0b8c818ed145c74ecf9fe40e6d"; + url = "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; + name = "lodash-2.4.2.tgz"; + sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; }; deps = { }; @@ -1950,16 +3289,18 @@ os = [ ]; cpu = [ ]; }; - by-spec."lodash"."~1.3.1" = - self.by-version."lodash"."1.3.1"; - by-version."lodash"."1.3.1" = self.buildNodePackage { - name = "lodash-1.3.1"; - version = "1.3.1"; + by-spec."lodash"."~2.4.1" = + self.by-version."lodash"."2.4.2"; + by-spec."lodash._basetostring"."^3.0.0" = + self.by-version."lodash._basetostring"."3.0.0"; + by-version."lodash._basetostring"."3.0.0" = self.buildNodePackage { + name = "lodash._basetostring-3.0.0"; + version = "3.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz"; - name = "lodash-1.3.1.tgz"; - sha1 = "a4663b53686b895ff074e2ba504dfb76a8e2b770"; + url = "http://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz"; + name = "lodash._basetostring-3.0.0.tgz"; + sha1 = "75a9a4aaaa2b2a8761111ff5431e7d83c1daf0e2"; }; deps = { }; @@ -1969,17 +3310,138 @@ os = [ ]; cpu = [ ]; }; - "lodash" = self.by-version."lodash"."1.3.1"; - by-spec."long-timeout"."~0.0.1" = - self.by-version."long-timeout"."0.0.2"; - by-version."long-timeout"."0.0.2" = self.buildNodePackage { - name = "long-timeout-0.0.2"; - version = "0.0.2"; + by-spec."lodash._createpadding"."^3.0.0" = + self.by-version."lodash._createpadding"."3.6.0"; + by-version."lodash._createpadding"."3.6.0" = self.buildNodePackage { + name = "lodash._createpadding-3.6.0"; + version = "3.6.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/long-timeout/-/long-timeout-0.0.2.tgz"; - name = "long-timeout-0.0.2.tgz"; - sha1 = "f36449ba89629d13a7a2b2523a4db9dd66e3ff68"; + url = "http://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.0.tgz"; + name = "lodash._createpadding-3.6.0.tgz"; + sha1 = "c466850dd1a05e6bfec54fd0cf0db28b68332d5e"; + }; + deps = { + "lodash.repeat-3.0.0" = self.by-version."lodash.repeat"."3.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash.pad"."^3.0.0" = + self.by-version."lodash.pad"."3.1.0"; + by-version."lodash.pad"."3.1.0" = self.buildNodePackage { + name = "lodash.pad-3.1.0"; + version = "3.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.0.tgz"; + name = "lodash.pad-3.1.0.tgz"; + sha1 = "9f18b1f3749a95e197b5ff2ae752ea9851ada965"; + }; + deps = { + "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; + "lodash._createpadding-3.6.0" = self.by-version."lodash._createpadding"."3.6.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash.padleft"."^3.0.0" = + self.by-version."lodash.padleft"."3.1.1"; + by-version."lodash.padleft"."3.1.1" = self.buildNodePackage { + name = "lodash.padleft-3.1.1"; + version = "3.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.1.tgz"; + name = "lodash.padleft-3.1.1.tgz"; + sha1 = "150151f1e0245edba15d50af2d71f1d5cff46530"; + }; + deps = { + "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; + "lodash._createpadding-3.6.0" = self.by-version."lodash._createpadding"."3.6.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash.padright"."^3.0.0" = + self.by-version."lodash.padright"."3.1.1"; + by-version."lodash.padright"."3.1.1" = self.buildNodePackage { + name = "lodash.padright-3.1.1"; + version = "3.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.1.tgz"; + name = "lodash.padright-3.1.1.tgz"; + sha1 = "79f7770baaa39738c040aeb5465e8d88f2aacec0"; + }; + deps = { + "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; + "lodash._createpadding-3.6.0" = self.by-version."lodash._createpadding"."3.6.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lodash.repeat"."^3.0.0" = + self.by-version."lodash.repeat"."3.0.0"; + by-version."lodash.repeat"."3.0.0" = self.buildNodePackage { + name = "lodash.repeat-3.0.0"; + version = "3.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.0.tgz"; + name = "lodash.repeat-3.0.0.tgz"; + sha1 = "c340f4136c99dc5b2e397b3fd50cffbd172a94b0"; + }; + deps = { + "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."log-driver"."1.2.4" = + self.by-version."log-driver"."1.2.4"; + by-version."log-driver"."1.2.4" = self.buildNodePackage { + name = "log-driver-1.2.4"; + version = "1.2.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz"; + name = "log-driver-1.2.4.tgz"; + sha1 = "2d62d7faef45d8a71341961a04b0761eca99cfa3"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."lolex"."1.1.0" = + self.by-version."lolex"."1.1.0"; + by-version."lolex"."1.1.0" = self.buildNodePackage { + name = "lolex-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lolex/-/lolex-1.1.0.tgz"; + name = "lolex-1.1.0.tgz"; + sha1 = "5dbbbc850395e7523c74b3586f7fbd2626d25b1b"; }; deps = { }; @@ -1990,15 +3452,15 @@ cpu = [ ]; }; by-spec."lru-cache"."2" = - self.by-version."lru-cache"."2.5.0"; - by-version."lru-cache"."2.5.0" = self.buildNodePackage { - name = "lru-cache-2.5.0"; - version = "2.5.0"; + self.by-version."lru-cache"."2.6.2"; + by-version."lru-cache"."2.6.2" = self.buildNodePackage { + name = "lru-cache-2.6.2"; + version = "2.6.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"; - name = "lru-cache-2.5.0.tgz"; - sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb"; + url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.6.2.tgz"; + name = "lru-cache-2.6.2.tgz"; + sha1 = "77741638c6dc972e503dbe41dcb6bfdfba499a38"; }; deps = { }; @@ -2009,7 +3471,24 @@ cpu = [ ]; }; by-spec."lru-cache"."~2.5.0" = - self.by-version."lru-cache"."2.5.0"; + self.by-version."lru-cache"."2.5.2"; + by-version."lru-cache"."2.5.2" = self.buildNodePackage { + name = "lru-cache-2.5.2"; + version = "2.5.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.2.tgz"; + name = "lru-cache-2.5.2.tgz"; + sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."media-typer"."0.3.0" = self.by-version."media-typer"."0.3.0"; by-version."media-typer"."0.3.0" = self.buildNodePackage { @@ -2048,22 +3527,18 @@ os = [ ]; cpu = [ ]; }; - by-spec."method-override"."~2.3.2" = - self.by-version."method-override"."2.3.2"; - by-version."method-override"."2.3.2" = self.buildNodePackage { - name = "method-override-2.3.2"; - version = "2.3.2"; + by-spec."methods"."0.0.1" = + self.by-version."methods"."0.0.1"; + by-version."methods"."0.0.1" = self.buildNodePackage { + name = "methods-0.0.1"; + version = "0.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/method-override/-/method-override-2.3.2.tgz"; - name = "method-override-2.3.2.tgz"; - sha1 = "f2433fb27b6c087efb8812628727fb8cfd93a793"; + url = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz"; + name = "methods-0.0.1.tgz"; + sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c"; }; deps = { - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "methods-1.1.1" = self.by-version."methods"."1.1.1"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "vary-1.0.0" = self.by-version."vary"."1.0.0"; }; optionalDependencies = { }; @@ -2071,16 +3546,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."methods"."1.0.1" = - self.by-version."methods"."1.0.1"; - by-version."methods"."1.0.1" = self.buildNodePackage { - name = "methods-1.0.1"; - version = "1.0.1"; + by-spec."methods"."1.0.0" = + self.by-version."methods"."1.0.0"; + by-version."methods"."1.0.0" = self.buildNodePackage { + name = "methods-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/methods/-/methods-1.0.1.tgz"; - name = "methods-1.0.1.tgz"; - sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b"; + url = "http://registry.npmjs.org/methods/-/methods-1.0.0.tgz"; + name = "methods-1.0.0.tgz"; + sha1 = "9a73d86375dfcef26ef61ca3e4b8a2e2538a80e3"; }; deps = { }; @@ -2109,16 +3584,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."mime"."1.2.11" = - self.by-version."mime"."1.2.11"; - by-version."mime"."1.2.11" = self.buildNodePackage { - name = "mime-1.2.11"; - version = "1.2.11"; + by-spec."mime"."1.2.5" = + self.by-version."mime"."1.2.5"; + by-version."mime"."1.2.5" = self.buildNodePackage { + name = "mime-1.2.5"; + version = "1.2.5"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - name = "mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + url = "http://registry.npmjs.org/mime/-/mime-1.2.5.tgz"; + name = "mime-1.2.5.tgz"; + sha1 = "9eed073022a8bf5e16c8566c6867b8832bfbfa13"; }; deps = { }; @@ -2147,24 +3622,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."mime"."^1.2.11" = - self.by-version."mime"."1.3.4"; by-spec."mime"."~1.2.11" = self.by-version."mime"."1.2.11"; - by-spec."mime"."~1.2.2" = - self.by-version."mime"."1.2.11"; - by-spec."mime"."~1.2.7" = - self.by-version."mime"."1.2.11"; - by-spec."mime-db".">= 1.1.2 < 2" = - self.by-version."mime-db"."1.8.0"; - by-version."mime-db"."1.8.0" = self.buildNodePackage { - name = "mime-db-1.8.0"; - version = "1.8.0"; + by-version."mime"."1.2.11" = self.buildNodePackage { + name = "mime-1.2.11"; + version = "1.2.11"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz"; - name = "mime-db-1.8.0.tgz"; - sha1 = "82a9b385f22b0f5954dec4d445faba0722c4ad25"; + url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + name = "mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; }; deps = { }; @@ -2174,8 +3641,27 @@ os = [ ]; cpu = [ ]; }; - by-spec."mime-db"."~1.8.0" = - self.by-version."mime-db"."1.8.0"; + by-spec."mime-db".">= 1.1.2 < 2" = + self.by-version."mime-db"."1.9.1"; + by-version."mime-db"."1.9.1" = self.buildNodePackage { + name = "mime-db-1.9.1"; + version = "1.9.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.9.1.tgz"; + name = "mime-db-1.9.1.tgz"; + sha1 = "1431049a71791482c29f37bafc8ea2cb3a6dd3e8"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."mime-db"."~1.9.1" = + self.by-version."mime-db"."1.9.1"; by-spec."mime-types"."~1.0.1" = self.by-version."mime-types"."1.0.2"; by-version."mime-types"."1.0.2" = self.buildNodePackage { @@ -2196,18 +3682,18 @@ cpu = [ ]; }; by-spec."mime-types"."~2.0.1" = - self.by-version."mime-types"."2.0.10"; - by-version."mime-types"."2.0.10" = self.buildNodePackage { - name = "mime-types-2.0.10"; - version = "2.0.10"; + self.by-version."mime-types"."2.0.11"; + by-version."mime-types"."2.0.11" = self.buildNodePackage { + name = "mime-types-2.0.11"; + version = "2.0.11"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz"; - name = "mime-types-2.0.10.tgz"; - sha1 = "eacd81bb73cab2a77447549a078d4f2018c67b4d"; + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.11.tgz"; + name = "mime-types-2.0.11.tgz"; + sha1 = "bf3449042799d877c815c29929d1e74760e72007"; }; deps = { - "mime-db-1.8.0" = self.by-version."mime-db"."1.8.0"; + "mime-db-1.9.1" = self.by-version."mime-db"."1.9.1"; }; optionalDependencies = { }; @@ -2215,10 +3701,10 @@ os = [ ]; cpu = [ ]; }; - by-spec."mime-types"."~2.0.10" = - self.by-version."mime-types"."2.0.10"; + by-spec."mime-types"."~2.0.11" = + self.by-version."mime-types"."2.0.11"; by-spec."mime-types"."~2.0.3" = - self.by-version."mime-types"."2.0.10"; + self.by-version."mime-types"."2.0.11"; by-spec."minimatch"."0.3" = self.by-version."minimatch"."0.3.0"; by-version."minimatch"."0.3.0" = self.buildNodePackage { @@ -2231,7 +3717,7 @@ sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; }; deps = { - "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; + "lru-cache-2.6.2" = self.by-version."lru-cache"."2.6.2"; "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; }; optionalDependencies = { @@ -2240,6 +3726,70 @@ os = [ ]; cpu = [ ]; }; + by-spec."minimatch"."0.x" = + self.by-version."minimatch"."0.4.0"; + by-version."minimatch"."0.4.0" = self.buildNodePackage { + name = "minimatch-0.4.0"; + version = "0.4.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz"; + name = "minimatch-0.4.0.tgz"; + sha1 = "bd2c7d060d2c8c8fd7cde7f1f2ed2d5b270fdb1b"; + }; + deps = { + "lru-cache-2.6.2" = self.by-version."lru-cache"."2.6.2"; + "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."minimatch"."^2.0.1" = + self.by-version."minimatch"."2.0.7"; + by-version."minimatch"."2.0.7" = self.buildNodePackage { + name = "minimatch-2.0.7"; + version = "2.0.7"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.7.tgz"; + name = "minimatch-2.0.7.tgz"; + sha1 = "d23652ab10e663e7d914602e920e21f9f66492be"; + }; + deps = { + "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."minimatch"."~0.2.0" = + self.by-version."minimatch"."0.2.14"; + by-version."minimatch"."0.2.14" = self.buildNodePackage { + name = "minimatch-0.2.14"; + version = "0.2.14"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; + name = "minimatch-0.2.14.tgz"; + sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; + }; + deps = { + "lru-cache-2.6.2" = self.by-version."lru-cache"."2.6.2"; + "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."minimatch"."~0.2.11" = + self.by-version."minimatch"."0.2.14"; by-spec."minimist"."0.0.8" = self.by-version."minimist"."0.0.8"; by-version."minimist"."0.0.8" = self.buildNodePackage { @@ -2259,6 +3809,85 @@ os = [ ]; cpu = [ ]; }; + by-spec."minimist"."~0.0.1" = + self.by-version."minimist"."0.0.10"; + by-version."minimist"."0.0.10" = self.buildNodePackage { + name = "minimist-0.0.10"; + version = "0.0.10"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; + name = "minimist-0.0.10.tgz"; + sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."minimist"."~0.0.7" = + self.by-version."minimist"."0.0.10"; + by-spec."minimist"."~1.1.0" = + self.by-version."minimist"."1.1.1"; + by-version."minimist"."1.1.1" = self.buildNodePackage { + name = "minimist-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz"; + name = "minimist-1.1.1.tgz"; + sha1 = "1bc2bc71658cdca5712475684363615b0b4f695b"; + }; + 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.5" = + self.by-version."mkdirp"."0.5.1"; + by-version."mkdirp"."0.5.1" = self.buildNodePackage { + name = "mkdirp-0.5.1"; + version = "0.5.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + name = "mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + deps = { + "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."mkdirp"."0.5.0" = self.by-version."mkdirp"."0.5.0"; by-version."mkdirp"."0.5.0" = self.buildNodePackage { @@ -2279,18 +3908,35 @@ os = [ ]; cpu = [ ]; }; - by-spec."mkdirp"."~0.3.5" = - 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; + by-spec."mkdirp"."0.5.x" = + self.by-version."mkdirp"."0.5.1"; + by-spec."mkdirp".">=0.5 0" = + self.by-version."mkdirp"."0.5.1"; + by-spec."mkdirp"."^0.5.0" = + self.by-version."mkdirp"."0.5.1"; + by-spec."mkdirp"."~0.5.0" = + self.by-version."mkdirp"."0.5.1"; + by-spec."mocha"."^2.1.0" = + self.by-version."mocha"."2.2.4"; + by-version."mocha"."2.2.4" = self.buildNodePackage { + name = "mocha-2.2.4"; + version = "2.2.4"; + bin = true; src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - name = "mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + url = "http://registry.npmjs.org/mocha/-/mocha-2.2.4.tgz"; + name = "mocha-2.2.4.tgz"; + sha1 = "192b0edc0e17e56613bc66e5fc7e81c00413a98d"; }; deps = { + "commander-2.3.0" = self.by-version."commander"."2.3.0"; + "debug-2.0.0" = self.by-version."debug"."2.0.0"; + "diff-1.0.8" = self.by-version."diff"."1.0.8"; + "escape-string-regexp-1.0.2" = self.by-version."escape-string-regexp"."1.0.2"; + "glob-3.2.3" = self.by-version."glob"."3.2.3"; + "growl-1.8.1" = self.by-version."growl"."1.8.1"; + "jade-0.26.3" = self.by-version."jade"."0.26.3"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "supports-color-1.2.1" = self.by-version."supports-color"."1.2.1"; }; optionalDependencies = { }; @@ -2298,18 +3944,23 @@ os = [ ]; cpu = [ ]; }; - by-spec."moment"."~2.1.0" = - self.by-version."moment"."2.1.0"; - by-version."moment"."2.1.0" = self.buildNodePackage { - name = "moment-2.1.0"; - version = "2.1.0"; + "mocha" = self.by-version."mocha"."2.2.4"; + by-spec."morgan"."^1.3.0" = + self.by-version."morgan"."1.5.3"; + by-version."morgan"."1.5.3" = self.buildNodePackage { + name = "morgan-1.5.3"; + version = "1.5.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz"; - name = "moment-2.1.0.tgz"; - sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567"; + url = "http://registry.npmjs.org/morgan/-/morgan-1.5.3.tgz"; + name = "morgan-1.5.3.tgz"; + sha1 = "8adb4e72f9e5c5436e5d93f42910835f79da9fdf"; }; deps = { + "basic-auth-1.0.1" = self.by-version."basic-auth"."1.0.1"; + "debug-2.2.0" = self.by-version."debug"."2.2.0"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; }; optionalDependencies = { }; @@ -2317,30 +3968,7 @@ os = [ ]; cpu = [ ]; }; - "moment" = self.by-version."moment"."2.1.0"; - by-spec."morgan"."~1.5.2" = - self.by-version."morgan"."1.5.2"; - by-version."morgan"."1.5.2" = self.buildNodePackage { - name = "morgan-1.5.2"; - version = "1.5.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/morgan/-/morgan-1.5.2.tgz"; - name = "morgan-1.5.2.tgz"; - sha1 = "34c1a0e7c2d5ad3ed78f0ef3257b8ac7c35d7cff"; - }; - deps = { - "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0"; - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "depd-1.0.0" = self.by-version."depd"."1.0.0"; - "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; + "morgan" = self.by-version."morgan"."1.5.3"; by-spec."ms"."0.6.2" = self.by-version."ms"."0.6.2"; by-version."ms"."0.6.2" = self.buildNodePackage { @@ -2379,20 +4007,18 @@ os = [ ]; cpu = [ ]; }; - by-spec."multiparty"."3.3.2" = - self.by-version."multiparty"."3.3.2"; - by-version."multiparty"."3.3.2" = self.buildNodePackage { - name = "multiparty-3.3.2"; - version = "3.3.2"; + 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/multiparty/-/multiparty-3.3.2.tgz"; - name = "multiparty-3.3.2.tgz"; - sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f"; + url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + name = "ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; }; deps = { - "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; - "stream-counter-0.2.0" = self.by-version."stream-counter"."0.2.0"; }; optionalDependencies = { }; @@ -2419,42 +4045,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."nan"."~1.6.2" = - self.by-version."nan"."1.6.2"; - by-spec."nano"."^5.8.0" = - self.by-version."nano"."5.12.2"; - by-version."nano"."5.12.2" = self.buildNodePackage { - name = "nano-5.12.2"; - version = "5.12.2"; + by-spec."nan"."~1.0.0" = + self.by-version."nan"."1.0.0"; + by-version."nan"."1.0.0" = self.buildNodePackage { + name = "nan-1.0.0"; + version = "1.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/nano/-/nano-5.12.2.tgz"; - name = "nano-5.12.2.tgz"; - sha1 = "b51c9c5e4045c4a71fe3bf6a1f46f0ac2426a17c"; - }; - deps = { - "request-2.42.0" = self.by-version."request"."2.42.0"; - "follow-0.11.4" = self.by-version."follow"."0.11.4"; - "errs-0.3.2" = self.by-version."errs"."0.3.2"; - "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "nano" = self.by-version."nano"."5.12.2"; - by-spec."native-or-bluebird"."~1.1.2" = - self.by-version."native-or-bluebird"."1.1.2"; - by-version."native-or-bluebird"."1.1.2" = self.buildNodePackage { - name = "native-or-bluebird-1.1.2"; - version = "1.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.2.tgz"; - name = "native-or-bluebird-1.1.2.tgz"; - sha1 = "3921e110232d1eb790f3dac61bb370531c7d356e"; + url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz"; + name = "nan-1.0.0.tgz"; + sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"; }; deps = { }; @@ -2464,16 +4064,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."negotiator"."0.5.1" = - self.by-version."negotiator"."0.5.1"; - by-version."negotiator"."0.5.1" = self.buildNodePackage { - name = "negotiator-0.5.1"; - version = "0.5.1"; + by-spec."nan"."~1.8.4" = + 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/negotiator/-/negotiator-0.5.1.tgz"; - name = "negotiator-0.5.1.tgz"; - sha1 = "498f661c522470153c6086ac83019cb3eb66f61c"; + url = "http://registry.npmjs.org/nan/-/nan-1.8.4.tgz"; + name = "nan-1.8.4.tgz"; + sha1 = "3c76b5382eab33e44b758d2813ca9d92e9342f34"; }; deps = { }; @@ -2483,41 +4083,21 @@ os = [ ]; cpu = [ ]; }; - by-spec."node-dogstatsd"."0.0.5" = - self.by-version."node-dogstatsd"."0.0.5"; - by-version."node-dogstatsd"."0.0.5" = self.buildNodePackage { - name = "node-dogstatsd-0.0.5"; - version = "0.0.5"; + by-spec."nconf"."^0.6.9" = + self.by-version."nconf"."0.6.9"; + by-version."nconf"."0.6.9" = self.buildNodePackage { + name = "nconf-0.6.9"; + version = "0.6.9"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/node-dogstatsd/-/node-dogstatsd-0.0.5.tgz"; - name = "node-dogstatsd-0.0.5.tgz"; - sha1 = "5b1bc12e7c2f1cab65c6081f43cee27eb359316e"; + url = "http://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz"; + name = "nconf-0.6.9.tgz"; + sha1 = "9570ef15ed6f9ae6b2b3c8d5e71b66d3193cd661"; }; deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ "linux" "darwin" "freebsd" ]; - cpu = [ ]; - }; - "node-dogstatsd" = self.by-version."node-dogstatsd"."0.0.5"; - by-spec."node-persist"."0.0.2" = - self.by-version."node-persist"."0.0.2"; - by-version."node-persist"."0.0.2" = self.buildNodePackage { - name = "node-persist-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/node-persist/-/node-persist-0.0.2.tgz"; - name = "node-persist-0.0.2.tgz"; - sha1 = "a4999e81d5f3f605df267abf314b7f03b8e6823b"; - }; - deps = { - "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - "sugar-1.3.9" = self.by-version."sugar"."1.3.9"; + "async-0.2.9" = self.by-version."async"."0.2.9"; + "ini-1.3.3" = self.by-version."ini"."1.3.3"; + "optimist-0.6.0" = self.by-version."optimist"."0.6.0"; }; optionalDependencies = { }; @@ -2525,39 +4105,17 @@ os = [ ]; cpu = [ ]; }; - "node-persist" = self.by-version."node-persist"."0.0.2"; - by-spec."node-schedule"."^0.1.13" = - self.by-version."node-schedule"."0.1.16"; - by-version."node-schedule"."0.1.16" = self.buildNodePackage { - name = "node-schedule-0.1.16"; - version = "0.1.16"; + "nconf" = self.by-version."nconf"."0.6.9"; + by-spec."negotiator"."0.5.3" = + self.by-version."negotiator"."0.5.3"; + by-version."negotiator"."0.5.3" = self.buildNodePackage { + name = "negotiator-0.5.3"; + version = "0.5.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/node-schedule/-/node-schedule-0.1.16.tgz"; - name = "node-schedule-0.1.16.tgz"; - sha1 = "1bbc74bd03141b9bb8c1135978d3b63995ddbf94"; - }; - deps = { - "cron-parser-0.3.6" = self.by-version."cron-parser"."0.3.6"; - "long-timeout-0.0.2" = self.by-version."long-timeout"."0.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "node-schedule" = self.by-version."node-schedule"."0.1.16"; - by-spec."node-statsd"."^0.1.0" = - self.by-version."node-statsd"."0.1.1"; - by-version."node-statsd"."0.1.1" = self.buildNodePackage { - name = "node-statsd-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/node-statsd/-/node-statsd-0.1.1.tgz"; - name = "node-statsd-0.1.1.tgz"; - sha1 = "27a59348763d0af7a037ac2a031fef3f051013d3"; + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; + name = "negotiator-0.5.3.tgz"; + sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; }; deps = { }; @@ -2567,8 +4125,35 @@ os = [ ]; cpu = [ ]; }; - "node-statsd" = self.by-version."node-statsd"."0.1.1"; - by-spec."node-uuid"."~1.4.0" = + by-spec."node-pre-gyp"."~0.6.7" = + self.by-version."node-pre-gyp"."0.6.7"; + by-version."node-pre-gyp"."0.6.7" = self.buildNodePackage { + name = "node-pre-gyp-0.6.7"; + version = "0.6.7"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.7.tgz"; + name = "node-pre-gyp-0.6.7.tgz"; + sha1 = "4c3ee4ac2934b0b27fead6bc76391c0dccf38ea8"; + }; + deps = { + "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; + "npmlog-1.2.0" = self.by-version."npmlog"."1.2.0"; + "request-2.55.0" = self.by-version."request"."2.55.0"; + "semver-4.3.4" = self.by-version."semver"."4.3.4"; + "tar-2.1.1" = self.by-version."tar"."2.1.1"; + "tar-pack-2.0.0" = self.by-version."tar-pack"."2.0.0"; + "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1"; + "rc-1.0.1" = self.by-version."rc"."1.0.1"; + "rimraf-2.3.3" = self.by-version."rimraf"."2.3.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."node-uuid"."^1.4.1" = self.by-version."node-uuid"."1.4.3"; by-version."node-uuid"."1.4.3" = self.buildNodePackage { name = "node-uuid-1.4.3"; @@ -2587,18 +4172,22 @@ os = [ ]; cpu = [ ]; }; - by-spec."oauth-sign"."~0.2.0" = - self.by-version."oauth-sign"."0.2.0"; - by-version."oauth-sign"."0.2.0" = self.buildNodePackage { - name = "oauth-sign-0.2.0"; - version = "0.2.0"; - bin = false; + "node-uuid" = self.by-version."node-uuid"."1.4.3"; + by-spec."node-uuid"."~1.4.0" = + self.by-version."node-uuid"."1.4.3"; + by-spec."nopt"."3.x" = + self.by-version."nopt"."3.0.1"; + by-version."nopt"."3.0.1" = self.buildNodePackage { + name = "nopt-3.0.1"; + version = "3.0.1"; + bin = true; src = fetchurl { - url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz"; - name = "oauth-sign-0.2.0.tgz"; - sha1 = "a0e6a1715daed062f322b622b7fe5afd1035b6e2"; + url = "http://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz"; + name = "nopt-3.0.1.tgz"; + sha1 = "bce5c42446a3291f47622a370abbf158fbbacbfd"; }; deps = { + "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; }; optionalDependencies = { }; @@ -2606,16 +4195,40 @@ os = [ ]; cpu = [ ]; }; - by-spec."oauth-sign"."~0.4.0" = - self.by-version."oauth-sign"."0.4.0"; - by-version."oauth-sign"."0.4.0" = self.buildNodePackage { - name = "oauth-sign-0.4.0"; - version = "0.4.0"; + by-spec."nopt"."~3.0.1" = + self.by-version."nopt"."3.0.1"; + by-spec."npmlog"."~1.2.0" = + self.by-version."npmlog"."1.2.0"; + by-version."npmlog"."1.2.0" = self.buildNodePackage { + name = "npmlog-1.2.0"; + version = "1.2.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"; - name = "oauth-sign-0.4.0.tgz"; - sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69"; + url = "http://registry.npmjs.org/npmlog/-/npmlog-1.2.0.tgz"; + name = "npmlog-1.2.0.tgz"; + sha1 = "b512f18ae8696a0192ada78ba00c06dbbd91bafb"; + }; + deps = { + "ansi-0.3.0" = self.by-version."ansi"."0.3.0"; + "are-we-there-yet-1.0.4" = self.by-version."are-we-there-yet"."1.0.4"; + "gauge-1.2.0" = self.by-version."gauge"."1.2.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."oauth-sign"."~0.3.0" = + self.by-version."oauth-sign"."0.3.0"; + by-version."oauth-sign"."0.3.0" = self.buildNodePackage { + name = "oauth-sign-0.3.0"; + version = "0.3.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; + name = "oauth-sign-0.3.0.tgz"; + sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; }; deps = { }; @@ -2645,15 +4258,15 @@ cpu = [ ]; }; by-spec."on-finished"."~2.2.0" = - self.by-version."on-finished"."2.2.0"; - by-version."on-finished"."2.2.0" = self.buildNodePackage { - name = "on-finished-2.2.0"; - version = "2.2.0"; + self.by-version."on-finished"."2.2.1"; + by-version."on-finished"."2.2.1" = self.buildNodePackage { + name = "on-finished-2.2.1"; + version = "2.2.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.0.tgz"; - name = "on-finished-2.2.0.tgz"; - sha1 = "e6ba6a09a3482d6b7969bc3da92c86f0a967605e"; + url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz"; + name = "on-finished-2.2.1.tgz"; + sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029"; }; deps = { "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0"; @@ -2664,6 +4277,8 @@ os = [ ]; cpu = [ ]; }; + by-spec."on-finished"."~2.2.1" = + self.by-version."on-finished"."2.2.1"; by-spec."on-headers"."~1.0.0" = self.by-version."on-headers"."1.0.0"; by-version."on-headers"."1.0.0" = self.buildNodePackage { @@ -2683,6 +4298,88 @@ os = [ ]; cpu = [ ]; }; + by-spec."once"."^1.3.0" = + self.by-version."once"."1.3.2"; + by-version."once"."1.3.2" = self.buildNodePackage { + name = "once-1.3.2"; + version = "1.3.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/once/-/once-1.3.2.tgz"; + name = "once-1.3.2.tgz"; + sha1 = "d8feeca93b039ec1dcdee7741c92bdac5e28081b"; + }; + deps = { + "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."once"."~1.1.1" = + self.by-version."once"."1.1.1"; + by-version."once"."1.1.1" = self.buildNodePackage { + name = "once-1.1.1"; + version = "1.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/once/-/once-1.1.1.tgz"; + name = "once-1.1.1.tgz"; + sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."optimist"."0.6.0" = + self.by-version."optimist"."0.6.0"; + by-version."optimist"."0.6.0" = self.buildNodePackage { + name = "optimist-0.6.0"; + version = "0.6.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz"; + name = "optimist-0.6.0.tgz"; + sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200"; + }; + deps = { + "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3"; + "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."optimist"."~0.3" = + 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 = [ ]; + }; + by-spec."optimist"."~0.3.5" = + self.by-version."optimist"."0.3.7"; by-spec."options".">=0.0.5" = self.by-version."options"."0.0.6"; by-version."options"."0.0.6" = self.buildNodePackage { @@ -2721,16 +4418,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."pause"."0.0.1" = - self.by-version."pause"."0.0.1"; - by-version."pause"."0.0.1" = self.buildNodePackage { - name = "pause-0.0.1"; - version = "0.0.1"; + by-spec."path-to-regexp"."0.1.3" = + self.by-version."path-to-regexp"."0.1.3"; + by-version."path-to-regexp"."0.1.3" = self.buildNodePackage { + name = "path-to-regexp-0.1.3"; + version = "0.1.3"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; - name = "pause-0.0.1.tgz"; - sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; + url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"; + name = "path-to-regexp-0.1.3.tgz"; + sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb"; }; deps = { }; @@ -2759,41 +4456,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."posix"."^2.0.0" = - self.by-version."posix"."2.0.0"; - by-version."posix"."2.0.0" = self.buildNodePackage { - name = "posix-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/posix/-/posix-2.0.0.tgz"; - name = "posix-2.0.0.tgz"; - sha1 = "90fd0ec73968d805c890b61ae6cc95ae5803a87d"; - }; - deps = { - "nan-1.6.2" = self.by-version."nan"."1.6.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "posix" = self.by-version."posix"."2.0.0"; by-spec."proxy-addr"."~1.0.7" = - self.by-version."proxy-addr"."1.0.7"; - by-version."proxy-addr"."1.0.7" = self.buildNodePackage { - name = "proxy-addr-1.0.7"; - version = "1.0.7"; + self.by-version."proxy-addr"."1.0.8"; + by-version."proxy-addr"."1.0.8" = self.buildNodePackage { + name = "proxy-addr-1.0.8"; + version = "1.0.8"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.7.tgz"; - name = "proxy-addr-1.0.7.tgz"; - sha1 = "6e2655aa9c56b014f09734a7e6d558cc77751939"; + url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.8.tgz"; + name = "proxy-addr-1.0.8.tgz"; + sha1 = "db54ec878bcc1053d57646609219b3715678bafe"; }; deps = { "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0"; - "ipaddr.js-0.1.9" = self.by-version."ipaddr.js"."0.1.9"; + "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1"; }; optionalDependencies = { }; @@ -2801,45 +4477,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."punycode".">=0.2.0" = - self.by-version."punycode"."1.3.2"; - by-version."punycode"."1.3.2" = self.buildNodePackage { - name = "punycode-1.3.2"; - version = "1.3.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; - name = "punycode-1.3.2.tgz"; - sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."q"."~1.0.0" = - self.by-version."q"."1.0.1"; - by-version."q"."1.0.1" = self.buildNodePackage { - name = "q-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/q/-/q-1.0.1.tgz"; - name = "q-1.0.1.tgz"; - sha1 = "11872aeedee89268110b10a718448ffb10112a14"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "q" = self.by-version."q"."1.0.1"; by-spec."qs"."0.6.6" = self.by-version."qs"."0.6.6"; by-version."qs"."0.6.6" = self.buildNodePackage { @@ -2878,16 +4515,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."qs"."~0.5.4" = - self.by-version."qs"."0.5.6"; - by-version."qs"."0.5.6" = self.buildNodePackage { - name = "qs-0.5.6"; - version = "0.5.6"; + by-spec."qs"."2.4.2" = + self.by-version."qs"."2.4.2"; + by-version."qs"."2.4.2" = self.buildNodePackage { + name = "qs-2.4.2"; + version = "2.4.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-0.5.6.tgz"; - name = "qs-0.5.6.tgz"; - sha1 = "31b1ad058567651c526921506b9a8793911a0384"; + url = "http://registry.npmjs.org/qs/-/qs-2.4.2.tgz"; + name = "qs-2.4.2.tgz"; + sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a"; }; deps = { }; @@ -2897,35 +4534,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."qs"."~1.2.0" = - self.by-version."qs"."1.2.2"; - by-version."qs"."1.2.2" = self.buildNodePackage { - name = "qs-1.2.2"; - version = "1.2.2"; + by-spec."qs"."~1.0.0" = + self.by-version."qs"."1.0.2"; + by-version."qs"."1.0.2" = self.buildNodePackage { + name = "qs-1.0.2"; + version = "1.0.2"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-1.2.2.tgz"; - name = "qs-1.2.2.tgz"; - sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."~2.3.1" = - self.by-version."qs"."2.3.3"; - by-version."qs"."2.3.3" = self.buildNodePackage { - name = "qs-2.3.3"; - version = "2.3.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; - name = "qs-2.3.3.tgz"; - sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; + url = "http://registry.npmjs.org/qs/-/qs-1.0.2.tgz"; + name = "qs-1.0.2.tgz"; + sha1 = "50a93e2b5af6691c31bcea5dae78ee6ea1903768"; }; deps = { }; @@ -2935,6 +4553,8 @@ os = [ ]; cpu = [ ]; }; + by-spec."qs"."~2.4.0" = + self.by-version."qs"."2.4.2"; by-spec."range-parser"."~1.0.2" = self.by-version."range-parser"."1.0.2"; by-version."range-parser"."1.0.2" = self.buildNodePackage { @@ -2954,20 +4574,43 @@ os = [ ]; cpu = [ ]; }; - by-spec."raw-body"."1.3.3" = - self.by-version."raw-body"."1.3.3"; - by-version."raw-body"."1.3.3" = self.buildNodePackage { - name = "raw-body-1.3.3"; - version = "1.3.3"; + by-spec."raw-body"."~2.0.1" = + self.by-version."raw-body"."2.0.1"; + by-version."raw-body"."2.0.1" = self.buildNodePackage { + name = "raw-body-2.0.1"; + version = "2.0.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.3.tgz"; - name = "raw-body-1.3.3.tgz"; - sha1 = "8841af3f64ad50a351dc77f229118b40c28fa58c"; + url = "http://registry.npmjs.org/raw-body/-/raw-body-2.0.1.tgz"; + name = "raw-body-2.0.1.tgz"; + sha1 = "2b70a3ffd1681c0521bae73454e0ccbc785d378e"; }; deps = { - "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; - "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7"; + "bytes-2.0.1" = self.by-version."bytes"."2.0.1"; + "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."rc"."~1.0.1" = + self.by-version."rc"."1.0.1"; + by-version."rc"."1.0.1" = self.buildNodePackage { + name = "rc-1.0.1"; + version = "1.0.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/rc/-/rc-1.0.1.tgz"; + name = "rc-1.0.1.tgz"; + sha1 = "f919c25e804cb0aa60f6fd92d929fc86b45013e8"; + }; + deps = { + "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; + "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11"; + "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3"; + "ini-1.3.3" = self.by-version."ini"."1.3.3"; }; optionalDependencies = { }; @@ -2998,30 +4641,7 @@ os = [ ]; cpu = [ ]; }; - by-spec."readable-stream"."~1.0.26" = - self.by-version."readable-stream"."1.0.33"; - by-version."readable-stream"."1.0.33" = self.buildNodePackage { - name = "readable-stream-1.0.33"; - version = "1.0.33"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"; - name = "readable-stream-1.0.33.tgz"; - sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c"; - }; - deps = { - "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."readable-stream"."~1.1.8" = + by-spec."readable-stream"."^1.1.12" = self.by-version."readable-stream"."1.1.13"; by-version."readable-stream"."1.1.13" = self.buildNodePackage { name = "readable-stream-1.1.13"; @@ -3044,20 +4664,24 @@ os = [ ]; cpu = [ ]; }; - by-spec."readable-stream"."~1.1.9" = + by-spec."readable-stream"."^1.1.13" = self.by-version."readable-stream"."1.1.13"; - by-spec."redis"."^0.10.1" = - self.by-version."redis"."0.10.3"; - by-version."redis"."0.10.3" = self.buildNodePackage { - name = "redis-0.10.3"; - version = "0.10.3"; + by-spec."readable-stream"."~1.0.2" = + self.by-version."readable-stream"."1.0.33"; + by-version."readable-stream"."1.0.33" = self.buildNodePackage { + name = "readable-stream-1.0.33"; + version = "1.0.33"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/redis/-/redis-0.10.3.tgz"; - name = "redis-0.10.3.tgz"; - sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"; + name = "readable-stream-1.0.33.tgz"; + sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c"; }; deps = { + "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; + "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; + "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; optionalDependencies = { }; @@ -3065,7 +4689,8 @@ os = [ ]; cpu = [ ]; }; - "redis" = self.by-version."redis"."0.10.3"; + by-spec."readable-stream"."~1.0.26" = + self.by-version."readable-stream"."1.0.33"; by-spec."reduce-component"."1.0.1" = self.by-version."reduce-component"."1.0.1"; by-version."reduce-component"."1.0.1" = self.buildNodePackage { @@ -3085,101 +4710,30 @@ os = [ ]; cpu = [ ]; }; - by-spec."request"."2.16.x" = - self.by-version."request"."2.16.6"; - by-version."request"."2.16.6" = self.buildNodePackage { - name = "request-2.16.6"; - version = "2.16.6"; + by-spec."request"."2.40.0" = + self.by-version."request"."2.40.0"; + by-version."request"."2.40.0" = self.buildNodePackage { + name = "request-2.40.0"; + version = "2.40.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz"; - name = "request-2.16.6.tgz"; - sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad"; + url = "http://registry.npmjs.org/request/-/request-2.40.0.tgz"; + name = "request-2.40.0.tgz"; + sha1 = "4dd670f696f1e6e842e66b4b5e839301ab9beb67"; }; deps = { - "form-data-0.0.10" = self.by-version."form-data"."0.0.10"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "hawk-0.10.2" = self.by-version."hawk"."0.10.2"; - "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; - "cookie-jar-0.2.0" = self.by-version."cookie-jar"."0.2.0"; - "aws-sign-0.2.0" = self.by-version."aws-sign"."0.2.0"; - "oauth-sign-0.2.0" = self.by-version."oauth-sign"."0.2.0"; - "forever-agent-0.2.0" = self.by-version."forever-agent"."0.2.0"; - "tunnel-agent-0.2.0" = self.by-version."tunnel-agent"."0.2.0"; - "json-stringify-safe-3.0.0" = self.by-version."json-stringify-safe"."3.0.0"; - "qs-0.5.6" = self.by-version."qs"."0.5.6"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."request"."^2.34.0" = - self.by-version."request"."2.53.0"; - by-version."request"."2.53.0" = self.buildNodePackage { - name = "request-2.53.0"; - version = "2.53.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.53.0.tgz"; - name = "request-2.53.0.tgz"; - sha1 = "180a3ae92b7b639802e4f9545dd8fcdeb71d760c"; - }; - deps = { - "bl-0.9.4" = self.by-version."bl"."0.9.4"; - "caseless-0.9.0" = self.by-version."caseless"."0.9.0"; - "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "form-data-0.2.0" = self.by-version."form-data"."0.2.0"; - "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; - "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10"; - "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; - "qs-2.3.3" = self.by-version."qs"."2.3.3"; - "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; - "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; - "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; - "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0"; - "hawk-2.3.1" = self.by-version."hawk"."2.3.1"; - "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; - "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "isstream-0.1.2" = self.by-version."isstream"."0.1.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "request" = self.by-version."request"."2.53.0"; - by-spec."request"."^2.44.0" = - self.by-version."request"."2.53.0"; - by-spec."request"."~2.42.0" = - self.by-version."request"."2.42.0"; - by-version."request"."2.42.0" = self.buildNodePackage { - name = "request-2.42.0"; - version = "2.42.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.42.0.tgz"; - name = "request-2.42.0.tgz"; - sha1 = "572bd0148938564040ac7ab148b96423a063304a"; - }; - deps = { - "bl-0.9.4" = self.by-version."bl"."0.9.4"; - "caseless-0.6.0" = self.by-version."caseless"."0.6.0"; - "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "qs-1.2.2" = self.by-version."qs"."1.2.2"; + "qs-1.0.2" = self.by-version."qs"."1.0.2"; "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; + "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; - "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; }; optionalDependencies = { - "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; + "tough-cookie-1.1.0" = self.by-version."tough-cookie"."1.1.0"; "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; + "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; - "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0"; + "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; "hawk-1.1.1" = self.by-version."hawk"."1.1.1"; "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; @@ -3188,20 +4742,36 @@ os = [ ]; cpu = [ ]; }; - by-spec."response-time"."~2.3.0" = - self.by-version."response-time"."2.3.0"; - by-version."response-time"."2.3.0" = self.buildNodePackage { - name = "response-time-2.3.0"; - version = "2.3.0"; + by-spec."request"."2.x" = + self.by-version."request"."2.55.0"; + by-version."request"."2.55.0" = self.buildNodePackage { + name = "request-2.55.0"; + version = "2.55.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/response-time/-/response-time-2.3.0.tgz"; - name = "response-time-2.3.0.tgz"; - sha1 = "27cf2194fa373ef02c04781287416a3138060b68"; + url = "http://registry.npmjs.org/request/-/request-2.55.0.tgz"; + name = "request-2.55.0.tgz"; + sha1 = "d75c1cdf679d76bb100f9bffe1fe551b5c24e93d"; }; deps = { - "depd-1.0.0" = self.by-version."depd"."1.0.0"; - "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; + "bl-0.9.4" = self.by-version."bl"."0.9.4"; + "caseless-0.9.0" = self.by-version."caseless"."0.9.0"; + "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1"; + "form-data-0.2.0" = self.by-version."form-data"."0.2.0"; + "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; + "mime-types-2.0.11" = self.by-version."mime-types"."2.0.11"; + "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3"; + "qs-2.4.2" = self.by-version."qs"."2.4.2"; + "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; + "tough-cookie-1.1.0" = self.by-version."tough-cookie"."1.1.0"; + "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1"; + "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0"; + "hawk-2.3.1" = self.by-version."hawk"."2.3.1"; + "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; + "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4"; + "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; + "isstream-0.1.2" = self.by-version."isstream"."0.1.2"; + "har-validator-1.7.0" = self.by-version."har-validator"."1.7.0"; }; optionalDependencies = { }; @@ -3209,44 +4779,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."ripple-lib"."0.12.0" = - self.by-version."ripple-lib"."0.12.0"; - by-version."ripple-lib"."0.12.0" = self.buildNodePackage { - name = "ripple-lib-0.12.0"; - version = "0.12.0"; - bin = false; + by-spec."require-directory"."^1.2.0" = + self.by-version."require-directory"."1.2.0"; + by-version."require-directory"."1.2.0" = self.buildNodePackage { + name = "require-directory-1.2.0"; + version = "1.2.0"; + bin = true; src = fetchurl { - url = "http://registry.npmjs.org/ripple-lib/-/ripple-lib-0.12.0.tgz"; - name = "ripple-lib-0.12.0.tgz"; - sha1 = "8bbefa8250bf09e148c4997c27bbca70c7030b55"; - }; - deps = { - "async-0.9.0" = self.by-version."async"."0.9.0"; - "bignumber.js-2.0.3" = self.by-version."bignumber.js"."2.0.3"; - "extend-1.2.1" = self.by-version."extend"."1.2.1"; - "lodash-3.5.0" = self.by-version."lodash"."3.5.0"; - "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; - "ripple-wallet-generator-1.0.1" = self.by-version."ripple-wallet-generator"."1.0.1"; - "ws-0.7.1" = self.by-version."ws"."0.7.1"; - "superagent-0.18.2" = self.by-version."superagent"."0.18.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "ripple-lib" = self.by-version."ripple-lib"."0.12.0"; - by-spec."ripple-wallet-generator"."1.0.1" = - self.by-version."ripple-wallet-generator"."1.0.1"; - by-version."ripple-wallet-generator"."1.0.1" = self.buildNodePackage { - name = "ripple-wallet-generator-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ripple-wallet-generator/-/ripple-wallet-generator-1.0.1.tgz"; - name = "ripple-wallet-generator-1.0.1.tgz"; - sha1 = "fd9311c0c620c1bd51808a76a3f2a946293d459a"; + url = "http://registry.npmjs.org/require-directory/-/require-directory-1.2.0.tgz"; + name = "require-directory-1.2.0.tgz"; + sha1 = "35ff45a82ab73ca6ca35c746c0a17014371e1afd"; }; deps = { }; @@ -3256,16 +4798,17 @@ os = [ ]; cpu = [ ]; }; - by-spec."rndm"."~1.1.0" = - self.by-version."rndm"."1.1.0"; - by-version."rndm"."1.1.0" = self.buildNodePackage { - name = "rndm-1.1.0"; - version = "1.1.0"; + "require-directory" = self.by-version."require-directory"."1.2.0"; + by-spec."resolve"."0.7.x" = + self.by-version."resolve"."0.7.4"; + by-version."resolve"."0.7.4" = self.buildNodePackage { + name = "resolve-0.7.4"; + version = "0.7.4"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/rndm/-/rndm-1.1.0.tgz"; - name = "rndm-1.1.0.tgz"; - sha1 = "01d1a8f1fb9b471181925b627b9049bf33074574"; + url = "http://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz"; + name = "resolve-0.7.4.tgz"; + sha1 = "395a9ef9e873fbfe12bd14408bd91bb936003d69"; }; deps = { }; @@ -3275,16 +4818,163 @@ os = [ ]; cpu = [ ]; }; - by-spec."scmp"."1.0.0" = - self.by-version."scmp"."1.0.0"; - by-version."scmp"."1.0.0" = self.buildNodePackage { - name = "scmp-1.0.0"; + by-spec."resolve"."~1.0.0" = + self.by-version."resolve"."1.0.0"; + by-version."resolve"."1.0.0" = self.buildNodePackage { + name = "resolve-1.0.0"; version = "1.0.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/scmp/-/scmp-1.0.0.tgz"; - name = "scmp-1.0.0.tgz"; - sha1 = "a0b272c3fc7292f77115646f00618b0262514e04"; + url = "http://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz"; + name = "resolve-1.0.0.tgz"; + sha1 = "2a6e3b314dcd57c6519e8e2282af8687e8de61c6"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."rimraf"."2" = + self.by-version."rimraf"."2.3.3"; + by-version."rimraf"."2.3.3" = self.buildNodePackage { + name = "rimraf-2.3.3"; + version = "2.3.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.3.3.tgz"; + name = "rimraf-2.3.3.tgz"; + sha1 = "d0073d8b3010611e8f3ad377b08e9a3c18b98f06"; + }; + deps = { + "glob-4.5.3" = self.by-version."glob"."4.5.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."rimraf"."~2.2.0" = + self.by-version."rimraf"."2.2.8"; + by-version."rimraf"."2.2.8" = self.buildNodePackage { + name = "rimraf-2.2.8"; + version = "2.2.8"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; + name = "rimraf-2.2.8.tgz"; + sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."rimraf"."~2.3.2" = + self.by-version."rimraf"."2.3.3"; + by-spec."ripple-lib"."^0.12.3" = + self.by-version."ripple-lib"."0.12.4"; + by-version."ripple-lib"."0.12.4" = self.buildNodePackage { + name = "ripple-lib-0.12.4"; + version = "0.12.4"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ripple-lib/-/ripple-lib-0.12.4.tgz"; + name = "ripple-lib-0.12.4.tgz"; + sha1 = "97675f9ae92bda1397deaaad70a76955d14f91fd"; + }; + deps = { + "async-0.9.0" = self.by-version."async"."0.9.0"; + "bignumber.js-2.0.7" = self.by-version."bignumber.js"."2.0.7"; + "extend-1.2.1" = self.by-version."extend"."1.2.1"; + "lodash-3.8.0" = self.by-version."lodash"."3.8.0"; + "lru-cache-2.5.2" = self.by-version."lru-cache"."2.5.2"; + "ripple-wallet-generator-1.0.3" = self.by-version."ripple-wallet-generator"."1.0.3"; + "ws-0.7.1" = self.by-version."ws"."0.7.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "ripple-lib" = self.by-version."ripple-lib"."0.12.4"; + by-spec."ripple-lib-transactionparser"."^0.3.2" = + self.by-version."ripple-lib-transactionparser"."0.3.2"; + by-version."ripple-lib-transactionparser"."0.3.2" = self.buildNodePackage { + name = "ripple-lib-transactionparser-0.3.2"; + version = "0.3.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ripple-lib-transactionparser/-/ripple-lib-transactionparser-0.3.2.tgz"; + name = "ripple-lib-transactionparser-0.3.2.tgz"; + sha1 = "cf85e44f9f623798b68f664244e026956092f874"; + }; + deps = { + "bignumber.js-1.4.1" = self.by-version."bignumber.js"."1.4.1"; + "lodash-3.8.0" = self.by-version."lodash"."3.8.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "ripple-lib-transactionparser" = self.by-version."ripple-lib-transactionparser"."0.3.2"; + by-spec."ripple-wallet-generator"."^1.0.3" = + self.by-version."ripple-wallet-generator"."1.0.3"; + by-version."ripple-wallet-generator"."1.0.3" = self.buildNodePackage { + name = "ripple-wallet-generator-1.0.3"; + version = "1.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/ripple-wallet-generator/-/ripple-wallet-generator-1.0.3.tgz"; + name = "ripple-wallet-generator-1.0.3.tgz"; + sha1 = "2a1f0f6e2a39998fcf8fa89a55cb5c999cdb86ca"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."samsam"."~1.1" = + self.by-version."samsam"."1.1.2"; + by-version."samsam"."1.1.2" = self.buildNodePackage { + name = "samsam-1.1.2"; + version = "1.1.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz"; + name = "samsam-1.1.2.tgz"; + sha1 = "bec11fdc83a9fda063401210e40176c3024d1567"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."semver"."~4.3.2" = + self.by-version."semver"."4.3.4"; + by-version."semver"."4.3.4" = self.buildNodePackage { + name = "semver-4.3.4"; + version = "4.3.4"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/semver/-/semver-4.3.4.tgz"; + name = "semver-4.3.4.tgz"; + sha1 = "bf43a1aae304de040e12a13f84200ca7aeab7589"; }; deps = { }; @@ -3307,14 +4997,14 @@ }; deps = { "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "depd-1.0.1" = self.by-version."depd"."1.0.1"; "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; "etag-1.5.1" = self.by-version."etag"."1.5.1"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; "mime-1.3.4" = self.by-version."mime"."1.3.4"; "ms-0.7.0" = self.by-version."ms"."0.7.0"; - "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0"; + "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; }; optionalDependencies = { @@ -3323,55 +5013,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."serve-favicon"."~2.2.0" = - self.by-version."serve-favicon"."2.2.0"; - by-version."serve-favicon"."2.2.0" = self.buildNodePackage { - name = "serve-favicon-2.2.0"; - version = "2.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.2.0.tgz"; - name = "serve-favicon-2.2.0.tgz"; - sha1 = "a0c25ee8a652e1a638a67db46269cd52a8705858"; - }; - deps = { - "etag-1.5.1" = self.by-version."etag"."1.5.1"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "ms-0.7.0" = self.by-version."ms"."0.7.0"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."serve-index"."~1.6.3" = - self.by-version."serve-index"."1.6.3"; - by-version."serve-index"."1.6.3" = self.buildNodePackage { - name = "serve-index-1.6.3"; - version = "1.6.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/serve-index/-/serve-index-1.6.3.tgz"; - name = "serve-index-1.6.3.tgz"; - sha1 = "639056494ea59470a2c9518c28e7f225a342fd79"; - }; - deps = { - "accepts-1.2.5" = self.by-version."accepts"."1.2.5"; - "batch-0.5.2" = self.by-version."batch"."0.5.2"; - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1"; - "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; by-spec."serve-static"."~1.9.2" = self.by-version."serve-static"."1.9.2"; by-version."serve-static"."1.9.2" = self.buildNodePackage { @@ -3414,19 +5055,21 @@ os = [ ]; cpu = [ ]; }; - by-spec."sntp"."0.1.x" = - self.by-version."sntp"."0.1.4"; - by-version."sntp"."0.1.4" = self.buildNodePackage { - name = "sntp-0.1.4"; - version = "0.1.4"; + by-spec."sinon".">=1.4.0 <2" = + self.by-version."sinon"."1.14.1"; + by-version."sinon"."1.14.1" = self.buildNodePackage { + name = "sinon-1.14.1"; + version = "1.14.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz"; - name = "sntp-0.1.4.tgz"; - sha1 = "5ef481b951a7b29affdf4afd7f26838fc1120f84"; + url = "http://registry.npmjs.org/sinon/-/sinon-1.14.1.tgz"; + name = "sinon-1.14.1.tgz"; + sha1 = "d82797841918734507c94b7a73e3f560904578ad"; }; deps = { - "hoek-0.7.6" = self.by-version."hoek"."0.7.6"; + "formatio-1.1.1" = self.by-version."formatio"."1.1.1"; + "util-0.10.3" = self.by-version."util"."0.10.3"; + "lolex-1.1.0" = self.by-version."lolex"."1.1.0"; }; optionalDependencies = { }; @@ -3434,6 +5077,50 @@ os = [ ]; cpu = [ ]; }; + by-spec."sinon"."~1.10.0" = + self.by-version."sinon"."1.10.3"; + by-version."sinon"."1.10.3" = self.buildNodePackage { + name = "sinon-1.10.3"; + version = "1.10.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sinon/-/sinon-1.10.3.tgz"; + name = "sinon-1.10.3.tgz"; + sha1 = "c063e0e99d8327dc199113aab52eb83a2e9e3c2c"; + }; + deps = { + "formatio-1.0.2" = self.by-version."formatio"."1.0.2"; + "util-0.10.3" = self.by-version."util"."0.10.3"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "sinon" = self.by-version."sinon"."1.10.3"; + by-spec."sinon-chai"."^2.5.0" = + self.by-version."sinon-chai"."2.7.0"; + by-version."sinon-chai"."2.7.0" = self.buildNodePackage { + name = "sinon-chai-2.7.0"; + version = "2.7.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sinon-chai/-/sinon-chai-2.7.0.tgz"; + name = "sinon-chai-2.7.0.tgz"; + sha1 = "493df3a3d758933fdd3678d011a4f738d5e72540"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = [ + self.by-version."chai"."2.3.0" + self.by-version."sinon"."1.14.1"]; + os = [ ]; + cpu = [ ]; + }; + "sinon-chai" = self.by-version."sinon-chai"."2.7.0"; by-spec."sntp"."0.2.x" = self.by-version."sntp"."0.2.4"; by-version."sntp"."0.2.4" = self.buildNodePackage { @@ -3466,7 +5153,7 @@ sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; deps = { - "hoek-2.11.1" = self.by-version."hoek"."2.11.1"; + "hoek-2.13.0" = self.by-version."hoek"."2.13.0"; }; optionalDependencies = { }; @@ -3474,6 +5161,69 @@ os = [ ]; cpu = [ ]; }; + by-spec."source-map"."~0.1.33" = + self.by-version."source-map"."0.1.43"; + by-version."source-map"."0.1.43" = self.buildNodePackage { + name = "source-map-0.1.43"; + version = "0.1.43"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; + name = "source-map-0.1.43.tgz"; + sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; + }; + deps = { + "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."source-map"."~0.1.7" = + self.by-version."source-map"."0.1.43"; + by-spec."sprintf-js"."~1.0.2" = + self.by-version."sprintf-js"."1.0.2"; + by-version."sprintf-js"."1.0.2" = self.buildNodePackage { + name = "sprintf-js-1.0.2"; + version = "1.0.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.2.tgz"; + name = "sprintf-js-1.0.2.tgz"; + sha1 = "11e4d84ff32144e35b0bf3a66f8587f38d8f9978"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."sqlite3"."^3.0.2" = + self.by-version."sqlite3"."3.0.8"; + by-version."sqlite3"."3.0.8" = self.buildNodePackage { + name = "sqlite3-3.0.8"; + version = "3.0.8"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/sqlite3/-/sqlite3-3.0.8.tgz"; + name = "sqlite3-3.0.8.tgz"; + sha1 = "662d6507426ba2af0cdaf894a1766c8099c0e435"; + }; + deps = { + "nan-1.8.4" = self.by-version."nan"."1.8.4"; + "node-pre-gyp-0.6.7" = self.by-version."node-pre-gyp"."0.6.7"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "sqlite3" = self.by-version."sqlite3"."3.0.8"; by-spec."stack-trace"."0.0.x" = self.by-version."stack-trace"."0.0.9"; by-version."stack-trace"."0.0.9" = self.buildNodePackage { @@ -3493,45 +5243,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."statuses"."1" = - self.by-version."statuses"."1.2.1"; - by-version."statuses"."1.2.1" = self.buildNodePackage { - name = "statuses-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"; - name = "statuses-1.2.1.tgz"; - sha1 = "dded45cc18256d51ed40aec142489d5c61026d28"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."stream-counter"."~0.2.0" = - self.by-version."stream-counter"."0.2.0"; - by-version."stream-counter"."0.2.0" = self.buildNodePackage { - name = "stream-counter-0.2.0"; - version = "0.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz"; - name = "stream-counter-0.2.0.tgz"; - sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de"; - }; - deps = { - "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; - }; - 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 { @@ -3570,16 +5281,56 @@ os = [ ]; cpu = [ ]; }; - by-spec."sugar"."~1.3.8" = - self.by-version."sugar"."1.3.9"; - by-version."sugar"."1.3.9" = self.buildNodePackage { - name = "sugar-1.3.9"; - version = "1.3.9"; - bin = false; + by-spec."strip-ansi"."^0.3.0" = + self.by-version."strip-ansi"."0.3.0"; + by-version."strip-ansi"."0.3.0" = self.buildNodePackage { + name = "strip-ansi-0.3.0"; + version = "0.3.0"; + bin = true; src = fetchurl { - url = "http://registry.npmjs.org/sugar/-/sugar-1.3.9.tgz"; - name = "sugar-1.3.9.tgz"; - sha1 = "f879c6c87721252b51fd0b6520412d98d83cb179"; + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz"; + name = "strip-ansi-0.3.0.tgz"; + sha1 = "25f48ea22ca79187f3174a4db8759347bb126220"; + }; + deps = { + "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."strip-ansi"."^2.0.1" = + self.by-version."strip-ansi"."2.0.1"; + by-version."strip-ansi"."2.0.1" = self.buildNodePackage { + name = "strip-ansi-2.0.1"; + version = "2.0.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz"; + name = "strip-ansi-2.0.1.tgz"; + sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e"; + }; + deps = { + "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."strip-json-comments"."0.1.x" = + self.by-version."strip-json-comments"."0.1.3"; + by-version."strip-json-comments"."0.1.3" = self.buildNodePackage { + name = "strip-json-comments-0.1.3"; + version = "0.1.3"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"; + name = "strip-json-comments-0.1.3.tgz"; + sha1 = "164c64e370a8a3cc00c9e01b539e569823f0ee54"; }; deps = { }; @@ -3589,28 +5340,28 @@ os = [ ]; cpu = [ ]; }; - by-spec."superagent"."^0.18.0" = - self.by-version."superagent"."0.18.2"; - by-version."superagent"."0.18.2" = self.buildNodePackage { - name = "superagent-0.18.2"; - version = "0.18.2"; + by-spec."superagent"."0.18.0" = + self.by-version."superagent"."0.18.0"; + by-version."superagent"."0.18.0" = self.buildNodePackage { + name = "superagent-0.18.0"; + version = "0.18.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/superagent/-/superagent-0.18.2.tgz"; - name = "superagent-0.18.2.tgz"; - sha1 = "9afc6276a9475f4bdcd535ac6a0685ebc4b560eb"; + url = "http://registry.npmjs.org/superagent/-/superagent-0.18.0.tgz"; + name = "superagent-0.18.0.tgz"; + sha1 = "9d4375a3ae2c4fbd55fd20d5b12a2470d2fc8f62"; }; deps = { "qs-0.6.6" = self.by-version."qs"."0.6.6"; "formidable-1.0.14" = self.by-version."formidable"."1.0.14"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; + "mime-1.2.5" = self.by-version."mime"."1.2.5"; "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; - "methods-1.0.1" = self.by-version."methods"."1.0.1"; - "cookiejar-2.0.1" = self.by-version."cookiejar"."2.0.1"; - "debug-1.0.4" = self.by-version."debug"."1.0.4"; + "methods-0.0.1" = self.by-version."methods"."0.0.1"; + "cookiejar-1.3.2" = self.by-version."cookiejar"."1.3.2"; + "debug-0.7.4" = self.by-version."debug"."0.7.4"; "reduce-component-1.0.1" = self.by-version."reduce-component"."1.0.1"; "extend-1.2.1" = self.by-version."extend"."1.2.1"; - "form-data-0.1.3" = self.by-version."form-data"."0.1.3"; + "form-data-0.1.2" = self.by-version."form-data"."0.1.2"; "readable-stream-1.0.27-1" = self.by-version."readable-stream"."1.0.27-1"; }; optionalDependencies = { @@ -3619,19 +5370,20 @@ os = [ ]; cpu = [ ]; }; - by-spec."tough-cookie".">=0.12.0" = - self.by-version."tough-cookie"."0.12.1"; - by-version."tough-cookie"."0.12.1" = self.buildNodePackage { - name = "tough-cookie-0.12.1"; - version = "0.12.1"; + by-spec."supertest"."^0.13.0" = + self.by-version."supertest"."0.13.0"; + by-version."supertest"."0.13.0" = self.buildNodePackage { + name = "supertest-0.13.0"; + version = "0.13.0"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz"; - name = "tough-cookie-0.12.1.tgz"; - sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62"; + url = "http://registry.npmjs.org/supertest/-/supertest-0.13.0.tgz"; + name = "supertest-0.13.0.tgz"; + sha1 = "4892bafd9beaa9bbcc95fd5a9f04949aef1ce06f"; }; deps = { - "punycode-1.3.2" = self.by-version."punycode"."1.3.2"; + "superagent-0.18.0" = self.by-version."superagent"."0.18.0"; + "methods-1.0.0" = self.by-version."methods"."1.0.0"; }; optionalDependencies = { }; @@ -3639,16 +5391,185 @@ os = [ ]; cpu = [ ]; }; - by-spec."tunnel-agent"."~0.2.0" = - self.by-version."tunnel-agent"."0.2.0"; - by-version."tunnel-agent"."0.2.0" = self.buildNodePackage { - name = "tunnel-agent-0.2.0"; + "supertest" = self.by-version."supertest"."0.13.0"; + by-spec."supports-color"."^0.2.0" = + self.by-version."supports-color"."0.2.0"; + by-version."supports-color"."0.2.0" = self.buildNodePackage { + name = "supports-color-0.2.0"; version = "0.2.0"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"; + name = "supports-color-0.2.0.tgz"; + sha1 = "d92de2694eb3f67323973d7ae3d8b55b4c22190a"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."supports-color"."^1.3.0" = + self.by-version."supports-color"."1.3.1"; + by-version."supports-color"."1.3.1" = self.buildNodePackage { + name = "supports-color-1.3.1"; + version = "1.3.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz"; + name = "supports-color-1.3.1.tgz"; + sha1 = "15758df09d8ff3b4acc307539fabe27095e1042d"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."supports-color"."~1.2.0" = + self.by-version."supports-color"."1.2.1"; + by-version."supports-color"."1.2.1" = self.buildNodePackage { + name = "supports-color-1.2.1"; + version = "1.2.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/supports-color/-/supports-color-1.2.1.tgz"; + name = "supports-color-1.2.1.tgz"; + sha1 = "12ee21507086cd98c1058d9ec0f4ac476b7af3b2"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tar"."~0.1.17" = + self.by-version."tar"."0.1.20"; + by-version."tar"."0.1.20" = self.buildNodePackage { + name = "tar-0.1.20"; + version = "0.1.20"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz"; - name = "tunnel-agent-0.2.0.tgz"; - sha1 = "6853c2afb1b2109e45629e492bde35f459ea69e8"; + url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz"; + name = "tar-0.1.20.tgz"; + sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13"; + }; + deps = { + "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tar"."~2.1.0" = + self.by-version."tar"."2.1.1"; + by-version."tar"."2.1.1" = self.buildNodePackage { + name = "tar-2.1.1"; + version = "2.1.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tar/-/tar-2.1.1.tgz"; + name = "tar-2.1.1.tgz"; + sha1 = "ac0649e135fa4546e430c7698514e1da2e8a7cc4"; + }; + deps = { + "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; + "fstream-1.0.6" = self.by-version."fstream"."1.0.6"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tar-pack"."~2.0.0" = + self.by-version."tar-pack"."2.0.0"; + by-version."tar-pack"."2.0.0" = self.buildNodePackage { + name = "tar-pack-2.0.0"; + version = "2.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz"; + name = "tar-pack-2.0.0.tgz"; + sha1 = "c2c401c02dd366138645e917b3a6baa256a9dcab"; + }; + deps = { + "uid-number-0.0.3" = self.by-version."uid-number"."0.0.3"; + "once-1.1.1" = self.by-version."once"."1.1.1"; + "debug-0.7.4" = self.by-version."debug"."0.7.4"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; + "tar-0.1.20" = self.by-version."tar"."0.1.20"; + "fstream-ignore-0.0.7" = self.by-version."fstream-ignore"."0.0.7"; + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; + }; + optionalDependencies = { + "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3"; + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tildify"."~1.0.0" = + self.by-version."tildify"."1.0.0"; + by-version."tildify"."1.0.0" = self.buildNodePackage { + name = "tildify-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz"; + name = "tildify-1.0.0.tgz"; + sha1 = "2a021db5e8fbde0a8f8b4df37adaa8fb1d39d7dd"; + }; + deps = { + "user-home-1.1.1" = self.by-version."user-home"."1.1.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tinycolor"."0.x" = + self.by-version."tinycolor"."0.0.1"; + by-version."tinycolor"."0.0.1" = self.buildNodePackage { + name = "tinycolor-0.0.1"; + version = "0.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"; + name = "tinycolor-0.0.1.tgz"; + sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."tough-cookie".">=0.12.0" = + self.by-version."tough-cookie"."1.1.0"; + by-version."tough-cookie"."1.1.0" = self.buildNodePackage { + name = "tough-cookie-1.1.0"; + version = "1.1.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-1.1.0.tgz"; + name = "tough-cookie-1.1.0.tgz"; + sha1 = "126d2490e66ae5286b6863debd4a341076915954"; }; deps = { }; @@ -3677,20 +5598,39 @@ os = [ ]; cpu = [ ]; }; - by-spec."type-is"."~1.6.1" = - self.by-version."type-is"."1.6.1"; - by-version."type-is"."1.6.1" = self.buildNodePackage { - name = "type-is-1.6.1"; - version = "1.6.1"; + by-spec."type-detect"."0.1.1" = + self.by-version."type-detect"."0.1.1"; + by-version."type-detect"."0.1.1" = self.buildNodePackage { + name = "type-detect-0.1.1"; + version = "0.1.1"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.6.1.tgz"; - name = "type-is-1.6.1.tgz"; - sha1 = "49addecb0f6831cbc1d34ba929f0f3a4f21b0f2e"; + url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz"; + name = "type-detect-0.1.1.tgz"; + sha1 = "0ba5ec2a885640e470ea4e8505971900dac58822"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."type-is"."~1.6.1" = + self.by-version."type-is"."1.6.2"; + by-version."type-is"."1.6.2" = self.buildNodePackage { + name = "type-is-1.6.2"; + version = "1.6.2"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/type-is/-/type-is-1.6.2.tgz"; + name = "type-is-1.6.2.tgz"; + sha1 = "694e83e5d110417e681cea278227f264ae406e33"; }; deps = { "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10"; + "mime-types-2.0.11" = self.by-version."mime-types"."2.0.11"; }; optionalDependencies = { }; @@ -3698,20 +5638,42 @@ os = [ ]; cpu = [ ]; }; - by-spec."uid-safe"."1.1.0" = - self.by-version."uid-safe"."1.1.0"; - by-version."uid-safe"."1.1.0" = self.buildNodePackage { - name = "uid-safe-1.1.0"; - version = "1.1.0"; - bin = false; + by-spec."type-is"."~1.6.2" = + self.by-version."type-is"."1.6.2"; + by-spec."uglify-js"."~2.3" = + self.by-version."uglify-js"."2.3.6"; + by-version."uglify-js"."2.3.6" = self.buildNodePackage { + name = "uglify-js-2.3.6"; + version = "2.3.6"; + bin = true; src = fetchurl { - url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.1.0.tgz"; - name = "uid-safe-1.1.0.tgz"; - sha1 = "58d6c5dabf8dfbd8d52834839806c03fd6143232"; + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz"; + name = "uglify-js-2.3.6.tgz"; + sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a"; + }; + deps = { + "async-0.2.10" = self.by-version."async"."0.2.10"; + "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; + "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."uid-number"."0.0.3" = + self.by-version."uid-number"."0.0.3"; + by-version."uid-number"."0.0.3" = self.buildNodePackage { + name = "uid-number-0.0.3"; + version = "0.0.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"; + name = "uid-number-0.0.3.tgz"; + sha1 = "cefb0fa138d8d8098da71a40a0d04a8327d6e1cc"; }; deps = { - "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1"; - "native-or-bluebird-1.1.2" = self.by-version."native-or-bluebird"."1.1.2"; }; optionalDependencies = { }; @@ -3719,8 +5681,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."uid-safe"."~1.1.0" = - self.by-version."uid-safe"."1.1.0"; by-spec."ultron"."1.0.x" = self.by-version."ultron"."1.0.1"; by-version."ultron"."1.0.1" = self.buildNodePackage { @@ -3740,25 +5700,6 @@ os = [ ]; cpu = [ ]; }; - by-spec."underscore"."~1.4.4" = - 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 = [ ]; - }; by-spec."underscore"."~1.7.0" = self.by-version."underscore"."1.7.0"; by-version."underscore"."1.7.0" = self.buildNodePackage { @@ -3778,6 +5719,44 @@ os = [ ]; cpu = [ ]; }; + by-spec."underscore.string"."~2.4.0" = + self.by-version."underscore.string"."2.4.0"; + by-version."underscore.string"."2.4.0" = self.buildNodePackage { + name = "underscore.string-2.4.0"; + version = "2.4.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"; + name = "underscore.string-2.4.0.tgz"; + sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."user-home"."^1.0.0" = + self.by-version."user-home"."1.1.1"; + by-version."user-home"."1.1.1" = self.buildNodePackage { + name = "user-home-1.1.1"; + version = "1.1.1"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"; + name = "user-home-1.1.1.tgz"; + sha1 = "2b5be23a32b63a7c9deb8d0f28d485724a3df190"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."utf-8-validate"."1.0.x" = self.by-version."utf-8-validate"."1.0.1"; by-version."utf-8-validate"."1.0.1" = self.buildNodePackage { @@ -3799,6 +5778,26 @@ os = [ ]; cpu = [ ]; }; + by-spec."util".">=0.10.3 <1" = + self.by-version."util"."0.10.3"; + by-version."util"."0.10.3" = self.buildNodePackage { + name = "util-0.10.3"; + version = "0.10.3"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/util/-/util-0.10.3.tgz"; + name = "util-0.10.3.tgz"; + sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + }; + deps = { + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; by-spec."utils-merge"."1.0.0" = self.by-version."utils-merge"."1.0.0"; by-version."utils-merge"."1.0.0" = self.buildNodePackage { @@ -3837,16 +5836,16 @@ os = [ ]; cpu = [ ]; }; - by-spec."vhost"."~3.0.0" = - self.by-version."vhost"."3.0.0"; - by-version."vhost"."3.0.0" = self.buildNodePackage { - name = "vhost-3.0.0"; - version = "3.0.0"; + by-spec."when"."~3.4.6" = + self.by-version."when"."3.4.6"; + by-version."when"."3.4.6" = self.buildNodePackage { + name = "when-3.4.6"; + version = "3.4.6"; bin = false; src = fetchurl { - url = "http://registry.npmjs.org/vhost/-/vhost-3.0.0.tgz"; - name = "vhost-3.0.0.tgz"; - sha1 = "2d0ec59a3e012278b65adbe17c1717a5a5023045"; + url = "http://registry.npmjs.org/when/-/when-3.4.6.tgz"; + name = "when-3.4.6.tgz"; + sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c"; }; deps = { }; @@ -3856,24 +5855,43 @@ os = [ ]; cpu = [ ]; }; - by-spec."winston"."~0.7.2" = - self.by-version."winston"."0.7.3"; - by-version."winston"."0.7.3" = self.buildNodePackage { - name = "winston-0.7.3"; - version = "0.7.3"; - bin = false; + by-spec."which"."1.0.x" = + self.by-version."which"."1.0.9"; + by-version."which"."1.0.9" = self.buildNodePackage { + name = "which-1.0.9"; + version = "1.0.9"; + bin = true; src = fetchurl { - url = "http://registry.npmjs.org/winston/-/winston-0.7.3.tgz"; - name = "winston-0.7.3.tgz"; - sha1 = "7ae313ba73fcdc2ecb4aa2f9cd446e8298677266"; + url = "http://registry.npmjs.org/which/-/which-1.0.9.tgz"; + name = "which-1.0.9.tgz"; + sha1 = "460c1da0f810103d0321a9b633af9e575e64486f"; }; deps = { - "async-0.2.10" = self.by-version."async"."0.2.10"; - "colors-0.6.2" = self.by-version."colors"."0.6.2"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."winston"."^1.0.0" = + self.by-version."winston"."1.0.0"; + by-version."winston"."1.0.0" = self.buildNodePackage { + name = "winston-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/winston/-/winston-1.0.0.tgz"; + name = "winston-1.0.0.tgz"; + sha1 = "30e36e0041fc0a864b0029565719e4dc41d026a4"; + }; + deps = { + "async-0.9.0" = self.by-version."async"."0.9.0"; + "colors-1.0.3" = self.by-version."colors"."1.0.3"; "cycle-1.0.3" = self.by-version."cycle"."1.0.3"; "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; + "isstream-0.1.2" = self.by-version."isstream"."0.1.2"; "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; - "request-2.16.6" = self.by-version."request"."2.16.6"; "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; }; optionalDependencies = { @@ -3882,7 +5900,90 @@ os = [ ]; cpu = [ ]; }; - "winston" = self.by-version."winston"."0.7.3"; + "winston" = self.by-version."winston"."1.0.0"; + by-spec."wordwrap"."0.0.x" = + 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."wordwrap".">=0.0.2" = + self.by-version."wordwrap"."1.0.0"; + by-version."wordwrap"."1.0.0" = self.buildNodePackage { + name = "wordwrap-1.0.0"; + version = "1.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; + name = "wordwrap-1.0.0.tgz"; + sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."wordwrap"."~0.0.2" = + self.by-version."wordwrap"."0.0.3"; + by-spec."wrappy"."1" = + self.by-version."wrappy"."1.0.1"; + by-version."wrappy"."1.0.1" = self.buildNodePackage { + name = "wrappy-1.0.1"; + version = "1.0.1"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"; + name = "wrappy-1.0.1.tgz"; + sha1 = "1e65969965ccbc2db4548c6b84a6f2c5aedd4739"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + by-spec."ws"."^0.4.32" = + self.by-version."ws"."0.4.32"; + by-version."ws"."0.4.32" = self.buildNodePackage { + name = "ws-0.4.32"; + version = "0.4.32"; + bin = true; + src = fetchurl { + url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz"; + name = "ws-0.4.32.tgz"; + sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32"; + }; + deps = { + "commander-2.1.0" = self.by-version."commander"."2.1.0"; + "nan-1.0.0" = self.by-version."nan"."1.0.0"; + "tinycolor-0.0.1" = self.by-version."tinycolor"."0.0.1"; + "options-0.0.6" = self.by-version."options"."0.0.6"; + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; + "ws" = self.by-version."ws"."0.4.32"; by-spec."ws"."~0.7.1" = self.by-version."ws"."0.7.1"; by-version."ws"."0.7.1" = self.buildNodePackage { @@ -3906,4 +6007,23 @@ os = [ ]; cpu = [ ]; }; + by-spec."xtend"."^4.0.0" = + self.by-version."xtend"."4.0.0"; + by-version."xtend"."4.0.0" = self.buildNodePackage { + name = "xtend-4.0.0"; + version = "4.0.0"; + bin = false; + src = fetchurl { + url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz"; + name = "xtend-4.0.0.tgz"; + sha1 = "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f"; + }; + deps = { + }; + optionalDependencies = { + }; + peerDependencies = []; + os = [ ]; + cpu = [ ]; + }; } diff --git a/pkgs/servers/rippled/ripple-rest.nix b/pkgs/servers/rippled/ripple-rest.nix new file mode 100644 index 00000000000..01fd098c920 --- /dev/null +++ b/pkgs/servers/rippled/ripple-rest.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, nodePackages }: + +with lib; + +let + np = nodePackages.override { generated = ./package.nix; self = np; }; +in nodePackages.buildNodePackage rec { + name = "ripple-rest-${version}"; + version = "1.7.0-rc1"; + + src = fetchFromGitHub { + repo = "ripple-rest"; + owner = "ripple"; + rev = version; + sha256 = "19ixgrz40iawd927jan0g1ac8w56wxh2vy3n3sa3dn9cmjd4k2r3"; + }; + + deps = (filter (v: nixType v == "derivation") (attrValues np)); + + meta = { + description = " RESTful API for submitting payments and monitoring accounts on the Ripple Network"; + homepage = https://github.com/ripple/ripple-rest; + maintainers = with maintainers; [ offline ]; + license = [ licenses.mit ]; + }; +} diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix index 635934db23c..be30e12258b 100644 --- a/pkgs/servers/search/elasticsearch/default.nix +++ b/pkgs/servers/search/elasticsearch/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "elasticsearch-1.4.4"; + name = "elasticsearch-1.4.5"; src = fetchurl { url = "https://download.elasticsearch.org/elasticsearch/elasticsearch/${name}.tar.gz"; - sha256 = "11l57r0pnx20v6zy047lw5zgq9r3w95k1smsvrj0clk89r3qs5d3"; + sha256 = "1qjnffbxa1fz5f3sqahhgf45b4r1xa5lkjy9xj135g0w8jgala6w"; }; patches = [ ./es-home.patch ]; diff --git a/pkgs/servers/sql/postgresql/jdbc/default.nix b/pkgs/servers/sql/postgresql/jdbc/default.nix index 61b12164f24..ba5a9ead698 100644 --- a/pkgs/servers/sql/postgresql/jdbc/default.nix +++ b/pkgs/servers/sql/postgresql/jdbc/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { cp jars/*.jar $out/share/java ''; - meta = { + meta = with stdenv.lib; { homepage = http://jdbc.postgresql.org/; description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; - license = "bsd"; + license = licenses.bsd3; }; } diff --git a/pkgs/servers/sql/postgresql/psqlodbc/default.nix b/pkgs/servers/sql/postgresql/psqlodbc/default.nix index ce57c214183..72221c0eec0 100644 --- a/pkgs/servers/sql/postgresql/psqlodbc/default.nix +++ b/pkgs/servers/sql/postgresql/psqlodbc/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { configureFlags = "--with-iodbc=${libiodbc}"; - meta = { + meta = with stdenv.lib; { homepage = http://psqlodbc.projects.postgresql.org/; description = "ODBC driver for PostgreSQL"; - license = "LGPL"; + license = licenses.lgpl2; }; } diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index ada34030034..b755d28c851 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -2,11 +2,11 @@ let - version = "5.0.7"; + version = "5.0.8"; documentation = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}-doc.tar.bz2"; - sha256 = "1wgw16r7z6k3mbr94mwfc8f13yc4ds2d9qk41hvsiv6rm5dnds23"; + sha256 = "0h4y6f0fjb1lf83j4cixl0h5jgyy5q7y1iw7w33flp7s8y60ir8f"; }; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/zsh/zsh-${version}.tar.bz2"; - sha256 = "1cq4cz7ngvmbg399dva3g6njcz5d92gprmyi2swqc0klh7g2fkjl"; + sha256 = "08vxw74v8cx6hcynz0cdf7s2z5p6nqmxfsxmhhpz5vwbrc4cyyc0"; }; buildInputs = [ ncurses coreutils pcre ]; @@ -69,7 +69,7 @@ EOF ''; license = "MIT-like"; homepage = "http://www.zsh.org/"; - maintainers = with stdenv.lib.maintainers; [ chaoflow ]; + maintainers = with stdenv.lib.maintainers; [ chaoflow pSub ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix index 383b7a0e079..7d49bde68c1 100644 --- a/pkgs/tools/compression/lzop/default.nix +++ b/pkgs/tools/compression/lzop/default.nix @@ -9,9 +9,9 @@ stdenv.mkDerivation { buildInputs = [ lzo ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.lzop.org; description = "Fast file compressor"; - license = "GPL"; + license = licenses.gpl2; }; } diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix new file mode 100644 index 00000000000..354afb8d178 --- /dev/null +++ b/pkgs/tools/compression/zopfli/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "zopfli-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "zopfli"; + rev = name; + name = "${name}-src"; + sha256 = "0r2k3md24y5laslzsph7kh4synm5az4ppv64idrvjk5yh2qwwb62"; + }; + + installPhase = '' + install -D zopfli $out/bin/zopfli + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/google/zopfli; + description = "A compression tool to perform very good, but slow, deflate or zlib compression"; + longDescription = + ''Zopfli Compression Algorithm is a compression library programmed + in C to perform very good, but slow, deflate or zlib compression. + + This library can only compress, not decompress. Existing zlib or + deflate libraries can decompress the data. + ''; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.asl20; + maintainers = with maintainers; [ bobvanderlinden ]; + }; +} diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index f47107c85fb..69c2d046f1c 100644 --- a/pkgs/tools/filesystems/boxfs/default.nix +++ b/pkgs/tools/filesystems/boxfs/default.nix @@ -32,6 +32,8 @@ in stdenv.mkDerivation { cp -a --no-preserve=mode ${libjson} libjson ''; + patches = [ ./work-around-API-borkage.patch ]; + buildInputs = [ curl fuse libxml2 pkgconfig ]; buildFlags = "static"; diff --git a/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch b/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch new file mode 100644 index 00000000000..b74e7f32466 --- /dev/null +++ b/pkgs/tools/filesystems/boxfs/work-around-API-borkage.patch @@ -0,0 +1,15 @@ +diff --git a/boxapi.c b/boxapi.c +index 4964273..1a32e0d 100644 +--- a/boxapi.c ++++ b/boxapi.c +@@ -38,8 +38,8 @@ + // AUTH + #define API_KEY_VAL "f9ss11y2w0hg5r04jsidxlhk4pil28cf" + #define API_SECRET "r3ZHAIhsOL2FoHjgERI9xf74W5skIM0w" +-#define API_OAUTH_URL "https://app.box.com/api/oauth2/" //"https://www.box.com/api/oauth2/" +-#define API_OAUTH_AUTHORIZE API_OAUTH_URL "authorize?response_type=code&client_id=" API_KEY_VAL /*"&redirect_uri=http%3A//localhost"*/ ++#define API_OAUTH_URL "https://api.box.com/oauth2/" //"https://www.box.com/api/oauth2/" ++#define API_OAUTH_AUTHORIZE "https://app.box.com/api/oauth2/authorize?response_type=code&client_id=" API_KEY_VAL /*"&redirect_uri=http%3A//localhost"*/ + #define API_OAUTH_TOKEN API_OAUTH_URL "token" + // CALLS + #define API_ENDPOINT "https://api.box.com/2.0/" diff --git a/pkgs/tools/graphics/nip2/default.nix b/pkgs/tools/graphics/nip2/default.nix index 81222cde2ed..e61488e202d 100644 --- a/pkgs/tools/graphics/nip2/default.nix +++ b/pkgs/tools/graphics/nip2/default.nix @@ -2,11 +2,11 @@ fftw, gsl, goffice_0_8, libgsf }: stdenv.mkDerivation rec { - name = "nip2-7.42.1"; + name = "nip2-8.0"; src = fetchurl { url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz"; - sha256 = "14lfyn0azswrz8r81ign9lbpxzk7ibmnnp03a3l8wgxvm2j9a7jl"; + sha256 = "10ybac0qrz63x1yk1d0gpv9z1vzpadyii2qhrai6lllplzw6jqx7"; }; buildInputs = diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index bc1f86e3661..08f99469d25 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { ''; }; - meta = { + meta = with stdenv.lib; { homepage = http://optipng.sourceforge.net/; description = "A PNG optimizer"; - license = "bsd"; + license = licenses.zlib; }; } diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index fd26174f197..f35553ea168 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -40,9 +40,9 @@ stdenv.mkDerivation { --prefix PATH : ${ghostscript}/bin:${pngnq}/bin:${djvulibre}/bin:${unrar}/bin:${optipng}/bin ''; - meta = { + meta = with stdenv.lib; { description = "PDF/DJVU to ebook format converter"; homepage = http://www.mobileread.com/forums/showthread.php?t=21906; - license = "bsd"; + license = licenses.mit; }; } diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index f9b7ad8fe64..cc086da5a13 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.7.83"; + name = "pngcrush-1.7.85"; src = fetchurl { url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; - sha256 = "0324l1czflplz49i1i3xs72pzi9p4f8h6yk626q5y81fn29kg5mj"; + sha256 = "1hvcync32x2ign694scafkj7xc73gzyy8n2l5z026yxckilyyv19"; }; configurePhase = '' diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 28b65da24a5..a411080c390 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "vips-7.42.1"; + name = "vips-8.0.2"; src = fetchurl { url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz"; - sha256 = "1gvazsyfa8w9wdwz89rpa1xmfpyk3b0cp4kkila1r9jc3sqp5qjy"; + sha256 = "0fpshv71sxbkbycxgd2hvwn7fyq9rm0rsgq0b1zld1an88mi0v8y"; }; buildInputs = diff --git a/pkgs/tools/inputmethods/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-anthy/default.nix index df0790877ac..1b0201c4b17 100644 --- a/pkgs/tools/inputmethods/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-anthy/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, ibus, anthy, intltool, pkgconfig, glib, gobjectIntrospection, python, pythonPackages }: -let version = "1.5.4"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ibus-anthy-${version}"; + version = "1.5.6"; meta = with stdenv.lib; { description = "IBus interface to the anthy input method"; - homepace = https://code.google.com/p/ibus/; + homepage = http://wiki.github.com/fujiwarat/ibus-anthy; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ gebner ]; @@ -23,7 +23,7 @@ in stdenv.mkDerivation { ''; src = fetchurl { - url = "https://ibus.googlecode.com/files/ibus-anthy-${version}.tar.gz"; - sha256 = "4c0a8b88a2c547e72173a7d682d82797f6c65fe712abe5f3b89495d4eec7b031"; + url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz"; + sha256 = "0vl904l5862zxfi8fiiljwvqv4yvb3nfdbkmpcqk3zw4r1mn6p03"; }; } diff --git a/pkgs/tools/inputmethods/ibus-qt/default.nix b/pkgs/tools/inputmethods/ibus-qt/default.nix index c538d36ec59..95c32532e40 100644 --- a/pkgs/tools/inputmethods/ibus-qt/default.nix +++ b/pkgs/tools/inputmethods/ibus-qt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ibus-qt-${version}"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "http://ibus.googlecode.com/files/${name}-Source.tar.gz"; - sha256 = "070c8ef4e6c74eddf7ddf4385936aed730c2dfe2160162e5c56b5158d1061a76"; + url = "https://github.com/ibus/ibus-qt/releases/download/${version}/${name}-Source.tar.gz"; + sha256 = "1q9g7qghpcf07valc2ni7yf994xqx2pmdffknj7scxfidav6p19g"; }; buildInputs = [ @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DQT_PLUGINS_DIR=lib/qt4/plugins" ]; meta = with stdenv.lib; { - homepage = https://code.google.com/p/ibus/; + homepage = https://github.com/ibus/ibus-qt/; description = "Qt4 interface to the ibus input method"; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 6b426169a70..97a8c3e7d1c 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "ibus-${version}"; - version = "1.5.5"; + version = "1.5.10"; src = fetchurl { - url = "http://ibus.googlecode.com/files/${name}.tar.gz"; - sha256 = "1v4a9xv2k26g6ggk4282ynfvh68j2r5hg1cdpvnryfa8c2pkdaq2"; + url = "https://github.com/ibus/ibus/releases/download/${version}/${name}.tar.gz"; + sha256 = "152mdzi9hr246spnn7bkb4gy16x30082xwq460gmm1q2cs0bf08x"; }; configureFlags = "--disable-gconf --enable-dconf --disable-memconf --enable-ui --enable-python-library"; @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { libnotify isocodes gobjectIntrospection ]; - preBuild = '' - patchShebangs ./scripts - substituteInPlace data/dconf/Makefile --replace "dconf update" "echo" + preConfigure = '' + substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo" + sed -i "s|PYTHON2_LIBDIR=.*|PYTHON2_LIBDIR=$out/lib/${python.libPrefix}|" configure ''; preFixup = '' @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://code.google.com/p/ibus/; + homepage = https://github.com/ibus/ibus; description = "Intelligent Input Bus for Linux / Unix OS"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix new file mode 100644 index 00000000000..c8fe39f6a7a --- /dev/null +++ b/pkgs/tools/misc/calamares/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchgit, cmake, qt5, polkit_qt5, libyamlcpp, python, boost, parted +, extra-cmake-modules, kconfig, ki18n, kcoreaddons, solid, utillinux, libatasmart }: + +stdenv.mkDerivation rec { + name = "calamares-${version}"; + version = "1.0"; + + src = fetchgit { + url = "https://github.com/calamares/calamares.git"; + rev = "dabfb68a68cb012a90cd7b94a22e1ea08f7dd8ad"; + sha256 = "2851ce487aaac61d2df342a47f91ec87fe52ff036227ef697caa7056fe5f188c"; + }; + + buildInputs = [ + cmake qt5.base qt5.tools libyamlcpp python boost polkit_qt5 parted + extra-cmake-modules kconfig ki18n kcoreaddons solid utillinux libatasmart + ]; + + cmakeFlags = [ + "-DPYTHON_LIBRARY=${python}/lib/libpython${python.majorVersion}m.so" + "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m" + "-DWITH_PARTITIONMANAGER=1" + ]; + + preInstall = '' + substituteInPlace cmake_install.cmake --replace "${polkit_qt5}" "$out" + ''; + + meta = with stdenv.lib; { + description = "Distribution-independent installer framework"; + license = licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ tstrobel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index e29c5effbdb..16af347e551 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "ethtool-3.18"; + name = "ethtool-4.0"; src = fetchurl { url = "mirror://kernel/software/network/ethtool/${name}.tar.xz"; - sha256 = "1xj20fr44dk01hghyy5sq962sbiywc88ni3qqliv8bfxzmczwgw1"; + sha256 = "1zzcwn6pk8qfasalqkxg8vrhacksfa50xsq4xifw7yfjqyn8fj4h"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 18137312a3d..574178222c6 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl} : stdenv.mkDerivation { - name = "remind-3.1.13"; + name = "remind-3.1.14"; src = fetchurl { - url = http://www.roaringpenguin.com/files/download/remind-03.01.13.tar.gz; - sha256 = "0kzw1d53nlj90qfsibbs2gkzp1hamqqxpj57ip4kz1j1xgan69ng"; + url = http://www.roaringpenguin.com/files/download/remind-03.01.14.tar.gz; + sha256 = "1b9ij3r95lf14q6dyh8ilzc3y5yxxc1iss8wj3i49n6zjvklml8a"; }; meta = { diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix index 5e473a5cd09..c00db07ed1f 100644 --- a/pkgs/tools/misc/t1utils/default.nix +++ b/pkgs/tools/misc/t1utils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "t1utils-1.38"; + name = "t1utils-1.39"; src = fetchurl { url = "http://www.lcdf.org/type/${name}.tar.gz"; - sha256 = "1pnxpjabjyzfjrp319wsq4acxw99c8nnsaalbz7nwamj8kkim7zw"; + sha256 = "1i6ln194ns2g4j5zjlj4bfzxpkfpnxvy37n9baq3hywjqkjz7bhg"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix new file mode 100644 index 00000000000..e6fb4e0130b --- /dev/null +++ b/pkgs/tools/networking/carddav-util/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchgit, python, pythonPackages, makeWrapper }: + +stdenv.mkDerivation rec { + + name = "carddav-0.1-2014-02-26"; + + src = fetchgit { + url = git://github.com/ljanyst/carddav-util; + rev = "53b181faff5f154bcd180467dd04c0ce69405564"; + sha256 = "0f0raffdy032wlnxfck6ky60r163nhqfbr311y4ry55l60s4497n"; + }; + + buildInputs = [makeWrapper]; + + propagatedBuildInputs = with pythonPackages; [ requests vobject lxml ]; + + doCheck = false; # no test + + installPhase = '' + mkdir -p $out/bin + cp $src/carddav-util.py $out/bin + + pythondir="$out/lib/${python.libPrefix}/site-packages" + mkdir -p "$pythondir" + cp $src/carddav.py "$pythondir" + ''; + + preFixup = '' + wrapProgram "$out/bin/carddav-util.py" \ + --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)" \ + --prefix PATH : "$prefix/bin:$PATH" + ''; + + meta = { + homepage = https://github.com/ljanyst/carddav-util; + description = "A CardDAV import/export utility"; + }; +} diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix index c1a41d98f4b..c19dcae965b 100644 --- a/pkgs/tools/networking/dnstop/default.nix +++ b/pkgs/tools/networking/dnstop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpcap, ncurses }: -stdenv.mkDerivation { - name = "dnstop-20121017"; +stdenv.mkDerivation rec { + name = "dnstop-20140915"; src = fetchurl { - url = http://dns.measurement-factory.com/tools/dnstop/src/dnstop-20121017.tar.gz; - sha256 = "1xjrz4dzwshfrlc226s390sbwd10j0pl2al09d62955b6xh2vvba"; + url = "http://dns.measurement-factory.com/tools/dnstop/src/${name}.tar.gz"; + sha256 = "0yn5s2825l826506gclbcfk3lzllx9brk9rzja6yj5jv0013vc5l"; }; buildInputs = [ libpcap ncurses ]; diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index a31511beeab..cc1531961b3 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "httpie-0.8.0"; + name = "httpie-0.9.2"; namePrefix = ""; src = fetchurl { url = "http://pypi.python.org/packages/source/h/httpie/${name}.tar.gz"; - sha256 = "16f3scm794plxbyw7a5b4541hb2psa85kfi98g83785i2qwz98ag"; + sha256 = "0s0dsj1iimn17h0xyziwk4kz4ga9s0vy9rhzixh8dna32za84fdg"; }; - propagatedBuildInputs = with pythonPackages; [ pygments requests2 ]; + propagatedBuildInputs = with pythonPackages; [ pygments requests2 curses ]; doCheck = false; diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 44c8bb45b72..a9591a3ecde 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -2,7 +2,7 @@ , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl , pkgconfig, zlib }: -let version = "0.5.9-5-g107456c"; in +let version = "0.5.9-10-gb7ece46"; in stdenv.mkDerivation { name = "netsniff-ng-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { src = fetchFromGitHub rec { repo = "netsniff-ng"; owner = repo; - rev = "107456c646ab38e5ccb6ee788389faced59c16ff"; - sha256 = "0i0b2595x4cprf9d4crwjn3qvswz2qxr905zpcwxa3qan6hrmnsp"; + rev = "b7ece46f62b1fbece160cc7bd2905a6d0d3970a9"; + sha256 = "1m44ssvkzp4xrkwc61gsmn2vkbmf9r5mp1zjz8cj8w120703cljj"; }; buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index 52ca9ad494f..ed28db45f10 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sstp-client-${version}"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { url = "mirror://sourceforge/sstp-client/sstp-client/${version}/sstp-client-${version}.tar.gz"; - sha256 = "0kpwywbavmlgid07rk8ff0bxp75bnfa1nc28w4j0pkxjhmja5n6k"; + sha256 = "096lw3a881hjqnffms3bl077pjyq77870kjaf83chhjcakc8942z"; }; patchPhase = diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 67c4578ac9a..2a9d167cfcd 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, curl, gpgme }: +{ stdenv, fetchurl, pkgconfig, curl, gpgme, libarchive, bzip2, lzma, attr, acl }: stdenv.mkDerivation rec { - version = "0.2.4"; + version = "0.3.0"; name = "opkg-${version}"; src = fetchurl { url = "http://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "11ih8lay1v7sk5czk3m3cfqil4cp8s7pfz60xnddy7nqazjcfh0g"; + sha256 = "13wqai7lgyfjlqvly0bz786wk9frl16a9yzrn27p3wwfvcf5swvz"; }; - buildInputs = [ pkgconfig curl gpgme ]; + buildInputs = [ pkgconfig curl gpgme libarchive bzip2 lzma attr acl ]; meta = with stdenv.lib; { description = "A lightweight package management system based upon ipkg"; diff --git a/pkgs/tools/security/muscleframework/default.nix b/pkgs/tools/security/muscleframework/default.nix index 97b0617d396..c1b9dad91ff 100644 --- a/pkgs/tools/security/muscleframework/default.nix +++ b/pkgs/tools/security/muscleframework/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation { buildInputs = [ libmusclecard pkgconfig pcsclite]; - meta = { + meta = with stdenv.lib; { description = "MUSCLE smart card framework - mcard plugin"; homepage = http://muscleplugins.alioth.debian.org/; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric]; + license = licenses.bsd3; + maintainers = with maintainers; [viric]; # XXX: don't build before libmusclecard is fixed # platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/security/muscletool/default.nix b/pkgs/tools/security/muscletool/default.nix index cc369835f25..34f75609e4f 100644 --- a/pkgs/tools/security/muscletool/default.nix +++ b/pkgs/tools/security/muscletool/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation { buildInputs = [ libmusclecard pcsclite pkgconfig ]; - meta = { + meta = with stdenv.lib; { description = "Smart card applications for use with MUSCLE plugins"; homepage = http://muscleapps.alioth.debian.org/; - license = "BSD"; # http://anonscm.debian.org/viewvc/muscleapps/trunk/muscleTool/COPYING?view=markup - maintainers = with stdenv.lib.maintainers; [viric]; + license = licenses.bsd3; + maintainers = with maintainers; [viric]; # XXX: don't build before libmusclecard is fixed # platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix index 84150b46837..63a6e7e1fa3 100644 --- a/pkgs/tools/system/dfc/default.nix +++ b/pkgs/tools/system/dfc/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, cmake, gettext}: stdenv.mkDerivation rec { - name = "dfc-3.0.4"; + name = "dfc-3.0.5"; src = fetchurl { - url = "http://projects.gw-computing.net/attachments/download/79/dfc-3.0.4.tar.gz"; - sha256 = "0bdc2edb92c7f740a0b7d3fa75eb134adf197ba711bfa589ab51c691fabd617e"; + url = "http://projects.gw-computing.net/attachments/download/467/${name}.tar.gz"; + sha256 = "0yl5dl1nydinji71zz37c7myg3vg9jzxq89rcjqlfcy5dcfpm51w"; }; buildInputs = [ cmake gettext ]; diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index b97252e74de..a85aa045b66 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -1,20 +1,21 @@ -{stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }: +{ stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }: stdenv.mkDerivation rec { - version = "0.7.17"; + version = "0.7.21"; name = "pdf2djvu-${version}"; src = fetchurl { - url = "http://pdf2djvu.googlecode.com/files/pdf2djvu_${version}.tar.gz"; - sha256 = "1nplcabb8526bs5707k9212pi000wnskq3c9hbq9acgmdlnnwvgy"; + url = "https://bitbucket.org/jwilk/pdf2djvu/downloads/${name}.tar.xz"; + sha256 = "1fc7nrc8z5z66ifjjqbqn3c52hxlzgkgbdrr3cgrwdp27k681m0j"; }; buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ]; - meta = { + meta = with stdenv.lib; { description = "Creates djvu files from PDF files"; homepage = http://code.google.com/p/pdf2djvu/; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; inherit version; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37045d696e5..23ad099c3dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -285,6 +285,10 @@ let dotnetfx = dotnetfx40; }; + dotnetbuildhelpers = import ../build-support/dotnetbuildhelpers { + inherit mono helperFunctions pkgconfig; + }; + scatterOutputHook = makeSetupHook {} ../build-support/setup-hooks/scatter_output.sh; vsenv = callPackage ../build-support/vsenv { @@ -409,6 +413,9 @@ let meta.homepage = "http://repo.or.cz/${repo}.git/"; }; + fetchNuGet = import ../build-support/fetchnuget { inherit stdenv fetchurl buildDotnetPackage unzip; }; + buildDotnetPackage = import ../build-support/build-dotnet-package { inherit stdenv lib makeWrapper mono pkgconfig dotnetbuildhelpers; }; + resolveMirrorURLs = {url}: fetchurl { showURLs = true; inherit url; @@ -1645,6 +1652,13 @@ let ghostscript = null; }; + calamares = callPackage ../tools/misc/calamares rec { + python = python3; + boost = callPackage ../development/libraries/boost/1.57.nix { python=python3; }; + libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; }; + inherit (kf5_stable) extra-cmake-modules kconfig ki18n kcoreaddons solid; + }; + grub = callPackage_i686 ../tools/misc/grub { buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; automake = automake112x; # fails with 13 and 14 @@ -3872,6 +3886,8 @@ let fsharp = callPackage ../development/compilers/fsharp {}; + dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix { inherit stdenv fetchNuGet; }); + go_1_0 = callPackage ../development/compilers/go { }; go_1_1 = @@ -3896,23 +3912,17 @@ let gwt240 = callPackage ../development/compilers/gwt/2.4.0.nix { }; - icedtea7_jdk = callPackage ../development/compilers/icedtea rec { - jdk = openjdk; - giflib = giflib_5_0; - } // { outputs = [ "out" ]; }; - - icedtea7_jre = (lib.setName "icedtea7-${lib.getVersion pkgs.icedtea7_jdk.jre}" (lib.addMetaAttrs - { description = "Free Java runtime environment based on OpenJDK 7.0 and the IcedTea project"; } - pkgs.icedtea7_jdk.jre)) // { outputs = [ "jre" ]; }; - icedtea7_web = callPackage ../development/compilers/icedtea-web { - jdk = icedtea7_jdk; + jdk = jdk7; xulrunner = firefox; }; - icedtea_jdk = icedtea7_jdk; - icedtea_jre = icedtea7_jre; - icedtea_web = icedtea7_web; + icedtea8_web = callPackage ../development/compilers/icedtea-web { + jdk = jdk8; + xulrunner = firefox; + }; + + icedtea_web = icedtea8_web; ikarus = callPackage ../development/compilers/ikarus { }; @@ -3920,34 +3930,43 @@ let path64 = callPackage ../development/compilers/path64 { }; - openjdk = - if stdenv.isDarwin then - callPackage ../development/compilers/openjdk-darwin { } - else - let - openjdkBootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { }; - in (callPackage ../development/compilers/openjdk { - jdk = openjdkBootstrap; - }) // { outputs = [ "out" ]; }; + openjdk7-bootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "7"; }; + openjdk8-bootstrap = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; - openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix { } // { outputs = [ "out" ]; }; + openjdk7-make-bootstrap = callPackage ../development/compilers/openjdk/make-bootstrap.nix { + openjdk = openjdk7.override { minimal = true; }; + }; + openjdk8-make-bootstrap = callPackage ../development/compilers/openjdk/make-bootstrap.nix { + openjdk = openjdk8.override { minimal = true; }; + }; - # FIXME: Need a way to set per-output meta attributes. - openjre = (lib.setName "openjre-${lib.getVersion pkgs.openjdk.jre}" (lib.addMetaAttrs - { description = "The open-source Java Runtime Environment"; } - pkgs.openjdk.jre)) // { outputs = [ "jre" ]; }; + openjdk-darwin = callPackage ../development/compilers/openjdk-darwin { }; - jdk = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" - then pkgs.icedtea_jdk - else if stdenv.isDarwin - then pkgs.openjdk # TODO: Use icedtea for darwin - else pkgs.oraclejdk; + openjdk7 = callPackage ../development/compilers/openjdk { + bootjdk = openjdk7-bootstrap; + }; + openjdk7_jdk = openjdk7 // { outputs = [ "out" ]; }; + openjdk7_jre = openjdk7 // { outputs = [ "jre" ]; }; - jre = if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" - then pkgs.icedtea_jre - else if stdenv.isDarwin - then pkgs.openjre # TODO: Use icedtea for darwin - else pkgs.oraclejre; + openjdk8 = callPackage ../development/compilers/openjdk/openjdk8.nix { + bootjdk = openjdk8-bootstrap; + }; + openjdk8_jdk = openjdk8 // { outputs = [ "out" ]; }; + openjdk8_jre = openjdk8 // { outputs = [ "jre" ]; }; + + openjdk = if stdenv.isDarwin then openjdk-darwin else openjdk8; + + java7 = openjdk7; + jdk7 = java7 // { outputs = [ "out" ]; }; + jre7 = java7 // { outputs = [ "jre" ]; }; + + java8 = openjdk8; + jdk8 = java8 // { outputs = [ "out" ]; }; + jre8 = java8 // { outputs = [ "jre" ]; }; + + java = if stdenv.isDarwin then openjdk-darwin else jdk8; + jdk = java // { outputs = [ "out" ]; }; + jre = java // { outputs = [ "jre" ]; }; oraclejdk = pkgs.jdkdistro true false; @@ -7512,7 +7531,9 @@ let openbr = callPackage ../development/libraries/openbr { }; - opencascade = callPackage ../development/libraries/opencascade { }; + opencascade = callPackage ../development/libraries/opencascade { + tcl = tcl-8_5; + }; opencascade_6_5 = callPackage ../development/libraries/opencascade/6.5.nix { automake = automake111x; @@ -8974,10 +8995,10 @@ let }; rippled = callPackage ../servers/rippled { - boost = boost155; + boost = boost157; }; - ripple-data-api = callPackage ../servers/rippled/data-api.nix { }; + ripple-rest = callPackage ../servers/rippled/ripple-rest.nix { }; s6 = callPackage ../servers/s6 { }; @@ -10423,10 +10444,14 @@ let tcl = tcl-8_5; }; + AMB-plugins = callPackage ../applications/audio/AMB-plugins { }; + ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; amsn = callPackage ../applications/networking/instant-messengers/amsn { }; + antimony = callPackage ../applications/graphics/antimony {}; + antiword = callPackage ../applications/office/antiword {}; ardour = ardour4; @@ -10561,6 +10586,8 @@ let canto-daemon = callPackage ../applications/networking/feedreaders/canto-daemon { }; + carddav-util = callPackage ../tools/networking/carddav-util { }; + carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss gtkspell aspell gettext ncurses avahi dbus dbus_glib python @@ -10591,6 +10618,8 @@ let amdappsdk = amdappsdk28; }; + CharacterCompressor = callPackage ../applications/audio/CharacterCompressor { }; + chatzilla = callPackage ../applications/networking/irc/chatzilla { }; chromium = callPackage ../applications/networking/browsers/chromium { @@ -10626,10 +10655,14 @@ let cmus = callPackage ../applications/audio/cmus { }; + CompBus = callPackage ../applications/audio/CompBus { }; + compiz = callPackage ../applications/window-managers/compiz { inherit (gnome) GConf ORBit2 metacity; }; + constant-detune-chorus = callPackage ../applications/audio/constant-detune-chorus { }; + coriander = callPackage ../applications/video/coriander { inherit (gnome) libgnomeui GConf; }; @@ -10783,6 +10816,8 @@ let gconf = null; alsaLib = null; imagemagick = null; + acl = null; + gpm = null; }; emacs24-nox = lowPrio (appendToName "nox" (emacs24.override { @@ -12204,6 +12239,8 @@ let qt = qt4; }); + RhythmDelay = callPackage ../applications/audio/RhythmDelay { }; + rofi = callPackage ../applications/misc/rofi { automake = automake114x; }; @@ -12377,7 +12414,6 @@ let sonic-visualiser = callPackage ../applications/audio/sonic-visualiser { inherit (pkgs.vamp) vampSDK; inherit (pkgs.xlibs) libX11; - fftw = pkgs.fftwSinglePrec; }; sox = callPackage ../applications/misc/audio/sox { }; @@ -12996,6 +13032,8 @@ let inherit (gnome) libgnomeprint libgnomeprintui libgnomecanvas; }; + apvlv = callPackage ../applications/misc/apvlv { }; + xpdf = callPackage ../applications/misc/xpdf { motif = lesstif; base14Fonts = "${ghostscript}/share/ghostscript/fonts"; @@ -14394,12 +14432,7 @@ let nix-serve = callPackage ../tools/package-management/nix-serve { }; - # Remember to check the default lightdm wallpaper - nixos-artwork = fetchgit { - url = "git://github.com/NixOS/nixos-artwork"; - rev = "e71b6846023919136795ede22b16d73b2cf1693d"; - sha256 = "167yvhm2qy7qgyrqqs4hv98mmlarhgxpcsyv0r8a9g3vkblfdczb"; - }; + nixos-artwork = callPackage ../data/misc/nixos-artwork { }; nut = callPackage ../applications/misc/nut { }; @@ -14535,6 +14568,8 @@ let tetex = callPackage ../tools/typesetting/tex/tetex { libpng = libpng12; }; + tewi-font = callPackage ../data/fonts/tewi {}; + tex4ht = callPackage ../tools/typesetting/tex/tex4ht { }; texFunctions = import ../tools/typesetting/tex/nix pkgs; @@ -14698,6 +14733,8 @@ let zdfmediathk = callPackage ../applications/video/zdfmediathk { }; + zopfli = callPackage ../tools/compression/zopfli { }; + myEnvFun = import ../misc/my-env { inherit substituteAll pkgs; inherit (stdenv) mkDerivation; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix new file mode 100644 index 00000000000..852856d4c69 --- /dev/null +++ b/pkgs/top-level/dotnet-packages.nix @@ -0,0 +1,495 @@ +{ stdenv +, pkgs +, buildDotnetPackage +, fetchurl +, fetchFromGitHub +, fetchNuGet +, pkgconfig +, mono +, monodevelop +, fsharp +, unzip +, overrides ? {} +}: + +let self = dotnetPackages // overrides; dotnetPackages = with self; { + + Autofac = fetchNuGet { + baseName = "Autofac"; + version = "3.5.2"; + sha256 = "194cs8ybn5xjqnzy643w5i62m0d5s34d3nshwxp2v4fcb94wa4ri"; + outputFiles = [ "lib/portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1/*" ]; + }; + + Fake = fetchNuGet { + baseName = "FAKE"; + version = "3.33.0"; + sha256 = "04gllx9d1w8zn9gq9p5k76b79ix07rilk3apdi72dmz6h3yylcdm"; + outputFiles = [ "tools/*" ]; + dllFiles = [ "Fake*.dll" ]; + }; + + Fantomas = fetchNuGet { + baseName = "Fantomas"; + version = "1.6.0"; + sha256 = "1b9rd3i76b5xzv0j62dvfr1ksdwvb59vxw6jhzpi018axjn6757q"; + outputFiles = [ "lib/*" ]; + dllFiles = [ "Fantomas*.dll" ]; + }; + + FSharpCompilerCodeDom = fetchNuGet { + baseName = "FSharp.Compiler.CodeDom"; + version = "0.9.2"; + sha256 = "0cy9gbvmfx2g74m7bgp6x9mr4avb6s560yjii7cyyxb7jlwabfcj"; + outputFiles = [ "lib/net40/*" ]; + }; + + FsCheck = fetchNuGet { + baseName = "FsCheck"; + version = "1.0.4"; + sha256 = "1q2wk4d4d1q94qzcccgmxb2lh0b8qkmpyz0p7lfphkw2gx6cy5ad"; + outputFiles = [ "lib/net45/*" ]; + }; + + FsCheckNunit = fetchNuGet { + baseName = "FsCheck.Nunit"; + version = "1.0.4"; + sha256 = "1s62jrsa5hxqy1ginl8r29rjdc8vbkwmz7mb0hglhwccdqfyr5xy"; + outputFiles = [ "lib/net45/*" ]; + }; + + FsUnit = fetchNuGet { + baseName = "FsUnit"; + version = "1.3.0.1"; + sha256 = "1k7w8pc81aplsfn7n46617khmzingd2v7hcgdhh7vgsssibwms64"; + outputFiles = [ "Lib/Net40/*" ]; + }; + + NUnit = fetchNuGet { + baseName = "NUnit"; + version = "2.6.4"; + sha256 = "1acwsm7p93b1hzfb83ia33145x0w6fvdsfjm9xflsisljxpdx35y"; + outputFiles = [ "lib/*" ]; + }; + + NUnitRunners = fetchNuGet { + baseName = "NUnit.Runners"; + version = "2.6.4"; + sha256 = "11nmi7vikn9idz8qcad9z7f73arsh5rw18fc1sri9ywz77mpm1s4"; + outputFiles = [ "tools/*" ]; + preInstall = "mv -v tools/lib/* tools && rmdir -v tools/lib"; + }; + + SystemCollectionsImmutable = fetchNuGet { + baseName = "System.Collections.Immutable"; + version = "1.1.36"; + sha256 = "0760kzf5s771pnvnxsgas446kqdh1b71w6g3k75jpzldfmsd3vyq"; + outputFiles = [ "lib/portable-net45+win8+wp8+wpa81/*" ]; + }; + + ExtCore = buildDotnetPackage rec { + baseName = "ExtCore"; + version = "0.8.46"; + + src = fetchFromGitHub { + owner = "jack-pappas"; + repo = "ExtCore"; + rev = "0269b6d3c479f45abd7aa983aaeca08d07473943"; + sha256 = "1kxkiszpvqisffhd6wciha8j3dhkq06w9c540bmq8zixa4xaj83p"; + }; + + buildInputs = [ + fsharp + dotnetPackages.NUnit + dotnetPackages.FsCheck + ]; + + postConfigure = '' + # Fix case + sed -i -e s,nuget.targets,NuGet.targets, ExtCore.Tests/ExtCore.Tests.fsproj + ''; + + xBuildFlags = [ "/p:Configuration=Release (net45)" ]; + outputFiles = [ "ExtCore/bin/net45/Release/*" ]; + + meta = { + description = "ExtCore is an extended core library for F#"; + homepage = "https://github.com/jack-pappas/ExtCore"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ obadz ]; + platforms = with stdenv.lib.platforms; linux; + }; + }; + + FSharpAutoComplete = buildDotnetPackage rec { + baseName = "FSharp.AutoComplete"; + version = "0.16.0"; + + src = fetchurl { + name = "${baseName}-${version}.tar.gz"; + url = "https://github.com/fsharp/FSharp.AutoComplete/archive/${version}.tar.gz"; + sha256 = "0mwp456zfw1sjy2mafz2shx0sjn4f858pfnsmawy50g8l2znw8qg"; + }; + + buildInputs = [ + fsharp + dotnetPackages.FSharpCompilerService + dotnetPackages.NewtonsoftJson + dotnetPackages.NDeskOptions + ]; + + outputFiles = [ "FSharp.AutoComplete/bin/Release/*" ]; + + meta = { + description = "This project provides a command-line interface to the FSharp.Compiler.Service project. It is intended to be used as a backend service for rich editing or 'intellisense' features for editors."; + homepage = "https://github.com/fsharp/FSharp.AutoComplete"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ obadz ]; + platforms = with stdenv.lib.platforms; linux; + }; + }; + + FSharpCompilerService = buildDotnetPackage rec { + baseName = "FSharp.Compiler.Service"; + version = "0.0.89"; + + src = fetchFromGitHub { + owner = "fsharp"; + repo = "FSharp.Compiler.Service"; + rev = "55a8143a82bb31c3e8c1ad2af64eb64162fed0d7"; + sha256 = "1f5f97382h8v9p0j7c2gksrps12d869m752n692b3g0k8h4zpial"; + }; + + buildInputs = [ + fsharp + dotnetPackages.NUnit + ]; + + outputFiles = [ "bin/v4.5/*" ]; + + meta = { + description = "The F# compiler services package is a component derived from the F# compiler source code that exposes additional functionality for implementing F# language bindings"; + homepage = "http://fsharp.github.io/FSharp.Compiler.Service/"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ obadz ]; + platforms = with stdenv.lib.platforms; linux; + }; + }; + + FSharpData = buildDotnetPackage rec { + baseName = "FSharp.Data"; + version = "2.2.2"; + + src = fetchurl { + name = "${baseName}-${version}.tar.gz"; + url = "https://github.com/fsharp/FSharp.Data/archive/${version}.tar.gz"; + sha256 = "1li33ydjxz18v8siw53vv1nmkp5w7sdlsjcrfp6dzcynpvwbjw3s"; + }; + + buildInputs = [ fsharp ]; + + fileProvidedTypes = fetchurl { + name = "ProvidedTypes.fs"; + url = https://raw.githubusercontent.com/fsprojects/FSharp.TypeProviders.StarterPack/877014bfa6244ac382642e113d7cd6c9bc27bc6d/src/ProvidedTypes.fs; + sha256 = "1lb056v1xld1rfx6a8p8i2jz8i6qa2r2823n5izsf1qg1qgf2980"; + }; + + fileDebugProvidedTypes = fetchurl { + name = "DebugProvidedTypes.fs"; + url = https://raw.githubusercontent.com/fsprojects/FSharp.TypeProviders.StarterPack/877014bfa6244ac382642e113d7cd6c9bc27bc6d/src/DebugProvidedTypes.fs; + sha256 = "1whyrf2jv6fs7kgysn2086v15ggjsd54g1xfs398mp46m0nxp91f"; + }; + + preConfigure = '' + # Copy single-files-in-git-repos + mkdir -p "paket-files/fsprojects/FSharp.TypeProviders.StarterPack/src" + cp -v "${fileProvidedTypes}" "paket-files/fsprojects/FSharp.TypeProviders.StarterPack/src/ProvidedTypes.fs" + cp -v "${fileDebugProvidedTypes}" "paket-files/fsprojects/FSharp.TypeProviders.StarterPack/src/DebugProvidedTypes.fs" + ''; + + xBuildFiles = [ "src/FSharp.Data.fsproj" "src/FSharp.Data.DesignTime.fsproj" ]; + outputFiles = [ "bin/*.dll" "bin/*.xml" ]; + + meta = { + description = "F# Data: Library for Data Access"; + homepage = "http://fsharp.github.io/FSharp.Data/"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ obadz ]; + platforms = with stdenv.lib.platforms; linux; + }; + }; + + # FSharpxExtras = buildDotnetPackage rec { + # baseName = "FSharpx.Extras"; + # version = "1.8.41"; + # + # src = fetchurl { + # name = "${baseName}-${version}.tar.gz"; + # url = "https://github.com/fsprojects/FSharpx.Extras/archive/${version}.tar.gz"; + # sha256 = "102z5bvk3ffi1crgyp51488vamv41fsf61n8x8pdiznq155zydhl"; + # }; + # + # buildInputs = [ + # fsharp + # dotnetPackages.NUnit + # dotnetPackages.FsCheck + # dotnetPackages.FsCheckNunit + # dotnetPackages.FsUnit + # ]; + # + # patches = [ ./disable_excel.patch ]; + # + # xBuildFiles = [ "FSharpx.WithTypeProviders.sln" ]; + # outputFiles = [ "build/*" ]; + # + # meta = { + # description = "FSharpx.Extras is a collection of libraries and tools for use with F#."; + # homepage = "http://fsprojects.github.io/FSharpx.Extras/"; + # license = stdenv.lib.licenses.asl20; + # maintainers = with stdenv.lib.maintainers; [ obadz ]; + # platforms = with stdenv.lib.platforms; linux; + # }; + # }; + + MonoDevelopFSharpBinding = buildDotnetPackage rec { + baseName = "MonoDevelop.FSharpBinding"; + version = "git-a09c8185eb"; + + src = fetchFromGitHub { + owner = "fsharp"; + repo = "fsharpbinding"; + rev = "a09c8185ebf23fe2f7d22b14b4af2e3268d4f011"; + sha256 = "1zp5gig42s1h681kch0rw5ykbbj0mcsmdvpyz1319wy9s7n2ng91"; + }; + + buildInputs = [ + fsharp + monodevelop + pkgs.gtk-sharp + pkgs.gnome-sharp + dotnetPackages.ExtCore + dotnetPackages.FSharpCompilerService + dotnetPackages.FSharpCompilerCodeDom + dotnetPackages.FSharpAutoComplete + dotnetPackages.Fantomas + ]; + + patches = [ + ../development/dotnet-modules/patches/monodevelop-fsharpbinding.references.patch + ../development/dotnet-modules/patches/monodevelop-fsharpbinding.addin-xml.patch + ]; + + preConfigure = '' + substituteInPlace monodevelop/configure.fsx --replace /usr/lib/monodevelop ${monodevelop}/lib/monodevelop + substituteInPlace monodevelop/configure.fsx --replace bin/MonoDevelop.exe ../../bin/monodevelop + (cd monodevelop; fsharpi ./configure.fsx) + ''; + + # This will not work as monodevelop probably looks in absolute nix store path rather than path + # relative to its executable. Need to ln -s /run/current-system/sw/lib/dotnet/MonoDevelop.FSharpBinding + # ~/.local/share/MonoDevelop-5.0/LocalInstall/Addins/ to install until we have a better way + + # postInstall = '' + # mkdir -p "$out/lib/monodevelop/AddIns" + # ln -sv "$out/lib/dotnet/${baseName}" "$out/lib/monodevelop/AddIns" + # ''; + + xBuildFiles = [ "monodevelop/MonoDevelop.FSharpBinding/MonoDevelop.FSharp.mac-linux.fsproj" ]; + outputFiles = [ "monodevelop/bin/mac-linux/Release/*" ]; + + meta = { + description = "F# addin for MonoDevelop 5.9"; + homepage = "https://github.com/fsharp/fsharpbinding/tree/5.9"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ obadz ]; + platforms = with stdenv.lib.platforms; linux; + }; + }; + + NDeskOptions = stdenv.mkDerivation rec { + baseName = "NDesk.Options"; + version = "0.2.1"; + name = "${baseName}-${version}"; + + src = fetchurl { + name = "${baseName}-${version}.tar.gz"; + url = "http://www.ndesk.org/archive/ndesk-options/ndesk-options-0.2.1.tar.gz"; + sha256 = "1y25bfapafwmifakjzyb9c70qqpvza8g5j2jpf08j8wwzkrb6r28"; + }; + + buildInputs = [ + mono + pkgconfig + ]; + + preConfigure = '' + substituteInPlace configure --replace gmcs mcs + ''; + + postInstall = '' + # Otherwise pkg-config won't find it and the DLL will get duplicated + ln -sv $out/lib/pkgconfig/ndesk-options.pc $out/lib/pkgconfig/NDesk.Options.pc + ''; + + dontStrip = true; + + meta = { + description = "NDesk.Options is a callback-based program option parser for C#."; + homepage = "http://www.ndesk.org/Options"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ obadz ]; + platforms = with stdenv.lib.platforms; linux; + }; + }; + + NewtonsoftJson = buildDotnetPackage rec { + baseName = "Newtonsoft.Json"; + version = "6.0.8"; + + src = fetchurl { + name = "${baseName}-${version}.tar.gz"; + url = "https://github.com/JamesNK/Newtonsoft.Json/archive/${version}.tar.gz"; + sha256 = "14znf5mycka578bxjnlnz6a3f9nfkc682hgmgg42gdzksnarvhlm"; + }; + + buildInputs = [ + fsharp + dotnetPackages.NUnit + dotnetPackages.SystemCollectionsImmutable + dotnetPackages.Autofac + ]; + + patches = [ ../development/dotnet-modules/patches/newtonsoft-json.references.patch ]; + + postConfigure = '' + # Just to make sure there's no attempt to call these executables + rm -rvf Tools + ''; + + xBuildFiles = [ "Src/Newtonsoft.Json.sln" ]; + outputFiles = [ "Src/Newtonsoft.Json/bin/Release/Net45/*" ]; + + meta = { + description = "Popular high-performance JSON framework for .NET"; + homepage = "http://www.newtonsoft.com/json"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ obadz ]; + platforms = with stdenv.lib.platforms; linux; + }; + }; + + Nuget = buildDotnetPackage { + baseName = "Nuget"; + version = "2.8.5"; + + src = fetchFromGitHub { + owner = "mono"; + repo = "nuget-binary"; + rev = "da1f2102f8172df6f7a1370a4998e3f88b91c047"; + sha256 = "1hbnckc4gvqkknf8gh1k7iwqb4vdzifdjd19i60fnczly5v8m1c3"; + }; + + buildInputs = [ unzip ]; + + phases = [ "unpackPhase" "installPhase" ]; + + outputFiles = [ "*" ]; + dllFiles = [ "NuGet*.dll" ]; + exeFiles = [ "NuGet.exe" ]; + }; + + Paket = buildDotnetPackage rec { + baseName = "Paket"; + version = "1.6.2"; + + src = fetchurl { + name = "${baseName}-${version}.tar.gz"; + url = "https://github.com/fsprojects/Paket/archive/${version}.tar.gz"; + sha256 = "1ryslxdgc3r7kcn1gq4bqcyrqdi8z6364aj3lr7yjz71wi22fca8"; + }; + + buildInputs = [ + fsharp + dotnetPackages.NewtonsoftJson + dotnetPackages.UnionArgParser + dotnetPackages.NUnit + ]; + + fileFsUnit = fetchurl { + name = "FsUnit.fs"; + url = https://raw.githubusercontent.com/forki/FsUnit/81d27fd09575a32c4ed52eadb2eeac5f365b8348/FsUnit.fs; + sha256 = "1zxigqgb2s2v755622jbbzibvf91990x2dijhbdgg646vsybkpdp"; + }; + + # fileOctokit = fetchurl { + # name = "Octokit.fsx"; + # url = https://raw.githubusercontent.com/fsharp/FAKE/8e65e2fc1406f326b44f3f87ec9ca9b3127a6e78/modules/Octokit/Octokit.fsx; + # sha256 = "16qxwmgyg3fn3z9a8hppv1m579828x7lvfj8qflcgs2g6ciagsir"; + # }; + + fileGlobbing = fetchurl { + name = "Globbing.fs"; + url = https://raw.githubusercontent.com/fsharp/FAKE/8e65e2fc1406f326b44f3f87ec9ca9b3127a6e78/src/app/FakeLib/Globbing/Globbing.fs; + sha256 = "1v7d7666a61j6f8ksh0q40hfsc5b03448viq17xa91xgb7skhyx7"; + }; + + fileErrorHandling = fetchurl { + name = "ErrorHandling.fs"; + url = https://raw.githubusercontent.com/fsprojects/Chessie/3017092260b4a59a3b4b25bf8fca6be6eb7487eb/src/Chessie/ErrorHandling.fs; + sha256 = "0ka9ilfbl4izxc1wqd5vlfjnp7n2xcckfhp13gzhqbdx7464van9"; + }; + + postConfigure = '' + # Copy said single-files-in-git-repos + mkdir -p "paket-files/forki/FsUnit" + cp -v "${fileFsUnit}" "paket-files/forki/FsUnit/FsUnit.fs" + + mkdir -p "paket-files/fsharp/FAKE/src/app/FakeLib/Globbing" + cp -v "${fileGlobbing}" "paket-files/fsharp/FAKE/src/app/FakeLib/Globbing/Globbing.fs" + + mkdir -p "paket-files/fsprojects/Chessie/src/Chessie" + cp -v "${fileErrorHandling}" "paket-files/fsprojects/Chessie/src/Chessie/ErrorHandling.fs" + ''; + + xBuildFiles = [ ]; + + outputFiles = [ "bin/*" ]; + exeFiles = [ "paket.exe" ]; + + meta = { + description = "A dependency manager for .NET and Mono projects"; + homepage = "http://fsprojects.github.io/Paket/"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ obadz ]; + platforms = with stdenv.lib.platforms; linux; + }; + }; + + UnionArgParser = buildDotnetPackage rec { + baseName = "UnionArgParser"; + version = "0.8.7"; + + src = fetchFromGitHub { + owner = "nessos"; + repo = "UnionArgParser"; + rev = "acaeb946e53cbb0bd9768977c656b3242146070a"; + sha256 = "1yrs7ycf2hg7h8z6vm9lr7i3gr9s30k74fr2maigdydnnls93als"; + }; + + buildInputs = [ + fsharp + dotnetPackages.NUnit + dotnetPackages.FsUnit + ]; + + outputFiles = [ "bin/net40/*" ]; + + meta = { + description = "A declarative CLI argument/XML configuration parser for F# applications."; + homepage = "http://nessos.github.io/UnionArgParser/"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ obadz ]; + platforms = with stdenv.lib.platforms; linux; + }; + }; +}; in self diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d3ddc879a17..a6515c7b13a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -522,17 +522,54 @@ let }; }; + funcsigs = buildPythonPackage rec { + name = "funcsigs-0.4"; + disabled = ! (isPy26 || isPy27 || isPy33 || isPyPy); + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/f/funcsigs/${name}.tar.gz"; + md5 = "fb1d031f284233e09701f6db1281c2a5"; + }; + + buildInputs = with self; [ + unittest2 + ]; + + meta = with pkgs.stdenv.lib; { + description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"; + homepage = "https://github.com/aliles/funcsigs"; + maintainers = with maintainers; [ garbas ]; + license = licenses.asl20; + }; + }; apscheduler = buildPythonPackage rec { name = "APScheduler-3.0.1"; - - propagatedBuildInputs = with self; [ futures tzlocal six pytest mock sqlalchemy9 ]; + disabled = !isPy27; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/A/APScheduler/${name}.tar.gz"; - sha256 = "1dcyk58svhhd7flpq0fbyzcp0z3a1as4ddmdv1rxqvqng0sxhwaf"; + md5 = "7c3687b3dcd645fe9df48e34eb7a7592"; }; + buildInputs = with self; [ + pytest + sqlalchemy9 + tornado + twisted + mock + trollius + funcsigs + gevent + ]; + + propagatedBuildInputs = with self; [ + six + pytz + tzlocal + futures + ]; + meta = with pkgs.stdenv.lib; { description = "A Python library that lets you schedule your Python code to be executed"; homepage = http://pypi.python.org/pypi/APScheduler/; @@ -540,7 +577,6 @@ let }; }; - area53 = buildPythonPackage (rec { name = "Area53-0.94"; @@ -974,6 +1010,32 @@ let }; }; + buttersink = buildPythonPackage rec { + name = "buttersink-0.6.6"; + + src = pkgs.fetchurl { + sha256 = "1vi0pz8r3d17bsn5g7clkyph7sc0rjzbzqk6rwglaxcah7sfj2mj"; + url = "https://pypi.python.org/packages/source/b/buttersink/${name}.tar.gz"; + }; + + meta = { + description = "Synchronise btrfs snapshots"; + longDescription = '' + ButterSink is like rsync, but for btrfs subvolumes instead of files, + which makes it much more efficient for things like archiving backup + snapshots. It is built on top of btrfs send and receive capabilities. + Sources and destinations can be local btrfs file systems, remote btrfs + file systems over SSH, or S3 buckets. + ''; + homepage = https://github.com/AmesCornish/buttersink/wiki; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ nckx ]; + }; + + propagatedBuildInputs = with self; [ boto crcmod psutil ]; + }; + circus = buildPythonPackage rec { name = "circus-0.11.1"; @@ -5483,18 +5545,18 @@ let }; futures = buildPythonPackage rec { - name = "futures-2.1.6"; - + name = "futures-3.0.2"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/f/futures/futures-2.1.6.tar.gz"; - md5 = "cfab9ac3cd55d6c7ddd0546a9f22f453"; + url = "https://pypi.python.org/packages/source/f/futures/${name}.tar.gz"; + md5 = "42aaf1e4de48d6e871d77dc1f9d96d5a"; }; meta = with pkgs.stdenv.lib; { description = "Backport of the concurrent.futures package from Python 3.2"; - homepage = http://code.google.com/p/pythonfutures; + homepage = "https://github.com/agronholm/pythonfutures"; license = licenses.bsd2; + maintainers = with maintainers; [ garbas ]; }; }; @@ -7881,8 +7943,13 @@ let sha256 = "1fp3d3z2grb1ls97smjkraazpxnvajda2d1g1378s6gzmda2jvjd"; }; - buildInputs = with self; [ pkgs.makeWrapper ]; - propagatedBuildInputs = with self; [ requests2 pkgs.rtmpdump pycrypto singledispatch futures ]; + buildInputs = [ pkgs.makeWrapper ]; + + propagatedBuildInputs = with self; [ pkgs.rtmpdump pycrypto requests2 ] + ++ optionals isPy26 [ singledispatch futures argparse ] + ++ optionals isPy27 [ singledispatch futures ] + ++ optionals isPy33 [ singledispatch ]; + postInstall = '' wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin ''; @@ -14714,6 +14781,26 @@ let }; }; + graphite_beacon = buildPythonPackage rec { + name = "graphite_beacon-0.22.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/g/graphite_beacon/${name}.tar.gz"; + md5 = "3d7b2bf8a41b6c3ec5ba2c14db321096"; + }; + + propagatedBuildInputs = [ self.tornado ]; + + preBuild = "> requirements.txt"; + + meta = { + description = "A simple alerting application for Graphite metrics"; + homepage = https://github.com/klen/graphite-beacon; + maintainers = [ maintainers.offline ]; + license = licenses.mit; + }; + }; + graphite_influxdb = buildPythonPackage rec { name = "graphite-influxdb-0.3"; @@ -15672,4 +15759,50 @@ let }; }; + trollius = buildPythonPackage rec { + version = "1.0.4"; + name = "trollius-${version}"; + disabled = ! isPy27; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/t/trollius/${name}.tar.gz"; + md5 = "3631a464d49d0cbfd30ab2918ef2b783"; + }; + + buildInputs = [ self.mock ]; + + propagatedBuildInputs = [ self.futures ]; + + meta = { + description = "Port of the Tulip project (asyncio module, PEP 3156) on Python 2"; + homepage = "https://bitbucket.org/enovance/trollius"; + license = licenses.asl20; + maintainers = with maintainers; [ garbas ]; + }; + }; + + neovim = buildPythonPackage rec { + version = "0.0.36"; + name = "neovim-${version}"; + disabled = ! isPy27; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/n/neovim/${name}.tar.gz"; + md5 = "8cdad23402e29c7c5a1e85770e976edf"; + }; + + propagatedBuildInputs = with self; [ + msgpack + trollius + greenlet + ]; + + meta = { + description = "Python client for Neovim"; + homepage = "https://github.com/neovim/python-client"; + license = licenses.asl20; + maintainers = with maintainers; [ garbas ]; + }; + }; + }; in pythonPackages