diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 5d13d3086f7..981ed156b34 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -4,8 +4,8 @@ ###### Things done - [ ] Tested using sandboxing - ([nix.useChroot](http://nixos.org/nixos/manual/options.html#opt-nix.useChroot) on NixOS, - or option `build-use-chroot` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) + ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, + or option `build-use-sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS) - Built on platform(s) - [ ] NixOS diff --git a/.version b/.version index 18fc8443eec..6879fa566dd 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -16.09 \ No newline at end of file +17.03 \ No newline at end of file diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index c38266413bf..e7dbe3bd7db 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -481,7 +481,7 @@ and the aliases #### `buildPythonPackage` function The `buildPythonPackage` function is implemented in -`pkgs/development/python-modules/generic/default.nix` +`pkgs/development/interpreters/python/build-python-package.nix` and can be used as: @@ -536,6 +536,7 @@ All parameters from `mkDerivation` function are still supported. * `installFlags`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]. * `format`: Format of the source. Options are `setup` for when the source has a `setup.py` and `setuptools` is used to build a wheel, and `wheel` in case the source is already a binary wheel. The default value is `setup`. * `catchConflicts` If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`. +* `checkInputs` Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`. #### `buildPythonApplication` function diff --git a/doc/old/update-upstream-data.txt b/doc/old/update-upstream-data.txt deleted file mode 100644 index 2abce3b4055..00000000000 --- a/doc/old/update-upstream-data.txt +++ /dev/null @@ -1,14 +0,0 @@ -Semi-automatic source information updating using "update-upstream-data.sh" script and "src-{,info-}for-*.nix" - -1. Recognizing when a pre-existing package uses this mechanism. - -Packages using this automatical update mechanism have src-info-for-default.nix and src-for-default.nix next to default.nix. src-info-for-default.nix describes getting the freshest source from upstream web site; src-for-default.nix is a generated file with the current data about used source. Both files define a simple attrSet. - -src-info-for-default.nix (for a file grabbed via http) contains at least downloadPage attribute - it is the page we need to look at to find out the latest version. It also contains baseName that is used for automatical generation of package name containing version. It can contain extra data for trickier cases. - -src-for-default.nix will contain advertisedUrl (raw URL chosen on the site; its change prompts regeneration of source data), url for fetchurl, hash, version retrieved from the download URL and suggested package name. - -2. Updating a package - -nixpkgs/pkgs/build-support/upstream-updater directory contains some scripts. The worker script is called update-upstream-data.sh. This script requires main expression name (e.g. default.nix). It can optionally accpet a second parameter, URL which will be used instead of getting one by parsing the downloadPage (version extraction, mirror URL creation etc. will still be run). After running the script, check src-for-default.nix (or replace default.nix with expression name, if there are seceral expressions in the directory) for new version information. - diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 5be57fc5a97..c17d7c51ae2 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -557,8 +557,8 @@ script) if it exists. configureFlags - Additional arguments passed to the configure - script. + A list of strings passed as additional arguments to the + configure script. @@ -658,7 +658,7 @@ nothing. makeFlags - Additional flags passed to + A list of strings passed as additional flags to make. These flags are also used by the default install and check phase. For setting make flags specific to the build phase, use buildFlags (see @@ -685,7 +685,7 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar") buildFlags / buildFlagsArray - Additional flags passed to + A list of strings passed as additional flags to make. Like makeFlags and makeFlagsArray, but only used by the build phase. @@ -753,7 +753,7 @@ doCheck = true; checkFlags / checkFlagsArray - Additional flags passed to + A list of strings passed as additional flags to make. Like makeFlags and makeFlagsArray, but only used by the check phase. @@ -808,7 +808,7 @@ installTargets = "install-bin install-doc"; installFlags / installFlagsArray - Additional flags passed to + A list of strings passed as additional flags to make. Like makeFlags and makeFlagsArray, but only used by the install phase. diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index 31a7ae04a4f..20d3f74f94b 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -9,6 +9,7 @@ This section lists the release notes for each stable version of NixOS and current unstable revision. + diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml index 78b57dddf07..70759ee25f8 100644 --- a/nixos/doc/manual/release-notes/rl-1609.xml +++ b/nixos/doc/manual/release-notes/rl-1609.xml @@ -57,6 +57,14 @@ following incompatible changes: behavior of Redis 3.2 + + /var/setuid-wrappers/ + is now a symlink so + it can be atomically updated + and it's not mounted as tmpfs anymore since setuid binaries are located on /run/ as tmpfs. + + + Gitlab's maintainence script gitlab-runner was removed and split up into the more clearer gitlab-run and gitlab-rake scripts because gitlab-runner is a component of Gitlab CI. diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml new file mode 100644 index 00000000000..c0fa4388a2a --- /dev/null +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -0,0 +1,46 @@ +
+ +Release 17.03 (“XXX”, 2017/03/??) + +In addition to numerous new and upgraded packages, this release +has the following highlights: + + + + + + + +The following new services were added since the last release: + + + + + + + + +When upgrading from a previous release, please be aware of the +following incompatible changes: + + + + + + + + +Other notable improvements: + + + + + + + + +
diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index 62b6e011713..e57ed2565a1 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -54,6 +54,10 @@ let WARNING: Don't try to hibernate when you have at least one swap partition with this option enabled! We have no way to set the partition into which hibernation image is saved, so if your image ends up on an encrypted one you would lose it! + + WARNING #2: Do not use /dev/disk/by-uuid/… or /dev/disk/by-label/… as your swap device + when using randomEncryption as the UUIDs and labels will get erased on every boot when + the partition is encrypted. Best to use /dev/disk/by-partuuid/… ''; }; @@ -72,7 +76,7 @@ let config = rec { device = mkIf options.label.isDefined "/dev/disk/by-label/${config.label}"; - deviceName = escapeSystemdPath config.device; + deviceName = lib.replaceChars ["\\"] [""] (escapeSystemdPath config.device); realDevice = if config.randomEncryption then "/dev/mapper/${deviceName}" else config.device; }; @@ -121,6 +125,8 @@ in createSwapDevice = sw: assert sw.device != ""; + assert !(sw.randomEncryption && lib.hasPrefix "/dev/disk/by-uuid" sw.device); + assert !(sw.randomEncryption && lib.hasPrefix "/dev/disk/by-label" sw.device); let realDevice' = escapeSystemdPath sw.realDevice; in nameValuePair "mkswap-${sw.deviceName}" { description = "Initialisation of swap device ${sw.device}"; diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 62ea98c4676..589a51fa709 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -92,14 +92,12 @@ fi mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home mkdir -m 01777 -p $mountPoint/tmp mkdir -m 0755 -p $mountPoint/tmp/root -mkdir -m 0755 -p $mountPoint/var/setuid-wrappers mkdir -m 0700 -p $mountPoint/root mount --rbind /dev $mountPoint/dev mount --rbind /proc $mountPoint/proc mount --rbind /sys $mountPoint/sys mount --rbind / $mountPoint/tmp/root mount -t tmpfs -o "mode=0755" none $mountPoint/run -mount -t tmpfs -o "mode=0755" none $mountPoint/var/setuid-wrappers rm -rf $mountPoint/var/run ln -s /run $mountPoint/var/run for f in /etc/resolv.conf /etc/hosts; do rm -f $mountPoint/$f; [ -f "$f" ] && cp -Lf $f $mountPoint/etc/; done diff --git a/nixos/modules/security/hidepid.nix b/nixos/modules/security/hidepid.nix index 4917327d617..8f2df380cfe 100644 --- a/nixos/modules/security/hidepid.nix +++ b/nixos/modules/security/hidepid.nix @@ -20,6 +20,6 @@ with lib; config = mkIf config.security.hideProcessInformation { users.groups.proc.gid = config.ids.gids.proc; - fileSystems."/proc".options = [ "hidepid=2" "gid=${toString config.ids.gids.proc}" ]; + boot.specialFileSystems."/proc".options = [ "hidepid=2" "gid=${toString config.ids.gids.proc}" ]; }; } diff --git a/nixos/modules/security/setuid-wrappers.nix b/nixos/modules/security/setuid-wrappers.nix index 99dd514feea..e1dca477d70 100644 --- a/nixos/modules/security/setuid-wrappers.nix +++ b/nixos/modules/security/setuid-wrappers.nix @@ -12,7 +12,7 @@ let installPhase = '' mkdir -p $out/bin cp ${./setuid-wrapper.c} setuid-wrapper.c - gcc -Wall -O2 -DWRAPPER_DIR=\"${wrapperDir}\" \ + gcc -Wall -O2 -DWRAPPER_DIR=\"/run/setuid-wrapper-dirs\" \ setuid-wrapper.c -o $out/bin/setuid-wrapper ''; }; @@ -102,11 +102,11 @@ in source=/nix/var/nix/profiles/default/bin/${program} fi - cp ${setuidWrapper}/bin/setuid-wrapper ${wrapperDir}/${program} - echo -n "$source" > ${wrapperDir}/${program}.real - chmod 0000 ${wrapperDir}/${program} # to prevent races - chown ${owner}.${group} ${wrapperDir}/${program} - chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" ${wrapperDir}/${program} + cp ${setuidWrapper}/bin/setuid-wrapper $wrapperDir/${program} + echo -n "$source" > $wrapperDir/${program}.real + chmod 0000 $wrapperDir/${program} # to prevent races + chown ${owner}.${group} $wrapperDir/${program} + chmod "u${if setuid then "+" else "-"}s,g${if setgid then "+" else "-"}s,${permissions}" $wrapperDir/${program} ''; in stringAfter [ "users" ] @@ -115,9 +115,29 @@ in # programs to be wrapped. SETUID_PATH=${config.system.path}/bin:${config.system.path}/sbin - rm -f ${wrapperDir}/* # */ + mkdir -p /run/setuid-wrapper-dirs + wrapperDir=$(mktemp --directory --tmpdir=/run/setuid-wrapper-dirs setuid-wrappers.XXXXXXXXXX) ${concatMapStrings makeSetuidWrapper setuidPrograms} + + if [ -L ${wrapperDir} ]; then + # Atomically replace the symlink + # See https://axialcorps.com/2013/07/03/atomically-replacing-files-and-directories/ + old=$(readlink ${wrapperDir}) + ln --symbolic --force --no-dereference $wrapperDir ${wrapperDir}-tmp + mv --no-target-directory ${wrapperDir}-tmp ${wrapperDir} + rm --force --recursive $old + elif [ -d ${wrapperDir} ]; then + # Compatibility with old state, just remove the folder and symlink + rm -f ${wrapperDir}/* + # if it happens to be a tmpfs + umount ${wrapperDir} || true + rm -d ${wrapperDir} + ln -d --symbolic $wrapperDir ${wrapperDir} + else + # For initial setup + ln --symbolic $wrapperDir ${wrapperDir} + fi ''; }; diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 9988fc6e63b..24ef4637ec9 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -11,12 +11,14 @@ let if cfg.extraPlugins == [] then pg else pkgs.buildEnv { name = "postgresql-and-plugins-${(builtins.parseDrvName pg.name).version}"; - paths = [ pg ] ++ cfg.extraPlugins; + paths = [ pg pg.lib ] ++ cfg.extraPlugins; + buildInputs = [ pkgs.makeWrapper ]; postBuild = '' mkdir -p $out/bin rm $out/bin/{pg_config,postgres,pg_ctl} cp --target-directory=$out/bin ${pg}/bin/{postgres,pg_config,pg_ctl} + wrapProgram $out/bin/postgres --set NIX_PGLIBDIR $out/lib ''; }; diff --git a/nixos/modules/services/desktops/accountsservice.nix b/nixos/modules/services/desktops/accountsservice.nix index c28c2729576..2a7450669ea 100644 --- a/nixos/modules/services/desktops/accountsservice.nix +++ b/nixos/modules/services/desktops/accountsservice.nix @@ -35,6 +35,14 @@ with lib; services.dbus.packages = [ pkgs.accountsservice ]; systemd.packages = [ pkgs.accountsservice ]; + + systemd.services.accounts-daemon= { + + wantedBy = [ "graphical.target" ]; + + } // (mkIf (!config.users.mutableUsers) { + environment.NIXOS_USERS_PURE = "true"; + }); }; } diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix index befd8c628f1..44880ebeda1 100644 --- a/nixos/modules/services/misc/gitit.nix +++ b/nixos/modules/services/misc/gitit.nix @@ -663,7 +663,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; path = with pkgs; [ curl ] - ++ optional cfg.pdfExport texLiveFull + ++ optional cfg.pdfExport texlive.combined.scheme-basic ++ optional (cfg.repositoryType == "darcs") darcs ++ optional (cfg.repositoryType == "mercurial") mercurial ++ optional (cfg.repositoryType == "git") git; diff --git a/nixos/modules/services/networking/mjpg-streamer.nix b/nixos/modules/services/networking/mjpg-streamer.nix index 9986f549aec..1286b0c7ef6 100644 --- a/nixos/modules/services/networking/mjpg-streamer.nix +++ b/nixos/modules/services/networking/mjpg-streamer.nix @@ -59,8 +59,12 @@ in { description = "mjpg-streamer webcam streamer"; wantedBy = [ "multi-user.target" ]; - serviceConfig.User = cfg.user; - serviceConfig.Group = cfg.group; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + Restart = "on-failure"; + RestartSec = 1; + }; script = '' IPLUGIN="${cfg.inputPlugin}" diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index 0dd24478f40..ed0744c44cc 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -43,14 +43,10 @@ in options = { services.unbound = { - enable = mkOption { - default = false; - type = types.bool; - description = "Whether to enable the Unbound domain name server."; - }; + enable = mkEnableOption "Unbound domain name server"; allowedAccess = mkOption { - default = ["127.0.0.0/24"]; + default = [ "127.0.0.0/24" ]; type = types.listOf types.str; description = "What networks are allowed to use unbound as a resolver."; }; @@ -97,7 +93,7 @@ in }; systemd.services.unbound = { - description="Unbound recursive Domain Name Server"; + description = "Unbound recursive Domain Name Server"; after = [ "network.target" ]; before = [ "nss-lookup.target" ]; wants = [" nss-lookup.target" ]; diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix index e66648f683f..86e0204ec2f 100644 --- a/nixos/modules/services/networking/zerotierone.nix +++ b/nixos/modules/services/networking/zerotierone.nix @@ -7,11 +7,19 @@ let in { options.services.zerotierone.enable = mkEnableOption "ZeroTierOne"; - + options.services.zerotierone.package = mkOption { + default = pkgs.zerotierone; + defaultText = "pkgs.zerotierone"; + type = types.package; + description = '' + ZeroTier One package to use. + ''; + }; + config = mkIf cfg.enable { systemd.services.zerotierone = { description = "ZeroTierOne"; - path = [ pkgs.zerotierone ]; + path = [ cfg.package ]; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = @@ -21,7 +29,7 @@ in chown -R root:root /var/lib/zerotier-one ''; serviceConfig = { - ExecStart = "${pkgs.zerotierone}/bin/zerotier-one"; + ExecStart = "${cfg.package}/bin/zerotier-one"; Restart = "always"; KillMode = "process"; }; @@ -30,6 +38,6 @@ in # ZeroTier does not issue DHCP leases, but some strangers might... networking.dhcpcd.denyInterfaces = [ "zt0" ]; - environment.systemPackages = [ pkgs.zerotierone ]; + environment.systemPackages = [ cfg.package ]; }; } diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index e86df4e74c9..61c34cc2f03 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -425,13 +425,20 @@ in { path = "/boot"; inherit (cfg) devices; inherit (efi) efiSysMountPoint; } ]; - system.build.installBootLoader = pkgs.writeScript "install-grub.sh" ('' + system.build.installBootLoader = + let + install-grub-pl = pkgs.substituteAll { + src = ./install-grub.pl; + inherit (pkgs) utillinux; + btrfsprogs = pkgs.btrfs-progs; + }; + in pkgs.writeScript "install-grub.sh" ('' #!${pkgs.stdenv.shell} set -e export PERL5LIB=${makePerlPath (with pkgs.perlPackages; [ FileSlurp XMLLibXML XMLSAX ListCompare ])} ${optionalString cfg.enableCryptodisk "export GRUB_ENABLE_CRYPTODISK=y"} '' + flip concatMapStrings cfg.mirroredBoots (args: '' - ${pkgs.perl}/bin/perl ${./install-grub.pl} ${grubConfig args} $@ + ${pkgs.perl}/bin/perl ${install-grub-pl} ${grubConfig args} $@ '')); system.build.grub = grub; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 4fa157641a4..06eece5025f 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -12,8 +12,10 @@ require List::Compare; use POSIX; use Cwd; +# system.build.toplevel path my $defaultConfig = $ARGV[1] or die; +# Grub config XML generated by grubConfig function in grub.nix my $dom = XML::LibXML->load_xml(location => $ARGV[0]); sub get { my ($name) = @_; return $dom->findvalue("/expr/attrs/attr[\@name = '$name']/*/\@value"); } @@ -97,6 +99,8 @@ sub PathInMount { } return 1; } + +# Figure out what filesystem is used for the directory with init/initrd/kernel files sub GetFs { my ($dir) = @_; my $bestFs = Fs->new(device => "", type => "", mount => ""); @@ -136,7 +140,10 @@ my $driveid = 1; sub GrubFs { my ($dir) = @_; my $fs = GetFs($dir); - my $path = "/" . substr($dir, length($fs->mount)); + my $path = substr($dir, length($fs->mount)); + if (substr($path, 0, 1) ne "/") { + $path = "/$path"; + } my $search = ""; if ($grubVersion > 1) { @@ -169,7 +176,7 @@ sub GrubFs { $search = $types{$fsIdentifier} . ' '; # Based on the type pull in the identifier from the system - my ($status, @devInfo) = runCommand("blkid -o export @{[$fs->device]}"); + my ($status, @devInfo) = runCommand("@utillinux@/bin/blkid -o export @{[$fs->device]}"); if ($status != 0) { die "Failed to get blkid info for @{[$fs->mount]} on @{[$fs->device]}"; } @@ -182,7 +189,7 @@ sub GrubFs { # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes if ($fs->type eq 'btrfs') { - my ($status, @id_info) = runCommand("btrfs subvol show @{[$fs->mount]}"); + my ($status, @id_info) = runCommand("@btrfsprogs@/bin/btrfs subvol show @{[$fs->mount]}"); if ($status != 0) { die "Failed to retrieve subvolume info for @{[$fs->mount]}\n"; } @@ -190,7 +197,7 @@ sub GrubFs { if ($#ids > 0) { die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n" } elsif ($#ids == 0) { - my ($status, @path_info) = runCommand("btrfs subvol list @{[$fs->mount]}"); + my ($status, @path_info) = runCommand("@btrfsprogs@/bin/btrfs subvol list @{[$fs->mount]}"); if ($status != 0) { die "Failed to find @{[$fs->mount]} subvolume id from btrfs\n"; } diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 7de85209a15..704150e77d7 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -141,13 +141,6 @@ if [ -n "@useHostResolvConf@" -a -e /etc/resolv.conf ]; then cat /etc/resolv.conf | resolvconf -m 1000 -a host fi - -# Create /var/setuid-wrappers as a tmpfs. -rm -rf /var/setuid-wrappers -mkdir -m 0755 -p /var/setuid-wrappers -mount -t tmpfs -o "mode=0755" tmpfs /var/setuid-wrappers - - # Log the script output to /dev/kmsg or /run/log/stage-2-init.log. # Only at this point are all the necessary prerequisites ready for these commands. exec {logOutFd}>&1 {logErrFd}>&2 diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index f2a22e4ada8..f4892244de4 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -309,7 +309,7 @@ in rec { }; startAt = mkOption { - type = types.str; + type = with types; either str (listOf str); default = ""; example = "Sun 14:00:00"; description = '' diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index d69284a7532..9ab1baeacb9 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -20,7 +20,7 @@ let specialFSTypes = [ "proc" "sysfs" "tmpfs" "devtmpfs" "devpts" ]; - fileSystemOpts = { name, config, ... }: { + coreFileSystemOpts = { name, config, ... }: { options = { @@ -37,13 +37,6 @@ let description = "Location of the device."; }; - label = mkOption { - default = null; - example = "root-partition"; - type = types.nullOr types.str; - description = "Label of the device (if any)."; - }; - fsType = mkOption { default = "auto"; example = "ext3"; @@ -55,12 +48,28 @@ let default = [ "defaults" ]; example = [ "data=journal" ]; description = "Options used to mount the file system."; - } // (if versionAtLeast lib.nixpkgsVersion "16.09" then { type = types.listOf types.str; - } else { - type = types.either types.commas (types.listOf types.str); - apply = x: if isList x then x else lib.strings.splitString "," (builtins.trace "warning: passing a comma-separated string for filesystem options is deprecated; use a list of strings instead. This will become a hard error in 16.09." x); - }); + }; + + }; + + config = { + mountPoint = mkDefault name; + device = mkIf (elem config.fsType specialFSTypes) (mkDefault config.fsType); + }; + + }; + + fileSystemOpts = { config, ... }: { + + options = { + + label = mkOption { + default = null; + example = "root-partition"; + type = types.nullOr types.str; + description = "Label of the device (if any)."; + }; autoFormat = mkOption { default = false; @@ -99,22 +108,9 @@ let description = "Disable running fsck on this filesystem."; }; - early = mkOption { - default = false; - type = types.bool; - internal = true; - description = '' - Mount this filesystem very early during boot. At the moment of - mounting no disks are exposed, so this option is primarily for - special file systems. - ''; - }; - }; config = { - mountPoint = mkDefault name; - device = mkIf (elem config.fsType specialFSTypes) (mkDefault config.fsType); options = mkIf config.autoResize [ "x-nixos.autoresize" ]; # -F needed to allow bare block device without partitions @@ -151,7 +147,7 @@ in "/bigdisk".label = "bigdisk"; } ''; - type = types.loaOf (types.submodule fileSystemOpts); + type = types.loaOf (types.submodule [coreFileSystemOpts fileSystemOpts]); description = '' The file systems to be mounted. It must include an entry for the root directory (mountPoint = "/"). Each @@ -183,6 +179,15 @@ in description = "Names of supported filesystem types."; }; + boot.specialFileSystems = mkOption { + default = {}; + type = types.loaOf (types.submodule coreFileSystemOpts); + internal = true; + description = '' + Special filesystems that are mounted very early during boot. + ''; + }; + }; @@ -196,14 +201,11 @@ in { assertion = ! (fileSystems' ? "cycle"); message = "The ‘fileSystems’ option can't be topologically sorted: mountpoint dependency path ${ls " -> " fileSystems'.cycle} loops to ${ls ", " fileSystems'.loops}"; } - { assertion = all (x: !x.early || (x.label == null && !x.autoFormat && !x.autoResize)) fileSystems; - message = "Early filesystems don't support mounting by label, auto formatting and resizing"; - } ]; # Export for use in other modules system.build.fileSystems = fileSystems; - system.build.earlyMountScript = makeSpecialMounts (filter (fs: fs.early) fileSystems); + system.build.earlyMountScript = makeSpecialMounts (toposort fsBefore (attrValues config.boot.specialFileSystems)).result; boot.supportedFilesystems = map (fs: fs.fsType) fileSystems; @@ -234,7 +236,7 @@ in + " " + (if skipCheck fs then "0" else if fs.mountPoint == "/" then "1" else "2") + "\n" - ) (filter (fs: !fs.early) fileSystems)} + ) fileSystems} # Swap devices. ${flip concatMapStrings config.swapDevices (sw: @@ -282,7 +284,7 @@ in in listToAttrs (map formatDevice (filter (fs: fs.autoFormat) fileSystems)); # Sync mount options with systemd's src/core/mount-setup.c: mount_table. - fileSystems = mapAttrs (n: fs: fs // { early = true; }) { + boot.specialFileSystems = { "/proc" = { fsType = "proc"; options = [ "nosuid" "noexec" "nodev" ]; }; "/sys" = { fsType = "sysfs"; options = [ "nosuid" "noexec" "nodev" ]; }; "/run" = { fsType = "tmpfs"; options = [ "nosuid" "nodev" "strictatime" "mode=755" "size=${config.boot.runSize}" ]; }; diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix index 760a7100c6e..ab49d8871f8 100644 --- a/nixos/modules/virtualisation/brightbox-image.nix +++ b/nixos/modules/virtualisation/brightbox-image.nix @@ -20,7 +20,7 @@ in postVM = '' - PATH=$PATH:${stdenv.lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]} + PATH=$PATH:${lib.makeBinPath [ pkgs.gnutar pkgs.gzip ]} pushd $out ${pkgs.qemu_kvm}/bin/qemu-img convert -c -O qcow2 $diskImageBase nixos.qcow2 rm $diskImageBase diff --git a/nixos/modules/virtualisation/grow-partition.nix b/nixos/modules/virtualisation/grow-partition.nix index 34547905166..abc2e766959 100644 --- a/nixos/modules/virtualisation/grow-partition.nix +++ b/nixos/modules/virtualisation/grow-partition.nix @@ -4,6 +4,8 @@ { config, lib, pkgs, ... }: +with lib; + { options = { diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index 5fb472ebfc3..ce4abecd676 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.virtualisation.virtualbox.host; virtualbox = config.boot.kernelPackages.virtualbox.override { - inherit (cfg) enableHardening; + inherit (cfg) enableHardening headless; }; in @@ -47,6 +47,15 @@ in
''; }; + + headless = mkOption { + type = types.bool; + default = false; + description = '' + Use VirtualBox installation without GUI and Qt dependency. Useful to enable on servers + and when virtual machines are controlled only via SSH. + ''; + }; }; config = mkIf cfg.enable (mkMerge [{ diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix new file mode 100644 index 00000000000..1dba5c363c0 --- /dev/null +++ b/nixos/tests/postgis.nix @@ -0,0 +1,30 @@ +import ./make-test.nix ({ pkgs, ...} : { + name = "postgis"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ lsix ]; + }; + + nodes = { + master = + { pkgs, config, ... }: + + { + services.postgresql = let mypg = pkgs.postgresql95; in { + enable = true; + package = mypg; + extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }).v_2_2_1 ]; + initialScript = pkgs.writeText "postgresql-init.sql" + '' + CREATE ROLE postgres WITH superuser login createdb; + ''; + }; + }; + }; + + testScript = '' + startAll; + $master->waitForUnit("postgresql"); + $master->sleep(10); # Hopefully this is long enough!! + $master->succeed("sudo -u postgres psql -c 'CREATE EXTENSION postgis;'"); + ''; +}) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index e85ff238089..ab4d46ab7e1 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -314,6 +314,9 @@ let test2.vmFlags = hostonlyVMFlags; test2.vmScript = dhcpScript; + + headless.virtualisation.virtualbox.headless = true; + headless.services.xserver.enable = false; }; mkVBoxTest = name: testScript: makeTest { @@ -402,6 +405,14 @@ in mapAttrs mkVBoxTest { shutdownVM_simple; ''; + headless = '' + createVM_headless; + $machine->succeed(ru("VBoxHeadless --startvm headless & disown %1")); + waitForStartup_headless; + waitForVMBoot_headless; + shutdownVM_headless; + ''; + host-usb-permissions = '' my $userUSB = removeUUIDs vbm("list usbhost"); print STDERR $userUSB; diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 6643b4475d3..8dc15195a45 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = http://ncmpcpp.rybczak.net/; license = licenses.gpl2Plus; maintainers = with maintainers; [ lovek323 mornfall koral ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 0cd5c199751..a5f5ac9d93a 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -5,7 +5,8 @@ assert stdenv.system == "x86_64-linux"; let - version = "1.0.36.120.g536a862f-20"; + # Please update the stable branch! + version = "1.0.37.152.gc83ea995-42"; deps = [ alsaLib @@ -50,7 +51,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "03r4hz4x4f3zmp6dsv1n72y5q01d7mfqvaaxqvd587a5561gahf0"; + sha256 = "00hd5q3cn9dzgphkpswd5y06k9phiqhhmb3frwdkcnb1d4pnp9cx"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 736826fcc9d..8694c30c6d4 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -28,10 +28,10 @@ ada-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, wisi }: elpaBuild { pname = "ada-mode"; - version = "5.1.9"; + version = "5.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-5.1.9.tar"; - sha256 = "04hwy9py22c4vpbk24idbyavjdjpm1akvnfigdzx35zljdrvk3l7"; + url = "https://elpa.gnu.org/packages/ada-mode-5.2.0.tar"; + sha256 = "1j4f94bmykz5j6kyyg5x81k0yjai609c1qzs8sig8v267hydkpqr"; }; packageRequires = [ cl-lib emacs wisi ]; meta = { @@ -471,10 +471,10 @@ debbugs = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, soap-client }: elpaBuild { pname = "debbugs"; - version = "0.9.7"; + version = "0.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.9.7.tar"; - sha256 = "07w73if4lmh23ih2v3p0197f781002dywd5fzdbmr4hcqvvi97qq"; + url = "https://elpa.gnu.org/packages/debbugs-0.10.tar"; + sha256 = "0vrsa70h6ipsq01qr9qzlaw1704xqviby321ri6w69wkwlcjkpin"; }; packageRequires = [ cl-lib soap-client ]; meta = { @@ -523,6 +523,19 @@ license = lib.licenses.free; }; }) {}; + diffview = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + pname = "diffview"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/diffview-1.0.el"; + sha256 = "1gkdmzmgjixz9nak7dxvqy28kz0g7i672gavamwgnc1jl37wkcwi"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/diffview.html"; + license = lib.licenses.free; + }; + }) {}; dismal = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "dismal"; @@ -605,10 +618,10 @@ }) {}; el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "el-search"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-0.2.1.el"; - sha256 = "1ralag6a4752mqbsz92prd1f75380q5f7j4k3ajhv66krhd1w0k6"; + url = "https://elpa.gnu.org/packages/el-search-0.2.2.tar"; + sha256 = "07b4jk143vi3sydg03mg12gy1rs21q0qvs7p303irwz4pv8bfwqj"; }; packageRequires = [ emacs ]; meta = { @@ -698,10 +711,10 @@ }) {}; exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { pname = "exwm"; - version = "0.6"; + version = "0.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.6.tar"; - sha256 = "0fxkhpc87wd7crzwwj9r5r3s07pznsphk4hi8jinx91641szi1px"; + url = "https://elpa.gnu.org/packages/exwm-0.10.tar"; + sha256 = "1c8558dxy7a2m61a0bc0p5vrdw3nw03zq9s8wxgmdvlklyzbqa22"; }; packageRequires = [ xelb ]; meta = { @@ -846,6 +859,19 @@ license = lib.licenses.free; }; }) {}; + hyperbole = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { + pname = "hyperbole"; + version = "6.0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/hyperbole-6.0.2.tar"; + sha256 = "0nyihi7j2061jpdzl4mf4pki840hkfpwj0m2sqz0nqxd689ckwpg"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/hyperbole.html"; + license = lib.licenses.free; + }; + }) {}; ioccur = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "ioccur"; version = "2.4"; @@ -980,10 +1006,10 @@ }) {}; lmc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "lmc"; - version = "1.3"; + version = "1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/lmc-1.3.el"; - sha256 = "0s5dkksgfbfbhc770z1n7d4jrkpcb8z1935abgrw80icxgsrc01p"; + url = "https://elpa.gnu.org/packages/lmc-1.4.el"; + sha256 = "0fm4sclx9gg0d0615smz105x320sk45y4ivpjk3nbc67c5l0sh2h"; }; packageRequires = []; meta = { @@ -1202,14 +1228,15 @@ license = lib.licenses.free; }; }) {}; - nhexl-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + nhexl-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "nhexl-mode"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/nhexl-mode-0.1.el"; - sha256 = "0h4kl5d8rj9aw4xxrmv4a9fdcqvkk74ia7bq8jgmjp11pwpzww9j"; + url = "https://elpa.gnu.org/packages/nhexl-mode-0.2.el"; + sha256 = "0qrzpkxxdwi2b3136yj5agvaxwr9g2c58kpmjmjpfhpc6yyyx5x0"; }; - packageRequires = []; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/nhexl-mode.html"; license = lib.licenses.free; @@ -1309,10 +1336,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20160725"; + version = "20160829"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20160725.tar"; - sha256 = "05ky7hlsjqlml14ss9hcj2756clvsi1f26gv7a01d923m3drkqjc"; + url = "https://elpa.gnu.org/packages/org-20160829.tar"; + sha256 = "1p0bxbzjzxmhsg1m4a3mlsphh7gcv6b97mfgkl22lfy0ia0g1fzv"; }; packageRequires = []; meta = { @@ -1375,10 +1402,10 @@ }) {}; poker = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "poker"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/poker-0.1.el"; - sha256 = "0gbm59m6bs0766r7v8dy9gdif1pb89xj1h8h76bh78hr65yh7gg0"; + url = "https://elpa.gnu.org/packages/poker-0.2.el"; + sha256 = "0sikspimvnzvwhyivi1gvr0630zz2pr3q2fwagl57iv06jas9f00"; }; packageRequires = []; meta = { @@ -1439,6 +1466,26 @@ license = lib.licenses.free; }; }) {}; + realgud = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, load-relative, loc-changes, test-simple }: + elpaBuild { + pname = "realgud"; + version = "1.4.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/realgud-1.4.3.tar"; + sha256 = "07yfah8kmr60rhrj8y8gs7l85hsbylv26crw3qbqh67ka4ykpj01"; + }; + packageRequires = [ + cl-lib + emacs + load-relative + loc-changes + test-simple + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/realgud.html"; + license = lib.licenses.free; + }; + }) {}; register-list = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "register-list"; version = "0.1"; @@ -1571,14 +1618,15 @@ license = lib.licenses.free; }; }) {}; - sml-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + sml-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "sml-mode"; version = "6.7"; src = fetchurl { url = "https://elpa.gnu.org/packages/sml-mode-6.7.el"; sha256 = "041dmxx7imiy99si9pscwjh5y4h02y3lirzhv1cfxqr3ghxngf9x"; }; - packageRequires = []; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/sml-mode.html"; license = lib.licenses.free; @@ -1639,10 +1687,10 @@ }) {}; stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "stream"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/stream-2.2.0.el"; - sha256 = "0i6vwih61a0z0q05v9wyp9nj5h68snlb9n52nmrv1k0hhzsjmlrs"; + url = "https://elpa.gnu.org/packages/stream-2.2.1.el"; + sha256 = "1d91ddak5whb7kln216vhcsl707h5kirc6aqbkw82skhpg4c3ap1"; }; packageRequires = [ emacs ]; meta = { @@ -1690,14 +1738,15 @@ license = lib.licenses.free; }; }) {}; - temp-buffer-browse = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + temp-buffer-browse = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { pname = "temp-buffer-browse"; - version = "1.4"; + version = "1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/temp-buffer-browse-1.4.el"; - sha256 = "055z7hm8b2s8z1kd6hahjz0crz9qx8k9qb5pwdwdxcsh2j70pmcw"; + url = "https://elpa.gnu.org/packages/temp-buffer-browse-1.5.el"; + sha256 = "1drfvqxc6g4vfijmx787b1ygq7x2s5wq26l45qnz4wdrqqmcqx3c"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/temp-buffer-browse.html"; license = lib.licenses.free; @@ -1759,10 +1808,10 @@ }) {}; transcribe = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "transcribe"; - version = "1.5.0"; + version = "1.5.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transcribe-1.5.0.el"; - sha256 = "0capyagpzmrf26jgqng5kvsxz30pf2iq55drnws73w9jywkq45mf"; + url = "https://elpa.gnu.org/packages/transcribe-1.5.2.el"; + sha256 = "08m1n6adab46bfywm47gygswf10vnxcfh16yjxglvcsg4prkn2vh"; }; packageRequires = []; meta = { @@ -1931,10 +1980,10 @@ wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "wisi"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-1.1.2.tar"; - sha256 = "04gryfpgbviviwbnvv3sh280pzasr59cp5xz1s0yf0n4d3rv2df3"; + url = "https://elpa.gnu.org/packages/wisi-1.1.3.tar"; + sha256 = "1vhligxyg73gvr68767pjgiqxah00a920h6i37kip8xmhlkgp9ak"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1971,10 +2020,10 @@ xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "xelb"; - version = "0.9"; + version = "0.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xelb-0.9.tar"; - sha256 = "19gv08wxs2s337y1wv2i19a0vk8w6733l9mryn334yy2m5031vxh"; + url = "https://elpa.gnu.org/packages/xelb-0.11.tar"; + sha256 = "12qgbv30dizp7kadq9kg7nfyg5qfbfy14s833zg95fqqa87qg90j"; }; packageRequires = [ cl-generic emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index d2a0c4fb276..0f7e8cad751 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -2,12 +2,12 @@ _0blayout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "_0blayout"; - version = "20151021.349"; + version = "20160826.1522"; src = fetchFromGitHub { owner = "etu"; repo = "0blayout-mode"; - rev = "22913a412ce5749d0659fe0396e909c968eec9dd"; - sha256 = "1xigpz2aswlmpcsc1f7gfakyw7041pbyl9zfd8nz38iq036n5b96"; + rev = "3032dadf28ab63c132cd20abdd3a0008f6b72f9f"; + sha256 = "1xq91wx2f0psj395jlrjb2viwdz4ai1xm34m5xvanip2vm085xgy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6521ec44ae8b0ba2e0523517f0f3d5b94ddbe1be/recipes/0blayout"; @@ -106,12 +106,12 @@ abl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abl-mode"; - version = "20160129.231"; + version = "20160823.314"; src = fetchFromGitHub { owner = "afroisalreadyinu"; repo = "abl-mode"; - rev = "e17fb93cf85423ca202b61ae226492da70a27f6c"; - sha256 = "09hy7rj27h7xbvasd87146di4vhpg5cmqc9f39fy0ihmv9gy56za"; + rev = "b6d32f5e711929e8a1a2249498a3156d86dcbff6"; + sha256 = "06lbpy75gli15gfabh38hhzr8c761j70igq2rvdvw78gacanblfi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a52edb381daa9c4dcc9f7e511175b38fc141be/recipes/abl-mode"; @@ -274,12 +274,12 @@ ac-cider = callPackage ({ auto-complete, cider, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-cider"; - version = "20160611.304"; + version = "20160810.2358"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "ac-cider"; - rev = "cb3a758690faa12e9a8542897a92db9cc55e10e7"; - sha256 = "13vv6k81zjmj14220yhc11il5s222hj83imh307xs4k6qyslpnav"; + rev = "8c652adebb0432e7aaafa2ff71200798b95e3a42"; + sha256 = "1lfdggd5mf5r623b3l0r6xwabikgxqyia7ym1x198lavxxvlrq1d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8adefaf2e284ef91baec3dbd3e10c868de69926/recipes/ac-cider"; @@ -352,6 +352,27 @@ license = lib.licenses.free; }; }) {}; + ac-emacs-eclim = callPackage ({ auto-complete, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ac-emacs-eclim"; + version = "20160813.1754"; + src = fetchFromGitHub { + owner = "emacs-eclim"; + repo = "emacs-eclim"; + rev = "a58dd558e6ad4f8f5d78b743955a758178e323be"; + sha256 = "1jn2raymx4qml8h7ala8jhgfzfbppd5nq55ffbs0il46r9w3n086"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; + sha256 = "0bkh7x6zj5drdvm9ji4vwqdxv7limd9a1idy8lsg0lcca3rjq3s5"; + name = "ac-emacs-eclim"; + }; + packageRequires = [ auto-complete eclim ]; + meta = { + homepage = "https://melpa.org/#/ac-emacs-eclim"; + license = lib.licenses.free; + }; + }) {}; ac-emmet = callPackage ({ auto-complete, emmet-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-emmet"; @@ -695,8 +716,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "ff6f268fe6f9dd7cd67dde7c52e1fe9b8a145f14"; - sha256 = "0dxhcm6cfk0sgv2nbdscjf791js9g3qkxcapjh1zwyqsgmcrk9hs"; + rev = "5b463aba738648d0ac8e1d1000e849a858353ce8"; + sha256 = "0y0yzi9dy852yxww5zzj97fpr9sdgg6n5bk9s0hbwi0v4sj4hvwa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -712,12 +733,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20160722.2111"; + version = "20160819.2147"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "ff6f268fe6f9dd7cd67dde7c52e1fe9b8a145f14"; - sha256 = "0dxhcm6cfk0sgv2nbdscjf791js9g3qkxcapjh1zwyqsgmcrk9hs"; + rev = "5b463aba738648d0ac8e1d1000e849a858353ce8"; + sha256 = "0y0yzi9dy852yxww5zzj97fpr9sdgg6n5bk9s0hbwi0v4sj4hvwa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -838,12 +859,12 @@ ace-isearch = callPackage ({ ace-jump-mode, avy, emacs, fetchFromGitHub, fetchurl, helm-swoop, lib, melpaBuild }: melpaBuild { pname = "ace-isearch"; - version = "20150808.556"; + version = "20160804.1608"; src = fetchFromGitHub { owner = "tam17aki"; repo = "ace-isearch"; - rev = "9a32a039623e3907a4fce959aa48c26a79fb249b"; - sha256 = "02i3gxk7kfv3a0pcc82z69hgvjw8bvn40y8h7d59chg8bixcwbyr"; + rev = "1355f15b49490eeff0336716f4b27b02784ef55a"; + sha256 = "15rsb0i53k9vi7w2p08k89wdqcy51av0jg8zb5a0vssc7awpk4sk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/344f0cf784a027cde196b7d766024fb415fa1968/recipes/ace-isearch"; @@ -943,12 +964,12 @@ ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-link"; - version = "20160529.2350"; + version = "20160811.112"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-link"; - rev = "5bf301e2c74960246427d3e48889a49f9f8ec6ba"; - sha256 = "1mrlwkls80blispg5hdgnif42rck3iqhcm1f3khq14nm09yqwdk9"; + rev = "36770f464a0d15f8c666a55f8aedde26c238f4f4"; + sha256 = "1rcpylzpqf06jss7kibm3jr1lpakhf236nqg39725bxqai63j6ci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link"; @@ -1089,12 +1110,12 @@ actionscript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "actionscript-mode"; - version = "20140605.1128"; + version = "20160820.1731"; src = fetchFromGitHub { owner = "austinhaas"; repo = "actionscript-mode"; - rev = "f7dd1d77322b49d259919d58ffcdf64073ba6c09"; - sha256 = "1rxx2j7kkzjdsk06zgisiydg8dc18vqll4wl6q9mfhrg2y12lq94"; + rev = "39287f00465559a58df1ea71a9dc5b15d4ac882a"; + sha256 = "19qrlnbirxay70dm5w5p2iw4wrw3acj74kixs2wkifw5sq8i5cql"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c11e74f2156f109b713380cebf83022d7159d4a/recipes/actionscript-mode"; @@ -1194,12 +1215,12 @@ ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ag"; - version = "20160702.1128"; + version = "20160731.1323"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ag.el"; - rev = "518c7a4a6c3080bcd5dab8f276942da2a9fa5b04"; - sha256 = "193bv4hwf0i0xgb7rjka94m70cd61x9a7r20x027zxlp0varmq71"; + rev = "e93d45fd09bcdac27cbd7bbab2a057cecbcbc01f"; + sha256 = "0jwdgpinz4as7npg7fhqycy6892p6i5g0gp5dd0n2n5r40gh620n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag"; @@ -1256,11 +1277,11 @@ }) {}; ahg = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahg"; - version = "20160513.136"; + version = "20160822.144"; src = fetchhg { url = "https://bitbucket.com/agriggio/ahg"; - rev = "8779fec342a4"; - sha256 = "0w5wqanw2spxxhmlxgxyp4rb9i1y6kqhfb8cyv5fz01i8b8p5faw"; + rev = "38f9f9740e19"; + sha256 = "0wcg03n9ddrh79r98i1pl59wncak7bb46cqcrv60hn239karsdaa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ahg"; @@ -1318,12 +1339,12 @@ airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "airline-themes"; - version = "20160715.1027"; + version = "20160815.1724"; src = fetchFromGitHub { owner = "AnthonyDiGirolamo"; repo = "airline-themes"; - rev = "2813df844218d48553684c9fc7e41513eabadbb9"; - sha256 = "1mdclcnmwyw193y9vmyqzviirwhq7l4x7yzvpmn0cwimwrww38xx"; + rev = "ce0804bfc4fcd6db07d1ffc96722e1e9e87f0871"; + sha256 = "0cbb8389wd80hbfb084q3b3qlkzxmz5i682rd2sl0rgvk9aafik4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes"; @@ -1423,12 +1444,12 @@ alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }: melpaBuild { pname = "alert"; - version = "20160506.1821"; + version = "20160824.821"; src = fetchFromGitHub { owner = "jwiegley"; repo = "alert"; - rev = "aa5938ae2c74ee1c296b844dc1d126cb8a31dfe1"; - sha256 = "1p6969wq2n26jvbh8p2gwc0hw38h4xq4rs299i7yzviq2hwvg8r1"; + rev = "2a81fc6642d23a4d825dae96aa2e23e865b0d56a"; + sha256 = "0blyj7m169imfifvhkwsim20163qwcqhv1f7rq9ms1awi5b33pq3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert"; @@ -1483,15 +1504,15 @@ license = lib.licenses.free; }; }) {}; - amd-mode = callPackage ({ ag, dash, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s }: + amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: melpaBuild { pname = "amd-mode"; - version = "20160726.1005"; + version = "20160801.1445"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "amd-mode.el"; - rev = "5aa1cd77a42a491cf2d534a99657645d04255771"; - sha256 = "00d096waxx8xkgq5yz8z027z03jhyj1q3i4ayhwk87px3c72skzv"; + rev = "f785c5bf39f04194dbeb5c55138c03de1524bb22"; + sha256 = "1f6q4p31v0j0n088blz87fp8n4awr39w7fpid9yfkccpi7grmjkn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; @@ -1499,14 +1520,14 @@ name = "amd-mode"; }; packageRequires = [ - ag - dash + emacs f js2-mode js2-refactor makey projectile s + seq ]; meta = { homepage = "https://melpa.org/#/amd-mode"; @@ -1579,12 +1600,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "20160717.1034"; + version = "20160825.204"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "488e292e0214715f754dfa8246ba235057025005"; - sha256 = "0adykms8s72dplnph283j43sklv92idzr0s1fg6n9zf0ci8ycimz"; + rev = "7128978b571ec013ccfd91865029cc0d062c269c"; + sha256 = "0l683fk3l82w6097d1g8i9ka3sfv9vpa363i6500xwraa49fcq9i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -1724,12 +1745,12 @@ annotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "annotate"; - version = "20151227.822"; + version = "20160825.444"; src = fetchFromGitHub { owner = "bastibe"; repo = "annotate.el"; - rev = "e8c9b33b4d9bd428c24058a63c0781ba85498242"; - sha256 = "08gs96r9mbdg0s5l504yp6i5nmi9qr4nwxq3xprsbx9bdzv5l2dx"; + rev = "95da17258802a0a831ed1558faca64b589b261af"; + sha256 = "1bjh5qm9zjw2i1h9c7fd5csmn762i1wp4hsvrifnzaawxlxx9bhj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae88b8e3b080501195d291012deab31aaf35f7/recipes/annotate"; @@ -1913,12 +1934,12 @@ anybar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anybar"; - version = "20160112.802"; + version = "20160816.721"; src = fetchFromGitHub { owner = "tie-rack"; repo = "anybar-el"; - rev = "852ce3821e8939a9e527847f86bfc7613a3087d7"; - sha256 = "0qy5q4rq68nb21k7w3xpil8k8k5awcpjrjlxjwnhcklwb83w3dhf"; + rev = "7a0743e0d31bcb36ab1bb2e351f3e7139c422ac5"; + sha256 = "1s7vnp2xzffdj4pqdqn6mrirw33ms0yqlpxzz5pwj6xrbp2x5r6s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5516e309df9ac8bf0fafb9ec9037094d82913b67/recipes/anybar"; @@ -1955,11 +1976,11 @@ anything = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anything"; - version = "20151018.1903"; + version = "20160822.1852"; src = fetchgit { url = "http://repo.or.cz/r/anything-config.git"; - rev = "2d7e0450e13ab04b20f4dff08f32936e78677e58"; - sha256 = "077gdqd6vhnfryf21mbgs2bdp8k7bdgaiajdw72rq4rlcg4xpjv9"; + rev = "86560874b1c77932502efd42727b783ebc2d173b"; + sha256 = "1ng89ajvhrzbp7cfpb6vhq7507ybi18gicn0j89m3yrl7vfiwx4n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1700e86cb35617178f5d7c61c88718ac7849f9b/recipes/anything"; @@ -2143,12 +2164,12 @@ anzu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anzu"; - version = "20160726.840"; + version = "20160818.619"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-anzu"; - rev = "3845ead349e004ff8616b11eb167051584b98e97"; - sha256 = "0735ssqp79h8r39q3f7ynd48wanhlp3xa33fdsgrpyqibpxf022v"; + rev = "1965307a41aac029db2be007120e0c743226dba4"; + sha256 = "0xizn58wplk7r7zmfm12b0rkkl4nhlskbk6h20pdfic3xvad9zyk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04ac359d02d91725c8fc451b17bc2f06a7fe57a5/recipes/anzu"; @@ -2572,8 +2593,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "assess"; - rev = "fca80753d788e48ffe782b016db925663c9e84ce"; - sha256 = "1cjjvjzim98cbqq1ifa5hrk15laswsakr95k407qiqsdbj8j7ksq"; + rev = "61771edab753d5469d4bb9b8273f55e79b3fda04"; + sha256 = "1phhjq40fwb4vv35wkdphbc676y8gqxh25iqnrd3km818md5mqlb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f917a34506193f2674b195569dfd3c13ba62c1d/recipes/assess"; @@ -2652,12 +2673,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20160521.1206"; + version = "20160816.713"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "807679bfe9ddc53a0cd6cfcdcd851b4496c707e3"; - sha256 = "07gbnm0bbgbqvmzhwmfpnxfkirrldr4dvvvq5plv923hbqzayiih"; + rev = "0e20e451605a052ef4faecafbd4d9937a6daaf0c"; + sha256 = "1q9c0ckrax5qvf3l3v8pxf1ygx380k803rdwrl9c8yb9wmxyn0ck"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -2803,8 +2824,8 @@ src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "209663c772105ae87d244cce9247695823914a00"; - sha256 = "1b6g7qvrxv6gkl4izq1y7k0x0l7izyfnpki10di5vdv3jp6xg9b2"; + rev = "451952126251b4eaf0418ffb50257b63510451a1"; + sha256 = "03h5p4wbgj3gz3d94fwmc6s3gkxg7l77fscl3znkcb8f934rf6xn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; @@ -2880,12 +2901,12 @@ auto-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "20160424.418"; + version = "20160711.1012"; src = fetchFromGitHub { owner = "tarsius"; repo = "auto-compile"; - rev = "61c6bec0ab4e44fe68628a5ee0c8b3b7f50c001f"; - sha256 = "05crb8cm7s1nggrqq0xcs2xiabjw3vh44fnkdiilq1c5cnajdcrj"; + rev = "1526e59ea8aaa1738c53b24673d62605dbbb5c96"; + sha256 = "05bzknh0fhl22r2klqqrgs7wpx18p5kzwxmg916smbvyk1fzfgva"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile"; @@ -2901,12 +2922,12 @@ auto-complete = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "auto-complete"; - version = "20160710.1544"; + version = "20160827.649"; src = fetchFromGitHub { owner = "auto-complete"; repo = "auto-complete"; - rev = "a9cb072fbad2f4c2c337e91e6ce257ff58c23ffa"; - sha256 = "19whmy8yigpsz21nxa64dlyvi1hczyw36iyiv8vl1906x0dxzma2"; + rev = "b0090a942f93824bcbe9a938217c665ea658eacd"; + sha256 = "1c6gmk9j5rhjqdsgns3v0f91vy3x6zs715p68m3sh7vn7cwsdw63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/auto-complete"; @@ -3024,6 +3045,27 @@ license = lib.licenses.free; }; }) {}; + auto-complete-distel = callPackage ({ auto-complete, distel-completion-lib, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "auto-complete-distel"; + version = "20160815.2300"; + src = fetchFromGitHub { + owner = "sebastiw"; + repo = "distel-completion"; + rev = "994c61dda2e3256b41fa2e53821c484b5ffd13e6"; + sha256 = "00nifdhwy89zmi50hln5p5albdx7ypm4mbdfjzhk4870crx4zjr2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/90fff35dd9709b06802edef89d1fe6a96b7115a6/recipes/auto-complete-distel"; + sha256 = "0ca242gl8dl4rmg8qqyhgxvf46fprl2npbq2w8f6s546s9nql4jk"; + name = "auto-complete-distel"; + }; + packageRequires = [ auto-complete distel-completion-lib ]; + meta = { + homepage = "https://melpa.org/#/auto-complete-distel"; + license = lib.licenses.free; + }; + }) {}; auto-complete-exuberant-ctags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-complete-exuberant-ctags"; @@ -3153,12 +3195,12 @@ auto-dim-other-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-dim-other-buffers"; - version = "20160128.946"; + version = "20160811.548"; src = fetchFromGitHub { owner = "mina86"; repo = "auto-dim-other-buffers.el"; - rev = "e9c886fac5cf482029e3e8998e2f1ef881e9db09"; - sha256 = "0lqfnv8wqnbb5ddwmh9svphc3bgmwdpwx40qw9sgqdzpj3xh7v8g"; + rev = "b797afadb48f69671d167050243e086923dcd364"; + sha256 = "0qx4db2m6xpz9j9p2jj49dilqzikbz16b4gf1p38r48w51ff8779"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/auto-dim-other-buffers"; @@ -3339,12 +3381,12 @@ auto-yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "auto-yasnippet"; - version = "20160524.618"; + version = "20160809.46"; src = fetchFromGitHub { owner = "abo-abo"; repo = "auto-yasnippet"; - rev = "35760e8e06eb2f724fd456ad05b8ddbdf9a51f76"; - sha256 = "0xp9yixv853bcyqyb1yy9sq5b8xdmad68z38wylrn0m971p722dd"; + rev = "4496ad507041e48d36522ed1616e430df3f87efe"; + sha256 = "17g463clsyi69fl2mzy84yg6v3sh7nq3ij06spx5j0fpxvmbf6z8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d33c0aee6a5d27217bbae28fc8f448c3badc8a4b/recipes/auto-yasnippet"; @@ -3568,12 +3610,12 @@ avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20160722.512"; + version = "20160814.250"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "a5fb9369e7b68c9786f2d620f064b4b93f2ae902"; - sha256 = "1glghza6x0n55hjhf7gn88z9s8a2ggs5d7rqjvc4n6c3p617ssrh"; + rev = "0f5e99b5e9a0fe709e5bce8ea4462dc732b2a281"; + sha256 = "1p2x7k5106dlz4l1p5avkkvfxls7g35zbsbiranxsgmd1x2dyl7a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -3631,12 +3673,12 @@ avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: melpaBuild { pname = "avy-migemo"; - version = "20160620.820"; + version = "20160818.725"; src = fetchFromGitHub { owner = "momomo5717"; repo = "avy-migemo"; - rev = "0871f06a0e043febbdd398cfdde9d7bb5871c740"; - sha256 = "0yjg0qsjzc3qzn32ybignxp2b2942za942g97q92s2xv7sqzwkb7"; + rev = "6e394af511274e906db027ea025ac95b4739b613"; + sha256 = "00air40hslsiwm4h0kf3ynklx13hn5dziqw3xwcgf3cvjpchw7vy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo"; @@ -3862,12 +3904,12 @@ badwolf-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "badwolf-theme"; - version = "20160726.343"; + version = "20160823.152"; src = fetchFromGitHub { owner = "bkruczyk"; repo = "badwolf-emacs"; - rev = "a753ba4a7e5c432764bc8fea6d9596ab34e6b383"; - sha256 = "0lbzh2117y7pm7brnbffyvil2c6phwfbpy8153p72s974vffxjzf"; + rev = "dc3bf0ed7031e8d755e3c8ac733e69003715665a"; + sha256 = "00r9gwmyrf8dd4l83mqw4m4qzj8ppy3082k94njhmyq1cx9bvx85"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01f3deade0759830ed2e70e00e596915be5f5c11/recipes/badwolf-theme"; @@ -3904,16 +3946,16 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20151019.711"; + version = "20160828.1825"; src = fetchFromGitHub { - owner = "mkaito"; + owner = "belak"; repo = "base16-emacs"; - rev = "18693adea42ec2667534651c28c32934bc1bcec0"; - sha256 = "16240dj0hvxkljas9973wjdgkbx213sqws77j167yr5xf761dlsr"; + rev = "24dee691af4758d04595cc14f3c2536d39b26f58"; + sha256 = "0qvawqrnl0zx3nzs1fapvfgs7pj1ylqnv7hgs8z5fshy5h96zv2b"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/521e8df1c741833e0a1237bb3498a9ed7ac279bd/recipes/base16-theme"; - sha256 = "1zxbvfj6gvz1ynhj6i9q9y65hq7aq41qx4vnx738cjizcq0rc8bs"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; + sha256 = "115dhr3gfvdz5wv76fwpv3b4dywiwbk69qrhkfhij8vpcfybrpzx"; name = "base16-theme"; }; packageRequires = []; @@ -3946,12 +3988,12 @@ basic-c-compile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "basic-c-compile"; - version = "20160719.2015"; + version = "20160803.527"; src = fetchFromGitHub { owner = "nick96"; repo = "basic-c-compile"; - rev = "57c9e08ed44f4daa7279f0cdc3176226e04d44ac"; - sha256 = "1mlmcpsxp90kgp4yqd7wxd3pxvfxgk76m2fjfnhd6frhksjg17jv"; + rev = "69e1ce9078a1a54beddc6c9f786cdd521a3717bf"; + sha256 = "0r1ygnkvl3b61qw5lsji3434f2dkbsfkc1fk6rl355am9ssn3vr6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bdf8a23771774f630baa41b24375cb57f90fbb2e/recipes/basic-c-compile"; @@ -3967,12 +4009,12 @@ basic-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "basic-theme"; - version = "20151010.107"; + version = "20160817.127"; src = fetchFromGitHub { owner = "fgeller"; repo = "basic-theme.el"; - rev = "e3c32e1285749b4135d4d593f06566c631c26456"; - sha256 = "1pbnw6ccphxynbhnc4g687jfcg33p1sa7a0mfxc2ai0i3z59gn78"; + rev = "e2a855bd39f4b78296228d4b790f9123156f7d7e"; + sha256 = "1dfk73bkyhmhxnizbcp5zky8qyrgl7cf0dl9y6drqqc1lrcgz3jl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/451d1b67fefec5d3a346b1261d1284e8df6927a0/recipes/basic-theme"; @@ -4134,8 +4176,8 @@ src = fetchFromGitLab { owner = "iankelling"; repo = "bbdb-csv-import"; - rev = "7739d10ebe1787a72aa74085e9baedd0f4988b00"; - sha256 = "1h9vi9wb3dzzjrw5zfypk60afzzshxa3qmnbc24ypby5dr7qy91l"; + rev = "21c775d776be1a6b3a096912bcdb53dab6bfaa31"; + sha256 = "0amdn5hd72108ylss90yk550w6vzvsg91l29dycbfr8a3hrfs22x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/bbdb-csv-import"; @@ -4418,6 +4460,27 @@ license = lib.licenses.free; }; }) {}; + better-shell = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "better-shell"; + version = "20160830.1451"; + src = fetchFromGitHub { + owner = "killdash9"; + repo = "better-shell"; + rev = "1c0ddbba888b47fb5f66f5f39f5faee230bf207a"; + sha256 = "1q4dgrqsia3pbggl0yfjx013w2rm7wb4ddclybxqw5v56bvb8ldc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fc553c9fb6de69dafe9fbe44a955b307f4d9507f/recipes/better-shell"; + sha256 = "1mr39xz8chnc28zw1rrw5yqf44v44pby7ki22yyz6rp1j5ishp4v"; + name = "better-shell"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/better-shell"; + license = lib.licenses.free; + }; + }) {}; bf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bf-mode"; @@ -4593,8 +4656,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "c191614a009bf02d7af63e306bab6d296e1849e3"; - sha256 = "1v9s01g03sgy42pqaslcchwza3zw14d18qfidiggcic7ffl6sy0j"; + rev = "3f6ba1bb8ad3fd81278b6787c664639a6a0df6f5"; + sha256 = "161bdn6b76rf0sm7881pyr6xs8mvyvpxhzicf0g2dqncisg4y0gn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -4614,8 +4677,8 @@ src = fetchFromGitHub { owner = "justbur"; repo = "emacs-bind-map"; - rev = "ffe5e636178ab9878fa8213fd1a1d4862ccb3d5f"; - sha256 = "1h07s8g4vpq6c8sl5m6vxvd598iks160bksv0wn51680gh05f0pa"; + rev = "078c522f6e763dd24a30e15af9121376affe207f"; + sha256 = "16yk8xl6ds6zp0ndfzr613k8wkzl7hnsqnmnn1bi1da5laxbwrdb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f58800af5965a6e7c9314aa00e971196ea0d036e/recipes/bind-map"; @@ -4754,6 +4817,27 @@ license = lib.licenses.free; }; }) {}; + blackboard-bold-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "blackboard-bold-mode"; + version = "20160812.1906"; + src = fetchFromGitHub { + owner = "grettke"; + repo = "blackboard-bold-mode"; + rev = "5299cb064ba71baa3e331b8560bf8dd38cbbc4ed"; + sha256 = "00xbcgx4snz4sd7q7ys24rsnf5wdxjn402v8y5dgn4ayx88y1rrj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e62944dfef1c0c259524bacf1c82e68571acaf30/recipes/blackboard-bold-mode"; + sha256 = "0zip1v96mdmz2z9hakn9asg5c1gm68i4mdmrsccqig3s60zrxvhz"; + name = "blackboard-bold-mode"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/blackboard-bold-mode"; + license = lib.licenses.free; + }; + }) {}; blank-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "blank-mode"; version = "20130824.459"; @@ -4964,12 +5048,12 @@ boogie-friends = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "boogie-friends"; - version = "20160629.1630"; + version = "20160805.1441"; src = fetchFromGitHub { owner = "boogie-org"; repo = "boogie-friends"; - rev = "d7bd275274c6f61c995b96f776feb3948174d2a0"; - sha256 = "0wy3jhj4x1qg3hl0dfs7yalcjl0934317c0q4a43n26wfihingi0"; + rev = "a0c3942ddbeebc7a45c31303157409a283ad4496"; + sha256 = "1sfv50x6al276w70170nyy5fyi60r1rp3y81332pp2mn1rlqsflv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5bdd06b82d002677c046876642efe1dc01bc3e77/recipes/boogie-friends"; @@ -5000,22 +5084,22 @@ license = lib.licenses.free; }; }) {}; - boon = callPackage ({ emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: + boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20160725.1059"; + version = "20160830.1218"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "199d30229e26a98c11516d78ef10483d540c42c4"; - sha256 = "052ybgvw7n11x75lhwn9758pdnjmal03wpzlsmcj145fzklxxjvr"; + rev = "c0413bf1eafbee891ec1ed6c290d107056db4fbd"; + sha256 = "1kfvbmsrwcch3ykllfgwknir0hizqqyx01wm16sq0wly6c8fjcca"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; sha256 = "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb"; name = "boon"; }; - packageRequires = [ emacs expand-region multiple-cursors ]; + packageRequires = [ dash emacs expand-region multiple-cursors ]; meta = { homepage = "https://melpa.org/#/boon"; license = lib.licenses.free; @@ -5397,12 +5481,12 @@ buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: melpaBuild { pname = "buffer-flip"; - version = "20160109.1854"; + version = "20160811.713"; src = fetchFromGitHub { owner = "killdash9"; repo = "buffer-flip.el"; - rev = "f6c67d87717e3171156b78406ab5a0eeb048905c"; - sha256 = "0s43cvkr1za5sd2cvl55ig34wbp8xyjf85snmf67ps04swyyk92q"; + rev = "386067141ca77848b266e068f8c6baf6b4c2ab5b"; + sha256 = "1bch4jk6d60aydvcc624026pwfby29fbcwm3zhrsksqc0d2qxdwq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3924870cac1392a7eaeeda34b92614c26c674d63/recipes/buffer-flip"; @@ -5439,12 +5523,12 @@ buffer-sets = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-sets"; - version = "20160723.1903"; + version = "20160811.1911"; src = fetchFromGitHub { owner = "swflint"; repo = "buffer-sets"; - rev = "3739e04b6778738cf2db757eac519f4626d94e02"; - sha256 = "14v7m3i9j10vxad2vq7gd3lwdkzy33b4i2cf5m6l0pbsq8ndzkry"; + rev = "9f266fb9b6325286ea312c9997071b74b5bb45cc"; + sha256 = "0pxykjnq892k93i1yil1f51gv9286gpwlnddq82jhq20hzh79r9c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc99dde16a23ba5f07848bd4a8483cbe384e7a6d/recipes/buffer-sets"; @@ -5541,12 +5625,12 @@ bundler = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "bundler"; - version = "20160121.324"; + version = "20160815.215"; src = fetchFromGitHub { owner = "tobiassvn"; repo = "bundler.el"; - rev = "b9b1acd074263cb23d05a0718e02f164687f0625"; - sha256 = "0gr4v6fmg0im17f6i3pw6h8l401n5l5lzxz0hgi8lrisvx73iqa5"; + rev = "f981f67c33b42243e57a78c358dffff70022b56b"; + sha256 = "1hfcvlkwa3hh70qan3q5mvld1hqqbnmbwqycvlqi6qr8dcdfl3cx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ade7d0f0f0e553b48634e60ecaf7b91d0776d5f0/recipes/bundler"; @@ -5916,6 +6000,27 @@ license = lib.licenses.free; }; }) {}; + calendar-norway = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "calendar-norway"; + version = "20160827.1316"; + src = fetchFromGitHub { + owner = "unhammer"; + repo = "calendar-norway.el"; + rev = "8501b2ee515e995f345365391b03f44c812cabdf"; + sha256 = "0lch835rq2rqyh0vyi75dhyl7hm6bv27f2z753wggh0jyg6qxi7a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c5d01230027d5cec9da2545a9ce9270a611f6567/recipes/calendar-norway"; + sha256 = "1i23ks0bnq62bvn3szvqf0ikcam4s92yvr998mkjxhdhc94zd19c"; + name = "calendar-norway"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/calendar-norway"; + license = lib.licenses.free; + }; + }) {}; calfw = callPackage ({ fetchFromGitHub, fetchurl, google-maps, lib, melpaBuild }: melpaBuild { pname = "calfw"; @@ -6043,12 +6148,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20160525.519"; + version = "20160807.831"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "6aa0c45ef75a0b23c5a29acd8a50cdbcb8745eef"; - sha256 = "030glbfdybjnkpraa37x6i34hpm1pjqssxf2dgwbp0l0phvfbv5z"; + rev = "0ce335ee0284e9158c56b7002ecd51f597bf8d32"; + sha256 = "15jfbwl6xa583fmym432kygkb4sfvcxfqvirrihkmd33c61ski9b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -6106,12 +6211,12 @@ cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: melpaBuild { pname = "cask"; - version = "20160708.519"; + version = "20160816.753"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "885ee04ff83639b0a08eea1b65e091b139d43656"; - sha256 = "1jsgnaqwaql893rnchn6y3272kigfdykiplxgi2jknfqdb9kpjn1"; + rev = "0828b34d93f3a300fc1c0a40132c17ae7f4bedcb"; + sha256 = "08wy9ksy21v25kbmgdn62x1b2rryfrgl17w36ms03v83drc7l486"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -6215,8 +6320,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "444991051df5d8bd2babd4249d2311dc39890e37"; - sha256 = "1mqz83yqgad7p5ssjil10w0bw0vm642xp18ms4id8pzcbxz8ygsv"; + rev = "fa713612fbf12a599b20f31e0aa6f35931bc92a0"; + sha256 = "0adl3njl8p4jgzwbjfw30yf1z0qis4nilbdkssgag8n9jld53ayz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc"; @@ -6257,8 +6362,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "444991051df5d8bd2babd4249d2311dc39890e37"; - sha256 = "1mqz83yqgad7p5ssjil10w0bw0vm642xp18ms4id8pzcbxz8ygsv"; + rev = "fa713612fbf12a599b20f31e0aa6f35931bc92a0"; + sha256 = "0adl3njl8p4jgzwbjfw30yf1z0qis4nilbdkssgag8n9jld53ayz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb"; @@ -6444,8 +6549,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "439d194be4eb3405848af952fdbb9725195b3be4"; - sha256 = "1xsnv8qhfh9cgq39xawsqjjj00jxbnhxhhpvq5q916k10v33yqpw"; + rev = "7ba51548b2a5e8d90f75f95adf6978992cc90d07"; + sha256 = "0s48s2znrxcx9zqvp4141qzf6kjag0wl0y65vps2bsifq5zdwdsw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -6481,11 +6586,11 @@ }) {}; cg = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cg"; - version = "20160713.59"; + version = "20160801.615"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "11696"; - sha256 = "09iwd8xx29z2p2dnpzckqap8a50sbcr3p6yh4zyxcdn7w6jq02hr"; + rev = "11715"; + sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a275ee794b0aa30b1348bb3a984114eef8dfc808/recipes/cg"; @@ -6671,8 +6776,8 @@ src = fetchFromGitHub { owner = "eikek"; repo = "chee"; - rev = "be183aeb6157c0aad552cc5bf5eda3914b496419"; - sha256 = "07bmbl835smck78azcr5xmvdgb8igcyd883xfwq2ivm12v55vhrq"; + rev = "d15d10c32447edb528b9e6e00091ab326a100a25"; + sha256 = "0y0k30pmrdfkadxp3j60i9bjiai8ds7l5a6iy6xmkkmiksgjdv4k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee"; @@ -6793,12 +6898,12 @@ chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-fonts-setup"; - version = "20160708.1722"; + version = "20160830.2145"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-fonts-setup"; - rev = "431aa98f645dbd299de815293e140d4de85a4adb"; - sha256 = "0y07w2hvc1fysh0a063lincv8l8ygqdl5zpv66lfk83rzgc00q6d"; + rev = "d1f020daba8bdc1acfb3d5828ed8d830089e8da0"; + sha256 = "1s7sv5j6vkpqzrjy6w3kvfc8qxfrm5rd4ih3nm14v0z26qm5fwhi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup"; @@ -6814,12 +6919,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "20160723.436"; + version = "20160809.1712"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "2e51081b84ad31dc05f6a12e4c6b9cc2b5fa9ba4"; - sha256 = "1sl8kgbfsxxp7ib5ymgk1mqhsqr1p7pggcnzx7la45mm77s7pr4n"; + rev = "99d161a56b907e8bc8079d49554b60404e93565b"; + sha256 = "1wdr1hz8v045d17n1vf2gf0119lvhbnykfrzkwm11cs9plk0vmqb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -7021,12 +7126,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20160725.136"; + version = "20160830.23"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "b8932a37b936a34b923ce4e356379ea76108ec6d"; - sha256 = "07xb09csppk2rbffbyiy22mx4s7cd5h48nx428dag7q13fvarc31"; + rev = "bdbb2d25b9f3fccf2c586414c5dfce104c811713"; + sha256 = "1k5s97inlm7igy5wp8rapy3l8k8mln0c3fqwn5w7pr09xb7bcqk9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7123,6 +7228,27 @@ license = lib.licenses.free; }; }) {}; + ciel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ciel"; + version = "20160809.310"; + src = fetchFromGitHub { + owner = "cs14095"; + repo = "ciel.el"; + rev = "ebe6dc68aeed627b88dafd170b023121f7def0d4"; + sha256 = "1z2hsbfkml5psj47b4i83grn96q85mpqll95nqb3n98hyc6da90a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9c70c007a557ea9fb9eb4d3f8b7adbe4dac39c8a/recipes/ciel"; + sha256 = "0rz7z3shhsvky91b581nn3hw760nlsc94fl35flm1973kvm9lvdp"; + name = "ciel"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ciel"; + license = lib.licenses.free; + }; + }) {}; cil-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cil-mode"; @@ -7189,12 +7315,12 @@ circe-notifications = callPackage ({ alert, circe, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe-notifications"; - version = "20160605.804"; + version = "20160809.2023"; src = fetchFromGitHub { owner = "eqyiel"; repo = "circe-notifications"; - rev = "32c0a2b3acf4bdf22dc45528def5d78ea77cebf6"; - sha256 = "0ahk9w0nxmh8c27s63iizvk1yddf1bpz62b61niwi8nn6g6fx6m2"; + rev = "251aaeef50346fa85e0a0a6eadc71a23b80ebdc6"; + sha256 = "0jfp0ydrkfcwkx32dikhsfxr6vkf7d55pba6wbb2h13wpz4d4n4s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76c0408423c4e0728789de7b356b2971d6c446c7/recipes/circe-notifications"; @@ -7255,8 +7381,8 @@ version = "20151116.438"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "276856"; - sha256 = "10vsflngqd1q4wrggm867n0j5hzchxc731bjz59vd9qvljddmzbb"; + rev = "280224"; + sha256 = "0v0wzbma0acn44as6hhpar70bs99vsgpv5caqxx6c90spp8h2agf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -7641,12 +7767,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20160725.652"; + version = "20160803.140"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "a5492a08017faa837d506666a82649b50fd23511"; - sha256 = "02ws4q7dygv7gjb6cg6mccx43ahi49bqx7f9k0c9jr6raq1qqm22"; + rev = "464c9de6734cb4b426137674041d695c2a7c7ef9"; + sha256 = "0xg85x5lrh1d8vlnkzrxpdrcqsqngjy6xp7p509wnhx7k8j85vpm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -7666,8 +7792,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "a5492a08017faa837d506666a82649b50fd23511"; - sha256 = "02ws4q7dygv7gjb6cg6mccx43ahi49bqx7f9k0c9jr6raq1qqm22"; + rev = "464c9de6734cb4b426137674041d695c2a7c7ef9"; + sha256 = "0xg85x5lrh1d8vlnkzrxpdrcqsqngjy6xp7p509wnhx7k8j85vpm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -7704,12 +7830,12 @@ clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "clojure-snippets"; - version = "20160305.602"; + version = "20160728.29"; src = fetchFromGitHub { owner = "mpenet"; repo = "clojure-snippets"; - rev = "7c80ba4bb91777a10784f042c137b9245ab23573"; - sha256 = "08sswxmrb94an95cjxxcppn3f8gvy99jdr4cbwlwk2yswdrxdlg0"; + rev = "c5220e978709bc7234e3adfe336b66eff2b89b4b"; + sha256 = "08zrmbhczr08s8ni76i9g338250rgk95vz7sl22rj5fxln3zn6xz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4898fc6746b30b0d0453b3b56d02479bfb0f70b9/recipes/clojure-snippets"; @@ -7725,12 +7851,12 @@ clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clomacs"; - version = "20160720.845"; + version = "20160828.1236"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "7f1de411a25fbdb490b2d8050111e6408c087550"; - sha256 = "18scwjfa5k9xd3d9dynsp9jaqm59arn8zzayi203yjbr7nkfzdr2"; + rev = "de0d374886c79deb4068e188d00ea3ef76835a8c"; + sha256 = "11z1rdxsg6w44ab9cfgvl7kdrdzvq5fj9fxsqig6j6gvd7m3znhq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; @@ -7830,12 +7956,12 @@ cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cm-mode"; - version = "20160310.829"; + version = "20160824.615"; src = fetchFromGitHub { owner = "joostkremers"; repo = "criticmarkup-emacs"; - rev = "1ac0d64842eb303323f2ebea61b4b6ba9f72969c"; - sha256 = "1rwln3ms71fys3rdv3sx8w706aqn874im3kqcfrkxz86wiazm2d5"; + rev = "81863c2e16e2ddc6e1616d5585836e46ceee6401"; + sha256 = "0rj4ww67v0r5wjf8siz6yy3hwxbwsnm9l5f8962sxrjillgf3kpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42dda804ec0c7338c39c57eec6ba479609a38555/recipes/cm-mode"; @@ -7872,12 +7998,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }: melpaBuild { pname = "cmake-ide"; - version = "20160719.853"; + version = "20160802.619"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "f69b6ee2153b13008285b65ce7cb30f66b89e9bd"; - sha256 = "1bm5m35yd760k5g9yr7krqcaxr1vckfphnb8lc7s14znbqf69vac"; + rev = "372c05ecd4a7eae91c8b3b1e31c9226b514b6d90"; + sha256 = "0caqi5s17mmgfz6q1439a1w6yr9kmd2g7xqg54ij1km5vq2wbxxk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -7893,12 +8019,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "20160510.1140"; + version = "20160801.1215"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "73c618be7036c693cbff764b3765de1bf4626cfb"; - sha256 = "1xjz2zspal9ycp5mds0jvc3agbn91qzy92w37j6yg3j6hyglv3wc"; + rev = "9bbf1dc06ebb891498747768736442b22058c49e"; + sha256 = "02zafa14znp91rlbsfhc2s81xai8zvwp1klc7210y47p302nipw2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -7934,10 +8060,10 @@ }) {}; cmds-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmds-menu"; - version = "20151231.1230"; + version = "20160830.1130"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/cmds-menu.el"; - sha256 = "13r8pjxknsfd6ywzlgcy4bm7fvr768ba34k6b7y365y3c1asz6y3"; + sha256 = "00wl9qqqqznd3hk0zxc6l5zsnmkmqikzpirm5gj2lp1wqdkrbmi4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de6366e4b3e72a5e68b960d6bf4bab2683ad6800/recipes/cmds-menu"; @@ -7992,6 +8118,27 @@ license = lib.licenses.free; }; }) {}; + coati = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "coati"; + version = "20160725.1704"; + src = fetchFromGitHub { + owner = "CoatiSoftware"; + repo = "emacs-coati"; + rev = "a4f2aaaf1c4b92dfed801c8c264ab2ddc8ee3d4c"; + sha256 = "1dlx1f5p662f1zbc7pr66ymbb4x3v7szybsvskjd5a25mdggwn05"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a43f28144401803d86bafdc9c5b60bcb3ada0bab/recipes/coati"; + sha256 = "0f6vhypv8b8maq72pc1xp1yqv760za508kff2dqv0crwyd7iv32h"; + name = "coati"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/coati"; + license = lib.licenses.free; + }; + }) {}; cobra-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cobra-mode"; @@ -8058,11 +8205,11 @@ codesearch = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "codesearch"; - version = "20160111.655"; + version = "20160806.57"; src = fetchFromGitHub { owner = "abingham"; repo = "codesearch.el"; - rev = "09cf7c4275c51a5aafe84f700abea7b48ee0c145"; + rev = "7f5ea7d653d01071ff9ce3c3281dc2bed4f96c5c"; sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism"; }; recipeFile = fetchurl { @@ -8121,12 +8268,12 @@ coffee-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "coffee-mode"; - version = "20160520.146"; + version = "20160808.1712"; src = fetchFromGitHub { owner = "defunkt"; repo = "coffee-mode"; - rev = "d0223a4e85bf8cf534b79112499bde38a35648af"; - sha256 = "10l7as2z903y5bgqb4zr203rx254l62wrn9zx9863p7vzw1yhbpd"; + rev = "026222983aee3842f6ddac9024364dcaacd9a73e"; + sha256 = "13icfx0h89hb2180srqnvrm415cijn2v5l8i8hdv820wkd2v9lx8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/coffee-mode"; @@ -8203,12 +8350,12 @@ color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-identifiers-mode"; - version = "20160519.1146"; + version = "20160810.2142"; src = fetchFromGitHub { owner = "ankurdave"; repo = "color-identifiers-mode"; - rev = "536151410dbb198b328dc62b829d9692cec0b1bd"; - sha256 = "1zwgyp65jivds9zvbp5k5q3gazffh3w0mvs739ddq93lkf165rwh"; + rev = "c2cc1e5e6a7120da37de3a24d6796678c6637e0f"; + sha256 = "08y8ks2a017899prwgjxqxl15dip6g2kxfglnsfq03vgzjp7ry21"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c735755e414fdf169aca5ec6f742533d21472e0/recipes/color-identifiers-mode"; @@ -8349,12 +8496,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20160710.1625"; + version = "20160829.2324"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "c0fcc63ede0727c6de66bafb8d7ba0e6f5e33b83"; - sha256 = "03qxwpvhfs7iwpwykm53d3z30yqyfrr0j4wsdla2pjz9c04668yz"; + rev = "6943ca134babe228fef975506826d7ac471c9ca2"; + sha256 = "1cnd1fd4mi6jjy7fkldsk9vzgl6q67d5rajr9a5fzzanp4v08zr1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -8598,12 +8745,12 @@ company = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20160720.1548"; + version = "20160829.1206"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "3d369e1a7e011efa9b5afeec5fc930b85f898903"; - sha256 = "0rpcr3gpdq7nhjxj3nrv6knnscg415xz9aldg11k6xn6iljcs86x"; + rev = "f2327bc7f303fcf83c3d8f9c76f61deaa110ebb5"; + sha256 = "0d0if7nksd5adybc6w9v8bg2j11gz975b869k4kd9fi3fbsv5cw3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -8619,12 +8766,12 @@ company-anaconda = callPackage ({ anaconda-mode, cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "company-anaconda"; - version = "20160509.417"; + version = "20160809.705"; src = fetchFromGitHub { owner = "proofit404"; repo = "company-anaconda"; - rev = "612a49144c8d865880e1dfb623035d7cec45f886"; - sha256 = "1vkh0angvi9aqfbn2n1f2kq9myq0zw0dk19hqb5x6gxxd5s8l7hb"; + rev = "182a8fdabc01630f255beeb2708728c0cd5c6316"; + sha256 = "1rqf9i4l32njpwx4aiwxqr994g3jzispwprs6nwjfvg70xkvm4m0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/company-anaconda"; @@ -8715,8 +8862,8 @@ src = fetchFromGitHub { owner = "randomphrase"; repo = "company-c-headers"; - rev = "0450f429bd5745e91e984651c932264481953142"; - sha256 = "0jh2j260x1smlm4362dvgfpfpba7kg6hqvszjirc6mpm74zdcnp8"; + rev = "9bfdd438be5ecb75e5717eb48e09ce69904676e3"; + sha256 = "152fwy23x5k3dp45z1k4h4n6pcvl3wrhwhwd4l4rp06yhgwf0i1a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d97b5c53967e0ff767b3654c52622f4b5ddf1985/recipes/company-c-headers"; @@ -8771,22 +8918,29 @@ license = lib.licenses.free; }; }) {}; - company-dcd = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, flycheck-dmd-dub, lib, melpaBuild, popwin, yasnippet }: + company-dcd = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, flycheck-dmd-dub, ivy, lib, melpaBuild, popwin, yasnippet }: melpaBuild { pname = "company-dcd"; - version = "20160712.1857"; + version = "20160806.1852"; src = fetchFromGitHub { owner = "tsukimizake"; repo = "company-dcd"; - rev = "13cbbba01af0339391ee2f4c16c3a6f39b787cca"; - sha256 = "0p0k97j01ibrfxcnk36sfm3kns17x9845fqgjhb2lx9lg6i9k44r"; + rev = "d2cead0a3f70a0ef944bc778643d26934331642d"; + sha256 = "0w410mqhafxfywa1hfgms21kzpww6sfw4v4fl43pkcxfki94fv1r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad5be8c53911271fba03a88da7e9d518c6508ffe/recipes/company-dcd"; sha256 = "03849k4jzs23iglk9ghcq6283c9asffcq4dznypcjax7y4x113vd"; name = "company-dcd"; }; - packageRequires = [ cl-lib company flycheck-dmd-dub popwin yasnippet ]; + packageRequires = [ + cl-lib + company + flycheck-dmd-dub + ivy + popwin + yasnippet + ]; meta = { homepage = "https://melpa.org/#/company-dcd"; license = lib.licenses.free; @@ -8813,6 +8967,27 @@ license = lib.licenses.free; }; }) {}; + company-distel = callPackage ({ distel-completion-lib, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "company-distel"; + version = "20160815.2300"; + src = fetchFromGitHub { + owner = "sebastiw"; + repo = "distel-completion"; + rev = "994c61dda2e3256b41fa2e53821c484b5ffd13e6"; + sha256 = "00nifdhwy89zmi50hln5p5albdx7ypm4mbdfjzhk4870crx4zjr2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/90fff35dd9709b06802edef89d1fe6a96b7115a6/recipes/company-distel"; + sha256 = "1jklxwkm2dvpcasmy9vl48dxq3q9s4dlk159ica39z0kqpkpzmgw"; + name = "company-distel"; + }; + packageRequires = [ distel-completion-lib ]; + meta = { + homepage = "https://melpa.org/#/company-distel"; + license = lib.licenses.free; + }; + }) {}; company-edbi = callPackage ({ cl-lib ? null, company, edbi, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "company-edbi"; @@ -8820,8 +8995,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "company-edbi"; - rev = "08dc69ccfbcf10ca83f7075e9b735c6885cd7e11"; - sha256 = "0n2hvrfbybsp57w6m9mm7ywjq30fwwx9bzc2rllfr06d2ms7naai"; + rev = "ffaeff75d0457285d16d11db772881542a6026ad"; + sha256 = "16v4wzb9sp9ryfhgl3rk108pqvam2v6rh6hl6008083g557nmhq1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d881ff0927d5bd7f8192f58927ceabb9bad4beb/recipes/company-edbi"; @@ -8834,6 +9009,27 @@ license = lib.licenses.free; }; }) {}; + company-emacs-eclim = callPackage ({ cl-lib ? null, company, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "company-emacs-eclim"; + version = "20160813.1754"; + src = fetchFromGitHub { + owner = "emacs-eclim"; + repo = "emacs-eclim"; + rev = "a58dd558e6ad4f8f5d78b743955a758178e323be"; + sha256 = "1jn2raymx4qml8h7ala8jhgfzfbppd5nq55ffbs0il46r9w3n086"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; + sha256 = "1l56hcy0y3cr38z1pjf0ilsdqdzvj3zwd40markm6si2xhdr8xig"; + name = "company-emacs-eclim"; + }; + packageRequires = [ cl-lib company eclim ]; + meta = { + homepage = "https://melpa.org/#/company-emacs-eclim"; + license = lib.licenses.free; + }; + }) {}; company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-emoji"; @@ -8855,6 +9051,27 @@ license = lib.licenses.free; }; }) {}; + company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "company-flow"; + version = "20160829.820"; + src = fetchFromGitHub { + owner = "aaronjensen"; + repo = "company-flow"; + rev = "484d726a2ec63b1ea0052885dd4d88a6fba22620"; + sha256 = "1ly17p4radjaxaic3b0c2dd0bp1p6370l5zxbddz3cb2qx3fh7h4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow"; + sha256 = "07brjfgiwv4dxjf0sca84allcy3qlp4jrkz7ki1qc5wmb5sd209l"; + name = "company-flow"; + }; + packageRequires = [ company dash ]; + meta = { + homepage = "https://melpa.org/#/company-flow"; + license = lib.licenses.free; + }; + }) {}; company-flx = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }: melpaBuild { pname = "company-flx"; @@ -8925,8 +9142,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "3e1f8b46c1200ebec1336008838c6140586d059e"; - sha256 = "1c51ym21m2mrs8zhj7nzbbc7cckqj63jf1xx2a6x6zjh0g5bq8zj"; + rev = "57b3fab1de11102eee896051605108949fbe75da"; + sha256 = "19829cfyl181kjqp5mn71f0symypfp1f2g5hi8a6949ya9n3l6rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -8963,12 +9180,12 @@ company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }: melpaBuild { pname = "company-irony"; - version = "20160613.1120"; + version = "20160826.56"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "company-irony"; - rev = "0eff012c6389d66668751454c08c7547017fe546"; - sha256 = "0mmdh4f6v4jwxd1wdzj8z8m54cmc55n7mf9lv0gaccw5aid8cfza"; + rev = "f1d6761c581fd12fa1188e26478c0229d8348332"; + sha256 = "10kbyrryjk66ix5024acqrc0nn3hfgsavfpgbdspwbhwcff9czsx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/company-irony"; @@ -9089,12 +9306,12 @@ company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ngram"; - version = "20160725.616"; + version = "20160826.1722"; src = fetchFromGitHub { owner = "kshramt"; repo = "company-ngram"; - rev = "44a5a90047a71efb083e58ff685117b11eadd23e"; - sha256 = "0zkirwj9yarqlam5hsdnysanx1x06cmgzx9lnjrs1skypl4q096y"; + rev = "1f5a36ffdc19c77e2fcbe790be2332d16fd4c35f"; + sha256 = "03jap56722rp9sbb5chad9nbvqmimcjipr0rfhqz5szd9xahpihc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram"; @@ -9131,12 +9348,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "20160706.3"; + version = "20160804.2131"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "ff6f268fe6f9dd7cd67dde7c52e1fe9b8a145f14"; - sha256 = "0dxhcm6cfk0sgv2nbdscjf791js9g3qkxcapjh1zwyqsgmcrk9hs"; + rev = "5b463aba738648d0ac8e1d1000e849a858353ce8"; + sha256 = "0y0yzi9dy852yxww5zzj97fpr9sdgg6n5bk9s0hbwi0v4sj4hvwa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -9149,6 +9366,27 @@ license = lib.licenses.free; }; }) {}; + company-pollen = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, pollen-mode }: + melpaBuild { + pname = "company-pollen"; + version = "20160812.810"; + src = fetchFromGitHub { + owner = "lijunsong"; + repo = "pollen-mode"; + rev = "de762bd7f9760185dae8ef025ca9a9126ae78de0"; + sha256 = "19bi50nlmwnh4kz3b1hrgc7ks0g84bld9aifws2l3wyc3xsj8cqa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/97bda0616abe3bb632fc4231e5317d9472dfd14f/recipes/company-pollen"; + sha256 = "1pz5d8j7scrv2ci9mxvyikwsk8badkrbp8dznnb5qq1ycqv24bl1"; + name = "company-pollen"; + }; + packageRequires = [ company pollen-mode ]; + meta = { + homepage = "https://melpa.org/#/company-pollen"; + license = lib.licenses.free; + }; + }) {}; company-qml = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, qml-mode }: melpaBuild { pname = "company-qml"; @@ -9173,12 +9411,12 @@ company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }: melpaBuild { pname = "company-quickhelp"; - version = "20160211.718"; + version = "20160826.806"; src = fetchFromGitHub { owner = "expez"; repo = "company-quickhelp"; - rev = "39e206f7797962992aa1e555c293b6d872d6718b"; - sha256 = "1b2v84ss5k43nnbsnvabgvb19ardsacbs1prn2h9i1k2d5mb8icw"; + rev = "d8fd045715ca64bc8cb3e714c05fe70d7eb33f09"; + sha256 = "1fdiz1jqxnrl940vqbq14idrs4ird9dkzgckmyawzznv5yi29fw4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp"; @@ -9368,12 +9606,12 @@ company-ycmd = callPackage ({ company, dash, deferred, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: melpaBuild { pname = "company-ycmd"; - version = "20160720.359"; + version = "20160821.1554"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "5342f1def925e59477880c1bf5c10778c50678fe"; - sha256 = "1nn312z7bfjya570gbs7gcwf9zh3b7jhwg52gfp7digdwqrary42"; + rev = "200a6d2536cf4932b36a89a753eb9c6a12888f54"; + sha256 = "0avvsnizx8l0gyvzy8qkg0177agckxylldqk0vm45pqzzmbsvr02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; @@ -9407,6 +9645,27 @@ license = lib.licenses.free; }; }) {}; + composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: + melpaBuild { + pname = "composer"; + version = "20160827.235"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "composer.el"; + rev = "a846d4d5be8c216b2f97b3e6d9b04b93bd766dd9"; + sha256 = "19ib567f6n0z4mgvrd099rw1la79as79lqns88fzj3zcpd93lkhx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer"; + sha256 = "1gwgfbb0fqn87s7jscr9xy47h239wy74n3hgpk4i16p2g6qinpza"; + name = "composer"; + }; + packageRequires = [ emacs f request s ]; + meta = { + homepage = "https://melpa.org/#/composer"; + license = lib.licenses.free; + }; + }) {}; concurrent = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "concurrent"; @@ -9539,8 +9798,8 @@ src = fetchFromGitHub { owner = "yuutayamada"; repo = "contrast-color-el"; - rev = "5b8d1fc50ddce88b1d139a8832c10026470811be"; - sha256 = "18hd7w70hgif6j02is8kx2b2w6sksnp1nsk92wkv090z7r36nsns"; + rev = "31a04e4776117096057ff189e7abd1a1d2fcc277"; + sha256 = "1x9vll92n7fff9q172r978s3mf5amxhwam5j0qvmbvzyiry30abz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a13602e10a5fa889d0e094eff5b74a39023a477/recipes/contrast-color"; @@ -9616,6 +9875,27 @@ license = lib.licenses.free; }; }) {}; + coq-commenter = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "coq-commenter"; + version = "20160808.2307"; + src = fetchFromGitHub { + owner = "ailrun"; + repo = "coq-commenter"; + rev = "b57c7c92219201c0f931014127b50fd9b1e0039a"; + sha256 = "03wwdd9n7fijrczrrdhn9xisrj7mqhc2q7z4da6fm3q45sy2npqk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/522d8ae8abbc672f09b8893acb77695756746321/recipes/coq-commenter"; + sha256 = "18whbdsdzyjl9gmbzh49gdv5w3d7fpp8c8g1539adzdxarps36s8"; + name = "coq-commenter"; + }; + packageRequires = [ cl-lib dash s ]; + meta = { + homepage = "https://melpa.org/#/coq-commenter"; + license = lib.licenses.free; + }; + }) {}; corral = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "corral"; @@ -9640,12 +9920,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20160722.1137"; + version = "20160826.2343"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "17b59b2244473ba32cff3408e41e451de7fcc69f"; - sha256 = "1srzmlgd4wbwdickgxq4kjxbw5rprkh7dwfi7rz82zsahk1jkzr8"; + rev = "4c3ecb4d739df379dd01ac8c7dc17080e608dac3"; + sha256 = "0cah0ri248hy1xzrldhh831imyfvnm9jdwnnxqm0iphp4dsf1xk7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -9661,12 +9941,12 @@ counsel-dash = callPackage ({ counsel, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, helm-dash, lib, melpaBuild }: melpaBuild { pname = "counsel-dash"; - version = "20160523.2352"; + version = "20160729.829"; src = fetchFromGitHub { owner = "nathankot"; repo = "counsel-dash"; - rev = "f88ca42c3f29584adb42cbae7f5f9c68af1e622b"; - sha256 = "15caglb1pvnrsgc17sfdfahkilrqba5r61118ny5fa3vgk9cbwcq"; + rev = "07fa74a94ff4da5b6c8c4810f5e143e701b480d2"; + sha256 = "17h2m9zsadq270mkq12kmdzmpbfjiwjbg8n1rg2apqnm1ndgcwf8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8af4d854f972bfed3d2122b4c089f72d8b5f2a/recipes/counsel-dash"; @@ -9682,12 +9962,12 @@ counsel-osx-app = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "counsel-osx-app"; - version = "20160525.305"; + version = "20160821.109"; src = fetchFromGitHub { owner = "d12frosted"; repo = "counsel-osx-app"; - rev = "e794630989c8df75f6c025846d73d911cc63cbd6"; - sha256 = "1h25wy945n173rv629d3q9s9q6yl72nnfr6xg27jjbnzf6v2i8lv"; + rev = "b1c54cbc033c4939966910d85ce035503079e108"; + sha256 = "0p3j60hjai3v8yny9zlzbxppy0pl9s3yf4x6z5rac6n86xx0iix8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/926d0ab3d62d7114d6997944521b66ab969f6830/recipes/counsel-osx-app"; @@ -10079,12 +10359,12 @@ csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; - version = "20160615.1119"; + version = "20160808.1235"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "33fb05c1049e9d3b6db4aa72e27b9b7335b4dbe1"; - sha256 = "0i4ql5i6php60jvga0a7qbgwpi0bmq30g35k76b1mgd760wn81xx"; + rev = "0c4edfd8e4916725810e26d8bb3c42a1d740c294"; + sha256 = "0335shnscf5z9jipz7cpwccl7w85svr5g77kr7lj2i4wklcj4qyg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; @@ -10302,6 +10582,27 @@ license = lib.licenses.free; }; }) {}; + cubicaltt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cubicaltt"; + version = "20160810.38"; + src = fetchFromGitHub { + owner = "mortberg"; + repo = "cubicaltt"; + rev = "cdf88159a26e2e4b73f9fea0c88a6e1d16497218"; + sha256 = "1x9qpil0fmhqld03aj5zxqcb7k4q35ca8w4plgblf5h30l9xzfzg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; + sha256 = "1wgy6965cnw201wx4a2pn71sa40mh2712y0d0470klr156krj0n9"; + name = "cubicaltt"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/cubicaltt"; + license = lib.licenses.free; + }; + }) {}; cucumber-goto-step = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el }: melpaBuild { pname = "cucumber-goto-step"; @@ -10429,8 +10730,8 @@ src = fetchFromGitHub { owner = "n3mo"; repo = "cyberpunk-theme.el"; - rev = "4ffdaee0a32b8e235bf44c0daedde66eaf7b1b33"; - sha256 = "1yhizh8j745hv5ancpvijds9dasvsr2scwjscksp2x3krnd26ssp"; + rev = "35e73ef8ad01965bf9b58e2188c5f94544911dfd"; + sha256 = "1jffhqkp5ci20gsmlihayihvvg3vyngbjzlna9lmy83gy7jqqj1f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme"; @@ -10573,8 +10874,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "ac4cbf0265735979ea17cedf051652f8603b7034"; - sha256 = "16s62khj4p38hpk6h82gp4lz4n665pfk81fklf92fhb9lln38ca4"; + rev = "09f6874a8e831370e9ba08e706e366ecfc72b408"; + sha256 = "1ii6v0bixwj64x3iw8xjy8n3x2brb2swwln176625lwz7x39jc2k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -10821,12 +11122,12 @@ darkokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darkokai-theme"; - version = "20160512.816"; + version = "20160803.2058"; src = fetchFromGitHub { owner = "sjrmanning"; repo = "darkokai"; - rev = "066fd74c3f522ddd4ae0defdee59e65179c31b09"; - sha256 = "1603pk88mnzvwv75wdqk83s0wba4q2b7cmg5bwn2yncxmirmh3lq"; + rev = "5c5cee814c370f99db486ad11165f2023a22f7be"; + sha256 = "0by1c73hbc1y32ylb2pbfin6ydzxh2597rrm8xj8lc5g0ilch67n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81387a5a70f7c42fbae16b52db765136795a37e1/recipes/darkokai-theme"; @@ -10842,12 +11143,12 @@ darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "20160524.2250"; + version = "20160820.48"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "abdcab39f38438b80fddaa326c634b8606bc9cf1"; - sha256 = "0z1d15dgs4iymkh744bnqpq8b32d94244m4riq07lh4180wkdglq"; + rev = "839c94048e0a3e9ac6e286212c7626f3fb7ac2c9"; + sha256 = "1nagwhd8n69iysa4m5i7xxi06w6z4hsrvjsgmdg5msyi14ci5lip"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -10884,12 +11185,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20160619.611"; + version = "20160820.501"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "502be58722262c5b9d779848a168b0dc67ee7471"; - sha256 = "1cmj1ppi5v0q56mnym3x0zirpwm1673fm04cvpqzpahgs4nki73l"; + rev = "f1c60c4f114e6f7256100364e04bbd32552b0eaf"; + sha256 = "15iy8dhs2hx4kfn7ym4yp2kb6j17g5i8q66ji39sf5adbjsfsf1l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -10930,8 +11231,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "502be58722262c5b9d779848a168b0dc67ee7471"; - sha256 = "1cmj1ppi5v0q56mnym3x0zirpwm1673fm04cvpqzpahgs4nki73l"; + rev = "f1c60c4f114e6f7256100364e04bbd32552b0eaf"; + sha256 = "15iy8dhs2hx4kfn7ym4yp2kb6j17g5i8q66ji39sf5adbjsfsf1l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -11115,12 +11416,12 @@ ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ddskk"; - version = "20160315.708"; + version = "20160820.1428"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "444991051df5d8bd2babd4249d2311dc39890e37"; - sha256 = "1mqz83yqgad7p5ssjil10w0bw0vm642xp18ms4id8pzcbxz8ygsv"; + rev = "fa713612fbf12a599b20f31e0aa6f35931bc92a0"; + sha256 = "0adl3njl8p4jgzwbjfw30yf1z0qis4nilbdkssgag8n9jld53ayz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk"; @@ -11386,12 +11687,12 @@ demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demangle-mode"; - version = "20151109.1253"; + version = "20160822.924"; src = fetchFromGitHub { owner = "liblit"; repo = "demangle-mode"; - rev = "07e62a7f976f6c7366b4b0475bbb5cff881452b8"; - sha256 = "13jfhc9gavvb9dxmgi3k7ivp5iwh4yw4m11r2s8wpwn6p056bmfl"; + rev = "b40d7174d5d31ea8bf3442fb054f3c15bf6e979c"; + sha256 = "00aqhzamp1492kn0x1j2h15wywbkwx9m0alm5z82z60wrq7gy9z7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode"; @@ -11407,12 +11708,12 @@ demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demo-it"; - version = "20160525.646"; + version = "20160801.1728"; src = fetchFromGitHub { owner = "howardabrams"; repo = "demo-it"; - rev = "cc88b9b2b73dedbe60f5767ac0d1cbedeb58eb08"; - sha256 = "12sdba2c2zh91cmv4p2naq9b2y6l7ygizb88l4m9g0jsvwx6brvs"; + rev = "58c500aa1137c2be5e64eba0f52601d0dea2d2bb"; + sha256 = "0jjc3093yb5jxgsf2lr3mxsz3bchckln7kmabn5abgzr8wjpbg9a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1dec5877db00c29d81d76be0ee2504399bad9cc4/recipes/demo-it"; @@ -11453,8 +11754,8 @@ src = fetchFromGitHub { owner = "ffevotte"; repo = "desktop-plus"; - rev = "a9cb8dd0af5071d9f148211b408c54306239381c"; - sha256 = "10f5dkrwfd6a1ab98j2kywkh1h01pnanvj2i7fv9a9vxnmiywrcf"; + rev = "5da49fbf2d8c45843466ae9f7f9e2a2295e9b914"; + sha256 = "1klgf1w2lvb537l48cgpncw51f429vhvy5qcz1p0hkdzav6v5d9z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b009b42c73490d56d4613dcf5a57447fb4ccab4/recipes/desktop+"; @@ -11509,6 +11810,27 @@ license = lib.licenses.free; }; }) {}; + dfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dfmt"; + version = "20160827.211"; + src = fetchFromGitHub { + owner = "qsimpleq"; + repo = "elisp-dfmt"; + rev = "618274b841b0b6dbfebd79baa9fe05eab2bbd5c9"; + sha256 = "1pvplsjcxl3m8fxix63ndwcwp54ga12kh0yv2y1bzbd51z08210a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a343a752d25185b30b10805c4012f3b21a03651e/recipes/dfmt"; + sha256 = "06g9yimw6q4wl2prspr8vjyv2pxk8bb0451wplpp70h5ajfwy3dz"; + name = "dfmt"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/dfmt"; + license = lib.licenses.free; + }; + }) {}; dic-lookup-w3m = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, stem, w3m }: melpaBuild { pname = "dic-lookup-w3m"; @@ -11574,12 +11896,12 @@ diff-hl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diff-hl"; - version = "20160622.1816"; + version = "20160827.1922"; src = fetchFromGitHub { owner = "dgutov"; repo = "diff-hl"; - rev = "e93367512080e540dc5dd126dfcb38b4a5e9415b"; - sha256 = "03pvh213w0sgyvv0xrkj43bs53p2xfr7162yhzdh24qwa8dd23qv"; + rev = "f8ce39d157144ee4b22d386dd40673ea7f87ecd7"; + sha256 = "0cnhmcdkmbjikbv2hca54xw258f7wys0srxk07wp02jaryvj1298"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf8fc25abd2fb91ec6a6ba951d89a19ca4f5571f/recipes/diff-hl"; @@ -11655,15 +11977,35 @@ license = lib.licenses.free; }; }) {}; + digit-groups = callPackage ({ dash, fetchhg, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "digit-groups"; + version = "20160816.1926"; + src = fetchhg { + url = "https://bitbucket.com/adamsmd/digit-groups"; + rev = "ee1d6de37260"; + sha256 = "0rkajjlw820gfx1kclkcvdq7milhiid2yzvn9hd275ydskrhhwlp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/eea9d435c7c1889b16549a0ef3f66483b2de3605/recipes/digit-groups"; + sha256 = "1wy1hf15qi9v0wz2rykpf40v3g2n4mha6h207m0zn8l8rb79hwjq"; + name = "digit-groups"; + }; + packageRequires = [ dash ]; + meta = { + homepage = "https://melpa.org/#/digit-groups"; + license = lib.licenses.free; + }; + }) {}; dim = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dim"; - version = "20151226.115"; + version = "20160818.249"; src = fetchFromGitHub { owner = "alezost"; repo = "dim.el"; - rev = "78eaf6dda704f7abbb3257021938b732006922eb"; - sha256 = "17jfmgyras32w9xr8fldqj924bijgng4bjg9fy6ckwb3mgihyil8"; + rev = "110624657fec0c8a7b3589108230e6a635302ae0"; + sha256 = "1qiqkppfpgyqm1z31i956gj96670kjxs7m33knmhngqk7i5yc94i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a740ab40cab3a1890f56df808f41a2d541aa77c/recipes/dim"; @@ -11721,12 +12063,12 @@ dionysos = callPackage ({ alert, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild, pkg-info, s }: melpaBuild { pname = "dionysos"; - version = "20151013.103"; + version = "20160810.356"; src = fetchFromGitHub { owner = "nlamirault"; repo = "dionysos"; - rev = "98907a38e98ff1b02171a1ad8df246a291e04750"; - sha256 = "1ldqxdwy6r0fd2vh0ckkhgpincvybghavi8c7vvyd24j91i57y2f"; + rev = "98bc789d20e41020d6e62d63d3c78f8032fa4bf2"; + sha256 = "1hma72dyn3w6cwd3vrgg4hdlrxgwqs55cjyxb05vs9csz7r42208"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/890445eca3c555acd2639a6f509c8e83b687f2bd/recipes/dionysos"; @@ -11881,6 +12223,27 @@ license = lib.licenses.free; }; }) {}; + dired-explorer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dired-explorer"; + version = "20160809.200"; + src = fetchFromGitHub { + owner = "jidaikobo-shibata"; + repo = "dired-explorer"; + rev = "0e929d4eab2eb545a2e2436994cf4941b643e5c1"; + sha256 = "02syawkw44f33hldp4ncws271jv6w4zid1acf4zkm40sbb0iqdil"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/acd40e02185847dfdcd70b3cacea703133e4356d/recipes/dired-explorer"; + sha256 = "12mymmcl663ci543vqzg8jai8kgfbb3gw5wsbcm4ln3j8d5fgzd9"; + name = "dired-explorer"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/dired-explorer"; + license = lib.licenses.free; + }; + }) {}; dired-fdclone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-fdclone"; @@ -11905,12 +12268,12 @@ dired-filetype-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-filetype-face"; - version = "20160217.47"; + version = "20160822.655"; src = fetchFromGitHub { owner = "jixiuf"; repo = "dired-filetype-face"; - rev = "ca37251cee6b4e07004326169d701745a80f595f"; - sha256 = "06hxcxgivxds42qilraqa6q1mlrhkn21w2adb1dg70p8qyrjqfk6"; + rev = "72b3c88e8b82b3f8681d940757f7b2992bd80793"; + sha256 = "1sp6fr3qha5zas65q06b61bgqx0nfiarcgpydqv0drkn6dpaps8b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e6c8015af3d5f013272308a97e089a4e3ca847d/recipes/dired-filetype-face"; @@ -11989,12 +12352,12 @@ dired-k = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-k"; - version = "20160330.1913"; + version = "20160817.823"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-dired-k"; - rev = "3ec3881dc9c491ba80ffb4c8401fe7018cc9534f"; - sha256 = "0adqiqaqdcbcrmifz4zd9h08rgml6ghwkwid7qncrk2gxschkikz"; + rev = "4c9eb0fab636983a03dbe4357f9b3ee6b3ca8d74"; + sha256 = "17g0ajhbhk7l5s75h0ybz1w1dnf5aikvbcgcdd4d0qkj9l91k8x6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7/recipes/dired-k"; @@ -12051,10 +12414,10 @@ }) {}; dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-plus"; - version = "20160528.748"; + version = "20160826.2346"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired+.el"; - sha256 = "0wi2ph2ixsk6cjw81yxlqxl9ar0wh3k0yfwijr254yn9rl4vibxc"; + sha256 = "0v5qi7gvqq52qb8wv2dqw3xq348ckfb1ps1l1sk52qp5iswl6995"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+"; @@ -12414,6 +12777,27 @@ license = lib.licenses.free; }; }) {}; + discourse = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: + melpaBuild { + pname = "discourse"; + version = "20160811.2150"; + src = fetchFromGitHub { + owner = "lujun9972"; + repo = "discourse-api"; + rev = "a1c16af8f77986fb94fbc34c1e6ea36fcd97e00b"; + sha256 = "0i2p97cgrqz65l0bc6zgixvb5bdya4ynq18ygrs3v66xp02rxqc1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f5e64fc3fa3fc7d0ac14e7e5d324ee1ca77ea4c3/recipes/discourse"; + sha256 = "0j11pyly7qni3gqgywd9bkzfm1dfvhbfjc7pls9n9s26nbqdzcw9"; + name = "discourse"; + }; + packageRequires = [ cl-lib request s ]; + meta = { + homepage = "https://melpa.org/#/discourse"; + license = lib.licenses.free; + }; + }) {}; discover = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }: melpaBuild { pname = "discover"; @@ -12558,6 +12942,27 @@ license = lib.licenses.free; }; }) {}; + distel-completion-lib = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "distel-completion-lib"; + version = "20160816.406"; + src = fetchFromGitHub { + owner = "sebastiw"; + repo = "distel-completion"; + rev = "994c61dda2e3256b41fa2e53821c484b5ffd13e6"; + sha256 = "00nifdhwy89zmi50hln5p5albdx7ypm4mbdfjzhk4870crx4zjr2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/90fff35dd9709b06802edef89d1fe6a96b7115a6/recipes/distel-completion-lib"; + sha256 = "0b06z3k30b4x5zpzk0jgcs7kcaix64xx81iskm1kys57r3gskzpa"; + name = "distel-completion-lib"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/distel-completion-lib"; + license = lib.licenses.free; + }; + }) {}; distinguished-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "distinguished-theme"; @@ -12579,15 +12984,35 @@ license = lib.licenses.free; }; }) {}; + ditz-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ditz-mode"; + version = "20150729.240"; + src = fetchhg { + url = "https://bitbucket.com/zondo/ditz-mode"; + rev = "beac4c1f3b7e"; + sha256 = "1cbsy4lchl41zmyxfq828cjpl3h2dwvn8xf1qgf2lbscdb6cwbwb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/02e2a2a25f42929626d7237511136ba6826dad33/recipes/ditz-mode"; + sha256 = "0shzm9l31n4ffjs1d26ykxsycd478lhlpl8xcwzbjryywg4gf5nd"; + name = "ditz-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ditz-mode"; + license = lib.licenses.free; + }; + }) {}; dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix"; - version = "20160713.225"; + version = "20160801.142"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "e7256998912bc9263091b8486e73029206dcc169"; - sha256 = "0rx1j38dgl8ccqi5hwshwwp3w4xshfjxpfd87cj661wcrigyf6jc"; + rev = "64289f0f658fb67ec9470626aea3365b8fd84f58"; + sha256 = "1r8nz1v0b0qnjvdszh9pvj8c9y5b07k2sdvdmimdhpp0fx9vd246"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix"; @@ -12607,8 +13032,8 @@ src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "e7256998912bc9263091b8486e73029206dcc169"; - sha256 = "0rx1j38dgl8ccqi5hwshwwp3w4xshfjxpfd87cj661wcrigyf6jc"; + rev = "64289f0f658fb67ec9470626aea3365b8fd84f58"; + sha256 = "1r8nz1v0b0qnjvdszh9pvj8c9y5b07k2sdvdmimdhpp0fx9vd246"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil"; @@ -12645,12 +13070,12 @@ django-manage = callPackage ({ fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "django-manage"; - version = "20151024.2330"; + version = "20160818.1912"; src = fetchFromGitHub { owner = "gopar"; repo = "django-manage"; - rev = "91ce758c830f06b33b7d04cc66dd5ec131bd4398"; - sha256 = "15i25zh54b2fqji0qmkg502051ymccih6pgqnzq02c43dpnsqhqv"; + rev = "e72b1cf2fdbb5c624d19169176e60467b4918fe2"; + sha256 = "0lyi64dfd2njlnf9dzb8i88rrw930jiq99xfn8zmh87y6qy1j79i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66f88d30a1ab9b7f9281a2b5939c7ab2711b966a/recipes/django-manage"; @@ -12876,12 +13301,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20160708.512"; + version = "20160816.105"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "5585b8dd9a2a8e5c5d98b1a3a47dc25c5d25b312"; - sha256 = "1wg1d895y0hhq4abz0c1a69sxg1427fp5kdy7v7ab0q841xfkdgs"; + rev = "d5d6f8ecdc5fdae19ff03ad3b242fd50fd618c4a"; + sha256 = "0sczy87n9ymckw64fh3lxbpjawfc26xsja4qylzaj5pjsixrnpjh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -13217,12 +13642,12 @@ dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dracula-theme"; - version = "20160710.1322"; + version = "20160826.627"; src = fetchFromGitHub { owner = "dracula"; repo = "emacs"; - rev = "af1febe83ed682c7015c5e208836b1e03a5519f9"; - sha256 = "0p4kiych8r3aa957is3pgav2lsdkrjkawb874sqq398xmwqfh0wx"; + rev = "83e60b91c526405506c3f6167af207371e2420c8"; + sha256 = "00wlspaya7g48fh34rbn27ixixxnm2qrc6gl135d97hawv86rmrb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d63cb8906726f106e65f7d9895b49a38ffebf8d5/recipes/dracula-theme"; @@ -13361,12 +13786,12 @@ drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }: melpaBuild { pname = "drupal-mode"; - version = "20160420.1258"; + version = "20160821.1324"; src = fetchFromGitHub { owner = "arnested"; repo = "drupal-mode"; - rev = "2ed0a8139812f4215c733913c1891d4fdab40550"; - sha256 = "1hbm3zdmd28fjl8fky0kq4gs2bxsrn2zxk9rd1wa2wky43ycnd35"; + rev = "f425ba445ae201a16e3fc3b4f5fb8bea93579d39"; + sha256 = "1c3krir3l04rwlyadnhra6kmbnmvdm95aj7iwspa6dssnry4vflj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode"; @@ -13405,7 +13830,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1754245"; + rev = "1758596"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -13506,12 +13931,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20160715.1740"; + version = "20160830.1152"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "cddb48646c330fd949801f2dadf51d93a37c5625"; - sha256 = "1zvin0qp3jr3s6m88zl2xdi0zrrw6j7hjp9vhhksjbf675w9ibqz"; + rev = "c99c874451aefae9072e521e518a14aeb3559b12"; + sha256 = "1dw0ybx5xr9lrlnqblgw64dwk446812vgh1134jpdslzqjpirzwd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump"; @@ -13593,8 +14018,8 @@ version = "20160723.524"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "a3fdf75d634a"; - sha256 = "0yqsrqqzhril9crdgc3ddjz0jggmy29djksqrlihffk9p8zs341d"; + rev = "4b5bc1f49cad"; + sha256 = "1c0jswjxazf330bh0xg889s6pfk50x5qi5lc8kpfqwa0p6b15306"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -13946,12 +14371,12 @@ easy-lentic = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lentic, lib, melpaBuild }: melpaBuild { pname = "easy-lentic"; - version = "20160529.2330"; + version = "20160727.2025"; src = fetchFromGitHub { owner = "tumashu"; repo = "easy-lentic"; - rev = "4e1fc55b6936ca240b265809ca8a5dc2a237837d"; - sha256 = "0sm54ngmpciqmik7y3zihyygw9g0lhphzdm4xx07wvxmhnlamxsa"; + rev = "751a1d717840d9f526f26cf43e88d44981a6b14f"; + sha256 = "027w2sjagv74g9bx1k4w2f79fmxwvdsk2625abjlv7mly3aigzyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e098e70214e85e1c583a4976f895941c13de75f/recipes/easy-lentic"; @@ -14030,12 +14455,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }: melpaBuild { pname = "ebib"; - version = "20160706.220"; + version = "20160831.425"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "28e4ee990d0e1c685632a737c764425037f7d5c4"; - sha256 = "114k7gr9z7wisz5h6jic1fqn7481xidi89fjhljhbak602iq6zjc"; + rev = "57a9a228743d5f773002f951b9bc5765ff9c7332"; + sha256 = "1rz4mdzwx293q8ba8gvidj79y7lcjy3dngvh9dhz9vig2xdggn77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -14108,6 +14533,27 @@ license = lib.licenses.free; }; }) {}; + eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }: + melpaBuild { + pname = "eclim"; + version = "20160831.455"; + src = fetchFromGitHub { + owner = "emacs-eclim"; + repo = "emacs-eclim"; + rev = "a58dd558e6ad4f8f5d78b743955a758178e323be"; + sha256 = "1jn2raymx4qml8h7ala8jhgfzfbppd5nq55ffbs0il46r9w3n086"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; + sha256 = "1n60ci6kjmzy2khr3gs7s8gf21j1f9zjaj5a1yy2dyygsarbxw7b"; + name = "eclim"; + }; + packageRequires = [ cl-lib dash json popup s yasnippet ]; + meta = { + homepage = "https://melpa.org/#/eclim"; + license = lib.licenses.free; + }; + }) {}; eclipse-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eclipse-theme"; @@ -14426,12 +14872,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20160719.559"; + version = "20160808.2212"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "e316e6ebe2bfed0806dd21583e7c904e6d4c182f"; - sha256 = "1mnx2b2qyv3d8chj9l2l7icvajdiry2n5d3c8byvibs8wav9jzh6"; + rev = "e54c0b8aa81bbd4292301c6c0cee2be71e62bccf"; + sha256 = "1jwkf1q59b24dk4zlpp25v8y7200a7mn5fjq8f8xzsw2vgfqz0zs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -14447,12 +14893,12 @@ editorconfig-custom-majormode = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig-custom-majormode"; - version = "20160706.2035"; + version = "20160729.24"; src = fetchFromGitHub { owner = "10sr"; repo = "editorconfig-custom-majormode-el"; - rev = "72df25c2d4a1fb8ab56f71919799897b826bf044"; - sha256 = "1hmfvqyl6nyyk122vn74wfscpw7869rwi28hs5cy3n8nvn220d3c"; + rev = "601ce5a04634003075396a8ff74d0b09cfa7c11a"; + sha256 = "0jdvg1a76r8vg2d0n8hl2kczg8hybk2hcbd732g3vhzl8i4izfi2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd47bf4630442ad1a941ad432cef64c7746aa71/recipes/editorconfig-custom-majormode"; @@ -14510,12 +14956,12 @@ edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, eproject, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "edts"; - version = "20160430.631"; + version = "20160812.729"; src = fetchFromGitHub { owner = "tjarvstrand"; repo = "edts"; - rev = "40138ee39ea3823d74145dabfd0c342cbdeef5d9"; - sha256 = "0dn2p80pifkc5pjqqx6xhr53mjp5y0hb48imhwybf9mwbgpz16va"; + rev = "a3e4eeb5b340186f727bd06aa3d4d3fcacc16292"; + sha256 = "0kbm11v3sfvkc821lpcv87z21pqb3pb4jzv7wyiy6mlkbnqjl289"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/782db7fba2713bfa17d9305ae15b0a9e1985445b/recipes/edts"; @@ -14586,8 +15032,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "f270ba4b1fe0003fa3e1e054f1a743d14a318ad5"; - sha256 = "1gh6cf7913hrzb83dzgr2fhgi6h762ggh0chypmbp1d6sf5h2y89"; + rev = "f08462616a29d58774e4e89fe01b75f4503394a8"; + sha256 = "13xyr7g1if29yv6vykwx1inmphig20z320hzva1lbni4cl1dwfc7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -14603,12 +15049,12 @@ ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "ego"; - version = "20160720.326"; + version = "20160822.849"; src = fetchFromGitHub { owner = "emacs-china"; repo = "EGO"; - rev = "69aeac85148b5a5789272c9445aa85b25e5a2a1b"; - sha256 = "06d2caxmg7k2z0v3hv41b8ybdjajw05m73m29afw8vadghcghixz"; + rev = "33b8df4e13257a0e893a4f49a1d6aa623e2bca72"; + sha256 = "059vhx15rvp52s3bdvhz62jvkxi6ab9ly7pmab9cpdcpagqq9gaq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0090a628a5d566a887cac0d24b080ee6bafe4612/recipes/ego"; @@ -14706,12 +15152,12 @@ eink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eink-theme"; - version = "20160521.2303"; + version = "20160826.51"; src = fetchFromGitHub { owner = "maio"; repo = "eink-emacs"; - rev = "8708f11ddbc3542e18b19eac8e45479cfc1ea55e"; - sha256 = "1ll3d8ylwbznmlq0wl6nvf6sgb9y2hkkpybv17ymg016j5xbngkm"; + rev = "a817ef1cc891de174a4ec9d9b06551a1ebf8d8e4"; + sha256 = "0cf587c7wl8r3if7wiqh7rw0r2dmjck79wjnm2il1l45ffff2nzn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1349c3f93ab60983f77c28f97048fa258b612a6/recipes/eink-theme"; @@ -14769,12 +15215,12 @@ el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-get"; - version = "20160628.1619"; + version = "20160827.1305"; src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "b59cada0c5a95809dbd084542f5b90395180ac39"; - sha256 = "1i1k9hii7xj3r31mfx7kqw6161hdkk7xy4plw268aa98j50d4ysz"; + rev = "a6638a664acd9313e8797d6c4087dafcc0ac45cb"; + sha256 = "049wwsxg0w803d2a5xkywldlqds7dbw6wa0m2lpip2yl08qfympg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -14997,12 +15443,12 @@ el2markdown = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el2markdown"; - version = "20150516.1338"; + version = "20160822.1135"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "el2markdown"; - rev = "875648f9a65ed18fe71fc72872a0db70aab5253d"; - sha256 = "03xlxx57z1id9mr7afkvf77m2f9rrknrm1380p51vka84v2hl3mh"; + rev = "712364b9f64d2f6501a069e1bfed207de0237881"; + sha256 = "12l50k56h1aiwmvvxrka3y1i82sv5xc7vn99z3y3kl31yl3g6382"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/914e845a0869680f84611a415373c9a166c93794/recipes/el2markdown"; @@ -15099,12 +15545,12 @@ electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "electric-operator"; - version = "20160510.2331"; + version = "20160828.544"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "ff1aceec151bd9e7b25f0414ba93f3435e5c2999"; - sha256 = "1fq80j0gq3x03jqdpb6lr748mbx7sj7r54lq2m3qpnxp15p2v360"; + rev = "49bffc321705179a06d685c2023e67229b952b36"; + sha256 = "1kqq557m5rm71hg3b7qr4md145dsp0g0xn2dim5jifcwmynf4m6f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -15159,15 +15605,36 @@ license = lib.licenses.free; }; }) {}; + elf-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "elf-mode"; + version = "20160829.1118"; + src = fetchFromGitHub { + owner = "abo-abo"; + repo = "elf-mode"; + rev = "ae5ff9b88033e275f8eeca1a0753ba6a8aa6153b"; + sha256 = "0208wkbi2qc1lfdisrdc36gpsmf9hlj99y6w3va01yl2b5hrc5ik"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/368d1ff91f310e5ffe68f872ab0a91584a41a66e/recipes/elf-mode"; + sha256 = "0xwpaqg4mc0a0d8a4dxbd1sqzvi01gfhwr75f7i3sjzx0fj8vcwd"; + name = "elf-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/elf-mode"; + license = lib.licenses.free; + }; + }) {}; elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20160703.2019"; + version = "20160826.1719"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "f1050c93803688293f0f6988625183863972f4ec"; - sha256 = "1bwvsbxnx68vz9vmdbxybl66qn8s54zhlbjswjb9vdir16w9ww4s"; + rev = "45cad0febad147c16ca52f24417b633501dbda22"; + sha256 = "11gq4jhvrnx4209dp5wp2lrpdcdfrn0m5gvzzzd363pv78qqnadq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -15211,12 +15678,12 @@ elfeed-org = callPackage ({ dash, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "elfeed-org"; - version = "20151003.331"; + version = "20160814.314"; src = fetchFromGitHub { owner = "remyhonig"; repo = "elfeed-org"; - rev = "e5206bc983d04c68310181da83147908682de295"; - sha256 = "0cp8sbhym83db88ii7gyab6iqxppinjlrkzb9627gq7xgb5mqj5j"; + rev = "ccb571188b7942ec3e1f93561ed4bb8b659a78a2"; + sha256 = "15wcwp8gfv1zsykyc59ml07g43p1w305q3mgahis37rl9bpyaadn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5874b83e31cb760698032106fff75c8ded1d8e82/recipes/elfeed-org"; @@ -15232,12 +15699,12 @@ elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "20160525.516"; + version = "20160828.1809"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "f1050c93803688293f0f6988625183863972f4ec"; - sha256 = "1bwvsbxnx68vz9vmdbxybl66qn8s54zhlbjswjb9vdir16w9ww4s"; + rev = "45cad0febad147c16ca52f24417b633501dbda22"; + sha256 = "11gq4jhvrnx4209dp5wp2lrpdcdfrn0m5gvzzzd363pv78qqnadq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -15565,6 +16032,27 @@ license = lib.licenses.free; }; }) {}; + eloud = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eloud"; + version = "20160731.857"; + src = fetchFromGitHub { + owner = "smythp"; + repo = "eloud"; + rev = "82c97918585bd2a749251ae87d7732ca9d856c16"; + sha256 = "19wfn3zfi7avgnrki805acin8qd4f1jvmddgjk22j6m78l607lxn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e80fba9bc541594129756f5c668f3192919bc8/recipes/eloud"; + sha256 = "1h8wd5mfi1cn9bzrckgc5mdrr5jkqsx92ay008p650wvjl689rn2"; + name = "eloud"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/eloud"; + license = lib.licenses.free; + }; + }) {}; elpa-audit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-audit"; @@ -15823,27 +16311,6 @@ license = lib.licenses.free; }; }) {}; - emacs-eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s }: - melpaBuild { - pname = "emacs-eclim"; - version = "20160616.2312"; - src = fetchFromGitHub { - owner = "emacs-eclim"; - repo = "emacs-eclim"; - rev = "2f59bfb333928c219855ceaf011791380d1b9a7a"; - sha256 = "1ran9pg836433d4dqhf5j5zr26s8sbxld8xigjapyri9m2bhy9sn"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753/recipes/emacs-eclim"; - sha256 = "1l55jhz5mb3bqw90cbf4jhcqgwj962br706qhm2wn5i2a1mg8xlv"; - name = "emacs-eclim"; - }; - packageRequires = [ cl-lib dash json popup s ]; - meta = { - homepage = "https://melpa.org/#/emacs-eclim"; - license = lib.licenses.free; - }; - }) {}; emacs-setup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacs-setup"; @@ -15931,12 +16398,12 @@ emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }: melpaBuild { pname = "emacsql"; - version = "20160424.747"; + version = "20160824.1308"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "3042597a723157f7a69765d833107b5e9efb3562"; - sha256 = "012x6cx3rbxysvsmbx56y295ijdlpgy8z7ggcfp0cq0khki67yva"; + rev = "3176aeee6140e464e1cede60e05b6523d1e38a23"; + sha256 = "13065qyd6p8g3hx56524wv23yddl94g666rrah2y4y872jzdbdn2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; @@ -15956,8 +16423,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "3042597a723157f7a69765d833107b5e9efb3562"; - sha256 = "012x6cx3rbxysvsmbx56y295ijdlpgy8z7ggcfp0cq0khki67yva"; + rev = "3176aeee6140e464e1cede60e05b6523d1e38a23"; + sha256 = "13065qyd6p8g3hx56524wv23yddl94g666rrah2y4y872jzdbdn2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; @@ -15977,8 +16444,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "3042597a723157f7a69765d833107b5e9efb3562"; - sha256 = "012x6cx3rbxysvsmbx56y295ijdlpgy8z7ggcfp0cq0khki67yva"; + rev = "3176aeee6140e464e1cede60e05b6523d1e38a23"; + sha256 = "13065qyd6p8g3hx56524wv23yddl94g666rrah2y4y872jzdbdn2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; @@ -15998,8 +16465,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "3042597a723157f7a69765d833107b5e9efb3562"; - sha256 = "012x6cx3rbxysvsmbx56y295ijdlpgy8z7ggcfp0cq0khki67yva"; + rev = "3176aeee6140e464e1cede60e05b6523d1e38a23"; + sha256 = "13065qyd6p8g3hx56524wv23yddl94g666rrah2y4y872jzdbdn2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite"; @@ -16015,12 +16482,12 @@ emacsshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacsshot"; - version = "20160713.942"; + version = "20160822.756"; src = fetchFromGitHub { owner = "marcowahl"; repo = "emacsshot"; - rev = "e813bbec4c9677ed2fc4496d64277b074aadee4c"; - sha256 = "1wv1crfq1lqjm0nf6fgi127x5fd6qlgjnrfqq4inzxhfcnizb52d"; + rev = "634f6cca9531c6a65dbea9267ca5b64a93ec543f"; + sha256 = "050csja2p1zzvh48dpa28lsnvdxxmdpi60pd7jx5cvkfjbic86c5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efdd85accc6053f92efcbfdb7ddc37b23a07a3b0/recipes/emacsshot"; @@ -16033,27 +16500,6 @@ license = lib.licenses.free; }; }) {}; - emagician-fix-spell-memory = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "emagician-fix-spell-memory"; - version = "20141229.1434"; - src = fetchFromGitHub { - owner = "jonnay"; - repo = "emagicians-starter-kit"; - rev = "5fadbf1bf84091b6ffe6cd1bff48f30e3da6c479"; - sha256 = "00iklf97mszrsdv20q55qhml1dscvmmalpfnlkwi9mabklyq3i6z"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f181a35e33c93f42b16961bd522825b017057fc5/recipes/emagician-fix-spell-memory"; - sha256 = "0ffjrpiph21dn8bplklsz3hrsai25l67yyr7n8qjxlwlibwqzv6j"; - name = "emagician-fix-spell-memory"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/emagician-fix-spell-memory"; - license = lib.licenses.free; - }; - }) {}; emamux = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emamux"; @@ -16182,11 +16628,11 @@ }) {}; emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20160624.1353"; + version = "20160801.1349"; src = fetchgit { url = "git://git.sv.gnu.org/emms.git"; - rev = "bec63d3ea62dafc4158c35abdf7e9180419a3f78"; - sha256 = "0qbkjqi3d3y432mg3k0gxivndvq7kpghcx4kkypli2mr24qqf33j"; + rev = "02c5183a484b12d529b0901a81604eb658bec8d3"; + sha256 = "02sl9nipa96bzn1adqsgp1nrb20iawscr8kajyhv0613r7igi177"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/205eeed002b0848809a4c5f8ad99d925b48799ec/recipes/emms"; @@ -16454,12 +16900,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20160715.2321"; + version = "20160805.918"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "7c6c9126d7c6ef1ea3a823f75d456476c44bbcf9"; - sha256 = "0fgdjrankzq95k662vwcx78rfsy6lk360f7dssfagg4ilpixcjpj"; + rev = "2b5dde50a0f74a92d5c87ebf349351b871e483c4"; + sha256 = "144bmpvx62xm0j0ddbjn15n1rn55ilwj03cfyxw0s8xpx47jdgvc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -16592,12 +17038,12 @@ enh-ruby-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "enh-ruby-mode"; - version = "20151123.141"; + version = "20160817.1711"; src = fetchFromGitHub { owner = "zenspider"; repo = "enhanced-ruby-mode"; - rev = "73d949ab1de16a4d3f368cde94dd5403c0402ab4"; - sha256 = "008wggl6xxk339njrgpj2fndbil7k9f3i2hg1mjwqk033j87nbz7"; + rev = "5493f9fde48557d6aaaf38dd63adfdd8538496ff"; + sha256 = "1nm304bg3k38s1gi21x7n6g8228fnyp91yb9p1i39hfckxjynq39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; @@ -16676,12 +17122,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20160710.951"; + version = "20160828.1225"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "08c93aad53809eebf14fc8da5f9362f423d13d46"; - sha256 = "05ai02fpk3dmfpd9h7w1xwzx2w5mnbmd5hqnhw03zsnjxyqcsp0f"; + rev = "a32b758ee6933597dd723694f560cefd7acd1849"; + sha256 = "1xf18wkqwb4ic2dd8594iqs03c5fxa9zr5x1mclv4ffb1ibk63g1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -17208,12 +17654,12 @@ eredis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eredis"; - version = "20120808.2007"; + version = "20160809.2053"; src = fetchFromGitHub { owner = "justinhj"; repo = "eredis"; - rev = "3a8d552fa25f651614c0256dc9f45181c74f8475"; - sha256 = "0kc44r4qljmfj4xnz0w4q0arjafppdn5jgrkngjmp4g7dcvs1ilv"; + rev = "0d7d524592be488309c7c339d137ba836e52bfff"; + sha256 = "0hj8czwqzdjs7ciyg4xf0imdqfv423c6q862gy83ni09zk5ncm3i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63f06713d06911f836fe2a4bf199b0794ac89cf0/recipes/eredis"; @@ -17292,12 +17738,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20160719.535"; + version = "20160824.510"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "18d328f9e2275d13a1d469016916f7261a612951"; - sha256 = "1gmdb1hvhjgz05qpv2l6cjnhvvg8ccmiw5qvqylib911ckycjp8a"; + rev = "7b5bc80b74c488fb056fc37d687b8acb29fb331a"; + sha256 = "151yrjxdvkdhdc2bg496iirm2pfd82va1dc3s41x1i4c88lz89k8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/erlang"; @@ -17393,12 +17839,12 @@ ert-runner = callPackage ({ ansi, commander, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "ert-runner"; - version = "20160329.2306"; + version = "20160815.1309"; src = fetchFromGitHub { owner = "rejeep"; repo = "ert-runner.el"; - rev = "691a8f17870a654a4cf315a1e5aa03e6e8e8678b"; - sha256 = "0cjdpk0v07yzxbxqhxlgrk0nh9cj31yx6dd90d9f7jd4bxyzkzbb"; + rev = "b4ebafe62d0593adec38a3845af6b5499df4ab39"; + sha256 = "0babcbyarqxfqka5dl91zz58wyz1j7xfc8wy0r9818lwj15nr422"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a1acc68f296e80b6ed99a1783e9f67be54ffac9/recipes/ert-runner"; @@ -17435,12 +17881,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, spark }: melpaBuild { pname = "es-mode"; - version = "20160516.1250"; + version = "20160822.927"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "f5e6054a1d25d5eb8e21ddb931b7f65b0735c5f8"; - sha256 = "04lll5sscbpqcq3sv5gsfky5qcj6asqql7fw1bp6g12qqf9r02nd"; + rev = "58782fb516a4fcf94d7347c4bf9a166679e62e49"; + sha256 = "0jllwx3fc5dlv83s3sn8s1afj26ijgym5qzqbagwh2rgajxmh7w8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode"; @@ -17645,12 +18091,12 @@ eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-prompt-extras"; - version = "20160418.830"; + version = "20160801.2006"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "eshell-prompt-extras"; - rev = "5f1b9be555e39e76d85ad6ce037c9e396e5b1339"; - sha256 = "0g3d2b4cyvzxi54d1nd2irn4sa7rydy8b0fcqqx71sppm59fs50s"; + rev = "7a5af38b1b891d831b8317f0f24f179544628730"; + sha256 = "1gcvsxxvad0kj3m638jmfc2mjza5v69yq89ffl7llpqkicrnxrxq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras"; @@ -17684,6 +18130,27 @@ license = lib.licenses.free; }; }) {}; + eslint-fix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eslint-fix"; + version = "20160819.36"; + src = fetchFromGitHub { + owner = "codesuki"; + repo = "eslint-fix"; + rev = "be90d1e78b1dfd43b6b3b1c06868539e2ac27d3a"; + sha256 = "1l7pm0ywjby0giilyn6qsz1zh54sgmvmii7y9jhrva13c5kgg9an"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3d4417bb564a942ef031cfb319cff3b93645e5d8/recipes/eslint-fix"; + sha256 = "06qzzx1bab1169jdaljm7zh5nzm9p0wzdvqcxfrsw8s2mw5q5wi8"; + name = "eslint-fix"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/eslint-fix"; + license = lib.licenses.free; + }; + }) {}; espresso-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "espresso-theme"; @@ -17771,12 +18238,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20160723.1359"; + version = "20160829.349"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "5141f425e60cb202e5f6d42b7eb260288da66071"; - sha256 = "0a4xdn6g3nr6c0ni6b44vp1kqyzbkain4jnd2lxyb2rq07p6700b"; + rev = "fc81449c8a3bf95f2cf063e1d2f377d4e73124ee"; + sha256 = "0airlgpzrlbvzj8p1ppx2qz1r1slxgdzw35zr1b32k9kkfbmc5n7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -17897,12 +18364,12 @@ esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esup"; - version = "20160716.23"; + version = "20160818.2130"; src = fetchFromGitHub { owner = "jschaf"; repo = "esup"; - rev = "08cb1796578b2aea19dda18518c9857c0a721187"; - sha256 = "0wl89iss5kjpb216pzd9wmw6l3lzkag0fhdicl28r5addj8izwk9"; + rev = "7ab0f4cb39398528e7dee5200a7ccf7eb8f0a3db"; + sha256 = "1lcmim8vv04dgmmq8fznb9brvqsk78a4dclk5gkrxk63nli68d9m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup"; @@ -18035,6 +18502,27 @@ license = lib.licenses.free; }; }) {}; + eval-expr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eval-expr"; + version = "20120618.2347"; + src = fetchFromGitHub { + owner = "jwiegley"; + repo = "eval-expr"; + rev = "a0e69e83de41df8dbccefc1962ab4f02206a3328"; + sha256 = "08zw3qrhqmnv2wxmbf74svk2cx5by4831kyw6rx13imkc4x8kngx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f56c5312cc8ffc1a8b31fc342e8e2b8827eff846/recipes/eval-expr"; + sha256 = "0zkphbx7ph4p7qkfxqyr6p8420j9qkvx5wghd1sza6y0kb456872"; + name = "eval-expr"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/eval-expr"; + license = lib.licenses.free; + }; + }) {}; eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: melpaBuild { pname = "eval-in-repl"; @@ -18122,11 +18610,11 @@ evil = callPackage ({ fetchhg, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20160619.2253"; + version = "20160825.1343"; src = fetchhg { url = "https://bitbucket.com/lyro/evil"; - rev = "3f1515976813"; - sha256 = "1wjw3pg44axqa72mvpifsqch96pg722x16cvnhlq2i8a6y42fms5"; + rev = "f2648b841f9b"; + sha256 = "0gv8b6adaypw3d2brx0lh41yyi3kdf1klahx7kap36a7m652nan6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/evil"; @@ -18310,12 +18798,12 @@ evil-ediff = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-ediff"; - version = "20160202.1241"; + version = "20160821.1950"; src = fetchFromGitHub { owner = "justbur"; repo = "evil-ediff"; - rev = "c852bf960db9a9f13089b29c1b68ab4fffe55171"; - sha256 = "16pz48gdpl68azaqwyixh10y1x9xzi1lnhq2v0nrd0y6bfcqcvc7"; + rev = "81be356eaf5dc9ee1cc624c237007892d7c191f9"; + sha256 = "1x831myijdnzxjfpm1gb8fqfvfwv5ixsaqkax37cim2yf2fbvln1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45eb1339792849b80a3ec94b96a88dd36262df2b/recipes/evil-ediff"; @@ -18373,12 +18861,12 @@ evil-exchange = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-exchange"; - version = "20160407.2118"; + version = "20160812.843"; src = fetchFromGitHub { owner = "Dewdrops"; repo = "evil-exchange"; - rev = "29bd39d942a1401a714e43daf11573eab6abfaa8"; - sha256 = "0avaw5pgyv75nhbinjjpy30pgkwfq79fx2k9z034f1x76ls9s683"; + rev = "6e80e2509bcc14d84ca04e3c463c04e4c999efa4"; + sha256 = "1ffhkl7ssfbngvgdjaxqdihi246lgcsgwqc5m8lil7s00xrj3gw2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b06397c032d24a8da4074ad97cdb30d0c468e20/recipes/evil-exchange"; @@ -18583,12 +19071,12 @@ evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "evil-magit"; - version = "20160714.1142"; + version = "20160728.751"; src = fetchFromGitHub { owner = "justbur"; repo = "evil-magit"; - rev = "4a375ea3045671a0bdef7cdaed28efc84c9681a5"; - sha256 = "1qqn51aqn0pgadg70zaiwjph1z7xwrv21xasxc9jy7syimyqv96g"; + rev = "077354f8ebd5da76937bf8f5df5d484f8a0ccc62"; + sha256 = "05llzcdbg84x04a98b6r7d0m8631hk83hjq33hwd4n8ixp85dg20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cfc6cc3581323c81d5f347895aaddfdc71001f22/recipes/evil-magit"; @@ -18625,12 +19113,12 @@ evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "20160627.1751"; + version = "20160827.527"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "080639aed39265f8f9f7e2ef8d3a6292939dffe2"; - sha256 = "0zd0cy65zyz6nb6vmcwjj8nq1nkifynsg12ys2mplsx33ijg7546"; + rev = "de6ce21e1e24b7a0370ca3a6ce83b529f772c8db"; + sha256 = "0dhk8ajn5b0y4qla4jak76zxqgiai9fcd1hpfh98pmsjy1jq5ll4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -18646,12 +19134,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20160724.1412"; + version = "20160804.637"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "7b80d66c9d4ba552dea6686b003d04d75a93c83d"; - sha256 = "1322gkz0zm5b1p39v3vakyf323l0rdd162h881gh9iv55gjfygav"; + rev = "4a202ae581978e467c726b6bab2344a48d225bf4"; + sha256 = "18p90q9xxsnnakk4zc1lylwri0qpqhavabjbrn8yb740brwi59dj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -18667,12 +19155,12 @@ evil-mc-extras = callPackage ({ cl-lib ? null, emacs, evil, evil-mc, evil-numbers, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc-extras"; - version = "20160723.2250"; + version = "20160731.1641"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc-extras"; - rev = "803529d0c99a52aee4ef3deb5c7bf31290d9e750"; - sha256 = "1cxqik2haj23nww6saqcaxxwx6bmf1p4dwrl998y4plzqnn1f2ak"; + rev = "22f9b4cdb66cd6dffc89a66ee3a70593946a7d16"; + sha256 = "0cbpx6ynang74g7w3hv43vp57nf00axfsprc9zyl6q10mpzdpkhn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd7c9aa0f4c17e7f27836e75a0b83c44a68ad744/recipes/evil-mc-extras"; @@ -18688,12 +19176,12 @@ evil-mu4e = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mu4e"; - version = "20160611.1158"; + version = "20160813.413"; src = fetchFromGitHub { owner = "JorisE"; repo = "evil-mu4e"; - rev = "5bd77b716d07881a0f78ea5808e10b218902b80b"; - sha256 = "0zcypvihhmczmmakxm0c34l410197avdx1svrh634iy0gnv3lkb6"; + rev = "3edf45cbf94bb304a1d99b00fe43e72b86b3ee94"; + sha256 = "1zd6dccsb7f8rsb6nw29a4kp37q4s5d63c73ppi268nn0jsa3f28"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332f3f9c6dc106e58345abbc2d8fd99056d518c0/recipes/evil-mu4e"; @@ -18919,12 +19407,12 @@ evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-snipe"; - version = "20160413.1049"; + version = "20160815.608"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "726cc907027cb5bde078b9915fedbf2b7ad1984d"; - sha256 = "15rhnrz2ppwyyhjj4y251654kvyw3yjzmkbslvszcp5y8a5m30pg"; + rev = "f48a215eabefcd1e1d76814e166d59bd0cdecc79"; + sha256 = "1hgdx1rvmfgcy9i2ihpibd1iahpvn2g8g7zyzj9dz4rm8cg1w6ry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; @@ -18965,8 +19453,8 @@ src = fetchFromGitHub { owner = "timcharper"; repo = "evil-surround"; - rev = "37a5f9e8d79a8990be695f7682a63a158530b697"; - sha256 = "1sl89qm3wgmsr1mld1nv18mz7fjc2wq11br6hkdf7qm733q68b7a"; + rev = "eda6b0d6ca856d66f32b2718887ff02ea5c94d16"; + sha256 = "0nqa5lqr2rplsinxh5nh1qkyl2b7lg64q6pxi2mn3rgvhdq7hrm9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da8b46729f3bd9aa74c4f0ee2a9dc60804aa661c/recipes/evil-surround"; @@ -18979,6 +19467,27 @@ license = lib.licenses.free; }; }) {}; + evil-swap-keys = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-swap-keys"; + version = "20160825.1024"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "evil-swap-keys"; + rev = "064c7388995803ccf9959e09fe8aaa95c53e001b"; + sha256 = "0nqj70yw0jalw8svkbh46240kr0bhs60yallrribxakiz5iqyb33"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys"; + sha256 = "12cx95mjm4ymggidvf41gh3a364z32h655jmhk417v0ga9jk9fv6"; + name = "evil-swap-keys"; + }; + packageRequires = [ emacs evil ]; + meta = { + homepage = "https://melpa.org/#/evil-swap-keys"; + license = lib.licenses.free; + }; + }) {}; evil-tabs = callPackage ({ elscreen, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-tabs"; @@ -19003,12 +19512,12 @@ evil-terminal-cursor-changer = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-terminal-cursor-changer"; - version = "20150827.1951"; + version = "20160806.2236"; src = fetchFromGitHub { owner = "7696122"; repo = "evil-terminal-cursor-changer"; - rev = "2735a11a2a0c8d327b730cefef2794834263c413"; - sha256 = "10aic2r1akk38hh761hr5vp9fjlh1m5nimag0nzdq5x9g9467cc8"; + rev = "918a741c2ad83f3aa3478863d01bf57422eb6009"; + sha256 = "0wdn2gp93r555p7pp9pw8ma2wfs2gzvb54ncrh3ad0p8v95x1kf5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/148d324afb1891b239dfad680ad7b87b4611316b/recipes/evil-terminal-cursor-changer"; @@ -19021,6 +19530,27 @@ license = lib.licenses.free; }; }) {}; + evil-text-object-python = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-text-object-python"; + version = "20160815.141"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "evil-text-object-python"; + rev = "3b3fb01e7ad7eeeeae1143695547fe75148cc44f"; + sha256 = "1alin2rmx1xa1w3b1nb76bplmg10il55jxxm6jj7qs6z1izzllci"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d0893b07bc4a057561a1c1a85b7520c50f31e12/recipes/evil-text-object-python"; + sha256 = "0jdzs1yn8nrxq890427yjrxdvnzj8jy7bs3jj4w4c0fik26ngqhm"; + name = "evil-text-object-python"; + }; + packageRequires = [ emacs evil ]; + meta = { + homepage = "https://melpa.org/#/evil-text-object-python"; + license = lib.licenses.free; + }; + }) {}; evil-textobj-anyblock = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-textobj-anyblock"; @@ -19126,6 +19656,27 @@ license = lib.licenses.free; }; }) {}; + evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-visual-replace"; + version = "20160731.508"; + src = fetchFromGitHub { + owner = "troyp"; + repo = "evil-visual-replace"; + rev = "867d1175f84cb49f31e6b74b005ce1acb4e597ee"; + sha256 = "01j9dz6b187h154aj2p2201qa6mgv2960wa2fx8i349sna1akr04"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/165aea6697a6041bb83303f3ec8068a537accd4a/recipes/evil-visual-replace"; + sha256 = "1pw2s228q78cbjpd6yx5jca3xhj8lwrb8kj86i6afn4l1m88azzv"; + name = "evil-visual-replace"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://melpa.org/#/evil-visual-replace"; + license = lib.licenses.free; + }; + }) {}; evil-visualstar = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-visualstar"; @@ -19213,12 +19764,12 @@ exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exec-path-from-shell"; - version = "20160112.2246"; + version = "20160812.159"; src = fetchFromGitHub { owner = "purcell"; repo = "exec-path-from-shell"; - rev = "c2ca275d3243e8253513ced73e3ac21dc352e303"; - sha256 = "0xxk0cr28g7vw8cwsnwrdrc8xqr50g6m9h0v43mx2iws9pn9dd47"; + rev = "9700a076a932d4c8bc92d9e12f21978232056373"; + sha256 = "11w0wn2q7c80h8czkbipp5j5vgj47jx0azfqk6xpw66dh4205zp3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d8545191031bece15cf1706d81ad1d064f2a4bd/recipes/exec-path-from-shell"; @@ -19255,12 +19806,12 @@ expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "expand-region"; - version = "20150902.558"; + version = "20160729.131"; src = fetchFromGitHub { owner = "magnars"; repo = "expand-region.el"; - rev = "59f67115263676de5345581216640019975c4fda"; - sha256 = "0qqqv0pp25xg1zh72i6fsb7l9vi14nd96rx0qdj1f3pdwfidqms1"; + rev = "cfef9aab6a3e826124ac53409b5c7bd6defa3b2d"; + sha256 = "0bfszrc6r2i6ggf5wplzppfyym50s2rn0h3ankjy26xrnnx0is8f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/expand-region"; @@ -19442,12 +19993,12 @@ f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "f"; - version = "20160426.527"; + version = "20160815.1253"; src = fetchFromGitHub { owner = "rejeep"; repo = "f.el"; - rev = "de85171132fc0d3bdb8ca9264845b478e28c7b81"; - sha256 = "0v6y897ibs589gry7xrs1vj14h9qd6riach6r27xf7386ji5hb6s"; + rev = "4f8d3112f03e99506bab3c910fa3a29f0b8eb86b"; + sha256 = "0gf4vh7h4sjmp74kfiwxngjpx44m88mksridfil7piapbg23z9xm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22ddcf536af597b688d8edb70b3636ed6c265bf5/recipes/f"; @@ -19853,12 +20404,12 @@ feature-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "feature-mode"; - version = "20141121.1030"; + version = "20160805.2015"; src = fetchFromGitHub { owner = "michaelklishin"; repo = "cucumber.el"; - rev = "84562dd5cb2d86216cf548be47defb094de04960"; - sha256 = "0ylm4zcf82f5rl4lps5p6p8dc3i5p2v7w93caadgzv5qbl400h5d"; + rev = "f0aaa806b52eec7ee8fe97883274ed49c28e8eb8"; + sha256 = "0ms1hmwc78vix91396ia317prw54vqjx8qv2qrcccwa8bphc0py5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a70991695f9ff305f12cfa45e0a597f4a782ba3/recipes/feature-mode"; @@ -20094,12 +20645,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20160719.2048"; + version = "20160809.526"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "b69411d15902d9d1cbb0184885f726270de0b98c"; - sha256 = "1jlggfk9qx6gi8ifzvjn9hpbqgs8dc7hmss8aflnzf3gn4202svp"; + rev = "a32ab79cfef0e1c5c8d9055fb99d9cad005815de"; + sha256 = "0gdsribyrvapinjkpm773rdn6sbrr9gsydpss5jw4p9a16nkl8a5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -20214,12 +20765,12 @@ fingers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fingers"; - version = "20150809.1716"; + version = "20160817.129"; src = fetchFromGitHub { owner = "fgeller"; repo = "fingers.el"; - rev = "8fc8ae143736c4761fef69cb53c6083c5be5d914"; - sha256 = "1vjgcxyzv2p74igr3y0z6hk7bj6yqwjawx90xvvmp9z7m91d4yrg"; + rev = "fed0f742afb1d72eaef29d8da394467550a030fa"; + sha256 = "1mx05zfdrkwb50l7f0iycsqw23b1gxzacfnssclb42xdjxxmyhdj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2afd4983d1a5820daafb31e96d54b214a79849f/recipes/fingers"; @@ -20319,12 +20870,12 @@ fireplace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fireplace"; - version = "20160101.1047"; + version = "20160811.519"; src = fetchFromGitHub { owner = "johanvts"; repo = "emacs-fireplace"; - rev = "71976303d7826e184157826265c7ec45d3075cfc"; - sha256 = "1smg4mqc5qdwzk5mp2hfm6l4s7k408x46xfl7fl45csb18islmrp"; + rev = "2b966ed65b714c613f79e9144d004dfa3b28f1ed"; + sha256 = "1f5053bbvjdmm64zv6r2qkswkpwvx0s3qz4bwm9zya583a6g0nv8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c1ac52c1cfe7ccf46092c2d299ebbffdc1b7609/recipes/fireplace"; @@ -20418,6 +20969,27 @@ license = lib.licenses.free; }; }) {}; + fix-muscle-memory = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fix-muscle-memory"; + version = "20160822.2139"; + src = fetchFromGitHub { + owner = "jonnay"; + repo = "fix-muscle-memory"; + rev = "df687aea23c6eac4b751f993893c2fd56e5a8a3b"; + sha256 = "02nl4vz6fnbjc7w1lk1y9z0qw5bsxr407ww0b2wqw6h8spmcpcrc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b0501714a6d82657b88d11e3f79d75eea17d8e/recipes/fix-muscle-memory"; + sha256 = "0qhasnjw0bj5hzw27r8vj6shhwc3zxcp3wmxijh1rpdw4773f7n8"; + name = "fix-muscle-memory"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/fix-muscle-memory"; + license = lib.licenses.free; + }; + }) {}; fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fix-word"; @@ -20616,12 +21188,12 @@ flim = callPackage ({ apel, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flim"; - version = "20160311.1537"; + version = "20160816.243"; src = fetchFromGitHub { owner = "wanderlust"; repo = "flim"; - rev = "96fb2de481f5fa543f730f370042e94bc7152e13"; - sha256 = "10sayqyf5jwmz7h9gpp4657v6v8vmcd8ahzbshwwqbakjqwnn08c"; + rev = "c946b83addd10ea700f2173b8d63386ef37b481a"; + sha256 = "0lrh7h30q5wvqzix8d7w4x5jacmnk8fscrpdfl637fi27gy6cwgf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94faf56ff9bf94f51ef5253e4c4244faec5eecfd/recipes/flim"; @@ -20634,6 +21206,27 @@ license = lib.licenses.free; }; }) {}; + flimenu = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "flimenu"; + version = "20160821.1330"; + src = fetchFromGitHub { + owner = "IvanMalison"; + repo = "flimenu"; + rev = "66a063612daad59ef8035aeacc1a1ed244ba22d0"; + sha256 = "0krs5qjkis01qh21xvxqxd1jn6yw9276si36hacgwv0q92mk8x0b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0ffc67a266de3d58553b27325b7fc6937df425be/recipes/flimenu"; + sha256 = "1xr28kprkq9xwy2f7b3wnjr25a8avm2lfcyi8853jygkm2vmnsx1"; + name = "flimenu"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/flimenu"; + license = lib.licenses.free; + }; + }) {}; fliptext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "fliptext"; version = "20131113.1818"; @@ -20655,12 +21248,12 @@ floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }: melpaBuild { pname = "floobits"; - version = "20160621.1322"; + version = "20160804.1135"; src = fetchFromGitHub { owner = "Floobits"; repo = "floobits-emacs"; - rev = "6fea6eb2a1841d163acdeb5d9d59e51a5d7f61c4"; - sha256 = "1n6x8n3fzxfwgpkvvnbxv6w3b08zzmx95pwv9yhqxl5b4pwyl31i"; + rev = "da342a7389f2490cd51a057aff1b9272e023771f"; + sha256 = "04nciqgyjkg8ky8y60mcbdxmad6ygqr7q992azc7jh6iq0wyidfm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95c859e8440049579630b4c2bcc31e7eaa13b1f1/recipes/floobits"; @@ -20739,12 +21332,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20160726.134"; + version = "20160831.204"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "c31379661e30b4aa398cc53ad092d477edc2665e"; - sha256 = "1qh6r2iiqvfay8f9shxd35c3x5jf9j34ri22m7ghajf0q4gkfaj4"; + rev = "7b4f5440fc35bf23162714a753a1118a65be5d91"; + sha256 = "0aphb03m9hx8qrdq1n3k75rf7iw99i4c8zn63h8681mhg0f9waz8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -20823,12 +21416,12 @@ flycheck-cask = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-cask"; - version = "20150920.453"; + version = "20160815.1200"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-cask"; - rev = "f2cebedacaa96ef30262fbb67068d1df489ff238"; - sha256 = "0klnhq0zfn5zbkwl7y9kja7x49n1w6r1qbphk7a7v9svgm3h9s7n"; + rev = "13eaae7e8ac14412433ab9eafc651a63bbd1c427"; + sha256 = "1d486bgkn4mmffy4h61q9cphqfjrvcdsm54gmp28h1bvbnk3krjw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/43224eef52bb316102fea524ba87b0e9e43dc6e6/recipes/flycheck-cask"; @@ -21117,12 +21710,12 @@ flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-flow"; - version = "20160627.58"; + version = "20160826.110"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-flow"; - rev = "9d0787c0ea6b17362c8255a3c8859ca76efd2242"; - sha256 = "1j7dbjkhnswsifnv27qnfms5kgkb5mak0r02wj8vqfsvpg4fpcm2"; + rev = "95a9b41c7c1c8515cbf8680ce5456b2b8af23268"; + sha256 = "1p4yzjnn790c168pf6341bwfa84nj4a47qz8fwrr9p4jsszb4i7n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow"; @@ -21282,6 +21875,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-liquidhs = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-liquidhs"; + version = "20150618.1922"; + src = fetchFromGitHub { + owner = "ucsd-progsys"; + repo = "flycheck-liquidhs.el"; + rev = "ee0d3bd0d5e07a872e541d02c112f1cc204db922"; + sha256 = "1wwn9dnzn4vrh747dgbcm944bp3z02gzxd32afjc9k2dsn32qvz2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d5921fde4068ff1bb288f6f9e2fe03f4a7fdbbda/recipes/flycheck-liquidhs"; + sha256 = "07dn2ifj49z2jj9zw0f0ydp5rxx9wfmah4fh4vx8slnpjby367yh"; + name = "flycheck-liquidhs"; + }; + packageRequires = [ flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-liquidhs"; + license = lib.licenses.free; + }; + }) {}; flycheck-mercury = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }: melpaBuild { pname = "flycheck-mercury"; @@ -21306,12 +21920,12 @@ flycheck-mix = callPackage ({ elixir-mode, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-mix"; - version = "20160606.1329"; + version = "20160803.140"; src = fetchFromGitHub { owner = "tomekowal"; repo = "flycheck-mix"; - rev = "c565ebb12a48fcd49cc65656d79295c3288fcb84"; - sha256 = "1yncail979sfljmib7b1m9aw376xd4b76apz4d50hj83lrfy169c"; + rev = "c4e018c5a24e45c0ddc678547e73d5448dbde18b"; + sha256 = "0yz053xzs2vq0d2cxmizwsqx8l3mf4g6afg11qb297m3b081s6a7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd2a4d71b7f4c0082b687a23fd367d55186625a9/recipes/flycheck-mix"; @@ -21558,12 +22172,12 @@ flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-rust"; - version = "20160614.1130"; + version = "20160816.236"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-rust"; - rev = "cbcdf416d8e0aab8c6208cbb758c30a6d6063f9f"; - sha256 = "1d8q99inzwf2vdzvyv19kps1hfscygmxhgink5hp5zpxc4hbpx09"; + rev = "2a0fb6bb82785fc717b0acc7427e801b08a13017"; + sha256 = "0dyjamgmgdj0sw9l7ay9s4akba95n0apnza4l5qcbkmz28qw6gz5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust"; @@ -21597,22 +22211,22 @@ license = lib.licenses.free; }; }) {}; - flycheck-status-emoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: + flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "flycheck-status-emoji"; - version = "20160207.1451"; + version = "20160813.2038"; src = fetchFromGitHub { owner = "liblit"; repo = "flycheck-status-emoji"; - rev = "695bc8fdc8309a062b69f8a91434d99d0470cc99"; - sha256 = "0v7d0yijqn3mhgjwqiv1rsdhw2ay6ffbn8i45x0dlp960v7k2k8f"; + rev = "bfe40fec4695b6914d1ef36331dbd3eda384c92d"; + sha256 = "06p38yqkdrb4ksm30yd7wj3i6vqkhgmys94dm33anslh8dz00flw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji"; sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p"; name = "flycheck-status-emoji"; }; - packageRequires = [ emacs flycheck let-alist ]; + packageRequires = [ cl-lib emacs flycheck let-alist ]; meta = { homepage = "https://melpa.org/#/flycheck-status-emoji"; license = lib.licenses.free; @@ -21642,12 +22256,12 @@ flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: melpaBuild { pname = "flycheck-ycmd"; - version = "20160320.424"; + version = "20160808.754"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "5342f1def925e59477880c1bf5c10778c50678fe"; - sha256 = "1nn312z7bfjya570gbs7gcwf9zh3b7jhwg52gfp7digdwqrary42"; + rev = "200a6d2536cf4932b36a89a753eb9c6a12888f54"; + sha256 = "0avvsnizx8l0gyvzy8qkg0177agckxylldqk0vm45pqzzmbsvr02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; @@ -21723,19 +22337,22 @@ license = lib.licenses.free; }; }) {}; - flymake-cursor = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + flymake-cursor = callPackage ({ fetchFromGitHub, fetchurl, flymake ? null, lib, melpaBuild }: + melpaBuild { pname = "flymake-cursor"; - version = "20130822.332"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/flymake-cursor.el"; - sha256 = "10cpzrd588ya52blghxss5zkn6x8hc7bx1h0qbcdlybbmkjgpkxr"; + version = "20120322.1057"; + src = fetchFromGitHub { + owner = "flymake"; + repo = "emacs-flymake-cursor"; + rev = "ecc539082c3fc9e91bba33d72c26989217411593"; + sha256 = "0cdf5m3rfwsim505qjyyml0r5zzqx7jrlc8ayfvix70f3bmxnibs"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/flymake-cursor"; - sha256 = "1s065w0z3sfv3d348w4zhlw96xf3j28bcz14sl46963mj2dm90lr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a02597edee67c84bef259d7fc5c5b61bd39a5b86/recipes/flymake-cursor"; + sha256 = "0v5abg3h9kmybr0cyr7hqy4rn88h84snzxbsmqcbjw24s10v9p0s"; name = "flymake-cursor"; }; - packageRequires = []; + packageRequires = [ flymake ]; meta = { homepage = "https://melpa.org/#/flymake-cursor"; license = lib.licenses.free; @@ -22311,16 +22928,16 @@ flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct"; - version = "20160713.2316"; + version = "20160731.329"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "03dcc4abfe4658d1bfe4ffa7e3ca200e285728ac"; - sha256 = "13qg3wh0p61j1qfxr62q9b3qka3qvdfl1n7vfwaa1xfj144ng7s8"; + rev = "e9a80346ff306e8512930596069257a59393ecee"; + sha256 = "0gryvd3c6k1kjk1aqrhdkz1va4515sf4ljc82m8c72clln3378zz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct"; - sha256 = "0j7fp2r1463517716d070wmgwxyj8p59b4ybqh106lmpc5w1i9nj"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct"; + sha256 = "0d2205h234na9s942s83yvkq89l9w9jnl5yfrxkkdiq8pw0dvymd"; name = "flyspell-correct"; }; packageRequires = []; @@ -22332,12 +22949,12 @@ flyspell-correct-helm = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, helm, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct-helm"; - version = "20160610.851"; + version = "20160730.201"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "03dcc4abfe4658d1bfe4ffa7e3ca200e285728ac"; - sha256 = "13qg3wh0p61j1qfxr62q9b3qka3qvdfl1n7vfwaa1xfj144ng7s8"; + rev = "e9a80346ff306e8512930596069257a59393ecee"; + sha256 = "0gryvd3c6k1kjk1aqrhdkz1va4515sf4ljc82m8c72clln3378zz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm"; @@ -22353,12 +22970,12 @@ flyspell-correct-ivy = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, ivy, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct-ivy"; - version = "20160610.851"; + version = "20160730.201"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "03dcc4abfe4658d1bfe4ffa7e3ca200e285728ac"; - sha256 = "13qg3wh0p61j1qfxr62q9b3qka3qvdfl1n7vfwaa1xfj144ng7s8"; + rev = "e9a80346ff306e8512930596069257a59393ecee"; + sha256 = "0gryvd3c6k1kjk1aqrhdkz1va4515sf4ljc82m8c72clln3378zz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy"; @@ -22374,12 +22991,12 @@ flyspell-correct-popup = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, lib, melpaBuild, popup }: melpaBuild { pname = "flyspell-correct-popup"; - version = "20160610.851"; + version = "20160730.201"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "03dcc4abfe4658d1bfe4ffa7e3ca200e285728ac"; - sha256 = "13qg3wh0p61j1qfxr62q9b3qka3qvdfl1n7vfwaa1xfj144ng7s8"; + rev = "e9a80346ff306e8512930596069257a59393ecee"; + sha256 = "0gryvd3c6k1kjk1aqrhdkz1va4515sf4ljc82m8c72clln3378zz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup"; @@ -22875,12 +23492,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "20160720.2346"; + version = "20160830.1804"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "0707b4753fabdc07cbe04030b1559671d87c57f2"; - sha256 = "0r5zrcn0am7d2085v4f1s9a6xl8d0z3ckyy2sy9qmp8csz3s36md"; + rev = "c7c445c49ac619fe3fb2f0c6bd2bd83b9c9ed7a3"; + sha256 = "16linxh50d3gkcl7mhjl3b3gz0n5wlbs0b3vnbi3sqfzk0isffwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -22893,6 +23510,27 @@ license = lib.licenses.free; }; }) {}; + fraktur-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fraktur-mode"; + version = "20160814.1927"; + src = fetchFromGitHub { + owner = "grettke"; + repo = "fraktur-mode"; + rev = "514baf5546aed12a0d9fa0fe66e87cdcc7843b08"; + sha256 = "169d9j7jk3li96fkn2sr257835flkcpml24l4bmzp8j3q57a7wxw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/42acad345b25ee60fba6bd90e503f5437c6241f5/recipes/fraktur-mode"; + sha256 = "05d7xff4vjy1qzw923xsd0kdm1q2cibgxxc4g83mr0hiwlcx91fl"; + name = "fraktur-mode"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/fraktur-mode"; + license = lib.licenses.free; + }; + }) {}; frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }: melpaBuild { pname = "frame-cmds"; @@ -23110,8 +23748,8 @@ src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "096eb96f0873dc5f9c95e32f563c7d0ef2a2c426"; - sha256 = "0iwyys01d4sp1r62rfpwhnv7h3k6gyk7zp8qikfbnicxz5lxaf86"; + rev = "843fde937786d3f5ea1c54632379b31beed46e24"; + sha256 = "081a208jccs2602c3aqpwzkkf9zfgvp1mb8f9hb63bywyqkv24w5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode"; @@ -23189,12 +23827,12 @@ function-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "function-args"; - version = "20160628.658"; + version = "20160731.320"; src = fetchFromGitHub { owner = "abo-abo"; repo = "function-args"; - rev = "8bd0b2b8c2bad6b5c5b1828a841d8255437c7920"; - sha256 = "06j1hmd29wksmf4ggdmpz0xfjvvbw2blapwfjsccrs875czz3h90"; + rev = "12930e157f70b89f344f3314cca8f9f5c6820bad"; + sha256 = "1hz40k4pwgjdhddx0cvh8c04gmhgihx9lmynp353m00h58x37gm9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args"; @@ -23475,12 +24113,12 @@ geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geben"; - version = "20160725.634"; + version = "20160817.1834"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben"; - rev = "90e00f87125bd09b20f7f9bc285e9895f7094f1b"; - sha256 = "1ycn1khpf44bmrv2ka0vvsybcfsa43vbq8g5r58qflfsmyr42mwz"; + rev = "7a125456d3aa97c9217520da6893421804559884"; + sha256 = "1k4lrj261p2kafqbkvw7ghnqvm9xkfkvff5cx9m244ay14g6n7ny"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; @@ -23538,12 +24176,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20160617.954"; + version = "20160829.1350"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "208056444fe8a16947f0f641a3a72459fdf24eef"; - sha256 = "0g4r1anxkmihzkkbc1ss3rlqzqiwgqz8zl966zfikzhk79d6v7im"; + rev = "25fdd8dcda3fabcfffe983b7cadb3196dbca801b"; + sha256 = "0yz5q0ya1612kfn22xmwxx9yq32dqznilrdvavm7glgh6765wznd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -23580,12 +24218,12 @@ general-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general-close"; - version = "20160721.1208"; + version = "20160830.435"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "general-close"; - rev = "a8c14815e828d5efb110a1b49dea646c5ceeccf5"; - sha256 = "17c27vc52rd69sxwlc35ap2mphp13mb3wg096pvn8rwijdyiph2a"; + rev = "ef9ed23ea1cf11267f7178b70489aa604e6888d0"; + sha256 = "02zikvi8fzw7j06ab5kv17fdjz37rljzdf7lmh8iby3vb3zc81vb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641a48f5148df2a19476c9b3302934a604f5c283/recipes/general-close"; @@ -23706,12 +24344,12 @@ gh = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, logito, marshal, melpaBuild, pcache, s }: melpaBuild { pname = "gh"; - version = "20160725.1853"; + version = "20160728.1525"; src = fetchFromGitHub { owner = "sigma"; repo = "gh.el"; - rev = "5ceeaa23ee14e31715c780e784afd0e3e5672790"; - sha256 = "049fpnz5jz0ajxzlwqdwh3xcwj51c3saj114wl9dxvi890spzrm4"; + rev = "87cd3e9dcdefeb1a6d781a3fad78eaeb6ef2ac7f"; + sha256 = "13wch5vp837nvw2ilcv40j3q9j6dx0j0a3q74g23vy3sn42r8znc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/gh"; @@ -23748,12 +24386,12 @@ ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "ghc"; - version = "20160710.1443"; + version = "20160808.813"; src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "c0732ad9cb546d7811f18d8df8fe917d32c9f951"; - sha256 = "16lf72bmdk9wgai67rn5ca6ncszx6p6pnzbrn2k7yd2b3q7kilhi"; + rev = "8be4cdfe5f051f29a2488baae8a106a914d83ba8"; + sha256 = "10f5492r6pb203669zgpy49csz2jfmjxp53pnyk2rwyzfy0ci3v6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -23853,12 +24491,12 @@ ghq = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ghq"; - version = "20151130.118"; + version = "20160803.857"; src = fetchFromGitHub { owner = "rcoedo"; repo = "emacs-ghq"; - rev = "bfbf9245075f710ffc7dc2c6bf584dd2ca7bde24"; - sha256 = "1aj5j0y244r1fbbbl0lzb53wnyhljw91kb4n3hi2gagm7zwp8jcf"; + rev = "aae4b8cb22fd6c24d2c9e3962c7e8e9dac6d9825"; + sha256 = "0rh2k93c3a0vl073a3s3a3h6gkw454v1lyd7y8l3pd24vw9hc628"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9daa3b0039f6b296b8176523cffbbe27506bb02/recipes/ghq"; @@ -23871,6 +24509,27 @@ license = lib.licenses.free; }; }) {}; + ghub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ghub"; + version = "20160808.538"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "ghub"; + rev = "f9535e53fe6c5ffb18986ebf51e8529b9ec0da63"; + sha256 = "17cn3xl40kp2mx3w89w0cds47jrvx76ms2js3a9nr4bb0cgyw1yv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub"; + sha256 = "01kzziqv5y798rps52w45kkdcn0shhb6mrina2iawab4rlvlmnd8"; + name = "ghub"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ghub"; + license = lib.licenses.free; + }; + }) {}; gildas-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }: melpaBuild { pname = "gildas-mode"; @@ -23983,8 +24642,8 @@ src = fetchFromGitHub { owner = "tsgates"; repo = "git-emacs"; - rev = "5c7e8c546c7e99a2424d484b253c1581bfd7ff7d"; - sha256 = "0g839pzmipjlv32r0gh166jn3na5d0wh2w1sia2k4yx1w0ch1bsx"; + rev = "cfd3afe42b7d314c0cd1fc280dc35c69fc133869"; + sha256 = "125lh4gkxa0i66kvr0a6mrnc33knpqafjm3vg3278wy69pqrrznb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/git-blame"; @@ -24021,12 +24680,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20160519.950"; + version = "20160821.1338"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "5834d0dbd471af0ce6537b4fc020fac05701267b"; - sha256 = "0nmpkh9nw3zzaw6ya6inr9zljdx5qjkkivmh2dlyird6sppdsqxy"; + rev = "ec81268eb1c08c164ce363acca777e0fd96cc2dc"; + sha256 = "08633gmcg63k62qrk1cs96hclvs9q2r6777kcb76xfa63xal9rfs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -24084,12 +24743,12 @@ git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-gutter"; - version = "20160702.354"; + version = "20160828.711"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-git-gutter"; - rev = "46785711d9be4ea718bcf738e49e6b6bea805342"; - sha256 = "084l0p6pny7s6p1z9i4w9zfr7f6lfwgs4vlfyd58rws4dvzzwx6x"; + rev = "aa9420614ca814b2c63a2a47661901b389e10357"; + sha256 = "1f71jcfh9wgfpapdaizc333kmpdg131dlchrbrwd1ymjb7kxp61j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter"; @@ -24189,12 +24848,12 @@ git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-link"; - version = "20160401.1850"; + version = "20160813.1502"; src = fetchFromGitHub { owner = "sshaw"; repo = "git-link"; - rev = "3cb4ced58c48d372230efd10ee4a7f55f54945ea"; - sha256 = "0a1kxdz05ly9wbzyxcb79xlmy11q38xplf5s8w8klmyajdn43g1j"; + rev = "b9e197419b1d71c7190c2e7cb14b89d9e6759ab2"; + sha256 = "0f10qqmjaxy29qw86a85kjshyj8wc5dldymm8i89l3hb9s9iv260"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link"; @@ -24210,12 +24869,12 @@ git-messenger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "git-messenger"; - version = "20160602.710"; + version = "20160815.1952"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-git-messenger"; - rev = "e53e1f1c3d8a8de0f0d1deb9a07f340e4bb13021"; - sha256 = "05wm9hl1fi2dav6hx02j59vnljn5awbk3i32xvv8qlpkhv6fk4ld"; + rev = "9412a975f4723e9bc9c9feb4ec064b2e8c0c659d"; + sha256 = "1hh99ippc1bpqpnchvhbh7yzcsjx9v7bbpy5r9hx82kx0xqih0sc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e791293133f30e5d96c4b29e972f9016c06c476d/recipes/git-messenger"; @@ -24441,12 +25100,12 @@ github-search = callPackage ({ fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }: melpaBuild { pname = "github-search"; - version = "20160706.1903"; + version = "20160822.1328"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "github-search"; - rev = "d26fa59988211a17e612c8bd8223f067ee19fdc5"; - sha256 = "0cz2g40l88d5m5hcb14mq2qy66sk37xj9j7c6baqzzv1l62vn26g"; + rev = "1a5c1f8291f4d41e57367a8522699cb08eea8fc4"; + sha256 = "1382hda3hgpx3c3d1kjzz8hs4l5hi3s7c485hsgihhr6xdd5wrgm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/733a808400858513137e0e3d7d38b5b25e8ddc5a/recipes/github-search"; @@ -24543,6 +25202,27 @@ license = lib.licenses.free; }; }) {}; + glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "glab"; + version = "20160808.539"; + src = fetchFromGitLab { + owner = "tarsius"; + repo = "glab"; + rev = "cbba9c2bc55146015d75b8483237b501f761eb06"; + sha256 = "0wrkhinh5bgrhaw6d8v8p2sv2s7d5mp407qg4hipsl21vw8c836q"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/glab"; + sha256 = "0z34kzly39mdqsyqpi3n5m3189g0d7lsvk2ksmh46zdziak715di"; + name = "glab"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/glab"; + license = lib.licenses.free; + }; + }) {}; glsl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "glsl-mode"; @@ -24693,12 +25373,12 @@ gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnu-apl-mode"; - version = "20160621.2108"; + version = "20160805.36"; src = fetchFromGitHub { owner = "lokedhs"; repo = "gnu-apl-mode"; - rev = "1f454fa685c1868a47d6f56eefae90237f0fc3cd"; - sha256 = "0qskd7aak3z1by8rhq651ss4n3gaqp7nx911hk889cz86p1f8gnm"; + rev = "ba0d4d4815361e0af67d956d00880cad10553239"; + sha256 = "19jkryr60acls0bbhw3223xdjj37bi1ky8glw7zwhapbln52bgqr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode"; @@ -24883,8 +25563,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "3e1f8b46c1200ebec1336008838c6140586d059e"; - sha256 = "1c51ym21m2mrs8zhj7nzbbc7cckqj63jf1xx2a6x6zjh0g5bq8zj"; + rev = "57b3fab1de11102eee896051605108949fbe75da"; + sha256 = "19829cfyl181kjqp5mn71f0symypfp1f2g5hi8a6949ya9n3l6rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -25029,8 +25709,8 @@ version = "20160715.854"; src = fetchgit { url = "https://go.googlesource.com/tools"; - rev = "053ddb97bfa3b2e3021b6eb07f873233a62b2abb"; - sha256 = "103x3qfv4djcxn9nwzic9d5bx0cildjcpsl633xkara1khxjjmfi"; + rev = "9deed8c6c1c89e0b6d68d727f215de8e851d1064"; + sha256 = "10pj8yilyk8mgflmql09qfqbp7lyfqdpf9y9v099bz70vyw7is24"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/816a2511c54e451313c7ac9433d0860f95e68da6/recipes/go-guru"; @@ -25130,12 +25810,12 @@ go-projectile = callPackage ({ fetchFromGitHub, fetchurl, go-eldoc, go-guru, go-mode, go-rename, lib, melpaBuild, projectile }: melpaBuild { pname = "go-projectile"; - version = "20160418.1617"; + version = "20160825.1644"; src = fetchFromGitHub { owner = "dougm"; repo = "go-projectile"; - rev = "0c36c5abd1510a2b35bab2b8b36fcd4a26a8d05c"; - sha256 = "0010dgkk521pn4cwir5lvkxxzfzzw2nyz1cr5zx1h1ahxvhrzsqm"; + rev = "6b721aba171fd4aaef890369b11972eee1dfc8ce"; + sha256 = "0hkkl70ihmnc93wli2ryxr4il1fis85mjkvs520ac8w3g84g19rv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3559a179be2a5cda71ee0a5a18bead4b3a1a8138/recipes/go-projectile"; @@ -25154,8 +25834,8 @@ version = "20160307.744"; src = fetchgit { url = "https://go.googlesource.com/tools"; - rev = "053ddb97bfa3b2e3021b6eb07f873233a62b2abb"; - sha256 = "103x3qfv4djcxn9nwzic9d5bx0cildjcpsl633xkara1khxjjmfi"; + rev = "9deed8c6c1c89e0b6d68d727f215de8e851d1064"; + sha256 = "10pj8yilyk8mgflmql09qfqbp7lyfqdpf9y9v099bz70vyw7is24"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/421911dd75eec0f857295b76d310b8282053b57f/recipes/go-rename"; @@ -25465,12 +26145,12 @@ google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-translate"; - version = "20160513.1525"; + version = "20160824.1707"; src = fetchFromGitHub { owner = "atykhonov"; repo = "google-translate"; - rev = "50d3b9e00c3b7d2e66970b63cc7379b5fa4afb19"; - sha256 = "1098cmcd8ihvk67l5y5h6w4yfii5cg79yakjjyjh24zwpj5l0gaf"; + rev = "7e156e840d597f413ef3debd7629adf8de63da5d"; + sha256 = "1yf7z7mwn4qq9q1phiap565nvs8yrw7p1y8i7wwi2xbi91mjc232"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate"; @@ -25486,12 +26166,12 @@ goose-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "goose-theme"; - version = "20160331.2233"; + version = "20160828.545"; src = fetchFromGitHub { owner = "thwg"; repo = "goose-theme"; - rev = "7112c459fc1a6aea9b0ab47a0ac774a8892ccaed"; - sha256 = "1ms5f6imzw5klxi1mqqjxgb02iflvpam8cfxii3ljcr4fz093m4h"; + rev = "acd017b50ab25a75fd1331eb3de66467e2042e9c"; + sha256 = "1mmdvjsgnwgs6akhyj96fgj30mz53djdq85dl5q4cmiznlbma7hy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fa2ce32adbccdbc3f1b642585b430202e7ae274/recipes/goose-theme"; @@ -25570,12 +26250,12 @@ gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gotham-theme"; - version = "20160517.555"; + version = "20160823.106"; src = fetchFromGitHub { owner = "wasamasa"; repo = "gotham-theme"; - rev = "f04f2d500bcaa328f260b460b6a349f9a599e86b"; - sha256 = "1ch1acw23y37igy48wlb97q1l2dyjl1a0vazwwakwlmlcfg15l6d"; + rev = "d45287581d3844dbc7218cff646de16f685edbea"; + sha256 = "13lgj7hy9g98797lcw1a82fww7fglgxwlzbza07hs9vp48y8mwcj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme"; @@ -25651,12 +26331,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20160201.946"; + version = "20160808.1810"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "3de168d71c170aa71193183da59356da57f97c6d"; - sha256 = "0g5ps9j76d9ggvnsx9qv0vayq35pjnzq12nsq5qj38vkd292p9fn"; + rev = "f229d31ab41239c2caad72a3bb4a5ed3ee8fc214"; + sha256 = "17psrhl6l6hhb0sphlncsibmay7n2pl44b9vyx8nk6vqhkxwp5pg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -25819,12 +26499,12 @@ grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grandshell-theme"; - version = "20150404.501"; + version = "20160824.2356"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "grandshell-theme"; - rev = "2ca20ace2fc9757ebf4e0acf8b08dfd819163667"; - sha256 = "0803j6r447br0nszzcy6pc65l53j871icyr91dd7x10xi7ygw0lj"; + rev = "98e03515357528588fc6478e042d27810de0b9a0"; + sha256 = "1r69indg4mr0b216350cgdxz29d124b3rp0i1b3qw844hqqc4lhj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme"; @@ -26077,12 +26757,12 @@ grizzl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grizzl"; - version = "20160130.2351"; + version = "20160818.37"; src = fetchFromGitHub { owner = "grizzl"; repo = "grizzl"; - rev = "b0996a9e2e5f6a9c4327ba7665ab29b633e404eb"; - sha256 = "1d2kwiq3zy8wdg5zig0q9rrdcs4xdv6zsgvgc21b3kv83daq1dsq"; + rev = "d554d93afa8519ee3a41340ec8aa6b4555065446"; + sha256 = "0ks47pb71ywfxv3jsx8kwb7mgl1xj4fxny3764hfdsgwv1aw0r4c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/grizzl"; @@ -26305,6 +26985,27 @@ license = lib.licenses.free; }; }) {}; + habitica = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "habitica"; + version = "20160828.912"; + src = fetchFromGitHub { + owner = "abrochard"; + repo = "emacs-habitica"; + rev = "eddd0ad1664b305e2b8c05daba3fd37971ee8d24"; + sha256 = "1xwzdlbn19aq66v2b1i5kl6jk9zs6dk07ryy14yws26d1ajvm8rg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica"; + sha256 = "0g7rb8ip5d6xvlsfk8cvf81hgzlq5p4kw9pkisjq9ri8mvkfmxf3"; + name = "habitica"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/habitica"; + license = lib.licenses.free; + }; + }) {}; hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "hackernews"; @@ -26389,6 +27090,27 @@ license = lib.licenses.free; }; }) {}; + hamburger-menu = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hamburger-menu"; + version = "20160825.1331"; + src = fetchFromGitLab { + owner = "iain"; + repo = "hamburger-menu-mode"; + rev = "3568159c693c30bed7f61580e4f3b6241253ad4e"; + sha256 = "1nykpp8afa0c0wiax1qn8wf5hfjaixk5kn4yhcw40z00pb8i2z5f"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e8017730403cc0e613e3939017f85074753c3778/recipes/hamburger-menu"; + sha256 = "0ws9729i51arjqwpiywcpb7y3c5sm3c9wrq8q0k0m9hpq8h11wdb"; + name = "hamburger-menu"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/hamburger-menu"; + license = lib.licenses.free; + }; + }) {}; haml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "haml-mode"; @@ -26539,12 +27261,12 @@ harvest = callPackage ({ fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, s, swiper }: melpaBuild { pname = "harvest"; - version = "20160405.943"; + version = "20160811.1810"; src = fetchFromGitHub { owner = "kostajh"; repo = "harvest.el"; - rev = "aff6330812ba7f4572b546690893b7f4ff2551bd"; - sha256 = "0vachg3zqnm47x4gpdy4lb453pkmi7gjps4vpw5mx6c96il3c1xp"; + rev = "384e1ae10dcbdec4a1e2097094a8160507ea46a6"; + sha256 = "1bvgca35gl2daccpmhaa4q166iyaqachyd2k8n9vd6hlbbn4rrgl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1dcfc8f0759792367ee49d2fe96e5bd7ca4105f/recipes/harvest"; @@ -26623,12 +27345,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20160726.1027"; + version = "20160827.1033"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "26b25373fe0ae565f87ca5552465b973951af206"; - sha256 = "0h4hgg1jd8i7nishb356wk0pkm1qklccb65wk8zif6v8nr1wqb7q"; + rev = "19623461dd282614bc0589602603619499e45207"; + sha256 = "0hsaxm8zm4d8rpswazhsfnqv2p2hrli63sy928vc32d5010kac7i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -26682,6 +27404,27 @@ license = lib.licenses.free; }; }) {}; + hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hasky-extensions"; + version = "20160813.609"; + src = fetchFromGitHub { + owner = "hasky-mode"; + repo = "hasky-extensions"; + rev = "3f1862989a2ca3b79761dccfa352a1b6d518ee77"; + sha256 = "10214654gvnyqimh4950jsw1r42p0y79pfl8h0x44mzll62bvz87"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions"; + sha256 = "0ymigba1d0qkrk3ccd3cx754safzmx1v5d13976571rszgmkvr15"; + name = "hasky-extensions"; + }; + packageRequires = [ avy-menu emacs ]; + meta = { + homepage = "https://melpa.org/#/hasky-extensions"; + license = lib.licenses.free; + }; + }) {}; haste = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "haste"; @@ -26703,6 +27446,27 @@ license = lib.licenses.free; }; }) {}; + haxe-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }: + melpaBuild { + pname = "haxe-imports"; + version = "20160814.52"; + src = fetchFromGitHub { + owner = "accidentalrebel"; + repo = "emacs-haxe-imports"; + rev = "0fbd5d26f976bcf70bf26e685b2c3c0dc465a058"; + sha256 = "0hkyhj29imn1hrjabqjwqlj47qdwigcyclic3k3bigk06pjwalmh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/db7d2b08e914aab7719c6d3a951b142ec7252f34/recipes/haxe-imports"; + sha256 = "10xh57ir49f18pzw9ihpwffchm1mba0ck1zdqsfllh3p5gry1msg"; + name = "haxe-imports"; + }; + packageRequires = [ emacs pcache s ]; + meta = { + homepage = "https://melpa.org/#/haxe-imports"; + license = lib.licenses.free; + }; + }) {}; haxe-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haxe-mode"; @@ -26809,10 +27573,10 @@ }) {}; header2 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "header2"; - version = "20151231.1326"; + version = "20160810.1234"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/header2.el"; - sha256 = "00j74cqdnaf5rl7w4wabm4z88cm20s152y0yxnv73z9pvqbknrmm"; + sha256 = "1fiqmbmnq07v70ak6jvvdb27val420zvq5xlwyrqdj5qjri8z83r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d16829cb4dea98908735be13aa632bc13d308acb/recipes/header2"; @@ -26849,12 +27613,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20160723.2238"; + version = "20160831.10"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "8acee62ffc19e57f152df313faba1afb7698c2b9"; - sha256 = "1qriwyr2c6adif770jk6rl7d9w6q4f268gzzpr5q25ll7d2i8n02"; + rev = "8eef909d567921af76c067830a2e39021be5f586"; + sha256 = "0dmn141ikv254v07jjykkx7p73i3mhp7a6ygm8nqrdpi3883q02g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90ab37af6b0c85eac11c423bc8f0d93d6d8a9fd4/recipes/helm"; @@ -26933,12 +27697,12 @@ helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ag"; - version = "20160717.2013"; + version = "20160809.337"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ag"; - rev = "39f02a29f0ad1b2d0afd847d59782b269a65b13e"; - sha256 = "0szkyyywfqndfxnik41czyzz4cs8xwjlx6y03zzfm6m2va8sb9pd"; + rev = "88e422ad5a76a7a0d8a5cd766d29c22206d8135e"; + sha256 = "0fmhys3ikjcqnsld8fc04d9l0kbb8gs1n3yy06kxf5jzc8cnyi84"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag"; @@ -27038,12 +27802,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20160721.1617"; + version = "20160823.900"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "d6a98ac6f28d2a6a05e203115211c98333d40aca"; - sha256 = "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23"; + rev = "13e04b275d3b9a523d6a9f7fa753fc449f3f5960"; + sha256 = "1l66sn7ancyd9q3jbbhay55rs8zbbd7nh2vv9jdgmpw2lys3xs89"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -27164,12 +27928,12 @@ helm-c-yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, yasnippet }: melpaBuild { pname = "helm-c-yasnippet"; - version = "20151231.10"; + version = "20160823.611"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "helm-c-yasnippet"; - rev = "2833bff9427f6d06531cf798e9152141e6b2fc83"; - sha256 = "03c4w34r0q7xpz1ny8dya8f96rhjpc9r2c24n7vg9x6x4i2wl204"; + rev = "5bf2c2adc0afe38c17c7cbf8c5d8a0604c4ee51f"; + sha256 = "1yb4swbx1i90fbfhkcvbvqvnbbfing7cgxz1dcyfbnazkdlfryhh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2fc20598a2cd22efb212ba43159c6728f0249e5e/recipes/helm-c-yasnippet"; @@ -27227,12 +27991,12 @@ helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }: melpaBuild { pname = "helm-cider"; - version = "20160719.1937"; + version = "20160727.1944"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "5799fd0001e0d5398745fbd03f60da1aac9c1479"; - sha256 = "1hpr1w9v855fxqwrqfdcj5acxd3bkp1gc8h5whyl91d1f93zyy55"; + rev = "a82b8b2e219e38c783d39a32ad86730672a49da6"; + sha256 = "0kw2i9921vyqcl3a831r9zf1apdgrb51iwj3k4jrb4srpz2sk79p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider"; @@ -27332,12 +28096,12 @@ helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-codesearch"; - version = "20160123.313"; + version = "20160809.803"; src = fetchFromGitHub { owner = "youngker"; repo = "helm-codesearch.el"; - rev = "eb97593da777d34087350af3ddd6e9e34c6346bd"; - sha256 = "05nvbwz3inbmfj88am69sz032wsj8jkfpjk5drgfijw98il9blk9"; + rev = "aac4d858a80396231adaf1a78c3b75f65bb22921"; + sha256 = "1d7rsjp5xbshj6simsp4hqgd8fh865c34i9i12y968aqkn7nlsqd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a992824e46a4170e2f0915f7a507fcb8a9ef0a6/recipes/helm-codesearch"; @@ -27395,12 +28159,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20160723.944"; + version = "20160831.308"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "8acee62ffc19e57f152df313faba1afb7698c2b9"; - sha256 = "1qriwyr2c6adif770jk6rl7d9w6q4f268gzzpr5q25ll7d2i8n02"; + rev = "8eef909d567921af76c067830a2e39021be5f586"; + sha256 = "0dmn141ikv254v07jjykkx7p73i3mhp7a6ygm8nqrdpi3883q02g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -27479,12 +28243,12 @@ helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dash"; - version = "20160716.917"; + version = "20160802.1147"; src = fetchFromGitHub { owner = "areina"; repo = "helm-dash"; - rev = "3f997ef2d1bac4882dea4c8da44ef9ab5834627c"; - sha256 = "1084papl32c1nn98wzv7vprlcabgkin6c1z4s0hbx0jj3rkhdzmz"; + rev = "bf80144f7cb810a0db89036b886d0e6f580ef7d7"; + sha256 = "1r3x72pd9wzqrkkwafmv64lcr9f1mrzbm1f3qv5fvv5xrs3qib2h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c3ea21430473ef22d5ea9c8b2cf7ec9689883a/recipes/helm-dash"; @@ -27500,12 +28264,12 @@ helm-descbinds = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-descbinds"; - version = "20160609.912"; + version = "20160806.913"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-descbinds"; - rev = "b4ad76372a1b9f4415322d210b3888423247693d"; - sha256 = "1qjhk1aag3arks0pgj3k2plr6k3cvb7i45apyczka6dvz8fmwj47"; + rev = "7771aa53d4f2828022504132114fa99e178be892"; + sha256 = "0dp540vah2lnza4g1p65ping09jk944fvpq7yp965dj62gsjbjgn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/447610a05422cd2f35399e43d98bf46410ff0408/recipes/helm-descbinds"; @@ -27542,12 +28306,12 @@ helm-dictionary = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dictionary"; - version = "20160601.848"; + version = "20160817.1333"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-dictionary"; - rev = "956bb84558cbcea52f1ce73866e1c5776d145723"; - sha256 = "1pb7jnpddy00bmsh5lcr1hxlkfmn4xbi3s7vj47m1vn0wf3gcxpa"; + rev = "805ce850d4cbe811227d9c9b16cc51f652198f3f"; + sha256 = "0ambb6i8ipz5y0mnc8jd07j3iiwb7ah87pw8x8pi3phv1r80l0k1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b8cc457b06ce271f7c19729cde7728286bb85528/recipes/helm-dictionary"; @@ -27560,6 +28324,27 @@ license = lib.licenses.free; }; }) {}; + helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-dired-history"; + version = "20160731.645"; + src = fetchFromGitHub { + owner = "jixiuf"; + repo = "helm-dired-history"; + rev = "77e60f201aee071dad920e6120aa118d346ee265"; + sha256 = "139kbf2kn64fs6a971kk7gyvbs49007544dxxjx3p1qawrnyc0jy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/56036d496c2a5fb1a6b32cdfcd1814944618e652/recipes/helm-dired-history"; + sha256 = "1k0021wn6x7in4wi9lri2c9wl06pvprv950hgdwgra8m155qjfp1"; + name = "helm-dired-history"; + }; + packageRequires = [ cl-lib helm ]; + meta = { + homepage = "https://melpa.org/#/helm-dired-history"; + license = lib.licenses.free; + }; + }) {}; helm-dired-recent-dirs = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dired-recent-dirs"; @@ -27899,12 +28684,12 @@ helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-git-grep"; - version = "20160713.521"; + version = "20160820.635"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-git-grep"; - rev = "456ea8324eb811f099dad993ae94c8837368b23a"; - sha256 = "13p8dbfln8kcvi6iwj9mlb7vy6bda4285gagsng01j3nfrw0ck9x"; + rev = "dc66d07ecfb70b0b3c57b0849c74cf80b2bb1312"; + sha256 = "1zjimp0rww90xffzwf9yrhd0xg7jiv5r79v2hw84mxqmbqq70icj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/338d28c3fe201a7b2f15793be6d540f44819f4d8/recipes/helm-git-grep"; @@ -28071,8 +28856,8 @@ src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-gtags"; - rev = "4b98c1281bb8e5f91f8d4fef4bbfcfc00ef8d676"; - sha256 = "0yhhncz00arxzlv4j9wjn22g5gxglk40rpj6zd19zr7igyqy246b"; + rev = "fb0079054518b966a1b8a42f5d970e5fbc522d37"; + sha256 = "1nw0drvyqdjwdq4q5ypj1pqjvkgmgz64i70r7dnwnyjpgvk3d1dc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-gtags"; @@ -28406,7 +29191,7 @@ version = "20150717.39"; src = fetchsvn { url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el"; - rev = "150710"; + rev = "152175"; sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz"; }; recipeFile = fetchurl { @@ -28423,12 +29208,12 @@ helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-make"; - version = "20160331.754"; + version = "20160807.1756"; src = fetchFromGitHub { owner = "abo-abo"; repo = "helm-make"; - rev = "83f11a9bf9db3570b547eade58346b5887e016c0"; - sha256 = "1zxahr48s17di8mcy2sxvy4006ch9vwbvkbgkxdphijgqz41irqz"; + rev = "f1bb61049c83b281f7d6fd0d13dfb262629ed5dc"; + sha256 = "1wrcjpd6lsf4sgqw61ql2y3dcb8v27ysnchyjwyppgmsqbkrz0a9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make"; @@ -28486,12 +29271,12 @@ helm-mt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi-term }: melpaBuild { pname = "helm-mt"; - version = "20151104.2120"; + version = "20160803.713"; src = fetchFromGitHub { owner = "dfdeshom"; repo = "helm-mt"; - rev = "39a7d58050942f6afc15b1078f1e397ec4c8cd5c"; - sha256 = "09rb8aq7fnf661w3liwbkkaczjph3dzvg26slm9cwcnl7pqnvagl"; + rev = "10790691f083c3806c9e85758b7ea73b5e24c5ed"; + sha256 = "1k1jzzxygpmxnj07br7ah2582sdj67vqmipykz7yzrprd8r9c8fw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e726bf0b9b3f371b21f1f0d75175e0dda62f6fb0/recipes/helm-mt"; @@ -28507,12 +29292,12 @@ helm-mu = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-mu"; - version = "20160531.1031"; + version = "20160819.1132"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-mu"; - rev = "884ba7484b2635231aa6436800e8b6fb722bcddf"; - sha256 = "1ifws3p0civl60wpri0zs3mi23c6jajrvz1zaimw6am222s2sx3z"; + rev = "3d53161fdd15a229c9afe96004118167ba0593b1"; + sha256 = "0ja4vka6wxyy5vg8cdg0znkisvmrn158mhkrph7l0p4b59qdxal6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63ee2e2aa622c96993c1b705d0fd223d6b36fd0f/recipes/helm-mu"; @@ -28672,6 +29457,27 @@ license = lib.licenses.free; }; }) {}; + helm-pass = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, password-store }: + melpaBuild { + pname = "helm-pass"; + version = "20160825.1410"; + src = fetchFromGitHub { + owner = "jabranham"; + repo = "helm-pass"; + rev = "36025e7e435c4ee516bab554fa097d958b8b4ba6"; + sha256 = "0v99cz44bdwajvzf882qp76p85g9mbd1a24b8156wpbsys0dkbg0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d8100599d69a760cd4548004a552cc0adcdb3bed/recipes/helm-pass"; + sha256 = "11yknsch0avdl8jmj54xk45nba3qh8bhsdrc2rds084i7d5gmqia"; + name = "helm-pass"; + }; + packageRequires = [ helm password-store ]; + meta = { + homepage = "https://melpa.org/#/helm-pass"; + license = lib.licenses.free; + }; + }) {}; helm-perldoc = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-perldoc"; @@ -28759,12 +29565,12 @@ helm-projectile = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-projectile"; - version = "20160709.2315"; + version = "20160807.313"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "fc20f2c25ba9d357d122b8c78a272f98b9bc4a6f"; - sha256 = "0j69iryi9gmcybkhh6z8smzljn924hxdacj66i1r7d6741fa9bij"; + rev = "fb2dd7fad405f650f95e0492d2a80e4b40ce434f"; + sha256 = "0qi46q04h0y8khqhza5pj6q83wwlq5mh3y524d21pbklc0vsm8yx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; @@ -28927,12 +29733,12 @@ helm-recoll = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-recoll"; - version = "20160605.1423"; + version = "20160731.221"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-recoll"; - rev = "8901a648fea4f2a2c0814bccfeebce3e8b1af33d"; - sha256 = "01ikw689xjrjk4aas3z34dhldhzj3200q0kgq7xjgs777mi38054"; + rev = "cc4c4fa9c8f4f99383647baa8512b60523dc8b36"; + sha256 = "1ic2k8ls084yn9h96pk8815wlvxkwwdq75zhm1ls197pkbw7gh7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a0d168f96470753c22b92ad863be98d8c421ccd/recipes/helm-recoll"; @@ -28987,6 +29793,27 @@ license = lib.licenses.free; }; }) {}; + helm-ros = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, xterm-color }: + melpaBuild { + pname = "helm-ros"; + version = "20160812.1052"; + src = fetchFromGitHub { + owner = "davidlandry93"; + repo = "helm-ros"; + rev = "92b0b215f6a017f0f57f1af15466cc0b2a5a0135"; + sha256 = "1fgph8wsm2nakn53zj19r59mirzn25r601rljmdv2xpw5h3axywg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9ddf53b4060c33550a445f877aef37dffaeb7e/recipes/helm-ros"; + sha256 = "1q9qqjchkj6anikaamhw998f5aaampc1z7085v9pigg3x11vv9fm"; + name = "helm-ros"; + }; + packageRequires = [ cl-lib helm xterm-color ]; + meta = { + homepage = "https://melpa.org/#/helm-ros"; + license = lib.licenses.free; + }; + }) {}; helm-rubygems-local = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-rubygems-local"; @@ -29485,12 +30312,12 @@ hexo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hexo"; - version = "20160423.817"; + version = "20160815.2246"; src = fetchFromGitHub { owner = "kuanyui"; repo = "hexo.el"; - rev = "3e41f90f4954e75dc584dd3563e68e11757ea3b9"; - sha256 = "1ghknn1fd6lwxq035amrawx9ixw3qwjsfarsjyqss7rhs70wrn5a"; + rev = "1ef35c70692e58b9c5d0ae52b00c058df99397ba"; + sha256 = "0xvzbbsqdx6lqkcydc67iv56y0s7536574m2pnj7q52hbfidazf8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/21de1b7db0fa4af4fc0014207d41893a0713d738/recipes/hexo"; @@ -29739,10 +30566,10 @@ }) {}; highlight-chars = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-chars"; - version = "20151231.1335"; + version = "20160729.2320"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/highlight-chars.el"; - sha256 = "18y6cw43mhizccvwfydv6g2kz8w7vff0n3k9sq5ghwq3rb3z14b2"; + sha256 = "1qpx5bpb2iyhdv2d6lnk3vmdxwsvf8ylriarr0hw79zli0l167kp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/highlight-chars"; @@ -30043,12 +30870,12 @@ highlight-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-thing"; - version = "20160220.1642"; + version = "20160817.126"; src = fetchFromGitHub { owner = "fgeller"; repo = "highlight-thing.el"; - rev = "821f408c055838f1f245fc18c026889c300b198b"; - sha256 = "00s2nm0rfdgkpn2v9m36y0l42jyfah5hp5hd3bkwljgs99cp1ihk"; + rev = "f9eaebdd80815d1cc30dbf56d8b171da3135ee7c"; + sha256 = "00nvmp8fcc55hmy37wxnwhvg3m85a5fyrqpli9zjgbblckfz1v55"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84b6cb403ff9a588771d051e472596f4e3cc974d/recipes/highlight-thing"; @@ -30106,12 +30933,12 @@ hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hindent"; - version = "20151113.24"; + version = "20160831.218"; src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "99f30377cc74672ec2c4195b564a777ce64b0816"; - sha256 = "15kqfn93nrfxsqdj0ycq300ki254sms0c4pdnl0lpwnmm7gd392f"; + rev = "963a89bd83756c538bcabde14b668df136cd8f7c"; + sha256 = "106czcg0g73z0qiavqjhf1gwv0jwhcmggig6d63k1ic6793ld7d7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -30211,12 +31038,12 @@ history = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "history"; - version = "20150409.1734"; + version = "20160821.902"; src = fetchFromGitHub { owner = "boyw165"; repo = "history"; - rev = "4bb475513f98ec07db55212a504b6167dae3a646"; - sha256 = "1dmrg39g0faqqkgrpcbybjbb91vcpkwawxsplckkj92y59zanq3x"; + rev = "5317663fb45bbd5e96d258cb0807dcc266ce67ff"; + sha256 = "1ghbpfmmp5p0wvivd79165dx5kia8qkmac3a6asg2d6l1h9y58n1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f51d4cc6521546c99197adeb35459fcd53bd67d4/recipes/history"; @@ -30433,12 +31260,12 @@ hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; - version = "20160606.715"; + version = "20160807.523"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "dff381a5b2c9235bbdbe32123751ecdf17df7432"; - sha256 = "0r2xyljcvhh547mkx7h9diajc21l6lpwjwpklc3h7491zazv3s6r"; + rev = "215ff60d7a4097b5104edaf2784f9a3257db4403"; + sha256 = "1f7dz1r42qy3dwsqx7x802m7v4jfnmfp2q4678gs8d0scgxxfqb4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; @@ -30534,6 +31361,27 @@ license = lib.licenses.free; }; }) {}; + holiday-pascha-etc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "holiday-pascha-etc"; + version = "20160821.1758"; + src = fetchFromGitHub { + owner = "hexmode"; + repo = "holiday-pascha-etc"; + rev = "eb198656f63cb8679fb0e3a8248782df071a0f3c"; + sha256 = "1dd0k7r5kx15sph12vzakhq27zh7vy9r541qdp8w5051k6apw3pw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4108926b1fee78e54c9fa68445c7a2b1b20404ea/recipes/holiday-pascha-etc"; + sha256 = "0v2mhga1db6qy1160i730pzzrzisvhl3fjkazj4cjbkpjlshfc5j"; + name = "holiday-pascha-etc"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/holiday-pascha-etc"; + license = lib.licenses.free; + }; + }) {}; homebrew-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "homebrew-mode"; @@ -30576,22 +31424,22 @@ license = lib.licenses.free; }; }) {}; - hound = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, web }: + hound = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "hound"; - version = "20150217.949"; + version = "20160731.2106"; src = fetchFromGitHub { owner = "ryoung786"; repo = "hound.el"; - rev = "26fb047ff4e4c1fe5b66423cb29a7394b9ace665"; - sha256 = "1gm5nczq5lsxqkfb38ajffg65zwxkfqvqhk33bwnnd00rpa1ix6j"; + rev = "209b87b64a0477718e5f0ec721a1a4b7f323ddff"; + sha256 = "0w7vknf8nz9a3rqwzpdp1lnscx0kamgyrd9mvravkp6644kjw3k4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90cfc34eb4e8be7bf887533b85feba91131a435b/recipes/hound"; sha256 = "0qri6bddd3c4sqvaqvmqw6xg46vwlfi1by3gc9i3izpq4xl1cr1v"; name = "hound"; }; - packageRequires = [ cl-lib web ]; + packageRequires = [ cl-lib request ]; meta = { homepage = "https://melpa.org/#/hound"; license = lib.licenses.free; @@ -30659,22 +31507,22 @@ license = lib.licenses.free; }; }) {}; - ht = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ht"; - version = "20150830.1115"; + version = "20160806.1753"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ht.el"; - rev = "84b5b4404515ed3a3f6a85aacf2723302de851a4"; - sha256 = "17x5w5kzam8cgaphyasnqzm2yhc0hwm38azvmin7ra4h912vlisd"; + rev = "62d77713ecb99871f2b05c111474445c15781164"; + sha256 = "07n1xh6q2v25jarjlkgjzn40niz958jw0r69d5c2mf66fr7n0b8g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht"; sha256 = "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd"; name = "ht"; }; - packageRequires = []; + packageRequires = [ dash ]; meta = { homepage = "https://melpa.org/#/ht"; license = lib.licenses.free; @@ -30743,17 +31591,19 @@ license = lib.licenses.free; }; }) {}; - htmlize = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "htmlize"; version = "20130207.1202"; - src = fetchgit { - url = "http://fly.srk.fer.hr/~hniksic/emacs/htmlize.git"; + src = fetchFromGitHub { + owner = "dunn"; + repo = "htmlize-mirror"; rev = "aa6e2f6dba6fdfa200c7c55efe29ff63380eac8f"; sha256 = "1vkqxgirc82vc44g7xhhr041arf93yirjin3h144kjyfkgkplnkp"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8a72ad91f62c1ac3cae212a53acd6dd7c88526c2/recipes/htmlize"; - sha256 = "15pym76iwqb1dqkbmkgc1yar450g2xinfl89fyss2ifyi4am1nxp"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8d1d4a17daa60f577c3f88f757997fa42f7b527e/recipes/htmlize"; + sha256 = "03rv3myds696gasfqw3lwvsjd680xgwcf9kilblzxdidd7l6n5xf"; name = "htmlize"; }; packageRequires = []; @@ -30804,12 +31654,12 @@ http-twiddle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "http-twiddle"; - version = "20151121.544"; + version = "20160801.1211"; src = fetchFromGitHub { owner = "hassy"; repo = "http-twiddle"; - rev = "bbf025b0f57068fe0fb3f1fbc2f6fd7bf0d65992"; - sha256 = "008iq5fhsw4qklw2l457a1cfqq8diadpnf1c1di5p07sc0za5562"; + rev = "4d0c73b7dcbde8b483d4f3a75c49c74d2fe3ca45"; + sha256 = "0fxmk5b4ggi92n5gi2nim08a2gx1yg7jlp4hj4m0qazxqdcy38i1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/56e6078d42cfefbe3f0731952f67afd7f6e9a92e/recipes/http-twiddle"; @@ -30930,12 +31780,12 @@ hydandata-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydandata-light-theme"; - version = "20160122.1753"; + version = "20160815.2118"; src = fetchFromGitHub { owner = "hydandata"; repo = "hydandata-light-theme"; - rev = "3b9bb5f213029a8331818b1d670194ef26d9505a"; - sha256 = "11vgz64f8vs8vqp4scj9qvrfdshag7bs615ly9zvzzlk68jivdya"; + rev = "169c0d9ab1272b0f4a1f29eb5f1cd5ffb2365e1e"; + sha256 = "19q63kg1higqxf26bhwnqwvqxpayjq2j24yi54b1wkvwbv5f28nr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/413c617f15947782891159a240e0c9014f1f7d11/recipes/hydandata-light-theme"; @@ -30972,12 +31822,12 @@ hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydra"; - version = "20160702.29"; + version = "20160828.154"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "91f8e7c13bcd9629ad1678588e58576ca6806b58"; - sha256 = "1czdar4yv5c9996wvj887d0c1knlrpcjj0aq2dily2x074gdzh4j"; + rev = "3527b321ce02b796e22a4adb2b4c3f17899ca935"; + sha256 = "04r8bpznqfv5xlg9y9f1b690943117hhpxxfif398j8yyx0d8jpi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -31139,7 +31989,7 @@ }) {}; icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icicles"; - version = "20160701.922"; + version = "20160830.1738"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/icicles.el"; sha256 = "0x082kilmzq26f9pwwbq2bid98s9mjyfwljcwz2qlj8fbihwjn6l"; @@ -31533,12 +32383,12 @@ ido-occur = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-occur"; - version = "20160527.409"; + version = "20160820.740"; src = fetchFromGitHub { owner = "danil"; repo = "ido-occur"; - rev = "10f6acfd01eb61c5b27031be6b26f034667a465d"; - sha256 = "0i1mcpg69rkfjpis7l1106gfqlvf1z48f5j5jkjc9xqcdr5zm09c"; + rev = "522af5d55b3d4cd6885f3b4100913566c202cec4"; + sha256 = "0yh8px5ffx4pjmy97v1z9nwxb3qgzc5pdaj9nn6lsdxv9z7w5p3v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a576d8569bf82be01e7d50defcc99a90aab1436/recipes/ido-occur"; @@ -31764,12 +32614,12 @@ iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iedit"; - version = "20160624.856"; + version = "20160728.1951"; src = fetchFromGitHub { owner = "victorhge"; repo = "iedit"; - rev = "890a11657ce56449fec13760bba6925235ad3926"; - sha256 = "0kcpj0199671i0am3ana2akap3lnrfs5h89s40gappaybb3qn51f"; + rev = "3211c2ee6cdc6c7fca280244f426b3aa8fbff3f5"; + sha256 = "0nsd0s3fj571bdqv6zm0l9q14w5l2nf823fxa407riynxllxqp5w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa2b2745bd1f1778070954c834158c19d4cfb788/recipes/iedit"; @@ -31990,12 +32840,12 @@ imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenu-anywhere"; - version = "20160722.1440"; + version = "20160831.356"; src = fetchFromGitHub { owner = "vspinu"; repo = "imenu-anywhere"; - rev = "03fa805fe9104fec8e9eda5f58be583eb9bd28e6"; - sha256 = "1bfishspj2szc3qr1i22wryjshfhbdvfxwb41pi108bm5fmyxjam"; + rev = "94bab9136e1264e98a10d9325ad53d735307f8f3"; + sha256 = "1ffdh0izdd22av85rizk38fidfp8f6lk6phr549fzaspn11hvd8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere"; @@ -32263,8 +33113,8 @@ src = fetchFromGitHub { owner = "kwrooijen"; repo = "indy"; - rev = "bc1edbaa6db7264dd64fbd04331406d889b44501"; - sha256 = "0kv0aj444i2rzksvcfz8sw0yyig3ca3m05agnhw9jzr01y05yl1n"; + rev = "4604867d8111f0e186a5351e68e054a77cb14abf"; + sha256 = "17xvi39v358nff4h1f6l3l3xwjlcr9hzln5v8qmk0kq9b8gkzgxa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/indy"; @@ -32301,12 +33151,12 @@ inf-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-mongo"; - version = "20131216.228"; + version = "20160815.216"; src = fetchFromGitHub { owner = "tobiassvn"; repo = "inf-mongo"; - rev = "2d910f2143610f12de9c573ee202a322cf579e85"; - sha256 = "14kf3zvms1w8cbixhpgw3m2xxc2r87i57gmx00jwh89282i6kgsi"; + rev = "649dc6ea8e468f1d8109568548eb222c71486dbf"; + sha256 = "19n0ddzgbqhbz3qjpvvw4nasrn2qvkczrdd8kk9h28v8xix5grzp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9b27d5354d4b30cc9dd3be730d79e5a5bc1f74/recipes/inf-mongo"; @@ -32361,6 +33211,27 @@ license = lib.licenses.free; }; }) {}; + inferior-spim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "inferior-spim"; + version = "20160826.646"; + src = fetchFromGitHub { + owner = "hiddenlotus"; + repo = "inferior-spim"; + rev = "93f67ee49f1c6899a7efd52ea4e80e9f9da3371c"; + sha256 = "1ffa29clfsr3wb00irzqlazk9d0qmjxn9wy8zfca61lh0ax5khbg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d2ce70b5dc05096a6de46069e8d26323d3df78b6/recipes/inferior-spim"; + sha256 = "1bl29ww55vabgly84wdg18qq1md4vxzvsb6kvxymf6bpw55k313s"; + name = "inferior-spim"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/inferior-spim"; + license = lib.licenses.free; + }; + }) {}; inflections = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inflections"; @@ -32445,12 +33316,12 @@ init-open-recentf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "init-open-recentf"; - version = "20160601.2000"; + version = "20160822.701"; src = fetchFromGitHub { owner = "zonuexe"; repo = "init-open-recentf.el"; - rev = "002375a6aefc812a3f52ff326e489fa0ffedaea1"; - sha256 = "0vbqmz9kcdxwwsid1fclwakhcq268jhbwqc5hgpywp8w2b83mjs1"; + rev = "a4f5338a14302d44fa5aebb1ddc7aff3dc9abbe3"; + sha256 = "0iph5cpz2dva1rnvp5xynmkndny87z308pziadk1qgf05mc0i61d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4db8b6eced50726c788d7343137f6b4558575abf/recipes/init-open-recentf"; @@ -32484,6 +33355,27 @@ license = lib.licenses.free; }; }) {}; + ink-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ink-mode"; + version = "20160814.416"; + src = fetchFromGitHub { + owner = "Kungsgeten"; + repo = "ink-mode"; + rev = "e35f26abbaf8ea23c5aa0a0c7ef15334cdfb7b48"; + sha256 = "0ixqgk101gnm2q6f2bjk2pnqlrj41krqz56lss6fmf81xhxavmpp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e3276b823cf03455083929599e1d47aea894ad5c/recipes/ink-mode"; + sha256 = "1fi1g7sim5qyildzz84iwywwq94qxym972ac15sj7yd7x0i8smax"; + name = "ink-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ink-mode"; + license = lib.licenses.free; + }; + }) {}; inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inkpot-theme"; @@ -32633,12 +33525,12 @@ interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "interleave"; - version = "20160701.54"; + version = "20160825.953"; src = fetchFromGitHub { owner = "rudolfochrist"; repo = "interleave"; - rev = "d42fe4b97aaff256c791a91716b4e0726b2d1e15"; - sha256 = "1i592kcwa0ivpmc7vkxz0r5v11lcih21kkc58vaz3yq4k5lgdjb9"; + rev = "fa2c32c7b55b6f7ea5900e89c9a749469501a9b6"; + sha256 = "1slf22a044iirn4p5rw1hvgg1grmhml4rjk4g74xbsg68xiyg6ma"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave"; @@ -32654,12 +33546,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20160725.19"; + version = "20160825.656"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "337144280ccb3933277ab7f416a8acdb2bc08090"; - sha256 = "0hafg68yrw3njsfblghna81jqam7y8l9dqxzcr3qwn9nz3ppiw5m"; + rev = "037f1acd9d275d669e594942e1c207264b1e0282"; + sha256 = "1m73y99yvbwkdbrfaiibk33ibc1alwdg3nwgnn7fn7ivxz91n617"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -32903,12 +33795,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20160713.1245"; + version = "20160825.1209"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "6e0a3f0df9306bda32dfe6097ffa014a23c05af6"; - sha256 = "0xky99rc0p8zdjw0x3hfc28jh8p1ajh205cywd59xbjyr86fc51c"; + rev = "03cf7216c93dcd907ce9e13e52b6de545a5593bc"; + sha256 = "17a6mpyk2pj479jjzxc68v2c62d07609ys959kb33c719w9djpb9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -32983,10 +33875,10 @@ }) {}; isearch-prop = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-prop"; - version = "20151231.1407"; + version = "20160827.922"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch-prop.el"; - sha256 = "1i1ypganr2ivwgi0vgjihgk1s4yglwj8nbqnqjiiwdywf8g5hcmr"; + sha256 = "065nbrc14iw4ppj6v7fp5iygi52rbd2iwm7z5kif292ffdn499zn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/isearch-prop"; @@ -33191,12 +34083,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20160726.1937"; + version = "20160829.234"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "17b59b2244473ba32cff3408e41e451de7fcc69f"; - sha256 = "1srzmlgd4wbwdickgxq4kjxbw5rprkh7dwfi7rz82zsahk1jkzr8"; + rev = "4c3ecb4d739df379dd01ac8c7dc17080e608dac3"; + sha256 = "0cah0ri248hy1xzrldhh831imyfvnm9jdwnnxqm0iphp4dsf1xk7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -33212,12 +34104,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20160714.1000"; + version = "20160823.900"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "d6a98ac6f28d2a6a05e203115211c98333d40aca"; - sha256 = "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23"; + rev = "13e04b275d3b9a523d6a9f7fa753fc449f3f5960"; + sha256 = "1l66sn7ancyd9q3jbbhay55rs8zbbd7nh2vv9jdgmpw2lys3xs89"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -33230,22 +34122,22 @@ license = lib.licenses.free; }; }) {}; - ivy-erlang-complete = callPackage ({ dash, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, s }: + ivy-erlang-complete = callPackage ({ async, counsel, dash, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, s }: melpaBuild { pname = "ivy-erlang-complete"; - version = "20160726.146"; + version = "20160824.2004"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "dc2ee7c8534454a3ec31dd951ace78a8a06ce84c"; - sha256 = "1vaxp2xjcc1mj73r67z69ghi9mw9ayg98jlpljmmiz840gi70zx0"; + rev = "eec1c4ec26f693fb21495c8644badf4d7bd4ae6f"; + sha256 = "0ivmwk8nnvpghbvrr883i8wc7nck5752pws1kkfxn4qs2yl6v1bf"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d0ec649f7adc4c82c4d67656891f06c9bc50ba9c/recipes/ivy-erlang-complete"; - sha256 = "10r1497jp0k4hasdmih1d7qv4w4435af5rib2wl6x4jx98s5vzvh"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; + sha256 = "00fqjgrhvcn3ibpgiy4b0sr4x9p6ym5r1rvi4rdzsw2i3nxmgf3a"; name = "ivy-erlang-complete"; }; - packageRequires = [ dash emacs erlang ivy s ]; + packageRequires = [ async counsel dash emacs erlang ivy s ]; meta = { homepage = "https://melpa.org/#/ivy-erlang-complete"; license = lib.licenses.free; @@ -33279,8 +34171,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "17b59b2244473ba32cff3408e41e451de7fcc69f"; - sha256 = "1srzmlgd4wbwdickgxq4kjxbw5rprkh7dwfi7rz82zsahk1jkzr8"; + rev = "4c3ecb4d739df379dd01ac8c7dc17080e608dac3"; + sha256 = "0cah0ri248hy1xzrldhh831imyfvnm9jdwnnxqm0iphp4dsf1xk7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -33293,6 +34185,27 @@ license = lib.licenses.free; }; }) {}; + ivy-pages = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "ivy-pages"; + version = "20160728.1220"; + src = fetchFromGitHub { + owner = "igorepst"; + repo = "ivy-pages"; + rev = "47b03a1f9384502cf22369ff31a2898c863d3aff"; + sha256 = "0jv74s8jn1sdwdhxkx11gnaqcc49369gld1g6a1hl62521j897rc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/93f1183beb74aa4a96de8cd043a2a8eefdd7ad7e/recipes/ivy-pages"; + sha256 = "0zz8nbjma8r6r7xxbg7xfz13202d77k1ybzpib41slmljzh7xgwv"; + name = "ivy-pages"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/ivy-pages"; + license = lib.licenses.free; + }; + }) {}; ivy-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, window-purpose }: melpaBuild { pname = "ivy-purpose"; @@ -33438,6 +34351,27 @@ license = lib.licenses.free; }; }) {}; + jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, map, melpaBuild, seq, websocket }: + melpaBuild { + pname = "jade"; + version = "20160808.129"; + src = fetchFromGitHub { + owner = "NicolasPetton"; + repo = "jade"; + rev = "e5204d18a9a9563af2ba5d5f985d6161a906d7d9"; + sha256 = "0l0q4c98jil0scr4spc3z3rgy4xy4w85zrsas1z8w142arvpiw70"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; + sha256 = "04w7pgn0dkppi6l15rkz8b1bcpw1dsgvvijy81a6i4nkigxxlv4y"; + name = "jade"; + }; + packageRequires = [ company emacs js2-mode map seq websocket ]; + meta = { + homepage = "https://melpa.org/#/jade"; + license = lib.licenses.free; + }; + }) {}; jade-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jade-mode"; @@ -33756,12 +34690,12 @@ jdee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jdee"; - version = "20160624.643"; + version = "20160728.1152"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "a0026ec0efdba87f10b9f007e9bbb3e78f65b7f1"; - sha256 = "0srs0mhamxpzc1azzmrbnpa5ms5q2ycyd9bc43aq28vgx759abx0"; + rev = "3bbae544db19da22d3943d226eb45c33d7919b43"; + sha256 = "0dr5mfaykqrsmmsbykwh46nkndggccs87v8y5qdxd6mqkivacfyl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d19f9b3c3163dbac4c0407e90fdfce5bf9008c/recipes/jdee"; @@ -33984,12 +34918,12 @@ jist = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, magit, melpaBuild, pkg-info, request }: melpaBuild { pname = "jist"; - version = "20160708.759"; + version = "20160803.1758"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "jist.el"; - rev = "a9dd29d34d420bed75f298cc6111886a89d63b63"; - sha256 = "0hibkmn9s4iaddzz3ga7xjlllkaav7i2x355c1vr0vn7s34zwp5m"; + rev = "1a0252e47b4ae5be6f8a16680752f6c69b1291a8"; + sha256 = "0wa7gbm1nn5q97bkz1zsrzwhga4m028bsiixzf14qml8pfq6q5ml"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/898bfa0b315240ef9335fde24ff0386a4c6c6595/recipes/jist"; @@ -34026,12 +34960,12 @@ jonprl-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "jonprl-mode"; - version = "20151203.142"; + version = "20160818.1759"; src = fetchFromGitHub { owner = "david-christiansen"; repo = "jonprl-mode"; - rev = "a7c7525ee19682c700f4d1d432b5be5707e94f10"; - sha256 = "1a0091r1xs3fpvg1wynh53xibdsiaf2khz1gp6s8dc45z8r0bclx"; + rev = "6059bb64891fae45827174e044d6a87ac07172d8"; + sha256 = "0v4xiq3xf7c52rmyymw8a4ws85ij0xy7pr7625gf15359cs5chs9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d26b6aea2b0567b971c4f013b58b598e9eb76af6/recipes/jonprl-mode"; @@ -34044,6 +34978,27 @@ license = lib.licenses.free; }; }) {}; + jpop = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "jpop"; + version = "20160816.348"; + src = fetchFromGitHub { + owner = "domtronn"; + repo = "jpop.el"; + rev = "485aec3e09e4f01eeb4b737c4de99fadf79e0b31"; + sha256 = "1a63xzczwb8frr3d4a2z864qq2wx83lgljqbqphkabx99apc749l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2a52a3cf909d12201196b92685435f9fa338b7ba/recipes/jpop"; + sha256 = "00chh1aqnkkkhdp44sapdjx37cbn92g42wapdq7kcl8v1v0xmnjr"; + name = "jpop"; + }; + packageRequires = [ cl-lib dash emacs ]; + meta = { + homepage = "https://melpa.org/#/jpop"; + license = lib.licenses.free; + }; + }) {}; jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jq-mode"; @@ -34173,12 +35128,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20160707.723"; + version = "20160826.1908"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "1f1251713830a2c3300e1b007ca6a5ca56d94e01"; - sha256 = "18ypa1g6m7gh0zh36dzk356mwcbs50fz309bkxq6asp2lvlcfbv5"; + rev = "e45206b792e56e241c5536459d70b5509b731b28"; + sha256 = "0rdysrbfm6ks7x9nkw77pklsjmn8z01r2pa6bv8inbwgdvxm62v3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -34278,12 +35233,12 @@ json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }: melpaBuild { pname = "json-mode"; - version = "20160710.1637"; + version = "20160803.1606"; src = fetchFromGitHub { owner = "joshwnj"; repo = "json-mode"; - rev = "9ba01b868a6b138feeff82b9eb0abd331d29325f"; - sha256 = "0i79lqzdg59vkqwjd3q092xxn9vhxspb1vn4pkis0vfvn46g01jy"; + rev = "e8ba0c03c5c10f61b8f0b3f5d531ef1d80dec9b0"; + sha256 = "1j02bg20ngarfwifdxz6al6394rjms2491xh4nlia7d6ihhhrafr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03d0ff6c8d724cf39446fa27f52aa5cc1a3cefb6/recipes/json-mode"; @@ -34465,12 +35420,12 @@ julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "julia-mode"; - version = "20160517.1043"; + version = "20160803.1643"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "julia-emacs"; - rev = "2d860b18582e6423de271500530a390469f93294"; - sha256 = "1394z087h07zw86xzi4kr87j0yn3v3r7pzjbnf3hgivjmz2w48bj"; + rev = "7b1d3fb053c32d9affe82fbf20cc0f8795f45026"; + sha256 = "0fz4165rzkh2nqv99ai25y3k26y1j2igakv3gg43ffhmxxkfil5l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode"; @@ -34696,12 +35651,12 @@ kakapo-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kakapo-mode"; - version = "20150906.2152"; + version = "20160727.2136"; src = fetchFromGitHub { owner = "listx"; repo = "kakapo-mode"; - rev = "fe3d579867f7465cd3ad04f29b4b2b3b820edc01"; - sha256 = "0b6af8hnrn0v4z1xpahjfpw5iga2bmgd3qwfn3is2rygsn5rkm40"; + rev = "5d0390009cddbd8e5e1cf6b565d38ddc8ddf9e9f"; + sha256 = "0cfpm8cy05nlqb0xv6pydvb6vwgkn3z10chfi894vhiwh04jxj4v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a43f0f1f6a0773240a51d379ec786c20a9389e7b/recipes/kakapo-mode"; @@ -34736,12 +35691,12 @@ kanji-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kanji-mode"; - version = "20150202.25"; + version = "20160826.439"; src = fetchFromGitHub { owner = "wsgac"; repo = "kanji-mode"; - rev = "ce6a755d034311059381c3a2c5a97f2de7f38f20"; - sha256 = "0rxf44kszxazkpjmccz3wnks7si3g8vsfi2lamwynmksk8sw5d7g"; + rev = "5e9d5b72468ece11cfb81b729be6babf63ede425"; + sha256 = "1zh7klqaza840q5f44zzh1wrnd6sqa2k93z3dgx3yhhsxfd1dxvy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9f1fb16f2f7f677d0817fd63633dd071ba2cf12/recipes/kanji-mode"; @@ -35027,12 +35982,12 @@ keyswap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keyswap"; - version = "20160726.43"; + version = "20160813.257"; src = fetchFromGitHub { owner = "hardenedapple"; repo = "keyswap.el"; - rev = "d6fad6f0e46d4f92d314bf52244b0be239c647a2"; - sha256 = "0qanh8jdjchrcn66p661haza1cj8m6afqlg52bs344dd84zkj6z9"; + rev = "cd682a7c4a8d64d6bae6a005db5045232e5e7b95"; + sha256 = "191i2b2xx6180sly0dd6b1z6npsrzjqhxrbak9wm6yblx7alsgn2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed8303f5009604ae3d83769063d38749e37fc5d8/recipes/keyswap"; @@ -35220,8 +36175,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "24da01467801e9573eee4bf4ee42528968349ece"; - sha256 = "05qaslwg78d5xc9cphp36j2rf3gcdjsxzkhx9yk5n5flb3rs567h"; + rev = "0a9354edd2f9b66da171f642f6bccb2ad1094320"; + sha256 = "130ngys74vcfsq7m0vcr7qbfv7rjbrqrn5ha0a38qsc9ccnxw8ir"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -35237,12 +36192,12 @@ kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kiwix"; - version = "20160727.333"; + version = "20160810.634"; src = fetchFromGitHub { owner = "stardiviner"; repo = "kiwix.el"; - rev = "90658b742e09b0daae5aacb9e246a085ec224abd"; - sha256 = "0zrwqqcd3n320lifyyxhc20n9cl69089m6i9v50jcxbfpv6vyyl1"; + rev = "ec62ab010ae0f2670b6598c112cc54119e2ed2f4"; + sha256 = "1zyflkrwwjai097cwvqm2n21mvmb4ppdi3j2lc1jvq9jnls68xxn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673b4ecec96562bb860caf5c08d016d6c4b89d8c/recipes/kiwix"; @@ -35360,6 +36315,27 @@ license = lib.licenses.free; }; }) {}; + kosmos-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "kosmos-theme"; + version = "20160829.2135"; + src = fetchFromGitHub { + owner = "habamax"; + repo = "kosmos-theme"; + rev = "968113f1a6ebcb4876c4f1fc9bd0882845d2845e"; + sha256 = "02244gmvs5hpxa3wxhcd4ajc2gj5f773m7mx76siwf2lidq5gr21"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/617eb74a7a2416d244acc6feaba50eeeb425bda5/recipes/kosmos-theme"; + sha256 = "0d8h64f3vsrbqw7bzsslhzvwmnfk0kid21gfch817jw7v4gp5zii"; + name = "kosmos-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/kosmos-theme"; + license = lib.licenses.free; + }; + }) {}; kotlin-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kotlin-mode"; @@ -35510,12 +36486,12 @@ labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "labburn-theme"; - version = "20160725.219"; + version = "20160801.753"; src = fetchFromGitHub { owner = "ksjogo"; repo = "labburn-theme"; - rev = "9dab3f9b81844db1f7b73b78bc0195bda461012b"; - sha256 = "1ff7mqx9y45fxxzihxna0niikrq3ygh4bww6k184jl5iw942yyrh"; + rev = "564e1454f1b1fe436494f0cd9fbb78a889fd2969"; + sha256 = "0fm8zlc27m22lfa2ay81h2s5aar0vyhfhwbha3nl1wwdi9720w0f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme"; @@ -35797,6 +36773,27 @@ license = lib.licenses.free; }; }) {}; + lcb-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lcb-mode"; + version = "20160815.2240"; + src = fetchFromGitHub { + owner = "peter-b"; + repo = "lcb-mode"; + rev = "be0768e9aa6f9b8e76f2230f4f7f4d152a766b9a"; + sha256 = "0mgcqqhjadm8ckp6x37f9j4xcs61g73m9v8qr4zbw115yci2d0xk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fd1380a9ba363f62f297e3ab2995341258b51fd1/recipes/lcb-mode"; + sha256 = "184vd5ll0ms2lspzv8zz2zbairsr8i9p3gs28hrnnwm6mrpx4n18"; + name = "lcb-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/lcb-mode"; + license = lib.licenses.free; + }; + }) {}; ldap-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ldap-mode"; @@ -35818,19 +36815,40 @@ license = lib.licenses.free; }; }) {}; + leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }: + melpaBuild { + pname = "leanote"; + version = "20160829.317"; + src = fetchFromGitHub { + owner = "aborn"; + repo = "leanote-emacs"; + rev = "28b2eda501b850174b0eda425ad59bd9bef8ed2e"; + sha256 = "11izm80swbg01hw5wx3imy6sssxgxhzb4sw30rb36kdamvk616dl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b00b806ae4562ca5a74f41c12ef35bfa597bcfa8/recipes/leanote"; + sha256 = "1xnfv7bpkw3ir402962zbp856d56nas098nkf7bamnsnax6kkqw7"; + name = "leanote"; + }; + packageRequires = [ async cl-lib emacs let-alist pcache request s ]; + meta = { + homepage = "https://melpa.org/#/leanote"; + license = lib.licenses.free; + }; + }) {}; ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20160716.1259"; + version = "20160716.1044"; src = fetchFromGitHub { owner = "ledger"; - repo = "ledger"; - rev = "67d21ed4b083424831e51a649060fbde7c2f735b"; - sha256 = "0jkalp1sggdj0nsms7jlyll9fzq3xxjf110jqwk9ydid0farbyzi"; + repo = "ledger-mode"; + rev = "96c4e81eed52e0ef514dc15a6ea6d877b3409a2a"; + sha256 = "12q6wblwnb6y5c1882jz14742fqbm6p5jpzlvz7p90ylqfl7h989"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/93c54a327f226bf7e6a0ab4a3368a0e1ca169e62/recipes/ledger-mode"; - sha256 = "0hi9waxmw1bbg88brlr3816vhdi0jj05wcwvrvfc1agvrvzyqq8s"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode"; + sha256 = "19vljgprgfpb9bkbdvkqnwc5pjn1rl0rniwav08a2c6kd2g59xaf"; name = "ledger-mode"; }; packageRequires = []; @@ -35968,12 +36986,12 @@ less-css-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "less-css-mode"; - version = "20150511.319"; + version = "20160819.9"; src = fetchFromGitHub { owner = "purcell"; repo = "less-css-mode"; - rev = "d59a3ff4031ae75fbbe77b6cfce7843205394c28"; - sha256 = "1w6mbk4gc63sh2p9rsy851x2kid0dp2ja4ai5badkr5prxkcpfdn"; + rev = "61f1d7219ec68e7471dd74d6e29cd35de49a2591"; + sha256 = "0bcf8j9lrcl3aaxzap4dsyz935xz1mp2pi3sfb009yr74cbnbgkc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/less-css-mode"; @@ -36010,12 +37028,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20160725.428"; + version = "20160827.205"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "b0f212ebe09ce47bce3a7e852d8c574acfd4fa61"; - sha256 = "1kvayvjh7c199h72ri8sbi3glanxsg6dxp0r1sa65cb6vp7p988v"; + rev = "a41db665be150c8d4435dad6b4d15824034f296b"; + sha256 = "05avd08kvi74ivi0dwdygwi984ga1vxb1xc3cqpx4ircknilbc9a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -36070,12 +37088,12 @@ lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lfe-mode"; - version = "20160630.1839"; + version = "20160810.1940"; src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "5fb22077167a725a5291c194a468e6f5dc5656dc"; - sha256 = "0q22yazhxlss6nk5qpk4n25blgq4w54xngzbng6319jz97ks9s2k"; + rev = "c097741baa2a6757c94d01857139e8401b018294"; + sha256 = "1kamlps1bzsvz4kc7c0fzv1930zg92w2zgj20ghwmlsk9bl14zpx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -36295,6 +37313,35 @@ license = lib.licenses.free; }; }) {}; + liquid-types = callPackage ({ button-lock, dash, emacs, fetchFromGitHub, fetchurl, flycheck, flycheck-liquidhs, lib, melpaBuild, popup, pos-tip }: + melpaBuild { + pname = "liquid-types"; + version = "20151201.2335"; + src = fetchFromGitHub { + owner = "ucsd-progsys"; + repo = "liquid-types.el"; + rev = "cc4bacbbf204ef9cf0756f78dfebee2c6ae14d7b"; + sha256 = "06rnma2xj2vnbvy1bnls59cagk6qsf862bj1zp6xbmpr1a5l9m4z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d5921fde4068ff1bb288f6f9e2fe03f4a7fdbbda/recipes/liquid-types"; + sha256 = "1g7zyak69l4lcsq952j2jy692xxnill9nqb1xfa17yzp547cgvf2"; + name = "liquid-types"; + }; + packageRequires = [ + button-lock + dash + emacs + flycheck + flycheck-liquidhs + popup + pos-tip + ]; + meta = { + homepage = "https://melpa.org/#/liquid-types"; + license = lib.licenses.free; + }; + }) {}; liso-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "liso-theme"; @@ -36358,12 +37405,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper }: melpaBuild { pname = "lispy"; - version = "20160725.513"; + version = "20160830.611"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "e8d98fbd4bf0dcc93127fde9cfe2bdec08df3de2"; - sha256 = "0n88snmblprj4iz78f9lwnpqz4r2f46ss05lh38fmamzlqky2rs0"; + rev = "7c2fe43bcbd2df86e1149b189b5d54e30602b57f"; + sha256 = "11f6d9wfnh2z8708rma020749rgckkiyap799hrgyw7hlysmgcj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -36400,12 +37447,12 @@ lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }: melpaBuild { pname = "lispyville"; - version = "20160630.1835"; + version = "20160816.1536"; src = fetchFromGitHub { owner = "noctuid"; repo = "lispyville"; - rev = "dbd76df9ef7838e7e746da344c6a67316f0a223c"; - sha256 = "1w5y698s7q95yv75lg1np2kvq5zlk2f3qlh0knxcs6lsy44qam30"; + rev = "a5648a611c7d538176b86dd1b3dcb6477c136f12"; + sha256 = "1h9a8jx0jajpi1kfw9n10q9zq842psh89z60ka3pvma5kwn8njyd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville"; @@ -36779,8 +37826,8 @@ src = fetchFromGitHub { owner = "rocky"; repo = "emacs-load-relative"; - rev = "49919120c93a05beede58ce7cc261e1f47721fdd"; - sha256 = "0n44sva0rhaxp7g1s9jkwji0f0x5h021mgplbs9arvrjc46sw4bb"; + rev = "b11fb74be7e5f465a2fe505e4d44cd13ec9ae136"; + sha256 = "0v0v036hq0qxj0yybr1fpsfkl01750nvl9q3c0sfiis9ylpqgzmq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f052f201f7c308325c27cc2423e85cf6b9b67b4e/recipes/load-relative"; @@ -36817,12 +37864,12 @@ loc-changes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "loc-changes"; - version = "20160716.458"; + version = "20160801.1008"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-loc-changes"; - rev = "d0ef370c773c04e6533e6725f76c69f3e4eccbe5"; - sha256 = "1w8n2md44w65rrvlyn5vw8a1mqzbm8ymc6k6215kd9fmjjkc2y86"; + rev = "4d1dcdf7631c23b1259ad4f72bf9686cf95fb46c"; + sha256 = "0a81933l3rrsbi9vkvfb1g94vkhl5n3fkffpy4icis97q7qh08mc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ce68d573d19f26ecfd190f8e6cd1f384ca3e8a/recipes/loc-changes"; @@ -37026,12 +38073,12 @@ look-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, look-mode, melpaBuild }: melpaBuild { pname = "look-dired"; - version = "20160529.1401"; + version = "20160729.1623"; src = fetchFromGitHub { owner = "vapniks"; repo = "look-dired"; - rev = "6b26f5c3f73b7a987c0a4eea99ae76c3aafea00d"; - sha256 = "0767s606d2iv9k1ffc4bmmkxammbysf9z7306cycbd3jrqdsakrs"; + rev = "9bfa4e5e6f3810705b6426c88493ea0bf6b15640"; + sha256 = "1yagp35ylznrh3a5ahpzrrxi6ma69ppwqsab3cwss54bi4f02ihn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef66b97b2e9034cb0c62dd1e37b2577ffef60834/recipes/look-dired"; @@ -37065,12 +38112,12 @@ loop = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "loop"; - version = "20160725.2005"; + version = "20160813.707"; src = fetchFromGitHub { owner = "Wilfred"; repo = "loop.el"; - rev = "48bcf97cd6ea37d70ad8b4afb3b0770ab70b43d3"; - sha256 = "1bapsndcymcs0d9sksh426r7r6x9qgdif2yrhmf5z869kz234syn"; + rev = "30c43568fca7688a70dc0e2e6f72738ee2d4f1fc"; + sha256 = "1vdfvndc967kagqzswxydcjp14hmfh8gfbm7i9000wb0pi8rpbdg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba481ca96469b3bd518e4fd8f24947338c8af014/recipes/loop"; @@ -37128,12 +38175,12 @@ lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lua-mode"; - version = "20160502.1141"; + version = "20160821.1216"; src = fetchFromGitHub { owner = "immerrr"; repo = "lua-mode"; - rev = "3019e7537ba807313f5536b39eb708d949a1cd23"; - sha256 = "03k7nqk6vz8949pj77lsmw2rrzip7xnfp5nyy18y5d8rvifrcdgw"; + rev = "33097fec0d32145389c6ec8c407a1b706c8e77e5"; + sha256 = "1dbvnm201i1vdaygsd846c9q7ykn3yh76b46ni0jgmfcc084cxq5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/lua-mode"; @@ -37212,12 +38259,12 @@ lyrics = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "lyrics"; - version = "20160722.1540"; + version = "20160803.1106"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "lyrics.el"; - rev = "72b1b36fe05eabc5ae7b97c0b982a2a2654bfad7"; - sha256 = "0bgq39ai2bsw7k6zkjj0ilvs3gfjd30y4zw6lc6ywf2zbnia8jjn"; + rev = "a8a613f2af78529a6285eb817fc5c6be07067e3b"; + sha256 = "1v6rgh78l3b15dr050ywlmn4zyksvmc9n2w9w69y0l97x438zncq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b04c8f3dfa9fc07cc0ff3df5c4069f864b6db92e/recipes/lyrics"; @@ -37377,12 +38424,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20160724.858"; + version = "20160827.1549"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "5834d0dbd471af0ce6537b4fc020fac05701267b"; - sha256 = "0nmpkh9nw3zzaw6ya6inr9zljdx5qjkkivmh2dlyird6sppdsqxy"; + rev = "ec81268eb1c08c164ce363acca777e0fd96cc2dc"; + sha256 = "08633gmcg63k62qrk1cs96hclvs9q2r6777kcb76xfa63xal9rfs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -37510,12 +38557,12 @@ magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }: melpaBuild { pname = "magit-gitflow"; - version = "20160629.1232"; + version = "20160809.1335"; src = fetchFromGitHub { owner = "jtatarik"; repo = "magit-gitflow"; - rev = "56f9934d3445fbeaf6ed6e7426e840b8e1db247e"; - sha256 = "0g8jm9ax4k59wkl3n65zy7hbqrvk85lw22mwza900xbwb515mm66"; + rev = "a2b7b85134784317445faee13d647fb62401ea23"; + sha256 = "1m6hnds12gpj66hcpaxgncapvslh0dml99r1vhg0r8rlmnmf0b9p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow"; @@ -37552,12 +38599,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20160725.1907"; + version = "20160821.1338"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "5834d0dbd471af0ce6537b4fc020fac05701267b"; - sha256 = "0nmpkh9nw3zzaw6ya6inr9zljdx5qjkkivmh2dlyird6sppdsqxy"; + rev = "ec81268eb1c08c164ce363acca777e0fd96cc2dc"; + sha256 = "08633gmcg63k62qrk1cs96hclvs9q2r6777kcb76xfa63xal9rfs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -37720,12 +38767,12 @@ majapahit-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "majapahit-theme"; - version = "20160412.432"; + version = "20160817.1148"; src = fetchFromGitLab { owner = "franksn"; repo = "majapahit-theme"; - rev = "017b6072560a6e3a4a9bd17652a9a9995cb53d52"; - sha256 = "1s4sm59wz03yz4srqzav7myq6p0gmijw5zj2kbpvxfanlr8b2rb1"; + rev = "77c96df7619666b2102d90d452eeadf04adc89a6"; + sha256 = "0wnhfdk2zwxqfh8d74xmszqgibcgxiq825pq8381zg4nkz5cckfb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9b793878de4107bb646652d09d8799aef8b97e8/recipes/majapahit-theme"; @@ -37762,12 +38809,12 @@ make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "make-it-so"; - version = "20160705.111"; + version = "20160818.58"; src = fetchFromGitHub { owner = "abo-abo"; repo = "make-it-so"; - rev = "4fea635f47f4c1d235c6b7535f420c0f7643fa87"; - sha256 = "0fng4v949nxm64fhiy0bnl9zf4p1av1wcd23hqjg4wfabxhvx5by"; + rev = "5417491b28ec6300823d8e20089b10a56a4b4dcd"; + sha256 = "0dqayvgjjac4kp1i8m0pp71y4g7mxa1vwm3cgwz00d1qxj9s3cxy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so"; @@ -38077,12 +39124,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20160722.445"; + version = "20160830.820"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "3ba1851ccc9338501ccf1e1c24085420d95f18f7"; - sha256 = "0d2mhy7npfh5vv1i0b61dvc7avgp0bkv2fqczsfb9vnq320zj06l"; + rev = "3f11a4a7609ba2a507ee10f491bdadab28e9b985"; + sha256 = "0yp6468fl15d8r6sbp3bhzp7nlrl98wjxmlyhd3vv336hwjqq7ad"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -38140,12 +39187,12 @@ markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, websocket }: melpaBuild { pname = "markdown-preview-mode"; - version = "20160604.859"; + version = "20160830.219"; src = fetchFromGitHub { owner = "ancane"; repo = "markdown-preview-mode"; - rev = "625c041efda1fa5e621c510770586baea1fd6a72"; - sha256 = "1r0aqy78671k4cgf6y6rilch0vrhcj22ff7bvpwpba7imb8mf1cj"; + rev = "25f1de28390a0b7be493e8f168749d851784ce12"; + sha256 = "116jms95wfdhlbcyn10nqq452jkplvhqwsl7al8f1zx4rn22snra"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/011d26360a109b074cdecbcb133269ec6452ab86/recipes/markdown-preview-mode"; @@ -38161,12 +39208,12 @@ markdown-toc = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, s }: melpaBuild { pname = "markdown-toc"; - version = "20160725.504"; + version = "20160727.908"; src = fetchFromGitHub { owner = "ardumont"; repo = "markdown-toc"; - rev = "15587c76bec43dd778a2034035f98a79ad29e96a"; - sha256 = "00rvpbfcdy1npddxa7yynqpzwrx1h2bm69x9yh42dv6ss3vk1sjs"; + rev = "297bb643e222ec2f95a23403723e45eaf4a1dcd2"; + sha256 = "0vk6zrxpinmzmgx74k1kc9kw6slb3j1z0lk4cyhcpxd202dm1bmw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4db1e90be8e34d5ad0c898be10dfa5cd95ccb921/recipes/markdown-toc"; @@ -38284,22 +39331,22 @@ license = lib.licenses.free; }; }) {}; - marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: + marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }: melpaBuild { pname = "marshal"; - version = "20160725.1851"; + version = "20160807.1954"; src = fetchFromGitHub { owner = "sigma"; repo = "marshal.el"; - rev = "d62a406abb9e8c3dfb8513452402845c55ade6ae"; - sha256 = "164nx0bk8h0p38j8gprcz2zwdqwbjxfcj3idlc5ryqm165h5cwmy"; + rev = "6332b3f567f3a09ebed8f7f01e99e503f096e2a4"; + sha256 = "1i0w27fbm9vyz8g3pv4ksmzmabflwzcb5705g5zb696kl20n6jxz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal"; sha256 = "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl"; name = "marshal"; }; - packageRequires = [ eieio json ]; + packageRequires = [ eieio ht json ]; meta = { homepage = "https://melpa.org/#/marshal"; license = lib.licenses.free; @@ -38333,8 +39380,8 @@ src = fetchFromGitHub { owner = "cpaulik"; repo = "emacs-material-theme"; - rev = "143e875ad9a8729d718572271e3f673201149065"; - sha256 = "1j1282bvsjj71nhswpz0nr11gc7nzxvr113ara49ya58vqhm42gb"; + rev = "f9e2c7f86f94cb9a23be6bb618cb31304a491841"; + sha256 = "0nh016z84hx86rd09xvwajm44259viwgl1dx33d6z9dcjpp7f1mm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d31ababaa50061e767605c979a3f327a654e564b/recipes/material-theme"; @@ -38392,11 +39439,11 @@ matlab-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "matlab-mode"; - version = "20160527.1352"; + version = "20160815.50"; src = fetchgit { url = "git://git.code.sf.net/p/matlab-emacs/src"; - rev = "64f2a5635fb3c690ed22d40779ea930ed5130b5c"; - sha256 = "1yfh1j85lnjn58dhrb54wz4ggkbl5gw6wnbx8abknryjyg6c483a"; + rev = "32a69776d12882902a8a42826b6265d9505051f3"; + sha256 = "013h9ph6vabq63k0xwavm313ni2523vjarmbkfm5s5ras2kw020n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39e384608df76bb3e91bd1405e3a5029181ff94e/recipes/matlab-mode"; @@ -38412,11 +39459,11 @@ matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }: melpaBuild { pname = "matrix-client"; - version = "20160718.915"; + version = "20160806.2045"; src = fetchgit { url = "http://fort.kickass.systems/git/rrix/matrix-client.git"; - rev = "7b4159f3f594bdfd6c592a8fa3fbeece2f66ae19"; - sha256 = "1m8ws0w7lk51s2yh4jphzn4l9as2qgw8gcjpg63p641ccs5s4pvd"; + rev = "987f6e9cf71843d638d8ad16f02da2f8a7f103e2"; + sha256 = "1h8zwwc7kwalqiliv07zjnw9rrb1gdhs6x3j67r6innnq1rw3z49"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/152969c540b57c0a9532e698c24eac0de5e0269c/recipes/matrix-client"; @@ -38597,12 +39644,12 @@ md-readme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "md-readme"; - version = "20150505.2359"; + version = "20160811.946"; src = fetchFromGitHub { owner = "thomas11"; repo = "md-readme"; - rev = "9f3630d3ad2b83ec20968cf02c6613c53e8e32ec"; - sha256 = "1j8gp3byanf1mq8sc4hv838rgcywlv35d8q1vjwzsjaznvz8hvc3"; + rev = "bf818dd847c8b06b3b5100c5d3cf24cf96662528"; + sha256 = "0gyjadkv572v3zilxivbiz28pvqh0jmi5bh5la1hyim0qnxymli8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5408d7c12c189d2b5ab9fbb02276de334851e3c8/recipes/md-readme"; @@ -38847,8 +39894,8 @@ src = fetchFromGitHub { owner = "myTerminal"; repo = "meta-presenter"; - rev = "bfdbe68384466bf3eb991d05c7f371f0b52a382f"; - sha256 = "1x425ah3ymjyp3pxvyzyp4gd8zrjx8lgdzprml8qvf1yk82iv45l"; + rev = "1a92f65114d3b6f83d822494c224a406fdaf6e33"; + sha256 = "03lpl8zkcys0p8x95s8d2izq7phgkl5g713sbxhblsl4yl8sbsjy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b73e9424515b3ddea220b786e91c57ee22bed87f/recipes/meta-presenter"; @@ -38948,12 +39995,12 @@ mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mew"; - version = "20150813.2354"; + version = "20160818.1927"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "Mew"; - rev = "ff9c41b981fb6050121a3831825d0349bffeb9ce"; - sha256 = "1rkipcv53p7zra3gbjc77ywyxn8d1kx2gniyfqq16d2p2jw0lbzb"; + rev = "00dacb8b7246cb36efaff754ba1ebdcfc9a02217"; + sha256 = "0bbn1p0wmmjdhipdvc0vs0mzl3q7p355ffdrfbwvvs523zdfv4nd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew"; @@ -39588,12 +40635,12 @@ mocha = callPackage ({ f, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "mocha"; - version = "20160524.723"; + version = "20160818.1456"; src = fetchFromGitHub { owner = "scottaj"; repo = "mocha.el"; - rev = "f9e27d8c3f22571da2249352c88720e6e50d7d45"; - sha256 = "0wchypjjmsyb8wsnfh49nw93af5y4fa2r4ksxmfxc53d04sgzya9"; + rev = "7a658c112220d759fccb1c16e49f3712d8bb1af7"; + sha256 = "0gwgq5iq7lazy596hsld0yib88r1wv57wb92rjga79vbmg5pi1nq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c26134ba95f277a4e9400e506433d96a695aa4/recipes/mocha"; @@ -39672,12 +40719,12 @@ mode-icons = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mode-icons"; - version = "20160531.1708"; + version = "20160808.525"; src = fetchFromGitHub { owner = "ryuslash"; repo = "mode-icons"; - rev = "53ac2b364fed1797d083e4db1c9dcd5b75c4a8a0"; - sha256 = "1xpskmmmc8xgz0n35fdq7k8ms21pjwd3m9zk9gshf2gyzcsb4mx1"; + rev = "0b5e76b2418d455bf7cf8ee52dd3354964626b5e"; + sha256 = "1z9jrc85mlgcqpyys9filyaav7f8asn2w5dd2q5wp4s7i3gj8mc2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mode-icons"; @@ -39792,12 +40839,12 @@ moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "moe-theme"; - version = "20160713.1146"; + version = "20160814.2212"; src = fetchFromGitHub { owner = "kuanyui"; repo = "moe-theme.el"; - rev = "8545478b57f356d87d49c462091e39414b50b258"; - sha256 = "0bij509xypqihlqp8ydymg7i61q9hj46ah1qqaa613d3x29vc2n6"; + rev = "c27112439d1567421922bd582ea525f4597ccc5c"; + sha256 = "16f4dphpnwpq5kw8k5pchq3l909b4qcgzqnycqfjgdr7ssjp5n4i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme"; @@ -39897,12 +40944,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20160706.1552"; + version = "20160814.659"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "02c5f5d5a5d3ee93a1daa16117471197817f3bc8"; - sha256 = "0w18lwp3vn1f9rq9l8s434l2f16rgrp9i1x0c2vbzd5c9xzaq2fi"; + rev = "53f0ba96f0417885e7d3955d8750de6763f99444"; + sha256 = "1azyrvhvyrd5n7djyh324famzab9w5c81bm3nv04p93gd92mm6zh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -39918,12 +40965,12 @@ monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monroe"; - version = "20160615.605"; + version = "20160808.654"; src = fetchFromGitHub { owner = "sanel"; repo = "monroe"; - rev = "e86fa4e6e4d73ccea336575ad343bfbea2cc6f8c"; - sha256 = "1hhmvn98ckdy7avjyf4dqd3rbrpyjr5fz9v93vbdsnrgzp0wd8gd"; + rev = "0b9b043f042145bf62969add7ec476ea51da7cbd"; + sha256 = "101lfrykdbv37spkbw7zihhx26bc1lhjyxbanrcp9880bxj04jiy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe"; @@ -40374,12 +41421,12 @@ mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "mu4e-alert"; - version = "20160725.1102"; + version = "20160814.145"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "mu4e-alert"; - rev = "3af4808b2c8bfac7882a727f32d0fc4bc20cb821"; - sha256 = "198mgzcdpiyk2vid9rhdgy9109za7nnhp0mr51adpb74vdd37v3i"; + rev = "12d3c458e8a45440776f6560c5f22a090ff24769"; + sha256 = "0iy3lslr3w4npfqasgn3bv5akdc7h7csx7amcybb21dzwi38bi23"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a48e8cb571e91b582ff0dea18e8dc75601edc35/recipes/mu4e-alert"; @@ -40473,22 +41520,22 @@ license = lib.licenses.free; }; }) {}; - multi-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "multi-line"; - version = "20160601.1445"; + version = "20160829.1830"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "multi-line"; - rev = "6f6039748de47ff9400775696554dd8e6617c7ef"; - sha256 = "08zyplahyfr6wa145fsggqyn5nh8x4nx98znz82g38pyh8yn2i1j"; + rev = "2d31d60e240caa321a2f57345b395dcc6fdb874d"; + sha256 = "19p8x43dsqvm2nfjdwb1imcwqkajc0vb2d8xqjswg894qiinkrlr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line"; sha256 = "1aadmijnjr029s1qq4gk8xyl9m8xb5x5774b8i3jyfixyjqvhvwp"; name = "multi-line"; }; - packageRequires = [ emacs s ]; + packageRequires = [ cl-lib dash emacs s shut-up ]; meta = { homepage = "https://melpa.org/#/multi-line"; license = lib.licenses.free; @@ -40602,8 +41649,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "multiple-cursors.el"; - rev = "95f2e41fabdeb464efb11d32df30a4a1d532625a"; - sha256 = "1pinw3n4pfkkwi99jgb57qzqdbkmr7l5zd4qr4jwanl1xbknz5pf"; + rev = "dfaf6215fced1eb81ce4b91e8a19a7346e94325e"; + sha256 = "0ii8a2r2ijhlz483fy64jg67ch4w3s90s23gdcxmpzcn4jzia3jj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f015e6b88be2a5ded363bd882a558e94d1f391/recipes/multiple-cursors"; @@ -40865,6 +41912,27 @@ license = lib.licenses.free; }; }) {}; + mysql-to-org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "mysql-to-org"; + version = "20160817.1453"; + src = fetchFromGitHub { + owner = "mallt"; + repo = "mysql-to-org-mode"; + rev = "4cbb45a32ba5c286bed73b77470d29160a192b44"; + sha256 = "10gnppqj3f15nzsm93si83f0z8qzvijv4642lbhgdlxvm2q19rfw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ca23f61be1dc8b0ae2ec0ae38d4614cf9c855023/recipes/mysql-to-org"; + sha256 = "13ysgvqp7bafiaz0f9kg4pq2idndj4r804q6ih64bac8gqhnmcv9"; + name = "mysql-to-org"; + }; + packageRequires = [ emacs s ]; + meta = { + homepage = "https://melpa.org/#/mysql-to-org"; + license = lib.licenses.free; + }; + }) {}; mysql2sqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mysql2sqlite"; @@ -40893,8 +41961,8 @@ src = fetchFromGitHub { owner = "myTerminal"; repo = "myterminal-controls"; - rev = "d772b847442570f5fbfac1bd53184b7778361813"; - sha256 = "18wqgjn38jxzsbivmf2fkcq3r1y4lffh3dbpv1jj7s9qn91pyp6a"; + rev = "9f4ad8007064b40302bc43bf826e17ef5c1bc70a"; + sha256 = "1517lhialks2404s2826vkvshqwjdsxyvqgysp6awmblg676k9yv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a82a45d9fcafea0795f832bce1bdd7bc83667e2/recipes/myterminal-controls"; @@ -41179,12 +42247,12 @@ naquadah-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "naquadah-theme"; - version = "20150923.141"; + version = "20160819.121"; src = fetchFromGitHub { owner = "jd"; repo = "naquadah-theme"; - rev = "f6308bb7d110f1e6d6a91db901f8fb3f99da12ac"; - sha256 = "0mxf61ky1dd7r2qd4j7k6bdppmkilkq5l9gv257a12539wkw5yq2"; + rev = "37e822ccea0ff4a6eb79ea6615a1fd6dc6c72d51"; + sha256 = "1z6fy97x9753fprvrmnmplnqwr6xl8hgvwkpi6fp6awcb0wrza3d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/naquadah-theme"; @@ -41260,12 +42328,12 @@ nash-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nash-mode"; - version = "20160710.1753"; + version = "20160830.512"; src = fetchFromGitHub { owner = "tiago4orion"; repo = "nash-mode.el"; - rev = "5d83ce21069b10ae7d1fb42607a9667f641b21a4"; - sha256 = "19a79ih0rprbvc9knxplmr8s8c9kpsqyz1s0gvbbs0w23jh92fb6"; + rev = "bb7ae728a16812a0ef506483b877f6221c92ca9c"; + sha256 = "1n4dxbd388ibghismc5d1nkvxwxdi4r415prsaa3qad8l9s4ivwh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8bd080c81b163a6ddcfffc710316b9711935b4a/recipes/nash-mode"; @@ -41467,15 +42535,36 @@ license = lib.licenses.free; }; }) {}; + neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "neon-mode"; + version = "20160811.216"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = "neon-mode"; + rev = "370212fa9ffcba3ff542a154d17ccf5be1066c4c"; + sha256 = "13a760jidh00czl05c0pnpbxzr7smrkf5ms9kd3h1cq613ffapby"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode"; + sha256 = "0kgyc0rkxvvks5ykizfv82f2cx7ck17sk63plj7bld6khlcgv0y6"; + name = "neon-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/neon-mode"; + license = lib.licenses.free; + }; + }) {}; neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "20160727.41"; + version = "20160802.51"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "ddf21ac355032b40a27b203d6698772144193b67"; - sha256 = "0npawzxx22bi8f8wcg46ggypdm5s88xdzwzfi4ijw4j0qpjrgrrp"; + rev = "5982766558bea413b0c15c807aa45bb36a296eed"; + sha256 = "03xcziqli0hwpcggp94vgswn27np0a05rcr4dgzksviyn4gb9ixc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; @@ -41680,12 +42769,12 @@ nim-mode = callPackage ({ commenter, company, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "nim-mode"; - version = "20160727.30"; + version = "20160827.1217"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "edf245f6c49072e030f8e8c3ede67859fb8eaf50"; - sha256 = "0hrgr2pijwh1zxg9wv0cwg1hpb5pgs2d7zswbr01fkamfbdajlyc"; + rev = "208f42612b66b2d2cfc25381035f94b75c6364f2"; + sha256 = "0rcvfkknvy6pwvgl9h66lky5kw4kcjanpj7lisva9s5a4iq8z0jb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; @@ -41705,8 +42794,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "5739c144354c826b57042ad0968680c272a95856"; - sha256 = "0p6gj5hip5fiv0wbiwdv7cp89x9bcb2xzfrfwm0x8a0mz653bn63"; + rev = "94fc14314501a78b1742e910f7c920188b2753da"; + sha256 = "05r6335i9fivinb2cny96wvvkcn1fwaqq7ax1nkzqsag27nc7qp5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -41726,8 +42815,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "ee22a91ab847f63a22466f3bf63e33ca29da9cfe"; - sha256 = "0dpmhsxjckz0hsg6dsbmgycv1adi08ymz29x9m2biap73l2zm8yp"; + rev = "d74c8a3f4e1131ee9dbd9898d141789832802306"; + sha256 = "00b0gi26rbxg5hsnn2zz0404kaqyn3bmlf7dz09knvpq4w77gsgj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -41848,12 +42937,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20160620.544"; + version = "20160828.458"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "5ec9bd5e60415c533293c3797e038890c3fa7a22"; - sha256 = "126fys33xc92x42cacgabcpskl3i32cshwbqlk7vk75p9phxz3gs"; + rev = "537e584d115fb056a23a0b055e0a28f543182c45"; + sha256 = "1cma5047c3486bjfshb612iq6j3yml0c02gqy8d0ms9507r60igq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -41992,11 +43081,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20160628.20"; + version = "20160811.416"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "92d8eae8f182e4eebc87d76f8d4f37e6c018883a"; - sha256 = "00qf4n7v44rl5ax7bpadqnpprqvilfbm733mya6bd3afribcxdd3"; + rev = "59fed50a82b0a625a7303099675484557fed9d23"; + sha256 = "12d2xna8fn5n9axpc8c75dq1ikc7fnrqsgh27d80j1lw22i2ds21"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -42195,6 +43284,27 @@ license = lib.licenses.free; }; }) {}; + number-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "number-lock"; + version = "20160829.1900"; + src = fetchFromGitHub { + owner = "Liu233w"; + repo = "number-lock.el"; + rev = "1ac1b1a269128ddac820df7d45a8d0c703e9c05c"; + sha256 = "11pqm2f8bx3m9mnvpjbvq8vd8sym7zpq7n0y4lbkybiyxswjrv5q"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3c107adabe2e4c5b35ebb6b21db076cdea0e9c24/recipes/number-lock"; + sha256 = "13xqn4bcjm01zl0rgbwzad58x35230lm2qiipbyqkh2ma0a9pqn4"; + name = "number-lock"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/number-lock"; + license = lib.licenses.free; + }; + }) {}; nummm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nummm-mode"; @@ -42404,6 +43514,27 @@ license = lib.licenses.free; }; }) {}; + ob-dart = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-dart"; + version = "20160707.2040"; + src = fetchFromGitHub { + owner = "mzimmerm"; + repo = "ob-dart"; + rev = "ded30450a1550af30edb422cfa8cb7b43995b684"; + sha256 = "0896mpjbl5j1b4d0h25k03xbi8dzb99gz1gvmwj5x1i7fcflhv6r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3219b9623587365f56e9eeb4bd97f3dc449a11/recipes/ob-dart"; + sha256 = "1lqi4pazkjcxvmm2bdpd9vcakmdclkamb69xwxdl44p68wsq2gn8"; + name = "ob-dart"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ob-dart"; + license = lib.licenses.free; + }; + }) {}; ob-diagrams = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-diagrams"; @@ -42495,8 +43626,8 @@ src = fetchFromGitHub { owner = "gregsexton"; repo = "ob-ipython"; - rev = "950dbde87947f9e8f53f521d4bcf239f3be8ef71"; - sha256 = "0my3wwdx9rn1772mrdbbfmz6vlp580n6m6k9j1j9vmpybfkzhfjw"; + rev = "12e764aa231d029368056796452f644a3adba856"; + sha256 = "0k1jmacvfl2kxbc9xan93nivvnc3j3k17qp7xjmhrlrx1gdx63lr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython"; @@ -42614,6 +43745,27 @@ license = lib.licenses.free; }; }) {}; + ob-nim = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-nim"; + version = "20160830.220"; + src = fetchFromGitHub { + owner = "lompik"; + repo = "ob-nim"; + rev = "71131f184994e0a81ed291fc3faf1a29dae8c5f3"; + sha256 = "011z8scb6pmhkm6qzpdqich4h4pxpac58zirddbrnal3nf37kmqh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7263ebadeabe36359c14ffb36deda2bc75f2ca61/recipes/ob-nim"; + sha256 = "07i9n9z9xswbisq4rvgg7vbqj28c6j1xk96kpdbk8ffdvgybcpfz"; + name = "ob-nim"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/ob-nim"; + license = lib.licenses.free; + }; + }) {}; ob-php = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-php"; @@ -42761,6 +43913,27 @@ license = lib.licenses.free; }; }) {}; + ob-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, spice-mode }: + melpaBuild { + pname = "ob-spice"; + version = "20160815.2249"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "ob-spice"; + rev = "0ea589f852de4b1eb239c985be9f960367aa5c1a"; + sha256 = "10cyqjqbv87n3d1m3v6vxlyk3xzazms6876ay30nhkd4dbsw8kak"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6142975cf9c0b9faaf128be34d30e12a88b500f8/recipes/ob-spice"; + sha256 = "13a6g9sh6wvlshvzlllxn8zchb6cb2m0ar14fqvrz5g4hn4hbsm8"; + name = "ob-spice"; + }; + packageRequires = [ org spice-mode ]; + meta = { + homepage = "https://melpa.org/#/ob-spice"; + license = lib.licenses.free; + }; + }) {}; ob-swift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-swift"; @@ -43016,12 +44189,12 @@ octopress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "octopress"; - version = "20160123.1406"; + version = "20160731.1150"; src = fetchFromGitHub { owner = "aaronbieber"; repo = "octopress.el"; - rev = "842907662c613710a87feeb1e4a29f4d32111683"; - sha256 = "0p9ph62vnw1r9dbvrjyw356a9bjnzh0hglssi97dr0qd6cs8whf3"; + rev = "4624d8d58f1d571372827af20bddf55d2c97a36f"; + sha256 = "1d32ba8vpi6ladqzfnglizwj4w0jay57cwx4hkz3hizrsc7f4992"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7205d3d43797755077f19f57f531b4b39e77bae3/recipes/octopress"; @@ -43079,12 +44252,12 @@ olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "20160703.702"; + version = "20160823.244"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "b4094d34cc78c461eccb68eff6c80bd7553f16a0"; - sha256 = "1viygvkknkxniyfilafqpwbz9c71rrdbc2ad4h6dp0lwaxjpzhfy"; + rev = "d2c54acf566a9ee38021261f7d8f43a94c9eee8c"; + sha256 = "1rh6vi2vi50zkmcd5jyfnhhsdrfn6l9abd43l8ppgr3k93l3m5bl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -43277,12 +44450,12 @@ omtose-phellack-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omtose-phellack-theme"; - version = "20160712.1314"; + version = "20160820.812"; src = fetchFromGitHub { owner = "franksn"; repo = "omtose-phellack-theme"; - rev = "86ad2a63c62c3ca99c5426b697493d60a580b2a0"; - sha256 = "14anks7jif9jp1j5b7qcvm4934m4xcaicghwxa1w5s2j0rmjnycf"; + rev = "2c2da8950d7429e710dc785c92d38fe9ba254a4b"; + sha256 = "0zzj1kjzqdjjvgm5yq44fyh4gb8gqkx9wjzxd0yzz3ihklgz3d09"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/478b1e07ed9010408c12598640ec8d154f9eb18d/recipes/omtose-phellack-theme"; @@ -43442,12 +44615,12 @@ opensource = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: melpaBuild { pname = "opensource"; - version = "20160625.31"; + version = "20160802.303"; src = fetchFromGitHub { owner = "nlamirault"; repo = "opensource.el"; - rev = "94bda9a55ae564b6e96688c4619541631ba8354b"; - sha256 = "1bg46qbp4kvfw587ryrsqml4w4l520gajgpva14rs77s7qjbr2f6"; + rev = "27d06be45c852e84e47c33cbd0f4c344fd9a0370"; + sha256 = "1rjf78vki4xp8y856v95877093p3zgfc9mx92npscsi1g93dxn80"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9925f059f0caf0550a747d1f07e043e9d854f77/recipes/opensource"; @@ -43629,16 +44802,16 @@ org-beautify-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-beautify-theme"; - version = "20150106.956"; + version = "20160829.2146"; src = fetchFromGitHub { owner = "jonnay"; - repo = "emagicians-starter-kit"; - rev = "5fadbf1bf84091b6ffe6cd1bff48f30e3da6c479"; - sha256 = "00iklf97mszrsdv20q55qhml1dscvmmalpfnlkwi9mabklyq3i6z"; + repo = "org-beautify-theme"; + rev = "26f5ce5769d8d1848f331c6076b7b6ad1a162f08"; + sha256 = "1d64ihrcy13gr7xj0nzajxjgqzlp7j699yd225aii5fjn740njiy"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6949c34b33f2a1c3273045049359b54f96a79552/recipes/org-beautify-theme"; - sha256 = "1j2gi3f72kvavdcj6xs7zng0dcnivrhc7pjzm2g4mjm5ad5s1flq"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/f55f1ee9890f720e058401a052e14c7411252967/recipes/org-beautify-theme"; + sha256 = "0rrlyn61xh3szw8aihxpbmg809xx5ac66xqzj895dn1raz129h2w"; name = "org-beautify-theme"; }; packageRequires = []; @@ -43734,12 +44907,12 @@ org-chinese-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-chinese-utils"; - version = "20160727.300"; + version = "20160811.217"; src = fetchFromGitHub { owner = "tumashu"; repo = "org-chinese-utils"; - rev = "9e568ea7a999238d475b1e6c7b5c151f7621fae8"; - sha256 = "152r7ak085jvm7ayfi24cj1nimqkhpnxi6drxvwsqjl05biprbqd"; + rev = "3818d03bde90433b49b8ef8cffdd242084af4058"; + sha256 = "0rlqr0b54rv8p2015vgb730r3lqwxg3v0msiimwxlhfhgww1pg2b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/org-chinese-utils"; @@ -43755,12 +44928,12 @@ org-cliplink = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-cliplink"; - version = "20160319.500"; + version = "20160819.900"; src = fetchFromGitHub { owner = "rexim"; repo = "org-cliplink"; - rev = "d4853156961f81210ae1a6742f11ea1ee297fde6"; - sha256 = "048mcjgls405wwvn2r90cxkyw9z2nf97gif86k0gxk7yrbbkiy2x"; + rev = "4c7c126ad3421ef076e4eb6358c57389b40a5e53"; + sha256 = "1z514mrppdd3yir6apyf12nqhqsmyzlrh1xfvcb8m6q2f12ny7f2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ddb13c59441fdf4eb1ba3816e147279dea7d429/recipes/org-cliplink"; @@ -43776,12 +44949,12 @@ org-clock-convenience = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-clock-convenience"; - version = "20160529.723"; + version = "20160830.1156"; src = fetchFromGitHub { owner = "dfeich"; repo = "org-clock-convenience"; - rev = "40b86b6950e9118c660e2234dab2f413f36f5692"; - sha256 = "1imy615qvkw6qfd6ngvillhkqbrnb5mxiqbfy4sm7wq5q76qwkm5"; + rev = "d4f98e95d75d78822ddfab6b67bc971516f9773c"; + sha256 = "0s69jqadrgsmlv74386i900gr6xr3kgr5x1n75gqf4rsdmhx4s5d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a80ed929181cdd28886ca598a0c387a31d239b2e/recipes/org-clock-convenience"; @@ -43794,6 +44967,27 @@ license = lib.licenses.free; }; }) {}; + org-commentary = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-commentary"; + version = "20160801.2337"; + src = fetchFromGitHub { + owner = "smaximov"; + repo = "org-commentary"; + rev = "821ccb994811359c42f4e3d459e0e88849d42b75"; + sha256 = "0ixhyn8s7l2caq0qpv9zlq9fzm3z8b81755c3yffnk5camnij6py"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3e0a40d9ea5849b9c22378a84ac8122e4eb2737d/recipes/org-commentary"; + sha256 = "0ym1rq2zhyhc6hkk40wsa9jni2h1z5dkaisldqzg8ggl7iv3v4fx"; + name = "org-commentary"; + }; + packageRequires = [ dash emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-commentary"; + license = lib.licenses.free; + }; + }) {}; org-context = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-context"; @@ -43864,8 +45058,8 @@ src = fetchFromGitHub { owner = "omouse"; repo = "org-doing"; - rev = "e099514cfc162f8fe3d383456a7964743b0455d5"; - sha256 = "1hvnrw0y3chlfv6zxsczmm8zybrnakn3x13ykv2zblw96am9kd2s"; + rev = "a79b5ef87c5e7452f29770721fe961c7110d16f5"; + sha256 = "1jmwwid3y8g9jihjvb91i0ch39zw0hbaylgmnzgghpqipkif9pmk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c497b87e14ab614c963f4b2f041bc0111b6e936/recipes/org-doing"; @@ -43902,12 +45096,12 @@ org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-download"; - version = "20160620.607"; + version = "20160814.237"; src = fetchFromGitHub { owner = "abo-abo"; repo = "org-download"; - rev = "734e22acfad4154b4fb92226a3825b46d74e7d10"; - sha256 = "1s5jfl9945da6kfid1aj25v0nr1c6ivvxnprsxv8anz8vd7na4qd"; + rev = "ec2dc69b7a49054bc0d34c6533cdcadba708db67"; + sha256 = "1fdzn8qfhalk15g5cfyywi99wmmgx6ck6b24zsgsr38jphcih0k1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download"; @@ -44025,27 +45219,6 @@ license = lib.licenses.free; }; }) {}; - org-eww = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: - melpaBuild { - pname = "org-eww"; - version = "20160521.1458"; - src = fetchFromGitHub { - owner = "lujun9972"; - repo = "org-eww"; - rev = "5c8c302a7994f26d9c50b36d5e5a94287501a9d9"; - sha256 = "0aa7hzn8ss6b7p24qxgwvz8w3kd2lcr98wj315c0c5zhwdrcw2rj"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b73c06723bfb47c29c2cb2ad2bfe4db79a01f2af/recipes/org-eww"; - sha256 = "132asshgfpphjckd5vz1vcs18lj55mrqs1l4ggfa89rc6aj8xrca"; - name = "org-eww"; - }; - packageRequires = [ emacs org ]; - meta = { - homepage = "https://melpa.org/#/org-eww"; - license = lib.licenses.free; - }; - }) {}; org-fstree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-fstree"; @@ -44069,12 +45242,12 @@ org-gcal = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred }: melpaBuild { pname = "org-gcal"; - version = "20160307.1206"; + version = "20160805.2144"; src = fetchFromGitHub { owner = "myuhe"; repo = "org-gcal.el"; - rev = "51fae3a77fab26f81705e9cdcfc62a524ea902e0"; - sha256 = "1di32pvkqbd90f4j4d07gdbba6d0fzyhw5lsynz7cl6yrh5y9cpr"; + rev = "4a5c9eb487b3206771bac0ef2016492af628fc3a"; + sha256 = "1lhy8cjzz2bkw2g0ihvh6yxaavg4g3zrvnzlqi9p2y0lcw1w65lr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2d5bd8d8f2616dae19b9232d9442fe423d6e5e/recipes/org-gcal"; @@ -44195,12 +45368,12 @@ org-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-jira"; - version = "20150911.558"; + version = "20160821.1939"; src = fetchFromGitHub { owner = "baohaojun"; repo = "org-jira"; - rev = "eb4f3012d64bcab0c28491a26eac085ccae5bf78"; - sha256 = "0b5f8qkyzh4jwj3kvbaj3m4dpjbvh1fql7v1nb9bi5n7iwkv3lxp"; + rev = "da3c987fc078ea142632bf9f050adcac719f9a9d"; + sha256 = "0zkabdqjkazcl6y4yn5c1lrhw3qny8dm51mjf18pfcfvz8fmr13c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d83f6897d422f81eef83933c49d82fc5db1d1ae3/recipes/org-jira"; @@ -44537,12 +45710,12 @@ org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "org-projectile"; - version = "20160617.1206"; + version = "20160822.2123"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "0a5977b0de68d26ec93ffad4c5099b7e64b5b361"; - sha256 = "0nhf1hwirwmznrqsf0lfjc9l37z206wdmbsz55a8wz36rhvrjv3y"; + rev = "a3c95858fc4bbc7b38f4e7253979942118f0a2ed"; + sha256 = "0k3r78nx0gd8azcam1lzrjkxlsv0a6dzbscij8prdj1l7j9r2mxm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dde8c06c968d4375926d269150a16b31c3a840e/recipes/org-projectile"; @@ -44648,12 +45821,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20160723.754"; + version = "20160830.1546"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "0f4cdc1f47ce358247ca205a2ce8738fac84a06a"; - sha256 = "06ls7hv72pj3fm62cca7ck1zb61rbwsbpimcrfhk18xc4l6cj4lp"; + rev = "db328ff7a2d42e1f8bde9ae15d43638e16cff5c9"; + sha256 = "0bk6bkaa6c3c2ahyag28aqixkyqwsc23yhc06n89drs9zjv3nrvj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -44980,16 +46153,16 @@ org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, web-server }: melpaBuild { pname = "org-webpage"; - version = "20160307.26"; + version = "20160818.643"; src = fetchFromGitHub { owner = "tumashu"; repo = "org-webpage"; - rev = "478fd463c3c406397b2e5d2d7e3bb97fb7940e01"; - sha256 = "18idnl2hx1s5hv1xm5akd35favnjnj2pxw6h00956lrapg01d1fn"; + rev = "66670bcfa6ed89cfbe67f144b53b9cf7202613e1"; + sha256 = "1n578x8ysxribmsm9gsg5y4anvq6zl8bypw6qgasnlagb00ppa3d"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ec6c05bca203460d85bf139038891f78354fb73f/recipes/org-webpage"; - sha256 = "0vwv8cv38gx8rnfskbmnaf8y8sffjqy1408655bwhjz6dp69qmah"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/1428ef6b2291d415ae2114de123652d9e378398e/recipes/org-webpage"; + sha256 = "0ndvv5kw65p5shgg0gn3rpxz3zbxgcpa6an4m4yxms0ma72xw124"; name = "org-webpage"; }; packageRequires = [ cl-lib dash ht htmlize mustache org web-server ]; @@ -45106,12 +46279,12 @@ organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "organic-green-theme"; - version = "20160712.153"; + version = "20160811.1539"; src = fetchFromGitHub { owner = "kostafey"; repo = "organic-green-theme"; - rev = "9955ef16b129cf5613ea25f71c522cb323395ccf"; - sha256 = "0ny3kzan2jdq8h2264kvd0lbglnz7jmgl59rf3d265i9bbhnxqdx"; + rev = "e36bea4f8d424a856225639d9195afdc40dadb5d"; + sha256 = "16vc6f0c2ba14fgvplxdxzrdfqagfxgp9apiz5bvbbfs2gb7gphk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9383ef5f0372724b34f4bb9173ef8ccbb773e19e/recipes/organic-green-theme"; @@ -45148,12 +46321,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "20160119.1424"; + version = "20160801.715"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "12bfadf603d8a1f616a1bdac5f909a0c20e6aba4"; - sha256 = "1wxxdx3c5qacsii4kysk438cjr1hnmpir78kp6xgk9xw5g9snlnj"; + rev = "3747e49964fc4e96c41aa10a5553d7ad609e8f43"; + sha256 = "1x3pdk5wgk4cw9qq2l2d0baidnrjxj1qjdp6ajx7hlmwmxl7c203"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -45379,12 +46552,12 @@ osx-lib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-lib"; - version = "20160719.1259"; + version = "20160830.1149"; src = fetchFromGitHub { owner = "raghavgautam"; repo = "osx-lib"; - rev = "530ecdaa501b4bd8a6c75564719ab04f7caa3dca"; - sha256 = "1kvh3ks3y69nr63k899bfrnzysk3hfjx8x3hxkq233gphpf6xs6v"; + rev = "448dd983427a6130ff5606d3eff4198efedd54da"; + sha256 = "0g7iybibja08babmvdkdhdya97lxxyhywwy5ngis2zh7jkazsy3h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b42ae666e3511752f5138927e7bf7965bd9f7ee5/recipes/osx-lib"; @@ -45715,12 +46888,12 @@ ox-clip = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, org }: melpaBuild { pname = "ox-clip"; - version = "20160705.458"; + version = "20160816.507"; src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "5c38ef3f600daa652938d8933b97aa3b6e077891"; - sha256 = "13k1llsfqwk65zws5zvxq7a61f0n7qbi8gjbndwzrrr225nkx6qn"; + rev = "c6e287d1de2e85e23b4c39afda97f654ac08aa0e"; + sha256 = "0in2w1wcillq6gf5qyjqprdn2n7bzp612s5zrqhpc9vwz2krzd1d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -45736,12 +46909,12 @@ ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-gfm"; - version = "20160520.1442"; + version = "20160805.928"; src = fetchFromGitHub { owner = "larstvei"; repo = "ox-gfm"; - rev = "66bed0d17909ed76fa9030785fe3b0dc942f0feb"; - sha256 = "1fr5kp9cya9mzrl18flp117dy0qlp6f684qvmyilzaqm6q8w0nia"; + rev = "a46628aeb67f4504fea596771bf432be09212b47"; + sha256 = "0j8992d55p54m6v38v9bqy0x8ks13acak4hdgqc9lyx14asrhljx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm"; @@ -46072,12 +47245,12 @@ ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-twbs"; - version = "20160306.2258"; + version = "20160820.604"; src = fetchFromGitHub { owner = "marsmining"; repo = "ox-twbs"; - rev = "b55cd6b51dfe6d339d8ad018ef159d37b60acee1"; - sha256 = "0yrac13xiyfxipy5qyq56jg7151wjs3xv4gpsarx4hkrxi96apbi"; + rev = "ca98e2c312c6be1165b956f655a4becc89776634"; + sha256 = "0ranapdq6ly5xrqcksisgazwjp5xvydn98qfi8i1b491163704m3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3263133ba6dde790a364bad7c96144912971ba2d/recipes/ox-twbs"; @@ -46156,16 +47329,16 @@ package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-build"; - version = "20160721.155"; + version = "20160816.1911"; src = fetchFromGitHub { owner = "melpa"; - repo = "melpa"; - rev = "ed8303f5009604ae3d83769063d38749e37fc5d8"; - sha256 = "1a9qjggf4y6yrbf0icj13ahzv4jhz6x7m4xvkg524lm9l4k6n39m"; + repo = "package-build"; + rev = "82a19298d1d8669b0e548a1c80dd0ebf3e8a43ed"; + sha256 = "127zn218hwcrk73dnqzps336b2f0jc4k8qvi4a1zxjbnmvsx25xa"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/3fb67ca7f003cff8ba7b7fdc3a6de899ea0a130a/recipes/package-build"; - sha256 = "15c37hmsh9h5bybaxvsbdnn6xczrzl7dsvkgaqyla5n6gs8d866r"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; + sha256 = "0kr82j9rbvmapsph0jdxy24p0b8mcnj01sg1myywf428nf30cgbh"; name = "package-build"; }; packageRequires = [ cl-lib ]; @@ -46468,12 +47641,12 @@ pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "pandoc-mode"; - version = "20160519.853"; + version = "20160822.1439"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "dd1152f43d6f2f56cf45ccab5422f560ab880b6c"; - sha256 = "1aldnaas57saa2rdg6j3hczmf008m34dw47qzxjmn1jh6xibk357"; + rev = "e641d91c2886800871769e8e0e6554d2f8001e79"; + sha256 = "1lv3iiwidlvr6jsldd2s9apir1jzpynii8vp58gxq9kxbm4rzb42"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; @@ -46722,8 +47895,8 @@ src = fetchFromGitHub { owner = "cute-jumper"; repo = "parsec.el"; - rev = "311a5cab7dc43c34e415922d74ccdf333edef95b"; - sha256 = "1ccp1gq6z42hfyia5yw3wy5laqi3cd86pw0lnql3j6l9gvc81gw9"; + rev = "7e65db0d4f21cd64434adc2a19d250589604531d"; + sha256 = "093gwb8ppgwvaz3jxp48mwj577xkcqckvzgq8cgl1l04si1lkcdc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/248aaf5ff9c98cd3e439d0a26611cdefe6b6c32a/recipes/parsec"; @@ -46739,12 +47912,12 @@ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }: melpaBuild { pname = "pass"; - version = "20160214.235"; + version = "20160821.1136"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "2e1b08e7e4620e6abbb9151a27601405bbd2e480"; - sha256 = "0npm5kv00fcnb5ajj76jp1dc84zxp7fgrkn472yxdq4hppvx0ixv"; + rev = "6093fb0a07a4afdd428c13178e6aef086c24da36"; + sha256 = "114dvh1grsx0xrw2x0l9hiki2vmc8d8grbz1p4cwcq230rcm6q2z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; @@ -46968,12 +48141,12 @@ paxedit = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: melpaBuild { pname = "paxedit"; - version = "20160702.1533"; + version = "20160730.1027"; src = fetchFromGitHub { owner = "promethial"; repo = "paxedit"; - rev = "644eb7036a475fbcba4de5d46d6940b1e8ef33cd"; - sha256 = "0jmhr658cczblag8knr8j77q58yj268rkhh5dmga66l0sb30wb21"; + rev = "48df0a26285f68cd20ea64368e7bf2a5fbf13135"; + sha256 = "0z32lb2s943vk9fincsifdrjqmk7ks2skpzr6g4s3gd40sz5imfz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/106b272c2f0741d21d31a0ddfa4f521c575559c1/recipes/paxedit"; @@ -47366,12 +48539,12 @@ perl6-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "perl6-mode"; - version = "20160616.708"; + version = "20160730.1455"; src = fetchFromGitHub { owner = "hinrik"; repo = "perl6-mode"; - rev = "5456e2b044a9176cccf13776f4a15a6820ddc2a0"; - sha256 = "0nq5ldabicnjysxz9347lh63r3s91s4jpa9rdj316bkihyd4zy6w"; + rev = "14073feeb0f8ad2225616d550133f8f473a51b33"; + sha256 = "1j6zgr9vfyqpdya8975sjh2ny70rqqyj9zbl63kldkirppnw995i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4bbb2171c70958d5ab3730f974db3b07561a81b/recipes/perl6-mode"; @@ -47471,12 +48644,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20160724.1220"; + version = "20160830.228"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "2346982e2d181977a9cf189a7f446eddf07a6397"; - sha256 = "0a27kxfwamcvi0vn8hjr1qaq2cihbb7hmpla9p84y73g1mki1zr8"; + rev = "2c559083fa316b97b76e25c491a45aec5f2fe501"; + sha256 = "091k1pnkw4a62di6lj7gkczzpgf2jsxpj3brpfjs8gkcgx07vxsh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -47891,12 +49064,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20160605.1533"; + version = "20160821.1455"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "fd2db3c259dce7ca3d0dad35ff2863e73b5e720b"; - sha256 = "0kqlcgmdii81x6d1ya9q5dipbmrbnbnjjgrlcfc918w5bnpmaiqp"; + rev = "f1cdabf3fb6f1b23652d05f2649a1196f61131f3"; + sha256 = "0j4k3rdw8bb4hgvrg0m50ra0dw0ms0msvpdf79zvrhbdab1yl4rn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -47954,12 +49127,12 @@ php-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, s }: melpaBuild { pname = "php-scratch"; - version = "20160724.200"; + version = "20160730.115"; src = fetchFromGitHub { owner = "mallt"; repo = "php-scratch"; - rev = "581e9421f35ca6871372dbd5aa70c901b9b24b38"; - sha256 = "01lg779q3shmsxc1y6r56m42rmygjsqn5qsxqciphyx45wwnc5n3"; + rev = "755ea9dbc21b55329255967def2426a0fcbca597"; + sha256 = "1vnlv2amhh05lj6sxaq4l4hxv1rjjm7sg9j5b04g2dl22jdjv4ww"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68336364f6956325a2e03194d7db30747ab7f80c/recipes/php-scratch"; @@ -47996,12 +49169,12 @@ phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "phpunit"; - version = "20160531.727"; + version = "20160808.212"; src = fetchFromGitHub { owner = "nlamirault"; repo = "phpunit.el"; - rev = "7b2a811d80fd9781ec78692bc4f66c1641eb386a"; - sha256 = "1pmds2g7y1pcs3ivsd68zg30ih34janib0ydz4wr0mci3q52cjpy"; + rev = "165ca257d4840c266e1e79e806b4b943b5785fe6"; + sha256 = "1xgjhq1nxj4zfcns0q8a1kdlmqcjrxlblyj9vrspv1qck3akrp3z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit"; @@ -48353,12 +49526,12 @@ planet-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "planet-theme"; - version = "20160425.2058"; + version = "20160821.717"; src = fetchFromGitHub { owner = "cmack"; repo = "emacs-planet-theme"; - rev = "29cc5915d55b7cec9094a5faacebfbc75ce1d1b8"; - sha256 = "1aahyxmjsz9i5d22654bnmis8isbf5fydh0yy03sbiybm2hlyimi"; + rev = "4a3517728e009fb025d3f727eec4ea87b876aa2c"; + sha256 = "191cyq2q2ybrpqjb4hlqjlmpahdaxm1cpg1414x7xlnpj45chc1c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/18c4b8311b42af9f914264245f4dd377adcfbd0c/recipes/planet-theme"; @@ -48399,8 +49572,8 @@ src = fetchFromGitHub { owner = "ZachMassia"; repo = "PlatformIO-Mode"; - rev = "5f7c70f6749172a822ee7dd8291ee987eee8947b"; - sha256 = "04xnk9s5mjr55y36y07k4vnsf841pg70c9wr6vcj5s16h3fhx9nw"; + rev = "4b514ea9c82c95cbe8756cbbcac4638b4e2790aa"; + sha256 = "0xiss3c6inz27yf08974mm4wg9dx8rcqqj77zp4rxhyhiqxzv338"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/platformio-mode"; @@ -48576,6 +49749,25 @@ license = lib.licenses.free; }; }) {}; + po-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + pname = "po-mode"; + version = "20160827.857"; + src = fetchgit { + url = "git://git.savannah.gnu.org/gettext.git"; + rev = "9c38baf93e46a2223b524f91ff744cff2a0e1157"; + sha256 = "1gghn58k2i887sib2m1agj3d94dm3ac3gr2gxxqyx08cqdm1sxpy"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode"; + sha256 = "1hb9vrr2x6mh0yzckmx9fk6535d6r189974n4bizpr1xdikn7dgp"; + name = "po-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/po-mode"; + license = lib.licenses.free; + }; + }) {}; pocket-api = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "pocket-api"; @@ -48657,15 +49849,36 @@ license = lib.licenses.free; }; }) {}; + pollen-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pollen-mode"; + version = "20160808.2000"; + src = fetchFromGitHub { + owner = "lijunsong"; + repo = "pollen-mode"; + rev = "de762bd7f9760185dae8ef025ca9a9126ae78de0"; + sha256 = "19bi50nlmwnh4kz3b1hrgc7ks0g84bld9aifws2l3wyc3xsj8cqa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/97bda0616abe3bb632fc4231e5317d9472dfd14f/recipes/pollen-mode"; + sha256 = "1kskvdh6rczlki724h5xym8s4iychqzm0i82qdj87x1cg1kx9i85"; + name = "pollen-mode"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/pollen-mode"; + license = lib.licenses.free; + }; + }) {}; polymode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "polymode"; - version = "20160625.757"; + version = "20160805.448"; src = fetchFromGitHub { owner = "vspinu"; repo = "polymode"; - rev = "d44c93a1adfa1e446aa36534d46ec9d2b6b9d171"; - sha256 = "19pcqwnhvv7ixsqg979rpcclz8myn91ngkckmvly1k8rlv2nljq5"; + rev = "8a39ed6817298508c71f28effb0354a00f2235b4"; + sha256 = "1knms39cd97hkwi3ya6asnzri15fbskqq8zb4ly9ax8a358ryaz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/polymode"; @@ -49386,12 +50599,12 @@ prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "prodigy"; - version = "20160428.2354"; + version = "20160815.1255"; src = fetchFromGitHub { owner = "rejeep"; repo = "prodigy.el"; - rev = "feb5e453cc550d7d8dd861080fbbeeae23e9e9a7"; - sha256 = "0yy4ximahmj3kbxn6bhag853vyy56g1n007qnd8hjsl1xawlin5x"; + rev = "2bb744f3ff96805a854c7b34258f7d5ce51127b3"; + sha256 = "0ywxcad282nspafs3vnpfvzzjzcsxclf4j4nkw85q3wvpsb1671q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04686b7a450ccd4631ecf1d9bcd51572c21fd20d/recipes/prodigy"; @@ -49569,22 +50782,22 @@ license = lib.licenses.free; }; }) {}; - projectile = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: + projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20160723.622"; + version = "20160830.138"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "b01c5b97d895f942e104057322f912744799b440"; - sha256 = "02x5qa8n537g87lwwwi80p8y2mzgff3mhzd2brzcj7s905awxi9j"; + rev = "3e56c2f3c6ca4e28997320480a4115e4edf1a63c"; + sha256 = "0hxv2p8bwxz86mzq7dw8jdxai71ny5g0ig7171p51bvxx34xm7f8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn"; name = "projectile"; }; - packageRequires = [ dash pkg-info ]; + packageRequires = [ pkg-info ]; meta = { homepage = "https://melpa.org/#/projectile"; license = lib.licenses.free; @@ -49597,7 +50810,7 @@ src = fetchFromGitHub { owner = "abingham"; repo = "codesearch.el"; - rev = "09cf7c4275c51a5aafe84f700abea7b48ee0c145"; + rev = "7f5ea7d653d01071ff9ce3c3281dc2bed4f96c5c"; sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism"; }; recipeFile = fetchurl { @@ -49656,12 +50869,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "20160627.1329"; + version = "20160830.858"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "9a8a4641be1f2eae7f6f42d13db24c10bfa0c974"; - sha256 = "0v5mm9v4wd3yfnlx7zbb48lsxz7fyv4vcdszdpr5nswynmihxfi5"; + rev = "70ec237ce49172ccc4daa536505749e3d4701469"; + sha256 = "0jvj0lxy7mhkv8ql472zz6wyrmh72cw1z9n1200z5g8p4n7jfjsj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -49719,12 +50932,12 @@ projector = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "projector"; - version = "20160617.1314"; + version = "20160822.948"; src = fetchFromGitHub { owner = "waymondo"; repo = "projector.el"; - rev = "e1d99231f2f31681ae54b765e742d2ddedafe0c4"; - sha256 = "145sl1dyi8siqz17y4l787cyk2d57wxqmagh52q9mi2lfvjaa7dl"; + rev = "62ecd304df6fe643f1943ecbf1b85976c5689226"; + sha256 = "0ya5dykp2w1lpykj59k015xgmn36n87mbdynsrmdyzm9vbrjr5r1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/420ffea4549f59677a16c1ee89c77b866487e302/recipes/projector"; @@ -49866,12 +51079,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "20150521.2011"; + version = "20160805.1045"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "ba52f2b6780fa5e6bee86cf7e8ee6f6ba617862c"; - sha256 = "1ffgnfa44kgsncd7sz63kgqanj07yrcg2p38imwb7yczqlxf4siy"; + rev = "c0a6a6b4628a634f6a0529c9f7e9e1e0fe66d4d6"; + sha256 = "1k1b3yhcdp4x55cdk4wf1hzx8sw66cjy8xpjc0n1k71pzlx6ydz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -50600,12 +51813,12 @@ pylint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pylint"; - version = "20160715.211"; + version = "20160728.1033"; src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "67be95a25da3c720e449864ea61db4cb1dd91a81"; - sha256 = "0p0byb5wpbnli684wzvwz99mqdfxyg0r5fgi5zjcqj31hvavq1yi"; + rev = "537885ec90ba7d949a929ac560760d0f4199a936"; + sha256 = "0cpalx34w2jhrmyc04a3108in8xv0qfsia388ksid373l7zaqd5z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -50688,8 +51901,8 @@ src = fetchFromGitHub { owner = "glyph"; repo = "python-docstring-mode"; - rev = "707b4a3e5086278d89e737af5fb821982cc6509c"; - sha256 = "0nlhfxiirs90g8sx3zwf36idnj1nbasrdm0qhpdqs6k6vkndfbgk"; + rev = "a07bad8498a995d3389711a1989a7fe3502c82d2"; + sha256 = "0y554x7gpjnw2l8yr70h4b0fj2adsl55lndfq6hba5xdiv7y3wkn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e159e59ba0b60326cca0e1ea68fac4b85d54cd24/recipes/python-docstring"; @@ -50768,12 +51981,12 @@ python-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-test"; - version = "20160625.1420"; + version = "20160801.1224"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "python-test.el"; - rev = "c478bb077867acd9e979012ac39353cb8900abac"; - sha256 = "0cs0l42q8airi93acb6f2ndysif5nb06w1hvpf3cimbpkazgf7pl"; + rev = "a1a72be0d48c0270c7475ee216b061b07edaa97a"; + sha256 = "0bdg0zkh7hrx2v50d3nqyqz0bza68yirh46lqb9grw5ck3fkfnir"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ea68b3aa9c057e81a3e90a359a38ac16cb26c2f/recipes/python-test"; @@ -50936,12 +52149,12 @@ quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }: melpaBuild { pname = "quelpa"; - version = "20160325.629"; + version = "20160818.2249"; src = fetchFromGitHub { owner = "quelpa"; repo = "quelpa"; - rev = "f58878188d54e21db110cecb67d01f2c3d23d997"; - sha256 = "0xh7djgzz2gcvbl6w0ajkinay5h4fz00yafmvhhrb6hdkqsgh2br"; + rev = "e49a855cf699931cad7ef339a32812498f94e048"; + sha256 = "1iwrcm1pw8pjif1jbh522zivlpw7cpdrd91n99pcj4a8sv7wsc6j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa"; @@ -51041,12 +52254,12 @@ quickrun = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quickrun"; - version = "20160611.634"; + version = "20160808.1753"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-quickrun"; - rev = "69a7094160358de3b74a820161c389dc3e9f2cae"; - sha256 = "0jnd9z8hv7gyvy0sawqajxl891j54n7f477w67fqzppvgfqy4spi"; + rev = "cd9052132dbde7c8526309a0c21fc5a60c709a46"; + sha256 = "17l9kdfc2zc4d4alg4pfi7s6wlk51yxll6bdlcr4rbn67nj5lacj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun"; @@ -51101,22 +52314,22 @@ license = lib.licenses.free; }; }) {}; - racer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }: + racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }: melpaBuild { pname = "racer"; - version = "20160720.1416"; + version = "20160829.2022"; src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "78d523d00e7c27381ab0fa6e7cf749c6ebe1621d"; - sha256 = "0k9v1wmh07kzarphkc7l5i7v79abj8ncy8mqhz5dq3rywjf70vm1"; + rev = "8b35f743157e3c8b34bfec193a8f055f402bae8c"; + sha256 = "055jfkac0yiv9jdp50bzczyvvwnhhsy1rici8qwiv5pk3i89nj4v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi"; name = "racer"; }; - packageRequires = [ dash emacs rust-mode s ]; + packageRequires = [ dash emacs f rust-mode s ]; meta = { homepage = "https://melpa.org/#/racer"; license = lib.licenses.free; @@ -51125,12 +52338,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20160724.1851"; + version = "20160829.846"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "6370213864ec08568c3c56aa9fabac840eee01b3"; - sha256 = "0mnlhy29p5nl6c0h4l0j0g430ra85h8r6mzwbfca98ny7wslijfi"; + rev = "b6a7db7a3831268ebd5e9a68036486486abfacdd"; + sha256 = "0z7gxcldmqhzvi33a7g1rjwmyc5aim4ga0f4hb0ajbl0kwxl6m4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -51293,12 +52506,12 @@ rake = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rake"; - version = "20150831.158"; + version = "20160830.245"; src = fetchFromGitHub { owner = "asok"; repo = "rake"; - rev = "eba311a8f5ccfb6535efbc26fa58c43e3f1e5515"; - sha256 = "1wcs8j8rdls0n3v8zdpk2n5riwzz2yvjf6b70a5bj7p20gyafhj2"; + rev = "14ff370e867302d7f55d7cc02dd42ac82179af6a"; + sha256 = "0mk5zsm081sdz06mf1jvvbvhsqbl11jh17csyg5wqjyx6vs0bzla"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf0f84698dda02a5b84a244ee29a23a6faa9de68/recipes/rake"; @@ -51377,12 +52590,12 @@ ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ranger"; - version = "20160622.130"; + version = "20160823.1611"; src = fetchFromGitHub { owner = "ralesi"; repo = "ranger.el"; - rev = "d8f18bfd25a233550a0fc9405f80d01c5ddc673d"; - sha256 = "0lhjz4c19s7si81yvgqif817xkxbm7f1p8rrlx1l973hbbqjyrc2"; + rev = "58d3f847400294e0c096fc0cff45e71173721aba"; + sha256 = "1aygddzfhrmalivsy99bapvzvi7fq7h25nxbpb8zfcwb3wizmr36"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger"; @@ -51608,12 +52821,12 @@ rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rdf-prefix"; - version = "20160517.1123"; + version = "20160813.829"; src = fetchFromGitHub { owner = "simenheg"; repo = "rdf-prefix"; - rev = "d1897dcb98bd24741f90d9e3973aed762a0430ae"; - sha256 = "1ss0y7lwd9bi8nzmhvpfn24vl4xsjk2xclhvfz602c9k18k18qza"; + rev = "07f1b914f0bf0ca154831e13202eacecf27cf4c4"; + sha256 = "0cis7lcsjpr2gbh59v4sj1irkdkzx893rl3z3q35pq2yklrmx9nv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix"; @@ -51668,6 +52881,27 @@ license = lib.licenses.free; }; }) {}; + read-aloud = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "read-aloud"; + version = "20160815.928"; + src = fetchFromGitHub { + owner = "gromnitsky"; + repo = "read-aloud.el"; + rev = "ebdc1180648cc5db6d6ab9ce8bdcf37858cc08ae"; + sha256 = "11l2nq80xsqlvpwhg2gvcam46x0b3gsa2jrdcs64sjyfbi2s8igk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/20452bf3112276a7e1c880bfab259150fc70b47a/recipes/read-aloud"; + sha256 = "01fd87k50x71w8qypbi7llgyc1xnmyxifxh4ni9pgbx2ryn72lzv"; + name = "read-aloud"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/read-aloud"; + license = lib.licenses.free; + }; + }) {}; readability = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth, ov }: melpaBuild { pname = "readability"; @@ -51731,85 +52965,91 @@ license = lib.licenses.free; }; }) {}; - realgud = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, load-relative, loc-changes, melpaBuild, test-simple }: + realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20160712.849"; + version = "20160829.1821"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "1e257cf3fa2df3d5c972d8569f02718a34a4828c"; - sha256 = "0kba72mdwq2875gch7g4ab8sxy9b8p3vm1xcjj38d0qj8xcs7qhm"; + rev = "4246e34d7a6f668f5d9d403de054ef68e6d89548"; + sha256 = "0rnqs09q30rshp3lyslwh3rxgn7ay370y9ain1bhf2p2ww9j3m5i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; sha256 = "0qmvd35ng1aqclwj3pskn58c0fi98kvx9666wp3smgj3n88vgy15"; name = "realgud"; }; - packageRequires = [ list-utils load-relative loc-changes test-simple ]; + packageRequires = [ + cl-lib + emacs + load-relative + loc-changes + test-simple + ]; meta = { homepage = "https://melpa.org/#/realgud"; license = lib.licenses.free; }; }) {}; - realgud-byebug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }: + realgud-byebug = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }: melpaBuild { pname = "realgud-byebug"; - version = "20160713.604"; + version = "20160805.732"; src = fetchFromGitHub { owner = "rocky"; repo = "realgud-byebug"; - rev = "93bc1129ce9b03a3d08c0e68c34bcb8a997020e4"; - sha256 = "1142bi4wygkby6qkman6w102rds5lhvxci12x991759fq3g2w5i7"; + rev = "5f45e790cc8261caccc8f30b99b36c303e2c78f5"; + sha256 = "1gqszhdgrqcrlb3b7i1ng3qxkd8s1fxa69rh652ggwssy0ss8qsc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-byebug"; sha256 = "1m4pqnvnnfzq7b9bv5fkz70pifklddwqrwbwnrfyiawx9vdgrpz9"; name = "realgud-byebug"; }; - packageRequires = [ realgud ]; + packageRequires = [ cl-lib emacs realgud ]; meta = { homepage = "https://melpa.org/#/realgud-byebug"; license = lib.licenses.free; }; }) {}; - realgud-old-debuggers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }: + realgud-old-debuggers = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }: melpaBuild { pname = "realgud-old-debuggers"; - version = "20160303.54"; + version = "20160805.713"; src = fetchFromGitHub { owner = "rocky"; repo = "realgud-old-debuggers"; - rev = "eee3d9d88bfe94d21f08716217184e44a4161e55"; - sha256 = "0jxi5a6mlgwjj14gfajs951180m8r8m4vqx09xz1yyc9qq8ywfk9"; + rev = "1362a42dec1ee859d4c339cbe6cf4813bf826f51"; + sha256 = "0zf8vxcn0lyajjz2dbmr98k2004qp6ydf3y4a696krvk1gm0vf79"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/260b4d5a85c380dda0f7bb0370e3ffa8cc3c0275/recipes/realgud-old-debuggers"; sha256 = "0iwi1byfwcpviaizdw9wzdcjlbk35ql4wfzj0ynh331g0hmibhs9"; name = "realgud-old-debuggers"; }; - packageRequires = [ realgud ]; + packageRequires = [ cl-lib emacs realgud ]; meta = { homepage = "https://melpa.org/#/realgud-old-debuggers"; license = lib.licenses.free; }; }) {}; - realgud-pry = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }: + realgud-pry = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }: melpaBuild { pname = "realgud-pry"; - version = "20160625.1734"; + version = "20160805.745"; src = fetchFromGitHub { owner = "rocky"; repo = "realgud-pry"; - rev = "a5a0fa2e24907b931fba2beee09c4bf094548529"; - sha256 = "0y796q5fs0q6grfdbsz0li5zb0qq179ffpn084z1bnzb2p5r1wbb"; + rev = "fca36075a223f6a4a643764199babe3d1dfde2ac"; + sha256 = "08jnav5v5q1mwgk9x100magm3jcprzfhmx8z6x8vcmp7xf79n1pp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud-pry"; sha256 = "1p5ijig5rczndcykllq0vy6w4askwl0yd8b5fqg7yl5yx45r8xgs"; name = "realgud-pry"; }; - packageRequires = [ realgud ]; + packageRequires = [ cl-lib emacs realgud ]; meta = { homepage = "https://melpa.org/#/realgud-pry"; license = lib.licenses.free; @@ -52040,6 +53280,27 @@ license = lib.licenses.free; }; }) {}; + redprl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "redprl"; + version = "20160818.852"; + src = fetchFromGitHub { + owner = "RedPRL"; + repo = "sml-redprl"; + rev = "1ee36bd7e8595a61f20152985f4b9f4230a51c6a"; + sha256 = "120kmjqrp4s5jvcxgkingzszkxk01ya1h5xrgdf1lylg52xx9dvj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; + sha256 = "1zinzs3vzf2alsnxf5k71i7lp90fm26wv4y20ci52n0hnh5nz861"; + name = "redprl"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/redprl"; + license = lib.licenses.free; + }; + }) {}; redshank = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redshank"; @@ -52109,8 +53370,8 @@ src = fetchFromGitHub { owner = "Wilfred"; repo = "refine"; - rev = "22aa21717c71189a264151a382cf713d78b4375d"; - sha256 = "0wxfhxr23s8qwha18h04852lfrglamzdainjijywikwkmrw4i905"; + rev = "6546f1cbe9255b4b6009ae5c26ab6b1594f47990"; + sha256 = "09xg830hxivhxpi34ajvmj0zs6ygph1s907r1wizi27hgpbgg6zv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; @@ -52500,12 +53761,12 @@ request = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "request"; - version = "20160623.1938"; + version = "20160822.1659"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "40ac53c5f6179aab80ee5e5ea6744331ef1d3b64"; - sha256 = "165nz8ivw585scalrm3b68869jmqnhd4yqc8ykaf206ssz0znicx"; + rev = "12450136785fe6ff8df940f9c0601406a9fd8bc9"; + sha256 = "0kpb2fhj617kh7xzcls7i911pj61bmjfb7hr0vc1a2pgwpgrpd4y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request"; @@ -52525,8 +53786,8 @@ src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "40ac53c5f6179aab80ee5e5ea6744331ef1d3b64"; - sha256 = "165nz8ivw585scalrm3b68869jmqnhd4yqc8ykaf206ssz0znicx"; + rev = "12450136785fe6ff8df940f9c0601406a9fd8bc9"; + sha256 = "0kpb2fhj617kh7xzcls7i911pj61bmjfb7hr0vc1a2pgwpgrpd4y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred"; @@ -52626,12 +53887,12 @@ restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "restclient"; - version = "20160725.702"; + version = "20160801.707"; src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "6f6af40c4a95d1976b3b4e740b5cabf608bf5634"; - sha256 = "02akkjy94qx4j1yxc80qarsjgn4s4ig0syhjc3z1kcb2fjw0dmwl"; + rev = "10671d044f0b2bdbf908dab7ac994d6fc296182d"; + sha256 = "1iimkd5w8bjj1i64vqwvbwvwy7r2ha8xmxx3lklkssjnyi3icpvp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient"; @@ -52651,8 +53912,8 @@ src = fetchFromGitHub { owner = "pashky"; repo = "restclient.el"; - rev = "6f6af40c4a95d1976b3b4e740b5cabf608bf5634"; - sha256 = "02akkjy94qx4j1yxc80qarsjgn4s4ig0syhjc3z1kcb2fjw0dmwl"; + rev = "10671d044f0b2bdbf908dab7ac994d6fc296182d"; + sha256 = "1iimkd5w8bjj1i64vqwvbwvwy7r2ha8xmxx3lklkssjnyi3icpvp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/59303304fe1f724596245556dd90f6afffba425d/recipes/restclient-helm"; @@ -52725,6 +53986,27 @@ license = lib.licenses.free; }; }) {}; + reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "reverse-im"; + version = "20160813.208"; + src = fetchFromGitHub { + owner = "a13"; + repo = "reverse-im.el"; + rev = "76a391a26957eaf5030f85cb0f302a45ea771df1"; + sha256 = "0vjw7l0zgvailxvn1jqfn66hp7bzfixkd0qz75q7dg1b61fzz067"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im"; + sha256 = "0c0dxxpa2s6gvhi14zfb0rnb4i7jaqw627a7ngm5fzyh0r9himcf"; + name = "reverse-im"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/reverse-im"; + license = lib.licenses.free; + }; + }) {}; reverse-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "reverse-theme"; @@ -52749,12 +54031,12 @@ review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "review-mode"; - version = "20150110.612"; + version = "20160825.1846"; src = fetchFromGitHub { owner = "kmuto"; repo = "review-el"; - rev = "d043b227eb1cd10361f8117c17de9a67caebe96a"; - sha256 = "0lzsy68k7sm9d3r8lzhzx9alc1f0cgfclry40pa4x0ilkcr7ysch"; + rev = "d84a1a017b4c2871a9a39734be08fb8285f0b6a3"; + sha256 = "0b6vhl9cy9p51pa6gk6p3x2bmwsd03c7abkbw8j5gd8r3iyam4ng"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2f9e2667389577d0703874ca69ebe4800ae3e01/recipes/review-mode"; @@ -52932,27 +54214,6 @@ license = lib.licenses.free; }; }) {}; - rnc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "rnc-mode"; - version = "20121227.1502"; - src = fetchFromGitHub { - owner = "TreeRex"; - repo = "rnc-mode"; - rev = "b39dc23218213336b55f28e12a1d0e49ef7c1e21"; - sha256 = "1drvyf5asjp3lgpss7llff35q8r89vmh73n1axaj2qp9jx5a5jih"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e12b048692ceb145cfbe1a03ecc2714f7bfc3bad/recipes/rnc-mode"; - sha256 = "09ly7ln6qrcmmim9bl7kd50h4axrhy6ig406r352xm4a9zc8n22q"; - name = "rnc-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/rnc-mode"; - license = lib.licenses.free; - }; - }) {}; robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "robe"; @@ -52977,12 +54238,12 @@ robots-txt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "robots-txt-mode"; - version = "20160312.751"; + version = "20160820.202"; src = fetchFromGitHub { owner = "zonuexe"; repo = "robots-txt-mode"; - rev = "7b524685036d339a8aff1481697fbcd529dfa8f7"; - sha256 = "0dimmdz4aqcif4lp23nqxfg7kngzym2yivn6h3p7bn1821vgzq9s"; + rev = "edf1f8082c88cb2ff5a784ba00f92c535aaa1c7d"; + sha256 = "11ig771ck610glb6f3322ka026ikq0b072rlq5z6ymr3rbxagn6j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1669c7a0d89ea36d61bfa57ef54ee1f203daff5f/recipes/robots-txt-mode"; @@ -53149,8 +54410,8 @@ src = fetchFromGitHub { owner = "pezra"; repo = "rspec-mode"; - rev = "80c5578a4778ab0fe19be14293d683de16dbb457"; - sha256 = "1d3f7if926zd8ynm5sixpc86imhwpgm4l824pr8glh5wk23z2805"; + rev = "9e254cef81dc5533739efab2d81a575df0334629"; + sha256 = "1wcdq3hyb0q7l6nj6qbaf32m3mhfiph4kdd6frxf0fb93b8rpciz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd83e61b10da20198de990aa081b47d3b0b44d43/recipes/rspec-mode"; @@ -53166,12 +54427,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20160715.1019"; + version = "20160830.957"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2e676e1a0dada6a49fc454b5b29710bc30b28b70"; - sha256 = "1zfc5r8d8lj3y7sdz29drxp7kmwb5lxhm2rr7nszy525n8ab2w0g"; + rev = "9f4fcaefd51915dae69cf283e62e5883ae6cef09"; + sha256 = "1grw4gc98yaxsdqarl2n3w3bn4h9nri1anjrvw5hqi9i111fskwb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -53232,7 +54493,7 @@ version = "20160607.157"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "55763"; + rev = "56050"; sha256 = "0lcd5p5rkga6yfaaa5smy2pl1y1xv69ap33kyjmq58ajd78gql2m"; }; recipeFile = fetchurl { @@ -53312,7 +54573,7 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "55763"; + rev = "56050"; sha256 = "0lcd5p5rkga6yfaaa5smy2pl1y1xv69ap33kyjmq58ajd78gql2m"; }; recipeFile = fetchurl { @@ -53459,8 +54720,8 @@ src = fetchFromGitHub { owner = "r0man"; repo = "ruby-test-mode"; - rev = "78f80e5ed4ddd09b617a2574c68f575ebc81fce2"; - sha256 = "195i85nz0c738bagmcyh3h7zzr85zlpz30bj0mlv36mqcig152xi"; + rev = "24c7b59a834413d60a97c5f59917dc13c247c883"; + sha256 = "0lcp5sil9fhlgq4mi1xc2zhrd5g4v84jviba8cs2rrhjx5ibwp1s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/746e0e49a24f16baa5f1cc7f11220766ecf9f1fe/recipes/ruby-test-mode"; @@ -53539,12 +54800,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20160726.720"; + version = "20160820.255"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "ba5ff9058546df593ff7d8737fb52b5e92ad1913"; - sha256 = "1c06fc14lfy0245syci0nfmy2r06z45kkaqyikika3bapqbfg87v"; + rev = "5cfb9197af67e00ebd5bbcb05c28545c9014ea32"; + sha256 = "1pvb6imh89pnmxzdlivyidqqd7f1va29dvjhy5znw2qhw1myf4hn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -53683,6 +54944,27 @@ license = lib.licenses.free; }; }) {}; + salesforce-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "salesforce-utils"; + version = "20160813.1854"; + src = fetchFromGitHub { + owner = "grimnebulin"; + repo = "emacs-salesforce"; + rev = "73328baf0fb94ac0d0de645a8f6d42e5ae27f773"; + sha256 = "1zsznz9pn9dj672jii6wcvs47yqyxv3dsm5qy1dax1d6gvvbf4zq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/455cfeb623057c2bb03a5a78380b3247e2bdd0d4/recipes/salesforce-utils"; + sha256 = "0fyz710saqfi44sf3zqm9n3m4w09zsip015ij0pqs75nanhcnmvy"; + name = "salesforce-utils"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/salesforce-utils"; + license = lib.licenses.free; + }; + }) {}; salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }: melpaBuild { pname = "salt-mode"; @@ -53854,12 +55136,12 @@ sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "20160727.406"; + version = "20160816.1353"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "5c3424b3f2b14e3c03321ae0e257301af1bef880"; - sha256 = "115ddxbpca23xcfcz6a4a7cbsqv0jagkh0jrgidim4gfzsxy9pid"; + rev = "cb9940f0e8b1346f4297ff6c2c90b406c92abab0"; + sha256 = "10bq04xm3b8awjnfq0mg52zm3rds1kr7q0jfrvhjkbd9rwd1y9bz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; @@ -53879,8 +55161,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "1c4c93149b6a656ab99f901c15271edf1a1ae0a3"; - sha256 = "1pd2k7z4ixnbnyya09kh6z5v4m7n2i92rfjr0r3yzb8hk3sx6fvs"; + rev = "733562b1eea812d7f5b241678fc6bf42af5bc0dc"; + sha256 = "0qap5gih0wh6g1dj271s6fkhb2y1i1mk6nl0wipg9sdgdc3m50lp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -53917,12 +55199,12 @@ scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scala-mode"; - version = "20160519.731"; + version = "20160813.304"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "c90bbde5ff29c23b1545c7b29edba453fc33f393"; - sha256 = "1ayqdmnp38wvhi3a8r8wivn4z8v6irbz0kwqvgsnpq6m2s3jsbz9"; + rev = "a0b73b25377f5aedf50abe198d6b6111310735be"; + sha256 = "0b2gm1mfxiqm86m5156scmzvn10dl0idgxpzgki1k0cpy4xf4qfa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -54148,12 +55430,12 @@ scratch-message = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scratch-message"; - version = "20160718.935"; + version = "20160825.644"; src = fetchFromGitHub { owner = "thisirs"; repo = "scratch-message"; - rev = "70f417878144b4a701b0b28dbc47b03d84c07fd1"; - sha256 = "1v9qlizlp394ym5l58g31kgr8xwsix6y36vccjlin84ygz9pgps7"; + rev = "8f9957a83788f391bf513e35bc877366b399dcae"; + sha256 = "0x2961bqby1ciqaz2r55bmyhddxjr2slffgkqb8fd788d5l5m927"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/24c5ff6b643de9fb79334eff57b702281b20bc10/recipes/scratch-message"; @@ -54247,6 +55529,27 @@ license = lib.licenses.free; }; }) {}; + scribble-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "scribble-mode"; + version = "20160124.1528"; + src = fetchFromGitHub { + owner = "emacs-pe"; + repo = "scribble-mode"; + rev = "34e9e5edb921813b6483e0fefa848efb6ee4b314"; + sha256 = "0598byqpz2q6yi2q4dwd77jj9z3n99z34d3an51s9m2za0nh1qvp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6469c2b389d757003da69da727905228eb564d50/recipes/scribble-mode"; + sha256 = "0idagikxhr86h2k6fb45zdzg73wpmpiszx0gi6d8jx7s1xqd6s50"; + name = "scribble-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/scribble-mode"; + license = lib.licenses.free; + }; + }) {}; scrooge = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, thrift }: melpaBuild { pname = "scrooge"; @@ -54377,8 +55680,8 @@ src = fetchFromGitHub { owner = "jcinnamond"; repo = "seeing-is-believing"; - rev = "03e5e2adc08bcfa859fefc0323deef7392b4c747"; - sha256 = "1g8avn0vxsjg3fclbgahbjwi71rb81wxd4j0fwabw70lmaqk6f8v"; + rev = "6f123ad897dcca40652ef682b298881fc25d8ddf"; + sha256 = "1anxxx0wm8rwqbxwllk7dwsnnjw19pwrp3x16r5m3y4ccxzpdr3f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14bb6de5c051a68284ee1a7e25ecb2c7c19ffd3b/recipes/seeing-is-believing"; @@ -54478,12 +55781,12 @@ selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "selectric-mode"; - version = "20151201.718"; + version = "20160824.1522"; src = fetchFromGitHub { owner = "rbanffy"; repo = "selectric-mode"; - rev = "0dd7ef28a9d9d6fbb95fdeeab6b576ad8762ad16"; - sha256 = "18xdkisxvdizsk51pnyimp9mwc6k9cpcxqr5hgndkz9q97p5dp79"; + rev = "dcbfc60658ab698e7c43baa5871af7aff2e35823"; + sha256 = "1fd3liqdhd0dw1kkgjz3qvajnlr8k60gbcgfzy3s858q2x6ranfl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08922071b9854142eab726302e75f1db2d326ec5/recipes/selectric-mode"; @@ -54499,12 +55802,12 @@ semi = callPackage ({ fetchFromGitHub, fetchurl, flim, lib, melpaBuild }: melpaBuild { pname = "semi"; - version = "20160701.440"; + version = "20160816.239"; src = fetchFromGitHub { owner = "wanderlust"; repo = "semi"; - rev = "225370fd706eeb6d3fd3439c3f5c3736e1d035df"; - sha256 = "0c3wmm7lf42awdb62365d70xz7jkklxcaw9ryy4q61xj4bcjr346"; + rev = "6b9c62a76f22caf1476c837ee1976eaf0eaf38e7"; + sha256 = "0h0f6w13kiyy90vnsa4jlfdlsnd04wq6b0vrbmz74q1krfs8b0kz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e78849c2d1df187b7f0ef4c34985a341e640ad3e/recipes/semi"; @@ -54578,22 +55881,22 @@ license = lib.licenses.free; }; }) {}; - sentence-navigation = callPackage ({ ample-regexps, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + sentence-navigation = callPackage ({ ample-regexps, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sentence-navigation"; - version = "20150914.2146"; + version = "20160830.1840"; src = fetchFromGitHub { owner = "noctuid"; repo = "emacs-sentence-navigation"; - rev = "935f44387bc8f7277e373052817124e628fe6b48"; - sha256 = "1slhm6cn9pp9vkz2i18sn82j5v38315s0wic7qdmk93ss72jhdvj"; + rev = "f9aedbfc2b8d7957f427dac87558948c80582429"; + sha256 = "13413jpk84hs5hy05rlgkcr7h8diw46xhb9zdj1p9lh145s7si8w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d097cf9b6c9c1606505d3988a2afdd7b066abc8/recipes/sentence-navigation"; sha256 = "1p3ch1ab06v038h130fsxpbq45d1yadl67i2ih4l4fh3xah5997m"; name = "sentence-navigation"; }; - packageRequires = [ ample-regexps emacs ]; + packageRequires = [ ample-regexps cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/sentence-navigation"; license = lib.licenses.free; @@ -54768,12 +56071,12 @@ shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shackle"; - version = "20160516.419"; + version = "20160830.2343"; src = fetchFromGitHub { owner = "wasamasa"; repo = "shackle"; - rev = "730ccb2143e97ed69ae373edac34b460d45f9deb"; - sha256 = "1xmxms9rhys2k7cl5v0zhqm23my5jv5f0s3541j044hn55rcpig5"; + rev = "4ec9883fa68ffc4a0dc02998b98fe59bd87a1143"; + sha256 = "0hp51fq2gk9ksln691h7vkm8r9rif8lbjhd4593xri69778rz387"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle"; @@ -55223,10 +56526,10 @@ }) {}; showkey = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "showkey"; - version = "20160704.1421"; + version = "20160816.2247"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/showkey.el"; - sha256 = "0bsc6lg4hh3h5fskyzdz9pix90q5r6nhg1zxjividd57gibmkbq2"; + sha256 = "1aipl39lh2kym5pc7a8z5sznrrssz327spd6y9cf84agy2k7mv5d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2b5576d501aee95c8f62d721a69077a1f3df424/recipes/showkey"; @@ -55386,12 +56689,12 @@ signal = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "signal"; - version = "20160424.10"; + version = "20160816.738"; src = fetchFromGitHub { owner = "Mola-T"; repo = "signal"; - rev = "88c3f3c82a8a295b66b7eb8c64bd35b8ef834dd6"; - sha256 = "1n6mjfw655a5q0ifq52yf6nyc0zxcahr47dvxg0p8x8v3f4jskvz"; + rev = "aa58327e2297df921d72a0370468b48663efd438"; + sha256 = "1gzfdk3ks56h8q4xk69aaxkhkg9jhs55iqdicyvq7x9wmjn6b7xw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e5bad0b4c9a7cd28de44ce60de056330a376b3e6/recipes/signal"; @@ -55470,12 +56773,12 @@ simple-bookmarks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-bookmarks"; - version = "20160627.340"; + version = "20160804.701"; src = fetchFromGitHub { owner = "jtkDvlp"; repo = "simple-bookmarks"; - rev = "ef14b49f168caf45be34698d851a061da1f74208"; - sha256 = "1x1zn4f4k7il8h331lva5gw9vscpw2c7310apn1xwhyj7hz47mf2"; + rev = "e89e8163a0705e28e9346320a1ee13c1aae249af"; + sha256 = "0bx8inaihfs48rzi01nlr3wp2iw0bnk318hhgpd4zg64ap3sgdsv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a60dd50c388a75ce21a5aec9acf938835d7afdbc/recipes/simple-bookmarks"; @@ -55720,12 +57023,12 @@ skewer-less = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode }: melpaBuild { pname = "skewer-less"; - version = "20131015.622"; + version = "20160828.1321"; src = fetchFromGitHub { owner = "purcell"; repo = "skewer-less"; - rev = "5a48dfa627c91f5f94150fab04cd66e890e3929f"; - sha256 = "16757xz5ank3jsh8xglyly7pwdn5xm0yngampy1n1vgcwsp5080a"; + rev = "4d4394418b70bd454efef1cb68129da05ab67891"; + sha256 = "0bf6w9wca8bkm23246cbf4dcb5y583xz8114a7xg0152hpfcg46q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb63f7417f39bd718972f54e57360708eb48b977/recipes/skewer-less"; @@ -55766,8 +57069,8 @@ src = fetchFromGitHub { owner = "NateEag"; repo = "skewer-reload-stylesheets"; - rev = "3207abca9551660407a6b009cb40fb32bbb550da"; - sha256 = "0fgxil70yrf6annrbvza4lqaagrn65c7pmayg6pr16hy5w8wcgsk"; + rev = "27c5a64785cd61419c1fe5bf53da46cc278f251d"; + sha256 = "0pc0mnrgd47cq61s8xrc9mcizfc3cj4ln7r5ixqk6jq59img27fh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7a00894cb1398757b90f670a0beb7b7f640b8b8/recipes/skewer-reload-stylesheets"; @@ -55801,15 +57104,36 @@ license = lib.licenses.free; }; }) {}; + sl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sl"; + version = "20160729.2101"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "sl.el"; + rev = "76a8eae2b3fc449ed81b2a577c53939434851635"; + sha256 = "1nkgqva4l4nwpixavky8gm38371z7mrkpqdkgrya4j5mrx4kiw86"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7188a93d33e38f360930b5090c6ef872116f8a7c/recipes/sl"; + sha256 = "0h90ajikr6kclsy73vs9f50jg8z3d6kqbpanm9ryh2pw3sd4rnii"; + name = "sl"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/sl"; + license = lib.licenses.free; + }; + }) {}; slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20160710.551"; + version = "20160805.614"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "8e82c006d98d0a8607de2849cf178c3df1498b72"; - sha256 = "0cyvggij1h5hvdp68cz0ag2g8i7zb5ivrjplj4knyrm2bzd4fd03"; + rev = "e7219b50499a46b578bc9caf96d64b06ceea47ad"; + sha256 = "0dv1c33qk65bjz66jjzydi5b0c7vdwahsrq3zwhvrf97xd7vr4s3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -55888,12 +57212,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20160704.1500"; + version = "20160829.1150"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "a8a3dd887141a6a64cd9646a95a56c48e1a2f5e1"; - sha256 = "1z7ib1m9syhhn41kchipgbz9cx6dv4hfl96pjlmzprdjx8di1849"; + rev = "20e0c1d345359def80d7cdbdd74214b510b00885"; + sha256 = "1i7v93f0njqjfahn5r671knyfi0jngygvgr2xb8b2d20v6di7ysh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -55951,12 +57275,12 @@ slime-docker = callPackage ({ cl-lib ? null, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: melpaBuild { pname = "slime-docker"; - version = "20160723.1326"; + version = "20160817.2344"; src = fetchFromGitHub { owner = "daewok"; repo = "slime-docker"; - rev = "a84b26082c5989f148753c275ffe103f801a83f3"; - sha256 = "0qjpj7n0pnqb5113fhqfl2qj8h4f9bfd7wkbi4gp2ksp9wh7ivh0"; + rev = "f90fc274c2f764a5962a3cbcf0ea00622ee5bfe6"; + sha256 = "0wknygb8gnr49xc5wyyalgs97zk0qj33wwcw1kcxah4nmvzgqg7f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/15ec3f7208287161571c8fc3b29369ceabb44e5f/recipes/slime-docker"; @@ -56077,12 +57401,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20160629.1051"; + version = "20160829.847"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "d1d5b04eeb897648dc56e9b185644481b4debd48"; - sha256 = "09sc63nwz5r10id5q5cnsnkllcsjwmv43ic2km1l271rjcgspvra"; + rev = "fbcb96264ab073c516efa06c8e8d4b0cc4ff566e"; + sha256 = "19nlwqp7zia3fnvl323v8v9j10b32bpw0m5pv14ilqy4kbnpxw2q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -56221,6 +57545,27 @@ license = lib.licenses.free; }; }) {}; + smali-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "smali-mode"; + version = "20160406.1556"; + src = fetchFromGitHub { + owner = "strazzere"; + repo = "Emacs-Smali"; + rev = "10437ab0b29994cf4bf67ec28ccf82a74b8c026b"; + sha256 = "1ircjz571q1sgjkxryc3rlcpdrh6ac7ydnvclr7ldh3nhz77pm7p"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/90182e5bbf79c570b3cb59f541636d4aad5d8652/recipes/smali-mode"; + sha256 = "17fcr66ky9hmj74i4wr3y9n1d9g8hib7l3gmr4jxj8vsjzfxy7h7"; + name = "smali-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/smali-mode"; + license = lib.licenses.free; + }; + }) {}; smart-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-comment"; @@ -56281,6 +57626,26 @@ license = lib.licenses.free; }; }) {}; + smart-dash = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "smart-dash"; + version = "20110130.1916"; + src = fetchhg { + url = "https://bitbucket.com/malsyned/smart-dash"; + rev = "f8f23121ecb1"; + sha256 = "069jwi74qh9hy152k19c7avdgb89zym989v92kgghbaaiyinng22"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/98a2cf93cc41cb2bba14f91a83b6949267623198/recipes/smart-dash"; + sha256 = "1n3lh0ximwrqawdg8q9ls6aabidrawqca5w67f8vsfmrvyfx48n4"; + name = "smart-dash"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/smart-dash"; + license = lib.licenses.free; + }; + }) {}; smart-forward = callPackage ({ expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smart-forward"; @@ -56347,12 +57712,12 @@ smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }: melpaBuild { pname = "smart-mode-line"; - version = "20160618.1512"; + version = "20160818.508"; src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "558251e200cc555df137e60326295f2bd640fd6a"; - sha256 = "1xh1qcxw0r3j8hx8k8hsx0cl82wps5x755j4kbn01m7srzv6v167"; + rev = "3656417ec06ba448f940d65e96bddb57fdc79244"; + sha256 = "1vm96cb693mgzf7x9wl3sy3z90rq4mgbrnhy9hb746ypdpkfd3am"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/smart-mode-line"; @@ -56372,8 +57737,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "smart-mode-line"; - rev = "558251e200cc555df137e60326295f2bd640fd6a"; - sha256 = "1xh1qcxw0r3j8hx8k8hsx0cl82wps5x755j4kbn01m7srzv6v167"; + rev = "3656417ec06ba448f940d65e96bddb57fdc79244"; + sha256 = "1vm96cb693mgzf7x9wl3sy3z90rq4mgbrnhy9hb746ypdpkfd3am"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60072b183151e519d141ec559b4902d20c87904c/recipes/smart-mode-line-powerline-theme"; @@ -56515,12 +57880,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20160721.1448"; + version = "20160828.1136"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "453687e9572a0a0e8fb0c4b8f411f4d90f2d0820"; - sha256 = "0yk5k32sk9c8nsbz1al4qsg0qwbamka5jk2x0v3jy2c30bqigpqc"; + rev = "659e4ded92e26390cc7f8e0c7e6c7fd2e96acb8a"; + sha256 = "1i7hrj57dv2nhjhmayvysj974myq1lkpkl6dgja5x9xvcz024acn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -56976,12 +58341,12 @@ solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solarized-theme"; - version = "20160515.442"; + version = "20160827.1130"; src = fetchFromGitHub { owner = "bbatsov"; repo = "solarized-emacs"; - rev = "8bc7592721efdc9272029e2a6aaaac8b09104c86"; - sha256 = "1vrfqzgqh2hdg7w770l9qvxiaxpg72rxl5gx74vvwdfgw727vcwg"; + rev = "62dfe37e843faa705a65e6fbed0c2a2c7ed57c12"; + sha256 = "1dr0psppjfgkn6plbkhni6jdmad588mk2jdnky2w2g07hz4jrgd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme"; @@ -57064,8 +58429,8 @@ src = fetchFromGitHub { owner = "omouse"; repo = "emacs-sos"; - rev = "3ddee278ab5d22ee3363841b26cfede4955117fb"; - sha256 = "086a66jlnkiv044i4japs4czw8gfs8p0n80p42ck83zm2jnznc49"; + rev = "01b5e25814b2e76db3814a967e25edf85d33bcac"; + sha256 = "1w1fdf5ppz22aq40w5wmi2619sgkvw97rr8zqigw1acva0pxysaa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/36e02223b4ff9c0be4662991d734ca4a4e756f4b/recipes/sos"; @@ -57277,12 +58642,12 @@ spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }: melpaBuild { pname = "spaceline"; - version = "20160720.1034"; + version = "20160801.211"; src = fetchFromGitHub { owner = "TheBB"; repo = "spaceline"; - rev = "c79ded7f3e81164077fd43f31c3807e51c250243"; - sha256 = "0dfm5n50xrkchz4cxl00zjq8nxdryqjm55ys86hm54g9cwsh5fs1"; + rev = "34ee477b3dbc0d81dc44c82cc092f006899cba70"; + sha256 = "10kwjlngp0xsgzj7gpglmzyx0l2vmfl3f6q7gwwad4kymsbh4s8p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline"; @@ -57298,12 +58663,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20160716.1303"; + version = "20160820.1041"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "3e8f0d8fabf9f52f8f1e725f5f3b066077a4626b"; - sha256 = "0nik79apwcxvldbjvrwiqh88da5w1fjyzli49hkjmlv9nw6skhfv"; + rev = "6d96877d228af73a2c4c656c9bc33734feacc887"; + sha256 = "0aj0aazky2l8c59kn11qhj8xch40mqxjp6a9gfbyfbfcqnmrvlqg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -57382,12 +58747,12 @@ sparql-mode = callPackage ({ async, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "20160316.804"; + version = "20160728.1000"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "04a3ad8a5aaf409cfe2256c833e3a3b697a259dc"; - sha256 = "1bwa7vi97xlgwzyrc9cdz8i8rajlvkp4ajs8nklsqwrvzngly9lx"; + rev = "22d1f80176e4ac57ec489d4aa3d243212060843d"; + sha256 = "1v1wcbvbymg0vlwpis706ps5w9bscypqp8zpbk52lcny2lshqmik"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; @@ -57522,6 +58887,27 @@ license = lib.licenses.free; }; }) {}; + spice-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "spice-mode"; + version = "20160818.1749"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "spice-mode"; + rev = "78bbaa6c39fe5a89de7fc3775b161f4a9c022e69"; + sha256 = "0cf0km62izcj62m78q9vgafrckq49mjmf672vnkbckf974m93h2l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6142975cf9c0b9faaf128be34d30e12a88b500f8/recipes/spice-mode"; + sha256 = "0r9dp5g3rp8fycd6nmm4m1vwsqahc47h3dsk6whw9a7adxh5i2bv"; + name = "spice-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/spice-mode"; + license = lib.licenses.free; + }; + }) {}; spike-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spike-theme"; @@ -57588,12 +58974,12 @@ spotify = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spotify"; - version = "20160128.106"; + version = "20160816.15"; src = fetchFromGitHub { owner = "remvee"; repo = "spotify-el"; - rev = "99c693c3016326465ede26243885ad05f0911f71"; - sha256 = "185zkdghi10yjmzxlfafjk9d9cq760432h2y5z373ksshxc3pdpa"; + rev = "472f6e61d732a7e700f5505e2a445fc0b030916a"; + sha256 = "0kc17ijjd8ygwjji23ndhq75kqjyxlb8kg9q0ij0l38q3b903fhi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb57a2d7dc46f7b0663a030e240f81c758a44e6a/recipes/spotify"; @@ -57634,8 +59020,8 @@ src = fetchFromGitHub { owner = "ian-kelling"; repo = "spray"; - rev = "69fe48e7bb079e3011476b9f4eb6ac9ae94d6d9b"; - sha256 = "0anidv7w2vwsjv8rwkvhs3x51av3y8dp435456czy5yfq6i6vfbl"; + rev = "ecb0425a3c49b4bcb1ac1d3ccbeec2061ff43978"; + sha256 = "0vl3qx3wdxqbvbpn811q4d0pnh9sla4mf5c19n56m4n4dd9i47h3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d0947317319c8ccfee59461ee628eb8ae9f261fc/recipes/spray"; @@ -57858,12 +59244,12 @@ sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlup-mode"; - version = "20160624.1107"; + version = "20160830.1354"; src = fetchFromGitHub { owner = "Trevoke"; repo = "sqlup-mode.el"; - rev = "6295ec413a2e3cc50644b342aa77ec85d744448c"; - sha256 = "0ajixsfxpyy37k7kbaqz3dqazwc371yfd9fqdhanwn9lz6w390kk"; + rev = "c8e86c90655dd138e5ccf2fd666f90b977c9a976"; + sha256 = "1wfrm2ylgxcazmp9v5ah214svcsl1l581p4cz89k7vg8f4vscs4g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode"; @@ -57981,12 +59367,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20160721.144"; + version = "20160813.308"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "952abf0366f3216a515bb707c61705f8398f2fe7"; - sha256 = "18c0xnv2af8nh11pby3la4hk93pzz377jhlba148lsj4i0q4v9v2"; + rev = "965c68fe6ae4eabab28faad37ce2a57e3e343b46"; + sha256 = "1y10j2lqyz2ls7lp61f261mm2vgwrgcfqqv1af75g6gd2qqb1bfk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy"; @@ -58090,8 +59476,8 @@ src = fetchFromGitHub { owner = "lueck"; repo = "standoff-mode"; - rev = "02101e3045d1b813618b1899a63666911587076b"; - sha256 = "0jq2hn4gqp71ynk0s2i21wp975in3xv2q18xx1fwd4p0yw8h5dig"; + rev = "c55e80ff0e939f3d2cd6bda50b1121a54c08231c"; + sha256 = "0cjqd0cgn0n5mlf8iva70y228day58inly7929p2hw28fndy51gy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/98858a45f72c28eec552b119a66479ea99b60f93/recipes/standoff-mode"; @@ -58256,8 +59642,8 @@ version = "20140213.348"; src = fetchgit { url = "git://repo.or.cz/stgit.git"; - rev = "e4e04764009f749665636c4d11e0cafd9c4971e1"; - sha256 = "0s7si3f9b06d6pnpz412sjxryqpibxzvpmb3f91ziaycib69zg23"; + rev = "ef93c20469c08feef7fd915bb773b53e0673679b"; + sha256 = "08xjp9r2cx9jp4gvnadm1x72mqicwkj6rzmzgm976xrndi47cakm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ed7cc025d22d8e1e63464e43f733c78421c91c7/recipes/stgit"; @@ -58622,12 +60008,12 @@ sublimity = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sublimity"; - version = "20151230.727"; + version = "20160822.1856"; src = fetchFromGitHub { owner = "zk-phi"; repo = "sublimity"; - rev = "ee9c9fbb92b8fc0c191e5e8640477e251b602bf9"; - sha256 = "1kpq7kpmhgq3vjd62rr4qsc824qcyjxm50m49r7invgnmgd78h4x"; + rev = "f692af1ba045146f568ee36009a78b79e9cfe21f"; + sha256 = "035cb27a5i5ixlrqbh4a0srw3z9k054z32dzls851775rz91dks5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c1e78cd1e5366a9b6d04237e9bf6a7e73424be52/recipes/sublimity"; @@ -58742,6 +60128,27 @@ license = lib.licenses.free; }; }) {}; + suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: + melpaBuild { + pname = "suggest"; + version = "20160822.2134"; + src = fetchFromGitHub { + owner = "Wilfred"; + repo = "suggest.el"; + rev = "d9cedf0d9c3809d4eb44dd719aebf2a0c681be4b"; + sha256 = "16g1ammapx0wgrxlhckxhn3bn2lj0xjx0m23gnn9ln1bj138h9fq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; + sha256 = "12vvakqqzmmqq5yynpd4wf4lnb0yvcnz065kni996sy7rv7rh83q"; + name = "suggest"; + }; + packageRequires = [ dash emacs f loop s ]; + meta = { + homepage = "https://melpa.org/#/suggest"; + license = lib.licenses.free; + }; + }) {}; summarye = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "summarye"; version = "20130328.327"; @@ -58970,6 +60377,27 @@ license = lib.licenses.free; }; }) {}; + swbuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "swbuff"; + version = "20160824.707"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "swbuff"; + rev = "8d5b2bec12503509554f9dd83b97c198b259db2b"; + sha256 = "0h96pwvf1smd2kakd5ydsn6q59dv9sj706p1ak86aj82m028wzk5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a44a6577740b98749fe2703b32d70f15a473eb46/recipes/swbuff"; + sha256 = "0pi816ljprpl8p2pigfyzm9ripvrc4hvnpkjdsg30mw8iyrk66yn"; + name = "swbuff"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/swbuff"; + license = lib.licenses.free; + }; + }) {}; swbuff-x = callPackage ({ fetchurl, lib, melpaBuild, swbuff }: melpaBuild { pname = "swbuff-x"; version = "20130607.314"; @@ -59033,12 +60461,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20160720.426"; + version = "20160829.2049"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "17b59b2244473ba32cff3408e41e451de7fcc69f"; - sha256 = "1srzmlgd4wbwdickgxq4kjxbw5rprkh7dwfi7rz82zsahk1jkzr8"; + rev = "4c3ecb4d739df379dd01ac8c7dc17080e608dac3"; + sha256 = "0cah0ri248hy1xzrldhh831imyfvnm9jdwnnxqm0iphp4dsf1xk7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -59303,12 +60731,12 @@ synosaurus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "synosaurus"; - version = "20151119.1049"; + version = "20160812.723"; src = fetchFromGitHub { owner = "hpdeifel"; repo = "synosaurus"; - rev = "9be71a2df0c19ddb5e0cb8cba29ded5368a0fcae"; - sha256 = "1zz9rnwaclr95fpjyabv5rlhk36n2k8f1lzz6yqh964hv8i9562s"; + rev = "24d194992d9c57df29256257b80960fdb1c4c2a7"; + sha256 = "022fj1pfbjjl6khzmns9pwigwg1cll3vlccf48i8amk4n1m1wgmc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/synosaurus"; @@ -59449,12 +60877,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "20160628.2048"; + version = "20160731.1630"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "0e793b05e2767f1737bd4085874cf1ba6cf07ced"; - sha256 = "02kjq9ayp9rkhfw5xlyvs1md2zkmdmb76w1ml3bbg0dyp46nk06p"; + rev = "a1633c271da2854f78e25015a846954df2e50968"; + sha256 = "05629nph69711yn7jvv5zlqdydivz9vgj8m57bjv7m9khdxf8j5l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -59575,12 +61003,12 @@ tabbar-ruler = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, mode-icons, powerline, tabbar }: melpaBuild { pname = "tabbar-ruler"; - version = "20160526.2148"; + version = "20160801.2007"; src = fetchFromGitHub { owner = "mattfidler"; repo = "tabbar-ruler.el"; - rev = "4663470219f0ee22ad333eeca646a4a8afdc98f6"; - sha256 = "1rf7qahc2h9v5r75cj8y4vn88xqgwxpdqxkh2cd1f6hy5m1p4cam"; + rev = "535568189aa12a3eff7f977d2783e57b6a65ab6a"; + sha256 = "1csj6qhwihdf4kfahcqhm163isiwac08w4nqid1hnca184bfk6xm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d69d1ef8dbab8394be01153cf9ebe8e49bf9912/recipes/tabbar-ruler"; @@ -59767,8 +61195,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "3bfeaeed25c0248579787db47c98c00918914526"; - sha256 = "1cdiw4p0b18zd21vasvs6hayk9rr5mz2rsgr8j0ifsamasl7vmgw"; + rev = "6eb5781af166bb8850e83fe7bb9be74f274f2b99"; + sha256 = "1yzx5ijjpg7dn6vnp66qq8fazb389wkpki4kpn3jvwc2462i2z6r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -59826,12 +61254,12 @@ tco = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tco"; - version = "20140412.612"; + version = "20160810.1712"; src = fetchFromGitHub { owner = "Wilfred"; repo = "tco.el"; - rev = "d2224bd291e25724b06d8589d4d62d74ed32db24"; - sha256 = "1krway6iw62dlr4ak3kj9llqh48xjf3d84nlincap7gkrw886l4q"; + rev = "722eef5591303f118c1e79be6993ef4c90de7b46"; + sha256 = "0vf29cgbc7wirj077hr2fvzps5vq3cr888ksa5il74xlz4vk1yb3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca33f97f0394585c8ccb31cab0ee776d1655907c/recipes/tco"; @@ -59994,12 +61422,12 @@ term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "term-manager"; - version = "20160605.2109"; + version = "20160824.1049"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "102dacb8c1329b3e4919636279d808ca99113c4e"; - sha256 = "07f9bjvlgb5iaflnkh87xih0yf89cs7m58mqijyj81p0p546cw15"; + rev = "0768cef5efe7579a36304a5832d46b0e044993cc"; + sha256 = "0cifgzsgzyd659h38gsvh2dr8z48n9qn0aq8z8bz18wz66q8lbij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager"; @@ -60078,12 +61506,12 @@ term-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, term-manager }: melpaBuild { pname = "term-projectile"; - version = "20160620.304"; + version = "20160824.1049"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "102dacb8c1329b3e4919636279d808ca99113c4e"; - sha256 = "07f9bjvlgb5iaflnkh87xih0yf89cs7m58mqijyj81p0p546cw15"; + rev = "0768cef5efe7579a36304a5832d46b0e044993cc"; + sha256 = "0cifgzsgzyd659h38gsvh2dr8z48n9qn0aq8z8bz18wz66q8lbij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile"; @@ -60141,12 +61569,12 @@ tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "tern"; - version = "20160718.57"; + version = "20160817.522"; src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "18932c449b6ba1aff606e04c711242bad48426af"; - sha256 = "1x7gx7krgw7s5l0k8k3cxrqd85bhpvzimqa68m85wqch01cpcwaw"; + rev = "0bf87473bc8c21f8d37e2ff6157edf9df8bde521"; + sha256 = "189pbik01j3spd7ds2nsl48k1aqj01b3m4pc5261c8rakhdzgjz6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -60166,8 +61594,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "18932c449b6ba1aff606e04c711242bad48426af"; - sha256 = "1x7gx7krgw7s5l0k8k3cxrqd85bhpvzimqa68m85wqch01cpcwaw"; + rev = "0bf87473bc8c21f8d37e2ff6157edf9df8bde521"; + sha256 = "189pbik01j3spd7ds2nsl48k1aqj01b3m4pc5261c8rakhdzgjz6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -60225,12 +61653,12 @@ terraform-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }: melpaBuild { pname = "terraform-mode"; - version = "20160621.409"; + version = "20160823.31"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-terraform-mode"; - rev = "5b796450bd60ab9fb184a0b4ecc08c15de1cbc22"; - sha256 = "1ab59q016ffzfwms7f2d6mnzcbf68f35jg72mlj2g52bns9khanr"; + rev = "6337c5eda0abacc5b38e241dae0fadd8cecc81e5"; + sha256 = "0cyijxjxdhkc555hwgdv0jxnsqp22b12ys35v2hai3p9w5x22jxc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93e06adf34bc613edf95feaca64c69a0a2a4b567/recipes/terraform-mode"; @@ -60415,8 +61843,8 @@ src = fetchFromGitHub { owner = "myTerminal"; repo = "theme-looper"; - rev = "41c15ae98f9406b7932974318a2eada3668a88e7"; - sha256 = "1kd4mazrcy5xamkvvrwsmcx63g0gp5w4264kxbk3d25bjqcf8rmj"; + rev = "6df57e7f6b6e40168b3b2c6a2f80a15d0522ce6f"; + sha256 = "05b3p4i7bljhlx490dqkp32a1n15kz697vdjlzld30hwspfynhcv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/861c3b96189233956b15f222702ff034ed2d8cd1/recipes/theme-looper"; @@ -60489,10 +61917,10 @@ }) {}; thingatpt-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "thingatpt-plus"; - version = "20160620.953"; + version = "20160830.1004"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/thingatpt+.el"; - sha256 = "1j6p089b2zdzf2mps642my24aa79ldpfa79rxpz1za8ixrk4333l"; + sha256 = "1psccacv7r4mqxbp99q4hsln27pybhb0dz9mzrh0iz57b9j13fnh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+"; @@ -60547,6 +61975,27 @@ license = lib.licenses.free; }; }) {}; + threes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "threes"; + version = "20160820.542"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "threes.el"; + rev = "6981acb30b856c77cba6aba63fefbf102cbdfbb2"; + sha256 = "1a7zqq6kmqxgzbsg8yczlvipzv65n10c8j26mc507p4m47nlikgv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bff7d9ffbca45629f310743aff776b762c8507cc/recipes/threes"; + sha256 = "03zwcaibdj88a6whccc5ysqsnfwi76yhsgjsfp3lxjcmlkwqzjbs"; + name = "threes"; + }; + packageRequires = [ emacs seq ]; + meta = { + homepage = "https://melpa.org/#/threes"; + license = lib.licenses.free; + }; + }) {}; thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thrift"; @@ -60554,8 +62003,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "bcad91771b7f0bff28a1cac1981d7ef2b9bcef3c"; - sha256 = "1zz8lb8jvd9iza65hs3nn9n3il50q36zpi6v6w020xlr6shakjjn"; + rev = "e4ba16495e8d8177eb85d6bfcc69089b38753e39"; + sha256 = "1ykhl56l2rr853ppf37w37rq4bc5dvfvf1h47ahplij9qgagbf6x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -60611,12 +62060,12 @@ tide = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20160722.534"; + version = "20160830.2120"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "1e070790da1be11a330ec2484531e9a58a5201a9"; - sha256 = "1chh4pvq6szjz3s2lr6c7k8ckfv5g2mkyd5c14275slq0c6kf9wi"; + rev = "170bce9067a6467f190418284377559a9f43c667"; + sha256 = "0b23d9bi1i00v9ffrdi5ag0q2i149ai1p88klpgl2j9kvdif0zmg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -60776,12 +62225,12 @@ tiny = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tiny"; - version = "20151208.205"; + version = "20160811.246"; src = fetchFromGitHub { owner = "abo-abo"; repo = "tiny"; - rev = "d775201a6e14aae03dda032132aa288ca93bddc4"; - sha256 = "0mmz8b0fzffybc2jws9fif982zfx0l6kn1l4qxc67mf9nafbdca3"; + rev = "1766056dc768df6c981c301a2e7b8de7305acb73"; + sha256 = "0k3wmp0m4w77q00sk2i30zd23rjlwnj9r66xrl2gw55sapnayh77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3029dab001fff5d12e8a2bace6ddbf897842c26/recipes/tiny"; @@ -60860,12 +62309,12 @@ tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tldr"; - version = "20160312.608"; + version = "20160807.2022"; src = fetchFromGitHub { owner = "kuanyui"; repo = "tldr.el"; - rev = "f5e093349ebccc0355acf6f591ba9bc6076a7639"; - sha256 = "0z94m84q7j35dffpnbz1yh6axd6c787hj358bkq2qk0irsvh5n79"; + rev = "b2b154b0cbe495f25de1bd9bccc76666ef209342"; + sha256 = "1bdd31aravm01ahy3ksgfdm65rknzj2v5a69vnag36ap7lj4ax49"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45af2c5d1a36fcbf739812594c5cc878bf319a26/recipes/tldr"; @@ -61250,12 +62699,12 @@ tox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tox"; - version = "20141004.1403"; + version = "20160810.855"; src = fetchFromGitHub { owner = "chmouel"; repo = "tox.el"; - rev = "5c1a7c18cb7f2fd2da2386debf86012e6953e15d"; - sha256 = "16217i8rjhgaa5kv8iq0s14b42v5rs8m2qlr60a0x6qzy65chq39"; + rev = "27a074b21238855ce3c33d22e42d69e2c2921205"; + sha256 = "1m3f0i6vrkrncd7xsgz65m6595iv6yr4gbbzlis8p01kd98wbxfk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08a7433e16f2a9a2c04168600a9c99bc21c68ddf/recipes/tox"; @@ -61399,15 +62848,36 @@ license = lib.licenses.free; }; }) {}; + transfer-sh = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "transfer-sh"; + version = "20160828.424"; + src = fetchFromGitHub { + owner = "Brillow"; + repo = "transfer-sh.el"; + rev = "70cd5c50b56ed2597221796014298417f503d10f"; + sha256 = "1s4c70z54pc1kcqzqg3z07vw4v0d0f68w7nzifcmbx6s1l5211wf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b4f74dd06d4d5249beaf67b2befec4251c8c18ed/recipes/transfer-sh"; + sha256 = "1gii2avqg9mdmdj2r562s9382fcmw53w9zsvprpnkcyhxhgfy8sy"; + name = "transfer-sh"; + }; + packageRequires = [ async ]; + meta = { + homepage = "https://melpa.org/#/transfer-sh"; + license = lib.licenses.free; + }; + }) {}; transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20160719.2219"; + version = "20160731.1035"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "0f051e62443a5fa6803945a32e997cff66fef4b7"; - sha256 = "0gsvym0af2ja8xw79sb2fs0qa37571iqk3jp93j5bv9vvy6y1482"; + rev = "79008abc3f328c1b24434ffb5ea9e5bc8821ed4d"; + sha256 = "0yf982js9f1hpkn6ydvnzc7x3jwfga5dpyn3ca8ffvzn76iws0vi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -62308,12 +63778,12 @@ unfill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "unfill"; - version = "20131103.213"; + version = "20160816.2300"; src = fetchFromGitHub { owner = "purcell"; repo = "unfill"; - rev = "d5f3dbaaaa871dc26bbc9e4bcd6deacac02a02d4"; - sha256 = "0fd9k5m1yw2274m2w9rkrg7vqagzf0rjbybglqi7d200b3hmjin3"; + rev = "a88ba489b47429653c98d72ae8e0b2bcbed02faa"; + sha256 = "1gmwdja53x3mzpfxjjqs41vy7prfyz7a1iy3cf5fx3k1yw9vcfkb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ade389a20419b3e29a613409ac73a16b7c5bddb/recipes/unfill"; @@ -62694,12 +64164,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20160722.1123"; + version = "20160815.1137"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "c191614a009bf02d7af63e306bab6d296e1849e3"; - sha256 = "1v9s01g03sgy42pqaslcchwza3zw14d18qfidiggcic7ffl6sy0j"; + rev = "3f6ba1bb8ad3fd81278b6787c664639a6a0df6f5"; + sha256 = "161bdn6b76rf0sm7881pyr6xs8mvyvpxhzicf0g2dqncisg4y0gn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -62740,8 +64210,8 @@ src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "f84b9b10ae0b9b58f2d41d4d5216891da4d49d55"; - sha256 = "0nxj6k1j8cpargl1qv4p2dhnlmn8fb5qy941jx03613igaya2f6z"; + rev = "d8905336751ab1a3065d128fb4e13bbcf54d0e2e"; + sha256 = "0hyfk565cy2h1rhs4azx2g6bwpjhh6yz59qlnlrirjpsnjya6f9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -62845,8 +64315,8 @@ src = fetchFromGitHub { owner = "ottbot"; repo = "vagrant.el"; - rev = "ef3022d290ee26597e21b17ab87acbd8d4f1071f"; - sha256 = "1661fwfx2gpxjriy3ngi9raz8c2kkk3rgg51irdi591jr2zqmw6s"; + rev = "46c0c5129f6330497c518de442d517a0794b70fa"; + sha256 = "11bh92a40x778875q1m2kmq9nanp96d9v9hzra0jk8954g0bavlr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/vagrant"; @@ -63072,12 +64542,12 @@ vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "vdiff"; - version = "20160726.1519"; + version = "20160803.1035"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-vdiff"; - rev = "945405330ffb3e397505738efb33cc1f2c1aff14"; - sha256 = "0nx0c5h0mvkqbr2qbn3w5qxnhg65hw8lmy5mnh9q2a6gd154aqdm"; + rev = "eda4b1bee033d3fde19a70ccfd2abbe278230f0e"; + sha256 = "1yhvizfcl71j6j8dz2la7z90zn4x1mka3qavpmgjcrpck77a9k5x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff"; @@ -63216,22 +64686,22 @@ license = lib.licenses.free; }; }) {}; - vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine, projectile }: + vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "20160709.230"; + version = "20160810.525"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "6d8b03d588b612f82395d4fdf9d1d5c5adbd471f"; - sha256 = "13bazr7cgsypam4yhk491wlkm688rkp44nc83rbl7qyyf3zb24pa"; + rev = "f6dfac6851c6bc78f9d72849befd54b09ac64ce7"; + sha256 = "03qqvv9l83b5cpdcjdcq0wv3ghhx13y3b16rn1d1l0vfndzmnz42"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw"; name = "vhdl-tools"; }; - packageRequires = [ emacs ggtags helm outshine projectile ]; + packageRequires = [ emacs ggtags helm outshine ]; meta = { homepage = "https://melpa.org/#/vhdl-tools"; license = lib.licenses.free; @@ -63391,8 +64861,8 @@ src = fetchFromGitHub { owner = "mcandre"; repo = "vimrc-mode"; - rev = "d4c7d41091eb282e617c973f5b1fc29c69dc9a28"; - sha256 = "000fs2h5zcv8aq8an16r6zwwf9x1qnfs7xxn39iahiwfzvnljqp0"; + rev = "fae7604e5ea6eef104d8c68598c3bbf9d798aa74"; + sha256 = "02yhagnrq0zl19w7fh559fs6vm6b383k1r27alvixjfcm18p0fpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81521d8020d55d75014302b1e5cf0d7126a34bc6/recipes/vimrc-mode"; @@ -63492,12 +64962,12 @@ visual-fill-column = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "visual-fill-column"; - version = "20160411.520"; + version = "20160804.1452"; src = fetchFromGitHub { owner = "joostkremers"; repo = "visual-fill-column"; - rev = "865c9b32ead54ac3c0a6f0a92164e9963bacdd5d"; - sha256 = "0r1iylk7r25wmlba4vlrc6k1apbkrbplb9id1h9q91wqhwdnxqal"; + rev = "d3f64e72062cdb74e698bbda8c44d47eb3133099"; + sha256 = "0g6x97d8l11zgcfqdbm5p2bxb9x4c9c7hlypbr6vl6zy1dqixaiw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column"; @@ -63513,12 +64983,12 @@ visual-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "visual-regexp"; - version = "20160624.320"; + version = "20160806.610"; src = fetchFromGitHub { owner = "benma"; repo = "visual-regexp.el"; - rev = "2cf4dc5a2dff0736eb2e2da95997d7274bbb5766"; - sha256 = "0zz83l97xkna2yqiiywxyhj2zwil2a0xqzdsdxw0ai951jql1j5r"; + rev = "96dea5e40a2f904da8efb7cff968d770550b9fb8"; + sha256 = "1482pk12fb23dv97lvp9wkmsa5pybsvc3d2yn5223kwxdy6yg922"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/visual-regexp"; @@ -63719,10 +65189,10 @@ }) {}; w32-browser = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "w32-browser"; - version = "20151231.1620"; + version = "20160814.1433"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/w32-browser.el"; - sha256 = "0vb5ss30mz0kqq8cscjckw647vqn6xprp2sfjcbpg2fx59z4agma"; + sha256 = "0cb42vmvjhgjg34klxfrqx8fc39awv0gcr2i2n3ma2xdknzb9z7b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/w32-browser"; @@ -63862,12 +65332,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20160704.313"; + version = "20160826.1616"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "d6565e7e8f8423f419c24cd96bc7508241ad2dd7"; - sha256 = "18iqgwq2b162408sza3i5fgzjgy16v376hsbal10403bvzlwp1ir"; + rev = "6e69789e5413e91d315123ba977d9754bd9ef76d"; + sha256 = "0j0mhcvsf1hi2zxdn1gi7r0mrbcffcj0kdjrf15wwih4g6kraja6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -64093,12 +65563,12 @@ web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20160717.1201"; + version = "20160828.2311"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "e170d2720be0758a7ebe001e234231be52c83554"; - sha256 = "0grskbrxcpn4sb55qycp1rm2fxvdd1ijndscqzfmvwi9kp0snx59"; + rev = "cceda49bfaad34296592492bebaa1544f6f0dc12"; + sha256 = "1d6ifc9ii2f64jyywqlkjk48jp1gv71hwd32lrp6dxmv3l32bwk3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -64386,12 +65856,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20160709.1225"; + version = "20160817.817"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "eb4a6f6e251cf0e34f2d7f988591dea194b4012f"; - sha256 = "0f951k9lsnxbigdgcgrn12ndbl4m64m40qp7whgvndnzhjq3nqpp"; + rev = "1eace34a1f5b780a30797976d0cfec5936048b7b"; + sha256 = "0sgisdgid6xw6pggdi42i07wmar8bbxg9wk1b7jvyi7i7q94s843"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -64555,8 +66025,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "5f7a483cd068573c2c32a73a0b535db38090f2a3"; - sha256 = "06x6m7jm01pmpz1cy6aazyay0hg3kg2as0h3qzrc8lzbq0v7plhd"; + rev = "58a5a48691f5814c6264fce48310681eed10cef4"; + sha256 = "010aplsdww0aksyml6xgyp6j44sj1f3m30h9zz7pknq7yn96rjnp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -64776,12 +66246,12 @@ window-numbering = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "window-numbering"; - version = "20150228.1247"; + version = "20160809.1110"; src = fetchFromGitHub { owner = "nschum"; repo = "window-numbering.el"; - rev = "575ad203545b01e21d28fefc0d8b809d1016ea3a"; - sha256 = "1f4c6q4larifm745fr8f3w8sxs1sbs77vna29rw120jz8rnlz0jy"; + rev = "10809b3993a97c7b544240bf5d7ce9b1110a1b89"; + sha256 = "1nlgzrjg5k7wyaka8ziqyv683vsc0f2lw5kr5xajcqlamwbzs7vi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ce1dc80f69894736b276885e4ec3ce571a8612c9/recipes/window-numbering"; @@ -64815,12 +66285,12 @@ window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }: melpaBuild { pname = "window-purpose"; - version = "20160722.901"; + version = "20160727.655"; src = fetchFromGitHub { owner = "bmag"; repo = "emacs-purpose"; - rev = "373c67ce586fe5443f353e1cc9f553708f9482ac"; - sha256 = "0jjm5cfqvqgl507z4i06l85f7b8pldl57zcdyw3bw7lz66xcbgqv"; + rev = "00c253778d8e845bdc17a350c22ea157c5871b41"; + sha256 = "11hv2rrcirswzgx0l52kwav5dilr3yksky9a3vg1pghgqhmm59hv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose"; @@ -64896,6 +66366,26 @@ license = lib.licenses.free; }; }) {}; + wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "wisp-mode"; + version = "20160419.1232"; + src = fetchhg { + url = "https://bitbucket.com/ArneBab/wisp"; + rev = "a55b6dd96558"; + sha256 = "1n0a99v2gwr12dhgg0yw42lm7ggcq9b85qn1c29k66l7jz637mfp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; + sha256 = "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc"; + name = "wisp-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/wisp-mode"; + license = lib.licenses.free; + }; + }) {}; wispjs-mode = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wispjs-mode"; @@ -64920,12 +66410,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20160408.201"; + version = "20160828.1025"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "d28d07497f67fea4c62fe7a2d3201fd86fb64fe2"; - sha256 = "0rzq2fbz523fyy2p6ddx9iws89sfgw3pwillw8yz965f3hxx3dj3"; + rev = "6f41998405796336575b1fce49b84667feaa9b9f"; + sha256 = "12bw86l8756rwfgnik0kywqafw8idv8ncdxlbaybix70r2iaa61y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -65067,12 +66557,12 @@ worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper }: melpaBuild { pname = "worf"; - version = "20160704.111"; + version = "20160825.218"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "0b906ae372f27049f309971185e019aabfffa486"; - sha256 = "1gapmnpkky9f9zfwzrmzbv8camx2x5645xhzzk221fvq11sn23k7"; + rev = "ec177f9edd48bcb230acd5ff995bdb78b8f8ffac"; + sha256 = "1vhc370swk6bh7abgz1bnzyjvilmcjr7hvdl878x0vzcf9vlg7gx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -65172,12 +66662,12 @@ writegood-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "writegood-mode"; - version = "20150325.1115"; + version = "20160802.1405"; src = fetchFromGitHub { owner = "bnbeckwith"; repo = "writegood-mode"; - rev = "4302169c1563cab9319745083f9b9a7f5f4af0bd"; - sha256 = "1nnjn1r669hvvzfycllwap4w04m8rfsk4nzcg8057m1f263kj31b"; + rev = "253710702282c2a789b9a6cd64d53a5fcfe08638"; + sha256 = "1kppxgq2hcra1a978r5m589y7cya07hpqlhg19qa3i6m92wz6jcj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/75c5a4304999fc3f5a02235a1c2c904238d2ce4f/recipes/writegood-mode"; @@ -65193,12 +66683,12 @@ writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }: melpaBuild { pname = "writeroom-mode"; - version = "20160613.1611"; + version = "20160830.616"; src = fetchFromGitHub { owner = "joostkremers"; repo = "writeroom-mode"; - rev = "63fff51a2be84addd5253176fc42ad96524313f8"; - sha256 = "0x7y2j6wx6amj41jx2iwq1r00d0zg7dlrpkf6bmb4gkysydgfnb6"; + rev = "425ab2bd4f37165a6cf85b58e0dec8105bd2bd35"; + sha256 = "0b6rr78aid7h006k77i6gm82par48l5d5w7xhhkbv109cdra1qlh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode"; @@ -65295,6 +66785,27 @@ license = lib.licenses.free; }; }) {}; + www-synonyms = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + melpaBuild { + pname = "www-synonyms"; + version = "20160812.1329"; + src = fetchFromGitHub { + owner = "spebern"; + repo = "www-synonyms"; + rev = "e0ee69f98309a5f3f540683ddc35af46502343b2"; + sha256 = "11iwwybanlwm4qkigk4w6zjh9rk7q7pf79hbcbyz9lll69hlmyj0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2fe69ac09c3e24af9c4e24308e57d7c3c3425096/recipes/www-synonyms"; + sha256 = "0rp5p26hd67k4dsb40hj7jv24i9wncaay88dmiqla48843j4ymgh"; + name = "www-synonyms"; + }; + packageRequires = [ cl-lib request ]; + meta = { + homepage = "https://melpa.org/#/www-synonyms"; + license = lib.licenses.free; + }; + }) {}; x-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "x-dict"; @@ -65316,6 +66827,27 @@ license = lib.licenses.free; }; }) {}; + x-path-walker = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: + melpaBuild { + pname = "x-path-walker"; + version = "20160822.1015"; + src = fetchFromGitHub { + owner = "lompik"; + repo = "x-path-walker"; + rev = "2c728b5fe21b83fa670b7f8ae026bb93bfffd551"; + sha256 = "0ldcfpdid1cjls66lb40wizak9cbrjfd0my20s89a6k9sxccyrah"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c51f2aba59cb93f4bb104a7dde214963cbf002a6/recipes/x-path-walker"; + sha256 = "03l83ph0d8g5pxnzp1gs3gdbwl3vhgvyk186yhqy6sbknq627k2x"; + name = "x-path-walker"; + }; + packageRequires = [ helm-core ]; + meta = { + homepage = "https://melpa.org/#/x-path-walker"; + license = lib.licenses.free; + }; + }) {}; x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "x86-lookup"; @@ -65340,12 +66872,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20160714.125"; + version = "20160816.837"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "baac1e25f9de1b513ce400cb0a7392d94967faab"; - sha256 = "02w863v0mvynms6camqy9kj9r0lbmpqdh5v2hkjfx25f2g8bls4s"; + rev = "44f3f98549ef9eba5389dde11a74bd0b34b9a012"; + sha256 = "0bx1bk4m55qdf557s7dich0fs544vbfa6sgh8nlqhz6z0bvs2s5m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode"; @@ -65361,12 +66893,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20160720.2229"; + version = "20160817.509"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "c9e361cba389b6c2d7c67597dfb3d69f6ee04f63"; - sha256 = "1d5514gmh0wfi2hvw4shrk0x9bm6hikvlxmn6wpaa2n1i5df2lzl"; + rev = "2f4e511fe88ef21f24e0381ab3f31995296cd43a"; + sha256 = "0cwghnyklcnmcn1f6py0ji9bc5pwf03wxk1jv9vjxlyh0yd35dnk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -65403,12 +66935,12 @@ xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20160722.2248"; + version = "20160827.2003"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "24c7eadeb14eb088ab4ab3c34118770bfeb873a7"; - sha256 = "0al53x90lpcpf2z7x0cnvzmdjc6arfxb3f3ygdp46d5y863b9dk0"; + rev = "30d7f9fad789f20c73eda03c62a18d4ecb6a239d"; + sha256 = "11x0d5rbvxk35hrmd8ygpyfi3k9nd8rxqkqrjvvzbfjwnjpwdk9q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -65676,12 +67208,12 @@ xmlgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xmlgen"; - version = "20130219.219"; + version = "20160810.331"; src = fetchFromGitHub { owner = "philjackson"; repo = "xmlgen"; - rev = "d27294a4174888fe452015cb98dedd2a4bdc1e92"; - sha256 = "1nk50iwb6az01r1s2l9wwdqrz3k4ywr00q0zmd9vvi3y9v4cjah0"; + rev = "fa99dbc8fa233100242a234e915fe658154d2a34"; + sha256 = "0j2yp6fy3gvgvpjdlrrxxwyax24ngv7jhxfj4rmf8wghf7i2flvg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd19fded2de4e7549121485e81f7405c0176e203/recipes/xmlgen"; @@ -65760,12 +67292,12 @@ xquery-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xquery-tool"; - version = "20160705.356"; + version = "20160823.902"; src = fetchFromGitHub { owner = "paddymcall"; repo = "xquery-tool.el"; - rev = "68de7a26e589f5eab1929caeaa5dafffde362bef"; - sha256 = "1j11vnkva7c3rwzyfg467m7l437lb1rdfzarsgi33i225ai4c0hb"; + rev = "b81b5862e8541aca5231840eb176afad7ab55cf3"; + sha256 = "0dv3gl9djs9sbsg5mhdfnnv61ir9xccqijh7i2b82gq2j3lqhibm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc71e5ea4a0ecb006f62617f5b6caadc9b3c77b2/recipes/xquery-tool"; @@ -65781,12 +67313,12 @@ xref-js2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "xref-js2"; - version = "20160521.448"; + version = "20160803.116"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "xref-js2"; - rev = "a950782a09b5e88d994c888c1700e54204b5dbd3"; - sha256 = "0xs7wi29kxy2rjpimrlmigsk5sm03is4cd2snc4gsqfns769bjp0"; + rev = "7e2bc6a8dad08a493d11d3554f6374584846b9e6"; + sha256 = "1mmd27miv32sl8cj7qhy09yfh7v1zgw7rv4fdwk96msvd4qfdkqd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5dab444ead98210b4ab3a6f9a61d013aed6d5b7/recipes/xref-js2"; @@ -65820,22 +67352,22 @@ license = lib.licenses.free; }; }) {}; - xterm-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xterm-color"; - version = "20160707.1653"; + version = "20160802.1752"; src = fetchFromGitHub { owner = "atomontage"; repo = "xterm-color"; - rev = "a2bd27070243934b7129702a120ad523848045aa"; - sha256 = "1lxfnjz35gyfqv9pp9kq8lck8q2jd52wsgmf6mnk0f7jw1v8w9lx"; + rev = "f7c197f64e3aded540faefc6b7686cc959cdd948"; + sha256 = "0d4njs7bk3kh8qjqc7mhj245ca1ckd7yq8vhdwl4njx587ikldvy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; sha256 = "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj"; name = "xterm-color"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/xterm-color"; license = lib.licenses.free; @@ -65970,12 +67502,12 @@ yafolding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yafolding"; - version = "20160723.556"; + version = "20160814.1230"; src = fetchFromGitHub { owner = "zenozeng"; repo = "yafolding.el"; - rev = "f0cc030ddd7ab53fbdf3cdb8b157d8cbcd6a08bd"; - sha256 = "0xwa490bl59bk0lpga6kag8gif9ln0g4hp42hryhjv5spvgzlsb8"; + rev = "a89146d35b8f66be68c1e8d1d03c4abdde39ebee"; + sha256 = "1pq2b6bhl93b023gin7j1warvg8bz8zvf6kdgkmhmqaaaqqha5kr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/51bfd6465ee8ee553e8fd466a3bc4e65ab98faed/recipes/yafolding"; @@ -66117,12 +67649,12 @@ yankpad = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yankpad"; - version = "20160716.1613"; + version = "20160819.247"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "yankpad"; - rev = "3216213b19afb42c35c527ecf5ca266b2bfc0d00"; - sha256 = "1jfyrj544qv8i79zvcxbw43hqrpkw8apas5gs74xbqa0cay14m3l"; + rev = "aa61434132125ac6ab67d19968d8a1d5b27f62f5"; + sha256 = "0d5rbp36r7lwd7zm0z010wj0nxrf344ln1gn10j06hg4555wbmhb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; @@ -66156,12 +67688,12 @@ yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yapfify"; - version = "20160616.1340"; + version = "20160822.1207"; src = fetchFromGitHub { owner = "JorisE"; repo = "yapfify"; - rev = "ae48d638f6f9faf3f00d99d0676efa8423bd8219"; - sha256 = "09xgv2p17n1jxw26qaf78srr3zwc4dvlwvkln83pkhayfnc93lwk"; + rev = "756ebae981208f4b9a8038c415107e1191be9b9d"; + sha256 = "0mfp3wpdk0hsrh93lg3gdym85g5g1f7wj08m7j5919dgx745n094"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify"; @@ -66174,6 +67706,27 @@ license = lib.licenses.free; }; }) {}; + yara-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "yara-mode"; + version = "20160821.724"; + src = fetchFromGitHub { + owner = "binjo"; + repo = "yara-mode"; + rev = "3ad06bc419329ec9c872fe3292da214b3aa9a1f1"; + sha256 = "12xdhmxilqfrsqkx8dv5g78c0dcarsfjf3gy928rqjfhgslafbq6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ef22d2dad1bae62721710bbff4b7228204d7c425/recipes/yara-mode"; + sha256 = "12j25nbfg65bkil4wv6f27sszlj3jm6h0zczr0v26xr5syppis17"; + name = "yara-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/yara-mode"; + license = lib.licenses.free; + }; + }) {}; yard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yard-mode"; @@ -66240,12 +67793,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20160723.510"; + version = "20160801.1142"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "yasnippet"; - rev = "7e0a0de499e655d94a2e454f6519620d99c92ac6"; - sha256 = "0z3zbx0cs085qghmrs15yxhy0g1grlr22z1jw7b2k3y6xg5mmf9c"; + rev = "309fe157f60e537e94f95e1ce3505a3fcdbd4994"; + sha256 = "1784kf4jqaq7x2f1z92n5spz2cc8xnmk4lamchkbziviwlk83jap"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/489687c6c41399a3bca8148a62d25581726a847d/recipes/yasnippet"; @@ -66281,11 +67834,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20160107.1519"; + version = "20160813.100"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "e78a87bc2c9e"; - sha256 = "08iwfpsjs36pqr2l85avxhsjx8z0sdfw8cqwwf3brn7i4x67f7z5"; + rev = "2521a95043af"; + sha256 = "0l7nxjc67mg2ddi7cf9vm744yps26zz64hqq7g0cfycjsgzg517v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; @@ -66340,15 +67893,15 @@ license = lib.licenses.free; }; }) {}; - ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, popup, request, request-deferred, s }: + ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20160725.637"; + version = "20160830.1455"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "5342f1def925e59477880c1bf5c10778c50678fe"; - sha256 = "1nn312z7bfjya570gbs7gcwf9zh3b7jhwg52gfp7digdwqrary42"; + rev = "200a6d2536cf4932b36a89a753eb9c6a12888f54"; + sha256 = "0avvsnizx8l0gyvzy8qkg0177agckxylldqk0vm45pqzzmbsvr02"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -66361,7 +67914,6 @@ deferred emacs let-alist - popup request request-deferred s @@ -66582,12 +68134,12 @@ zerodark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20160518.627"; + version = "20160830.659"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "90aa9d2ca5632bfc6471982339f0709494b35f4a"; - sha256 = "1kdsyki7i7x0ypq0iabdv1bnx0gd45acqcixvrxi3rf9j4chyvls"; + rev = "1dbe8f3b202a1d958c9568a15d72059844277490"; + sha256 = "09kz6yx3ysmdsgrjabq5n30n48r13pi6mp3b5arl9y760k62kds5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; @@ -66770,10 +68322,10 @@ }) {}; zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "zones"; - version = "20160209.920"; + version = "20160819.1426"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/zones.el"; - sha256 = "1g6dpyihwaz28ppndhkw3jzmph6pmcnfhaff926j0zr1j701sqdd"; + sha256 = "1dmcslyf9wm6hmyj8lshs97s3pn6y5m5q4i75p4gzrsgqgyc0h5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f768556f3fbe2537d6ebb08a5285d040e851e85d/recipes/zones"; @@ -66810,10 +68362,10 @@ zoom-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }: melpaBuild { pname = "zoom-frm"; - version = "20151231.1625"; + version = "20160809.716"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/zoom-frm.el"; - sha256 = "1whpd97yjby5zbcr4fcn0nxhqvn6k3jn8k2d15i6ss579kziwdqn"; + sha256 = "0k165zzqc65sl1glhh6qnlfrjx5qx1gcv5a0l445z7ny12r69xwb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/zoom-frm"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 40a61ec8cdd..c061b30def8 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -6,8 +6,8 @@ src = fetchFromGitHub { owner = "etu"; repo = "0blayout-mode"; - rev = "6e4ef20e70aed88489c31c48c73da8ff0ce4572b"; - sha256 = "1xigpz2aswlmpcsc1f7gfakyw7041pbyl9zfd8nz38iq036n5b96"; + rev = "1540cf8a8086bb73685927ae4eb3da099d65a1b4"; + sha256 = "13qgj7dckmilqd34b19klrk1yy1z68r8fv0plr7cg9rcms54aqqh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6521ec44ae8b0ba2e0523517f0f3d5b94ddbe1be/recipes/0blayout"; @@ -485,12 +485,12 @@ ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "ac-php"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "fb2a862af77249e538f304e197fc763baea310bc"; - sha256 = "1a1k72py903z76xznnwv15ay8r2hpicb49zh9faw2vqm44672bm1"; + rev = "f66d13c98543032d2773c83441f49d4b6e109e97"; + sha256 = "0zi16x56jmas70srphd07ycxfdw4ny1y8vsdcvfvmgvg1mgys8f6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -506,12 +506,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "fb2a862af77249e538f304e197fc763baea310bc"; - sha256 = "1a1k72py903z76xznnwv15ay8r2hpicb49zh9faw2vqm44672bm1"; + rev = "f66d13c98543032d2773c83441f49d4b6e109e97"; + sha256 = "0zi16x56jmas70srphd07ycxfdw4ny1y8vsdcvfvmgvg1mgys8f6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -1031,12 +1031,12 @@ amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: melpaBuild { pname = "amd-mode"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "amd-mode.el"; - rev = "4d43d280a7ba7fb10d29ebd3a8b919b15bec85f7"; - sha256 = "0jy43ahhpmafjz8pg5y35gvlkwm8mn3rr0si2nk8s3dh59kmf9lp"; + rev = "27975cae561541bf5e3c4ec8f33730208ea240b5"; + sha256 = "1a9l3gz1r7b3nbzg08x9a30pdn6aa03a3crcsy5nmr5msydnfbsc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; @@ -1061,12 +1061,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "40b389854188e3867ae3d7a757f98c60aa461ef7"; - sha256 = "1mwdlvpyxmnsf3zkqlcjln6ryd88czw5hdssz1acg2yi24k4j44d"; + rev = "7128978b571ec013ccfd91865029cc0d062c269c"; + sha256 = "0l683fk3l82w6097d1g8i9ka3sfv9vpa363i6500xwraa49fcq9i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -1166,12 +1166,12 @@ annotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "annotate"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "bastibe"; repo = "annotate.el"; - rev = "a1690384317ce366e5a33aec916949e3328a0117"; - sha256 = "18ninv1z8zdqpqnablbds4zgxgk4c1nmznlfdicj6qs738c5c30s"; + rev = "067fe860eabcbad4894609c06f090c2c0f97773f"; + sha256 = "0s1yviv6sa05njlix7a88vhfz75mw056w2ac6cmw4wyhxcf4rwdv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae88b8e3b080501195d291012deab31aaf35f7/recipes/annotate"; @@ -1396,12 +1396,12 @@ anzu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anzu"; - version = "0.61"; + version = "0.62"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-anzu"; - rev = "324c3e2db48a3036cce95988e656a99154821c2d"; - sha256 = "015d03w88w79iy28ary7iif20qrizi0j5hpg5pycjzsg69ar1dps"; + rev = "3328619fec138862302bbe1b9acf2eea624a4c5e"; + sha256 = "1lzvc0ihcbplir4hqfyxfqpsd78arz15gk92kmq4f8ggbkl37fan"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04ac359d02d91725c8fc451b17bc2f06a7fe57a5/recipes/anzu"; @@ -1582,6 +1582,27 @@ license = lib.licenses.free; }; }) {}; + auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "auctex-latexmk"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "tom-tan"; + repo = "auctex-latexmk"; + rev = "bda696babcf4f4df435415e2d6a9c54fa99b230c"; + sha256 = "0zq4am4jgb1rnr2gvi9156y7zi6vfkrasjfj5ar1pw4k0cba7pf6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3f48af615c56f093dff417a5d3b705f9993c518f/recipes/auctex-latexmk"; + sha256 = "1rdlgkiwlgm06i1gjxcfciz6wgdskfhln8qhixyfxk7pnz0ax327"; + name = "auctex-latexmk"; + }; + packageRequires = [ auctex ]; + meta = { + homepage = "https://melpa.org/#/auctex-latexmk"; + license = lib.licenses.free; + }; + }) {}; aurel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aurel"; @@ -1648,12 +1669,12 @@ auto-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "tarsius"; repo = "auto-compile"; - rev = "61c6bec0ab4e44fe68628a5ee0c8b3b7f50c001f"; - sha256 = "05crb8cm7s1nggrqq0xcs2xiabjw3vh44fnkdiilq1c5cnajdcrj"; + rev = "1526e59ea8aaa1738c53b24673d62605dbbb5c96"; + sha256 = "05bzknh0fhl22r2klqqrgs7wpx18p5kzwxmg916smbvyk1fzfgva"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e00dcd4f8c59c748cc3c85af1607dd19b85d7813/recipes/auto-compile"; @@ -2113,6 +2134,27 @@ license = lib.licenses.free; }; }) {}; + base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "base16-theme"; + version = "1.1"; + src = fetchFromGitHub { + owner = "belak"; + repo = "base16-emacs"; + rev = "bd7c0d6f54f961752104e1e05f0c525cf62048f7"; + sha256 = "1150alc6f848daf47gchcsy6dhqsq5m35bj4rvdcy50i8n0wa5pc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; + sha256 = "115dhr3gfvdz5wv76fwpv3b4dywiwbk69qrhkfhij8vpcfybrpzx"; + name = "base16-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/base16-theme"; + license = lib.licenses.free; + }; + }) {}; bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bash-completion"; @@ -2407,6 +2449,27 @@ license = lib.licenses.free; }; }) {}; + bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "bm"; + version = "201608"; + src = fetchFromGitHub { + owner = "joodland"; + repo = "bm"; + rev = "b91f87c8f78d2430edc376830d5ba15f45d28637"; + sha256 = "1ggqg0lgvxg2adq91damvh55m36qsa23n3z6zyf5z6855ilzaa4x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm"; + sha256 = "07459r7m12j2nsb7qrb26bx32alylhaaq3z448n42lz02a8dc63g"; + name = "bm"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/bm"; + license = lib.licenses.free; + }; + }) {}; bnfc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bnfc"; @@ -2557,12 +2620,12 @@ buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }: melpaBuild { pname = "buffer-flip"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "killdash9"; repo = "buffer-flip.el"; - rev = "f6c67d87717e3171156b78406ab5a0eeb048905c"; - sha256 = "0s43cvkr1za5sd2cvl55ig34wbp8xyjf85snmf67ps04swyyk92q"; + rev = "386067141ca77848b266e068f8c6baf6b4c2ab5b"; + sha256 = "1bch4jk6d60aydvcc624026pwfby29fbcwm3zhrsksqc0d2qxdwq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3924870cac1392a7eaeeda34b92614c26c674d63/recipes/buffer-flip"; @@ -2848,6 +2911,27 @@ license = lib.licenses.free; }; }) {}; + calendar-norway = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "calendar-norway"; + version = "0.9.3"; + src = fetchFromGitHub { + owner = "unhammer"; + repo = "calendar-norway.el"; + rev = "8501b2ee515e995f345365391b03f44c812cabdf"; + sha256 = "0lch835rq2rqyh0vyi75dhyl7hm6bv27f2z753wggh0jyg6qxi7a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c5d01230027d5cec9da2545a9ce9270a611f6567/recipes/calendar-norway"; + sha256 = "1i23ks0bnq62bvn3szvqf0ikcam4s92yvr998mkjxhdhc94zd19c"; + name = "calendar-norway"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/calendar-norway"; + license = lib.licenses.free; + }; + }) {}; calfw = callPackage ({ fetchFromGitHub, fetchurl, google-maps, lib, melpaBuild }: melpaBuild { pname = "calfw"; @@ -3103,12 +3187,12 @@ cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cfengine-code-style"; - version = "3.9.0.2.1"; + version = "3.9.1"; src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "38748eea130f1bd4578a29cd52380181d9734721"; - sha256 = "1pkbg1zlcfbzsxl0yhz1g9cn77lgw5p9g8xfvdm4ilsia9zy7d29"; + rev = "843fb337d8fe849860ca2f2aeb55c7f549f75a52"; + sha256 = "0mw7xif23949d2hg4pgg2b1sj4afjc19522zqk4dmv2cz7qdmqi2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -3597,12 +3681,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "5.5.1"; + version = "5.5.2"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "a5492a08017faa837d506666a82649b50fd23511"; - sha256 = "02ws4q7dygv7gjb6cg6mccx43ahi49bqx7f9k0c9jr6raq1qqm22"; + rev = "464c9de6734cb4b426137674041d695c2a7c7ef9"; + sha256 = "0xg85x5lrh1d8vlnkzrxpdrcqsqngjy6xp7p509wnhx7k8j85vpm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -3618,12 +3702,12 @@ clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode-extra-font-locking"; - version = "5.5.1"; + version = "5.5.2"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "a5492a08017faa837d506666a82649b50fd23511"; - sha256 = "02ws4q7dygv7gjb6cg6mccx43ahi49bqx7f9k0c9jr6raq1qqm22"; + rev = "464c9de6734cb4b426137674041d695c2a7c7ef9"; + sha256 = "0xg85x5lrh1d8vlnkzrxpdrcqsqngjy6xp7p509wnhx7k8j85vpm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -4038,12 +4122,12 @@ company-anaconda = callPackage ({ anaconda-mode, cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "company-anaconda"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "proofit404"; repo = "company-anaconda"; - rev = "137ba58960a5feeb23aff34c9225fdf161f49f98"; - sha256 = "1i6788qfinh47c5crgr57ykgbp6bvk1afcl00c8gywxsf8srvnvy"; + rev = "182a8fdabc01630f255beeb2708728c0cd5c6316"; + sha256 = "1rqf9i4l32njpwx4aiwxqr994g3jzispwprs6nwjfvg70xkvm4m0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0eb23a75c8b57b4af1737c0508f03e66430e6076/recipes/company-anaconda"; @@ -4161,6 +4245,27 @@ license = lib.licenses.free; }; }) {}; + company-emacs-eclim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "company-emacs-eclim"; + version = "0.3"; + src = fetchFromGitHub { + owner = "emacs-eclim"; + repo = "emacs-eclim"; + rev = "c5c7272ae30e5017ebd08d4e03508abc6b23bf4c"; + sha256 = "0b9hr3xg53nap6sik9d2cwqi8vfwzv8yqjcin4hab6rg2fkr5mra"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; + sha256 = "1l56hcy0y3cr38z1pjf0ilsdqdzvj3zwd40markm6si2xhdr8xig"; + name = "company-emacs-eclim"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/company-emacs-eclim"; + license = lib.licenses.free; + }; + }) {}; company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-emoji"; @@ -4311,12 +4416,12 @@ company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ngram"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "kshramt"; repo = "company-ngram"; - rev = "44a5a90047a71efb083e58ff685117b11eadd23e"; - sha256 = "0zkirwj9yarqlam5hsdnysanx1x06cmgzx9lnjrs1skypl4q096y"; + rev = "11323ca12ddd5f706d5a855a3a7824013cf3cca6"; + sha256 = "1gq2q6bjnaji53gdaqy4gadiydrvl0ddg0l8xhxj0v1w3sk81b08"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram"; @@ -4353,12 +4458,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "1.7.4"; + version = "1.7.5"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "fb2a862af77249e538f304e197fc763baea310bc"; - sha256 = "1a1k72py903z76xznnwv15ay8r2hpicb49zh9faw2vqm44672bm1"; + rev = "f66d13c98543032d2773c83441f49d4b6e109e97"; + sha256 = "0zi16x56jmas70srphd07ycxfdw4ny1y8vsdcvfvmgvg1mgys8f6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -4374,12 +4479,12 @@ company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }: melpaBuild { pname = "company-quickhelp"; - version = "1.3.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "expez"; repo = "company-quickhelp"; - rev = "39e206f7797962992aa1e555c293b6d872d6718b"; - sha256 = "1b2v84ss5k43nnbsnvabgvb19ardsacbs1prn2h9i1k2d5mb8icw"; + rev = "d8fd045715ca64bc8cb3e714c05fe70d7eb33f09"; + sha256 = "1fdiz1jqxnrl940vqbq14idrs4ird9dkzgckmyawzznv5yi29fw4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp"; @@ -4524,6 +4629,27 @@ license = lib.licenses.free; }; }) {}; + composer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: + melpaBuild { + pname = "composer"; + version = "0.0.5"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "composer.el"; + rev = "3b5a9b7364136c8dd85b8b3c1323790c8c38c2a8"; + sha256 = "0zk1rbnh423r1rsml4lbwzkajkq7h3k6dan4cjqbyiw8pd12hq3m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer"; + sha256 = "1gwgfbb0fqn87s7jscr9xy47h239wy74n3hgpk4i16p2g6qinpza"; + name = "composer"; + }; + packageRequires = [ emacs f request s ]; + meta = { + homepage = "https://melpa.org/#/composer"; + license = lib.licenses.free; + }; + }) {}; concurrent = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "concurrent"; @@ -4611,12 +4737,12 @@ copyit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copyit"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "zonuexe"; repo = "emacs-copyit"; - rev = "4f869e13b3e2b1498bd13fe037480f1ccd8e2600"; - sha256 = "16i8py34wapphknj5xl8a07gq4gk77w1ayjz4swlvn3b2wwxlqy6"; + rev = "c973d3650208a033aaf845989d023f9c6e572ddd"; + sha256 = "1fwndjbzwhl4dzrw5jxbq66yggxkl81ga3cnnl7rm3s63pkb6l3w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69bd50fd1f3865d48cec9fe2680d260d746248e5/recipes/copyit"; @@ -4632,12 +4758,12 @@ copyit-pandoc = callPackage ({ copyit, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pandoc }: melpaBuild { pname = "copyit-pandoc"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "zonuexe"; repo = "emacs-copyit"; - rev = "4f869e13b3e2b1498bd13fe037480f1ccd8e2600"; - sha256 = "16i8py34wapphknj5xl8a07gq4gk77w1ayjz4swlvn3b2wwxlqy6"; + rev = "c973d3650208a033aaf845989d023f9c6e572ddd"; + sha256 = "1fwndjbzwhl4dzrw5jxbq66yggxkl81ga3cnnl7rm3s63pkb6l3w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69bd50fd1f3865d48cec9fe2680d260d746248e5/recipes/copyit-pandoc"; @@ -5113,12 +5239,12 @@ darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "0.1.37"; + version = "0.1.44"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "ce2d8d5faeb72205bdcb192dfc1e4769e7088fa3"; - sha256 = "1p7ih9fmcxnnxkj2mz56xa403m828wyyqvliabf5amklzjlhb3z9"; + rev = "839c94048e0a3e9ac6e286212c7626f3fb7ac2c9"; + sha256 = "1nagwhd8n69iysa4m5i7xxi06w6z4hsrvjsgmdg5msyi14ci5lip"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -5155,12 +5281,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "2.12.1"; + version = "2.13.0"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "fec6f5480d0ce03ead0e6117ac77dc7e757e76f8"; - sha256 = "1njv5adcm96kdch0jb941l8pm51yfdx7mlz83y0pq6jlzjs9mwaa"; + rev = "4ae329aa2160411c8b47794de067fcf29bc38a22"; + sha256 = "12gvpn0a07kgbj2lrzw1vv4njp1w4gl38rl68yh0jp3rhvacbsg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -5176,12 +5302,12 @@ dash-functional = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash-functional"; - version = "2.12.1"; + version = "2.13.0"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "fec6f5480d0ce03ead0e6117ac77dc7e757e76f8"; - sha256 = "1njv5adcm96kdch0jb941l8pm51yfdx7mlz83y0pq6jlzjs9mwaa"; + rev = "4ae329aa2160411c8b47794de067fcf29bc38a22"; + sha256 = "12gvpn0a07kgbj2lrzw1vv4njp1w4gl38rl68yh0jp3rhvacbsg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -5384,12 +5510,12 @@ demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demangle-mode"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "liblit"; repo = "demangle-mode"; - rev = "07e62a7f976f6c7366b4b0475bbb5cff881452b8"; - sha256 = "13jfhc9gavvb9dxmgi3k7ivp5iwh4yw4m11r2s8wpwn6p056bmfl"; + rev = "b40d7174d5d31ea8bf3442fb054f3c15bf6e979c"; + sha256 = "00aqhzamp1492kn0x1j2h15wywbkwx9m0alm5z82z60wrq7gy9z7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode"; @@ -5423,22 +5549,22 @@ license = lib.licenses.free; }; }) {}; - desktop-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + desktop-plus = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "desktop-plus"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "ffevotte"; repo = "desktop-plus"; - rev = "a484d24ca673c7536387368729421dad9dde5059"; - sha256 = "184zi5fv7ranghfx1hpx7j2wnk6kim8ysliyw2c5c1294sxxq3f3"; + rev = "a9cb8dd0af5071d9f148211b408c54306239381c"; + sha256 = "10f5dkrwfd6a1ab98j2kywkh1h01pnanvj2i7fv9a9vxnmiywrcf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b009b42c73490d56d4613dcf5a57447fb4ccab4/recipes/desktop+"; sha256 = "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8"; name = "desktop-plus"; }; - packageRequires = []; + packageRequires = [ dash emacs f ]; meta = { homepage = "https://melpa.org/#/desktop+"; license = lib.licenses.free; @@ -5612,22 +5738,22 @@ license = lib.licenses.free; }; }) {}; - dionysos = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild, pkg-info, s }: + dionysos = callPackage ({ alert, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild, pkg-info, s }: melpaBuild { pname = "dionysos"; - version = "0.3.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "nlamirault"; repo = "dionysos"; - rev = "92578e813b92c8aae12948b44e0c7757cc9b3d9b"; - sha256 = "1xg9cschjd2m0zal296q54ifk5i4s1s3azwfdkbgshxxgvxaky0w"; + rev = "98bc789d20e41020d6e62d63d3c78f8032fa4bf2"; + sha256 = "1hma72dyn3w6cwd3vrgg4hdlrxgwqs55cjyxb05vs9csz7r42208"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/890445eca3c555acd2639a6f509c8e83b687f2bd/recipes/dionysos"; sha256 = "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz"; name = "dionysos"; }; - packageRequires = [ dash libmpdee pkg-info s ]; + packageRequires = [ alert cl-lib dash libmpdee pkg-info s ]; meta = { homepage = "https://melpa.org/#/dionysos"; license = lib.licenses.free; @@ -5720,12 +5846,12 @@ dired-k = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-k"; - version = "0.16"; + version = "0.17"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-dired-k"; - rev = "f4f4a1fe3155c35e212d3e16ed5f7c89c0b32282"; - sha256 = "0rpln6m3j4xbhrmmz18hby6xpzpzbf1c5hr7bxvna265cb0i5rn7"; + rev = "4c9eb0fab636983a03dbe4357f9b3ee6b3ca8d74"; + sha256 = "17g0ajhbhk7l5s75h0ybz1w1dnf5aikvbcgcdd4d0qkj9l91k8x6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7/recipes/dired-k"; @@ -5948,6 +6074,26 @@ license = lib.licenses.free; }; }) {}; + ditz-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ditz-mode"; + version = "0.3"; + src = fetchhg { + url = "https://bitbucket.com/zondo/ditz-mode"; + rev = "beac4c1f3b7e"; + sha256 = "1cbsy4lchl41zmyxfq828cjpl3h2dwvn8xf1qgf2lbscdb6cwbwb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/02e2a2a25f42929626d7237511136ba6826dad33/recipes/ditz-mode"; + sha256 = "0shzm9l31n4ffjs1d26ykxsycd478lhlpl8xcwzbjryywg4gf5nd"; + name = "ditz-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ditz-mode"; + license = lib.licenses.free; + }; + }) {}; dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix"; @@ -6140,12 +6286,12 @@ drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }: melpaBuild { pname = "drupal-mode"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "arnested"; repo = "drupal-mode"; - rev = "d920370dc632bd0b4abf736a7315aa20748d2676"; - sha256 = "1hbm3zdmd28fjl8fky0kq4gs2bxsrn2zxk9rd1wa2wky43ycnd35"; + rev = "1e6f973ed5dfdbbfda96c4ab266bd8ef3d6436d7"; + sha256 = "1c3krir3l04rwlyadnhra6kmbnmvdm95aj7iwspa6dssnry4vflj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode"; @@ -6203,12 +6349,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "0.4.1"; + version = "0.4.3"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "d75ae09fd1640c6855cf2c8c0fcac0604fd2b898"; - sha256 = "0vjsj397i283k86f38ihgq2hsn92kd4iph704fyjkbs6l1187yc2"; + rev = "3f15f30a7330dd13a1d88891345ab382e9bee7cd"; + sha256 = "12y5gf65jdmh1m0fygzx4snfixlgc1laaax0w7ajkbhahyn8dwzc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump"; @@ -6248,8 +6394,8 @@ version = "0.3"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "a3fdf75d634a"; - sha256 = "0yqsrqqzhril9crdgc3ddjz0jggmy29djksqrlihffk9p8zs341d"; + rev = "4b5bc1f49cad"; + sha256 = "1c0jswjxazf330bh0xg889s6pfk50x5qi5lc8kpfqwa0p6b15306"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -6538,12 +6684,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }: melpaBuild { pname = "ebib"; - version = "2.5.4"; + version = "2.6.3"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "069ecbe32a4d5f1273e2d749204750652fbb5d91"; - sha256 = "1kcmbr4a2jxd62s4nc8xshrksb36xwb17j6c0hjzvb75r544xy6s"; + rev = "018d6ae692eaff67aa77ebaccd29d49912669cd8"; + sha256 = "1awwlrmypbrycbrz8nh1z97gq9rh7k7mav9zk47rhq6vwbl9l066"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -6577,6 +6723,27 @@ license = lib.licenses.free; }; }) {}; + eclim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eclim"; + version = "0.3"; + src = fetchFromGitHub { + owner = "emacs-eclim"; + repo = "emacs-eclim"; + rev = "c5c7272ae30e5017ebd08d4e03508abc6b23bf4c"; + sha256 = "0b9hr3xg53nap6sik9d2cwqi8vfwzv8yqjcin4hab6rg2fkr5mra"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; + sha256 = "1n60ci6kjmzy2khr3gs7s8gf21j1f9zjaj5a1yy2dyygsarbxw7b"; + name = "eclim"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/eclim"; + license = lib.licenses.free; + }; + }) {}; ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ecukes"; @@ -6706,12 +6873,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "0.7.7"; + version = "0.7.8"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "e316e6ebe2bfed0806dd21583e7c904e6d4c182f"; - sha256 = "1mnx2b2qyv3d8chj9l2l7icvajdiry2n5d3c8byvibs8wav9jzh6"; + rev = "442f23637ec50274c5e47c20827c946f51cfb8fb"; + sha256 = "1cwd2b72wm5rdbydv12qb64jz0a383j13vbzpy20z091ixkpmrj7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -7103,12 +7270,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "1.4.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "f34b5c34766868c6ebe3408155086dcf54062e2b"; - sha256 = "0zqrh8ycrk7768mj0d5b9dkz72559a36yhddb6idhik1v4q836sw"; + rev = "0fd363d09150ad101edafca667dac82ffaec5adf"; + sha256 = "1a95ncphwvg5f1q8jbjg2hhalggms8yd59wp1g6jmz1kjfhawbj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -7124,12 +7291,12 @@ elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }: melpaBuild { pname = "elfeed-web"; - version = "1.4.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "f34b5c34766868c6ebe3408155086dcf54062e2b"; - sha256 = "0zqrh8ycrk7768mj0d5b9dkz72559a36yhddb6idhik1v4q836sw"; + rev = "0fd363d09150ad101edafca667dac82ffaec5adf"; + sha256 = "1a95ncphwvg5f1q8jbjg2hhalggms8yd59wp1g6jmz1kjfhawbj0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -7442,27 +7609,6 @@ license = lib.licenses.free; }; }) {}; - emacs-eclim = callPackage ({ dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s }: - melpaBuild { - pname = "emacs-eclim"; - version = "0.3"; - src = fetchFromGitHub { - owner = "emacs-eclim"; - repo = "emacs-eclim"; - rev = "c5c7272ae30e5017ebd08d4e03508abc6b23bf4c"; - sha256 = "0b9hr3xg53nap6sik9d2cwqi8vfwzv8yqjcin4hab6rg2fkr5mra"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a38eea3d0fd02c12f6ec8aef6e4cc46eedf25753/recipes/emacs-eclim"; - sha256 = "1l55jhz5mb3bqw90cbf4jhcqgwj962br706qhm2wn5i2a1mg8xlv"; - name = "emacs-eclim"; - }; - packageRequires = [ dash json popup s ]; - meta = { - homepage = "https://melpa.org/#/emacs-eclim"; - license = lib.licenses.free; - }; - }) {}; emacs-setup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emacs-setup"; @@ -7912,6 +8058,27 @@ license = lib.licenses.free; }; }) {}; + enh-ruby-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "enh-ruby-mode"; + version = "20150711"; + src = fetchFromGitHub { + owner = "zenspider"; + repo = "enhanced-ruby-mode"; + rev = "f945cff5e784e23e0028bf0a5221f4f47a822fac"; + sha256 = "1f6zyz5jmbrvv37mbzsvwb3ycmq105p4ryz8p65b76jz3ps8yq5w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cd1ac1ce69b77b11f34c4175611a852e7ec0806c/recipes/enh-ruby-mode"; + sha256 = "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns"; + name = "enh-ruby-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/enh-ruby-mode"; + license = lib.licenses.free; + }; + }) {}; enlive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "enlive"; @@ -8258,12 +8425,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "19.0.2"; + version = "19.0.5"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "b490fb8664ec6e5ceaadc1c74350dc666f5406d2"; - sha256 = "1vsykghhzpgmc42jwj48crl11zzzpvrqvh2lk8lxfqbflzflxm6j"; + rev = "71894a879d6254693791585246ce340dd7414b82"; + sha256 = "0s0s94jsqqpny5z2qdbb62h45cz8lh2if65q26jlcgbyz2729j77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/erlang"; @@ -8443,6 +8610,48 @@ license = lib.licenses.free; }; }) {}; + eshell-did-you-mean = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eshell-did-you-mean"; + version = "0.1"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "eshell-did-you-mean"; + rev = "7cb6ef8e2274d0a50a9e114d412307a6543533d5"; + sha256 = "0v0wshck5n4hspcv1zk1g2nm6xiigcjp16lx0dc8wzkl6ymljvbg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a7649eca21a21ddbbc7131f29cbbd91a00a84060/recipes/eshell-did-you-mean"; + sha256 = "1z1wpn3sj1gi5nn0a71wg0i3av0dijnk79dc32zh3qlh500kz8mz"; + name = "eshell-did-you-mean"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/eshell-did-you-mean"; + license = lib.licenses.free; + }; + }) {}; + eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "eshell-git-prompt"; + version = "0.1"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "eshell-git-prompt"; + rev = "826d2ebdec0808493955a4544dc91b575f6c4ecf"; + sha256 = "00gaq8vz8vnhh0j2i66mp763hm3dfxkxz3j782nsfml81sngkww0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5272280b19579c302ba41b53c77e42bc5e8ccbda/recipes/eshell-git-prompt"; + sha256 = "0a8pyppqvnavvb8rwsjxagb76hra9zhs5gwa0ylyznmql83f8w8s"; + name = "eshell-git-prompt"; + }; + packageRequires = [ cl-lib dash emacs s ]; + meta = { + homepage = "https://melpa.org/#/eshell-git-prompt"; + license = lib.licenses.free; + }; + }) {}; eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-z"; @@ -8488,12 +8697,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "15.9"; + version = "16.4"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "82d13c36f43efb4ef32fbb515ca58f63b2f0c06e"; - sha256 = "0lvr14xlxsdad4ihywkpbwwj9lyal0w4p616ska5rk7gg5i8v74p"; + rev = "81d34db66301e78e59ea79e4ae7b9600f1378641"; + sha256 = "039iqrxd8nc52n2j9qjhfmb5f276h2ikvn2lagjbzk15mvg26va4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -8569,22 +8778,22 @@ license = lib.licenses.free; }; }) {}; - esup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esup"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "jschaf"; repo = "esup"; - rev = "f9514db82c06680c7f354a2e50c2ca66e8aa0171"; - sha256 = "1pzbd2ka6h5ipiivfwfgq1hq80ww59xvyldmx406mdd5vn7yqk5z"; + rev = "6faef1fe1b5ff2fb761722ef1972a16395d9a10b"; + sha256 = "18igz3gcdp42wk89y59d4gxkbv0zvs8i4lg1b0qsrf90knasfjc9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup"; sha256 = "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0"; name = "esup"; }; - packageRequires = []; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/esup"; license = lib.licenses.free; @@ -8701,8 +8910,8 @@ version = "1.2.12"; src = fetchhg { url = "https://bitbucket.com/lyro/evil"; - rev = "3f1515976813"; - sha256 = "1wjw3pg44axqa72mvpifsqch96pg722x16cvnhlq2i8a6y42fms5"; + rev = "f2648b841f9b"; + sha256 = "0gv8b6adaypw3d2brx0lh41yyi3kdf1klahx7kap36a7m652nan6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/evil"; @@ -8757,6 +8966,27 @@ license = lib.licenses.free; }; }) {}; + evil-colemak-basics = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-colemak-basics"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "evil-colemak-basics"; + rev = "4be54df939035daa039e323a95c052f7c99b6f51"; + sha256 = "1n7nw5mzpwzp8r791qsis2f2ak5f0m2d129r0wmbyx9zykx5rm7v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/945417d19faf492fb678aee3ba692d14e7518d85/recipes/evil-colemak-basics"; + sha256 = "1sbbli0hdmpc23f3g5n95svqfdg3rlvf71plyvpv1a6va9jhi83k"; + name = "evil-colemak-basics"; + }; + packageRequires = [ emacs evil ]; + meta = { + homepage = "https://melpa.org/#/evil-colemak-basics"; + license = lib.licenses.free; + }; + }) {}; evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-commentary"; @@ -8865,12 +9095,12 @@ evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "evil-magit"; - version = "0.4"; + version = "0.4.1"; src = fetchFromGitHub { owner = "justbur"; repo = "evil-magit"; - rev = "3aaa6264f2223f707070ab95093352c8c0248367"; - sha256 = "06gs5hs220iyjxhkw6gkrihx0znlmr8yii322khbxqypypji7wk6"; + rev = "077354f8ebd5da76937bf8f5df5d484f8a0ccc62"; + sha256 = "05llzcdbg84x04a98b6r7d0m8631hk83hjq33hwd4n8ixp85dg20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cfc6cc3581323c81d5f347895aaddfdc71001f22/recipes/evil-magit"; @@ -8907,12 +9137,12 @@ evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-matchit"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-matchit"; - rev = "6346825fd89ee115fab974746fdba338adee856c"; - sha256 = "0x6rc98g7hvvmlgq31n7qanylrld6dzvg6n8qgzp4s544l0dwfw6"; + rev = "de6ce21e1e24b7a0370ca3a6ce83b529f772c8db"; + sha256 = "0dhk8ajn5b0y4qla4jak76zxqgiai9fcd1hpfh98pmsjy1jq5ll4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aeab4a998bffbc784e8fb23927d348540baf9951/recipes/evil-matchit"; @@ -9096,12 +9326,12 @@ evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-snipe"; - version = "2.0.1"; + version = "2.0.3"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "b51bdb7a8efbc5c8de5b23984d072271d71974c6"; - sha256 = "1ip2ibgsir6rhj7ci2f128z18n1yrwd6pg0i42j1flc3m4shs6ap"; + rev = "c37aa6bcac8d78aa4115d5bc48e219a6ec8a8261"; + sha256 = "0r6nna21w9hcwwhi6ij9lrmlhvgp6c67zl3pbc2iwwfw7bvca4xb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; @@ -9135,6 +9365,27 @@ license = lib.licenses.free; }; }) {}; + evil-text-object-python = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-text-object-python"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "wbolster"; + repo = "evil-text-object-python"; + rev = "3b3fb01e7ad7eeeeae1143695547fe75148cc44f"; + sha256 = "1alin2rmx1xa1w3b1nb76bplmg10il55jxxm6jj7qs6z1izzllci"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d0893b07bc4a057561a1c1a85b7520c50f31e12/recipes/evil-text-object-python"; + sha256 = "0jdzs1yn8nrxq890427yjrxdvnzj8jy7bs3jj4w4c0fik26ngqhm"; + name = "evil-text-object-python"; + }; + packageRequires = [ emacs evil ]; + meta = { + homepage = "https://melpa.org/#/evil-text-object-python"; + license = lib.licenses.free; + }; + }) {}; evil-textobj-anyblock = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-textobj-anyblock"; @@ -9705,12 +9956,12 @@ fireplace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fireplace"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "johanvts"; repo = "emacs-fireplace"; - rev = "1ba1234ae801dcc2a0c051073622666584d0619a"; - sha256 = "174x0qyrwswppc9p1q1nn4424r3zg7g49zk329k5aq18vyjz52d7"; + rev = "2b966ed65b714c613f79e9144d004dfa3b28f1ed"; + sha256 = "1f5053bbvjdmm64zv6r2qkswkpwvx0s3qz4bwm9zya583a6g0nv8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c1ac52c1cfe7ccf46092c2d299ebbffdc1b7609/recipes/fireplace"; @@ -9786,6 +10037,27 @@ license = lib.licenses.free; }; }) {}; + fix-muscle-memory = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fix-muscle-memory"; + version = "0.93"; + src = fetchFromGitHub { + owner = "jonnay"; + repo = "fix-muscle-memory"; + rev = "df687aea23c6eac4b751f993893c2fd56e5a8a3b"; + sha256 = "02nl4vz6fnbjc7w1lk1y9z0qw5bsxr407ww0b2wqw6h8spmcpcrc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b0501714a6d82657b88d11e3f79d75eea17d8e/recipes/fix-muscle-memory"; + sha256 = "0qhasnjw0bj5hzw27r8vj6shhwc3zxcp3wmxijh1rpdw4773f7n8"; + name = "fix-muscle-memory"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/fix-muscle-memory"; + license = lib.licenses.free; + }; + }) {}; fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fix-word"; @@ -9901,12 +10173,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "28"; + version = "29"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "0b6d258cc8907d9bf6c3dc111a39ff14c892ad36"; - sha256 = "1bwx7ka79kggk180rjf6fcdndfhlfayvibyjyha9cxpvg78dafkl"; + rev = "38f88da0b6531bde5a7fcb6ebad9c502503ebd51"; + sha256 = "0vxhj5lqaj0fmwr6i55gcap44b3x37kbsaz9qg48wjk6gxz91006"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -10360,6 +10632,27 @@ license = lib.licenses.free; }; }) {}; + flymake-cursor = callPackage ({ fetchFromGitHub, fetchurl, flymake ? null, lib, melpaBuild }: + melpaBuild { + pname = "flymake-cursor"; + version = "1.0.2"; + src = fetchFromGitHub { + owner = "flymake"; + repo = "emacs-flymake-cursor"; + rev = "5cac5045398b1436ceb143d48961b50d38ae1396"; + sha256 = "0xaq8zfd90kqqwg8ik081jblrdyj6p3fh2xpf6a4sdj8826ry93v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a02597edee67c84bef259d7fc5c5b61bd39a5b86/recipes/flymake-cursor"; + sha256 = "0v5abg3h9kmybr0cyr7hqy4rn88h84snzxbsmqcbjw24s10v9p0s"; + name = "flymake-cursor"; + }; + packageRequires = [ flymake ]; + meta = { + homepage = "https://melpa.org/#/flymake-cursor"; + license = lib.licenses.free; + }; + }) {}; flymake-easy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flymake-easy"; @@ -10665,8 +10958,8 @@ sha256 = "0zfyry6ysz77ala8ppy4k9h7ssnzw2brnglalphbqw2lgx3q3f98"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct"; - sha256 = "0j7fp2r1463517716d070wmgwxyj8p59b4ybqh106lmpc5w1i9nj"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct"; + sha256 = "0d2205h234na9s942s83yvkq89l9w9jnl5yfrxkkdiq8pw0dvymd"; name = "flyspell-correct"; }; packageRequires = []; @@ -11014,12 +11307,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "2.1.3"; + version = "2.2.0"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "68e685c561c1fdc25e4fde25dba328fe6840da6e"; - sha256 = "1kp7fb181szjv5mdhd5ij4v5cymynp8ihq1fagxgccggrsm83cp4"; + rev = "cffb48cfc3973155d34651996257a901e6f5f8d0"; + sha256 = "1bzbjv15bz0zfsizgd8yr6gin225qnq8g2795r14q7al8f71slv7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -11327,12 +11620,12 @@ geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geben"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben"; - rev = "5d79cfd7cdf79367f2e360cc77c33ff31e31e0e2"; - sha256 = "124p2aybyc9zwl2acn579j2qii5xyfw1cblb6wjrishw7531dhvv"; + rev = "1308c93c1eb6c96c0e322f09fcb784f5df208a04"; + sha256 = "0fva9xmwh887d0fdm8id67azs5rjbqk7qpjlwh7nlhrwgxsnzr7d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; @@ -11499,8 +11792,8 @@ src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "737b1fe5a34ee8307345c8313d3e010b2dab6684"; - sha256 = "0kc42bixzi7886b1zaxcrkmci6rgzm6mkk1kg20ggh1645nc7g9c"; + rev = "deef7036d06072fbccb6c17369ac7e28ad341482"; + sha256 = "1kq3ynnjs57pgs99a2m4hh6nc692lf8j9ydmn5wync75r2pyh0jc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -11534,6 +11827,48 @@ license = lib.licenses.free; }; }) {}; + ghq = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ghq"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "rcoedo"; + repo = "emacs-ghq"; + rev = "aae4b8cb22fd6c24d2c9e3962c7e8e9dac6d9825"; + sha256 = "0rh2k93c3a0vl073a3s3a3h6gkw454v1lyd7y8l3pd24vw9hc628"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a9daa3b0039f6b296b8176523cffbbe27506bb02/recipes/ghq"; + sha256 = "0prvywcgwdhx5pw66rv5kkfriahal2mli2ibam5np3z6bwcq4ngh"; + name = "ghq"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ghq"; + license = lib.licenses.free; + }; + }) {}; + ghub = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ghub"; + version = "1.1.0"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "ghub"; + rev = "018aa524e12141b0d5a121ffcbde6d66d3f7aa4d"; + sha256 = "0phskyb48bvmmrrjcd8n7w2cnwyhfq6i3cfl71l8ypxb4pdibz0l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/ghub"; + sha256 = "01kzziqv5y798rps52w45kkdcn0shhb6mrina2iawab4rlvlmnd8"; + name = "ghub"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ghub"; + license = lib.licenses.free; + }; + }) {}; gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }: melpaBuild { pname = "gist"; @@ -11621,12 +11956,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "bfc6f6d88619221506e246390e5fbb39087564ec"; - sha256 = "1dv5qr9z5lxj2zjhwjhx451mbkb8d3y00q7ar6n34x7d5c4gmiya"; + rev = "570a0320bdd7437fc35a36d78a1c28e1ee19ce88"; + sha256 = "040wc4nj9r3vlma42sc24x4w25rm2kpzwyq44jw3njjk3b7q9avp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -11747,12 +12082,12 @@ git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-link"; - version = "0.4.1"; + version = "0.4.3"; src = fetchFromGitHub { owner = "sshaw"; repo = "git-link"; - rev = "3cb4ced58c48d372230efd10ee4a7f55f54945ea"; - sha256 = "0a1kxdz05ly9wbzyxcb79xlmy11q38xplf5s8w8klmyajdn43g1j"; + rev = "b9e197419b1d71c7190c2e7cb14b89d9e6759ab2"; + sha256 = "0f10qqmjaxy29qw86a85kjshyj8wc5dldymm8i89l3hb9s9iv260"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link"; @@ -11768,12 +12103,12 @@ git-messenger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "git-messenger"; - version = "0.16"; + version = "0.17"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-git-messenger"; - rev = "c45cdd9805d52a82bdd23907bd0f91dc7760d78d"; - sha256 = "139yivbxdpmv8j6qz406769b040nbmj3j8r28n9gqy54zlwblgv8"; + rev = "9412a975f4723e9bc9c9feb4ec064b2e8c0c659d"; + sha256 = "1hh99ippc1bpqpnchvhbh7yzcsjx9v7bbpy5r9hx82kx0xqih0sc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e791293133f30e5d96c4b29e972f9016c06c476d/recipes/git-messenger"; @@ -11954,6 +12289,27 @@ license = lib.licenses.free; }; }) {}; + github-search = callPackage ({ fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }: + melpaBuild { + pname = "github-search"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "IvanMalison"; + repo = "github-search"; + rev = "1a5c1f8291f4d41e57367a8522699cb08eea8fc4"; + sha256 = "1382hda3hgpx3c3d1kjzz8hs4l5hi3s7c485hsgihhr6xdd5wrgm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/733a808400858513137e0e3d7d38b5b25e8ddc5a/recipes/github-search"; + sha256 = "1pwrzbbwnq0il5494561fyvkr0vmm5jqlvpffgkk28c54vs7ms0b"; + name = "github-search"; + }; + packageRequires = [ gh magit ]; + meta = { + homepage = "https://melpa.org/#/github-search"; + license = lib.licenses.free; + }; + }) {}; gitignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitignore-mode"; @@ -11996,6 +12352,27 @@ license = lib.licenses.free; }; }) {}; + glab = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "glab"; + version = "1.1.0"; + src = fetchFromGitLab { + owner = "tarsius"; + repo = "glab"; + rev = "7c022e55ec5d50f9f5b656b17823f7e165f2d056"; + sha256 = "0qmnz4zd6z0nhxxmwgk16mppf7i86na7c3nyc47jfw7xl63s98pk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/glab"; + sha256 = "0z34kzly39mdqsyqpi3n5m3189g0d7lsvk2ksmh46zdziak715di"; + name = "glab"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/glab"; + license = lib.licenses.free; + }; + }) {}; gmail-message-mode = callPackage ({ fetchFromGitHub, fetchurl, ham-mode, lib, melpaBuild }: melpaBuild { pname = "gmail-message-mode"; @@ -12992,6 +13369,27 @@ license = lib.licenses.free; }; }) {}; + hamburger-menu = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hamburger-menu"; + version = "1.0.5"; + src = fetchFromGitLab { + owner = "iain"; + repo = "hamburger-menu-mode"; + rev = "fd37f013c2f2619a88d3ed5311a9d1308cc82614"; + sha256 = "196ydb57h4mjagjaiflvb20my561i6mdc6v6694ibdik2yns2inm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e8017730403cc0e613e3939017f85074753c3778/recipes/hamburger-menu"; + sha256 = "0ws9729i51arjqwpiywcpb7y3c5sm3c9wrq8q0k0m9hpq8h11wdb"; + name = "hamburger-menu"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/hamburger-menu"; + license = lib.licenses.free; + }; + }) {}; haml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "haml-mode"; @@ -13201,6 +13599,27 @@ license = lib.licenses.free; }; }) {}; + hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hasky-extensions"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "hasky-mode"; + repo = "hasky-extensions"; + rev = "3f1862989a2ca3b79761dccfa352a1b6d518ee77"; + sha256 = "10214654gvnyqimh4950jsw1r42p0y79pfl8h0x44mzll62bvz87"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions"; + sha256 = "0ymigba1d0qkrk3ccd3cx754safzmx1v5d13976571rszgmkvr15"; + name = "hasky-extensions"; + }; + packageRequires = [ avy-menu emacs ]; + meta = { + homepage = "https://melpa.org/#/hasky-extensions"; + license = lib.licenses.free; + }; + }) {}; haxor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haxor-mode"; @@ -13246,12 +13665,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "1.9.9"; + version = "2.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "6230b8cad44d076b239d721adec2979182813e31"; - sha256 = "06wvqhq4gfhrmk8a8qm2hl0mnh0v5593bdplz5rxyg4w7iz400y8"; + rev = "557786d0443791d5d0ccfbdc1dcc86004e31d218"; + sha256 = "0xk0hw08b335j3w2frxa61bg3521zjrjv35bw5qcd1z6b0n8gwks"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90ab37af6b0c85eac11c423bc8f0d93d6d8a9fd4/recipes/helm"; @@ -13456,12 +13875,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "1.9.9"; + version = "2.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "6230b8cad44d076b239d721adec2979182813e31"; - sha256 = "06wvqhq4gfhrmk8a8qm2hl0mnh0v5593bdplz5rxyg4w7iz400y8"; + rev = "557786d0443791d5d0ccfbdc1dcc86004e31d218"; + sha256 = "0xk0hw08b335j3w2frxa61bg3521zjrjv35bw5qcd1z6b0n8gwks"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -13918,12 +14337,12 @@ helm-mt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi-term }: melpaBuild { pname = "helm-mt"; - version = "0.6"; + version = "0.8"; src = fetchFromGitHub { owner = "dfdeshom"; repo = "helm-mt"; - rev = "27391022dbf5720cb13ecec8ca8c398c05a7cbf7"; - sha256 = "0gknncyhr2392xkvghgy5mh6gdv6qzvswidx2wy04ypb4s0vxgq2"; + rev = "10790691f083c3806c9e85758b7ea73b5e24c5ed"; + sha256 = "1k1jzzxygpmxnj07br7ah2582sdj67vqmipykz7yzrprd8r9c8fw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e726bf0b9b3f371b21f1f0d75175e0dda62f6fb0/recipes/helm-mt"; @@ -14233,12 +14652,12 @@ helm-recoll = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-recoll"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-recoll"; - rev = "9dcd056214cb2665113743bb3b1a97973c002316"; - sha256 = "1hfn7zk3pgz3w8mn44hh6dcv377j5272azx4r12p95kkp770xls2"; + rev = "cc4c4fa9c8f4f99383647baa8512b60523dc8b36"; + sha256 = "1ic2k8ls084yn9h96pk8815wlvxkwwdq75zhm1ls197pkbw7gh7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0a0d168f96470753c22b92ad863be98d8c421ccd/recipes/helm-recoll"; @@ -14632,12 +15051,12 @@ hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hindent"; - version = "5.4.3"; + version = "5.2.0"; src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "726c692d234581c853495165472c78f4c7fb9297"; - sha256 = "0hb74j5137yj3rm2si16xzwmcvkiwx8ywh1qrlnrzv5gl4viyjzb"; + rev = "7d883bfa80dcb6fd2bf6c559cc8250fe0c4f80d7"; + sha256 = "1dil3lspcidvdq99h7an7n6mvylwmf8s4xmaqbpdbc4rwiijjhkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -14800,12 +15219,12 @@ hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "tarsius"; repo = "hl-todo"; - rev = "dff381a5b2c9235bbdbe32123751ecdf17df7432"; - sha256 = "0r2xyljcvhh547mkx7h9diajc21l6lpwjwpklc3h7491zazv3s6r"; + rev = "215ff60d7a4097b5104edaf2784f9a3257db4403"; + sha256 = "1f7dz1r42qy3dwsqx7x802m7v4jfnmfp2q4678gs8d0scgxxfqb4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7/recipes/hl-todo"; @@ -14881,22 +15300,43 @@ license = lib.licenses.free; }; }) {}; - ht = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + hound = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + melpaBuild { + pname = "hound"; + version = "1.1.0"; + src = fetchFromGitHub { + owner = "ryoung786"; + repo = "hound.el"; + rev = "28cb804d99f9240d690d60098644e4300336b5fa"; + sha256 = "1zyd6350mbah7wjz7qrwyh9pr4jpk5i1v8p7cfmdlja92fpqj9rh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/90cfc34eb4e8be7bf887533b85feba91131a435b/recipes/hound"; + sha256 = "0qri6bddd3c4sqvaqvmqw6xg46vwlfi1by3gc9i3izpq4xl1cr1v"; + name = "hound"; + }; + packageRequires = [ cl-lib request ]; + meta = { + homepage = "https://melpa.org/#/hound"; + license = lib.licenses.free; + }; + }) {}; + ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ht"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ht.el"; - rev = "285c8752b7d3ab4b3d0c53bab6ba05d328577960"; - sha256 = "0k09n66jar0prq9aal2h3izp1y67jibdx0gjr0g4jx1p1yxig1dg"; + rev = "0c0019ba2dfeaacdfe6be6d7f681e5e11dc8fa67"; + sha256 = "0yrxygyzl4cqnp7m57jwp26544q72w8qf6xshmh9q3y93ix4h4aw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht"; sha256 = "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd"; name = "ht"; }; - packageRequires = []; + packageRequires = [ dash ]; meta = { homepage = "https://melpa.org/#/ht"; license = lib.licenses.free; @@ -15262,12 +15702,12 @@ ido-occur = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-occur"; - version = "0.1.5"; + version = "0.2.0"; src = fetchFromGitHub { owner = "danil"; repo = "ido-occur"; - rev = "eef18ac643dae03afbe9c42479be315e9d729b48"; - sha256 = "050r5cr0a4kyscp8pp2a1mzawji080pnw0q4hxrsc97s2bxrj9x5"; + rev = "b0e67fe4835c162cbcf8a982bdf377955b9ac5ae"; + sha256 = "13f21vx3q1qbnl13n3lx1rnr8dhq3zwch22pvy53h8q6sdf7r73a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a576d8569bf82be01e7d50defcc99a90aab1436/recipes/ido-occur"; @@ -15535,12 +15975,12 @@ imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenu-anywhere"; - version = "1.1.1"; + version = "1.1.3"; src = fetchFromGitHub { owner = "vspinu"; repo = "imenu-anywhere"; - rev = "03fa805fe9104fec8e9eda5f58be583eb9bd28e6"; - sha256 = "1bfishspj2szc3qr1i22wryjshfhbdvfxwb41pi108bm5fmyxjam"; + rev = "94bab9136e1264e98a10d9325ad53d735307f8f3"; + sha256 = "1ffdh0izdd22av85rizk38fidfp8f6lk6phr549fzaspn11hvd8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/imenu-anywhere"; @@ -15933,12 +16373,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "0.1.16"; + version = "0.1.18"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "e7723039044867101ec80d2b5cdf26560e30b536"; - sha256 = "0wdacic3mp5lkpjbib8nh3rd4z8i3mp5hyhmdrwak9afmq6lv2f7"; + rev = "5378bb637c76c48eca64ccda0c855f7557aecb60"; + sha256 = "1vgmbs790l8z90bk8sib3xvli06p1nkrjnnvlnhsjzkkpxynf2nf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -16098,6 +16538,27 @@ license = lib.licenses.free; }; }) {}; + ivy-pages = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "ivy-pages"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "igorepst"; + repo = "ivy-pages"; + rev = "428a901f94c9625c8407fd2bf76f9d7714d40d87"; + sha256 = "11lcv8dqlmfqvhn7n3wfp9idr5hf30312p213y5pvs4m70lbc9k2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/93f1183beb74aa4a96de8cd043a2a8eefdd7ad7e/recipes/ivy-pages"; + sha256 = "0zz8nbjma8r6r7xxbg7xfz13202d77k1ybzpib41slmljzh7xgwv"; + name = "ivy-pages"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/ivy-pages"; + license = lib.licenses.free; + }; + }) {}; ivy-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, window-purpose }: melpaBuild { pname = "ivy-purpose"; @@ -16201,6 +16662,27 @@ license = lib.licenses.free; }; }) {}; + jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, map, melpaBuild, seq, websocket }: + melpaBuild { + pname = "jade"; + version = "0.17"; + src = fetchFromGitHub { + owner = "NicolasPetton"; + repo = "jade"; + rev = "11769bf8419202819a25047f57dd9aa0c98f5ebb"; + sha256 = "09zfvcirz7hcp255yhsf7d04vrc078kk69qhwy1j31ar0rb4fy1b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; + sha256 = "04w7pgn0dkppi6l15rkz8b1bcpw1dsgvvijy81a6i4nkigxxlv4y"; + name = "jade"; + }; + packageRequires = [ company emacs js2-mode map seq websocket ]; + meta = { + homepage = "https://melpa.org/#/jade"; + license = lib.licenses.free; + }; + }) {}; jade-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jade-mode"; @@ -16348,6 +16830,27 @@ license = lib.licenses.free; }; }) {}; + jpop = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "jpop"; + version = "3.2.3"; + src = fetchFromGitHub { + owner = "domtronn"; + repo = "jpop.el"; + rev = "f3eed65e54dc2daaa7678e6eb169d35c4a7d1e63"; + sha256 = "17wiv1b8c56c2zi9b9mjm37kl7yc735nk3188wnmq3fqjgdpwpwg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2a52a3cf909d12201196b92685435f9fa338b7ba/recipes/jpop"; + sha256 = "00chh1aqnkkkhdp44sapdjx37cbn92g42wapdq7kcl8v1v0xmnjr"; + name = "jpop"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/jpop"; + license = lib.licenses.free; + }; + }) {}; jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jq-mode"; @@ -17209,6 +17712,48 @@ license = lib.licenses.free; }; }) {}; + lcb-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lcb-mode"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "peter-b"; + repo = "lcb-mode"; + rev = "be0768e9aa6f9b8e76f2230f4f7f4d152a766b9a"; + sha256 = "0mgcqqhjadm8ckp6x37f9j4xcs61g73m9v8qr4zbw115yci2d0xk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fd1380a9ba363f62f297e3ab2995341258b51fd1/recipes/lcb-mode"; + sha256 = "184vd5ll0ms2lspzv8zz2zbairsr8i9p3gs28hrnnwm6mrpx4n18"; + name = "lcb-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/lcb-mode"; + license = lib.licenses.free; + }; + }) {}; + leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }: + melpaBuild { + pname = "leanote"; + version = "0.3.6"; + src = fetchFromGitHub { + owner = "aborn"; + repo = "leanote-emacs"; + rev = "60368f2629ec4eac97c2a9d1ad043efd84454925"; + sha256 = "01y4ilrjhf7y3a1r514ahxpa7cl1w5xdj01lxal2a3bhxbkzcvrp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b00b806ae4562ca5a74f41c12ef35bfa597bcfa8/recipes/leanote"; + sha256 = "1xnfv7bpkw3ir402962zbp856d56nas098nkf7bamnsnax6kkqw7"; + name = "leanote"; + }; + packageRequires = [ async cl-lib emacs let-alist pcache request s ]; + meta = { + homepage = "https://melpa.org/#/leanote"; + license = lib.licenses.free; + }; + }) {}; ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; @@ -17744,12 +18289,12 @@ loop = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "loop"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "Wilfred"; repo = "loop.el"; - rev = "145959ab5765bc56a3a4396676871f0e0b6fc2e7"; - sha256 = "1zczsmjz14pj01cd5sk9zqqlcacffazfdlvb7k029hb7pwxf9h63"; + rev = "c3598bd3ad0677f66e061b3ba51a05d05275283e"; + sha256 = "1gs95xnmnn8aa4794k7h8mw1sz1nfdh9v0caqj6yvnsdnwy74n5x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ba481ca96469b3bd518e4fd8f24947338c8af014/recipes/loop"; @@ -17807,12 +18352,12 @@ m-buffer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "m-buffer"; - version = "0.13"; + version = "0.14"; src = fetchFromGitHub { owner = "phillord"; repo = "m-buffer-el"; - rev = "1ff021c5f6c74b092dc1aad28d28af1b5e060f76"; - sha256 = "01847f8xmjfxvvi7hf73l7ypkdazwg8ciinm117zp4jkgnv0apz0"; + rev = "61d1ed99e528840d2eee2ce07946a9d76eb6d814"; + sha256 = "048ls0ca9yppjj0mx6g00f1vwh4ryvv6bckihxs7ynbr2jcydjr7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c34d02682e87c9978a3583bd903dcac5da5b41d5/recipes/m-buffer"; @@ -17891,12 +18436,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "bfc6f6d88619221506e246390e5fbb39087564ec"; - sha256 = "1dv5qr9z5lxj2zjhwjhx451mbkb8d3y00q7ar6n34x7d5c4gmiya"; + rev = "570a0320bdd7437fc35a36d78a1c28e1ee19ce88"; + sha256 = "040wc4nj9r3vlma42sc24x4w25rm2kpzwyq44jw3njjk3b7q9avp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -18024,12 +18569,12 @@ magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }: melpaBuild { pname = "magit-gitflow"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "jtatarik"; repo = "magit-gitflow"; - rev = "56f9934d3445fbeaf6ed6e7426e840b8e1db247e"; - sha256 = "0g8jm9ax4k59wkl3n65zy7hbqrvk85lw22mwza900xbwb515mm66"; + rev = "a2b7b85134784317445faee13d647fb62401ea23"; + sha256 = "1m6hnds12gpj66hcpaxgncapvslh0dml99r1vhg0r8rlmnmf0b9p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow"; @@ -18045,12 +18590,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "bfc6f6d88619221506e246390e5fbb39087564ec"; - sha256 = "1dv5qr9z5lxj2zjhwjhx451mbkb8d3y00q7ar6n34x7d5c4gmiya"; + rev = "570a0320bdd7437fc35a36d78a1c28e1ee19ce88"; + sha256 = "040wc4nj9r3vlma42sc24x4w25rm2kpzwyq44jw3njjk3b7q9avp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -18381,12 +18926,12 @@ markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, websocket }: melpaBuild { pname = "markdown-preview-mode"; - version = "0.4"; + version = "0.6"; src = fetchFromGitHub { owner = "ancane"; repo = "markdown-preview-mode"; - rev = "625c041efda1fa5e621c510770586baea1fd6a72"; - sha256 = "1r0aqy78671k4cgf6y6rilch0vrhcj22ff7bvpwpba7imb8mf1cj"; + rev = "25f1de28390a0b7be493e8f168749d851784ce12"; + sha256 = "116jms95wfdhlbcyn10nqq452jkplvhqwsl7al8f1zx4rn22snra"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/011d26360a109b074cdecbcb133269ec6452ab86/recipes/markdown-preview-mode"; @@ -18462,27 +19007,48 @@ license = lib.licenses.free; }; }) {}; - marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: + marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild }: melpaBuild { pname = "marshal"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "sigma"; repo = "marshal.el"; - rev = "d62a406abb9e8c3dfb8513452402845c55ade6ae"; - sha256 = "164nx0bk8h0p38j8gprcz2zwdqwbjxfcj3idlc5ryqm165h5cwmy"; + rev = "92caeddbb3c3de61707d12db62b9915e271807b7"; + sha256 = "0fajz4k3p2ki237jz0c3wfab5272fvvw9vzxzfivpmpcnws6gbn6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/203f2061c5c7d4aefab3175de5e0538f12158ee3/recipes/marshal"; sha256 = "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl"; name = "marshal"; }; - packageRequires = [ eieio json ]; + packageRequires = [ eieio ht json ]; meta = { homepage = "https://melpa.org/#/marshal"; license = lib.licenses.free; }; }) {}; + material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "material-theme"; + version = "1.0"; + src = fetchFromGitHub { + owner = "cpaulik"; + repo = "emacs-material-theme"; + rev = "b465a4f2112240df9e65f8326160d0c3e09a5a89"; + sha256 = "05cjgjmawndmgw2dl71sx5msj8csn0jr72rfxnw7jx24p4c33nkk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d31ababaa50061e767605c979a3f327a654e564b/recipes/material-theme"; + sha256 = "1d259avldc5fq121xrqv53h8s4f4bp6b89nz2rvjhygz7f8hargq"; + name = "material-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/material-theme"; + license = lib.licenses.free; + }; + }) {}; math-symbol-lists = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "math-symbol-lists"; @@ -19136,12 +19702,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "2.0.3"; + version = "2.2.1"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "02c5f5d5a5d3ee93a1daa16117471197817f3bc8"; - sha256 = "0w18lwp3vn1f9rq9l8s434l2f16rgrp9i1x0c2vbzd5c9xzaq2fi"; + rev = "53f0ba96f0417885e7d3955d8750de6763f99444"; + sha256 = "1azyrvhvyrd5n7djyh324famzab9w5c81bm3nv04p93gd92mm6zh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -19157,12 +19723,12 @@ monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monroe"; - version = "0.2.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "sanel"; repo = "monroe"; - rev = "2f8aed286de47f5c4f65b352b6e4f72b47cac279"; - sha256 = "1a0pv8fkv1cjdb0k5bmjd67a273bzcmxjwzgy4jpb3ng1qbb2xnm"; + rev = "0b9b043f042145bf62969add7ec476ea51da7cbd"; + sha256 = "101lfrykdbv37spkbw7zihhx26bc1lhjyxbanrcp9880bxj04jiy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe"; @@ -19406,6 +19972,27 @@ license = lib.licenses.free; }; }) {}; + multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: + melpaBuild { + pname = "multi-line"; + version = "0.1.4"; + src = fetchFromGitHub { + owner = "IvanMalison"; + repo = "multi-line"; + rev = "329551143764c4106e717bce77a493bd20b72cb8"; + sha256 = "1bvz3h394mmnc3r4k121nnks5ha15wlz53708hda993cs6r8dqvb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line"; + sha256 = "1aadmijnjr029s1qq4gk8xyl9m8xb5x5774b8i3jyfixyjqvhvwp"; + name = "multi-line"; + }; + packageRequires = [ cl-lib dash emacs s shut-up ]; + meta = { + homepage = "https://melpa.org/#/multi-line"; + license = lib.licenses.free; + }; + }) {}; multi-web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi-web-mode"; @@ -19721,6 +20308,27 @@ license = lib.licenses.free; }; }) {}; + neon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "neon-mode"; + version = "1.0.2"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = "neon-mode"; + rev = "370212fa9ffcba3ff542a154d17ccf5be1066c4c"; + sha256 = "13a760jidh00czl05c0pnpbxzr7smrkf5ms9kd3h1cq613ffapby"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b2a4898bf21413c4d9e6714af129bbb0a23e1a/recipes/neon-mode"; + sha256 = "0kgyc0rkxvvks5ykizfv82f2cx7ck17sk63plj7bld6khlcgv0y6"; + name = "neon-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/neon-mode"; + license = lib.licenses.free; + }; + }) {}; neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; @@ -19808,12 +20416,12 @@ nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "437d3cdc7ac2f75d51b1c9980f6720e071d785e2"; - sha256 = "1rvi30xyj2vj3gmzagy51smrhb1xwlsfgnyg30hblj88yn0wh5sz"; + rev = "2ac966a464a830f52a9101c0a9d65f6a95cbfa0e"; + sha256 = "003lxk19z8wq0i6ah7xf14cgqgxww50337vgp66gi3kc0lscfdbf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -20053,6 +20661,27 @@ license = lib.licenses.free; }; }) {}; + number-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "number-lock"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "Liu233w"; + repo = "number-lock.el"; + rev = "846e86e2b3b07410f69e70d3ba7afb072b5585da"; + sha256 = "12gza7lxpwrp191gi9gm61wpvgwsrda52zva9bz3ncqfp7w0y32i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3c107adabe2e4c5b35ebb6b21db076cdea0e9c24/recipes/number-lock"; + sha256 = "13xqn4bcjm01zl0rgbwzad58x35230lm2qiipbyqkh2ma0a9pqn4"; + name = "number-lock"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/number-lock"; + license = lib.licenses.free; + }; + }) {}; nvm = callPackage ({ dash, dash-functional, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "nvm"; @@ -20200,6 +20829,27 @@ license = lib.licenses.free; }; }) {}; + ob-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, spice-mode }: + melpaBuild { + pname = "ob-spice"; + version = "0.4.2"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "ob-spice"; + rev = "790faa67b0c57ca76e8814a1fa60b4dd774412c0"; + sha256 = "0rn3j88ry38500vfaj0myx148nd5kh1jwja6j221ydd6v5wqws6d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6142975cf9c0b9faaf128be34d30e12a88b500f8/recipes/ob-spice"; + sha256 = "13a6g9sh6wvlshvzlllxn8zchb6cb2m0ar14fqvrz5g4hn4hbsm8"; + name = "ob-spice"; + }; + packageRequires = [ org spice-mode ]; + meta = { + homepage = "https://melpa.org/#/ob-spice"; + license = lib.licenses.free; + }; + }) {}; ob-translate = callPackage ({ fetchFromGitHub, fetchurl, google-translate, lib, melpaBuild, org }: melpaBuild { pname = "ob-translate"; @@ -20308,12 +20958,12 @@ olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "4a6197f3d0d4f1230ae75fc6d3c17d5d6459033b"; - sha256 = "1wb2qgyym9gzd8ywrjcji9jxz0wcspz242ny1abkjf0crzgfivhq"; + rev = "d2c54acf566a9ee38021261f7d8f43a94c9eee8c"; + sha256 = "1rh6vi2vi50zkmcd5jyfnhhsdrfn6l9abd43l8ppgr3k93l3m5bl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -20485,12 +21135,12 @@ opensource = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: melpaBuild { pname = "opensource"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "nlamirault"; repo = "opensource.el"; - rev = "eb7bd24e4d4988e7555a6a7c7b8b902630b06ffd"; - sha256 = "1hgbj6rh9mn7n3ccf8ia8vlgzl6mcyr3282l2zqv8z6232sciky2"; + rev = "27d06be45c852e84e47c33cbd0f4c344fd9a0370"; + sha256 = "1rjf78vki4xp8y856v95877093p3zgfc9mx92npscsi1g93dxn80"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9925f059f0caf0550a747d1f07e043e9d854f77/recipes/opensource"; @@ -20587,6 +21237,27 @@ license = lib.licenses.free; }; }) {}; + org-beautify-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-beautify-theme"; + version = "0.2"; + src = fetchFromGitHub { + owner = "jonnay"; + repo = "org-beautify-theme"; + rev = "152918e600c36400068b3d8849fb8b01882ce8c3"; + sha256 = "0414pi4yrzn87kfij83njwdw7aczx4ga6z7kq4miq2fh7cjq8bvj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f55f1ee9890f720e058401a052e14c7411252967/recipes/org-beautify-theme"; + sha256 = "0rrlyn61xh3szw8aihxpbmg809xx5ac66xqzj895dn1raz129h2w"; + name = "org-beautify-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/org-beautify-theme"; + license = lib.licenses.free; + }; + }) {}; org-bookmark-heading = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-bookmark-heading"; @@ -20629,6 +21300,27 @@ license = lib.licenses.free; }; }) {}; + org-commentary = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "org-commentary"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "smaximov"; + repo = "org-commentary"; + rev = "2eeeb0f506e30ef82263e67279d837a79cbde021"; + sha256 = "02an98pc52yfxsxmz1kib692yx93rqdi1q3lpvblzyd3hhd51rlr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3e0a40d9ea5849b9c22378a84ac8122e4eb2737d/recipes/org-commentary"; + sha256 = "0ym1rq2zhyhc6hkk40wsa9jni2h1z5dkaisldqzg8ggl7iv3v4fx"; + name = "org-commentary"; + }; + packageRequires = [ dash emacs org ]; + meta = { + homepage = "https://melpa.org/#/org-commentary"; + license = lib.licenses.free; + }; + }) {}; org-doing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-doing"; @@ -21383,12 +22075,12 @@ orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }: melpaBuild { pname = "orgit"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "magit"; repo = "orgit"; - rev = "12bfadf603d8a1f616a1bdac5f909a0c20e6aba4"; - sha256 = "1wxxdx3c5qacsii4kysk438cjr1hnmpir78kp6xgk9xw5g9snlnj"; + rev = "3747e49964fc4e96c41aa10a5553d7ad609e8f43"; + sha256 = "1x3pdk5wgk4cw9qq2l2d0baidnrjxj1qjdp6ajx7hlmwmxl7c203"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73b5f7c44c90540e4cbdc003d9881f0ac22cc7bc/recipes/orgit"; @@ -21719,12 +22411,12 @@ ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-twbs"; - version = "1.0.7"; + version = "1.0.9"; src = fetchFromGitHub { owner = "marsmining"; repo = "ox-twbs"; - rev = "d2def6a33d179c8c9778d1bf8a72ab347cbc42e3"; - sha256 = "08dw3h1417cr6ddd8gl8zcd11pxqpmkd67bknzhjpj7bbqznfqwa"; + rev = "ca98e2c312c6be1165b956f655a4becc89776634"; + sha256 = "0ranapdq6ly5xrqcksisgazwjp5xvydn98qfi8i1b491163704m3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3263133ba6dde790a364bad7c96144912971ba2d/recipes/ox-twbs"; @@ -21758,6 +22450,27 @@ license = lib.licenses.free; }; }) {}; + package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "package-build"; + version = "1.0"; + src = fetchFromGitHub { + owner = "melpa"; + repo = "package-build"; + rev = "d70db33776cd52586e05e932915653ec54f41c9c"; + sha256 = "1hfbmh4gzgxdmv421bnpj8486fja7015sj7jrnp8bhvcxxxc3azd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; + sha256 = "0kr82j9rbvmapsph0jdxy24p0b8mcnj01sg1myywf428nf30cgbh"; + name = "package-build"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/package-build"; + license = lib.licenses.free; + }; + }) {}; package-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-plus"; @@ -21908,12 +22621,12 @@ pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "pandoc-mode"; - version = "2.17.2"; + version = "2.18"; src = fetchFromGitHub { owner = "joostkremers"; repo = "pandoc-mode"; - rev = "7f184c178d759e573eaed486d9d70c9b5c8c1eb0"; - sha256 = "17ibs2szjvy4ar4gidlyg6w20926fr1z59m851akghiwf4aqly7z"; + rev = "e641d91c2886800871769e8e0e6554d2f8001e79"; + sha256 = "1lv3iiwidlvr6jsldd2s9apir1jzpynii8vp58gxq9kxbm4rzb42"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/pandoc-mode"; @@ -22095,12 +22808,12 @@ pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }: melpaBuild { pname = "pass"; - version = "1.1"; + version = "1.4"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "93d99883a95e70f931d2abad87e697f5243115d3"; - sha256 = "18m0973l670cjbzpa1vfv06gymhsa2f1pjcp329s0npb735x5whj"; + rev = "6e5f557f3430934fdf78d99d93d2456c474e4bde"; + sha256 = "0crf97jjmhvnxc9d089qfi9m5qdbpxiv7ncacp7m3xasxy9sd7cb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; @@ -22429,12 +23142,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "1.2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "7d46178b260cb600d378e9e3b746253cc9cb8a46"; - sha256 = "090b73969namf3h7pbf8xc969dygj3frzlkf0h2x29wl1fmag5kr"; + rev = "2c559083fa316b97b76e25c491a45aec5f2fe501"; + sha256 = "091k1pnkw4a62di6lj7gkczzpgf2jsxpj3brpfjs8gkcgx07vxsh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -22618,12 +23331,12 @@ phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "phpunit"; - version = "0.9.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "nlamirault"; repo = "phpunit.el"; - rev = "7b2a811d80fd9781ec78692bc4f66c1641eb386a"; - sha256 = "1pmds2g7y1pcs3ivsd68zg30ih34janib0ydz4wr0mci3q52cjpy"; + rev = "165ca257d4840c266e1e79e806b4b943b5785fe6"; + sha256 = "1xgjhq1nxj4zfcns0q8a1kdlmqcjrxlblyj9vrspv1qck3akrp3z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit"; @@ -22909,6 +23622,25 @@ license = lib.licenses.free; }; }) {}; + po-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + pname = "po-mode"; + version = "0.19.8.1"; + src = fetchgit { + url = "git://git.savannah.gnu.org/gettext.git"; + rev = "c737bf843616ca984c9416048a2da845e9ad3f50"; + sha256 = "0hlvnq3cigpb8f4yxy2llcmmn0b38prlb1awwy6zl5fwwi9ksrwk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode"; + sha256 = "1hb9vrr2x6mh0yzckmx9fk6535d6r189974n4bizpr1xdikn7dgp"; + name = "po-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/po-mode"; + license = lib.licenses.free; + }; + }) {}; pony-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "pony-snippets"; @@ -23245,6 +23977,27 @@ license = lib.licenses.free; }; }) {}; + project-persist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "project-persist"; + version = "0.3.2"; + src = fetchFromGitHub { + owner = "rdallasgray"; + repo = "project-persist"; + rev = "a4e5de1833edb60656d8a04357c527d34e81d27c"; + sha256 = "1x7hwda1w59b8hvzxyk996wdz6phs6rchh3f1ydf0ab6x7m7xvjr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bd81d1f8a30ed951ed94b9a4db13a2f7735ea878/recipes/project-persist"; + sha256 = "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24"; + name = "project-persist"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/project-persist"; + license = lib.licenses.free; + }; + }) {}; project-persist-drawer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, project-persist }: melpaBuild { pname = "project-persist-drawer"; @@ -23748,6 +24501,27 @@ license = lib.licenses.free; }; }) {}; + pydoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pydoc"; + version = "0.1"; + src = fetchFromGitHub { + owner = "statmobile"; + repo = "pydoc"; + rev = "5392248e33d83ef05d3b2809b0c6b207786b2644"; + sha256 = "1m0jb5pk1a1ww5jx2y5nz21by4dh7nlnhdn6bigz53ra449rrxii"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5c4988a66040ddf659492bdb0ae2b9617c342c69/recipes/pydoc"; + sha256 = "0sf52cb80yiridsl1pffdr3wpbgxrn2l8vnq03l70djckild477n"; + name = "pydoc"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/pydoc"; + license = lib.licenses.free; + }; + }) {}; pyenv-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic }: melpaBuild { pname = "pyenv-mode"; @@ -23979,22 +24753,22 @@ license = lib.licenses.free; }; }) {}; - racer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }: + racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }: melpaBuild { pname = "racer"; - version = "1.0.2"; + version = "1.1"; src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "9025fab5af8c6a487341e397a62bca08f14e9bf5"; - sha256 = "1r1gq6b33iv5a3kf96s73xp5y7yw2lq36cczmwbb9ix5bh5jhcyk"; + rev = "0f0246ddad7d89205b1babe228c4b132c19dded3"; + sha256 = "0zvv83rrchq92yqi6w14q5m88fva7gcm8q4vhj226acf5iq1xwdm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi"; name = "racer"; }; - packageRequires = [ dash emacs rust-mode s ]; + packageRequires = [ dash emacs f rust-mode s ]; meta = { homepage = "https://melpa.org/#/racer"; license = lib.licenses.free; @@ -24192,12 +24966,12 @@ rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rdf-prefix"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "simenheg"; repo = "rdf-prefix"; - rev = "ec8fa683f6b89664c62ea799edadaeb5bc0a932f"; - sha256 = "1hn5x6kw7xh5wnpwr862584h4vrmvd36vjbshcgwng1qj486m3as"; + rev = "07f1b914f0bf0ca154831e13202eacecf27cf4c4"; + sha256 = "0cis7lcsjpr2gbh59v4sj1irkdkzx893rl3z3q35pq2yklrmx9nv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix"; @@ -24231,22 +25005,22 @@ license = lib.licenses.free; }; }) {}; - realgud = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, load-relative, loc-changes, melpaBuild, test-simple }: + realgud = callPackage ({ fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "1.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "0dd37e233f315a5666eefc6a3e9fc088fcc6561f"; - sha256 = "07j1grdbqv3iv5ghmgsjw678bxjajcxi27clz4krcz3ys5b1h70v"; + rev = "6dc971269f6f9435e5159c2cfe66fc5e4b296df2"; + sha256 = "1pl758xp2gfy8h313ggpmqv7sjb8h6qdrqj68ypxch70k9vq76z8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; sha256 = "0qmvd35ng1aqclwj3pskn58c0fi98kvx9666wp3smgj3n88vgy15"; name = "realgud"; }; - packageRequires = [ list-utils load-relative loc-changes test-simple ]; + packageRequires = [ load-relative loc-changes test-simple ]; meta = { homepage = "https://melpa.org/#/realgud"; license = lib.licenses.free; @@ -24756,27 +25530,6 @@ license = lib.licenses.free; }; }) {}; - rnc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "rnc-mode"; - version = "1.0.6"; - src = fetchFromGitHub { - owner = "TreeRex"; - repo = "rnc-mode"; - rev = "b39dc23218213336b55f28e12a1d0e49ef7c1e21"; - sha256 = "1drvyf5asjp3lgpss7llff35q8r89vmh73n1axaj2qp9jx5a5jih"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e12b048692ceb145cfbe1a03ecc2714f7bfc3bad/recipes/rnc-mode"; - sha256 = "09ly7ln6qrcmmim9bl7kd50h4axrhy6ig406r352xm4a9zc8n22q"; - name = "rnc-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/rnc-mode"; - license = lib.licenses.free; - }; - }) {}; robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "robe"; @@ -24801,12 +25554,12 @@ robots-txt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "robots-txt-mode"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "zonuexe"; repo = "robots-txt-mode"; - rev = "7b524685036d339a8aff1481697fbcd529dfa8f7"; - sha256 = "0dimmdz4aqcif4lp23nqxfg7kngzym2yivn6h3p7bn1821vgzq9s"; + rev = "edf1f8082c88cb2ff5a784ba00f92c535aaa1c7d"; + sha256 = "11ig771ck610glb6f3322ka026ikq0b072rlq5z6ymr3rbxagn6j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1669c7a0d89ea36d61bfa57ef54ee1f203daff5f/recipes/robots-txt-mode"; @@ -25246,8 +25999,8 @@ src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "c90bbde5ff29c23b1545c7b29edba453fc33f393"; - sha256 = "1ayqdmnp38wvhi3a8r8wivn4z8v6irbz0kwqvgsnpq6m2s3jsbz9"; + rev = "a0b73b25377f5aedf50abe198d6b6111310735be"; + sha256 = "0b2gm1mfxiqm86m5156scmzvn10dl0idgxpzgki1k0cpy4xf4qfa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -25788,12 +26541,12 @@ simple-bookmarks = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-bookmarks"; - version = "1.6"; + version = "1.8"; src = fetchFromGitHub { owner = "jtkDvlp"; repo = "simple-bookmarks"; - rev = "ef14b49f168caf45be34698d851a061da1f74208"; - sha256 = "1x1zn4f4k7il8h331lva5gw9vscpw2c7310apn1xwhyj7hz47mf2"; + rev = "e89e8163a0705e28e9346320a1ee13c1aae249af"; + sha256 = "0bx8inaihfs48rzi01nlr3wp2iw0bnk318hhgpd4zg64ap3sgdsv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a60dd50c388a75ce21a5aec9acf938835d7afdbc/recipes/simple-bookmarks"; @@ -25953,6 +26706,27 @@ license = lib.licenses.free; }; }) {}; + sl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sl"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "sl.el"; + rev = "76a8eae2b3fc449ed81b2a577c53939434851635"; + sha256 = "1nkgqva4l4nwpixavky8gm38371z7mrkpqdkgrya4j5mrx4kiw86"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7188a93d33e38f360930b5090c6ef872116f8a7c/recipes/sl"; + sha256 = "0h90ajikr6kclsy73vs9f50jg8z3d6kqbpanm9ryh2pw3sd4rnii"; + name = "sl"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/sl"; + license = lib.licenses.free; + }; + }) {}; slamhound = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slamhound"; @@ -26061,12 +26835,12 @@ slime-docker = callPackage ({ cl-lib ? null, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: melpaBuild { pname = "slime-docker"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "daewok"; repo = "slime-docker"; - rev = "114992086054abb298af7c6e24f2ef19794e2de4"; - sha256 = "0swd9rbsag8k18njp741ljg6lmlz949i4bbz5w7bl0spcpc26fs9"; + rev = "1ba41c2d86540a84b47466b0b6957f8063f23aa8"; + sha256 = "168s5xsf7l6s8x5hcmzmk5j9d8a3wpr4s3dlm697dg2n1717gl2z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/15ec3f7208287161571c8fc3b29369ceabb44e5f/recipes/slime-docker"; @@ -26292,12 +27066,12 @@ smbc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smbc"; - version = "0.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "sakshamsharma"; repo = "emacs-smbc"; - rev = "45c39f82bc11ee157cac242d45f1563ce6160ab5"; - sha256 = "1qhs6k0bk5spcz81a99nznl0xi4nw7ml048h2gnymdcb3zd4xrfr"; + rev = "c377b806118d82140197d9cb1095548477e00497"; + sha256 = "16cj6jsy1psmcjshxb46i44sf1zb9s4mfiagl5cr22njy01ajq1h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b4f16cd8028edc758ada842432df11c8276fd3/recipes/smbc"; @@ -26709,22 +27483,22 @@ license = lib.licenses.free; }; }) {}; - spotify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + spotify = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spotify"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "remvee"; repo = "spotify-el"; - rev = "07a44ecdbdaa93977e97f2a2e5d280ef0b2e8545"; - sha256 = "05y8xv6zapspwr5bii41lgirslas22wsbm0kgb4dm79qbk9j1kzw"; + rev = "472f6e61d732a7e700f5505e2a445fc0b030916a"; + sha256 = "0kc17ijjd8ygwjji23ndhq75kqjyxlb8kg9q0ij0l38q3b903fhi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb57a2d7dc46f7b0663a030e240f81c758a44e6a/recipes/spotify"; sha256 = "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k"; name = "spotify"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/spotify"; license = lib.licenses.free; @@ -26796,12 +27570,12 @@ sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlup-mode"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Trevoke"; repo = "sqlup-mode.el"; - rev = "6295ec413a2e3cc50644b342aa77ec85d744448c"; - sha256 = "0ajixsfxpyy37k7kbaqz3dqazwc371yfd9fqdhanwn9lz6w390kk"; + rev = "6140e23a2902616da5894dc676b47a8748faf016"; + sha256 = "0dczcmibvr9m5isn9isgl01q9x97yfdcs21qa57ds2b3nmqaqy4p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode"; @@ -27189,6 +27963,27 @@ license = lib.licenses.free; }; }) {}; + suggest = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: + melpaBuild { + pname = "suggest"; + version = "0.1"; + src = fetchFromGitHub { + owner = "Wilfred"; + repo = "suggest.el"; + rev = "785818164ce0823360409fd6e8d12e656409fdd3"; + sha256 = "17xmpr2ir30x9nzb8fcbss7vnk1496sa1bxa8q8q1x778sh4728c"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; + sha256 = "12vvakqqzmmqq5yynpd4wf4lnb0yvcnz065kni996sy7rv7rh83q"; + name = "suggest"; + }; + packageRequires = [ dash f loop s ]; + meta = { + homepage = "https://melpa.org/#/suggest"; + license = lib.licenses.free; + }; + }) {}; suomalainen-kalenteri = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "suomalainen-kalenteri"; @@ -27273,6 +28068,27 @@ license = lib.licenses.free; }; }) {}; + swbuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "swbuff"; + version = "3.3"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "swbuff"; + rev = "8d5b2bec12503509554f9dd83b97c198b259db2b"; + sha256 = "0h96pwvf1smd2kakd5ydsn6q59dv9sj706p1ak86aj82m028wzk5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a44a6577740b98749fe2703b32d70f15a473eb46/recipes/swbuff"; + sha256 = "0pi816ljprpl8p2pigfyzm9ripvrc4hvnpkjdsg30mw8iyrk66yn"; + name = "swbuff"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/swbuff"; + license = lib.licenses.free; + }; + }) {}; sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }: melpaBuild { pname = "sweetgreen"; @@ -27842,12 +28658,12 @@ tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "tern"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "95dfbf405802207b5529314b83b6104f9ea9b042"; - sha256 = "067k1cnfywk5bl9qxpn4yxg577x35ndygg4s8nkhxncnl11dq63q"; + rev = "459b6705bada72027fbb922f4097b4dcf0ab305d"; + sha256 = "1b95sw2fmnyfsw6c25a2nhkxcwqypgpnnw7yn1wfry6i81p8j8kg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -27863,12 +28679,12 @@ tern-auto-complete = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }: melpaBuild { pname = "tern-auto-complete"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "95dfbf405802207b5529314b83b6104f9ea9b042"; - sha256 = "067k1cnfywk5bl9qxpn4yxg577x35ndygg4s8nkhxncnl11dq63q"; + rev = "459b6705bada72027fbb922f4097b4dcf0ab305d"; + sha256 = "1b95sw2fmnyfsw6c25a2nhkxcwqypgpnnw7yn1wfry6i81p8j8kg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -28094,12 +28910,12 @@ tide = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "2.0.0beta"; + version = "2.0.2"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "fbdef5d7af25786d2eddd691a8d6a00225c4202d"; - sha256 = "09y92kk0abfihyh6my2jsq6gvdczg61a9iy324vyhl8ig0aqf9zd"; + rev = "170bce9067a6467f190418284377559a9f43c667"; + sha256 = "0b23d9bi1i00v9ffrdi5ag0q2i149ai1p88klpgl2j9kvdif0zmg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -28813,12 +29629,12 @@ utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "utop"; - version = "1.19.2"; + version = "1.19.3"; src = fetchFromGitHub { owner = "diml"; repo = "utop"; - rev = "3db52cc2d0ad990398bd726d00eece171200c03a"; - sha256 = "17p3cwjxdvp0v3n8fiib7hgl07z2iqi1qwlff0g3zwf4rr6kxgqy"; + rev = "ee81ce49bab31757837bed35a182d29cbd54dfcb"; + sha256 = "1p2vjxw0y6py5hly6vjl4gxm171n9pr4rkimxd0rg3dl1npvn99z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30489fe52b4031184e54f994770aa3291257bc9d/recipes/utop"; @@ -28999,22 +29815,22 @@ license = lib.licenses.free; }; }) {}; - vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine, projectile }: + vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "4.4"; + version = "5.3"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "d4d89eaab46db3ecf5969ee8126064bc27ec6a84"; - sha256 = "0jawi8l8zbi06plgd07g1wbsvjqy83w2xv74m3c8ib5m4g9h93kv"; + rev = "f6dfac6851c6bc78f9d72849befd54b09ac64ce7"; + sha256 = "03qqvv9l83b5cpdcjdcq0wv3ghhx13y3b16rn1d1l0vfndzmnz42"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw"; name = "vhdl-tools"; }; - packageRequires = [ emacs ggtags helm outshine projectile ]; + packageRequires = [ emacs ggtags helm outshine ]; meta = { homepage = "https://melpa.org/#/vhdl-tools"; license = lib.licenses.free; @@ -29107,12 +29923,12 @@ visual-fill-column = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "visual-fill-column"; - version = "1.7"; + version = "1.9"; src = fetchFromGitHub { owner = "joostkremers"; repo = "visual-fill-column"; - rev = "d24354e79b4103ed75ff3a70e7279c75e0bf21a7"; - sha256 = "02msgb2dh3b5ki6v2bg39l2x93amvmaxg6v57kmyl80x27h00vx9"; + rev = "73da507c8f4af7a755f9b209bbb3b0343ca2517c"; + sha256 = "0hks82hdx7rfx3lwsz0zq5k9j6vpwbpgj9d6i7xhd6cwb9q95ycv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7628c805840c4687686d0b9dc5007342864721e/recipes/visual-fill-column"; @@ -29125,6 +29941,48 @@ license = lib.licenses.free; }; }) {}; + visual-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "visual-regexp"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "benma"; + repo = "visual-regexp.el"; + rev = "2cf4dc5a2dff0736eb2e2da95997d7274bbb5766"; + sha256 = "0zz83l97xkna2yqiiywxyhj2zwil2a0xqzdsdxw0ai951jql1j5r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/visual-regexp"; + sha256 = "16bdqq2j7pnjq3j6qa4rhxzidqdhyg80c7nazd93smis8rcv5d0z"; + name = "visual-regexp"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/visual-regexp"; + license = lib.licenses.free; + }; + }) {}; + visual-regexp-steroids = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, visual-regexp }: + melpaBuild { + pname = "visual-regexp-steroids"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "benma"; + repo = "visual-regexp-steroids.el"; + rev = "6fe4e504ae7a532d67aead6089d68bb2406e4c25"; + sha256 = "0bc44z8y1jmw7jlz785bisy36v08jichj53nwhmp2wjyv40xy321"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7f105ebce741956b7becc86e4bdfcafecf59af74/recipes/visual-regexp-steroids"; + sha256 = "1xkrzyyll8wmb67m75lfm9k8qcm068km8r1k8hcsadpkd01bx1lr"; + name = "visual-regexp-steroids"; + }; + packageRequires = [ visual-regexp ]; + meta = { + homepage = "https://melpa.org/#/visual-regexp-steroids"; + license = lib.licenses.free; + }; + }) {}; vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vlf"; @@ -29377,6 +30235,26 @@ license = lib.licenses.free; }; }) {}; + weblogger = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild, xml-rpc }: + melpaBuild { + pname = "weblogger"; + version = "1.4.5"; + src = fetchbzr { + url = "lp:weblogger-el"; + rev = "38"; + sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4e08837a9af8185951df9b44b9b94a799f0de923/recipes/weblogger"; + sha256 = "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk"; + name = "weblogger"; + }; + packageRequires = [ xml-rpc ]; + meta = { + homepage = "https://melpa.org/#/weblogger"; + license = lib.licenses.free; + }; + }) {}; weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }: melpaBuild { pname = "weechat"; @@ -29527,12 +30405,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "1.1.12"; + version = "1.1.15"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "13316578c8483740ecfe97f9f069fc364e4f97d9"; - sha256 = "0i25y5j5qwmj3v3cd16v1c81y5bwhgar379bjy4052mfm870b90d"; + rev = "1eace34a1f5b780a30797976d0cfec5936048b7b"; + sha256 = "0sgisdgid6xw6pggdi42i07wmar8bbxg9wk1b7jvyi7i7q94s843"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -29776,6 +30654,26 @@ license = lib.licenses.free; }; }) {}; + wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "wisp-mode"; + version = "0.9.1"; + src = fetchhg { + url = "https://bitbucket.com/ArneBab/wisp"; + rev = "a55b6dd96558"; + sha256 = "1n0a99v2gwr12dhgg0yw42lm7ggcq9b85qn1c29k66l7jz637mfp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; + sha256 = "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc"; + name = "wisp-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/wisp-mode"; + license = lib.licenses.free; + }; + }) {}; wispjs-mode = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wispjs-mode"; @@ -29800,12 +30698,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "d28d07497f67fea4c62fe7a2d3201fd86fb64fe2"; - sha256 = "0rzq2fbz523fyy2p6ddx9iws89sfgw3pwillw8yz965f3hxx3dj3"; + rev = "4929d430266925c1145adef9987e2acdb829395b"; + sha256 = "12613xwd05l26p2v9jxjxcqf4v20j6fq5wpmnj45spg0ngalwzg4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -29947,12 +30845,12 @@ writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }: melpaBuild { pname = "writeroom-mode"; - version = "3.2"; + version = "3.5"; src = fetchFromGitHub { owner = "joostkremers"; repo = "writeroom-mode"; - rev = "aed9803e8eb7178361fbac75df98c19a45eff4ee"; - sha256 = "11a3h5v7knj8y360cxin59c1ipd9y4qsqlanrw69yb5k4816ayyr"; + rev = "2e15db8e26a05618da7a1f97e19ff68f7359e8f6"; + sha256 = "1695vr25jr6m6fqjxyjns8vcbfixgjpkpqj1lk9k75k8n38x4ibw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/writeroom-mode"; @@ -30133,15 +31031,36 @@ license = lib.licenses.free; }; }) {}; + xmlgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "xmlgen"; + version = "0.4"; + src = fetchFromGitHub { + owner = "philjackson"; + repo = "xmlgen"; + rev = "d27294a4174888fe452015cb98dedd2a4bdc1e92"; + sha256 = "1nk50iwb6az01r1s2l9wwdqrz3k4ywr00q0zmd9vvi3y9v4cjah0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cd19fded2de4e7549121485e81f7405c0176e203/recipes/xmlgen"; + sha256 = "1mvnjqb9zxf9ml605w10v4cbbajwv9if93apr4xrh79l00scj383"; + name = "xmlgen"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/xmlgen"; + license = lib.licenses.free; + }; + }) {}; xquery-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xquery-tool"; - version = "0.1.9"; + version = "0.1.10"; src = fetchFromGitHub { owner = "paddymcall"; repo = "xquery-tool.el"; - rev = "68de7a26e589f5eab1929caeaa5dafffde362bef"; - sha256 = "1j11vnkva7c3rwzyfg467m7l437lb1rdfzarsgi33i225ai4c0hb"; + rev = "b81b5862e8541aca5231840eb176afad7ab55cf3"; + sha256 = "0dv3gl9djs9sbsg5mhdfnnv61ir9xccqijh7i2b82gq2j3lqhibm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc71e5ea4a0ecb006f62617f5b6caadc9b3c77b2/recipes/xquery-tool"; @@ -30348,8 +31267,8 @@ version = "1.78"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "e78a87bc2c9e"; - sha256 = "08iwfpsjs36pqr2l85avxhsjx8z0sdfw8cqwwf3brn7i4x67f7z5"; + rev = "2521a95043af"; + sha256 = "0l7nxjc67mg2ddi7cf9vm744yps26zz64hqq7g0cfycjsgzg517v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; @@ -30491,12 +31410,12 @@ zerodark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "1.3"; + version = "1.8"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "90aa9d2ca5632bfc6471982339f0709494b35f4a"; - sha256 = "1kdsyki7i7x0ypq0iabdv1bnx0gd45acqcixvrxi3rf9j4chyvls"; + rev = "c993631342d04a33f717e4161c60cf4fa7afe4a9"; + sha256 = "1yyx5c897b5nl1svqv8m0f6cy68cm20zi39ihabr8cdc0zywcjsi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index f99e5d76a47..c380d05302e 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -12,10 +12,10 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.6.3"; + version = "2.7.0"; src = fetchurl { - url = "https://nano-editor.org/dist/v2.6/${name}.tar.gz"; - sha256 = "00ym3zws1vdds726drgr5wj14mjn18d96ghn6vjci0915zhm8h2g"; + url = "mirror://gnu/nano/${name}.tar.xz"; + sha256 = "08cmnca3s377z74yjw1afz59l2h9s40wsa9wxw5y4x5f2jaz6spq"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; buildInputs = [ ncurses ]; @@ -26,15 +26,6 @@ stdenv.mkDerivation rec { ${optionalString enableTiny "--enable-tiny"} ''; - patchFlags = [ "-p0" ]; - - patches = optional stdenv.isDarwin - (fetchurl { - name = "darwin.patch"; - url = "https://trac.macports.org/browser/trunk/dports/editors/nano/files/patch-src-winio.c.diff?rev=151356&format=txt"; - sha256 = "184q33irz9px2svwr2qx70zvfby5zlwlhv4k607yzsy90fq2jpdd"; - }); - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace src/text.c --replace "__time_t" "time_t" ''; diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index bc101e24114..48278f5aac5 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { description = "The GNU Image Manipulation Program"; homepage = http://www.gimp.org/; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 572d346760c..f06f2f15d5c 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; postInstall = '' for p in $out/bin/*; do diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index e8d2951dd16..f29d09b8ef7 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { openjpeg opencolorio vc poppler_qt5 curl ilmbase ]; - NIX_CFLAGS_COMPILE = [ "-I${ilmbase}/include/OpenEXR" ]; + NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index 98152694c6d..30d34a88d90 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0nzvfxd3ybxx61rj6vxcaaxfrsxrl9af3h8jj7pr3rncisnl9gkl"; })]; - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; buildInputs = [ diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index 79db732750d..d16800dc881 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0cr0z81a41bg193dx9crcq1mns7mmzz7qys4lrbm18cmdbwkk88x"; }; + outputs = [ "bin" "out" "dev" "doc" ]; + buildInputs = [ boost cmake ilmbase libjpeg libpng libtiff opencolorio openexr unzip @@ -21,10 +23,15 @@ stdenv.mkDerivation rec { ]; preBuild = '' - makeFlags="ILMBASE_HOME=${ilmbase} OPENEXR_HOME=${openexr} USE_PYTHON=0 + makeFlags="ILMBASE_HOME=${ilmbase.dev} OPENEXR_HOME=${openexr.dev} USE_PYTHON=0 INSTALLDIR=$out dist_dir=" ''; + postInstall = '' + mkdir -p $bin + mv $out/bin $bin/ + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/qtpfsgui/default.nix b/pkgs/applications/graphics/qtpfsgui/default.nix index 14af2062c61..d3edc40cbea 100644 --- a/pkgs/applications/graphics/qtpfsgui/default.nix +++ b/pkgs/applications/graphics/qtpfsgui/default.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; preConfigure = '' - export CPATH="${ilmbase}/include/OpenEXR:$CPATH" + export CPATH="${ilmbase.dev}/include/OpenEXR:$CPATH" ''; qmakeFlags = [ "EXIV2PATH=${exiv2.dev}/include/exiv2" - "OPENEXRDIR=${openexr}/include/OpenEXR" + "OPENEXRDIR=${openexr.dev}/include/OpenEXR" "FFTW3DIR=${fftwSinglePrec.dev}/include" "LIBTIFFDIR=${libtiff.dev}/include" ]; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 28ac63f62a9..d76c935f0a6 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON" ++ optional colladaSupport "-DWITH_OPENCOLLADA=ON"; - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}m"; + NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${python}/include/${python.libPrefix}m"; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index b7db33609cc..ce743a00879 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: let - version = "15.04"; + version = "15.04.6"; in stdenv.mkDerivation { name = "curaengine-${version}"; src = fetchurl { url = "https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"; - sha256 = "0rgrsyi7951fsv3lzprlzrg55jf6pbdjfql85dylwmg9nc4y8xym"; + sha256 = "1cd4dikzvqyj5g80rqwymvh4nwm76vsf78clb37kj6q0fig3qbjg"; }; postPatch = '' diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index ef5b58733b9..00da9bfa5c1 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "emem"; - version = "0.2.27"; + version = "0.2.28"; name = "${pname}-${version}"; inherit jdk; src = fetchurl { url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar"; - sha256 = "0zmh152dfgsq2yj14wb3504pyibq4r671q5yz6yy28ihym7qr0fd"; + sha256 = "1hapvvkkwnvg32awx4nj84s2ascpci6x02wf4rckyd1ykbxp2b8m"; }; buildInputs = [ ]; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 3c07bfa80e8..09f9e654b94 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -12,13 +12,13 @@ let m33-fio = buildPlugin rec { name = "M33-Fio-${version}"; - version = "1.5"; + version = "1.7"; src = fetchFromGitHub { owner = "donovan6000"; repo = "M33-Fio"; rev = "V${version}"; - sha256 = "0ss8ic9l5srb5wj2mj0qafam0z4d6zv0cixhxgghh03fp0lvwjyq"; + sha256 = "14sqvgrpf3zvgycjj7f3m7m2flx06zq4h0yhq4g18av0zbsrv7yp"; }; patches = [ diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index 8e781cd1c02..f808ec611a3 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { description = "Console version of StarDict program"; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; }; src = fetchurl { diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix index f737d4e04bd..f339657b7fe 100644 --- a/pkgs/applications/networking/cluster/marathon/default.nix +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "marathon-${version}"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "https://downloads.mesosphere.com/marathon/v${version}/marathon-${version}.tgz"; - sha256 = "35a80401383f6551c45c676beed30b3c1af6d3ad027f44735c208abe8eaca93d"; + sha256 = "1c1ml3blhhc10mky5pqxhpndbz6nk7qgcfbzwdqj9kqfzmwlsfbb"; }; buildInputs = [ makeWrapper jdk mesos ]; diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 27c31443f12..6768df2df02 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -10,7 +10,7 @@ let soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so"; in stdenv.mkDerivation rec { - version = "0.28.0"; + version = "0.28.2"; name = "mesos-${version}"; enableParallelBuilding = true; @@ -18,12 +18,17 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/mesos/${version}/${name}.tar.gz"; - sha256 = "05dnj6r5pspizna0fk7yayn38a4w9hlcswgg8l9qmb35m6nq6hby"; + sha256 = "0wh4h11w5qvqa66fiz0qbm9q48d3jz48mw6mm22bcy9q9wmzrxcn"; }; patches = [ # https://reviews.apache.org/r/36610/ ./rb36610.patch + + # https://issues.apache.org/jira/browse/MESOS-6013 + ./rb51324.patch + ./rb51325.patch + ./maven_repo.patch ]; diff --git a/pkgs/applications/networking/cluster/mesos/rb51324.patch b/pkgs/applications/networking/cluster/mesos/rb51324.patch new file mode 100644 index 00000000000..abcd6d065db --- /dev/null +++ b/pkgs/applications/networking/cluster/mesos/rb51324.patch @@ -0,0 +1,72 @@ +diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/ls.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/ls.hpp +index f8da9ef74a885cc39424b3e50cebca905d88ca44..25e2bec6415f2382291cf8da5c0a8c44cf882d27 100644 +--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/ls.hpp ++++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/ls.hpp +@@ -18,6 +18,8 @@ + #else + #include + #endif // __WINDOWS__ ++ ++#include + #include + + #include +@@ -26,8 +28,6 @@ + #include + #include + +-#include +- + + namespace os { + +@@ -36,36 +36,32 @@ inline Try> ls(const std::string& directory) + DIR* dir = opendir(directory.c_str()); + + if (dir == NULL) { +- // Preserve `opendir` error. + return ErrnoError("Failed to opendir '" + directory + "'"); + } + +- dirent* temp = (dirent*) malloc(os::dirent_size(dir)); +- +- if (temp == NULL) { +- // Preserve `malloc` error. +- ErrnoError error("Failed to allocate directory entries"); +- closedir(dir); +- return error; +- } +- + std::list result; + struct dirent* entry; +- int error; + +- while ((error = readdir_r(dir, temp, &entry)) == 0 && entry != NULL) { ++ // Zero `errno` before starting to call `readdir`. This is necessary ++ // to allow us to determine when `readdir` returns an error. ++ errno = 0; ++ ++ while ((entry = readdir(dir)) != NULL) { + if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) { + continue; + } + result.push_back(entry->d_name); + } + +- free(temp); +- closedir(dir); ++ if (errno != 0) { ++ // Preserve `readdir` error. ++ Error error = ErrnoError("Failed to read directory"); ++ closedir(dir); ++ return error; ++ } + +- if (error != 0) { +- // Preserve `readdir_r` error. +- return ErrnoError("Failed to read directories"); ++ if (closedir(dir) == -1) { ++ return ErrnoError("Failed to close directory"); + } + + return result; diff --git a/pkgs/applications/networking/cluster/mesos/rb51325.patch b/pkgs/applications/networking/cluster/mesos/rb51325.patch new file mode 100644 index 00000000000..9c6eb7bebbe --- /dev/null +++ b/pkgs/applications/networking/cluster/mesos/rb51325.patch @@ -0,0 +1,156 @@ +diff -Naur a/3rdparty/libprocess/3rdparty/stout/include/Makefile.am b/3rdparty/libprocess/3rdparty/stout/include/Makefile.am +--- a/3rdparty/libprocess/3rdparty/stout/include/Makefile.am 2016-09-02 15:20:04.834457344 +0200 ++++ b/3rdparty/libprocess/3rdparty/stout/include/Makefile.am 2016-09-02 15:21:00.190983981 +0200 +@@ -62,7 +62,6 @@ + stout/os/chroot.hpp \ + stout/os/close.hpp \ + stout/os/constants.hpp \ +- stout/os/direntsize.hpp \ + stout/os/environment.hpp \ + stout/os/exists.hpp \ + stout/os/fcntl.hpp \ +@@ -101,7 +100,6 @@ + stout/os/posix/bootid.hpp \ + stout/os/posix/chown.hpp \ + stout/os/posix/chroot.hpp \ +- stout/os/posix/direntsize.hpp \ + stout/os/posix/exists.hpp \ + stout/os/posix/fcntl.hpp \ + stout/os/posix/fork.hpp \ +@@ -118,7 +116,6 @@ + stout/os/raw/environment.hpp \ + stout/os/windows/bootid.hpp \ + stout/os/windows/chroot.hpp \ +- stout/os/windows/direntsize.hpp \ + stout/os/windows/exists.hpp \ + stout/os/windows/fcntl.hpp \ + stout/os/windows/fork.hpp \ +diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/direntsize.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/direntsize.hpp +deleted file mode 100644 +index 819f99a89862491e99873bdedc603317b91266b0..0000000000000000000000000000000000000000 +--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/direntsize.hpp ++++ /dev/null +@@ -1,26 +0,0 @@ +-// Licensed under the Apache License, Version 2.0 (the "License"); +-// you may not use this file except in compliance with the License. +-// You may obtain a copy of the License at +-// +-// http://www.apache.org/licenses/LICENSE-2.0 +-// +-// Unless required by applicable law or agreed to in writing, software +-// distributed under the License is distributed on an "AS IS" BASIS, +-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-// See the License for the specific language governing permissions and +-// limitations under the License. +- +-#ifndef __STOUT_OS_DIRENTSIZE_HPP__ +-#define __STOUT_OS_DIRENTSIZE_HPP__ +- +- +-// For readability, we minimize the number of #ifdef blocks in the code by +-// splitting platform specifc system calls into separate directories. +-#ifdef __WINDOWS__ +-#include +-#else +-#include +-#endif // __WINDOWS__ +- +- +-#endif // __STOUT_OS_DIRENTSIZE_HPP__ +diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/direntsize.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/direntsize.hpp +deleted file mode 100644 +index 9d8f72eb607a288e77f92b39b91542ff5eb2fa21..0000000000000000000000000000000000000000 +--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/direntsize.hpp ++++ /dev/null +@@ -1,42 +0,0 @@ +-// Licensed under the Apache License, Version 2.0 (the "License"); +-// you may not use this file except in compliance with the License. +-// You may obtain a copy of the License at +-// +-// http://www.apache.org/licenses/LICENSE-2.0 +-// +-// Unless required by applicable law or agreed to in writing, software +-// distributed under the License is distributed on an "AS IS" BASIS, +-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-// See the License for the specific language governing permissions and +-// limitations under the License. +- +-#ifndef __STOUT_OS_POSIX_DIRENTSIZE_HPP__ +-#define __STOUT_OS_POSIX_DIRENTSIZE_HPP__ +- +-#include +-#include +- +- +-namespace os { +- +-inline size_t dirent_size(DIR* dir) +-{ +- // Calculate the size for a "directory entry". +- long name_max = fpathconf(dirfd(dir), _PC_NAME_MAX); +- +- // If we don't get a valid size, check NAME_MAX, but fall back on +- // 255 in the worst case ... Danger, Will Robinson! +- if (name_max == -1) { +- name_max = (NAME_MAX > 255) ? NAME_MAX : 255; +- } +- +- size_t name_end = (size_t) offsetof(dirent, d_name) + name_max + 1; +- +- size_t size = (name_end > sizeof(dirent) ? name_end : sizeof(dirent)); +- +- return size; +-} +- +-} // namespace os { +- +-#endif // __STOUT_OS_POSIX_DIRENTSIZE_HPP__ +diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/direntsize.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/direntsize.hpp +deleted file mode 100644 +index 7c8c7a06f478b3a80341a874494cff21f71fc397..0000000000000000000000000000000000000000 +--- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/windows/direntsize.hpp ++++ /dev/null +@@ -1,43 +0,0 @@ +-// Licensed under the Apache License, Version 2.0 (the "License"); +-// you may not use this file except in compliance with the License. +-// You may obtain a copy of the License at +-// +-// http://www.apache.org/licenses/LICENSE-2.0 +-// +-// Unless required by applicable law or agreed to in writing, software +-// distributed under the License is distributed on an "AS IS" BASIS, +-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-// See the License for the specific language governing permissions and +-// limitations under the License. +- +-#ifndef __STOUT_OS_WINDOWS_DIRENTSIZE_HPP__ +-#define __STOUT_OS_WINDOWS_DIRENTSIZE_HPP__ +- +-#include +- +-#include +- +- +-namespace os { +- +-inline size_t dirent_size(DIR* dir) +-{ +- // NOTE: Size calculation logic here is much simpler than on POSIX because +- // our implementation of `dirent` is constant-sized. In particular, on POSIX, +- // we usually have to calculate the maximum name size for a path before we +- // can alloc a correctly-size `dirent`, but on Windows, `dirent.d_name` is +- // always `MAX_PATH` bytes in size. +- // +- // This follows closely from the Windows standard API data structures for +- // manipulating and querying directories. For example, the structures +- // `WIN32_FIND_DATA`[1] (which in many ways is the Windows equivalent of +- // `dirent`) has a field `cFileName` (which is much like `d_name`) that is +- // also `MAX_PATH` in size. +- // +- // [1] https://msdn.microsoft.com/en-us/library/windows/desktop/aa365740(v=vs.85).aspx +- return sizeof(dirent); +-} +- +-} // namespace os { +- +-#endif // __STOUT_OS_WINDOWS_DIRENTSIZE_HPP__ diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix index ec604e9918b..d2c1a2aeb07 100644 --- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix +++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { description = "An open-source RSS/Atom feed reader for text terminals"; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix b/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix index 4dbd0d5e854..93865eb1875 100644 --- a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix +++ b/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { description = "An open-source RSS/Atom feed reader for text terminals"; maintainers = with maintainers; [ lovek323 ]; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 8b467a868b5..b292dd8f68e 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libcommuni qtbase ]; - enableParallelBuild = true; + enableParallelBuilding = true; preConfigure = '' export QMAKEFEATURES=${libcommuni}/features diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix index 84845c764bc..0ff4d5a5f2a 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -4,123 +4,123 @@ # ruby generate_sources.rb 45.1.1 > sources.nix { - version = "45.2.0"; + version = "45.3.0"; sources = [ - { locale = "ar"; arch = "linux-i686"; sha512 = "fa7457cf48ca68f559b14b79acefe90f8d449e7dd7a32a97f728ef33b26e3f513064bf733eed77b12237902491852a66fce690b1cf1de049e2f09d27416d8786"; } - { locale = "ar"; arch = "linux-x86_64"; sha512 = "6b2bc528ef7401a5ca6d6c5e68eaf68386a706925a3087ed16b4a2560a449ccba52c8dacae39d9a761323cc46f934ca2ea3c07bc5ef49df07eff9760a8a0ed15"; } - { locale = "ast"; arch = "linux-i686"; sha512 = "2917644f88a775441634a8b2dc214e29a34eb0cc7ad88c423a5cc02f7603cf321392c7fc3c7ce97231835fd39d1d8e264d8a9fb084651ec722719d5110d83cbb"; } - { locale = "ast"; arch = "linux-x86_64"; sha512 = "d047bc41a3ee0a444c8e4870a986c0068a67deff043bf96a9ae6338247461f2b51ecf02348c4a5b5e2ae4f68f7bd665c64582f0afc45bd480588cc82cdebc1e5"; } - { locale = "be"; arch = "linux-i686"; sha512 = "830fce5b2361acef206876a43af60963ddd720ad4c49c30936b0231c94096c5f43fb9479679c0260846a28a315f359ee2cdcb66e1f2bce0d222f1495b1cf1f58"; } - { locale = "be"; arch = "linux-x86_64"; sha512 = "8ec67cd108abb51b86fb8cc528a6bd43628847e47e2a7e5ffe3bc971b6c89aa0c7cbce2ce0738a7316a54c4ab376502187ddf5be9d74db31985187b7e6ae3038"; } - { locale = "bg"; arch = "linux-i686"; sha512 = "d18965ad8f1456d688811e972b09e293cedaa98832b4d5898d62a80dc9cb4799d898a14ad968fc2f05c3e6dcf3fc480d21d1d8de63a4ea9c10b8081b28c321fa"; } - { locale = "bg"; arch = "linux-x86_64"; sha512 = "a7dcbe29dc4b28b3273693bec60f9ed66d1eb81899a049f7181271e84763f13817f97e07a9696ce803d151b382f3339f3b0d2b1bdfc5bc687c3f6198627e2fd3"; } - { locale = "bn-BD"; arch = "linux-i686"; sha512 = "3919ffd44cb501f5c8d273651e3bef27203270ae269e8682f2c749a32eb6a622a8106179cb9a493f7e62f255da62381ab497e2a590f84bd207a1bbabc039827d"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "8e4d026bf30a0fc69eb2c7982b3866a4745f506f5365677540e050cba81a569df1b367c42b9bcaf58ae20243a82a9e7d006c476a83ecc29b4b77f042f8aad5d1"; } - { locale = "br"; arch = "linux-i686"; sha512 = "cd00e42cce4a5efd18ba5b9a784dc93282c200a43796b826cc05eb4858d44775df827dafcda0c6468d17ea5f7f930590db1546b544fc19ad52d9d5e1cf7c522d"; } - { locale = "br"; arch = "linux-x86_64"; sha512 = "be84c92859014a055606588fd7e9c8d8c13fed8ca253ccaed560a2b457305b487cb2664df8af7416220349a85a4db15f7420674ab46c1ba8f8cdec03f0002d83"; } - { locale = "ca"; arch = "linux-i686"; sha512 = "2e678aec4efde29b659f1e4de071f7b5cf2fc56b28b362bfc7fc2a3ba8ceaaa53a3452cb9c2a565ea5bf83304be87fa18dd246d2207e5ba6f5ad16a0f008ffe7"; } - { locale = "ca"; arch = "linux-x86_64"; sha512 = "7bebca69abdf5510793e376693d82e626fbce49d01fc66d28bc53ad51ab70fd9432266e2cc1b0d83359fb2bfdd075daa181c66618f6094996355f6cc0920b239"; } - { locale = "cs"; arch = "linux-i686"; sha512 = "2f8d5faaa0952ad37e3777a2d15e2a1ac7aed1ed275faf909e479f56e4ee2e9f385aedf6b08cdb3abd9e0830949b6b6b1048e19ac489d0d0e881595b31816068"; } - { locale = "cs"; arch = "linux-x86_64"; sha512 = "01e807c22d90e07503b92e3821ddf91b509763d9c7b2ebc5e21ec9788333086de25508979422446a2e0469be611f890db682757ddebf15e549bb8714f40877d4"; } - { locale = "cy"; arch = "linux-i686"; sha512 = "e87718bbd286e1e2fcef8e114aa27b81a1917b37cba996c59ddc30d5300bf53a4e3662d3770f70362850d41e564887ba510f605412e57d8e6510f02e5a4d54d8"; } - { locale = "cy"; arch = "linux-x86_64"; sha512 = "f3287f4cec54f6814a678dfd9875952d5109716cd15d097ad5589fb2bbf75aabf2496cff6d320929c825b1a1e61d50f060b9d9fd7f7011078620995570dbe88a"; } - { locale = "da"; arch = "linux-i686"; sha512 = "6cc8e7c2c3aec96dc9639a8663915db2e86437b8b9a598570946b2dc63c9d261a257dcba3359762668683a67cf39d5448e0203eeeeb4da41f6d5df51c955da3d"; } - { locale = "da"; arch = "linux-x86_64"; sha512 = "bcba101b8438ff5a61ecb76f1328174aaaf7dccf5031a836cfcd8e597db8d0b120623e15a8c8231373732b6796015ed9fe212797bf0f664055d3be3755bf38d5"; } - { locale = "de"; arch = "linux-i686"; sha512 = "fffa1b9a61ef75ac077bf03f85abbb5a40131a9a35a49835ac40b424870b773a42f8fb534ba5757da7c0bf6781efe39dbe2942ddd436860efe5799170952dbed"; } - { locale = "de"; arch = "linux-x86_64"; sha512 = "db88539be38c0a62d9c56b5295af2bb67d342996c85e788a17fe2a74e974a8d196765343ca005207b8b1ebb8f76421640dc7cdf36c51e23a4bc03edfbdbfe73c"; } - { locale = "dsb"; arch = "linux-i686"; sha512 = "2191707e5c796eb5ef210798c3519004f5cfcc9be0f56a22c03eef52a34f04f011e556894dc932467c142c8ec876105cab628c947ded0e11d7a63733db83bdac"; } - { locale = "dsb"; arch = "linux-x86_64"; sha512 = "07a9bb323db8f626ff0614dd8cfbbb1f0c8d922aac4c7ce21770b79c40e79ca09c798903998d44c236cfaa76daaaa94814bff697d34aafa417533078405cef1f"; } - { locale = "el"; arch = "linux-i686"; sha512 = "4325888c1b2585d7f2bf9c999407dba260783570816b0edfadd90bdebe6d6db637f9aa9589f2b5824ab6e833c4527fa760e177ed866ce302fce85d9b9daa2608"; } - { locale = "el"; arch = "linux-x86_64"; sha512 = "bbb2971ba5c3ebda94312f740c54ef0b4b4b4f2311d4a017e272260945a9f063eb4d341857919da4107f2207f3265df9439aea78d636d9c357fd79a11239fd9e"; } - { locale = "en-GB"; arch = "linux-i686"; sha512 = "507f8f79718698b9599d52e7b5a4a9157c05ae1642622eff1b3547861532ece9727b3d56f67a20ca38df0f32375beec65ec3c7b1ba929799ddc057b4b95d1b8d"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "bbaceccac3ad841259058c738ef2baef780e96177b3b6a635fbc8a18de53137ec6831729b9f98bcb6b4442fe58b5dd71f526a9f0f3b86231a41bb0a48ea4c930"; } - { locale = "en-US"; arch = "linux-i686"; sha512 = "28b5d2699a65792457414d178bb3bc4d73abf911860ecbcf75bbcfae91b24a056fd67d6aa4d50e4b3003ef84c63750050e16e74c92b690fe9b24347de3ad54a7"; } - { locale = "en-US"; arch = "linux-x86_64"; sha512 = "08034ab8d833f7a2e63a7e40a56dfc78a2dd762e73d1a4b8fd0dd70ad23da5d525771846f47c8e7798517d1f85fef9bc2a8437af3d6ba71d7402a9f6a93d5679"; } - { locale = "es-AR"; arch = "linux-i686"; sha512 = "3f08fc47b03cf095bcfc0af78064fd7179006a4b3240292fbd109b2a4c58c55719328eed631a67ca7a3f0f68ac8d2fcc577596bf532ad95442fba728270ef28a"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "cfe7e9f8dd67fb52462f840048115e54e5f789a34b63c5d7ec592ccc3a2b25220a66fb7499a50f32539d61205fc46199c0167ad5a75ea46123b96070329a236d"; } - { locale = "es-ES"; arch = "linux-i686"; sha512 = "d2c4cc32d2ae7bfdde1870686675f644f4eb3f2bd0870fa72986f5cef2cc3c45b8070b6df3196e67275bc67c1ece63706f1fcae3b89d80fea8db5c34b9f4b638"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "6f4d295638ab8d16e1ec1db176d9a60946ee76cacb21c7e10018c2b908e5dad0527705d37b7050d11587244e922fa9e218482fcef40c3beab06c07db3dd8ccfb"; } - { locale = "et"; arch = "linux-i686"; sha512 = "e352de0fb13570e5fd39bae39ea7dfab746529e8617beb8cca51c0a6183614722f62f93e91065c74fbe24e0cd91c03428d76c6e70369a60a64957ebebd1052d7"; } - { locale = "et"; arch = "linux-x86_64"; sha512 = "583be1a8c7f1e2aac3242371ca8f34710510c6750b95f933e1574f9ba0e2a6ad733de4c9cc503909a063250d969aaaee6a53a69aae0c502274f5b0d43fc33b43"; } - { locale = "eu"; arch = "linux-i686"; sha512 = "9de8f87c48c65535c7b073ad90d9c1ad3b7f4932124529ffc1ece36175e5a139d4660efc4a850bd0034d885afc7d7889f137b10fb5972377a4ec97d6858c932f"; } - { locale = "eu"; arch = "linux-x86_64"; sha512 = "101beb0a0dc8f33a78583f9b15036815b030429d471ba0c8852dde7a2e2c91bb6436c8dd36f39e4eab1ecdb38cec08c7ab88f4649b5d25a246657d358984f7c2"; } - { locale = "fi"; arch = "linux-i686"; sha512 = "9670d209fabc23fed2dadb873335e3964b7107b67fbfda39e53fa28ff1d91fd617f73d041cd9d4d0b9dfbdc9e619f69ce05199f7afd383a4fd6717b9f912dee9"; } - { locale = "fi"; arch = "linux-x86_64"; sha512 = "3c2b135437a80047ec04e9995d119b32e948d105677bde0efe505272a0768d860e8b68dbe487bb81c38f9eee94a7bcc23c976a3dd614300056ec578bb5dbe7a1"; } - { locale = "fr"; arch = "linux-i686"; sha512 = "d14822f3ef67082a77488ee3f7b6e3294a01f12e48cf037fb2b41ab9c5e4af01f1b0a76b29673c9196f2caa16dade84183d69a6bbf1dd618e7742f9e1d903477"; } - { locale = "fr"; arch = "linux-x86_64"; sha512 = "e1fdb863309bcdf382c3533b15ff1c3e4e9ee6f4c0ea097790c432d302b4a0712d00b1f0851dbc4c4e9c3758f941eddffd82dd1d3912dc76afc20e05083b82ad"; } - { locale = "fy-NL"; arch = "linux-i686"; sha512 = "3881348184cdbac93b452e9f5c9ebbf14c542dff68cb500c82204dec42c3433e3b356f2d332c1fb5a4f6649e8bd5b03564bbd1f75bb25c2d946c72ba955c4b63"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "3182f39c26085bc882cb1a391c63f2ce58a8ffcffce4ae1ca9293a08e572d888691cb2968d93caee77576bc7568a0ad67f0ccb6815dfffadc9f8f798343c92b2"; } - { locale = "ga-IE"; arch = "linux-i686"; sha512 = "a653b578be20b8127de26e7c8ac90adc04024cd108e078b5a5e2e7634d834d76f9227341e52ab8b72fdc5f8c11787405eabc19403922c854f0d0fc7e9fcb0774"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "28dcbcefd11807482becc961244f58520498e0f9540f28c1e74d18f499cf5a209d51599783b8551ee937f228b406bd0605adef4146e29dccd8ccf2e5ef155a2c"; } - { locale = "gd"; arch = "linux-i686"; sha512 = "2b39ed0b1533cce97f4c4e5663ffef0fc88611334cceeaee0687ccc87e8c4b0f58afd9d826e7e9b66634b51249b776820cf03fc841e739ff3504eadc02597dd5"; } - { locale = "gd"; arch = "linux-x86_64"; sha512 = "525f632482577a3dcc2668495ad8c127bb8bc06412ef01ccf0188c1dbf735e73460cbabac439fc3dd80cf70519c45a439897ef91a1b32208d527e0b6487044f2"; } - { locale = "gl"; arch = "linux-i686"; sha512 = "232bbd56d92ce7648ba57a061d8154b38bc6068dbde32b9ef17199d3a8bb28e1b0b384859d99c526fa96fbb35405520675ab3b45adc90caf125ac813bc77b5bd"; } - { locale = "gl"; arch = "linux-x86_64"; sha512 = "5758ab0d5a6733395ba62601735193073fcee47ba7c3ab24d7031ce87447fb9018264bf3df1ab715ea786beb63a9d479e57217d56477d987021aa482c7b116a5"; } - { locale = "he"; arch = "linux-i686"; sha512 = "dc7cd600a93276995634303cff80d77724b56f0b7ff2fdfe8fe7da23d57d5f4f3d0e0169508c02c9ac57092da58d9ac9e3646f951ca4cb1fd398c70196fc6405"; } - { locale = "he"; arch = "linux-x86_64"; sha512 = "bdb385f4df861b1109169e1819860d46e8edf4d58588d4cdce609387117adeafe35e8bb17a0a2e43bcf12b1bb2244f089f3a1669cd69bb507434da202a1c7e15"; } - { locale = "hr"; arch = "linux-i686"; sha512 = "e7dc17107f762128bac6f0e173ceaec6a9e910dc84d486a0c9447365f1df07fcc1379dd2f05416aa904637836deac5a924f704396ab2af149676a6b1d075c52f"; } - { locale = "hr"; arch = "linux-x86_64"; sha512 = "74600954b56b03d4f2bcc71b32f6c8a19be483af16a7cd2b841fabea6eb042ded21afb1c196aa9bea97c81aae1732d7153e8419f97f439b44570ae53e53f88ea"; } - { locale = "hsb"; arch = "linux-i686"; sha512 = "d42d5b10480100a38d2fe275be060423593f54f9aa6cda13fdac96fca9a36590dd9bb8d1638cca935faedbd09bf2435c0a2858ae9c2ce653af7b2dd183f46f29"; } - { locale = "hsb"; arch = "linux-x86_64"; sha512 = "c41c5b57d7c170c54cd0817dbe21be8ba9e94b99fe28d7478ceb6545c6bf64a215d9ed6c66f99f116f43bb7b442ba6765613c15d14648ff64be3c0c5d7a6c763"; } - { locale = "hu"; arch = "linux-i686"; sha512 = "d2ee002d390bf44ecdadba86ece0d77bdb4ea96a69a79dac4064a4c3f3244c9aeed95df4a1101535fb02225e0305e1d7e97389d4419574ad98d9484237aaff84"; } - { locale = "hu"; arch = "linux-x86_64"; sha512 = "aca465875d8f3cb5815dd2de0546b7a822b55090c78f049d6d3a885f29c90fcbc437f0b7184e8249bb9c8dcc1ca4f146f1cf0067a751590df2d8c5fe4aeeea5d"; } - { locale = "hy-AM"; arch = "linux-i686"; sha512 = "567cba4a91dcc944e1922a429c8b328fc3b2843105056cef938a97c2ba73806f0fee2471b6fe6898856230c54ae0cb6110ebb249eaf9363a0beb35ed2aa0daba"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "34bf0a6638822fd1ea6c1a51e01d0d2f370202c61bb5a728abbeb2c1335c9130f3a4fbb7c26f9cb8025849aefde09eaf58567c7aedfd7d854d7313baeb8fd698"; } - { locale = "id"; arch = "linux-i686"; sha512 = "9dd1e0ba44787921fe8fce39f430575334e61948cbbd2e31923c67779c795dc0fc64cc0e46d62e3fa749a3d6cac12c3cb54c3f9e62e02930c1f4fd9a17fa50b2"; } - { locale = "id"; arch = "linux-x86_64"; sha512 = "78385b8276c5a9449d34a0233b40280437dacfc04a9d5d8291ae8603ee5b89337c5b53d4da80f41ca8c7153719654d6506027179c4a79575fd555d9dc8740d4f"; } - { locale = "is"; arch = "linux-i686"; sha512 = "02bc577e3d696735a280079fef84361d556a04c5d3f11f5af93f9ec5220ed729f237eb67120739192dfeedcb4570480bc40da9c413ca2b7f9023a5742cbb2e4a"; } - { locale = "is"; arch = "linux-x86_64"; sha512 = "5de6270e4dd79f402163fdd724fa0987563c1f474c54b555e84ebd94cdb865bd890de21e3dc44ace9dc2bcc70fb182b78752840b6860a6f0494fbfadf4f705c6"; } - { locale = "it"; arch = "linux-i686"; sha512 = "d81131a4322b0a069f3f914d394f8400b0d532aad4f1a0316288ed00df184798c5c61484cbb50a134e7b681a2f150bd04416147734f0d73731811349e537a2d3"; } - { locale = "it"; arch = "linux-x86_64"; sha512 = "7c9ce8e652dc994ee1155e4d1d3375ad093d8f684c422157a5c450edc3701151a1ca8036dda5f79781860ea1e138960266a7df77c16770418f4cb8327e2a2767"; } - { locale = "ja"; arch = "linux-i686"; sha512 = "6b96e8bba64fb004021838e41a36f13469eb48cb03659bceb12b897dd09fdc44f32d279e71e97b146a77fc0433cd85eb38449bf666355692a25f39eddc2775b8"; } - { locale = "ja"; arch = "linux-x86_64"; sha512 = "90c7f76fecc1c9eafbbd7f2f935a006266372d4192c2382c447b52a7993b650b6bb769d1f2f067540f038588b862a82ab4f1dc3b8a7c2a484fedaee55c82889e"; } - { locale = "ko"; arch = "linux-i686"; sha512 = "c2e509fd91664c9ae9d12ad4eebbc875b96c3b7124b88373fbbfb8ef3ec45b3525e8e9c6a295680c583b55564ee26855f2d607a661bfce9d9f57acdc4b90a3cb"; } - { locale = "ko"; arch = "linux-x86_64"; sha512 = "b5fb1e955dde624bdf52a58d5ffadf99cc7fb0a0e757d236c553675aca14fbc942d420a63c91f64e584486fda3e0ecc39c62dbba6b3a62910d01447d7cafd4fc"; } - { locale = "lt"; arch = "linux-i686"; sha512 = "a24deedd6a2ed118cbdb9fc66c17aeb5756d8bf3586a096164c0c1841e1bd7a4b6179cacff3f058bbc9bef40186acf3833a5b2e75aeca8ee525302953fd7ea58"; } - { locale = "lt"; arch = "linux-x86_64"; sha512 = "f4e0a5ec95a30f04a8ee84dd1f4f8bf7427255d382c0fc6a35f63a935edf54380dcd73bca5329ea01147e89c4d3faf30582412618e93a543643ee5922e9044b9"; } - { locale = "nb-NO"; arch = "linux-i686"; sha512 = "c10d7ce6f66d716c550f27ba793cd6239d98ef7fb1dc75605288f426bb2fb65357af95134c4c2241f0438ac90995f666a488a3a61e7696318180496bc29cc94f"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "a722d43addca22cfc791da37de60d5ab96e18d66fbb0d8b4b3de9f08202b01bec8c5b8300404df19689d154249d80b0f84a6e09335f607c74a7ee65f64daecee"; } - { locale = "nl"; arch = "linux-i686"; sha512 = "030da83ad81fcb1ce7188d8957fc0ea216372aa4e1fd6fd7d173ef5e329d95d8cd61d1ec9db3e28887d2f949056172644b0590e05815478abb42427d0ad5c06b"; } - { locale = "nl"; arch = "linux-x86_64"; sha512 = "6ea70e3fedc1cf1ea6f75ce9be7c8a7a6245e167f65baaabcdfd3194e70ca5474766e9ccd0d8180270b84c78697793a9af5b82a8f7a773c46b1af0a025382a99"; } - { locale = "nn-NO"; arch = "linux-i686"; sha512 = "354bb0c0447c8e7a54e8e8218f659f4810a6e2848f85c482cf289fe77518fce9c33bd817019bf089f254f71b141d65061c2a690190000c968badd939feaacec0"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "fa2484614a067461d8cc3c1fab8675f65b17fc6419c0fe1a8f15e98e8ffffea7297391ec8ec50ec8d2fe1cac4b348afe0b82f2db55584c46cbe2d62daf3a8e4b"; } - { locale = "pa-IN"; arch = "linux-i686"; sha512 = "045fa66125cc3c4fc4650bf4e5ea12aae1b26f2cc4191d6b464f41e5305f015611463b311f3bb55264d07b48edbbff606cb58f73d91b22b3bfaaf5de0b830121"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "696dad47dde2f2494f0410fb698b52ca87112e2c29310aea585b703f4633e404f533d37e6bbe09939aa6f575f426d0a4f2605ca5b95fccafc033569bfe258872"; } - { locale = "pl"; arch = "linux-i686"; sha512 = "1848c4c819fa0aebeeec75ac43f3bcf3fa332ba08b79c8296a17aadc7d0434d2b634280541c8d71a68390e3a892a88dd49a0ab4b25c3a2b4b5e7321132801ee9"; } - { locale = "pl"; arch = "linux-x86_64"; sha512 = "e9e0b937a165fd90e0639a01001c9b4ada645c9a1201b64ae6cbc1bbf885b5d0b89e195ca5732aaae66360dfc4f188ac8f1643bf12bdbfa029a348aa29a0f79a"; } - { locale = "pt-BR"; arch = "linux-i686"; sha512 = "4a69c26598d48d25d048288b6d1785dc8e4d89078eca3d300497a93d44639a8eaca0c32c1988abd831d33e0c32788e8ca6d07fdec9cd4ba7f451a23afbddc525"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "72d387d49ae5f4dd6406f63fd5c0003f99865079c9d63d7d3deaf15268437dba592642ee8bc759df85fb679da094078c1bdf9808de05bf5e35ac870a62b960e2"; } - { locale = "pt-PT"; arch = "linux-i686"; sha512 = "b3ff7eecd345f789bc4798e94402fe7cf7a0cbf27b03f3d8f92274f39764cfd38bd1e4ad5745f3d177645f2c5bea6cb4aa2f1110c90d524bc6b89916c00b2eb2"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "684849e41f77410c290688582488243fed9594c02ebdd85812a2c63e0cc410b470c14533d09184a83df43555b9ff1d775ed0f1ddbe24bb6890848ccce4e041f6"; } - { locale = "rm"; arch = "linux-i686"; sha512 = "02c4171d05c1f070cde474ad60edd7aded613ec1fd7bf51391fe4718554eed435282c44bf891703c356f5bfc0dd08093ef5bc7c979174d5b7fdab1529dde9dbe"; } - { locale = "rm"; arch = "linux-x86_64"; sha512 = "9ea31a30e8b5624c03c1627a6e2e1895a3ede5d35e1b9da0b16d6571c13af0e34cfcbe17f396638c8946b1f96037e9c833b3ed58ad46a9e0bf38ffc0e1dc8bba"; } - { locale = "ro"; arch = "linux-i686"; sha512 = "dc5b581971333067b25317b702a2e9f58484ae66f640ecda0f9d7c8323fbf8c9fb6ca47fb59c94494e641787f7e9b95c6a4cf3037bf2fc974cc394160359910e"; } - { locale = "ro"; arch = "linux-x86_64"; sha512 = "92ef0d86e46d8c80685e9bcd16331447e310147b87cdb45bf80ab2992b4ea11626cf5fbf860ee807d2d8d4e6c7c4fdd352de4c498a57c6951f66ebf72bd60aeb"; } - { locale = "ru"; arch = "linux-i686"; sha512 = "511f96bd7713ea798904216d466f362115922c1566d7214115df7665d9e152b9866bb66608f5426080251f55391ac92eb8ec8a0e76d9471563a0bd84fc8c4431"; } - { locale = "ru"; arch = "linux-x86_64"; sha512 = "57f6669ae5706a4673bb15b1eb06d89807a9a1a0fb59493b2380778efd8dd3f014d1e0a354c16e71207bf0121a561720caa1a71a846237044889916374b6a5d6"; } - { locale = "si"; arch = "linux-i686"; sha512 = "9eb41ae08570098f2cd9d099cec9d2a21490f5bbd7a5a9a422ae9c83b72fb50af2768ed7c33d0d174c3bd09b365107b1e726a57db8fd6bcf52dcc7430f8d22fe"; } - { locale = "si"; arch = "linux-x86_64"; sha512 = "03291a8e69b3b6ebb69e25627ed77fed3e7a008ae77f869b262983fb9334e61748a1028f6dd4e1aabf513b7f6cbaefef83c237107d88c1b177c31f34fff54e3f"; } - { locale = "sk"; arch = "linux-i686"; sha512 = "0152a947109f5257ec17889453cf650d1dcdd40825208053e65b70e8281579fce307d1f38e6d682d7a8d2f3da377c91ca1e249bc1d507c768d2f08292e5e6b90"; } - { locale = "sk"; arch = "linux-x86_64"; sha512 = "d2fdb7585af8a1507362b44b9383acc611668cc4aeb912d98424a49543cefb9a58f95aaa77c1b36a1082fd1334f60df939900e1673e32d3af764ca5ce746d144"; } - { locale = "sl"; arch = "linux-i686"; sha512 = "c2cedc7a07a27f439e5833ca9a1214d0e75b2154ff879fa39b06ab6baa05d13feac227b51d1126d70ef907942db1dcaf1e7c987128f752d0dc1d147266cf520f"; } - { locale = "sl"; arch = "linux-x86_64"; sha512 = "07aa88c7d281e247e9c30f9ae3b8329132d4a145e8a8b0f88b544995d39f58d196fb6ce6a5604954129222a848ce49aa07a0bf6f1ab3a4b1fd29e61f51c7664f"; } - { locale = "sq"; arch = "linux-i686"; sha512 = "e2afd03139f475ae68206cc1f35780261abd7646babd7f05c255acbcdbb712f11ea0b7b68887d0fc05e8bcded3a166cea490c86b2936be7d400c919efbb221cd"; } - { locale = "sq"; arch = "linux-x86_64"; sha512 = "7b91f7c6cdeda2735dbe7befcdec777a6d22c1aa278d4a1caa8cb15441841b4edb7599e8d4d4fbc1d198cc6178625ad4a29455e7195ab563e9bd3ac4faa1104c"; } - { locale = "sr"; arch = "linux-i686"; sha512 = "6b92ea68fde0ede23bdd7998a81d9924e35b8cb77cc396636fb91495cafe039c32efa272f8c3693fa4ec582eb04bc0db6d22991e3056d22188e0eb8c64bf352b"; } - { locale = "sr"; arch = "linux-x86_64"; sha512 = "3ca3f049f677f9283d9af660d2989f5c05ed418bb904e7695e456f73d9615da106e0f0db2c3a371109c77fd7348eef5a94d8061b3a0ad508d193e1234839f954"; } - { locale = "sv-SE"; arch = "linux-i686"; sha512 = "95bbcfaade0c12d87c8b591e3d9d6205e1056741e9eb526cc505687e2ee43fbdb96ff0b411c63b58c6fdd57260180a94d343155163518843a843f5f3b086b25b"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "15d0bfb22e6f0d3425737dd05dedc5af7e1f98744fb0d943cd88ad6125083bc86bbfb700d71839a090f9b54642cc1b0ebb8fbd205d46316f83cab75bd5442ec9"; } - { locale = "ta-LK"; arch = "linux-i686"; sha512 = "89b3a7997d3cc3a8372ee49df3dee21e535403d08a2aa742a1416c1e7c41c63fa56fe50fe133f588f3a34db180c4505f05034e99e078c0b19e1eef6f48e3d7fb"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "00c20fc4c27005e13cda53c5332bf874267e4bda6894480e599557e5e90a334b648a47ce28fff6353060d9a6fb4e547e632e2deb1513175023c1bf6d453a9583"; } - { locale = "tr"; arch = "linux-i686"; sha512 = "1b791b57b9d8c3da228293c83fa02fc1a24a0b6b8a6efaecbfef42962f2390fb448d2fb08e5a812df8efcf135f9cecb98cba3b2b174e59b43575236ba5fb2f76"; } - { locale = "tr"; arch = "linux-x86_64"; sha512 = "7040da3720ce3b0dad6e2863b48e025c32206c8a0d6cdae4e4fb13b7b6754796e9e1b83a09280303a83c97ddaf391c10a56aa8edfe1e7eca60534a6e1d4006d3"; } - { locale = "uk"; arch = "linux-i686"; sha512 = "54412cf33dab4be4553d267cad386d47ca38726e8643de10b8509828ba6c25f2c35e151165d3d999c22724ba57028b740f9b5e5f9a05aa773779759ffe6ced78"; } - { locale = "uk"; arch = "linux-x86_64"; sha512 = "3725c3c9c7ee8140b2c9ae3ad928e933afbfaab60ec27b8f1a8c56a87553c0123031d50d27c794407b6971b347b8f379c1c92ddff00db960bb635fb0cd945ebf"; } - { locale = "vi"; arch = "linux-i686"; sha512 = "92edb5e4789d1e1a63d5f69f99a06ae474d85949771c07ef572ce5ae66a125d5c04ea207b51fcb4ee2d1f00052f53ee8415d109cb06e53c55e9436f37e375d3f"; } - { locale = "vi"; arch = "linux-x86_64"; sha512 = "e786670f4033857873e5238118b23a86638b190db51d70ac55662718126621580bffd705803638bf71556caa397f3420efaa08e83e06abb4c2e2dbdd22f111af"; } - { locale = "zh-CN"; arch = "linux-i686"; sha512 = "9af79559703b8734df11c2773ccd7f77a88d9dc5ebf2df1bac14fdef4ad0f45c840102e5bb86f6172ad6e7d225af8a1723d4de84b877fb2574fd1a729213ea08"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "4d63dc15450d9297d4f161c72eded27d6176bc755f657012821cd9d9e989597c296f985e12af39d7a1b37dd5cf442fdbf9d2e1f7e6f11ba841ed87ea279d813b"; } - { locale = "zh-TW"; arch = "linux-i686"; sha512 = "7bca2ef8b1e597346c0450870fcd0058fac18b3f3607c6280774db97d594e98928bf291ee22146d70f2de40437e38088b9a8af71b0b076b9bbf2049067bfc448"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "64ee5cf56a48159c1a2aee2c8dc9118ce9187c5c68a9a1393e2c28a35786fd42042b13d48d30ececf1893973ccab92c0a8b23cbaec340a5150cc1a994236c6cc"; } + { locale = "ar"; arch = "linux-i686"; sha512 = "a2d1728cec3775a3a012ada32a8934fa1a94ff0af315e395e765c94873593c4e2ddb1ec5acee33a83f2970137087ff1fd6ba23b0bbea3780e4f67a3b46146911"; } + { locale = "ar"; arch = "linux-x86_64"; sha512 = "d29362ecf4abe3cb7224058ffb421feafe5ddb277ad8cae407907c0939028e7e03079ec3b6a691cf260ea29908be7df4377dbc626704da622548056f45b6e9d7"; } + { locale = "ast"; arch = "linux-i686"; sha512 = "51fb3626875acbf78f0d2337feee07aeaca24dec59042a2b6374afb205dce099df477ab3384e0e9c545fe68ac13af921a8d3a1c4c93f721d7831f3aca15e4783"; } + { locale = "ast"; arch = "linux-x86_64"; sha512 = "660376e67491f11d484ff112b8b8d1dc9187a7bb7f7ff1e8665d3693e5eee9737bff8f23f69f4d71b2d3f3be0ad4d816febb4894bb17ac911e19ef18411fc667"; } + { locale = "be"; arch = "linux-i686"; sha512 = "be5fed683ee9b325f135e65fc6f641d81b7294f3d13f411b36b4e73d68a8b8592d0c93fa6ad55fc9aa8a281a5d2069f3f8dcf029038d867f3b87baf8e4a93411"; } + { locale = "be"; arch = "linux-x86_64"; sha512 = "4b92f1999478d9a97737b31f34ca78bcbf6d657297b0ef791327c73d89a1737a29df9eaca47aed3e0f1ddf0d4925ba6c0a51584ca8009237ea98fec9007e69b9"; } + { locale = "bg"; arch = "linux-i686"; sha512 = "76d2450774254052ee216644f53025ffd4a928932955d856e16141a95b557fc327b17f01d4c47ff3b7f8a8c267a6a78511c126980554bf64f5fa5c06eba758fe"; } + { locale = "bg"; arch = "linux-x86_64"; sha512 = "53f2463e8838e6dc53fd1212745f401dbbffec484036745114f04e90e2270421efb0e579724023f1a153e2fbf5afb9e31b383b9d0a8e74ec15cdd17aff04b58c"; } + { locale = "bn-BD"; arch = "linux-i686"; sha512 = "c798161824be7fd3253308b3157c0dfb5dbec085f2b530fa4a7cd8992b8e602031c0c8f6959449a3a7f988f10b00b1f99f331b017c8d38358a017e54c2ff5166"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "8f8fafa9a79696a81e2e4a7e033edec1e37c44fc6b4a5a20cea0853f88ac978fa536109a81f5fe7baf574af6e1778975b8df5e0a47a0c6cb8161dd19f3e2c067"; } + { locale = "br"; arch = "linux-i686"; sha512 = "9007da613fd8930e669da228197d5be59d53a26f94453523ae468a0b4172adb4509e5ae1677ca21421031238910d19f45323fb09ef52ac95205f1fa3a1d8ce46"; } + { locale = "br"; arch = "linux-x86_64"; sha512 = "57cead8865a052981729f55f85f402329dd4151cf3f89ad5c6cc1a83a068a9ba1e309db521ecde1cf90a3737b04a7d992087a68b93506ce0ab4a7ea26253b761"; } + { locale = "ca"; arch = "linux-i686"; sha512 = "5401395d2e57ada9b62fd1d8a90006e60884a38086fe74bc720109d1fd8d989292bcb2781c1b30f19fbfcb867bf157bf33c3948463ab1e0fd8ddbfbc790b492d"; } + { locale = "ca"; arch = "linux-x86_64"; sha512 = "1d69ddc33643c7227d80cbb61087a73ff46c79e1531479531201b4e49a53400fc576f445306dad20b318f189e8b739179390f9ca7fd340e2d2cac46650569da6"; } + { locale = "cs"; arch = "linux-i686"; sha512 = "25a9c864e60aced998c1599786a9cb3db92c02b9d855c7500fd466cd92f4bc8ff6fc7c5cb37c52b3dbba990ae4ce0eee1854f4f3459b4c2ce50e4e4ccd3ff445"; } + { locale = "cs"; arch = "linux-x86_64"; sha512 = "0b1b72a4f43192afa03fcf17e234fa6d09ab20cccadc0a58682b37c96a576c31d2e5022d3d778992c188b826816d7d36e56fbf4055a0be2213e45062a162939d"; } + { locale = "cy"; arch = "linux-i686"; sha512 = "b69312902ede9687c804a068f9fcf70c0c3c68786d92c72a5b38ed38e9773382223e5d09a2067632b02ae9e2f224c85e0c95de9ada535e0b8e37ce5f6aa86006"; } + { locale = "cy"; arch = "linux-x86_64"; sha512 = "bd03a664a14c2b7271db1ae66f65fada02eb995da9d8466f345d25b40bbd7f836e48e9e8f19276f7109e5e42effc3be70d0c20705d386620319c6e2c920027c4"; } + { locale = "da"; arch = "linux-i686"; sha512 = "2fce874759494b51d9f9081f26985834527984cec849f1f07ebd0f3b7523bdeb7a39cae6d17f021e82972f392ae7cc33d6b81606f81afc7bc35a75698889905d"; } + { locale = "da"; arch = "linux-x86_64"; sha512 = "c7fd6b68f50c2ea4abb2d72dfb804db0e5ff3a8dd932f36fb7e9f194f4a12469bf64785ba18ad6f989b5456e6a0387c17fcf421075341998dce315f658b70058"; } + { locale = "de"; arch = "linux-i686"; sha512 = "8661fd16bcb94fba14156ea0d569364b495dd470359491b482f6e9c957a6ffd1c9b3a60728d6a0755a1789d6c3029952bead677df38d3f7e972469cd877d96a2"; } + { locale = "de"; arch = "linux-x86_64"; sha512 = "c98b8afbd38e3ea31196a2dfdd3e8a13639aed9a3052a25dbcf851139a75167481b67c94542be310c5a2fd8850c8396ff2fbb57ac14b0158c87b6e30562d1eb6"; } + { locale = "dsb"; arch = "linux-i686"; sha512 = "2e5f781f0ea57f4cc129693d5085d17047ecdde3273a97b83717e793bef2693ddd543078c667635e2603e5a4867fdee60cecf0fe47170f84d31456c72f4753a1"; } + { locale = "dsb"; arch = "linux-x86_64"; sha512 = "fcaad0f6ea4f9610bbfb5efd414005ab1b62d13799e2f0ff0188c0e262910c881f0e7ca838c6d18df0bc629eb26e4dc34e48635fb64029f484c0fe3aec12cef0"; } + { locale = "el"; arch = "linux-i686"; sha512 = "d71b2805881cf5b7f0c06e398289907f224bbb58ffe676c32587f98cdfa6d80b1a8497bf4d1d515a4b1ba8472f5250dc7df178a0fd47baf51746409c18157d69"; } + { locale = "el"; arch = "linux-x86_64"; sha512 = "89309f36b503f1be5a23f24def962a7ed6604369fc1e3a254deaf3fca6b020837813e7b3a5896320620301eb14025c604121c4b6727f1362d6783da6256be039"; } + { locale = "en-GB"; arch = "linux-i686"; sha512 = "233fb74c88ff43fc5520fef6fc052019551405ed43e786448c9b7921fb620b81b8b1569dbd3c57b7e8a0aa34043b29fa388100ab0ad66545bb84675de43d4b9b"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "70dddef3561b53d359ed59205dd77d661f6842a7ac4a62d79f2f2576a7d2b9a8735ae7e48759b669bade841dd7329857d4c273fd6e202f1ae22201b7d461def3"; } + { locale = "en-US"; arch = "linux-i686"; sha512 = "bf1f75d614dc0e401981b81d84911f2e13a1c8fc668b8a7c531963162ac293f72d6252aceb4447c97c57cc3b632452de6475f294f82090751141c3f8f681b868"; } + { locale = "en-US"; arch = "linux-x86_64"; sha512 = "5b7ba243783d5bd3eb1acc6cad872b5f2885cf289d33274932ceee2159295c84230f692a1338fc4c4c3e1947436917251ed54a6995922b4777bdee7e5303ec29"; } + { locale = "es-AR"; arch = "linux-i686"; sha512 = "9fddac56cc41a0b83c794ad7b7744573a6039c736d785a46666fb5c40360aae0397d129e523a7ac8b7e9b07295b56741e96e8cea770533c7c3611c209f9ae5ad"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "f7d7a051bc7411d2811aa5672da7aff51ee96065eb26e47e9eda721c0e125a529353a6290195cc257f36e44dbca6d81dff1342478a52b0d700f7def335135440"; } + { locale = "es-ES"; arch = "linux-i686"; sha512 = "b0b32a37d13b76899037c7d34e2444cb45d54166516c6f6f141ae4713e5cca36827c0c02f4d9614a1c7eb5d9d859087586dda3e311d221f19091414557f9b713"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "918affe04e2dbf1f8d2f65a8a16cb30d575631d323eeb5cd29e76f2b30d003337e35792e57f78ca6bf8abd253f005296b44b71ecd4c48d055456b8820a2b8551"; } + { locale = "et"; arch = "linux-i686"; sha512 = "7a2aaa9e81fa166ad66ef6a275ea1e1b1f333946e73bd22c7954b78641949a870e8c4ff38f763ef22bbf25cf81ad0138e5d4b154b1d2cb90126ef53e56b6e676"; } + { locale = "et"; arch = "linux-x86_64"; sha512 = "cfb751a0d94cbc3e130abe78dceb81117750b16c9665860a083a71554ce96e9102fa3c8b084c7acf07c9e10a8fe30e54e5964a214486c2bd16d93678a4b6948d"; } + { locale = "eu"; arch = "linux-i686"; sha512 = "c99dd3738739f06963cf3e31d72831d8861c898ac512b0563f0d9ab21e671fed55c0e16e07ff87e058873095204a81f1756d77453e792bcc522c81d6ac26638c"; } + { locale = "eu"; arch = "linux-x86_64"; sha512 = "4726d30ed22d79edca4d3a6082ecf40cb107b28aeebcc1ed21faca951cd955fca524d4c16f4e9ac71fd57651c2392d79c5adcafea9a7dadbe84dc3e3511f47f4"; } + { locale = "fi"; arch = "linux-i686"; sha512 = "3fe4ae74f046a0fcf95570ff7cd00abfa63567153bbabd036ecd8cccf1aab075b19e43642e247c741165d3990f1690d4c7f4b3eb16aaa34188d1bd17c202e06d"; } + { locale = "fi"; arch = "linux-x86_64"; sha512 = "5e76a85eb66d62c2fcd42d0274e43c052131bd2a8d54bce256e417782d1b97985cc9a917fba18ab1118e72fd3bacb94abdf5620c1be9a7225f6c9b62f1eb0e02"; } + { locale = "fr"; arch = "linux-i686"; sha512 = "216e084442018d1e5925d4deb14c11bda248d5015696b22167693f2534dd98049dd385bc3061348085113487b93cfea675cb7ea528ca4385022b33860b39633a"; } + { locale = "fr"; arch = "linux-x86_64"; sha512 = "6fbb2935899d94b3f56b27c131e2574f6735fba4147430a1dd5cd8728db29b90fd1416bc3661b1a3a927f496e9d716ae165ed8c65951184c2b1e07c962f876df"; } + { locale = "fy-NL"; arch = "linux-i686"; sha512 = "f752dbe8d2e90c0b5e60faa0b34280050463ea1bdda0749c9d46a46f08339e5952eacf70f0765144677362c9dad51c24a3bdffeb89e309563e472484f436993f"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "302d8bf3941e0dff52918202f7f885dcb14ae9504baf52686a5c9201a644d469c57925181074ac0789d437d9bd8bfa965ae2ccbd54f51dbe2bc352b29d4a1e9c"; } + { locale = "ga-IE"; arch = "linux-i686"; sha512 = "be52801d6995cd377d451a640e319c2b812d83d62cbb2c3bf7063a18f03838f9b758add09875aa9e4e973b3ce3ac285f6f3486a7495590acf5672ccb900e5528"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "a475b35c3fbd9fee3e4fd1475b9d3138d58df296744660dd8cc1932f121bbe9b1a2324c6452a4159b5c97a3846f38e92b9214a512d739a897cffeb40805cc0c7"; } + { locale = "gd"; arch = "linux-i686"; sha512 = "88e209d87e38dd950b1248351d6b0518f63dd27423d2f30df1b177740dda4fb3568e19361b066ddd758fe071a7f2c747f8ff9307d6745b9d68002bb34be5dc77"; } + { locale = "gd"; arch = "linux-x86_64"; sha512 = "a56c26c2393323a8ec9190a89b3c1a4a27de9086222791e6cc84de0f640e2700274b92ffda0a21aa1de39684443108499122a12fbf5ceec3df69301132cf3463"; } + { locale = "gl"; arch = "linux-i686"; sha512 = "bc180ce7132641596151a1b6516b6ab9aa6070c542fbe90be7e440580c8f7a488348ba238922e33c8aea10505814604d5f5568d03978bcc75db536a31f66c4ce"; } + { locale = "gl"; arch = "linux-x86_64"; sha512 = "92bba67974146f832d91c6d023b60a7d4dd3f0391f4df9744379035bbf6fe2ca43d8eb81e05184658da34d5519b310f06fe4429287874ba618d3720931ef89a6"; } + { locale = "he"; arch = "linux-i686"; sha512 = "37da8123306823963ac02c9756d5ce3e76207ee0a1652fdad42cf2c8467062f1369c8f6640625fdc049e2c024d6ed71cb3c9c669d18e1d737246d510102d1d89"; } + { locale = "he"; arch = "linux-x86_64"; sha512 = "62bb1f1735c13ac7adef4ce922eff64aba486bb2274691b8c3df12c4d87c30660dd2054e6fa314f56a690a0a8bf3533237d0d4bce89f83cc7a955e8de3f9fc43"; } + { locale = "hr"; arch = "linux-i686"; sha512 = "b36128139442da20bdda63bf325a12e6f7467fe8f1baf8a56a3b0c55c8cce45f8c5a629b25a97b12c86e10fc12cddc2edd9aeea651bb9026427c6486270d80a2"; } + { locale = "hr"; arch = "linux-x86_64"; sha512 = "ec3c826ed484ced10b417320d50f3c0c9b955b71eb656b2469c7a3268d712579901cba904a789f5f6a2fab6d7707401ff1ea0e112a575091c4196d7bd178387d"; } + { locale = "hsb"; arch = "linux-i686"; sha512 = "274b913c0a5c293b45c622c360380560c62b19772c0d5616d46040b6330cc5c330177084f743f2edc2624c88bcafda748fcd3beae606adf7eafbc4711845517e"; } + { locale = "hsb"; arch = "linux-x86_64"; sha512 = "5af289d7d57645959c0b1f1437239e8ed989720c586b6dff7734bd675258f6876b467b2e4a29686ac0f703685e41204b702df758ea25410271ecad9d9beee203"; } + { locale = "hu"; arch = "linux-i686"; sha512 = "fff9201e818d17b8ed453d272c5095625edac664555fc028efa9f08d23ad151d5aa22e3ddd9ee0eae9d0dfdfac27ca882107f12aa023741bcbd20be61e11c457"; } + { locale = "hu"; arch = "linux-x86_64"; sha512 = "cbe561fbd504b14c59e5db745dcbf83edbb5bf1813f86888419d0dc5cab43bc700f96782c36d1bc8c8732311758209faee5d9755e872e626c0a6012e5be6e441"; } + { locale = "hy-AM"; arch = "linux-i686"; sha512 = "954e697b2400b93fc575c7336a613d3d63702e80a12617a9c86b08e294bf4dad54c2cae4669525e88ecb55a0c029bab028105659a12656f03ce2ba0f0a7e71b1"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "9e27956960fb2154e8c4b895123ceb0cbc8538f3f4563e2888db2d056605de0612a629c66f3db9a9acc3db7032ef39b553a9791a11489e89b6485c00f0e1b903"; } + { locale = "id"; arch = "linux-i686"; sha512 = "bdedb03a25ec664c0443fa4e1e0d5dfa84ac5644e2a5dcefc67a714b71c2d18d9a38962e7ca2661f4d0d4d518d3e4eab51fb499efc32825a0446387cd22ed34e"; } + { locale = "id"; arch = "linux-x86_64"; sha512 = "2c18f2b919a64f540e5a1e59a430d1c710959711757e06fb38a12b67f0ff139ddde822ef7cdf5836a32d3bf904e56fb56e9d8d97f9d49cf35b67650be54e131c"; } + { locale = "is"; arch = "linux-i686"; sha512 = "73e866f713fc38ab7e56b97c985db69d49bdea2007c84e2ba54638f07433fc37a1a65a1189dd2b847394811e57ba8c767e20756686ec7fc86dcc3248168b110d"; } + { locale = "is"; arch = "linux-x86_64"; sha512 = "031c069a6c6dd79f21594dcd64801c9f11bf4e41ba8efd3b17020fdebae585ea746910c0186a5dcfb5a073ff33807d8324932e5ef3c2e04b5d35e24a714f2cd2"; } + { locale = "it"; arch = "linux-i686"; sha512 = "86bf4650fabfb9716d228e8449792b620a0692e3f5c6af19398cb37b1079cdf79f42795e16cd13c6ed261c1a81b7b3a23ba305299d03bcf1d716ee0ccade903d"; } + { locale = "it"; arch = "linux-x86_64"; sha512 = "5225af86242544e4fdc176fa68463c9ab03e4066ae57266f112aec179f7085b7621df7e46e34302bc3e3e30dc713eb45af568b86bfb1a4fa6b01f50fe677b5b2"; } + { locale = "ja"; arch = "linux-i686"; sha512 = "401e4c7b9831f2a3342764b6a2de732c89fe5687ff1e611c4ba1b630f22936c0343b3ef5ec444925ccc68c8ad45cd98d67ca502c32094adb567bfa64481e82c0"; } + { locale = "ja"; arch = "linux-x86_64"; sha512 = "7962eaef19bc5bdcf5f3aa9dad6df110ffed9b247d13dd61f3c4c170e4c854985d061847b84058bac35c16391821bdbbf5ed05120687cfc75c4baeba2de6f5ee"; } + { locale = "ko"; arch = "linux-i686"; sha512 = "d09e2083db577b308a65d1600bf15cbc6cae7b5137c66782d922a28588803a58348f87df5b9cb2cf9ca00713d542d441c5947475b551c8d5d929dc6293c00a48"; } + { locale = "ko"; arch = "linux-x86_64"; sha512 = "b8689c851b176ec82b73566bffecff54c0e6c85efcae7deb9dd542360fd7a0f8a6f8e53c193060dc36a98203ad7024a0c1d408ac2348f59fd9f3cbd591a17e5e"; } + { locale = "lt"; arch = "linux-i686"; sha512 = "8d5bd77d3d5d1b6168b65458bbb4f2409c447cfb6d019fcf7f8d81b3d4d486203533d3acb8a59257e664296636ee5b192b237ebf070b37a729926ff11bd81090"; } + { locale = "lt"; arch = "linux-x86_64"; sha512 = "7314e8138a913c7610227cbbf71d535f85bf008e09610d742d996be391ff4be0e9dd4daed8fa3ccf1e1556e5c66982e3f2cea0d34d76d78588fe9926420af75f"; } + { locale = "nb-NO"; arch = "linux-i686"; sha512 = "6b1cbcd9888b400ebcb4eccd416e12d09f29431a4afa3b890b05721d1c4108c35549c2f70800ca386f3b21c66b42be3d00a730d4fd2a4ba9c62069c92ab726f7"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "27f278b9f54b563f0aa907448eba04b4f84c9ab33eadb4737a662058e904e68baa481625c0303764ac7416cf5cad7bcf94a651db981fbcf94ab8e93625555415"; } + { locale = "nl"; arch = "linux-i686"; sha512 = "d932296e6cc61c634ab09a66328335e0c6049e9d6ca660a862dce3cbe8cc0900fb3bdc0956b82c9f70f18f5c68c1f37acacdd7a3b8a697acd24df1197683aea3"; } + { locale = "nl"; arch = "linux-x86_64"; sha512 = "010e833b541b1a9ef20d10a1678b7b25cf2a9268cfc6b6f0f1c1e5b1803bfdc4cd214b9e3a86132f1335531f107773dfe01f9f4dcd996262dc2c3ece491b36a4"; } + { locale = "nn-NO"; arch = "linux-i686"; sha512 = "b2ed20a973248031fb63b5652f6eea2c572c1fc2d8dc780db4cfa6a0450ccc211effc1d79ac67718b444f0247f8659d134586a0abe829df4090f65b1cdb59d93"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "5924aaeeb828464552b0de572ce24cbb94558aa30d599cb518d7dae74e6974d7da9ac5035c5bb2195fe826a8197907c29f02f5f0e83e36c84bb023b208fb56c7"; } + { locale = "pa-IN"; arch = "linux-i686"; sha512 = "6ac911f182c6c9b7e2617118efb76285136f0320d99f49401e5732841ffd846770bdd7ec98a200922536cfbd855debd037bdbe279b0f43e644d6e107afd73e68"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "e16db609e60e4c79336e31d267af552124b2d2b62fac0066e0a84a6e48f082a46699010a9f2540df30ff5c1d4f8d481c4cfc4caea4acc68f50ab83f996105209"; } + { locale = "pl"; arch = "linux-i686"; sha512 = "90217da5f30de60aef9da734355d6b5e0a93526e0d8f91db6c21405e2666df12d1ae37acb94638966b1bff6e3de3713c5243b683e4d321b916125ef89af42c15"; } + { locale = "pl"; arch = "linux-x86_64"; sha512 = "b77b19d6c413a92ae3c0da43f989725b3d74fd9d7c1f343711ea73d5a10e4310f005a2d728fa708fcad3b281c5694964ab91966df00b2667a7a8ef616c3a86eb"; } + { locale = "pt-BR"; arch = "linux-i686"; sha512 = "d4ce84451941a9382d4fa6225b697e2bea2f72dcf76c72b779bd1e3d955803d7ad3bcbed47e9a7dafde72cd20bfa1e8616b691d275e1e390b2af415e0ea9610c"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "c3585047b7b5611e5925f873e3a996142e9b73b5f5389729f3b609f3554030d39a988183f15aa2a5d07036fecc147cdd0abc02b13601a0e02e794c40cada5b40"; } + { locale = "pt-PT"; arch = "linux-i686"; sha512 = "e28dce49f6660bea1f56f2515ae539701cc160956318305464ea6b8cf1cf6be21fa8b97b30b234eec9f7e5bc3987ed939b5eca50174ab148a988706f00a2ef0f"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "81a225e7d4f56b0c231d690b4da3f819a1549e8f5194cd6dd2da23d7909c24d9f5f9262e6bec5eee8701ce510980426c7d2612149c4c88da68f910cb7b046d1e"; } + { locale = "rm"; arch = "linux-i686"; sha512 = "c4c724f0be3d6a1ada175ec87f840b177ab2a074d5ec858a49732ca7b5289a7d3b1e09b9d0e5c195e1e7565175cdef35e5b6e6e1a3344d7e307f9901e0ca1e6f"; } + { locale = "rm"; arch = "linux-x86_64"; sha512 = "8e55f3b680a7b7d4299e59360413a339a99569af8c3a890cb95437c76dfd903f5fc60b6abfb3820e4dbd7d637015ebf8600f351f858022b535709879c9b0608a"; } + { locale = "ro"; arch = "linux-i686"; sha512 = "cf91019d92850db3954690a403c13948f53d79574d874aa10effeac92d759d1b5e62cad9184f58c29b6e478903a4c6f4e27cc3e7e2457605332e361da5ab3ab4"; } + { locale = "ro"; arch = "linux-x86_64"; sha512 = "ed1106a9855752c951f232de0946665914051dda0e9ded0052b4ef10b7f8d19ce3994165eabeb8b2a1f04009fb7909a48c79c484451335ee24541ab3eee52f4c"; } + { locale = "ru"; arch = "linux-i686"; sha512 = "e3175d29cee4f253f7adf4f1d9b9826840e434d11d0c3f10fd9163f904ca315764b4943fb9d2c8a2324aedaac26047e95b6cf87c3218bc5b941e0b9a07e2b49f"; } + { locale = "ru"; arch = "linux-x86_64"; sha512 = "62c15a60e2d600068273695f00e4d37416cd7c1804bbc814a3e0b7c0de2a3f23a03b4d6fa5666f25971b7726bd0cde1fccb40cde1e95522704c14252d52384dd"; } + { locale = "si"; arch = "linux-i686"; sha512 = "a94106b78937fa105eb254044f5ba808edb17b7b0f9b2b56ad918a48566ed43e181b652f4b4feb37d81ed749a5ecd9bd6997cfe6fd1cd7fc001567d9a888f582"; } + { locale = "si"; arch = "linux-x86_64"; sha512 = "974c8349b19e34e9262a98b44c691354061a8f802c8ce47609251023eb91a97096cc107fbd653e9ef9536deb81259cead57b5bcebadb602af8fe51b7e1224fc6"; } + { locale = "sk"; arch = "linux-i686"; sha512 = "63fea9c688a89717b5626e407abf82e650916ede2f01189a54d33e4af366474b39383c2d64bde4bfdfdde3bfe767afb8677b1638b3b327c8a387d0dc00b1318e"; } + { locale = "sk"; arch = "linux-x86_64"; sha512 = "96684db63e28088ca0d1f6c3bc30b3075ee2f135900359060add36a34d539132655ec403847acd4d7823bf80d6fb5f7ce7a0c618031b64f6af725a8b3c4c5a22"; } + { locale = "sl"; arch = "linux-i686"; sha512 = "6279d3656f2b0a71e7082fd728bd2b551b16838263d7f83a32eebbb28e6d69df11be3f25db259a464428529ddf389f221048f445f0a0f34de1c263aca6fc48ae"; } + { locale = "sl"; arch = "linux-x86_64"; sha512 = "c69e0ae0d72229c59ca0fa68789c1bdab1ceff5159906ccb27766b854b677328cb1c305d5568c058b93c4e512fd5b7f7626531c5a6f1655519f0c07ecc02308f"; } + { locale = "sq"; arch = "linux-i686"; sha512 = "d63f84b4e5d8b9728e354487b243c3de604c571af39e43a7552cebdf28139271a8acab85bd1dfc6506e1231bb1ed49dc127f3b0400c9fdaeba2bf6c3ea78829d"; } + { locale = "sq"; arch = "linux-x86_64"; sha512 = "df10b39b6cc461c2418d8b297fed5f7ce34e31a0892737b99076b11095602f250b7018af109555a0ce7959695e00c56835786a9ca10573bfca07d1f21af7dedb"; } + { locale = "sr"; arch = "linux-i686"; sha512 = "57f710812a1f26212ad0cbc4a3506424d36d0560f5d7d17f8e01d7ed4836fb7a385753b17388b30074cd00985ce7edd7882cb5c326b89840cc816f0b5f1c19cd"; } + { locale = "sr"; arch = "linux-x86_64"; sha512 = "88a92d428e32b7c3f63fc898c1c3a448ef3b78afde1334d86dc4e68819f05cb8cba9816e875aaf36f52f1f04c42f9833d690c43dc5eedff3743416a76d33f38d"; } + { locale = "sv-SE"; arch = "linux-i686"; sha512 = "f86b0d7fd4f5875dee70ec00efe7f4c99a59d34e877b21288c89f9d5c83d04b31eeafe7dadc01ee5bd91a76363dace2da86e5bc219909fa06d47c5351931efc4"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "8994b908589746e5d8dc980b5dd06294988399be8e1ced10c6d4b3a6da440f69d6de7f101b9f96723fe55afdc21a7336c141058aa7fc70d283533e5fdd096b85"; } + { locale = "ta-LK"; arch = "linux-i686"; sha512 = "852a0132af6ed9d0c3da36025e0183b9c5bfc4a34af7870373989602059f05f6f5f779439c68ce577e6821295c2aa45135a2b90624b941c736089c391364e566"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "bf8332314c43a8f2709be4440e9eace27ce4ca097d0db7a25de99ac6447606fda297bdccd5d7bf865a964f5276f04371a022134c22962fa5743cc90f4e1a627e"; } + { locale = "tr"; arch = "linux-i686"; sha512 = "e46e71d28a9bf4eefe453ad3841bfdbc261594e2b29322bc2e5cc072957674e1121c246d3be3fb56c84f64692d048f6792be526dd600dc85d5b2d7f5d2aaeab4"; } + { locale = "tr"; arch = "linux-x86_64"; sha512 = "1c5d2d1f01129aa4456c166120ab21dd021e92bcd9ba9f4c1d2911699f856516bd9c9a5ae356397d117ae376fc5a44eb3b3880a2fe7e4f61a3b5bc581544f2b1"; } + { locale = "uk"; arch = "linux-i686"; sha512 = "7b3acee5c624600f908ec6ff7e664d2414a3fc48208bd54baf0cf209f66460e560137a52445805ccfb410913f2ab8ecee30f4a702fbe0c8bf758bf89411d06fe"; } + { locale = "uk"; arch = "linux-x86_64"; sha512 = "3b90f1a04c8922889182b81c88a071de2ff54f3524110739878e80738513216ba133ab973219eef822d7c1f605c1d2fa1b32fdbee2451e4c6427a27f9d25599a"; } + { locale = "vi"; arch = "linux-i686"; sha512 = "bd37a54a586e91b29c668a2995fc37ec5b2e6d0bab5af640575981aff2be91e97181f5f89e0c4720979fac38b19530c056562a2c4a07c3b9868b347ea5f7f831"; } + { locale = "vi"; arch = "linux-x86_64"; sha512 = "a571cfd9e0e43e9ebf5d29969a9af08c16c3fb44abad302207ee17018b105cb7079a0e3da02433264cddfc2da7922296c41f4d5ee76d722b07211c9cb78c8caa"; } + { locale = "zh-CN"; arch = "linux-i686"; sha512 = "6560d28c15ec9e46787d8eaa1fd9b20630828f15b2ebea98591e25123e5c51a90e12889ac2474467f9d1e3e41b88ae3cacc75ebb67391af0abbe18aaffa29a48"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "0ad5965f5028c7d0642cdbb140caabab24536e9bb386b6b14c59af52758e667a6217c7251445c462d3c283c72215a449545f06a1d176ad178a17ed51640715c3"; } + { locale = "zh-TW"; arch = "linux-i686"; sha512 = "a44dc60451845e27560ba41ff5a37446f955076e0da8cbf8ed9ffe06c217dee8847f57c6a58913581ccd4d4039b0f2b570b660882e68bd0e9050371cd1220022"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "17cbdb81577522510f7538d843755f09465700f558d164e6e292070859c9e298165e16c57e5c6db109be6b570666986fd506b60ce6b8ea6f983070c36c5b28c4"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index dc6d43fefb8..b03698f10fa 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -13,7 +13,7 @@ enableOfficialBranding ? false }: -let version = "45.2.0"; in +let version = "45.3.0"; in let verName = "${version}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz"; - sha256 = "1h1p14zswrg71qvzshwvw03mhicwwkfg29hvnj56cf41nb5qj8xx"; + sha512 = "1226b35535d68b9c088ab8692f61120c99951e1ecbae4739ced711665a3237d248202831831f00536c724e2f6359db4601fa5c90f2793433eab4bd9dab0c1165"; }; buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix index 33f6d50d8ad..5d69b1f29e7 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -1,33 +1,65 @@ { stdenv , fetchurl -, pkgconfig -, ncurses +, pkgconfig +, automake +, autoconf +, libtool +, ncurses +, readline +, which +, python ? null , mpi ? null }: stdenv.mkDerivation rec { - name = "neuron-7.4"; - buildInputs = [ stdenv pkgconfig ncurses mpi ]; + name = "neuron-${version}"; + version = "7.4"; + + nativeBuildInputs = [ which pkgconfig automake autoconf libtool ]; + buildInputs = [ ncurses readline python mpi ]; src = fetchurl { - url = "http://www.neuron.yale.edu/ftp/neuron/versions/v7.4/nrn-7.4.tar.gz"; + url = "http://www.neuron.yale.edu/ftp/neuron/versions/v${version}/nrn-${version}.tar.gz"; sha256 = "1rid8cmv5mca0vqkgwahm0prkwkbdvchgw2bdwvx4adkn8bbl0ql"; }; + patches = (stdenv.lib.optional (stdenv.isDarwin) [ ./neuron-carbon-disable.patch ]); enableParallelBuilding = true; - configureFlags = [ "--without-x" - "${if mpi != null then "--with-mpi" else "--without-mpi"}" ]; + ## neuron install by default everything under prefix/${host_arch}/* + ## override this to support nix standard file hierarchy + ## without issues: install everything under prefix/ + preConfigure = '' + ./build.sh + export prefix="''${prefix} --exec-prefix=''${out}" + ''; + + configureFlags = with stdenv.lib; + [ "--without-x" "--with-readline=${readline}" ] + ++ optionals (python != null) [ "--with-nrnpython=${python.interpreter}" ] + ++ (if mpi != null then ["--with-mpi" "--with-paranrn"] + else ["--without-mpi"]); + + + postInstall = stdenv.lib.optionals (python != null) [ '' + ## standardise python neuron install dir if any + if [[ -d $out/lib/python ]]; then + mkdir -p ''${out}/${python.sitePackages} + mv ''${out}/lib/python/* ''${out}/${python.sitePackages}/ + fi + '']; + + propagatedBuildInputs = [ readline ncurses which libtool ]; meta = with stdenv.lib; { description = "Simulation environment for empirically-based simulations of neurons and networks of neurons"; longDescription = "NEURON is a simulation environment for developing and exercising models of - neurons and networks of neurons. It is particularly well-suited to problems where - cable properties of cells play an important role, possibly including extracellular - potential close to the membrane), and where cell membrane properties are complex, - involving many ion-specific channels, ion accumulation, and second messengers"; + neurons and networks of neurons. It is particularly well-suited to problems where + cable properties of cells play an important role, possibly including extracellular + potential close to the membrane), and where cell membrane properties are complex, + involving many ion-specific channels, ion accumulation, and second messengers"; license = licenses.bsd3; homepage = http://www.neuron.yale.edu/neuron; diff --git a/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch b/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch new file mode 100644 index 00000000000..923bffb1c33 --- /dev/null +++ b/pkgs/applications/science/biology/neuron/neuron-carbon-disable.patch @@ -0,0 +1,21 @@ +--- nrn-7.4/src/mac/Makefile.am 2015-11-12 21:42:45.000000000 +0100 ++++ nrn-7.4.new/src/mac/Makefile.am 2016-08-24 17:43:39.000000000 +0200 +@@ -15,18 +15,8 @@ + host_cpu = @host_cpu@ + + if MAC_DARWIN +-carbon = @enable_carbon@ + bin_SCRIPTS = $(launch_scripts) + install: install-am +-if UniversalMacBinary +- $(CC) -arch ppc -o aoutppc -Dcpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon +- $(CC) -arch i386 -o aouti386 -Dcpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon +- lipo aouti386 aoutppc -create -output a.out +-else +- gcc -g -arch i386 -Dncpu="\"$(host_cpu)\"" -I. $(srcdir)/launch.c $(srcdir)/mac2uxarg.c -framework Carbon +- +-endif +- carbon=$(carbon) sh $(srcdir)/launch_inst.sh "$(host_cpu)" "$(DESTDIR)$(prefix)" "$(srcdir)" + for i in $(S) ; do \ + sed "s/^CPU.*/CPU=\"$(host_cpu)\"/" < $(DESTDIR)$(bindir)/$$i > temp; \ + mv temp $(DESTDIR)$(bindir)/$$i; \ diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index 9c09ea3db98..43c2ae141b7 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { for first-order and equational logic. Prover9 is a successor of the Otter Prover. This is the LADR command-line version. ''; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; maintainers = []; }; } diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix index adf87c4ee5b..0f6dc35fe0c 100644 --- a/pkgs/applications/science/math/yacas/default.nix +++ b/pkgs/applications/science/math/yacas/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = http://yacas.sourceforge.net/; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix index 40e7d2f1883..28df4f7fc31 100644 --- a/pkgs/applications/version-management/peru/default.nix +++ b/pkgs/applications/version-management/peru/default.nix @@ -1,24 +1,21 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ stdenv, fetchurl, python3Packages }: let - version = "0.2.3"; -in - -python3Packages.buildPythonApplication rec { - - # Do not prefix name with python specific version identifier. - namePrefix = ""; + pythonPackages = python3Packages; +in pythonPackages.buildPythonApplication rec { name = "peru-${version}"; + version = "1.0.1"; - src = fetchFromGitHub { - owner = "buildinspace"; - repo = "peru"; - rev = "${version}"; - sha256 = "04bnaly50qmzkj0shdag94n8vr3ggarlqdny5zdb8nh31fqgln8b"; + src = fetchurl { + url = "mirror://pypi/p/peru/${name}.tar.gz"; + sha256 = "d51771d4aa7e16119e46c39efd71b0a1a898607bf3fb7735fc688a64fc59cbf1"; }; - pythonPath = with python3Packages; [ pyyaml docopt ]; + propagatedBuildInputs = with pythonPackages; [ pyyaml docopt ]; + + # No tests in archive + doCheck = false; meta = { homepage = https://github.com/buildinspace/peru; diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index ed69f4a4220..5acced4ac07 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ eelco ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 84848d58753..927842916a1 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 4cdb2f7ec7d..e431501cf29 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman -, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy -, libaio, gnutls, nettle +{ stdenv, fetchurl, fetchpatch, python, zlib, pkgconfig, glib +, ncurses, perl, pixman, vde2, alsaLib, texinfo, libuuid, flex +, bison, lzo, snappy, libaio, gnutls, nettle , makeWrapper , attr, libcap, libcap_ng , CoreServices, Cocoa, rez, setfile @@ -15,7 +15,7 @@ with stdenv.lib; let - version = "2.6.0"; + version = "2.6.1"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2"; - sha256 = "1v1lhhd6m59hqgmiz100g779rjq70pik5v4b3g936ci73djlmb69"; + sha256 = "1l88iqk0swqccrnjwczgl9arqsvy77bis862zxajy7z3dqdzshj9"; }; buildInputs = @@ -45,7 +45,24 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ ./no-etc-install.patch ]; + patches = [ + ./no-etc-install.patch + (fetchpatch { + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=fff39a7ad09da07ef490de05c92c91f22f8002f2"; + name = "9pfs-forbid-illegal-path-names.patch"; + sha256 = "081j85p6m7s1cfh3aq1i2av2fsiarlri9gs939s0wvc6pdyb4b70"; + }) + (fetchpatch { + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=805b5d98c649d26fc44d2d7755a97f18e62b438a"; + name = "9pfs-forbid-.-and-..-in-file-names.patch"; + sha256 = "0km6knll492dx745gx37bi6dhmz08cmjiyf479ajkykp0aljii24"; + }) + (fetchpatch { + url = "http://git.qemu.org/?p=qemu.git;a=patch;h=56f101ecce0eafd09e2daf1c4eeb1377d6959261"; + name = "9pfs-directory-traversal-CVE-2016-7116.patch"; + sha256 = "06pr070qj19w5mjxr36bcqxmgpiczncigqsbwfc8ncjhm1h7dmry"; + }) + ]; configureFlags = [ "--smbd=smbd" # use `smbd' from $PATH diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 6ef014f457f..8bcf122132e 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext , libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2 +, libXrandr , which, alsaLib, curl, libvpx, gawk, nettools, dbus , xorriso, makeself, perl, pkgconfig, nukeReferences , javaBindings ? false, jdk ? null @@ -7,6 +8,7 @@ , enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null , pulseSupport ? false, libpulseaudio ? null , enableHardening ? false +, headless ? false }: with stdenv.lib; @@ -67,12 +69,14 @@ in stdenv.mkDerivation { }; buildInputs = - [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL + [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL libcap glib lvm2 python alsaLib curl libvpx pam xorriso makeself perl pkgconfig which libXmu nukeReferences ] ++ optional javaBindings jdk ++ optional pythonBindings python - ++ optional pulseSupport libpulseaudio; + ++ optional pulseSupport libpulseaudio + ++ optionals (headless) [ libXrandr libpng ] + ++ optionals (!headless) [ qt4 SDL ]; hardeningDisable = [ "fortify" "pic" "stackprotector" ]; @@ -129,7 +133,9 @@ in stdenv.mkDerivation { ''} LOCAL_CONFIG - ./configure --with-qt4-dir=${qt4} \ + ./configure \ + ${optionalString headless "--build-headless"} \ + ${optionalString (!headless) "--with-qt4-dir=${qt4}"} \ ${optionalString (!javaBindings) "--disable-java"} \ ${optionalString (!pythonBindings) "--disable-python"} \ ${optionalString (!pulseSupport) "--disable-pulse"} \ @@ -180,16 +186,18 @@ in stdenv.mkDerivation { EXTHELPER ''} - # Create and fix desktop item - mkdir -p $out/share/applications - sed -i -e "s|Icon=VBox|Icon=$libexec/VBox.png|" $libexec/virtualbox.desktop - ln -sfv $libexec/virtualbox.desktop $out/share/applications - # Icons - mkdir -p $out/share/icons/hicolor - for size in `ls -1 $libexec/icons`; do - mkdir -p $out/share/icons/hicolor/$size/apps - ln -s $libexec/icons/$size/*.png $out/share/icons/hicolor/$size/apps - done + ${optionalString (!headless) '' + # Create and fix desktop item + mkdir -p $out/share/applications + sed -i -e "s|Icon=VBox|Icon=$libexec/VBox.png|" $libexec/virtualbox.desktop + ln -sfv $libexec/virtualbox.desktop $out/share/applications + # Icons + mkdir -p $out/share/icons/hicolor + for size in `ls -1 $libexec/icons`; do + mkdir -p $out/share/icons/hicolor/$size/apps + ln -s $libexec/icons/$size/*.png $out/share/icons/hicolor/$size/apps + done + ''} # Get rid of a reference to linux.dev. nuke-refs $out/lib/modules/*/misc/*.ko diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix deleted file mode 100644 index e21b032aacb..00000000000 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ /dev/null @@ -1,607 +0,0 @@ -args @ {stringsWithDeps, lib, stdenv, writeScript, fetchurl, fetchmtn, fetchgit, ...}: with args; with stringsWithDeps; with lib; -let inherit (builtins) head tail trace; in -(rec -{ - inherit writeScript; - - src = attrByPath ["src"] "" args; - - addSbinPath = attrByPath ["addSbinPath"] false args; - - forceShare = if args ? forceShare then args.forceShare else ["man" "doc" "info"]; - forceCopy = ["COPYING" "LICENSE" "DISTRIBUTION" "LEGAL" - "README" "AUTHORS" "ChangeLog" "CHANGES" "LICENCE" "COPYRIGHT"] ++ - (optional (attrByPath ["forceCopyDoc"] true args) "doc"); - - hasSuffixHack = a: b: hasSuffix (a+(substring 0 0 b)) ((substring 0 0 a)+b); - - archiveType = s: - (if hasSuffixHack ".tar" s then "tar" - else if (hasSuffixHack ".tar.gz" s) || (hasSuffixHack ".tgz" s) then "tgz" - else if (hasSuffixHack ".tar.bz2" s) || (hasSuffixHack ".tbz2" s) || - (hasSuffixHack ".tbz" s) then "tbz2" - else if hasSuffixHack ".tar.Z" s then "tZ" - else if hasSuffixHack ".tar.lzma" s then "tar.lzma" - else if hasSuffixHack ".tar.xz" s then "tar.xz" - else if hasSuffixHack ".rar" s then "rar" - else if (hasSuffixHack ".zip" s) || (hasSuffixHack ".ZIP" s) then "zip" - else if hasSuffixHack "-cvs-export" s then "cvs-dir" - else if hasSuffixHack "-git-export" s then "git-dir" - else if hasSuffixHack ".nar.bz2" s then "narbz2" - else if hasSuffixHack ".rpm" s then "rpm" - - # Mostly for manually specified directories.. - else if hasSuffixHack "/" s then "dir" - - # Last block - for single files!! It should be always after .tar.* - else if hasSuffixHack ".bz2" s then "plain-bz2" - else if hasSuffixHack ".gz" s then "plain-gz" - - # For bootstrap calls - else if (s ==("" + (substring 0 0 s))) then "empty" - - else (abort "unknown archive type : ${s}")); - - # changing this ? see [1] - defAddToSearchPath = fullDepEntry (" - addToSearchPathWithCustomDelimiter() { - local delimiter=\$1 - local varName=\$2 - local needDir=\$3 - local addDir=\${4:-\$needDir} - local prefix=\$5 - if [ -d \$prefix\$needDir ]; then - if [ -z \${!varName} ]; then - eval export \${varName}=\${prefix}\$addDir - else - eval export \${varName}=\${!varName}\${delimiter}\${prefix}\$addDir - fi - fi - } - - addToSearchPath() - { - addToSearchPathWithCustomDelimiter \"\${PATH_DELIMITER}\" \"\$@\" - } - ") ["defNest"]; - - # changing this ? see [1] - defNest = noDepEntry (" - nestingLevel=0 - - startNest() { - nestingLevel=\$((\$nestingLevel + 1)) - echo -en \"\\e[\$1p\" - } - - stopNest() { - nestingLevel=\$((\$nestingLevel - 1)) - echo -en \"\\e[q\" - } - - header() { - startNest \"\$2\" - echo \"\$1\" - } - - # Make sure that even when we exit abnormally, the original nesting - # level is properly restored. - closeNest() { - while test \$nestingLevel -gt 0; do - stopNest - done - } - - trap \"closeNest\" EXIT - "); - - - # changing this ? see [1] - minInit = fullDepEntry (" - ${stdenv.preHook} - - set -e - NIX_CC=${stdenv.cc} - export SHELL=${stdenv.shell} - PATH_DELIMITER=':' - - # Set up the initial path. - PATH= - for i in \$NIX_CC ${toString stdenv.initialPath}; do - PATH=\$PATH\${PATH:+\"\${PATH_DELIMITER}\"}\$i/bin - done - - export TZ=UTC - - prefix=${if args ? prefix then (toString args.prefix) else "\$out"} - - ") ["defNest" "defAddToSearchPath"]; - - # if you change this rewrite using '' instead of "" to get rid of indentation in builder scripts - addInputs = fullDepEntry (" - # Recursively find all build inputs. - findInputs() - { - local pkg=\$1 - - case \$pkgs in - *\\ \$pkg\\ *) - return 0 - ;; - esac - - pkgs=\"\$pkgs \$pkg \" - - echo \$pkg - if test -f \$pkg/nix-support/setup-hook; then - source \$pkg/nix-support/setup-hook - fi - } - - pkgs=\"\" - for i in \$NIX_CC ${toString realBuildInputs}; do - findInputs \$i - done - - - # Set the relevant environment variables to point to the build inputs - # found above. - addToEnv() - { - local pkg=\$1 - "+ - (if !((args ? ignoreFailedInputs) && (args.ignoreFailedInputs == 1)) then " - if [ -e \$1/nix-support/failed ]; then - echo \"failed input \$1\" >&2 - fail - fi - " else "") - +(if addSbinPath then " - if test -d \$1/sbin; then - export _PATH=\$_PATH\${_PATH:+\"\${PATH_DELIMITER}\"}\$1/sbin - fi - " else "") - +" - if test -d \$1/bin; then - export _PATH=\$_PATH\${_PATH:+\"\${PATH_DELIMITER}\"}\$1/bin - fi - - for i in \"\${envHooks[@]}\"; do - \$i \$pkg - done - } - - for i in \$pkgs; do - addToEnv \$i - done - - - # Add the output as an rpath. - if test \"\$NIX_NO_SELF_RPATH\" != \"1\"; then - export NIX_LDFLAGS=\"-rpath \$out/lib \$NIX_LDFLAGS\" - fi - - PATH=\$_PATH\${_PATH:+\"\${PATH_DELIMITER}\"}\$PATH - ") ["minInit"]; - - # changing this ? see [1] - defEnsureDir = fullDepEntry (" - # Ensure that the given directories exists. - ensureDir() { - local dir - for dir in \"\$@\"; do - if ! test -x \"\$dir\"; then mkdir -p \"\$dir\"; fi - done - } - ") ["minInit"]; - - # changing this ? see [1] - toSrcDir = s : fullDepEntry ((if (archiveType s) == "tar" then " - tar xvf '${s}' - cd \"\$(tar tf '${s}' | head -1 | sed -e 's@/.*@@' )\" - " else if (archiveType s) == "tgz" then " - tar xvzf '${s}' - cd \"\$(tar tzf '${s}' | head -1 | sed -e 's@/.*@@' )\" - " else if (archiveType s) == "tbz2" then " - tar xvjf '${s}' - cd \"\$(tar tjf '${s}' | head -1 | sed -e 's@/.*@@' )\" - " else if (archiveType s) == "tZ" then " - uncompress < '${s}' | tar x - cd \"\$(uncompress < '${s}' | tar t | head -1 | sed -e 's@/.*@@' )\" - " else if (archiveType s) == "tar.lzma" then " - unlzma -d -c <'${s}' | tar xv - cd \"\$(unlzma -d -c <'${s}' | tar t | head -1 | sed -e 's@/.*@@' )\" - " else if (archiveType s) == "tar.xz" then " - xz -d -c <'${s}' | tar xv - cd \"\$(xz -d -c <'${s}' | tar t | head -1 | sed -e 's@/.*@@' )\" - " else if (archiveType s) == "rar" then " - unrar x '${s}' - cd \"$(unrar lb '${s}' | tail -1 | sed -e 's@/.*@@' )\" - " else if (archiveType s) == "zip" then " - unzip '${s}' - cd \"$( unzip -lqq '${s}' | tail -1 | - sed -e 's@^\\(\\s\\+[-0-9:]\\+\\)\\{3,3\\}\\s\\+\\([^/]\\+\\)/.*@\\2@' )\" - " else if (archiveType s) == "cvs-dir" then " - cp -r '${s}' . - cd \$(basename ${s}) - chmod u+rwX -R . - " else if (archiveType s) == "git-dir" then " - cp -r '${s}' . - cd \$(basename ${s}) - chmod u+rwX -R . - " else if (archiveType s) == "dir" then " - cp -r '${s}' . - cd \$(basename ${s}) - chmod u+rwX -R . - " else if (archiveType s) == "narbz2" then " - bzip2 <${s} | nix-store --restore \$PWD/\$(basename ${s} .nar.bz2) - cd \$(basename ${s} .nar.bz2) - " else if (archiveType s) == "rpm" then '' - rpm2cpio ${s} > ${s}.cpio - cpio -iv < ${s}.cpio - test -f *.tar.* && tar -xvf *.tar.* - test -d */ && cd */ - '' else if (archiveType s) == "plain-bz2" then " - mkdir \$PWD/\$(basename ${s} .bz2) - NAME=\$(basename ${s} .bz2) - bzip2 -d <${s} > \$PWD/\$(basename ${s} .bz2)/\${NAME#*-} - cd \$(basename ${s} .bz2) - " else if (archiveType s) == "plain-gz" then " - mkdir \$PWD/\$(basename ${s} .gz) - NAME=\$(basename ${s} .gz) - gzip -d <${s} > \$PWD/\$(basename ${s} .gz)/\${NAME#*-} - cd \$(basename ${s} .gz) - " else if (archiveType s) == "empty" then " - echo No source to unpack - doing nothing .. - " else (abort "unknown archive type : ${s}"))+ - # goSrcDir is typically something like "cd mysubdir" .. but can be anything else - (if args ? goSrcDir then args.goSrcDir else "") - ) ["minInit"]; - - configureCommand = attrByPath ["configureCommand"] "./configure" args; - - # changing this ? see [1] - doConfigure = fullDepEntry (" - ${configureCommand} --prefix=\"\$prefix\" ${toString configureFlags} - ") ["minInit" "addInputs" "doUnpack"]; - - # changing this ? see [1] - doIntltool = fullDepEntry (" - mkdir -p config - intltoolize --copy --force - ") ["minInit" "addInputs" "doUnpack"]; - - # changing this ? see [1] - doAutotools = fullDepEntry (" - mkdir -p config - libtoolize --copy --force - aclocal --force - #Some packages do not need this - autoheader || true; - automake --add-missing --copy - autoconf - ")["minInit" "addInputs" "doUnpack"]; - - # changing this ? see [1] - doAutogen = fullDepEntry ('' - ./autogen.sh - '')["minInit" "addInputs" "doUnpack"]; - - # changing this ? see [1] - doMake = fullDepEntry (" - make ${toString makeFlags} - ") ["minInit" "addInputs" "doUnpack"]; - - doUnpack = toSrcDir (toString src); - - # changing this ? see [1] - installPythonPackage = fullDepEntry (" - python setup.py install --prefix=\"\$prefix\" - ") ["minInit" "addInputs" "doUnpack"]; - - doPythonConfigure = fullDepEntry ('' - pythonVersion=$(toPythonPath "$prefix") - pythonVersion=''${pythonVersion#*/lib/python} - pythonVersion=''${pythonVersion%%/site-packages} - ${if args ? extraPythonConfigureCommand then - args.extraPythonConfigureCommand - else ""} - python configure.py -b "$prefix/bin" -d "$(toPythonPath "$prefix")" -v "$prefix/share/sip" ${toString configureFlags} - '') ["minInit" "addInputs" "doUnpack"]; - - # changing this ? see [1] - doMakeInstall = fullDepEntry (" - make ${toString (attrByPath ["makeFlags"] "" args)} "+ - "${toString (attrByPath ["installFlags"] "" args)} install") ["doMake"]; - - # changing this ? see [1] - doForceShare = fullDepEntry (" - mkdir -p \"\$prefix/share\" - for d in ${toString forceShare}; do - if [ -d \"\$prefix/\$d\" -a ! -d \"\$prefix/share/\$d\" ]; then - mv -v \"\$prefix/\$d\" \"\$prefix/share\" - ln -sv share/\$d \"\$prefix\" - fi; - done; - ") ["minInit" "defEnsureDir"]; - - doForceCopy = fullDepEntry ('' - name="$(basename $out)" - name="''${name#*-}" - mkdir -p "$prefix/share/$name" - for f in ${toString forceCopy}; do - cp -r "$f" "$prefix/share/$name/$f" || true - done; - '') ["minInit" "defEnsureDir"]; - - doDump = n: noDepEntry "echo Dump number ${n}; set"; - - saveEnv = noDepEntry ''export > "$TMP/env-vars" || true''; - - doDumpBuildInputs = noDepEntry ('' - echo "${toString realBuildInputs}" - ''); - - patchFlags = if args ? patchFlags then args.patchFlags else "-p1"; - - patches = attrByPath ["patches"] [] args; - - toPatchCommand = s: "cat ${s} | patch ${toString patchFlags}"; - - doPatch = fullDepEntry (concatStringsSep ";" - (map toPatchCommand patches) - ) ["minInit" "doUnpack"]; - - envAdderInner = s: x: if x==null then s else y: - a: envAdderInner (s+"echo export ${x}='\"'\"\$${x}:${y}\";'\"'\n") a; - - envAdder = envAdderInner ""; - - envAdderList = l: if l==[] then "" else - "echo export ${head l}='\"'\"\\\$${head l}:${head (tail l)}\"'\"';\n" + - envAdderList (tail (tail l)); - - # changing this ? see [1] - wrapEnv = cmd: env: " - mv \"${cmd}\" \"${cmd}-orig\"; - touch \"${cmd}\"; - chmod a+rx \"${cmd}\"; - (${envAdderList env} - echo '\"'\"${cmd}-orig\"'\"' '\"'\\\$@'\"' \n) > \"${cmd}\""; - - doWrap = cmd: fullDepEntry (wrapEnv cmd (attrByPath ["wrappedEnv"] [] args)) ["minInit"]; - - makeManyWrappers = wildcard : wrapperFlags : fullDepEntry ('' - for i in ${wildcard}; do - wrapProgram "$i" ${wrapperFlags} - done - '') ["minInit" "addInputs" "defEnsureDir"]; - - wrapBinContentsPython = (makeManyWrappers - ''$out/bin/*'' - pythonWrapperArguments - ); - - pythonWrapperArguments = - (''--prefix PYTHONPATH : $(toPythonPath $out)'' + - ''''${PYTHONPATH:+ --prefix PYTHONPATH : $PYTHONPATH}''); - - preservePathWrapperArguments = ''''${PATH:+ --prefix PATH : $PATH }''; - - doPropagate = fullDepEntry (" - mkdir -p \$out/nix-support - echo '${toString (attrByPath ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs - ") ["minInit" "defEnsureDir"]; - - cmakeFlags = attrByPath ["cmakeFlags"] [] args; - - cmakeRPathFlag = if attrByPath ["cmakeSkipRpath "] true args then " -DCMAKE_SKIP_BUILD_RPATH=ON " else ""; - - cmakeBuildDir = attrByPath ["cmakeBuildDir"] "build" args; - - doCmake = fullDepEntry ('' - mkdir ${cmakeBuildDir} - cd ${cmakeBuildDir} - cmake -D CMAKE_INSTALL_PREFIX="$out" ${cmakeRPathFlag}${toString cmakeFlags} .. - '') ["minInit" "addInputs" "doUnpack"]; - - doScons = fullDepEntry ('' - mkdir -p $out - ${if (attrByPath ["sconsCleanEnv"] false args) - then "" - else '' - sed -e '1iimport os' -i SConstruct - sed -e 's/env *= *Environment *.*/&; env['"'"'ENV'"'"']=os.environ;/' -i SConstruct - '' - } - scons ${toString (attrByPath ["sconsFlags"] [] args)} PREFIX=$out - scons ${toString (attrByPath ["sconsFlags"] [] args)} PREFIX=$out install - '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"]; - - /*debug = x:(trace x x); - debugX = x:(trace (toXML x) x);*/ - - makeNest = x: if x == defNest.text then x else "startNest\n" + x + "\nstopNest\n"; - textClosure = a: steps: textClosureMap makeNest a (["defNest"] ++ steps); - - inherit noDepEntry fullDepEntry packEntry; - - defList = attrByPath ["defList"] [] args; - getVal = getValue args defList; - check = checkFlag args; - reqsList = attrByPath ["reqsList"] [] args; - buildInputsNames = filter (x: null != getVal x) - (uniqList {inputList = - (concatLists (map - (x: if x==[] then [] else builtins.tail x) - reqsList));}); - configFlags = attrByPath ["configFlags"] [] args; - buildFlags = attrByPath ["buildFlags"] [] args; - nameSuffixes = attrByPath ["nameSuffixes"] [] args; - autoBuildInputs = assert (checkReqs args defList reqsList); - filter (x: x!=null) (map getVal buildInputsNames); - autoConfigureFlags = condConcat "" configFlags check; - autoMakeFlags = condConcat "" buildFlags check; - useConfig = attrByPath ["useConfig"] false args; - realBuildInputs = - lib.closePropagation ((if useConfig then - autoBuildInputs else - attrByPath ["buildInputs"] [] args)++ - (attrByPath ["propagatedBuildInputs"] [] args)); - configureFlags = if useConfig then autoConfigureFlags else - attrByPath ["configureFlags"] "" args; - makeFlags = if useConfig then autoMakeFlags else attrByPath ["makeFlags"] "" args; - - inherit lib; - - surroundWithCommands = x : before : after : {deps=x.deps; text = before + "\n" + - x.text + "\n" + after ;}; - - createDirs = fullDepEntry (concatStringsSep ";" - (map (x: "mkdir -p ${x}") (attrByPath ["neededDirs"] [] args)) - ) ["minInit" "defEnsureDir"]; - - copyExtraDoc = fullDepEntry ('' - name="$(basename $out)" - name="''${name#*-}" - mkdir -p "$out/share/doc/$name" - '' + (concatStringsSep ";" - (map - (x: ''cp "${x}" "$out/share/doc/$name" || true;'') - (attrByPath ["extraDoc"] [] args)))) ["minInit" "defEnsureDir" "doUnpack"]; - - realPhaseNames = - (optional ([] != attrByPath ["neededDirs"] [] args) "createDirs") - ++ - (attrByPath ["phaseNames"] [] args) - ++ - ["doForceShare" "doPropagate" "doForceCopy"] - ++ - (optional ([] != attrByPath ["extraDoc"] [] args) "copyExtraDoc") - ++ - (optional (attrByPath ["doCheck"] false args) "doMakeCheck") - ++ - (optional (attrByPath ["alwaysFail"] false args) "doFail") - ; - - doFail = noDepEntry " - echo 'Failing to keep builddir (and to invalidate result).' - a() { return 127; } ; a ; - "; - - doMakeCheck = fullDepEntry ('' - make check - '') ["minInit"]; - - extraDerivationAttrs = lib.attrByPath ["extraDerivationAttrs"] {} args; - - # for overrides.. - builderDefsArgs = args; - - innerBuilderDefsPackage = bd: args: ( - let localDefs = bd.passthru.function args; in - - stdenv.mkDerivation ((rec { - inherit (localDefs) name; - buildCommand = textClosure localDefs localDefs.realPhaseNames; - meta = localDefs.meta; - passthru = localDefs.passthru // {inherit (localDefs) src; }; - }) // (if localDefs ? propagatedBuildInputs then { - inherit (localDefs) propagatedBuildInputs; - } else {}) // extraDerivationAttrs) - ); - - builderDefsPackage = bd: func: - if builtins.isFunction func then - (foldArgs - (x: y: ((func (bd // x // y)) // y)) - (innerBuilderDefsPackage bd) - {}) - else - (builderDefsPackage bd (import (toString func))) - ; - - generateFontsFromSFD = fullDepEntry ('' - for i in *.sfd; do - echo $i; - fontforge -c \ - 'Open($1); - ${optionalString (args ? extraFontForgeCommands) args.extraFontForgeCommands - }Reencode("unicode"); - ${optionalString (attrByPath ["createTTF"] true args) ''Generate($1:r + ".ttf");''} - ${optionalString (attrByPath ["createOTF"] true args) ''Generate($1:r + ".otf");''} - Reencode("TeX-Base-Encoding"); - ${optionalString (attrByPath ["createAFM"] true args) ''Generate($1:r + ".afm");''} - ${optionalString (attrByPath ["createPFM"] true args) ''Generate($1:r + ".pfm");''} - ${optionalString (attrByPath ["createPFB"] true args) ''Generate($1:r + ".pfb");''} - ${optionalString (attrByPath ["createMAP"] true args) ''Generate($1:r + ".map");''} - ${optionalString (attrByPath ["createENC"] true args) ''Generate($1:r + ".enc");''} - ' $i; - done - '') ["minInit" "addInputs" "doUnpack"]; - - installFonts = - let retrievedName = (if args ? name then args.name else ""); in - fullDepEntry ('' - mkdir -p $out/share/fonts/truetype/public/${retrievedName} - mkdir -p $out/share/fonts/opentype/public/${retrievedName} - mkdir -p $out/share/fonts/type1/public/${retrievedName} - mkdir -p $out/share/texmf/fonts/enc/${retrievedName} - mkdir -p $out/share/texmf/fonts/map/${retrievedName} - - find -name '*.ttf' -exec cp {} $out/share/fonts/truetype/public/${retrievedName} \; - find -name '*.otf' -exec cp {} $out/share/fonts/opentype/public/${retrievedName} \; - find -name '*.pfm' -o -name '*.afm' -o -name '*.pfb' -exec cp {} $out/share/fonts/type1/public/${retrievedName} \; - find -name '*.enc' -exec cp {} $out/share/texmf/fonts/enc/${retrievedName} \; - find -name '*.map' -exec cp {} $out/share/texmf/fonts/map/${retrievedName} \; - '') ["minInit" "defEnsureDir"]; - - simplyShare = shareName: fullDepEntry ('' - mkdir -p $out/share - cp -r . $out/share/${shareName} - '') ["doUnpack" "defEnsureDir"]; - - doPatchShebangs = dir: fullDepEntry ('' - patchShebangFun() { - # Rewrite all script interpreter file names (`#! /path') under the - # specified directory tree to paths found in $PATH. E.g., - # /bin/sh will be rewritten to /nix/store/-some-bash/bin/sh. - # Interpreters that are already in the store are left untouched. - echo "patching script interpreter paths" - local f - for f in $(find "${dir}" -xtype f -perm -0100); do - local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f") - if test -n "$oldPath" -a "''${oldPath:0:''${#NIX_STORE}}" != "$NIX_STORE"; then - local newPath=$(type -P $(basename $oldPath) || true) - if test -n "$newPath" -a "$newPath" != "$oldPath"; then - echo "$f: interpreter changed from $oldPath to $newPath" - sed -i "1 s,$oldPath,$newPath," "$f" - else - echo "$f: not changing interpreter from $oldPath" - fi - fi - done - } - patchShebangFun; - '') ["minInit"]; - - createPythonInstallationTarget = fullDepEntry ('' - mkdir -p $(toPythonPath $out) - export PYTHONPATH=$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath $out) - '') ["minInit" "addInputs" "defEnsureDir"]; - - fetchUrlFromSrcInfo = srcInfo: fetchurl ({ - url = srcInfo.url; - sha256 = srcInfo.hash; - } // - (if srcInfo ? downloadName then {name = srcInfo.downloadName;} else {})); - - fetchGitFromSrcInfo = srcInfo: fetchgit { - url = srcInfo.url; - rev = srcInfo.rev; - sha256 = srcInfo.hash; - }; -}) // args - -# [1]: rewrite using '' instead of " so that indentation gets stripped. It's -# only about some spaces but in the end they will sum up diff --git a/pkgs/build-support/builder-defs/template-auto-callable.nix b/pkgs/build-support/builder-defs/template-auto-callable.nix deleted file mode 100644 index a94a96fe538..00000000000 --- a/pkgs/build-support/builder-defs/template-auto-callable.nix +++ /dev/null @@ -1,48 +0,0 @@ -x@{builderDefsPackage - (abort "Specify dependencies") - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - [(abort "Specify helper argument names")]; - - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="${abort ''Specify package name''}"; - version=""; - name="${baseName}-${version}"; - url="${name}"; - hash=""; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - - meta = { - description = "${abort ''Specify description''}"; - maintainers = with a.lib.maintainers; - [ - (abort "Specify maintainers") - ]; - platforms = with a.lib.platforms; - (abort "Specify platforms"); - license = a.lib.licenses.(abort "Specify license"); - }; - passthru = { - updateInfo = { - downloadPage = "${abort ''Specify download page''}"; - }; - }; -}) x - diff --git a/pkgs/build-support/builder-defs/template-bdp-uud.nix b/pkgs/build-support/builder-defs/template-bdp-uud.nix deleted file mode 100644 index 2b2af257d37..00000000000 --- a/pkgs/build-support/builder-defs/template-bdp-uud.nix +++ /dev/null @@ -1,26 +0,0 @@ -a : -let - s = import ./src-for-default.nix; - buildInputs = with a; [ - - ]; -in -rec { - src = a.fetchUrlFromSrcInfo s; - - inherit (s) name; - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - - meta = { - description = "${abort "Specify description"}"; - maintainers = [ - a.lib.maintainers.(abort "Specify maintainer") - ]; - platforms = with a.lib.platforms; - (abort "Specify supported platforms"); - }; -} diff --git a/pkgs/build-support/builder-defs/template-composing+config.nix b/pkgs/build-support/builder-defs/template-composing+config.nix deleted file mode 100644 index a774d421efa..00000000000 --- a/pkgs/build-support/builder-defs/template-composing+config.nix +++ /dev/null @@ -1,22 +0,0 @@ -args : with args; let localDefs = builderDefs (args // rec { - src = /* put a fetchurl here */ - (abort "Specify source"); - useConfig = true; - reqsList = [ - ["true" ] - ["false"] - ]; - /* List consisiting of an even number of strings; "key" "value" */ - configFlags = [ - ]; - }) args null; /* null is a terminator for sumArgs */ - in with localDefs; -stdenv.mkDerivation rec { - name = "${(abort "Specify name")}"+version; - builder = writeScript (name + "-builder") - (textClosure localDefs [(abort "Check phases") doMakeInstall doForceShare doPropagate]); - meta = { - description = "${(abort "Specify description")}"; - inherit src; - }; -} diff --git a/pkgs/build-support/builder-defs/template-composing-builder.nix b/pkgs/build-support/builder-defs/template-composing-builder.nix deleted file mode 100644 index 979df800008..00000000000 --- a/pkgs/build-support/builder-defs/template-composing-builder.nix +++ /dev/null @@ -1,26 +0,0 @@ -a : -let - fetchurl = a.fetchurl; - - version = a.lib.attrByPath ["version"] "" a; - buildInputs = with a; [ - - ]; -in -rec { - src = /* Here a fetchurl expression goes */; - - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; - - name = "${abort "Specify name"}-" + version; - meta = { - description = "${abort "Specify description"}"; - maintainers = [ - a.lib.maintainers.(abort "Specify maintainer") - ]; - }; -} diff --git a/pkgs/build-support/upstream-updater/attrset-to-dir.sh b/pkgs/build-support/upstream-updater/attrset-to-dir.sh deleted file mode 100755 index 2d99ef110a1..00000000000 --- a/pkgs/build-support/upstream-updater/attrset-to-dir.sh +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh - -[ -n "$2" ] && NIXPKGS_ALL="$2"; -[ -z "$NIXPKGS_ALL" ] && [ -d "/etc/nixos/nixpkgs" ] && NIXPKGS_ALL="/etc/nixos/nixpkgs"; -[ -z "$NIXPKGS_ALL" ] && [ -d "$HOME/nixpkgs" ] && NIXPKGS_ALL="$HOME/nixpkgs"; -[ -z "$NIXPKGS_ALL" ] && { - echo "Cannot find Nixpkgs source. Please specify it via NIXPKGS_ALL or second command line argument" - exit 1 -}; - -derivation="$(nix-instantiate --show-trace - << EOF -let - pkgs = import "${NIXPKGS_ALL}" {}; - attrSet = import "${1}"; -in - pkgs.attrSetToDir attrSet -EOF -)" -echo "Derivation is: $derivation" >&2 -output="$(nix-store -r "$derivation")" -echo "$output/attributes" diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 0268aeb79d8..8eeebf40134 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -9,12 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1vimj3va16plxmv46rw6nzw4m9l11hb7r1d217y1bjpd5q8nw8qz"; }; - # keep developer docs separately (man2 and man3) - outputs = [ "out" "devdoc" ]; makeFlags = [ "MANDIR=$(out)/share/man" ]; - postFixup = '' - moveToOutput share/man/man2 "$devdoc" - ''; meta = with stdenv.lib; { description = "Linux development manual pages"; diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix index 93c4a55d49e..f948a9642ff 100644 --- a/pkgs/data/fonts/baekmuk-ttf/default.nix +++ b/pkgs/data/fonts/baekmuk-ttf/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://kldp.net/baekmuk/release/865-${name}.tar.gz"; - sha256 = "08ab7dffb55d5887cc942ce370f5e33b756a55fbb4eaf0b90f244070e8d51882"; + sha256 = "10hqspl70h141ywz1smlzdanlx9vwgsp1qrcjk68fn2xnpzpvaq8"; }; dontBuild = true; diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index 894325e5b7f..aee4a63c308 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -19,11 +19,18 @@ stdenv.mkDerivation rec { mkdir -p $out/share/fonts/truetype ./install.sh ${withFont} ''; + meta = with stdenv.lib; { - description = "Nerd Fonts is a project that attempts to patch as many developer targeted and/or used fonts as possible. The patch is to specifically add a high number of additional glyphs from popular 'iconic fonts' such as Font Awesome, Devicons, Octicons, and others."; + description = '' + Nerd Fonts is a project that attempts to patch as many developer targeted + and/or used fonts as possible. The patch is to specifically add a high + number of additional glyphs from popular 'iconic fonts' such as Font + Awesome, Devicons, Octicons, and others. + ''; homepage = "https://github.com/ryanoasis/nerd-fonts"; license = licenses.mit; maintainers = with maintainers; [ garbas ]; platforms = with platforms; unix; + hydraPlatforms = []; # 'Output limit exceeded' on Hydra }; } diff --git a/pkgs/data/fonts/oxygenfonts/default.nix b/pkgs/data/fonts/oxygenfonts/default.nix index 4d4065466e6..1054986288a 100644 --- a/pkgs/data/fonts/oxygenfonts/default.nix +++ b/pkgs/data/fonts/oxygenfonts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "oxygenfonts-20160825"; + name = "oxygenfonts-20160824"; src = fetchFromGitHub { owner = "vernnobile"; diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix new file mode 100644 index 00000000000..451725a6d80 --- /dev/null +++ b/pkgs/data/fonts/roboto-mono/default.nix @@ -0,0 +1,84 @@ +{ stdenv, fetchurl }: + +let + # last commit on the directory containing the fonts in the upstream repository + commit = "883939708704a19a295e0652036369d22469e8dc"; +in +stdenv.mkDerivation rec { + name = "roboto-mono-${version}"; + version = "2016-01-11"; + + srcs = [ + (fetchurl { + url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Regular.ttf"; + sha256 = "0r6g1xydy824xbbjilq6pvrv8611ga3q1702v5jj1ly5np6gpddz"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Bold.ttf"; + sha256 = "0x9qnrbd7hin873wjzrl6798bvakixd86qdw0z5b4sm56f7fjl32"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Italic.ttf"; + sha256 = "17aia6hgpjvvrl79y0f67ncr5y1nhyxj0dzqwdg3dycsa4kij59q"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-BoldItalic.ttf"; + sha256 = "05gqfnps6qzxgyxrrmkmw0by3j88lf88v67n8jgi2chhhm0sw40q"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Medium.ttf"; + sha256 = "0ww96qd0cyj3waxf7a98hyd4cp8snajjvjmbhr66zilql8ylfzk0"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-MediumItalic.ttf"; + sha256 = "1n2cvvcpwm68lazfh3s3xhj4mrc01x84mi2ackwf8ahd95fk9p5y"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Light.ttf"; + sha256 = "0na2sxz3n1km1ryz002spfa65d91fm48x0qcda2ac0rly7dgaqjf"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-LightItalic.ttf"; + sha256 = "171fr8wsbmvfllsbmb9pcdax2qfzhbqzyxfn5bcrz9kx5k9x6198"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Thin.ttf"; + sha256 = "0pv54afyprajb16ksm5vklc1q76iv72v427wgamqzrzyvxgn6ymj"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-ThinItalic.ttf"; + sha256 = "1ziyysl09z24l735y940g92rqhn9v4npwqzajj9m1kn0xz21r1aw"; + }) + ]; + + sourceRoot = "./"; + + unpackCmd = '' + ttfName=$(basename $(stripHash $curSrc; echo $strippedName)) + cp $curSrc ./$ttfName + ''; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp -a *.ttf $out/share/fonts/truetype/ + ''; + + meta = { + homepage = https://www.google.com/fonts/specimen/Roboto+Mono; + description = "Google Roboto Mono fonts"; + longDescription = '' + Roboto Mono is a monospaced addition to the Roboto type family. Like + the other members of the Roboto family, the fonts are optimized for + readability on screens across a wide variety of devices and reading + environments. While the monospaced version is related to its variable + width cousin, it doesn't hesitate to change forms to better fit the + constraints of a monospaced environment. For example, narrow glyphs + like 'I', 'l' and 'i' have added serifs for more even texture while + wider glyphs are adjusted for weight. Curved caps like 'C' and 'O' + take on the straighter sides from Roboto Condensed. + ''; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.romildo ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix new file mode 100644 index 00000000000..ade9fd2350e --- /dev/null +++ b/pkgs/data/fonts/roboto-slab/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchurl }: + +let + # last commit on the directory containing the fonts in the upstream repository + commit = "883939708704a19a295e0652036369d22469e8dc"; +in +stdenv.mkDerivation rec { + name = "roboto-slab-${version}"; + version = "2016-01-11"; + + srcs = [ + (fetchurl { + url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotoslab/RobotoSlab-Regular.ttf"; + sha256 = "04180b5zk2nzll1rrgx8f1i1za66pk6pbrp0iww2xypjqra5zahk"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotoslab/RobotoSlab-Bold.ttf"; + sha256 = "0ayl2hf5j33vixxfa7051hzjjxnx8zhag3rr0mmmnxpsn7md44ms"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotoslab/RobotoSlab-Light.ttf"; + sha256 = "09riqgj9ixqjdb3mkzbs799cgmnp3ja3d6izlqkhpkfm52sgafqm"; + }) + (fetchurl { + url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotoslab/RobotoSlab-Thin.ttf"; + sha256 = "1hd0m7lxhr261a4s2nb572ari6v53w2yd8yjr9i534iqfl4jcbsf"; + }) + ]; + + sourceRoot = "./"; + + unpackCmd = '' + ttfName=$(basename $(stripHash $curSrc; echo $strippedName)) + cp $curSrc ./$ttfName + ''; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp -a *.ttf $out/share/fonts/truetype/ + ''; + + meta = { + homepage = https://www.google.com/fonts/specimen/Roboto+Slab; + description = "Google Roboto Slab fonts"; + longDescription = '' + Roboto has a dual nature. It has a mechanical skeleton and the forms + are largely geometric. At the same time, the font features friendly + and open curves. While some grotesks distort their letterforms to + force a rigid rhythm, Roboto doesn't compromise, allowing letters to + be settled into their natural width. This makes for a more natural + reading rhythm more commonly found in humanist and serif types. + + This is the Roboto Slab family, which can be used alongside the normal + Roboto family and the Roboto Condensed family. + ''; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.romildo ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/desktops/kde-4.14/kde-runtime.nix b/pkgs/desktops/kde-4.14/kde-runtime.nix index 495ea242e0d..cbfe2ebf6d5 100644 --- a/pkgs/desktops/kde-4.14/kde-runtime.nix +++ b/pkgs/desktops/kde-4.14/kde-runtime.nix @@ -16,7 +16,7 @@ kde { nativeBuildInputs = [ shared_mime_info ]; - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; + NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; passthru.propagatedUserEnvPackages = [ virtuoso ]; diff --git a/pkgs/desktops/kde-5/applications/kdelibs/default.nix b/pkgs/desktops/kde-5/applications/kdelibs/default.nix index b93aea764a3..ec57c908dc5 100644 --- a/pkgs/desktops/kde-5/applications/kdelibs/default.nix +++ b/pkgs/desktops/kde-5/applications/kdelibs/default.nix @@ -27,7 +27,7 @@ kdeApp { ]; # cmake does not detect path to `ilmbase` - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; cmakeFlags = [ "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook" diff --git a/pkgs/desktops/kde-5/applications/kio-extras.nix b/pkgs/desktops/kde-5/applications/kio-extras.nix index d9fe6a61ac3..fe3e3fad200 100644 --- a/pkgs/desktops/kde-5/applications/kio-extras.nix +++ b/pkgs/desktops/kde-5/applications/kio-extras.nix @@ -18,5 +18,5 @@ kdeApp { kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support kpty libmtp libssh openexr openslp phonon qtsvg samba solid ]; - NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev or ilmbase}/include/OpenEXR" ]; + NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ]; } diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index 02a78f60550..e607ef7e270 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -8,7 +8,7 @@ let fetchFilteredPatch = args: fetchurl (args // { downloadToTemp = true; postFetch = '' - ${patchutils}/bin/filterdiff --clean --strip-match=1 -x 'testsuite/*' "$downloadedFile" > "$out" + ${patchutils}/bin/filterdiff --clean --strip-match=1 -x '"testsuite/"*' "$downloadedFile" > "$out" ''; }); in @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # Fix https://ghc.haskell.org/trac/ghc/ticket/12130 (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/4d71cc89b4e9648f3fbb29c8fcd25d725616e265; sha256 = "0syaxb4y4s2dc440qmrggb4vagvqqhb55m6mx12rip4i9qhxl8k0"; }) (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; }) - ]; + ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch; buildInputs = [ ghc perl hscolour ]; diff --git a/pkgs/development/compilers/ghc/ghc-no-madv-free.patch b/pkgs/development/compilers/ghc/ghc-no-madv-free.patch new file mode 100644 index 00000000000..8fea9f92012 --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-no-madv-free.patch @@ -0,0 +1,18 @@ +diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c +index 99620ee..e052a84 100644 +--- a/rts/posix/OSMem.c ++++ b/rts/posix/OSMem.c +@@ -523,13 +523,7 @@ void osDecommitMemory(void *at, W_ size) + sysErrorBelch("unable to make released memory unaccessible"); + #endif + +-#ifdef MADV_FREE +- // Try MADV_FREE first, FreeBSD has both and MADV_DONTNEED +- // just swaps memory out +- r = madvise(at, size, MADV_FREE); +-#else + r = madvise(at, size, MADV_DONTNEED); +-#endif + if(r < 0) + sysErrorBelch("unable to decommit memory"); + } diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index e9073a42cf0..e14667ce131 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { and a documentation generator (ocamldoc). ''; - platforms = with platforms; linux ++ darwin; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index b366f20ffb6..8ad3620bc73 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { and a documentation generator (ocamldoc). ''; - platforms = with platforms; linux ++ darwin; + platforms = with platforms; linux; }; } diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 6344b96db33..50199852ae2 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -122,16 +122,17 @@ let cp -av build/*/images/j2sdk-image/* $out/lib/openjdk - # Move some stuff to top-level. - mv $out/lib/openjdk/include $out/include - mv $out/lib/openjdk/man $out/share/man + # Remove some broken manpages. + rm -rf $out/lib/openjdk/man/ja* + + # Mirror some stuff in top-level. + mkdir $out/include $out/share/man + ln -s $out/lib/openjdk/include/* $out/include/ + ln -s $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/ - # 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 @@ -174,6 +175,7 @@ let ln -s $out/lib/openjdk/bin $out/bin ln -s $jre/lib/openjdk/jre/bin $jre/bin + ln -s $jre/lib/openjdk/jre $out/jre ''; # FIXME: this is unnecessary once the multiple-outputs branch is merged. diff --git a/pkgs/development/compilers/rust/beta.nix b/pkgs/development/compilers/rust/beta.nix index cb1b0bd8b40..db19391575f 100644 --- a/pkgs/development/compilers/rust/beta.nix +++ b/pkgs/development/compilers/rust/beta.nix @@ -21,7 +21,7 @@ rec { version = "beta-2016-07-25"; srcRev = "f09ef68cc47956ccc5f99212bdcdd15298c400a0"; srcSha = "1r6q9jd0fl6mzhwkvrrcv358q2784hg51dfpy28xgh4n61m7c155"; - depsSha256 = "055ky0lkrcsi976kmvc4lqyv0sjdpcj3jv36kz9hkqq0gip3crjc"; + depsSha256 = "1p1ygabg9k9b0azm0mrx8asjzdi35c5zw53iysba198lli6bhdl4"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/sbcl/1.2.5.nix b/pkgs/development/compilers/sbcl/1.2.5.nix index 68ed58b426f..4f854652ffe 100644 --- a/pkgs/development/compilers/sbcl/1.2.5.nix +++ b/pkgs/development/compilers/sbcl/1.2.5.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { homepage = http://www.sbcl.org; license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; inherit version; }; } diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7e1023134d5..cc13b5ee52c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -981,16 +981,6 @@ self: super: { # us when we patch the cabal file (Link options will be recored in the ghc package registry). GLUT = addPkgconfigDepend (appendPatch super.GLUT ./patches/GLUT.patch) pkgs.freeglut; - # https://github.com/gwern/mueval/issues/14 - mueval = overrideCabal super.mueval (drv: { - revision = null; - editedCabalFile = null; - patches = [(pkgs.fetchpatch { - url = "https://github.com/gwern/mueval/commit/866f895e0b671bcaa232b46ed93dd7d47a4b32b2.patch"; - sha256 = "16pb9nfr52hwidxv0f7j4yg8yd86959kzbcw9lmnzpvgdy5qyvkg"; - })]; - }); - # remove if a version > 0.1.0.1 ever gets released stunclient = overrideCabal super.stunclient (drv: { postPatch = (drv.postPatch or "") + '' diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 003fef4f096..d88fbe70b63 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -320,6 +320,7 @@ dont-distribute-packages: anatomy: [ i686-linux, x86_64-darwin, x86_64-linux ] android-lint-summary: [ i686-linux, x86_64-linux ] AndroidViewHierarchyImporter: [ i686-linux, x86_64-darwin, x86_64-linux ] + angle: [ i686-linux, x86_64-darwin, x86_64-linux ] Animas: [ i686-linux, x86_64-linux ] Annotations: [ i686-linux, x86_64-linux ] antagonist: [ i686-linux, x86_64-linux ] @@ -519,6 +520,7 @@ dont-distribute-packages: bindings-libv4l2: [ i686-linux, x86_64-darwin, x86_64-linux ] bindings-libzip: [ i686-linux, x86_64-darwin, x86_64-linux ] bindings-linux-videodev2: [ i686-linux, x86_64-linux ] + bindings-lxc: [ i686-linux, x86_64-darwin, x86_64-linux ] bindings-mpdecimal: [ i686-linux, x86_64-linux ] bindings-portaudio: [ x86_64-darwin ] bindings-sane: [ i686-linux, x86_64-linux ] @@ -589,6 +591,7 @@ dont-distribute-packages: bond-haskell-compiler: [ i686-linux, x86_64-darwin, x86_64-linux ] bond-haskell: [ i686-linux, x86_64-darwin, x86_64-linux ] bond: [ i686-linux, x86_64-darwin, x86_64-linux ] + bookkeeper: [ i686-linux, x86_64-darwin, x86_64-linux ] Bookshelf: [ i686-linux, x86_64-darwin, x86_64-linux ] boolean-normal-forms: [ i686-linux, x86_64-linux ] boomerang: [ i686-linux, x86_64-linux ] @@ -666,6 +669,7 @@ dont-distribute-packages: call: [ i686-linux, x86_64-darwin, x86_64-linux ] camfort: [ i686-linux, x86_64-linux ] campfire: [ i686-linux, x86_64-darwin, x86_64-linux ] + canteven-parsedate: [ i686-linux, x86_64-darwin, x86_64-linux ] cantor: [ i686-linux, x86_64-linux ] cao: [ i686-linux, x86_64-linux ] cap: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -733,6 +737,7 @@ dont-distribute-packages: chp-transformers: [ i686-linux, x86_64-linux ] chp: [ i686-linux, x86_64-linux ] ChristmasTree: [ i686-linux, x86_64-linux ] + chu2: [ i686-linux, x86_64-darwin, x86_64-linux ] chuchu: [ i686-linux, x86_64-linux ] chunks: [ i686-linux, x86_64-darwin, x86_64-linux ] cil: [ i686-linux, x86_64-linux ] @@ -849,6 +854,7 @@ dont-distribute-packages: conductive-hsc3: [ i686-linux, x86_64-linux ] conduit-audio-lame: [ i686-linux, x86_64-linux ] conduit-audio-samplerate: [ i686-linux, x86_64-linux ] + conduit-find: [ i686-linux, x86_64-darwin, x86_64-linux ] conduit-network-stream: [ i686-linux, x86_64-linux ] conduit-resumablesink: [ i686-linux, x86_64-linux ] config-manager: [ i686-linux, x86_64-linux ] @@ -866,6 +872,7 @@ dont-distribute-packages: consumers: [ i686-linux, x86_64-linux ] container: [ i686-linux, x86_64-darwin, x86_64-linux ] context-stack: [ i686-linux, x86_64-linux ] + ContextAlgebra: [ i686-linux, x86_64-darwin, x86_64-linux ] continue: [ i686-linux, x86_64-linux ] continuum: [ i686-linux, x86_64-linux ] Contract: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -887,6 +894,7 @@ dont-distribute-packages: copilot-theorem: [ i686-linux, x86_64-linux ] copilot: [ i686-linux, x86_64-darwin, x86_64-linux ] COrdering: [ i686-linux, x86_64-linux ] + core-compiler: [ i686-linux, x86_64-darwin, x86_64-linux ] core-haskell: [ i686-linux, x86_64-darwin, x86_64-linux ] core: [ i686-linux, x86_64-linux ] corebot-bliki: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -1030,6 +1038,7 @@ dont-distribute-packages: debian-binary: [ i686-linux, x86_64-darwin, x86_64-linux ] debian: [ i686-linux, x86_64-linux ] decepticons: [ i686-linux, x86_64-linux ] + decimal-arithmetic: [ i686-linux, x86_64-darwin, x86_64-linux ] DecisionTree: [ i686-linux, x86_64-linux ] decoder-conduit: [ i686-linux, x86_64-linux ] dedukti: [ i686-linux, x86_64-linux ] @@ -1069,6 +1078,7 @@ dont-distribute-packages: dfsbuild: [ i686-linux, x86_64-darwin, x86_64-linux ] dgim: [ i686-linux, x86_64-linux ] dgs: [ i686-linux, x86_64-linux ] + diagrams-boolean: [ i686-linux, x86_64-darwin, x86_64-linux ] diagrams-builder: [ i686-linux, x86_64-darwin, x86_64-linux ] diagrams-cairo: [ i686-linux, x86_64-darwin, x86_64-linux ] diagrams-canvas: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -1098,8 +1108,13 @@ dont-distribute-packages: diffcabal: [ i686-linux, x86_64-linux ] DifferenceLogic: [ i686-linux, x86_64-linux ] DifferentialEvolution: [ i686-linux, x86_64-darwin, x86_64-linux ] + digestive-bootstrap: [ i686-linux, x86_64-darwin, x86_64-linux ] + digestive-foundation-lucid: [ i686-linux, x86_64-darwin, x86_64-linux ] + digestive-functors-blaze: [ i686-linux, x86_64-darwin, x86_64-linux ] digestive-functors-happstack: [ i686-linux, x86_64-darwin, x86_64-linux ] + digestive-functors-heist: [ i686-linux, x86_64-darwin, x86_64-linux ] digestive-functors-hsp: [ i686-linux, x86_64-darwin, x86_64-linux ] + digestive-functors-lucid: [ i686-linux, x86_64-darwin, x86_64-linux ] DigitalOcean: [ i686-linux, x86_64-linux ] DimensionalHash: [ i686-linux, x86_64-linux ] dingo-core: [ i686-linux, x86_64-linux ] @@ -1244,6 +1259,7 @@ dont-distribute-packages: email-header: [ i686-linux, x86_64-linux ] email-postmark: [ i686-linux, x86_64-linux ] email: [ i686-linux, x86_64-linux ] + emailparse: [ i686-linux, x86_64-darwin, x86_64-linux ] embeddock-example: [ i686-linux, x86_64-linux ] embeddock: [ i686-linux, x86_64-linux ] embroidery: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -1251,6 +1267,7 @@ dont-distribute-packages: Emping: [ i686-linux, x86_64-linux ] enchant: [ i686-linux, x86_64-darwin, x86_64-linux ] engine-io-growler: [ i686-linux, x86_64-darwin, x86_64-linux ] + engine-io-snap: [ i686-linux, x86_64-darwin, x86_64-linux ] enumerate: [ i686-linux, x86_64-darwin, x86_64-linux ] enumeration: [ i686-linux, x86_64-darwin, x86_64-linux ] enumfun: [ i686-linux, x86_64-linux ] @@ -1397,6 +1414,7 @@ dont-distribute-packages: fltkhs-hello-world: [ i686-linux, x86_64-linux, x86_64-darwin ] FM-SBLEX: [ i686-linux, x86_64-darwin, x86_64-linux ] FModExRaw: [ i686-linux, x86_64-linux ] + fn-extra: [ i686-linux, x86_64-darwin, x86_64-linux ] foldl-incremental: [ i686-linux, x86_64-linux ] folds-common: [ i686-linux, x86_64-linux ] follower: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -1419,6 +1437,8 @@ dont-distribute-packages: fortran-src: [ i686-linux, x86_64-darwin, x86_64-linux ] foscam-sort: [ i686-linux, x86_64-linux ] Foster: [ i686-linux, x86_64-darwin, x86_64-linux ] + foundation-edge: [ i686-linux, x86_64-darwin, x86_64-linux ] + foundation: [ i686-linux, x86_64-darwin, x86_64-linux ] fpco-api: [ i686-linux, x86_64-linux ] fpnla-examples: [ i686-linux, x86_64-darwin, x86_64-linux ] Fractaler: [ i686-linux, x86_64-linux ] @@ -1447,6 +1467,7 @@ dont-distribute-packages: ftdi: [ i686-linux, x86_64-linux ] FTGL-bytestring: [ i686-linux, x86_64-linux ] ftp-conduit: [ i686-linux, x86_64-linux ] + FTPLine: [ i686-linux, x86_64-darwin, x86_64-linux ] ftshell: [ i686-linux, x86_64-darwin, x86_64-linux ] full-sessions: [ i686-linux, x86_64-linux ] full-text-search: [ i686-linux, x86_64-linux ] @@ -1505,6 +1526,7 @@ dont-distribute-packages: geniserver: [ i686-linux, x86_64-darwin, x86_64-linux ] GenSmsPdu: [ i686-linux, x86_64-darwin, x86_64-linux ] GenussFold: [ i686-linux, x86_64-darwin, x86_64-linux ] + genvalidity-containers: [ i686-linux, x86_64-darwin, x86_64-linux ] geo-resolver: [ i686-linux, x86_64-linux ] GeocoderOpenCage: [ i686-linux, x86_64-linux ] geodetic: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -1601,6 +1623,7 @@ dont-distribute-packages: GLFW: [ x86_64-darwin ] glicko: [ i686-linux, x86_64-linux ] glider-nlp: [ i686-linux, x86_64-linux ] + glirc: [ i686-linux, x86_64-darwin, x86_64-linux ] GLMatrix: [ i686-linux, x86_64-linux ] global-config: [ i686-linux, x86_64-linux ] global-variables: [ i686-linux, x86_64-linux ] @@ -1832,6 +1855,7 @@ dont-distribute-packages: hack-middleware-jsonp: [ i686-linux, x86_64-darwin, x86_64-linux ] hack2-handler-happstack-server: [ i686-linux, x86_64-darwin, x86_64-linux ] hack2-handler-mongrel2-http: [ i686-linux, x86_64-linux ] + hack2-handler-snap-server: [ i686-linux, x86_64-darwin, x86_64-linux ] hack2-handler-warp: [ i686-linux, x86_64-linux ] hack2-interface-wai: [ i686-linux, x86_64-linux ] hackage-proxy: [ i686-linux, x86_64-linux ] @@ -1877,6 +1901,8 @@ dont-distribute-packages: hamusic: [ i686-linux, x86_64-linux ] handsy: [ i686-linux, x86_64-linux ] hannahci: [ i686-linux, x86_64-linux ] + hans-pcap: [ i686-linux, x86_64-darwin, x86_64-linux ] + hans: [ i686-linux, x86_64-darwin, x86_64-linux ] haphviz: [ i686-linux, x86_64-linux ] happindicator3: [ i686-linux, x86_64-darwin, x86_64-linux ] happindicator: [ i686-linux, x86_64-linux ] @@ -1938,6 +1964,7 @@ dont-distribute-packages: has: [ i686-linux, x86_64-linux ] hascal: [ i686-linux, x86_64-linux ] hascar: [ i686-linux, x86_64-darwin, x86_64-linux ] + hascas: [ i686-linux, x86_64-darwin, x86_64-linux ] hascat-lib: [ i686-linux, x86_64-darwin, x86_64-linux ] hascat-setup: [ i686-linux, x86_64-darwin, x86_64-linux ] hascat-system: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -1968,6 +1995,7 @@ dont-distribute-packages: haskell-generate: [ i686-linux, x86_64-linux ] haskell-gi-base: [ i686-linux ] haskell-gi: [ i686-linux ] + haskell-igraph: [ i686-linux, x86_64-darwin, x86_64-linux ] haskell-mpfr: [ i686-linux, x86_64-linux ] haskell-names: [ i686-linux, x86_64-linux ] haskell-openflow: [ i686-linux, x86_64-linux ] @@ -1978,6 +2006,8 @@ dont-distribute-packages: haskell-plot: [ i686-linux, x86_64-linux ] haskell-reflect: [ i686-linux, x86_64-darwin, x86_64-linux ] haskell-rules: [ i686-linux, x86_64-linux ] + haskell-src-exts-prisms: [ i686-linux, x86_64-darwin, x86_64-linux ] + haskell-src-exts-simple: [ i686-linux, x86_64-darwin, x86_64-linux ] haskell-src-meta-mwotton: [ i686-linux, x86_64-linux ] haskell-token-utils: [ i686-linux, x86_64-linux ] haskell-tools-ast-fromghc: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -2042,12 +2072,16 @@ dont-distribute-packages: hasloGUI: [ i686-linux, x86_64-darwin, x86_64-linux ] hasparql-client: [ i686-linux, x86_64-linux ] hasql-backend: [ i686-linux, x86_64-linux ] + hasql-cursor-query: [ i686-linux, x86_64-darwin, x86_64-linux ] + hasql-cursor-transaction: [ i686-linux, x86_64-darwin, x86_64-linux ] hasql-postgres-options: [ i686-linux, x86_64-linux ] hasql-postgres: [ i686-linux, x86_64-linux ] hasql-transaction: [ i686-linux, x86_64-darwin, x86_64-linux ] haste-cabal-install: [ i686-linux, x86_64-darwin, x86_64-linux ] + haste-cabal-install: [ i686-linux, x86_64-darwin, x86_64-linux ] haste-cabal-install: [ i686-linux, x86_64-linux ] haste-Cabal: [ i686-linux, x86_64-darwin, x86_64-linux ] + haste-Cabal: [ i686-linux, x86_64-darwin, x86_64-linux ] haste-Cabal: [ i686-linux, x86_64-linux ] haste-compiler: [ i686-linux, x86_64-darwin, x86_64-linux ] haste-gapi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2056,6 +2090,7 @@ dont-distribute-packages: Hate: [ i686-linux, x86_64-linux ] hatex-guide: [ i686-linux, x86_64-darwin, x86_64-linux ] HaTeX-meta: [ i686-linux, x86_64-linux ] + hats: [ i686-linux, x86_64-darwin, x86_64-linux ] haverer: [ i686-linux, x86_64-linux ] HaVSA: [ i686-linux, x86_64-darwin, x86_64-linux ] hawitter: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -2116,6 +2151,8 @@ dont-distribute-packages: hecc: [ i686-linux, x86_64-linux ] Hedi: [ i686-linux, x86_64-darwin, x86_64-linux ] heist-aeson: [ i686-linux, x86_64-linux ] + heist-async: [ i686-linux, x86_64-darwin, x86_64-linux ] + heist: [ i686-linux, x86_64-darwin, x86_64-linux ] helics-wai: [ i686-linux, x86_64-linux ] helics: [ i686-linux, x86_64-linux ] helium: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -2185,6 +2222,7 @@ dont-distribute-packages: hgen: [ i686-linux, x86_64-linux ] hgeometric: [ i686-linux, x86_64-linux ] hgeometry: [ i686-linux, x86_64-linux ] + hgeos: [ i686-linux, x86_64-darwin, x86_64-linux ] hgithub: [ i686-linux, x86_64-darwin, x86_64-linux ] hgom: [ i686-linux, x86_64-linux ] HGraphStorage: [ i686-linux, x86_64-linux ] @@ -2277,6 +2315,7 @@ dont-distribute-packages: hob: [ i686-linux, x86_64-linux ] hobbes: [ i686-linux, x86_64-linux ] hobbits: [ i686-linux, x86_64-linux ] + hocilib: [ i686-linux, x86_64-darwin, x86_64-linux ] HODE: [ i686-linux, x86_64-linux ] hoe: [ i686-linux, x86_64-darwin, x86_64-linux ] Hoed: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -2375,6 +2414,7 @@ dont-distribute-packages: hs-twitter: [ i686-linux, x86_64-darwin, x86_64-linux ] hs-twitterarchiver: [ i686-linux, x86_64-linux ] hs-vcard: [ i686-linux, x86_64-darwin, x86_64-linux ] + hs-watchman: [ i686-linux, x86_64-darwin, x86_64-linux ] hs2bf: [ i686-linux, x86_64-linux ] hs2dot: [ i686-linux, x86_64-darwin, x86_64-linux ] Hs2lib: [ i686-linux, x86_64-linux ] @@ -2390,6 +2430,7 @@ dont-distribute-packages: hsc3-rec: [ i686-linux, x86_64-linux ] hsc3-server: [ i686-linux, x86_64-darwin, x86_64-linux ] hsc3-unsafe: [ i686-linux, x86_64-linux ] + hscaffold: [ i686-linux, x86_64-darwin, x86_64-linux ] hscamwire: [ i686-linux, x86_64-darwin, x86_64-linux ] hscassandra: [ i686-linux, x86_64-linux ] hsclock: [ i686-linux, x86_64-linux ] @@ -2408,6 +2449,7 @@ dont-distribute-packages: HSHHelpers: [ i686-linux, x86_64-darwin, x86_64-linux ] HsHyperEstraier: [ i686-linux, x86_64-linux ] hSimpleDB: [ i686-linux, x86_64-linux ] + hsimport: [ i686-linux, x86_64-darwin, x86_64-linux ] HsJudy: [ i686-linux, x86_64-linux ] hskeleton: [ i686-linux, x86_64-linux ] hslackbuilder: [ i686-linux, x86_64-linux ] @@ -2430,6 +2472,7 @@ dont-distribute-packages: hsparql: [ i686-linux, x86_64-linux ] hspear: [ i686-linux, x86_64-linux ] hspec-experimental: [ i686-linux, x86_64-linux ] + hspec-golden-aeson: [ i686-linux, x86_64-darwin, x86_64-linux ] hspec-shouldbe: [ i686-linux, x86_64-linux ] hspec-snap: [ i686-linux, x86_64-darwin, x86_64-linux ] hspec-test-sandbox: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -2509,6 +2552,7 @@ dont-distribute-packages: hw-bits: [ i686-linux ] hw-conduit: [ i686-linux ] hw-json: [ i686-linux ] + hw-json: [ i686-linux, x86_64-darwin, x86_64-linux ] hw-rankselect: [ i686-linux ] hw-succinct: [ i686-linux ] hworker-ses: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -2708,6 +2752,7 @@ dont-distribute-packages: jsc: [ i686-linux, x86_64-linux ] JsContracts: [ i686-linux, x86_64-linux ] jsmw: [ i686-linux, x86_64-linux ] + json-api: [ i686-linux, x86_64-darwin, x86_64-linux ] json-ast-json-encoder: [ i686-linux, x86_64-darwin, x86_64-linux ] json-ast-quickcheck: [ i686-linux, x86_64-linux ] json-autotype: [ i686-linux, x86_64-linux ] @@ -2738,7 +2783,9 @@ dont-distribute-packages: JuicyPixels-repa: [ i686-linux, x86_64-darwin, x86_64-linux ] jukebox: [ x86_64-darwin ] JunkDB-driver-gdbm: [ i686-linux, x86_64-darwin, x86_64-linux ] + jupyter: [ i686-linux, x86_64-darwin, x86_64-linux ] JYU-Utils: [ i686-linux, x86_64-linux ] + kaleidoscope: [ i686-linux, x86_64-darwin, x86_64-linux ] kangaroo: [ i686-linux, x86_64-linux ] kansas-lava-cores: [ i686-linux, x86_64-linux ] kansas-lava-papilio: [ i686-linux, x86_64-linux ] @@ -2765,6 +2812,7 @@ dont-distribute-packages: Ketchup: [ i686-linux, x86_64-linux ] kevin: [ i686-linux, x86_64-darwin, x86_64-linux ] keyring: [ i686-linux, x86_64-darwin, x86_64-linux ] + keysafe: [ i686-linux, x86_64-darwin, x86_64-linux ] keystore: [ i686-linux, x86_64-darwin, x86_64-linux ] kicad-data: [ i686-linux, x86_64-linux ] kickass-torrents-dump-parser: [ i686-linux, x86_64-linux ] @@ -2774,6 +2822,8 @@ dont-distribute-packages: kif-parser: [ i686-linux, x86_64-darwin, x86_64-linux ] kit: [ i686-linux, x86_64-linux ] kmeans-par: [ i686-linux, x86_64-linux ] + knead-arithmetic: [ i686-linux, x86_64-darwin, x86_64-linux ] + knead: [ i686-linux, x86_64-darwin, x86_64-linux ] knots: [ i686-linux, x86_64-linux ] koellner-phonetic: [ i686-linux, x86_64-linux ] Konf: [ i686-linux, x86_64-linux ] @@ -2795,6 +2845,7 @@ dont-distribute-packages: lambda-devs: [ i686-linux, x86_64-darwin, x86_64-linux ] lambda-toolbox: [ i686-linux, x86_64-linux ] lambdaBase: [ i686-linux, x86_64-darwin, x86_64-linux ] + lambdabot-utils: [ i686-linux, x86_64-darwin, x86_64-linux ] LambdaCalculator: [ i686-linux, x86_64-linux ] lambdacat: [ i686-linux, x86_64-linux ] lambdacms-core: [ i686-linux, x86_64-linux ] @@ -2830,6 +2881,7 @@ dont-distribute-packages: language-sh: [ i686-linux, x86_64-linux ] language-spelling: [ i686-linux, x86_64-linux ] language-sqlite: [ i686-linux, x86_64-linux ] + large-hashable: [ i686-linux, x86_64-darwin, x86_64-linux ] Lastik: [ i686-linux, x86_64-linux ] lat: [ i686-linux, x86_64-darwin, x86_64-linux ] latest-npm-version: [ i686-linux, x86_64-linux ] @@ -2887,6 +2939,7 @@ dont-distribute-packages: libxls: [ i686-linux, x86_64-linux ] libxml: [ i686-linux, x86_64-linux ] libxslt: [ i686-linux, x86_64-linux ] + libzfs: [ i686-linux, x86_64-darwin, x86_64-linux ] LibZip: [ i686-linux, x86_64-darwin, x86_64-linux ] lifter: [ i686-linux, x86_64-linux ] lighttpd-conf-qq: [ i686-linux, x86_64-linux ] @@ -2916,6 +2969,7 @@ dont-distribute-packages: lio-eci11: [ i686-linux, x86_64-linux ] lio-simple: [ i686-linux, x86_64-linux ] liquid-fixpoint: [ i686-linux, x86_64-linux ] + liquid: [ i686-linux, x86_64-darwin, x86_64-linux ] liquidhaskell-cabal-demo: [ i686-linux, x86_64-linux ] liquidhaskell-cabal: [ i686-linux, x86_64-linux ] liquidhaskell: [ i686-linux, x86_64-linux ] @@ -2966,6 +3020,8 @@ dont-distribute-packages: lojbanXiragan: [ i686-linux, x86_64-linux ] lojysamban: [ i686-linux, x86_64-linux ] lol-apps: [ i686-linux, x86_64-darwin, x86_64-linux ] + lol-calculus: [ i686-linux, x86_64-darwin, x86_64-linux ] + lol-typing: [ i686-linux, x86_64-darwin, x86_64-linux ] lol: [ i686-linux, x86_64-darwin, x86_64-linux ] loli: [ i686-linux, x86_64-darwin, x86_64-linux ] loop-effin: [ i686-linux, x86_64-linux ] @@ -2973,6 +3029,8 @@ dont-distribute-packages: lord: [ i686-linux, x86_64-linux ] loris: [ i686-linux, x86_64-linux ] lostcities: [ i686-linux, x86_64-darwin, x86_64-linux ] + lp-diagrams-svg: [ i686-linux, x86_64-darwin, x86_64-linux ] + lp-diagrams: [ i686-linux, x86_64-darwin, x86_64-linux ] ls-usb: [ i686-linux, x86_64-darwin, x86_64-linux ] lscabal: [ i686-linux, x86_64-linux ] LslPlus: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -3043,6 +3101,7 @@ dont-distribute-packages: markup-preview: [ i686-linux, x86_64-linux ] marmalade-upload: [ i686-linux, x86_64-darwin, x86_64-linux ] marquise: [ i686-linux, x86_64-darwin, x86_64-linux ] + mars: [ i686-linux, x86_64-darwin, x86_64-linux ] marxup: [ i686-linux, x86_64-linux ] masakazu-bot: [ i686-linux, x86_64-darwin, x86_64-linux ] matchers: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -3092,6 +3151,7 @@ dont-distribute-packages: mighttpd: [ i686-linux, x86_64-darwin, x86_64-linux ] milena: [ i686-linux, x86_64-linux ] mime-string: [ i686-linux, x86_64-linux ] + minecraft-data: [ i686-linux, x86_64-darwin, x86_64-linux ] minesweeper: [ i686-linux, x86_64-darwin, x86_64-linux ] MiniAgda: [ i686-linux, x86_64-linux ] miniforth: [ i686-linux, x86_64-linux ] @@ -3128,6 +3188,7 @@ dont-distribute-packages: monad-exception: [ i686-linux, x86_64-linux ] monad-interleave: [ i686-linux, x86_64-linux ] monad-levels: [ i686-linux, x86_64-linux ] + monad-lgbt: [ i686-linux, x86_64-darwin, x86_64-linux ] monad-lrs: [ i686-linux, x86_64-darwin, x86_64-linux ] monad-memo: [ i686-linux, x86_64-linux ] monad-mersenne-random: [ i686-linux, x86_64-linux ] @@ -3222,6 +3283,7 @@ dont-distribute-packages: mysnapsession-example: [ i686-linux, x86_64-darwin, x86_64-linux ] mysnapsession: [ i686-linux, x86_64-darwin, x86_64-linux ] mysql-effect: [ i686-linux, x86_64-darwin, x86_64-linux ] + mysql-haskell: [ i686-linux, x86_64-darwin, x86_64-linux ] mysql-simple-quasi: [ i686-linux, x86_64-darwin, x86_64-linux ] mysql-simple-typed: [ i686-linux, x86_64-darwin, x86_64-linux ] mysql-simple: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -3244,6 +3306,7 @@ dont-distribute-packages: natural-number: [ i686-linux, x86_64-linux ] NaturalLanguageAlphabets: [ i686-linux, x86_64-darwin, x86_64-linux ] nc-indicators: [ i686-linux, x86_64-linux ] + NearContextAlgebra: [ i686-linux, x86_64-darwin, x86_64-linux ] neat: [ i686-linux, x86_64-linux ] needle: [ i686-linux, x86_64-darwin, x86_64-linux ] nehe-tuts: [ i686-linux, x86_64-linux ] @@ -3265,6 +3328,7 @@ dont-distribute-packages: network-bytestring: [ i686-linux, x86_64-linux ] network-connection: [ i686-linux, x86_64-linux ] network-dns: [ i686-linux, x86_64-darwin, x86_64-linux ] + network-hans: [ i686-linux, x86_64-darwin, x86_64-linux ] network-interfacerequest: [ x86_64-darwin ] network-ip: [ i686-linux, x86_64-darwin, x86_64-linux ] network-minihttp: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -3489,6 +3553,7 @@ dont-distribute-packages: Phsu: [ i686-linux, x86_64-darwin, x86_64-linux ] phybin: [ i686-linux, x86_64-linux ] pi-calculus: [ i686-linux, x86_64-linux ] + pi-forall: [ i686-linux, x86_64-darwin, x86_64-linux ] pianola: [ i686-linux, x86_64-darwin, x86_64-linux ] piet: [ i686-linux, x86_64-linux ] piki: [ i686-linux, x86_64-linux ] @@ -3504,6 +3569,7 @@ dont-distribute-packages: pipes-files: [ i686-linux, x86_64-linux ] pipes-network-tls: [ i686-linux, x86_64-darwin, x86_64-linux ] pipes-p2p-examples: [ i686-linux, x86_64-linux ] + pipes-protolude: [ i686-linux, x86_64-darwin, x86_64-linux ] pipes-shell: [ i686-linux, x86_64-linux ] pisigma: [ i686-linux, x86_64-linux ] Piso: [ i686-linux, x86_64-linux ] @@ -3549,6 +3615,7 @@ dont-distribute-packages: poppler: [ i686-linux, x86_64-linux ] porte: [ i686-linux, x86_64-linux ] porter: [ i686-linux, x86_64-darwin, x86_64-linux ] + PortFusion: [ i686-linux, x86_64-darwin, x86_64-linux ] ports: [ i686-linux, x86_64-darwin, x86_64-linux ] posix-acl: [ i686-linux, x86_64-linux ] posix-waitpid: [ i686-linux, x86_64-linux ] @@ -3560,6 +3627,7 @@ dont-distribute-packages: postgresql-simple-typed: [ i686-linux, x86_64-linux ] postgresql-typed: [ i686-linux, x86_64-linux ] PostgreSQL: [ i686-linux, x86_64-linux ] + postgrest-ws: [ i686-linux, x86_64-darwin, x86_64-linux ] postgrest: [ i686-linux, x86_64-darwin, x86_64-linux ] postie: [ i686-linux, x86_64-linux ] postmaster: [ i686-linux, x86_64-linux ] @@ -3693,6 +3761,7 @@ dont-distribute-packages: rad: [ i686-linux, x86_64-linux ] radium-formula-parser: [ i686-linux, x86_64-linux ] rados-haskell: [ i686-linux, x86_64-linux ] + raft: [ i686-linux, x86_64-darwin, x86_64-linux ] rail-compiler-editor: [ i686-linux, x86_64-darwin, x86_64-linux ] rainbow-tests: [ i686-linux, x86_64-darwin, x86_64-linux ] rakhana: [ i686-linux, x86_64-linux ] @@ -3720,6 +3789,7 @@ dont-distribute-packages: rcu: [ i686-linux, x86_64-linux ] rdf4h: [ i686-linux, x86_64-linux ] rdioh: [ i686-linux, x86_64-linux ] + react-tutorial-haskell-server: [ i686-linux, x86_64-darwin, x86_64-linux ] reaction-logic: [ i686-linux, x86_64-linux ] reactive-bacon: [ i686-linux, x86_64-linux ] reactive-balsa: [ i686-linux, x86_64-linux ] @@ -3792,6 +3862,7 @@ dont-distribute-packages: relational-record-examples: [ i686-linux, x86_64-linux ] relational-record: [ i686-linux, x86_64-linux ] relational-schemas: [ i686-linux, x86_64-linux ] + reload: [ i686-linux, x86_64-darwin, x86_64-linux ] remote-debugger: [ i686-linux, x86_64-linux ] remote-json-client: [ i686-linux, x86_64-linux ] remote-json-server: [ i686-linux, x86_64-linux ] @@ -3847,8 +3918,11 @@ dont-distribute-packages: ripple: [ i686-linux, x86_64-linux ] risc386: [ i686-linux, x86_64-linux ] rivers: [ i686-linux, x86_64-linux ] + rivet-simple-deploy: [ i686-linux, x86_64-darwin, x86_64-linux ] + rivet: [ i686-linux, x86_64-darwin, x86_64-linux ] RJson: [ i686-linux, x86_64-darwin, x86_64-linux ] Rlang-QQ: [ i686-linux, x86_64-darwin, x86_64-linux ] + rlwe-challenges: [ i686-linux, x86_64-darwin, x86_64-linux ] rmonad: [ i686-linux, x86_64-linux ] RMP: [ i686-linux, x86_64-linux ] RNAdesign: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -3995,12 +4069,14 @@ dont-distribute-packages: servant-github: [ i686-linux, x86_64-linux ] servant-haxl-client: [ i686-linux, x86_64-darwin, x86_64-linux ] servant-jquery: [ i686-linux, x86_64-linux ] + servant-matrix-param: [ i686-linux, x86_64-darwin, x86_64-linux ] servant-pandoc: [ i686-linux ] servant-pool: [ i686-linux, x86_64-linux ] servant-postgresql: [ i686-linux, x86_64-linux ] servant-purescript: [ i686-linux, x86_64-darwin, x86_64-linux ] servant-router: [ i686-linux, x86_64-darwin, x86_64-linux ] servant-scotty: [ i686-linux, x86_64-linux ] + servant-smsc-ru: [ i686-linux, x86_64-darwin, x86_64-linux ] servant-subscriber: [ i686-linux, x86_64-darwin, x86_64-linux ] servant-swagger: [ i686-linux, x86_64-linux ] serversession-backend-acid-state: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -4055,6 +4131,7 @@ dont-distribute-packages: simple-form: [ i686-linux, x86_64-linux ] simple-index: [ i686-linux, x86_64-darwin, x86_64-linux ] simple-log-syslog: [ i686-linux, x86_64-linux ] + simple-logger: [ i686-linux, x86_64-darwin, x86_64-linux ] simple-pascal: [ i686-linux, x86_64-linux ] simple-postgresql-orm: [ i686-linux, x86_64-darwin, x86_64-linux ] simple-vec3: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -4139,6 +4216,7 @@ dont-distribute-packages: snaplet-rest: [ i686-linux, x86_64-darwin, x86_64-linux ] snaplet-riak: [ i686-linux, x86_64-darwin, x86_64-linux ] snaplet-sass: [ i686-linux, x86_64-darwin, x86_64-linux ] + snaplet-scoped-session: [ i686-linux, x86_64-darwin, x86_64-linux ] snaplet-sedna: [ i686-linux, x86_64-darwin, x86_64-linux ] snaplet-ses-html: [ i686-linux, x86_64-darwin, x86_64-linux ] snaplet-sqlite-simple: [ i686-linux, x86_64-darwin, x86_64-linux ] @@ -4354,6 +4432,7 @@ dont-distribute-packages: TBit: [ i686-linux, x86_64-linux ] tbox: [ i686-linux, x86_64-linux ] tccli: [ i686-linux, x86_64-linux ] + tcp-streams: [ i686-linux, x86_64-darwin, x86_64-linux ] tcp: [ i686-linux, x86_64-linux ] tdd-util: [ i686-linux, x86_64-linux ] tdoc: [ i686-linux, x86_64-linux ] @@ -4364,6 +4443,7 @@ dont-distribute-packages: template-haskell-util: [ i686-linux, x86_64-darwin, x86_64-linux ] template-hsml: [ i686-linux, x86_64-darwin, x86_64-linux ] template-yj: [ i686-linux, x86_64-linux ] + templateify: [ i686-linux, x86_64-darwin, x86_64-linux ] tempodb: [ i686-linux, x86_64-linux ] temporal-csound: [ i686-linux, x86_64-linux, x86_64-darwin ] tempus: [ i686-linux, x86_64-linux ] @@ -4479,6 +4559,7 @@ dont-distribute-packages: transactional-events: [ i686-linux, x86_64-linux ] transf: [ i686-linux, x86_64-darwin, x86_64-linux ] transformations: [ i686-linux, x86_64-linux ] + TransformeR: [ i686-linux, x86_64-darwin, x86_64-linux ] transformers-convert: [ i686-linux, x86_64-linux ] transformers-eff: [ i686-linux, x86_64-linux ] transformers-runnable: [ i686-linux, x86_64-linux ] @@ -4584,6 +4665,7 @@ dont-distribute-packages: unroll-ghc-plugin: [ i686-linux, x86_64-linux ] unscramble: [ i686-linux, x86_64-linux ] unsequential: [ i686-linux, x86_64-darwin, x86_64-linux ] + unused: [ i686-linux, x86_64-darwin, x86_64-linux ] up: [ i686-linux, x86_64-linux ] uploadcare: [ i686-linux, x86_64-linux ] upskirt: [ i686-linux, x86_64-linux ] @@ -4665,6 +4747,7 @@ dont-distribute-packages: VKHS: [ i686-linux, x86_64-linux ] vowpal-utils: [ i686-linux, x86_64-linux ] voyeur: [ i686-linux, x86_64-linux ] + vrpn: [ i686-linux, x86_64-darwin, x86_64-linux ] vte: [ i686-linux, x86_64-linux ] vtegtk3: [ i686-linux, x86_64-linux ] vty-menu: [ i686-linux, x86_64-linux ] @@ -4695,6 +4778,7 @@ dont-distribute-packages: wai-middleware-static-caching: [ i686-linux, x86_64-linux ] wai-middleware-verbs: [ i686-linux, x86_64-darwin, x86_64-linux ] wai-routes: [ i686-linux, x86_64-linux ] + wai-session-mysql: [ i686-linux, x86_64-darwin, x86_64-linux ] wai-session-tokyocabinet: [ i686-linux, x86_64-linux ] wai-static-cache: [ i686-linux, x86_64-linux ] wai-thrift: [ i686-linux, x86_64-linux ] diff --git a/pkgs/development/haskell-modules/configuration-lts.nix b/pkgs/development/haskell-modules/configuration-lts.nix index 59f791e93bd..675debc74be 100644 --- a/pkgs/development/haskell-modules/configuration-lts.nix +++ b/pkgs/development/haskell-modules/configuration-lts.nix @@ -75,6 +75,7 @@ self: super: { "Agda" = doDistribute super."Agda_2_5_1"; "Agda-executable" = dontDistribute super."Agda-executable"; "AhoCorasick" = dontDistribute super."AhoCorasick"; + "AlanDeniseEricLauren" = dontDistribute super."AlanDeniseEricLauren"; "AlgorithmW" = dontDistribute super."AlgorithmW"; "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms"; "Allure" = dontDistribute super."Allure"; @@ -461,6 +462,7 @@ self: super: { "HTTP-Simple" = dontDistribute super."HTTP-Simple"; "HTab" = dontDistribute super."HTab"; "HTicTacToe" = dontDistribute super."HTicTacToe"; + "HUnit" = doDistribute super."HUnit_1_3_1_1"; "HUnit-Diff" = dontDistribute super."HUnit-Diff"; "HUnit-Plus" = dontDistribute super."HUnit-Plus"; "HUnit-approx" = dontDistribute super."HUnit-approx"; @@ -867,7 +869,14 @@ self: super: { "SpaceInvaders" = dontDistribute super."SpaceInvaders"; "SpacePrivateers" = dontDistribute super."SpacePrivateers"; "SpinCounter" = dontDistribute super."SpinCounter"; + "Spock" = doDistribute super."Spock_0_10_0_1"; + "Spock-api" = dontDistribute super."Spock-api"; + "Spock-api-ghcjs" = dontDistribute super."Spock-api-ghcjs"; + "Spock-api-server" = dontDistribute super."Spock-api-server"; "Spock-auth" = dontDistribute super."Spock-auth"; + "Spock-core" = dontDistribute super."Spock-core"; + "Spock-digestive" = doDistribute super."Spock-digestive_0_2_0_0"; + "Spock-worker" = doDistribute super."Spock-worker_0_3_0_0"; "SpreadsheetML" = dontDistribute super."SpreadsheetML"; "Sprig" = dontDistribute super."Sprig"; "Stasis" = dontDistribute super."Stasis"; @@ -880,6 +889,7 @@ self: super: { "StrategyLib" = dontDistribute super."StrategyLib"; "Stream" = dontDistribute super."Stream"; "StrictBench" = dontDistribute super."StrictBench"; + "StringUtils" = dontDistribute super."StringUtils"; "SuffixStructures" = dontDistribute super."SuffixStructures"; "SybWidget" = dontDistribute super."SybWidget"; "SyntaxMacros" = dontDistribute super."SyntaxMacros"; @@ -1598,6 +1608,7 @@ self: super: { "bond" = dontDistribute super."bond"; "bond-haskell" = dontDistribute super."bond-haskell"; "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; + "bookkeeper" = dontDistribute super."bookkeeper"; "boolean-list" = dontDistribute super."boolean-list"; "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; "boolexpr" = dontDistribute super."boolexpr"; @@ -1781,6 +1792,12 @@ self: super: { "casr-logbook" = dontDistribute super."casr-logbook"; "casr-logbook-html" = dontDistribute super."casr-logbook-html"; "casr-logbook-meta" = dontDistribute super."casr-logbook-meta"; + "casr-logbook-meta-html" = dontDistribute super."casr-logbook-meta-html"; + "casr-logbook-reports" = dontDistribute super."casr-logbook-reports"; + "casr-logbook-reports-html" = dontDistribute super."casr-logbook-reports-html"; + "casr-logbook-reports-meta" = dontDistribute super."casr-logbook-reports-meta"; + "casr-logbook-reports-meta-html" = dontDistribute super."casr-logbook-reports-meta-html"; + "casr-logbook-types" = dontDistribute super."casr-logbook-types"; "cassandra-cql" = dontDistribute super."cassandra-cql"; "cassandra-thrift" = dontDistribute super."cassandra-thrift"; "cassava-conduit" = dontDistribute super."cassava-conduit"; @@ -1863,6 +1880,7 @@ self: super: { "cil" = dontDistribute super."cil"; "cinvoke" = dontDistribute super."cinvoke"; "cio" = dontDistribute super."cio"; + "cipher-aes128" = doDistribute super."cipher-aes128_0_7_0_1"; "cipher-rc5" = dontDistribute super."cipher-rc5"; "ciphersaber2" = dontDistribute super."ciphersaber2"; "circ" = dontDistribute super."circ"; @@ -2035,6 +2053,7 @@ self: super: { "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; + "conduit-combinators" = doDistribute super."conduit-combinators_1_0_4"; "conduit-find" = dontDistribute super."conduit-find"; "conduit-merge" = dontDistribute super."conduit-merge"; "conduit-network-stream" = dontDistribute super."conduit-network-stream"; @@ -2121,6 +2140,7 @@ self: super: { "count" = dontDistribute super."count"; "countable" = dontDistribute super."countable"; "counter" = dontDistribute super."counter"; + "courier" = doDistribute super."courier_0_1_1_3"; "court" = dontDistribute super."court"; "coverage" = dontDistribute super."coverage"; "cpio-conduit" = dontDistribute super."cpio-conduit"; @@ -3172,6 +3192,7 @@ self: super: { "ghc-parmake" = dontDistribute super."ghc-parmake"; "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; + "ghc-prof" = dontDistribute super."ghc-prof"; "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph"; "ghc-server" = dontDistribute super."ghc-server"; "ghc-simple" = dontDistribute super."ghc-simple"; @@ -3832,6 +3853,7 @@ self: super: { "haspell" = dontDistribute super."haspell"; "hasql" = doDistribute super."hasql_0_19_14"; "hasql-backend" = dontDistribute super."hasql-backend"; + "hasql-class" = dontDistribute super."hasql-class"; "hasql-cursor-query" = dontDistribute super."hasql-cursor-query"; "hasql-cursor-transaction" = dontDistribute super."hasql-cursor-transaction"; "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; @@ -3921,6 +3943,7 @@ self: super: { "helics-wai" = dontDistribute super."helics-wai"; "helisp" = dontDistribute super."helisp"; "helium" = dontDistribute super."helium"; + "helium-overture" = dontDistribute super."helium-overture"; "helix" = dontDistribute super."helix"; "hell" = dontDistribute super."hell"; "hellage" = dontDistribute super."hellage"; @@ -4329,6 +4352,7 @@ self: super: { "hspec-test-framework" = dontDistribute super."hspec-test-framework"; "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; + "hspec-webdriver" = doDistribute super."hspec-webdriver_1_1_0"; "hspec2" = dontDistribute super."hspec2"; "hspecVariant" = dontDistribute super."hspecVariant"; "hspr-sh" = dontDistribute super."hspr-sh"; @@ -4406,6 +4430,7 @@ self: super: { "http-enumerator" = dontDistribute super."http-enumerator"; "http-kinder" = dontDistribute super."http-kinder"; "http-kit" = dontDistribute super."http-kit"; + "http-link-header" = doDistribute super."http-link-header_1_0_1"; "http-listen" = dontDistribute super."http-listen"; "http-monad" = dontDistribute super."http-monad"; "http-proxy" = dontDistribute super."http-proxy"; @@ -4587,6 +4612,7 @@ self: super: { "inilist" = dontDistribute super."inilist"; "inject" = dontDistribute super."inject"; "inject-function" = dontDistribute super."inject-function"; + "inline-c" = doDistribute super."inline-c_0_5_5_5"; "inline-c-win32" = dontDistribute super."inline-c-win32"; "inline-java" = dontDistribute super."inline-java"; "inline-r" = doDistribute super."inline-r_0_8_0_1"; @@ -4670,6 +4696,7 @@ self: super: { "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps"; "isobmff-builder" = dontDistribute super."isobmff-builder"; "isohunt" = dontDistribute super."isohunt"; + "isotope" = dontDistribute super."isotope"; "ispositive" = dontDistribute super."ispositive"; "itanium-abi" = dontDistribute super."itanium-abi"; "iter-stats" = dontDistribute super."iter-stats"; @@ -5318,10 +5345,10 @@ self: super: { "memexml" = dontDistribute super."memexml"; "memo-ptr" = dontDistribute super."memo-ptr"; "memo-sqlite" = dontDistribute super."memo-sqlite"; + "memorypool" = dontDistribute super."memorypool"; "memscript" = dontDistribute super."memscript"; "merge-bash-history" = dontDistribute super."merge-bash-history"; "mersenne-random" = dontDistribute super."mersenne-random"; - "mersenne-random-pure64" = doDistribute super."mersenne-random-pure64_0_2_0_5"; "messente" = dontDistribute super."messente"; "meta-misc" = dontDistribute super."meta-misc"; "meta-par" = dontDistribute super."meta-par"; @@ -5480,6 +5507,7 @@ self: super: { "montage" = dontDistribute super."montage"; "montage-client" = dontDistribute super."montage-client"; "monte-carlo" = dontDistribute super."monte-carlo"; + "monzo" = dontDistribute super."monzo"; "moo" = dontDistribute super."moo"; "moonshine" = dontDistribute super."moonshine"; "morfette" = dontDistribute super."morfette"; @@ -5671,6 +5699,7 @@ self: super: { "network-stream" = dontDistribute super."network-stream"; "network-topic-models" = dontDistribute super."network-topic-models"; "network-transport-amqp" = dontDistribute super."network-transport-amqp"; + "network-uri-flag" = dontDistribute super."network-uri-flag"; "network-uri-static" = dontDistribute super."network-uri-static"; "network-wai-router" = dontDistribute super."network-wai-router"; "network-websocket" = dontDistribute super."network-websocket"; @@ -5730,6 +5759,7 @@ self: super: { "np-linear" = dontDistribute super."np-linear"; "nptools" = dontDistribute super."nptools"; "nth-prime" = dontDistribute super."nth-prime"; + "ntha" = dontDistribute super."ntha"; "nthable" = dontDistribute super."nthable"; "ntp-control" = dontDistribute super."ntp-control"; "null-canvas" = dontDistribute super."null-canvas"; @@ -6066,6 +6096,7 @@ self: super: { "pipes-files" = dontDistribute super."pipes-files"; "pipes-http" = doDistribute super."pipes-http_1_0_3"; "pipes-interleave" = dontDistribute super."pipes-interleave"; + "pipes-io" = dontDistribute super."pipes-io"; "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv"; "pipes-lzma" = dontDistribute super."pipes-lzma"; "pipes-network-tls" = dontDistribute super."pipes-network-tls"; @@ -6112,6 +6143,7 @@ self: super: { "pnm" = dontDistribute super."pnm"; "pocket-dns" = dontDistribute super."pocket-dns"; "pointed" = doDistribute super."pointed_4_2_0_2"; + "pointedalternative" = dontDistribute super."pointedalternative"; "pointfree" = dontDistribute super."pointfree"; "pointless-haskell" = dontDistribute super."pointless-haskell"; "pointless-lenses" = dontDistribute super."pointless-lenses"; @@ -6156,6 +6188,7 @@ self: super: { "ports-tools" = dontDistribute super."ports-tools"; "positive" = dontDistribute super."positive"; "posix-acl" = dontDistribute super."posix-acl"; + "posix-error-codes" = dontDistribute super."posix-error-codes"; "posix-escape" = dontDistribute super."posix-escape"; "posix-filelock" = dontDistribute super."posix-filelock"; "posix-paths" = dontDistribute super."posix-paths"; @@ -6171,6 +6204,7 @@ self: super: { "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape"; "postgresql-cube" = dontDistribute super."postgresql-cube"; "postgresql-error-codes" = dontDistribute super."postgresql-error-codes"; + "postgresql-libpq" = doDistribute super."postgresql-libpq_0_9_1_1"; "postgresql-query" = dontDistribute super."postgresql-query"; "postgresql-simple-bind" = dontDistribute super."postgresql-simple-bind"; "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; @@ -6307,6 +6341,7 @@ self: super: { "pugs-hsregex" = dontDistribute super."pugs-hsregex"; "pulse" = dontDistribute super."pulse"; "pulse-simple" = dontDistribute super."pulse-simple"; + "pulseaudio" = dontDistribute super."pulseaudio"; "punkt" = dontDistribute super."punkt"; "punycode" = dontDistribute super."punycode"; "puppetresources" = dontDistribute super."puppetresources"; @@ -6432,6 +6467,8 @@ self: super: { "ratio-int" = dontDistribute super."ratio-int"; "raven-haskell" = dontDistribute super."raven-haskell"; "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; + "raw-feldspar" = dontDistribute super."raw-feldspar"; + "rawr" = dontDistribute super."rawr"; "rawstring-qm" = dontDistribute super."rawstring-qm"; "razom-text-util" = dontDistribute super."razom-text-util"; "rbr" = dontDistribute super."rbr"; @@ -6444,6 +6481,7 @@ self: super: { "rdtsc-enolan" = dontDistribute super."rdtsc-enolan"; "re2" = dontDistribute super."re2"; "react-flux" = dontDistribute super."react-flux"; + "react-flux-servant" = dontDistribute super."react-flux-servant"; "react-haskell" = dontDistribute super."react-haskell"; "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server"; "reaction-logic" = dontDistribute super."reaction-logic"; @@ -6591,6 +6629,7 @@ self: super: { "representable-tries" = dontDistribute super."representable-tries"; "reqcatcher" = dontDistribute super."reqcatcher"; "request-monad" = dontDistribute super."request-monad"; + "reroute" = doDistribute super."reroute_0_3_1_0"; "reserve" = dontDistribute super."reserve"; "resistor-cube" = dontDistribute super."resistor-cube"; "resource-effect" = dontDistribute super."resource-effect"; @@ -6855,6 +6894,7 @@ self: super: { "serv-wai" = dontDistribute super."serv-wai"; "servant-aeson-specs" = dontDistribute super."servant-aeson-specs"; "servant-auth-cookie" = dontDistribute super."servant-auth-cookie"; + "servant-auth-hmac" = dontDistribute super."servant-auth-hmac"; "servant-auth-token" = dontDistribute super."servant-auth-token"; "servant-auth-token-api" = dontDistribute super."servant-auth-token-api"; "servant-csharp" = dontDistribute super."servant-csharp"; @@ -6963,6 +7003,7 @@ self: super: { "simple-config" = dontDistribute super."simple-config"; "simple-css" = dontDistribute super."simple-css"; "simple-download" = dontDistribute super."simple-download"; + "simple-effects" = dontDistribute super."simple-effects"; "simple-eval" = dontDistribute super."simple-eval"; "simple-firewire" = dontDistribute super."simple-firewire"; "simple-form" = dontDistribute super."simple-form"; @@ -7024,6 +7065,7 @@ self: super: { "sleep" = dontDistribute super."sleep"; "slice-cpp-gen" = dontDistribute super."slice-cpp-gen"; "slidemews" = dontDistribute super."slidemews"; + "slim" = dontDistribute super."slim"; "sloane" = dontDistribute super."sloane"; "slot-lambda" = dontDistribute super."slot-lambda"; "sloth" = dontDistribute super."sloth"; @@ -7273,6 +7315,7 @@ self: super: { "stm-split" = dontDistribute super."stm-split"; "stm-tlist" = dontDistribute super."stm-tlist"; "stmcontrol" = dontDistribute super."stmcontrol"; + "stochastic" = dontDistribute super."stochastic"; "stomp-conduit" = dontDistribute super."stomp-conduit"; "stomp-patterns" = dontDistribute super."stomp-patterns"; "stomp-queue" = dontDistribute super."stomp-queue"; @@ -7465,12 +7508,14 @@ self: super: { "task-distribution" = dontDistribute super."task-distribution"; "taskpool" = dontDistribute super."taskpool"; "tasty" = doDistribute super."tasty_0_11_0_3"; + "tasty-golden" = doDistribute super."tasty-golden_2_3_1"; "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters"; "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; "tasty-integrate" = dontDistribute super."tasty-integrate"; "tasty-laws" = dontDistribute super."tasty-laws"; "tasty-lens" = dontDistribute super."tasty-lens"; "tasty-program" = dontDistribute super."tasty-program"; + "tasty-silver" = doDistribute super."tasty-silver_3_1_8_1"; "tateti-tateti" = dontDistribute super."tateti-tateti"; "tau" = dontDistribute super."tau"; "tbox" = dontDistribute super."tbox"; @@ -7940,6 +7985,7 @@ self: super: { "uri" = dontDistribute super."uri"; "uri-bytestring" = doDistribute super."uri-bytestring_0_2_1_2"; "uri-conduit" = dontDistribute super."uri-conduit"; + "uri-encode" = doDistribute super."uri-encode_1_5_0_4"; "uri-enumerator" = dontDistribute super."uri-enumerator"; "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; "uri-template" = dontDistribute super."uri-template"; @@ -8016,6 +8062,7 @@ self: super: { "vector-bytestring" = dontDistribute super."vector-bytestring"; "vector-clock" = dontDistribute super."vector-clock"; "vector-conduit" = dontDistribute super."vector-conduit"; + "vector-fftw" = doDistribute super."vector-fftw_0_1_3_6"; "vector-functorlazy" = dontDistribute super."vector-functorlazy"; "vector-heterogenous" = dontDistribute super."vector-heterogenous"; "vector-instances-collections" = dontDistribute super."vector-instances-collections"; @@ -8106,6 +8153,7 @@ self: super: { "wai-predicates" = doDistribute super."wai-predicates_0_8_6"; "wai-request-spec" = dontDistribute super."wai-request-spec"; "wai-responsible" = dontDistribute super."wai-responsible"; + "wai-route" = doDistribute super."wai-route_0_3_1"; "wai-router" = dontDistribute super."wai-router"; "wai-routing" = doDistribute super."wai-routing_0_12_3"; "wai-session-alt" = dontDistribute super."wai-session-alt"; @@ -8150,6 +8198,7 @@ self: super: { "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver-angular" = doDistribute super."webdriver-angular_0_1_10"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; "webfinger-client" = dontDistribute super."webfinger-client"; "webidl" = dontDistribute super."webidl"; @@ -8188,6 +8237,7 @@ self: super: { "winerror" = dontDistribute super."winerror"; "winio" = dontDistribute super."winio"; "wire-streams" = dontDistribute super."wire-streams"; + "wires" = dontDistribute super."wires"; "wiring" = dontDistribute super."wiring"; "witness" = dontDistribute super."witness"; "witty" = dontDistribute super."witty"; @@ -8351,6 +8401,7 @@ self: super: { "yesod-angular" = dontDistribute super."yesod-angular"; "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; "yesod-auth" = doDistribute super."yesod-auth_1_4_13_3"; + "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_2"; "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_5_1_1"; "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; @@ -8416,6 +8467,7 @@ self: super: { "yi-emacs-colours" = dontDistribute super."yi-emacs-colours"; "yi-gtk" = dontDistribute super."yi-gtk"; "yi-monokai" = dontDistribute super."yi-monokai"; + "yi-rope" = doDistribute super."yi-rope_0_7_0_1"; "yi-snippet" = dontDistribute super."yi-snippet"; "yi-solarized" = dontDistribute super."yi-solarized"; "yi-spolsky" = dontDistribute super."yi-spolsky"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 26ed77e7a99..a3191794d3b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -820,6 +820,27 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "AlanDeniseEricLauren" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-core, MonadRandom + , mtl, QuickCheck, random, random-shuffle, transformers, vector + }: + mkDerivation { + pname = "AlanDeniseEricLauren"; + version = "0.1.0.1"; + sha256 = "52338386938ad8fca09a2c3d1dc5fd34580749f89ea190fbc553d795a8e9b083"; + libraryHaskellDepends = [ + base containers MonadRandom mtl random random-shuffle vector + ]; + testHaskellDepends = [ + base containers hspec hspec-core MonadRandom QuickCheck random + transformers + ]; + jailbreak = true; + homepage = "http://github.com/enolan/AlanDeniseEricLauren"; + description = "Find the minimal subset/submap satisfying some property"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "AlgorithmW" = callPackage ({ mkDerivation, base, containers, mtl, pretty }: mkDerivation { @@ -1357,12 +1378,11 @@ self: { }: mkDerivation { pname = "BiGUL"; - version = "1.0.0"; - sha256 = "f4fe9d078b3f7b3db8d39be54877ff912c0c7f37774a82c728edab713efc6775"; + version = "1.0.1"; + sha256 = "91727be408a414f83f9cb26ef7d5ee9a46ec6167e61423b82bf508dda2383f59"; libraryHaskellDepends = [ base containers mtl template-haskell th-extras ]; - jailbreak = true; homepage = "http://www.prg.nii.ac.jp/project/bigul/"; description = "The Bidirectional Generic Update Language"; license = stdenv.lib.licenses.publicDomain; @@ -3194,15 +3214,23 @@ self: { }) {}; "ContextAlgebra" = callPackage - ({ mkDerivation, base, containers, lattices, multiset }: + ({ mkDerivation, base, containers, criterion, multiset, QuickCheck + , statistics, vector + }: mkDerivation { pname = "ContextAlgebra"; - version = "0.2.0.1"; - sha256 = "5b2e0503f9bb506a2aa5e160a49b598de7aeea34c187f3550ab5dbc5967d14d1"; - libraryHaskellDepends = [ base containers lattices multiset ]; + version = "1.0.0.0"; + sha256 = "272e9209c1b5f627912378b260ffd9191eb32f73932ab3eb329cc0b77e7e22f6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers criterion multiset QuickCheck statistics vector + ]; jailbreak = true; - description = "Context Algebra"; + homepage = "https://github.com/juergenhah/ContextAlgebra"; + description = "Implementation of the context algebra"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Contract" = callPackage @@ -5083,6 +5111,7 @@ self: { ]; description = "A command-line FTP client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Facts" = callPackage @@ -6989,17 +7018,21 @@ self: { }) {}; "HDBC-mysql" = callPackage - ({ mkDerivation, base, bytestring, HDBC, time, utf8-string }: + ({ mkDerivation, base, bytestring, HDBC, mysqlclient, time + , utf8-string + }: mkDerivation { pname = "HDBC-mysql"; - version = "0.6.6.1"; - sha256 = "35f1f32f20e9122800cde9eaf07d41e17b8786269f79125e31502cadacefa0e0"; + version = "0.6.6.4"; + sha256 = "01df81920b9a005cd9e11467aa5e05b10534d284933fddc34991400e5888048b"; libraryHaskellDepends = [ base bytestring HDBC time utf8-string ]; - homepage = "http://github.com/bos/hdbc-mysql"; + librarySystemDepends = [ mysqlclient ]; + jailbreak = true; + homepage = "https://github.com/ryantm/hdbc-mysql"; description = "MySQL driver for HDBC"; license = "LGPL"; hydraPlatforms = [ "x86_64-darwin" ]; - }) {}; + }) {mysqlclient = null;}; "HDBC-odbc" = callPackage ({ mkDerivation, base, bytestring, concurrent-extra, HDBC, mtl @@ -8156,10 +8189,12 @@ self: { pname = "HSlippyMap"; version = "2.2"; sha256 = "a9943b4a20f22c3c0ac34f097abbc18c53ec5639e8e82d1e879c9ea4f69dc19e"; + revision = "2"; + editedCabalFile = "31ff4b5f5128f8ebd327f4af1dbb711dbfc906757e97526497a58865f5d18347"; libraryHaskellDepends = [ base ]; jailbreak = true; - homepage = "https://github.com/j4/HSlippyMap"; - description = "OpenStreetMap Slippy Map"; + homepage = "https://github.com/41px/HSlippyMap"; + description = "OpenStreetMap (OSM) Slippy Map"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -8355,7 +8390,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "HUnit" = callPackage + "HUnit_1_3_1_1" = callPackage ({ mkDerivation, base, deepseq, filepath }: mkDerivation { pname = "HUnit"; @@ -8363,6 +8398,20 @@ self: { sha256 = "93e5fc4290ab685b469209f04d9858338ffff486e15c23a11260c47e32da8ef8"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq filepath ]; + homepage = "https://github.com/hspec/HUnit#readme"; + description = "A unit testing framework for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "HUnit" = callPackage + ({ mkDerivation, base, deepseq, filepath }: + mkDerivation { + pname = "HUnit"; + version = "1.3.1.2"; + sha256 = "badebf99ae5a4982cdf2f8932f080e349240dc2b75c40e75ce2518ea086c5381"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base deepseq filepath ]; doCheck = false; homepage = "https://github.com/hspec/HUnit#readme"; description = "A unit testing framework for Haskell"; @@ -10964,8 +11013,8 @@ self: { }: mkDerivation { pname = "LibZip"; - version = "0.11.1"; - sha256 = "cecc9b9d5f38c2f758e4f316f5dbc2c93fb2d81011791f23c44044895f82df12"; + version = "1.0.1"; + sha256 = "a636e0202d2a3f60d894a814bd9834cf8c62313b67ccc48c295f02a4bebe425f"; libraryHaskellDepends = [ base bindings-libzip bytestring filepath mtl time utf8-string ]; @@ -12381,6 +12430,7 @@ self: { jailbreak = true; description = "Context Algebra of near"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Neks" = callPackage @@ -13832,6 +13882,7 @@ self: { homepage = "http://fusion.corsis.eu"; description = "high-performance distributed reverse / forward proxy & tunneling for TCP"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PortMidi_0_1_6_0" = callPackage @@ -16107,7 +16158,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Spock" = callPackage + "Spock_0_10_0_1" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, containers, crypto-random, directory, focus , hashable, hspec, hspec-wai, http-types, hvect, list-t @@ -16120,6 +16171,8 @@ self: { pname = "Spock"; version = "0.10.0.1"; sha256 = "ef80deb37728e89369f34c3a8cc9c4190d8aa50911a08a9e1e0c1993466595d2"; + revision = "1"; + editedCabalFile = "4c9fc2e3aae3df4e64c014a0fcba192dda7e1bd244c87145e0723bf0c6b2abf4"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers crypto-random directory focus hashable http-types hvect list-t @@ -16131,12 +16184,82 @@ self: { base base64-bytestring bytestring hspec hspec-wai http-types reroute stm text time unordered-containers wai wai-extra ]; + jailbreak = true; homepage = "http://www.spock.li"; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "Spock" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect + , list-t, monad-control, mtl, reroute, resource-pool, resourcet + , Spock-core, stm, stm-containers, text, time, transformers + , transformers-base, unordered-containers, vault, wai, wai-extra + }: + mkDerivation { + pname = "Spock"; + version = "0.11.0.0"; + sha256 = "9dcc232e83860d28f44bd4f35a8b38e59330ada78a30c661aaddf244f4a5deb3"; + libraryHaskellDepends = [ + base base64-bytestring bytestring containers cryptonite focus + hashable http-types hvect list-t monad-control mtl reroute + resource-pool resourcet Spock-core stm stm-containers text time + transformers transformers-base unordered-containers vault wai + ]; + testHaskellDepends = [ + base bytestring hspec hspec-wai Spock-core stm text time + unordered-containers vault wai wai-extra + ]; + homepage = "https://www.spock.li"; + description = "Another Haskell web framework for rapid development"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; + "Spock-api" = callPackage + ({ mkDerivation, aeson, base, deepseq, hvect, reroute }: + mkDerivation { + pname = "Spock-api"; + version = "0.11.0.0"; + sha256 = "993272b289d95f2e7e704b24d8297b63257b1434ec205faddf8a2ec7bc1aea29"; + libraryHaskellDepends = [ aeson base deepseq hvect reroute ]; + homepage = "https://www.spock.li"; + description = "Another Haskell web framework for rapid development"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "Spock-api-ghcjs" = callPackage + ({ mkDerivation, aeson, base, bytestring, ghcjs-base, hvect + , Spock-api, text + }: + mkDerivation { + pname = "Spock-api-ghcjs"; + version = "0.11.0.0"; + sha256 = "d533e4e76c50e8120675d0bbe1c7dd8d6909a4c7455cf0eea2ee75b7d868518c"; + libraryHaskellDepends = [ + aeson base bytestring ghcjs-base hvect Spock-api text + ]; + jailbreak = true; + homepage = "https://www.spock.li"; + description = "Another Haskell web framework for rapid development"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {ghcjs-base = null;}; + + "Spock-api-server" = callPackage + ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }: + mkDerivation { + pname = "Spock-api-server"; + version = "0.11.0.0"; + sha256 = "35d0fd72caed2bd4e2cc52d2a39b3af528845ec9bc58cf64dfe4b6ccd956ac3d"; + libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ]; + homepage = "https://www.spock.li"; + description = "Another Haskell web framework for rapid development"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Spock-auth" = callPackage ({ mkDerivation, base, http-types, Spock, text, time }: mkDerivation { @@ -16151,7 +16274,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Spock-digestive" = callPackage + "Spock-core" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , case-insensitive, containers, cookie, directory, hashable, hspec + , hspec-wai, http-types, hvect, mtl, old-locale, path-pieces + , reroute, resourcet, stm, text, time, transformers + , unordered-containers, vault, wai, wai-extra, warp + }: + mkDerivation { + pname = "Spock-core"; + version = "0.11.0.0"; + sha256 = "d6339c4b8e5ac3a98e5545e3f4c64f1ff515c125ae9fb33d2176972e1244aa9a"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive containers + cookie directory hashable http-types hvect mtl old-locale + path-pieces reroute resourcet stm text time transformers + unordered-containers vault wai wai-extra warp + ]; + testHaskellDepends = [ + base base64-bytestring bytestring hspec hspec-wai http-types + reroute text time transformers unordered-containers wai + ]; + homepage = "https://www.spock.li"; + description = "Another Haskell web framework for rapid development"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "Spock-digestive_0_2_0_0" = callPackage ({ mkDerivation, base, digestive-functors, http-types, mtl, Spock , text, unordered-containers, wai }: @@ -16159,10 +16308,31 @@ self: { pname = "Spock-digestive"; version = "0.2.0.0"; sha256 = "e5571d88d7b9dcafc7f5c364c8499a1d8d698d1698f2615b5f26698c85080260"; + revision = "1"; + editedCabalFile = "040e9c024b49a598fe3fa0a5aa2593e601c1d47b16986d7a52de079c7dac0c35"; libraryHaskellDepends = [ base digestive-functors http-types mtl Spock text unordered-containers wai ]; + jailbreak = true; + homepage = "https://github.com/agrafix/Spock-digestive"; + description = "Digestive functors support for Spock"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "Spock-digestive" = callPackage + ({ mkDerivation, base, digestive-functors, http-types, mtl + , Spock-core, text, unordered-containers, wai + }: + mkDerivation { + pname = "Spock-digestive"; + version = "0.3.0.0"; + sha256 = "09b6109853feb5f1bb4453cd74b9aa65f3b1fcdab5601e0ccd8dd08165f2acfa"; + libraryHaskellDepends = [ + base digestive-functors http-types mtl Spock-core text + unordered-containers wai + ]; homepage = "https://github.com/agrafix/Spock-digestive"; description = "Digestive functors support for Spock"; license = stdenv.lib.licenses.mit; @@ -16184,7 +16354,7 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "Spock-worker" = callPackage + "Spock-worker_0_3_0_0" = callPackage ({ mkDerivation, base, containers, errors, HTF, lifted-base, mtl , Spock, stm, text, time, transformers, vector }: @@ -16192,6 +16362,28 @@ self: { pname = "Spock-worker"; version = "0.3.0.0"; sha256 = "f5ec5c09125a6dd6c6cd0534a1eb7bc0d6bfe9908f7328d999bf14bd785835f3"; + revision = "1"; + editedCabalFile = "4e69af8f88f8afd53d7c02d5fb5171de1f584e039d638b15b223e3e6f1a434c5"; + libraryHaskellDepends = [ + base containers errors lifted-base mtl Spock stm text time + transformers vector + ]; + testHaskellDepends = [ base containers HTF stm vector ]; + jailbreak = true; + homepage = "http://github.com/agrafix/Spock-worker"; + description = "Background workers for Spock"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "Spock-worker" = callPackage + ({ mkDerivation, base, containers, errors, HTF, lifted-base, mtl + , Spock, stm, text, time, transformers, vector + }: + mkDerivation { + pname = "Spock-worker"; + version = "0.3.1.0"; + sha256 = "edc009d59fe528ab3bee887b8092f720a8a4ee85b550dec065964ed55c76dc4b"; libraryHaskellDepends = [ base containers errors lifted-base mtl Spock stm text time transformers vector @@ -16393,6 +16585,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "StringUtils" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "StringUtils"; + version = "0.1.0.0"; + sha256 = "9208f603ae362ab0788b7f61aa424e7b929e4eaaea97b6eca0a1b83c51eaacdb"; + libraryHaskellDepends = [ base ]; + jailbreak = true; + description = "String manipulation utilities"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "SuffixStructures" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cereal, cmdargs , containers, data-default-class, ListLike, primitive, vector @@ -17002,6 +17206,7 @@ self: { homepage = "https://github.com/remysucre/TransformeR#readme"; description = "eDSL in R for Safe Variable Transformarion"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TransformersStepByStep" = callPackage @@ -20332,6 +20537,8 @@ self: { pname = "aeson-better-errors"; version = "0.9.0.1"; sha256 = "125f4453f945b5b051fa596cd148b7db0414942cdfbe1d6fd0359989ab45d8e6"; + revision = "1"; + editedCabalFile = "8aa3d1ad76116aad051bc6adce10e2798191bdd6ecf84145687e5c77d3a7a2c2"; libraryHaskellDepends = [ aeson base bytestring dlist mtl scientific text transformers transformers-compat unordered-containers vector void @@ -23756,6 +23963,7 @@ self: { jailbreak = true; description = "A small, general-purpose programming language"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "animalcase" = callPackage @@ -25821,7 +26029,6 @@ self: { base bytestring directory filepath FontyFruity JuicyPixels optparse-applicative rasterific-svg svg-tree text ]; - doCheck = false; description = "Pretty rendering of Ascii diagram into svg or png"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -26271,14 +26478,14 @@ self: { }) {}; "atmos" = callPackage - ({ mkDerivation, base, dimensional, dimensional-tf, HUnit - , test-framework, test-framework-hunit + ({ mkDerivation, base, dimensional, HUnit, test-framework + , test-framework-hunit }: mkDerivation { pname = "atmos"; - version = "0.3.0.0"; - sha256 = "6d53dff23edae529d31084bcb9606ac0b2268c2b8664f693e9841af670883ed4"; - libraryHaskellDepends = [ base dimensional dimensional-tf ]; + version = "0.4.0.0"; + sha256 = "4bc25f5e4a93440f61495cc2fd33a06a1f0bd1193977937ebf1e83e22fb21999"; + libraryHaskellDepends = [ base dimensional ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit ]; @@ -30721,8 +30928,8 @@ self: { ({ mkDerivation, base, bindings-DSL, libzip }: mkDerivation { pname = "bindings-libzip"; - version = "0.11"; - sha256 = "3243580c2f9c716e28b367b82f253a0ee16d401c332eee24eec76cb521b91343"; + version = "1.0.1"; + sha256 = "908d060360d66974b1d9400dea28a1dce35a88baf5d73a6e3c12be8e74cda2ec"; libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ libzip ]; homepage = "http://bitbucket.org/astanin/hs-libzip/"; @@ -30755,6 +30962,7 @@ self: { homepage = "https://github.com/fizruk/bindings-lxc"; description = "Direct Haskell bindings to LXC (Linux containers) C API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) lxc;}; "bindings-mmap" = callPackage @@ -32895,8 +33103,8 @@ self: { }: mkDerivation { pname = "bond"; - version = "0.4.1.0"; - sha256 = "6a18c8ac814ee9bfea069dfde24cc5d357f05a2b67c0429a0e135f83bf44e6a5"; + version = "0.5.0.0"; + sha256 = "3720a7004ebe8b1334bbc1c2fe240f20a49fbb1ca9003a5f7257dad5ed2ba3ab"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -32927,8 +33135,8 @@ self: { }: mkDerivation { pname = "bond-haskell"; - version = "0.1.3.0"; - sha256 = "37b7dc9229b423772bd44d796aae5cd50daedfe745deaf3fdd6d75139ac4b341"; + version = "0.1.4.0"; + sha256 = "5590a50af8e143df9b0fd9dcee284fde9f051a8684dd45f3c769ce1d54f10419"; libraryHaskellDepends = [ aeson array base binary bond-haskell-compiler bytestring containers deepseq extra hashable mtl scientific text unordered-containers @@ -32947,15 +33155,17 @@ self: { "bond-haskell-compiler" = callPackage ({ mkDerivation, aeson, base, bond, bytestring, cmdargs, directory - , filepath, haskell-src-exts, monad-loops + , filepath, haskell-src-exts, monad-loops, text }: mkDerivation { pname = "bond-haskell-compiler"; - version = "0.1.3.1"; - sha256 = "ec6a50128f18f5278d6296883d361145cd3de0cdafb319ef8fa17fbd6b3a10c2"; + version = "0.1.4.0"; + sha256 = "729134e6f72594997ddf4f96c237d9ac9ab8e6c6fc5a8098c1cf17623d6de266"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bond filepath haskell-src-exts ]; + libraryHaskellDepends = [ + base bond filepath haskell-src-exts text + ]; executableHaskellDepends = [ aeson base bond bytestring cmdargs directory filepath monad-loops ]; @@ -32966,6 +33176,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bookkeeper" = callPackage + ({ mkDerivation, base, data-default-class, doctest, Glob, hspec + , markdown-unlit, QuickCheck, type-level-sets, yaml + }: + mkDerivation { + pname = "bookkeeper"; + version = "0.2.2.0"; + sha256 = "713c92318b14a7592a83ccc7fc575ee709c73ccd9c93e9e418bca8c2a1a5b219"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base data-default-class type-level-sets + ]; + executableHaskellDepends = [ + base data-default-class markdown-unlit type-level-sets + ]; + testHaskellDepends = [ + base data-default-class doctest Glob hspec QuickCheck + type-level-sets yaml + ]; + homepage = "http://github.com/turingjump/bookkeeper#readme"; + description = "Anonymous records and overloaded labels"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bool-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -35645,10 +35881,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.0"; - sha256 = "cc9e277133d371d8ffd8e0755464051f132775e1400981573db26aef7610c152"; - revision = "1"; - editedCabalFile = "ac3c02fa357a9aa1e262de189e43e935cbe7aab9b313bb355314884cb5a0307d"; + version = "2.0.1"; + sha256 = "f271eb8de00952c01a4860846fa0c6f9cad3e91378a073c0b7416eb6a51ca230"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35907,7 +36141,6 @@ self: { aeson async base base16-bytestring bytestring directory free hlint lens mtl text ]; - doCheck = false; homepage = "https://github.com/centromere/cacophony"; description = "A library implementing the Noise protocol"; license = stdenv.lib.licenses.publicDomain; @@ -36261,30 +36494,27 @@ self: { }) {}; "camfort" = callPackage - ({ mkDerivation, alex, array, base, bytestring, comonad, containers - , directory, fclabels, fgl, filepath, fortran-src, generic-deriving - , GenericPretty, ghc-prim, happy, haskell-src, hmatrix, hspec - , language-fortran, matrix, mtl, QuickCheck, syb, syz - , template-haskell, text, transformers, uniplate, vector + ({ mkDerivation, alex, array, base, bytestring, containers + , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim + , happy, hmatrix, hspec, matrix, mtl, QuickCheck, syb, syz, text + , transformers, uniplate, vector }: mkDerivation { pname = "camfort"; - version = "0.804"; - sha256 = "45a0d5df36e9cd948b37eb8bdf51cbe8e9b414b09a402214fc4873c4f77f3b2d"; + version = "0.900"; + sha256 = "fc92d5a5d5ecf42470d4f7aea2848eb785e44ba925949df86599e7b96f4a4427"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bytestring comonad containers directory fclabels fgl - filepath fortran-src generic-deriving GenericPretty ghc-prim - haskell-src hmatrix language-fortran matrix mtl syb syz - template-haskell text transformers uniplate vector + array base bytestring containers directory fgl filepath fortran-src + GenericPretty ghc-prim hmatrix matrix mtl syb syz text transformers + uniplate vector ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ - array base bytestring comonad containers directory fclabels fgl - filepath fortran-src generic-deriving GenericPretty ghc-prim - haskell-src hmatrix language-fortran matrix mtl QuickCheck syb syz - template-haskell text transformers uniplate vector + array base bytestring containers directory fgl filepath fortran-src + GenericPretty ghc-prim hmatrix matrix mtl QuickCheck syb syz text + transformers uniplate vector ]; testHaskellDepends = [ array base bytestring containers directory filepath fortran-src @@ -36418,6 +36648,7 @@ self: { jailbreak = true; description = "Date / time parsing utilities that try to guess the date / time format"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "canteven-template" = callPackage @@ -36947,14 +37178,23 @@ self: { }) {}; "casr-logbook" = callPackage - ({ mkDerivation, base, containers, digit, directory, doctest - , filepath, lens, QuickCheck, template-haskell, time + ({ mkDerivation, base, casr-logbook-html, casr-logbook-meta + , casr-logbook-meta-html, casr-logbook-reports + , casr-logbook-reports-html, casr-logbook-reports-meta + , casr-logbook-reports-meta-html, casr-logbook-types, digit + , directory, doctest, filepath, lucid, QuickCheck, template-haskell + , time }: mkDerivation { pname = "casr-logbook"; - version = "0.1.3"; - sha256 = "5cf395400ffe15ad83522d98f3c6626d3755fef5ef538cda1ce00cb3e7cb342f"; - libraryHaskellDepends = [ base containers digit lens time ]; + version = "0.2.2"; + sha256 = "2eeb37db62ead7f718d4ef252e6492f4d2ff827fc24cc58f8da6f3205fe37fb6"; + libraryHaskellDepends = [ + base casr-logbook-html casr-logbook-meta casr-logbook-meta-html + casr-logbook-reports casr-logbook-reports-html + casr-logbook-reports-meta casr-logbook-reports-meta-html + casr-logbook-types digit lucid time + ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; @@ -36964,15 +37204,16 @@ self: { }) {}; "casr-logbook-html" = callPackage - ({ mkDerivation, base, casr-logbook, digit, directory, doctest - , filepath, lens, lucid, QuickCheck, template-haskell, text, time + ({ mkDerivation, base, casr-logbook-types, digit, directory + , doctest, filepath, lens, lucid, QuickCheck, template-haskell + , text, time }: mkDerivation { pname = "casr-logbook-html"; - version = "0.0.1"; - sha256 = "9ab0cd9a42379fb4f892f00558802de86556727b6d898c8034291b27b6909079"; + version = "0.0.2"; + sha256 = "0a9cadd97d0b821a78e262b858b6ab650c7e72274d640ec8d6c8806f9aa090bd"; libraryHaskellDepends = [ - base casr-logbook digit lens lucid text time + base casr-logbook-types digit lens lucid text time ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell @@ -36984,14 +37225,14 @@ self: { }) {}; "casr-logbook-meta" = callPackage - ({ mkDerivation, base, casr-logbook, directory, doctest, filepath - , lens, QuickCheck, template-haskell + ({ mkDerivation, base, casr-logbook-types, directory, doctest + , filepath, lens, QuickCheck, template-haskell }: mkDerivation { pname = "casr-logbook-meta"; - version = "0.0.2"; - sha256 = "68460e46a3f7367efbd46a72daa802ee249321ffddb3ad5b4630115e2be692de"; - libraryHaskellDepends = [ base casr-logbook lens ]; + version = "0.0.4"; + sha256 = "8f8ee4b7b59a3f5719a92c7c17f2f83e9087345657c6805d139bf5af1d9a6c90"; + libraryHaskellDepends = [ base casr-logbook-types lens ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; @@ -37000,6 +37241,126 @@ self: { license = "unknown"; }) {}; + "casr-logbook-meta-html" = callPackage + ({ mkDerivation, base, casr-logbook-html, casr-logbook-meta + , casr-logbook-types, directory, doctest, filepath, lens, lucid + , QuickCheck, template-haskell, text + }: + mkDerivation { + pname = "casr-logbook-meta-html"; + version = "0.0.4"; + sha256 = "52eb8640d21e88f9ee34800b52f6413a4d2d6d31eda01781fe2056aad24504b5"; + libraryHaskellDepends = [ + base casr-logbook-html casr-logbook-meta casr-logbook-types lens + lucid text + ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/tonymorris/casr-logbook-meta-html"; + description = "Meta-information about entries in a CASR 61.345 logbook (casr-logbook) HTML output"; + license = "unknown"; + }) {}; + + "casr-logbook-reports" = callPackage + ({ mkDerivation, base, casr-logbook-types, containers, directory + , doctest, filepath, lens, QuickCheck, template-haskell, time + }: + mkDerivation { + pname = "casr-logbook-reports"; + version = "0.0.2"; + sha256 = "31148b8982cce8933515b3033ba86e2032abc32ce9edec8d6037a0f86039cf8f"; + libraryHaskellDepends = [ + base casr-logbook-types containers lens time + ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/tonymorris/casr-logbook-reports"; + description = "CASR 61.345 logbook (casr-logbook) reports."; + license = "unknown"; + }) {}; + + "casr-logbook-reports-html" = callPackage + ({ mkDerivation, base, casr-logbook-html, casr-logbook-reports + , casr-logbook-types, containers, directory, doctest, filepath + , lens, lucid, QuickCheck, template-haskell, text, time + }: + mkDerivation { + pname = "casr-logbook-reports-html"; + version = "0.0.2"; + sha256 = "a088b0a9640eb3f0dcf8638f067d40c7324315f43457b30a96a73000b94647e1"; + libraryHaskellDepends = [ + base casr-logbook-html casr-logbook-reports casr-logbook-types + containers lens lucid text time + ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/tonymorris/casr-logbook-reports-html"; + description = "CASR 61.345 logbook reports HTML output"; + license = "unknown"; + }) {}; + + "casr-logbook-reports-meta" = callPackage + ({ mkDerivation, base, casr-logbook-meta, casr-logbook-types + , directory, doctest, filepath, lens, QuickCheck, template-haskell + }: + mkDerivation { + pname = "casr-logbook-reports-meta"; + version = "0.0.3"; + sha256 = "16feedd8270795b81a25a37bbf039050f3a489c205bdeaabd087b5685ec024b6"; + libraryHaskellDepends = [ + base casr-logbook-meta casr-logbook-types lens + ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/tonymorris/casr-logbook-reports-meta"; + description = "Reports on meta-information about entries in a CASR 61.345 logbook (casr-logbook)"; + license = "unknown"; + }) {}; + + "casr-logbook-reports-meta-html" = callPackage + ({ mkDerivation, base, casr-logbook-meta, casr-logbook-meta-html + , casr-logbook-reports, casr-logbook-reports-html + , casr-logbook-reports-meta, casr-logbook-types, directory, doctest + , filepath, lens, lucid, QuickCheck, template-haskell, text + }: + mkDerivation { + pname = "casr-logbook-reports-meta-html"; + version = "0.0.3"; + sha256 = "c17169e9505b77b2d1660ef389decba56c8d1e8573891e58138ea85a490ef125"; + libraryHaskellDepends = [ + base casr-logbook-meta casr-logbook-meta-html casr-logbook-reports + casr-logbook-reports-html casr-logbook-reports-meta + casr-logbook-types lens lucid text + ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/tonymorris/casr-logbook-reports-meta-html"; + description = "HTML output for reports on meta-information about entries in a CASR 61.345 logbook"; + license = "unknown"; + }) {}; + + "casr-logbook-types" = callPackage + ({ mkDerivation, base, containers, digit, directory, doctest + , filepath, lens, QuickCheck, template-haskell, time + }: + mkDerivation { + pname = "casr-logbook-types"; + version = "0.0.1"; + sha256 = "2db550ada72fe6a8fb1913ae31aeb3d732bf22da26724fad0b7844d5bbab638c"; + libraryHaskellDepends = [ base containers digit lens time ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/tonymorris/casr-logbook-types"; + description = "CASR 61.345 Pilot Personal Logbook"; + license = "unknown"; + }) {}; + "cassandra-cql" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, cryptohash , Decimal, hslogger, MonadCatchIO-transformers, mtl, network @@ -37052,7 +37413,6 @@ self: { test-framework-hunit test-framework-quickcheck2 text unordered-containers vector ]; - doHaddock = false; homepage = "https://github.com/hvr/cassava"; description = "A CSV parsing and encoding library"; license = stdenv.lib.licenses.bsd3; @@ -37077,14 +37437,14 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "cassava-conduit_0_3_3" = callPackage + "cassava-conduit_0_3_4" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, cassava , conduit, conduit-extra, containers, mtl, QuickCheck, text }: mkDerivation { pname = "cassava-conduit"; - version = "0.3.3"; - sha256 = "04286953d887cb1ba2c12aa7f3ba3697789920e39b93abd2de2e3081e2272759"; + version = "0.3.4"; + sha256 = "cebd36d3b7cd575f2ccf38860d3f89ba0872cd196d25f5f5d1cefb579a111849"; libraryHaskellDepends = [ array base bifunctors bytestring cassava conduit conduit-extra containers mtl text @@ -38572,6 +38932,7 @@ self: { homepage = "https://github.com/nfjinjing/chu2"; description = "FFI for Chu2 Agda Web Server Interface"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chuchu" = callPackage @@ -38733,7 +39094,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cipher-aes128" = callPackage + "cipher-aes128_0_7_0_1" = callPackage ({ mkDerivation, base, bytestring, cereal, crypto-api, tagged }: mkDerivation { pname = "cipher-aes128"; @@ -38745,6 +39106,36 @@ self: { homepage = "https://github.com/TomMD/cipher-aes128"; description = "AES and common modes using AES-NI when available"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "cipher-aes128" = callPackage + ({ mkDerivation, base, bytestring, cereal, crypto-api, tagged }: + mkDerivation { + pname = "cipher-aes128"; + version = "0.7.0.2"; + sha256 = "3f2359189bb5d7f12d795cf59953315b5498a8ec39bebd44be0263da8cb8a32f"; + libraryHaskellDepends = [ + base bytestring cereal crypto-api tagged + ]; + homepage = "https://github.com/TomMD/cipher-aes128"; + description = "AES and common modes using AES-NI when available"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "cipher-aes128_0_7_0_3" = callPackage + ({ mkDerivation, base, bytestring, cereal, crypto-api, tagged }: + mkDerivation { + pname = "cipher-aes128"; + version = "0.7.0.3"; + sha256 = "6f27bea8bcd1987072fc75b6b423ae9c691574324b6a328ec1e2866f84412e3a"; + libraryHaskellDepends = [ + base bytestring cereal crypto-api tagged + ]; + homepage = "https://github.com/TomMD/cipher-aes128"; + description = "AES and common modes using AES-NI when available"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cipher-blowfish" = callPackage @@ -39659,7 +40050,6 @@ self: { sha256 = "c3172361b21508ec0634cf43a3cd018323bd0e24ce936f554b0f16ca4329b3c1"; libraryHaskellDepends = [ base mtl text ]; testHaskellDepends = [ base hspec hspec-expectations mtl text ]; - doCheck = false; homepage = "http://fvisser.nl/clay"; description = "CSS preprocessor as embedded Haskell"; license = stdenv.lib.licenses.bsd3; @@ -40865,8 +41255,8 @@ self: { ({ mkDerivation, base, blank-canvas, mtl, random, text, time }: mkDerivation { pname = "codeworld-api"; - version = "0.1.0.1"; - sha256 = "0cfc3b9f2feef07ee09ed9a9c5f95ea909202ec16ce5bbc08c3c1462945affce"; + version = "0.2.0.0"; + sha256 = "b6a5d936bdc8aa1f18d949102646990eeaaa26647f81e2c58bf92cb18e2ecdb9"; libraryHaskellDepends = [ base blank-canvas mtl random text time ]; description = "Graphics library for CodeWorld"; license = stdenv.lib.licenses.asl20; @@ -42655,7 +43045,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "conduit-combinators" = callPackage + "conduit-combinators_1_0_4" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, chunked-data, conduit, conduit-extra, containers , directory, filepath, hspec, monad-control, mono-traversable, mtl @@ -42681,6 +43071,35 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable"; description = "Commonly used conduit functions, for both chunked and unchunked data"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "conduit-combinators" = callPackage + ({ mkDerivation, base, base16-bytestring, base64-bytestring + , bytestring, chunked-data, conduit, conduit-extra, containers + , directory, filepath, hspec, monad-control, mono-traversable, mtl + , mwc-random, primitive, QuickCheck, resourcet, safe, silently + , text, transformers, transformers-base, unix, unix-compat, vector + , void + }: + mkDerivation { + pname = "conduit-combinators"; + version = "1.0.5"; + sha256 = "b6e65bcfec9a9b57e268a7a16f067af500f1e8b8f7dad9b96e9aad7bf603c6cd"; + libraryHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring chunked-data + conduit conduit-extra filepath monad-control mono-traversable + mwc-random primitive resourcet text transformers transformers-base + unix unix-compat vector void + ]; + testHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring chunked-data + conduit containers directory filepath hspec mono-traversable mtl + mwc-random QuickCheck safe silently text transformers vector + ]; + homepage = "https://github.com/snoyberg/mono-traversable"; + description = "Commonly used conduit functions, for both chunked and unchunked data"; + license = stdenv.lib.licenses.mit; }) {}; "conduit-connection" = callPackage @@ -42764,6 +43183,7 @@ self: { homepage = "https://github.com/erikd/conduit-find"; description = "A file-finding conduit that allows user control over traversals"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-iconv" = callPackage @@ -43467,19 +43887,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "containers_0_5_7_1" = callPackage + "containers_0_5_8_1" = callPackage ({ mkDerivation, array, base, ChasingBottoms, deepseq, ghc-prim , HUnit, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 + , test-framework-quickcheck2, transformers }: mkDerivation { pname = "containers"; - version = "0.5.7.1"; - sha256 = "73856c3307e2ea26c33474309af4dcdfb80e7644e9a82ef4146c742a6e400f79"; + version = "0.5.8.1"; + sha256 = "f7e65874f5592c7fd7c24aaca67d8ccf87887e5a69ea8e97890c40c3bb07f142"; libraryHaskellDepends = [ array base deepseq ghc-prim ]; testHaskellDepends = [ array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 + transformers ]; description = "Assorted concrete container types"; license = stdenv.lib.licenses.bsd3; @@ -44303,6 +44724,7 @@ self: { homepage = "https://github.com/aneksteind/Core#readme"; description = "compile your own mini functional language with Core"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "core-haskell" = callPackage @@ -44551,7 +44973,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "courier" = callPackage + "courier_0_1_1_3" = callPackage ({ mkDerivation, async, base, bytestring, cereal, containers , directory, hslogger, HUnit, network, stm, test-framework , test-framework-hunit, text, uuid @@ -44574,6 +44996,32 @@ self: { homepage = "http://github.com/hargettp/courier"; description = "A message-passing library for simplifying network applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "courier" = callPackage + ({ mkDerivation, async, base, bytestring, cereal, containers + , directory, hslogger, HUnit, network, stm, test-framework + , test-framework-hunit, text, uuid + }: + mkDerivation { + pname = "courier"; + version = "0.1.1.4"; + sha256 = "e4e808d564166d79b819c6736fb445486530be1271365c3e75cb5f3e3a2ed9a3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring cereal containers hslogger network stm text + uuid + ]; + executableHaskellDepends = [ base cereal ]; + testHaskellDepends = [ + async base cereal containers directory hslogger HUnit network stm + test-framework test-framework-hunit + ]; + homepage = "http://github.com/hargettp/courier"; + description = "A message-passing library for simplifying network applications"; + license = stdenv.lib.licenses.mit; }) {}; "court" = callPackage @@ -45145,25 +45593,29 @@ self: { "craze" = callPackage ({ mkDerivation, async, base, bytestring, containers, curl , data-default-class, doctest, doctest-discover, haxy, hspec - , hspec-discover, HTTP, http-types, optparse-generic, text - , transformers + , hspec-discover, HTTP, http-types, lens, lifted-async, lifted-base + , monad-control, mtl, optparse-generic, text, transformers + , transformers-base }: mkDerivation { pname = "craze"; - version = "0.1.2.0"; - sha256 = "951dae20e27bffdff346008b1f357a12f1e143d9c42184c32ba90fbbbbc722a9"; + version = "0.1.3.0"; + sha256 = "b2707ee3c854a646ada8301383449c2a4e658bd7288984bb34b9007656a0b1db"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base bytestring containers curl data-default-class text - transformers + async base bytestring containers curl data-default-class lens + lifted-async lifted-base monad-control mtl text transformers + transformers-base ]; executableHaskellDepends = [ - base bytestring curl optparse-generic text transformers + base bytestring curl lens lifted-async lifted-base monad-control + mtl optparse-generic text transformers transformers-base ]; testHaskellDepends = [ base bytestring curl doctest doctest-discover haxy hspec - hspec-discover HTTP http-types text transformers + hspec-discover HTTP http-types lens lifted-async lifted-base + monad-control mtl text transformers transformers-base ]; homepage = "https://github.com/etcinit/craze#readme"; description = "HTTP Racing Library"; @@ -45734,12 +46186,12 @@ self: { "crypto-multihash" = callPackage ({ mkDerivation, base, base58-bytestring, bytestring, containers - , cryptonite, hspec, memory, string-conversions + , cryptonite, hspec, memory, QuickCheck, string-conversions }: mkDerivation { pname = "crypto-multihash"; - version = "0.4.1.0"; - sha256 = "175f277341722a856495bde25906fd9dc55b9864e10a337302ea1ae3d2cd4f9b"; + version = "0.4.2.0"; + sha256 = "01f5e71ade39dfaa1e8b8f690b9af976c693e644c4a18ec5968ab44713bd7e85"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45747,7 +46199,7 @@ self: { string-conversions ]; executableHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ base bytestring hspec ]; + testHaskellDepends = [ base bytestring hspec QuickCheck ]; homepage = "https://github.com/mseri/crypto-multihash#crypto-multihash"; description = "Multihash library on top of cryptonite crypto library"; license = stdenv.lib.licenses.bsd3; @@ -49449,17 +49901,18 @@ self: { }) {}; "dbm" = callPackage - ({ mkDerivation, base, directory, ini, optparse-applicative - , sqlite-simple, text, time + ({ mkDerivation, base, direct-sqlite, directory, ini + , optparse-applicative, sqlite-simple, text, time }: mkDerivation { pname = "dbm"; - version = "0.1.1.0"; - sha256 = "d3e9b3896f0c6710c001b97a1b6fc54ecde5a753cbc96df227ea9780fd126fee"; + version = "0.2"; + sha256 = "e5b5c5d6da4623fd7544111b4c917a26db81d0c41d881f748097ec8085d5bbce"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base directory ini optparse-applicative sqlite-simple text time + base direct-sqlite directory ini optparse-applicative sqlite-simple + text time ]; homepage = "https://github.com/relrod/dbm"; description = "A *simple* database migration tool"; @@ -50145,6 +50598,7 @@ self: { homepage = "https://github.com/verement/decimal-arithmetic#readme"; description = "An implementation of the General Decimal Arithmetic Specification"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "declarative" = callPackage @@ -51181,8 +51635,8 @@ self: { }: mkDerivation { pname = "desert"; - version = "0.1.0.1"; - sha256 = "105d7fe94d34dc1efcb5e391a74a0999429af6d7d031f2dc5c2b1c87ba261170"; + version = "0.1.0.6"; + sha256 = "6f844fe193bf0930f8c1382d0cb60e14cc1bb4672ab610d30cef8a7e5bcd474f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -51400,6 +51854,7 @@ self: { libraryHaskellDepends = [ base cubicbezier diagrams-lib ]; description = "boolean operations on Diagrams paths"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-builder" = callPackage @@ -52390,6 +52845,7 @@ self: { ]; description = "Speed up form designing using digestive functors and bootstrap"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-foundation-lucid" = callPackage @@ -52407,6 +52863,7 @@ self: { jailbreak = true; description = "Speed up form designing using digestive functors and foundation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors_0_8_0_1" = callPackage @@ -52493,6 +52950,7 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Blaze frontend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-happstack" = callPackage @@ -52527,6 +52985,7 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Heist frontend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-hsp" = callPackage @@ -52554,6 +53013,7 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Lucid frontend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-scotty" = callPackage @@ -53002,7 +53462,6 @@ self: { sha256 = "ff09c6e66a5038f905ea423700d60e538286c12b83fecda70b2932ee4eb5b3c5"; libraryHaskellDepends = [ base directory filepath ]; testHaskellDepends = [ base directory filepath process ]; - doCheck = false; homepage = "http://brandon.si/code/directory-tree-module-released/"; description = "A simple directory-like tree datatype, with useful IO functions"; license = stdenv.lib.licenses.bsd3; @@ -54312,6 +54771,7 @@ self: { sha256 = "4ab056cc370c320536976ce3c1648098ee60d7d60b9e770e556f013d0ad6aeaa"; libraryHaskellDepends = [ base HUnit QuickCheck ]; testHaskellDepends = [ base doctest HUnit QuickCheck ]; + doCheck = false; description = "Allow QuickCheck-style property testing within doctest"; license = stdenv.lib.licenses.mit; }) {}; @@ -55685,8 +56145,8 @@ self: { }: mkDerivation { pname = "dynamic-loader"; - version = "0.0"; - sha256 = "20e23ae42814f96ffebc44d6091ae3edf6eec041dfa7be7e0f8bb9078ce39533"; + version = "0.0.1"; + sha256 = "25a8b1552c12e36d72bbef11009ce55fa9410705b15f3f55467b38fe2e7327b2"; libraryHaskellDepends = [ base directory ghc-prim hashable hashtables time transformers ]; @@ -57520,6 +57980,7 @@ self: { jailbreak = true; description = "An email parser that will parse everything"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "embeddock" = callPackage @@ -57746,6 +58207,7 @@ self: { jailbreak = true; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "engine-io-wai" = callPackage @@ -59575,10 +60037,9 @@ self: { ({ mkDerivation, base, compensated, log-domain }: mkDerivation { pname = "exp-extended"; - version = "0.1.1.1"; - sha256 = "fe4c8955f0fdff62525d7457b7be08147d063838cbb0f39bc2600256e24008a7"; + version = "0.1.1.2"; + sha256 = "19807ac0d486cf493c1ffeab200514dd96f8b5914c506ea4bac10e1030b7ae7a"; libraryHaskellDepends = [ base compensated log-domain ]; - jailbreak = true; homepage = "http://code.mathr.co.uk/exp-extended"; description = "floating point with extended exponent range"; license = stdenv.lib.licenses.bsd3; @@ -62459,8 +62920,8 @@ self: { }: mkDerivation { pname = "fixfile"; - version = "0.2.0.0"; - sha256 = "7cc1313702089f3b559a9e167ff83ea1ab91406f57500c567d69672c3f85ecfe"; + version = "0.3.0.0"; + sha256 = "9ece220e3f833b9ec3002492efc881051e54ecd06fe9b86e9178af48bdcee24f"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath hashable hashtables lens mtl temporary vector @@ -62565,14 +63026,13 @@ self: { }: mkDerivation { pname = "flaccuraterip"; - version = "0.3.5"; - sha256 = "fa572869a54dfcea3aac395c9f1e116f9fb69cf04134411d5e8b4a88ea8ff229"; + version = "0.3.6"; + sha256 = "7e7904030c86963c8a2a129a5d0f50a7872b80feaf26fea54f1508a0615469da"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base binary deepseq HTTP optparse-applicative process ]; - jailbreak = true; homepage = "http://noaxiom.org/flAccurateRip"; description = "Verify FLAC files ripped form CD using AccurateRip™"; license = stdenv.lib.licenses.gpl3; @@ -63246,6 +63706,7 @@ self: { homepage = "http://github.com/positiondev/fn#readme"; description = "Extras for Fn, a functional web framework"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "focus" = callPackage @@ -63840,13 +64301,14 @@ self: { }) {}; "fortran-src" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers, fgl - , GenericPretty, happy, hspec, mtl, pretty, text, uniplate + ({ mkDerivation, alex, array, base, bytestring, containers, derive + , directory, fgl, filepath, GenericPretty, happy, hspec, mtl + , pretty, text, uniplate }: mkDerivation { pname = "fortran-src"; - version = "0.1.0.2"; - sha256 = "c250862a13ca8f877f4e25e1ee9b34ed1ca4e381351d95db22cf5e20c2d7ae57"; + version = "0.1.0.3"; + sha256 = "c3c3a2de98e4d08c23907092311f69869577850842cfb1b5fce53176cfb4a06e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63859,9 +64321,9 @@ self: { uniplate ]; testHaskellDepends = [ - array base bytestring containers fgl hspec mtl text uniplate + array base bytestring containers derive directory fgl filepath + GenericPretty hspec mtl pretty text uniplate ]; - doHaddock = false; description = "Parser and anlyses for Fortran standards 66, 77, 90"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -63953,6 +64415,7 @@ self: { homepage = "https://github.com/haskell-foundation/foundation"; description = "Alternative prelude with batteries and no dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foundation-edge" = callPackage @@ -63965,6 +64428,7 @@ self: { homepage = "https://github.com/haskell-foundation/foundation-edge"; description = "foundation's edge with the conventional set of packages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fountain" = callPackage @@ -66656,6 +67120,7 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for containers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec" = callPackage @@ -67559,6 +68024,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ghc-prof" = callPackage + ({ mkDerivation, attoparsec, base, containers, directory, filepath + , process, scientific, tasty, tasty-hunit, temporary, text, time + }: + mkDerivation { + pname = "ghc-prof"; + version = "1.0.0"; + sha256 = "58adf44ad70a30be50397c8ec85390596afa821dca40b92378d46e31e6fb0fe8"; + libraryHaskellDepends = [ + attoparsec base containers scientific text time + ]; + testHaskellDepends = [ + attoparsec base directory filepath process tasty tasty-hunit + temporary text + ]; + homepage = "https://github.com/maoe/ghc-prof"; + description = "Library for parsing GHC time and allocation profiling reports"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghc-prof-flamegraph" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -69125,19 +69610,19 @@ self: { "ginger" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, filepath , http-types, mtl, parsec, safe, scientific, tasty, tasty-hunit - , tasty-quickcheck, text, transformers, unordered-containers + , tasty-quickcheck, text, time, transformers, unordered-containers , utf8-string, vector }: mkDerivation { pname = "ginger"; - version = "0.2.8.0"; - sha256 = "17f7ee8a2f0cb1ee40b20043a1d39e6fd6dc100e7cb6548f590cc82030af9856"; + version = "0.3.2.0"; + sha256 = "23485cfcab2af0bc010991183ac57fe1a922010581aa51dd70261241b241f87a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring data-default filepath http-types mtl parsec - safe scientific text transformers unordered-containers utf8-string - vector + safe scientific text time transformers unordered-containers + utf8-string vector ]; executableHaskellDepends = [ aeson base bytestring data-default text transformers @@ -69145,7 +69630,8 @@ self: { ]; testHaskellDepends = [ aeson base bytestring data-default mtl tasty tasty-hunit - tasty-quickcheck text transformers unordered-containers utf8-string + tasty-quickcheck text time transformers unordered-containers + utf8-string ]; homepage = "https://bitbucket.org/tdammers/ginger"; description = "An implementation of the Jinja2 template language in Haskell"; @@ -69748,8 +70234,8 @@ self: { }: mkDerivation { pname = "gitHUD"; - version = "1.3.4"; - sha256 = "8c2273f0d2af162915291e3180f1910dfa76813be9cb7676c53fde112e8ad355"; + version = "1.3.5"; + sha256 = "7956019a42632f8658ba9a6508943fd212e9796657252eedec53f48850a07009"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec process text unix ]; @@ -70547,27 +71033,30 @@ self: { ({ mkDerivation, async, attoparsec, base, bytestring, Cabal , config-value, connection, containers, data-default-class, deepseq , directory, filepath, gitrev, hashable, irc-core, lens, network - , regex-tdfa, regex-tdfa-text, split, stm, text, time, tls + , process, regex-tdfa, regex-tdfa-text, split, stm, text, time, tls , transformers, unix, unordered-containers, vector, vty, x509 , x509-store, x509-system }: mkDerivation { pname = "glirc"; - version = "2.10"; - sha256 = "9ecb9d1e0fd365d2bf51706e2df09ce8e6e17a648ad9f603d2888ae15129f368"; + version = "2.11"; + sha256 = "24c00b3ebf4c9eb9d355255b0217d0984519c2d67e29c8aa98d923ee53123e4a"; + revision = "1"; + editedCabalFile = "efcc2845625158d6483b35c66e06f3a8656287b3022888ba319d73500ec1bcc7"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal ]; executableHaskellDepends = [ async attoparsec base bytestring config-value connection containers data-default-class deepseq directory filepath gitrev hashable - irc-core lens network regex-tdfa regex-tdfa-text split stm text - time tls transformers unix unordered-containers vector vty x509 - x509-store x509-system + irc-core lens network process regex-tdfa regex-tdfa-text split stm + text time tls transformers unix unordered-containers vector vty + x509 x509-store x509-system ]; homepage = "https://github.com/glguy/irc-core"; description = "Console IRC client"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gll" = callPackage @@ -75982,6 +76471,7 @@ self: { homepage = "https://github.com/nfjinjing/hack2-handler-snap-server"; description = "Hack2 Snap server handler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hack2-handler-warp" = callPackage @@ -76180,8 +76670,8 @@ self: { }: mkDerivation { pname = "hackage-security"; - version = "0.5.2.1"; - sha256 = "f80daf98372df883b09cc44a83503a0ffb3d4ac076ae4267c988ba5aafc9b7ba"; + version = "0.5.2.2"; + sha256 = "507a837851264a774c8f4d400f798c3dac5be11dc428fe72d33ef594ca533c41"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -77278,12 +77768,11 @@ self: { }: mkDerivation { pname = "hakyll-filestore"; - version = "0.1.2"; - sha256 = "85bda3df5f708d222d0b2d97177809aa95039dbfabd45eb580d65ab58158cf9f"; + version = "0.1.4"; + sha256 = "4f4a4ff6312fd8a226357329c19b7da9ad0547b3683679ce033a1b82dd7d4bb9"; libraryHaskellDepends = [ base filestore hakyll time time-locale-compat ]; - jailbreak = true; homepage = "https://gitlab.com/aergus/hakyll-filestore"; description = "FileStore utilities for Hakyll"; license = stdenv.lib.licenses.publicDomain; @@ -77739,6 +78228,7 @@ self: { ]; description = "Network Stack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hans-pcap" = callPackage @@ -77752,6 +78242,7 @@ self: { homepage = "https://github.com/tolysz/hans-pcap"; description = "Driver for real ethernet devices for HaNS"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hans-pfq" = callPackage @@ -78910,6 +79401,7 @@ self: { homepage = "https://github.com/eklavya/hascas#readme"; description = "Cassandra driver for haskell"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hascat" = callPackage @@ -79886,6 +80378,7 @@ self: { ]; description = "Imcomplete igraph bindings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {igraph = null;}; "haskell-import-graph" = callPackage @@ -80045,6 +80538,31 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "haskell-names_0_8_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , data-lens-light, filemanip, filepath, haskell-src-exts, mtl + , pretty-show, tasty, tasty-golden, transformers + , traverse-with-class, uniplate + }: + mkDerivation { + pname = "haskell-names"; + version = "0.8.0"; + sha256 = "963b20f77a12fcfc0e8811d891b86aaaa7fe5cbb44365d60eb17f6b7de93ee88"; + libraryHaskellDepends = [ + aeson base bytestring containers data-lens-light filepath + haskell-src-exts mtl transformers traverse-with-class uniplate + ]; + testHaskellDepends = [ + base containers filemanip filepath haskell-src-exts mtl pretty-show + tasty tasty-golden traverse-with-class + ]; + jailbreak = true; + homepage = "http://documentup.com/haskell-suite/haskell-names"; + description = "Name resolution library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-neo4j-client" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , data-default, hashable, HTTP, http-client, http-client-tls @@ -80370,6 +80888,7 @@ self: { homepage = "https://github.com/DanielWaterworth/haskell-src-exts-prisms"; description = "Prisms with newtype wrappers for haskell-src-exts"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-exts-qq" = callPackage @@ -80399,6 +80918,7 @@ self: { homepage = "https://github.com/int-e/haskell-src-exts-simple"; description = "A simplified view on the haskell-src-exts AST"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-meta" = callPackage @@ -81721,19 +82241,24 @@ self: { }) {}; "hasktags" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, json, unix - , utf8-string + ({ mkDerivation, base, bytestring, directory, filepath, HUnit, json + , unix, utf8-string }: mkDerivation { pname = "hasktags"; - version = "0.69.1"; - sha256 = "243f802c581ea7c0327065d2c71f21019dc6d7dc7dfadad9d17fffd8b34df1e6"; + version = "0.69.2"; + sha256 = "92c7742ff50527dd5ff45cf65c2009f364b06e17bdc4e41874a75bbf0c1f75fc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring directory filepath json unix utf8-string ]; - executableHaskellDepends = [ base directory filepath unix ]; + executableHaskellDepends = [ + base bytestring directory filepath HUnit json unix utf8-string + ]; + testHaskellDepends = [ + base bytestring directory filepath HUnit json unix utf8-string + ]; homepage = "http://github.com/MarcWeber/hasktags"; description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs"; license = stdenv.lib.licenses.bsd3; @@ -81879,6 +82404,31 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "hasql-class" = callPackage + ({ mkDerivation, base, bytestring, containers, contravariant + , data-default-class, doctest, generics-eot, Glob, hasql, hspec + , process, QuickCheck, quickcheck-instances, string-qq, text, time + , vector, yaml + }: + mkDerivation { + pname = "hasql-class"; + version = "0.0.0.1"; + sha256 = "90db8a197d6755401f0431fa9586aa3f1744d411fe714ec8bfd2b51f5540c9de"; + libraryHaskellDepends = [ + base bytestring contravariant data-default-class generics-eot hasql + text time vector + ]; + testHaskellDepends = [ + base bytestring containers contravariant data-default-class doctest + generics-eot Glob hasql hspec process QuickCheck + quickcheck-instances string-qq text time vector yaml + ]; + jailbreak = true; + homepage = "http://github.com/turingjump/hasql-class#readme"; + description = "Encodable and Decodable classes for hasql"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hasql-cursor-query" = callPackage ({ mkDerivation, base, base-prelude, bytestring, contravariant , foldl, hasql, hasql-cursor-transaction, hasql-transaction @@ -81900,6 +82450,7 @@ self: { homepage = "https://github.com/nikita-volkov/hasql-cursor-query"; description = "A declarative abstraction over PostgreSQL Cursor"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-cursor-transaction" = callPackage @@ -81918,6 +82469,7 @@ self: { homepage = "https://github.com/nikita-volkov/hasql-cursor-transaction"; description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasql-optparse-applicative" = callPackage @@ -82296,6 +82848,7 @@ self: { homepage = "https://github.com/kosmoskatten/hats"; description = "Haskell client for the NATS messaging system"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hatt" = callPackage @@ -83830,6 +84383,7 @@ self: { homepage = "http://snapframework.com/"; description = "An Haskell template system supporting both HTML5 and XML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "heist-aeson" = callPackage @@ -83861,6 +84415,7 @@ self: { homepage = "http://github.com/dbp/heist-async"; description = "Adding support for asynchronous updates (\"AJAX\") with heist"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "helics" = callPackage @@ -83944,6 +84499,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "helium-overture" = callPackage + ({ mkDerivation, base, bytestring, deepseq, lifted-base, mtl + , random, text, transformers + }: + mkDerivation { + pname = "helium-overture"; + version = "1.0.0"; + sha256 = "fcdb214bfc8af76a689aa228b13ca33e1ff8e66a1f185b7cb46f9c9cd78c2bff"; + libraryHaskellDepends = [ + base bytestring deepseq lifted-base mtl random text transformers + ]; + description = "A backwards-compatible, modern replacement for the Prelude"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "helix" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , case-insensitive, containers, cookie, data-default-class @@ -85175,6 +85745,7 @@ self: { homepage = "https://github.com/rcook/hgeos#readme"; description = "Simple Haskell bindings to GEOS C API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {geos_c = null;}; "hgettext" = callPackage @@ -85697,8 +86268,8 @@ self: { }: mkDerivation { pname = "hills"; - version = "0.1.2.2"; - sha256 = "fd4428fa04a87613287d1e09a1a889986edd2d351dab351d4b0aa6659396e7e7"; + version = "0.1.2.3"; + sha256 = "b2a3f0f1f0936691c26251e2dc92915279bde51d45355d3646cd41403ac597ad"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -85786,8 +86357,8 @@ self: { pname = "hindent"; version = "4.6.4"; sha256 = "26fc1498705b8a64b03eb5b699ba6229955273d91a49a01c3c2b58436c8e4dcf"; - revision = "2"; - editedCabalFile = "d06cf7934ba7a7bc938bf9c378955ee5d4925ee3f45cfa1e417a2adbe5db5955"; + revision = "3"; + editedCabalFile = "86ebc305942be9a659bdd7a9f66771d74e72825816c6ba1f0dd29a65ce8eef35"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85805,28 +86376,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hindent_5_0_1" = callPackage + "hindent_5_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, descriptive - , directory, exceptions, ghc-prim, haskell-src-exts, hspec - , monad-loops, mtl, text, transformers, utf8-string + , Diff, directory, exceptions, ghc-prim, haskell-src-exts, hspec + , monad-loops, mtl, path, path-io, text, transformers, unix-compat + , utf8-string, yaml }: mkDerivation { pname = "hindent"; - version = "5.0.1"; - sha256 = "429f2603479b7a972332aaa91bbc69ac204d5b7a218f83fc071f8565120cc6b9"; + version = "5.2.0"; + sha256 = "c2215a684be4287b1218d042c80b7ccb220424069f2d1026b2f6f369b0d07caa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers exceptions haskell-src-exts monad-loops - mtl text transformers utf8-string + mtl text transformers utf8-string yaml ]; executableHaskellDepends = [ - base bytestring descriptive directory ghc-prim haskell-src-exts - text utf8-string + base bytestring deepseq descriptive directory exceptions ghc-prim + haskell-src-exts path path-io text transformers unix-compat + utf8-string yaml ]; testHaskellDepends = [ - base bytestring deepseq directory exceptions haskell-src-exts hspec - monad-loops mtl utf8-string + base bytestring deepseq Diff directory exceptions haskell-src-exts + hspec monad-loops mtl utf8-string ]; jailbreak = true; homepage = "http://www.github.com/chrisdone/hindent"; @@ -86035,7 +86608,6 @@ self: { testHaskellDepends = [ base directory exceptions extensible-exceptions filepath HUnit ]; - doCheck = false; homepage = "https://github.com/mvdan/hint"; description = "Runtime Haskell interpreter (GHC API wrapper)"; license = stdenv.lib.licenses.bsd3; @@ -86921,7 +87493,6 @@ self: { old-time parsec pretty-show regex-tdfa safe split test-framework test-framework-hunit time transformers uglymemo utf8-string ]; - doCheck = false; homepage = "http://hledger.org"; description = "Core data types, parsers and functionality for the hledger accounting tools"; license = "GPL"; @@ -87952,17 +88523,21 @@ self: { }: mkDerivation { pname = "hocilib"; - version = "0.0.0"; - sha256 = "a8bd06eec5224d8fa0c72a4a1d0f2639ef9f3ba84e52cad42c633435a8bf8ee0"; + version = "0.1.0"; + sha256 = "44354cbcfd324ce02786131fc3e0ffac29d4a8676854cac45e675e47cdc35e51"; libraryHaskellDepends = [ base containers inline-c template-haskell ]; librarySystemDepends = [ ocilib ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; + testSystemDepends = [ ocilib ]; + doHaddock = false; + doCheck = false; homepage = "https://github.com/fpinsight/hocilib"; description = "FFI binding to OCILIB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {ocilib = null;}; "hoe" = callPackage @@ -88621,13 +89196,12 @@ self: { wai wai-logger warp warp-tls zlib ]; executableHaskellDepends = [ base ]; - doCheck = false; homepage = "http://hoogle.haskell.org/"; description = "Haskell API Search"; license = stdenv.lib.licenses.bsd3; }) {}; - "hoogle_5_0_2" = callPackage + "hoogle_5_0_3" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit , conduit-extra, connection, containers, deepseq, directory, extra , filepath, haskell-src-exts, http-conduit, http-types, js-flot @@ -88638,8 +89212,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.2"; - sha256 = "2617f06f2df2be90fc1b69f87df53936b575edd32a974f813e78b7bc155b6c82"; + version = "5.0.3"; + sha256 = "76bda66fd5be7d0ad79da1c512a4e60caf3be15d988a40e8274f16cd7df3815b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89380,8 +89954,8 @@ self: { }: mkDerivation { pname = "hpack-convert"; - version = "0.14.5"; - sha256 = "fddb0bbb0a0aeb7362ee4333fb15f5d90191a6163698d596aead89577b4656ae"; + version = "0.14.6"; + sha256 = "80a439b06603e48f338ad4a08b0ffc54c0f0f97584a265f5fab5b31d8c03cb1c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90013,37 +90587,13 @@ self: { }: mkDerivation { pname = "hquantlib"; - version = "0.0.3.0"; - sha256 = "14ef306cc8f2e45302cdfbaf0aff70f6391bce69867119427b6d9eea9ea277a6"; - libraryHaskellDepends = [ - base containers hmatrix hmatrix-gsl hmatrix-special mersenne-random - parallel statistics time vector vector-algorithms - ]; - testHaskellDepends = [ - base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 - ]; - homepage = "http://github.com/paulrzcz/hquantlib.git"; - description = "HQuantLib is a port of essencial parts of QuantLib to Haskell"; - license = "LGPL"; - hydraPlatforms = [ "x86_64-darwin" ]; - }) {}; - - "hquantlib_0_0_3_1" = callPackage - ({ mkDerivation, base, containers, HerbiePlugin, hmatrix - , hmatrix-gsl, hmatrix-special, HUnit, mersenne-random, parallel - , QuickCheck, statistics, test-framework, test-framework-hunit - , test-framework-quickcheck2, time, vector, vector-algorithms - }: - mkDerivation { - pname = "hquantlib"; - version = "0.0.3.1"; - sha256 = "1da4a612d63aceca1ac946d204ee8048732fb82a74ece9df7b8c15f0b17ee0e4"; + version = "0.0.3.2"; + sha256 = "b26666d1d95a4895ff3e0773d8234e67c692c7f2fe740466b653face4bfb9af3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers HerbiePlugin hmatrix hmatrix-gsl hmatrix-special - mersenne-random parallel statistics time vector vector-algorithms + base containers hmatrix hmatrix-gsl hmatrix-special mersenne-random + parallel statistics time vector vector-algorithms ]; executableHaskellDepends = [ base containers mersenne-random parallel @@ -90055,7 +90605,7 @@ self: { homepage = "http://github.com/paulrzcz/hquantlib.git"; description = "HQuantLib is a port of essencial parts of QuantLib to Haskell"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-darwin" ]; }) {}; "hquery" = callPackage @@ -90674,6 +91224,7 @@ self: { homepage = "https://github.com/bitc/hs-watchman"; description = "Client library for Facebook's Watchman tool"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs2048" = callPackage @@ -91295,6 +91846,7 @@ self: { homepage = "https://github.com/yamadapc/hscaffold#readme"; description = "Very simple file/directory structure scaffolding writer monad EDSL"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hscamwire" = callPackage @@ -91872,6 +92424,7 @@ self: { jailbreak = true; description = "A command line program for extending the import list of a Haskell source file"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsini" = callPackage @@ -92551,8 +93104,8 @@ self: { }: mkDerivation { pname = "hspec-golden-aeson"; - version = "0.1.0.0"; - sha256 = "c6faaabdce29fdc8b25e2f35e90698eeee0601a690b22b16aca6a1f431bbca65"; + version = "0.2.0.0"; + sha256 = "4654859bfb77434daf4a4b695ec433894a39ae9d85c51d077ff0f5f74c007efd"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath hspec QuickCheck quickcheck-arbitrary-adt random transformers @@ -92564,6 +93117,7 @@ self: { homepage = "https://github.com/plow-technologies/hspec-golden-aeson#readme"; description = "Use tests to monitor changes in Aeson serialization"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-hashable" = callPackage @@ -92945,7 +93499,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-webdriver" = callPackage + "hspec-webdriver_1_1_0" = callPackage ({ mkDerivation, base, data-default, hashable, hspec, hspec-core , HUnit, lifted-base, stm, text, transformers, unordered-containers , webdriver @@ -92961,6 +93515,25 @@ self: { homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; description = "Write end2end web application tests using webdriver and hspec"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hspec-webdriver" = callPackage + ({ mkDerivation, aeson, base, data-default, hashable, hspec + , hspec-core, HUnit, lifted-base, stm, text, transformers + , unordered-containers, webdriver + }: + mkDerivation { + pname = "hspec-webdriver"; + version = "1.2.0"; + sha256 = "05d0f818de7f21e3dcb10860f60fe53b393fad75892ec1c520815dd53a0385c8"; + libraryHaskellDepends = [ + aeson base data-default hashable hspec hspec-core HUnit lifted-base + stm text transformers unordered-containers webdriver + ]; + homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; + description = "Write end2end web application tests using webdriver and hspec"; + license = stdenv.lib.licenses.mit; }) {}; "hspec2" = callPackage @@ -94185,6 +94758,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-api-data_0_3" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, doctest + , filepath, hashable, hspec, HUnit, QuickCheck, text, time + , time-locale-compat, unordered-containers, uri-bytestring + }: + mkDerivation { + pname = "http-api-data"; + version = "0.3"; + sha256 = "380de358c67a8c894133e978e025171388e90333f2c5db10cd41f3224a35fd1f"; + libraryHaskellDepends = [ + base bytestring containers hashable text time time-locale-compat + unordered-containers uri-bytestring + ]; + testHaskellDepends = [ + base bytestring directory doctest filepath hspec HUnit QuickCheck + text time unordered-containers + ]; + homepage = "http://github.com/fizruk/http-api-data"; + description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, http-types }: mkDerivation { @@ -94229,7 +94825,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_5_1" = callPackage + "http-client_0_5_2" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -94238,8 +94834,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.5.1"; - sha256 = "7406a258594989546a9706179b1ee76708b7258394a6cff280167cf26ce1d1f0"; + version = "0.5.2"; + sha256 = "a1697c94f8f777b402f0b274eb58a638facdda16572a3cd5822185e61165288a"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -94478,7 +95074,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http-conduit_2_2_0" = callPackage + "http-conduit_2_2_0_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, connection, cookie , data-default-class, exceptions, hspec, http-client @@ -94488,10 +95084,8 @@ self: { }: mkDerivation { pname = "http-conduit"; - version = "2.2.0"; - sha256 = "ba3dbc20b8be238386928405af52cadb33c0c8bdf0f3e97236a4b958a5a09510"; - revision = "1"; - editedCabalFile = "372b74352618af28ae28dca7d7b4cbe38e07f0e132554e15f4376f8ae1ef6617"; + version = "2.2.0.1"; + sha256 = "54e7d2a3346e45f3785dc14b98f534c931236db20a1ea20335893ada922558a7"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra exceptions http-client http-client-tls http-types lifted-base monad-control mtl resourcet @@ -94681,7 +95275,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-link-header" = callPackage + "http-link-header_1_0_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring , bytestring-conversion, errors, hspec, hspec-attoparsec , network-uri, QuickCheck, text @@ -94700,6 +95294,28 @@ self: { homepage = "https://github.com/myfreeweb/http-link-header"; description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\""; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "http-link-header" = callPackage + ({ mkDerivation, attoparsec, base, bytestring + , bytestring-conversion, errors, hspec, hspec-attoparsec + , network-uri, QuickCheck, text + }: + mkDerivation { + pname = "http-link-header"; + version = "1.0.2"; + sha256 = "618b33aa9518cfae4d63e3d79689642bde5eecfa33c83ea1d1e3aa33420f8685"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-conversion errors network-uri + text + ]; + testHaskellDepends = [ + base hspec hspec-attoparsec QuickCheck text + ]; + homepage = "https://github.com/myfreeweb/http-link-header"; + description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\""; + license = stdenv.lib.licenses.publicDomain; }) {}; "http-listen" = callPackage @@ -94970,7 +95586,6 @@ self: { system-fileio system-filepath text transformers unordered-containers ]; - doCheck = false; homepage = "http://research.operationaldynamics.com/projects/http-streams/"; description = "An HTTP client using io-streams"; license = stdenv.lib.licenses.bsd3; @@ -95260,8 +95875,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "huckleberry"; - version = "0.9.1.1"; - sha256 = "cbb6e78b098a466fdc8b6f90e64f510bd362920c4979d42aeb2bb47f6a258778"; + version = "0.10.0.0"; + sha256 = "0650de774e6d595ee7888898e655ce78dbbb613ef9bcc16e16fa04bf5aa9a22b"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/mitsuji/huckleberry#readme"; description = "Haskell IOT on Intel Edison and other Linux computers"; @@ -95712,8 +96327,8 @@ self: { }: mkDerivation { pname = "hw-bits"; - version = "0.0.0.12"; - sha256 = "db8888878caa8a7e69595528147737794b1621f9b05fc0be7b308aa1a2b531d8"; + version = "0.1.0.0"; + sha256 = "cb691ceb9dace1f15f7f8299f0daea16971f06e65535395e19ca3385722c27d3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring hw-prim parsec vector ]; @@ -95844,30 +96459,20 @@ self: { homepage = "http://github.com/haskell-works/hw-json#readme"; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-mquery" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, conduit - , containers, dlist, hspec, hw-bits, hw-conduit, hw-diagnostics - , hw-json, hw-parser, hw-prim, hw-rankselect, mmap - , mono-traversable, parsec, QuickCheck, resourcet, text - , transformers, vector, word8 - }: + ({ mkDerivation, ansi-wl-pprint, base, dlist, hspec, QuickCheck }: mkDerivation { pname = "hw-mquery"; - version = "0.0.0.1"; - sha256 = "0bff5ab155d450a47c13d0bf4641f27a83230d526ee3de18947e30c4ee49d8bc"; - libraryHaskellDepends = [ - array attoparsec base bytestring conduit containers dlist hw-bits - hw-conduit hw-diagnostics hw-json hw-parser hw-prim hw-rankselect - mmap mono-traversable resourcet text vector word8 - ]; - testHaskellDepends = [ - attoparsec base bytestring conduit containers hspec hw-bits - hw-conduit hw-prim hw-rankselect mmap parsec QuickCheck resourcet - transformers vector - ]; + version = "0.1.0.0"; + sha256 = "7353d749e489c8cff4d5a9a923f3901453979642fcaa76e13617c67177149c83"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ ansi-wl-pprint base dlist ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; homepage = "http://github.com/haskell-works/hw-mquery#readme"; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.bsd3; @@ -95911,16 +96516,16 @@ self: { }) {}; "hw-prim" = callPackage - ({ mkDerivation, base, bytestring, hspec, QuickCheck, random - , vector + ({ mkDerivation, base, bytestring, deepseq, hspec, QuickCheck + , random, vector }: mkDerivation { pname = "hw-prim"; - version = "0.0.3.8"; - sha256 = "38684ac8dc3ecc4effe4e8f27fda4f5d515fd54b0d695f9eb30c24a5eac4038f"; + version = "0.1.0.0"; + sha256 = "ff4212ac8f2f767c1eecfac2a65f02623a81e4daf38a71030419d6c01643018b"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring random vector ]; + libraryHaskellDepends = [ base bytestring deepseq random vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base bytestring hspec QuickCheck random vector @@ -95955,8 +96560,8 @@ self: { }: mkDerivation { pname = "hw-rankselect"; - version = "0.2.0.1"; - sha256 = "6ded1738898c3549336faf296d78c74ec9089b5610c2e07c09cc2963e02787af"; + version = "0.3.0.0"; + sha256 = "c1b053a7b5752c55636bd95ad30678f0143aa0a3afc962ba2827187309782cfe"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hw-bits hw-prim vector ]; @@ -97509,13 +98114,13 @@ self: { }) {}; "idringen" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath + ({ mkDerivation, base, bytestring, directory, filepath, hspec , http-conduit, MissingH, process, transformers }: mkDerivation { pname = "idringen"; - version = "0.1.0.1"; - sha256 = "28b154c9f991f86cdbfb7cd563e51de5c5a6b7fb65e80de4b2e50dae75881014"; + version = "0.1.0.3"; + sha256 = "b478a71aabb0b82f39b61515cf4a0fbe9fbbd5f8beccba09ec0b8a192a96e32a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -97523,6 +98128,7 @@ self: { transformers ]; executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; homepage = "https://github.com/zjhmale/idringen"; description = "A project manage tool for Idris"; license = stdenv.lib.licenses.bsd3; @@ -98440,8 +99046,8 @@ self: { }: mkDerivation { pname = "imperative-edsl"; - version = "0.6"; - sha256 = "fda40eb483f84092a3c2e2456445fadf151de469c1231366f38f061790222cc2"; + version = "0.7"; + sha256 = "1a207736fb6b84e5316bbbe95593b464fe7f155db65e89fbac78b59d0e05f5f7"; libraryHaskellDepends = [ array base BoundedChan containers data-default-class deepseq directory exception-transformers ghc-prim language-c-quote @@ -99207,7 +99813,7 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "inline-c" = callPackage + "inline-c_0_5_5_5" = callPackage ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring , containers, cryptohash, directory, filepath, hashable, hspec, mtl , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix @@ -99232,6 +99838,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "inline-c" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring + , containers, cryptohash, directory, filepath, hashable, hspec, mtl + , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix + , template-haskell, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "inline-c"; + version = "0.5.5.6"; + sha256 = "31bd1599b8d278c5be87ef4672d161e75ae057cf553f85396755874f6e412408"; + libraryHaskellDepends = [ + ansi-wl-pprint base binary bytestring containers cryptohash + directory filepath hashable mtl parsec parsers QuickCheck + template-haskell transformers unordered-containers vector + ]; + testHaskellDepends = [ + ansi-wl-pprint base containers hashable hspec parsers QuickCheck + raw-strings-qq regex-posix template-haskell transformers + unordered-containers vector + ]; + description = "Write Haskell source files including C code inline. No FFI required."; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inline-c-cpp" = callPackage ({ mkDerivation, base, inline-c, template-haskell }: mkDerivation { @@ -99340,7 +99971,6 @@ self: { tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck template-haskell temporary text unix vector ]; - doCheck = false; homepage = "https://tweag.github.io/HaskellR"; description = "Seamlessly call R from Haskell and vice versa. No FFI required."; license = stdenv.lib.licenses.bsd3; @@ -99780,10 +100410,8 @@ self: { }: mkDerivation { pname = "intero"; - version = "0.1.16"; - sha256 = "28dc0a16cec34ec8423f7b97c5243f0a894d22881e400c8c74cb06608040dfa1"; - revision = "1"; - editedCabalFile = "ac2cf03606a57c99b8b685b5411a6e19aa59047203ecfb469c28397b52a69da1"; + version = "0.1.18"; + sha256 = "7e546a35df019149e38bf2a33cd977c2143e650b45a3c7835a42fd1c7099c570"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -100650,19 +101278,18 @@ self: { }) {}; "irc-core" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, hashable, lens + ({ mkDerivation, attoparsec, base, bytestring, hashable, HUnit , memory, primitive, text, time, vector }: mkDerivation { pname = "irc-core"; - version = "2.1.0.0"; - sha256 = "e1dcd6a967bd866d56df30b29fcdeb97b11d9608419e1886288e45a29a2e799d"; - revision = "1"; - editedCabalFile = "81dda1142ca0a847629278e19cb1535c3073e9f4755aac347f088d4eb2c6dc60"; + version = "2.1.1.1"; + sha256 = "73f5a1ced86966659bad47f2e6a04419aac16319500cae4784361430751b808a"; libraryHaskellDepends = [ - attoparsec base bytestring hashable lens memory primitive text time + attoparsec base bytestring hashable memory primitive text time vector ]; + testHaskellDepends = [ base HUnit text ]; homepage = "https://github.com/glguy/irc-core"; description = "IRC core library for glirc"; license = stdenv.lib.licenses.isc; @@ -101095,6 +101722,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "isotope" = callPackage + ({ mkDerivation, base, containers, hspec, megaparsec, QuickCheck + , template-haskell, th-lift + }: + mkDerivation { + pname = "isotope"; + version = "0.1.0.0"; + sha256 = "8b63da859be3cbf3eaabcdf123563feeb2479b2edbb98acee1632b8322b5bc78"; + libraryHaskellDepends = [ + base containers megaparsec template-haskell th-lift + ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + jailbreak = true; + homepage = "https://github.com/Michaelt293/Element-isotopes/blob/master/README.md"; + description = "Isotopic masses and relative abundances"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "ispositive" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -102493,6 +103138,7 @@ self: { homepage = "https://github.com/toddmohney/json-api"; description = "Utilities for generating JSON-API payloads"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-assertions" = callPackage @@ -102997,8 +103643,8 @@ self: { }: mkDerivation { pname = "json-stream"; - version = "0.4.1.0"; - sha256 = "eaaec9b5f640203e2aa4d78988966440e24e8c76a97e25292db630cc51d3f497"; + version = "0.4.1.2"; + sha256 = "096be98bf0f8eb13a83388a455fc123d13c18c11a598fbde31506b610c78e976"; libraryHaskellDepends = [ aeson base bytestring scientific text unordered-containers vector ]; @@ -103356,6 +104002,7 @@ self: { homepage = "http://github.com/gibiansky/haskell-jupyter"; description = "A library for creating and using Jupyter kernels"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jvm-parser" = callPackage @@ -103466,6 +104113,7 @@ self: { homepage = "https://github.com/sdiehl/kaleidoscope"; description = "Haskell Kaleidoscope tutorial"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kan-extensions_4_2_3" = callPackage @@ -104468,6 +105116,7 @@ self: { homepage = "https://joeyh.name/code/keysafe/"; description = "back up a secret key securely to the cloud"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {argon2 = null;}; "keystore" = callPackage @@ -104745,6 +105394,7 @@ self: { homepage = "http://hub.darcs.net/thielema/knead/"; description = "Repa array processing using LLVM JIT"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "knead-arithmetic" = callPackage @@ -104759,6 +105409,7 @@ self: { homepage = "http://hub.darcs.net/thielema/knead-arithmetic/"; description = "Linear algebra and interpolation using LLVM JIT"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "knob" = callPackage @@ -105568,6 +106219,7 @@ self: { homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Utility libraries for the advanced IRC bot, Lambdabot"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdacat" = callPackage @@ -106053,6 +106705,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-c-quote_0_11_6_3" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers + , exception-mtl, exception-transformers, filepath, happy + , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb + , symbol, template-haskell, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "language-c-quote"; + version = "0.11.6.3"; + sha256 = "1dea4102addfaa4744b7dc110f2e842a11511dc4da72814222be4a954a721a2b"; + libraryHaskellDepends = [ + array base bytestring containers exception-mtl + exception-transformers filepath haskell-src-meta mainland-pretty + mtl srcloc syb symbol template-haskell + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base bytestring HUnit mainland-pretty srcloc symbol test-framework + test-framework-hunit + ]; + homepage = "http://www.drexel.edu/~mainland/"; + description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-cil" = callPackage ({ mkDerivation, base, bool-extras }: mkDerivation { @@ -106073,8 +106751,8 @@ self: { }: mkDerivation { pname = "language-conf"; - version = "0.2.1.0"; - sha256 = "a61265983569cefca12d5c27fbaed131a0592ca4065fd375dcb224c36acfe024"; + version = "0.2.2.0"; + sha256 = "f7413ee42c06fb62b47965e2aa1a03355e609177c5d2590d9d129ec0c2a8a39a"; libraryHaskellDepends = [ aeson base deepseq directory filepath megaparsec pretty scientific semigroups text unordered-containers vector @@ -106132,7 +106810,6 @@ self: { test-framework test-framework-hunit th-lift th-lift-instances transformers ]; - doCheck = false; homepage = "https://github.com/beijaflor-io/language-dockerfile#readme"; description = "Dockerfile linter, parser, pretty-printer and embedded DSL"; license = stdenv.lib.licenses.gpl3; @@ -106409,8 +107086,8 @@ self: { }: mkDerivation { pname = "language-lua"; - version = "0.9.0"; - sha256 = "24da44733576714dcd6f3782f661e877771a2c394a97d8231151518588e82de5"; + version = "0.10.0"; + sha256 = "0c2012b6dfe5127158d8300cca11c18ef3be428e010e05d4bd6e1ec9f3fd3c62"; libraryHaskellDepends = [ array base bytestring deepseq text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ @@ -106887,6 +107564,7 @@ self: { homepage = "https://github.com/factisresearch/large-hashable"; description = "Efficiently hash (large) Haskell values"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "largeword" = callPackage @@ -107699,7 +108377,6 @@ self: { test-framework-hunit test-framework-quickcheck2 test-framework-th transformers ]; - doCheck = false; homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; license = stdenv.lib.licenses.bsd3; @@ -108956,6 +109633,7 @@ self: { executableSystemDepends = [ nvpair zfs ]; description = "Bindings to libzfs, for dealing with the Z File System and Zpools"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {nvpair = null; inherit (pkgs) zfs;}; "licensor" = callPackage @@ -109604,16 +110282,17 @@ self: { }) {}; "linode-v4" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-conduit + ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit , unordered-containers }: mkDerivation { pname = "linode-v4"; - version = "0.1.0.1"; - sha256 = "838b407b13077d9d61bb01d96dbf0235fa5be7d5b6403eb954d318965c28b722"; + version = "0.1.0.3"; + sha256 = "83bb8598f94a9646469469b85c1673189b89139ba9dc173bc85e8ee30ff40bfe"; libraryHaskellDepends = [ aeson base bytestring http-conduit unordered-containers ]; + testHaskellDepends = [ base hspec ]; jailbreak = true; homepage = "https://github.com/eatonphil/linode-haskell"; description = "Haskell wrapper for the Linode v4 API"; @@ -109907,6 +110586,7 @@ self: { homepage = "https://github.com/projectorhq/haskell-liquid"; description = "Liquid template language library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "liquid-fixpoint" = callPackage @@ -110263,12 +110943,13 @@ self: { }) {}; "list-transformer" = callPackage - ({ mkDerivation, base, mtl }: + ({ mkDerivation, base, doctest, mtl }: mkDerivation { pname = "list-transformer"; - version = "1.0.0"; - sha256 = "8e653ddd1f5ca44f6611fbc636431e4eedc778da4f2b6e1cce0aa3ddcf7c037d"; + version = "1.0.1"; + sha256 = "25f574da365db08d19fdb17f69a682de951850e471f4b9c051293aeddb86506a"; libraryHaskellDepends = [ base mtl ]; + testHaskellDepends = [ base doctest ]; homepage = "https://github.com/Gabriel439/Haskell-List-Transformer-Library"; description = "List monad transformer"; license = stdenv.lib.licenses.bsd3; @@ -110595,7 +111276,7 @@ self: { description = "FFI bindings to the LLVM compiler toolkit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {"llvm" = null;}; + }) {inherit (self.llvmPackages) llvm;}; "llvm-ffi-tools" = callPackage ({ mkDerivation, base, bytestring, containers, regex-posix @@ -111531,6 +112212,7 @@ self: { ]; description = "Calculus for LOL (λω language)"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lol-typing" = callPackage @@ -111542,6 +112224,8 @@ self: { pname = "lol-typing"; version = "1.20160822"; sha256 = "23dc43a7cc9a742da3c335b4b68118b46e9d9afc868ac929f077cdbb35e1538b"; + revision = "1"; + editedCabalFile = "66fc867da364d50ad2808e9b6ec0e6e55ea415691e66e0d6094880ddf768f3ba"; setupHaskellDepends = [ base Cabal uuagc uuagc-cabal ]; libraryHaskellDepends = [ base containers ghc-prim lol-calculus monad-classes parsec text @@ -111552,9 +112236,9 @@ self: { monad-classes tasty tasty-hunit text text-format transformers ]; jailbreak = true; - homepage = "http://pad.autogeree.net/informatique/lol/"; description = "Type inferencer for LOL (λω language)"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "loli" = callPackage @@ -111808,6 +112492,7 @@ self: { ]; description = "An EDSL for diagrams based based on linear constraints"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lp-diagrams-svg" = callPackage @@ -111825,6 +112510,7 @@ self: { ]; description = "SVG Backend for lp-diagrams"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lrucache" = callPackage @@ -112002,8 +112688,8 @@ self: { }: mkDerivation { pname = "ltiv1p1"; - version = "1.0.0.2"; - sha256 = "d51a7723a205b344b15a153de8baf463d31c23275891691613b13fe2dc9de24c"; + version = "1.0.0.3"; + sha256 = "6393a2fc805e8d089782ce3e25adfbb21b46af0d96f7c7a3791ecf30f6097be7"; libraryHaskellDepends = [ authenticate-oauth base blaze-builder bytestring containers data-default http-client http-types random text time transformers @@ -113124,7 +113810,6 @@ self: { sha256 = "e47e5f07b23071ea1a9881c034ce66f915d3c2a3cf646b4f7db2718725d80316"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ attoparsec base bytestring doctest Glob ]; - doCheck = false; homepage = "http://github.com/nmattia/mask"; description = "Simple Makefile parser"; license = stdenv.lib.licenses.mit; @@ -114028,8 +114713,8 @@ self: { }: mkDerivation { pname = "mars"; - version = "0.2.0.0"; - sha256 = "070993003d162fa6e76cf38a0976fa821a3072cf792a0415759f89003209fa96"; + version = "0.2.1.0"; + sha256 = "dfc3504269555da1e5398e2dcb2c12308411abad427fb3372f5819efba36d5fd"; libraryHaskellDepends = [ array base bytestring colour gloss MonadRandom mtl random ]; @@ -114037,6 +114722,7 @@ self: { homepage = "https://qlfiles.net"; description = "Generates mountainous terrain using a random walk algorithm"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "marxup" = callPackage @@ -115165,6 +115851,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "memorypool" = callPackage + ({ mkDerivation, base, containers, transformers, unsafe, vector }: + mkDerivation { + pname = "memorypool"; + version = "0.1.0.0"; + sha256 = "70b6602bbb2fb3268ae07c99057fdd8b68ed35654b0ba1907e5d59ed5cd37a70"; + libraryHaskellDepends = [ + base containers transformers unsafe vector + ]; + homepage = "https://github.com/lspitzner/memorypool"; + description = "basic memory pool outside of haskell heap/GC"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "memscript" = callPackage ({ mkDerivation, base, haskeline, transformers }: mkDerivation { @@ -115211,7 +115911,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mersenne-random-pure64_0_2_0_5" = callPackage + "mersenne-random-pure64" = callPackage ({ mkDerivation, base, old-time, random }: mkDerivation { pname = "mersenne-random-pure64"; @@ -115221,19 +115921,19 @@ self: { homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/"; description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mersenne-random-pure64" = callPackage + "mersenne-random-pure64_0_2_2_0" = callPackage ({ mkDerivation, base, random, time }: mkDerivation { pname = "mersenne-random-pure64"; - version = "0.2.1.0"; - sha256 = "0f2b3eb57e53e3057598bb0c026f16143dbc73b1237bc45d69a9a9ec64f6904f"; + version = "0.2.2.0"; + sha256 = "ef1400ddc1ddafb0b98d4331a58bdbe3b5209a81579e17f85f180731a96d75d1"; libraryHaskellDepends = [ base random time ]; homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/"; description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "messagepack" = callPackage @@ -116238,6 +116938,7 @@ self: { homepage = "https://github.com/stepcut/minecraft-data"; description = "a DSL for generating minecraft commands and levels"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mines" = callPackage @@ -117432,6 +118133,7 @@ self: { homepage = "https://github.com/mgajda/monad-lgbt#readme"; description = "Monad transformers for combining local and global state"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-log" = callPackage @@ -117495,8 +118197,8 @@ self: { }: mkDerivation { pname = "monad-logger-prefix"; - version = "0.1.4"; - sha256 = "3723db1545702f800a3fa5663f4120b9778ce089c50bddf4c0263ff8ca46d39a"; + version = "0.1.5"; + sha256 = "fac86ae4d93d817963a9f8a75eadbd08bde5b1f3e6a12f07ef85f30c9a452fcf"; libraryHaskellDepends = [ base exceptions monad-control monad-logger mtl resourcet text transformers transformers-base @@ -118339,8 +119041,8 @@ self: { }: mkDerivation { pname = "mongoDB"; - version = "2.1.1"; - sha256 = "b8f737847418fa1c9f4f9746762c47f3eaa7ce45acdcb5efc2e4c2bcd22e922e"; + version = "2.1.1.1"; + sha256 = "e4bf850327da71db1b91441445b1d7585bd276a435cfdf60d622eacf14039c57"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring binary bson bytestring containers cryptohash data-default-class hashtables @@ -118351,7 +119053,7 @@ self: { doCheck = false; homepage = "https://github.com/mongodb-haskell/mongodb"; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; - license = "unknown"; + license = stdenv.lib.licenses.asl20; }) {}; "mongodb-queue" = callPackage @@ -118771,6 +119473,30 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "monzo" = callPackage + ({ mkDerivation, aeson, authenticate-oauth, base, bytestring + , containers, hspec, http-client, http-client-tls, mtl, network + , servant, servant-client, servant-server, text, time, timerep + , transformers, unordered-containers, wai, warp + }: + mkDerivation { + pname = "monzo"; + version = "0.4.0.0"; + sha256 = "928b9fc1e68058798f8066e1fafb7f6010f8fd51d46f1783dd8bba96b752f7c6"; + libraryHaskellDepends = [ + aeson authenticate-oauth base bytestring containers http-client + http-client-tls mtl servant servant-client text time timerep + transformers unordered-containers + ]; + testHaskellDepends = [ + base hspec network servant servant-client servant-server time + timerep transformers wai warp + ]; + jailbreak = true; + description = "Haskell bindings for the Monzo API"; + license = stdenv.lib.licenses.mit; + }) {}; + "moo" = callPackage ({ mkDerivation, array, base, containers, gray-code, HUnit , mersenne-random-pure64, monad-mersenne-random, mtl, random @@ -120448,8 +121174,8 @@ self: { }: mkDerivation { pname = "mustache"; - version = "2.0.1"; - sha256 = "18404b812c7205eafe70f2cfbdf02828947405e4ff0dad86d790be68b956c834"; + version = "2.1"; + sha256 = "159241066d7e78bb40436391113f319ccb9753e6e00a72c604ccba493e7d42d6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120809,8 +121535,8 @@ self: { }: mkDerivation { pname = "mysql-haskell"; - version = "0.4.0.0"; - sha256 = "44cdd2fa3e897cd90667a60d63e408beca0acfcf83be134a49236db6ee809914"; + version = "0.5.0.0"; + sha256 = "90441f149ae5720c0842cadac775d8bd5f59f7f56c4f297bac19318ce3603258"; libraryHaskellDepends = [ base binary blaze-textual bytestring bytestring-lexing cryptonite HsOpenSSL io-streams memory monad-loops network scientific @@ -120825,6 +121551,7 @@ self: { homepage = "https://github.com/winterland1989/mysql-haskell"; description = "pure haskell MySQL driver"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "mysql-simple" = callPackage @@ -121098,8 +121825,8 @@ self: { ({ mkDerivation, base, containers, monoid-extras }: mkDerivation { pname = "namespace"; - version = "0.1.2.0"; - sha256 = "defefa737c991b1648e70bb1c4fd318dcc74a63071cc966c5dd8fe20b47d580e"; + version = "0.1.2.2"; + sha256 = "78992bb0c7b3f03633884512417674fbd9400298cf869b05d2d7ef9c9cdfe2f1"; libraryHaskellDepends = [ base containers monoid-extras ]; testHaskellDepends = [ base ]; homepage = "https://github.com/xu-hao/namespace"; @@ -121529,8 +122256,8 @@ self: { }: mkDerivation { pname = "ncurses"; - version = "0.2.15"; - sha256 = "d66088846d7b82ac7921a81e6456492277f1d81c0b115afe1a35b23e0ec0b198"; + version = "0.2.16"; + sha256 = "e50fb7b1f700d6fa60b4040623b7e0249ae6af2ef2729801fb2917e8b1f25e3f"; libraryHaskellDepends = [ base containers text transformers ]; librarySystemDepends = [ ncurses ]; libraryToolDepends = [ c2hs ]; @@ -122568,6 +123295,7 @@ self: { jailbreak = true; description = "HaNS to Network shims for easier HaNS integration"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-house" = callPackage @@ -123050,6 +123778,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-uri-flag" = callPackage + ({ mkDerivation, network, network-uri }: + mkDerivation { + pname = "network-uri-flag"; + version = "0.1"; + sha256 = "45a833cdb86ebfef2d7b8643ee83776fd88cb2ced8db9b2672e16727640bb662"; + revision = "2"; + editedCabalFile = "b35cdf41ffe29683d1edd38e1226a343e60fa3ea6fc7307a78b7528b24c042ed"; + libraryHaskellDepends = [ network network-uri ]; + doHaddock = false; + description = "Pseudo-package encapsulating flag(network-uri) Cabal boilerplate"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "network-uri-static" = callPackage ({ mkDerivation, base, doctest, network-uri, template-haskell }: mkDerivation { @@ -124113,6 +124855,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ntha" = callPackage + ({ mkDerivation, alex, array, base, containers, happy, haskeline + , hspec, lens, monad-loops, mtl, pretty, z3 + }: + mkDerivation { + pname = "ntha"; + version = "0.1.3"; + sha256 = "6abcccd975d4794526c1bd132a6405b1d9d7d865c6c84f791d15b2d7c400e73e"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers monad-loops mtl pretty z3 + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ base containers haskeline lens mtl ]; + testHaskellDepends = [ base containers hspec pretty ]; + homepage = "https://github.com/zjhmale/ntha"; + description = "A tiny statically typed functional programming language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nthable" = callPackage ({ mkDerivation, base, type-level }: mkDerivation { @@ -124801,6 +125564,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "octane_0_15_0" = callPackage + ({ mkDerivation, aeson, base, bimap, binary, binary-bits + , bytestring, containers, data-binary-ieee754, data-default-class + , deepseq, file-embed, http-client, http-client-tls + , overloaded-records, regex-compat, tasty, tasty-hspec, text + , unordered-containers, vector + }: + mkDerivation { + pname = "octane"; + version = "0.15.0"; + sha256 = "f5e89b98315efa4a62e0a07595dfecda52604bade45216def1eb23adbfc8218c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bimap binary binary-bits bytestring containers + data-binary-ieee754 data-default-class deepseq file-embed + overloaded-records regex-compat text unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base binary bytestring http-client http-client-tls + ]; + testHaskellDepends = [ base tasty tasty-hspec ]; + homepage = "https://github.com/tfausak/octane#readme"; + description = "Parse Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "octohat" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , base64-bytestring, bytestring, containers, cryptohash, dotenv @@ -124940,19 +125731,12 @@ self: { }) {}; "ogmarkup" = callPackage - ({ mkDerivation, base, blaze-html, hspec, mtl, parsec, shakespeare - , text, yesod - }: + ({ mkDerivation, base, hspec, mtl, parsec, shakespeare, text }: mkDerivation { pname = "ogmarkup"; - version = "2.1"; - sha256 = "1ba3c05aa8723ec24951b71db70ea06a676d092c9570ddda2a5af4e6e77881eb"; - isLibrary = true; - isExecutable = true; + version = "2.2"; + sha256 = "999ac4986db428da6910283df98b90044accb98c512f7cc27d013493c0c94678"; libraryHaskellDepends = [ base mtl parsec ]; - executableHaskellDepends = [ - base blaze-html parsec shakespeare text yesod - ]; testHaskellDepends = [ base hspec parsec shakespeare text ]; homepage = "http://github.com/ogma-project/ogmarkup"; description = "A lightweight markup language for story writers"; @@ -126870,10 +127654,9 @@ self: { ({ mkDerivation, base, colour, gloss, random }: mkDerivation { pname = "oscpacking"; - version = "0.2.1.1"; - sha256 = "503ff0847a498bccfa43bd9bf233b8beb0544e329998ab636ad251f5af52247a"; + version = "0.3.0.0"; + sha256 = "2c0e5df0dfee7beeb2e97ea24800c2b4f6bc9343debc817091ab1704bc50a290"; libraryHaskellDepends = [ base colour gloss random ]; - jailbreak = true; description = "Implements an osculatory packing (kissing circles) algorithm and display"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -127846,10 +128629,8 @@ self: { }: mkDerivation { pname = "papillon"; - version = "0.1.0.2"; - sha256 = "2a7a6d5b08e6be261dca18cc80a4040a1215a5a8e66953a1e766845455ba4861"; - revision = "1"; - editedCabalFile = "5c1af18fd9437293a3fd51ebfe1386e82e4ec7727be4a0703c5f198138ffb8cd"; + version = "0.1.0.3"; + sha256 = "827177b41054cb1e908cc237e36ef4ffd2bf44611879b327020c89ef8a673df9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127859,7 +128640,7 @@ self: { base directory filepath monads-tf template-haskell transformers ]; jailbreak = true; - homepage = "https://skami.iocikun.jp/computer/haskell/packages/papillon"; + homepage = "https://skami.iocikun.jp/haskell/packages/papillon"; description = "packrat parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; @@ -129844,40 +130625,6 @@ self: { }) {}; "persistent" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , blaze-html, blaze-markup, bytestring, conduit, containers - , exceptions, fast-logger, hspec, http-api-data, lifted-base - , monad-control, monad-logger, mtl, old-locale, path-pieces - , resource-pool, resourcet, scientific, silently, tagged - , template-haskell, text, time, transformers, transformers-base - , unordered-containers, vector - }: - mkDerivation { - pname = "persistent"; - version = "2.5"; - sha256 = "de34feeb6e9fb3a181f204e8fdf6ad2adebe781a88182cd136e0d330c2455375"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html blaze-markup - bytestring conduit containers exceptions fast-logger http-api-data - lifted-base monad-control monad-logger mtl old-locale path-pieces - resource-pool resourcet scientific silently tagged template-haskell - text time transformers transformers-base unordered-containers - vector - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-html bytestring - conduit containers fast-logger hspec http-api-data lifted-base - monad-control monad-logger mtl old-locale path-pieces resource-pool - resourcet scientific tagged template-haskell text time transformers - unordered-containers vector - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Type-safe, multi-backend data serialization"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent_2_6" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers , exceptions, fast-logger, hspec, http-api-data, lifted-base @@ -129908,7 +130655,6 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, multi-backend data serialization"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -130131,7 +130877,6 @@ self: { monad-control monad-logger mysql mysql-simple persistent resource-pool resourcet text transformers ]; - jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using MySQL database server"; license = stdenv.lib.licenses.mit; @@ -130182,27 +130927,6 @@ self: { }) {}; "persistent-postgresql" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, monad-control, monad-logger, persistent - , postgresql-libpq, postgresql-simple, resource-pool, resourcet - , text, time, transformers - }: - mkDerivation { - pname = "persistent-postgresql"; - version = "2.5"; - sha256 = "46694c4cf4f83b73944e8df989c37a50dc22b109fee2e739f21c66c352cdae09"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers - monad-control monad-logger persistent postgresql-libpq - postgresql-simple resource-pool resourcet text time transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using postgresql"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent-postgresql_2_6" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit , containers, monad-control, monad-logger, persistent , postgresql-libpq, postgresql-simple, resource-pool, resourcet @@ -130217,11 +130941,9 @@ self: { monad-control monad-logger persistent postgresql-libpq postgresql-simple resource-pool resourcet text time transformers ]; - jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using postgresql"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -130322,31 +131044,6 @@ self: { }) {}; "persistent-sqlite" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, containers - , hspec, monad-control, monad-logger, old-locale, persistent - , persistent-template, resource-pool, resourcet, temporary, text - , time, transformers - }: - mkDerivation { - pname = "persistent-sqlite"; - version = "2.5.0.2"; - sha256 = "dd0f3490a9daa0b11638080f0966049ba0946d7a392808789e57f3aa24c5f54d"; - libraryHaskellDepends = [ - aeson base bytestring conduit containers monad-control monad-logger - old-locale persistent resource-pool resourcet text time - transformers - ]; - testHaskellDepends = [ - base hspec persistent persistent-template temporary text time - transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using sqlite3"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "persistent-sqlite_2_6" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, monad-control, monad-logger, old-locale, persistent , persistent-template, resource-pool, resourcet, temporary, text @@ -130365,11 +131062,9 @@ self: { base hspec persistent persistent-template temporary text time transformers ]; - jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using sqlite3"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -131075,6 +131770,7 @@ self: { homepage = "https://github.com/sweirich/pi-forall"; description = "Demo implementation of typechecker for dependently-typed language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pia-forward" = callPackage @@ -131936,6 +132632,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-io" = callPackage + ({ mkDerivation, base, hspec, pipes, pipes-parse }: + mkDerivation { + pname = "pipes-io"; + version = "0.1"; + sha256 = "d9454a110860512ca6cf1d7c45f03c507d3bd05eaeba2ea798ed8167e416d499"; + revision = "1"; + editedCabalFile = "7c94944e42ff4eb463759eac4238b9150c91c58ffc75240a826f89981b408702"; + libraryHaskellDepends = [ base pipes pipes-parse ]; + testHaskellDepends = [ base hspec pipes ]; + description = "Stateful IO streams based on pipes"; + license = stdenv.lib.licenses.asl20; + }) {}; + "pipes-key-value-csv" = callPackage ({ mkDerivation, base, bifunctors, containers, contravariant , data-default-class, lens, mtl, pipes, pipes-bytestring @@ -132123,14 +132833,15 @@ self: { homepage = "https://github.com/mckeankylej/pipes-protolude#readme"; description = "Alternate Prelude for the pipes ecosystem"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-random" = callPackage ({ mkDerivation, base, mwc-random, pipes, vector }: mkDerivation { pname = "pipes-random"; - version = "1.0.0"; - sha256 = "af9bccbad467c71134ebd69b77c137fd034e92d805078e1c996703b7bb3dde12"; + version = "1.0.0.1"; + sha256 = "e18371195212d91ccb7f08f0d4065b3fd314988480bc72fce03f60716ac29ccd"; libraryHaskellDepends = [ base mwc-random pipes vector ]; description = "Producers for handling randomness"; license = stdenv.lib.licenses.bsd3; @@ -132653,6 +133364,8 @@ self: { pname = "plist-buddy"; version = "0.1.0.0"; sha256 = "481cb13bacb3a0e5a9eee75bd78b793b30b048140d3d7a19eabc9ef6b33cc774"; + revision = "2"; + editedCabalFile = "91011692ad8ca1dd4ef73d3960807be1e9f6f422f0befb850bd575603c1ceee0"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring cryptohash directory mtl posix-pty process text time xml @@ -132661,7 +133374,6 @@ self: { base bytestring directory hspec mtl posix-pty process QuickCheck text time ]; - jailbreak = true; description = "Remote monad for editing plists"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = [ "x86_64-darwin" ]; @@ -133031,6 +133743,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pointedalternative" = callPackage + ({ mkDerivation, base, mtl, semigroups, transformers }: + mkDerivation { + pname = "pointedalternative"; + version = "0.1.0.0"; + sha256 = "0a3af9212ef30c9ce000f6089b2ef9cfdc68f78d138ddeba04f404fa2040838a"; + libraryHaskellDepends = [ base mtl semigroups transformers ]; + homepage = "http://ircbrowse.net/browse/haskell?q=manyLazy"; + description = "Alternative done right"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pointedlist" = callPackage ({ mkDerivation, base, binary }: mkDerivation { @@ -133833,6 +134557,18 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {inherit (pkgs) acl;}; + "posix-error-codes" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "posix-error-codes"; + version = "0.1.0.0"; + sha256 = "61cbef7106066b04b7fb52b3b8a3f17a8913ee0951f2bb55376239ddb3b4c290"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/kerscher/posix-error-codes"; + description = "POSIX error codes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "posix-escape" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -134103,7 +134839,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "postgresql-libpq" = callPackage + "postgresql-libpq_0_9_1_1" = callPackage ({ mkDerivation, base, bytestring, postgresql }: mkDerivation { pname = "postgresql-libpq"; @@ -134114,6 +134850,20 @@ self: { homepage = "http://github.com/lpsmith/postgresql-libpq"; description = "low-level binding to libpq"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) postgresql;}; + + "postgresql-libpq" = callPackage + ({ mkDerivation, base, bytestring, postgresql }: + mkDerivation { + pname = "postgresql-libpq"; + version = "0.9.2.0"; + sha256 = "0338a93518bf73cd64b47977961f8183f6009b4e4ecc0c99b8bc68320808f310"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ postgresql ]; + homepage = "http://github.com/lpsmith/postgresql-libpq"; + description = "low-level binding to libpq"; + license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) postgresql;}; "postgresql-orm" = callPackage @@ -134434,6 +135184,7 @@ self: { homepage = "https://github.com/diogob/postgrest-ws#readme"; description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postie" = callPackage @@ -134823,17 +135574,18 @@ self: { }) {}; "preliminaries" = callPackage - ({ mkDerivation, abstract-par, bifunctors, classy-prelude-conduit - , data-default, microlens-contra, microlens-platform, monad-par - , monad-parallel, mono-traversable-instances, mtl, parallel - , stm-conduit, string-conversions + ({ mkDerivation, abstract-par, base, bifunctors + , classy-prelude-conduit, data-default, microlens-contra + , microlens-platform, monad-par, monad-parallel + , mono-traversable-instances, mtl, parallel, stm-conduit + , string-conversions }: mkDerivation { pname = "preliminaries"; - version = "0.1.4.0"; - sha256 = "50f7dc0e791e8c88674995729a46bf6d4b2d86bc88a0ce22d53968b18fb86e63"; + version = "0.1.5.0"; + sha256 = "c4a861eeeb4695797efcdfa591de3f8304976ebe73a0ea8df448298bb9c44949"; libraryHaskellDepends = [ - abstract-par bifunctors classy-prelude-conduit data-default + abstract-par base bifunctors classy-prelude-conduit data-default microlens-contra microlens-platform monad-par monad-parallel mono-traversable-instances mtl parallel stm-conduit string-conversions @@ -135159,12 +135911,12 @@ self: { }) {}; "pretty-types" = callPackage - ({ mkDerivation, base, hspec }: + ({ mkDerivation, base, hspec, mtl }: mkDerivation { pname = "pretty-types"; - version = "0.1.1.0"; - sha256 = "10f351d6c028ddaf745a4d17a3c3191c7e8d917ad1503b2339e7bd432d7f03f8"; - libraryHaskellDepends = [ base ]; + version = "0.2.1.0"; + sha256 = "5c174607ef75dade1edb781ae0edadb4da0b66547d1f55967369435f9a4ea452"; + libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base hspec ]; homepage = "https://github.com/sheyll/pretty-types#readme"; description = "A small pretty printing DSL for complex types"; @@ -135470,12 +136222,11 @@ self: { }: mkDerivation { pname = "probable"; - version = "0.1.1"; - sha256 = "9923eff95f7404fcfc04f514888dc6d8d5e4b57b56c0a55c6502b3ace03dd7d8"; + version = "0.1.2"; + sha256 = "df4d08403d4776f90845b3f5fc21068dcaa7fa78bc9e89522ff2914fc7efd753"; libraryHaskellDepends = [ base mtl mwc-random primitive statistics transformers vector ]; - jailbreak = true; homepage = "http://github.com/alpmestan/probable"; description = "Easy and reasonably efficient probabilistic programming and random generation"; license = stdenv.lib.licenses.bsd3; @@ -136229,8 +136980,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "3.1.1"; - sha256 = "664b6653f0eb098c0217f0670035e621d11f845e68a24ce108907d83d63b111a"; + version = "3.1.2"; + sha256 = "a6baace79c8dd9782985836304494bf3cc4159ae6df398c9ee9d613a418a8e47"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136349,8 +137100,8 @@ self: { }: mkDerivation { pname = "proto-lens"; - version = "0.1.0.1"; - sha256 = "3de8afba7eb6b757971f84edc1f60d8828700ea7eb7b3d70e488eac81fffc09c"; + version = "0.1.0.2"; + sha256 = "860abe2b2a248144a7459dd00b5a55a8e13e07ba143060295d2db0c1790d067b"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class lens-family parsec pretty text transformers void @@ -136384,14 +137135,14 @@ self: { }: mkDerivation { pname = "proto-lens-combinators"; - version = "0.1.0.1"; - sha256 = "1c3288fc2b2026b00463c4da011b01f1ef1c80caa3c18703986145ecca503a2c"; + version = "0.1.0.2"; + sha256 = "6ca43460e627f46944cf9b66e831f1e6997ef24fe5a7568a0e665987f1ecc077"; libraryHaskellDepends = [ base data-default-class lens-family proto-lens proto-lens-protoc transformers ]; testHaskellDepends = [ - base HUnit lens-family proto-lens-protoc test-framework + base HUnit lens-family proto-lens proto-lens-protoc test-framework test-framework-hunit ]; jailbreak = true; @@ -136422,13 +137173,13 @@ self: { }: mkDerivation { pname = "proto-lens-protoc"; - version = "0.1.0.1"; - sha256 = "eeee63e3456da3a3c8062c7404b86fa4671ec1281a91d4124b97dccf571ad987"; + version = "0.1.0.2"; + sha256 = "f70c4ae45a950ce090d6d93303738ee79e237168a7b03bce2a4f883a0ace6b4b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring Cabal containers data-default-class directory - filepath lens-family process proto-lens text + filepath haskell-src-exts lens-family process proto-lens text ]; executableHaskellDepends = [ base bytestring containers data-default-class filepath @@ -137162,6 +137913,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libpulseaudio;}; + "pulseaudio" = callPackage + ({ mkDerivation, base, containers, pulse, stm, unix }: + mkDerivation { + pname = "pulseaudio"; + version = "0.0.1.1"; + sha256 = "11696b8df21dc010b0792c3b7ded2ea683b4d379657eca39ace2a04fabaf36f0"; + libraryHaskellDepends = [ base containers stm unix ]; + librarySystemDepends = [ pulse ]; + description = "A low-level (incomplete) wrapper around the pulseaudio client asynchronous api"; + license = stdenv.lib.licenses.lgpl3; + }) {pulse = null;}; + "punkt" = callPackage ({ mkDerivation, array, base, mtl, regex-tdfa, regex-tdfa-text , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers @@ -138067,8 +138830,8 @@ self: { ({ mkDerivation, aeson, attoparsec, base, http-types, mtl, text }: mkDerivation { pname = "quack"; - version = "0.0.0.1"; - sha256 = "86a7aae649a3c81bea6ccf368a13d75deddf11efd850580e28c92ede55cee8a3"; + version = "0.0.0.3"; + sha256 = "2925bcce5bc0f5d1938c3c83852608b45c625278bb7f0109afc5bd4d4b9bdfa3"; libraryHaskellDepends = [ aeson attoparsec base http-types mtl text ]; @@ -139075,20 +139838,21 @@ self: { "raft" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring - , containers, data-default, ghc-prim, mtl, scientific, split, text - , time, tostring, zlib + , containers, data-default, ghc-prim, mtl, parallel, scientific + , split, text, time, tostring, zlib }: mkDerivation { pname = "raft"; - version = "0.3.2.2"; - sha256 = "1a22a4de6376889553263fc04f76e3fdfa7f2932db6df3512edd71d8955c7096"; + version = "0.3.7.0"; + sha256 = "5f54a03b971f1853ee4d8033aaa134c6765d254d070e1d31b5871b2e187839b3"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring containers data-default - ghc-prim mtl scientific split text time tostring zlib + ghc-prim mtl parallel scientific split text time tostring zlib ]; homepage = "https://bitbucket.org/functionally/raft"; description = "Miscellaneous Haskell utilities for data structures and data manipulation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rail-compiler-editor" = callPackage @@ -139837,6 +140601,30 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; + "raw-feldspar" = callPackage + ({ mkDerivation, array, base, constraints, containers + , data-default-class, data-hash, imperative-edsl, language-c-quote + , mtl, operational-alacarte, prelude-edsl, QuickCheck, syntactic + , tasty, tasty-hunit, tasty-quickcheck, tasty-th, template-haskell + }: + mkDerivation { + pname = "raw-feldspar"; + version = "0.1"; + sha256 = "e1c3a65925f763519ef55d893b38c859db3a5386c6a8007e08dc941bc521f357"; + libraryHaskellDepends = [ + array base constraints containers data-default-class data-hash + imperative-edsl language-c-quote mtl operational-alacarte + prelude-edsl syntactic template-haskell + ]; + testHaskellDepends = [ + base mtl QuickCheck syntactic tasty tasty-hunit tasty-quickcheck + tasty-th + ]; + homepage = "https://github.com/Feldspar/raw-feldspar"; + description = "Resource-Aware Feldspar"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "raw-strings-qq" = callPackage ({ mkDerivation, base, HUnit, template-haskell }: mkDerivation { @@ -139850,6 +140638,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rawr" = callPackage + ({ mkDerivation, base, deepseq, doctest, ghc-datasize, ghc-prim + , lens, tasty, tasty-hunit, template-haskell + }: + mkDerivation { + pname = "rawr"; + version = "0.0.0.1"; + sha256 = "aea2f4d27182b6b7ef4427720c4146d550a399b1180b42eb892012facaaf819e"; + libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ]; + testHaskellDepends = [ + base deepseq doctest ghc-datasize lens tasty tasty-hunit + ]; + jailbreak = true; + homepage = "https://github.com/pkmx/rawr"; + description = "Anonymous extensible records"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rawstring-qm" = callPackage ({ mkDerivation, base, bytestring, template-haskell, text }: mkDerivation { @@ -139943,8 +140749,8 @@ self: { }: mkDerivation { pname = "rdf"; - version = "0.1.0.0"; - sha256 = "b18dac5e3a4465a0f24eafb03deb2cdbf9de8deaf7713e565408c52e9fe5b37a"; + version = "0.1.0.1"; + sha256 = "4f320db1d89ccff1d93d5694d00f9d51eeaea81e2f3ba6da32e0d7badd333ea6"; libraryHaskellDepends = [ attoparsec base bytestring deepseq dlist fgl text transformers ]; @@ -140050,8 +140856,8 @@ self: { }: mkDerivation { pname = "react-flux"; - version = "1.2.1"; - sha256 = "5d2b4decb013edd5e90c1bc109d13cb8f49f3e1dd8a657249df52c8639819e34"; + version = "1.2.2"; + sha256 = "a2d11eed2b5ff02ca22bf9b981b788497e8b464b7c456f86625be6c6adfc8b06"; libraryHaskellDepends = [ aeson base bytestring deepseq mtl template-haskell text time unordered-containers @@ -140061,6 +140867,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "react-flux-servant" = callPackage + ({ mkDerivation, aeson, base, react-flux, servant, text }: + mkDerivation { + pname = "react-flux-servant"; + version = "0.1.0"; + sha256 = "9dac8c127094cb3ddfded25f5b79f2da46f3f8cd5e6aa58c552b55d341ced901"; + libraryHaskellDepends = [ aeson base react-flux servant text ]; + homepage = "https://bitbucket.org/wuzzeb/react-flux-servant"; + description = "Allow react-flux stores to send requests to a servant server"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "react-haskell" = callPackage ({ mkDerivation, aeson, base, deepseq, lens-family, monads-tf, text , transformers, unordered-containers, void @@ -140095,6 +140913,7 @@ self: { jailbreak = true; description = "react-tutorial web server"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reaction-logic" = callPackage @@ -142411,6 +143230,7 @@ self: { homepage = "https://github.com/jpmoresmau/reload#readme"; description = "A web based Haskell IDE"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rematch" = callPackage @@ -142955,8 +143775,8 @@ self: { }: mkDerivation { pname = "repl-toolkit"; - version = "1.0.1.0"; - sha256 = "4b170911926fc0ac270ab1e1689d4427c6141a5a67336ad79a675d8a5c0945ef"; + version = "1.1.0.0"; + sha256 = "f6cf40598841d6aefda7104ab331c114d67acb35292162a2cc591a7558b0edb7"; libraryHaskellDepends = [ aeson base bytestring data-default directory exceptions filepath functor-monadic ListLike listsafe monad-loops mtl parsec @@ -143156,7 +143976,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "reroute" = callPackage + "reroute_0_3_1_0" = callPackage ({ mkDerivation, base, deepseq, graph-core, hashable, hspec, hvect , mtl, path-pieces, regex-compat, text, transformers , unordered-containers, vector @@ -143175,6 +143995,27 @@ self: { homepage = "http://github.com/agrafix/reroute"; description = "abstract implementation of typed and untyped web routing"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "reroute" = callPackage + ({ mkDerivation, base, deepseq, hashable, hspec, hvect, mtl + , path-pieces, text, unordered-containers, vector + }: + mkDerivation { + pname = "reroute"; + version = "0.4.0.1"; + sha256 = "d1c3636aa6d2895055721ff9290a595fff2ce3e9d917e9af7e36aafb71701f0e"; + libraryHaskellDepends = [ + base deepseq hashable hvect mtl path-pieces text + unordered-containers + ]; + testHaskellDepends = [ + base hspec hvect mtl text unordered-containers vector + ]; + homepage = "http://github.com/agrafix/Spock"; + description = "abstract implementation of typed and untyped web routing"; + license = stdenv.lib.licenses.mit; }) {}; "reserve" = callPackage @@ -143568,11 +144409,12 @@ self: { pname = "rest-snap"; version = "0.2.0.1"; sha256 = "24ff57b82808aac05a04d8b1e4ac24e5a2a71655991d95415d8a713533c402d5"; + revision = "1"; + editedCabalFile = "fc05db1f47c6eb12429938204f60d3078751997afa8cdc20e82c50ee13a16978"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive rest-core safe snap-core unordered-containers uri-encode utf8-string ]; - jailbreak = true; description = "Rest driver for Snap"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -143690,12 +144532,16 @@ self: { }) {}; "result" = callPackage - ({ mkDerivation, base, bifunctors, keys, semigroups }: + ({ mkDerivation, base, bifunctors, keys, mtl, semigroups + , transformers + }: mkDerivation { pname = "result"; - version = "0.2.2.0"; - sha256 = "9807a72c07467c617a27bf5a7c4ebae6e1732cba6a767d934edb9b7435e26e51"; - libraryHaskellDepends = [ base bifunctors keys semigroups ]; + version = "0.2.3.0"; + sha256 = "d6dc6392e421116beac1c5613b6f0ee5f464b28d8ea5cd7889e8b1a5f6e399de"; + libraryHaskellDepends = [ + base bifunctors keys mtl semigroups transformers + ]; testHaskellDepends = [ base ]; homepage = "https://github.com/srijs/haskell-result"; description = "Encode success or at least one error"; @@ -144356,6 +145202,7 @@ self: { homepage = "https://github.com/dbp/rivet"; description = "A project management tool for Haskell applications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rivet-adaptor-postgresql" = callPackage @@ -144420,6 +145267,7 @@ self: { homepage = "https://github.com/dbp/rivet"; description = "Basic deployment support for project management tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rlglue" = callPackage @@ -144483,6 +145331,7 @@ self: { homepage = "https://github.com/cpeikert/Lol"; description = "Ring-LWE/LWR challenges using Lol"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rmonad" = callPackage @@ -149034,6 +149883,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-auth-hmac" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-html, blaze-markup, bytestring, case-insensitive, cereal + , containers, cryptonite, data-default, exceptions, hspec + , hspec-expectations, hspec-wai, http-media, http-types, memory + , mtl, random, servant, servant-blaze, servant-server, string-class + , text, time, transformers, unix, wai, wai-extra, warp + , with-location + }: + mkDerivation { + pname = "servant-auth-hmac"; + version = "0.1.0.1"; + sha256 = "ca7ee1d75e290c5e120083e3ae765033da76dbc5e0be7e00f2c586a948bdfc9f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base base64-bytestring bytestring case-insensitive + cryptonite data-default exceptions http-types memory servant + servant-server string-class time transformers wai + ]; + executableHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring cereal containers + data-default http-media mtl random servant servant-blaze + servant-server string-class text transformers unix wai warp + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive cereal + containers cryptonite data-default hspec hspec-expectations + hspec-wai http-types random servant servant-server string-class + time transformers wai wai-extra with-location + ]; + description = "Authentication via HMAC"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-auth-token" = callPackage ({ mkDerivation, aeson-injector, base, bytestring, containers, mtl , persistent, persistent-postgresql, persistent-template @@ -149049,6 +149933,7 @@ self: { persistent-postgresql persistent-template pwstore-fast servant-auth-token-api servant-server text time transformers uuid ]; + jailbreak = true; homepage = "https://github.com/ncrashed/servant-auth-token#readme"; description = "Servant based API and server for token based authorisation"; license = stdenv.lib.licenses.bsd3; @@ -149488,6 +150373,7 @@ self: { jailbreak = true; description = "Matrix parameter combinator for servant"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-mock" = callPackage @@ -149606,8 +150492,8 @@ self: { }: mkDerivation { pname = "servant-purescript"; - version = "0.2.0.1"; - sha256 = "161930685b414a1780860d6364bff3504923218156b000e0f502b6010db1e178"; + version = "0.3.0.0"; + sha256 = "4baedc50f875564c6eed6e64ba3d49dd2ffb68cf8f0741580e3c5f818b9285cb"; libraryHaskellDepends = [ aeson base bytestring containers directory filepath http-types lens mainland-pretty purescript-bridge servant servant-foreign @@ -149617,7 +150503,6 @@ self: { aeson base containers lens mainland-pretty purescript-bridge servant servant-foreign servant-subscriber text ]; - jailbreak = true; homepage = "https://github.com/eskimor/servant-purescript#readme"; description = "Generate PureScript accessor functions for you servant API"; license = stdenv.lib.licenses.bsd3; @@ -149626,24 +150511,26 @@ self: { "servant-quickcheck" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring - , case-insensitive, data-default-class, hspec, http-client - , http-media, http-types, mtl, process, QuickCheck, quickcheck-io - , servant, servant-client, servant-server, split - , string-conversions, temporary, text, transformers, warp + , case-insensitive, data-default-class, hspec, hspec-core + , http-client, http-media, http-types, mtl, pretty, process + , QuickCheck, quickcheck-io, servant, servant-client + , servant-server, split, string-conversions, temporary, text + , transformers, warp }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.0.0"; - sha256 = "12570871ccef6e0bf290a2d3b3635b37a8cef00a7ce6adff3927bb5b14f52f67"; + version = "0.0.1.1"; + sha256 = "e200e569feb68818c3a3cf64b3e9279e50b7ac3ead8e1702be866e4140d69673"; libraryHaskellDepends = [ aeson base base-compat bytestring case-insensitive data-default-class hspec http-client http-media http-types mtl - process QuickCheck servant servant-client servant-server split - string-conversions temporary text warp + pretty process QuickCheck servant servant-client servant-server + split string-conversions temporary text warp ]; testHaskellDepends = [ - base base-compat hspec http-client QuickCheck quickcheck-io servant - servant-client servant-server transformers warp + base base-compat hspec hspec-core http-client QuickCheck + quickcheck-io servant servant-client servant-server transformers + warp ]; jailbreak = true; description = "QuickCheck entire APIs"; @@ -149799,6 +150686,7 @@ self: { homepage = "https://github.com/NCrashed/servant-smsc-ru#readme"; description = "Servant client for smsc.ru service for sending SMS to cell phones"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-subscriber" = callPackage @@ -149811,8 +150699,8 @@ self: { }: mkDerivation { pname = "servant-subscriber"; - version = "0.3.0.0"; - sha256 = "63096205ce9465ba113d4b1f8823036b0a68f7190682e5e80464114e2595ac37"; + version = "0.4.0.0"; + sha256 = "b539a26ac25739165fd375e4c7fcc7db0e277bcd20d07423e058ff0a852683ce"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -149823,7 +150711,6 @@ self: { wai-websockets warp websockets ]; executableHaskellDepends = [ base purescript-bridge ]; - jailbreak = true; homepage = "http://github.com/eskimor/servant-subscriber#readme"; description = "When REST is not enough ..."; license = stdenv.lib.licenses.bsd3; @@ -149874,7 +150761,6 @@ self: { aeson aeson-qq base directory doctest filepath hspec lens QuickCheck servant swagger2 text time ]; - doCheck = false; homepage = "https://github.com/haskell-servant/servant-swagger"; description = "Generate Swagger specification for your servant API"; license = stdenv.lib.licenses.bsd3; @@ -149904,7 +150790,6 @@ self: { servant-swagger swagger2 template-haskell text transformers transformers-compat wai wai-app-static warp ]; - doCheck = false; homepage = "https://github.com/phadej/servant-swagger-ui#readme"; description = "Servant swagger ui"; license = stdenv.lib.licenses.bsd3; @@ -150391,8 +151276,8 @@ self: { }: mkDerivation { pname = "sexp-grammar"; - version = "1.2.1"; - sha256 = "254244724c89b8d7bdcccaf242c1737d898feaca0365e876e4855c0ed8ef8dbc"; + version = "1.2.2"; + sha256 = "250ea8894b7232e074040e50de1fa8e2e26183aeffa21c206ece5767dc725492"; libraryHaskellDepends = [ array base bytestring containers mtl profunctors scientific semigroups split tagged template-haskell text transformers @@ -150400,8 +151285,8 @@ self: { ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ - base bytestring QuickCheck scientific semigroups tasty tasty-hunit - tasty-quickcheck + base QuickCheck scientific semigroups tasty tasty-hunit + tasty-quickcheck text ]; homepage = "https://github.com/esmolanka/sexp-grammar"; description = "Invertible parsers for S-expressions"; @@ -151895,6 +152780,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-effects" = callPackage + ({ mkDerivation, base, interlude-l, lens, monad-control, mtl + , transformers, transformers-base + }: + mkDerivation { + pname = "simple-effects"; + version = "0.1.0.1"; + sha256 = "cffc82c58b5985162eef90e8a1f51145364e2a9b48d3632d677cc68e32accd16"; + libraryHaskellDepends = [ + base interlude-l lens monad-control mtl transformers + transformers-base + ]; + homepage = "https://github.com/githubuser/simple-effects#readme"; + description = "Simple project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "simple-eval" = callPackage ({ mkDerivation, base, parsec, text, transformers }: mkDerivation { @@ -152049,6 +152951,7 @@ self: { homepage = "https://github.com/agrafix/simple-logger#readme"; description = "A very simple but efficient logging framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-neural-networks" = callPackage @@ -152193,6 +153096,8 @@ self: { pname = "simple-sendfile"; version = "0.2.25"; sha256 = "0ae68821cd828b29772654b5613d514a421b1b1440d82a4b610339e67a92294d"; + revision = "1"; + editedCabalFile = "ac78b431148355d859f1b432ce367faf04ba14c244b30818fd0ffc28ec86afab"; libraryHaskellDepends = [ base bytestring network unix ]; testHaskellDepends = [ base bytestring conduit conduit-extra directory hspec HUnit network @@ -153157,6 +154062,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "slim" = callPackage + ({ mkDerivation, base, containers, hspec, mtl, pretty, transformers + }: + mkDerivation { + pname = "slim"; + version = "0.0.1"; + sha256 = "5e35db110191e5872b74256420ef6fd103e295e624ea23b872492bb256747fb8"; + libraryHaskellDepends = [ + base containers mtl pretty transformers + ]; + testHaskellDepends = [ base hspec ]; + description = "Functional reactive user interface programming"; + license = stdenv.lib.licenses.mit; + }) {}; + "sloane" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , bloomfilter, bytestring, conduit, conduit-extra, containers @@ -153910,8 +154830,8 @@ self: { }: mkDerivation { pname = "snap-cors"; - version = "1.2.9"; - sha256 = "8dc9ff4c21966a79afee54a9a76aa6bc6897f01f10872e3fa026e5466da2cb68"; + version = "1.2.10"; + sha256 = "57304a8fa66584fb0d7cd5d7b64feaa8c4a9d15e8f753ff80f1cd2d5e092b637"; libraryHaskellDepends = [ attoparsec base bytestring case-insensitive hashable network network-uri snap text transformers unordered-containers @@ -154136,7 +155056,6 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 text threads time transformers unix unix-compat vector ]; - doCheck = false; homepage = "http://snapframework.com/"; description = "A web server for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -154370,13 +155289,12 @@ self: { pname = "snaplet-fay"; version = "0.3.3.13"; sha256 = "39810748b7177b45a0fab785e48ac497d81587e48dde9dc8ad75e8d704bdda3f"; - revision = "3"; - editedCabalFile = "9c0c70fba7d28449f5e2d2aa6612466aac98b4416a63f829adc3012fec9199a2"; + revision = "4"; + editedCabalFile = "113ed86052324b14e90472827e2ad4de22e4660afc676a0f3f87becd56660afc"; libraryHaskellDepends = [ aeson base bytestring configurator directory fay filepath mtl snap snap-core transformers ]; - jailbreak = true; homepage = "https://github.com/faylang/snaplet-fay"; description = "Fay integration for Snap with request- and pre-compilation"; license = stdenv.lib.licenses.bsd3; @@ -154862,6 +155780,7 @@ self: { homepage = "https://github.com/JustusAdam/snaplet-scoped-session#readme"; description = "Modularised session state for Snaplets, in a Snaplet"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snaplet-sedna" = callPackage @@ -158784,6 +159703,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stochastic" = callPackage + ({ mkDerivation, base, Chart, Chart-cairo, containers, mtl, random + }: + mkDerivation { + pname = "stochastic"; + version = "0.1.1.1"; + sha256 = "04b9827a9da85ba7a1da799ff9a2ca75448f8ea8e03c1dd1151f9359eb785a63"; + libraryHaskellDepends = [ base containers mtl random ]; + testHaskellDepends = [ + base Chart Chart-cairo containers mtl random + ]; + homepage = "http://kevinl.io/posts/2016-08-24-sampling-monad.html"; + description = "Monadic composition of probabilistic functions and sampling"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "stomp-conduit" = callPackage ({ mkDerivation, base, conduit, mime, mtl, resourcet, stomp-queue , stompl @@ -159020,7 +159955,6 @@ self: { th-reify-many th-utilities time transformers unordered-containers vector vector-binary-instances void weigh ]; - doCheck = false; homepage = "https://github.com/fpco/store#readme"; description = "Fast binary serialization"; license = stdenv.lib.licenses.mit; @@ -160245,15 +161179,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "stylish-haskell_0_6_3_0" = callPackage + "stylish-haskell_0_6_4_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative , strict, syb, test-framework, test-framework-hunit, yaml }: mkDerivation { pname = "stylish-haskell"; - version = "0.6.3.0"; - sha256 = "a285bf678220fa365eec2624192ab36c2f35dd0893d811b7118eff887701bfa2"; + version = "0.6.4.0"; + sha256 = "7f8aba23c7409350c59fdc836eedc4ab71e179bd5eed7e1b828178ef89bc6676"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -161827,7 +162761,6 @@ self: { base bytestring chell system-filepath temporary text time transformers unix ]; - doCheck = false; homepage = "https://github.com/fpco/haskell-filesystem"; description = "Consistent filesystem interaction across GHC versions (deprecated)"; license = stdenv.lib.licenses.mit; @@ -162981,7 +163914,6 @@ self: { array base bytestring bytestring-handle containers deepseq directory filepath QuickCheck tasty tasty-quickcheck time ]; - doCheck = false; description = "Reading, writing and manipulating \".tar\" archive files."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -163206,7 +164138,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-golden" = callPackage + "tasty-golden_2_3_1" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , directory, filepath, mtl, optparse-applicative, process, tagged , tasty, tasty-hunit, temporary, temporary-rc @@ -163215,6 +164147,30 @@ self: { pname = "tasty-golden"; version = "2.3.1"; sha256 = "f292a57dc63afdd5607cca82bcc5ad606c5e1c59bb6fabc7fe48a26d816dcbf1"; + revision = "1"; + editedCabalFile = "ecec40232352129f5e7cf7ec06a93800c7eb76ef42a7b9fa5439ab8434513860"; + libraryHaskellDepends = [ + async base bytestring containers deepseq directory filepath mtl + optparse-applicative process tagged tasty temporary + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary-rc + ]; + homepage = "https://github.com/feuerbach/tasty-golden"; + description = "Golden tests support for tasty"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tasty-golden" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, mtl, optparse-applicative, process, tagged + , tasty, tasty-hunit, temporary, temporary-rc + }: + mkDerivation { + pname = "tasty-golden"; + version = "2.3.1.1"; + sha256 = "9e87fa5b29f840731c12722049563655cedb6522b5e5792c5eb596eb352c8e5d"; libraryHaskellDepends = [ async base bytestring containers deepseq directory filepath mtl optparse-applicative process tagged tasty temporary @@ -163437,7 +164393,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "tasty-silver" = callPackage + "tasty-silver_3_1_8_1" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit @@ -163459,6 +164415,31 @@ self: { homepage = "https://github.com/phile314/tasty-silver"; description = "A fancy test runner, including support for golden tests"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "tasty-silver" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, containers + , deepseq, directory, filepath, mtl, optparse-applicative, process + , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit + , temporary, text, transformers + }: + mkDerivation { + pname = "tasty-silver"; + version = "3.1.9"; + sha256 = "7067a64be061c42102eca6c09215bcaebe27c8bb9c554c38521c105dcc69b630"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring containers deepseq directory + filepath mtl optparse-applicative process process-extras regex-tdfa + stm tagged tasty temporary text + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary + transformers + ]; + homepage = "https://github.com/phile314/tasty-silver"; + description = "A fancy test runner, including support for golden tests"; + license = stdenv.lib.licenses.mit; }) {}; "tasty-smallcheck" = callPackage @@ -163642,6 +164623,7 @@ self: { ]; description = "One stop solution for tcp client and server with tls support"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "tdd-util" = callPackage @@ -163929,6 +164911,7 @@ self: { homepage = "http://github.com/xpika/templateify"; description = "Make template from website"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "templatepg" = callPackage @@ -166812,8 +167795,8 @@ self: { }: mkDerivation { pname = "tidal"; - version = "0.8"; - sha256 = "75ecf92a7cc0277cccad934183ec9b0e49d9639b9a1db9728602a97ca8275035"; + version = "0.8.1"; + sha256 = "e85f7810dd3a59c04cd3238fdec1f4b3ef52e5820b7e0b624ed153ed6860b5a9"; libraryHaskellDepends = [ base binary bytestring colour containers hashable hmt hosc mersenne-random-pure64 mtl parsec process text time transformers @@ -166851,6 +167834,7 @@ self: { libraryHaskellDepends = [ base bytestring containers serialport tidal ]; + jailbreak = true; homepage = "http://tidalcycles.org/"; description = "Serial support for tidal"; license = stdenv.lib.licenses.gpl3; @@ -171684,7 +172668,7 @@ self: { mkDerivation { pname = "unbound"; version = "0.5.1"; - sha256 = "0cjfd6fdxpi94dac5aslgfggm81fdspbywfyl5m20ah5drgpsr12"; + sha256 = "22647d5f6e052a206aa1de71bfae6e2ea0fa9e7b54abc2542329dede9c694e32"; libraryHaskellDepends = [ base binary containers mtl RepLib transformers ]; @@ -172907,8 +173891,8 @@ self: { }: mkDerivation { pname = "unused"; - version = "0.6.1.0"; - sha256 = "763cd92955d6ec154037e10e1332507272d8557abc1b2a2262a354a3c226375f"; + version = "0.6.1.1"; + sha256 = "4a88183dd96bd9e4285e93e0592608666e15b537403799cecd7f963d54623f60"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -172924,6 +173908,7 @@ self: { homepage = "https://github.com/joshuaclayton/unused#readme"; description = "A command line tool to identify unused code"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uom-plugin" = callPackage @@ -173136,7 +174121,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "uri-encode" = callPackage + "uri-encode_1_5_0_4" = callPackage ({ mkDerivation, base, bytestring, network-uri, text, utf8-string }: mkDerivation { @@ -173148,6 +174133,21 @@ self: { ]; description = "Unicode aware uri-encoding"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "uri-encode" = callPackage + ({ mkDerivation, base, bytestring, network-uri, text, utf8-string + }: + mkDerivation { + pname = "uri-encode"; + version = "1.5.0.5"; + sha256 = "e82b588aad63112d34f6bad6f1ef72489b9edebfe14f2f523dc1dabdcbe2b186"; + libraryHaskellDepends = [ + base bytestring network-uri text utf8-string + ]; + description = "Unicode aware uri-encoding"; + license = stdenv.lib.licenses.bsd3; }) {}; "uri-enumerator" = callPackage @@ -174795,7 +175795,7 @@ self: { hydraPlatforms = [ "x86_64-darwin" ]; }) {}; - "vector-fftw" = callPackage + "vector-fftw_0_1_3_6" = callPackage ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: mkDerivation { pname = "vector-fftw"; @@ -174806,6 +175806,20 @@ self: { homepage = "http://hackage.haskell.org/package/vector-fftw"; description = "A binding to the fftw library for one-dimensional vectors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) fftw;}; + + "vector-fftw" = callPackage + ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: + mkDerivation { + pname = "vector-fftw"; + version = "0.1.3.7"; + sha256 = "e3c21826d6bfb45c82a6c5a972b060f33b4feab3c9e6f389251208daaa7f8176"; + libraryHaskellDepends = [ base primitive storable-complex vector ]; + librarySystemDepends = [ fftw ]; + homepage = "http://hackage.haskell.org/package/vector-fftw"; + description = "A binding to the fftw library for one-dimensional vectors"; + license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) fftw;}; "vector-functorlazy" = callPackage @@ -175028,7 +176042,6 @@ self: { testHaskellDepends = [ base bytestring cereal hex protobuf tasty tasty-hunit text vector ]; - doCheck = false; homepage = "https://github.com/fosskers/vectortiles"; description = "GIS Vector Tiles, as defined by Mapbox"; license = stdenv.lib.licenses.asl20; @@ -175052,8 +176065,8 @@ self: { ({ mkDerivation, base, binary, data-default-class, deepseq }: mkDerivation { pname = "verbosity"; - version = "0.2.2.0"; - sha256 = "5193bd13b2dfd39794248b2b5d79e8b4b2a9681f06a6c196c1dd649363bfa868"; + version = "0.2.3.0"; + sha256 = "8b4ce5ab48aab17b6752dec4efba259964b7084ce10330198ae3ff7ea090f264"; libraryHaskellDepends = [ base binary data-default-class deepseq ]; homepage = "https://github.com/trskop/verbosity"; description = "Simple enum that encodes application verbosity"; @@ -175672,6 +176685,7 @@ self: { homepage = "https://bitbucket.org/functionally/vrpn"; description = "Bindings to VRPN"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) vrpn;}; "vte" = callPackage @@ -175756,8 +176770,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.8"; - sha256 = "29bdd4098703b64387619c97e43e2c12f84013e29bc29edf2bfc6eca8a32f9b1"; + version = "5.9.1"; + sha256 = "37cbc530767ac0ab6d94d2781f907c76d893aafcb543e4c58dca534eacbcd9c1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177112,7 +178126,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "wai-route" = callPackage + "wai-route_0_3_1" = callPackage ({ mkDerivation, base, bytestring, http-types, mtl, QuickCheck , tasty, tasty-quickcheck, unordered-containers, wai }: @@ -177129,6 +178143,26 @@ self: { ]; description = "Minimalistic, efficient routing for WAI"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "wai-route" = callPackage + ({ mkDerivation, base, bytestring, http-types, mtl, QuickCheck + , tasty, tasty-quickcheck, unordered-containers, wai + }: + mkDerivation { + pname = "wai-route"; + version = "0.3.1.1"; + sha256 = "43fe7d52f5a3c388f67a309b1642353d59dc3cb33b30ca550ce4649da59c2c0f"; + libraryHaskellDepends = [ + base bytestring http-types unordered-containers wai + ]; + testHaskellDepends = [ + base bytestring http-types mtl QuickCheck tasty tasty-quickcheck + wai + ]; + description = "Minimalistic, efficient routing for WAI"; + license = stdenv.lib.licenses.mpl20; }) {}; "wai-router" = callPackage @@ -177290,6 +178324,7 @@ self: { homepage = "https://github.com/Lupino/mysql-session#readme"; description = "MySQL backed Wai session store"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-session-postgresql" = callPackage @@ -177949,6 +178984,8 @@ self: { pname = "web-inv-route"; version = "0.1"; sha256 = "8973080f0a59429cf97ed1ac0d1060b864f6a25f577c3e150ff0f0a3635ac8fa"; + revision = "1"; + editedCabalFile = "7e68be5f41dbc5f47d7f38f017f0f676eaf962a8fa56142ce491c8882165d28d"; libraryHaskellDepends = [ base bytestring case-insensitive containers happstack-server hashable http-types invertible network-uri snap-core text @@ -178347,7 +179384,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "webdriver-angular" = callPackage + "webdriver-angular_0_1_10" = callPackage ({ mkDerivation, aeson, base, hspec, hspec-webdriver , language-javascript, template-haskell, text, transformers , unordered-containers, wai-app-static, warp, webdriver @@ -178368,6 +179405,30 @@ self: { homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; description = "Webdriver actions to assist with testing a webpage which uses Angular.Js"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "webdriver-angular" = callPackage + ({ mkDerivation, aeson, base, hspec, hspec-webdriver + , language-javascript, template-haskell, text, transformers + , unordered-containers, wai-app-static, warp, webdriver + }: + mkDerivation { + pname = "webdriver-angular"; + version = "0.1.11"; + sha256 = "5ebb650cdd9d0815ec897b4972cb0ab7f93d223e8f810e9bf30d6e1fd2ff49f6"; + libraryHaskellDepends = [ + aeson base language-javascript template-haskell text transformers + unordered-containers webdriver + ]; + testHaskellDepends = [ + base hspec hspec-webdriver transformers wai-app-static warp + webdriver + ]; + doCheck = false; + homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; + description = "Webdriver actions to assist with testing a webpage which uses Angular.Js"; + license = stdenv.lib.licenses.mit; }) {}; "webdriver-snoy" = callPackage @@ -179193,6 +180254,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wires" = callPackage + ({ mkDerivation, base, deepseq, profunctors, semigroupoids, these + }: + mkDerivation { + pname = "wires"; + version = "0.1.0"; + sha256 = "4145f1870301d1ba7af683ec17877450dbeaa93afa002d0cf9a36b1ef4248c65"; + libraryHaskellDepends = [ + base deepseq profunctors semigroupoids these + ]; + homepage = "https://github.com/esoeylemez/wires"; + description = "Functional reactive programming library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wiring" = callPackage ({ mkDerivation, base, hspec, mtl, QuickCheck, template-haskell , transformers @@ -180380,8 +181456,8 @@ self: { ({ mkDerivation, base, monads-tf, QuickCheck, vector }: mkDerivation { pname = "x86-64bit"; - version = "0.1.4"; - sha256 = "bd6959ccc90bc6176eccf915e7c2af1ddc3febdfa84708413289357160e5821a"; + version = "0.2"; + sha256 = "03a02c746a87a42db4d6dcf74de5b924d9ef810c2ba1ae93c5ceb796f2b0b4c6"; libraryHaskellDepends = [ base monads-tf QuickCheck vector ]; testHaskellDepends = [ base monads-tf QuickCheck vector ]; homepage = "https://github.com/divipp/x86-64"; @@ -182882,6 +183958,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; @@ -182917,7 +183994,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-auth-account" = callPackage + "yesod-auth-account_1_4_2" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast , resourcet, text, xml-conduit, yesod, yesod-auth, yesod-core @@ -182935,6 +184012,31 @@ 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yesod-auth-account" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger + , mtl, nonce, persistent, persistent-sqlite, pwstore-fast + , resourcet, text, xml-conduit, yesod, yesod-auth, yesod-core + , yesod-form, yesod-persistent, yesod-test + }: + mkDerivation { + pname = "yesod-auth-account"; + version = "1.4.3"; + sha256 = "e9f077d58d64023b80d6ff502933e8dfc6832c95afbdabce3124dddc918664af"; + libraryHaskellDepends = [ + base blaze-html bytestring mtl nonce persistent pwstore-fast text + yesod-auth yesod-core yesod-form yesod-persistent + ]; + testHaskellDepends = [ + base bytestring hspec monad-logger mtl persistent-sqlite resourcet + text xml-conduit yesod yesod-auth yesod-test + ]; homepage = "https://bitbucket.org/wuzzeb/yesod-auth-account"; description = "An account authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; @@ -183064,6 +184166,7 @@ self: { http-types monad-logger network-uri persistent-sqlite resourcet text wai-extra yesod yesod-auth yesod-core yesod-test ]; + jailbreak = true; homepage = "https://github.com/paul-rouse/yesod-auth-hashdb"; description = "Authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; @@ -183213,8 +184316,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.2.1"; - sha256 = "88d7d296c6e42f73dde6fb52f356d2a944c0776f4153a843ebf1bd0efaef97f6"; + version = "0.2.2"; + sha256 = "6276f3bef0c992084ce55cdefb64dbb63b9a27b3ccfed515318f043ea7b85c33"; libraryHaskellDepends = [ aeson authenticate base bytestring hoauth2 http-client http-conduit http-types lifted-base network-uri random text transformers vector @@ -183455,8 +184558,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.23"; - sha256 = "05aea0cf09ae9f568358d8443c702bf070f2f64759820e3b5d3ecb4e4f557e3c"; + version = "1.4.24"; + sha256 = "3472469f56e8d5b280389bc40247f6bc1bc42da6e2b87e6865780ae93127b0d2"; libraryHaskellDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup byteable bytestring case-insensitive cereal clientsession conduit @@ -184009,6 +185112,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; @@ -184899,7 +186003,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yi-rope" = callPackage + "yi-rope_0_7_0_1" = callPackage ({ mkDerivation, base, binary, bytestring, charsetdetect-ae , data-default, deepseq, fingertree, hspec, QuickCheck , quickcheck-instances, text, text-icu @@ -184917,6 +186021,27 @@ self: { ]; description = "A rope data structure used by Yi"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yi-rope" = callPackage + ({ mkDerivation, base, binary, bytestring, charsetdetect-ae + , data-default, deepseq, fingertree, hspec, QuickCheck + , quickcheck-instances, text, text-icu + }: + mkDerivation { + pname = "yi-rope"; + version = "0.7.0.2"; + sha256 = "e05df2d905460723c62dba6f5201964504bf8214b3db9db11c1378dc0f08ca9d"; + libraryHaskellDepends = [ + base binary bytestring charsetdetect-ae data-default deepseq + fingertree text text-icu + ]; + testHaskellDepends = [ + base hspec QuickCheck quickcheck-instances text + ]; + description = "A rope data structure used by Yi"; + license = stdenv.lib.licenses.gpl2; }) {}; "yi-snippet" = callPackage diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index a67dc323601..4ac9b647956 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation { sqlite readline asciidoc SDL SDL_gfx ]; + NIX_CFLAGS_COMPILE = [ "-I${SDL.dev}/include/SDL" ]; + configureFlags = [ "--with-ext=oo" "--with-ext=tree" @@ -25,12 +27,6 @@ stdenv.mkDerivation { "--ipv6" ]; - preConfigurePhase = '' - export CFLAGS=$(sdl-config --cflags) - export LDFLAGS=$(sdl-config --libs) - ''; - - meta = { description = "An open source small-footprint implementation of the Tcl programming language"; homepage = http://jim.tcl.tk/; diff --git a/pkgs/development/interpreters/octave/hg.nix b/pkgs/development/interpreters/octave/hg.nix deleted file mode 100644 index 797fff584f6..00000000000 --- a/pkgs/development/interpreters/octave/hg.nix +++ /dev/null @@ -1,49 +0,0 @@ -{stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, - bison, autoconf, automake, sourceFromHead, config, lib, atlas, gperf, python, glibc, gnuplot, texinfo, texLive, qhull, libX11}: - -let commonBuildInputs = [gfortran readline ncurses perl glibc qhull libX11 texinfo]; in - -stdenv.mkDerivation ({ - NIX_LDFLAGS = "-lpthread"; - configureFlags = "--enable-readline --enable-dl"; - meta = { - description = "High-level interactive language for numerical computations"; - homepage = http://www.octave.org; - license = stdenv.lib.licenses.gpl3; - }; -} // ( - if config.octave.devVersion or false then { - name = "octave-hg"; # developement version mercurial repo - # REGION AUTO UPDATE: { name="octave"; type = "hg"; url = "http://www.octave.org/hg/octave"; } - src = sourceFromHead "octave-03b414516dd8.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/octave-03b414516dd8.tar.gz"; sha256 = "30877f1e2ff1a456e7a76153aabf7c59ce7c7a8b63eda0515b1eead6a4351ce7"; }); - # END - # HOME is set to $TMP because octave needs to access ${HOME}/.octave_hist while running targets - # in doc/interpreter.. Maybe this can be done better. This hack is fastest :) - preConfigure = '' - # glob is contained in glibc! Don't know why autotools want to use -lglob - sed -i 's/-lglob//' configure.in - ./autogen.sh - export HOME=$TMP - ''; - buildInputs = commonBuildInputs ++ [ flex bison autoconf automake gperf gnuplot texLive ] - ++ lib.optionals (config.octave.atlas or true) [ python atlas ]; - # it does build, but documentation doesn't.. So just remove that directory - # from the buildfile - buildPhase = '' - sed -i octMakefile \ - -e 's/^\(INSTALL_SUBDIRS = .*\)doc \(.*\)$/\1 \2/' \ - -e 's/^\(SUBDIRS = .*\)doc \(.*\)$/\1 \2/' \ - -e 's/\$(MAKE) -C doc/#/' - make - ''; - } else { - name = "octave-3.1.55"; - src = fetchurl { - url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-3.1.55.tar.bz2; - sha256 = "1lm4v85kdic4n5yxwzrdb0v6dc6nw06ljgx1q8hfkmi146kpg7s6"; - }; - buildInputs = commonBuildInputs ++ [ flex bison autoconf automake python ] - ++ lib.optionals (config.octave.atlas or true) [ python atlas ]; - } -)) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/interpreters/python/build-python-package.nix similarity index 58% rename from pkgs/development/python-modules/generic/default.nix rename to pkgs/development/interpreters/python/build-python-package.nix index 38d74e08244..a92296cedba 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -3,57 +3,37 @@ (http://pypi.python.org/pypi/setuptools/), which represents a large number of Python packages nowadays. */ -{ python, setuptools, unzip, wrapPython, lib, bootstrapped-pip -, ensureNewerSourcesHook }: +{ lib +, python +, mkPythonDerivation +, bootstrapped-pip +}: -{ name - -# by default prefix `name` e.g. "python3.3-${name}" -, namePrefix ? python.libPrefix + "-" - -, buildInputs ? [] +{ buildInputs ? [] # propagate build dependencies so in case we have A -> B -> C, -# C can import package A propagated by B -, propagatedBuildInputs ? [] +# C can import package A propagated by B +#, propagatedBuildInputs ? [] # passed to "python setup.py build_ext" # https://github.com/pypa/pip/issues/881 , setupPyBuildFlags ? [] -# DEPRECATED: use propagatedBuildInputs -, pythonPath ? [] - -# used to disable derivation, useful for specific python versions -, disabled ? false - -, meta ? {} - # Execute before shell hook , preShellHook ? "" # Execute after shell hook , postShellHook ? "" -# Additional arguments to pass to the makeWrapper function, which wraps -# generated binaries. -, makeWrapperArgs ? [] - # Additional flags to pass to "pip install". , installFlags ? [] -# Raise an error if two packages are installed with the same name -, catchConflicts ? true - , format ? "setup" , ... } @ attrs: -# Keep extra attributes from `attrs`, e.g., `patchPhase', etc. -if disabled -then throw "${name} not supported for interpreter ${python.executable}" -else + let # use setuptools shim (so that setuptools is imported before distutils) @@ -73,14 +53,10 @@ let installCheckPhase = attrs.checkPhase or ":"; # Wheels don't have any checks to run - doInstallCheck = attrs.doCheck or false; + doCheck = attrs.doCheck or false; } else if format == "setup" then { - # propagate python/setuptools to active setup-hook in nix-shell - propagatedBuildInputs = - propagatedBuildInputs ++ [ python setuptools ]; - # we copy nix_run_setup.py over so it's executed relative to the root of the source # many project make that assumption buildPhase = attrs.buildPhase or '' @@ -100,21 +76,17 @@ let # are typically distributed with tests. # With Python it's a common idiom to run the tests # after the software has been installed. - - # For backwards compatibility, let's use an alias - doInstallCheck = attrs.doCheck or true; + doCheck = attrs.doCheck or true; } else throw "Unsupported format ${format}"; -in -python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] // { - name = namePrefix + name; - buildInputs = [ wrapPython bootstrapped-pip ] ++ buildInputs ++ pythonPath - ++ [ (ensureNewerSourcesHook { year = "1980"; }) ] - ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip); +in mkPythonDerivation ( attrs // { - pythonPath = pythonPath; + # To build and install a wheel we need pip + buildInputs = buildInputs ++ [ bootstrapped-pip ]; + +#inherit propagatedBuildInputs; configurePhase = attrs.configurePhase or '' runHook preConfigure @@ -126,9 +98,6 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] // runHook postConfigure ''; - # Python packages don't have a checkPhase, only an installCheckPhase - doCheck = false; - installPhase = attrs.installPhase or '' runHook preInstall @@ -142,14 +111,6 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] // runHook postInstall ''; - postFixup = attrs.postFixup or '' - wrapPythonPrograms - '' + lib.optionalString catchConflicts '' - # check if we have two packages with the same name in closure and fail - # this shouldn't happen, something went wrong with dependencies specs - ${python.interpreter} ${./catch_conflicts.py} - ''; - shellHook = attrs.shellHook or '' ${preShellHook} if test -e setup.py; then @@ -162,13 +123,4 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] // ${postShellHook} ''; - meta = with lib.maintainers; { - # default to python's platforms - platforms = python.meta.platforms; - } // meta // { - # add extra maintainer(s) to every package - maintainers = (meta.maintainers or []) ++ [ chaoflow domenkozar ]; - # a marker for release utilities to discover python packages - isBuildPythonPackage = python.meta.platforms; - }; } // formatspecific) diff --git a/pkgs/development/python-modules/generic/catch_conflicts.py b/pkgs/development/interpreters/python/catch_conflicts.py similarity index 100% rename from pkgs/development/python-modules/generic/catch_conflicts.py rename to pkgs/development/interpreters/python/catch_conflicts.py diff --git a/pkgs/development/interpreters/python/cpython/3.3/default.nix b/pkgs/development/interpreters/python/cpython/3.3/default.nix index 1d2312fdc15..cb48186a69e 100644 --- a/pkgs/development/interpreters/python/cpython/3.3/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.3/default.nix @@ -2,7 +2,6 @@ , bzip2 , db , gdbm -, less , libX11, xproto , lzma , ncurses @@ -29,10 +28,6 @@ let zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto ]; - propagatedBuildInputs = [ - less - ]; - in stdenv.mkDerivation { name = "python3-${version}"; @@ -40,7 +35,6 @@ stdenv.mkDerivation { inherit majorVersion version; inherit buildInputs; - inherit propagatedBuildInputs; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 64c61e504b7..2293e6d485a 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -2,7 +2,6 @@ , bzip2 , db , gdbm -, less , libX11, xproto , lzma , ncurses @@ -44,10 +43,6 @@ let xproto ] ++ optionals stdenv.isDarwin [ CF configd ]; - propagatedBuildInputs = [ - less - ]; - in stdenv.mkDerivation { name = "python3-${fullVersion}"; @@ -55,7 +50,6 @@ stdenv.mkDerivation { inherit majorVersion version; inherit buildInputs; - inherit propagatedBuildInputs; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index c36d7c2a6eb..1b6814ea436 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -1,8 +1,6 @@ { stdenv, fetchurl , bzip2 -, db , gdbm -, less , libX11, xproto , lzma , ncurses @@ -34,7 +32,6 @@ let lzma gdbm sqlite - db readline ncurses openssl @@ -43,11 +40,6 @@ let libX11 xproto ] ++ optionals stdenv.isDarwin [ CF configd ]; - - propagatedBuildInputs = [ - less - ]; - in stdenv.mkDerivation { name = "python3-${fullVersion}"; @@ -55,7 +47,6 @@ stdenv.mkDerivation { inherit majorVersion version; inherit buildInputs; - inherit propagatedBuildInputs; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; @@ -102,10 +93,21 @@ stdenv.mkDerivation { paxmark E $out/bin/python${majorVersion} ''; + postFixup = '' + # Get rid of retained dependencies on -dev packages, and remove + # some $TMPDIR references to improve binary reproducibility. + for i in $out/lib//python${majorVersion}/_sysconfigdata.py $out/lib/python${majorVersion}/config-${majorVersion}m/Makefile; do + sed -i $i -e "s|-I/nix/store/[^ ']*||g" -e "s|-L/nix/store/[^ ']*||g" -e "s|$TMPDIR|/no-such-path|g" + done + + # FIXME: should regenerate this. + rm $out/lib/python${majorVersion}/__pycache__/_sysconfigdata.cpython* + ''; + passthru = rec { zlibSupport = zlib != null; sqliteSupport = sqlite != null; - dbSupport = db != null; + dbSupport = false; readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 3269a3c9684..2c184644207 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -3,7 +3,6 @@ , bzip2 , db , gdbm -, less , libX11, xproto , lzma , ncurses @@ -45,11 +44,6 @@ let libX11 xproto ] ++ optionals stdenv.isDarwin [ CF configd ]; - - propagatedBuildInputs = [ - less - ]; - in stdenv.mkDerivation { name = "python3-${fullVersion}"; @@ -57,7 +51,6 @@ stdenv.mkDerivation { inherit majorVersion version; inherit buildInputs; - inherit propagatedBuildInputs; src = fetchurl { url = "https://www.python.org/ftp/python/${majorVersion}.0/Python-${fullVersion}.tar.xz"; diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix new file mode 100644 index 00000000000..99af42cd7ad --- /dev/null +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -0,0 +1,95 @@ +/* Generic builder for Python packages that come without a setup.py. */ + +{ lib +, python +, wrapPython +, setuptools +, unzip +, ensureNewerSourcesHook +}: + +{ name + +# by default prefix `name` e.g. "python3.3-${name}" +, namePrefix ? python.libPrefix + "-" + +# Dependencies for building the package +, buildInputs ? [] + +# Dependencies needed for running the checkPhase. +# These are added to buildInputs when doCheck = true. +, checkInputs ? [] + +# propagate build dependencies so in case we have A -> B -> C, +# C can import package A propagated by B +, propagatedBuildInputs ? [] + +# DEPRECATED: use propagatedBuildInputs +, pythonPath ? [] + +# used to disable derivation, useful for specific python versions +, disabled ? false + +# Raise an error if two packages are installed with the same name +, catchConflicts ? true + +# Additional arguments to pass to the makeWrapper function, which wraps +# generated binaries. +, makeWrapperArgs ? [] + +, meta ? {} + +, passthru ? {} + +, doCheck ? false + +, ... } @ attrs: + + +# Keep extra attributes from `attrs`, e.g., `patchPhase', etc. +if disabled +then throw "${name} not supported for interpreter ${python.executable}" +else + +python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled"] // { + + name = namePrefix + name; + + inherit pythonPath; + + buildInputs = [ wrapPython ] ++ buildInputs ++ pythonPath + ++ [ (ensureNewerSourcesHook { year = "1980"; }) ] + ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip) + ++ lib.optionals doCheck checkInputs; + + # propagate python/setuptools to active setup-hook in nix-shell + propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ]; + + # Python packages don't have a checkPhase, only an installCheckPhase + doCheck = false; + doInstallCheck = doCheck; + + postFixup = attrs.postFixup or '' + wrapPythonPrograms + '' + lib.optionalString catchConflicts '' + # check if we have two packages with the same name in closure and fail + # this shouldn't happen, something went wrong with dependencies specs + ${python.interpreter} ${./catch_conflicts.py} + ''; + + passthru = { + inherit python; # The python interpreter + } // passthru; + + meta = with lib.maintainers; { + # default to python's platforms + platforms = python.meta.platforms; + } // meta // { + # add extra maintainer(s) to every package + maintainers = (meta.maintainers or []) ++ [ chaoflow domenkozar ]; + # a marker for release utilities to discover python packages + isBuildPythonPackage = python.meta.platforms; + }; +}) + + diff --git a/pkgs/development/python-modules/generic/run_setup.py b/pkgs/development/interpreters/python/run_setup.py similarity index 100% rename from pkgs/development/python-modules/generic/run_setup.py rename to pkgs/development/interpreters/python/run_setup.py diff --git a/pkgs/development/interpreters/python/wrap-python.nix b/pkgs/development/interpreters/python/wrap-python.nix new file mode 100644 index 00000000000..b965ff5350b --- /dev/null +++ b/pkgs/development/interpreters/python/wrap-python.nix @@ -0,0 +1,51 @@ +{ lib +, python +, makeSetupHook +, makeWrapper }: + +with lib; + +makeSetupHook { + deps = makeWrapper; + substitutions.libPrefix = python.libPrefix; + substitutions.executable = python.interpreter; + substitutions.python = python; + substitutions.magicalSedExpression = let + # Looks weird? Of course, it's between single quoted shell strings. + # NOTE: Order DOES matter here, so single character quotes need to be + # at the last position. + quoteVariants = [ "'\"'''\"'" "\"\"\"" "\"" "'\"'\"'" ]; # hey Vim: '' + + mkStringSkipper = labelNum: quote: let + label = "q${toString labelNum}"; + isSingle = elem quote [ "\"" "'\"'\"'" ]; + endQuote = if isSingle then "[^\\\\]${quote}" else quote; + in '' + /^[a-z]?${quote}/ { + /${quote}${quote}|${quote}.*${endQuote}/{n;br} + :${label}; n; /^${quote}/{n;br}; /${endQuote}/{n;br}; b${label} + } + ''; + + # This preamble does two things: + # * Sets argv[0] to the original application's name; otherwise it would be .foo-wrapped. + # Python doesn't support `exec -a`. + # * Adds all required libraries to sys.path via `site.addsitedir`. It also handles *.pth files. + preamble = '' + import sys + import site + import functools + sys.argv[0] = '"'$(basename "$f")'"' + functools.reduce(lambda k, p: site.addsitedir(p, k), ['"$([ -n "$program_PYTHONPATH" ] && (echo "'$program_PYTHONPATH'" | sed "s|:|','|g") || true)"'], site._init_pathinfo()) + ''; + + in '' + 1 { + :r + /\\$|,$/{N;br} + /__future__|^ |^ *(#.*)?$/{n;br} + ${concatImapStrings mkStringSkipper quoteVariants} + /^[^# ]/i ${replaceStrings ["\n"] [";"] preamble} + } + ''; +} ./wrap.sh diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/interpreters/python/wrap.sh similarity index 100% rename from pkgs/development/python-modules/generic/wrap.sh rename to pkgs/development/interpreters/python/wrap.sh diff --git a/pkgs/development/interpreters/ruby/dev.nix b/pkgs/development/interpreters/ruby/dev.nix index 7787306eb32..62d561fbc14 100644 --- a/pkgs/development/interpreters/ruby/dev.nix +++ b/pkgs/development/interpreters/ruby/dev.nix @@ -8,7 +8,6 @@ let ruby = ruby; }; bundix_ = bundix.override { - ruby = ruby; bundler = bundler_; }; in diff --git a/pkgs/development/interpreters/ruby/rubygems-src.nix b/pkgs/development/interpreters/ruby/rubygems-src.nix index fea749e7de0..59b2becdc6e 100644 --- a/pkgs/development/interpreters/ruby/rubygems-src.nix +++ b/pkgs/development/interpreters/ruby/rubygems-src.nix @@ -1,6 +1,6 @@ { fetchurl -, version ? "2.6.2" -, sha256 ? "1j02ajici555f35vd6ky6m4bxs8lh8nqb1c59qqib4jp4ibcv6zy" +, version ? "2.6.6" +, sha256 ? "0x0ldlwr627d0brw96jdbscib6d2nk19izvnh8lzsasszi1k5rkq" }: fetchurl { url = "http://production.cf.rubygems.org/rubygems/rubygems-${version}.tgz"; diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index d01df5ce8be..3bf4ba2dc2f 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -10,15 +10,27 @@ stdenv.mkDerivation rec { inherit src; + outputs = [ "out" "man" ]; + + setOutputFlags = false; + preConfigure = '' + # Note: using $out instead of $man to prevent a runtime dependency on $man. + configureFlagsArray+=(--mandir=$out/share/man --enable-man-symlinks) + + # Don't install tzdata because NixOS already has a more up-to-date copy. + configureFlagsArray+=(--with-tzdata=no) + cd unix ''; + enableParallelBuilding = true; + postInstall = '' make install-private-headers ln -s $out/bin/tclsh${release} $out/bin/tclsh ''; - + meta = with stdenv.lib; { description = "The Tcl scription language"; homepage = http://www.tcl.tk/; @@ -26,7 +38,7 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ wkennington vrthra ]; }; - + passthru = rec { inherit release version; libPrefix = "tcl${release}"; diff --git a/pkgs/development/libraries/accountsservice/Add-nixbld-to-user-blacklist.patch b/pkgs/development/libraries/accountsservice/Add-nixbld-to-user-blacklist.patch new file mode 100644 index 00000000000..f5d9e569502 --- /dev/null +++ b/pkgs/development/libraries/accountsservice/Add-nixbld-to-user-blacklist.patch @@ -0,0 +1,27 @@ +From e069102365a9ff03822667f435e662f938e8d768 Mon Sep 17 00:00:00 2001 +From: Alexander Ried +Date: Wed, 1 Jun 2016 12:49:48 +0200 +Subject: [PATCH] Add nixbld* to user blacklist + +--- + src/user-classify.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/user-classify.c b/src/user-classify.c +index 69e6809..0e152b6 100644 +--- a/src/user-classify.c ++++ b/src/user-classify.c +@@ -75,6 +75,10 @@ user_classify_is_blacklisted (const char *username) + return TRUE; + } + ++ if (g_str_has_prefix (username, "nixbld")) { ++ return TRUE; ++ } ++ + return FALSE; + } + +-- +2.7.4 + diff --git a/pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch b/pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch new file mode 100644 index 00000000000..acaccb8c848 --- /dev/null +++ b/pkgs/development/libraries/accountsservice/Disable-methods-that-change-files-in-etc.patch @@ -0,0 +1,130 @@ +From 6f172007452b39bfda5062fc29ea5382671ac16e Mon Sep 17 00:00:00 2001 +From: Alexander Ried +Date: Thu, 26 May 2016 19:54:21 +0200 +Subject: [PATCH] Disable methods that change files in /etc + +Only if environment variable NIXOS_USERS_PURE is set. +--- + src/daemon.c | 10 ++++++++++ + src/user.c | 35 +++++++++++++++++++++++++++++++++++ + 2 files changed, 45 insertions(+) + +diff --git a/src/daemon.c b/src/daemon.c +index e62e124..87459b2 100644 +--- a/src/daemon.c ++++ b/src/daemon.c +@@ -931,6 +931,11 @@ daemon_create_user (AccountsAccounts *accounts, + const gchar *real_name, + gint account_type) + { ++ if (getenv("NIXOS_USERS_PURE")) { ++ throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers"); ++ return; ++ } ++ + Daemon *daemon = (Daemon*)accounts; + CreateUserData *data; + +@@ -1138,6 +1143,11 @@ daemon_delete_user (AccountsAccounts *accounts, + gint64 uid, + gboolean remove_files) + { ++ if (getenv("NIXOS_USERS_PURE")) { ++ throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers"); ++ return; ++ } ++ + Daemon *daemon = (Daemon*)accounts; + DeleteUserData *data; + +diff --git a/src/user.c b/src/user.c +index 0fb1a17..dbdebaf 100644 +--- a/src/user.c ++++ b/src/user.c +@@ -904,6 +904,11 @@ user_set_real_name (AccountsUser *auser, + GDBusMethodInvocation *context, + const gchar *real_name) + { ++ if (getenv("NIXOS_USERS_PURE")) { ++ throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers"); ++ return; ++ } ++ + User *user = (User*)auser; + int uid; + const gchar *action_id; +@@ -981,6 +986,11 @@ user_set_user_name (AccountsUser *auser, + GDBusMethodInvocation *context, + const gchar *user_name) + { ++ if (getenv("NIXOS_USERS_PURE")) { ++ throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers"); ++ return; ++ } ++ + User *user = (User*)auser; + daemon_local_check_auth (user->daemon, + user, +@@ -1263,6 +1273,11 @@ user_set_home_directory (AccountsUser *auser, + GDBusMethodInvocation *context, + const gchar *home_dir) + { ++ if (getenv("NIXOS_USERS_PURE")) { ++ throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers"); ++ return; ++ } ++ + User *user = (User*)auser; + daemon_local_check_auth (user->daemon, + user, +@@ -1322,6 +1337,11 @@ user_set_shell (AccountsUser *auser, + GDBusMethodInvocation *context, + const gchar *shell) + { ++ if (getenv("NIXOS_USERS_PURE")) { ++ throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers"); ++ return; ++ } ++ + User *user = (User*)auser; + daemon_local_check_auth (user->daemon, + user, +@@ -1602,6 +1622,11 @@ user_set_locked (AccountsUser *auser, + GDBusMethodInvocation *context, + gboolean locked) + { ++ if (getenv("NIXOS_USERS_PURE")) { ++ throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers"); ++ return; ++ } ++ + User *user = (User*)auser; + daemon_local_check_auth (user->daemon, + user, +@@ -1814,6 +1839,11 @@ user_set_password_mode (AccountsUser *auser, + GDBusMethodInvocation *context, + gint mode) + { ++ if (getenv("NIXOS_USERS_PURE")) { ++ throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers"); ++ return; ++ } ++ + User *user = (User*)auser; + const gchar *action_id; + +@@ -1905,6 +1935,11 @@ user_set_password (AccountsUser *auser, + const gchar *password, + const gchar *hint) + { ++ if (getenv("NIXOS_USERS_PURE")) { ++ throw_error (context, ERROR_NOT_SUPPORTED, "Modifying users not supported without users.mutableUsers"); ++ return; ++ } ++ + User *user = (User*)auser; + gchar **data; + +-- +2.9.3 + diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 83e3a0b2c59..2dc6b57c339 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, makeWrapper +{ stdenv, fetchurl, pkgconfig, glib, intltool, makeWrapper, shadow , libtool, gobjectIntrospection, polkit, systemd, coreutils }: stdenv.mkDerivation rec { name = "accountsservice-${version}"; - version = "0.6.40"; - + version = "0.6.42"; + src = fetchurl { url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; - sha256 = "0ayb3y3l25dmwxlh9g071h02mphjfbkvi2k5f635bayb01k7akzh"; + sha256 = "0zh0kjpdc631qh36plcgpwvnmh9wj8l5cki3aw5r09w6y7198r75"; }; buildInputs = [ pkgconfig glib intltool libtool makeWrapper @@ -15,10 +15,21 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--localstatedir=/var" ]; + prePatch = '' + substituteInPlace src/daemon.c --replace '"/usr/sbin/useradd"' '"${shadow}/bin/useradd"' \ + --replace '"/usr/sbin/userdel"' '"${shadow}/bin/userdel"' + substituteInPlace src/user.c --replace '"/usr/sbin/usermod"' '"${shadow}/bin/usermod"' \ + --replace '"/usr/bin/chage"' '"${shadow}/bin/chage"' \ + --replace '"/usr/bin/passwd"' '"${shadow}/bin/passwd"' \ + --replace '"/bin/cat"' '"${coreutils}/bin/cat"' + ''; + + patches = [ + ./no-create-dirs.patch + ./Add-nixbld-to-user-blacklist.patch + ./Disable-methods-that-change-files-in-etc.patch + ]; - patches = [ ./no-create-dirs.patch ]; - patchFlags = "-p0"; - preFixup = '' wrapProgram "$out/libexec/accounts-daemon" \ --run "${coreutils}/bin/mkdir -p /var/lib/AccountsService/users" \ diff --git a/pkgs/development/libraries/accountsservice/no-create-dirs.patch b/pkgs/development/libraries/accountsservice/no-create-dirs.patch index a0c7ca23598..f26f5c73822 100644 --- a/pkgs/development/libraries/accountsservice/no-create-dirs.patch +++ b/pkgs/development/libraries/accountsservice/no-create-dirs.patch @@ -1,5 +1,5 @@ ---- src/Makefile.in.orig 2014-04-23 22:30:00.276005326 +0200 -+++ src/Makefile.in 2014-04-23 22:30:16.809409113 +0200 +--- a/src/Makefile.in 2014-04-23 22:30:00.276005326 +0200 ++++ b/src/Makefile.in 2014-04-23 22:30:16.809409113 +0200 @@ -881,8 +881,8 @@ gdbus-codegen --generate-c-code accounts-user-generated --c-namespace Accounts --interface-prefix=org.freedesktop.Accounts. $(top_srcdir)/data/org.freedesktop.Accounts.User.xml diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 8ba0f6fcc2d..4711a8baa36 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "--with-polarssl=${polarssl}" ]; - enableParallelBuild = true; + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://www.linphone.org/index.php/eng; diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index 76069e72b0d..80f858254ff 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake ]; - enableParallelBuild = true; + enableParallelBuilding = true; meta = { description = "Advanced disassembly library"; diff --git a/pkgs/development/libraries/commoncpp2/default.nix b/pkgs/development/libraries/commoncpp2/default.nix index a4347e77632..f578cd2f87d 100644 --- a/pkgs/development/libraries/commoncpp2/default.nix +++ b/pkgs/development/libraries/commoncpp2/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/commoncpp/; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.marcweber ]; - platforms = with stdenv.lib.platforms; allBut freebsd; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 8ec1dd283e2..f4621216a09 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -141,7 +141,8 @@ /* * Darwin frameworks */ -, Cocoa, CoreServices, AVFoundation, MediaToolbox, VideoDecodeAcceleration, CF +, Cocoa, CoreAudio, CoreServices, AVFoundation, MediaToolbox +, VideoDecodeAcceleration, CF }: /* Maintainer notes: @@ -236,14 +237,17 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "3.0.2"; + version = "3.1.3"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "08sjp4dxgcinmv9ly7nm24swmn2cnbbhvph44ihlplf4n33kr542"; + sha256 = "08l8290gipm632dhrqndnphdpkc5ncqc1j3hxdx46r1a3q3mqmzq"; }; - patchPhase = ''patchShebangs .''; + patchPhase = ''patchShebangs . + '' + stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/#ifndef __MAC_10_11/#if 1/' ./libavcodec/audiotoolboxdec.c + ''; configureFlags = [ /* @@ -412,8 +416,8 @@ stdenv.mkDerivation rec { ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optionals isLinux [ alsaLib libraw1394 libv4l ] ++ optionals nvenc [ nvidia-video-sdk ] - ++ optionals stdenv.isDarwin [ Cocoa CoreServices AVFoundation MediaToolbox - VideoDecodeAcceleration ]; + ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation + MediaToolbox VideoDecodeAcceleration ]; # Build qt-faststart executable buildPhase = optional qtFaststartProgram ''make tools/qt-faststart''; diff --git a/pkgs/development/libraries/ggz_base_libs/default.nix b/pkgs/development/libraries/ggz_base_libs/default.nix index 631160487d8..6003c5ea33e 100644 --- a/pkgs/development/libraries/ggz_base_libs/default.nix +++ b/pkgs/development/libraries/ggz_base_libs/default.nix @@ -12,8 +12,13 @@ stdenv.mkDerivation rec { buildInputs = [ intltool openssl expat libgcrypt ]; + patchPhase = '' + substituteInPlace configure \ + --replace "/usr/local/ssl/include" "${openssl.dev}/include" \ + --replace "/usr/local/ssl/lib" "${openssl.out}/lib" + ''; + configureFlags = [ - "--with-ssl-dir=${openssl.dev}/" "--with-tls" ]; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 6595d97b01a..89bd7e918fd 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1iwb2a6wfhkzv6fa7zx2gz1lkwa0iwnd9ka1im5vdc44xm4dq9da"; }; + outputs = [ "bin" "out" "dev" "doc" ]; + nativeBuildInputs = [ xlibsWrapper libXmu libXi ]; propagatedNativeBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { installFlags = [ "install.all" ]; preInstall = '' - export GLEW_DEST="$out" + makeFlagsArray+=(GLEW_DEST=$out BINDIR=$bin/bin INCDIR=$dev/include/GL) ''; postInstall = '' @@ -32,6 +34,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/pkgconfig cp glew*.pc $out/lib/pkgconfig cp -r README.txt LICENSE.txt doc $out/share/doc/glew + rm $out/lib/*.a ''; crossAttrs.makeFlags = [ diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index de421df127f..a91acdbb008 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { a real live maintainer, or some actual wide use. ''; license = licenses.lgpl2Plus; - platforms = platforms.unix; + platforms = platforms.linux; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index cf96eacd318..a44bdbcd08c 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { code, LGPL or LGPL-compatible for the supporting library). ''; license = licenses.lgpl2Plus; - platforms = platforms.unix; + platforms = platforms.linux; }; src = fetchurl { diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index 191c1f6b0f2..f8a75c25122 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo +{ fetchurl, stdenv, lib, pkgconfig, gst_plugins_base, aalib, cairo , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx , libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc , glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintlOrEmpty @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { patches = [ ./v4l.patch ./linux-headers-3.9.patch ]; - configureFlags = "--enable-experimental --disable-oss"; + configureFlags = [ "--enable-experimental" "--disable-oss" ]; buildInputs = [ pkgconfig glib gstreamer gst_plugins_base ] - ++ stdenv.lib.optional stdenv.isLinux [ libpulseaudio ] + ++ lib.optional stdenv.isLinux [ libpulseaudio ] ++ libintlOrEmpty - ++ stdenv.lib.optionals (!minimalDeps) + ++ lib.optionals (!minimalDeps) [ aalib libcaca cairo libdv flac libjpeg libpng speex taglib bzip2 libvpx gdk_pixbuf orc libsoup libshout ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = '' + postInstall = lib.optionalString (!minimalDeps) '' substituteInPlace $out/lib/gstreamer-0.10/libgstaasink.la \ --replace "${ncurses.dev}/lib" "${ncurses.out}/lib" ''; diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 4df17d271a2..21c2c46105e 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1izddjwbh1grs8080vmaix72z469qy29wrvkphgmqmcm0sv1by7c"; }; + outputs = [ "out" "dev" ]; + preConfigure = '' ./bootstrap ''; diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index ec22dc335d5..f05da98f553 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -7,5 +7,5 @@ kdeFramework { name = "kimageformats"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ ecm ]; - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; } diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index ebb90f79663..b3deabbde2d 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = "-v"; meta = with stdenv.lib; { - platforms = platforms.all; + platforms = platforms.linux; maintainers = [ maintainers.urkud ]; license = stdenv.lib.licenses.lgpl3; description = "An opensource database of photographic lenses and their characteristics"; diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index 06a7f54e42b..8e911a9b015 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtdeclarative ]; nativeBuildInputs = [ qmakeHook which ]; - enableParallelBuild = true; + enableParallelBuilding = true; dontUseQmakeConfigure = true; configureFlags = "-config release"; diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index 09427e2788a..d0122d0283c 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { homepage = http://musicbrainz.org/doc/libdiscid; maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix index caabde85f29..02e86cc688b 100644 --- a/pkgs/development/libraries/libmnl/default.nix +++ b/pkgs/development/libraries/libmnl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libmnl-1.0.3"; + name = "libmnl-1.0.4"; src = fetchurl { url = "http://netfilter.org/projects/libmnl/files/${name}.tar.bz2"; - sha1 = "c27e25f67c6422ebf893fc3a844af8085a1c5b63"; + sha256 = "108zampspaalv44zn0ar9h386dlfixpd149bnxa5hsi8kxlqj7qp"; }; meta = { diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index 361966379c0..e1902263ac2 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { in the form of a library suitable primarily for POSIX compliant operating systems. We implement MTP Basic, the stuff proposed for standardization. ''; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/development/libraries/libmusicbrainz/2.x.nix b/pkgs/development/libraries/libmusicbrainz/2.x.nix index bff49dcf76f..4cad0c0f9f6 100644 --- a/pkgs/development/libraries/libmusicbrainz/2.x.nix +++ b/pkgs/development/libraries/libmusicbrainz/2.x.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { Library) is a development library geared towards developers who wish to add MusicBrainz lookup capabilities to their applications.''; maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 53dfd21f23d..a043d36ff4d 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "libnftnl-1.0.5"; + name = "libnftnl-1.0.6"; src = fetchurl { url = "http://netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; - sha256 = "15z4kcsklbvy94d24p2r0avyhc2rsvygjqr3gyccg2z30akzbm7n"; + sha256 = "0zmh190c7212zvzjsn5lm6pf399r4arq7dliiqq6grd174m96fxd"; }; buildInputs = [ pkgconfig libmnl ]; diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index c17045d5e4b..396e8e92acf 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "Opensource implementation of the Open Financial eXchange specification"; homepage = http://libofx.sourceforge.net/; license = "LGPL"; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 0b196cc22e0..d3127437de6 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; homepage = http://www.libraw.org/; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index 730916bf9d3..5b7041601f7 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -12,15 +12,14 @@ stdenv.mkDerivation rec { "LIBRE_INC=${libre}/include/re" ''PREFIX=$(out)'' ] - ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" - ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" + ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.lib.getDev stdenv.cc.cc}" + ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.lib.getDev stdenv.cc.libc}" ; meta = { homepage = "http://www.creytiv.com/rem.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; license = stdenv.lib.licenses.bsd3; - inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; downloadURLRegexp = "/rem-.*[.]tar[.].*"; diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index 959c544876f..0374c7f89b7 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, cmake, SDL, mesa, upx }: +{ stdenv, fetchFromBitbucket, cmake, SDL, mesa, upx, zlib }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cmakeFlags="-DLIBTCOD_SAMPLES=OFF"; - buildInputs = [ cmake SDL mesa upx ]; + buildInputs = [ cmake SDL mesa upx zlib ]; meta = { description = "API for roguelike games"; diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix index 21442cd1624..f0284370726 100644 --- a/pkgs/development/libraries/libyaml-cpp/default.nix +++ b/pkgs/development/libraries/libyaml-cpp/default.nix @@ -11,8 +11,14 @@ stdenv.mkDerivation rec { sha256 = "0qr286q8mwbr4cxz0y0rf045zc071qh3cb804by6w1ydlqciih8a"; }; + outputs = [ "out" "dev" ]; + buildInputs = [ cmake boost ]; + cmakeFlags = "-DBUILD_SHARED_LIBS=ON"; + + enableParallelBuilding = true; + meta = with stdenv.lib; { inherit (src.meta) homepage; description = "A YAML parser and emitter for C++"; diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index a0d17666d52..b6f7411a1c2 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ mesa_noglu ]; + outputs = [ "out" "dev" ]; + meta = { description = "OpenGL utility library"; homepage = http://cgit.freedesktop.org/mesa/glu/; diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index ab3c3ed8c5a..642f93872eb 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/mp4v2; maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 28d361ea7b8..db9a5aeed21 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, unzip }: stdenv.mkDerivation rec { - name = "ocio-${version}"; + name = "opencolorio-${version}"; version = "1.0.9"; src = fetchurl { @@ -9,8 +9,15 @@ stdenv.mkDerivation rec { sha256 = "14j80dgbb6f09z63aqh2874vhzpga6zksz8jmqnj1zh87x15pqnr"; }; + outputs = [ "bin" "out" "dev" ]; + buildInputs = [ cmake unzip ]; + postInstall = '' + rm $out/lib/*.a + mkdir -p $bin/bin; mv $out/bin $bin/ + ''; + meta = with stdenv.lib; { homepage = http://opencolorio.org; description = "A color management framework for visual effects and animation"; @@ -18,4 +25,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 9ca59c9c73a..6a89a672b2c 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig unzip ]; - NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; cmakeFlags = [ "-DWITH_IPP=${if enableIpp then "ON" else "OFF"}" diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index f792e17890c..d7f4367739f 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig unzip ]; - NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = lib.optional enableEXR "-I${ilmbase.dev}/include/OpenEXR"; cmakeFlags = [ (opencvFlag "TIFF" enableTIFF) diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 738e7d87af6..22cc5b416e7 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0ca2j526n4wlamrxb85y2jrgcv0gf21b3a19rr0gh4rjqkv1581n"; }; - outputs = [ "out" "doc" ]; + outputs = [ "bin" "dev" "out" "doc" ]; preConfigure = '' ./bootstrap diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 45436376a33..a99cc51de4a 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { # TODO: separate "out" and "bin" outputs = [ "out" "dev" "man" "devdoc" ]; + enableParallelBuilding = true; + buildInputs = [ openssl cyrus_sasl db groff ]; configureFlags = @@ -29,6 +31,8 @@ stdenv.mkDerivation rec { sed -e 's,-lsasl2,-L${cyrus_sasl.out}/lib -lsasl2,' \ -e 's,-lssl,-L${openssl.out}/lib -lssl,' \ -i $out/lib/libldap.la -i $out/lib/libldap_r.la + + rm -rf $out/var rm -r libraries/*/.libs ''; diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 9a97eaaff09..c7ab69e5169 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -42,6 +42,10 @@ in stdenv.mkDerivation rec { patchShebangs ompi/mpi/fortran/base/gen-mpi-sizeof.pl ''; + postInstall = '' + rm -f $out/lib/*.la + ''; + meta = { homepage = http://www.open-mpi.org/; description = "Open source MPI-2 implementation"; diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index c9bf9a72503..6daa1274565 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa, glew +{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu, mesa_noglu, glew , cudaSupport ? false, cudatoolkit }: @@ -12,6 +12,8 @@ stdenv.mkDerivation { sha256 = "14ylpzk4121gi3fl02dwmqjp5sbaqpkm4gd0lh6jijccdih0xsc0"; }; + outputs = [ "out" "dev" ]; + patches = [ # Fix for building with cudatoolkit 7. (fetchurl { @@ -21,7 +23,7 @@ stdenv.mkDerivation { ]; buildInputs = - [ cmake pkgconfig mesa + [ cmake pkgconfig mesa_glu mesa_noglu # FIXME: these are not actually needed, but the configure script wants them. glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor xorg.libXinerama ] @@ -37,6 +39,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; + postInstall = "rm $out/lib/*.a"; + meta = { description = "An Open-Source subdivision surface library"; homepage = http://graphics.pixar.com/opensubdiv; diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index c5a01ec7e7c..87a2edee3ca 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -5,14 +5,19 @@ stdenv.mkDerivation { inherit src patches; - postInstall = '' - ln -s $out/bin/wish* $out/bin/wish - ''; + outputs = [ "out" "man" "dev" ]; + + setOutputFlags = false; preConfigure = '' + configureFlagsArray+=(--mandir=$man/share/man --enable-man-symlinks) cd unix ''; + postInstall = '' + ln -s $out/bin/wish* $out/bin/wish + ''; + configureFlags = [ "--with-tcl=${tcl}/lib" ]; diff --git a/pkgs/development/libraries/torch-hdf5/default.nix b/pkgs/development/libraries/torch-hdf5/default.nix new file mode 100644 index 00000000000..e5803d644f3 --- /dev/null +++ b/pkgs/development/libraries/torch-hdf5/default.nix @@ -0,0 +1,19 @@ +{stdenv, fetchFromGitHub, torch, cmake, hdf5}: +stdenv.mkDerivation rec { + name = "torch-hdf5-${version}"; + version = "0.0pre2016-07-01"; + buildInputs = [cmake torch hdf5]; + src = fetchFromGitHub { + owner = "deepmind"; + repo = "torch-hdf5"; + rev = "639bb4e62417ac392bf31a53cdd495d19337642b"; + sha256 = "0x1si2c30d95vmw0xqyq242wghfih3m5i43785vwahlzm7h6n6xz"; + }; + meta = { + inherit version; + description = ''HDF5 format support for Torch''; + license = stdenv.lib.licenses.bsd3; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 4d140932402..64afde3c53b 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 28852fd97d6..1dc35db43f9 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1y3yii8wnyz68n0mzcmjylwd6jchqa3l913v39l2zsd2rv5nyvs0"; }; - NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; + NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; buildInputs = [ boost cmake fftw fftwSinglePrec hdf5 ilmbase libjpeg libpng libtiff numpy openexr python ]; diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix index 47760cdb288..d9f0dcc1b0f 100644 --- a/pkgs/development/libraries/wxGTK-2.9/default.nix +++ b/pkgs/development/libraries/wxGTK-2.9/default.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix index 93f771e8c8f..bdb0032a85a 100644 --- a/pkgs/development/libraries/wxGTK-3.0/default.nix +++ b/pkgs/development/libraries/wxGTK-3.0/default.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index 0a287363e67..c485cb6a05a 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -49,6 +49,10 @@ stdenv.mkDerivation rec { cd source ''; + postInstall = '' + rm $out/lib/*.a + ''; + nativeBuildInputs = [ cmake yasm ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix index e68415951c7..3a45447119c 100644 --- a/pkgs/development/libraries/xlslib/default.nix +++ b/pkgs/development/libraries/xlslib/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "C++/C library to construct Excel .xls files in code"; homepage = http://sourceforge.net/projects/xlslib/; license = licenses.bsd2; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix new file mode 100644 index 00000000000..f4adad3ba2b --- /dev/null +++ b/pkgs/development/mobile/adb-sync/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit, python, androidsdk, makeWrapper }: + +stdenv.mkDerivation rec { + name = "adb-sync-${version}"; + version = "2016-08-31"; + + src = fetchgit { + url = "https://github.com/google/adb-sync"; + rev = "7fc48ad1e15129ebe34e9f89b04bfbb68ced144d"; + sha256 = "1y016bjky5sn58v91jyqfz7vw8qfqnfhb9s9jd32k8y29hy5vy4d"; + }; + + preferLocalBuild = true; + + buildInputs = [ python androidsdk makeWrapper ]; + + phases = "installPhase"; + + installPhase = '' + mkdir -p $out/bin + cp $src/adb-channel $src/adb-sync $out/bin/ + patchShebangs $out/bin + wrapProgram $out/bin/adb-sync --suffix PATH : ${androidsdk}/bin + ''; + + meta = with stdenv.lib; { + description = "A tool to synchronise files between a PC and an Android devices using ADB (Android Debug Bridge)"; + homepage = "https://github.com/google/adb-sync"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ scolobb ]; + }; +} diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 36b40d5a29f..a0ecb641f08 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -1,7 +1,7 @@ { stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper , platformTools, buildTools, support, supportRepository, platforms, sysimages, addons , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib -, freetype, fontconfig, glib, gtk, atk, file, jdk, coreutils, libpulseaudio +, freetype, fontconfig, glib, gtk, atk, file, jdk, coreutils, libpulseaudio, dbus , zlib, glxinfo, xkeyboardconfig }: { platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false, useGooglePlayServices ? false }: @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { do wrapProgram `pwd`/$i \ --prefix PATH : ${stdenv.lib.makeBinPath [ file glxinfo ]} \ - --suffix LD_LIBRARY_PATH : `pwd`/lib64:`pwd`/lib64/qt/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext mesa alsaLib zlib libpulseaudio ]} \ + --suffix LD_LIBRARY_PATH : `pwd`/lib64:`pwd`/lib64/qt/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext mesa alsaLib zlib libpulseaudio dbus.lib ]} \ --suffix QT_XKB_CONFIG_ROOT : ${xkeyboardconfig}/share/X11/xkb done ''} diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index 25af902679d..390c5eb7a20 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation ({ name = stdenv.lib.replaceChars [" "] [""] name; - ANDROID_HOME = "${androidsdkComposition}/libexec/android-sdk-${platformName}"; + ANDROID_HOME = "${androidsdkComposition}/libexec"; buildInputs = [ jdk ant ] ++ stdenv.lib.optional useNDK [ androidndk gnumake gawk file which ]; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 7874792b3a0..5a5eb1ab51b 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -40,7 +40,7 @@ rec { androidsdk = import ./androidsdk.nix { inherit (pkgs) stdenv fetchurl unzip makeWrapper; - inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk atk mesa file alsaLib jdk coreutils libpulseaudio; + inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk atk mesa file alsaLib jdk coreutils libpulseaudio dbus; inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst xkeyboardconfig; inherit platformTools buildTools support supportRepository platforms sysimages addons; diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index cad77ec7d62..2fc753c047a 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { for i in $(seq 5554 2 5584) do - if [ -z "$(${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb devices | grep emulator-$i)" ] + if [ -z "$(${androidsdkComposition}/libexec/platform-tools/adb devices | grep emulator-$i)" ] then port=$i break @@ -61,10 +61,10 @@ stdenv.mkDerivation { # Create a virtual android device for testing if it does not exists - if [ "$(${androidsdkComposition}/libexec/android-sdk-*/tools/android list avd | grep 'Name: device')" = "" ] + if [ "$(${androidsdkComposition}/libexec/tools/android list avd | grep 'Name: device')" = "" ] then # Create a virtual android device - yes "" | ${androidsdkComposition}/libexec/android-sdk-*/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} $NIX_ANDROID_AVD_FLAGS + yes "" | ${androidsdkComposition}/libexec/tools/android create avd -n device -t ${if useGoogleAPIs then "'Google Inc.:Google APIs:"+platformVersion+"'" else "android-"+platformVersion} $NIX_ANDROID_AVD_FLAGS ${stdenv.lib.optionalString enableGPU '' # Enable GPU acceleration @@ -77,24 +77,24 @@ stdenv.mkDerivation { fi # Launch the emulator - ${androidsdkComposition}/libexec/android-sdk-*/tools/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS & + ${androidsdkComposition}/libexec/tools/emulator -avd device -no-boot-anim -port $port $NIX_ANDROID_EMULATOR_FLAGS & # Wait until the device has completely booted echo "Waiting until the emulator has booted the device and the package manager is ready..." >&2 - ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port wait-for-device + ${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port wait-for-device echo "Device state has been reached" >&2 - while [ -z "$(${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell getprop dev.bootcomplete | grep 1)" ] + while [ -z "$(${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port shell getprop dev.bootcomplete | grep 1)" ] do sleep 5 done echo "dev.bootcomplete property is 1" >&2 - #while [ -z "$(${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell getprop sys.boot_completed | grep 1)" ] + #while [ -z "$(${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port shell getprop sys.boot_completed | grep 1)" ] #do #sleep 5 #done @@ -106,7 +106,7 @@ stdenv.mkDerivation { ${stdenv.lib.optionalString (app != null) '' # Install the App through the debugger, if it has not been installed yet - if [ -z "${package}" ] || [ "$(${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell pm list packages | grep package:${package})" = "" ] + if [ -z "${package}" ] || [ "$(${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port shell pm list packages | grep package:${package})" = "" ] then if [ -d "${app}" ] then @@ -115,12 +115,12 @@ stdenv.mkDerivation { appPath="${app}" fi - ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port install "$appPath" + ${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port install "$appPath" fi # Start the application ${stdenv.lib.optionalString (package != null && activity != null) '' - ${androidsdkComposition}/libexec/android-sdk-*/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/${activity} + ${androidsdkComposition}/libexec/platform-tools/adb -s emulator-$port shell am start -a android.intent.action.MAIN -n ${package}/${activity} ''} ''} EOF diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix index fb25037e167..cafe329c076 100644 --- a/pkgs/development/mobile/titaniumenv/build-app.nix +++ b/pkgs/development/mobile/titaniumenv/build-app.nix @@ -1,4 +1,4 @@ -{stdenv, androidsdk, titaniumsdk, titanium, xcodewrapper, jdk, python, which, xcodeBaseDir}: +{stdenv, androidsdk, titaniumsdk, titanium, alloy, xcodewrapper, jdk, python, nodejs, which, xcodeBaseDir}: { name, src, target, androidPlatformVersions ? [ "23" ], androidAbiVersions ? [ "armeabi" "armeabi-v7a" ], tiVersion ? null , release ? false, androidKeyStore ? null, androidKeyAlias ? null, androidKeyStorePassword ? null , iosMobileProvisioningProfile ? null, iosCertificateName ? null, iosCertificate ? null, iosCertificatePassword ? null, iosVersion ? "9.2" @@ -47,7 +47,7 @@ stdenv.mkDerivation { name = stdenv.lib.replaceChars [" "] [""] name; inherit src; - buildInputs = [ titanium jdk python which ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; + buildInputs = [ nodejs titanium alloy jdk python which ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper; buildPhase = '' export HOME=$TMPDIR @@ -78,10 +78,9 @@ stdenv.mkDerivation { javac -version ''} - titanium config --config-file $TMPDIR/config.json --no-colors android.sdk ${androidsdkComposition}/libexec/android-sdk-* - titanium config --config-file $TMPDIR/config.json --no-colors android.buildTools.selectedVersion 23.0.1 + titanium config --config-file $TMPDIR/config.json --no-colors android.sdk ${androidsdkComposition}/libexec - export PATH=$(echo ${androidsdkComposition}/libexec/android-sdk-*/tools):$(echo ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*):$PATH + export PATH=$(echo ${androidsdkComposition}/libexec/tools):$(echo ${androidsdkComposition}/libexec/build-tools/android-*):$PATH ${if release then ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --store-password ${androidKeyStorePassword} --output-dir $out'' diff --git a/pkgs/development/mobile/titaniumenv/cli/cli.json b/pkgs/development/mobile/titaniumenv/cli/cli.json deleted file mode 100644 index df2c0af5d93..00000000000 --- a/pkgs/development/mobile/titaniumenv/cli/cli.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - "titanium" -] diff --git a/pkgs/development/mobile/titaniumenv/cli/default.nix b/pkgs/development/mobile/titaniumenv/cli/default.nix deleted file mode 100644 index fa98bb3b76a..00000000000 --- a/pkgs/development/mobile/titaniumenv/cli/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{system ? builtins.currentSystem, pkgs ? import { - inherit system; - }, overrides ? {}}: - -let - nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv fetchurl nodejs python utillinux runCommand; - }; - registry = (import ./registry.nix { - inherit (nodeEnv) buildNodePackage; - inherit (pkgs) fetchurl fetchgit; - self = registry; - }) // overrides; -in -registry \ No newline at end of file diff --git a/pkgs/development/mobile/titaniumenv/cli/node-env.nix b/pkgs/development/mobile/titaniumenv/cli/node-env.nix deleted file mode 100644 index c6d56c9e074..00000000000 --- a/pkgs/development/mobile/titaniumenv/cli/node-env.nix +++ /dev/null @@ -1,309 +0,0 @@ -{ stdenv, fetchurl, nodejs, python, utillinux, runCommand }: - -let - # Function that generates a TGZ file from a NPM project - buildNodeSourceDist = - { name, version, src }: - - stdenv.mkDerivation { - name = "node-tarball-${name}-${version}"; - inherit src; - buildInputs = [ nodejs ]; - buildPhase = '' - export HOME=$TMPDIR - tgzFile=$(npm pack) - ''; - installPhase = '' - mkdir -p $out/tarballs - mv $tgzFile $out/tarballs - mkdir -p $out/nix-support - echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products - ''; - }; - - # We must run semver to determine whether a provided dependency conforms to a certain version range - semver = buildNodePackage { - name = "semver"; - version = "5.0.3"; - src = fetchurl { - url = http://registry.npmjs.org/semver/-/semver-5.0.3.tgz; - sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; - }; - } {}; - - # Function that produces a deployed NPM package in the Nix store - buildNodePackage = - { name, version, src, dependencies ? {}, buildInputs ? [], production ? true, npmFlags ? "", meta ? {}, linkDependencies ? false }: - { providedDependencies ? {} }: - - let - # Generate and import a Nix expression that determines which dependencies - # are required and which are not required (and must be shimmed). - # - # It uses the semver utility to check whether a version range matches any - # of the provided dependencies. - - analysedDependencies = - if dependencies == {} then {} - else - import (stdenv.mkDerivation { - name = "${name}-${version}-analysedDependencies.nix"; - buildInputs = [ semver ]; - buildCommand = '' - cat > $out </dev/null - then - echo "shimmedDependencies.\"${dependencyName}\".\"$latestVersion\" = true;" - else - echo 'requiredDependencies."${dependencyName}"."${versionSpec}" = true;' - fi) - '' - else # If a dependency is not provided by an includer, we must always include it ourselves - "requiredDependencies.\"${dependencyName}\".\"${versionSpec}\" = true;\n" - ) versionSpecs - ) (builtins.attrNames dependencies)} - } - EOF - ''; - }); - - requiredDependencies = analysedDependencies.requiredDependencies or {}; - shimmedDependencies = analysedDependencies.shimmedDependencies or {}; - - # Extract the Node.js source code which is used to compile packages with native bindings - nodeSources = runCommand "node-sources" {} '' - tar --no-same-owner --no-same-permissions -xf ${nodejs.src} - mv node-* $out - ''; - - # Compose dependency information that this package must propagate to its - # dependencies, so that provided dependencies are not included a second time. - # This prevents cycles and wildcard version mismatches. - - propagatedProvidedDependencies = - (stdenv.lib.mapAttrs (dependencyName: dependency: - builtins.listToAttrs (map (versionSpec: - { name = dependency."${versionSpec}".version; - value = true; - } - ) (builtins.attrNames dependency)) - ) dependencies) // - providedDependencies // - { "${name}"."${version}" = true; }; - - # Create a node_modules folder containing all required dependencies of the - # package - - nodeDependencies = stdenv.mkDerivation { - name = "node-dependencies-${name}-${version}"; - inherit src; - buildCommand = '' - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules - - # Create copies of (or symlinks to) the dependencies that must be deployed in this package's private node_modules folder. - # This package's private dependencies are NPM packages that have not been provided by any of the includers. - - ${stdenv.lib.concatMapStrings (requiredDependencyName: - stdenv.lib.concatMapStrings (versionSpec: - let - dependency = dependencies."${requiredDependencyName}"."${versionSpec}".pkg { - providedDependencies = propagatedProvidedDependencies; - }; - in - '' - depPath=$(echo ${dependency}/lib/node_modules/*) - - ${if linkDependencies then '' - ln -s $depPath . - '' else '' - cp -r $depPath . - ''} - '' - ) (builtins.attrNames (requiredDependencies."${requiredDependencyName}")) - ) (builtins.attrNames requiredDependencies)} - ''; - }; - - # Deploy the Node package with some tricks - self = stdenv.lib.makeOverridable stdenv.mkDerivation { - inherit src meta; - dontStrip = true; - - name = "node-${name}-${version}"; - buildInputs = [ nodejs python ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - dontBuild = true; - - installPhase = '' - # Move the contents of the tarball into the output folder - mkdir -p "$out/lib/node_modules/${name}" - mv * "$out/lib/node_modules/${name}" - - # Enter the target directory - cd "$out/lib/node_modules/${name}" - - # Patch the shebangs of the bundled modules. For "regular" dependencies - # this is step is not required, because it has already been done by the generic builder. - - if [ -d node_modules ] - then - patchShebangs node_modules - fi - - # Copy the required dependencies - mkdir -p node_modules - - ${stdenv.lib.optionalString (requiredDependencies != {}) '' - for i in ${nodeDependencies}/lib/node_modules/* - do - if [ ! -d "node_modules/$(basename $i)" ] - then - cp -a $i node_modules - fi - done - ''} - - # Create shims for the packages that have been provided by earlier includers to allow the NPM install operation to still succeed - - ${stdenv.lib.concatMapStrings (shimmedDependencyName: - stdenv.lib.concatMapStrings (versionSpec: - '' - mkdir -p node_modules/${shimmedDependencyName} - cat > node_modules/${shimmedDependencyName}/package.json <=0.0.4" = { - version = "1.0.0"; - pkg = self."amdefine-1.0.0"; - }; - }; - }; - meta = { - description = "Generates and consumes source maps"; - homepage = https://github.com/mozilla/source-map; - }; - production = true; - linkDependencies = false; - }; - "amdefine-1.0.0" = buildNodePackage { - name = "amdefine"; - version = "1.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"; - sha1 = "fd17474700cb5cc9c2b709f0be9d23ce3c198c33"; - }; - meta = { - description = "Provide AMD's define() API for declaring modules in the AMD format"; - homepage = http://github.com/jrburke/amdefine; - license = "BSD-3-Clause AND MIT"; - }; - production = true; - linkDependencies = false; - }; - "amdefine->=0.0.4" = self."amdefine-1.0.0"; - "moment-2.10.6" = buildNodePackage { - name = "moment"; - version = "2.10.6"; - src = fetchurl { - url = "http://registry.npmjs.org/moment/-/moment-2.10.6.tgz"; - sha1 = "6cb21967c79cba7b0ca5e66644f173662b3efa77"; - }; - meta = { - description = "Parse, validate, manipulate, and display dates"; - homepage = http://momentjs.com/; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "node-appc-0.2.31" = buildNodePackage { - name = "node-appc"; - version = "0.2.31"; - src = fetchurl { - url = "http://registry.npmjs.org/node-appc/-/node-appc-0.2.31.tgz"; - sha1 = "8d8d0052fd8b8ce4bc44f06883009f7c950bc8c2"; - }; - dependencies = { - adm-zip = { - "0.4.7" = { - version = "0.4.7"; - pkg = self."adm-zip-0.4.7"; - }; - }; - async = { - "1.4.2" = { - version = "1.4.2"; - pkg = self."async-1.4.2"; - }; - }; - colors = { - "1.1.2" = { - version = "1.1.2"; - pkg = self."colors-1.1.2"; - }; - }; - diff = { - "2.1.0" = { - version = "2.1.0"; - pkg = self."diff-2.1.0"; - }; - }; - node-uuid = { - "1.4.3" = { - version = "1.4.3"; - pkg = self."node-uuid-1.4.3"; - }; - }; - optimist = { - "0.6.1" = { - version = "0.6.1"; - pkg = self."optimist-0.6.1"; - }; - }; - request = { - "2.61.0" = { - version = "2.61.0"; - pkg = self."request-2.61.0"; - }; - }; - semver = { - "5.0.1" = { - version = "5.0.1"; - pkg = self."semver-5.0.1"; - }; - }; - sprintf = { - "0.1.5" = { - version = "0.1.5"; - pkg = self."sprintf-0.1.5"; - }; - }; - temp = { - "0.8.3" = { - version = "0.8.3"; - pkg = self."temp-0.8.3"; - }; - }; - wrench = { - "1.5.8" = { - version = "1.5.8"; - pkg = self."wrench-1.5.8"; - }; - }; - uglify-js = { - "2.4.24" = { - version = "2.4.24"; - pkg = self."uglify-js-2.4.24"; - }; - }; - xmldom = { - "0.1.19" = { - version = "0.1.19"; - pkg = self."xmldom-0.1.19"; - }; - }; - }; - meta = { - description = "Appcelerator Common Node Library"; - homepage = http://github.com/appcelerator/node-appc; - license = "Apache Public License v2"; - }; - production = true; - linkDependencies = false; - }; - "adm-zip-0.4.7" = buildNodePackage { - name = "adm-zip"; - version = "0.4.7"; - src = fetchurl { - url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"; - sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1"; - }; - meta = { - description = "A Javascript implementation of zip for nodejs. Allows user to create or extract zip files both in memory or to/from disk"; - homepage = http://github.com/cthackers/adm-zip; - }; - production = true; - linkDependencies = false; - }; - "diff-2.1.0" = buildNodePackage { - name = "diff"; - version = "2.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/diff/-/diff-2.1.0.tgz"; - sha1 = "39b5aa97f0d1600b428ad0a91dc8efcc9b29e288"; - }; - dependencies = {}; - meta = { - description = "A javascript text diff implementation"; - homepage = "https://github.com/kpdecker/jsdiff#readme"; - license = "BSD-3-Clause"; - }; - production = true; - linkDependencies = false; - }; - "node-uuid-1.4.3" = buildNodePackage { - name = "node-uuid"; - version = "1.4.3"; - src = fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz"; - sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9"; - }; - meta = { - description = "Rigorous implementation of RFC4122 (v1 and v4) UUIDs"; - homepage = https://github.com/broofa/node-uuid; - }; - production = true; - linkDependencies = false; - }; - "optimist-0.6.1" = buildNodePackage { - name = "optimist"; - version = "0.6.1"; - src = fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; - sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; - }; - dependencies = { - wordwrap = { - "~0.0.2" = { - version = "0.0.3"; - pkg = self."wordwrap-0.0.3"; - }; - }; - minimist = { - "~0.0.1" = { - version = "0.0.10"; - pkg = self."minimist-0.0.10"; - }; - }; - }; - meta = { - description = "Light-weight option parsing with an argv hash. No optstrings attached"; - homepage = https://github.com/substack/node-optimist; - license = "MIT/X11"; - }; - production = true; - linkDependencies = false; - }; - "wordwrap-0.0.3" = buildNodePackage { - name = "wordwrap"; - version = "0.0.3"; - src = fetchurl { - url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; - }; - meta = { - description = "Wrap those words. Show them at what columns to start and stop"; - homepage = "https://github.com/substack/node-wordwrap#readme"; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "wordwrap-~0.0.2" = self."wordwrap-0.0.3"; - "minimist-0.0.10" = buildNodePackage { - name = "minimist"; - version = "0.0.10"; - src = fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; - }; - meta = { - description = "Parse argument options"; - homepage = https://github.com/substack/minimist; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "minimist-~0.0.1" = self."minimist-0.0.10"; - "request-2.61.0" = buildNodePackage { - name = "request"; - version = "2.61.0"; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.61.0.tgz"; - sha1 = "6973cb2ac94885f02693f554eec64481d6013f9f"; - }; - dependencies = { - bl = { - "~1.0.0" = { - version = "1.0.0"; - pkg = self."bl-1.0.0"; - }; - }; - caseless = { - "~0.11.0" = { - version = "0.11.0"; - pkg = self."caseless-0.11.0"; - }; - }; - extend = { - "~3.0.0" = { - version = "3.0.0"; - pkg = self."extend-3.0.0"; - }; - }; - forever-agent = { - "~0.6.0" = { - version = "0.6.1"; - pkg = self."forever-agent-0.6.1"; - }; - }; - form-data = { - "~1.0.0-rc1" = { - version = "1.0.0-rc3"; - pkg = self."form-data-1.0.0-rc3"; - }; - }; - json-stringify-safe = { - "~5.0.0" = { - version = "5.0.1"; - pkg = self."json-stringify-safe-5.0.1"; - }; - }; - mime-types = { - "~2.1.2" = { - version = "2.1.8"; - pkg = self."mime-types-2.1.8"; - }; - }; - node-uuid = { - "~1.4.0" = { - version = "1.4.7"; - pkg = self."node-uuid-1.4.7"; - }; - }; - qs = { - "~4.0.0" = { - version = "4.0.0"; - pkg = self."qs-4.0.0"; - }; - }; - tunnel-agent = { - "~0.4.0" = { - version = "0.4.2"; - pkg = self."tunnel-agent-0.4.2"; - }; - }; - tough-cookie = { - ">=0.12.0" = { - version = "2.2.1"; - pkg = self."tough-cookie-2.2.1"; - }; - }; - http-signature = { - "~0.11.0" = { - version = "0.11.0"; - pkg = self."http-signature-0.11.0"; - }; - }; - oauth-sign = { - "~0.8.0" = { - version = "0.8.0"; - pkg = self."oauth-sign-0.8.0"; - }; - }; - hawk = { - "~3.1.0" = { - version = "3.1.2"; - pkg = self."hawk-3.1.2"; - }; - }; - aws-sign2 = { - "~0.5.0" = { - version = "0.5.0"; - pkg = self."aws-sign2-0.5.0"; - }; - }; - stringstream = { - "~0.0.4" = { - version = "0.0.5"; - pkg = self."stringstream-0.0.5"; - }; - }; - combined-stream = { - "~1.0.1" = { - version = "1.0.5"; - pkg = self."combined-stream-1.0.5"; - }; - }; - isstream = { - "~0.1.1" = { - version = "0.1.2"; - pkg = self."isstream-0.1.2"; - }; - }; - har-validator = { - "^1.6.1" = { - version = "1.8.0"; - pkg = self."har-validator-1.8.0"; - }; - }; - }; - meta = { - description = "Simplified HTTP request client"; - homepage = "https://github.com/request/request#readme"; - license = "Apache-2.0"; - }; - production = true; - linkDependencies = false; - }; - "bl-1.0.0" = buildNodePackage { - name = "bl"; - version = "1.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/bl/-/bl-1.0.0.tgz"; - sha1 = "ada9a8a89a6d7ac60862f7dec7db207873e0c3f5"; - }; - dependencies = { - readable-stream = { - "~2.0.0" = { - version = "2.0.5"; - pkg = self."readable-stream-2.0.5"; - }; - }; - }; - meta = { - description = "Buffer List: collect buffers and access with a standard readable Buffer interface, streamable too!"; - homepage = https://github.com/rvagg/bl; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "readable-stream-2.0.5" = buildNodePackage { - name = "readable-stream"; - version = "2.0.5"; - src = fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.5.tgz"; - sha1 = "a2426f8dcd4551c77a33f96edf2886a23c829669"; - }; - dependencies = { - core-util-is = { - "~1.0.0" = { - version = "1.0.2"; - pkg = self."core-util-is-1.0.2"; - }; - }; - inherits = { - "~2.0.1" = { - version = "2.0.1"; - pkg = self."inherits-2.0.1"; - }; - }; - isarray = { - "0.0.1" = { - version = "0.0.1"; - pkg = self."isarray-0.0.1"; - }; - }; - process-nextick-args = { - "~1.0.6" = { - version = "1.0.6"; - pkg = self."process-nextick-args-1.0.6"; - }; - }; - string_decoder = { - "~0.10.x" = { - version = "0.10.31"; - pkg = self."string_decoder-0.10.31"; - }; - }; - util-deprecate = { - "~1.0.1" = { - version = "1.0.2"; - pkg = self."util-deprecate-1.0.2"; - }; - }; - }; - meta = { - description = "Streams3, a user-land copy of the stream library from iojs v2.x"; - homepage = "https://github.com/nodejs/readable-stream#readme"; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "core-util-is-1.0.2" = buildNodePackage { - name = "core-util-is"; - version = "1.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - meta = { - description = "The `util.is*` functions introduced in Node v0.12"; - homepage = "https://github.com/isaacs/core-util-is#readme"; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "core-util-is-~1.0.0" = self."core-util-is-1.0.2"; - "inherits-2.0.1" = buildNodePackage { - name = "inherits"; - version = "2.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; - }; - meta = { - description = "Browser-friendly inheritance fully compatible with standard node.js inherits()"; - license = "ISC"; - }; - production = true; - linkDependencies = false; - }; - "inherits-~2.0.1" = self."inherits-2.0.1"; - "isarray-0.0.1" = buildNodePackage { - name = "isarray"; - version = "0.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - dependencies = {}; - meta = { - description = "Array#isArray for older browsers"; - homepage = https://github.com/juliangruber/isarray; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "process-nextick-args-1.0.6" = buildNodePackage { - name = "process-nextick-args"; - version = "1.0.6"; - src = fetchurl { - url = "http://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"; - sha1 = "0f96b001cea90b12592ce566edb97ec11e69bd05"; - }; - meta = { - description = "process.nextTick but always with args"; - homepage = https://github.com/calvinmetcalf/process-nextick-args; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "process-nextick-args-~1.0.6" = self."process-nextick-args-1.0.6"; - "string_decoder-0.10.31" = buildNodePackage { - name = "string_decoder"; - version = "0.10.31"; - src = fetchurl { - url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - dependencies = {}; - meta = { - description = "The string_decoder module from Node core"; - homepage = https://github.com/rvagg/string_decoder; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "string_decoder-~0.10.x" = self."string_decoder-0.10.31"; - "util-deprecate-1.0.2" = buildNodePackage { - name = "util-deprecate"; - version = "1.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; - }; - meta = { - description = "The Node.js `util.deprecate()` function with browser support"; - homepage = https://github.com/TooTallNate/util-deprecate; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "util-deprecate-~1.0.1" = self."util-deprecate-1.0.2"; - "readable-stream-~2.0.0" = self."readable-stream-2.0.5"; - "bl-~1.0.0" = self."bl-1.0.0"; - "caseless-0.11.0" = buildNodePackage { - name = "caseless"; - version = "0.11.0"; - src = fetchurl { - url = "http://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; - sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; - }; - meta = { - description = "Caseless object set/get/has, very useful when working with HTTP headers"; - homepage = "https://github.com/mikeal/caseless#readme"; - license = "Apache-2.0"; - }; - production = true; - linkDependencies = false; - }; - "caseless-~0.11.0" = self."caseless-0.11.0"; - "extend-3.0.0" = buildNodePackage { - name = "extend"; - version = "3.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/extend/-/extend-3.0.0.tgz"; - sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4"; - }; - dependencies = {}; - meta = { - description = "Port of jQuery.extend for node.js and the browser"; - homepage = "https://github.com/justmoon/node-extend#readme"; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "extend-~3.0.0" = self."extend-3.0.0"; - "forever-agent-0.6.1" = buildNodePackage { - name = "forever-agent"; - version = "0.6.1"; - src = fetchurl { - url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; - }; - dependencies = {}; - meta = { - description = "HTTP Agent that keeps socket connections alive between keep-alive requests. Formerly part of mikeal/request, now a standalone module"; - homepage = https://github.com/mikeal/forever-agent; - license = "Apache-2.0"; - }; - production = true; - linkDependencies = false; - }; - "forever-agent-~0.6.0" = self."forever-agent-0.6.1"; - "form-data-1.0.0-rc3" = buildNodePackage { - name = "form-data"; - version = "1.0.0-rc3"; - src = fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz"; - sha1 = "d35bc62e7fbc2937ae78f948aaa0d38d90607577"; - }; - dependencies = { - async = { - "^1.4.0" = { - version = "1.5.1"; - pkg = self."async-1.5.1"; - }; - }; - combined-stream = { - "^1.0.5" = { - version = "1.0.5"; - pkg = self."combined-stream-1.0.5"; - }; - }; - mime-types = { - "^2.1.3" = { - version = "2.1.8"; - pkg = self."mime-types-2.1.8"; - }; - }; - }; - meta = { - description = "A library to create readable \"multipart/form-data\" streams. Can be used to submit forms and file uploads to other web applications"; - homepage = "https://github.com/form-data/form-data#readme"; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "async-1.5.1" = buildNodePackage { - name = "async"; - version = "1.5.1"; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-1.5.1.tgz"; - sha1 = "b05714f4b11b357bf79adaffdd06da42d0766c10"; - }; - meta = { - description = "Higher-order functions and common patterns for asynchronous code"; - homepage = "https://github.com/caolan/async#readme"; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "async-^1.4.0" = self."async-1.5.1"; - "combined-stream-1.0.5" = buildNodePackage { - name = "combined-stream"; - version = "1.0.5"; - src = fetchurl { - url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; - sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; - }; - dependencies = { - delayed-stream = { - "~1.0.0" = { - version = "1.0.0"; - pkg = self."delayed-stream-1.0.0"; - }; - }; - }; - meta = { - description = "A stream that emits multiple other streams one after another"; - homepage = https://github.com/felixge/node-combined-stream; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "delayed-stream-1.0.0" = buildNodePackage { - name = "delayed-stream"; - version = "1.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; - }; - dependencies = {}; - meta = { - description = "Buffers events from a stream until you are ready to handle them"; - homepage = https://github.com/felixge/node-delayed-stream; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "delayed-stream-~1.0.0" = self."delayed-stream-1.0.0"; - "combined-stream-^1.0.5" = self."combined-stream-1.0.5"; - "mime-types-2.1.8" = buildNodePackage { - name = "mime-types"; - version = "2.1.8"; - src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.8.tgz"; - sha1 = "faf57823de04bc7cbff4ee82c6b63946e812ae72"; - }; - dependencies = { - mime-db = { - "~1.20.0" = { - version = "1.20.0"; - pkg = self."mime-db-1.20.0"; - }; - }; - }; - meta = { - description = "The ultimate javascript content-type utility"; - homepage = https://github.com/jshttp/mime-types; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "mime-db-1.20.0" = buildNodePackage { - name = "mime-db"; - version = "1.20.0"; - src = fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.20.0.tgz"; - sha1 = "496f90fd01fe0e031c8823ec3aa9450ffda18ed8"; - }; - meta = { - description = "Media Type Database"; - homepage = https://github.com/jshttp/mime-db; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "mime-db-~1.20.0" = self."mime-db-1.20.0"; - "mime-types-^2.1.3" = self."mime-types-2.1.8"; - "form-data-~1.0.0-rc1" = self."form-data-1.0.0-rc3"; - "json-stringify-safe-5.0.1" = buildNodePackage { - name = "json-stringify-safe"; - version = "5.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; - }; - meta = { - description = "Like JSON.stringify, but doesn't blow up on circular refs"; - homepage = https://github.com/isaacs/json-stringify-safe; - license = "ISC"; - }; - production = true; - linkDependencies = false; - }; - "json-stringify-safe-~5.0.0" = self."json-stringify-safe-5.0.1"; - "mime-types-~2.1.2" = self."mime-types-2.1.8"; - "node-uuid-1.4.7" = buildNodePackage { - name = "node-uuid"; - version = "1.4.7"; - src = fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; - sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; - }; - dependencies = {}; - meta = { - description = "Rigorous implementation of RFC4122 (v1 and v4) UUIDs"; - homepage = https://github.com/broofa/node-uuid; - }; - production = true; - linkDependencies = false; - }; - "node-uuid-~1.4.0" = self."node-uuid-1.4.7"; - "qs-4.0.0" = buildNodePackage { - name = "qs"; - version = "4.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-4.0.0.tgz"; - sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; - }; - dependencies = {}; - meta = { - description = "A querystring parser that supports nesting and arrays, with a depth limit"; - homepage = https://github.com/hapijs/qs; - license = "BSD-3-Clause"; - }; - production = true; - linkDependencies = false; - }; - "qs-~4.0.0" = self."qs-4.0.0"; - "tunnel-agent-0.4.2" = buildNodePackage { - name = "tunnel-agent"; - version = "0.4.2"; - src = fetchurl { - url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"; - sha1 = "1104e3f36ac87125c287270067d582d18133bfee"; - }; - dependencies = {}; - meta = { - description = "HTTP proxy tunneling agent. Formerly part of mikeal/request, now a standalone module"; - homepage = "https://github.com/mikeal/tunnel-agent#readme"; - license = "Apache-2.0"; - }; - production = true; - linkDependencies = false; - }; - "tunnel-agent-~0.4.0" = self."tunnel-agent-0.4.2"; - "tough-cookie-2.2.1" = buildNodePackage { - name = "tough-cookie"; - version = "2.2.1"; - src = fetchurl { - url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz"; - sha1 = "3b0516b799e70e8164436a1446e7e5877fda118e"; - }; - meta = { - description = "RFC6265 Cookies and Cookie Jar for node.js"; - homepage = https://github.com/SalesforceEng/tough-cookie; - license = "BSD-3-Clause"; - }; - production = true; - linkDependencies = false; - }; - "tough-cookie->=0.12.0" = self."tough-cookie-2.2.1"; - "http-signature-0.11.0" = buildNodePackage { - name = "http-signature"; - version = "0.11.0"; - src = fetchurl { - url = "http://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"; - sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6"; - }; - dependencies = { - assert-plus = { - "^0.1.5" = { - version = "0.1.5"; - pkg = self."assert-plus-0.1.5"; - }; - }; - asn1 = { - "0.1.11" = { - version = "0.1.11"; - pkg = self."asn1-0.1.11"; - }; - }; - ctype = { - "0.5.3" = { - version = "0.5.3"; - pkg = self."ctype-0.5.3"; - }; - }; - }; - meta = { - description = "Reference implementation of Joyent's HTTP Signature scheme"; - homepage = https://github.com/joyent/node-http-signature/; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "assert-plus-0.1.5" = buildNodePackage { - name = "assert-plus"; - version = "0.1.5"; - src = fetchurl { - url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; - sha1 = "ee74009413002d84cec7219c6ac811812e723160"; - }; - dependencies = {}; - meta = { - description = "Extra assertions on top of node's assert module"; - }; - production = true; - linkDependencies = false; - }; - "assert-plus-^0.1.5" = self."assert-plus-0.1.5"; - "asn1-0.1.11" = buildNodePackage { - name = "asn1"; - version = "0.1.11"; - src = fetchurl { - url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; - sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; - }; - dependencies = {}; - meta = { - description = "Contains parsers and serializers for ASN.1 (currently BER only)"; - }; - production = true; - linkDependencies = false; - }; - "ctype-0.5.3" = buildNodePackage { - name = "ctype"; - version = "0.5.3"; - src = fetchurl { - url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; - sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; - }; - meta = { - description = "Read and write binary structures and data types"; - homepage = https://github.com/rmustacc/node-ctype; - }; - production = true; - linkDependencies = false; - }; - "http-signature-~0.11.0" = self."http-signature-0.11.0"; - "oauth-sign-0.8.0" = buildNodePackage { - name = "oauth-sign"; - version = "0.8.0"; - src = fetchurl { - url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz"; - sha1 = "938fdc875765ba527137d8aec9d178e24debc553"; - }; - dependencies = {}; - meta = { - description = "OAuth 1 signing. Formerly a vendor lib in mikeal/request, now a standalone module"; - homepage = "https://github.com/mikeal/oauth-sign#readme"; - license = "Apache-2.0"; - }; - production = true; - linkDependencies = false; - }; - "oauth-sign-~0.8.0" = self."oauth-sign-0.8.0"; - "hawk-3.1.2" = buildNodePackage { - name = "hawk"; - version = "3.1.2"; - src = fetchurl { - url = "http://registry.npmjs.org/hawk/-/hawk-3.1.2.tgz"; - sha1 = "90c90118886e21975d1ad4ae9b3e284ed19a2de8"; - }; - dependencies = { - hoek = { - "2.x.x" = { - version = "2.16.3"; - pkg = self."hoek-2.16.3"; - }; - }; - boom = { - "2.x.x" = { - version = "2.10.1"; - pkg = self."boom-2.10.1"; - }; - }; - cryptiles = { - "2.x.x" = { - version = "2.0.5"; - pkg = self."cryptiles-2.0.5"; - }; - }; - sntp = { - "1.x.x" = { - version = "1.0.9"; - pkg = self."sntp-1.0.9"; - }; - }; - }; - meta = { - description = "HTTP Hawk Authentication Scheme"; - homepage = "https://github.com/hueniverse/hawk#readme"; - license = "BSD-3-Clause"; - }; - production = true; - linkDependencies = false; - }; - "hoek-2.16.3" = buildNodePackage { - name = "hoek"; - version = "2.16.3"; - src = fetchurl { - url = "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; - sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; - }; - dependencies = {}; - meta = { - description = "General purpose node utilities"; - homepage = "https://github.com/hapijs/hoek#readme"; - license = "BSD-3-Clause"; - }; - production = true; - linkDependencies = false; - }; - "hoek-2.x.x" = self."hoek-2.16.3"; - "boom-2.10.1" = buildNodePackage { - name = "boom"; - version = "2.10.1"; - src = fetchurl { - url = "http://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; - sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; - }; - dependencies = { - hoek = { - "2.x.x" = { - version = "2.16.3"; - pkg = self."hoek-2.16.3"; - }; - }; - }; - meta = { - description = "HTTP-friendly error objects"; - homepage = "https://github.com/hapijs/boom#readme"; - license = "BSD-3-Clause"; - }; - production = true; - linkDependencies = false; - }; - "boom-2.x.x" = self."boom-2.10.1"; - "cryptiles-2.0.5" = buildNodePackage { - name = "cryptiles"; - version = "2.0.5"; - src = fetchurl { - url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; - sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; - }; - dependencies = { - boom = { - "2.x.x" = { - version = "2.10.1"; - pkg = self."boom-2.10.1"; - }; - }; - }; - meta = { - description = "General purpose crypto utilities"; - homepage = "https://github.com/hapijs/cryptiles#readme"; - license = "BSD-3-Clause"; - }; - production = true; - linkDependencies = false; - }; - "cryptiles-2.x.x" = self."cryptiles-2.0.5"; - "sntp-1.0.9" = buildNodePackage { - name = "sntp"; - version = "1.0.9"; - src = fetchurl { - url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; - }; - dependencies = { - hoek = { - "2.x.x" = { - version = "2.16.3"; - pkg = self."hoek-2.16.3"; - }; - }; - }; - meta = { - description = "SNTP Client"; - homepage = https://github.com/hueniverse/sntp; - }; - production = true; - linkDependencies = false; - }; - "sntp-1.x.x" = self."sntp-1.0.9"; - "hawk-~3.1.0" = self."hawk-3.1.2"; - "aws-sign2-0.5.0" = buildNodePackage { - name = "aws-sign2"; - version = "0.5.0"; - src = fetchurl { - url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; - }; - dependencies = {}; - meta = { - description = "AWS signing. Originally pulled from LearnBoost/knox, maintained as vendor in request, now a standalone module"; - }; - production = true; - linkDependencies = false; - }; - "aws-sign2-~0.5.0" = self."aws-sign2-0.5.0"; - "stringstream-0.0.5" = buildNodePackage { - name = "stringstream"; - version = "0.0.5"; - src = fetchurl { - url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; - sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; - }; - meta = { - description = "Encode and decode streams into string streams"; - homepage = "https://github.com/mhart/StringStream#readme"; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "stringstream-~0.0.4" = self."stringstream-0.0.5"; - "combined-stream-~1.0.1" = self."combined-stream-1.0.5"; - "isstream-0.1.2" = buildNodePackage { - name = "isstream"; - version = "0.1.2"; - src = fetchurl { - url = "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - meta = { - description = "Determine if an object is a Stream"; - homepage = https://github.com/rvagg/isstream; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "isstream-~0.1.1" = self."isstream-0.1.2"; - "har-validator-1.8.0" = buildNodePackage { - name = "har-validator"; - version = "1.8.0"; - src = fetchurl { - url = "http://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz"; - sha1 = "d83842b0eb4c435960aeb108a067a3aa94c0eeb2"; - }; - dependencies = { - bluebird = { - "^2.9.30" = { - version = "2.10.2"; - pkg = self."bluebird-2.10.2"; - }; - }; - chalk = { - "^1.0.0" = { - version = "1.1.1"; - pkg = self."chalk-1.1.1"; - }; - }; - commander = { - "^2.8.1" = { - version = "2.9.0"; - pkg = self."commander-2.9.0"; - }; - }; - is-my-json-valid = { - "^2.12.0" = { - version = "2.12.3"; - pkg = self."is-my-json-valid-2.12.3"; - }; - }; - }; - meta = { - description = "Extremely fast HTTP Archive (HAR) validator using JSON Schema"; - homepage = https://github.com/ahmadnassri/har-validator; - license = "ISC"; - }; - production = true; - linkDependencies = false; - }; - "bluebird-2.10.2" = buildNodePackage { - name = "bluebird"; - version = "2.10.2"; - src = fetchurl { - url = "http://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz"; - sha1 = "024a5517295308857f14f91f1106fc3b555f446b"; - }; - meta = { - description = "Full featured Promises/A+ implementation with exceptionally good performance"; - homepage = https://github.com/petkaantonov/bluebird; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "bluebird-^2.9.30" = self."bluebird-2.10.2"; - "chalk-1.1.1" = buildNodePackage { - name = "chalk"; - version = "1.1.1"; - src = fetchurl { - url = "http://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz"; - sha1 = "509afb67066e7499f7eb3535c77445772ae2d019"; - }; - dependencies = { - ansi-styles = { - "^2.1.0" = { - version = "2.1.0"; - pkg = self."ansi-styles-2.1.0"; - }; - }; - escape-string-regexp = { - "^1.0.2" = { - version = "1.0.4"; - pkg = self."escape-string-regexp-1.0.4"; - }; - }; - has-ansi = { - "^2.0.0" = { - version = "2.0.0"; - pkg = self."has-ansi-2.0.0"; - }; - }; - strip-ansi = { - "^3.0.0" = { - version = "3.0.0"; - pkg = self."strip-ansi-3.0.0"; - }; - }; - supports-color = { - "^2.0.0" = { - version = "2.0.0"; - pkg = self."supports-color-2.0.0"; - }; - }; - }; - meta = { - description = "Terminal string styling done right. Much color"; - homepage = "https://github.com/chalk/chalk#readme"; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "ansi-styles-2.1.0" = buildNodePackage { - name = "ansi-styles"; - version = "2.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"; - sha1 = "990f747146927b559a932bf92959163d60c0d0e2"; - }; - meta = { - description = "ANSI escape codes for styling strings in the terminal"; - homepage = https://github.com/chalk/ansi-styles; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "ansi-styles-^2.1.0" = self."ansi-styles-2.1.0"; - "escape-string-regexp-1.0.4" = buildNodePackage { - name = "escape-string-regexp"; - version = "1.0.4"; - src = fetchurl { - url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.4.tgz"; - sha1 = "b85e679b46f72d03fbbe8a3bf7259d535c21b62f"; - }; - meta = { - description = "Escape RegExp special characters"; - homepage = https://github.com/sindresorhus/escape-string-regexp; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "escape-string-regexp-^1.0.2" = self."escape-string-regexp-1.0.4"; - "has-ansi-2.0.0" = buildNodePackage { - name = "has-ansi"; - version = "2.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; - }; - dependencies = { - ansi-regex = { - "^2.0.0" = { - version = "2.0.0"; - pkg = self."ansi-regex-2.0.0"; - }; - }; - }; - meta = { - description = "Check if a string has ANSI escape codes"; - homepage = https://github.com/sindresorhus/has-ansi; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "ansi-regex-2.0.0" = buildNodePackage { - name = "ansi-regex"; - version = "2.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"; - sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107"; - }; - meta = { - description = "Regular expression for matching ANSI escape codes"; - homepage = https://github.com/sindresorhus/ansi-regex; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "ansi-regex-^2.0.0" = self."ansi-regex-2.0.0"; - "has-ansi-^2.0.0" = self."has-ansi-2.0.0"; - "strip-ansi-3.0.0" = buildNodePackage { - name = "strip-ansi"; - version = "3.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz"; - sha1 = "7510b665567ca914ccb5d7e072763ac968be3724"; - }; - dependencies = { - ansi-regex = { - "^2.0.0" = { - version = "2.0.0"; - pkg = self."ansi-regex-2.0.0"; - }; - }; - }; - meta = { - description = "Strip ANSI escape codes"; - homepage = https://github.com/sindresorhus/strip-ansi; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "strip-ansi-^3.0.0" = self."strip-ansi-3.0.0"; - "supports-color-2.0.0" = buildNodePackage { - name = "supports-color"; - version = "2.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; - }; - meta = { - description = "Detect whether a terminal supports color"; - homepage = https://github.com/chalk/supports-color; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "supports-color-^2.0.0" = self."supports-color-2.0.0"; - "chalk-^1.0.0" = self."chalk-1.1.1"; - "commander-2.9.0" = buildNodePackage { - name = "commander"; - version = "2.9.0"; - src = fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; - }; - dependencies = { - graceful-readlink = { - ">= 1.0.0" = { - version = "1.0.1"; - pkg = self."graceful-readlink-1.0.1"; - }; - }; - }; - meta = { - description = "The complete solution for node.js command-line programs"; - homepage = "https://github.com/tj/commander.js#readme"; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "graceful-readlink-1.0.1" = buildNodePackage { - name = "graceful-readlink"; - version = "1.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; - }; - meta = { - description = "Graceful fs.readlink"; - homepage = https://github.com/zhiyelee/graceful-readlink; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "graceful-readlink->= 1.0.0" = self."graceful-readlink-1.0.1"; - "commander-^2.8.1" = self."commander-2.9.0"; - "is-my-json-valid-2.12.3" = buildNodePackage { - name = "is-my-json-valid"; - version = "2.12.3"; - src = fetchurl { - url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz"; - sha1 = "5a39d1d76b2dbb83140bbd157b1d5ee4bdc85ad6"; - }; - dependencies = { - generate-function = { - "^2.0.0" = { - version = "2.0.0"; - pkg = self."generate-function-2.0.0"; - }; - }; - generate-object-property = { - "^1.1.0" = { - version = "1.2.0"; - pkg = self."generate-object-property-1.2.0"; - }; - }; - jsonpointer = { - "2.0.0" = { - version = "2.0.0"; - pkg = self."jsonpointer-2.0.0"; - }; - }; - xtend = { - "^4.0.0" = { - version = "4.0.1"; - pkg = self."xtend-4.0.1"; - }; - }; - }; - meta = { - description = "A JSONSchema validator that uses code generation to be extremely fast"; - homepage = https://github.com/mafintosh/is-my-json-valid; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "generate-function-2.0.0" = buildNodePackage { - name = "generate-function"; - version = "2.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"; - sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74"; - }; - meta = { - description = "Module that helps you write generated functions in Node"; - homepage = https://github.com/mafintosh/generate-function; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "generate-function-^2.0.0" = self."generate-function-2.0.0"; - "generate-object-property-1.2.0" = buildNodePackage { - name = "generate-object-property"; - version = "1.2.0"; - src = fetchurl { - url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; - sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; - }; - dependencies = { - is-property = { - "^1.0.0" = { - version = "1.0.2"; - pkg = self."is-property-1.0.2"; - }; - }; - }; - meta = { - description = "Generate safe JS code that can used to reference a object property"; - homepage = https://github.com/mafintosh/generate-object-property; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "is-property-1.0.2" = buildNodePackage { - name = "is-property"; - version = "1.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"; - sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84"; - }; - dependencies = {}; - meta = { - description = "Tests if a JSON property can be accessed using . syntax"; - homepage = https://github.com/mikolalysenko/is-property; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "is-property-^1.0.0" = self."is-property-1.0.2"; - "generate-object-property-^1.1.0" = self."generate-object-property-1.2.0"; - "jsonpointer-2.0.0" = buildNodePackage { - name = "jsonpointer"; - version = "2.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"; - sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9"; - }; - meta = { - description = "Simple JSON Addressing"; - homepage = "https://github.com/janl/node-jsonpointer#readme"; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "xtend-4.0.1" = buildNodePackage { - name = "xtend"; - version = "4.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; - sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; - }; - dependencies = {}; - meta = { - description = "Extend like a boss"; - homepage = https://github.com/Raynos/xtend; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "xtend-^4.0.0" = self."xtend-4.0.1"; - "is-my-json-valid-^2.12.0" = self."is-my-json-valid-2.12.3"; - "har-validator-^1.6.1" = self."har-validator-1.8.0"; - "semver-5.0.1" = buildNodePackage { - name = "semver"; - version = "5.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-5.0.1.tgz"; - sha1 = "9fb3f4004f900d83c47968fe42f7583e05832cc9"; - }; - meta = { - description = "The semantic version parser used by npm"; - homepage = "https://github.com/npm/node-semver#readme"; - license = "ISC"; - }; - production = true; - linkDependencies = false; - }; - "temp-0.8.3" = buildNodePackage { - name = "temp"; - version = "0.8.3"; - src = fetchurl { - url = "http://registry.npmjs.org/temp/-/temp-0.8.3.tgz"; - sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59"; - }; - dependencies = { - os-tmpdir = { - "^1.0.0" = { - version = "1.0.1"; - pkg = self."os-tmpdir-1.0.1"; - }; - }; - rimraf = { - "~2.2.6" = { - version = "2.2.8"; - pkg = self."rimraf-2.2.8"; - }; - }; - }; - meta = { - description = "Temporary files and directories"; - homepage = https://github.com/bruce/node-temp; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "os-tmpdir-1.0.1" = buildNodePackage { - name = "os-tmpdir"; - version = "1.0.1"; - src = fetchurl { - url = "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"; - sha1 = "e9b423a1edaf479882562e92ed71d7743a071b6e"; - }; - meta = { - description = "Node.js os.tmpdir() ponyfill"; - homepage = https://github.com/sindresorhus/os-tmpdir; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "os-tmpdir-^1.0.0" = self."os-tmpdir-1.0.1"; - "rimraf-2.2.8" = buildNodePackage { - name = "rimraf"; - version = "2.2.8"; - src = fetchurl { - url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; - sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; - }; - meta = { - description = "A deep deletion module for node (like `rm -rf`)"; - homepage = https://github.com/isaacs/rimraf; - license = { - type = "MIT"; - url = "https://github.com/isaacs/rimraf/raw/master/LICENSE"; - }; - }; - production = true; - linkDependencies = false; - }; - "rimraf-~2.2.6" = self."rimraf-2.2.8"; - "wrench-1.5.8" = buildNodePackage { - name = "wrench"; - version = "1.5.8"; - src = fetchurl { - url = "http://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz"; - sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5"; - }; - dependencies = {}; - meta = { - description = "Recursive filesystem (and other) operations that Node *should* have"; - homepage = https://github.com/ryanmcgrath/wrench-js; - }; - production = true; - linkDependencies = false; - }; - "uglify-js-2.4.24" = buildNodePackage { - name = "uglify-js"; - version = "2.4.24"; - src = fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz"; - sha1 = "fad5755c1e1577658bb06ff9ab6e548c95bebd6e"; - }; - dependencies = { - async = { - "~0.2.6" = { - version = "0.2.10"; - pkg = self."async-0.2.10"; - }; - }; - source-map = { - "0.1.34" = { - version = "0.1.34"; - pkg = self."source-map-0.1.34"; - }; - }; - uglify-to-browserify = { - "~1.0.0" = { - version = "1.0.2"; - pkg = self."uglify-to-browserify-1.0.2"; - }; - }; - yargs = { - "~3.5.4" = { - version = "3.5.4"; - pkg = self."yargs-3.5.4"; - }; - }; - }; - meta = { - description = "JavaScript parser, mangler/compressor and beautifier toolkit"; - homepage = http://lisperator.net/uglifyjs; - license = "BSD"; - }; - production = true; - linkDependencies = false; - }; - "async-0.2.10" = buildNodePackage { - name = "async"; - version = "0.2.10"; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }; - meta = { - description = "Higher-order functions and common patterns for asynchronous code"; - }; - production = true; - linkDependencies = false; - }; - "async-~0.2.6" = self."async-0.2.10"; - "source-map-0.1.34" = buildNodePackage { - name = "source-map"; - version = "0.1.34"; - src = fetchurl { - url = "http://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz"; - sha1 = "a7cfe89aec7b1682c3b198d0acfb47d7d090566b"; - }; - dependencies = { - amdefine = { - ">=0.0.4" = { - version = "1.0.0"; - pkg = self."amdefine-1.0.0"; - }; - }; - }; - meta = { - description = "Generates and consumes source maps"; - homepage = https://github.com/mozilla/source-map; - }; - production = true; - linkDependencies = false; - }; - "uglify-to-browserify-1.0.2" = buildNodePackage { - name = "uglify-to-browserify"; - version = "1.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; - sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; - }; - dependencies = {}; - meta = { - description = "A transform to make UglifyJS work in browserify"; - homepage = https://github.com/ForbesLindesay/uglify-to-browserify; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "uglify-to-browserify-~1.0.0" = self."uglify-to-browserify-1.0.2"; - "yargs-3.5.4" = buildNodePackage { - name = "yargs"; - version = "3.5.4"; - src = fetchurl { - url = "http://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz"; - sha1 = "d8aff8f665e94c34bd259bdebd1bfaf0ddd35361"; - }; - dependencies = { - camelcase = { - "^1.0.2" = { - version = "1.2.1"; - pkg = self."camelcase-1.2.1"; - }; - }; - decamelize = { - "^1.0.0" = { - version = "1.1.2"; - pkg = self."decamelize-1.1.2"; - }; - }; - window-size = { - "0.1.0" = { - version = "0.1.0"; - pkg = self."window-size-0.1.0"; - }; - }; - wordwrap = { - "0.0.2" = { - version = "0.0.2"; - pkg = self."wordwrap-0.0.2"; - }; - }; - }; - meta = { - description = "Light-weight option parsing with an argv hash. No optstrings attached"; - homepage = https://github.com/bcoe/yargs; - license = "MIT/X11"; - }; - production = true; - linkDependencies = false; - }; - "camelcase-1.2.1" = buildNodePackage { - name = "camelcase"; - version = "1.2.1"; - src = fetchurl { - url = "http://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; - sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; - }; - meta = { - description = "Convert a dash/dot/underscore/space separated string to camelCase: foo-bar → fooBar"; - homepage = https://github.com/sindresorhus/camelcase; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "camelcase-^1.0.2" = self."camelcase-1.2.1"; - "decamelize-1.1.2" = buildNodePackage { - name = "decamelize"; - version = "1.1.2"; - src = fetchurl { - url = "http://registry.npmjs.org/decamelize/-/decamelize-1.1.2.tgz"; - sha1 = "dcc93727be209632e98b02718ef4cb79602322f2"; - }; - dependencies = { - escape-string-regexp = { - "^1.0.4" = { - version = "1.0.4"; - pkg = self."escape-string-regexp-1.0.4"; - }; - }; - }; - meta = { - description = "Convert a camelized string into a lowercased one with a custom separator: unicornRainbow → unicorn_rainbow"; - homepage = https://github.com/sindresorhus/decamelize; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "escape-string-regexp-^1.0.4" = self."escape-string-regexp-1.0.4"; - "decamelize-^1.0.0" = self."decamelize-1.1.2"; - "window-size-0.1.0" = buildNodePackage { - name = "window-size"; - version = "0.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; - sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; - }; - meta = { - description = "Reliable way to to get the height and width of the terminal/console in a node.js environment"; - homepage = https://github.com/jonschlinkert/window-size; - }; - production = true; - linkDependencies = false; - }; - "wordwrap-0.0.2" = buildNodePackage { - name = "wordwrap"; - version = "0.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; - }; - dependencies = {}; - meta = { - description = "Wrap those words. Show them at what columns to start and stop"; - license = "MIT/X11"; - }; - production = true; - linkDependencies = false; - }; - "yargs-~3.5.4" = self."yargs-3.5.4"; - "xmldom-0.1.19" = buildNodePackage { - name = "xmldom"; - version = "0.1.19"; - src = fetchurl { - url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz"; - sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc"; - }; - dependencies = {}; - meta = { - description = "A W3C Standard XML DOM(Level2 CORE) implementation and parser(DOMParser/XMLSerializer)"; - homepage = https://github.com/jindw/xmldom; - }; - production = true; - linkDependencies = false; - }; - "request-2.62.0" = buildNodePackage { - name = "request"; - version = "2.62.0"; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.62.0.tgz"; - sha1 = "55c165f702a146f1e21e0725c0b75e1136487b0f"; - }; - dependencies = { - bl = { - "~1.0.0" = { - version = "1.0.0"; - pkg = self."bl-1.0.0"; - }; - }; - caseless = { - "~0.11.0" = { - version = "0.11.0"; - pkg = self."caseless-0.11.0"; - }; - }; - extend = { - "~3.0.0" = { - version = "3.0.0"; - pkg = self."extend-3.0.0"; - }; - }; - forever-agent = { - "~0.6.0" = { - version = "0.6.1"; - pkg = self."forever-agent-0.6.1"; - }; - }; - form-data = { - "~1.0.0-rc1" = { - version = "1.0.0-rc3"; - pkg = self."form-data-1.0.0-rc3"; - }; - }; - json-stringify-safe = { - "~5.0.0" = { - version = "5.0.1"; - pkg = self."json-stringify-safe-5.0.1"; - }; - }; - mime-types = { - "~2.1.2" = { - version = "2.1.8"; - pkg = self."mime-types-2.1.8"; - }; - }; - node-uuid = { - "~1.4.0" = { - version = "1.4.7"; - pkg = self."node-uuid-1.4.7"; - }; - }; - qs = { - "~5.1.0" = { - version = "5.1.0"; - pkg = self."qs-5.1.0"; - }; - }; - tunnel-agent = { - "~0.4.0" = { - version = "0.4.2"; - pkg = self."tunnel-agent-0.4.2"; - }; - }; - tough-cookie = { - ">=0.12.0" = { - version = "2.2.1"; - pkg = self."tough-cookie-2.2.1"; - }; - }; - http-signature = { - "~0.11.0" = { - version = "0.11.0"; - pkg = self."http-signature-0.11.0"; - }; - }; - oauth-sign = { - "~0.8.0" = { - version = "0.8.0"; - pkg = self."oauth-sign-0.8.0"; - }; - }; - hawk = { - "~3.1.0" = { - version = "3.1.2"; - pkg = self."hawk-3.1.2"; - }; - }; - aws-sign2 = { - "~0.5.0" = { - version = "0.5.0"; - pkg = self."aws-sign2-0.5.0"; - }; - }; - stringstream = { - "~0.0.4" = { - version = "0.0.5"; - pkg = self."stringstream-0.0.5"; - }; - }; - combined-stream = { - "~1.0.1" = { - version = "1.0.5"; - pkg = self."combined-stream-1.0.5"; - }; - }; - isstream = { - "~0.1.1" = { - version = "0.1.2"; - pkg = self."isstream-0.1.2"; - }; - }; - har-validator = { - "^1.6.1" = { - version = "1.8.0"; - pkg = self."har-validator-1.8.0"; - }; - }; - }; - meta = { - description = "Simplified HTTP request client"; - homepage = "https://github.com/request/request#readme"; - license = "Apache-2.0"; - }; - production = true; - linkDependencies = false; - }; - "qs-5.1.0" = buildNodePackage { - name = "qs"; - version = "5.1.0"; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-5.1.0.tgz"; - sha1 = "4d932e5c7ea411cca76a312d39a606200fd50cd9"; - }; - dependencies = {}; - meta = { - description = "A querystring parser that supports nesting and arrays, with a depth limit"; - homepage = https://github.com/hapijs/qs; - license = "BSD-3-Clause"; - }; - production = true; - linkDependencies = false; - }; - "qs-~5.1.0" = self."qs-5.1.0"; - "semver-5.0.3" = buildNodePackage { - name = "semver"; - version = "5.0.3"; - src = fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-5.0.3.tgz"; - sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; - }; - meta = { - description = "The semantic version parser used by npm"; - homepage = "https://github.com/npm/node-semver#readme"; - license = "ISC"; - }; - production = true; - linkDependencies = false; - }; - "winston-1.0.2" = buildNodePackage { - name = "winston"; - version = "1.0.2"; - src = fetchurl { - url = "http://registry.npmjs.org/winston/-/winston-1.0.2.tgz"; - sha1 = "351c58e2323f8a4ca29a45195aa9aa3b4c35d76f"; - }; - dependencies = { - async = { - "~1.0.0" = { - version = "1.0.0"; - pkg = self."async-1.0.0"; - }; - }; - colors = { - "1.0.x" = { - version = "1.0.3"; - pkg = self."colors-1.0.3"; - }; - }; - cycle = { - "1.0.x" = { - version = "1.0.3"; - pkg = self."cycle-1.0.3"; - }; - }; - eyes = { - "0.1.x" = { - version = "0.1.8"; - pkg = self."eyes-0.1.8"; - }; - }; - isstream = { - "0.1.x" = { - version = "0.1.2"; - pkg = self."isstream-0.1.2"; - }; - }; - pkginfo = { - "0.3.x" = { - version = "0.3.1"; - pkg = self."pkginfo-0.3.1"; - }; - }; - stack-trace = { - "0.0.x" = { - version = "0.0.9"; - pkg = self."stack-trace-0.0.9"; - }; - }; - }; - meta = { - description = "A multi-transport async logging library for Node.js"; - homepage = "https://github.com/winstonjs/winston#readme"; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "async-1.0.0" = buildNodePackage { - name = "async"; - version = "1.0.0"; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-1.0.0.tgz"; - sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9"; - }; - meta = { - description = "Higher-order functions and common patterns for asynchronous code"; - homepage = "https://github.com/caolan/async#readme"; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "async-~1.0.0" = self."async-1.0.0"; - "colors-1.0.3" = buildNodePackage { - name = "colors"; - version = "1.0.3"; - src = fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; - sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; - }; - meta = { - description = "Get colors in your node.js console"; - homepage = https://github.com/Marak/colors.js; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "colors-1.0.x" = self."colors-1.0.3"; - "cycle-1.0.3" = buildNodePackage { - name = "cycle"; - version = "1.0.3"; - src = fetchurl { - url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; - sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; - }; - meta = { - description = "Decycle your json"; - homepage = https://github.com/douglascrockford/JSON-js; - }; - production = true; - linkDependencies = false; - }; - "cycle-1.0.x" = self."cycle-1.0.3"; - "eyes-0.1.8" = buildNodePackage { - name = "eyes"; - version = "0.1.8"; - src = fetchurl { - url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; - sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; - }; - meta = { - description = "A customizable value inspector"; - }; - production = true; - linkDependencies = false; - }; - "eyes-0.1.x" = self."eyes-0.1.8"; - "isstream-0.1.x" = self."isstream-0.1.2"; - "pkginfo-0.3.1" = buildNodePackage { - name = "pkginfo"; - version = "0.3.1"; - src = fetchurl { - url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"; - sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; - }; - meta = { - description = "An easy way to expose properties on a module from a package.json"; - homepage = "https://github.com/indexzero/node-pkginfo#readme"; - license = "MIT"; - }; - production = true; - linkDependencies = false; - }; - "pkginfo-0.3.x" = self."pkginfo-0.3.1"; - "stack-trace-0.0.9" = buildNodePackage { - name = "stack-trace"; - version = "0.0.9"; - src = fetchurl { - url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; - sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; - }; - dependencies = {}; - meta = { - description = "Get v8 stack traces as an array of CallSite objects"; - homepage = https://github.com/felixge/node-stack-trace; - }; - production = true; - linkDependencies = false; - }; - "stack-trace-0.0.x" = self."stack-trace-0.0.9"; - "winston-1.0.x" = self."winston-1.0.2"; - titanium = self."titanium-5.0.5"; - }; -in -registry \ No newline at end of file diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix index 579456188d0..ae7a16984b8 100644 --- a/pkgs/development/mobile/titaniumenv/default.nix +++ b/pkgs/development/mobile/titaniumenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686, xcodeVersion ? "7.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "5.1.2.GA"}: +{pkgs, pkgs_i686, xcodeVersion ? "7.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "5.2.3.GA"}: rec { androidenv = pkgs.androidenv; @@ -10,6 +10,7 @@ rec { titaniumsdk = let titaniumSdkFile = if tiVersion == "5.1.2.GA" then ./titaniumsdk-5.1.nix + else if tiVersion == "5.2.3.GA" then ./titaniumsdk-5.2.nix else throw "Titanium version not supported: "+tiVersion; in import titaniumSdkFile { @@ -17,8 +18,8 @@ rec { }; buildApp = import ./build-app.nix { - inherit (pkgs) stdenv python which jdk; - titanium = (import ./cli { inherit (pkgs.stdenv) system; }).titanium {}; + inherit (pkgs) stdenv python which jdk nodejs; + inherit (pkgs.nodePackages) titanium alloy; inherit (androidenv) androidsdk; inherit (xcodeenv) xcodewrapper; inherit titaniumsdk xcodeBaseDir; diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix index c2c12438b61..60b96548da4 100644 --- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix +++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix @@ -9,7 +9,7 @@ let src = fetchgit { url = https://github.com/appcelerator/KitchenSink.git; rev = "6e9f509069fafdebfa78e15b2d14f20a27a485cc"; - sha256 = "0370dc0ca78b96a7e0befbff9cb1c248695e1aff66aceea98043bbb16c5121e6"; + sha256 = "049cf0d9y0ivhsi35slx621z0wry4lqf76hw0ksb315i2713v347"; }; # Rename the bundle id to something else diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-5.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-5.2.nix new file mode 100644 index 00000000000..511e8f0301b --- /dev/null +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-5.2.nix @@ -0,0 +1,42 @@ +{stdenv, fetchurl, unzip, makeWrapper, python, jdk}: + +stdenv.mkDerivation { + name = "mobilesdk-5.2.3.GA"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { + url = http://builds.appcelerator.com/mobile/5_2_X/mobilesdk-5.2.3.v20160404160237-linux.zip; + sha256 = "1acvkj3nrkgf9ch4js0pnjnwq5x6ddc15pkcanshp1zlc41z16gj"; + } + else if stdenv.system == "x86_64-darwin" then fetchurl { + url = http://builds.appcelerator.com/mobile/5_2_X/mobilesdk-5.2.3.v20160404160237-osx.zip; + sha256 = "04l7mrwiy3il2kzxz6sbfmczkqlkcrnwwndfzi8h5dzgh1672b7d"; + } + else throw "Platform: ${stdenv.system} not supported!"; + + buildInputs = [ unzip makeWrapper ]; + + buildCommand = '' + mkdir -p $out + cd $out + (yes y | unzip $src) || true + + # Rename ugly version number + cd mobilesdk/* + mv * 5.2.3.GA + cd * + + # Hack to make dx.jar work with new build-tools + #sed -i -e "s|path.join(dir, 'platform-tools', 'lib', 'dx.jar')|path.join(dir, 'build-tools', 'android-6.0', 'lib', 'dx.jar')|" $out/mobilesdk/*/*/node_modules/titanium-sdk/lib/android.js + + # Patch some executables + + ${if stdenv.system == "i686-linux" then + '' + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32 + '' + else if stdenv.system == "x86_64-linux" then + '' + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64 + '' + else ""} + ''; +} diff --git a/pkgs/development/node-packages/README b/pkgs/development/node-packages/README new file mode 100644 index 00000000000..48354324a05 --- /dev/null +++ b/pkgs/development/node-packages/README @@ -0,0 +1,13 @@ +How to update the NPM packages +============================== +- Install node2nix: + +nix-env -f '' -iA node2nix + +- Modify node-packages.json, add, update or remove package entries + +- Run the script: + +sh generate.sh + +- Done! diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix new file mode 100644 index 00000000000..05c18f861a0 --- /dev/null +++ b/pkgs/development/node-packages/composition-v4.nix @@ -0,0 +1,16 @@ +# This file has been generated by node2nix 1.0.1. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}: + +let + nodeEnv = import ./node-env.nix { + inherit (pkgs) stdenv python utillinux runCommand writeTextFile; + inherit nodejs; + }; +in +import ./node-packages-v4.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} \ No newline at end of file diff --git a/pkgs/development/node-packages/composition-v5.nix b/pkgs/development/node-packages/composition-v5.nix new file mode 100644 index 00000000000..a1567025c7d --- /dev/null +++ b/pkgs/development/node-packages/composition-v5.nix @@ -0,0 +1,16 @@ +# This file has been generated by node2nix 1.0.1. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-5_x"}: + +let + nodeEnv = import ./node-env.nix { + inherit (pkgs) stdenv python utillinux runCommand writeTextFile; + inherit nodejs; + }; +in +import ./node-packages-v5.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} \ No newline at end of file diff --git a/pkgs/development/node-packages/default-v0_10.nix b/pkgs/development/node-packages/default-v0_10.nix new file mode 100644 index 00000000000..baaadb39160 --- /dev/null +++ b/pkgs/development/node-packages/default-v0_10.nix @@ -0,0 +1,33 @@ +{pkgs, system, nodejs}: + +let + nodePackages = import ./composition-v4.nix { + inherit pkgs system nodejs; + }; +in +nodePackages // { + node-inspector = nodePackages.node-inspector.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; + }); + + phantomjs = nodePackages.phantomjs.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; + }); + + webdrvr = nodePackages.webdrvr.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; + + preRebuild = '' + mkdir $TMPDIR/webdrvr + + ln -s ${pkgs.fetchurl { + url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar"; + sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b"; + }} $TMPDIR/webdrvr/selenium-server-standalone-2.43.1.jar + ln -s ${pkgs.fetchurl { + url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip"; + sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89"; + }} $TMPDIR/webdrvr/chromedriver_linux64.zip + ''; + }); +} diff --git a/pkgs/development/node-packages/default-v4.nix b/pkgs/development/node-packages/default-v4.nix new file mode 100644 index 00000000000..5d724034201 --- /dev/null +++ b/pkgs/development/node-packages/default-v4.nix @@ -0,0 +1,39 @@ +{pkgs, system, nodejs}: + +let + nodePackages = import ./composition-v4.nix { + inherit pkgs system nodejs; + }; +in +nodePackages // { + node-inspector = nodePackages.node-inspector.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; + }); + + phantomjs = nodePackages.phantomjs.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; + }); + + webdrvr = nodePackages.webdrvr.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; + + preRebuild = '' + mkdir $TMPDIR/webdrvr + + ln -s ${pkgs.fetchurl { + url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar"; + sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b"; + }} $TMPDIR/webdrvr/selenium-server-standalone-2.43.1.jar + ln -s ${pkgs.fetchurl { + url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip"; + sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89"; + }} $TMPDIR/webdrvr/chromedriver_linux64.zip + ''; + }); + + wring = nodePackages.wring.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; + }); + + npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0"; +} diff --git a/pkgs/development/node-packages/default-v5.nix b/pkgs/development/node-packages/default-v5.nix new file mode 100644 index 00000000000..c858c580d2a --- /dev/null +++ b/pkgs/development/node-packages/default-v5.nix @@ -0,0 +1,35 @@ +{pkgs, system, nodejs}: + +let + nodePackages = import ./composition-v5.nix { + inherit pkgs system nodejs; + }; +in +nodePackages // { + node-inspector = nodePackages.node-inspector.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; + }); + + phantomjs = nodePackages.phantomjs.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; + }); + + webdrvr = nodePackages.webdrvr.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; + + preRebuild = '' + mkdir $TMPDIR/webdrvr + + ln -s ${pkgs.fetchurl { + url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar"; + sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b"; + }} $TMPDIR/webdrvr/selenium-server-standalone-2.43.1.jar + ln -s ${pkgs.fetchurl { + url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip"; + sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89"; + }} $TMPDIR/webdrvr/chromedriver_linux64.zip + ''; + + dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. + }); +} diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix new file mode 100644 index 00000000000..c858c580d2a --- /dev/null +++ b/pkgs/development/node-packages/default-v6.nix @@ -0,0 +1,35 @@ +{pkgs, system, nodejs}: + +let + nodePackages = import ./composition-v5.nix { + inherit pkgs system nodejs; + }; +in +nodePackages // { + node-inspector = nodePackages.node-inspector.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; + }); + + phantomjs = nodePackages.phantomjs.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; + }); + + webdrvr = nodePackages.webdrvr.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ]; + + preRebuild = '' + mkdir $TMPDIR/webdrvr + + ln -s ${pkgs.fetchurl { + url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar"; + sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b"; + }} $TMPDIR/webdrvr/selenium-server-standalone-2.43.1.jar + ln -s ${pkgs.fetchurl { + url = "http://chromedriver.storage.googleapis.com/2.10/chromedriver_linux64.zip"; + sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89"; + }} $TMPDIR/webdrvr/chromedriver_linux64.zip + ''; + + dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. + }); +} diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh new file mode 100755 index 00000000000..385463423ea --- /dev/null +++ b/pkgs/development/node-packages/generate.sh @@ -0,0 +1,5 @@ +#!/bin/sh -e + +rm -f node-env.nix +node2nix -i node-packages.json -o node-packages-v4.nix -c composition-v4.nix +node2nix -5 -i node-packages.json -o node-packages-v5.nix -c composition-v5.nix diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix new file mode 100644 index 00000000000..29995f22e26 --- /dev/null +++ b/pkgs/development/node-packages/node-env.nix @@ -0,0 +1,293 @@ +# This file originates from node2nix + +{stdenv, python, nodejs, utillinux, runCommand, writeTextFile}: + +let + # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise + tarWrapper = runCommand "tarWrapper" {} '' + mkdir -p $out/bin + + cat > $out/bin/tar <> $out/nix-support/hydra-build-products + ''; + }; + + includeDependencies = {dependencies}: + stdenv.lib.optionalString (dependencies != []) + (stdenv.lib.concatMapStrings (dependency: + '' + # Bundle the dependencies of the package + mkdir -p node_modules + cd node_modules + + # Only include dependencies if they don't exist. They may also be bundled in the package. + if [ ! -e "${dependency.name}" ] + then + ${composePackage dependency} + fi + + cd .. + '' + ) dependencies); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + let + fixImpureDependencies = writeTextFile { + name = "fixDependencies.js"; + text = '' + var fs = require('fs'); + var url = require('url'); + + /* + * Replaces an impure version specification by * + */ + function replaceImpureVersionSpec(versionSpec) { + var parsedUrl = url.parse(versionSpec); + + if(versionSpec == "latest" || versionSpec == "unstable" || + versionSpec.substr(0, 2) == ".." || dependency.substr(0, 2) == "./" || dependency.substr(0, 2) == "~/" || dependency.substr(0, 1) == '/') + return '*'; + else if(parsedUrl.protocol == "git:" || parsedUrl.protocol == "git+ssh:" || parsedUrl.protocol == "git+http:" || parsedUrl.protocol == "git+https:" || + parsedUrl.protocol == "http:" || parsedUrl.protocol == "https:") + return '*'; + else + return versionSpec; + } + + var packageObj = JSON.parse(fs.readFileSync('./package.json')); + + /* Replace dependencies */ + if(packageObj.dependencies !== undefined) { + for(var dependency in packageObj.dependencies) { + var versionSpec = packageObj.dependencies[dependency]; + packageObj.dependencies[dependency] = replaceImpureVersionSpec(versionSpec); + } + } + + /* Replace development dependencies */ + if(packageObj.devDependencies !== undefined) { + for(var dependency in packageObj.devDependencies) { + var versionSpec = packageObj.devDependencies[dependency]; + packageObj.devDependencies[dependency] = replaceImpureVersionSpec(versionSpec); + } + } + + /* Replace optional dependencies */ + if(packageObj.optionalDependencies !== undefined) { + for(var dependency in packageObj.optionalDependencies) { + var versionSpec = packageObj.optionalDependencies[dependency]; + packageObj.optionalDependencies[dependency] = replaceImpureVersionSpec(versionSpec); + } + } + + /* Write the fixed JSON file */ + fs.writeFileSync("package.json", JSON.stringify(packageObj)); + ''; + }; + in + '' + DIR=$(pwd) + cd $TMPDIR + + unpackFile ${src} + + # Make the base dir in which the target dependency resides first + mkdir -p "$(dirname "$DIR/${packageName}")" + + if [ -f "${src}" ] + then + # Figure out what directory has been unpacked + packageDir=$(find . -type d -maxdepth 1 | tail -1) + + # Restore write permissions to make building work + find "$packageDir" -type d -print0 | xargs -0 chmod u+x + chmod -R u+w "$packageDir" + + # Move the extracted tarball into the output folder + mv "$packageDir" "$DIR/${packageName}" + elif [ -d "${src}" ] + then + # Restore write permissions to make building work + chmod -R u+w $strippedName + + # Move the extracted directory into the output folder + mv $strippedName "$DIR/${packageName}" + fi + + # Unset the stripped name to not confuse the next unpack step + unset strippedName + + # Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store. + # The following JavaScript replaces these by * to prevent that + cd "$DIR/${packageName}" + node ${fixImpureDependencies} + + # Include the dependencies of the package + ${includeDependencies { inherit dependencies; }} + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ''; + + # Extract the Node.js source code which is used to compile packages with + # native bindings + nodeSources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv node-* $out + ''; + + # Builds and composes an NPM package including all its dependencies + buildNodePackage = { name, packageName, version, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, preRebuild ? "", ... }@args: + + stdenv.lib.makeOverridable stdenv.mkDerivation (builtins.removeAttrs args [ "dependencies" ] // { + name = "node-${name}-${version}"; + buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or []; + dontStrip = args.dontStrip or true; # Striping may fail a build for some package deployments + + inherit dontNpmInstall preRebuild; + + unpackPhase = args.unpackPhase or "true"; + + buildPhase = args.buildPhase or "true"; + + compositionScript = composePackage args; + passAsFile = [ "compositionScript" ]; + + installPhase = args.installPhase or '' + # Create and enter a root node_modules/ folder + mkdir -p $out/lib/node_modules + cd $out/lib/node_modules + + # Compose the package and all its dependencies + source $compositionScriptPath + + # Patch the shebangs of the bundled modules to prevent them from + # calling executables outside the Nix store as much as possible + patchShebangs . + + # Deploy the Node.js package by running npm install. Since the + # dependencies have been provided already by ourselves, it should not + # attempt to install them again, which is good, because we want to make + # it Nix's responsibility. If it needs to install any dependencies + # anyway (e.g. because the dependency parameters are + # incomplete/incorrect), it fails. + # + # The other responsibilities of NPM are kept -- version checks, build + # steps, postprocessing etc. + + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild + npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + + if [ "$dontNpmInstall" != "1" ] + then + npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + fi + + # Create symlink to the deployed executable folder, if applicable + if [ -d "$out/lib/node_modules/.bin" ] + then + ln -s $out/lib/node_modules/.bin $out/bin + fi + + # Create symlinks to the deployed manual page folders, if applicable + if [ -d "$out/lib/node_modules/${packageName}/man" ] + then + mkdir -p $out/share + for dir in "$out/lib/node_modules/${packageName}/man/"* + do + mkdir -p $out/share/man/$(basename "$dir") + for page in "$dir"/* + do + ln -s $page $out/share/man/$(basename "$dir") + done + done + fi + ''; + }); + + # Builds a development shell + buildNodeShell = { name, packageName, version, src, dependencies ? [], production ? true, npmFlags ? "", dontNpmInstall ? false, ... }@args: + let + nodeDependencies = stdenv.mkDerivation { + name = "node-dependencies-${name}-${version}"; + + buildInputs = [ tarWrapper python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ args.buildInputs or []; + + includeScript = includeDependencies { inherit dependencies; }; + passAsFile = [ "includeScript" ]; + + buildCommand = '' + mkdir -p $out/lib + cd $out/lib + source $includeScriptPath + + # Create fake package.json to make the npm commands work properly + cat > package.json < $out/bin/shell < pygobject != null && pyGtkGlade != null; - -buildPythonApplication (rec { - name = "buildbot-0.8.12"; - namePrefix = ""; - - src = fetchurl { - url = "mirror://pypi/b/buildbot/${name}.tar.gz"; - sha256 = "1mn4h04sp6smr3ahqfflys15cpn13q9mfkapcs2jc4ppvxv6kdn6"; - }; - - patchPhase = - # The code insists on /usr/bin/tail, /usr/bin/make, etc. - '' echo "patching erroneous absolute path references..." - for i in $(find -name \*.py) - do - sed -i "$i" \ - -e "s|/usr/bin/python|$(type -P python)|g ; s|/usr/bin/||g" - done - - sed -i 's/==/>=/' setup.py - ''; - - propagatedBuildInputs = - [ twisted dateutil jinja2 sqlalchemy_migrate_0_7 - ] ++ stdenv.lib.optional enableDebugClient [ pygobject pyGtkGlade ]; - - # What's up with this?! 'trial' should be 'test', no? - # - # running tests - # usage: setup.py [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...] - # or: setup.py --help [cmd1 cmd2 ...] - # or: setup.py --help-commands - # or: setup.py cmd --help - # - # error: invalid command 'trial' - doCheck = false; - - postInstall = '' - mkdir -p "$out/share/man/man1" - cp docs/buildbot.1 "$out/share/man/man1" - ''; - - meta = with stdenv.lib; { - homepage = http://buildbot.net/; - license = stdenv.lib.licenses.gpl2Plus; - # Of course, we don't really need that on NixOS. :-) - description = "Continuous integration system that automates the build/test cycle"; - longDescription = - '' The BuildBot is a system to automate the compile/test cycle - required by most software projects to validate code changes. By - automatically rebuilding and testing the tree each time something - has changed, build problems are pinpointed quickly, before other - developers are inconvenienced by the failure. The guilty - developer can be identified and harassed without human - intervention. By running the builds on a variety of platforms, - developers who do not have the facilities to test their changes - everywhere before checkin will at least know shortly afterwards - whether they have broken the build or not. Warning counts, lint - checks, image size, compile time, and other build parameters can - be tracked over time, are more visible, and are therefore easier - to improve. - - The overall goal is to reduce tree breakage and provide a platform - to run tests or code-quality checks that are too annoying or - pedantic for any human to waste their time with. Developers get - immediate (and potentially public) feedback about their changes, - encouraging them to be more careful about testing before checking - in code. - ''; - maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix new file mode 100644 index 00000000000..177b7b3d946 --- /dev/null +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -0,0 +1,91 @@ +{ stdenv +, fetchurl +, pythonPackages +}: + +let + buildbot-pkg = pythonPackages.buildPythonPackage rec { + name = "buildbot-pkg-${version}"; + version = "0.9.0rc2"; + + src = fetchurl { + url = "https://pypi.python.org/packages/95/47/1fef931d410cc24127564c2e193e7c1c184f5c5f481930f77c6d6840cfab/${name}.tar.gz"; + sha256 = "01wc9bmqq1rfayqnjm7rkjhbcj7h6ah4vv10s6hglnq9s4axvxp6"; + }; + + propagatedBuildInputs = with pythonPackages; [ setuptools ]; + + # doesn't seem to break without this... + patchPhase = '' + sed -i.bak -e '/"setuptools >= 21.2.1",/d' setup.py + ''; + + meta = with stdenv.lib; { + homepage = http://buildbot.net/; + description = "Buildbot Packaging Helper"; + maintainers = with maintainers; [ nand0p ryansydnor ]; + platforms = platforms.all; + }; + }; + +in { + + www = pythonPackages.buildPythonPackage rec { + name = "buildbot_www-${version}"; + version = "0.9.0rc2"; + + # NOTE: wheel is used due to buildbot circular dependency + format = "wheel"; + src = fetchurl { + url = "https://pypi.python.org/packages/e0/d7/f1023cdb7340a15ee1fc9916e87c4d634405a87164a051e2c59bf9d51ef1/${name}-py2-none-any.whl"; + sha256 = "1006x56x4w4p2mbrzm7jy51c0xxz48lzhdwvx7j4hrjs07mapndj"; + }; + + propagatedBuildInputs = [ buildbot-pkg ]; + + meta = with stdenv.lib; { + homepage = http://buildbot.net/; + description = "Buildbot UI"; + maintainers = with maintainers; [ nand0p ryansydnor ]; + platforms = platforms.all; + }; + }; + + console-view = pythonPackages.buildPythonPackage rec { + name = "buildbot-console-view-${version}"; + version = "0.9.0rc2"; + + src = fetchurl { + url = "https://pypi.python.org/packages/f4/51/e24cc1b596e5b262a272cba3687476a13ec7d9ea24bf1f4fd0cd72902bb6/${name}.tar.gz"; + sha256 = "0970gq1sxnfd0nlrnd3mj25i3cginlw2pj5ffqsd57n5hlqg48ib"; + }; + + propagatedBuildInputs = [ buildbot-pkg ]; + + meta = with stdenv.lib; { + homepage = http://buildbot.net/; + description = "Buildbot Console View Plugin"; + maintainers = with maintainers; [ nand0p ryansydnor ]; + platforms = platforms.all; + }; + }; + + waterfall-view = pythonPackages.buildPythonPackage rec { + name = "buildbot-waterfall-view-${version}"; + version = "0.9.0rc2"; + + src = fetchurl { + url = "https://pypi.python.org/packages/c2/21/3895355b05f91977a8b8e5435f85354e927c2ef547a25432a6bacf792a67/${name}.tar.gz"; + sha256 = "1zybrbbsyplv93zkin8cb3z1bqqr6px4p203ldcpn7lds5s9vk00"; + }; + + propagatedBuildInputs = [ buildbot-pkg ]; + + meta = with stdenv.lib; { + homepage = http://buildbot.net/; + description = "Buildbot Waterfall View Plugin"; + maintainers = with maintainers; [ nand0p ryansydnor ]; + platforms = platforms.all; + }; + }; +} diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix new file mode 100644 index 00000000000..36b57a41aa7 --- /dev/null +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -0,0 +1,24 @@ +{ stdenv +, fetchurl +, pythonPackages +}: + +pythonPackages.buildPythonApplication (rec { + name = "buildbot-worker-${version}"; + version = "0.9.0rc2"; + + src = fetchurl { + url = "https://pypi.python.org/packages/6a/be/ae80e5e87bc92ac813cd944c08d3b6168090145fc168e7a553e88c07067a/${name}.tar.gz"; + sha256 = "19l28s2fyzln6nv2ypbdg11xiz7lrjy0n64fzhngfalv61x2bp8j"; + }; + + buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; + propagatedBuildInputs = with pythonPackages; [ twisted future ]; + + meta = with stdenv.lib; { + homepage = http://buildbot.net/; + description = "Buildbot Worker Daemon"; + maintainers = with maintainers; [ nand0p ryansydnor ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index 3191d8293ef..919c80e7ce5 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.cmake.org/; description = "Cross-Platform Makefile Generator"; - platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all; + platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ urkud mornfall ]; }; } diff --git a/pkgs/development/tools/kube-aws/default.nix b/pkgs/development/tools/kube-aws/default.nix new file mode 100644 index 00000000000..0a6d0ba3221 --- /dev/null +++ b/pkgs/development/tools/kube-aws/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchFromGitHub, buildGoPackage }: + +with lib; + +buildGoPackage rec { + name = "kube-aws-${version}"; + version = "0.8.1"; + + goPackagePath = "github.com/coreos/coreos-kubernetes"; + + src = fetchFromGitHub { + owner = "coreos"; + repo = "coreos-kubernetes"; + rev = "v${version}"; + sha256 = "067nc525km0f37w5km44fs5pr22a6zz3lkdwwg2akb4hhg6f45c2"; + }; + + preBuild = '' + (cd go/src/github.com/coreos/coreos-kubernetes + go generate multi-node/aws/pkg/config/config.go) + ''; + + meta = { + description = "Tool for deploying kubernetes on aws using coreos"; + license = licenses.asl20; + homepage = https://github.com/coreos/coreos-kubernetes; + maintainers = with maintainers; [offline]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/tools/node-webkit/nw11.nix b/pkgs/development/tools/node-webkit/nw11.nix index 2fe1ddf42d4..925c32bd65d 100644 --- a/pkgs/development/tools/node-webkit/nw11.nix +++ b/pkgs/development/tools/node-webkit/nw11.nix @@ -15,6 +15,8 @@ let xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap libnotify ]; + + extraOutputsToInstall = [ "lib" "out" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/node-webkit/nw9.nix b/pkgs/development/tools/node-webkit/nw9.nix index d8601865c6d..ad2cda34cd8 100644 --- a/pkgs/development/tools/node-webkit/nw9.nix +++ b/pkgs/development/tools/node-webkit/nw9.nix @@ -13,6 +13,8 @@ let xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc.cc xorg.libXtst xorg.libXi ]; + + extraOutputsToInstall = [ "lib" "out" ]; }; in stdenv.mkDerivation rec { diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 5b8c13e3baf..7e8e2092ceb 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -5,9 +5,9 @@ stdenv.mkDerivation rec { name = "packer-${version}"; version = "0.10.1"; - src = import ./deps.nix { + src = (import ./deps.nix { inherit stdenv lib gox gotools buildGoPackage fetchgit fetchhg fetchbzr fetchsvn; - }; + }).out; buildInputs = [ src.go gox gotools ]; diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix index 180fed4e897..03cbf74cbad 100644 --- a/pkgs/development/web/remarkjs/default.nix +++ b/pkgs/development/web/remarkjs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, fetchurl, nodejs, nodePackages }: +{ stdenv, lib, fetchgit, fetchurl, nodejs, phantomjs2, pkgs }: with lib; @@ -10,6 +10,11 @@ let rev = "10b9500b67983f0a9c42d8ce8bf8e8c469f7078c"; sha256 = "1yy8by15kfklw8lwh17z1swpj067q0skjjih12yawbryraig41m0"; }; + + nodePackages = import ./nodepkgs.nix { + inherit pkgs; + inherit (stdenv) system; + }; in stdenv.mkDerivation rec { name = "remarkjs-${version}"; @@ -21,20 +26,18 @@ in stdenv.mkDerivation rec { sha256 = "1a2il6aa0g9cnig56ykmq8lr626pbxlsllk6js41h6gcn214rw60"; }; - buildInputs = with nodePackages; [ - nodejs + buildInputs = [ nodejs phantomjs2 ] ++ (with nodePackages; [ marked browserify uglify-js less mocha - mocha-phantomjs - phantomjs + #mocha-phantomjs should sinon jshint shelljs - ]; + ]); configurePhase = '' mkdir -p node_modules/.bin diff --git a/pkgs/development/web/remarkjs/generate.sh b/pkgs/development/web/remarkjs/generate.sh new file mode 100644 index 00000000000..63d43c6773f --- /dev/null +++ b/pkgs/development/web/remarkjs/generate.sh @@ -0,0 +1,3 @@ +#!/bin/sh -e + +node2nix -i pkgs.json -c nodepkgs.nix -e ../../node-packages/node-env.nix diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix new file mode 100644 index 00000000000..f6b9f901ec8 --- /dev/null +++ b/pkgs/development/web/remarkjs/node-packages.nix @@ -0,0 +1,2954 @@ +# This file has been generated by node2nix 1.0.1. Do not edit! + +{nodeEnv, fetchurl, fetchgit}: + +let + sources = { + "JSONStream-1.1.4" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.4.tgz"; + sha1 = "be11a495938e882d277773d11986f3974a8ba37a"; + }; + }; + "assert-1.3.0" = { + name = "assert"; + packageName = "assert"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz"; + sha1 = "03939a622582a812cc202320a0b9a56c9b815849"; + }; + }; + "browser-pack-6.0.1" = { + name = "browser-pack"; + packageName = "browser-pack"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.1.tgz"; + sha1 = "779887c792eaa1f64a46a22c8f1051cdcd96755f"; + }; + }; + "browser-resolve-1.11.2" = { + name = "browser-resolve"; + packageName = "browser-resolve"; + version = "1.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.2.tgz"; + sha1 = "8ff09b0a2c421718a1051c260b32e48f442938ce"; + }; + }; + "browserify-zlib-0.1.4" = { + name = "browserify-zlib"; + packageName = "browserify-zlib"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"; + sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; + }; + }; + "buffer-4.9.1" = { + name = "buffer"; + packageName = "buffer"; + version = "4.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; + sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; + }; + }; + "concat-stream-1.5.2" = { + name = "concat-stream"; + packageName = "concat-stream"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.2.tgz"; + sha1 = "708978624d856af41a5a741defdd261da752c266"; + }; + }; + "console-browserify-1.1.0" = { + name = "console-browserify"; + packageName = "console-browserify"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz"; + sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10"; + }; + }; + "constants-browserify-1.0.0" = { + name = "constants-browserify"; + packageName = "constants-browserify"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz"; + sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; + }; + }; + "crypto-browserify-3.11.0" = { + name = "crypto-browserify"; + packageName = "crypto-browserify"; + version = "3.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz"; + sha1 = "3652a0906ab9b2a7e0c3ce66a408e957a2485522"; + }; + }; + "defined-1.0.0" = { + name = "defined"; + packageName = "defined"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz"; + sha1 = "c98d9bcef75674188e110969151199e39b1fa693"; + }; + }; + "deps-sort-2.0.0" = { + name = "deps-sort"; + packageName = "deps-sort"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz"; + sha1 = "091724902e84658260eb910748cccd1af6e21fb5"; + }; + }; + "domain-browser-1.1.7" = { + name = "domain-browser"; + packageName = "domain-browser"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz"; + sha1 = "867aa4b093faa05f1de08c06f4d7b21fdf8698bc"; + }; + }; + "duplexer2-0.1.4" = { + name = "duplexer2"; + packageName = "duplexer2"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz"; + sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; + }; + }; + "events-1.1.1" = { + name = "events"; + packageName = "events"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/events/-/events-1.1.1.tgz"; + sha1 = "9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"; + }; + }; + "glob-5.0.15" = { + name = "glob"; + packageName = "glob"; + version = "5.0.15"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"; + sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"; + }; + }; + "has-1.0.1" = { + name = "has"; + packageName = "has"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz"; + sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28"; + }; + }; + "htmlescape-1.1.1" = { + name = "htmlescape"; + packageName = "htmlescape"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz"; + sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; + }; + }; + "https-browserify-0.0.1" = { + name = "https-browserify"; + packageName = "https-browserify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz"; + sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82"; + }; + }; + "inherits-2.0.1" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + }; + "insert-module-globals-7.0.1" = { + name = "insert-module-globals"; + packageName = "insert-module-globals"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.1.tgz"; + sha1 = "c03bf4e01cb086d5b5e5ace8ad0afe7889d638c3"; + }; + }; + "labeled-stream-splicer-2.0.0" = { + name = "labeled-stream-splicer"; + packageName = "labeled-stream-splicer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz"; + sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59"; + }; + }; + "module-deps-4.0.7" = { + name = "module-deps"; + packageName = "module-deps"; + version = "4.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/module-deps/-/module-deps-4.0.7.tgz"; + sha1 = "edfeb3937be7359bc14a6672c22ef124887f6ed2"; + }; + }; + "os-browserify-0.1.2" = { + name = "os-browserify"; + packageName = "os-browserify"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"; + sha1 = "49ca0293e0b19590a5f5de10c7f265a617d8fe54"; + }; + }; + "parents-1.0.1" = { + name = "parents"; + packageName = "parents"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz"; + sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; + }; + }; + "path-browserify-0.0.0" = { + name = "path-browserify"; + packageName = "path-browserify"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"; + sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a"; + }; + }; + "process-0.11.9" = { + name = "process"; + packageName = "process"; + version = "0.11.9"; + src = fetchurl { + url = "https://registry.npmjs.org/process/-/process-0.11.9.tgz"; + sha1 = "7bd5ad21aa6253e7da8682264f1e11d11c0318c1"; + }; + }; + "punycode-1.4.1" = { + name = "punycode"; + packageName = "punycode"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; + sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + }; + }; + "querystring-es3-0.2.1" = { + name = "querystring-es3"; + packageName = "querystring-es3"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"; + sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; + }; + }; + "read-only-stream-2.0.0" = { + name = "read-only-stream"; + packageName = "read-only-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz"; + sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0"; + }; + }; + "readable-stream-2.1.5" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"; + sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; + }; + }; + "resolve-1.1.7" = { + name = "resolve"; + packageName = "resolve"; + version = "1.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"; + sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b"; + }; + }; + "shasum-1.0.2" = { + name = "shasum"; + packageName = "shasum"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz"; + sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f"; + }; + }; + "shell-quote-1.6.1" = { + name = "shell-quote"; + packageName = "shell-quote"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz"; + sha1 = "f4781949cce402697127430ea3b3c5476f481767"; + }; + }; + "stream-browserify-2.0.1" = { + name = "stream-browserify"; + packageName = "stream-browserify"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz"; + sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; + }; + }; + "stream-http-2.3.1" = { + name = "stream-http"; + packageName = "stream-http"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.3.1.tgz"; + sha1 = "7e1dc87102c3e31b32e660f04ca31f23ddbd1d52"; + }; + }; + "string_decoder-0.10.31" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + }; + "subarg-1.0.0" = { + name = "subarg"; + packageName = "subarg"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz"; + sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2"; + }; + }; + "syntax-error-1.1.6" = { + name = "syntax-error"; + packageName = "syntax-error"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.6.tgz"; + sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710"; + }; + }; + "through2-2.0.1" = { + name = "through2"; + packageName = "through2"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz"; + sha1 = "384e75314d49f32de12eebb8136b8eb6b5d59da9"; + }; + }; + "timers-browserify-1.4.2" = { + name = "timers-browserify"; + packageName = "timers-browserify"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz"; + sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d"; + }; + }; + "tty-browserify-0.0.0" = { + name = "tty-browserify"; + packageName = "tty-browserify"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"; + sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; + }; + }; + "url-0.11.0" = { + name = "url"; + packageName = "url"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz"; + sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + }; + }; + "util-0.10.3" = { + name = "util"; + packageName = "util"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz"; + sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + }; + }; + "vm-browserify-0.0.4" = { + name = "vm-browserify"; + packageName = "vm-browserify"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz"; + sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"; + }; + }; + "xtend-4.0.1" = { + name = "xtend"; + packageName = "xtend"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; + sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + }; + }; + "jsonparse-1.2.0" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz"; + sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; + }; + }; + "through-2.3.8" = { + name = "through"; + packageName = "through"; + version = "2.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; + sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + }; + }; + "combine-source-map-0.7.2" = { + name = "combine-source-map"; + packageName = "combine-source-map"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.2.tgz"; + sha1 = "0870312856b307a87cc4ac486f3a9a62aeccc09e"; + }; + }; + "umd-3.0.1" = { + name = "umd"; + packageName = "umd"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz"; + sha1 = "8ae556e11011f63c2596708a8837259f01b3d60e"; + }; + }; + "convert-source-map-1.1.3" = { + name = "convert-source-map"; + packageName = "convert-source-map"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz"; + sha1 = "4829c877e9fe49b3161f3bf3673888e204699860"; + }; + }; + "inline-source-map-0.6.2" = { + name = "inline-source-map"; + packageName = "inline-source-map"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz"; + sha1 = "f9393471c18a79d1724f863fa38b586370ade2a5"; + }; + }; + "lodash.memoize-3.0.4" = { + name = "lodash.memoize"; + packageName = "lodash.memoize"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz"; + sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"; + }; + }; + "source-map-0.5.6" = { + name = "source-map"; + packageName = "source-map"; + version = "0.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"; + sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; + }; + }; + "pako-0.2.9" = { + name = "pako"; + packageName = "pako"; + version = "0.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz"; + sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; + }; + }; + "base64-js-1.1.2" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz"; + sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; + }; + }; + "ieee754-1.1.6" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.6.tgz"; + sha1 = "2e1013219c6d6712973ec54d981ec19e5579de97"; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "typedarray-0.0.6" = { + name = "typedarray"; + packageName = "typedarray"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; + sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + }; + }; + "readable-stream-2.0.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; + sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "process-nextick-args-1.0.7" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; + sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "date-now-0.1.4" = { + name = "date-now"; + packageName = "date-now"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"; + sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; + }; + }; + "browserify-cipher-1.0.0" = { + name = "browserify-cipher"; + packageName = "browserify-cipher"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz"; + sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a"; + }; + }; + "browserify-sign-4.0.0" = { + name = "browserify-sign"; + packageName = "browserify-sign"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.0.tgz"; + sha1 = "10773910c3c206d5420a46aad8694f820b85968f"; + }; + }; + "create-ecdh-4.0.0" = { + name = "create-ecdh"; + packageName = "create-ecdh"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz"; + sha1 = "888c723596cdf7612f6498233eebd7a35301737d"; + }; + }; + "create-hash-1.1.2" = { + name = "create-hash"; + packageName = "create-hash"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz"; + sha1 = "51210062d7bb7479f6c65bb41a92208b1d61abad"; + }; + }; + "create-hmac-1.1.4" = { + name = "create-hmac"; + packageName = "create-hmac"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.4.tgz"; + sha1 = "d3fb4ba253eb8b3f56e39ea2fbcb8af747bd3170"; + }; + }; + "diffie-hellman-5.0.2" = { + name = "diffie-hellman"; + packageName = "diffie-hellman"; + version = "5.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz"; + sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; + }; + }; + "pbkdf2-3.0.4" = { + name = "pbkdf2"; + packageName = "pbkdf2"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz"; + sha1 = "12c8bfaf920543786a85150b03f68d5f1aa982fc"; + }; + }; + "public-encrypt-4.0.0" = { + name = "public-encrypt"; + packageName = "public-encrypt"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz"; + sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6"; + }; + }; + "randombytes-2.0.3" = { + name = "randombytes"; + packageName = "randombytes"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.3.tgz"; + sha1 = "674c99760901c3c4112771a31e521dc349cc09ec"; + }; + }; + "browserify-aes-1.0.6" = { + name = "browserify-aes"; + packageName = "browserify-aes"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz"; + sha1 = "5e7725dbdef1fd5930d4ebab48567ce451c48a0a"; + }; + }; + "browserify-des-1.0.0" = { + name = "browserify-des"; + packageName = "browserify-des"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz"; + sha1 = "daa277717470922ed2fe18594118a175439721dd"; + }; + }; + "evp_bytestokey-1.0.0" = { + name = "evp_bytestokey"; + packageName = "evp_bytestokey"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"; + sha1 = "497b66ad9fef65cd7c08a6180824ba1476b66e53"; + }; + }; + "buffer-xor-1.0.3" = { + name = "buffer-xor"; + packageName = "buffer-xor"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"; + sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; + }; + }; + "cipher-base-1.0.2" = { + name = "cipher-base"; + packageName = "cipher-base"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"; + sha1 = "54ac1d1ebdf6a1bcd3559e6f369d72697f2cab8f"; + }; + }; + "des.js-1.0.0" = { + name = "des.js"; + packageName = "des.js"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz"; + sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; + }; + }; + "minimalistic-assert-1.0.0" = { + name = "minimalistic-assert"; + packageName = "minimalistic-assert"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"; + sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3"; + }; + }; + "bn.js-4.11.6" = { + name = "bn.js"; + packageName = "bn.js"; + version = "4.11.6"; + src = fetchurl { + url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz"; + sha1 = "53344adb14617a13f6e8dd2ce28905d1c0ba3215"; + }; + }; + "browserify-rsa-4.0.1" = { + name = "browserify-rsa"; + packageName = "browserify-rsa"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"; + sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; + }; + }; + "elliptic-6.3.1" = { + name = "elliptic"; + packageName = "elliptic"; + version = "6.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.1.tgz"; + sha1 = "17781f2109ab0ec686b146bdcff5d2e8c6aeceda"; + }; + }; + "parse-asn1-5.0.0" = { + name = "parse-asn1"; + packageName = "parse-asn1"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz"; + sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23"; + }; + }; + "brorand-1.0.5" = { + name = "brorand"; + packageName = "brorand"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"; + sha1 = "07b54ca30286abd1718a0e2a830803efdc9bfa04"; + }; + }; + "hash.js-1.0.3" = { + name = "hash.js"; + packageName = "hash.js"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"; + sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; + }; + }; + "asn1.js-4.8.0" = { + name = "asn1.js"; + packageName = "asn1.js"; + version = "4.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.8.0.tgz"; + sha1 = "e0e04e9923319163be46aed9e5378973b161ef13"; + }; + }; + "ripemd160-1.0.1" = { + name = "ripemd160"; + packageName = "ripemd160"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz"; + sha1 = "93a4bbd4942bc574b69a8fa57c71de10ecca7d6e"; + }; + }; + "sha.js-2.4.5" = { + name = "sha.js"; + packageName = "sha.js"; + version = "2.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz"; + sha1 = "27d171efcc82a118b99639ff581660242b506e7c"; + }; + }; + "miller-rabin-4.0.0" = { + name = "miller-rabin"; + packageName = "miller-rabin"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz"; + sha1 = "4a62fb1d42933c05583982f4c716f6fb9e6c6d3d"; + }; + }; + "inflight-1.0.5" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz"; + sha1 = "db3204cd5a9de2e6cd890b85c6e2f66bcf4f620a"; + }; + }; + "minimatch-3.0.3" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz"; + sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774"; + }; + }; + "once-1.3.3" = { + name = "once"; + packageName = "once"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; + sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; + }; + }; + "path-is-absolute-1.0.0" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"; + sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "brace-expansion-1.1.6" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"; + sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9"; + }; + }; + "balanced-match-0.4.2" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"; + sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838"; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "function-bind-1.1.0" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz"; + sha1 = "16176714c801798e4e8f2cf7f7529467bb4a5771"; + }; + }; + "is-buffer-1.1.4" = { + name = "is-buffer"; + packageName = "is-buffer"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz"; + sha1 = "cfc86ccd5dc5a52fa80489111c6920c457e2d98b"; + }; + }; + "lexical-scope-1.2.0" = { + name = "lexical-scope"; + packageName = "lexical-scope"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz"; + sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4"; + }; + }; + "astw-2.0.0" = { + name = "astw"; + packageName = "astw"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/astw/-/astw-2.0.0.tgz"; + sha1 = "08121ac8288d35611c0ceec663f6cd545604897d"; + }; + }; + "acorn-1.2.2" = { + name = "acorn"; + packageName = "acorn"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"; + sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014"; + }; + }; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; + "stream-splicer-2.0.0" = { + name = "stream-splicer"; + packageName = "stream-splicer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz"; + sha1 = "1b63be438a133e4b671cc1935197600175910d83"; + }; + }; + "detective-4.3.1" = { + name = "detective"; + packageName = "detective"; + version = "4.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective/-/detective-4.3.1.tgz"; + sha1 = "9fb06dd1ee8f0ea4dbcc607cda39d9ce1d4f726f"; + }; + }; + "stream-combiner2-1.1.1" = { + name = "stream-combiner2"; + packageName = "stream-combiner2"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz"; + sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; + }; + }; + "path-platform-0.11.15" = { + name = "path-platform"; + packageName = "path-platform"; + version = "0.11.15"; + src = fetchurl { + url = "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz"; + sha1 = "e864217f74c36850f0852b78dc7bf7d4a5721bf2"; + }; + }; + "buffer-shims-1.0.0" = { + name = "buffer-shims"; + packageName = "buffer-shims"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"; + sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; + }; + }; + "json-stable-stringify-0.0.1" = { + name = "json-stable-stringify"; + packageName = "json-stable-stringify"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz"; + sha1 = "611c23e814db375527df851193db59dd2af27f45"; + }; + }; + "jsonify-0.0.0" = { + name = "jsonify"; + packageName = "jsonify"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; + sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; + }; + }; + "array-filter-0.0.1" = { + name = "array-filter"; + packageName = "array-filter"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz"; + sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec"; + }; + }; + "array-reduce-0.0.0" = { + name = "array-reduce"; + packageName = "array-reduce"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz"; + sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b"; + }; + }; + "array-map-0.0.0" = { + name = "array-map"; + packageName = "array-map"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz"; + sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662"; + }; + }; + "builtin-status-codes-2.0.0" = { + name = "builtin-status-codes"; + packageName = "builtin-status-codes"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-2.0.0.tgz"; + sha1 = "6f22003baacf003ccd287afe6872151fddc58579"; + }; + }; + "to-arraybuffer-1.0.1" = { + name = "to-arraybuffer"; + packageName = "to-arraybuffer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"; + sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; + }; + }; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + }; + "acorn-2.7.0" = { + name = "acorn"; + packageName = "acorn"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz"; + sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7"; + }; + }; + "punycode-1.3.2" = { + name = "punycode"; + packageName = "punycode"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; + sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + }; + }; + "querystring-0.2.0" = { + name = "querystring"; + packageName = "querystring"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; + sha1 = "b209849203bb25df820da756e747005878521620"; + }; + }; + "indexof-0.0.1" = { + name = "indexof"; + packageName = "indexof"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; + sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; + }; + }; + "async-0.2.10" = { + name = "async"; + packageName = "async"; + version = "0.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + }; + }; + "uglify-to-browserify-1.0.2" = { + name = "uglify-to-browserify"; + packageName = "uglify-to-browserify"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; + sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; + }; + }; + "yargs-3.10.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; + sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; + }; + }; + "camelcase-1.2.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; + sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; + }; + }; + "cliui-2.1.0" = { + name = "cliui"; + packageName = "cliui"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; + sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "window-size-0.1.0" = { + name = "window-size"; + packageName = "window-size"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; + sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; + }; + }; + "center-align-0.1.3" = { + name = "center-align"; + packageName = "center-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; + sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; + }; + }; + "right-align-0.1.3" = { + name = "right-align"; + packageName = "right-align"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; + sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; + }; + }; + "wordwrap-0.0.2" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; + sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; + }; + }; + "align-text-0.1.4" = { + name = "align-text"; + packageName = "align-text"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; + sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; + }; + }; + "lazy-cache-1.0.4" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; + sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; + }; + }; + "kind-of-3.0.4" = { + name = "kind-of"; + packageName = "kind-of"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz"; + sha1 = "7b8ecf18a4e17f8269d73b501c9f232c96887a74"; + }; + }; + "longest-1.0.1" = { + name = "longest"; + packageName = "longest"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; + sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; + }; + }; + "repeat-string-1.5.4" = { + name = "repeat-string"; + packageName = "repeat-string"; + version = "1.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.4.tgz"; + sha1 = "64ec0c91e0f4b475f90d5b643651e3e6e5b6c2d5"; + }; + }; + "errno-0.1.4" = { + name = "errno"; + packageName = "errno"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz"; + sha1 = "b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"; + }; + }; + "graceful-fs-4.1.6" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.6.tgz"; + sha1 = "514c38772b31bee2e08bedc21a0aeb3abf54c19e"; + }; + }; + "image-size-0.5.0" = { + name = "image-size"; + packageName = "image-size"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/image-size/-/image-size-0.5.0.tgz"; + sha1 = "be7aed1c37b5ac3d9ba1d66a24b4c47ff8397651"; + }; + }; + "mime-1.3.4" = { + name = "mime"; + packageName = "mime"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; + sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "promise-7.1.1" = { + name = "promise"; + packageName = "promise"; + version = "7.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz"; + sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf"; + }; + }; + "prr-0.0.0" = { + name = "prr"; + packageName = "prr"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"; + sha1 = "1a84b85908325501411853d0081ee3fa86e2926a"; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "asap-2.0.4" = { + name = "asap"; + packageName = "asap"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/asap/-/asap-2.0.4.tgz"; + sha1 = "b391bf7f6bfbc65706022fec8f49c4b07fecf589"; + }; + }; + "browser-stdout-1.3.0" = { + name = "browser-stdout"; + packageName = "browser-stdout"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz"; + sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; + }; + }; + "commander-2.9.0" = { + name = "commander"; + packageName = "commander"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; + sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + }; + }; + "debug-2.2.0" = { + name = "debug"; + packageName = "debug"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + }; + }; + "diff-1.4.0" = { + name = "diff"; + packageName = "diff"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"; + sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; + }; + }; + "escape-string-regexp-1.0.5" = { + name = "escape-string-regexp"; + packageName = "escape-string-regexp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "glob-7.0.5" = { + name = "glob"; + packageName = "glob"; + version = "7.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz"; + sha1 = "b4202a69099bbb4d292a7c1b95b6682b67ebdc95"; + }; + }; + "growl-1.9.2" = { + name = "growl"; + packageName = "growl"; + version = "1.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz"; + sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f"; + }; + }; + "json3-3.3.2" = { + name = "json3"; + packageName = "json3"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz"; + sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1"; + }; + }; + "lodash.create-3.1.1" = { + name = "lodash.create"; + packageName = "lodash.create"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz"; + sha1 = "d7f2849f0dbda7e04682bb8cd72ab022461debe7"; + }; + }; + "supports-color-3.1.2" = { + name = "supports-color"; + packageName = "supports-color"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"; + sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"; + }; + }; + "graceful-readlink-1.0.1" = { + name = "graceful-readlink"; + packageName = "graceful-readlink"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; + sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + }; + }; + "ms-0.7.1" = { + name = "ms"; + packageName = "ms"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "lodash._baseassign-3.2.0" = { + name = "lodash._baseassign"; + packageName = "lodash._baseassign"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"; + sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e"; + }; + }; + "lodash._basecreate-3.0.3" = { + name = "lodash._basecreate"; + packageName = "lodash._basecreate"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz"; + sha1 = "1bc661614daa7fc311b7d03bf16806a0213cf821"; + }; + }; + "lodash._isiterateecall-3.0.9" = { + name = "lodash._isiterateecall"; + packageName = "lodash._isiterateecall"; + version = "3.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"; + sha1 = "5203ad7ba425fae842460e696db9cf3e6aac057c"; + }; + }; + "lodash._basecopy-3.0.1" = { + name = "lodash._basecopy"; + packageName = "lodash._basecopy"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"; + sha1 = "8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"; + }; + }; + "lodash.keys-3.1.2" = { + name = "lodash.keys"; + packageName = "lodash.keys"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz"; + sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a"; + }; + }; + "lodash._getnative-3.9.1" = { + name = "lodash._getnative"; + packageName = "lodash._getnative"; + version = "3.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"; + sha1 = "570bc7dede46d61cdcde687d65d3eecbaa3aaff5"; + }; + }; + "lodash.isarguments-3.1.0" = { + name = "lodash.isarguments"; + packageName = "lodash.isarguments"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"; + sha1 = "2f573d85c6a24289ff00663b491c1d338ff3458a"; + }; + }; + "lodash.isarray-3.0.4" = { + name = "lodash.isarray"; + packageName = "lodash.isarray"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"; + sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55"; + }; + }; + "has-flag-1.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"; + sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; + }; + }; + "phantomjs-1.9.7-15" = { + name = "phantomjs"; + packageName = "phantomjs"; + version = "1.9.7-15"; + src = fetchurl { + url = "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-15.tgz"; + sha1 = "0b3a7ce630486a83be91ff4e832eee20e971115b"; + }; + }; + "mocha-phantomjs-core-1.3.1" = { + name = "mocha-phantomjs-core"; + packageName = "mocha-phantomjs-core"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mocha-phantomjs-core/-/mocha-phantomjs-core-1.3.1.tgz"; + sha1 = "586538c8d71fa8de90c41a46acc0481c1fb83e18"; + }; + }; + "adm-zip-0.2.1" = { + name = "adm-zip"; + packageName = "adm-zip"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.2.1.tgz"; + sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf"; + }; + }; + "kew-0.1.7" = { + name = "kew"; + packageName = "kew"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/kew/-/kew-0.1.7.tgz"; + sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72"; + }; + }; + "ncp-0.4.2" = { + name = "ncp"; + packageName = "ncp"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"; + sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; + }; + }; + "npmconf-0.0.24" = { + name = "npmconf"; + packageName = "npmconf"; + version = "0.0.24"; + src = fetchurl { + url = "https://registry.npmjs.org/npmconf/-/npmconf-0.0.24.tgz"; + sha1 = "b78875b088ccc3c0afa3eceb3ce3244b1b52390c"; + }; + }; + "mkdirp-0.3.5" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + }; + }; + "progress-1.1.8" = { + name = "progress"; + packageName = "progress"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz"; + sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"; + }; + }; + "request-2.36.0" = { + name = "request"; + packageName = "request"; + version = "2.36.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.36.0.tgz"; + sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5"; + }; + }; + "request-progress-0.3.1" = { + name = "request-progress"; + packageName = "request-progress"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz"; + sha1 = "0721c105d8a96ac6b2ce8b2c89ae2d5ecfcf6b3a"; + }; + }; + "rimraf-2.2.8" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"; + sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; + }; + }; + "which-1.0.9" = { + name = "which"; + packageName = "which"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.0.9.tgz"; + sha1 = "460c1da0f810103d0321a9b633af9e575e64486f"; + }; + }; + "config-chain-1.1.10" = { + name = "config-chain"; + packageName = "config-chain"; + version = "1.1.10"; + src = fetchurl { + url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.10.tgz"; + sha1 = "7fc383de0fcc84d711cb465bd176579cad612346"; + }; + }; + "inherits-1.0.2" = { + name = "inherits"; + packageName = "inherits"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"; + sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"; + }; + }; + "once-1.1.1" = { + name = "once"; + packageName = "once"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.1.1.tgz"; + sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7"; + }; + }; + "osenv-0.0.3" = { + name = "osenv"; + packageName = "osenv"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz"; + sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6"; + }; + }; + "nopt-2.2.1" = { + name = "nopt"; + packageName = "nopt"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz"; + sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7"; + }; + }; + "semver-1.1.4" = { + name = "semver"; + packageName = "semver"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-1.1.4.tgz"; + sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540"; + }; + }; + "ini-1.1.0" = { + name = "ini"; + packageName = "ini"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"; + sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281"; + }; + }; + "proto-list-1.2.4" = { + name = "proto-list"; + packageName = "proto-list"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; + sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + }; + }; + "ini-1.3.4" = { + name = "ini"; + packageName = "ini"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"; + sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; + }; + }; + "abbrev-1.0.9" = { + name = "abbrev"; + packageName = "abbrev"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz"; + sha1 = "91b4792588a7738c25f35dd6f63752a2f8776135"; + }; + }; + "qs-0.6.6" = { + name = "qs"; + packageName = "qs"; + version = "0.6.6"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"; + sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107"; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "mime-1.2.11" = { + name = "mime"; + packageName = "mime"; + version = "1.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }; + }; + "forever-agent-0.5.2" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; + sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + }; + }; + "node-uuid-1.4.7" = { + name = "node-uuid"; + packageName = "node-uuid"; + version = "1.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; + sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; + }; + }; + "tough-cookie-2.3.1" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"; + sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd"; + }; + }; + "form-data-0.1.4" = { + name = "form-data"; + packageName = "form-data"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; + sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + }; + }; + "tunnel-agent-0.4.3" = { + name = "tunnel-agent"; + packageName = "tunnel-agent"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"; + sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; + }; + }; + "http-signature-0.10.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; + sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; + }; + }; + "oauth-sign-0.3.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"; + sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e"; + }; + }; + "hawk-1.0.0" = { + name = "hawk"; + packageName = "hawk"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz"; + sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d"; + }; + }; + "aws-sign2-0.5.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + }; + }; + "combined-stream-0.0.7" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; + }; + }; + "async-0.9.2" = { + name = "async"; + packageName = "async"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + }; + "delayed-stream-0.0.5" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + }; + }; + "assert-plus-0.1.5" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; + }; + }; + "asn1-0.1.11" = { + name = "asn1"; + packageName = "asn1"; + version = "0.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; + sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; + }; + }; + "ctype-0.5.3" = { + name = "ctype"; + packageName = "ctype"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; + }; + }; + "hoek-0.9.1" = { + name = "hoek"; + packageName = "hoek"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + }; + }; + "boom-0.4.2" = { + name = "boom"; + packageName = "boom"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; + }; + }; + "cryptiles-0.2.2" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + }; + }; + "sntp-0.2.4" = { + name = "sntp"; + packageName = "sntp"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + }; + }; + "throttleit-0.0.2" = { + name = "throttleit"; + packageName = "throttleit"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"; + sha1 = "cfedf88e60c00dd9697b61fdd2a8343a9b680eaf"; + }; + }; + "should-equal-1.0.1" = { + name = "should-equal"; + packageName = "should-equal"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/should-equal/-/should-equal-1.0.1.tgz"; + sha1 = "0b6e9516f2601a9fb0bb2dcc369afa1c7e200af7"; + }; + }; + "should-format-3.0.1" = { + name = "should-format"; + packageName = "should-format"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/should-format/-/should-format-3.0.1.tgz"; + sha1 = "3249b719c0921b4d7b26d347d1b0cc6e232ad324"; + }; + }; + "should-type-1.4.0" = { + name = "should-type"; + packageName = "should-type"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz"; + sha1 = "0756d8ce846dfd09843a6947719dfa0d4cff5cf3"; + }; + }; + "should-type-adaptors-1.0.0" = { + name = "should-type-adaptors"; + packageName = "should-type-adaptors"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.0.0.tgz"; + sha1 = "034b2843b8c151bb7b66e6350eba00543e797500"; + }; + }; + "should-util-1.0.0" = { + name = "should-util"; + packageName = "should-util"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/should-util/-/should-util-1.0.0.tgz"; + sha1 = "c98cda374aa6b190df8ba87c9889c2b4db620063"; + }; + }; + "formatio-1.1.1" = { + name = "formatio"; + packageName = "formatio"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz"; + sha1 = "5ed3ccd636551097383465d996199100e86161e9"; + }; + }; + "lolex-1.3.2" = { + name = "lolex"; + packageName = "lolex"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz"; + sha1 = "7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31"; + }; + }; + "samsam-1.1.2" = { + name = "samsam"; + packageName = "samsam"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz"; + sha1 = "bec11fdc83a9fda063401210e40176c3024d1567"; + }; + }; + "cli-1.0.0" = { + name = "cli"; + packageName = "cli"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli/-/cli-1.0.0.tgz"; + sha1 = "ee07dfc1390e3f2e6a9957cf88e1d4bfa777719d"; + }; + }; + "exit-0.1.2" = { + name = "exit"; + packageName = "exit"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"; + sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c"; + }; + }; + "htmlparser2-3.8.3" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "3.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz"; + sha1 = "996c28b191516a8be86501a7d79757e5c70c1068"; + }; + }; + "shelljs-0.3.0" = { + name = "shelljs"; + packageName = "shelljs"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"; + sha1 = "3596e6307a781544f591f37da618360f31db57b1"; + }; + }; + "strip-json-comments-1.0.4" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"; + sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"; + }; + }; + "lodash-3.7.0" = { + name = "lodash"; + packageName = "lodash"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz"; + sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45"; + }; + }; + "glob-7.0.6" = { + name = "glob"; + packageName = "glob"; + version = "7.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; + sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; + }; + }; + "domhandler-2.3.0" = { + name = "domhandler"; + packageName = "domhandler"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"; + sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738"; + }; + }; + "domutils-1.5.1" = { + name = "domutils"; + packageName = "domutils"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; + sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; + }; + }; + "domelementtype-1.3.0" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; + sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; + }; + }; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + }; + "entities-1.0.0" = { + name = "entities"; + packageName = "entities"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"; + sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26"; + }; + }; + "dom-serializer-0.1.0" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; + sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; + }; + }; + "domelementtype-1.1.3" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"; + sha1 = "bd28773e2642881aec51544924299c5cd822185b"; + }; + }; + "entities-1.1.1" = { + name = "entities"; + packageName = "entities"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"; + sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; + }; + }; + "interpret-1.0.1" = { + name = "interpret"; + packageName = "interpret"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/interpret/-/interpret-1.0.1.tgz"; + sha1 = "d579fb7f693b858004947af39fa0db49f795602c"; + }; + }; + "rechoir-0.6.2" = { + name = "rechoir"; + packageName = "rechoir"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; + sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; + }; + }; + }; +in +{ + marked = nodeEnv.buildNodePackage { + name = "marked"; + packageName = "marked"; + version = "0.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz"; + sha1 = "b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7"; + }; + meta = { + description = "A markdown parser built for speed"; + homepage = https://github.com/chjj/marked; + license = "MIT"; + }; + production = true; + }; + browserify = nodeEnv.buildNodePackage { + name = "browserify"; + packageName = "browserify"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify/-/browserify-13.1.0.tgz"; + sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae"; + }; + dependencies = [ + (sources."JSONStream-1.1.4" // { + dependencies = [ + sources."jsonparse-1.2.0" + sources."through-2.3.8" + ]; + }) + sources."assert-1.3.0" + (sources."browser-pack-6.0.1" // { + dependencies = [ + (sources."combine-source-map-0.7.2" // { + dependencies = [ + sources."convert-source-map-1.1.3" + sources."inline-source-map-0.6.2" + sources."lodash.memoize-3.0.4" + sources."source-map-0.5.6" + ]; + }) + sources."umd-3.0.1" + ]; + }) + sources."browser-resolve-1.11.2" + (sources."browserify-zlib-0.1.4" // { + dependencies = [ + sources."pako-0.2.9" + ]; + }) + (sources."buffer-4.9.1" // { + dependencies = [ + sources."base64-js-1.1.2" + sources."ieee754-1.1.6" + sources."isarray-1.0.0" + ]; + }) + (sources."concat-stream-1.5.2" // { + dependencies = [ + sources."typedarray-0.0.6" + (sources."readable-stream-2.0.6" // { + dependencies = [ + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."util-deprecate-1.0.2" + ]; + }) + ]; + }) + (sources."console-browserify-1.1.0" // { + dependencies = [ + sources."date-now-0.1.4" + ]; + }) + sources."constants-browserify-1.0.0" + (sources."crypto-browserify-3.11.0" // { + dependencies = [ + (sources."browserify-cipher-1.0.0" // { + dependencies = [ + (sources."browserify-aes-1.0.6" // { + dependencies = [ + sources."buffer-xor-1.0.3" + sources."cipher-base-1.0.2" + ]; + }) + (sources."browserify-des-1.0.0" // { + dependencies = [ + sources."cipher-base-1.0.2" + (sources."des.js-1.0.0" // { + dependencies = [ + sources."minimalistic-assert-1.0.0" + ]; + }) + ]; + }) + sources."evp_bytestokey-1.0.0" + ]; + }) + (sources."browserify-sign-4.0.0" // { + dependencies = [ + sources."bn.js-4.11.6" + sources."browserify-rsa-4.0.1" + (sources."elliptic-6.3.1" // { + dependencies = [ + sources."brorand-1.0.5" + sources."hash.js-1.0.3" + ]; + }) + (sources."parse-asn1-5.0.0" // { + dependencies = [ + (sources."asn1.js-4.8.0" // { + dependencies = [ + sources."minimalistic-assert-1.0.0" + ]; + }) + (sources."browserify-aes-1.0.6" // { + dependencies = [ + sources."buffer-xor-1.0.3" + sources."cipher-base-1.0.2" + ]; + }) + sources."evp_bytestokey-1.0.0" + ]; + }) + ]; + }) + (sources."create-ecdh-4.0.0" // { + dependencies = [ + sources."bn.js-4.11.6" + (sources."elliptic-6.3.1" // { + dependencies = [ + sources."brorand-1.0.5" + sources."hash.js-1.0.3" + ]; + }) + ]; + }) + (sources."create-hash-1.1.2" // { + dependencies = [ + sources."cipher-base-1.0.2" + sources."ripemd160-1.0.1" + sources."sha.js-2.4.5" + ]; + }) + sources."create-hmac-1.1.4" + (sources."diffie-hellman-5.0.2" // { + dependencies = [ + sources."bn.js-4.11.6" + (sources."miller-rabin-4.0.0" // { + dependencies = [ + sources."brorand-1.0.5" + ]; + }) + ]; + }) + sources."pbkdf2-3.0.4" + (sources."public-encrypt-4.0.0" // { + dependencies = [ + sources."bn.js-4.11.6" + sources."browserify-rsa-4.0.1" + (sources."parse-asn1-5.0.0" // { + dependencies = [ + (sources."asn1.js-4.8.0" // { + dependencies = [ + sources."minimalistic-assert-1.0.0" + ]; + }) + (sources."browserify-aes-1.0.6" // { + dependencies = [ + sources."buffer-xor-1.0.3" + sources."cipher-base-1.0.2" + ]; + }) + sources."evp_bytestokey-1.0.0" + ]; + }) + ]; + }) + sources."randombytes-2.0.3" + ]; + }) + sources."defined-1.0.0" + sources."deps-sort-2.0.0" + sources."domain-browser-1.1.7" + sources."duplexer2-0.1.4" + sources."events-1.1.1" + (sources."glob-5.0.15" // { + dependencies = [ + (sources."inflight-1.0.5" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.3.3" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.0" + ]; + }) + (sources."has-1.0.1" // { + dependencies = [ + sources."function-bind-1.1.0" + ]; + }) + sources."htmlescape-1.1.1" + sources."https-browserify-0.0.1" + sources."inherits-2.0.1" + (sources."insert-module-globals-7.0.1" // { + dependencies = [ + (sources."combine-source-map-0.7.2" // { + dependencies = [ + sources."convert-source-map-1.1.3" + sources."inline-source-map-0.6.2" + sources."lodash.memoize-3.0.4" + sources."source-map-0.5.6" + ]; + }) + sources."is-buffer-1.1.4" + (sources."lexical-scope-1.2.0" // { + dependencies = [ + (sources."astw-2.0.0" // { + dependencies = [ + sources."acorn-1.2.2" + ]; + }) + ]; + }) + ]; + }) + (sources."labeled-stream-splicer-2.0.0" // { + dependencies = [ + sources."isarray-0.0.1" + sources."stream-splicer-2.0.0" + ]; + }) + (sources."module-deps-4.0.7" // { + dependencies = [ + (sources."detective-4.3.1" // { + dependencies = [ + sources."acorn-1.2.2" + ]; + }) + sources."stream-combiner2-1.1.1" + ]; + }) + sources."os-browserify-0.1.2" + (sources."parents-1.0.1" // { + dependencies = [ + sources."path-platform-0.11.15" + ]; + }) + sources."path-browserify-0.0.0" + sources."process-0.11.9" + sources."punycode-1.4.1" + sources."querystring-es3-0.2.1" + sources."read-only-stream-2.0.0" + (sources."readable-stream-2.1.5" // { + dependencies = [ + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."util-deprecate-1.0.2" + ]; + }) + sources."resolve-1.1.7" + (sources."shasum-1.0.2" // { + dependencies = [ + (sources."json-stable-stringify-0.0.1" // { + dependencies = [ + sources."jsonify-0.0.0" + ]; + }) + sources."sha.js-2.4.5" + ]; + }) + (sources."shell-quote-1.6.1" // { + dependencies = [ + sources."jsonify-0.0.0" + sources."array-filter-0.0.1" + sources."array-reduce-0.0.0" + sources."array-map-0.0.0" + ]; + }) + sources."stream-browserify-2.0.1" + (sources."stream-http-2.3.1" // { + dependencies = [ + sources."builtin-status-codes-2.0.0" + sources."to-arraybuffer-1.0.1" + ]; + }) + sources."string_decoder-0.10.31" + (sources."subarg-1.0.0" // { + dependencies = [ + sources."minimist-1.2.0" + ]; + }) + (sources."syntax-error-1.1.6" // { + dependencies = [ + sources."acorn-2.7.0" + ]; + }) + (sources."through2-2.0.1" // { + dependencies = [ + (sources."readable-stream-2.0.6" // { + dependencies = [ + sources."core-util-is-1.0.2" + sources."isarray-1.0.0" + sources."process-nextick-args-1.0.7" + sources."util-deprecate-1.0.2" + ]; + }) + ]; + }) + sources."timers-browserify-1.4.2" + sources."tty-browserify-0.0.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + sources."querystring-0.2.0" + ]; + }) + sources."util-0.10.3" + (sources."vm-browserify-0.0.4" // { + dependencies = [ + sources."indexof-0.0.1" + ]; + }) + sources."xtend-4.0.1" + ]; + meta = { + description = "browser-side require() the node way"; + homepage = "https://github.com/substack/node-browserify#readme"; + license = "MIT"; + }; + production = true; + }; + uglify-js = nodeEnv.buildNodePackage { + name = "uglify-js"; + packageName = "uglify-js"; + version = "2.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.3.tgz"; + sha1 = "39b3a7329b89f5ec507e344c6e22568698ef4868"; + }; + dependencies = [ + sources."async-0.2.10" + sources."source-map-0.5.6" + sources."uglify-to-browserify-1.0.2" + (sources."yargs-3.10.0" // { + dependencies = [ + sources."camelcase-1.2.1" + (sources."cliui-2.1.0" // { + dependencies = [ + (sources."center-align-0.1.3" // { + dependencies = [ + (sources."align-text-0.1.4" // { + dependencies = [ + (sources."kind-of-3.0.4" // { + dependencies = [ + sources."is-buffer-1.1.4" + ]; + }) + sources."longest-1.0.1" + sources."repeat-string-1.5.4" + ]; + }) + sources."lazy-cache-1.0.4" + ]; + }) + (sources."right-align-0.1.3" // { + dependencies = [ + (sources."align-text-0.1.4" // { + dependencies = [ + (sources."kind-of-3.0.4" // { + dependencies = [ + sources."is-buffer-1.1.4" + ]; + }) + sources."longest-1.0.1" + sources."repeat-string-1.5.4" + ]; + }) + ]; + }) + sources."wordwrap-0.0.2" + ]; + }) + sources."decamelize-1.2.0" + sources."window-size-0.1.0" + ]; + }) + ]; + meta = { + description = "JavaScript parser, mangler/compressor and beautifier toolkit"; + homepage = http://lisperator.net/uglifyjs; + license = "BSD-2-Clause"; + }; + production = true; + }; + less = nodeEnv.buildNodePackage { + name = "less"; + packageName = "less"; + version = "2.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/less/-/less-2.7.1.tgz"; + sha1 = "6cbfea22b3b830304e9a5fb371d54fa480c9d7cf"; + }; + dependencies = [ + (sources."errno-0.1.4" // { + dependencies = [ + sources."prr-0.0.0" + ]; + }) + sources."graceful-fs-4.1.6" + sources."image-size-0.5.0" + sources."mime-1.3.4" + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + (sources."promise-7.1.1" // { + dependencies = [ + sources."asap-2.0.4" + ]; + }) + sources."source-map-0.5.6" + ]; + meta = { + description = "Leaner CSS"; + homepage = http://lesscss.org/; + license = "Apache-2.0"; + }; + production = true; + }; + mocha = nodeEnv.buildNodePackage { + name = "mocha"; + packageName = "mocha"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mocha/-/mocha-3.0.2.tgz"; + sha1 = "63a97f3e18f4d3e659d47a617677d089874557f0"; + }; + dependencies = [ + sources."browser-stdout-1.3.0" + (sources."commander-2.9.0" // { + dependencies = [ + sources."graceful-readlink-1.0.1" + ]; + }) + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + sources."diff-1.4.0" + sources."escape-string-regexp-1.0.5" + (sources."glob-7.0.5" // { + dependencies = [ + sources."fs.realpath-1.0.0" + (sources."inflight-1.0.5" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."inherits-2.0.1" + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.3.3" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.0" + ]; + }) + sources."growl-1.9.2" + sources."json3-3.3.2" + (sources."lodash.create-3.1.1" // { + dependencies = [ + (sources."lodash._baseassign-3.2.0" // { + dependencies = [ + sources."lodash._basecopy-3.0.1" + (sources."lodash.keys-3.1.2" // { + dependencies = [ + sources."lodash._getnative-3.9.1" + sources."lodash.isarguments-3.1.0" + sources."lodash.isarray-3.0.4" + ]; + }) + ]; + }) + sources."lodash._basecreate-3.0.3" + sources."lodash._isiterateecall-3.0.9" + ]; + }) + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + (sources."supports-color-3.1.2" // { + dependencies = [ + sources."has-flag-1.0.0" + ]; + }) + ]; + meta = { + description = "simple, flexible, fun test framework"; + homepage = https://mochajs.org/; + license = "MIT"; + }; + production = true; + }; + mocha-phantomjs = nodeEnv.buildNodePackage { + name = "mocha-phantomjs"; + packageName = "mocha-phantomjs"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-4.1.0.tgz"; + sha1 = "c75e16612e1a6af0ad8d281e3a2fef49d55e505b"; + }; + dependencies = [ + (sources."phantomjs-1.9.7-15" // { + dependencies = [ + sources."adm-zip-0.2.1" + sources."kew-0.1.7" + sources."ncp-0.4.2" + (sources."npmconf-0.0.24" // { + dependencies = [ + (sources."config-chain-1.1.10" // { + dependencies = [ + sources."proto-list-1.2.4" + sources."ini-1.3.4" + ]; + }) + sources."inherits-1.0.2" + sources."once-1.1.1" + sources."osenv-0.0.3" + (sources."nopt-2.2.1" // { + dependencies = [ + sources."abbrev-1.0.9" + ]; + }) + sources."semver-1.1.4" + sources."ini-1.1.0" + ]; + }) + sources."mkdirp-0.3.5" + sources."progress-1.1.8" + (sources."request-2.36.0" // { + dependencies = [ + sources."qs-0.6.6" + sources."json-stringify-safe-5.0.1" + sources."mime-1.2.11" + sources."forever-agent-0.5.2" + sources."node-uuid-1.4.7" + sources."tough-cookie-2.3.1" + (sources."form-data-0.1.4" // { + dependencies = [ + (sources."combined-stream-0.0.7" // { + dependencies = [ + sources."delayed-stream-0.0.5" + ]; + }) + sources."async-0.9.2" + ]; + }) + sources."tunnel-agent-0.4.3" + (sources."http-signature-0.10.1" // { + dependencies = [ + sources."assert-plus-0.1.5" + sources."asn1-0.1.11" + sources."ctype-0.5.3" + ]; + }) + sources."oauth-sign-0.3.0" + (sources."hawk-1.0.0" // { + dependencies = [ + sources."hoek-0.9.1" + sources."boom-0.4.2" + sources."cryptiles-0.2.2" + sources."sntp-0.2.4" + ]; + }) + sources."aws-sign2-0.5.0" + ]; + }) + (sources."request-progress-0.3.1" // { + dependencies = [ + sources."throttleit-0.0.2" + ]; + }) + sources."rimraf-2.2.8" + sources."which-1.0.9" + ]; + }) + sources."mocha-phantomjs-core-1.3.1" + (sources."commander-2.9.0" // { + dependencies = [ + sources."graceful-readlink-1.0.1" + ]; + }) + ]; + meta = { + description = "Run mocha browser tests in phantomjs via the command line"; + homepage = "https://github.com/nathanboktae/mocha-phantomjs#readme"; + }; + production = true; + }; + should = nodeEnv.buildNodePackage { + name = "should"; + packageName = "should"; + version = "11.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/should/-/should-11.1.0.tgz"; + sha1 = "1d2ee7d3b150e965611ebe37be7dcf0fe2075a8e"; + }; + dependencies = [ + sources."should-equal-1.0.1" + sources."should-format-3.0.1" + sources."should-type-1.4.0" + sources."should-type-adaptors-1.0.0" + sources."should-util-1.0.0" + ]; + meta = { + description = "test framework agnostic BDD-style assertions"; + homepage = https://github.com/shouldjs/should.js; + license = "MIT"; + }; + production = true; + }; + sinon = nodeEnv.buildNodePackage { + name = "sinon"; + packageName = "sinon"; + version = "1.17.5"; + src = fetchurl { + url = "https://registry.npmjs.org/sinon/-/sinon-1.17.5.tgz"; + sha1 = "1038cba830e37012e99a64837ecd3b67200c058c"; + }; + dependencies = [ + sources."formatio-1.1.1" + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) + sources."lolex-1.3.2" + sources."samsam-1.1.2" + ]; + meta = { + description = "JavaScript test spies, stubs and mocks."; + homepage = http://sinonjs.org/; + license = "BSD-3-Clause"; + }; + production = true; + }; + jshint = nodeEnv.buildNodePackage { + name = "jshint"; + packageName = "jshint"; + version = "2.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/jshint/-/jshint-2.9.3.tgz"; + sha1 = "a2e14ff85c2d6bf8c8080e5aa55129ebc6a2d320"; + }; + dependencies = [ + (sources."cli-1.0.0" // { + dependencies = [ + (sources."glob-7.0.6" // { + dependencies = [ + sources."fs.realpath-1.0.0" + (sources."inflight-1.0.5" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."inherits-2.0.1" + (sources."once-1.3.3" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.0" + ]; + }) + ]; + }) + (sources."console-browserify-1.1.0" // { + dependencies = [ + sources."date-now-0.1.4" + ]; + }) + sources."exit-0.1.2" + (sources."htmlparser2-3.8.3" // { + dependencies = [ + sources."domhandler-2.3.0" + (sources."domutils-1.5.1" // { + dependencies = [ + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + sources."entities-1.1.1" + ]; + }) + ]; + }) + sources."domelementtype-1.3.0" + (sources."readable-stream-1.1.14" // { + dependencies = [ + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."inherits-2.0.1" + ]; + }) + sources."entities-1.0.0" + ]; + }) + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + sources."shelljs-0.3.0" + sources."strip-json-comments-1.0.4" + sources."lodash-3.7.0" + ]; + meta = { + description = "Static analysis tool for JavaScript"; + homepage = http://jshint.com/; + license = "(MIT AND JSON)"; + }; + production = true; + }; + shelljs = nodeEnv.buildNodePackage { + name = "shelljs"; + packageName = "shelljs"; + version = "0.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.4.tgz"; + sha1 = "b8f04b3a74ddfafea22acf98e0be45ded53d59c8"; + }; + dependencies = [ + (sources."glob-7.0.6" // { + dependencies = [ + sources."fs.realpath-1.0.0" + (sources."inflight-1.0.5" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."inherits-2.0.1" + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.3.3" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.0" + ]; + }) + sources."interpret-1.0.1" + (sources."rechoir-0.6.2" // { + dependencies = [ + sources."resolve-1.1.7" + ]; + }) + ]; + meta = { + description = "Portable Unix shell commands for Node.js"; + homepage = http://github.com/shelljs/shelljs; + license = "BSD-3-Clause"; + }; + production = true; + }; +} \ No newline at end of file diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix new file mode 100644 index 00000000000..e7a3f74d2b8 --- /dev/null +++ b/pkgs/development/web/remarkjs/nodepkgs.nix @@ -0,0 +1,16 @@ +# This file has been generated by node2nix 1.0.1. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}: + +let + nodeEnv = import ../../node-packages/node-env.nix { + inherit (pkgs) stdenv python utillinux runCommand writeTextFile; + inherit nodejs; + }; +in +import ./node-packages.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} \ No newline at end of file diff --git a/pkgs/development/web/remarkjs/pkgs.json b/pkgs/development/web/remarkjs/pkgs.json new file mode 100644 index 00000000000..516bcebc6f4 --- /dev/null +++ b/pkgs/development/web/remarkjs/pkgs.json @@ -0,0 +1,12 @@ +[ + "marked" +, "browserify" +, "uglify-js" +, "less" +, "mocha" +, "mocha-phantomjs" +, "should" +, "sinon" +, "jshint" +, "shelljs" +] diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index 26323636402..0a94a1c433d 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa, libX11, xproto, tcl, freeglut +{ stdenv, fetchurl, mesa, libX11, xproto, tcl, freeglut, freetype , SDL, SDL_mixer, SDL_image, libXi, inputproto , libXmu, libXext, xextproto, libXt, libSM, libICE , libpng, pkgconfig, gettext, intltool @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - mesa libX11 xproto tcl freeglut + mesa libX11 xproto tcl freeglut freetype SDL SDL_mixer SDL_image libXi inputproto libXmu libXext xextproto libXt libSM libICE libpng pkgconfig gettext intltool diff --git a/pkgs/games/quantumminigolf/default.nix b/pkgs/games/quantumminigolf/default.nix index 1b075507796..1a8cbbea5f9 100644 --- a/pkgs/games/quantumminigolf/default.nix +++ b/pkgs/games/quantumminigolf/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { inherit (s) url sha256; }; preBuild = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL -I${SDL_ttf}/include/SDL" sed -re 's@"(gfx|fonts|tracks)/@"'"$out"'/share/quantumminigolf/\1/@g' -i *.cpp ''; diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index a118c0f0452..b0fd8072566 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openal, libvorbis, mesa_glu, premake4, SDL2, SDL2_image, SDL2_ttf}: +{stdenv, fetchurl, openal, libpng, libvorbis, mesa_glu, premake4, SDL2, SDL2_image, SDL2_ttf }: stdenv.mkDerivation rec { version = "1.4.6"; @@ -7,7 +7,8 @@ stdenv.mkDerivation rec { url = "http://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2"; sha256 = "12pi2lw1k6l3p209nnkh4nfv3ppp8kpd6mkh1324c81z6mh6w4wg"; }; - buildInputs = [ mesa_glu openal libvorbis SDL2 SDL2_ttf SDL2_image premake4 ]; + buildInputs = [ mesa_glu openal libpng libvorbis SDL2 SDL2_ttf SDL2_image premake4 ]; + NIX_CFLAGS_COMPILE = [ "-I${SDL2_image}/include/SDL2" "-I${SDL2_ttf}/include/SDL2" ]; preConfigure = '' sed -e "s@/opt/SDL-2.0/include/SDL2@${SDL2}/include/SDL2@g" -e "s@/usr/include/GL@/run/opengl-driver/include@g" -i premake4.lua premake4 gmake diff --git a/pkgs/games/ut2004demo/default.nix b/pkgs/games/ut2004demo/default.nix index 13f770eab2b..27b81edf630 100644 --- a/pkgs/games/ut2004demo/default.nix +++ b/pkgs/games/ut2004demo/default.nix @@ -7,7 +7,15 @@ let { raw = stdenv.mkDerivation { name = "ut2004-demo-3120"; src = fetchurl { - url = http://ftp.gameaholic.com/pub/demos/ut2004-lnx-demo-3120.run.bz2; + urls = [ + ("http://store.node-10.ds-servers.com/file/BcFLgoIgAADQA7kw0qZctDAF+4cj" + + "mbnDMFOJTAyM0-cejkEIuDvQ6Uv9ZbvcWMnRmXXxhA0LyvzoKdvsnXne0D1DGTLiR0" + + "I1CmM2M-E5ryH-tD3yweCXyNyH1WGI3Wh09ja29mHtzGF1rxEyhRfQ7ggCKdfCrhvz" + + "H9oTJXSCAtGuSKdVDhe6tNtrqa151MIircZtRLPxQcGmJ+n3-iUeWYgHuqbmrK4ur7" + + "Qcy6QrAhYa+e5jcfYjgPF3VGsw4qx+0ilxJUCiuYCX2H8A6X3rxJILa26w3O425W2G" + + "kHPiQWrhFT8cIOyqSr8+dMO5Xi5-/ut2004-lnx-demo-3120.run.bz2") + http://ftp.gameaholic.com/pub/demos/ut2004-lnx-demo-3120.run.bz2 + ]; sha256 = "1lravfkb1gsallqqird5dcbz42vwjg36m1qk76nmmnyyyghwqnli"; }; builder = ./builder.sh; diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 2e163af1d5e..3435efbae8b 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -1,12 +1,22 @@ { stdenv, fetchurl, kernel }: -let version = "20140928"; -in stdenv.mkDerivation { + +stdenv.mkDerivation rec { name = "vhba-${version}"; + version = "20140928"; + src = fetchurl { url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.bz2"; sha256 = "18jmpg2kpx87f32b8aprr1pxla9dlhf901rkj1sp3ammf94nxxa5"; }; - preBuild = '' - makeFlags="KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build INSTALL_MOD_PATH=$out"; - ''; + + makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; + + hardeningDisable = [ "pic" ]; + + meta = with stdenv.lib; { + description = "Provides a Virtual (SCSI) HBA"; + homepage = "http://cdemu.sourceforge.net/about/vhba/"; + platforms = platforms.linux; + licenses = licenses.gpl2Plus; + }; } diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index a3a58d8eccf..c1dcda54a62 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { ncurses perl zlib python ]; + # uses 'readdir_r' deprecated by glibc 2.24 + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + configurePhase = '' : ''; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 67ea56be847..f71a2e21a4d 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1169,11 +1169,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2016-07-23"; + name = "youcompleteme-2016-09-01"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "9968a43f7ec058298667c2c56ca86cfbbf1dac51"; - sha256 = "17fxlflzggzx0mzsbmgvhp7dmkrx760w2pkais2vkafk3xdr1yr7"; + rev = "e332cdb2a0c8599dead1d362b87bb9fb79c9a955"; + sha256 = "0lqmdbv2z3rhm6a9c62rhfl3i30mvpg2f7k0cjan7jvrln9588k9"; }; dependencies = []; buildInputs = [ diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index f9060107340..f58a7557ce3 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -32,6 +32,8 @@ let substituteInPlace ./common/Make.rules --replace "/usr/share/man" "share/man" ''; + # FIXME: convert these to a single multiple-outputs package? + libapparmor = stdenv.mkDerivation { name = "libapparmor-${apparmor-version}"; src = apparmor-sources; @@ -61,6 +63,13 @@ let postPatch = "cd ./libraries/libapparmor"; configureFlags = "--with-python --with-perl"; + outputs = [ "out" "python" ]; + + postInstall = '' + mkdir -p $python/lib + mv $out/lib/python* $python/lib/ + ''; + meta = apparmor-meta "library"; }; @@ -75,6 +84,7 @@ let pythonPackages.python pythonPackages.readline libapparmor + libapparmor.python ]; prePatch = prePatchCommon; diff --git a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix index 33bf58c234d..eea6f2893f2 100644 --- a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix @@ -1,7 +1,7 @@ { stdenv, linuxPackages }: with stdenv.lib; stdenv.mkDerivation { - name = "rtl8723bs-firmware-${linuxPackages.rtl8723bs.rev}"; + name = "rtl8723bs-firmware-${linuxPackages.rtl8723bs.version}"; inherit (linuxPackages.rtl8723bs) src; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/os-specific/linux/iomelt/default.nix b/pkgs/os-specific/linux/iomelt/default.nix index fccf7b6b1cd..f57cfd713fb 100644 --- a/pkgs/os-specific/linux/iomelt/default.nix +++ b/pkgs/os-specific/linux/iomelt/default.nix @@ -20,6 +20,6 @@ in stdenv.mkDerivation { description = "A simple yet effective way to benchmark disk IO in Linux systems"; homepage = http://www.iomelt.com; maintainers = with maintainers; [ cstrahan ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 03a3023053a..3b5e97f9edf 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -101,8 +101,8 @@ rec { grsecurity_testing = grsecPatch { kver = "4.7.2"; - grrev = "201608211829"; - sha256 = "1a7pvmb57w7j9s4ww8xvzzijlpnr2i7nhm7jhgfz4n5w3jvxcny3"; + grrev = "201608312326"; + sha256 = "0nbp3lnl6gi6kklpc8wnjpz5cj9zafaw2445lan15qnyzf5zb966"; }; # This patch relaxes grsec constraints on the location of usermode helpers, diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix index 54de1e1108c..4866c3d8132 100644 --- a/pkgs/os-specific/linux/mbpfan/default.nix +++ b/pkgs/os-specific/linux/mbpfan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, gnugrep, kmod }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, gnugrep, kmod }: stdenv.mkDerivation rec { name = "mbpfan-${version}"; @@ -9,7 +9,12 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "0issn5233h2nclrmh2jzyy5y0dyyd57f1ia7gvs3bys95glcm2s5"; }; - patches = [ ./fixes.patch ]; + patches = [ + ./fixes.patch + (fetchpatch { # buffer overflow fix https://github.com/dgraziotin/mbpfan/issues/72 + url = https://github.com/dgraziotin/mbpfan/commit/f2736c8ab93cafffc25b86bcc6c33e6cbd537243.patch; + sha256 = "10sldc69c91qk3hq0f6r3gxay38l2iw93nl85qh94mwpb8hy92yj"; }) + ]; postPatch = '' substituteInPlace src/main.c \ --replace '@GREP@' '${gnugrep}/bin/grep' \ diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 4b3e078cb57..3557c1f05af 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -2,11 +2,11 @@ , flex, bison, libmnl, libnftnl, gmp, readline }: stdenv.mkDerivation rec { - name = "nftables-0.5"; + name = "nftables-0.6"; src = fetchurl { url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2"; - sha256 = "1mhaw7ys7ma5786xyfccgar389jsj2zp7qmvghsgr96q6grxzdhz"; + sha256 = "0bbcrn9nz75daic8bq7rspvcw3ck7l82vqcvkyyg4mhwbxjn5pny"; }; configureFlags = [ diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index 56c12e9a4f0..cb320111017 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -8,14 +8,14 @@ assert !kernel.features ? grsecurity; let release = "0.4.0"; - revbump = "rev19"; # don't forget to change forum download id... + revbump = "rev22"; # don't forget to change forum download id... in stdenv.mkDerivation rec { name = "linux-phc-intel-${version}-${kernel.version}"; version = "${release}-${revbump}"; src = fetchurl { - sha256 = "1apvjp2rpaf3acjvsxgk6xiwrx4n9p565gxvra05pvicwikfiqa8"; - url = "http://www.linux-phc.org/forum/download/file.php?id=168"; + sha256 = "f80285a8cd2ebb1753841e493af0c091d55c33823777b26a93d25ed7264a385d"; + url = "http://www.linux-phc.org/forum/download/file.php?id=172"; name = "phc-intel-pack-${revbump}.tar.bz2"; }; diff --git a/pkgs/os-specific/linux/rtl8723bs/default.nix b/pkgs/os-specific/linux/rtl8723bs/default.nix index 39f6a3826c2..05dd0f8ebb9 100644 --- a/pkgs/os-specific/linux/rtl8723bs/default.nix +++ b/pkgs/os-specific/linux/rtl8723bs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, nukeReferences, kernel }: with stdenv.lib; stdenv.mkDerivation rec { - name = "rtl8723bs-${kernel.version}-${rev}"; - rev = "6918e9b2ff297b1cc7fde193e72452c33c10e1c8"; + name = "rtl8723bs-${kernel.version}-${version}"; + version = "2016-04-11"; src = fetchFromGitHub { owner = "hadess"; repo = "rtl8723bs"; - inherit rev; - sha256 = "07srd457wnz29nvvq02wz66s387bhjbydnmbs3qr7ljprabhsgmi"; + rev = "11ab92d8ccd71c80f0102828366b14ef6b676fb2"; + sha256 = "05q7mf12xcb00v6ba4wwvqi53q7ph5brfkj17xf6vkx4jr7xxnmm"; }; hardeningDisable = [ "pic" ]; @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { homepage = "https://github.com/hadess/rtl8723bs"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - broken = ! versionAtLeast kernel.version "3.19"; + broken = (! versionAtLeast kernel.version "3.19") + || (kernel.features.grsecurity or false); maintainers = with maintainers; [ elitak ]; }; } diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index eff515c3dad..d02f7291df5 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, kmod +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod , zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4 , kexectools, libmicrohttpd, linuxHeaders ? stdenv.cc.libc.linuxHeaders, libseccomp @@ -20,6 +20,14 @@ stdenv.mkDerivation rec { sha256 = "021b7filp1dlhic1iv54b821w7mj5595njvzns939pmn636ry4m5"; }; + patches = [ + # Fixes tty issues, see #18158. Remove when upgrading to systemd 232. + (fetchpatch { + url = "https://github.com/systemd/systemd/commit/bd64d82c1c0e3fe2a5f9b3dd9132d62834f50b2d.patch"; + sha256 = "1gc9fxdlnfmjhbi77xfwcb5mkhryjsdi0rmbh2lq2qq737iyqqwm"; + }) + ]; + /* gave up for now! outputs = [ "out" "libudev" "doc" ]; # maybe: "dev" # note: there are many references to ${systemd}/... diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index ed462b95382..995a643d7ef 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -1,92 +1,85 @@ -{ builderDefs }: +{ stdenv, fetchurl }: -let makeDictdDB = _src: _name: _subdir: _locale: -with builderDefs; - let localDefs = builderDefs.passthru.function (rec { - src=_src; - doInstall = fullDepEntry ('' - mkdir -p $out/share/dictd - tar xf ${src} - cp $(ls ./${_subdir}/*.{dict*,index} || true) $out/share/dictd - echo "${_locale}" >$out/share/dictd/locale - '') ["minInit" "addInputs" "defEnsureDir"]; +let + # Probably a bug in some FreeDict release files, but easier to trivially + # work around than report. Not that it can cause any other problems.. + makeDictdDBFreedict = src: name: locale: + makeDictdDB src name "{.,bin}" locale; - buildInputs = []; - configureFlags = []; - }); - in with localDefs; -stdenv.mkDerivation rec { - name = "dictd-db-${_name}"; - locale = _locale; - dbName = _name; - builder = writeScript (name + "-builder") - (textClosure localDefs - [doInstall doForceShare doPropagate]); - meta = { - description = "${name} dictionary for dictd"; - platforms = stdenv.lib.platforms.linux; - }; -}; -# Probably a bug in some FreeDict release files, but easier to trivially -# work around than report. Not that it can cause any other problems.. -makeDictdDBFreedict = _src: _name: _locale: makeDictdDB _src _name "{.,bin}" _locale; -fetchurl = builderDefs.fetchurl; + makeDictdDB = src: _name: _subdir: _locale: + stdenv.mkDerivation rec { + name = "dictd-db-${_name}"; + inherit src; + locale = _locale; + dbName = _name; + buildPhase = ":"; + unpackPhase = '' + tar xf ${src} + ''; + installPhase = '' + mkdir -p $out/share/dictd + cp $(ls ./${_subdir}/*.{dict*,index} || true) $out/share/dictd + echo "${_locale}" >$out/share/dictd/locale + ''; -in - -rec { - nld2eng = makeDictdDBFreedict (fetchurl { - url = http://prdownloads.sourceforge.net/freedict/nld-eng.tar.gz; - sha256 = "1vhw81pphb64fzsjvpzsnnyr34ka2fxizfwilnxyjcmpn9360h07"; - }) "nld-eng" "nl_NL"; - eng2nld = makeDictdDBFreedict (fetchurl { - url = mirror://sourceforge/freedict/eng-nld.tar.gz; - sha256 = "0rcg28ldykv0w2mpxc6g4rqmfs33q7pbvf68ssy1q9gpf6mz7vcl"; - }) "eng-nld" "en_UK"; - eng2rus = makeDictdDBFreedict (fetchurl { - url = mirror://sourceforge/freedict/eng-rus.tar.gz; - sha256 = "15409ivhww1wsfjr05083pv6mg10bak8v5pg1wkiqybk7ck61rry"; - }) "eng-rus" "en_UK"; - fra2eng = makeDictdDBFreedict (fetchurl { - url = mirror://sourceforge/freedict/fra-eng.tar.gz; - sha256 = "0sdd88s2zs5whiwdf3hd0s4pzzv75sdsccsrm1wxc87l3hjm85z3"; - }) "fra-eng" "fr_FR"; - eng2fra = makeDictdDBFreedict (fetchurl { - url = mirror://sourceforge/freedict/eng-fra.tar.gz; - sha256 = "0fi6rrnbqnhc6lq8d0nmn30zdqkibrah0mxfg27hsn9z7alwbj3m"; - }) "eng-fra" "en_UK"; - mueller_eng2rus_pkg = makeDictdDB (fetchurl { - url = mirror://sourceforge/mueller-dict/mueller-dict-3.1.tar.gz; - sha256 = "04r5xxznvmcb8hkxqbjgfh2gxvbdd87jnhqn5gmgvxxw53zpwfmq"; - }) "mueller-eng-rus" "mueller-dict-*/dict" "en_UK"; - mueller_enru_abbr = { - outPath = "${mueller_eng2rus_pkg}/share/dictd/mueller-abbrev"; - name = "mueller-abbr"; - dbName = "mueller-abbr"; - locale = "en_UK"; - }; - mueller_enru_base = { - outPath = "${mueller_eng2rus_pkg}/share/dictd/mueller-base"; - name = "mueller-base"; - dbName = "mueller-base"; - locale = "en_UK"; - }; - mueller_enru_dict = { - outPath = "${mueller_eng2rus_pkg}/share/dictd/mueller-dict"; - name = "mueller-dict"; - dbName = "mueller-dict"; - locale = "en_UK"; - }; - mueller_enru_geo = { - outPath = "${mueller_eng2rus_pkg}/share/dictd/mueller-geo"; - name = "mueller-geo"; - dbName = "mueller-geo"; - locale = "en_UK"; - }; - mueller_enru_names = { - outPath = "${mueller_eng2rus_pkg}/share/dictd/mueller-names"; - name = "mueller-names"; - dbName = "mueller-names"; - locale = "en_UK"; - }; + meta = { + description = "dictd-db dictionary for dictd"; + platforms = stdenv.lib.platforms.linux; + }; + }; +in rec { + nld2eng = makeDictdDBFreedict (fetchurl { + url = http://prdownloads.sourceforge.net/freedict/nld-eng.tar.gz; + sha256 = "1vhw81pphb64fzsjvpzsnnyr34ka2fxizfwilnxyjcmpn9360h07"; + }) "nld-eng" "nl_NL"; + eng2nld = makeDictdDBFreedict (fetchurl { + url = mirror://sourceforge/freedict/eng-nld.tar.gz; + sha256 = "0rcg28ldykv0w2mpxc6g4rqmfs33q7pbvf68ssy1q9gpf6mz7vcl"; + }) "eng-nld" "en_UK"; + eng2rus = makeDictdDBFreedict (fetchurl { + url = mirror://sourceforge/freedict/eng-rus.tar.gz; + sha256 = "15409ivhww1wsfjr05083pv6mg10bak8v5pg1wkiqybk7ck61rry"; + }) "eng-rus" "en_UK"; + fra2eng = makeDictdDBFreedict (fetchurl { + url = mirror://sourceforge/freedict/fra-eng.tar.gz; + sha256 = "0sdd88s2zs5whiwdf3hd0s4pzzv75sdsccsrm1wxc87l3hjm85z3"; + }) "fra-eng" "fr_FR"; + eng2fra = makeDictdDBFreedict (fetchurl { + url = mirror://sourceforge/freedict/eng-fra.tar.gz; + sha256 = "0fi6rrnbqnhc6lq8d0nmn30zdqkibrah0mxfg27hsn9z7alwbj3m"; + }) "eng-fra" "en_UK"; + mueller_eng2rus_pkg = makeDictdDB (fetchurl { + url = mirror://sourceforge/mueller-dict/mueller-dict-3.1.tar.gz; + sha256 = "04r5xxznvmcb8hkxqbjgfh2gxvbdd87jnhqn5gmgvxxw53zpwfmq"; + }) "mueller-eng-rus" "mueller-dict-*/dict" "en_UK"; + mueller_enru_abbr = { + outPath = "${mueller_eng2rus_pkg}/share/dictd/mueller-abbrev"; + name = "mueller-abbr"; + dbName = "mueller-abbr"; + locale = "en_UK"; + }; + mueller_enru_base = { + outPath = "${mueller_eng2rus_pkg}/share/dictd/mueller-base"; + name = "mueller-base"; + dbName = "mueller-base"; + locale = "en_UK"; + }; + mueller_enru_dict = { + outPath = "${mueller_eng2rus_pkg}/share/dictd/mueller-dict"; + name = "mueller-dict"; + dbName = "mueller-dict"; + locale = "en_UK"; + }; + mueller_enru_geo = { + outPath = "${mueller_eng2rus_pkg}/share/dictd/mueller-geo"; + name = "mueller-geo"; + dbName = "mueller-geo"; + locale = "en_UK"; + }; + mueller_enru_names = { + outPath = "${mueller_eng2rus_pkg}/share/dictd/mueller-names"; + name = "mueller-names"; + dbName = "mueller-names"; + locale = "en_UK"; + }; } diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index 20cea270889..d5af6e43292 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = "http://mini-httpd.nongnu.org/"; description = "A minimalistic high-performance web server"; license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index c7eec4b91b3..4dd7fb24c91 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { description = "Clients and server for the SNMP network monitoring protocol"; homepage = http://net-snmp.sourceforge.net/; license = licenses.bsd3; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ wkennington ]; }; } diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index 70202228032..b8253cf0ad4 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -84,7 +84,7 @@ in homepage = http://www.zabbix.com/; license = licenses.gpl2; maintainers = [ maintainers.eelco ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux; }; }; diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index 81eb675bb33..10375b9b1c1 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -96,7 +96,7 @@ in homepage = http://www.zabbix.com/; license = licenses.gpl2; maintainers = [ maintainers.eelco ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux; }; }; diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index 4ea40128cd6..cc54aa3b37a 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -62,7 +62,7 @@ in homepage = http://www.zabbix.com/; license = licenses.gpl2; maintainers = [ maintainers.eelco ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.linux; }; }; diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 3277f8e9be3..31ffcd14bbe 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, which, m4, python , protobuf, boost, zlib, curl, openssl, icu, jemalloc, libtool +, pythonPackages, makeWrapper }: stdenv.mkDerivation rec { name = "rethinkdb-${version}"; - version = "2.3.4"; + version = "2.3.5"; src = fetchurl { url = "https://download.rethinkdb.com/dist/${name}.tgz"; - sha256 = "19z1m4r1mqnbia207q0nvs39rn7jk8zsr2rvps2d11fp3ryr59wk"; + sha256 = "047fz3r0rn95mqr5p1xfdprf0hq4avq2a1q8zsdifxxid7hyx2nx"; }; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { "--lib-path=${jemalloc}/lib" ]; - buildInputs = [ protobuf boost zlib curl openssl icu ] + buildInputs = [ protobuf boost zlib curl openssl icu makeWrapper ] ++ stdenv.lib.optional (!stdenv.isDarwin) jemalloc ++ stdenv.lib.optional stdenv.isDarwin libtool; @@ -36,6 +37,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = '' + wrapProgram $out/bin/rethinkdb \ + --prefix PATH ":" "${pythonPackages.rethinkdb}/bin" + ''; + meta = { description = "An open-source distributed database built with love"; longDescription = '' diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 85dfa805fc1..3e340ba7df4 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { description = "An implementation of the Kerberos 5 network security system"; license = licenses.gpl3Plus; maintainers = with maintainers; [ bjg lovek323 wkennington ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/softether/4.18.nix b/pkgs/servers/softether/4.18.nix index 4b5b67cf85b..69c6cbe2c86 100644 --- a/pkgs/servers/softether/4.18.nix +++ b/pkgs/servers/softether/4.18.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = https://www.softether.org/; license = licenses.gpl2; maintainers = [ maintainers.rick68 ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index b58ca5f44b9..c0e97dab812 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -33,6 +33,7 @@ let [ (if lib.versionAtLeast version "9.4" then ./disable-resolve_symlinks-94.patch else ./disable-resolve_symlinks.patch) ./less-is-more.patch ./hardcode-pgxs-path.patch + ./specify_pkglibdir_at_runtime.patch ]; installTargets = [ "install-world" ]; diff --git a/pkgs/servers/sql/postgresql/specify_pkglibdir_at_runtime.patch b/pkgs/servers/sql/postgresql/specify_pkglibdir_at_runtime.patch new file mode 100644 index 00000000000..fe95d2ee99f --- /dev/null +++ b/pkgs/servers/sql/postgresql/specify_pkglibdir_at_runtime.patch @@ -0,0 +1,29 @@ +diff -ur postgresql-9.5.3-orig/src/port/path.c postgresql-9.5.3/src/port/path.c +--- postgresql-9.5.3-orig/src/port/path.c 2016-05-09 22:50:23.000000000 +0200 ++++ postgresql-9.5.3/src/port/path.c 2016-08-29 22:44:10.507377613 +0200 +@@ -714,7 +714,11 @@ + void + get_lib_path(const char *my_exec_path, char *ret_path) + { +- make_relative_path(ret_path, LIBDIR, PGBINDIR, my_exec_path); ++ char const * const nix_pglibdir = getenv("NIX_PGLIBDIR"); ++ if(nix_pglibdir == NULL) ++ make_relative_path(ret_path, LIBDIR, PGBINDIR, my_exec_path); ++ else ++ make_relative_path(ret_path, nix_pglibdir, PGBINDIR, my_exec_path); + } + + /* +@@ -723,7 +727,11 @@ + void + get_pkglib_path(const char *my_exec_path, char *ret_path) + { +- make_relative_path(ret_path, PKGLIBDIR, PGBINDIR, my_exec_path); ++ char const * const nix_pglibdir = getenv("NIX_PGLIBDIR"); ++ if(nix_pglibdir == NULL) ++ make_relative_path(ret_path, PKGLIBDIR, PGBINDIR, my_exec_path); ++ else ++ make_relative_path(ret_path, nix_pglibdir, PGBINDIR, my_exec_path); + } + + /* diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index aba8efa0798..715720b335f 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SQL/RDF database used by, e.g., KDE-nepomuk"; homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/; - platforms = platforms.all; + platforms = platforms.linux; maintainers = [ maintainers.urkud ]; }; } diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix index 7a8db3f2962..2087829084f 100644 --- a/pkgs/servers/sql/virtuoso/7.x.nix +++ b/pkgs/servers/sql/virtuoso/7.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "SQL/RDF database used by, e.g., KDE-nepomuk"; homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/; #configure: The current version [...] can only be built on 64bit platforms - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.urkud ]; }; } diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index d011391da3f..1f2c616f1cf 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -327,6 +327,19 @@ in ]; }; + # Obsolete drivers that don't compile anymore. + xf86videoark = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; + xf86videogeode = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; + xf86videoglide = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; + xf86videoglint = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; + xf86videoi128 = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; + xf86videonewport = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; + xf86videoopenchrome = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; + xf86videotga = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; + xf86videov4l = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; + xf86videovoodoo = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; + xf86videowsfb = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; + xf86videoamdgpu = attrs: attrs // { configureFlags = [ "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" ]; }; diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 832f8a4f8c5..44f318a0cc6 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { + (lib.optionalString (!isi686 && !isx86_64) "-DNOJIT ") + "-Dunix"; CXXFLAGS = with stdenv; "" - + (lib.optionalString (isi686) "-march=i686 ") - + (lib.optionalString (isx86_64) "-march=nocona ") - + "-O3 -mtune=generic -DNDEBUG"; + + (lib.optionalString isi686 "-march=i686 -mtune=generic ") + + (lib.optionalString isx86_64 "-march=nocona -mtune=generic ") + + "-O3 -DNDEBUG"; in '' buildFlagsArray=( "CPPFLAGS=${CPPFLAGS}" "CXXFLAGS=${CXXFLAGS}" ) ''; diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 5121ecc9477..ecc6bec3005 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -1,15 +1,23 @@ -{ stdenv, fetchurl, fetchpatch -, gnu-efi, efibootmgr, dosfstools, imagemagick }: +{ stdenv, fetchurl, fetchpatch, gnu-efi }: -assert (stdenv.system == "x86_64-linux" ||stdenv.system == "i686-linux"); +let + archids = { + "x86_64-linux" = { hostarch = "x86_64"; efiPlatform = "x64"; }; + "i686-linux" = rec { hostarch = "ia32"; efiPlatform = hostarch; }; + }; + + inherit + (archids.${stdenv.system} or (throw "unsupported system: ${stdenv.system}")) + hostarch efiPlatform; +in stdenv.mkDerivation rec { - - name = "refind-${meta.version}"; - srcName = "refind-src-${meta.version}"; + name = "refind-${version}"; + version = "0.10.3"; + srcName = "refind-src-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/refind/${meta.version}/${srcName}.tar.gz"; + url = "mirror://sourceforge/project/refind/${version}/${srcName}.tar.gz"; sha256 = "1r2qp29mz08lx36i7x52i2598773bxvfhwryd954ssq2baifjav5"; }; @@ -21,33 +29,31 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ gnu-efi efibootmgr dosfstools imagemagick ]; + buildInputs = [ gnu-efi ]; hardeningDisable = [ "stackprotector" ]; - HOSTARCH = - if stdenv.system == "x86_64-linux" then "x64" - else if stdenv.system == "i686-linux" then "ia32" - else "null"; - postPatch = '' sed -e 's|-DEFI_FUNCTION_WRAPPER|-DEFI_FUNCTION_WRAPPER -maccumulate-outgoing-args|g' -i Make.common sed -e 's|-DEFIX64|-DEFIX64 -maccumulate-outgoing-args|g' -i Make.common sed -e 's|-m64|-maccumulate-outgoing-args -m64|g' -i filesystems/Make.gnuefi ''; - buildPhase = - let ldScript = - if stdenv.system == "x86_64-linux" then "elf_x86_64_efi.lds" - else if stdenv.system == "i686-linux" then "elf_ia32_efi.lds" else "null"; - in '' - make prefix= EFIINC=${gnu-efi}/include/efi EFILIB=${gnu-efi}/lib GNUEFILIB=${gnu-efi}/lib EFICRT0=${gnu-efi}/lib LDSCRIPT=${gnu-efi}/lib/${ldScript} gnuefi fs_gnuefi - ''; + makeFlags = + [ "prefix=" + "EFIINC=${gnu-efi}/include/efi" + "EFILIB=${gnu-efi}/lib" + "GNUEFILIB=${gnu-efi}/lib" + "EFICRT0=${gnu-efi}/lib" + "HOSTARCH=${hostarch}" + ]; + + buildFlags = [ "gnuefi" "fs_gnuefi" ]; installPhase = '' install -d $out/bin/ - install -d $out/share/refind/drivers_${HOSTARCH}/ - install -d $out/share/refind/tools_${HOSTARCH}/ + install -d $out/share/refind/drivers_${efiPlatform}/ + install -d $out/share/refind/tools_${efiPlatform}/ install -d $out/share/refind/docs/html/ install -d $out/share/refind/docs/Styles/ install -d $out/share/refind/fonts/ @@ -56,16 +62,16 @@ stdenv.mkDerivation rec { install -d $out/share/refind/keys/ # refind uefi app - install -D -m0644 refind/refind_${HOSTARCH}.efi $out/share/refind/refind_${HOSTARCH}.efi + install -D -m0644 refind/refind_${efiPlatform}.efi $out/share/refind/refind_${efiPlatform}.efi # uefi drivers - install -D -m0644 drivers_${HOSTARCH}/*.efi $out/share/refind/drivers_${HOSTARCH}/ + install -D -m0644 drivers_${efiPlatform}/*.efi $out/share/refind/drivers_${efiPlatform}/ # uefi apps - install -D -m0644 gptsync/gptsync_${HOSTARCH}.efi $out/share/refind/tools_${HOSTARCH}/gptsync_${HOSTARCH}.efi + install -D -m0644 gptsync/gptsync_${efiPlatform}.efi $out/share/refind/tools_${efiPlatform}/gptsync_${efiPlatform}.efi # helper scripts - install -D -m0755 refind-install $out/bin/refind-install + install -D -m0755 refind-install $out/share/refind/refind-install install -D -m0755 mkrlconf $out/bin/refind-mkrlconf install -D -m0755 mvrefind $out/bin/refind-mvrefind install -D -m0755 fonts/mkfont.sh $out/bin/refind-mkfont @@ -94,16 +100,26 @@ stdenv.mkDerivation rec { # keys install -D -m0644 keys/* $out/share/refind/keys/ - # fix sharp-bang paths - patchShebangs $out/bin/refind-* + # The refind-install script assumes that all resource files are + # installed under the same directory as the script itself. To avoid + # having to patch around this assumption, generate a wrapper that + # cds into $out/share/refind and executes the real script from + # there. + cat >$out/bin/refind-install < { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}: + +let + nodeEnv = import ../../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv python utillinux runCommand writeTextFile; + inherit nodejs; + }; +in +import ./node-packages.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} \ No newline at end of file diff --git a/pkgs/tools/package-management/nixui/node-default.nix b/pkgs/tools/package-management/nixui/node-default.nix deleted file mode 100644 index 3c2c522cb75..00000000000 --- a/pkgs/tools/package-management/nixui/node-default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ nixui ? { outPath = ./.; name = "nixui"; } -, pkgs ? import {} -}: -let - nodePackages = import ../../../top-level/node-packages.nix { - inherit pkgs; - inherit (pkgs) stdenv nodejs fetchurl fetchgit; - neededNatives = [ pkgs.python ] ++ pkgs.lib.optional pkgs.stdenv.isLinux pkgs.utillinux; - self = nodePackages; - generated = ./node.nix; - }; -in rec { - tarball = pkgs.runCommand "nixui.tgz" { buildInputs = [ pkgs.nodejs ]; } '' - mv `HOME=$PWD npm pack ${nixui}` $out - ''; - build = nodePackages.buildNodePackage { - name = "nixui"; - src = [ tarball ]; - buildInputs = nodePackages.nativeDeps."nixui" or []; - deps = [ nodePackages.underscore nodePackages.nedb nodePackages.isnumber ]; - peerDependencies = []; - passthru.names = [ "nixui" ]; - }; -} diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix new file mode 100644 index 00000000000..79a52d54ca2 --- /dev/null +++ b/pkgs/tools/package-management/nixui/node-packages.nix @@ -0,0 +1,101 @@ +# This file has been generated by node2nix 1.0.1. Do not edit! + +{nodeEnv, fetchurl, fetchgit}: + +let + sources = { + "isnumber-1.0.0" = { + name = "isnumber"; + packageName = "isnumber"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isnumber/-/isnumber-1.0.0.tgz"; + sha1 = "0e3f9759b581d99dd85086f0ec2a74909cfadd01"; + }; + }; + "nedb-1.0.2" = { + name = "nedb"; + packageName = "nedb"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nedb/-/nedb-1.0.2.tgz"; + sha1 = "309f10ba29f2002f74a92fb870b8a53ba2131593"; + }; + }; + "underscore-1.8.3" = { + name = "underscore"; + packageName = "underscore"; + version = "1.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; + sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; + }; + }; + "async-0.2.10" = { + name = "async"; + packageName = "async"; + version = "0.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; + sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; + }; + }; + "underscore-1.4.4" = { + name = "underscore"; + packageName = "underscore"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; + sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + }; + }; + "binary-search-tree-0.2.4" = { + name = "binary-search-tree"; + packageName = "binary-search-tree"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.4.tgz"; + sha1 = "14fe106366a59ca8efb68c0ae30c36aaff0cd510"; + }; + }; + "mkdirp-0.3.5" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; + sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; + }; + }; + }; +in +{ + "nixui-git://github.com/matejc/nixui.git#0.2.1" = nodeEnv.buildNodePackage { + name = "nixui"; + packageName = "nixui"; + version = "0.2.1"; + src = fetchgit { + url = "git://github.com/matejc/nixui.git"; + rev = "845a5f4a33f1d0c509c727c130d0792a5b450a38"; + sha256 = "2a2b1dcd9201e306242688c6c86f520ac47ef5de841ae0d7ea6ae8ff2889c3ab"; + }; + dependencies = [ + sources."isnumber-1.0.0" + (sources."nedb-1.0.2" // { + dependencies = [ + sources."async-0.2.10" + sources."underscore-1.4.4" + sources."binary-search-tree-0.2.4" + sources."mkdirp-0.3.5" + ]; + }) + sources."underscore-1.8.3" + ]; + meta = { + description = "nix-env frontend written with Polymer"; + homepage = https://github.com/matejc/nixui; + license = "Apache-2.0"; + }; + production = true; + }; +} \ No newline at end of file diff --git a/pkgs/tools/package-management/nixui/node.nix b/pkgs/tools/package-management/nixui/node.nix deleted file mode 100644 index 38183c2dd9f..00000000000 --- a/pkgs/tools/package-management/nixui/node.nix +++ /dev/null @@ -1,608 +0,0 @@ -{ self, fetchurl, fetchgit ? null, lib }: - -{ - by-spec."async"."0.2.10" = - self.by-version."async"."0.2.10"; - by-version."async"."0.2.10" = self.buildNodePackage { - name = "async-0.2.10"; - version = "0.2.10"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; - name = "async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."binary-search-tree"."0.2.4" = - self.by-version."binary-search-tree"."0.2.4"; - by-version."binary-search-tree"."0.2.4" = self.buildNodePackage { - name = "binary-search-tree-0.2.4"; - version = "0.2.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.4.tgz"; - name = "binary-search-tree-0.2.4.tgz"; - sha1 = "14fe106366a59ca8efb68c0ae30c36aaff0cd510"; - }; - deps = { - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - 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-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."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."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."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."expect.js"."~0.3.1" = - self.by-version."expect.js"."0.3.1"; - by-version."expect.js"."0.3.1" = self.buildNodePackage { - name = "expect.js-0.3.1"; - version = "0.3.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/expect.js/-/expect.js-0.3.1.tgz"; - name = "expect.js-0.3.1.tgz"; - sha1 = "b0a59a0d2eff5437544ebf0ceaa6015841d09b5b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "expect.js" = self.by-version."expect.js"."0.3.1"; - 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.3" = self.by-version."samsam"."1.1.3"; - }; - 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."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."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."inherits"."2" = - self.by-version."inherits"."2.0.1"; - by-version."inherits"."2.0.1" = self.buildNodePackage { - name = "inherits-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - name = "inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."inherits"."2.0.1" = - self.by-version."inherits"."2.0.1"; - by-spec."isnumber"."^1.0.0" = - self.by-version."isnumber"."1.0.0"; - by-version."isnumber"."1.0.0" = self.buildNodePackage { - name = "isnumber-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/isnumber/-/isnumber-1.0.0.tgz"; - name = "isnumber-1.0.0.tgz"; - sha1 = "0e3f9759b581d99dd85086f0ec2a74909cfadd01"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "isnumber" = self.by-version."isnumber"."1.0.0"; - 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."lru-cache"."2" = - self.by-version."lru-cache"."2.7.0"; - by-version."lru-cache"."2.7.0" = self.buildNodePackage { - name = "lru-cache-2.7.0"; - version = "2.7.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"; - name = "lru-cache-2.7.0.tgz"; - sha1 = "aaa376a4cd970f9cebf5ec1909566ec034f07ee6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."minimatch"."~0.2.11" = - 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.7.0" = self.by-version."lru-cache"."2.7.0"; - "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."minimist"."0.0.8" = - self.by-version."minimist"."0.0.8"; - by-version."minimist"."0.0.8" = self.buildNodePackage { - name = "minimist-0.0.8"; - version = "0.0.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - name = "minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - 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.0" = - self.by-version."mkdirp"."0.5.0"; - by-version."mkdirp"."0.5.0" = self.buildNodePackage { - name = "mkdirp-0.5.0"; - version = "0.5.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"; - name = "mkdirp-0.5.0.tgz"; - sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12"; - }; - deps = { - "minimist-0.0.8" = self.by-version."minimist"."0.0.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - 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; - src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - name = "mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mocha"."~1.21.0" = - self.by-version."mocha"."1.21.5"; - by-version."mocha"."1.21.5" = self.buildNodePackage { - name = "mocha-1.21.5"; - version = "1.21.5"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/mocha/-/mocha-1.21.5.tgz"; - name = "mocha-1.21.5.tgz"; - sha1 = "7c58b09174df976e434a23b1e8d639873fc529e9"; - }; - 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"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "mocha" = self.by-version."mocha"."1.21.5"; - by-spec."ms"."0.6.2" = - self.by-version."ms"."0.6.2"; - by-version."ms"."0.6.2" = self.buildNodePackage { - name = "ms-0.6.2"; - version = "0.6.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; - name = "ms-0.6.2.tgz"; - sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."nedb"."~1.0.0" = - self.by-version."nedb"."1.0.2"; - by-version."nedb"."1.0.2" = self.buildNodePackage { - name = "nedb-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/nedb/-/nedb-1.0.2.tgz"; - name = "nedb-1.0.2.tgz"; - sha1 = "309f10ba29f2002f74a92fb870b8a53ba2131593"; - }; - deps = { - "async-0.2.10" = self.by-version."async"."0.2.10"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - "binary-search-tree-0.2.4" = self.by-version."binary-search-tree"."0.2.4"; - "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "nedb" = self.by-version."nedb"."1.0.2"; - by-spec."samsam"."~1.1" = - self.by-version."samsam"."1.1.3"; - by-version."samsam"."1.1.3" = self.buildNodePackage { - name = "samsam-1.1.3"; - version = "1.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/samsam/-/samsam-1.1.3.tgz"; - name = "samsam-1.1.3.tgz"; - sha1 = "9f5087419b4d091f232571e7fa52e90b0f552621"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sigmund"."~1.0.0" = - self.by-version."sigmund"."1.0.1"; - by-version."sigmund"."1.0.1" = self.buildNodePackage { - name = "sigmund-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; - name = "sigmund-1.0.1.tgz"; - sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sinon"."~1.10.3" = - 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."underscore"."^1.6.0" = - self.by-version."underscore"."1.8.3"; - by-version."underscore"."1.8.3" = self.buildNodePackage { - name = "underscore-1.8.3"; - version = "1.8.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; - name = "underscore-1.8.3.tgz"; - sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "underscore" = self.by-version."underscore"."1.8.3"; - 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."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 = [ ]; - }; -} diff --git a/pkgs/tools/package-management/nixui/pkg.json b/pkgs/tools/package-management/nixui/pkg.json new file mode 100644 index 00000000000..551df4f1b1c --- /dev/null +++ b/pkgs/tools/package-management/nixui/pkg.json @@ -0,0 +1,3 @@ +[ + { "nixui": "git://github.com/matejc/nixui.git#0.2.1" } +] diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 87a0596f6f0..c4d0f20d6c2 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "1.0.16"; + version = "1.0.17"; rev = "v${version}"; goPackagePath = "github.com/keybase/client"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; inherit rev; - sha256 = "0p62cqpfgx9b5kfnviqpig27i20yv9bg5mq61am5xrmkp68jk35b"; + sha256 = "14cj0npsvnc3whw7gashgd7lhj3lvjdkivsnvsjg7dp3hifvqxnx"; }; buildFlags = [ "-tags production" ]; diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix index a4aec5369fc..fc1d98806f0 100644 --- a/pkgs/tools/security/vidalia/default.nix +++ b/pkgs/tools/security/vidalia/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "A cross-platform graphical controller for the Tor software, built using the Qt framework"; license = licenses.gpl2Plus; maintainers = [ maintainers.phreedom ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index 15fcdcf6c9d..6085e6f841a 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -5,7 +5,7 @@ export PLAN9_TARGET=$PLAN9 configurePhase() { - echo CFLAGS=\"-I${fontconfig_dev}/include -I${libXt_dev}/include\" > LOCAL.config + echo CFLAGS=\"-I${fontconfig_dev}/include -I${libXt_dev}/include -I${freetype_dev}/include\" > LOCAL.config echo X11=\"${libXt_dev}/include\" >> LOCAL.config for f in `grep -l -r /usr/local/plan9`; do diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 6d2581550a4..f7668e1374a 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -1,26 +1,35 @@ -{stdenv, fetchgit, which, libX11, libXt, fontconfig +{ stdenv, fetchgit, which, libX11, libXt, fontconfig, freetype , xproto ? null , xextproto ? null , libXext ? null # For building web manuals -, perl ? null }: +, perl ? null +, samChordingSupport ? true #from 9front +}: stdenv.mkDerivation rec { - name = "plan9port-2015-06-29"; + name = "plan9port-2015-11-10"; src = fetchgit { # Latest, same as on github, google code is old url = "https://plan9port.googlesource.com/plan9"; - rev = "71de840"; - sha256 = "002ma7h7z3wii520dhijikwdc679hpwn0jv5a0c8g299drvzq2wx"; + rev = "0d2dfbc"; + sha256 = "1h16wvps4rfkjim2ihkmniw8wzl7yill5910larci1c70x6zcicf"; }; - patches = [ ./fontsrv.patch ]; - postPatch = - '' - substituteInPlace src/cmd/acme/acme.c \ - --replace /lib/font/bit $out/plan9/font - ''; + patches = [ + ./fontsrv.patch + ] ++ stdenv.lib.optionals samChordingSupport [ ./sam_chord_9front.patch ]; + + postPatch = '' + #hardcoded path + substituteInPlace src/cmd/acme/acme.c \ + --replace /lib/font/bit $out/plan9/font + #deprecated flags + find . -type f \ + -exec sed -i -e 's/_SVID_SOURCE/_DEFAULT_SOURCE/g' {} \; \ + -exec sed -i -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' {} \; + ''; builder = ./builder.sh; @@ -35,6 +44,7 @@ stdenv.mkDerivation rec { libXt xextproto libXext + freetype #fontsrv wants ft2build.h. provides system fonts for acme and sam. ]; enableParallelBuilding = true; @@ -49,4 +59,5 @@ stdenv.mkDerivation rec { libXt_dev = libXt.dev; fontconfig_dev = fontconfig.dev; + freetype_dev = freetype.dev; } diff --git a/pkgs/tools/system/plan9port/sam_chord_9front.patch b/pkgs/tools/system/plan9port/sam_chord_9front.patch new file mode 100644 index 00000000000..8920770e810 --- /dev/null +++ b/pkgs/tools/system/plan9port/sam_chord_9front.patch @@ -0,0 +1,215 @@ +diff -r -c p9p/src/cmd/sam/xec.c p9p-patched/src/cmd/sam/xec.c +*** p9p/src/cmd/sam/xec.c 2016-04-18 21:07:22.000000000 +0300 +--- p9p-patched/src/cmd/sam/xec.c 2016-08-31 06:35:26.910876148 +0300 +*************** +*** 277,282 **** +--- 277,283 ---- + else + while(n++ && undo(FALSE)) + ; ++ moveto(f, f->dot.r); + return TRUE; + } + +diff -r -c p9p/src/cmd/samterm/flayer.c p9p-patched/src/cmd/samterm/flayer.c +*** p9p/src/cmd/samterm/flayer.c 2016-04-18 21:07:22.000000000 +0300 +--- p9p-patched/src/cmd/samterm/flayer.c 2016-08-31 06:46:19.441411045 +0300 +*************** +*** 254,274 **** + int + flselect(Flayer *l) + { +- int ret; + if(l->visible!=All) + flupfront(l); +! frselect(&l->f, mousectl); +! ret = 0; +! if(l->f.p0==l->f.p1){ +! if(mousep->msec-l->clickf.p0+l->origin==l->p0){ +! ret = 1; + l->click = 0; +! }else +! l->click = mousep->msec; +! }else +! l->click = 0; + l->p0 = l->f.p0+l->origin, l->p1 = l->f.p1+l->origin; +! return ret; + } + + void +--- 254,271 ---- + int + flselect(Flayer *l) + { + if(l->visible!=All) + flupfront(l); +! if(l->f.p0==l->f.p1) +! if(mousep->msec-l->clickf.p0+l->origin==l->p0 && +! l->f.p0==frcharofpt(&l->f, mousep->xy)){ + l->click = 0; +! return 1; +! } +! l->click = mousep->msec; +! frselect(&l->f, mousectl); + l->p0 = l->f.p0+l->origin, l->p1 = l->f.p1+l->origin; +! return 0; + } + + void +diff -r -c p9p/src/cmd/samterm/main.c p9p-patched/src/cmd/samterm/main.c +*** p9p/src/cmd/samterm/main.c 2016-04-18 21:07:22.000000000 +0300 +--- p9p-patched/src/cmd/samterm/main.c 2016-08-31 06:52:05.670322598 +0300 +*************** +*** 23,33 **** + char hostlock = 1; + char hasunlocked = 0; + int maxtab = 8; +- int chord; + int autoindent; + +- #define chording 0 /* code here for reference but it causes deadlocks */ +- + void + notifyf(void *a, char *msg) + { +--- 23,30 ---- +*************** +*** 39,45 **** + void + threadmain(int argc, char *argv[]) + { +! int i, got, scr, w; + Text *t; + Rectangle r; + Flayer *nwhich; +--- 36,42 ---- + void + threadmain(int argc, char *argv[]) + { +! int i, got, scr, chord; + Text *t; + Rectangle r; + Flayer *nwhich; +*************** +*** 84,89 **** +--- 81,87 ---- + startnewfile(Tstartcmdfile, &cmd); + + got = 0; ++ chord = 0; + if(protodebug) print("loop\n"); + for(;;got = waitforio()){ + if(hasunlocked && RESIZED()) +*************** +*** 108,163 **** + continue; + } + nwhich = flwhich(mousep->xy); +! scr = which && ptinrect(mousep->xy, which->scroll); + if(mousep->buttons) + flushtyping(1); +! if(chording && chord==1 && !mousep->buttons) + chord = 0; +! if(chording && chord) + chord |= mousep->buttons; +! else if(mousep->buttons&1){ +! if(nwhich){ +! if(nwhich!=which) +! current(nwhich); +! else if(scr) +! scroll(which, 1); +! else{ +! t=(Text *)which->user1; +! if(flselect(which)){ +! outTsl(Tdclick, t->tag, which->p0); +! t->lock++; +! }else if(t!=&cmd) +! outcmd(); +! if(mousep->buttons&1) +! chord = mousep->buttons; + } + } + }else if((mousep->buttons&2) && which){ + if(scr) + scroll(which, 2); + else + menu2hit(); +! }else if((mousep->buttons&4)){ + if(scr) +! scroll(which, 3); + else + menu3hit(); + } + mouseunblock(); + } +- if(chording && chord){ +- t = (Text*)which->user1; +- if(!t->lock && !hostlock){ +- w = which-t->l; +- if(chord&2){ +- cut(t, w, 1, 1); +- chord &= ~2; +- }else if(chord&4){ +- paste(t, w); +- chord &= ~4; +- } +- } +- } + } + } + +--- 106,159 ---- + continue; + } + nwhich = flwhich(mousep->xy); +! scr = which && (ptinrect(mousep->xy, which->scroll) || +! mousep->buttons&(8|16)); + if(mousep->buttons) + flushtyping(1); +! if((mousep->buttons&1)==0) + chord = 0; +! if(chord && which && which==nwhich){ + chord |= mousep->buttons; +! t = (Text *)which->user1; +! if(!t->lock){ +! int w = which-t->l; +! if(chord&2){ +! cut(t, w, 1, 1); +! chord &= ~2; +! } +! if(chord&4){ +! paste(t, w); +! chord &= ~4; + } + } ++ }else if(mousep->buttons&(1|8)){ ++ if(scr) ++ scroll(which, (mousep->buttons&8) ? 4 : 1); ++ else if(nwhich && nwhich!=which) ++ current(nwhich); ++ else{ ++ t=(Text *)which->user1; ++ if(flselect(which)){ ++ outTsl(Tdclick, t->tag, which->p0); ++ t->lock++; ++ }else if(t!=&cmd) ++ outcmd(); ++ if(mousep->buttons&1) ++ chord = mousep->buttons; ++ } + }else if((mousep->buttons&2) && which){ + if(scr) + scroll(which, 2); + else + menu2hit(); +! }else if(mousep->buttons&(4|16)){ + if(scr) +! scroll(which, (mousep->buttons&16) ? 5 : 3); + else + menu3hit(); + } + mouseunblock(); + } + } + } + diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 5e0f5801ec9..3d4f99fc1f0 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "14d3a93ha5k4al4ib43nyn1ppx7kgb12xw6mkflhx8nxmx8827nc"; }; - buildInputs = [ pkgconfig openssl ] ++ + buildInputs = [ pkgconfig openssl stdenv.cc.libc.static ] ++ (if libuuid == null then [] else [ (stdenv.lib.overrideDerivation libuuid diff --git a/pkgs/tools/text/wring/default.nix b/pkgs/tools/text/wring/default.nix deleted file mode 100644 index 038456f82c5..00000000000 --- a/pkgs/tools/text/wring/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, callPackage, makeWrapper, nodejs, phantomjs2 }: - -let - self = ( - callPackage ../../../top-level/node-packages.nix { - generated = callPackage ./node-packages.nix { inherit self; }; - overrides = { - "wring" = { - buildInputs = [ makeWrapper phantomjs2 ]; - - postInstall = '' - wrapProgram "$out/bin/wring" \ - --prefix PATH : ${phantomjs2}/bin - ''; - - meta = with stdenv.lib; { - description = "Command-line tool for extracting content from webpages using CSS Selectors, XPath, and JS expressions"; - homepage = https://github.com/osener/wring; - license = licenses.mit; - platforms = platforms.darwin ++ platforms.linux; - maintainers = [ maintainers.osener ]; - }; - }; - }; - }); -in self.wring diff --git a/pkgs/tools/text/wring/node-packages.json b/pkgs/tools/text/wring/node-packages.json deleted file mode 100644 index 9c0e1712928..00000000000 --- a/pkgs/tools/text/wring/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "wring" ] diff --git a/pkgs/tools/text/wring/node-packages.nix b/pkgs/tools/text/wring/node-packages.nix deleted file mode 100644 index b3761bd33cb..00000000000 --- a/pkgs/tools/text/wring/node-packages.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ self, fetchurl, fetchgit ? null, lib }: - -{ - by-spec."wring"."*" = - self.by-version."wring"."1.0.0"; - by-version."wring"."1.0.0" = self.buildNodePackage { - name = "wring-1.0.0"; - version = "1.0.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/wring/-/wring-1.0.0.tgz"; - name = "wring-1.0.0.tgz"; - sha1 = "3d8ebe894545bf0b42946fdc84c61e37ae657ce1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "wring" = self.by-version."wring"."1.0.0"; -} diff --git a/pkgs/tools/typesetting/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix deleted file mode 100644 index 550870b0a6a..00000000000 --- a/pkgs/tools/typesetting/tex/texlive/aggregate.nix +++ /dev/null @@ -1,87 +0,0 @@ -args @ {poppler, perl, makeWrapper, ... }: with args; -rec { - name = "TeXLive-linkdir"; - - buildInputs = lib.closePropagation paths - ++ [perl] - ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; - - phaseNames = [ "doAggregate" ]; - - doAggregate = fullDepEntry ('' - set +o pipefail - - mkdir -p $out/bin - for currentPath in ${lib.concatStringsSep " " buildInputs}; do - echo Symlinking "$currentPath" - find $currentPath/share/info $currentPath/share/man $(echo $currentPath/texmf*/) -type d | while read; do - REPLY="''${REPLY#$currentPath}" - mkdir -p $out/"$REPLY" - done - find $currentPath/share/info $currentPath/share/man $(echo $currentPath/texmf*/) ! -type d | while read; do - REPLY="''${REPLY#$currentPath}" - ln -fs $currentPath/"$REPLY" $out/"$REPLY" - echo - done | while read; do head -n 999 >/dev/null; echo -n .; done - - for i in "$currentPath/bin/"* :; do - test "$i" != : || continue - echo -ne "#! $SHELL\\nexec $i \"\$@\"" > "$out/bin/$(basename "$i")" && \ - chmod a+x "$out/bin/$(basename "$i")" - done - - echo - - cp -Trfp $currentPath/libexec $out/libexec || true - done - - ln -s $out/texmf* $out/share/ - - rm -rf $out/texmf-config - find $out/texmf*/ -type d | while read; do - REPLY="''${REPLY#$out/texmf}" - mkdir -p $out/texmf-config/"$REPLY" - done - - for i in $out/libexec/*/* :; do - test "$i" = : && continue; - test -f "$i" && \ - test -x "$i" && \ - echo -ne "#! $SHELL\\nexec $i \"\$@\"" >$out/bin/$(basename $i) && \ - chmod a+x $out/bin/$(basename $i) - done - - rm -f $out/texmf*/ls-R - for i in web2c texconfig fonts/map; do - mkdir -p $out/texmf-config/$i - cp -Lr $out/texmf*/$i/* $out/texmf-config/$i || true - done - chmod -R u+w $out/texmf-config - - yes | TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees - yes | PATH=$PATH:$out/bin mktexlsr $out/texmf* - yes | TEXMFCONFIG=$out/texmf-config HOME=$PWD PATH=$PATH:$out/bin updmap --syncwithtrees - yes | PATH=$PATH:$out/bin mktexlsr $out/texmf* - '' + stdenv.lib.optionalString stdenv.isDarwin '' - # did the same thing in texLive, but couldn't get it to carry to the - # binaries installed by texLiveFull - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler.out}/lib" - done - '' ) [ "minInit" "defEnsureDir" "addInputs" ]; - - preferLocalBuild = true; - - meta = { - description = "TeX distribution directory"; - longDescription = '' - Here all the files from different TeX-related - packages are collected in one directory. Of - course, mktexlsr is called. Later placed - directories take precedence. It is supposed that - share and libexec are symlinked, and bin is - recreated with wrappers for libexec-located - linked binaries. - ''; - }; -} diff --git a/pkgs/tools/typesetting/tex/texlive/beamer.nix b/pkgs/tools/typesetting/tex/texlive/beamer.nix deleted file mode 100644 index 7acecd66543..00000000000 --- a/pkgs/tools/typesetting/tex/texlive/beamer.nix +++ /dev/null @@ -1,25 +0,0 @@ -args @ {texLiveLatexXColor, texLivePGF, texLive, ...}: with args; -rec { - name = "texlive-beamer-2013"; - src = fetchurl { - url = mirror://debian/pool/main/l/latex-beamer/latex-beamer_3.24.orig.tar.gz; - sha256 = "0rzjlbs67kzmvlh7lwga4yxgddvrvfkkhhx1ajdn4lqy2w9zxiv8"; - }; - - buildInputs = [texLive]; - propagatedBuildInputs = [texLiveLatexXColor texLivePGF]; - phaseNames = ["doCopy"]; - doCopy = fullDepEntry ('' - mkdir -p $out/share/ - - mkdir -p $out/texmf-dist/tex/latex/beamer - cp -r * $out/texmf-dist/tex/latex/beamer - - ln -s $out/texmf* $out/share/ - '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"]; - - meta = { - description = "Extra components for TeXLive: beamer class"; - maintainers = [ stdenv.lib.maintainers.mornfall stdenv.lib.maintainers.jwiegley ]; - }; -} diff --git a/pkgs/tools/typesetting/tex/texlive/cm-super.nix b/pkgs/tools/typesetting/tex/texlive/cm-super.nix deleted file mode 100644 index 5c442fad27f..00000000000 --- a/pkgs/tools/typesetting/tex/texlive/cm-super.nix +++ /dev/null @@ -1,35 +0,0 @@ -args @ {texLive, ...}: with args; -rec { - name = "texlive-cm-super-2009"; - src = fetchurl { - url = mirror://debian/pool/main/c/cm-super/cm-super_0.3.4.orig.tar.gz; - sha256 = "0zrq4sr9ank35svkz3cfd7f978i9c8xbzdqm2c8kvxia2753v082"; - }; - - phaseNames = ["doCopy"]; - doCopy = fullDepEntry ('' - mkdir -p $out/share/ - - mkdir -p $out/texmf-dist/fonts/enc - mkdir -p $out/texmf-dist/fonts/map - mkdir -p $out/texmf-dist/fonts/type1/public/cm-super - cp pfb/*.pfb $out/texmf-dist/fonts/type1/public/cm-super - mkdir -p $out/texmf-dist/dvips/cm-super - cp dvips/*.{map,enc} $out/texmf-dist/dvips/cm-super - cp dvips/*.enc $out/texmf-dist/fonts/enc - cp dvips/*.map $out/texmf-dist/fonts/map - mkdir -p $out/texmf-dist/dvipdfm/config - cp dvipdfm/*.map $out/texmf-dist/dvipdfm/config - - ln -s $out/texmf* $out/share/ - '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"]; - buildInputs = [texLive]; - - meta = { - description = "Extra components for TeXLive: CM-Super fonts"; - maintainers = [ args.lib.maintainers.raskin ]; - - # Actually, arch-independent.. - hydraPlatforms = []; - }; -} diff --git a/pkgs/tools/typesetting/tex/texlive/context.nix b/pkgs/tools/typesetting/tex/texlive/context.nix deleted file mode 100644 index 2cc62c33409..00000000000 --- a/pkgs/tools/typesetting/tex/texlive/context.nix +++ /dev/null @@ -1,25 +0,0 @@ -args @ { texLive, ... }: with args; -rec { - name = "context-2014.05.21"; - src = fetchurl { - url = mirror://debian/pool/main/c/context/context_2014.05.21.20140528.orig.tar.gz; - sha256 = "1d744xrsjyl52x2xbh87k5ad826mzz8yqmhdznrmqrhk3qpjkzic"; - }; - - buildInputs = [texLive]; - phaseNames = ["doCopy"]; - doCopy = fullDepEntry ('' - mkdir -p $out/share/ - - mkdir -p $out/texmf-dist - cp -r * $out/texmf-dist - - ln -s $out/texmf* $out/share/ - '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"]; - - meta = { - description = "ConTEXt TeX wrapper"; - }; - -} - diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix deleted file mode 100644 index 3a93c6445a7..00000000000 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ /dev/null @@ -1,161 +0,0 @@ -args @ { -builderDefs, zlib, bzip2, ncurses, libpng, ed, lesstif, ruby, potrace -, gd, t1lib, freetype, icu, perl, expat, curl, xz, pkgconfig, zziplib, texinfo -, libjpeg, bison, python, fontconfig, flex, poppler, libpaper, graphite2 -, makeWrapper, gmp, mpfr, xpdf, config -, libXaw, libX11, xproto, libXt, libXpm -, libXmu, libXext, xextproto, libSM, libICE -, ... }: with args; - -rec { - src = assert config.allowTexliveBuilds or true; fetchurl { - url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2014.20140926.35254.orig.tar.xz; - sha256 = "1c39x059jhn5jsy6i9j3akjbkm1kmmzssy1jyi1aw20rl2vp86w3"; - }; - - texmfVersion = "2014.20141024"; - texmfSrc = fetchurl { - url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz"; - sha256 = "1a6968myfi81s76n9p1qljgpwia9mi55pkkz1q6lbnwybf97akj1"; - }; - - langTexmfVersion = "2014.20141024"; - langTexmfSrc = fetchurl { - url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz"; - sha256 = "1ydz5m1v40n34g1l31r3vqg74rbr01x2f80drhz4igh21fm7zzpa"; - }; - - passthru = { inherit texmfSrc langTexmfSrc; }; - - setupHook = ./setup-hook.sh; - - doMainBuild = fullDepEntry ( stdenv.lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH="${poppler.out}/lib" - '' + '' - mkdir -p $out - mkdir -p $out/nix-support - cp ${setupHook} $out/nix-support/setup-hook.sh - mkdir -p $out/share - tar xf ${texmfSrc} -C $out --strip-components=1 - tar xf ${langTexmfSrc} -C $out --strip-components=1 - - sed -e s@/usr/bin/@@g -i $(grep /usr/bin/ -rl . ) - - sed -e 's@dehypht-x-2013-05-26@dehypht-x-2014-05-21@' -i $(grep 'dehypht-x' -rl $out ) - sed -e 's@dehyphn-x-2013-05-26@dehyphn-x-2014-05-21@' -i $(grep 'dehyphn-x' -rl $out ) - - sed -e 's@\' -i $(find . -name configure) - sed -e 's/-lttf/-lfreetype/' -i $(find . -name configure) - - # sed -e s@ncurses/curses.h@curses.h@g -i $(grep ncurses/curses.h -rl . ) - sed -e '1i\#include \n\#include ' -i $( find libs/teckit -name '*.cpp' -o -name '*.c' ) - - NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu.dev}/include/layout"; - - ./Build --prefix="$out" --datadir="$out/share" --mandir="$out/share/man" --infodir="$out/share/info" \ - ${args.lib.concatStringsSep " " configureFlags} - cd Work - '' ) [ "minInit" "doUnpack" "addInputs" "defEnsureDir" ]; - - promoteLibexec = fullDepEntry ('' - mkdir -p $out/libexec/ - mv $out/bin $out/libexec/$(uname -m) - mkdir -p $out/bin - for i in "$out/libexec/"* "$out/libexec/"*"/"* ; do - test \( \! -d "$i" \) -a \( -x "$i" -o -L "$i" \) || continue - - if [ -x "$i" ]; then - echo -ne "#! $SHELL\\nexec $i \"\$@\"" >$out/bin/$(basename $i) - chmod a+x $out/bin/$(basename $i) - else - mv "$i" "$out/libexec" - ln -s "$(readlink -f "$out/libexec/$(basename "$i")")" "$out/bin/$(basename "$i")"; - ln -sf "$(readlink -f "$out/libexec/$(basename "$i")")" "$out/libexec/$(uname -m)/$(basename "$i")"; - rm "$out/libexec/$(basename "$i")" - fi; - done - '') ["doMakeInstall"]; - - doPostInstall = fullDepEntry( '' - cp -r "$out/"texmf* "$out/share/" || true - rm -rf "$out"/texmf* - [ -d $out/share/texmf-config ] || ln -s $out/share/texmf-dist $out/share/texmf-config - ln -s "$out"/share/texmf* "$out"/ - - PATH=$PATH:$out/bin mktexlsr $out/share/texmf* - - yes | HOME=. PATH=$PATH:$out/bin updmap-sys --syncwithtrees || echo $? - - # Prebuild the format files, as it used to be done with TeXLive 2007. - # Luatex currently fails this way: - # - # This is a summary of all `failed' messages: - # `luatex -ini -jobname=luatex -progname=luatex luatex.ini' failed - # `luatex -ini -jobname=dviluatex -progname=dviluatex dviluatex.ini' failed - # - # I find it acceptable, hence the "|| true". - echo "building format files..." - mkdir -p "$out/share/texmf-var/web2c" - ln -sf "$out"/out/share/texmf* "$out"/ - PATH="$PATH:$out/bin" fmtutil-sys --all || true - - PATH=$PATH:$out/bin mktexlsr $out/share/texmf* - '' + stdenv.lib.optionalString stdenv.isDarwin '' - for prog in "$out/bin/"*; do - wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler.out}/lib" - done - '' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" "promoteLibexec" "patchShebangsInterim"]; - - patchShebangsInterimBin = doPatchShebangs ''$out/bin/''; - patchShebangsInterimLibexec = doPatchShebangs ''$out/libexec/''; - patchShebangsInterimShareTexmfDist = doPatchShebangs ''$out/share/texmf-dist/scripts/''; - patchShebangsInterimTexmfDist = doPatchShebangs ''$out/texmf-dist/scripts/''; - - patchShebangsInterim = fullDepEntry ("") ["patchShebangsInterimBin" - "patchShebangsInterimLibexec" "patchShebangsInterimTexmfDist" - "patchShebangsInterimShareTexmfDist"]; - - buildInputs = [ zlib bzip2 ncurses libpng flex bison libX11.out libICE xproto - freetype t1lib gd libXaw icu ghostscript ed libXt libXpm libXmu libXext - xextproto perl libSM ruby expat curl libjpeg python fontconfig xz pkgconfig - poppler libpaper graphite2 lesstif zziplib harfbuzz texinfo potrace gmp mpfr - xpdf ] - ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ] - ; - - configureFlags = [ "--with-x11" "--enable-ipc" "--with-mktexfmt" - "--enable-shared" "--disable-native-texlive-build" "--with-system-zziplib" - "--with-system-libgs" "--with-system-t1lib" "--with-system-freetype2" - "--with-system-freetype=no" "--disable-ttf2pk" "--enable-ttf2pk2" ] - ++ stdenv.lib.optionals stdenv.isDarwin [ - # TODO: We should be able to fix these tests - "--disable-devnag" - - # jww (2014-06-02): The following fails with: - # FAIL: tests/dvisvgm - # =================== - # - # dyld: Library not loaded: libgs.dylib.9.06 - # Referenced from: .../Work/texk/dvisvgm/.libs/dvisvgm - # Reason: image not found - "--disable-dvisvgm" - ]; - - phaseNames = [ "addInputs" "doMainBuild" "doMakeInstall" "doPostInstall" ]; - - name = "texlive-core-2014"; - - meta = with stdenv.lib; { - description = "A TeX distribution"; - homepage = http://www.tug.org/texlive; - license = stdenv.lib.licenses.gpl2; - maintainers = with maintainers; [ lovek323 raskin jwiegley ]; - platforms = platforms.unix; - hydraPlatforms = []; - broken = true; # https://github.com/NixOS/nixpkgs/issues/14807 - }; -} diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix deleted file mode 100644 index 7f7ffbee7c2..00000000000 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ /dev/null @@ -1,26 +0,0 @@ -args @ { texLive, xz, ... }: with args; -rec { - name = "texlive-extra-2014"; - version = "2014.20141024"; - - src = fetchurl { - url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz"; - sha256 = "190p5v6madcgkxjmfal0pcylfz88zi6yaixky0vrcz1kbvxqlcb9"; - }; - - buildInputs = [texLive xz]; - phaseNames = ["doCopy"]; - doCopy = fullDepEntry ('' - mkdir -p $out/share - cp -r texmf* $out/ - ln -s $out/texmf* $out/share - '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"]; - - meta = { - description = "Extra components for TeXLive"; - maintainers = [ args.lib.maintainers.raskin args.lib.maintainers.jwiegley ]; - - # Actually, arch-independent.. - hydraPlatforms = []; - }; -} diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix deleted file mode 100644 index 29e1c45245f..00000000000 --- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix +++ /dev/null @@ -1,24 +0,0 @@ -args @ {texLive, unzip, ...}: with args; -rec { - version = "1.5.1"; - name = "moderncv-${version}"; - src = fetchurl { - url = "https://launchpad.net/moderncv/trunk/${version}/+download/moderncv-${version}.zip"; - sha256 = "0k26s0z8hmw3h09vnpndim7gigwh8q6n9nbbihb5qbrw5qg2yqck"; - }; - - buildInputs = [texLive unzip]; - phaseNames = ["doCopy"]; - doCopy = fullDepEntry ('' - mkdir -p $out/texmf-dist/tex/latex/moderncv $out/texmf-dist/doc $out/share - mv *.cls *.sty $out/texmf-dist/tex/latex/moderncv/ - mv examples $out/texmf-dist/doc/moderncv - ln -s $out/texmf* $out/share/ - '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; - - meta = { - description = "The moderncv class for TeXLive"; - # Actually, arch-independent.. - hydraPlatforms = []; - }; -} diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix deleted file mode 100644 index caa140d42c7..00000000000 --- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix +++ /dev/null @@ -1,24 +0,0 @@ -args @ {texLive, unzip, ...}: with args; -rec { - version = "0.9"; - name = "moderntimeline-${version}"; - src = fetchurl { - url = "https://github.com/raphink/moderntimeline/archive/v0.9.zip"; - sha256 = "1h1sfdh0whb74y6f999hs80flwpdbs2n4n2b9c450rvs1y7abcml"; - }; - - buildInputs = [texLive unzip]; - phaseNames = ["doCopy"]; - doCopy = fullDepEntry ('' - mkdir -p $out/texmf-dist/tex/latex/moderntimeline $out/texmf-dist/doc/moderntimeline $out/share - mv *.dtx *.ins $out/texmf-dist/tex/latex/moderntimeline/ - mv *.md $out/texmf-dist/doc/moderntimeline/ - ln -s $out/texmf* $out/share/ - '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; - - meta = { - description = "The moderntimeline extensions for moderncv"; - # Actually, arch-independent.. - hydraPlatforms = []; - }; -} diff --git a/pkgs/tools/typesetting/tex/texlive/setup-hook.sh b/pkgs/tools/typesetting/tex/texlive/setup-hook.sh deleted file mode 100644 index 9c5424e881e..00000000000 --- a/pkgs/tools/typesetting/tex/texlive/setup-hook.sh +++ /dev/null @@ -1,7 +0,0 @@ -addTeXMFPath () { - if test -d "$1/share/texmf-nix"; then - export TEXINPUTS="${TEXINPUTS}${TEXINPUTS:+:}$1/share/texmf-nix//:" - fi -} - -envHooks+=(addTeXMFPath) diff --git a/pkgs/tools/typesetting/tex/texlive/xcolor.nix b/pkgs/tools/typesetting/tex/texlive/xcolor.nix deleted file mode 100644 index 57351e06992..00000000000 --- a/pkgs/tools/typesetting/tex/texlive/xcolor.nix +++ /dev/null @@ -1,37 +0,0 @@ -args @ {texLive, ... }: with args; -rec { - name = "texlive-latex-xcolor-2007"; - src = fetchurl { - url = mirror://debian/pool/main/l/latex-xcolor/latex-xcolor_2.11.orig.tar.gz; - sha256 = "0z78xfn5iq5ncg82sd6v2qrxs8p9hs3m4agaz90p4db5dvk2w0mn"; - }; - - buildInputs = [texLive]; - phaseNames = ["doCopy"]; - doCopy = fullDepEntry ('' - export HOME=$PWD - mkdir -p $out/share/ - - mkdir -p $out/texmf-dist/tex/latex/xcolor - mkdir -p $out/texmf-dist/dvips/xcolor - latex xcolor.ins - cp *.sty *.def $out/texmf-dist/tex/latex/xcolor - cp *.pro $out/texmf-dist/dvips/xcolor - - #latex xcolor.dtx - #latex xcolor.dtx - #makeindex -s gind.ist xcolor.idx - #latex xcolor.dtx - #latex xcolor.dtx - - rm *.sty *.pro *.ins *.def *.dtx - mkdir -p $out/texmf-dist/doc/latex-xcolor - cp * $out/texmf-dist/doc/latex-xcolor - - ln -s $out/texmf* $out/share/ - '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"]; - - meta = { - description = "Extra components for TeXLive: LaTeX color support"; - }; -} diff --git a/pkgs/tools/virtualization/azure-cli/default.nix b/pkgs/tools/virtualization/azure-cli/default.nix deleted file mode 100644 index 049597256a4..00000000000 --- a/pkgs/tools/virtualization/azure-cli/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ recurseIntoAttrs, callPackage, nodejs, makeWrapper -}: - -let - self = ( - callPackage ../../../top-level/node-packages.nix { - inherit nodejs self; - generated = callPackage ./node-packages.nix { inherit self; }; - overrides = { - - "azure-cli" = - let - streamline-streams = self.by-version."streamline-streams"."0.1.5"; - streamline = self.by-version."streamline"."0.10.17"; - node-uuid = self.by-version."node-uuid"."1.2.0"; - in { - passthru.nodePackages = self; - - buildInputs = [ makeWrapper ]; - - postInstall = '' - wrapProgram "$out/bin/azure" \ - --set NODE_PATH "${streamline-streams}/lib/node_modules:${streamline}/lib/node_modules:${node-uuid}/lib/node_modules" - ''; - }; - "easy-table" = { - dontMakeSourcesWritable = 1; - postUnpack = '' - chmod -R 770 "$sourceRoot" - ''; - }; - }; - }); -in self.azure-cli - diff --git a/pkgs/tools/virtualization/azure-cli/node-packages.json b/pkgs/tools/virtualization/azure-cli/node-packages.json deleted file mode 100644 index 1e0f658d49c..00000000000 --- a/pkgs/tools/virtualization/azure-cli/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "azure-cli" ] diff --git a/pkgs/tools/virtualization/azure-cli/node-packages.nix b/pkgs/tools/virtualization/azure-cli/node-packages.nix deleted file mode 100644 index 84379ae4c4a..00000000000 --- a/pkgs/tools/virtualization/azure-cli/node-packages.nix +++ /dev/null @@ -1,4844 +0,0 @@ -{ self, fetchurl, fetchgit ? null, lib }: - -{ - by-spec."adal-node"."0.1.16" = - self.by-version."adal-node"."0.1.16"; - by-version."adal-node"."0.1.16" = self.buildNodePackage { - name = "adal-node-0.1.16"; - version = "0.1.16"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/adal-node/-/adal-node-0.1.16.tgz"; - name = "adal-node-0.1.16.tgz"; - sha1 = "ed205574c05ae93c68f0b59909588242f2c9ccf8"; - }; - deps = { - "date-utils-1.2.18" = self.by-version."date-utils"."1.2.18"; - "jws-3.1.3" = self.by-version."jws"."3.1.3"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; - "request-2.69.0" = self.by-version."request"."2.69.0"; - "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; - "xmldom-0.1.22" = self.by-version."xmldom"."0.1.22"; - "xpath.js-1.0.6" = self.by-version."xpath.js"."1.0.6"; - "async-1.5.2" = self.by-version."async"."1.5.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."adal-node"."0.1.17" = - self.by-version."adal-node"."0.1.17"; - by-version."adal-node"."0.1.17" = self.buildNodePackage { - name = "adal-node-0.1.17"; - version = "0.1.17"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/adal-node/-/adal-node-0.1.17.tgz"; - name = "adal-node-0.1.17.tgz"; - sha1 = "7946eb374c837730bd3cc49b0894928154e505d0"; - }; - deps = { - "date-utils-1.2.18" = self.by-version."date-utils"."1.2.18"; - "jws-3.1.3" = self.by-version."jws"."3.1.3"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; - "request-2.69.0" = self.by-version."request"."2.69.0"; - "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; - "xmldom-0.1.22" = self.by-version."xmldom"."0.1.22"; - "xpath.js-1.0.6" = self.by-version."xpath.js"."1.0.6"; - "async-1.5.2" = self.by-version."async"."1.5.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."amdefine".">=0.0.4" = - self.by-version."amdefine"."1.0.0"; - by-version."amdefine"."1.0.0" = self.buildNodePackage { - name = "amdefine-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"; - name = "amdefine-1.0.0.tgz"; - sha1 = "fd17474700cb5cc9c2b709f0be9d23ce3c198c33"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ansi-regex"."^2.0.0" = - self.by-version."ansi-regex"."2.0.0"; - by-version."ansi-regex"."2.0.0" = self.buildNodePackage { - name = "ansi-regex-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"; - name = "ansi-regex-2.0.0.tgz"; - sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ansi-styles"."^2.1.0" = - self.by-version."ansi-styles"."2.2.0"; - by-version."ansi-styles"."2.2.0" = self.buildNodePackage { - name = "ansi-styles-2.2.0"; - version = "2.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.0.tgz"; - name = "ansi-styles-2.2.0.tgz"; - sha1 = "c59191936e6ed1c1315a4b6b6b97f3acfbfa68b0"; - }; - deps = { - "color-convert-1.0.0" = self.by-version."color-convert"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."asn1"."0.1.11" = - self.by-version."asn1"."0.1.11"; - by-version."asn1"."0.1.11" = self.buildNodePackage { - name = "asn1-0.1.11"; - version = "0.1.11"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"; - name = "asn1-0.1.11.tgz"; - sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."asn1".">=0.2.3 <0.3.0" = - self.by-version."asn1"."0.2.3"; - by-version."asn1"."0.2.3" = self.buildNodePackage { - name = "asn1-0.2.3"; - version = "0.2.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; - name = "asn1-0.2.3.tgz"; - sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."assert-plus".">=0.2.0 <0.3.0" = - self.by-version."assert-plus"."0.2.0"; - by-version."assert-plus"."0.2.0" = self.buildNodePackage { - name = "assert-plus-0.2.0"; - version = "0.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; - name = "assert-plus-0.2.0.tgz"; - sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; - }; - 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 { - name = "assert-plus-0.1.5"; - version = "0.1.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; - name = "assert-plus-0.1.5.tgz"; - sha1 = "ee74009413002d84cec7219c6ac811812e723160"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."assert-plus"."^0.2.0" = - self.by-version."assert-plus"."0.2.0"; - by-spec."assert-plus"."^1.0.0" = - self.by-version."assert-plus"."1.0.0"; - by-version."assert-plus"."1.0.0" = self.buildNodePackage { - name = "assert-plus-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - name = "assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."async"."0.1.x" = - self.by-version."async"."0.1.22"; - by-version."async"."0.1.22" = self.buildNodePackage { - name = "async-0.1.22"; - version = "0.1.22"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.1.22.tgz"; - name = "async-0.1.22.tgz"; - sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."async"."0.2.7" = - self.by-version."async"."0.2.7"; - by-version."async"."0.2.7" = self.buildNodePackage { - name = "async-0.2.7"; - version = "0.2.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.7.tgz"; - name = "async-0.2.7.tgz"; - sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."async"."1.4.2" = - self.by-version."async"."1.4.2"; - by-version."async"."1.4.2" = self.buildNodePackage { - name = "async-1.4.2"; - version = "1.4.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-1.4.2.tgz"; - name = "async-1.4.2.tgz"; - sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."async".">=0.6.0" = - self.by-version."async"."1.5.2"; - by-version."async"."1.5.2" = self.buildNodePackage { - name = "async-1.5.2"; - version = "1.5.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-1.5.2.tgz"; - name = "async-1.5.2.tgz"; - sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."async"."^1.4.0" = - self.by-version."async"."1.5.2"; - by-spec."async"."~0.9.0" = - self.by-version."async"."0.9.2"; - by-version."async"."0.9.2" = self.buildNodePackage { - name = "async-0.9.2"; - version = "0.9.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz"; - name = "async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."aws-sign2"."~0.5.0" = - self.by-version."aws-sign2"."0.5.0"; - by-version."aws-sign2"."0.5.0" = self.buildNodePackage { - name = "aws-sign2-0.5.0"; - version = "0.5.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - name = "aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."aws-sign2"."~0.6.0" = - self.by-version."aws-sign2"."0.6.0"; - by-version."aws-sign2"."0.6.0" = self.buildNodePackage { - name = "aws-sign2-0.6.0"; - version = "0.6.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; - name = "aws-sign2-0.6.0.tgz"; - sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."aws4"."^1.2.1" = - self.by-version."aws4"."1.3.2"; - by-version."aws4"."1.3.2" = self.buildNodePackage { - name = "aws4-1.3.2"; - version = "1.3.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz"; - name = "aws4-1.3.2.tgz"; - sha1 = "d39e0bee412ced0e8ed94a23e314f313a95b9fd1"; - }; - deps = { - "lru-cache-4.0.0" = self.by-version."lru-cache"."4.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-arm-authorization"."2.0.0" = - self.by-version."azure-arm-authorization"."2.0.0"; - by-version."azure-arm-authorization"."2.0.0" = self.buildNodePackage { - name = "azure-arm-authorization-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-authorization/-/azure-arm-authorization-2.0.0.tgz"; - name = "azure-arm-authorization-2.0.0.tgz"; - sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-arm-commerce"."0.1.1" = - self.by-version."azure-arm-commerce"."0.1.1"; - by-version."azure-arm-commerce"."0.1.1" = self.buildNodePackage { - name = "azure-arm-commerce-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-commerce/-/azure-arm-commerce-0.1.1.tgz"; - name = "azure-arm-commerce-0.1.1.tgz"; - sha1 = "3329693b8aba7d1b84e10ae2655d54262a1f1c59"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-arm-compute"."0.15.0" = - self.by-version."azure-arm-compute"."0.15.0"; - by-version."azure-arm-compute"."0.15.0" = self.buildNodePackage { - name = "azure-arm-compute-0.15.0"; - version = "0.15.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.15.0.tgz"; - name = "azure-arm-compute-0.15.0.tgz"; - sha1 = "a057ba240bd5ee9972c8813066d925204af09e27"; - }; - deps = { - "ms-rest-1.10.0" = self.by-version."ms-rest"."1.10.0"; - "ms-rest-azure-1.10.0" = self.by-version."ms-rest-azure"."1.10.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-arm-datalake-analytics"."0.1.2" = - self.by-version."azure-arm-datalake-analytics"."0.1.2"; - by-version."azure-arm-datalake-analytics"."0.1.2" = self.buildNodePackage { - name = "azure-arm-datalake-analytics-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-datalake-analytics/-/azure-arm-datalake-analytics-0.1.2.tgz"; - name = "azure-arm-datalake-analytics-0.1.2.tgz"; - sha1 = "7b8c26ba3808c220e7c1183f884d72f3e8d915a9"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "moment-2.12.0" = self.by-version."moment"."2.12.0"; - "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-arm-datalake-store"."0.1.2" = - self.by-version."azure-arm-datalake-store"."0.1.2"; - by-version."azure-arm-datalake-store"."0.1.2" = self.buildNodePackage { - name = "azure-arm-datalake-store-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-datalake-store/-/azure-arm-datalake-store-0.1.2.tgz"; - name = "azure-arm-datalake-store-0.1.2.tgz"; - sha1 = "dc8be199bfa4c8d4b10efe70d35a2414b8eb8d9a"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-arm-dns"."0.10.1" = - self.by-version."azure-arm-dns"."0.10.1"; - by-version."azure-arm-dns"."0.10.1" = self.buildNodePackage { - name = "azure-arm-dns-0.10.1"; - version = "0.10.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-0.10.1.tgz"; - name = "azure-arm-dns-0.10.1.tgz"; - sha1 = "8f6dded24a8b8dbc9b81f6b273970ac8ba2a0c54"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-arm-hdinsight"."0.1.0" = - self.by-version."azure-arm-hdinsight"."0.1.0"; - by-version."azure-arm-hdinsight"."0.1.0" = self.buildNodePackage { - name = "azure-arm-hdinsight-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-hdinsight/-/azure-arm-hdinsight-0.1.0.tgz"; - name = "azure-arm-hdinsight-0.1.0.tgz"; - sha1 = "10243278ae8cca0de0d68a2cbbe0fc9119a859ef"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-arm-hdinsight-jobs"."0.1.0" = - self.by-version."azure-arm-hdinsight-jobs"."0.1.0"; - by-version."azure-arm-hdinsight-jobs"."0.1.0" = self.buildNodePackage { - name = "azure-arm-hdinsight-jobs-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-hdinsight-jobs/-/azure-arm-hdinsight-jobs-0.1.0.tgz"; - name = "azure-arm-hdinsight-jobs-0.1.0.tgz"; - sha1 = "252938f18d4341adf9942261656e791490c3c220"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-arm-insights"."0.10.2" = - self.by-version."azure-arm-insights"."0.10.2"; - by-version."azure-arm-insights"."0.10.2" = self.buildNodePackage { - name = "azure-arm-insights-0.10.2"; - version = "0.10.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-insights/-/azure-arm-insights-0.10.2.tgz"; - name = "azure-arm-insights-0.10.2.tgz"; - sha1 = "3aad583c147685e35bc55fd0f013c701882fea42"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "moment-2.6.0" = self.by-version."moment"."2.6.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-arm-network"."0.12.1" = - self.by-version."azure-arm-network"."0.12.1"; - by-version."azure-arm-network"."0.12.1" = self.buildNodePackage { - name = "azure-arm-network-0.12.1"; - version = "0.12.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.12.1.tgz"; - name = "azure-arm-network-0.12.1.tgz"; - sha1 = "57c659e9d25f35e2ac0b79a0f78f7d025ceb20b8"; - }; - deps = { - "ms-rest-1.10.0" = self.by-version."ms-rest"."1.10.0"; - "ms-rest-azure-1.10.0" = self.by-version."ms-rest-azure"."1.10.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-arm-rediscache"."0.2.1" = - self.by-version."azure-arm-rediscache"."0.2.1"; - by-version."azure-arm-rediscache"."0.2.1" = self.buildNodePackage { - name = "azure-arm-rediscache-0.2.1"; - version = "0.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.1.tgz"; - name = "azure-arm-rediscache-0.2.1.tgz"; - sha1 = "22e516e7519dd12583e174cca4eeb3b20c993d02"; - }; - deps = { - "ms-rest-1.10.0" = self.by-version."ms-rest"."1.10.0"; - "ms-rest-azure-1.10.0" = self.by-version."ms-rest-azure"."1.10.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-arm-resource"."1.0.0-preview" = - self.by-version."azure-arm-resource"."1.0.0-preview"; - by-version."azure-arm-resource"."1.0.0-preview" = self.buildNodePackage { - name = "azure-arm-resource-1.0.0-preview"; - version = "1.0.0-preview"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.0.0-preview.tgz"; - name = "azure-arm-resource-1.0.0-preview.tgz"; - sha1 = "c664d4d0f3c4394680106f34359340e3c6a0cac2"; - }; - deps = { - "ms-rest-1.10.0" = self.by-version."ms-rest"."1.10.0"; - "ms-rest-azure-1.10.0" = self.by-version."ms-rest-azure"."1.10.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-arm-storage"."0.12.2-preview" = - self.by-version."azure-arm-storage"."0.12.2-preview"; - by-version."azure-arm-storage"."0.12.2-preview" = self.buildNodePackage { - name = "azure-arm-storage-0.12.2-preview"; - version = "0.12.2-preview"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.12.2-preview.tgz"; - name = "azure-arm-storage-0.12.2-preview.tgz"; - sha1 = "ecdfe608b58fe7e136f47cd2f4139ee010a724e6"; - }; - deps = { - "ms-rest-1.10.0" = self.by-version."ms-rest"."1.10.0"; - "ms-rest-azure-1.10.0" = self.by-version."ms-rest-azure"."1.10.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-arm-trafficmanager"."0.10.5" = - self.by-version."azure-arm-trafficmanager"."0.10.5"; - by-version."azure-arm-trafficmanager"."0.10.5" = self.buildNodePackage { - name = "azure-arm-trafficmanager-0.10.5"; - version = "0.10.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.10.5.tgz"; - name = "azure-arm-trafficmanager-0.10.5.tgz"; - sha1 = "b42683cb6dfdfed0f93875d72a0b8a53b3204d01"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-arm-website"."0.10.0" = - self.by-version."azure-arm-website"."0.10.0"; - by-version."azure-arm-website"."0.10.0" = self.buildNodePackage { - name = "azure-arm-website-0.10.0"; - version = "0.10.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.10.0.tgz"; - name = "azure-arm-website-0.10.0.tgz"; - sha1 = "610400ecb801bff16b7e2d7c1c6d1fe99c4f9ec9"; - }; - deps = { - "azure-common-0.9.12" = self.by-version."azure-common"."0.9.12"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - "moment-2.6.0" = self.by-version."moment"."2.6.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-asm-compute"."0.13.0" = - self.by-version."azure-asm-compute"."0.13.0"; - by-version."azure-asm-compute"."0.13.0" = self.buildNodePackage { - name = "azure-asm-compute-0.13.0"; - version = "0.13.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-asm-compute/-/azure-asm-compute-0.13.0.tgz"; - name = "azure-asm-compute-0.13.0.tgz"; - sha1 = "321999c92fcabb7da852a251cd97f461a0758065"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-asm-hdinsight"."0.10.2" = - self.by-version."azure-asm-hdinsight"."0.10.2"; - by-version."azure-asm-hdinsight"."0.10.2" = self.buildNodePackage { - name = "azure-asm-hdinsight-0.10.2"; - version = "0.10.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-asm-hdinsight/-/azure-asm-hdinsight-0.10.2.tgz"; - name = "azure-asm-hdinsight-0.10.2.tgz"; - sha1 = "2d11cdaaa073fc38f31c718991d5923fb7259fa0"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-asm-mgmt"."0.10.1" = - self.by-version."azure-asm-mgmt"."0.10.1"; - by-version."azure-asm-mgmt"."0.10.1" = self.buildNodePackage { - name = "azure-asm-mgmt-0.10.1"; - version = "0.10.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-asm-mgmt/-/azure-asm-mgmt-0.10.1.tgz"; - name = "azure-asm-mgmt-0.10.1.tgz"; - sha1 = "d0a44b47ccabf338b19d53271675733cfa2d1751"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-asm-network"."0.10.2" = - self.by-version."azure-asm-network"."0.10.2"; - by-version."azure-asm-network"."0.10.2" = self.buildNodePackage { - name = "azure-asm-network-0.10.2"; - version = "0.10.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.10.2.tgz"; - name = "azure-asm-network-0.10.2.tgz"; - sha1 = "eeeffd4c3f86f67212c995213fe5d5c1ebddc651"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-asm-sb"."0.10.1" = - self.by-version."azure-asm-sb"."0.10.1"; - by-version."azure-asm-sb"."0.10.1" = self.buildNodePackage { - name = "azure-asm-sb-0.10.1"; - version = "0.10.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-asm-sb/-/azure-asm-sb-0.10.1.tgz"; - name = "azure-asm-sb-0.10.1.tgz"; - sha1 = "92487b24166041119714f66760ec1f36e8dc7222"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-asm-sql"."0.10.1" = - self.by-version."azure-asm-sql"."0.10.1"; - by-version."azure-asm-sql"."0.10.1" = self.buildNodePackage { - name = "azure-asm-sql-0.10.1"; - version = "0.10.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-asm-sql/-/azure-asm-sql-0.10.1.tgz"; - name = "azure-asm-sql-0.10.1.tgz"; - sha1 = "47728df19a6d4f1cc935235c69fa9cf048cc8f42"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-asm-storage"."0.10.1" = - self.by-version."azure-asm-storage"."0.10.1"; - by-version."azure-asm-storage"."0.10.1" = self.buildNodePackage { - name = "azure-asm-storage-0.10.1"; - version = "0.10.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-asm-storage/-/azure-asm-storage-0.10.1.tgz"; - name = "azure-asm-storage-0.10.1.tgz"; - sha1 = "878ad15f6daee36e44f30e5cd348fb61a8f14172"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-asm-subscription"."0.10.1" = - self.by-version."azure-asm-subscription"."0.10.1"; - by-version."azure-asm-subscription"."0.10.1" = self.buildNodePackage { - name = "azure-asm-subscription-0.10.1"; - version = "0.10.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-asm-subscription/-/azure-asm-subscription-0.10.1.tgz"; - name = "azure-asm-subscription-0.10.1.tgz"; - sha1 = "917a5e87a04b69c0f5c29339fe910bb5e5e7a04c"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-asm-trafficmanager"."0.10.3" = - self.by-version."azure-asm-trafficmanager"."0.10.3"; - by-version."azure-asm-trafficmanager"."0.10.3" = self.buildNodePackage { - name = "azure-asm-trafficmanager-0.10.3"; - version = "0.10.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-asm-trafficmanager/-/azure-asm-trafficmanager-0.10.3.tgz"; - name = "azure-asm-trafficmanager-0.10.3.tgz"; - sha1 = "91e2e63d73869090613cd42ee38a3823e55f4447"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-asm-website"."0.10.1" = - self.by-version."azure-asm-website"."0.10.1"; - by-version."azure-asm-website"."0.10.1" = self.buildNodePackage { - name = "azure-asm-website-0.10.1"; - version = "0.10.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-asm-website/-/azure-asm-website-0.10.1.tgz"; - name = "azure-asm-website-0.10.1.tgz"; - sha1 = "0b8fabdb460e3b36ee72836d74630cc9685f572e"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - "moment-2.6.0" = self.by-version."moment"."2.6.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-cli"."*" = - self.by-version."azure-cli"."0.9.17"; - by-version."azure-cli"."0.9.17" = self.buildNodePackage { - name = "azure-cli-0.9.17"; - version = "0.9.17"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/azure-cli/-/azure-cli-0.9.17.tgz"; - name = "azure-cli-0.9.17.tgz"; - sha1 = "1f1cd28719c5fb8e201c01bf2a257a0880e743eb"; - }; - deps = { - "adal-node-0.1.17" = self.by-version."adal-node"."0.1.17"; - "async-1.4.2" = self.by-version."async"."1.4.2"; - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "azure-arm-authorization-2.0.0" = self.by-version."azure-arm-authorization"."2.0.0"; - "azure-arm-commerce-0.1.1" = self.by-version."azure-arm-commerce"."0.1.1"; - "azure-arm-compute-0.15.0" = self.by-version."azure-arm-compute"."0.15.0"; - "azure-arm-hdinsight-0.1.0" = self.by-version."azure-arm-hdinsight"."0.1.0"; - "azure-arm-hdinsight-jobs-0.1.0" = self.by-version."azure-arm-hdinsight-jobs"."0.1.0"; - "azure-arm-insights-0.10.2" = self.by-version."azure-arm-insights"."0.10.2"; - "azure-arm-network-0.12.1" = self.by-version."azure-arm-network"."0.12.1"; - "azure-arm-trafficmanager-0.10.5" = self.by-version."azure-arm-trafficmanager"."0.10.5"; - "azure-arm-dns-0.10.1" = self.by-version."azure-arm-dns"."0.10.1"; - "azure-arm-website-0.10.0" = self.by-version."azure-arm-website"."0.10.0"; - "azure-arm-rediscache-0.2.1" = self.by-version."azure-arm-rediscache"."0.2.1"; - "azure-arm-datalake-analytics-0.1.2" = self.by-version."azure-arm-datalake-analytics"."0.1.2"; - "azure-arm-datalake-store-0.1.2" = self.by-version."azure-arm-datalake-store"."0.1.2"; - "azure-extra-0.2.12" = self.by-version."azure-extra"."0.2.12"; - "azure-gallery-2.0.0-pre.18" = self.by-version."azure-gallery"."2.0.0-pre.18"; - "azure-keyvault-0.10.1" = self.by-version."azure-keyvault"."0.10.1"; - "azure-asm-compute-0.13.0" = self.by-version."azure-asm-compute"."0.13.0"; - "azure-asm-hdinsight-0.10.2" = self.by-version."azure-asm-hdinsight"."0.10.2"; - "azure-asm-trafficmanager-0.10.3" = self.by-version."azure-asm-trafficmanager"."0.10.3"; - "azure-asm-mgmt-0.10.1" = self.by-version."azure-asm-mgmt"."0.10.1"; - "azure-monitoring-0.10.2" = self.by-version."azure-monitoring"."0.10.2"; - "azure-asm-network-0.10.2" = self.by-version."azure-asm-network"."0.10.2"; - "azure-arm-resource-1.0.0-preview" = self.by-version."azure-arm-resource"."1.0.0-preview"; - "azure-arm-storage-0.12.2-preview" = self.by-version."azure-arm-storage"."0.12.2-preview"; - "azure-asm-sb-0.10.1" = self.by-version."azure-asm-sb"."0.10.1"; - "azure-asm-sql-0.10.1" = self.by-version."azure-asm-sql"."0.10.1"; - "azure-asm-storage-0.10.1" = self.by-version."azure-asm-storage"."0.10.1"; - "azure-asm-subscription-0.10.1" = self.by-version."azure-asm-subscription"."0.10.1"; - "azure-asm-website-0.10.1" = self.by-version."azure-asm-website"."0.10.1"; - "azure-storage-0.7.0" = self.by-version."azure-storage"."0.7.0"; - "caller-id-0.1.0" = self.by-version."caller-id"."0.1.0"; - "colors-0.6.2" = self.by-version."colors"."0.6.2"; - "commander-1.0.4" = self.by-version."commander"."1.0.4"; - "easy-table-0.0.1" = self.by-version."easy-table"."0.0.1"; - "event-stream-3.1.5" = self.by-version."event-stream"."3.1.5"; - "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; - "github-0.1.6" = self.by-version."github"."0.1.6"; - "js2xmlparser-1.0.0" = self.by-version."js2xmlparser"."1.0.0"; - "jsrsasign-4.8.2" = self.by-version."jsrsasign"."4.8.2"; - "kuduscript-1.0.6" = self.by-version."kuduscript"."1.0.6"; - "moment-2.6.0" = self.by-version."moment"."2.6.0"; - "ms-rest-azure-1.10.0" = self.by-version."ms-rest-azure"."1.10.0"; - "node-forge-0.6.23" = self.by-version."node-forge"."0.6.23"; - "node-uuid-1.2.0" = self.by-version."node-uuid"."1.2.0"; - "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0"; - "omelette-0.1.0" = self.by-version."omelette"."0.1.0"; - "openssl-wrapper-0.2.1" = self.by-version."openssl-wrapper"."0.2.1"; - "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; - "request-2.52.0" = self.by-version."request"."2.52.0"; - "ssh-key-to-pem-0.11.0" = self.by-version."ssh-key-to-pem"."0.11.0"; - "streamline-0.10.17" = self.by-version."streamline"."0.10.17"; - "streamline-streams-0.1.5" = self.by-version."streamline-streams"."0.1.5"; - "through-2.3.4" = self.by-version."through"."2.3.4"; - "tunnel-0.0.2" = self.by-version."tunnel"."0.0.2"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - "validator-3.1.0" = self.by-version."validator"."3.1.0"; - "winston-0.6.2" = self.by-version."winston"."0.6.2"; - "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; - "xml2js-0.1.14" = self.by-version."xml2js"."0.1.14"; - "xmlbuilder-0.4.3" = self.by-version."xmlbuilder"."0.4.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "azure-cli" = self.by-version."azure-cli"."0.9.17"; - by-spec."azure-common"."0.9.12" = - self.by-version."azure-common"."0.9.12"; - by-version."azure-common"."0.9.12" = self.buildNodePackage { - name = "azure-common-0.9.12"; - version = "0.9.12"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-common/-/azure-common-0.9.12.tgz"; - name = "azure-common-0.9.12.tgz"; - sha1 = "8ca8167c2dbaa43b61e3caa9c7d98e78908749f6"; - }; - deps = { - "xml2js-0.2.7" = self.by-version."xml2js"."0.2.7"; - "xmlbuilder-0.4.3" = self.by-version."xmlbuilder"."0.4.3"; - "dateformat-1.0.2-1.2.3" = self.by-version."dateformat"."1.0.2-1.2.3"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - "tunnel-0.0.4" = self.by-version."tunnel"."0.0.4"; - "request-2.45.0" = self.by-version."request"."2.45.0"; - "validator-3.1.0" = self.by-version."validator"."3.1.0"; - "envconf-0.0.4" = self.by-version."envconf"."0.0.4"; - "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; - "through-2.3.8" = self.by-version."through"."2.3.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-common"."0.9.16" = - self.by-version."azure-common"."0.9.16"; - by-version."azure-common"."0.9.16" = self.buildNodePackage { - name = "azure-common-0.9.16"; - version = "0.9.16"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-common/-/azure-common-0.9.16.tgz"; - name = "azure-common-0.9.16.tgz"; - sha1 = "0158ce02f7341d08f4146e3e232e3c327d10ac6e"; - }; - deps = { - "xml2js-0.2.7" = self.by-version."xml2js"."0.2.7"; - "xmlbuilder-0.4.3" = self.by-version."xmlbuilder"."0.4.3"; - "dateformat-1.0.2-1.2.3" = self.by-version."dateformat"."1.0.2-1.2.3"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - "tunnel-0.0.4" = self.by-version."tunnel"."0.0.4"; - "request-2.45.0" = self.by-version."request"."2.45.0"; - "validator-3.22.2" = self.by-version."validator"."3.22.2"; - "envconf-0.0.4" = self.by-version."envconf"."0.0.4"; - "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; - "through-2.3.8" = self.by-version."through"."2.3.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-common"."^0.9.10" = - self.by-version."azure-common"."0.9.16"; - by-spec."azure-common"."^0.9.13" = - self.by-version."azure-common"."0.9.16"; - by-spec."azure-extra"."0.2.12" = - self.by-version."azure-extra"."0.2.12"; - by-version."azure-extra"."0.2.12" = self.buildNodePackage { - name = "azure-extra-0.2.12"; - version = "0.2.12"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-extra/-/azure-extra-0.2.12.tgz"; - name = "azure-extra-0.2.12.tgz"; - sha1 = "9fa99fb577f678eadcc4d292a9c1aed8aed9d088"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-gallery"."2.0.0-pre.18" = - self.by-version."azure-gallery"."2.0.0-pre.18"; - by-version."azure-gallery"."2.0.0-pre.18" = self.buildNodePackage { - name = "azure-gallery-2.0.0-pre.18"; - version = "2.0.0-pre.18"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-gallery/-/azure-gallery-2.0.0-pre.18.tgz"; - name = "azure-gallery-2.0.0-pre.18.tgz"; - sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-keyvault"."0.10.1" = - self.by-version."azure-keyvault"."0.10.1"; - by-version."azure-keyvault"."0.10.1" = self.buildNodePackage { - name = "azure-keyvault-0.10.1"; - version = "0.10.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.10.1.tgz"; - name = "azure-keyvault-0.10.1.tgz"; - sha1 = "b3899d04b5115a22b794a9e83f89201a66c83855"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-monitoring"."0.10.2" = - self.by-version."azure-monitoring"."0.10.2"; - by-version."azure-monitoring"."0.10.2" = self.buildNodePackage { - name = "azure-monitoring-0.10.2"; - version = "0.10.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-monitoring/-/azure-monitoring-0.10.2.tgz"; - name = "azure-monitoring-0.10.2.tgz"; - sha1 = "2b7d493306747b43e4e2dcad44d65328e6c3cf57"; - }; - deps = { - "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - "moment-2.6.0" = self.by-version."moment"."2.6.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."azure-storage"."0.7.0" = - self.by-version."azure-storage"."0.7.0"; - by-version."azure-storage"."0.7.0" = self.buildNodePackage { - name = "azure-storage-0.7.0"; - version = "0.7.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/azure-storage/-/azure-storage-0.7.0.tgz"; - name = "azure-storage-0.7.0.tgz"; - sha1 = "246fc65adf96b3332043ecbc2b0176506b8a7359"; - }; - deps = { - "extend-1.2.1" = self.by-version."extend"."1.2.1"; - "browserify-mime-1.2.9" = self.by-version."browserify-mime"."1.2.9"; - "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; - "readable-stream-2.0.5" = self.by-version."readable-stream"."2.0.5"; - "request-2.57.0" = self.by-version."request"."2.57.0"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - "validator-3.22.2" = self.by-version."validator"."3.22.2"; - "xml2js-0.2.7" = self.by-version."xml2js"."0.2.7"; - "xmlbuilder-0.4.3" = self.by-version."xmlbuilder"."0.4.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - 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"; - 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"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."base64url"."~1.0.4" = - self.by-version."base64url"."1.0.6"; - by-version."base64url"."1.0.6" = self.buildNodePackage { - name = "base64url-1.0.6"; - version = "1.0.6"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/base64url/-/base64url-1.0.6.tgz"; - name = "base64url-1.0.6.tgz"; - sha1 = "d64d375d68a7c640d912e2358d170dca5bb54681"; - }; - deps = { - "concat-stream-1.4.10" = self.by-version."concat-stream"."1.4.10"; - "meow-2.0.0" = self.by-version."meow"."2.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bl"."~0.9.0" = - self.by-version."bl"."0.9.5"; - by-version."bl"."0.9.5" = self.buildNodePackage { - name = "bl-0.9.5"; - version = "0.9.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bl/-/bl-0.9.5.tgz"; - name = "bl-0.9.5.tgz"; - sha1 = "c06b797af085ea00bc527afc8efcf11de2232054"; - }; - deps = { - "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bl"."~1.0.0" = - self.by-version."bl"."1.0.3"; - by-version."bl"."1.0.3" = self.buildNodePackage { - name = "bl-1.0.3"; - version = "1.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; - name = "bl-1.0.3.tgz"; - sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; - }; - deps = { - "readable-stream-2.0.5" = self.by-version."readable-stream"."2.0.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bluebird"."^2.9.30" = - self.by-version."bluebird"."2.10.2"; - by-version."bluebird"."2.10.2" = self.buildNodePackage { - name = "bluebird-2.10.2"; - version = "2.10.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz"; - name = "bluebird-2.10.2.tgz"; - sha1 = "024a5517295308857f14f91f1106fc3b555f446b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."boom"."0.4.x" = - self.by-version."boom"."0.4.2"; - by-version."boom"."0.4.2" = self.buildNodePackage { - name = "boom-0.4.2"; - version = "0.4.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; - name = "boom-0.4.2.tgz"; - sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; - }; - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."boom"."2.x.x" = - self.by-version."boom"."2.10.1"; - by-version."boom"."2.10.1" = self.buildNodePackage { - name = "boom-2.10.1"; - version = "2.10.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; - name = "boom-2.10.1.tgz"; - sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; - }; - deps = { - "hoek-2.16.3" = self.by-version."hoek"."2.16.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."browserify-mime"."~1.2.9" = - self.by-version."browserify-mime"."1.2.9"; - by-version."browserify-mime"."1.2.9" = self.buildNodePackage { - name = "browserify-mime-1.2.9"; - version = "1.2.9"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/browserify-mime/-/browserify-mime-1.2.9.tgz"; - name = "browserify-mime-1.2.9.tgz"; - sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."buffer-equal-constant-time"."^1.0.1" = - self.by-version."buffer-equal-constant-time"."1.0.1"; - by-version."buffer-equal-constant-time"."1.0.1" = self.buildNodePackage { - name = "buffer-equal-constant-time-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"; - name = "buffer-equal-constant-time-1.0.1.tgz"; - sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."caller-id"."0.1.x" = - self.by-version."caller-id"."0.1.0"; - by-version."caller-id"."0.1.0" = self.buildNodePackage { - name = "caller-id-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/caller-id/-/caller-id-0.1.0.tgz"; - name = "caller-id-0.1.0.tgz"; - sha1 = "59bdac0893d12c3871408279231f97458364f07b"; - }; - deps = { - "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."camelcase"."^1.0.1" = - self.by-version."camelcase"."1.2.1"; - by-version."camelcase"."1.2.1" = self.buildNodePackage { - name = "camelcase-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; - name = "camelcase-1.2.1.tgz"; - sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."camelcase-keys"."^1.0.0" = - self.by-version."camelcase-keys"."1.0.0"; - by-version."camelcase-keys"."1.0.0" = self.buildNodePackage { - name = "camelcase-keys-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz"; - name = "camelcase-keys-1.0.0.tgz"; - sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec"; - }; - deps = { - "camelcase-1.2.1" = self.by-version."camelcase"."1.2.1"; - "map-obj-1.0.1" = self.by-version."map-obj"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."caseless"."~0.10.0" = - self.by-version."caseless"."0.10.0"; - by-version."caseless"."0.10.0" = self.buildNodePackage { - name = "caseless-0.10.0"; - version = "0.10.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/caseless/-/caseless-0.10.0.tgz"; - name = "caseless-0.10.0.tgz"; - sha1 = "ed6b2719adcd1fd18f58dc081c0f1a5b43963909"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."caseless"."~0.11.0" = - self.by-version."caseless"."0.11.0"; - by-version."caseless"."0.11.0" = self.buildNodePackage { - name = "caseless-0.11.0"; - version = "0.11.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; - name = "caseless-0.11.0.tgz"; - sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - 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"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"; - name = "caseless-0.6.0.tgz"; - sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."caseless"."~0.9.0" = - self.by-version."caseless"."0.9.0"; - by-version."caseless"."0.9.0" = self.buildNodePackage { - name = "caseless-0.9.0"; - version = "0.9.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz"; - name = "caseless-0.9.0.tgz"; - sha1 = "b7b65ce6bf1413886539cfd533f0b30effa9cf88"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."chalk"."^1.0.0" = - self.by-version."chalk"."1.1.1"; - by-version."chalk"."1.1.1" = self.buildNodePackage { - name = "chalk-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz"; - name = "chalk-1.1.1.tgz"; - sha1 = "509afb67066e7499f7eb3535c77445772ae2d019"; - }; - deps = { - "ansi-styles-2.2.0" = self.by-version."ansi-styles"."2.2.0"; - "escape-string-regexp-1.0.5" = self.by-version."escape-string-regexp"."1.0.5"; - "has-ansi-2.0.0" = self.by-version."has-ansi"."2.0.0"; - "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1"; - "supports-color-2.0.0" = self.by-version."supports-color"."2.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."chalk"."^1.1.1" = - self.by-version."chalk"."1.1.1"; - by-spec."color-convert"."^1.0.0" = - self.by-version."color-convert"."1.0.0"; - by-version."color-convert"."1.0.0" = self.buildNodePackage { - name = "color-convert-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/color-convert/-/color-convert-1.0.0.tgz"; - name = "color-convert-1.0.0.tgz"; - sha1 = "3c26fcd885d272d45beacf6e41baba75c89a8579"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."colors"."0.x.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"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; - name = "colors-0.6.2.tgz"; - sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."combined-stream"."^1.0.5" = - self.by-version."combined-stream"."1.0.5"; - by-version."combined-stream"."1.0.5" = self.buildNodePackage { - name = "combined-stream-1.0.5"; - version = "1.0.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; - name = "combined-stream-1.0.5.tgz"; - sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; - }; - deps = { - "delayed-stream-1.0.0" = self.by-version."delayed-stream"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."combined-stream"."~0.0.4" = - self.by-version."combined-stream"."0.0.7"; - by-version."combined-stream"."0.0.7" = self.buildNodePackage { - name = "combined-stream-0.0.7"; - version = "0.0.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - name = "combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; - }; - deps = { - "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."combined-stream"."~0.0.5" = - self.by-version."combined-stream"."0.0.7"; - by-spec."combined-stream"."~1.0.1" = - self.by-version."combined-stream"."1.0.5"; - by-spec."combined-stream"."~1.0.5" = - self.by-version."combined-stream"."1.0.5"; - by-spec."commander"."1.0.4" = - self.by-version."commander"."1.0.4"; - by-version."commander"."1.0.4" = self.buildNodePackage { - name = "commander-1.0.4"; - version = "1.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-1.0.4.tgz"; - name = "commander-1.0.4.tgz"; - sha1 = "5edeb1aee23c4fb541a6b70d692abef19669a2d3"; - }; - deps = { - "keypress-0.1.0" = self.by-version."keypress"."0.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."commander"."^2.8.1" = - self.by-version."commander"."2.9.0"; - by-version."commander"."2.9.0" = self.buildNodePackage { - name = "commander-2.9.0"; - version = "2.9.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; - name = "commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; - }; - deps = { - "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."commander"."^2.9.0" = - self.by-version."commander"."2.9.0"; - by-spec."commander"."~1.1.1" = - self.by-version."commander"."1.1.1"; - by-version."commander"."1.1.1" = self.buildNodePackage { - name = "commander-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-1.1.1.tgz"; - name = "commander-1.1.1.tgz"; - sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041"; - }; - deps = { - "keypress-0.1.0" = self.by-version."keypress"."0.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."concat-stream"."~1.4.7" = - self.by-version."concat-stream"."1.4.10"; - by-version."concat-stream"."1.4.10" = self.buildNodePackage { - name = "concat-stream-1.4.10"; - version = "1.4.10"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz"; - name = "concat-stream-1.4.10.tgz"; - sha1 = "acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36"; - }; - deps = { - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "typedarray-0.0.6" = self.by-version."typedarray"."0.0.6"; - "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."core-util-is"."~1.0.0" = - self.by-version."core-util-is"."1.0.2"; - by-version."core-util-is"."1.0.2" = self.buildNodePackage { - name = "core-util-is-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - name = "core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cryptiles"."0.2.x" = - self.by-version."cryptiles"."0.2.2"; - by-version."cryptiles"."0.2.2" = self.buildNodePackage { - name = "cryptiles-0.2.2"; - version = "0.2.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; - name = "cryptiles-0.2.2.tgz"; - sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; - }; - deps = { - "boom-0.4.2" = self.by-version."boom"."0.4.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cryptiles"."2.x.x" = - self.by-version."cryptiles"."2.0.5"; - by-version."cryptiles"."2.0.5" = self.buildNodePackage { - name = "cryptiles-2.0.5"; - version = "2.0.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; - name = "cryptiles-2.0.5.tgz"; - sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; - }; - deps = { - "boom-2.10.1" = self.by-version."boom"."2.10.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ctype"."0.5.2" = - self.by-version."ctype"."0.5.2"; - by-version."ctype"."0.5.2" = self.buildNodePackage { - name = "ctype-0.5.2"; - version = "0.5.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"; - name = "ctype-0.5.2.tgz"; - sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ctype"."0.5.3" = - self.by-version."ctype"."0.5.3"; - by-version."ctype"."0.5.3" = self.buildNodePackage { - name = "ctype-0.5.3"; - version = "0.5.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; - name = "ctype-0.5.3.tgz"; - sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cycle"."1.0.x" = - self.by-version."cycle"."1.0.3"; - by-version."cycle"."1.0.3" = self.buildNodePackage { - name = "cycle-1.0.3"; - version = "1.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; - name = "cycle-1.0.3.tgz"; - sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."dashdash".">=1.10.1 <2.0.0" = - self.by-version."dashdash"."1.13.0"; - by-version."dashdash"."1.13.0" = self.buildNodePackage { - name = "dashdash-1.13.0"; - version = "1.13.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/dashdash/-/dashdash-1.13.0.tgz"; - name = "dashdash-1.13.0.tgz"; - sha1 = "a5aae6fd9d8e156624eb0dd9259eb12ba245385a"; - }; - deps = { - "assert-plus-1.0.0" = self.by-version."assert-plus"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."date-utils"."*" = - self.by-version."date-utils"."1.2.18"; - by-version."date-utils"."1.2.18" = self.buildNodePackage { - name = "date-utils-1.2.18"; - version = "1.2.18"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/date-utils/-/date-utils-1.2.18.tgz"; - name = "date-utils-1.2.18.tgz"; - sha1 = "6a55e61b20250e9c24d836b1eaac9b32ee255d51"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."dateformat"."1.0.2-1.2.3" = - self.by-version."dateformat"."1.0.2-1.2.3"; - by-version."dateformat"."1.0.2-1.2.3" = self.buildNodePackage { - name = "dateformat-1.0.2-1.2.3"; - version = "1.0.2-1.2.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz"; - name = "dateformat-1.0.2-1.2.3.tgz"; - sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9"; - }; - deps = { - }; - 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 { - name = "debug-0.7.4"; - version = "0.7.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; - name = "debug-0.7.4.tgz"; - sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."delayed-stream"."0.0.5" = - self.by-version."delayed-stream"."0.0.5"; - by-version."delayed-stream"."0.0.5" = self.buildNodePackage { - name = "delayed-stream-0.0.5"; - version = "0.0.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - name = "delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."delayed-stream"."~1.0.0" = - self.by-version."delayed-stream"."1.0.0"; - by-version."delayed-stream"."1.0.0" = self.buildNodePackage { - name = "delayed-stream-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - name = "delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."duplexer"."~0.1.1" = - self.by-version."duplexer"."0.1.1"; - by-version."duplexer"."0.1.1" = self.buildNodePackage { - name = "duplexer-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; - name = "duplexer-0.1.1.tgz"; - sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."easy-table"."0.0.1" = - self.by-version."easy-table"."0.0.1"; - by-version."easy-table"."0.0.1" = self.buildNodePackage { - name = "easy-table-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/easy-table/-/easy-table-0.0.1.tgz"; - name = "easy-table-0.0.1.tgz"; - sha1 = "dbd809177a1dd7afc06b4849d1ca7eff13e299eb"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ecc-jsbn".">=0.0.1 <1.0.0" = - self.by-version."ecc-jsbn"."0.1.1"; - by-version."ecc-jsbn"."0.1.1" = self.buildNodePackage { - name = "ecc-jsbn-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; - name = "ecc-jsbn-0.1.1.tgz"; - sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; - }; - deps = { - "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ecdsa-sig-formatter"."^1.0.0" = - self.by-version."ecdsa-sig-formatter"."1.0.5"; - by-version."ecdsa-sig-formatter"."1.0.5" = self.buildNodePackage { - name = "ecdsa-sig-formatter-1.0.5"; - version = "1.0.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.5.tgz"; - name = "ecdsa-sig-formatter-1.0.5.tgz"; - sha1 = "0d0f32b638611f6b8f36ffd305a3e512ea5444e6"; - }; - deps = { - "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."envconf"."~0.0.4" = - self.by-version."envconf"."0.0.4"; - by-version."envconf"."0.0.4" = self.buildNodePackage { - name = "envconf-0.0.4"; - version = "0.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/envconf/-/envconf-0.0.4.tgz"; - name = "envconf-0.0.4.tgz"; - sha1 = "85675afba237c43f98de2d46adc0e532a4dcf48b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."escape-string-regexp"."^1.0.2" = - self.by-version."escape-string-regexp"."1.0.5"; - by-version."escape-string-regexp"."1.0.5" = self.buildNodePackage { - name = "escape-string-regexp-1.0.5"; - version = "1.0.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - name = "escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."event-stream"."3.1.5" = - self.by-version."event-stream"."3.1.5"; - by-version."event-stream"."3.1.5" = self.buildNodePackage { - name = "event-stream-3.1.5"; - version = "3.1.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/event-stream/-/event-stream-3.1.5.tgz"; - name = "event-stream-3.1.5.tgz"; - sha1 = "6cba5a3ae02a7e4967d65ad04ef12502a2fff66c"; - }; - deps = { - "through-2.3.8" = self.by-version."through"."2.3.8"; - "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; - "from-0.1.3" = self.by-version."from"."0.1.3"; - "map-stream-0.1.0" = self.by-version."map-stream"."0.1.0"; - "pause-stream-0.0.11" = self.by-version."pause-stream"."0.0.11"; - "split-0.2.10" = self.by-version."split"."0.2.10"; - "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."extend"."~1.2.1" = - self.by-version."extend"."1.2.1"; - by-version."extend"."1.2.1" = self.buildNodePackage { - name = "extend-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; - name = "extend-1.2.1.tgz"; - sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."extend"."~3.0.0" = - self.by-version."extend"."3.0.0"; - by-version."extend"."3.0.0" = self.buildNodePackage { - name = "extend-3.0.0"; - version = "3.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/extend/-/extend-3.0.0.tgz"; - name = "extend-3.0.0.tgz"; - sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."extsprintf"."1.0.2" = - self.by-version."extsprintf"."1.0.2"; - by-version."extsprintf"."1.0.2" = self.buildNodePackage { - name = "extsprintf-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; - name = "extsprintf-1.0.2.tgz"; - sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; - }; - 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 { - name = "eyes-0.1.8"; - version = "0.1.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; - name = "eyes-0.1.8.tgz"; - sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."eyes"."0.x.x" = - self.by-version."eyes"."0.1.8"; - by-spec."fibers"."^1.0.1" = - self.by-version."fibers"."1.0.10"; - by-version."fibers"."1.0.10" = self.buildNodePackage { - name = "fibers-1.0.10"; - version = "1.0.10"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/fibers/-/fibers-1.0.10.tgz"; - name = "fibers-1.0.10.tgz"; - sha1 = "0ccea7287e5dafd2626c2c9d3f15113a1b5829cd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."forever-agent"."~0.5.0" = - self.by-version."forever-agent"."0.5.2"; - by-version."forever-agent"."0.5.2" = self.buildNodePackage { - name = "forever-agent-0.5.2"; - version = "0.5.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - name = "forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - 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/forever-agent/-/forever-agent-0.6.1.tgz"; - name = "forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."forever-agent"."~0.6.1" = - self.by-version."forever-agent"."0.6.1"; - by-spec."form-data"."~0.1.0" = - self.by-version."form-data"."0.1.4"; - by-version."form-data"."0.1.4" = self.buildNodePackage { - name = "form-data-0.1.4"; - version = "0.1.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; - name = "form-data-0.1.4.tgz"; - sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; - }; - 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.2" = self.by-version."async"."0.9.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."form-data"."~0.2.0" = - self.by-version."form-data"."0.2.0"; - by-version."form-data"."0.2.0" = self.buildNodePackage { - name = "form-data-0.2.0"; - version = "0.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz"; - name = "form-data-0.2.0.tgz"; - sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466"; - }; - deps = { - "async-0.9.2" = self.by-version."async"."0.9.2"; - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."form-data"."~1.0.0-rc3" = - self.by-version."form-data"."1.0.0-rc3"; - by-version."form-data"."1.0.0-rc3" = self.buildNodePackage { - name = "form-data-1.0.0-rc3"; - version = "1.0.0-rc3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz"; - name = "form-data-1.0.0-rc3.tgz"; - sha1 = "d35bc62e7fbc2937ae78f948aaa0d38d90607577"; - }; - deps = { - "async-1.5.2" = self.by-version."async"."1.5.2"; - "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5"; - "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."from"."~0" = - self.by-version."from"."0.1.3"; - by-version."from"."0.1.3" = self.buildNodePackage { - name = "from-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/from/-/from-0.1.3.tgz"; - name = "from-0.1.3.tgz"; - sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."galaxy"."^0.1.11" = - self.by-version."galaxy"."0.1.12"; - by-version."galaxy"."0.1.12" = self.buildNodePackage { - name = "galaxy-0.1.12"; - version = "0.1.12"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/galaxy/-/galaxy-0.1.12.tgz"; - name = "galaxy-0.1.12.tgz"; - sha1 = "0c989774f2870c69378aa665648cdc60f343aa53"; - }; - deps = { - }; - 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.2.0"; - by-version."generate-object-property"."1.2.0" = self.buildNodePackage { - name = "generate-object-property-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"; - name = "generate-object-property-1.2.0.tgz"; - sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; - }; - deps = { - "is-property-1.0.2" = self.by-version."is-property"."1.0.2"; - }; - 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."github"."0.1.6" = - self.by-version."github"."0.1.6"; - by-version."github"."0.1.6" = self.buildNodePackage { - name = "github-0.1.6"; - version = "0.1.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/github/-/github-0.1.6.tgz"; - name = "github-0.1.6.tgz"; - sha1 = "1344e694f8d20ef9b29bcbfd1ca5eb4f7a287922"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - 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."har-validator"."^1.6.1" = - self.by-version."har-validator"."1.8.0"; - by-version."har-validator"."1.8.0" = self.buildNodePackage { - name = "har-validator-1.8.0"; - version = "1.8.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz"; - name = "har-validator-1.8.0.tgz"; - sha1 = "d83842b0eb4c435960aeb108a067a3aa94c0eeb2"; - }; - deps = { - "bluebird-2.10.2" = self.by-version."bluebird"."2.10.2"; - "chalk-1.1.1" = self.by-version."chalk"."1.1.1"; - "commander-2.9.0" = self.by-version."commander"."2.9.0"; - "is-my-json-valid-2.13.1" = self.by-version."is-my-json-valid"."2.13.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."har-validator"."~2.0.6" = - self.by-version."har-validator"."2.0.6"; - by-version."har-validator"."2.0.6" = self.buildNodePackage { - name = "har-validator-2.0.6"; - version = "2.0.6"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; - name = "har-validator-2.0.6.tgz"; - sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; - }; - deps = { - "chalk-1.1.1" = self.by-version."chalk"."1.1.1"; - "commander-2.9.0" = self.by-version."commander"."2.9.0"; - "is-my-json-valid-2.13.1" = self.by-version."is-my-json-valid"."2.13.1"; - "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."has-ansi"."^2.0.0" = - self.by-version."has-ansi"."2.0.0"; - by-version."has-ansi"."2.0.0" = self.buildNodePackage { - name = "has-ansi-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - name = "has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; - }; - deps = { - "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0"; - }; - 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 { - name = "hawk-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; - name = "hawk-1.1.1.tgz"; - sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; - }; - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - "boom-0.4.2" = self.by-version."boom"."0.4.2"; - "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2"; - "sntp-0.2.4" = self.by-version."sntp"."0.2.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 { - name = "hawk-2.3.1"; - version = "2.3.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz"; - name = "hawk-2.3.1.tgz"; - sha1 = "1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f"; - }; - deps = { - "hoek-2.16.3" = self.by-version."hoek"."2.16.3"; - "boom-2.10.1" = self.by-version."boom"."2.10.1"; - "cryptiles-2.0.5" = self.by-version."cryptiles"."2.0.5"; - "sntp-1.0.9" = self.by-version."sntp"."1.0.9"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hawk"."~3.1.0" = - self.by-version."hawk"."3.1.3"; - by-version."hawk"."3.1.3" = self.buildNodePackage { - name = "hawk-3.1.3"; - version = "3.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; - name = "hawk-3.1.3.tgz"; - sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; - }; - deps = { - "hoek-2.16.3" = self.by-version."hoek"."2.16.3"; - "boom-2.10.1" = self.by-version."boom"."2.10.1"; - "cryptiles-2.0.5" = self.by-version."cryptiles"."2.0.5"; - "sntp-1.0.9" = self.by-version."sntp"."1.0.9"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hoek"."0.9.x" = - self.by-version."hoek"."0.9.1"; - by-version."hoek"."0.9.1" = self.buildNodePackage { - name = "hoek-0.9.1"; - version = "0.9.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; - name = "hoek-0.9.1.tgz"; - sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hoek"."2.x.x" = - self.by-version."hoek"."2.16.3"; - by-version."hoek"."2.16.3" = self.buildNodePackage { - name = "hoek-2.16.3"; - version = "2.16.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; - name = "hoek-2.16.3.tgz"; - sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; - }; - deps = { - }; - 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 { - name = "http-signature-0.10.1"; - version = "0.10.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; - name = "http-signature-0.10.1.tgz"; - sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; - }; - deps = { - "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5"; - "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; - "ctype-0.5.3" = self.by-version."ctype"."0.5.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."http-signature"."~0.11.0" = - self.by-version."http-signature"."0.11.0"; - by-version."http-signature"."0.11.0" = self.buildNodePackage { - name = "http-signature-0.11.0"; - version = "0.11.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"; - name = "http-signature-0.11.0.tgz"; - sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6"; - }; - deps = { - "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5"; - "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; - "ctype-0.5.3" = self.by-version."ctype"."0.5.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."http-signature"."~1.1.0" = - self.by-version."http-signature"."1.1.1"; - by-version."http-signature"."1.1.1" = self.buildNodePackage { - name = "http-signature-1.1.1"; - version = "1.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; - name = "http-signature-1.1.1.tgz"; - sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; - }; - deps = { - "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0"; - "jsprim-1.2.2" = self.by-version."jsprim"."1.2.2"; - "sshpk-1.7.4" = self.by-version."sshpk"."1.7.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."indent-string"."^1.1.0" = - self.by-version."indent-string"."1.2.2"; - by-version."indent-string"."1.2.2" = self.buildNodePackage { - name = "indent-string-1.2.2"; - version = "1.2.2"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/indent-string/-/indent-string-1.2.2.tgz"; - name = "indent-string-1.2.2.tgz"; - sha1 = "db99bcc583eb6abbb1e48dcbb1999a986041cb6b"; - }; - deps = { - "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; - "minimist-1.2.0" = self.by-version."minimist"."1.2.0"; - "repeating-1.1.3" = self.by-version."repeating"."1.1.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."inherits"."~2.0.1" = - self.by-version."inherits"."2.0.1"; - by-version."inherits"."2.0.1" = self.buildNodePackage { - name = "inherits-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - name = "inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."is-finite"."^1.0.0" = - self.by-version."is-finite"."1.0.1"; - by-version."is-finite"."1.0.1" = self.buildNodePackage { - name = "is-finite-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz"; - name = "is-finite-1.0.1.tgz"; - sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b"; - }; - deps = { - "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."is-my-json-valid"."^2.12.0" = - self.by-version."is-my-json-valid"."2.13.1"; - by-version."is-my-json-valid"."2.13.1" = self.buildNodePackage { - name = "is-my-json-valid-2.13.1"; - version = "2.13.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"; - name = "is-my-json-valid-2.13.1.tgz"; - sha1 = "d55778a82feb6b0963ff4be111d5d1684e890707"; - }; - deps = { - "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0"; - "generate-object-property-1.2.0" = self.by-version."generate-object-property"."1.2.0"; - "jsonpointer-2.0.0" = self.by-version."jsonpointer"."2.0.0"; - "xtend-4.0.1" = self.by-version."xtend"."4.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."is-my-json-valid"."^2.12.4" = - self.by-version."is-my-json-valid"."2.13.1"; - 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 = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."is-typedarray"."~1.0.0" = - self.by-version."is-typedarray"."1.0.0"; - by-version."is-typedarray"."1.0.0" = self.buildNodePackage { - name = "is-typedarray-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - name = "is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."isarray"."0.0.1" = - self.by-version."isarray"."0.0.1"; - by-version."isarray"."0.0.1" = self.buildNodePackage { - name = "isarray-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - name = "isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."isstream"."~0.1.1" = - self.by-version."isstream"."0.1.2"; - by-version."isstream"."0.1.2" = self.buildNodePackage { - name = "isstream-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - name = "isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."isstream"."~0.1.2" = - self.by-version."isstream"."0.1.2"; - by-spec."jodid25519".">=1.0.0 <2.0.0" = - self.by-version."jodid25519"."1.0.2"; - by-version."jodid25519"."1.0.2" = self.buildNodePackage { - name = "jodid25519-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; - name = "jodid25519-1.0.2.tgz"; - sha1 = "06d4912255093419477d425633606e0e90782967"; - }; - deps = { - "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."js2xmlparser"."1.0.0" = - self.by-version."js2xmlparser"."1.0.0"; - by-version."js2xmlparser"."1.0.0" = self.buildNodePackage { - name = "js2xmlparser-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/js2xmlparser/-/js2xmlparser-1.0.0.tgz"; - name = "js2xmlparser-1.0.0.tgz"; - sha1 = "5a170f2e8d6476ce45405e04823242513782fe30"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jsbn".">=0.1.0 <0.2.0" = - self.by-version."jsbn"."0.1.0"; - by-version."jsbn"."0.1.0" = self.buildNodePackage { - name = "jsbn-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"; - name = "jsbn-0.1.0.tgz"; - sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jsbn"."~0.1.0" = - self.by-version."jsbn"."0.1.0"; - by-spec."json-schema"."0.2.2" = - self.by-version."json-schema"."0.2.2"; - by-version."json-schema"."0.2.2" = self.buildNodePackage { - name = "json-schema-0.2.2"; - version = "0.2.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; - name = "json-schema-0.2.2.tgz"; - sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."json-stringify-safe"."~5.0.0" = - self.by-version."json-stringify-safe"."5.0.1"; - by-version."json-stringify-safe"."5.0.1" = self.buildNodePackage { - name = "json-stringify-safe-5.0.1"; - version = "5.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - name = "json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."json-stringify-safe"."~5.0.1" = - self.by-version."json-stringify-safe"."5.0.1"; - by-spec."jsonpointer"."2.0.0" = - self.by-version."jsonpointer"."2.0.0"; - by-version."jsonpointer"."2.0.0" = self.buildNodePackage { - name = "jsonpointer-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"; - name = "jsonpointer-2.0.0.tgz"; - sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jsprim"."^1.2.2" = - self.by-version."jsprim"."1.2.2"; - by-version."jsprim"."1.2.2" = self.buildNodePackage { - name = "jsprim-1.2.2"; - version = "1.2.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz"; - name = "jsprim-1.2.2.tgz"; - sha1 = "f20c906ac92abd58e3b79ac8bc70a48832512da1"; - }; - deps = { - "extsprintf-1.0.2" = self.by-version."extsprintf"."1.0.2"; - "json-schema-0.2.2" = self.by-version."json-schema"."0.2.2"; - "verror-1.3.6" = self.by-version."verror"."1.3.6"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jsrsasign"."4.8.2 " = - self.by-version."jsrsasign"."4.8.2"; - by-version."jsrsasign"."4.8.2" = self.buildNodePackage { - name = "jsrsasign-4.8.2"; - version = "4.8.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jsrsasign/-/jsrsasign-4.8.2.tgz"; - name = "jsrsasign-4.8.2.tgz"; - sha1 = "bd0a7040d426d7598d6c742ec8f875d0e88644a9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jwa"."^1.1.2" = - self.by-version."jwa"."1.1.3"; - by-version."jwa"."1.1.3" = self.buildNodePackage { - name = "jwa-1.1.3"; - version = "1.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jwa/-/jwa-1.1.3.tgz"; - name = "jwa-1.1.3.tgz"; - sha1 = "fa9f2f005ff0c630e7c41526a31f37f79733cd6d"; - }; - deps = { - "base64url-1.0.6" = self.by-version."base64url"."1.0.6"; - "buffer-equal-constant-time-1.0.1" = self.by-version."buffer-equal-constant-time"."1.0.1"; - "ecdsa-sig-formatter-1.0.5" = self.by-version."ecdsa-sig-formatter"."1.0.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jws"."3.x.x" = - self.by-version."jws"."3.1.3"; - by-version."jws"."3.1.3" = self.buildNodePackage { - name = "jws-3.1.3"; - version = "3.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jws/-/jws-3.1.3.tgz"; - name = "jws-3.1.3.tgz"; - sha1 = "b88f1b4581a2c5ee8813c06b3fdf90ea9b5c7e6c"; - }; - deps = { - "base64url-1.0.6" = self.by-version."base64url"."1.0.6"; - "jwa-1.1.3" = self.by-version."jwa"."1.1.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."keypress"."0.1.x" = - self.by-version."keypress"."0.1.0"; - by-version."keypress"."0.1.0" = self.buildNodePackage { - name = "keypress-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; - name = "keypress-0.1.0.tgz"; - sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."kuduscript"."1.0.6" = - self.by-version."kuduscript"."1.0.6"; - by-version."kuduscript"."1.0.6" = self.buildNodePackage { - name = "kuduscript-1.0.6"; - version = "1.0.6"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/kuduscript/-/kuduscript-1.0.6.tgz"; - name = "kuduscript-1.0.6.tgz"; - sha1 = "466628f1d4f68d972a28939012e055156bdbcf16"; - }; - deps = { - "commander-1.1.1" = self.by-version."commander"."1.1.1"; - "streamline-0.4.11" = self.by-version."streamline"."0.4.11"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lru-cache"."^4.0.0" = - self.by-version."lru-cache"."4.0.0"; - by-version."lru-cache"."4.0.0" = self.buildNodePackage { - name = "lru-cache-4.0.0"; - version = "4.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-4.0.0.tgz"; - name = "lru-cache-4.0.0.tgz"; - sha1 = "b5cbf01556c16966febe54ceec0fb4dc90df6c28"; - }; - deps = { - "pseudomap-1.0.2" = self.by-version."pseudomap"."1.0.2"; - "yallist-2.0.0" = self.by-version."yallist"."2.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."map-obj"."^1.0.0" = - self.by-version."map-obj"."1.0.1"; - by-version."map-obj"."1.0.1" = self.buildNodePackage { - name = "map-obj-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - name = "map-obj-1.0.1.tgz"; - sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."map-stream"."~0.1.0" = - self.by-version."map-stream"."0.1.0"; - by-version."map-stream"."0.1.0" = self.buildNodePackage { - name = "map-stream-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; - name = "map-stream-0.1.0.tgz"; - sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."meow"."~2.0.0" = - self.by-version."meow"."2.0.0"; - by-version."meow"."2.0.0" = self.buildNodePackage { - name = "meow-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/meow/-/meow-2.0.0.tgz"; - name = "meow-2.0.0.tgz"; - sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1"; - }; - deps = { - "camelcase-keys-1.0.0" = self.by-version."camelcase-keys"."1.0.0"; - "indent-string-1.2.2" = self.by-version."indent-string"."1.2.2"; - "minimist-1.2.0" = self.by-version."minimist"."1.2.0"; - "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - 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"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - name = "mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-db"."~1.12.0" = - self.by-version."mime-db"."1.12.0"; - by-version."mime-db"."1.12.0" = self.buildNodePackage { - name = "mime-db-1.12.0"; - version = "1.12.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"; - name = "mime-db-1.12.0.tgz"; - sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-db"."~1.22.0" = - self.by-version."mime-db"."1.22.0"; - by-version."mime-db"."1.22.0" = self.buildNodePackage { - name = "mime-db-1.22.0"; - version = "1.22.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"; - name = "mime-db-1.22.0.tgz"; - sha1 = "ab23a6372dc9d86d3dc9121bd0ebd38105a1904a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."^2.1.3" = - self.by-version."mime-types"."2.1.10"; - by-version."mime-types"."2.1.10" = self.buildNodePackage { - name = "mime-types-2.1.10"; - version = "2.1.10"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz"; - name = "mime-types-2.1.10.tgz"; - sha1 = "b93c7cb4362e16d41072a7e54538fb4d43070837"; - }; - deps = { - "mime-db-1.22.0" = self.by-version."mime-db"."1.22.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."~1.0.1" = - self.by-version."mime-types"."1.0.2"; - by-version."mime-types"."1.0.2" = self.buildNodePackage { - name = "mime-types-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; - name = "mime-types-1.0.2.tgz"; - sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."~2.0.1" = - self.by-version."mime-types"."2.0.14"; - by-version."mime-types"."2.0.14" = self.buildNodePackage { - name = "mime-types-2.0.14"; - version = "2.0.14"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"; - name = "mime-types-2.0.14.tgz"; - sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6"; - }; - deps = { - "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."~2.0.3" = - self.by-version."mime-types"."2.0.14"; - by-spec."mime-types"."~2.1.7" = - self.by-version."mime-types"."2.1.10"; - by-spec."minimist"."^1.1.0" = - self.by-version."minimist"."1.2.0"; - by-version."minimist"."1.2.0" = self.buildNodePackage { - name = "minimist-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - name = "minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."moment"."2.6.0" = - self.by-version."moment"."2.6.0"; - by-version."moment"."2.6.0" = self.buildNodePackage { - name = "moment-2.6.0"; - version = "2.6.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/moment/-/moment-2.6.0.tgz"; - name = "moment-2.6.0.tgz"; - sha1 = "0765b72b841dd213fa91914c0f6765122719f061"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."moment"."^2.6.0" = - self.by-version."moment"."2.12.0"; - by-version."moment"."2.12.0" = self.buildNodePackage { - name = "moment-2.12.0"; - version = "2.12.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/moment/-/moment-2.12.0.tgz"; - name = "moment-2.12.0.tgz"; - sha1 = "dc2560d19838d6c0731b1a6afa04675264d360d6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ms-rest"."^1.10.0" = - self.by-version."ms-rest"."1.10.0"; - by-version."ms-rest"."1.10.0" = self.buildNodePackage { - name = "ms-rest-1.10.0"; - version = "1.10.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ms-rest/-/ms-rest-1.10.0.tgz"; - name = "ms-rest-1.10.0.tgz"; - sha1 = "d1d9a93f3c7f7189500475ac680875ed1da56d99"; - }; - deps = { - "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; - "tunnel-0.0.4" = self.by-version."tunnel"."0.0.4"; - "request-2.69.0" = self.by-version."request"."2.69.0"; - "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; - "through-2.3.8" = self.by-version."through"."2.3.8"; - "moment-2.12.0" = self.by-version."moment"."2.12.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ms-rest"."^1.8.0" = - self.by-version."ms-rest"."1.10.0"; - by-spec."ms-rest-azure"."^1.8.0" = - self.by-version."ms-rest-azure"."1.10.0"; - by-version."ms-rest-azure"."1.10.0" = self.buildNodePackage { - name = "ms-rest-azure-1.10.0"; - version = "1.10.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.10.0.tgz"; - name = "ms-rest-azure-1.10.0.tgz"; - sha1 = "467f481de7f3f10b5d020de393d0de71ada6278a"; - }; - deps = { - "async-0.2.7" = self.by-version."async"."0.2.7"; - "uuid-2.0.1" = self.by-version."uuid"."2.0.1"; - "adal-node-0.1.16" = self.by-version."adal-node"."0.1.16"; - "ms-rest-1.10.0" = self.by-version."ms-rest"."1.10.0"; - "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; - "moment-2.12.0" = self.by-version."moment"."2.12.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."node-forge"."0.6.23" = - self.by-version."node-forge"."0.6.23"; - by-version."node-forge"."0.6.23" = self.buildNodePackage { - name = "node-forge-0.6.23"; - version = "0.6.23"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/node-forge/-/node-forge-0.6.23.tgz"; - name = "node-forge-0.6.23.tgz"; - sha1 = "f03cf65ebd5d4d9dd2f7becb57ceaf78ed94a2bf"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."node-uuid"."1.2.0" = - self.by-version."node-uuid"."1.2.0"; - by-version."node-uuid"."1.2.0" = self.buildNodePackage { - name = "node-uuid-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.2.0.tgz"; - name = "node-uuid-1.2.0.tgz"; - sha1 = "81a9fe32934719852499b58b2523d2cd5fdfd65b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."node-uuid"."1.4.1" = - self.by-version."node-uuid"."1.4.1"; - by-version."node-uuid"."1.4.1" = self.buildNodePackage { - name = "node-uuid-1.4.1"; - version = "1.4.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; - name = "node-uuid-1.4.1.tgz"; - sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."node-uuid".">= 1.3.3" = - self.by-version."node-uuid"."1.4.7"; - by-version."node-uuid"."1.4.7" = self.buildNodePackage { - name = "node-uuid-1.4.7"; - version = "1.4.7"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; - name = "node-uuid-1.4.7.tgz"; - sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."node-uuid"."^1.4.1" = - self.by-version."node-uuid"."1.4.7"; - by-spec."node-uuid"."~1.4.0" = - self.by-version."node-uuid"."1.4.7"; - by-spec."node-uuid"."~1.4.7" = - self.by-version."node-uuid"."1.4.7"; - by-spec."number-is-nan"."1.0.0" = - self.by-version."number-is-nan"."1.0.0"; - by-version."number-is-nan"."1.0.0" = self.buildNodePackage { - name = "number-is-nan-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"; - name = "number-is-nan-1.0.0.tgz"; - sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."number-is-nan"."^1.0.0" = - self.by-version."number-is-nan"."1.0.0"; - 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"; - 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"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."oauth-sign"."~0.6.0" = - self.by-version."oauth-sign"."0.6.0"; - by-version."oauth-sign"."0.6.0" = self.buildNodePackage { - name = "oauth-sign-0.6.0"; - version = "0.6.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz"; - name = "oauth-sign-0.6.0.tgz"; - sha1 = "7dbeae44f6ca454e1f168451d630746735813ce3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."oauth-sign"."~0.8.0" = - self.by-version."oauth-sign"."0.8.1"; - by-version."oauth-sign"."0.8.1" = self.buildNodePackage { - name = "oauth-sign-0.8.1"; - version = "0.8.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz"; - name = "oauth-sign-0.8.1.tgz"; - sha1 = "182439bdb91378bf7460e75c64ea43e6448def06"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."object-assign"."^1.0.0" = - self.by-version."object-assign"."1.0.0"; - by-version."object-assign"."1.0.0" = self.buildNodePackage { - name = "object-assign-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz"; - name = "object-assign-1.0.0.tgz"; - sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."omelette"."0.1.0" = - self.by-version."omelette"."0.1.0"; - by-version."omelette"."0.1.0" = self.buildNodePackage { - name = "omelette-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/omelette/-/omelette-0.1.0.tgz"; - name = "omelette-0.1.0.tgz"; - sha1 = "31cc7eb472a513c07483d24d3e1bf164cb0d23b8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."openssl-wrapper"."0.2.1" = - self.by-version."openssl-wrapper"."0.2.1"; - by-version."openssl-wrapper"."0.2.1" = self.buildNodePackage { - name = "openssl-wrapper-0.2.1"; - version = "0.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/openssl-wrapper/-/openssl-wrapper-0.2.1.tgz"; - name = "openssl-wrapper-0.2.1.tgz"; - sha1 = "ff2d6552c83bb14437edc0371784704c75289473"; - }; - deps = { - "debug-0.7.4" = self.by-version."debug"."0.7.4"; - "q-0.9.7" = self.by-version."q"."0.9.7"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."pause-stream"."0.0.11" = - self.by-version."pause-stream"."0.0.11"; - by-version."pause-stream"."0.0.11" = self.buildNodePackage { - name = "pause-stream-0.0.11"; - version = "0.0.11"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; - name = "pause-stream-0.0.11.tgz"; - sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; - }; - deps = { - "through-2.3.8" = self.by-version."through"."2.3.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."pinkie"."^2.0.0" = - self.by-version."pinkie"."2.0.4"; - by-version."pinkie"."2.0.4" = self.buildNodePackage { - name = "pinkie-2.0.4"; - version = "2.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; - name = "pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."pinkie-promise"."^2.0.0" = - self.by-version."pinkie-promise"."2.0.0"; - by-version."pinkie-promise"."2.0.0" = self.buildNodePackage { - name = "pinkie-promise-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz"; - name = "pinkie-promise-2.0.0.tgz"; - sha1 = "4c83538de1f6e660c29e0a13446844f7a7e88259"; - }; - deps = { - "pinkie-2.0.4" = self.by-version."pinkie"."2.0.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."pkginfo"."0.2.x" = - self.by-version."pkginfo"."0.2.3"; - by-version."pkginfo"."0.2.3" = self.buildNodePackage { - name = "pkginfo-0.2.3"; - version = "0.2.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz"; - name = "pkginfo-0.2.3.tgz"; - sha1 = "7239c42a5ef6c30b8f328439d9b9ff71042490f8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."process-nextick-args"."~1.0.6" = - self.by-version."process-nextick-args"."1.0.6"; - by-version."process-nextick-args"."1.0.6" = self.buildNodePackage { - name = "process-nextick-args-1.0.6"; - version = "1.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"; - name = "process-nextick-args-1.0.6.tgz"; - sha1 = "0f96b001cea90b12592ce566edb97ec11e69bd05"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."pseudomap"."^1.0.1" = - self.by-version."pseudomap"."1.0.2"; - by-version."pseudomap"."1.0.2" = self.buildNodePackage { - name = "pseudomap-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; - name = "pseudomap-1.0.2.tgz"; - sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."q"."~0.9.3" = - self.by-version."q"."0.9.7"; - by-version."q"."0.9.7" = self.buildNodePackage { - name = "q-0.9.7"; - version = "0.9.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz"; - name = "q-0.9.7.tgz"; - sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - 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"; - 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"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."~3.1.0" = - self.by-version."qs"."3.1.0"; - by-version."qs"."3.1.0" = self.buildNodePackage { - name = "qs-3.1.0"; - version = "3.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-3.1.0.tgz"; - name = "qs-3.1.0.tgz"; - sha1 = "d0e9ae745233a12dc43fb4f3055bba446261153c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."~6.0.2" = - self.by-version."qs"."6.0.2"; - by-version."qs"."6.0.2" = self.buildNodePackage { - name = "qs-6.0.2"; - version = "6.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-6.0.2.tgz"; - name = "qs-6.0.2.tgz"; - sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."readable-stream"."~1.0.0" = - 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.2" = self.by-version."core-util-is"."1.0.2"; - "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.0.26" = - self.by-version."readable-stream"."1.0.33"; - by-spec."readable-stream"."~1.1.9" = - self.by-version."readable-stream"."1.1.13"; - by-version."readable-stream"."1.1.13" = self.buildNodePackage { - name = "readable-stream-1.1.13"; - version = "1.1.13"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"; - name = "readable-stream-1.1.13.tgz"; - sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e"; - }; - deps = { - "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2"; - "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"."~2.0.0" = - self.by-version."readable-stream"."2.0.5"; - by-version."readable-stream"."2.0.5" = self.buildNodePackage { - name = "readable-stream-2.0.5"; - version = "2.0.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.5.tgz"; - name = "readable-stream-2.0.5.tgz"; - sha1 = "a2426f8dcd4551c77a33f96edf2886a23c829669"; - }; - deps = { - "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "process-nextick-args-1.0.6" = self.by-version."process-nextick-args"."1.0.6"; - "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; - "util-deprecate-1.0.2" = self.by-version."util-deprecate"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."readable-stream"."~2.0.5" = - self.by-version."readable-stream"."2.0.5"; - by-spec."repeating"."^1.1.0" = - self.by-version."repeating"."1.1.3"; - by-version."repeating"."1.1.3" = self.buildNodePackage { - name = "repeating-1.1.3"; - version = "1.1.3"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz"; - name = "repeating-1.1.3.tgz"; - sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; - }; - deps = { - "is-finite-1.0.1" = self.by-version."is-finite"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."request"."2.45.0" = - self.by-version."request"."2.45.0"; - by-version."request"."2.45.0" = self.buildNodePackage { - name = "request-2.45.0"; - version = "2.45.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.45.0.tgz"; - name = "request-2.45.0.tgz"; - sha1 = "29d713a0a07f17fb2e7b61815d2010681718e93c"; - }; - deps = { - "bl-0.9.5" = self.by-version."bl"."0.9.5"; - "caseless-0.6.0" = self.by-version."caseless"."0.6.0"; - "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "qs-1.2.2" = self.by-version."qs"."1.2.2"; - "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1"; - "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; - "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2"; - "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; - }; - optionalDependencies = { - "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2"; - "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"; - "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.5" = self.by-version."stringstream"."0.0.5"; - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."request"."2.52.0" = - self.by-version."request"."2.52.0"; - by-version."request"."2.52.0" = self.buildNodePackage { - name = "request-2.52.0"; - version = "2.52.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.52.0.tgz"; - name = "request-2.52.0.tgz"; - sha1 = "02d82a8adc04dc94a3a79f09fc850ade9aa21e74"; - }; - deps = { - "bl-0.9.5" = self.by-version."bl"."0.9.5"; - "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.1" = self.by-version."json-stringify-safe"."5.0.1"; - "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14"; - "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; - "qs-2.3.3" = self.by-version."qs"."2.3.3"; - "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2"; - "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2"; - "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.5" = self.by-version."stringstream"."0.0.5"; - "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 = [ ]; - }; - by-spec."request"."2.69.0" = - self.by-version."request"."2.69.0"; - by-version."request"."2.69.0" = self.buildNodePackage { - name = "request-2.69.0"; - version = "2.69.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.69.0.tgz"; - name = "request-2.69.0.tgz"; - sha1 = "cf91d2e000752b1217155c005241911991a2346a"; - }; - deps = { - "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0"; - "aws4-1.3.2" = self.by-version."aws4"."1.3.2"; - "bl-1.0.3" = self.by-version."bl"."1.0.3"; - "caseless-0.11.0" = self.by-version."caseless"."0.11.0"; - "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5"; - "extend-3.0.0" = self.by-version."extend"."3.0.0"; - "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1"; - "form-data-1.0.0-rc3" = self.by-version."form-data"."1.0.0-rc3"; - "har-validator-2.0.6" = self.by-version."har-validator"."2.0.6"; - "hawk-3.1.3" = self.by-version."hawk"."3.1.3"; - "http-signature-1.1.1" = self.by-version."http-signature"."1.1.1"; - "is-typedarray-1.0.0" = self.by-version."is-typedarray"."1.0.0"; - "isstream-0.1.2" = self.by-version."isstream"."0.1.2"; - "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1"; - "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10"; - "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; - "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1"; - "qs-6.0.2" = self.by-version."qs"."6.0.2"; - "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5"; - "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2"; - "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."request"."2.9.x" = - self.by-version."request"."2.9.203"; - by-version."request"."2.9.203" = self.buildNodePackage { - name = "request-2.9.203"; - version = "2.9.203"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.9.203.tgz"; - name = "request-2.9.203.tgz"; - sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."request".">= 2.52.0" = - self.by-version."request"."2.69.0"; - by-spec."request".">= 2.9.203" = - self.by-version."request"."2.69.0"; - by-spec."request"."~2.57.0" = - self.by-version."request"."2.57.0"; - by-version."request"."2.57.0" = self.buildNodePackage { - name = "request-2.57.0"; - version = "2.57.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.57.0.tgz"; - name = "request-2.57.0.tgz"; - sha1 = "d445105a42d009b9d724289633b449a6d723d989"; - }; - deps = { - "bl-0.9.5" = self.by-version."bl"."0.9.5"; - "caseless-0.10.0" = self.by-version."caseless"."0.10.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.1" = self.by-version."json-stringify-safe"."5.0.1"; - "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14"; - "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; - "qs-3.1.0" = self.by-version."qs"."3.1.0"; - "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2"; - "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2"; - "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0"; - "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1"; - "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.5" = self.by-version."stringstream"."0.0.5"; - "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5"; - "isstream-0.1.2" = self.by-version."isstream"."0.1.2"; - "har-validator-1.8.0" = self.by-version."har-validator"."1.8.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sax"."0.5.2" = - self.by-version."sax"."0.5.2"; - by-version."sax"."0.5.2" = self.buildNodePackage { - name = "sax-0.5.2"; - version = "0.5.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sax/-/sax-0.5.2.tgz"; - name = "sax-0.5.2.tgz"; - sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sax".">=0.1.1" = - self.by-version."sax"."1.1.6"; - by-version."sax"."1.1.6" = self.buildNodePackage { - name = "sax-1.1.6"; - version = "1.1.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sax/-/sax-1.1.6.tgz"; - name = "sax-1.1.6.tgz"; - sha1 = "5d616be8a5e607d54e114afae55b7eaf2fcc3240"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sntp"."0.2.x" = - self.by-version."sntp"."0.2.4"; - by-version."sntp"."0.2.4" = self.buildNodePackage { - name = "sntp-0.2.4"; - version = "0.2.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; - name = "sntp-0.2.4.tgz"; - sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; - }; - deps = { - "hoek-0.9.1" = self.by-version."hoek"."0.9.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sntp"."1.x.x" = - self.by-version."sntp"."1.0.9"; - by-version."sntp"."1.0.9" = self.buildNodePackage { - name = "sntp-1.0.9"; - version = "1.0.9"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - name = "sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; - }; - deps = { - "hoek-2.16.3" = self.by-version."hoek"."2.16.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."source-map"."~0.1.43" = - 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-1.0.0" = self.by-version."amdefine"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."split"."0.2" = - self.by-version."split"."0.2.10"; - by-version."split"."0.2.10" = self.buildNodePackage { - name = "split-0.2.10"; - version = "0.2.10"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/split/-/split-0.2.10.tgz"; - name = "split-0.2.10.tgz"; - sha1 = "67097c601d697ce1368f418f06cd201cf0521a57"; - }; - deps = { - "through-2.3.8" = self.by-version."through"."2.3.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ssh-key-to-pem"."0.11.0" = - self.by-version."ssh-key-to-pem"."0.11.0"; - by-version."ssh-key-to-pem"."0.11.0" = self.buildNodePackage { - name = "ssh-key-to-pem-0.11.0"; - version = "0.11.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ssh-key-to-pem/-/ssh-key-to-pem-0.11.0.tgz"; - name = "ssh-key-to-pem-0.11.0.tgz"; - sha1 = "512675a28f08f1e581779e1989ab1e13effb49e4"; - }; - deps = { - "asn1-0.1.11" = self.by-version."asn1"."0.1.11"; - "ctype-0.5.2" = self.by-version."ctype"."0.5.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sshpk"."^1.7.0" = - self.by-version."sshpk"."1.7.4"; - by-version."sshpk"."1.7.4" = self.buildNodePackage { - name = "sshpk-1.7.4"; - version = "1.7.4"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/sshpk/-/sshpk-1.7.4.tgz"; - name = "sshpk-1.7.4.tgz"; - sha1 = "ad7b47defca61c8415d964243b62b0ce60fbca38"; - }; - deps = { - "asn1-0.2.3" = self.by-version."asn1"."0.2.3"; - "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0"; - "dashdash-1.13.0" = self.by-version."dashdash"."1.13.0"; - }; - optionalDependencies = { - "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0"; - "tweetnacl-0.14.1" = self.by-version."tweetnacl"."0.14.1"; - "jodid25519-1.0.2" = self.by-version."jodid25519"."1.0.2"; - "ecc-jsbn-0.1.1" = self.by-version."ecc-jsbn"."0.1.1"; - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."stack-trace"."0.0.x" = - self.by-version."stack-trace"."0.0.9"; - by-version."stack-trace"."0.0.9" = self.buildNodePackage { - name = "stack-trace-0.0.9"; - version = "0.0.9"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; - name = "stack-trace-0.0.9.tgz"; - sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."stack-trace"."~0.0.7" = - self.by-version."stack-trace"."0.0.9"; - by-spec."stream-combiner"."~0.0.4" = - self.by-version."stream-combiner"."0.0.4"; - by-version."stream-combiner"."0.0.4" = self.buildNodePackage { - name = "stream-combiner-0.0.4"; - version = "0.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; - name = "stream-combiner-0.0.4.tgz"; - sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; - }; - deps = { - "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."streamline"."0.10.17" = - self.by-version."streamline"."0.10.17"; - by-version."streamline"."0.10.17" = self.buildNodePackage { - name = "streamline-0.10.17"; - version = "0.10.17"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/streamline/-/streamline-0.10.17.tgz"; - name = "streamline-0.10.17.tgz"; - sha1 = "fa2170da74194dbd0b54f756523f0d0d370426af"; - }; - deps = { - "source-map-0.1.43" = self.by-version."source-map"."0.1.43"; - }; - optionalDependencies = { - "fibers-1.0.10" = self.by-version."fibers"."1.0.10"; - "galaxy-0.1.12" = self.by-version."galaxy"."0.1.12"; - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."streamline"."~0.4.10" = - self.by-version."streamline"."0.4.11"; - by-version."streamline"."0.4.11" = self.buildNodePackage { - name = "streamline-0.4.11"; - version = "0.4.11"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/streamline/-/streamline-0.4.11.tgz"; - name = "streamline-0.4.11.tgz"; - sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."streamline-streams"."0.1.5" = - self.by-version."streamline-streams"."0.1.5"; - by-version."streamline-streams"."0.1.5" = self.buildNodePackage { - name = "streamline-streams-0.1.5"; - version = "0.1.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/streamline-streams/-/streamline-streams-0.1.5.tgz"; - name = "streamline-streams-0.1.5.tgz"; - sha1 = "5b0ff80cf543f603cc3438ed178ca2aec7899b54"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."string_decoder"."~0.10.x" = - self.by-version."string_decoder"."0.10.31"; - by-version."string_decoder"."0.10.31" = self.buildNodePackage { - name = "string_decoder-0.10.31"; - version = "0.10.31"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - name = "string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."stringstream"."~0.0.4" = - self.by-version."stringstream"."0.0.5"; - by-version."stringstream"."0.0.5" = self.buildNodePackage { - name = "stringstream-0.0.5"; - version = "0.0.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; - name = "stringstream-0.0.5.tgz"; - sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."strip-ansi"."^3.0.0" = - self.by-version."strip-ansi"."3.0.1"; - by-version."strip-ansi"."3.0.1" = self.buildNodePackage { - name = "strip-ansi-3.0.1"; - version = "3.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - name = "strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - deps = { - "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."supports-color"."^2.0.0" = - self.by-version."supports-color"."2.0.0"; - by-version."supports-color"."2.0.0" = self.buildNodePackage { - name = "supports-color-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - name = "supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."through"."2" = - self.by-version."through"."2.3.8"; - by-version."through"."2.3.8" = self.buildNodePackage { - name = "through-2.3.8"; - version = "2.3.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/through/-/through-2.3.8.tgz"; - name = "through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."through"."2.3.4" = - self.by-version."through"."2.3.4"; - by-version."through"."2.3.4" = self.buildNodePackage { - name = "through-2.3.4"; - version = "2.3.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz"; - name = "through-2.3.4.tgz"; - sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."through"."~2.3" = - self.by-version."through"."2.3.8"; - by-spec."through"."~2.3.1" = - self.by-version."through"."2.3.8"; - by-spec."through"."~2.3.4" = - self.by-version."through"."2.3.8"; - by-spec."tough-cookie".">=0.12.0" = - self.by-version."tough-cookie"."2.2.2"; - by-version."tough-cookie"."2.2.2" = self.buildNodePackage { - name = "tough-cookie-2.2.2"; - version = "2.2.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"; - name = "tough-cookie-2.2.2.tgz"; - sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."tough-cookie"."~2.2.0" = - self.by-version."tough-cookie"."2.2.2"; - by-spec."tunnel"."0.0.2" = - self.by-version."tunnel"."0.0.2"; - by-version."tunnel"."0.0.2" = self.buildNodePackage { - name = "tunnel-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz"; - name = "tunnel-0.0.2.tgz"; - sha1 = "f23bcd8b7a7b8a864261b2084f66f93193396334"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."tunnel"."~0.0.2" = - self.by-version."tunnel"."0.0.4"; - by-version."tunnel"."0.0.4" = self.buildNodePackage { - name = "tunnel-0.0.4"; - version = "0.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz"; - name = "tunnel-0.0.4.tgz"; - sha1 = "2d3785a158c174c9a16dc2c046ec5fc5f1742213"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."tunnel-agent"."~0.4.0" = - self.by-version."tunnel-agent"."0.4.2"; - by-version."tunnel-agent"."0.4.2" = self.buildNodePackage { - name = "tunnel-agent-0.4.2"; - version = "0.4.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"; - name = "tunnel-agent-0.4.2.tgz"; - sha1 = "1104e3f36ac87125c287270067d582d18133bfee"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."tunnel-agent"."~0.4.1" = - self.by-version."tunnel-agent"."0.4.2"; - by-spec."tweetnacl".">=0.13.0 <1.0.0" = - self.by-version."tweetnacl"."0.14.1"; - by-version."tweetnacl"."0.14.1" = self.buildNodePackage { - name = "tweetnacl-0.14.1"; - version = "0.14.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.1.tgz"; - name = "tweetnacl-0.14.1.tgz"; - sha1 = "37c6a1fb5cd4b63b7acee450d8419d9c0024cc03"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."typedarray"."~0.0.5" = - self.by-version."typedarray"."0.0.6"; - by-version."typedarray"."0.0.6" = self.buildNodePackage { - name = "typedarray-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; - name = "typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."underscore"."1.4.x" = - self.by-version."underscore"."1.4.4"; - by-version."underscore"."1.4.4" = self.buildNodePackage { - name = "underscore-1.4.4"; - version = "1.4.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - name = "underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."underscore".">= 1.3.1" = - self.by-version."underscore"."1.8.3"; - by-version."underscore"."1.8.3" = self.buildNodePackage { - name = "underscore-1.8.3"; - version = "1.8.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; - name = "underscore-1.8.3.tgz"; - sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."underscore"."^1.4.0" = - self.by-version."underscore"."1.8.3"; - by-spec."underscore"."~1.4.4" = - self.by-version."underscore"."1.4.4"; - by-spec."util-deprecate"."~1.0.1" = - self.by-version."util-deprecate"."1.0.2"; - by-version."util-deprecate"."1.0.2" = self.buildNodePackage { - name = "util-deprecate-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - name = "util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."uuid"."2.0.1" = - self.by-version."uuid"."2.0.1"; - by-version."uuid"."2.0.1" = self.buildNodePackage { - name = "uuid-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz"; - name = "uuid-2.0.1.tgz"; - sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."validator"."~3.1.0" = - self.by-version."validator"."3.1.0"; - by-version."validator"."3.1.0" = self.buildNodePackage { - name = "validator-3.1.0"; - version = "3.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/validator/-/validator-3.1.0.tgz"; - name = "validator-3.1.0.tgz"; - sha1 = "2ea1ff7e92254d69367f385f015299e5ead8755b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."validator"."~3.22.2" = - self.by-version."validator"."3.22.2"; - by-version."validator"."3.22.2" = self.buildNodePackage { - name = "validator-3.22.2"; - version = "3.22.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/validator/-/validator-3.22.2.tgz"; - name = "validator-3.22.2.tgz"; - sha1 = "6f297ae67f7f82acc76d0afdb49f18d9a09c18c0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."verror"."1.3.6" = - self.by-version."verror"."1.3.6"; - by-version."verror"."1.3.6" = self.buildNodePackage { - name = "verror-1.3.6"; - version = "1.3.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; - name = "verror-1.3.6.tgz"; - sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; - }; - deps = { - "extsprintf-1.0.2" = self.by-version."extsprintf"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."winston"."0.6.x" = - self.by-version."winston"."0.6.2"; - by-version."winston"."0.6.2" = self.buildNodePackage { - name = "winston-0.6.2"; - version = "0.6.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz"; - name = "winston-0.6.2.tgz"; - sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2"; - }; - deps = { - "async-0.1.22" = self.by-version."async"."0.1.22"; - "colors-0.6.2" = self.by-version."colors"."0.6.2"; - "cycle-1.0.3" = self.by-version."cycle"."1.0.3"; - "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; - "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3"; - "request-2.9.203" = self.by-version."request"."2.9.203"; - "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."wordwrap"."0.0.2" = - self.by-version."wordwrap"."0.0.2"; - by-version."wordwrap"."0.0.2" = self.buildNodePackage { - name = "wordwrap-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - name = "wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."xml2js"."0.1.x" = - self.by-version."xml2js"."0.1.14"; - by-version."xml2js"."0.1.14" = self.buildNodePackage { - name = "xml2js-0.1.14"; - version = "0.1.14"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz"; - name = "xml2js-0.1.14.tgz"; - sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; - }; - deps = { - "sax-1.1.6" = self.by-version."sax"."1.1.6"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."xml2js"."0.2.7" = - self.by-version."xml2js"."0.2.7"; - by-version."xml2js"."0.2.7" = self.buildNodePackage { - name = "xml2js-0.2.7"; - version = "0.2.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.7.tgz"; - name = "xml2js-0.2.7.tgz"; - sha1 = "1838518bb01741cae0878bab4915e494c32306af"; - }; - deps = { - "sax-0.5.2" = self.by-version."sax"."0.5.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."xmlbuilder"."0.4.3" = - self.by-version."xmlbuilder"."0.4.3"; - by-version."xmlbuilder"."0.4.3" = self.buildNodePackage { - name = "xmlbuilder-0.4.3"; - version = "0.4.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz"; - name = "xmlbuilder-0.4.3.tgz"; - sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."xmlbuilder"."0.4.x" = - self.by-version."xmlbuilder"."0.4.3"; - by-spec."xmldom".">= 0.1.x" = - self.by-version."xmldom"."0.1.22"; - by-version."xmldom"."0.1.22" = self.buildNodePackage { - name = "xmldom-0.1.22"; - version = "0.1.22"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz"; - name = "xmldom-0.1.22.tgz"; - sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."xpath.js"."~1.0.5" = - self.by-version."xpath.js"."1.0.6"; - by-version."xpath.js"."1.0.6" = self.buildNodePackage { - name = "xpath.js-1.0.6"; - version = "1.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/xpath.js/-/xpath.js-1.0.6.tgz"; - name = "xpath.js-1.0.6.tgz"; - sha1 = "fe4b81c1b152ebd8e1395265fedc5b00fca29b90"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."xtend"."^4.0.0" = - self.by-version."xtend"."4.0.1"; - by-version."xtend"."4.0.1" = self.buildNodePackage { - name = "xtend-4.0.1"; - version = "4.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; - name = "xtend-4.0.1.tgz"; - sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."yallist"."^2.0.0" = - self.by-version."yallist"."2.0.0"; - by-version."yallist"."2.0.0" = self.buildNodePackage { - name = "yallist-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz"; - name = "yallist-2.0.0.tgz"; - sha1 = "306c543835f09ee1a4cb23b7bce9ab341c91cdd4"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0dd5a867208..baf749a89a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -88,10 +88,6 @@ in # inside the set for derivations. recurseIntoAttrs = attrs: attrs // { recurseForDerivations = true; }; - builderDefs = lib.composedArgsAndFun (callPackage ../build-support/builder-defs/builder-defs.nix) {}; - - builderDefsPackage = builderDefs.builderDefsPackage builderDefs; - stringsWithDeps = lib.stringsWithDeps; @@ -104,10 +100,6 @@ in ### BUILD SUPPORT - attrSetToDir = arg: callPackage ../build-support/upstream-updater/attrset-to-dir.nix { - theAttrSet = arg; - }; - autoreconfHook = makeSetupHook { substitutions = { inherit autoconf automake gettext libtool; }; } ../build-support/setup-hooks/autoreconf.sh; @@ -178,7 +170,17 @@ in fetchMavenArtifact = callPackage ../build-support/fetchmavenartifact { }; - packer = callPackage ../development/tools/packer { }; + packer = callPackage ../development/tools/packer { + # Go 1.7 changed the linker flag format + buildGoPackage = buildGo16Package; + gotools = self.gotools.override { + buildGoPackage = buildGo16Package; + go = self.go_1_6; + }; + gox = self.gox.override { + buildGoPackage = buildGo16Package; + }; + }; fetchpatch = callPackage ../build-support/fetchpatch { }; @@ -457,7 +459,7 @@ in aws_shell = pythonPackages.aws_shell; - azure-cli = callPackage ../tools/virtualization/azure-cli { }; + azure-cli = nodePackages.azure-cli; ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; @@ -481,6 +483,8 @@ in pkgs_i686 = pkgsi686Linux; }; + adb-sync = callPackage ../development/mobile/adb-sync { }; + apg = callPackage ../tools/security/apg { }; autorevision = callPackage ../tools/misc/autorevision { }; @@ -1518,6 +1522,11 @@ in fakechroot = callPackage ../tools/system/fakechroot { }; + fast-neural-doodle = callPackage ../tools/graphics/fast-neural-doodle { + inherit (python27Packages) numpy scipy h5py scikitlearn python + pillow; + }; + fatsort = callPackage ../tools/filesystems/fatsort { }; fcitx = callPackage ../tools/inputmethods/fcitx { @@ -2358,13 +2367,21 @@ in else nodejs-4_x; - nodePackages_6_x = callPackage ./node-packages.nix { self = nodePackages_6_x; nodejs = nodejs-6_x; }; + nodePackages_6_x = callPackage ../development/node-packages/default-v6.nix { + nodejs = pkgs.nodejs-6_x; + }; - nodePackages_5_x = callPackage ./node-packages.nix { self = nodePackages_5_x; nodejs = nodejs-5_x; }; + nodePackages_5_x = callPackage ../development/node-packages/default-v5.nix { + nodejs = pkgs.nodejs-5_x; + }; - nodePackages_4_x = callPackage ./node-packages.nix { self = nodePackages_4_x; nodejs = nodejs-4_x; }; + nodePackages_4_x = callPackage ../development/node-packages/default-v4.nix { + nodejs = pkgs.nodejs-4_x; + }; - nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; }; + nodePackages_0_10 = callPackage ../development/node-packages/default-v0_10.nix { + nodejs = pkgs.nodejs-0_10; + }; nodePackages = if stdenv.system == "armv5tel-linux" then nodePackages_0_10 @@ -4110,7 +4127,7 @@ in wml = callPackage ../development/web/wml { }; - wring = callPackage ../tools/text/wring { }; + wring = nodePackages.wring; wrk = callPackage ../tools/networking/wrk { }; @@ -4938,7 +4955,10 @@ in microscheme = callPackage ../development/compilers/microscheme { }; - mitscheme = callPackage ../development/compilers/mit-scheme { }; + mitscheme = callPackage ../development/compilers/mit-scheme { + texLive = texlive.combine { inherit (texlive) scheme-small; }; + texinfo = texinfo5; + }; mkcl = callPackage ../development/compilers/mkcl {}; @@ -5843,16 +5863,13 @@ in qt = qt4; })); - # mercurial (hg) bleeding edge version - octaveHG = callPackage ../development/interpreters/octave/hg.nix { }; - ocropus = callPackage ../applications/misc/ocropus { }; inherit (callPackages ../development/interpreters/perl {}) perl perl520 perl522; - php = php56; + php = php70; - phpPackages = php56Packages; + phpPackages = php70Packages; php56Packages = recurseIntoAttrs (callPackage ./php-packages.nix { php = php56; @@ -6179,15 +6196,20 @@ in wxGTK = wxGTK30; }; - buildbot = callPackage ../development/tools/build-managers/buildbot { - inherit (pythonPackages) twisted jinja2 sqlalchemy_migrate_0_7; - dateutil = pythonPackages.dateutil_1_5; - }; - buildbot-slave = callPackage ../development/tools/build-managers/buildbot-slave { inherit (pythonPackages) twisted; }; + buildbot = callPackage ../development/tools/build-managers/buildbot/9.nix { }; + buildbot-worker = callPackage ../development/tools/build-managers/buildbot/worker.nix { }; + buildbot-plugins = callPackage ../development/tools/build-managers/buildbot/plugins.nix { }; + buildbot-ui = self.buildbot.override { + plugins = with self.buildbot-plugins; [ www ]; + }; + buildbot-full = self.buildbot.override { + plugins = with self.buildbot-plugins; [ www console-view waterfall-view ]; + }; + buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; byacc = callPackage ../development/tools/parsing/byacc { }; @@ -6504,6 +6526,8 @@ in kcov = callPackage ../development/tools/analysis/kcov { }; + kube-aws = callPackage ../development/tools/kube-aws { }; + lcov = callPackage ../development/tools/analysis/lcov { }; leiningen = callPackage ../development/tools/build-managers/leiningen { }; @@ -7216,8 +7240,9 @@ in x265 = if stdenv.isDarwin then null else x265; xavs = if stdenv.isDarwin then null else xavs; inherit (darwin) CF; - inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices AVFoundation - MediaToolbox VideoDecodeAcceleration; + inherit (darwin.apple_sdk.frameworks) + Cocoa CoreServices CoreAudio AVFoundation MediaToolbox + VideoDecodeAcceleration; }; ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { @@ -8758,9 +8783,12 @@ in }; in mo.drivers ); + mesa = mesaDarwinOr (buildEnv { name = "mesa-${mesa_noglu.version}"; - paths = [ mesa_noglu.dev mesa_noglu.out mesa_glu ]; + # FIXME: this causes mesa to have a runtime dependency on + # mesa_noglu.dev. + paths = [ mesa_noglu.dev mesa_noglu.out mesa_glu mesa_glu.dev ]; meta = { platforms = lib.platforms.unix; }; @@ -9585,6 +9613,8 @@ in openblas = openblasCompat; }; + torch-hdf5 = callPackage ../development/libraries/torch-hdf5 {}; + tremor = callPackage ../development/libraries/tremor { }; udns = callPackage ../development/libraries/udns { }; @@ -10252,7 +10282,7 @@ in diod = callPackage ../servers/diod { lua = lua5_1; }; - dnschain = callPackage ../servers/dnschain { }; + #dnschain = callPackage ../servers/dnschain { }; dovecot = callPackage ../servers/mail/dovecot { }; dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { }; @@ -10593,7 +10623,7 @@ in boost = boost159; }; - ripple-rest = callPackage ../servers/rippled/ripple-rest.nix { }; + #ripple-rest = callPackage ../servers/rippled/ripple-rest.nix { }; s6 = callPackage ../tools/system/s6 { }; @@ -11331,6 +11361,11 @@ in enableHardening = true; }); + virtualboxHeadless = lowPrio (virtualbox.override { + enableHardening = true; + headless = true; + }); + virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; wireguard = callPackage ../os-specific/linux/wireguard { }; @@ -12112,6 +12147,10 @@ in roboto = callPackage ../data/fonts/roboto { }; + roboto-mono = callPackage ../data/fonts/roboto-mono { }; + + roboto-slab = callPackage ../data/fonts/roboto-slab { }; + hasklig = callPackage ../data/fonts/hasklig {}; sound-theme-freedesktop = callPackage ../data/misc/sound-theme-freedesktop { }; @@ -16041,7 +16080,7 @@ in ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { }); - ut2004demo = callPackage ../games/ut2004demo { }; + ut2004demo = callPackage_i686 ../games/ut2004demo { }; vapor = callPackage ../games/vapor { love = love_0_8; }; @@ -16447,7 +16486,9 @@ in igv = callPackage ../applications/science/biology/igv { }; - neuron = callPackage ../applications/science/biology/neuron { }; + neuron = callPackage ../applications/science/biology/neuron { + python = null; + }; neuron-mpi = appendToName "mpi" (neuron.override { mpi = pkgs.openmpi; @@ -17346,50 +17387,6 @@ in texlive = recurseIntoAttrs (callPackage ../tools/typesetting/tex/texlive-new { }); - texLive = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive) { - ghostscript = ghostscriptX; - harfbuzz = harfbuzz.override { - withIcu = true; withGraphite2 = true; - }; - }; - - texLiveFull = lib.setName "texlive-full" (texLiveAggregationFun { - paths = [ texLive texLiveExtra lmodern texLiveCMSuper texLiveLatexXColor - texLivePGF texLiveBeamer texLiveModerncv tipa tex4ht texinfo - texLiveModerntimeline texLiveContext ]; - }); - - /* Look in configurations/misc/raskin.nix for usage example (around revisions - where TeXLive was added) - - (texLiveAggregationFun { - paths = [texLive texLiveExtra texLiveCMSuper - texLiveBeamer - ]; - }) - - You need to use texLiveAggregationFun to regenerate, say, ls-R (TeX-related file list) - Just installing a few packages doesn't work. - */ - texLiveAggregationFun = params: - builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/aggregate.nix) params; - - texLiveContext = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/context.nix) {}; - - texLiveExtra = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/extra.nix) {}; - - texLiveCMSuper = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/cm-super.nix) {}; - - texLiveLatexXColor = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/xcolor.nix) {}; - - texLivePGF = pgf3; - - texLiveBeamer = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/beamer.nix) {}; - - texLiveModerncv = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/moderncv.nix) {}; - - texLiveModerntimeline = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/moderntimeline.nix) {}; - ib-tws = callPackage ../applications/office/ib/tws { jdk=oraclejdk8; }; ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; }; diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index 0a1f4639841..633b4f8a211 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -61,7 +61,7 @@ with pkgs; rec { installPhase = '' mkdir -p $out/share - mkdir -p $doc + mkdir -p $doc/share/${name} cp Demo* $out/share cp -R codemirror-5.12 $out/share @@ -72,7 +72,7 @@ with pkgs; rec { cp *.html $out/share cp *.json $out/share cp *.rng $out/share - cp README.md $doc/ + cp README.md $doc/share/${name} ''; postInstall = '' diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 39324e9e96a..695f91a0230 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2536,10 +2536,10 @@ let self = _self // overrides; _self = with self; { }; CryptJWT = buildPerlPackage rec { - name = "Crypt-JWT-0.017"; + name = "Crypt-JWT-0.018"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "811857ca0be3155ebb2f5ce006772f7463165678f6aa2c959f3009aa54d2f4f7"; + sha256 = "90e78f7f0ced17e5c2080ad8c7008ce3badd05186e2ff20cf9c7232ed863cdaf"; }; propagatedBuildInputs = [ CryptX JSONMaybeXS ]; meta = { @@ -3544,7 +3544,19 @@ let self = _self // overrides; _self = with self; { DBDSQLite = import ../development/perl-modules/DBD-SQLite { inherit stdenv fetchurl buildPerlPackage DBI; - inherit (pkgs) sqlite; + # inherit (pkgs) sqlite; + + # Workaround to address DBIxClass test failure. + # https://rt.cpan.org/Public/Bug/Display.html?id=117271#txn-1662798 + # https://github.com/NixOS/nixpkgs/pull/18083#issuecomment-243408430 + sqlite = pkgs.sqlite.overrideDerivation (_: { + name = "sqlite-3.13.0"; + + src = fetchurl { + url = "http://sqlite.org/2016/sqlite-autoconf-3130000.tar.gz"; + sha256 = "0sq88jbwsk48i41f7m7rkw9xvijq011nsbs7pl49s31inck70yg2"; + }; + }); }; DBDmysql = import ../development/perl-modules/DBD-mysql { @@ -3578,6 +3590,7 @@ let self = _self // overrides; _self = with self; { DBIxClass = buildPerlPackage rec { name = "DBIx-Class-0.082840"; + # UPGRADE Note: Please remove workaround in DBDSQLite above src = fetchurl { url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; sha256 = "4049afd175e315ebcab945b19030aec40bcec46cc5611b0286a5a267ca7181ef"; @@ -3961,6 +3974,18 @@ let self = _self // overrides; _self = with self; { }; }; + DigestPerlMD5 = buildPerlPackage rec { + name = "Digest-Perl-MD5-1.9"; + src = fetchurl { + url = "mirror://cpan/authors/id/D/DE/DELTA/${name}.tar.gz"; + sha256 = "7100cba1710f45fb0e907d8b1a7bd8caef35c64acd31d7f225aff5affeecd9b1"; + }; + meta = { + description = "Perl Implementation of Rivest's MD5 algorithm"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DigestSHA = null; DigestSHA1 = buildPerlPackage { @@ -7363,13 +7388,13 @@ let self = _self // overrides; _self = with self; { }; LogAny = buildPerlPackage rec { - name = "Log-Any-1.040"; + name = "Log-Any-1.042"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz"; - sha256 = "9759211bfc28055e4617894cf96c3b419e0c3c6afb4bdbfe2382f247193b3864"; + url = "mirror://cpan/authors/id/P/PR/PREACTION/${name}.tar.gz"; + sha256 = "b2cadb25a147bd49afdab1092a4a37268f307fcb6524a679623647a22501de84"; }; meta = { - homepage = https://github.com/dagolden/Log-Any; + homepage = https://github.com/preaction/Log-Any; description = "Bringing loggers and listeners together"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.rycee ]; @@ -9700,12 +9725,19 @@ let self = _self // overrides; _self = with self; { }; }; - OLEStorageLight = buildPerlPackage rec { + # For backwards compatibility. Please use OLEStorage_Lite instead. + OLEStorageLight = OLEStorage_Lite; + + OLEStorage_Lite = buildPerlPackage rec { name = "OLE-Storage_Lite-0.19"; src = fetchurl { url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/${name}.tar.gz"; sha256 = "179cxwqxb0f9dpx8954nvwjmggxxi5ndnang41yav1dx6mf0abp7"; }; + meta = { + description = "Read and write OLE storage files"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; }; Opcodes = buildPerlPackage { @@ -11172,13 +11204,30 @@ let self = _self // overrides; _self = with self; { }; SpreadsheetParseExcel = buildPerlPackage rec { - name = "Spreadsheet-ParseExcel-0.2603"; + name = "Spreadsheet-ParseExcel-0.65"; src = fetchurl { - url = "mirror://cpan/authors/id/K/KW/KWITKNR/${name}.tar.gz"; - sha256 = "0q5qq982528cdpqdj2wszrnf5g2rfphx0b413lczx7nvkkyy9xqz"; + url = "mirror://cpan/authors/id/D/DO/DOUGW/${name}.tar.gz"; + sha256 = "6ec4cb429bd58d81640fe12116f435c46f51ff1040c68f09cc8b7681c1675bec"; }; + propagatedBuildInputs = [ CryptRC4 DigestPerlMD5 IOstringy OLEStorage_Lite ]; + meta = { + homepage = http://github.com/runrig/spreadsheet-parseexcel/; + description = "Read information from an Excel file"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; - propagatedBuildInputs = [ IOStringy OLEStorageLight ]; + SpreadsheetWriteExcel = buildPerlPackage rec { + name = "Spreadsheet-WriteExcel-2.40"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/${name}.tar.gz"; + sha256 = "e356aad6866cf135731268ee0e979a197443c15a04878e9cf3e80d022ad6c07e"; + }; + propagatedBuildInputs = [ OLEStorage_Lite ParseRecDescent ]; + meta = { + description = "Write to a cross platform Excel binary file"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; }; SQLAbstract = buildPerlPackage rec { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 886e69e07dc..cffb0c02f2a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18,7 +18,10 @@ let bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { }; - buildPythonPackage = makeOverridable (callPackage ../development/python-modules/generic { + mkPythonDerivation = makeOverridable( callPackage ../development/interpreters/python/mk-python-derivation.nix { + }); + buildPythonPackage = makeOverridable (callPackage ../development/interpreters/python/build-python-package.nix { + inherit mkPythonDerivation; inherit bootstrapped-pip; }); @@ -34,55 +37,11 @@ let in modules // { - inherit python bootstrapped-pip isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k buildPythonPackage buildPythonApplication; + inherit python bootstrapped-pip isPy26 isPy27 isPy33 isPy34 isPy35 isPy36 isPyPy isPy3k mkPythonDerivation buildPythonPackage buildPythonApplication; # helpers - wrapPython = pkgs.makeSetupHook - { deps = pkgs.makeWrapper; - substitutions.libPrefix = python.libPrefix; - substitutions.executable = python.interpreter; - substitutions.python = python; - substitutions.magicalSedExpression = let - # Looks weird? Of course, it's between single quoted shell strings. - # NOTE: Order DOES matter here, so single character quotes need to be - # at the last position. - quoteVariants = [ "'\"'''\"'" "\"\"\"" "\"" "'\"'\"'" ]; # hey Vim: '' - - mkStringSkipper = labelNum: quote: let - label = "q${toString labelNum}"; - isSingle = elem quote [ "\"" "'\"'\"'" ]; - endQuote = if isSingle then "[^\\\\]${quote}" else quote; - in '' - /^[a-z]?${quote}/ { - /${quote}${quote}|${quote}.*${endQuote}/{n;br} - :${label}; n; /^${quote}/{n;br}; /${endQuote}/{n;br}; b${label} - } - ''; - - # This preamble does two things: - # * Sets argv[0] to the original application's name; otherwise it would be .foo-wrapped. - # Python doesn't support `exec -a`. - # * Adds all required libraries to sys.path via `site.addsitedir`. It also handles *.pth files. - preamble = '' - import sys - import site - import functools - sys.argv[0] = '"'$(basename "$f")'"' - functools.reduce(lambda k, p: site.addsitedir(p, k), ['"$([ -n "$program_PYTHONPATH" ] && (echo "'$program_PYTHONPATH'" | sed "s|:|','|g") || true)"'], site._init_pathinfo()) - ''; - - in '' - 1 { - :r - /\\$|,$/{N;br} - /__future__|^ |^ *(#.*)?$/{n;br} - ${concatImapStrings mkStringSkipper quoteVariants} - /^[^# ]/i ${replaceStrings ["\n"] [";"] preamble} - } - ''; - } - ../development/python-modules/generic/wrap.sh; + wrapPython = callPackage ../development/interpreters/python/wrap-python.nix {inherit python; inherit (pkgs) makeSetupHook makeWrapper; }; # specials @@ -241,6 +200,14 @@ in modules // { mpi = pkgs.openmpi; }; + neuron = pkgs.neuron.override { + inherit python; + }; + + neuron-mpi = pkgs.neuron-mpi.override { + inherit python; + }; + nixpart = callPackage ../tools/filesystems/nixpart { }; # This is used for NixOps to make sure we won't break it with the next major @@ -887,6 +854,10 @@ in modules // { buildInputs = with self; [ pytest ]; + checkPhase = '' + py.test + ''; + meta = { description = "Namespace control and lazy-import mechanism"; homepage = "http://bitbucket.org/hpk42/apipkg"; @@ -1235,6 +1206,10 @@ in modules // { pympler coverage ] ++ optionals (stdenv.isDarwin) [ pkgs.clang ]; + checkPhase = '' + py.test + ''; + meta = { description = "Python attributes without boilerplate"; homepage = https://github.com/hynek/attrs; @@ -2434,7 +2409,7 @@ in modules // { sha256 = "1j4f51dxic39mdwf6alj7gd769wy6mhk916v031wjali51xkh3xb"; }; - buildInputs = with self; [ hypothesis1 sqlite3 ]; + buildInputs = with self; [ hypothesis sqlite3 ]; propagatedBuildInputs = with self; [ chardet ]; @@ -4057,7 +4032,7 @@ in modules // { }; buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors - self.iso8601 self.pyasn1 self.pytest self.py self.hypothesis1 ] + self.iso8601 self.pyasn1 self.pytest_29 self.py self.hypothesis self.pytz ] ++ optional stdenv.isDarwin pkgs.darwin.apple_sdk.frameworks.Security; propagatedBuildInputs = with self; [ six idna ipaddress pyasn1 cffi pyasn1-modules modules.sqlite3 pytz ] ++ optional (pythonOlder "3.4") self.enum34; @@ -4544,6 +4519,33 @@ in modules // { }; }; + pyjade = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pyjade"; + version = "4.0.0"; + src = pkgs.fetchurl { + url = "mirror://pypi/p/${pname}/${name}.tar.gz"; + sha256 = "1mycn5cc9cp4fb0i2vzgkkk6d0glnkbilggwb4i99i09vr0vg5cd"; + }; + buildInputs = with self; [ pyramid_mako nose django_1_9 jinja2 tornado pyramid Mako ]; + propagatedBuildInputs = with self; [ six ]; + patchPhase = '' + sed -i 's/1.4.99/1.99/' setup.py + ''; + checkPhase = '' + nosetests pyjade + ''; + # No tests distributed. https://github.com/syrusakbary/pyjade/issues/262 + doCheck = false; + meta = { + description = "Jade syntax template adapter for Django, Jinja2, Mako and Tornado templates"; + homepage = "http://github.com/syrusakbary/pyjade"; + license = licenses.mit; + maintainers = with maintainers; [ nand0p ]; + platforms = platforms.all; + }; + }; + pytest = self.pytest_29; pytest_27 = buildPythonPackage rec { @@ -4858,6 +4860,26 @@ in modules // { }; }); + pytest-virtualenv = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pytest-virtualenv"; + version = "1.1.0"; + src = pkgs.fetchurl { + url = "mirror://pypi/p/${pname}/${name}.tar.gz"; + sha256 = "093f5fa479ee6201e48db367c307531dc8b800609b0c3ddca9c01e0fd466a669"; + }; + buildInputs = with self; [ pytestcov mock cmdline ]; + propagatedBuildInputs = with self; [ pytest-fixture-config pytest-shutil pytest ]; + checkPhase = '' py.test tests/unit ''; + meta = { + description = "Create a Python virtual environment in your test that cleans up on teardown. The fixture has utility methods to install packages and list what’s installed."; + homepage = https://github.com/manahl/pytest-plugins; + license = licenses.mit; + maintainers = with maintainers; [ ryansydnor ]; + platforms = platforms.all; + }; + }; + pytest_xdist = buildPythonPackage rec { name = "pytest-xdist-1.8"; @@ -6202,20 +6224,31 @@ in modules // { }; }; - execnet = buildPythonPackage rec { - name = "execnet-1.1"; - + name = "${pname}-${version}"; + pname = "execnet"; + version = "1.4.1"; src = pkgs.fetchurl { - url = "mirror://pypi/e/execnet/${name}.zip"; - sha256 = "fa1d8bd6b6d2282ff4df474b8ac687e1775bff4fc6462b219a5f89d5e9e6908c"; + url = "mirror://pypi/e/${pname}/${name}.tar.gz"; + sha256 = "1rpk1vyclhg911p3hql0m0nrpq7q7mysxnaaw6vs29cpa6kx8vgn"; }; - - doCheck = !isPy3k; # failures.. - + buildInputs = with self; [ pytest setuptools_scm ]; + propagatedBuildInputs = with self; [ apipkg ]; + # remove vbox tests + postPatch = '' + rm -v testing/test_termination.py + rm -v testing/test_channel.py + rm -v testing/test_xspec.py + rm -v testing/test_gateway.py + ''; + checkPhase = '' + py.test testing + ''; meta = { description = "Rapid multi-Python deployment"; license = licenses.gpl2; + homepage = "http://codespeak.net/execnet"; + maintainers = with maintainers; [ nand0p ]; }; }; @@ -6307,7 +6340,7 @@ in modules // { buildInputs = with self; [ fudge_9 nose ]; }; - fedora_cert = stdenv.mkDerivation (rec { + fedora_cert = mkPythonDerivation rec { name = "fedora-cert-0.5.9.2"; meta.maintainers = with maintainers; [ mornfall ]; @@ -6316,12 +6349,10 @@ in modules // { sha256 = "105swvzshgn3g6bjwk67xd8pslnhpxwa63mdsw6cl4c7cjp2blx9"; }; - propagatedBuildInputs = with self; [ python python_fedora wrapPython ]; + propagatedBuildInputs = with self; [ python_fedora modules.sqlite3 pyopenssl ]; postInstall = "mv $out/bin/fedpkg $out/bin/fedora-cert-fedpkg"; doCheck = false; - - postFixup = "wrapPythonPrograms"; - }); + }; fedpkg = buildPythonPackage (rec { name = "fedpkg-1.14"; @@ -7548,26 +7579,29 @@ in modules // { }; natsort = buildPythonPackage rec { - name = "natsort-4.0.0"; + name = "natsort-5.0.1"; src = pkgs.fetchurl { url = "mirror://pypi/n/natsort/${name}.tar.gz"; - sha256 = "a0d4239bd609eae5cd5163db6f9794378ce0e3f43ae16c10c35472d866ae20cd"; + sha256 = "4ad6b4d1153451e345967989bd3ca30abf33f615b116eeadfcc51a456e6974a9"; }; buildInputs = with self; [ - hypothesis1 + hypothesis + pytestcache pytestcov pytestflakes pytestpep8 - covCore + mock + pathlib ]; meta = { description = "Natural sorting for python"; homepage = https://github.com/SethMMorton/natsort; license = licenses.mit; + broken = true; }; }; @@ -8365,6 +8399,24 @@ in modules // { }; }; + rethinkdb = buildPythonPackage rec { + name = "rethinkdb-${version}"; + version = "2.3.0.post6"; + + src = pkgs.fetchurl { + url = "mirror://pypi/r/rethinkdb/${name}.tar.gz"; + sha256 = "05qwkmq6kn437ywyjs02jxbry720gw39q4z4jdb0cnbbi76lwddm"; + }; + + doCheck = false; + + meta = { + description = "Python driver library for the RethinkDB database server"; + homepage = "https://pypi.python.org/pypi/rethinkdb"; + license = licenses.agpl3; + }; + }; + roman = buildPythonPackage rec { version = "2.0.0"; name = "roman-${version}"; @@ -9124,12 +9176,12 @@ in modules // { django_1_10 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.10"; + version = "1.10.1"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz"; - sha256 = "01bh5yra6zyxcpqacahbwfbn0y4ivw07j2jsw3crvmjzivb6if26"; + sha256 = "1wr438yykg0m5s9xini36hc826di55jm6by8syplczxnbjrcbrnn"; }; patches = [ @@ -11614,28 +11666,13 @@ in modules // { propagatedBuildInputs = with self; [ requests2 ]; }; - hypothesis1 = buildPythonPackage rec { - name = "hypothesis-1.14.0"; - - buildInputs = with self; [fake_factory django numpy pytz flake8 pytest ]; - - doCheck = false; # no tests in source - - src = pkgs.fetchurl { - url = "mirror://pypi/h/hypothesis/${name}.tar.gz"; - sha256 = "12dxrvn108q2j20brrk6zcb8w00kn3af1c07c0fv572nf2ngyaxy"; - }; - - meta = { - description = "A Python library for property based testing"; - homepage = https://github.com/DRMacIver/hypothesis; - license = licenses.mpl20; - }; - }; - hypothesis = buildPythonPackage rec { # http://hypothesis.readthedocs.org/en/latest/packaging.html + # Hypothesis has optional dependencies on the following libraries + # pytz fake_factory django numpy pytest + # If you need these, you can just add them to your environment. + name = "hypothesis-${version}"; version = "3.1.0"; @@ -11648,7 +11685,7 @@ in modules // { }; buildInputs = with self; [ flake8 pytest flaky ]; - propagatedBuildInputs = with self; ([ pytz fake_factory django numpy ] ++ optionals isPy27 [ enum34 modules.sqlite3 ]); + propagatedBuildInputs = with self; ([] ++ optionals isPy27 [ enum34 modules.sqlite3 ]); # https://github.com/DRMacIver/hypothesis/issues/300 checkPhase = '' @@ -12136,20 +12173,21 @@ in modules // { }; isort = buildPythonPackage rec { - name = "isort-4.2.2"; - + name = "${pname}-${version}"; + pname = "isort"; + version = "4.2.5"; src = pkgs.fetchurl { - url = "mirror://pypi/i/isort/${name}.tar.gz"; - sha256 = "0xqxnkli3j69mj1m0i1r9n68bfkdxfcgxi602lqgy491m21q1rpj"; + url = "mirror://pypi/i/${pname}/${name}.tar.gz"; + sha256 = "0p7a6xaq7zxxq5vr5gizshnsbk2afm70apg97xwfdxiwyi201cjn"; }; - buildInputs = with self; [ mock pytest ]; - + # No tests distributed + doCheck = false; meta = { description = "A Python utility / library to sort Python imports"; homepage = https://github.com/timothycrosley/isort; license = licenses.mit; - maintainers = with maintainers; [ couchemar ]; + maintainers = with maintainers; [ couchemar nand0p ]; }; }; @@ -12234,6 +12272,9 @@ in modules // { propagatedBuildInputs = with self; [ markupsafe ]; + # No tests included + doCheck = false; + meta = { homepage = http://jinja.pocoo.org/; description = "Stand-alone template engine"; @@ -17060,6 +17101,10 @@ in modules // { sha256 = "17zajiw4mjbkkv6ahp3xf025qglkj0805m9s41c45zryzj6p2h39"; }; + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + meta = { description = "Object-oriented filesystem paths"; homepage = "https://pathlib.readthedocs.org/"; @@ -19484,7 +19529,7 @@ in modules // { sha256 = "0jgyhkkq36wn36rymn4jiyqh2vdslmradq4a2mjkxfbk2cz6wpi5"; }; - buildInputs = with self; [ six pytest hypothesis1 ] ++ optional (!isPy3k) modules.sqlite3; + buildInputs = with self; [ six pytest hypothesis ] ++ optional (!isPy3k) modules.sqlite3; checkPhase = '' py.test @@ -20146,7 +20191,7 @@ in modules // { }); - pysvn = pkgs.stdenv.mkDerivation rec { + pysvn = mkPythonDerivation rec { name = "pysvn-1.8.0"; src = pkgs.fetchurl { @@ -20154,7 +20199,7 @@ in modules // { sha256 = "0srjr2qgxfs69p65d9vvdib2lc142x10w8afbbdrqs7dhi46yn9r"; }; - buildInputs = with self; [ python pkgs.subversion pkgs.apr pkgs.aprutil pkgs.expat pkgs.neon pkgs.openssl ] + buildInputs = with self; [ pkgs.subversion pkgs.apr pkgs.aprutil pkgs.expat pkgs.neon pkgs.openssl ] ++ (if stdenv.isLinux then [pkgs.e2fsprogs] else []); # There seems to be no way to pass that path to configure. @@ -20300,7 +20345,7 @@ in modules // { }); - pywebkitgtk = stdenv.mkDerivation rec { + pywebkitgtk = mkPythonDerivation rec { name = "pywebkitgtk-${version}"; version = "1.1.8"; @@ -20631,14 +20676,14 @@ in modules // { qscintilla = if isPy3k || isPyPy then throw "qscintilla-${pkgs.qscintilla.version} not supported for interpreter ${python.executable}" - else pkgs.stdenv.mkDerivation rec { + else mkPythonDerivation rec { # TODO: Qt5 support name = "qscintilla-${version}"; version = pkgs.qscintilla.version; src = pkgs.qscintilla.src; - buildInputs = with self; [ pkgs.xorg.lndir pyqt4.qt pyqt4 python ]; + buildInputs = with self; [ pkgs.xorg.lndir pyqt4.qt pyqt4 ]; preConfigure = '' mkdir -p $out @@ -21052,6 +21097,13 @@ in modules // { sha256 = "42105c41d037246dc1987e36d96f3752ffd5c0c24834dd12e4fdbe1e79544e31"; }; + # Judging from SyntaxError + doCheck = !(isPy3k); + + checkPhase = '' + ${python.interpreter} -m unittest discover -s src/isodate/tests + ''; + meta = { description = "ISO 8601 date/time parser"; homepage = http://cheeseshop.python.org/pypi/isodate; @@ -21312,6 +21364,7 @@ in modules // { description = "Python interface to R"; license = licenses.gpl2Plus; maintainers = with maintainers; [ joelmo ]; + broken = true; }; }; @@ -21791,23 +21844,25 @@ in modules // { }; }; - - setuptoolsTrial = buildPythonPackage { - name = "setuptools-trial-0.5.12"; - + setuptoolsTrial = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "setuptools_trial"; + version = "0.6.0"; src = pkgs.fetchurl { - url = "mirror://pypi/s/setuptools_trial/setuptools_trial-0.5.12.tar.gz"; - sha256 = "9cc4ca5fd432944eb95e193f28b5a602e8b07201fea4d7077c0976a40f073432"; + url = "mirror://pypi/s/${pname}/${name}.tar.gz"; + sha256 = "14220f8f761c48ba1e2526f087195077cf54fad7098b382ce220422f0ff59b12"; }; - - propagatedBuildInputs = with self; [ twisted ]; - + buildInputs = with self; [ pytest virtualenv pytestrunner pytest-virtualenv ]; + propagatedBuildInputs = with self; [ twisted pathlib2 ]; + postPatch = '' + sed -i '12,$d' tests/test_main.py + ''; meta = { - description = "Setuptools plug-in that helps run unit tests built with the \"Trial\" framework (from Twisted)"; - - homepage = http://allmydata.org/trac/setuptools_trial; - - license = "unspecified"; # ! + description = "Setuptools plugin that makes unit tests execute with trial instead of pyunit."; + homepage = "https://github.com/rutsky/setuptools-trial"; + license = licenses.bsd2; + maintainers = with maintainers; [ ryansydnor nand0p ]; + platforms = platforms.all; }; }; @@ -22811,32 +22866,36 @@ in modules // { sphinx = buildPythonPackage (rec { - name = "Sphinx-1.3.6"; - - # 1.4 is broken - # https://github.com/sphinx-doc/sphinx/issues/2394 - + name = "${pname}-${version}"; + pname = "Sphinx"; + version = "1.3.6"; src = pkgs.fetchurl { - url = "mirror://pypi/S/Sphinx/${name}.tar.gz"; + url = "mirror://pypi/S/${pname}/${name}.tar.gz"; sha256 = "12pzlfkjjlwgvsj56k0y809jpx5mgcs9548k1l4kdbr028ifjfqb"; }; - LC_ALL = "en_US.UTF-8"; - checkPhase = '' - PYTHON=${python.executable} make test - ''; - - buildInputs = with self; [ mock pkgs.glibcLocales ]; + buildInputs = with self; [ nose simplejson mock pkgs.glibcLocales ]; + patchPhase = '' sed -i '$ d' tests/test_setup_command.py ''; + checkPhase = '' PYTHON=${python.executable} make test ''; propagatedBuildInputs = with self; [ - docutils jinja2 pygments sphinx_rtd_theme - alabaster Babel snowballstemmer six nose + docutils + jinja2 + pygments + sphinx_rtd_theme + alabaster + Babel + snowballstemmer + six + sqlalchemy + whoosh + imagesize ]; - meta = { description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; homepage = http://sphinx.pocoo.org/; license = licenses.bsd3; - platforms = platforms.unix; + maintainers = with maintainers; [ nand0p ]; + platforms = platforms.all; }; }); @@ -23049,40 +23108,6 @@ in modules // { rope = if isPy3k then null else self.rope; }; - sqlalchemy7 = buildPythonPackage rec { - name = "SQLAlchemy-0.7.10"; - disabled = isPy34 || isPy35; - doCheck = !isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/S/SQLAlchemy/${name}.tar.gz"; - sha256 = "0rhxgr85xdhjn467qfs0dkyj8x46zxcv6ad3dfx3w14xbkb3kakp"; - }; - - patches = [ - # see https://groups.google.com/forum/#!searchin/sqlalchemy/module$20logging$20handlers/sqlalchemy/ukuGhmQ2p6g/2_dOpBEYdDYJ - # waiting for 0.7.11 release - ../development/python-modules/sqlalchemy-0.7.10-test-failures.patch - ]; - - preConfigure = optionalString isPy3k '' - python3 sa2to3.py --no-diffs -w lib test examples - ''; - - buildInputs = with self; [ nose mock ] - ++ stdenv.lib.optional doCheck pysqlite; - propagatedBuildInputs = with self; [ modules.sqlite3 ]; - - checkPhase = '' - ${python.executable} sqla_nose.py - ''; - - meta = { - homepage = http://www.sqlalchemy.org/; - description = "A Python SQL toolkit and Object Relational Mapper"; - }; - }; - sqlalchemy8 = buildPythonPackage rec { name = "SQLAlchemy-0.8.7"; disabled = isPy34 || isPy35; @@ -23108,6 +23133,7 @@ in modules // { meta = { homepage = http://www.sqlalchemy.org/; description = "A Python SQL toolkit and Object Relational Mapper"; + broken = true; }; }; @@ -23203,7 +23229,6 @@ in modules // { }; sqlalchemy_migrate = self.sqlalchemy_migrate_func self.sqlalchemy; - sqlalchemy_migrate_0_7 = self.sqlalchemy_migrate_func self.sqlalchemy7; sqlparse = buildPythonPackage rec { name = "sqlparse-${version}"; @@ -23693,7 +23718,10 @@ in modules // { patchPhase = '' sed -i 's@python@${python.interpreter}@' .testr.conf ''; - doCheck = '' + + doCheck = true; + + checkPhase = '' patchShebangs run_tests.sh ./run_tests.sh ''; @@ -23980,7 +24008,7 @@ in modules // { tqdm = buildPythonPackage rec { name = "tqdm-${version}"; - version = "3.8.4"; + version = "4.8.4"; src = pkgs.fetchurl { url = "mirror://pypi/t/tqdm/${name}.tar.gz"; @@ -26516,6 +26544,56 @@ in modules // { }; }; + txgithub = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "txgithub"; + version = "15.0.0"; + src = pkgs.fetchurl { + url = "mirror://pypi/t/${pname}/${name}.tar.gz"; + sha256 = "16gbizy8vkxasxylwzj4p66yw8979nvzxdj6csidgmng7gi2k8nx"; + }; + propagatedBuildInputs = with self; [ pyopenssl twisted service-identity ]; + # fix python3 issues + patchPhase = '' + sed -i 's/except usage.UsageError, errortext/except usage.UsageError as errortext/' txgithub/scripts/create_token.py + sed -i 's/except usage.UsageError, errortext/except usage.UsageError as errortext/' txgithub/scripts/gist.py + sed -i 's/print response\[\x27html_url\x27\]/print(response\[\x27html_url\x27\])/' txgithub/scripts/gist.py + sed -i '41d' txgithub/scripts/gist.py + sed -i '41d' txgithub/scripts/gist.py + ''; + + # No tests distributed + doCheck = false; + meta = { + description = "GitHub API client implemented using Twisted."; + homepage = "https://github.com/tomprince/txgithub"; + license = licenses.mit; + maintainers = with maintainers; [ nand0p ]; + platforms = platforms.all; + }; + }; + + txrequests = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "txrequests"; + version = "0.9.2"; + src = pkgs.fetchurl { + url = "mirror://pypi/t/${pname}/${name}.tar.gz"; + sha256 = "0kkxxd17ar5gyjkz9yrrdr15a64qw6ym60ndi0zbwx2s634yfafw"; + }; + propagatedBuildInputs = with self; [ twisted requests2 cryptography ]; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + meta = { + description = "Asynchronous Python HTTP for Humans."; + homepage = "https://github.com/tardyp/txrequests"; + license = licenses.asl20; + maintainers = with maintainers; [ nand0p ]; + platforms = platforms.all; + }; + }; txamqp = buildPythonPackage rec { name = "txamqp-${version}"; @@ -28818,12 +28896,12 @@ in modules // { }; trezor_agent = buildPythonPackage rec{ - version = "0.6.1"; + version = "0.6.5"; name = "trezor_agent-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/t/trezor_agent/${name}.tar.gz"; - sha256 = "0wpppxzld7kqqxdvy80qc8629n047vm3m3nk171i7hijfw285p0b"; + sha256 = "074vzy5qrx7fa2svqdwj1p6nbpxa8xmhfych9qa2kpcq32dg7a8s"; }; propagatedBuildInputs = with self; [ trezor ecdsa ed25519 mnemonic keepkey semver ]; @@ -29784,4 +29862,32 @@ in modules // { sha256 = "1lqa8dy1sr1bxi00ri79lmbxvzxi84ki8p46zynyrgcqhwicxq2n"; }; }; + + whoosh = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "Whoosh"; + version = "2.7.4"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/25/2b/6beed2107b148edc1321da0d489afc4617b9ed317ef7b72d4993cad9b684/${name}.tar.gz"; + sha256 = "10qsqdjpbc85fykc1vgcs8xwbgn4l2l52c8d83xf1q59pwyn79bw"; + }; + buildInputs = with self; [ pytest ]; + + # Wrong encoding + postPatch = '' + rm tests/test_reading.py + ''; + checkPhase = '' + py.test + ''; + + meta = { + description = "Fast, pure-Python full text indexing, search, and spell checking library."; + homepage = "http://bitbucket.org/mchaput/whoosh"; + license = licenses.bsd2; + maintainers = with maintainers; [ nand0p ]; + platforms = platforms.all; + }; + }; + } diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 2774ff66f57..430c03f5190 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -154,9 +154,6 @@ with import ./release-lib.nix { inherit supportedSystems; }; sysvtools = linux; tcl = linux; tcpdump = linux; - texLive = linux; - texLiveBeamer = linux; - texLiveExtra = linux; texinfo = all; time = linux; tinycc = linux;