diff options
284 files changed, 6781 insertions, 7827 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index cf1c97865345..3116336db902 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -72,6 +72,7 @@ bcarrell = "Brandon Carrell <brandoncarrell@gmail.com>"; bcdarwin = "Ben Darwin <bcdarwin@gmail.com>"; bdimcheff = "Brandon Dimcheff <brandon@dimcheff.com>"; + bendlas = "Herwig Hochleitner <herwig@bendlas.net>"; benley = "Benjamin Staffin <benley@gmail.com>"; bennofs = "Benno Fünfstück <benno.fuenfstueck@gmail.com>"; benwbooth = "Ben Booth <benwbooth@gmail.com>"; @@ -107,6 +108,7 @@ chaoflow = "Florian Friesdorf <flo@chaoflow.net>"; chattered = "Phil Scott <me@philscotted.com>"; choochootrain = "Hurshal Patel <hurshal@imap.cc>"; + chpatrick = "Patrick Chilton <chpatrick@gmail.com>"; chris-martin = "Chris Martin <ch.martin@gmail.com>"; chrisjefferson = "Christopher Jefferson <chris@bubblescope.net>"; chrisrosset = "Christopher Rosset <chris@rosset.org.uk>"; @@ -171,6 +173,7 @@ drewkett = "Andrew Burkett <burkett.andrew@gmail.com>"; dsferruzza = "David Sferruzza <david.sferruzza@gmail.com>"; dtzWill = "Will Dietz <nix@wdtz.org>"; + dupgit = "Olivier Delhomme <olivier.delhomme@free.fr>"; dywedir = "Vladyslav M. <dywedir@protonmail.ch>"; e-user = "Alexander Kahl <nixos@sodosopa.io>"; ebzzry = "Rommel Martinez <ebzzry@ebzzry.io>"; @@ -194,6 +197,7 @@ eqyiel = "Ruben Maher <r@rkm.id.au>"; ericbmerritt = "Eric Merritt <eric@afiniate.com>"; ericsagnes = "Eric Sagnes <eric.sagnes@gmail.com>"; + erictapen = "Justin Humm <justin.humm@posteo.de>"; erikryb = "Erik Rybakken <erik.rybakken@math.ntnu.no>"; ertes = "Ertugrul Söylemez <esz@posteo.de>"; ethercrow = "Dmitry Ivanov <ethercrow@gmail.com>"; @@ -205,6 +209,7 @@ falsifian = "James Cook <james.cook@utoronto.ca>"; fare = "Francois-Rene Rideau <fahree@gmail.com>"; fgaz = "Francesco Gazzetta <francygazz@gmail.com>"; + flokli = "Florian Klink <flokli@flokli.de>"; florianjacob = "Florian Jacob <projects+nixos@florianjacob.de>"; flosse = "Markus Kohlhase <mail@markus-kohlhase.de>"; fluffynukeit = "Daniel Austin <dan@fluffynukeit.com>"; diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index d4b2e338c3ef..9fa848301f60 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -80,7 +80,7 @@ let truncate -s ${toString diskSize}M $diskImage ${if partitioned then '' - parted $diskImage -- mklabel msdos mkpart primary ext4 1M -1s + parted --script $diskImage -- mklabel msdos mkpart primary ext4 1M -1s offset=$((2048*512)) '' else '' offset=0 diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 58c447c76db6..9339ba78ff0c 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -149,6 +149,7 @@ rec { { key = "run-in-machine"; networking.hostName = "client"; nix.readOnlyStore = false; + virtualisation.writableStore = false; } ]; diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix index aa030a816d04..b15948f6e2e5 100644 --- a/nixos/modules/config/timezone.nix +++ b/nixos/modules/config/timezone.nix @@ -5,6 +5,9 @@ with lib; let tzdir = "${pkgs.tzdata}/share/zoneinfo"; + nospace = str: filter (c: c == " ") (stringToCharacters str) == []; + timezone = types.nullOr (types.addCheck types.str nospace) + // { description = "null or string without spaces"; }; in @@ -15,7 +18,7 @@ in timeZone = mkOption { default = null; - type = types.nullOr types.str; + type = timezone; example = "America/New_York"; description = '' The time zone used when displaying times and dates. See <link diff --git a/nixos/modules/hardware/network/intel-2030.nix b/nixos/modules/hardware/network/intel-2030.nix deleted file mode 100644 index c92b7a0509d0..000000000000 --- a/nixos/modules/hardware/network/intel-2030.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - hardware.enableRedistributableFirmware = true; -} diff --git a/nixos/modules/hardware/network/intel-2100bg.nix b/nixos/modules/hardware/network/intel-2100bg.nix deleted file mode 100644 index 0ec81474ad3e..000000000000 --- a/nixos/modules/hardware/network/intel-2100bg.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - - ###### interface - - options = { - - networking.enableIntel2100BGFirmware = lib.mkOption { - default = false; - type = lib.types.bool; - description = '' - Turn on this option if you want firmware for the Intel - PRO/Wireless 2100BG to be loaded automatically. This is - required if you want to use this device. - ''; - }; - - }; - - - ###### implementation - - config = lib.mkIf config.networking.enableIntel2100BGFirmware { - - hardware.enableRedistributableFirmware = true; - - }; - -} diff --git a/nixos/modules/hardware/network/intel-3945abg.nix b/nixos/modules/hardware/network/intel-3945abg.nix deleted file mode 100644 index 27a3f228b7d1..000000000000 --- a/nixos/modules/hardware/network/intel-3945abg.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - - ###### interface - - options = { - - networking.enableIntel3945ABGFirmware = lib.mkOption { - default = false; - type = lib.types.bool; - description = '' - This option enables automatic loading of the firmware for the Intel - PRO/Wireless 3945ABG. - ''; - }; - - }; - - - ###### implementation - - config = lib.mkIf config.networking.enableIntel3945ABGFirmware { - - hardware.enableRedistributableFirmware = true; - - }; - -} diff --git a/nixos/modules/hardware/network/intel-4965agn.nix b/nixos/modules/hardware/network/intel-4965agn.nix deleted file mode 100644 index c92b7a0509d0..000000000000 --- a/nixos/modules/hardware/network/intel-4965agn.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - hardware.enableRedistributableFirmware = true; -} diff --git a/nixos/modules/hardware/network/intel-5000.nix b/nixos/modules/hardware/network/intel-5000.nix deleted file mode 100644 index c92b7a0509d0..000000000000 --- a/nixos/modules/hardware/network/intel-5000.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - hardware.enableRedistributableFirmware = true; -} diff --git a/nixos/modules/hardware/network/intel-5150.nix b/nixos/modules/hardware/network/intel-5150.nix deleted file mode 100644 index c92b7a0509d0..000000000000 --- a/nixos/modules/hardware/network/intel-5150.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - hardware.enableRedistributableFirmware = true; -} diff --git a/nixos/modules/hardware/network/intel-6000.nix b/nixos/modules/hardware/network/intel-6000.nix deleted file mode 100644 index c92b7a0509d0..000000000000 --- a/nixos/modules/hardware/network/intel-6000.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - hardware.enableRedistributableFirmware = true; -} diff --git a/nixos/modules/hardware/network/intel-6000g2a.nix b/nixos/modules/hardware/network/intel-6000g2a.nix deleted file mode 100644 index c92b7a0509d0..000000000000 --- a/nixos/modules/hardware/network/intel-6000g2a.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - hardware.enableRedistributableFirmware = true; -} diff --git a/nixos/modules/hardware/network/intel-6000g2b.nix b/nixos/modules/hardware/network/intel-6000g2b.nix deleted file mode 100644 index c92b7a0509d0..000000000000 --- a/nixos/modules/hardware/network/intel-6000g2b.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - hardware.enableRedistributableFirmware = true; -} diff --git a/nixos/modules/hardware/network/ralink.nix b/nixos/modules/hardware/network/ralink.nix deleted file mode 100644 index 36182e2cb996..000000000000 --- a/nixos/modules/hardware/network/ralink.nix +++ /dev/null @@ -1,26 +0,0 @@ -{pkgs, config, lib, ...}: - -{ - - ###### interface - - options = { - - networking.enableRalinkFirmware = lib.mkOption { - default = false; - type = lib.types.bool; - description = '' - Turn on this option if you want firmware for the RT73 NIC. - ''; - }; - - }; - - - ###### implementation - - config = lib.mkIf config.networking.enableRalinkFirmware { - hardware.enableRedistributableFirmware = true; - }; - -} diff --git a/nixos/modules/hardware/network/rtl8192c.nix b/nixos/modules/hardware/network/rtl8192c.nix deleted file mode 100644 index bf328c2d3224..000000000000 --- a/nixos/modules/hardware/network/rtl8192c.nix +++ /dev/null @@ -1,26 +0,0 @@ -{pkgs, config, lib, ...}: - -{ - - ###### interface - - options = { - - networking.enableRTL8192cFirmware = lib.mkOption { - default = false; - type = lib.types.bool; - description = '' - Turn on this option if you want firmware for the RTL8192c (and related) NICs. - ''; - }; - - }; - - - ###### implementation - - config = lib.mkIf config.networking.enableRTL8192cFirmware { - hardware.enableRedistributableFirmware = true; - }; - -} diff --git a/nixos/modules/installer/scan/detected.nix b/nixos/modules/installer/scan/detected.nix index e72c78532943..7e181acb93b1 100644 --- a/nixos/modules/installer/scan/detected.nix +++ b/nixos/modules/installer/scan/detected.nix @@ -6,8 +6,7 @@ with lib; { config = mkDefault { - # Wireless card firmware - networking.enableIntel2200BGFirmware = true; - networking.enableIntel3945ABGFirmware = true; + # Common firmware, i.e. for wifi cards + hardware.enableRedistributableFirmware = true; }; } diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 97a30634dc7e..926d1e3133f7 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -402,7 +402,7 @@ EOF if ($status != 0 || join("", @info) =~ /ERROR:/) { die "Failed to retrieve subvolume info for $mountPoint\n"; } - my @ids = join("", @info) =~ m/Subvolume ID:[ \t\n]*([0-9]*)/; + my @ids = join("\n", @info) =~ m/^(?!\/\n).*Subvolume ID:[ \t\n]*([0-9]+)/s; if ($#ids > 0) { die "Btrfs subvol name for $mountPoint listed multiple times in mount\n" } elsif ($#ids == 0) { diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index cb75845baaf7..7d9d9984cf28 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -297,6 +297,8 @@ rslsync = 279; minio = 280; kanboard = 281; + pykms = 282; + kodi = 283; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -563,6 +565,8 @@ rslsync = 279; minio = 280; kanboard = 281; + pykms = 282; + kodi = 283; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 0fe91435ce8c..51953d1110c4 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -125,13 +125,16 @@ in { warnings = optional (isMLocate && cfg.localuser != null) "mlocate does not support searching as user other than root" ++ optional (isFindutils && cfg.pruneNames != []) "findutils locate does not support pruning by directory component" ++ optional (isFindutils && cfg.pruneBindMounts) "findutils locate does not support skipping bind mounts"; - + + # directory creation needs to be separated from main service + # because ReadWritePaths fails when the directory doesn't already exist + systemd.tmpfiles.rules = [ "d ${dirOf cfg.output} 0755 root root -" ]; + systemd.services.update-locatedb = { description = "Update Locate Database"; path = mkIf (!isMLocate) [ pkgs.su ]; script = '' - mkdir -m 0755 -p ${dirOf cfg.output} exec ${cfg.locate}/bin/updatedb \ ${optionalString (cfg.localuser != null && ! isMLocate) ''--localuser=${cfg.localuser}''} \ --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} @@ -147,8 +150,13 @@ in { serviceConfig.PrivateTmp = "yes"; serviceConfig.PrivateNetwork = "yes"; serviceConfig.NoNewPrivileges = "yes"; - serviceConfig.ReadOnlyDirectories = "/"; - serviceConfig.ReadWriteDirectories = dirOf cfg.output; + serviceConfig.ReadOnlyPaths = "/"; + # Use dirOf cfg.output because mlocate creates temporary files next to + # the actual database. We could specify and create them as well, + # but that would make this quite brittle when they change something. + # NOTE: If /var/cache does not exist, this leads to the misleading error message: + # update-locatedb.service: Failed at step NAMESPACE spawning …/update-locatedb-start: No such file or directory + serviceConfig.ReadWritePaths = dirOf cfg.output; }; systemd.timers.update-locatedb = diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index ee796242c1a2..a8cb957ffe21 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -35,11 +35,6 @@ ./hardware/ksm.nix ./hardware/mcelog.nix ./hardware/network/b43.nix - ./hardware/network/intel-2100bg.nix - ./hardware/network/intel-2200bg.nix - ./hardware/network/intel-3945abg.nix - ./hardware/network/ralink.nix - ./hardware/network/rtl8192c.nix ./hardware/nitrokey.nix ./hardware/opengl.nix ./hardware/pcmcia.nix @@ -136,8 +131,6 @@ ./security/rtkit.nix ./security/wrappers/default.nix ./security/sudo.nix - ./service-managers/docker.nix - ./service-managers/trivial.nix ./services/admin/salt/master.nix ./services/admin/salt/minion.nix ./services/amqp/activemq/default.nix @@ -333,6 +326,7 @@ ./services/misc/parsoid.nix ./services/misc/phd.nix ./services/misc/plex.nix + ./services/misc/pykms.nix ./services/misc/radarr.nix ./services/misc/redmine.nix ./services/misc/rippled.nix diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index 6e6ae98e19fc..3c7e516c497f 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -41,15 +41,12 @@ # Virtio (QEMU, KVM etc.) support. "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console" - + # VMware support. "mptspi" "vmw_balloon" "vmwgfx" "vmw_vmci" "vmw_vsock_vmci_transport" "vmxnet3" "vsock" # Hyper-V support. "hv_storvsc" - - # Keyboards - "usbhid" "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat" ]; # Include lots of firmware. diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index deff4067957a..b1b3f67a41d0 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -11,7 +11,11 @@ with lib; (mkRenamedOptionModule [ "fonts" "extraFonts" ] [ "fonts" "fonts" ]) (mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ]) - (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ]) + (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "hardware" "enableRedistributableFirmware" ]) + (mkRenamedOptionModule [ "networking" "enableIntel3945ABGFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) + (mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) + (mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) + (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ]) (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ]) (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ] diff --git a/nixos/modules/service-managers/docker.nix b/nixos/modules/service-managers/docker.nix deleted file mode 100644 index 8e9c763b18af..000000000000 --- a/nixos/modules/service-managers/docker.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.docker-containers; - - containerModule = { - script = mkOption { - type = types.lines; - description = "Shell commands executed as the service's main process."; - }; - }; - - toContainer = name: value: pkgs.dockerTools.buildImage { - inherit name; - config = { - Cmd = [ value.script ]; - }; - }; -in { - options.docker-containers = mkOption { - default = {}; - type = with types; attrsOf (types.submodule containerModule); - description = "Definition of docker containers"; - }; - - config.system.build.toplevel-docker = lib.mapAttrs toContainer cfg; -} diff --git a/nixos/modules/service-managers/trivial.nix b/nixos/modules/service-managers/trivial.nix deleted file mode 100644 index 77e615d1e2e2..000000000000 --- a/nixos/modules/service-managers/trivial.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.trivial-services; - - serviceModule.options = { - script = mkOption { - type = types.lines; - description = "Shell commands executed as the service's main process."; - }; - - environment = mkOption { - default = {}; - type = types.attrs; # FIXME - example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; }; - description = "Environment variables passed to the service's processes."; - }; - }; - - launcher = name: value: pkgs.writeScript name '' - #!${pkgs.stdenv.shell} -eu - - ${pkgs.writeScript "${name}-entry" value.script} - ''; -in { - options.trivial-services = mkOption { - default = {}; - type = with types; attrsOf (types.submodule serviceModule); - description = "Definition of trivial services"; - }; - - config.system.build.toplevel-trivial = lib.mapAttrs launcher cfg; -} diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index efa3b5b6bd76..beca820d2d60 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -189,6 +189,7 @@ in sshKey = "/root/.ssh/id_buildfarm"; system = "x86_64-linux"; maxJobs = 2; + speedFactor = 2; supportedFeatures = [ "kvm" ]; mandatoryFeatures = [ "perf" ]; } diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index e37b486375bd..46221ace3084 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -137,7 +137,7 @@ in User = cfg.user; Group = cfg.group; PermissionsStartOnly = "true"; - ExecStart = "/bin/sh -c ${cfg.package}/usr/lib/plexmediaserver/Plex\\ Media\\ Server"; + ExecStart = "\"${cfg.package}/usr/lib/plexmediaserver/Plex Media Server\""; KillSignal = "SIGQUIT"; Restart = "on-failure"; }; diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix new file mode 100644 index 000000000000..897e856e2a2d --- /dev/null +++ b/nixos/modules/services/misc/pykms.nix @@ -0,0 +1,90 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.pykms; + + home = "/var/lib/pykms"; + + services = { + serviceConfig = { + Restart = "on-failure"; + RestartSec = "10s"; + StartLimitInterval = "1min"; + PrivateTmp = true; + ProtectSystem = "full"; + ProtectHome = true; + }; + }; + +in { + + options = { + services.pykms = rec { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the PyKMS service."; + }; + + listenAddress = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "The IP address on which to listen."; + }; + + port = mkOption { + type = types.int; + default = 1688; + description = "The port on which to listen."; + }; + + verbose = mkOption { + type = types.bool; + default = false; + description = "Show verbose output."; + }; + + openFirewallPort = mkOption { + type = types.bool; + default = false; + description = "Whether the listening port should be opened automatically."; + }; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewallPort [ cfg.port ]; + + systemd.services = { + pykms = services // { + description = "Python KMS"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = with pkgs; { + User = "pykms"; + Group = "pykms"; + ExecStartPre = "${getBin pykms}/bin/create_pykms_db.sh ${home}/clients.db"; + ExecStart = "${getBin pykms}/bin/server.py ${optionalString cfg.verbose "--verbose"} ${cfg.listenAddress} ${toString cfg.port}"; + WorkingDirectory = home; + MemoryLimit = "64M"; + }; + }; + }; + + users = { + extraUsers.pykms = { + name = "pykms"; + group = "pykms"; + home = home; + createHome = true; + uid = config.ids.uids.pykms; + description = "PyKMS daemon user"; + }; + + extraGroups.pykms = { + gid = config.ids.gids.pykms; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix index d0683b877801..546d27069232 100644 --- a/nixos/modules/services/networking/connman.nix +++ b/nixos/modules/services/networking/connman.nix @@ -115,10 +115,5 @@ in { wireless.enable = true; networkmanager.enable = false; }; - - powerManagement.resumeCommands = '' - systemctl restart connman - ''; - }; } diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix index f782be97f6fa..379203cd1ab6 100644 --- a/nixos/modules/services/networking/dnscache.nix +++ b/nixos/modules/services/networking/dnscache.nix @@ -18,10 +18,13 @@ let '') ips} '') cfg.domainServers)} - # djbdns contains an outdated list of root servers; - # if one was not provided in config, provide a current list - if [ ! -e servers/@ ]; then - awk '/^.?.ROOT-SERVERS.NET/ { print $4 }' ${pkgs.dns-root-data}/root.hints > $out/servers/@ + # if a list of root servers was not provided in config, copy it + # over. (this is also done by dnscache-conf, but we 'rm -rf + # /var/lib/dnscache/root' below & replace it wholesale with this, + # so we have to ensure servers/@ exists ourselves.) + if [ ! -e $out/servers/@ ]; then + # symlink does not work here, due chroot + cp ${pkgs.djbdns}/etc/dnsroots.global $out/servers/@; fi ''; diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 68a814b23053..9bd88ca1707b 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -95,18 +95,18 @@ let ip46tables -N nixos-fw-log-refuse ${optionalString cfg.logRefusedConnections '' - ip46tables -A nixos-fw-log-refuse -p tcp --syn -j LOG --log-level info --log-prefix "rejected connection: " + ip46tables -A nixos-fw-log-refuse -p tcp --syn -j LOG --log-level info --log-prefix "refused connection: " ''} ${optionalString (cfg.logRefusedPackets && !cfg.logRefusedUnicastsOnly) '' ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type broadcast \ - -j LOG --log-level info --log-prefix "rejected broadcast: " + -j LOG --log-level info --log-prefix "refused broadcast: " ip46tables -A nixos-fw-log-refuse -m pkttype --pkt-type multicast \ - -j LOG --log-level info --log-prefix "rejected multicast: " + -j LOG --log-level info --log-prefix "refused multicast: " ''} ip46tables -A nixos-fw-log-refuse -m pkttype ! --pkt-type unicast -j nixos-fw-refuse ${optionalString cfg.logRefusedPackets '' ip46tables -A nixos-fw-log-refuse \ - -j LOG --log-level info --log-prefix "rejected packet: " + -j LOG --log-level info --log-prefix "refused packet: " ''} ip46tables -A nixos-fw-log-refuse -j nixos-fw-refuse diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index f3a04d97c98e..bcce4accdd6e 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -105,7 +105,7 @@ in description = "Unbound recursive Domain Name Server"; after = [ "network.target" ]; before = [ "nss-lookup.target" ]; - wants = [" nss-lookup.target" ]; + wants = [ "nss-lookup.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' diff --git a/nixos/modules/services/security/hologram-server.nix b/nixos/modules/services/security/hologram-server.nix index 8315c9ea5d61..e267fed27955 100644 --- a/nixos/modules/services/security/hologram-server.nix +++ b/nixos/modules/services/security/hologram-server.nix @@ -23,8 +23,6 @@ let stats = cfg.statsAddress; listen = cfg.listenAddress; }); - - script = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}"; in { options = { services.hologram-server = { @@ -96,15 +94,9 @@ in { after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - inherit script; - }; - - docker-containers.hologram-server = { - inherit script; - }; - - trivial-services.hologram-server = { - inherit script; + serviceConfig = { + ExecStart = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}"; + }; }; }; } diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix index 5a183443f71d..7f09e8893c4d 100644 --- a/nixos/modules/services/security/sshguard.nix +++ b/nixos/modules/services/security/sshguard.nix @@ -89,7 +89,7 @@ in { environment.systemPackages = [ pkgs.sshguard pkgs.iptables pkgs.ipset ]; - environment.etc."sshguard.conf".text = let + environment.etc."sshguard.conf".text = let list_services = ( name: "-t ${name} "); in '' BACKEND="${pkgs.sshguard}/libexec/sshg-fw-ipset" diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index bc88a808abc9..0b637e3991b4 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -184,10 +184,12 @@ in fi '' + lib.optionalString cfg.localDatabaseCreate '' if ! test -e "${cfg.statePath}/.db-created"; then - ${config.services.postgresql.package}/bin/psql postgres -c \ - "CREATE ROLE ${cfg.localDatabaseUser} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.localDatabasePassword}'" - ${config.services.postgresql.package}/bin/createdb \ - --owner ${cfg.localDatabaseUser} ${cfg.localDatabaseName} + ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} \ + ${config.services.postgresql.package}/bin/psql postgres -c \ + "CREATE ROLE ${cfg.localDatabaseUser} WITH LOGIN NOCREATEDB NOCREATEROLE ENCRYPTED PASSWORD '${cfg.localDatabasePassword}'" + ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} \ + ${config.services.postgresql.package}/bin/createdb \ + --owner ${cfg.localDatabaseUser} ${cfg.localDatabaseName} touch ${cfg.statePath}/.db-created fi '' + '' diff --git a/nixos/modules/services/web-servers/lighttpd/default.nix b/nixos/modules/services/web-servers/lighttpd/default.nix index 45a65965112a..700b4469c565 100644 --- a/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/nixos/modules/services/web-servers/lighttpd/default.nix @@ -15,7 +15,8 @@ let # Some modules are always imported and should not appear in the config: # disallowedModules = [ "mod_indexfile" "mod_dirlisting" "mod_staticfile" ]; # - # Get full module list: "ls -1 $lighttpd/lib/*.so" + # For full module list, see the output of running ./configure in the lighttpd + # source. allKnownModules = [ "mod_rewrite" "mod_redirect" @@ -38,12 +39,15 @@ let "mod_accesslog" # Remaining list of modules, order assumed to be unimportant. "mod_authn_file" + "mod_authn_gssapi" + "mod_authn_ldap" "mod_authn_mysql" "mod_cml" "mod_deflate" "mod_evasive" "mod_extforward" "mod_flv_streaming" + "mod_geoip" "mod_magnet" "mod_mysql_vhost" "mod_scgi" diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix index 56bc66b71796..42ceeb819806 100644 --- a/nixos/modules/services/x11/compton.nix +++ b/nixos/modules/services/x11/compton.nix @@ -7,7 +7,12 @@ let cfg = config.services.compton; - configFile = pkgs.writeText "compton.conf" + configFile = let + opacityRules = optionalString (length cfg.opacityRules != 0) + (concatStringsSep "\n" + (map (a: "opacity-rule = [ \"${a}\" ];") cfg.opacityRules) + ); + in pkgs.writeText "compton.conf" (optionalString cfg.fade '' # fading fading = true; @@ -30,7 +35,9 @@ let active-opacity = ${cfg.activeOpacity}; inactive-opacity = ${cfg.inactiveOpacity}; menu-opacity = ${cfg.menuOpacity}; - + + ${opacityRules} + # other options backend = ${toJSON cfg.backend}; vsync = ${toJSON cfg.vSync}; @@ -155,6 +162,14 @@ in { ''; }; + opacityRules = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Opacity rules to be handled by compton. + ''; + }; + backend = mkOption { type = types.str; default = "glx"; diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index 7a95ac6549d8..ab8a0a48b483 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -72,6 +72,7 @@ in ]; services.gnome3.gnome-keyring.enable = true; + services.upower.enable = config.powerManagement.enable; environment.pathsToLink = [ "/share" ]; }; diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index f099117f4777..d7e72c4a7aec 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -142,7 +142,8 @@ in kde-gtk-config breeze-gtk - phonon-backend-gstreamer + libsForQt56.phonon-backend-gstreamer + libsForQt5.phonon-backend-gstreamer ] ++ lib.optionals cfg.enableQt4Support [ breeze-qt4 pkgs.phonon-backend-gstreamer ] diff --git a/nixos/modules/services/x11/xautolock.nix b/nixos/modules/services/x11/xautolock.nix index 60ce9e6ed5c0..28fc92024bcb 100644 --- a/nixos/modules/services/x11/xautolock.nix +++ b/nixos/modules/services/x11/xautolock.nix @@ -31,7 +31,17 @@ in type = types.string; description = '' - The script to use when locking the computer. + The script to use when automatically locking the computer. + ''; + }; + + nowlocker = mkOption { + default = null; + example = "i3lock -i /path/to/img"; + type = types.nullOr types.string; + + description = '' + The script to use when manually locking the computer with <command>xautolock -locknow</command>. ''; }; @@ -45,28 +55,82 @@ in }; notifier = mkOption { - default = "notify-send 'Locking in 10 seconds'"; - type = types.string; + default = null; + example = literalExample '' + "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\"" + ''; + type = types.nullOr types.string; description = '' Notification script to be used to warn about the pending autolock. ''; }; + + killer = mkOption { + default = null; # default according to `man xautolock` is none + example = "systemctl suspend"; + type = types.nullOr types.string; + + description = '' + The script to use when nothing has happend for as long as <option>killtime</option> + ''; + }; + + killtime = mkOption { + default = 20; # default according to `man xautolock` + type = types.int; + + description = '' + Minutes xautolock waits until it executes the script specified in <option>killer</option> + (Has to be at least 10 minutes) + ''; + }; + + extraOptions = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "-detectsleep" ]; + description = '' + Additional command-line arguments to pass to + <command>xautolock</command>. + ''; + }; }; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ xautolock ]; - - services.xserver.displayManager.sessionCommands = with builtins; with pkgs; '' - ${xautolock}/bin/xautolock \ - ${concatStringsSep " \\\n" ([ - "-time ${toString(cfg.time)}" - "-locker ${cfg.locker}" - ] ++ optional cfg.enableNotifier (concatStringsSep " " [ - "-notify ${toString(cfg.notify)}" - "-notifier \"${cfg.notifier}\"" - ]))} & - ''; + systemd.user.services.xautolock = { + description = "xautolock service"; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; + serviceConfig = with lib; { + ExecStart = strings.concatStringsSep " " ([ + "${pkgs.xautolock}/bin/xautolock" + "-noclose" + "-time ${toString cfg.time}" + "-locker '${cfg.locker}'" + ] ++ optionals cfg.enableNotifier [ + "-notify ${toString cfg.notify}" + "-notifier '${cfg.notifier}'" + ] ++ optionals (cfg.nowlocker != null) [ + "-nowlocker '${cfg.nowlocker}'" + ] ++ optionals (cfg.killer != null) [ + "-killer '${cfg.killer}'" + "-killtime ${toString cfg.killtime}" + ] ++ cfg.extraOptions); + Restart = "always"; + }; + }; + assertions = [ + { + assertion = cfg.enableNotifier -> cfg.notifier != null; + message = "When enabling the notifier for xautolock, you also need to specify the notify script"; + } + { + assertion = cfg.killer != null -> cfg.killtime >= 10; + message = "killtime has to be at least 10 minutes according to `man xautolock`"; + } + ]; }; } diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index cf70a891c0ca..4db9631743e3 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -193,11 +193,6 @@ in "sd_mod" "sr_mod" - # Standard IDE stuff. - "ide_cd" - "ide_disk" - "ide_generic" - # SD cards and internal eMMC drives. "mmc_block" @@ -211,21 +206,11 @@ in "xhci_hcd" "xhci_pci" "usbhid" - "hid_generic" "hid_lenovo" - "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat" + "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat" # Misc. keyboard stuff. "pcips2" "atkbd" "i8042" - # Temporary fix for https://github.com/NixOS/nixpkgs/issues/18451 - # Remove as soon as upstream gets fixed - marking it: - # TODO - # FIXME - "i8042" - - # To wait for SCSI devices to appear. - "scsi_wait_scan" - # Needed by the stage 2 init script. "rtc_cmos" ]; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 82b5bcda9217..cc03e54ead63 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -197,7 +197,7 @@ sub GrubFs { if ($status != 0) { die "Failed to retrieve subvolume info for @{[$fs->mount]}\n"; } - my @ids = join("", @id_info) =~ m/Subvolume ID:[ \t\n]*([^ \t\n]*)/; + my @ids = join("\n", @id_info) =~ m/^(?!\/\n).*Subvolume ID:[ \t\n]*([0-9]+)/s; if ($#ids > 0) { die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n" } elsif ($#ids == 0) { diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix index 7f45f0f34f71..08bbcfd9d7c2 100644 --- a/nixos/modules/virtualisation/brightbox-image.nix +++ b/nixos/modules/virtualisation/brightbox-image.nix @@ -33,9 +33,9 @@ in } '' # Create partition table - ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos - ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize} - ${pkgs.parted}/sbin/parted /dev/vda print + ${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos + ${pkgs.parted}/sbin/parted --script /dev/vda mkpart primary ext4 1 ${diskSize} + ${pkgs.parted}/sbin/parted --script /dev/vda print . /sys/class/block/vda1/uevent mknod /dev/vda1 b $MAJOR $MINOR diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index f61d80f55991..125e6b7050bc 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -42,12 +42,11 @@ in rec { name = "nixos-${nixos.channel.version}"; meta = { description = "Release-critical builds for the NixOS channel"; - maintainers = [ pkgs.lib.maintainers.eelco ]; + maintainers = with pkgs.lib.maintainers; [ eelco fpletz ]; }; constituents = let - all = x: map (system: x.${system}) - (supportedSystems ++ limitedSupportedSystems); + all = x: map (system: x.${system}) supportedSystems; in [ nixos.channel (all nixos.dummy) @@ -61,7 +60,7 @@ in rec { nixos.tests.chromium (all nixos.tests.firefox) (all nixos.tests.firewall) - nixos.tests.gnome3.x86_64-linux # FIXME: i686-linux + (all nixos.tests.gnome3) nixos.tests.installer.zfsroot.x86_64-linux # ZFS is 64bit only (all nixos.tests.installer.lvm) (all nixos.tests.installer.luksroot) @@ -80,9 +79,8 @@ in rec { (all nixos.tests.boot.uefiCdrom) (all nixos.tests.boot.uefiUsb) (all nixos.tests.boot-stage1) - nixos.tests.hibernate.x86_64-linux # i686 is flaky, see #23107 + (all nixos.tests.hibernate) nixos.tests.docker - nixos.tests.docker-edge (all nixos.tests.ecryptfs) (all nixos.tests.env) (all nixos.tests.ipv6) @@ -93,7 +91,7 @@ in rec { (all nixos.tests.keymap.dvp) (all nixos.tests.keymap.neo) (all nixos.tests.keymap.qwertz) - nixos.tests.plasma5.x86_64-linux # avoid big build on i686 + (all nixos.tests.plasma5) #(all nixos.tests.lightdm) (all nixos.tests.login) (all nixos.tests.misc) diff --git a/nixos/release.nix b/nixos/release.nix index ee706ff986d4..4060e5df4ec1 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -303,6 +303,7 @@ in rec { #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); tests.peerflix = callTest tests/peerflix.nix {}; tests.postgresql = callSubTests tests/postgresql.nix {}; + tests.postgis = callTest tests/postgis.nix {}; #tests.pgjwt = callTest tests/pgjwt.nix {}; tests.printing = callTest tests/printing.nix {}; tests.proxy = callTest tests/proxy.nix {}; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index c1dae2a34fa3..da9582deec1d 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -260,9 +260,9 @@ in { { createPartitions = '' $machine->succeed( - "parted /dev/vda mklabel msdos", - "parted /dev/vda -- mkpart primary linux-swap 1M 1024M", - "parted /dev/vda -- mkpart primary ext2 1024M -1s", + "parted --script /dev/vda mklabel msdos", + "parted --script /dev/vda -- mkpart primary linux-swap 1M 1024M", + "parted --script /dev/vda -- mkpart primary ext2 1024M -1s", "udevadm settle", "mkswap /dev/vda1 -L swap", "swapon -L swap", @@ -277,11 +277,11 @@ in { { createPartitions = '' $machine->succeed( - "parted /dev/vda mklabel gpt", - "parted -s /dev/vda -- mkpart ESP fat32 1M 50MiB", # /boot - "parted -s /dev/vda -- set 1 boot on", - "parted -s /dev/vda -- mkpart primary linux-swap 50MiB 1024MiB", - "parted -s /dev/vda -- mkpart primary ext2 1024MiB -1MiB", # / + "parted --script /dev/vda mklabel gpt", + "parted --script /dev/vda -- mkpart ESP fat32 1M 50MiB", # /boot + "parted --script /dev/vda -- set 1 boot on", + "parted --script /dev/vda -- mkpart primary linux-swap 50MiB 1024MiB", + "parted --script /dev/vda -- mkpart primary ext2 1024MiB -1MiB", # / "udevadm settle", "mkswap /dev/vda2 -L swap", "swapon -L swap", @@ -300,10 +300,10 @@ in { { createPartitions = '' $machine->succeed( - "parted /dev/vda mklabel msdos", - "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot - "parted /dev/vda -- mkpart primary linux-swap 50MB 1024M", - "parted /dev/vda -- mkpart primary ext2 1024M -1s", # / + "parted --script /dev/vda mklabel msdos", + "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot + "parted --script /dev/vda -- mkpart primary linux-swap 50MB 1024M", + "parted --script /dev/vda -- mkpart primary ext2 1024M -1s", # / "udevadm settle", "mkswap /dev/vda2 -L swap", "swapon -L swap", @@ -321,10 +321,10 @@ in { { createPartitions = '' $machine->succeed( - "parted /dev/vda mklabel msdos", - "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot - "parted /dev/vda -- mkpart primary linux-swap 50MB 1024M", - "parted /dev/vda -- mkpart primary ext2 1024M -1s", # / + "parted --script /dev/vda mklabel msdos", + "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot + "parted --script /dev/vda -- mkpart primary linux-swap 50MB 1024M", + "parted --script /dev/vda -- mkpart primary ext2 1024M -1s", # / "udevadm settle", "mkswap /dev/vda2 -L swap", "swapon -L swap", @@ -357,9 +357,9 @@ in { createPartitions = '' $machine->succeed( - "parted /dev/vda mklabel msdos", - "parted /dev/vda -- mkpart primary linux-swap 1M 1024M", - "parted /dev/vda -- mkpart primary 1024M -1s", + "parted --script /dev/vda mklabel msdos", + "parted --script /dev/vda -- mkpart primary linux-swap 1M 1024M", + "parted --script /dev/vda -- mkpart primary 1024M -1s", "udevadm settle", "mkswap /dev/vda1 -L swap", @@ -380,11 +380,11 @@ in { { createPartitions = '' $machine->succeed( - "parted /dev/vda mklabel msdos", - "parted /dev/vda -- mkpart primary 1M 2048M", # PV1 - "parted /dev/vda -- set 1 lvm on", - "parted /dev/vda -- mkpart primary 2048M -1s", # PV2 - "parted /dev/vda -- set 2 lvm on", + "parted --script /dev/vda mklabel msdos", + "parted --script /dev/vda -- mkpart primary 1M 2048M", # PV1 + "parted --script /dev/vda -- set 1 lvm on", + "parted --script /dev/vda -- mkpart primary 2048M -1s", # PV2 + "parted --script /dev/vda -- set 2 lvm on", "udevadm settle", "pvcreate /dev/vda1 /dev/vda2", "vgcreate MyVolGroup /dev/vda1 /dev/vda2", @@ -402,10 +402,10 @@ in { luksroot = makeInstallerTest "luksroot" { createPartitions = '' $machine->succeed( - "parted /dev/vda mklabel msdos", - "parted /dev/vda -- mkpart primary ext2 1M 50MB", # /boot - "parted /dev/vda -- mkpart primary linux-swap 50M 1024M", - "parted /dev/vda -- mkpart primary 1024M -1s", # LUKS + "parted --script /dev/vda mklabel msdos", + "parted --script /dev/vda -- mkpart primary ext2 1M 50MB", # /boot + "parted --script /dev/vda -- mkpart primary linux-swap 50M 1024M", + "parted --script /dev/vda -- mkpart primary 1024M -1s", # LUKS "udevadm settle", "mkswap /dev/vda2 -L swap", "swapon -L swap", @@ -434,7 +434,7 @@ in { { createPartitions = '' $machine->succeed( - "parted /dev/vda --" + "parted --script /dev/vda --" . " mklabel msdos" . " mkpart primary ext2 1M 100MB" # /boot . " mkpart extended 100M -1s" @@ -469,9 +469,9 @@ in { { createPartitions = '' $machine->succeed( - "parted /dev/sda mklabel msdos", - "parted /dev/sda -- mkpart primary linux-swap 1M 1024M", - "parted /dev/sda -- mkpart primary ext2 1024M -1s", + "parted --script /dev/sda mklabel msdos", + "parted --script /dev/sda -- mkpart primary linux-swap 1M 1024M", + "parted --script /dev/sda -- mkpart primary ext2 1024M -1s", "udevadm settle", "mkswap /dev/sda1 -L swap", "swapon -L swap", diff --git a/nixos/tests/postgis.nix b/nixos/tests/postgis.nix index 1dba5c363c09..f6ce3fe38ed3 100644 --- a/nixos/tests/postgis.nix +++ b/nixos/tests/postgis.nix @@ -9,15 +9,11 @@ import ./make-test.nix ({ pkgs, ...} : { { pkgs, config, ... }: { - services.postgresql = let mypg = pkgs.postgresql95; in { + services.postgresql = let mypg = pkgs.postgresql100; 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; - ''; - }; + extraPlugins = [ (pkgs.postgis.override { postgresql = mypg; }).v_2_4_0 ]; + }; }; }; diff --git a/nixos/tests/run-in-machine.nix b/nixos/tests/run-in-machine.nix index d1102f8d4073..a6dfece44a92 100644 --- a/nixos/tests/run-in-machine.nix +++ b/nixos/tests/run-in-machine.nix @@ -2,7 +2,16 @@ with import ../lib/testing.nix { inherit system; }; -runInMachine { - drv = pkgs.hello; - machine = { config, pkgs, ... }: { /* services.sshd.enable = true; */ }; -} +let + output = runInMachine { + drv = pkgs.hello; + machine = { config, pkgs, ... }: { /* services.sshd.enable = true; */ }; + }; +in pkgs.runCommand "verify-output" { inherit output; } '' + if [ ! -e "$output/bin/hello" ]; then + echo "Derivation built using runInMachine produced incorrect output:" >&2 + ls -laR "$output" >&2 + exit 1 + fi + "$output/bin/hello" > "$out" +'' diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index a1ab7614871a..c519d7dae8be 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -107,8 +107,8 @@ let buildInputs = [ pkgs.utillinux pkgs.perl ]; } '' - ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos - ${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s + ${pkgs.parted}/sbin/parted --script /dev/vda mklabel msdos + ${pkgs.parted}/sbin/parted --script /dev/vda -- mkpart primary ext2 1M -1s . /sys/class/block/vda1/uevent mknod /dev/vda1 b $MAJOR $MINOR diff --git a/pkgs/applications/altcoins/go-ethereum-classic/default.nix b/pkgs/applications/altcoins/go-ethereum-classic/default.nix index 37d6264d82f3..679312d9a8e9 100644 --- a/pkgs/applications/altcoins/go-ethereum-classic/default.nix +++ b/pkgs/applications/altcoins/go-ethereum-classic/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "go-ethereum-classic-${version}"; - version = "3.5.86"; + version = "4.0.0"; goPackagePath = "github.com/ethereumproject/go-ethereum"; subPackages = [ "cmd/evm" "cmd/geth" ]; @@ -10,7 +10,7 @@ buildGoPackage rec { src = fetchgit { rev = "v${version}"; url = "https://github.com/ethereumproject/go-ethereum"; - sha256 = "1k59hl3qvx4422zqlp259566fnxq5bs67jhm0v6a1zfr1k8iqzwh"; + sha256 = "06f1w7s45q4zva1xjrx92xinsdrixl0m6zhx5hvdjmg3xqcbwr79"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 279e767173a2..04e68b1f1282 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.7.1"; + version = "1.7.2"; goPackagePath = "github.com/ethereum/go-ethereum"; # Fix for usb-related segmentation faults on darwin @@ -16,17 +16,9 @@ buildGoPackage rec { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - sha256 = "1rhqnqp2d951d4084z7dc07q0my4wd5401968a0nqj030a9vgng2"; + sha256 = "11n77zlf8qixhx26sqf33v911716msi6h0z4ng8gxhzhznrn2nrd"; }; - # Fix cyclic referencing on Darwin - postInstall = stdenv.lib.optionalString (stdenv.isDarwin) '' - for file in $bin/bin/*; do - # Not all files are referencing $out/lib so consider this step non-critical - install_name_tool -delete_rpath $out/lib $file || true - done - ''; - meta = with stdenv.lib; { homepage = https://ethereum.github.io/go-ethereum/; description = "Official golang implementation of the Ethereum protocol"; diff --git a/pkgs/applications/editors/android-studio/packages.nix b/pkgs/applications/editors/android-studio/packages.nix index 8ee5f0319aa1..061d75d4016f 100644 --- a/pkgs/applications/editors/android-studio/packages.nix +++ b/pkgs/applications/editors/android-studio/packages.nix @@ -27,9 +27,9 @@ in rec { preview = mkStudio rec { pname = "android-studio-preview"; - version = "3.0.0.15"; # "Android Studio 3.0 Beta 7" - build = "171.4365657"; - sha256Hash = "0am3rq0ag982ik95mpcxvx2zlv0h4l6747b29mlsbqih66868db6"; + version = "3.0.0.16"; # "Android Studio 3.0 RC 1" + build = "171.4392136"; + sha256Hash = "13zaqbbl7bqhiwh0ybbxkfv0h90qsfpa7sim778n2j32jjvdcby5"; meta = stable.meta // { description = "The Official IDE for Android (preview version)"; diff --git a/pkgs/applications/editors/atom/beta.nix b/pkgs/applications/editors/atom/beta.nix index 61f927ef76bc..391d098625c5 100644 --- a/pkgs/applications/editors/atom/beta.nix +++ b/pkgs/applications/editors/atom/beta.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-beta-${version}"; - version = "1.22.0-beta0"; + version = "1.22.0-beta1"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0xsj0vvaxjw60gg6niaws2lf9lkrh1sz7ypk41g6l4hdgmqyg6fi"; + sha256 = "0qggj0j0cnkzqwgvzw2fb1z10rvvx9jh0ymhdy1aca18hms44p3d"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 33d78591151e..f0af3b88c72e 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "atom-${version}"; - version = "1.21.0"; + version = "1.21.1"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0xnja2jdjjryisxgyxhh8ik861snl9wdpmr3rjlnalfglghqqb5h"; + sha256 = "13mpj3wvcgsxz9q6lai36lkfgd7rabcjrrih1j5309kd1dqaswnn"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 7cd57642aadf..cf49b8d2ea7e 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.2.2"; + version = "5.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-5.2.2.tar"; - sha256 = "0c0lrj4vgsbawyshqbfb7gvndf0yb97wybqb0b34z7kan7q0xgvd"; + url = "https://elpa.gnu.org/packages/ada-mode-5.3.1.tar"; + sha256 = "0srna7w3y2nq0y80a01bcx8mg6gvind7nzvsbk9bd7rrr05njrd9"; }; packageRequires = [ cl-lib emacs wisi ]; meta = { @@ -95,10 +95,10 @@ ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ahungry-theme"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ahungry-theme-1.4.0.tar"; - sha256 = "1n8k12mfn01f20j0pyd7ycj77x0y3a008xc94frklaaqjc0v26s4"; + url = "https://elpa.gnu.org/packages/ahungry-theme-1.5.0.tar"; + sha256 = "0xxzmqawd7cwafzb9z6c7hjlh6adc5sj7hfcqxf30b7b7ragqn19"; }; packageRequires = [ emacs ]; meta = { @@ -149,10 +149,10 @@ ascii-art-to-unicode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "ascii-art-to-unicode"; - version = "1.9"; + version = "1.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.9.el"; - sha256 = "0lfgfkx81s4dd318xcxsl7hdgpi0dc1fv3d00m3xg8smyxcf3adv"; + url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.11.el"; + sha256 = "1z1vjpskvhynja41cv5z6xrz3rmpdzz51avv2gzrpxxa4k6iaz8s"; }; packageRequires = []; meta = { @@ -281,10 +281,10 @@ }) {}; captain = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "captain"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/captain-1.0.1.el"; - sha256 = "1jqbgzcgq4kxpcsma9ia6w6rjy9sdn51lz2f4rfjjy3qgy4fqjx5"; + url = "https://elpa.gnu.org/packages/captain-1.0.2.el"; + sha256 = "0rslksfwzf5bngmbfgv2mwmls5dpwmz7rs9av9p60y7k848haqf1"; }; packageRequires = []; meta = { @@ -700,10 +700,10 @@ ebdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, seq }: elpaBuild { pname = "ebdb"; - version = "0.3.1"; + version = "0.3.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.3.1.tar"; - sha256 = "1g8chkw302nhjj8n6v7j3xfcw24wpn43pcp8f3bh4s4haw1l75q3"; + url = "https://elpa.gnu.org/packages/ebdb-0.3.4.tar"; + sha256 = "1jj7s0646wqg9ykmpi52cc6m6m0gk2inqc2h6h7cr7gr4v7n2l00"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -728,10 +728,10 @@ ebdb-i18n-chn = callPackage ({ ebdb, elpaBuild, fetchurl, lib, pyim }: elpaBuild { pname = "ebdb-i18n-chn"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.1.el"; - sha256 = "0pf7qp15z9wp41dazvi4bhdz7y13h9k5nnghhsb0nvknn6if0k4m"; + url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.2.el"; + sha256 = "1qgrlk625mhfd6n1mc0kqfzbisnb61kx3vrrl3bzlz4viq3kcc10"; }; packageRequires = [ ebdb pyim ]; meta = { @@ -1556,10 +1556,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20170911"; + version = "20171009"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20170911.tar"; - sha256 = "0w91f5lx64klwbpym0b73z919dagzakykkmx6g13iscsh7fflx06"; + url = "https://elpa.gnu.org/packages/org-20171009.tar"; + sha256 = "03j7vcj5rihhdh1mmy667s1jy39wfs0kf4gc0gmqxldml062gcpm"; }; packageRequires = []; meta = { @@ -2068,10 +2068,10 @@ }) {}; tramp-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "tramp-theme"; - version = "0.1.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-theme-0.1.1.el"; - sha256 = "0l8i625h9sc6h59qfj847blmfwfhf9bvfsbmwfb56qzs535fby3y"; + url = "https://elpa.gnu.org/packages/tramp-theme-0.2.el"; + sha256 = "1q1j0vcdyv5gnfbnfl08rnwd5j4ayc1gi1vpinr99ny70wsv7gbf"; }; packageRequires = [ emacs ]; meta = { @@ -2293,10 +2293,10 @@ wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "wisi"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-1.1.5.tar"; - sha256 = "1q0dbykh9gvh0355vc1lwpriwlqq07jaydqx8zdrs6s0zyffx3a4"; + url = "https://elpa.gnu.org/packages/wisi-1.1.6.tar"; + sha256 = "0p7hm9l4gbp50rmpqna6jnc1pss2axdd6m6hk9ik4afbz0knzwnk"; }; packageRequires = [ cl-lib emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index ce9c4b3a46fd..d28cf3a3edf1 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -127,12 +127,12 @@ abc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abc-mode"; - version = "20140225.944"; + version = "20171001.403"; src = fetchFromGitHub { owner = "mkjunker"; repo = "abc-mode"; - rev = "1dd6e1217136a6f986917a3e5f41c1007bac908d"; - sha256 = "1h4gwp2gyd4jhbkb8ai1zbzhhmlhmihbwzr0wsxg5yq074n72ifs"; + rev = "161de34bc9e13bb094da0e99233b496a16f890fd"; + sha256 = "0dqn2y6afn36jry2lb96v8w6hwlzcln3d314j5n4sl4lh5ba2s5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aaee9dc5de06747374f311d86a550d3cc15beed1/recipes/abc-mode"; @@ -355,25 +355,6 @@ license = lib.licenses.free; }; }) {}; - ac-dabbrev = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "ac-dabbrev"; - version = "20130905.2218"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/ac-dabbrev.el?revision=9"; - sha256 = "0q0lbhdng5s5hqa342yyvg02hf2bfbwq513lj1rlaqz4ykvpd7fh"; - name = "ac-dabbrev.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/ac-dabbrev"; - sha256 = "03lndw7y55bzz4rckl80j0kh66qa82xxxhfakzs1dh1h9f1f0azh"; - name = "ac-dabbrev"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/ac-dabbrev"; - license = lib.licenses.free; - }; - }) {}; ac-dcd = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, flycheck-dmd-dub, lib, melpaBuild }: melpaBuild { pname = "ac-dcd"; @@ -398,12 +379,12 @@ ac-emacs-eclim = callPackage ({ auto-complete, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-emacs-eclim"; - version = "20170104.743"; + version = "20170924.1339"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "ebb844d1ebdd7eb347e89063a9b6e9f890a1ff57"; - sha256 = "18q4blnxf7p2kvgh1rhr7pizga06z97hv1lxjgzv0dc2dll2zwmd"; + rev = "322a796be1619fb2ade6de6d51111e5f3f5776d0"; + sha256 = "05sil1pazr7rdg6hq34p5ba7rnp3rp2lfnhsjpr26fisfhkbbaic"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; @@ -759,8 +740,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "9e9c126397c3d2c7160e38eb72b9317c515678f3"; - sha256 = "14qnbfxm9k870qi53krg6lmmfzcbhnv0yslhv66p40rwh9wjslwd"; + rev = "59e11170c3e3d037ed3ccf183a856cae3cc9e531"; + sha256 = "02z0z0mxj44zlgzd0dx7v7v02fpbnz655nszc2dfmvd5m9q8bg3z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -776,12 +757,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20170831.802"; + version = "20170925.821"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "9e9c126397c3d2c7160e38eb72b9317c515678f3"; - sha256 = "14qnbfxm9k870qi53krg6lmmfzcbhnv0yslhv66p40rwh9wjslwd"; + rev = "59e11170c3e3d037ed3ccf183a856cae3cc9e531"; + sha256 = "02z0z0mxj44zlgzd0dx7v7v02fpbnz655nszc2dfmvd5m9q8bg3z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -822,8 +803,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25"; - sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39"; + rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; + sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ac-rtags"; @@ -1028,12 +1009,12 @@ ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-link"; - version = "20170904.340"; + version = "20170925.723"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-link"; - rev = "34eefe3c94042a20abf4d340fdae71955a087926"; - sha256 = "02lh4kmjwf8d67b33ha4shwkkfvy9igvg88v5xq7282wxp6y3lx7"; + rev = "eee81e6f75b078a207a547e0e8cff8c3d4f0b07c"; + sha256 = "03p8cdakbx5pz9f8s01chd0bzmgsz50zi433k6gh0vw553y8vcmi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link"; @@ -1216,12 +1197,12 @@ add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "add-node-modules-path"; - version = "20170501.151"; + version = "20170914.1912"; src = fetchFromGitHub { owner = "codesuki"; repo = "add-node-modules-path"; - rev = "8eef7fa6765af1716fc21db08f19f3d3e9b68998"; - sha256 = "1dm2gdhs9zy5jqhbqipdgzfj24mrzxz064ax9l2dg0lqylk1dc0q"; + rev = "6f7801b2c41e3711406b7e1654257ad5557f5bb3"; + sha256 = "1pfgy1k7vp34k4zb9835y3x4jmf81na60vsf80wlgvfafwk170z6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path"; @@ -1321,12 +1302,12 @@ ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ag"; - version = "20170712.1549"; + version = "20170915.1249"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ag.el"; - rev = "74d00c48a98211001c844ab4386d00420ccc850a"; - sha256 = "1mjgl1pwaf0wl8hmzcwxq1g58mbi63ajbvhxljlysyfdkw15lvlq"; + rev = "3b567902ccbec4ed9b8c5f5cd369be833e485e79"; + sha256 = "1ihhmz4ww6iqbjbv1cvssixn01bkd2cl8pij7p32dxyyd8jdwlkq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag"; @@ -1346,8 +1327,8 @@ src = fetchFromGitHub { owner = "davidshepherd7"; repo = "aggressive-fill-paragraph-mode"; - rev = "c5185ad673c01e5103ab4a078095c3e2ce7ab039"; - sha256 = "11dppmpdv26m9l5cnnnylihiss2a09zyyb7kqdrk3djdqvqplqb4"; + rev = "bcbc63d1c93cd8dc5bf2fc6eb4988fa76375c631"; + sha256 = "042xvhfc7h571rdriixdf2s2aai8qz4w1wddbbbsq3ir0n814zp3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/982f5936f2d83222263df2886ca0b629076366bb/recipes/aggressive-fill-paragraph"; @@ -1383,11 +1364,11 @@ }) {}; ahg = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahg"; - version = "20161110.455"; + version = "20171003.39"; src = fetchhg { url = "https://bitbucket.com/agriggio/ahg"; - rev = "0e1d1b4142e7"; - sha256 = "09606q8b9qhz1szshv8aapc7450j085rjf2fv769vbivr3kshqvh"; + rev = "6a4cc7a7eee6"; + sha256 = "09c3rawxqxxbl648bq1akawmgwiwppzd9g2sspza0k52adsb3rps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ahg"; @@ -1424,12 +1405,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "20170702.2226"; + version = "20170926.1903"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "e3d7e22cb10582a443b0e245be68aca936cd6abf"; - sha256 = "0fsip64bxs55kkqmpfcg4nr391b6wsd8hiq4fxvwww7n52lwsn5s"; + rev = "85a1af27541f6a73a63120fac2cfbb7ba39531c9"; + sha256 = "0z1kh8xj16lp7ydzw1fxypw37vlrcxcb8bpx96w6aj6zcd7pzwmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1508,12 +1489,12 @@ alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alda-mode"; - version = "20170803.1852"; + version = "20170913.926"; src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "08556b3050c0bfc2d8f0a6d918610dbb2b85958f"; - sha256 = "1f2m7pz3l62gk5ndfh49hm87ihz0lfk28izps9j3i68h4zclk3ls"; + rev = "0e800594796ae283f5c0a6a374b9c2f8ebdfef56"; + sha256 = "06j1imqknya3kglnmhsz2jg18mcbcycrjlgjzb9c1n68z43xglyh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1613,12 +1594,12 @@ all-the-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild, memoize }: melpaBuild { pname = "all-the-icons"; - version = "20170817.642"; + version = "20170914.129"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "d3550f8e0f8df6509e7f29a1ffbffc0f17144704"; - sha256 = "09y1g4dphkhzrxym1bwxgx5f3hzvh1v4shbrr59bvdqymv93dagl"; + rev = "8f269ae0ddec217db4ec643f8e167eb431091b72"; + sha256 = "1wprrwv099w61blam6x8wfxym1dfx802ra7cddbkmh07vfi1w6bx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -1790,12 +1771,12 @@ amx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "amx"; - version = "20170810.1842"; + version = "20170923.835"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "amx"; - rev = "ba09f5ecf451d278a6cf5721b6942ad8d81ab911"; - sha256 = "0xilab0v5qzvz6g8n10jdb9vz2pmlhgz6pc9cc3qsgg54r3igsv2"; + rev = "88ab7ccb2a88b5cd3ecc4d703ae9373df3e4971c"; + sha256 = "1n1zsrlj272scl4xcbys86d6gxnaq08vp5frd96i47c1an75p0xw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c55bfad05343b2b0f3150fd2b4adb07a1768c1c0/recipes/amx"; @@ -1811,12 +1792,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "20170405.301"; + version = "20170924.704"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "0f9576791b86e0b315447e6823b3a7db131cd826"; - sha256 = "1qqh1gg4sanh0vi624gys9wdncmvc92kly4zlwl6a9jhi3sr7w3s"; + rev = "89fc16d50b889a17521084347b28f3011b84e113"; + sha256 = "08wdci57vig88iy5kk57k5qjkzphbbzy8g7b87hxakfgdmcwpg3g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -1850,26 +1831,6 @@ license = lib.licenses.free; }; }) {}; - anchored-transpose = callPackage ({ fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "anchored-transpose"; - version = "20080904.2254"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/anchored-transpose.el?revision=8"; - sha256 = "1hklypbp79pgaf1yklbm3qx4skm3xlml0cm1r9b9js3dbqyha651"; - name = "anchored-transpose.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/993271c9931170c3352daa3c1c0a8bcfa6915d9a/recipes/anchored-transpose"; - sha256 = "19dgj1605qxc2znvzj0cj6x29zyrh00qnzk2rlwpn9hvzypg9v7w"; - name = "anchored-transpose"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/anchored-transpose"; - license = lib.licenses.free; - }; - }) {}; android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "android-mode"; @@ -2041,12 +2002,12 @@ ansible = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ansible"; - version = "20161218.1707"; + version = "20170926.1951"; src = fetchFromGitHub { owner = "k1LoW"; repo = "emacs-ansible"; - rev = "a712d9b48809c975525cb059ea278cbe8a839f5a"; - sha256 = "1jfksnk5fvr4h8mqb0mr2czyxnjmcdlrqdylvj0k0ks6xnskza91"; + rev = "9da54a2a426dca259ec9c2a8a60fb58e954be5bc"; + sha256 = "16z286gqy18s6bff1njkjpy0swrkfyarvb5xvik49pigd8hzh495"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e45bf58b980ff542a5e887707a6361eb5ac0492/recipes/ansible"; @@ -2415,25 +2376,6 @@ license = lib.licenses.free; }; }) {}; - aok = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "aok"; - version = "20130824.427"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/aok.el?revision=13"; - sha256 = "10vdmxzifxx3fkpyg76ngnj79k3d2pq0f322rd8ssc66alxhkz3g"; - name = "aok.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/38eee4f0f7ad25d9b1de9011e63b82400177cdd5/recipes/aok"; - sha256 = "1nkkbfwqp5r44wjwl902gm0xc8p3d2qj5mk1cchilr2rib52zd46"; - name = "aok"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/aok"; - license = lib.licenses.free; - }; - }) {}; aozora-view = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aozora-view"; @@ -2602,26 +2544,6 @@ license = lib.licenses.free; }; }) {}; - apropos-fn-plus-var = callPackage ({ fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "apropos-fn-plus-var"; - version = "20170221.748"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/apropos-fn+var.el"; - sha256 = "0aa8d92ibbi1ix60j73nhvy16l8dkb3njn9d9z256jixmvzab7gr"; - name = "apropos-fn+var.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cd66a7c1a54ede8a279effeee5326be392058d1c/recipes/apropos-fn+var"; - sha256 = "1s5gnsipsj7dhc8ca806grg32i6vlwm78hcxhrbs830vx9k84g5x"; - name = "apropos-fn-plus-var"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/apropos-fn+var"; - license = lib.licenses.free; - }; - }) {}; apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropospriate-theme"; @@ -2643,25 +2565,6 @@ license = lib.licenses.free; }; }) {}; - apu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "apu"; - version = "20170221.750"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/apu.el?revision=27"; - sha256 = "15mq2b0df4hx53hqvgl3hcrbf9ww370byg90cail6rm50wamyik6"; - name = "apu.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ad04078221946c9d6b758809ec03ff88efce7322/recipes/apu"; - sha256 = "0399rmjwcs7fykj10s9m0lm2wb1cr2bzw2bkgm5rp4n3va0rzaa2"; - name = "apu"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/apu"; - license = lib.licenses.free; - }; - }) {}; arch-packer = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "arch-packer"; @@ -2704,6 +2607,27 @@ license = lib.licenses.free; }; }) {}; + archive-rpm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "archive-rpm"; + version = "20171005.1548"; + src = fetchFromGitHub { + owner = "legoscia"; + repo = "archive-rpm"; + rev = "830158cfb3b43c85cfcb4bd5b92d4457d015c80a"; + sha256 = "18vmwffvxxg9clddmrkyv9lkjxiczaig69yyxzghigmzmg8wk557"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e5f5653e62afdc022eac30bda3d21bd2d2625d2e/recipes/archive-rpm"; + sha256 = "0s53zbn71lb008gw3f0b5w4q0pw0vgiqbffgnyib24sh03ijl7z7"; + name = "archive-rpm"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/archive-rpm"; + license = lib.licenses.free; + }; + }) {}; arduino-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "arduino-mode"; @@ -2830,25 +2754,6 @@ license = lib.licenses.free; }; }) {}; - ascii = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "ascii"; - version = "20130824.500"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/ascii.el?revision=10"; - sha256 = "05fjsj5nmc05cmsi0qj914dqdwk8rll1d4dwhn0crw36p2ivql75"; - name = "ascii.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ascii"; - sha256 = "0f90anxrpnb8k1lqmz0iim4yp20riy19palwmdyl840hz69m98cd"; - name = "ascii"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/ascii"; - license = lib.licenses.free; - }; - }) {}; asilea = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "asilea"; @@ -2915,12 +2820,12 @@ async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "async"; - version = "20170823.2116"; + version = "20170916.2256"; src = fetchFromGitHub { owner = "jwiegley"; repo = "emacs-async"; - rev = "5863eefbcd445f0fe917646f1326a9c86f067865"; - sha256 = "16m1ykbjawia3nh6qkmp38yrdg58pc7k3vpfq364gf31qpsq6rwg"; + rev = "87853ae35f19646f83f653b798e9f6d646de7113"; + sha256 = "17q1x9nddjy14nbm3h343s8kv9y8p6kj7yvixa7vbf71396dwsxm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/async"; @@ -3185,25 +3090,6 @@ license = lib.licenses.free; }; }) {}; - auto-capitalize = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "auto-capitalize"; - version = "20160415.1403"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/auto-capitalize.el?revision=19"; - sha256 = "0xywyfpsi64g9lihm5ncmjrj06iq9s6pp9fmsgj1hdf9y0z65lg0"; - name = "auto-capitalize.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d4edbba637a27a641f53f8a51861b176cabaa286/recipes/auto-capitalize"; - sha256 = "18fygc71n9bc0vrpymz2f7sw9hzkpqxzfglh53shmbm1zns3wkw0"; - name = "auto-capitalize"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/auto-capitalize"; - license = lib.licenses.free; - }; - }) {}; auto-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }: melpaBuild { pname = "auto-compile"; @@ -3501,12 +3387,12 @@ auto-dim-other-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-dim-other-buffers"; - version = "20170911.307"; + version = "20170925.1208"; src = fetchFromGitHub { owner = "mina86"; repo = "auto-dim-other-buffers.el"; - rev = "90f6a6f0fba8dac1cfd5e4140638eceebc88bfab"; - sha256 = "1z1d7gzfv573rw1kr3bb6viybj63zbfwad15gvgha9fld2jhmakz"; + rev = "d1ee176652d7f5a77608e54175b7e67c31d41381"; + sha256 = "1qqb051b16z2ay1xqx2ncy2p07cs29dv6wdy1x3n3w85yw9kh0mx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/auto-dim-other-buffers"; @@ -3561,34 +3447,15 @@ license = lib.licenses.free; }; }) {}; - auto-install = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "auto-install"; - version = "20150418.1702"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/auto-install.el?revision=82"; - sha256 = "043pb2wk7jh0jgxphdl4848rjyabna26gj0vlhpiyd8zc361pg9d"; - name = "auto-install.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad02a591b981518abd147475195f9484e4012fc/recipes/auto-install"; - sha256 = "1gaxc2ya4r903k0jf3319wg7wg5kzq7k8rfy8ac9b0wfzv247ixk"; - name = "auto-install"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/auto-install"; - license = lib.licenses.free; - }; - }) {}; auto-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-minor-mode"; - version = "20170716.717"; + version = "20170917.1437"; src = fetchFromGitHub { owner = "joewreschnig"; repo = "auto-minor-mode"; - rev = "06fa6975a9fb171b91a8b8234d65ef72374d64e2"; - sha256 = "19r71hdgz367f6cgyqfdpilwlmhrjw5drmijpq8m0fxgysnmz2qd"; + rev = "07ea9df59c5364d1938beef3dfbba24afd46c230"; + sha256 = "007w6j6zhjv2647njh80vfbrhjzhmb8rx9yi9rf94fhf17z8pmk3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3ab5f048034777551e344101d8415cac92362c8/recipes/auto-minor-mode"; @@ -3751,12 +3618,12 @@ auto-virtualenvwrapper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s, virtualenvwrapper }: melpaBuild { pname = "auto-virtualenvwrapper"; - version = "20170618.52"; + version = "20170916.1304"; src = fetchFromGitHub { owner = "robert-zaremba"; repo = "auto-virtualenvwrapper.el"; - rev = "516cb0406a98fd5a41d389f37544f11b28b1d027"; - sha256 = "0y82n8354nri2qpz7bn58rbhpjkqiaf82q9izhl6jy12g63g416l"; + rev = "0f2cc8ea8f211c7b88f852ae6ffe677914652b92"; + sha256 = "1vm2nf7i9v56v57r7ckz8i1y3fk5s302bcfglywqysm4b8k36mp8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02a209ae8f9fc68feb3bb64d32d129fedef2b80b/recipes/auto-virtualenvwrapper"; @@ -3853,26 +3720,6 @@ license = lib.licenses.free; }; }) {}; - autofit-frame = callPackage ({ fetchurl, fit-frame, lib, melpaBuild }: - melpaBuild { - pname = "autofit-frame"; - version = "20170221.752"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/autofit-frame.el?revision=48"; - sha256 = "0c2b0d743w1c58iicg9r194zq2l5xxa08zyxj0nljw2dz9lhacwm"; - name = "autofit-frame.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/autofit-frame"; - sha256 = "0p24qqnfa1vfn5pgnpvbxwi11zjkd6f3cv5igwg6h0pr5s7spnvw"; - name = "autofit-frame"; - }; - packageRequires = [ fit-frame ]; - meta = { - homepage = "https://melpa.org/#/autofit-frame"; - license = lib.licenses.free; - }; - }) {}; automargin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "automargin"; @@ -4020,6 +3867,27 @@ license = lib.licenses.free; }; }) {}; + avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "avk-emacs-themes"; + version = "20171001.235"; + src = fetchFromGitHub { + owner = "avkoval"; + repo = "avk-emacs-themes"; + rev = "bf781eec7d46cce829ac5bdb114e728a110366e7"; + sha256 = "0bj51ii8vsd2gwyykxp1hvkp4r9kbc0b7ajskf8i5vb8qvpvkali"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/recipes/avk-emacs-themes"; + sha256 = "0yimnfm50qsq505fc67b3qnxx2aiyz5a7bw87zkjrdnar12vv144"; + name = "avk-emacs-themes"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/avk-emacs-themes"; + license = lib.licenses.free; + }; + }) {}; avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; @@ -4086,12 +3954,12 @@ avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: melpaBuild { pname = "avy-migemo"; - version = "20170907.955"; + version = "20171004.925"; src = fetchFromGitHub { owner = "momomo5717"; repo = "avy-migemo"; - rev = "0074b70fda731169888571013b4b618a6f0914e7"; - sha256 = "153xv2k0v86k8c2w7cm68d6vs3xbrbhc660ka1dywprr7q1l3jrk"; + rev = "dfb7d8eb4cb1e037e5a460b514b907306f8b845b"; + sha256 = "157jbkzh0g7mmx94mj36lx137gzhzb9sqxjnjaissqn571p9ykay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo"; @@ -4125,25 +3993,6 @@ license = lib.licenses.free; }; }) {}; - awk-it = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "awk-it"; - version = "20130917.1148"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/awk-it.el?revision=10"; - sha256 = "1r1vbi1r3rdbkyb2naciqwja7hxigjhqfxsfcinnygabsi7fw9aw"; - name = "awk-it.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/awk-it"; - sha256 = "0qic9m7c31sq4xgx7hnkhj0j0mfy26smghg266lrp5jii833qlz3"; - name = "awk-it"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/awk-it"; - license = lib.licenses.free; - }; - }) {}; aws-ec2 = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tblui }: melpaBuild { pname = "aws-ec2"; @@ -4255,25 +4104,6 @@ license = lib.licenses.free; }; }) {}; - backup-each-save = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "backup-each-save"; - version = "20130704.732"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/backup-each-save.el?revision=2"; - sha256 = "0b9vvi2m0fdv36wj8mvawl951gjmg3pypg08a8n6rzn3rwg0fwz7"; - name = "backup-each-save.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/88fd979eb479701303e65e68c581f8f847887842/recipes/backup-each-save"; - sha256 = "1fv9sf6vkjyv93vil4l9hjm2fg73zlxbnif0xfm3kpmva9xin337"; - name = "backup-each-save"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/backup-each-save"; - license = lib.licenses.free; - }; - }) {}; backup-walker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "backup-walker"; @@ -4358,27 +4188,6 @@ license = lib.licenses.free; }; }) {}; - baidu-life = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "baidu-life"; - version = "20160426.519"; - src = fetchFromGitHub { - owner = "lujun9972"; - repo = "el-baidu-life"; - rev = "5c4b3dbc016a2656cc2febaa2ac2268c05725b5c"; - sha256 = "024gpdjr1lbqjg6md526g4wz2shpgfpdrrd2m1bn4fissbzj70i1"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/101ae6ea151df8d423f00cb6ac391374d0f7f3c8/recipes/baidu-life"; - sha256 = "0rib50hja33qk8dmw5i62gaxhx7mscj2y0n25jmnds7k88ms8z19"; - name = "baidu-life"; - }; - packageRequires = [ cl-lib ]; - meta = { - homepage = "https://melpa.org/#/baidu-life"; - license = lib.licenses.free; - }; - }) {}; bar-cursor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bar-cursor"; @@ -4403,12 +4212,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20170824.1656"; + version = "20171005.1058"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "bb4f204f51439fcf8ae45429d150861523d1f1d0"; - sha256 = "1vkv5kqs9crbk2j4jynyrx2fzijhimnhm2fvgwcxsb6hx3g257id"; + rev = "e7e646b79b5e3cebdf34f0ed775bceb8a5f3645a"; + sha256 = "1lgg54cxl1zhv1gh7y5z99dwfb15w64gn05g8iwha2f37kmk22r4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4424,12 +4233,12 @@ bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bash-completion"; - version = "20170909.650"; + version = "20170924.1021"; src = fetchFromGitHub { owner = "szermatt"; repo = "emacs-bash-completion"; - rev = "a789093cd32b2007cb64943de30aca51d5b3106b"; - sha256 = "1fqkslxjdfqcwq1dj4fhw80naq58gpz3d50xar4wrxn76z7vkbcz"; + rev = "31bc1c1c21691668c6cc16a46361490d5bec303a"; + sha256 = "0iq9q0isaynrjhzgkm5hvw26162m52vbzwf12vic5nr9frxbxkv5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/bash-completion"; @@ -4449,8 +4258,8 @@ src = fetchFromGitHub { owner = "nick96"; repo = "basic-c-compile"; - rev = "335e96e19647ad7245fb68cf7e68cf86c5023d23"; - sha256 = "1sq6mmg5361z30psn6x2ylpr8yxsbg3d47qai9px7p889p63384l"; + rev = "0129786aeee50d7bb0020d9fc2b7508875d403e8"; + sha256 = "0q6scyva1psyam7jzygqcr1wayf70vrp237hm01q5i9cin8j4j1z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/basic-c-compile"; @@ -4463,6 +4272,27 @@ license = lib.licenses.free; }; }) {}; + basic-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "basic-mode"; + version = "20171004.1218"; + src = fetchFromGitHub { + owner = "dykstrom"; + repo = "basic-mode"; + rev = "d5f480fce6b25de4857e0f04c419cab5268185e3"; + sha256 = "1kkqqi5ipbf5pyqdx1kzwxkn6gzgsmayg0dbyjzkdgc8zqihw4w3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/71801bdc0720f150edeab6796487c753c6e7c3f5/recipes/basic-mode"; + sha256 = "1l0ylzww7jg6l804fdrklhay4is0wx1drfi9l9wn7gcdjh76mr6g"; + name = "basic-mode"; + }; + packageRequires = [ emacs seq ]; + meta = { + homepage = "https://melpa.org/#/basic-mode"; + license = lib.licenses.free; + }; + }) {}; basic-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "basic-theme"; @@ -4484,25 +4314,6 @@ license = lib.licenses.free; }; }) {}; - batch-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "batch-mode"; - version = "20140807.1350"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/batch-mode.el?revision=14"; - sha256 = "1aa611jrzw4svmxvw1ghgh53x4nry0sl7mxmp4kxiaybqqvz6a1p"; - name = "batch-mode.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7fb675b865b8fa1497cdd33764bad051b2fd4d7e/recipes/batch-mode"; - sha256 = "1p0rh5r8w00jag64sbjy8xb9g6lqhm2fz476v201kbrj9ggp643x"; - name = "batch-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/batch-mode"; - license = lib.licenses.free; - }; - }) {}; bats-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bats-mode"; @@ -4672,12 +4483,12 @@ bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbyac"; - version = "20170815.28"; + version = "20171007.722"; src = fetchFromGitHub { owner = "baohaojun"; repo = "bbyac"; - rev = "e748e07bd77ef93f3c3110b5cde4e68f50b04efb"; - sha256 = "1030gs02hb6kjd4w5iw0li8k7lcpklya37ybl62mkqhrzfri61bh"; + rev = "584af0efa4809252bb37cf165df029410198327e"; + sha256 = "17cmlc49y26j2salkmcsck9618s1p7y49phiy7hvzkipa13qmj9w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92c10c13a1bd19c8bdbca128852d1c91b76f7002/recipes/bbyac"; @@ -4756,12 +4567,12 @@ beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "beginend"; - version = "20170810.624"; + version = "20171003.548"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "beginend"; - rev = "bc608ef0735e5b7e34b320b899fd2b3ce2156d1b"; - sha256 = "1vb9505lkzkl9ipczs3q0vmf70mzf9l1wk703g9b5aiss81r5w4i"; + rev = "2762796b54c7fd8613b02c041b2b9afeb13eb9fa"; + sha256 = "1g1mml0npypfk0vhicy4s7fa5df76xqpb80llxcfbnl2si9fzyfb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c1157d4fd9e47a780bbd91075252acdc7899dd/recipes/beginend"; @@ -4837,25 +4648,6 @@ license = lib.licenses.free; }; }) {}; - better-registers = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "better-registers"; - version = "20140813.119"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/better-registers.el?revision=23"; - sha256 = "05dlhhvd1m9q642gqqj6klif13shbinqi6bi72fldidi1z6wcqlh"; - name = "better-registers.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2667829dfc72e848ab939be0602cbec1105671b0/recipes/better-registers"; - sha256 = "01i0qjrwsc5way2h9z3pmsgccsbdifsq1dh6zhka4h6qfgrmn3bx"; - name = "better-registers"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/better-registers"; - license = lib.licenses.free; - }; - }) {}; better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "better-shell"; @@ -5027,12 +4819,12 @@ bifocal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bifocal"; - version = "20170906.1948"; + version = "20171004.1124"; src = fetchFromGitHub { owner = "riscy"; repo = "bifocal-mode"; - rev = "5e89ad1a9a47e890ce080a79fd32c71eb128d1c4"; - sha256 = "1rwxw1wniws31gbmpxgglxbc2g4jag19dvsjrym0f43yy4w2mbpw"; + rev = "a8b222b069a6bd64531b4780905989797bad8abe"; + sha256 = "0c6vzh35lj3pg9wd4v2fy6xdmcg9kq3n5br6rp4lx257gxglzpwh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal"; @@ -5094,8 +4886,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "360df30683a711c443f87e495ba14cdd125a505d"; - sha256 = "0nz0gk6gf9060hbyqr5vgzwr620k6l5sk9n6jbhfyrwmcscnmilc"; + rev = "16abb66246170fe06325ff32a4889e4b51bfd979"; + sha256 = "1fav32ax7qykclvrimlf00pyp534yfngizm697mbr9346va1zqm6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5297,25 +5089,6 @@ license = lib.licenses.free; }; }) {}; - blank-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "blank-mode"; - version = "20130824.459"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/blank-mode.el?revision=40"; - sha256 = "1wdplnmdllbydwr9gyyq4fbkxl5xjh7220vd4iajyv74pg2jkkkv"; - name = "blank-mode.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7e687f3d3945bdff0e8e36bcff1f629d8ad921fc/recipes/blank-mode"; - sha256 = "1pyx5xwflnni9my5aqpgf8xz4q4rvmj67pwb4zxx1lghrca97z87"; - name = "blank-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/blank-mode"; - license = lib.licenses.free; - }; - }) {}; blgrep = callPackage ({ clmemo, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "blgrep"; @@ -5403,12 +5176,12 @@ blog-admin = callPackage ({ cl-lib ? null, ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }: melpaBuild { pname = "blog-admin"; - version = "20170430.721"; + version = "20170923.709"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "blog-admin"; - rev = "98e397c4014f7c81c42722028778726cbf9baf8c"; - sha256 = "0fj0yri8hayqb6fwgj5i6bw7yx4jsdq7jh9aqd5zdpmyfc6lshzr"; + rev = "b5f2e1dad7d68ec903619f7280bb0bcb7e398a1e"; + sha256 = "0fgzmmjxhl8i9yqx1bvb7hgkk9w4ylx73xy990qf1bl7fg21v636"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/blog-admin"; @@ -5529,12 +5302,12 @@ bonjourmadame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bonjourmadame"; - version = "20160112.156"; + version = "20170919.434"; src = fetchFromGitHub { owner = "pierre-lecocq"; repo = "bonjourmadame"; - rev = "4b4baaec19d8893268a2c93b3c35ac2581d02ba4"; - sha256 = "06cpbjbv8ysz81szwgglgy5r1aay8rrzw5k86wyqg9jdzwpmilpn"; + rev = "d3df185fce78aefa689fded8e56a654f0fde4ac0"; + sha256 = "1acn63hd7s2z8viy52hmhncdic7m86rcqczxnz9aivikqy4hfnsi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34c4cfd7bbf5b442a9304598ba0a23ba9b8dfae4/recipes/bonjourmadame"; @@ -5568,25 +5341,6 @@ license = lib.licenses.free; }; }) {}; - bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "bookmark-plus"; - version = "20170731.1658"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; - sha256 = "0iqvlwqilwpqlymj8iynw2miifl28h1g7z10q08rly2430fnmi37"; - name = "bookmark+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/bookmark+"; - sha256 = "0121xx7dp2pakk9g7sg6par4mkxd9ky746yk4wh2wrhprc9dqzni"; - name = "bookmark-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/bookmark+"; - license = lib.licenses.free; - }; - }) {}; bool-flip = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bool-flip"; @@ -5716,12 +5470,12 @@ bpr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bpr"; - version = "20170823.1636"; + version = "20170930.642"; src = fetchFromGitHub { owner = "ilya-babanov"; repo = "emacs-bpr"; - rev = "392de473664fbf319e3585a15f7f8abd34b3dbb6"; - sha256 = "1ngz76j9mf9a1gvmwdy1r1jqxl8g4d3md95lqxq5dqbwz9076im2"; + rev = "314b0d6f69ff5a9c2d25a1ce5a2109d67d4d9bb3"; + sha256 = "02qj8gnhxv39y8kvlw491cbiaknll3hg03pk4xx15rffl7dyrbds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/bpr"; @@ -5839,26 +5593,6 @@ license = lib.licenses.free; }; }) {}; - browse-kill-ring-plus = callPackage ({ browse-kill-ring, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "browse-kill-ring-plus"; - version = "20170221.757"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/browse-kill-ring+.el"; - sha256 = "01cnh9i09b7i97aqjh8m7s18js85wm7cs25dxlkcrhy112pjb1nq"; - name = "browse-kill-ring+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e700f4066e67991dd67f6476c783e0a5134723db/recipes/browse-kill-ring+"; - sha256 = "1flw7vmqgsjjvr2zlgz2909gvpq9mhz8qkg6hvsrzwg95f4l548w"; - name = "browse-kill-ring-plus"; - }; - packageRequires = [ browse-kill-ring ]; - meta = { - homepage = "https://melpa.org/#/browse-kill-ring+"; - license = lib.licenses.free; - }; - }) {}; browse-url-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }: melpaBuild { pname = "browse-url-dwim"; @@ -5880,25 +5614,6 @@ license = lib.licenses.free; }; }) {}; - bs-ext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "bs-ext"; - version = "20130824.459"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/bs-ext.el?revision=8"; - sha256 = "1yslzlx54n17330sf6b2pynz01y6ifnkhipz4hggn1i55bz8hvrw"; - name = "bs-ext.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/74c4861e76bb806ec4c4fd3482162bf0d95530a8/recipes/bs-ext"; - sha256 = "0dddligqr71qdakgfkx0r45k9py85qlym7y5f204bxppyw5jmwb6"; - name = "bs-ext"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/bs-ext"; - license = lib.licenses.free; - }; - }) {}; bshell = callPackage ({ buffer-manage, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bshell"; @@ -6049,12 +5764,12 @@ buffer-manage = callPackage ({ choice-program, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-manage"; - version = "20170912.1621"; + version = "20170916.957"; src = fetchFromGitHub { owner = "plandes"; repo = "buffer-manage"; - rev = "7a37c2ffa3d8ff446fe9cb5adc693095696b8341"; - sha256 = "0shxy0apdmyajlhssxkgpzcch02c1ffbpgajddbr68m8npilq6p5"; + rev = "4a0d526ca45264971796efe67c6e41d8aa659e4c"; + sha256 = "15p089qfz8ra6f2lhny492hiricgs39w7w5iak2zlqm6k88cl1j8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage"; @@ -6108,25 +5823,6 @@ license = lib.licenses.free; }; }) {}; - buffer-stack = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "buffer-stack"; - version = "20101223.220"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/buffer-stack.el?revision=2"; - sha256 = "0d87cl7a4rcd6plbjyf26vaar7imwd18z24xdi4dz734m9zbkg6r"; - name = "buffer-stack.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/buffer-stack"; - sha256 = "0lnd5mh20b4isa6m930dzibw3v4jyzp1ryvmz8irca28xfn0hjln"; - name = "buffer-stack"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/buffer-stack"; - license = lib.licenses.free; - }; - }) {}; buffer-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-utils"; @@ -6403,12 +6099,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "20170901.422"; + version = "20170929.512"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "11d7fdce9f46eec62ed86f4f9617e04d2c204b3a"; - sha256 = "0vaq5dgajilysn720sgd294rhzvxbr7q2nyf71m74gf42pxf791d"; + rev = "c1187b34c11cdf4030c57427261f3af4d6374b15"; + sha256 = "0sk9s29521kh4qhi4px917vql6ba07ijvp7vrc0dzr1gdpm0b3w2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -6466,12 +6162,12 @@ c-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "c-eldoc"; - version = "20170618.845"; + version = "20170917.1502"; src = fetchFromGitHub { owner = "nflath"; repo = "c-eldoc"; - rev = "0899f497e98e285d7d2e9cf897e305587b4b0790"; - sha256 = "0yw59pm25a5xrcdl6mv30i08wnhljy6gndvnlpi09vp2dln37kbq"; + rev = "79d09769362228058246f5e6fa183d121f7fb322"; + sha256 = "1398lfd18zn2xym36p71yavgggqbb15xz9m7gah4w4k2bk15aczk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/c-eldoc"; @@ -6841,17 +6537,19 @@ license = lib.licenses.free; }; }) {}; - caml = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { + caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "caml"; - version = "20151009.845"; - src = fetchsvn { - url = "https://caml.inria.fr/svn/ocaml/trunk/emacs/"; - rev = "16561"; - sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw"; + version = "20170930.722"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = "ocaml"; + rev = "8eef73ea8d0a4994cb1c7210b83ba58e00d80144"; + sha256 = "03c5cc0xh1azqqj7119g5yiy7w1jr3qddinqc30m7db1jrjsg3nq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/caml"; - sha256 = "1s05s3dqxlz2qhvjr3j9akb56finpmpbnsjb5pmjnzflhc4y01cf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; + sha256 = "1ixs0626nsg1ilqdwj5rd8kicjy7mprswwy0kprppmpmc8y7xf7c"; name = "caml"; }; packageRequires = []; @@ -6947,12 +6645,12 @@ cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: melpaBuild { pname = "cask"; - version = "20161024.1205"; + version = "20170917.1107"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "07d8c963a4d349d856c51a471c60689734ebeda0"; - sha256 = "15fyfzd0ssjyq8n77s8h8n0by33j5q0m4hs0v5k7m8zb3ca0w7mc"; + rev = "bf52c3ecb1356657cae12fe3229c0827181c1ed9"; + sha256 = "0g4vnvbfvr9c2rjf0fbbvzw1ipvwgsp11sn0rjrpx5cwszghvy0w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -6989,12 +6687,12 @@ cask-package-toolset = callPackage ({ ansi, cl-lib ? null, commander, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "cask-package-toolset"; - version = "20170411.1430"; + version = "20170921.1556"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "cask-package-toolset.el"; - rev = "aed1f12b6072a2467e0efa23c3265aaa9f414425"; - sha256 = "1as3fxs1h4gq6mv7gdsjqa59prrgzzs22c9qky8q47dr20sc9q6s"; + rev = "2c74cd827e88c7f8360581a841e45f0b794510e7"; + sha256 = "1hk5q6p1j7cqg5srr3v21xfyy7aas4hfj1a66h21c2xvfjra3hxw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed71e45389626e700b93b29d5e2659b6706274d8/recipes/cask-package-toolset"; @@ -7216,26 +6914,6 @@ license = lib.licenses.free; }; }) {}; - centered-cursor-mode = callPackage ({ fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "centered-cursor-mode"; - version = "20151001.634"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/centered-cursor-mode.el?revision=30"; - sha256 = "15psyizjz8wf9wfxwwcdmg1bxf8jbv0qy40rskz7si7vxin8hhxl"; - name = "centered-cursor-mode.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/centered-cursor-mode"; - sha256 = "1sq0hfvnm8sbqyxzr0znq0lwrhbqm961wi13yywjcwxd3x0ar3z0"; - name = "centered-cursor-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/centered-cursor-mode"; - license = lib.licenses.free; - }; - }) {}; centered-window-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "centered-window-mode"; @@ -7327,8 +7005,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "83fd2b5014d2eb5d685941bed1ee64bf750e4f94"; - sha256 = "1ffdscvp624gh8vgb01nsdbafynw7b2r83mr1nqf356jpn43ah7a"; + rev = "4097e6453093b7aa8cb96e47d23847cc65b3fbe0"; + sha256 = "01irq5g2n55s5arj7b3clnq50ym38qwghg20mdwhij1zljp42zb1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -7386,12 +7064,12 @@ cframe = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cframe"; - version = "20170828.919"; + version = "20170917.1509"; src = fetchFromGitHub { owner = "plandes"; repo = "cframe"; - rev = "8b60c482a5888464caf6d05b2a0079340bdd7be8"; - sha256 = "0skms8cwniddpns1fmpqjnhyrn1fjvv6zknzjfganpv0h10gypgk"; + rev = "bb99672502046e87c8f029ce98c637f762a4fc54"; + sha256 = "088px3wlvr4km913y7hajrjqnxnv6n325rk6353bkbah2d75vxq4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/cframe"; @@ -7425,17 +7103,19 @@ license = lib.licenses.free; }; }) {}; - cg = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { + cg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "cg"; version = "20170911.610"; - src = fetchsvn { - url = "https://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "12362"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "cg"; + rev = "f5d74973d2cf19fd31db485ee6bfaaebcf96af2d"; sha256 = "0bmydpv3slv5fvy1admgsm1qlkfp4sdsd0caik48dn7bnghifggz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/cg"; - sha256 = "0xj4yqjg0r9m9cvwgs60lsid6qm1fi8lmb068dj6xaga11n70si5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/cg"; + sha256 = "0yl2w48953vym4gxcxvjfaq3jgsv5jlya9vq3iwlfxqpapd3r3k9"; name = "cg"; }; packageRequires = []; @@ -7447,12 +7127,12 @@ challenger-deep-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "challenger-deep-theme"; - version = "20170623.311"; + version = "20171007.300"; src = fetchFromGitHub { owner = "MaxSt"; repo = "challenger-deep"; - rev = "22022667437e94c2309c7c77a14268970de16146"; - sha256 = "1prvdrc8wjb7dy8dqj5gvjzzdiz6hqv252inlwcyjrqiq4apipxz"; + rev = "b4cd8550dd6a26c4efd226156dff33e261e7a8cc"; + sha256 = "1m0ackx5wvwff0qpy9204rmpq7yr6hd3bfkwahjy6kwfrjavkfbv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7942f539d025c1e2b059d49e1984716cbbc90a67/recipes/challenger-deep-theme"; @@ -7843,34 +7523,15 @@ license = lib.licenses.free; }; }) {}; - chm-view = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "chm-view"; - version = "20110616.1019"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/chm-view.el?revision=5"; - sha256 = "1r274pf0xrcdml4sy2nhhp3v5pr3y3s4lvk45hd3pmw1i4pw2fd8"; - name = "chm-view.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8688cd57fca1974403c0e36d6289845059adac5c/recipes/chm-view"; - sha256 = "1acz0fvl3inn7g4himq680yf64bgm7n61hsv2zpm1k6smrdl78nz"; - name = "chm-view"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/chm-view"; - license = lib.licenses.free; - }; - }) {}; choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "choice-program"; - version = "20170828.616"; + version = "20171004.931"; src = fetchFromGitHub { owner = "plandes"; repo = "choice-program"; - rev = "5a803216d1d7a7ac6fd0f89f04ba4c126182a852"; - sha256 = "0iah71kcrzi22mi1jvyyaiflsx0ry24hqb0wd2w0nbgzc8s5ycqb"; + rev = "27607ec1fe241c58fbc1f861454a8e2ec1fd7b15"; + sha256 = "0q8krgsydrc2xc29y60qljifdvxfmxnvbncxsh64xhrzsnrgwmq5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/choice-program"; @@ -7928,12 +7589,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20170913.434"; + version = "20171001.112"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "8a9eab32646abcaaf31fe83b2d897c01971b98f1"; - sha256 = "0ddkm87l9ann05a6j57r0x59qqgfavwrvlzhkc5xhak1nmk5556h"; + rev = "c60d1ae5802ec1dba90f5e4b51579488bbda55c6"; + sha256 = "15r4lbb2wraadi27300gw9yarfpgwnclhjfvgr8vgiy1pqg1y5bi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -8114,15 +7775,36 @@ license = lib.licenses.free; }; }) {}; + circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "circadian"; + version = "20170924.1440"; + src = fetchFromGitHub { + owner = "GuidoSchmidt"; + repo = "circadian.el"; + rev = "6412eca0dfd5030ccd18f949066f1352ed89b44d"; + sha256 = "0y62c3cfsz439x7pp7s4zzfhavyasv07y4gkn37383p38k56xqdf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian"; + sha256 = "13797y1w1636bibisz5i5p2xp0smd3apnhc1nx8ijm75smx679id"; + name = "circadian"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/circadian"; + license = lib.licenses.free; + }; + }) {}; circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "20170728.638"; + version = "20170929.1635"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "452dfb407b640ba6eb288ff25a9de27446a409c4"; - sha256 = "1yqnpvk5ib754bkb8gcd8skf0d3rqxkqwcsbibr052ilrp5ampcl"; + rev = "6b110d4c2c6447c4ed65cfa5b7e8676620081ee2"; + sha256 = "01llr34y9mvgpbz3y10l7gmp40qvislwhm6jb2fvcb7vdn9k9gmz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -8138,12 +7820,12 @@ circe-notifications = callPackage ({ alert, circe, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe-notifications"; - version = "20160902.42"; + version = "20171001.2258"; src = fetchFromGitHub { owner = "eqyiel"; repo = "circe-notifications"; - rev = "80c44441ecd3ae04ae63760aa20afa837c1ed05b"; - sha256 = "0s0iw5vclciziga78f1lvj6sdg84a132in39k4vz0pj598ypin1w"; + rev = "4b93112b715714fc7b0ac2637df93adb90f35b40"; + sha256 = "1hfic3qrlskcf0zmd3w76sl1qgrd6myf6mwg06mnc9jy76backqk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76c0408423c4e0728789de7b356b2971d6c446c7/recipes/circe-notifications"; @@ -8198,18 +7880,19 @@ license = lib.licenses.free; }; }) {}; - clang-format = callPackage ({ cl-lib ? null, fetchsvn, fetchurl, lib, melpaBuild }: + clang-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clang-format"; version = "20170120.137"; - src = fetchsvn { - url = "https://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "313143"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "clang-format"; + rev = "1fc9ffb08a71d8747c26037a133fbd811673adc0"; sha256 = "0zldh5nk5i3y41q70kwlhf576xmv0baim3q4jam01d41p4p040mq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/clang-format"; - sha256 = "1s7xbq1xczzz24gi6wlv9ihzs7cbsn3g16rrhdpxwaadagbasgk7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/clang-format"; + sha256 = "1w2w8hhyxp73s1ziyd0n7f1yi0x46v93630xxpjnf9bgr1psfk5f"; name = "clang-format"; }; packageRequires = [ cl-lib ]; @@ -8225,8 +7908,8 @@ src = fetchFromGitHub { owner = "pmarinov"; repo = "clean-aindent-mode"; - rev = "9ae15997cd75c5625a4f759a3aff39bf202fc36f"; - sha256 = "1h6k6kzim1zb87y1kzpqjzk3ip9bmfxyg54kdh2sfp4xy0g5h3p0"; + rev = "78d917761b7f47f41dd1452e5a6fd783115913c9"; + sha256 = "01jh561gpicw3wf8nvmw0ggc08gjg8zfzvqhjidpjn6sk4za9fhb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee9dac7c10e652f026643620418dfea9237a0d23/recipes/clean-aindent-mode"; @@ -8590,12 +8273,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20170819.2159"; + version = "20171008.743"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "a6f0592e9cabeb4e039e654bd30890a20208950e"; - sha256 = "0sr34679371b89qz93z88b6l0ii4lfh8lm91clpl6in4lp4daj93"; + rev = "35f5d71b196b1a4b147a56a82b723d0383cb7282"; + sha256 = "11im686bjh97vm67325zkm7q8mzd575s0rl7r8kd0kz837gywbh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8615,8 +8298,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "a6f0592e9cabeb4e039e654bd30890a20208950e"; - sha256 = "0sr34679371b89qz93z88b6l0ii4lfh8lm91clpl6in4lp4daj93"; + rev = "35f5d71b196b1a4b147a56a82b723d0383cb7282"; + sha256 = "11im686bjh97vm67325zkm7q8mzd575s0rl7r8kd0kz837gywbh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8695,12 +8378,12 @@ closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closql"; - version = "20170629.921"; + version = "20170919.455"; src = fetchFromGitHub { owner = "emacscollective"; repo = "closql"; - rev = "73e68bcfbe076e152beed1b8e5f894ca438f9770"; - sha256 = "0vj18784x6cdl39sbfpsksmxln5yj31ah250q5n7ivh54vk2hvjl"; + rev = "66597831248bbe14ebc7bbf24b24cafebb5fd362"; + sha256 = "0jxf7k95l2j6rjyafq3zj6bxaa2xn4zmi4zg1n04sachcdrcgh3l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; @@ -8821,12 +8504,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, s, seq }: melpaBuild { pname = "cmake-ide"; - version = "20170818.907"; + version = "20170922.231"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "6489aabba8d124445ba72f55db9ef3bb2212b1b0"; - sha256 = "0wh0z28nfb5kpm3jlkkgkxbhzyc8akyc6hs1fm8i7bxrslrj6ll0"; + rev = "37950c45f6a61383c70286bbecea305e6f1daf51"; + sha256 = "1si544nsjzwbikv3m17x2k4l0cnjrshpld28fzfhjv336p9jw25q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8846,8 +8529,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "a763cffd6b65bbe5572527e39969981bf31d5aca"; - sha256 = "1jrvsqcb123z1r84c074qz1z6ljz6psc7ysabzsxkrkcs3f66v58"; + rev = "cb8f26f199e18be231f40f523bfe64375e749e35"; + sha256 = "13zywybi3r9pzwlqvailgafqc68v62adkrkca1lm7mjrr33jdsfn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8902,25 +8585,6 @@ license = lib.licenses.free; }; }) {}; - cmds-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "cmds-menu"; - version = "20170221.1557"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/cmds-menu.el?revision=10"; - sha256 = "0ladkkydypf08mn3j749fv46blpzyvh45kx52qdzhwxjiz7nlmfs"; - name = "cmds-menu.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/de6366e4b3e72a5e68b960d6bf4bab2683ad6800/recipes/cmds-menu"; - sha256 = "12s75y9d75cxqgg3hj0s4w0d10zy8y230b5gy09685ab5lcajfks"; - name = "cmds-menu"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/cmds-menu"; - license = lib.licenses.free; - }; - }) {}; cmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmm-mode"; @@ -8942,27 +8606,6 @@ license = lib.licenses.free; }; }) {}; - cn-outline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "cn-outline"; - version = "20100321.914"; - src = fetchFromGitHub { - owner = "mori-dev"; - repo = "cn-outline"; - rev = "47d33a99b7ae26b1cd456441970b4bab2173d981"; - sha256 = "1635k51ppivq6v2702fihq8dvi33445smds9zhqm0drnpv9rv5cr"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bf843cbcfc5806d9089000f08c72433dc8c12e17/recipes/cn-outline"; - sha256 = "0cw1rr56hdngvhmx59j76hvkfzgybasn0fwhd6vwm709jqiiiwiz"; - name = "cn-outline"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/cn-outline"; - license = lib.licenses.free; - }; - }) {}; cnfonts = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cnfonts"; @@ -9152,26 +8795,6 @@ license = lib.licenses.free; }; }) {}; - col-highlight = callPackage ({ fetchurl, lib, melpaBuild, vline }: - melpaBuild { - pname = "col-highlight"; - version = "20170510.1541"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/col-highlight.el?revision=31"; - sha256 = "0wi4xz8n5ib65spyrgqsp8l6zafnvxdiw3hy918fs0xjj7ziy6qc"; - name = "col-highlight.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2a16dca0068d9d4f25ad6b699ec8cb8da6ba17e5/recipes/col-highlight"; - sha256 = "1kycjdlrg7a5x37b0pzqhg56yn7kaisryrk303qx1084kwq9464i"; - name = "col-highlight"; - }; - packageRequires = [ vline ]; - meta = { - homepage = "https://melpa.org/#/col-highlight"; - license = lib.licenses.free; - }; - }) {}; colemak-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "colemak-evil"; @@ -9256,18 +8879,19 @@ license = lib.licenses.free; }; }) {}; - color-theme = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild }: + color-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme"; - version = "20080305.34"; - src = fetchbzr { - url = "https://bzr.savannah.gnu.org/r/color-theme/trunk"; - rev = "57"; + version = "20070910.1007"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "color-theme"; + rev = "eeb07560b30aaf7934dfd21f5c2518a479905cd9"; sha256 = "17bidzq9kiz250gal1fn9mg8gf8l749nz69z0awpc4x2222wxxiz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/color-theme"; - sha256 = "1ds098v50p4g6ji0zy7m5nyj2kadm3l3v0pnb01wkjjx6anh3qsy"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/color-theme"; + sha256 = "1c1n0m4hhj2sxi08vjvayypf9g5i2hyng53ry950yfdqgzq7nk8i"; name = "color-theme"; }; packageRequires = []; @@ -9363,12 +8987,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20170908.216"; + version = "20171003.235"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "6c9b01bb5268f00d0e65fb8351a7ad87abbfb127"; - sha256 = "1gr1iab6dyyx47v2fbx7g1lf8x1hm9vppra9ypf8957fxzi99l2n"; + rev = "c5855d0906c672150dc2b00486dda633823d9477"; + sha256 = "1p2qjgwxj969hffawc8h1zikl5zgqj91qii7fv31n2h4sqxxybks"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -9423,6 +9047,27 @@ license = lib.licenses.free; }; }) {}; + colormaps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "colormaps"; + version = "20171008.1524"; + src = fetchFromGitHub { + owner = "lepisma"; + repo = "colormaps.el"; + rev = "19fbb64a6288d505b9cf45c9b5a3eed0bfb135e2"; + sha256 = "0kbhy8bpxqdr1kjczz2vm7chfpjprx2frpbh1gh9i1gwwx5k4myp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f4c795d9e323b08bc8354a6933a061644705a2ec/recipes/colormaps"; + sha256 = "16plhgpfz1wb58p6h8wxjhplhgv0mbj3f2xj34p6vydh44l8w8q2"; + name = "colormaps"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/colormaps"; + license = lib.licenses.free; + }; + }) {}; column-enforce-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "column-enforce-mode"; @@ -9444,25 +9089,6 @@ license = lib.licenses.free; }; }) {}; - column-marker = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "column-marker"; - version = "20121128.43"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/column-marker.el?revision=13"; - sha256 = "05bv198zhqw5hqq6cr11mhz02dpca74hhp1ycwq369m0yb2naxy9"; - name = "column-marker.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5f629b6b44fae3191f58e007c39b75bbb880d517/recipes/column-marker"; - sha256 = "1xgfsiw46aib2vb9bbjlgnhcgfnlfhdcxd0cl0jqj4fjfxzbz0bq"; - name = "column-marker"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/column-marker"; - license = lib.licenses.free; - }; - }) {}; comint-intercept = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "comint-intercept"; @@ -9568,6 +9194,27 @@ license = lib.licenses.free; }; }) {}; + comment-tags = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "comment-tags"; + version = "20170910.1035"; + src = fetchFromGitHub { + owner = "vincekd"; + repo = "comment-tags"; + rev = "7d914097f0a03484af71e621db533737fc692f58"; + sha256 = "0s86a7078arck9z4gzkp2hnxyklprl0zh5hsw7nkyyscjydly80i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6ac71f4ffc19bce4f571001f9270d5be855dfc3c/recipes/comment-tags"; + sha256 = "13slv150zch0b7zpxa2dbqjzpqh0iy559m6rc0zs0dwdagzryp3i"; + name = "comment-tags"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/comment-tags"; + license = lib.licenses.free; + }; + }) {}; commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "commenter"; @@ -9613,12 +9260,12 @@ common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "common-lisp-snippets"; - version = "20170522.2147"; + version = "20170918.356"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "common-lisp-snippets"; - rev = "46f1de08c8d86b72b474c2f8e1c1b313ac70f23d"; - sha256 = "148ach1p3iqch3a6r1y8wkr1avyprg47jjz3a31vjvqgcwgs3ynw"; + rev = "cd46223fbc6ee99372a25ba455ffec4354895e45"; + sha256 = "0xii63fw3gx1hhx57yh8gr9mhkgb2vjkfs2sl5z9010myi9504is"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48d0166ccd3dcdd3df4719349778c6c5ab6872ca/recipes/common-lisp-snippets"; @@ -9634,12 +9281,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20170828.414"; + version = "20171006.1442"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "c0098afab0719c633ea9984e62a240f542ab8c49"; - sha256 = "0vm4rl7xkqpbi1dh2ds45smbyk25x16w0x99ri1nzvfbana5w7j5"; + rev = "d033112748440e772f0173b28356e956ce57d8a0"; + sha256 = "0qabdz95wa4gqag212gcfys4kpnvdcv0kmq2kiwc6znyp6xicnd1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9789,12 +9436,12 @@ company-cabal = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-cabal"; - version = "20151216.720"; + version = "20170917.617"; src = fetchFromGitHub { owner = "iquiw"; repo = "company-cabal"; - rev = "05886d6f2621b019fafb40cff4d2567e5d8045b4"; - sha256 = "1yxp6l8a16d6g2sfwrpfx97ds7nfrgk2akwydal1dzr2bjq02pc6"; + rev = "62112a7259e24bd6c08885629a185afe512b7d3d"; + sha256 = "1gf45xwjzdm8i4q6c6khk4dbg1mmp2r0awz2sjr4dcr2dbd1n7mg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee888b1ba57b6af3a3330607898810cd248862db/recipes/company-cabal"; @@ -9926,8 +9573,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "ebb844d1ebdd7eb347e89063a9b6e9f890a1ff57"; - sha256 = "18q4blnxf7p2kvgh1rhr7pizga06z97hv1lxjgzv0dc2dll2zwmd"; + rev = "322a796be1619fb2ade6de6d51111e5f3f5776d0"; + sha256 = "05sil1pazr7rdg6hq34p5ba7rnp3rp2lfnhsjpr26fisfhkbbaic"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; @@ -10027,12 +9674,12 @@ company-ghc = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, ghc, lib, melpaBuild }: melpaBuild { pname = "company-ghc"; - version = "20160315.710"; + version = "20170918.133"; src = fetchFromGitHub { owner = "iquiw"; repo = "company-ghc"; - rev = "ff2205c0b309467eea763521d30220e7849c75b0"; - sha256 = "1a93q5q91xjyvfxbf5q57ndjarqdm9av11bb3dmc72v9bmwgpi7s"; + rev = "dab111cb5067c545ccdc6b2d0ba70c1c4bbce060"; + sha256 = "0ygw3dhlz247qzmcsbnkkdry2w2ni60j1rbyqprnzp8sd5yk97r1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28f6a983444f796c81df7e5ee94d74c480b21298/recipes/company-ghc"; @@ -10073,8 +9720,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1"; - sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb"; + rev = "1a78dd6c36d7f37cbb60073523c2e9ca3f6519fa"; + sha256 = "1bcd62rggq3sk96n3dlpidrv4pbx6x385x17knfnp35avgrhsv4b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -10283,8 +9930,8 @@ src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29"; - sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq"; + rev = "7007363e773a419203a69798fb0e0731b2eb0f73"; + sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/company-nixos-options"; @@ -10304,8 +9951,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "9e9c126397c3d2c7160e38eb72b9317c515678f3"; - sha256 = "14qnbfxm9k870qi53krg6lmmfzcbhnv0yslhv66p40rwh9wjslwd"; + rev = "59e11170c3e3d037ed3ccf183a856cae3cc9e531"; + sha256 = "02z0z0mxj44zlgzd0dx7v7v02fpbnz655nszc2dfmvd5m9q8bg3z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -10318,6 +9965,27 @@ license = lib.licenses.free; }; }) {}; + company-plsense = callPackage ({ cl-lib ? null, company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "company-plsense"; + version = "20171001.1200"; + src = fetchFromGitHub { + owner = "CeleritasCelery"; + repo = "company-plsense"; + rev = "8a72677fcd7f8abef4fb1f046b6b424d5482aadd"; + sha256 = "02b7pfrz5k31bfq23m71hq8pzxsl2w43wjxaqx154g2bb8wkfdkr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9cf9d671d81e07c704676c557a9f0d686067ce5c/recipes/company-plsense"; + sha256 = "0k8k2vpkknd4nyxzwdj7698lgm5d85byxd49x7w5nrxmh2h1w3c7"; + name = "company-plsense"; + }; + packageRequires = [ cl-lib company dash emacs s ]; + meta = { + homepage = "https://melpa.org/#/company-plsense"; + license = lib.licenses.free; + }; + }) {}; company-pollen = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, pollen-mode }: melpaBuild { pname = "company-pollen"; @@ -10409,8 +10077,8 @@ src = fetchFromGitHub { owner = "iquiw"; repo = "company-restclient"; - rev = "7b41cd58ffdf965480f1cf52d58d718009ba6fe7"; - sha256 = "0j6b9jqs4i05rxx6fs7rvim1snf33fi1l6dkm9lskchbykzz4adq"; + rev = "ef67ba2f613ce3d61b70011c9d0a303a754ffc5b"; + sha256 = "0af1h6n1rgyni686hrrakmmbgymjg8dc1i9g2jc27dxkxz0nk454"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dd063bc3789772fdcc6a8555817588962e60825/recipes/company-restclient"; @@ -10432,12 +10100,12 @@ company-rtags = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rtags }: melpaBuild { pname = "company-rtags"; - version = "20170829.2022"; + version = "20170924.2244"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25"; - sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39"; + rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; + sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/company-rtags"; @@ -10621,12 +10289,12 @@ company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: melpaBuild { pname = "company-ycmd"; - version = "20170622.146"; + version = "20170926.2252"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "fd037efae08628e41480e9dad705dcc1f64e498d"; - sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6"; + rev = "393724d0d36a8269e57a0e4c2b3723071caf0a3c"; + sha256 = "02pm3x9frscgz5szddvbir0i7amnkzfj7pl4lgiah57bhcg1lhd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/company-ycmd"; @@ -10765,18 +10433,19 @@ license = lib.licenses.free; }; }) {}; - confluence = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, xml-rpc }: + confluence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: melpaBuild { pname = "confluence"; version = "20151020.1828"; - src = fetchsvn { - url = "https://svn.code.sf.net/p/confluence-el/code/trunk/"; - rev = "173"; - sha256 = "18859zi60s2y79add998vxh084znbdxxq31m12flg7makxlamyh7"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "confluence"; + rev = "4518d270a07760644c4204985c83d234ece4738b"; + sha256 = "1lrq23cxlp2vkyv7g56r06bp7chhw10kii3ymkydf24y4pyn1zpg"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9110cd142ece0a8d63815bf00a89574b947bb4/recipes/confluence"; - sha256 = "0hplpqaxjg34pf75p9sf97wlbq4rz9f8qvn4cfpjxf16if078ls3"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/confluence"; + sha256 = "0xa2g168mm31kh5h7smhx35cjsk1js88nzs19yakjljf56b1khlf"; name = "confluence"; }; packageRequires = [ xml-rpc ]; @@ -11037,15 +10706,36 @@ license = lib.licenses.free; }; }) {}; + cosmo = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cosmo"; + version = "20170922.44"; + src = fetchFromGitLab { + owner = "montanari"; + repo = "cosmo-el"; + rev = "dd83b09a49a2843606b28279b674b2207040b36b"; + sha256 = "0phcg81g3dy67s1hfymvj0lkcpwygwql8iixf940nv31qllgzvd7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3ab914dfefcddf6ecd65261bc11bd3eb12929c79/recipes/cosmo"; + sha256 = "1pk34d0kv1jm2fq72qa5lj0y39x1yf2nbkjjg8jcj8ari28h9vfk"; + name = "cosmo"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/cosmo"; + license = lib.licenses.free; + }; + }) {}; counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20170911.1121"; + version = "20171007.231"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "0a1d361b926291874124f8c63a653d83ead64a36"; - sha256 = "0ssbsllpv0lyr7dhnipwd7zgpxvfm36rldr7vkxh5maajdkamls7"; + rev = "6827edffb70890f2e94c3d146ed129bde581992d"; + sha256 = "0xwf8q73xisi1072dkkvf181sf9a7a6j9b9g24ismc3fn0q7216k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -11145,12 +10835,12 @@ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "counsel-projectile"; - version = "20170911.1304"; + version = "20171001.641"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "20557b47a963cc5304ac2bc3ea4800c3a7da7feb"; - sha256 = "0cszbczgpsm6l2pwh8pci3md0aranilqw6j0519vr6aaj5j6g15p"; + rev = "88a16cb75301ae95f21a71e8838a49590d011e73"; + sha256 = "155yvmyyg99znxnb3viagmd3hmii44fww68g857l7msw4q9ki1gy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; @@ -11478,26 +11168,6 @@ license = lib.licenses.free; }; }) {}; - crosshairs = callPackage ({ col-highlight, fetchurl, hl-line-plus, lib, melpaBuild, vline }: - melpaBuild { - pname = "crosshairs"; - version = "20170626.1548"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/crosshairs.el?revision=40"; - sha256 = "1dcynm83a3ixdccw3cqy533d9xwzswyi67cydaqmv35q88dg2nqw"; - name = "crosshairs.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/crosshairs"; - sha256 = "0s7gh5zrb46hzybmpydb0pad7jinvcwds7i03ndhzwx89rxg3019"; - name = "crosshairs"; - }; - packageRequires = [ col-highlight hl-line-plus vline ]; - meta = { - homepage = "https://melpa.org/#/crosshairs"; - license = lib.licenses.free; - }; - }) {}; crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "crux"; @@ -11585,12 +11255,12 @@ csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; - version = "20170502.158"; + version = "20170927.816"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "628a4e2afa0e9c4672e8654c86240cb7f7bdf444"; - sha256 = "0gnl7nddgy7b83p70ybr41s3f6ybs383hdbzhp9jvxb21g665hn6"; + rev = "331b45df9c6e84601cea323638f82ce5e4a68b03"; + sha256 = "00i53c5a85n1i48jyxg78ab2yicx8maybfc6mzxw8s12j9hbw75i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; @@ -11606,12 +11276,12 @@ csound-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi, shut-up }: melpaBuild { pname = "csound-mode"; - version = "20170911.1412"; + version = "20170923.807"; src = fetchFromGitHub { owner = "hlolli"; repo = "csound-mode"; - rev = "c5243852d20e54e43a4a7fc19c58bbd10fa8570b"; - sha256 = "1wa4356xykkfmfp8pkk72r2s18l9vhv9mdhrq827fh6cgz64p4s8"; + rev = "b5abcb68cedf1231c2e419bf87e875bfdb8fbc42"; + sha256 = "0r5c8g3jjb4p3a21mjdi9xcmify0c2r61d5y7ycbia7rjv9xpgdh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c940d29de11e43b4abf2901c466c94d426a21818/recipes/csound-mode"; @@ -11708,34 +11378,15 @@ license = lib.licenses.free; }; }) {}; - csv-nav = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "csv-nav"; - version = "20130407.1120"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/csv-nav.el?revision=7"; - sha256 = "15rfg3326xcs3zj3siy9rn7yff101vfch1srskdi2650c3l3krva"; - name = "csv-nav.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/csv-nav"; - sha256 = "0626vsm2f5zc2wi5pyx4xrwcr4ai8w9a3l7gi9883smvayr619sj"; - name = "csv-nav"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/csv-nav"; - license = lib.licenses.free; - }; - }) {}; ctable = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ctable"; - version = "20140304.1659"; + version = "20171005.1711"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-ctable"; - rev = "cd673a09a80ce4e9e102ffe2e3d7e6bfb9d652b0"; - sha256 = "07vasdlai49qs0nsmq2cz1kcq1adqyarv8199imgwwcbh4vn7dqb"; + rev = "b8830d1ca95abb100a81bc32011bd17d5ecba000"; + sha256 = "0pg303pnqscrsbx9579hc815angszsgf9vpd2z2f8p4f4ka6a00h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/ctable"; @@ -11818,8 +11469,8 @@ src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "c920475b9f9b50559d81d39ad177dbe22b258a35"; - sha256 = "0s7az1j0dpi306j01wzw5ldy6cvpz56fk0x4jhb7bsnq01lkm7jy"; + rev = "747f5bafad712b90da9eb7e6b893fff16683fe17"; + sha256 = "1px9pycw44jvkl8gz1zz577hw61l7xvpmdl1bf1bl5wy72x13v42"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -11874,25 +11525,6 @@ license = lib.licenses.free; }; }) {}; - cursor-chg = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "cursor-chg"; - version = "20170221.1610"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/cursor-chg.el?revision=21"; - sha256 = "026x1mbjrf68xrv970jbf131d26rj0nmzi1x0c8r6qdr02pw2jy1"; - name = "cursor-chg.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cursor-chg"; - sha256 = "1yam5hz1v16g2v19j3dmgbj7n2rj8dsqyr5hwfyc031s6q7f649x"; - name = "cursor-chg"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/cursor-chg"; - license = lib.licenses.free; - }; - }) {}; cursor-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cursor-test"; @@ -11914,25 +11546,6 @@ license = lib.licenses.free; }; }) {}; - cus-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "cus-edit-plus"; - version = "20170604.1000"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/cus-edit+.el"; - sha256 = "0awn3m16cyamb4h9i4iq9fzbwzl6qrkpbcr4v3dr7iwlcz7lw7jl"; - name = "cus-edit+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/57370fc617f4f10cc67e9d3c6dc113ff0a18cace/recipes/cus-edit+"; - sha256 = "1kazcdfajcnrzvhsgsmwwx96rkry0dglprrc02hbd7ky1fppp4sz"; - name = "cus-edit-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/cus-edit+"; - license = lib.licenses.free; - }; - }) {}; cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyberpunk-theme"; @@ -12017,25 +11630,6 @@ license = lib.licenses.free; }; }) {}; - cygwin-mount = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "cygwin-mount"; - version = "20131111.1346"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/cygwin-mount.el?revision=17"; - sha256 = "09my4gj3qm9rdpk8lg6n6ki8ywj7kwzwd4hhgwascfnfi1hzwdvw"; - name = "cygwin-mount.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f94fb69a954275ee4098c96495b8566d6ce7cbb9/recipes/cygwin-mount"; - sha256 = "0ik2c8ab9bsx58mgcv511p50h45cpv7455n4b0kri83sx9xf5abb"; - name = "cygwin-mount"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/cygwin-mount"; - license = lib.licenses.free; - }; - }) {}; cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyphejor"; @@ -12085,8 +11679,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "e6315294395ad44e667a804710938ee799575296"; - sha256 = "07lgc3g66w8ggmnhqn7vrck3vl9jcvwmg67mlb772kz9d5v4kn5x"; + rev = "14b085980903fa5a172a118929aecbae2d1975c4"; + sha256 = "0rpilj79a1kpd7z5pmq04pqc7gxaxlfj7br6gfsx2bs07mc0j6b8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -12165,12 +11759,12 @@ dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dad-joke"; - version = "20170814.824"; + version = "20170927.2358"; src = fetchFromGitHub { owner = "davep"; repo = "dad-joke.el"; - rev = "92641503c7e93309db12380d5228f99dbe64a53c"; - sha256 = "063cz5k264qbkb5g87xr6z68fjjnw3j1hpckdn6nqy8cin4qhagc"; + rev = "bee47e7b746b403228fa7d7361cb095de19ac9ba"; + sha256 = "14snnnjs28jg6k8x6g90m3dbcx10306ipcd256d3l6czk9p17vpd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke"; @@ -12228,12 +11822,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20170702.1007"; + version = "20170928.1211"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "f4de0fa84bec756ea31419f8db0b900fd1603c83"; - sha256 = "1wzwiahab6r8y772mg6268sh7l3b1fw4hxl10d38qv2khy641vlv"; + rev = "b516cf4556bb2a1a898701d953374b96079678b3"; + sha256 = "0ilzd6qwjjj5lfimv3b5him54yh7lpxhlm0hnsmk6zcrr6884vsl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -12249,12 +11843,12 @@ dante = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild, s }: melpaBuild { pname = "dante"; - version = "20170901.525"; + version = "20171004.1231"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "203dcd8b748d485d1c78d04d81db22fd00cb71d7"; - sha256 = "1ywx46mm1zrj0hnx2zwyxlxlq7ysg46hsy5vi6hmfppwbrfmkyzv"; + rev = "17961ec04dbe924a4c43ff0fe94bd72d044d9703"; + sha256 = "14r1jhrrq4d5l0fsjacf619f4nhc86aq4jab8qzfkszi348r5g7j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -12267,6 +11861,27 @@ license = lib.licenses.free; }; }) {}; + darcsum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "darcsum"; + version = "20140315.2110"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "darcsum"; + rev = "00c252b51cb24c25fb74f529960ebd631514a4c1"; + sha256 = "1vbfdmc56ma2ycxhza681ninhdxgvxm9j5xb9374xiqmb6g0vykq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/darcsum"; + sha256 = "0p3hwmwjjqwgkjws5b7gkad4yxh0gs2hr03ar18y43yahwgihvnv"; + name = "darcsum"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/darcsum"; + license = lib.licenses.free; + }; + }) {}; darcula-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darcula-theme"; @@ -12459,12 +12074,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20170810.137"; + version = "20171009.105"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "dcb0ec1623517e54551b801846a272dd07fd55b2"; - sha256 = "1wfky9gq0qw4x8i8wnssh2zn18i953pypw23j35ra03rfknha1zc"; + rev = "8ef32875da21ea278002da823c05b7206cc1a81e"; + sha256 = "1zci5bbc5s9m6dvgiypsxwkqiqd67la5wxrqny1qnsii5c4id1kc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -12505,8 +12120,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "dcb0ec1623517e54551b801846a272dd07fd55b2"; - sha256 = "1wfky9gq0qw4x8i8wnssh2zn18i953pypw23j35ra03rfknha1zc"; + rev = "8ef32875da21ea278002da823c05b7206cc1a81e"; + sha256 = "1zci5bbc5s9m6dvgiypsxwkqiqd67la5wxrqny1qnsii5c4id1kc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -12522,12 +12137,12 @@ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: melpaBuild { pname = "dashboard"; - version = "20170901.2"; + version = "20170923.719"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "8a555de891a83a9cd080c940dde183a8806479a9"; - sha256 = "1w7f2fvnhqzcr6az4fkgb11k8qjzg81vwzx96qhym8d70sabahzh"; + rev = "8594c4f55448148b720eda5b72d51667fb7a8a39"; + sha256 = "1hhh1kfsz87qfmh45wjf2r93rz79rq0vbyxlfrsl02092zjbl1zr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; @@ -12585,12 +12200,12 @@ datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "datetime"; - version = "20170318.254"; + version = "20170928.815"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; - rev = "3ecf9985250ecd441e91614b44cf12323af907c0"; - sha256 = "1x8kj6d9p42lffk15m0c955ibwxxvfxhihij43alwq5xab2l16bv"; + rev = "082d2c7b0e38c26a8c46af9c9956a2e100d88e71"; + sha256 = "0fdswqi53qx924lib7nd9dazn0916xf1ybrh3bcn3f8cn6b8ikg5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime"; @@ -12900,12 +12515,12 @@ define-word = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "define-word"; - version = "20150709.1223"; + version = "20171001.1616"; src = fetchFromGitHub { owner = "abo-abo"; repo = "define-word"; - rev = "64d98b7748686c51261fe6e8d42078c6284feb13"; - sha256 = "02i621yq2ih0zp7mna8iykj41prv77hvcadz7rx8c942zyvjzxqd"; + rev = "a425ffe44d62622b86477a622c6188a56bc2bd9a"; + sha256 = "02v9yzvinapr6m7pjxr4kcgqnlm7j21ygh1dhkabarz83v43awh3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e318b30d8b2b89981f4b89d78e5a46e77d3de412/recipes/define-word"; @@ -12984,12 +12599,12 @@ demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "demangle-mode"; - version = "20170526.1508"; + version = "20170923.1501"; src = fetchFromGitHub { owner = "liblit"; repo = "demangle-mode"; - rev = "d3fce31974b1c9f659da427f3c69c2e6168df508"; - sha256 = "0k4pacjjgxagsa8kgzvynvmvczhbb73waq3l6gld7v3h38js163a"; + rev = "79231b05f97da147d66120f947656f856a3a64fb"; + sha256 = "0whr18qwi5bmz39n8x836sjgky20qhw59qha59c11dvly1qs5nnq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode"; @@ -13128,18 +12743,40 @@ license = lib.licenses.free; }; }) {}; - dic-lookup-w3m = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, stem, w3m }: + dhall-mode = callPackage ({ ansi-color ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dhall-mode"; + version = "20171006.1233"; + src = fetchFromGitHub { + owner = "psibi"; + repo = "dhall-mode"; + rev = "181e5b0df73ce729cf4b711fa76bb43c2581d29d"; + sha256 = "1jw4is9jxx60hsaqjkmravrkxdfn7ni6zl9wx9i7r2y2r5mmwx88"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c7ab435077b2f47d75ddc0ff10c64ee2b46044e2/recipes/dhall-mode"; + sha256 = "1zkspjwllcw9k4nlnif6jdwzl08ki39vmx90apw029n87xhvx7mp"; + name = "dhall-mode"; + }; + packageRequires = [ ansi-color emacs ]; + meta = { + homepage = "https://melpa.org/#/dhall-mode"; + license = lib.licenses.free; + }; + }) {}; + dic-lookup-w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, stem, w3m }: melpaBuild { pname = "dic-lookup-w3m"; version = "20170803.354"; - src = fetchsvn { - url = "https://svn.osdn.jp/svnroot/dic-lookup-w3m/"; - rev = "99"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "dic-lookup-w3m"; + rev = "79aca5eb9c78e67cb85a386060d48113caad5ec3"; sha256 = "18l2s37bnnzbgw22mivgw5isxck2y0n3nk7735r4ir5y5wqx88mr"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/dic-lookup-w3m"; - sha256 = "1siqrarpyqjh1h350dsyca993fy6qin4apgyjm4vpp6awip8xfp0"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/dic-lookup-w3m"; + sha256 = "1kwbmzzf8sj4bn5kicmlp2hzv8ydcikwmdy7s40ggkgf1mk9zvqr"; name = "dic-lookup-w3m"; }; packageRequires = [ stem w3m ]; @@ -13343,8 +12980,8 @@ src = fetchFromGitHub { owner = "myrjola"; repo = "diminish.el"; - rev = "d5c61a14e1a5590a65f83c099a5bd42fcadff24d"; - sha256 = "0c0p4b3nfnczmkjx64qz2w9dk0b7srfnhrnd902qn9z55k4n0wg8"; + rev = "565a983a39d2e2cffab5df13b34f3b6116723208"; + sha256 = "173lzj9l7a4wcfvdq6akvfyyyriy5c30b4vhhv51hs051dmn02d0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1bfb4acb381cada46458cf60eae9b88d007294d5/recipes/diminish"; @@ -13427,8 +13064,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; - sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; + rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; + sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -13448,8 +13085,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; - sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; + rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; + sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6aab23df1451682ff18d9ad02c35cb7ec612bc38/recipes/dired-collapse"; @@ -13462,45 +13099,6 @@ license = lib.licenses.free; }; }) {}; - dired-details = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "dired-details"; - version = "20130824.458"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dired-details.el?revision=15"; - sha256 = "1ddrhj1kw0wl7jbs9jn067vfffsvqhz4izfw9f7ihxz34fdl2iza"; - name = "dired-details.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dired-details"; - sha256 = "0kmcnx9zvfdwvq100nazgypkfwlgxgrbimprc5pysid8rrxyzws7"; - name = "dired-details"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/dired-details"; - license = lib.licenses.free; - }; - }) {}; - dired-details-plus = callPackage ({ dired-details, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "dired-details-plus"; - version = "20170903.1237"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dired-details+.el"; - sha256 = "03r7afjp376d0c34r1nj5hz914lbrk9y5ripar1w697bqk8kaxy3"; - name = "dired-details+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dired-details+"; - sha256 = "0b4y01hk839z6m7fx5bwa80gwylvkp15niri8vrjak4vgj5g5cg9"; - name = "dired-details-plus"; - }; - packageRequires = [ dired-details ]; - meta = { - homepage = "https://melpa.org/#/dired-details+"; - license = lib.licenses.free; - }; - }) {}; dired-dups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-dups"; @@ -13609,12 +13207,12 @@ dired-filter = callPackage ({ cl-lib ? null, dash, dired-hacks-utils, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-filter"; - version = "20170718.1145"; + version = "20171006.711"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; - sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; + rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; + sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -13634,8 +13232,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; - sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; + rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; + sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -13735,12 +13333,12 @@ dired-launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-launch"; - version = "20170409.1923"; + version = "20171004.1027"; src = fetchFromGitHub { owner = "thomp"; repo = "dired-launch"; - rev = "75745f2e40d060cae909f9e6f6ca2e5f725180b8"; - sha256 = "1amsqbbjzjw07s40v8c63iw59qf5r1x7rqq2iq1jiybwsrp9s7v0"; + rev = "f71826804221bafc4f9f2f75a800400a72c24b8b"; + sha256 = "1cyg1bbn2jj101wz2jjzk832mfk5yhnc4a9m817lnalf73j0nkrs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch"; @@ -13760,8 +13358,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; - sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; + rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; + sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -13781,8 +13379,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; - sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; + rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; + sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -13795,25 +13393,6 @@ license = lib.licenses.free; }; }) {}; - dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "dired-plus"; - version = "20170818.1411"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dired+.el"; - sha256 = "04yr4gwg5y6qjbjx2klharzf7s9n1akx2n14yddjrv7hr6rkxlrs"; - name = "dired+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+"; - sha256 = "1dmp6wcynran03nsa0fd26b9q0zj9wp8ngaafx1i1ybwn2gx32g5"; - name = "dired-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/dired+"; - license = lib.licenses.free; - }; - }) {}; dired-quick-sort = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "dired-quick-sort"; @@ -13838,12 +13417,12 @@ dired-rainbow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-rainbow"; - version = "20170531.816"; + version = "20170922.817"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; - sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; + rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; + sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -13863,8 +13442,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; - sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; + rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; + sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -13884,8 +13463,8 @@ src = fetchFromGitHub { owner = "jojojames"; repo = "dired-sidebar"; - rev = "9ac42bb6663e6c0c5e4e3dd2258b63e24cf33c90"; - sha256 = "0x6gmpjm1rv38h6w5zv98vk86d7s0qvsa3pl5sab268dbhw0l9w2"; + rev = "35e43797f037fc298b6478817d51be3ceff5b568"; + sha256 = "1rizajqh96im8ygbfzrhn0ysh3r9qlk7njgn2rayk6a5krj6gn16"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30e15c8361b01195f198197e704828fbcac0e8d6/recipes/dired-sidebar"; @@ -13919,64 +13498,6 @@ license = lib.licenses.free; }; }) {}; - dired-sort = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "dired-sort"; - version = "20090208.2038"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dired-sort.el?revision=1"; - sha256 = "1dpxkxxfs14sdm3hwxv0j26lq0qzx4gryw42vrcdi680aj24962z"; - name = "dired-sort.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e4cd8274cdec74a9867060f72ec2025ed0150d/recipes/dired-sort"; - sha256 = "1dzy2601yikmmbfqivf9s5xi4vd1f5g3c53f8rc74kfnxr1qn59x"; - name = "dired-sort"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/dired-sort"; - license = lib.licenses.free; - }; - }) {}; - dired-sort-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "dired-sort-menu"; - version = "20130824.507"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dired-sort-menu.el?revision=9"; - sha256 = "1i42r7j1c8677qf79ig33bia24d2yvcj26y92migfvrlbi03w4qi"; - name = "dired-sort-menu.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/dired-sort-menu"; - sha256 = "0n7zh8s3vdw3pcax8wkas9rykf917wn2dzikdlyrl5bbil9ijblb"; - name = "dired-sort-menu"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/dired-sort-menu"; - license = lib.licenses.free; - }; - }) {}; - dired-sort-menu-plus = callPackage ({ dired-sort-menu, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "dired-sort-menu-plus"; - version = "20170221.1630"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dired-sort-menu+.el"; - sha256 = "0f2z0nj51i27qqj0ws644k61dj9bp3hagi9phj9d41fcsqzzja4h"; - name = "dired-sort-menu+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/dired-sort-menu+"; - sha256 = "19ah8qgbfdvyhfszdr6hlw8l01lbdb84vf5snldw8qh3x6lw8cfq"; - name = "dired-sort-menu-plus"; - }; - packageRequires = [ dired-sort-menu ]; - meta = { - homepage = "https://melpa.org/#/dired-sort-menu+"; - license = lib.licenses.free; - }; - }) {}; dired-subtree = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-subtree"; @@ -13984,8 +13505,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "325e2c5300b9acccf786c0cc46637c18d39790e7"; - sha256 = "1p6m02d4j2wrnx7nlj5zqzc5q34d62ffc56hjhiw4r01vvvzm65j"; + rev = "1c24048931c1fa8a7c54e80e2b3e9acc17e50dfb"; + sha256 = "02chi7y41d3wqpdg91hdb51wdh4gvlbrhghsdz8zwc1ib3hvkxkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -14040,6 +13561,27 @@ license = lib.licenses.free; }; }) {}; + diredfl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "diredfl"; + version = "20171005.39"; + src = fetchFromGitHub { + owner = "purcell"; + repo = "diredfl"; + rev = "2393653a1518b118180ff90ef2b66cfb7d0b555c"; + sha256 = "04yykal90pc4nsdlk08z6svsnddjzaz1drwvs3bqfjw01fr50xcs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl"; + sha256 = "0cybq15yq07x2mnrnwapy020d598yymcy8y9wwf1m7f59p3h9hvn"; + name = "diredfl"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/diredfl"; + license = lib.licenses.free; + }; + }) {}; diredful = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diredful"; @@ -14169,12 +13711,12 @@ disable-mouse = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "disable-mouse"; - version = "20160630.1903"; + version = "20170929.1353"; src = fetchFromGitHub { owner = "purcell"; repo = "disable-mouse"; - rev = "f7d6f70a3c0a751a946613f997330fbc95a38c3e"; - sha256 = "0d2hmaiz8v8kzkbdi281hyf3yfjwr03ngxr2qphgm7xk9298351v"; + rev = "81639930bcaeedadbcc19728e91719afcac84613"; + sha256 = "0l6mai68ns3qw3rlvjvzsnqwdy7bxqiy0vdwflq0l1plxb1vazyc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbbc396373212fdf731e135cde391f27708ff015/recipes/disable-mouse"; @@ -14313,25 +13855,6 @@ license = lib.licenses.free; }; }) {}; - disk = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "disk"; - version = "20081128.706"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/disk.el?revision=9"; - sha256 = "1c0pgqvl1z2f5hprszln53pn2v2pqy110r3wx3g84v71w6378bbv"; - name = "disk.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/edcafb4c459cf51fecc7c43a3e4dcbe377d68b46/recipes/disk"; - sha256 = "0bij9gr4zv6jmc6dwsy3lb06vsxvmyzl8xrm8wzasxisk1qd2l6n"; - name = "disk"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/disk"; - license = lib.licenses.free; - }; - }) {}; dispass = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dispass"; @@ -14804,12 +14327,12 @@ docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "docker-compose-mode"; - version = "20170910.1034"; + version = "20170916.1438"; src = fetchFromGitHub { owner = "meqif"; repo = "docker-compose-mode"; - rev = "372df2f0de34a4bd44d4a7274b9ab85117ac7392"; - sha256 = "14vgjhy2j60xhf38zm5nlkr4d3r455kw6paw0wff4mqmdjcg3pds"; + rev = "f3c06a43d69dfe80041a82a9365281bd5c65a105"; + sha256 = "1fzz950wb95lp15ak8q4vzls21w9fc3qxqs5hlf50najdw36w52h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode"; @@ -14951,12 +14474,12 @@ doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20170912.726"; + version = "20170927.1705"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-themes"; - rev = "f7185cf7536e1f96e7cede2ce81c2b51205df850"; - sha256 = "1wqa5b9ni8rci4h8m78h7cb3387gi45v1w6z5dbya4zvaw1gwx8p"; + rev = "99a4c8691436b80ffb242512f026a8cc32b9539a"; + sha256 = "0ww95dr3djxdwba0kark0d1j1q4vkjhnpiv5s5gc5zhgbc0421rb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c5084bc2c3fe378af6ff39d65e40649c6359b7b5/recipes/doom-themes"; @@ -14969,84 +14492,6 @@ license = lib.licenses.free; }; }) {}; - doremi = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "doremi"; - version = "20170221.1634"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/doremi.el?revision=42"; - sha256 = "03alkj4mxajsgmghw935hm3c95a12222zq1ig6kwmfrla5kg3b7q"; - name = "doremi.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi"; - sha256 = "11i4cdxgrspx44p44zz5py89ypji5li6p5w77wy0b07i8a5gq2gb"; - name = "doremi"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/doremi"; - license = lib.licenses.free; - }; - }) {}; - doremi-cmd = callPackage ({ doremi, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "doremi-cmd"; - version = "20170221.1631"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/doremi-cmd.el?revision=47"; - sha256 = "09iizx079y43qk3jd66n8i8ifm2s7jnc9g7831nv5f3c26rgl0w6"; - name = "doremi-cmd.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-cmd"; - sha256 = "1qzspirn1abqps0dn5z8w6ymffc6b02dyki5hr8v74wfs8fhzx05"; - name = "doremi-cmd"; - }; - packageRequires = [ doremi ]; - meta = { - homepage = "https://melpa.org/#/doremi-cmd"; - license = lib.licenses.free; - }; - }) {}; - doremi-frm = callPackage ({ doremi, faces-plus, fetchurl, frame-fns, hexrgb, lib, melpaBuild }: - melpaBuild { - pname = "doremi-frm"; - version = "20170221.1632"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/doremi-frm.el?revision=74"; - sha256 = "0f9vwajgdm37krz55sv5c8ijfqhy5gsxj1zyxg8zbs6l33giynxd"; - name = "doremi-frm.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-frm"; - sha256 = "1rj3p665q32acsxxwygv1j5nbmjqrhi0b4glzrk88xki4lyz0ihz"; - name = "doremi-frm"; - }; - packageRequires = [ doremi faces-plus frame-fns hexrgb ]; - meta = { - homepage = "https://melpa.org/#/doremi-frm"; - license = lib.licenses.free; - }; - }) {}; - doremi-mac = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "doremi-mac"; - version = "20170221.1633"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/doremi-mac.el?revision=30"; - sha256 = "002jhqk26ywiyci1r91aqbq0zhbxy6rsyw3h74ck04rxjfc49rxl"; - name = "doremi-mac.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-mac"; - sha256 = "0n9fffgxnpqc7cch7aci5kxbwzk36iljdz2r8gcp5y5n1p7aamls"; - name = "doremi-mac"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/doremi-mac"; - license = lib.licenses.free; - }; - }) {}; dot-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dot-mode"; @@ -15341,34 +14786,15 @@ license = lib.licenses.free; }; }) {}; - dropdown-list = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "dropdown-list"; - version = "20120329.936"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/dropdown-list.el?revision=5"; - sha256 = "1szy46sk3nvlbb3yzk1s983281kkf507xr3fkclkki3d3x31n08a"; - name = "dropdown-list.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dropdown-list"; - sha256 = "1zqqa4872r96fp377bcz6pd1djz59ami5k09abb62dw854sc5xfj"; - name = "dropdown-list"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/dropdown-list"; - license = lib.licenses.free; - }; - }) {}; drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }: melpaBuild { pname = "drupal-mode"; - version = "20170112.1136"; + version = "20170926.38"; src = fetchFromGitHub { owner = "arnested"; repo = "drupal-mode"; - rev = "9d5808972f344a09dcf665d5113ae81e39ac1051"; - sha256 = "0vz41jfkfir7ymyl5y0v836zclqfihrjdiyz3vnb081x0gara8l0"; + rev = "b0ca2c39650136f7e5672461e64397b9add30b92"; + sha256 = "1l2xc24y037b3z62yxmq2bx1x3qqv56d15bf3qmb3mpgm4gh85j6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode"; @@ -15402,17 +14828,19 @@ license = lib.licenses.free; }; }) {}; - dsvn = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { + dsvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "dsvn"; version = "20130120.1257"; - src = fetchsvn { - url = "https://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1808231"; - sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "dsvn"; + rev = "17bce692e9bd5a43373d5cb1d66da50e1acb903b"; + sha256 = "1bv4ivv9j5r0ax4vay1kmwv753y44qj6qprr38yh7ky0fpsml34c"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dsvn"; - sha256 = "1y55s187q2xiab31vs95jjjp1a3qzwkdwn7p5man666scbjrdyl5"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/dsvn"; + sha256 = "1kgc0b8as7w1h9dsknv2h7dzr6jcrs0j0p376050pshgzcm79nm6"; name = "dsvn"; }; packageRequires = []; @@ -15445,12 +14873,12 @@ dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dtrt-indent"; - version = "20170825.847"; + version = "20171001.1233"; src = fetchFromGitHub { owner = "jscheid"; repo = "dtrt-indent"; - rev = "69d0c5e143453708dbf0ebec4e368bc26fff683c"; - sha256 = "154m53hhzjawmrg2vlqjcg9npgq1igw9f0fz6gh7vscmbxl5dnjq"; + rev = "7fd55af3b0311ea24b68397054e705c835fa5ef1"; + sha256 = "1sgmd1zqdwa1f6y8d6vaacyipkqn2ivvaim1xndbkihgmhyn4kf0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/61bcbcfa6c0f38a1d87f5b6913b8be6c50ef2994/recipes/dtrt-indent"; @@ -15505,15 +14933,36 @@ license = lib.licenses.free; }; }) {}; + dumb-diff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dumb-diff"; + version = "20170924.2036"; + src = fetchFromGitHub { + owner = "jacktasia"; + repo = "dumb-diff"; + rev = "205ea5fda371f296fd876e362c12a5b64c4724d9"; + sha256 = "0gxrrhlhp1g679c1ygj8m0jy4pag55b957vyxm9845z4vx93wj1x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cf7fa0b4235247d82569ed078f92774f10afa45c/recipes/dumb-diff"; + sha256 = "1h1dvxbj85kgi04lxh0bpx81f6sl1fd56lhjmq1cw9biwqw0sm0c"; + name = "dumb-diff"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/dumb-diff"; + license = lib.licenses.free; + }; + }) {}; dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20170911.1951"; + version = "20170918.2024"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "67928ef6449318a8653812167540aa5919301260"; - sha256 = "0i7jyh0zzk4ifkqwi89bnnwgvaaphnf4n5z299mg0fj4walzx3rz"; + rev = "0d39c148abd5c76e5b39847a794ab3a240a7e018"; + sha256 = "0ksddljicrjx4cbx8ws31bskcirjvbsxz60f4xh8j8ywi3s7wj4b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -15592,11 +15041,11 @@ dyalog-mode = callPackage ({ cl-lib ? null, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; - version = "20170519.704"; + version = "20170926.500"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "56fa34ea25d4"; - sha256 = "1hk7i557m0m42zdg59z278cylglnp49dr8wa3zbdwzk2xzdg0m00"; + rev = "023d2edde61d"; + sha256 = "1izhlafsbxfav4jvl7bqg188d71895r1sqacxsblvcld8c0brsqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -15906,12 +15355,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "20170819.347"; + version = "20171008.9"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "108cc2347507ff8c92b10a817de0850e9eb99ab2"; - sha256 = "1fcq6693cjl0lx67gwsk53lm20zznq9cc9widb3rzpwifns4x8ac"; + rev = "8f16fb1f510a147e7ab846030057d4c74127ffb2"; + sha256 = "15axmg6z1nlaz7xsf70arxazkkskkga2fa71iswpnhwqsrr90w8l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -16071,34 +15520,15 @@ license = lib.licenses.free; }; }) {}; - echo-bell = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "echo-bell"; - version = "20170221.1635"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/echo-bell.el?revision=8"; - sha256 = "0000ya8y6v5xvl5qkrsamzwh1iikc3clhpdpdr2da6c4b9cznydh"; - name = "echo-bell.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a81e339e9c7cf1ae5fe91ab4442164336a6fbf13/recipes/echo-bell"; - sha256 = "0adhdfbcpmdhd9252rh0jik2z3v9bzf0brpzfvcjn5py2x6724ws"; - name = "echo-bell"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/echo-bell"; - license = lib.licenses.free; - }; - }) {}; eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }: melpaBuild { pname = "eclim"; - version = "20170522.1354"; + version = "20170921.1440"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "ebb844d1ebdd7eb347e89063a9b6e9f890a1ff57"; - sha256 = "18q4blnxf7p2kvgh1rhr7pizga06z97hv1lxjgzv0dc2dll2zwmd"; + rev = "322a796be1619fb2ade6de6d51111e5f3f5776d0"; + sha256 = "05sil1pazr7rdg6hq34p5ba7rnp3rp2lfnhsjpr26fisfhkbbaic"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; @@ -16135,12 +15565,12 @@ ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ecukes"; - version = "20170810.305"; + version = "20170922.656"; src = fetchFromGitHub { owner = "ecukes"; repo = "ecukes"; - rev = "65f29ff764c3742cc1190371b1ac91f0812535f3"; - sha256 = "16dypiczds89kpwqj7p29n5qcqpc1d7faci2f4glw1m60gnkgvqq"; + rev = "e16dcb430cf05a28065ad26eab2b32e2f7af8705"; + sha256 = "1x085idsgcfzagqm6jqqhgqzy1xqjkq40zl2q7a20v013n3rkbd8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes"; @@ -16408,12 +15838,12 @@ edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edit-indirect"; - version = "20170310.1002"; + version = "20170928.430"; src = fetchFromGitHub { owner = "Fanael"; repo = "edit-indirect"; - rev = "2fc8f382ee12fc8f7202288534258186bdf6068a"; - sha256 = "1m40zi6dkq7m9386adrys5n7w8h9973svfmxl1c3n9vk9kjibb9k"; + rev = "032ac0ec690d4999d564fd882588c7a197efe8dd"; + sha256 = "0by1x53pji39fjrj5bd446kz831nv0vdgw2jqasbym4pc1p2947r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/edit-indirect"; @@ -16513,12 +15943,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20170912.2223"; + version = "20171005.2129"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "f527731c0d24a094f6fc784366558e2bf3d0e201"; - sha256 = "0im24f2h2n4ijdmkjkkphngk2sgj1g2rg0ygppq03rbzmqg0r6sm"; + rev = "99bb6882d8ac708a066a9977cc4fa23f86c6b8f6"; + sha256 = "0372s9xp8gjz6y0ix095r9gy8718jw1vkjszd12kz6vnxn4z4rmi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -16792,12 +16222,12 @@ ein = callPackage ({ auto-complete, cl-generic, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, request-deferred, s, skewer-mode, websocket }: melpaBuild { pname = "ein"; - version = "20170903.829"; + version = "20171003.817"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "213cea559e7a8fb50e303ea25e1626fefddaf4bd"; - sha256 = "18ysd78pfyymqd0f6ipma9p9x61pw21f0jwk118r5yi00wnry9za"; + rev = "e0e3fac0c41e8cf4efa2fea6dbb49d3ad80d6153"; + sha256 = "11zw1gqzxzim6y6yrbbbsmmyadpagqk5f79vmx8ly0x1ivk87ldn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -17017,6 +16447,27 @@ license = lib.licenses.free; }; }) {}; + el-pocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web }: + melpaBuild { + pname = "el-pocket"; + version = "20170922.549"; + src = fetchFromGitHub { + owner = "pterygota"; + repo = "el-pocket"; + rev = "a80abfb67efe68ada1d7d0a73aecee57e763baaa"; + sha256 = "0q4nsgqpjmmxml5pcb6im1askk6q7c3ykzv6fgf1w8jgkvdifa6f"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ef362a76a3881c7596dcc2639df588227b3713c0/recipes/el-pocket"; + sha256 = "0fgylpfixsx5l1nrgz6n1c2ayf52p60f9q290hmkn36siyx5hixw"; + name = "el-pocket"; + }; + packageRequires = [ emacs web ]; + meta = { + homepage = "https://melpa.org/#/el-pocket"; + license = lib.licenses.free; + }; + }) {}; el-spec = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-spec"; @@ -17101,25 +16552,6 @@ license = lib.licenses.free; }; }) {}; - el-swank-fuzzy = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "el-swank-fuzzy"; - version = "20130824.457"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/el-swank-fuzzy.el?revision=3"; - sha256 = "1g2jhm9m5qcj6a231n5ch6b8bqwzq3kj275nd4s89p89v1252qhn"; - name = "el-swank-fuzzy.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2aecf6d476c7898478e6e5dcfc77d91935f07039/recipes/el-swank-fuzzy"; - sha256 = "1m7y4c0r1w8ndmr1wgc2llrbfawbbxnvcvgjpsckb3704s87yxr1"; - name = "el-swank-fuzzy"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/el-swank-fuzzy"; - license = lib.licenses.free; - }; - }) {}; el-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-x"; @@ -17204,25 +16636,6 @@ license = lib.licenses.free; }; }) {}; - eldoc-extension = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "eldoc-extension"; - version = "20140306.645"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/eldoc-extension.el?revision=10"; - sha256 = "13ncpp3hrwk0h030c5nnm2zfiingilr5b876jsf2wxmylg57nbch"; - name = "eldoc-extension.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2c59866b554def3f6cef997cc23254a560f3eb33/recipes/eldoc-extension"; - sha256 = "0azkdx4ncjhb7qyhyg1a5pxgqqf2z1wq9iz802j0nxxnjzh9ny24"; - name = "eldoc-extension"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/eldoc-extension"; - license = lib.licenses.free; - }; - }) {}; eldoc-overlay-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, inline-docs, lib, melpaBuild, quick-peek }: melpaBuild { pname = "eldoc-overlay-mode"; @@ -17272,8 +16685,8 @@ src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "9aa71d7b6b780242e4659fedfdb186d4ee422366"; - sha256 = "03py67msf3cshg60zs6bdk71ksswi3vjf0nl88jhlgnzb3kjg4wm"; + rev = "5800e90f5ce23663fe370e4ad8fb40f59a4f93f5"; + sha256 = "0d3fakycfg7rfblp6wqxyynvnqnpnz4hvi812fp5v4wqz4slfjxh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -17352,12 +16765,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20170910.1453"; + version = "20171001.1900"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "b62a2d0040f1a8ad0a23a48e3843d2ed5cbc2a8c"; - sha256 = "1fxxcdrm7138pb06wxk9k519kag03jllkwf2fyxh755x6fnxlgin"; + rev = "f343cfa93b7d91024496b8b7f46280762fe86659"; + sha256 = "0bysjh9626r2651n6vvq6mbbw36jrp41nmd45an6y9cl0z0wj58w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -17426,8 +16839,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "b62a2d0040f1a8ad0a23a48e3843d2ed5cbc2a8c"; - sha256 = "1fxxcdrm7138pb06wxk9k519kag03jllkwf2fyxh755x6fnxlgin"; + rev = "f343cfa93b7d91024496b8b7f46280762fe86659"; + sha256 = "0bysjh9626r2651n6vvq6mbbw36jrp41nmd45an6y9cl0z0wj58w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -17611,12 +17024,12 @@ elixir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "elixir-mode"; - version = "20170102.942"; + version = "20170918.2231"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "emacs-elixir"; - rev = "384d8daf8ad563ebf2cb3437c71d30241adbe099"; - sha256 = "0idgfjwd6116zaag0lmq2i9by2mr054nrqmpnsvyhk26hw71k3vn"; + rev = "861788186f4dbd500209656dcf38a15b3efe74dd"; + sha256 = "1py8slpda3vsw88v1wp1imnn3r17hz54621c6ks8xm75lnhn60ra"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6374ced0de38d83bf99147f702f30706615480ed/recipes/elixir-mode"; @@ -17653,12 +17066,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20170903.221"; + version = "20171001.26"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "ece63376b2a7a8f5e6d708bdb2061e13d6afb731"; - sha256 = "1109si17ph8w90jcmzz72i0ha5va8ylh2y5jinabvsc3qs667bgy"; + rev = "a0339b196760823a0f3bb0bcaf26daa62c356535"; + sha256 = "0vsyibph08xcxinjri4lzy44ji3albwpcpb469q0h43jjd2jw2v4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -17881,15 +17294,15 @@ license = lib.licenses.free; }; }) {}; - elpy = callPackage ({ cl-generic, company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: + elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20170903.143"; + version = "20171005.1105"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "d1cfe9c87031a9fd4c9754afdc4c4d0b3b3128a6"; - sha256 = "1zy24fp888i7xaplfnxznlw8hldfpcgh9ni0053m9sq8z28nld6j"; + rev = "2d6dc9f31de8805f2b7630c874942fb7e8fb5bd3"; + sha256 = "1mrda1kvwv0mzgxi8z28a9qynlkfzpw0wgvwc86pkq94fzr6l2pj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -17897,7 +17310,6 @@ name = "elpy"; }; packageRequires = [ - cl-generic company find-file-in-project highlight-indentation @@ -18060,12 +17472,12 @@ elvish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elvish-mode"; - version = "20170815.625"; + version = "20170913.1939"; src = fetchFromGitHub { owner = "ALSchwalm"; repo = "elvish-mode"; - rev = "d78a560b0aeba76ae09fb0885ca0cff2ee5b0d0d"; - sha256 = "0fxmy0qfcapskbakin6p1hv9763yh4bxanlnak7p6dfmmw7mvz33"; + rev = "9cf31b453ac79b011b84e83ca11c964c4e647649"; + sha256 = "0ryg9c8pjw98a9l4hyjqwan7kcv492vzy0xxcrcfm69zn8vnw9k0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc724072702a565af471f9ae523a1e6e48e3f04/recipes/elvish-mode"; @@ -18480,11 +17892,11 @@ emms = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20170901.1328"; + version = "20170929.1427"; src = fetchgit { url = "https://git.savannah.gnu.org/git/emms.git"; - rev = "79793c0bb32620ad5b4db490c6e80ff8e5a20233"; - sha256 = "13mk66vbrnzsy8bcz2wahn4hcqyiia6j0srpfffxsg49x9bssvff"; + rev = "b1ea89a08da3f5953d55072fffed8f781b461315"; + sha256 = "0kih2hvwrzjsw8k271hciwx4p2bxn4hgm4bsk9zdrsw9lxy0qqnm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/emms"; @@ -18584,12 +17996,12 @@ emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-mpv-jp-radios"; - version = "20170506.1024"; + version = "20171002.723"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-player-mpv-jp-radios"; - rev = "43ef07db6e724847fdcff5f66d1806b3e8d315e4"; - sha256 = "15wfr6qs4k6anm16zing0rgawpbrnk9589vr06fc6qvkald7ib3v"; + rev = "dcf79a7570ff4031373991f9fc838ddc5f598006"; + sha256 = "0mq6k6qgqv08k421wjk69ma8m7m29yfmwh2bsphxj1pa2h1y6h2n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios"; @@ -18605,12 +18017,12 @@ emms-player-simple-mpv = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-simple-mpv"; - version = "20160924.825"; + version = "20170930.2216"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-player-simple-mpv"; - rev = "bcc056364df5f405716006a8b7bb90102a57f62f"; - sha256 = "0kz31qsn3nrpi8r31nlxlkkkah0qcdkq9a9i9ypv4ky7pvnzx6m5"; + rev = "1af7838037c86872e897bea872d279ff080c28c6"; + sha256 = "1xgkpw89pyn4p37l5rz9dw8yg065slzq8l5z69n6nam9hndcnjsh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/emms-player-simple-mpv"; @@ -18974,12 +18386,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20170817.2325"; + version = "20171005.347"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "fe816d36bce96151f90b76887a69f44100bd12da"; - sha256 = "19id9s3wvwlqvcfngw32rd9fnq74nwyl5zlmyvr6i268rk4gm4lq"; + rev = "82de811bde723e78a702e98592e46514ac700f9d"; + sha256 = "15n01ni833y9viccdcvhjj80yyavm1131njxwp0q13gqgbzj3n5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -19087,12 +18499,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20170905.1210"; + version = "20171006.353"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "42528f4f1d3310361d84bb557c4b7270adb5fd5b"; - sha256 = "1d14160l1w65a3klhd71972a726kzhcn07bljp5q57y1qxbq648m"; + rev = "4258ca3457e9a7ac46d1f0bd7a80f1da51b360cb"; + sha256 = "00v5ipcz642rrg4yicwmg1nam5n0yasqgrak13b3wqmzqx1qzf6f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -19569,12 +18981,12 @@ ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }: melpaBuild { pname = "ergoemacs-mode"; - version = "20170723.1921"; + version = "20170915.1902"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-mode"; - rev = "7b0600620fc64cdb92bb9a69144c68eaa088db5b"; - sha256 = "05ihafhhjlq7b4zs58jaqssgqdha5kqv65hvk7946ba7l845fi83"; + rev = "6231ee0ae7014bd8f8ef2a3adc13b4d3d403bf71"; + sha256 = "1c3ryazy796zcxp550ic7a7qsgs4528sfqqywmwqpf8vl7p0p7xp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; @@ -19611,12 +19023,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20170912.58"; + version = "20170913.604"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "b36f0b6d381746a16c8d8c2bb3767d9ffb44c3f8"; - sha256 = "1i0aqq3vwy10jbky6ahka2vqk55iqanq1liqj81r76l5v55flcz6"; + rev = "e38c688d3961bedcd85f842fd052836cb345a902"; + sha256 = "1izh0zblnyklhya72cz8rf8pwq8q5smm4yp520vrkplspcspwbva"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -19698,8 +19110,8 @@ version = "20161018.1217"; src = fetchgit { url = "https://bitbucket.org/olanilsson/ert-junit"; - rev = "b8e23617bbd5228dfa37fdc00e7b5227fd6382df"; - sha256 = "1f5r1ns2h53q5qmrr31xbwrsinnk4ialh4a7siz2n513znq6dq8w"; + rev = "c4cd27b60f9e7ccd05fd8a2097cde947eb250599"; + sha256 = "0zm71kv4wxs6yf70qwrfavxc1845bg4aqqk36zypy17g1x40bms7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27c627eacab54896a1363dbabc56250a65343dd8/recipes/ert-junit"; @@ -19778,12 +19190,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s, spark }: melpaBuild { pname = "es-mode"; - version = "20170823.957"; + version = "20170915.801"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "82c9d0e47f7f224d1248e3455ee10c0adea327bf"; - sha256 = "1jb4b2cww6y3y0j3gf9n5v2hcmb9zsf1cz9rhr0x6vh169yvhjvr"; + rev = "511eaf59123c2dc4f900cd31d3c30c5bf98599ea"; + sha256 = "1ldyf39z7faizbg2nzh2myd5yld9iwxi9r5260sp1dv0ab2im4gy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9912193f73c4beae03b295822bf41cb2298756e2/recipes/es-mode"; @@ -19922,6 +19334,27 @@ license = lib.licenses.free; }; }) {}; + eshell-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eshell-bookmark"; + version = "20170922.814"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = "eshell-bookmark"; + rev = "deda4b848b2fb979dbe73ead2cb866610e3596ed"; + sha256 = "14dmsnixf9vqdhsixw693sml0fn80zcf0b37z049fb40cmppqxdw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e7bf4702a907727990fcc676980f2b219e22ab0c/recipes/eshell-bookmark"; + sha256 = "1bybxlq1h5chrjxqjb23kq8dmgw2xrjwkrnvpbphblqzpdy5ck0s"; + name = "eshell-bookmark"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/eshell-bookmark"; + license = lib.licenses.free; + }; + }) {}; eshell-did-you-mean = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-did-you-mean"; @@ -20009,12 +19442,12 @@ eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-prompt-extras"; - version = "20170713.11"; + version = "20170914.1955"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "eshell-prompt-extras"; - rev = "52a8ce66da2c5f419efd41f2a6b6d4af03f78acd"; - sha256 = "1biandbijdngalbjvbfv894qjzmj0fndypa31rmd75c0r5mg2mnf"; + rev = "7581c109673c40aceff278cd524273f50ffe170d"; + sha256 = "1m1jisjz974cfz89i6l2zq666yzhsqipc6dmqlrm8mw81fxsfm1h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras"; @@ -20139,8 +19572,8 @@ src = fetchFromGitHub { owner = "ecukes"; repo = "espuds"; - rev = "31ffd83f6deccddfb8378fa2298d90d3fc5fdda1"; - sha256 = "1l8c8g050av0hi5snini7igfrjaq8q0nb3g114ai1i8frzsrxgzn"; + rev = "444285cde99860b50b4c9a2e1c6a25e4db8d9adf"; + sha256 = "0nwgh9nrr85n6ix60r6z58rw2078wkzkqqfszq2sr7wmad6kxspx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/espuds"; @@ -20198,12 +19631,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20170911.149"; + version = "20171007.516"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "23e6d3ef5b314223043c9f03301b3e7018141385"; - sha256 = "1fih6rphz5bsd2kvwblygaymp1mvz710xjvcqg52l9awlawgvbwb"; + rev = "d559b3d0e7db97a74823c20fda4095d1a14d9209"; + sha256 = "1cxq8k9m2m36zz3x04dranzg40k61qprhy4w91chl3384jf1rb39"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -20303,12 +19736,12 @@ esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "esup"; - version = "20170729.1742"; + version = "20170923.1328"; src = fetchFromGitHub { owner = "jschaf"; repo = "esup"; - rev = "94e0d2bef2bcdbd9477e702f63148cc2de75ecb3"; - sha256 = "0rz2a8ydr7jrsgz1mxgjk4wyf7rkz0w3qvx6jy8mygzhzhmniy24"; + rev = "a589005a9a888537deef94d6fe38a9b8790c97c7"; + sha256 = "04lxmd0h7mfjjl0qghrycgff0vcv950j1wqv0dbkr61jxp64n5fv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9d2948a42da5d4864404d2d11a924a4f235fc3b/recipes/esup"; @@ -20328,8 +19761,8 @@ src = fetchFromGitHub { owner = "tali713"; repo = "esxml"; - rev = "08fcc5d76abb90c194e181f267cf1d2a149b7a7c"; - sha256 = "034lxfqn5yh78hz7i568vw8kyv3hlb699z2d1dffjiigc1lblgip"; + rev = "6d58e047b7c1e3e8cab87cf7ee15e039e8a22510"; + sha256 = "0bkbp3bycb4vrk0y5n7013yqqzz7rjvfwkr9lppa6sixilhc8h66"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db6556fe1b2403d1bcdade263986fd0faf0d9087/recipes/esxml"; @@ -20363,44 +19796,6 @@ license = lib.licenses.free; }; }) {}; - etags-select = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "etags-select"; - version = "20130824.500"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/etags-select.el?revision=21"; - sha256 = "0gmlmxlwfsfk5axn3x5cfvqy9bx26ynpbg50mdxiljk7wzqs5dyb"; - name = "etags-select.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5875d00419666388acbcb8a4f392308e7576da0b/recipes/etags-select"; - sha256 = "0j6mxj10n7jf087l7j86s3a8si5hzpwmvrpqisfvlnvn6a0rdy7h"; - name = "etags-select"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/etags-select"; - license = lib.licenses.free; - }; - }) {}; - etags-table = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "etags-table"; - version = "20130824.457"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/etags-table.el?revision=4"; - sha256 = "0apm8as606bbkpa7i1hkwcbajzsmsyxn6cwfk9dkkll5bh4vglqf"; - name = "etags-table.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c3efc1791df5658ca5bba4907f2a22c2cabfd3c8/recipes/etags-table"; - sha256 = "1jzij9jknab42jmx358g7f1c0d8lsp9baxbk3xsy7w4nl0l53d84"; - name = "etags-table"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/etags-table"; - license = lib.licenses.free; - }; - }) {}; ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ethan-wspace"; @@ -20572,12 +19967,12 @@ evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20170904.1346"; + version = "20171006.2359"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "485bf5399bbad17ff0cbb3787de67b9a5a5665dd"; - sha256 = "02zd9pk2x44lz9cb8cqy0apvdbb8vwlxgvrgfkfswvx34ww4rqmc"; + rev = "b6ed94c9a531ba905b729e0c3dc89fc32d888f46"; + sha256 = "0idp7wl22vzpy440jcrxspb47snk098h7gi7vn5fq5awc9pknwpi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; @@ -20698,12 +20093,12 @@ evil-colemak-minimal = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-colemak-minimal"; - version = "20160922.226"; + version = "20171006.617"; src = fetchFromGitHub { owner = "bmallred"; repo = "evil-colemak-minimal"; - rev = "5f1db93959359d3efd57abb5a0d06e94dec92556"; - sha256 = "08dfmny7z03h6hbj21f344jv9kpzlzk31j5sd78w1c68mgx9hj6b"; + rev = "6d98b6da60f414524a0d718f76024c26dce742b3"; + sha256 = "0pd05jq4qkw5xx7xqzxzx62fsm77vjz0ry9ayaqgqw5831rbp553"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/828c744062069027f19fe5f2f233179f9149dc16/recipes/evil-colemak-minimal"; @@ -20824,12 +20219,12 @@ evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-escape"; - version = "20170115.1343"; + version = "20170913.618"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "evil-escape"; - rev = "b4d44fc5015341e484495fc86b73d09b2ac062ec"; - sha256 = "0s8lmmm25qabicwaj9jybpbd8mkc62yl7jnhk1lpablydjkv3w2i"; + rev = "25920fb2f4ef48998eecea433c04096f8d124cfe"; + sha256 = "1nbk0mlfrg8hbw119dpp2a1k2irgz811kcsrwmxv256gkx4pwmfk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/evil-escape"; @@ -20929,12 +20324,12 @@ evil-goggles = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-goggles"; - version = "20170913.59"; + version = "20171002.2303"; src = fetchFromGitHub { owner = "edkolev"; repo = "evil-goggles"; - rev = "221a5ed8ea0455e4274ef9ba14fe852cc512112d"; - sha256 = "0qjzkg1cms6ska213n1ldm511ivdawxwpvn8qzl8l75yf3whzw05"; + rev = "92d614e731d1f2b8cafa4bf211e560294e378c14"; + sha256 = "006ny911qmxl7p1azdcf4d6daswglc06jh295glhn963sqkc2mgf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/811b1261705b4c525e165fa9ee23ae191727a623/recipes/evil-goggles"; @@ -21328,12 +20723,12 @@ evil-org = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "evil-org"; - version = "20170911.1135"; + version = "20170917.1447"; src = fetchFromGitHub { owner = "Somelauw"; repo = "evil-org-mode"; - rev = "1b0cb009fcc593ba851d243d2e3291a8cfeb2fb0"; - sha256 = "0qnb5vbsrwxsn2zjl6dy6gvc1y77ac9c8nqrhpzyvjbkby2gkwzh"; + rev = "52bbb105a6a7fa9ead68c56746740b4343ecd6e9"; + sha256 = "1k0akcqbr67lsrj5gkpr9b3nhrf53zd3ksv4sfrapn9xhv13brbi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1768558ed0a0249421437b66fe45018dd768e637/recipes/evil-org"; @@ -21538,12 +20933,12 @@ evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-surround"; - version = "20170910.1952"; + version = "20171004.600"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil-surround"; - rev = "7839abe0e04740e2928a6b799557d1b16460fa5f"; - sha256 = "03lfn8clcbcmax5nzn6awzfd895inavzrn45n07hrq6abw98yjrd"; + rev = "822a0f61c3fd7c55cda4e04c8590ae5144401c26"; + sha256 = "0xd87whrznwk1hggb0jrx6n1m5sbj0014qv26qvvc3f11vrrda2x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c9dc47a4c837c44429a74fd998fe468c00639f2/recipes/evil-surround"; @@ -21622,12 +21017,12 @@ evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-test-helpers"; - version = "20170719.1445"; + version = "20171002.135"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "485bf5399bbad17ff0cbb3787de67b9a5a5665dd"; - sha256 = "02zd9pk2x44lz9cb8cqy0apvdbb8vwlxgvrgfkfswvx34ww4rqmc"; + rev = "b6ed94c9a531ba905b729e0c3dc89fc32d888f46"; + sha256 = "0idp7wl22vzpy440jcrxspb47snk098h7gi7vn5fq5awc9pknwpi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; @@ -21853,12 +21248,12 @@ ewmctrl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ewmctrl"; - version = "20161104.1833"; + version = "20170921.1917"; src = fetchFromGitHub { owner = "flexibeast"; repo = "ewmctrl"; - rev = "ba1879cc803a63d5a4047ec6f2990e369ae5af3a"; - sha256 = "12h2fgabfmaq1cpr7y7ckyyfgy53ww3v25p2kk5fq77rn40zbniy"; + rev = "3d0217c4d6cdb5c308b6cb4293574f470d4faacf"; + sha256 = "0ilwvx0qryv3v6xf0gxqwnfm6pf96gxap8h9g3f6z6lk9ff4n1wi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b2a7679f0961b171bf23080e628ae80f50c446e4/recipes/ewmctrl"; @@ -21936,12 +21331,12 @@ exotica-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exotica-theme"; - version = "20170828.357"; + version = "20171009.445"; src = fetchFromGitHub { owner = "jbharat"; repo = "exotica-theme"; - rev = "0fcb6f3e5ef7d97a4ec049867a8d703ec60a89f5"; - sha256 = "0i7pgdxrx2ijf67sy4x2xab416s458mgac261ng2522z87szddah"; + rev = "086d1539e681e38829e3861cffdf62e49213ed58"; + sha256 = "17prr6b5za43mahdfz355k1p1b2jkwd1csb6wlph5g4nmplh5c61"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9182f92dd62e2f1775a76699a6c8f9c3e71e9030/recipes/exotica-theme"; @@ -22083,12 +21478,12 @@ exwm-x = callPackage ({ bind-key, cl-lib ? null, counsel, exwm, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, swiper, switch-window }: melpaBuild { pname = "exwm-x"; - version = "20170903.2138"; + version = "20170916.2015"; src = fetchFromGitHub { owner = "tumashu"; repo = "exwm-x"; - rev = "cee7cc0e6dd6d1c481480f1978b6487287b4f637"; - sha256 = "0kwrm2bz09i8dj0zz7pznpv0hy08pxl4kzl46c470abvs2dzrp67"; + rev = "abb210ff56134cc6a285d91b875f3115bc951ad0"; + sha256 = "1l7578jfn3va6bpkjfbazygsn8asxhc7cpss32mnsrzkm1ix6sz8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a0e6e23bcffdcd1e17c70599c563609050e5de40/recipes/exwm-x"; @@ -22175,12 +21570,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "20170906.821"; + version = "20171007.939"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "63395a2367d1d48983a9363d2d0bf518177297bd"; - sha256 = "15vgv0z4vzdnc3vb98j2hy4bv5x83f4c1dzgx49r61vka7p5is0q"; + rev = "909a84dc5959aac982d1c296e82d687d172d3ecd"; + sha256 = "0mw9h55f708mv0ngixmdn7976yrhqjcnzac80f6mzddpwavgrhd6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -22277,72 +21672,15 @@ license = lib.licenses.free; }; }) {}; - face-remap-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "face-remap-plus"; - version = "20170222.1742"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/face-remap+.el"; - sha256 = "1p42wjzl2brbqv3vh3g1rcgh5m9a7bix5q80pg7r6515as8kykad"; - name = "face-remap+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/face-remap+"; - sha256 = "0vq6xjrv3qic89pxzi6mx1s08k4ba27g8wqm1ap4fxh3l14wkg0y"; - name = "face-remap-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/face-remap+"; - license = lib.licenses.free; - }; - }) {}; - facemenu-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "facemenu-plus"; - version = "20170222.1744"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/facemenu+.el"; - sha256 = "0nnaqmdsf6ksk6663924bpw3mrldybj6jjkgj0525nhpfjx7x4yq"; - name = "facemenu+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/facemenu+"; - sha256 = "0lbggalgkj59wj67z95949jmppmqrzrp63mdhw42r2x0fz1ir0iv"; - name = "facemenu-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/facemenu+"; - license = lib.licenses.free; - }; - }) {}; - faces-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "faces-plus"; - version = "20170222.1745"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/faces+.el"; - sha256 = "0a80027a78zad0nxlkmv69b2zzbz4b29rsn4ivgb313r4c24igzx"; - name = "faces+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/faces+"; - sha256 = "0k3m434f3d3061pvir0dnykmv6r9jswl7pzybzja3afiy591hh92"; - name = "faces-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/faces+"; - license = lib.licenses.free; - }; - }) {}; faceup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faceup"; - version = "20170126.1305"; + version = "20170925.1246"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "faceup"; - rev = "688b487ad0a78c8707c5aded50e1d85551270034"; - sha256 = "1wmmj69wgzgac5y7gnrz84dvwjzd45h3rr434vv4dxnam0j0lj40"; + rev = "6c92dad56a133e14e7b27831e1bcf9b3a71ff154"; + sha256 = "1yzmy7flrhrh0i10bdszx8idx6r8h6czm4vm4q0z6fp5fw94zwrx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a10bf2928b93c3908e89ca8ad9649bb468ebca05/recipes/faceup"; @@ -22592,8 +21930,8 @@ version = "20170908.658"; src = fetchgit { url = "https://bitbucket.org/yassinphilip/faustine"; - rev = "feb938af3a5363e0e0210aa98a447e1896ceca47"; - sha256 = "1c0xc1nk9djjk39ksysszliphibnpm7c472p4lvgkmrsmg28i23k"; + rev = "ae67cd9d1a2625d80726dace9dd83539e71d1b36"; + sha256 = "1wvf37g2bb9xbxi0qxn1sfq0ygaqxfzsnzdbnail6f29qyl541al"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b298e399335efbbdbc6e9bb06ab915fc07909faa/recipes/faustine"; @@ -22609,12 +21947,12 @@ fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fcitx"; - version = "20170812.1131"; + version = "20170913.1900"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "fcitx.el"; - rev = "6d552ab44234ed78ce9a50f2412f56197266bc9f"; - sha256 = "08l859rw1lwj6hdxrlxqlxf1cfxv8yv9h1jsgs5zfis3hp7nq39j"; + rev = "095332fbeb994c908c533fe2ad068c0728211c3d"; + sha256 = "01sm50rqajylah2hx6n5ig0xmrrhxbamzs4bg97qzxzr4nlnjcaz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx"; @@ -22751,44 +22089,6 @@ license = lib.licenses.free; }; }) {}; - files-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "files-plus"; - version = "20170222.1746"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/files+.el"; - sha256 = "1ch7k4gpfcb5k6z656rprdcvxp75wsfjhw5l6x8f05qbmm0cbimv"; - name = "files+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/files+"; - sha256 = "1m1pxf6knrnyc9ygmyr27gm709ydxf0kkh1xrfcza6n476frmwr8"; - name = "files-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/files+"; - license = lib.licenses.free; - }; - }) {}; - filesets-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "filesets-plus"; - version = "20170222.1748"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/filesets+.el"; - sha256 = "0i9nc9zhpj208as9pynnh6xvr0qk53y7bpg2gw4gak9xr9xywbpg"; - name = "filesets+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/filesets+"; - sha256 = "06n8pw8c65bmrkxda2akvv57ndfijgbp95l40j7sjg8bjp385spn"; - name = "filesets-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/filesets+"; - license = lib.licenses.free; - }; - }) {}; fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fill-column-indicator"; @@ -22873,25 +22173,6 @@ license = lib.licenses.free; }; }) {}; - find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "find-dired-plus"; - version = "20170409.1832"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/find-dired+.el"; - sha256 = "0zfqkw9vghbzvdh3iyqkkdq777bb1yhfgqk7p28dxz861z13cmfs"; - name = "find-dired+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/find-dired+"; - sha256 = "190cj41b6s1l6gk1m0rbwfsdciw4my39ncppdxf9pi7gzhcjpznr"; - name = "find-dired-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/find-dired+"; - license = lib.licenses.free; - }; - }) {}; find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; @@ -22976,25 +22257,6 @@ license = lib.licenses.free; }; }) {}; - finder-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "finder-plus"; - version = "20170222.1752"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/finder+.el"; - sha256 = "0h1jsgb7vivmbay35s9bx8dpl7l88zdh1f6ymdm16b0alpiv4p14"; - name = "finder+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/finder+"; - sha256 = "1ichxghp2vzx01n129fmjm6iwx4b98ay3xk1ja1i8vzyd2p0z8vh"; - name = "finder-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/finder+"; - license = lib.licenses.free; - }; - }) {}; findr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "findr"; @@ -23163,25 +22425,6 @@ license = lib.licenses.free; }; }) {}; - fit-frame = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "fit-frame"; - version = "20170222.1754"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/fit-frame.el?revision=63"; - sha256 = "1wm2jc7h5zhv695wf21l3n9gjn31ddgd0vybx8brj1nbvavifs0x"; - name = "fit-frame.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e13c77f822db3c9eaeb3fd5fa95cc2dbe5133f2c/recipes/fit-frame"; - sha256 = "1xcq4n9gj0npjjl98vqacms0a0wnzw62a9iplyf7bgj7n77pgkjb"; - name = "fit-frame"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fit-frame"; - license = lib.licenses.free; - }; - }) {}; fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fix-input"; @@ -23420,6 +22663,27 @@ license = lib.licenses.free; }; }) {}; + flex-compile = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "flex-compile"; + version = "20171006.905"; + src = fetchFromGitHub { + owner = "plandes"; + repo = "flex-compile"; + rev = "e2a2820282458cad5bcac4037baa6c2e76b1bdce"; + sha256 = "15dlfayyrcy54davrha8vm87vbip01sbqxgdjfbri4y134fljrk8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/259caeebc317e81ab9d532a371ea85656c2b1619/recipes/flex-compile"; + sha256 = "1hlh4k7qgln87xajnjjhf1yyg6bgdwd0iczhlfw8gdwfj5xpjd38"; + name = "flex-compile"; + }; + packageRequires = [ buffer-manage dash emacs ]; + meta = { + homepage = "https://melpa.org/#/flex-compile"; + license = lib.licenses.free; + }; + }) {}; flex-isearch = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flex-isearch"; @@ -23482,25 +22746,6 @@ license = lib.licenses.free; }; }) {}; - fliptext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "fliptext"; - version = "20131113.1818"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/fliptext.el?revision=4"; - sha256 = "1viigj04kla20dk46xm913jzqrmx05rpjrpghnc0ylbqppqdwzpw"; - name = "fliptext.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/093046dfb39148d56681e9c8be8cccff23dd19cb/recipes/fliptext"; - sha256 = "0cmyan9hckjsv5wk1mvjzif9nrc07frhzkhhl6pkgm0j0f1q30ji"; - name = "fliptext"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fliptext"; - license = lib.licenses.free; - }; - }) {}; floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }: melpaBuild { pname = "floobits"; @@ -23525,12 +22770,12 @@ flow-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flow-minor-mode"; - version = "20170729.1008"; + version = "20170916.312"; src = fetchFromGitHub { owner = "an-sh"; repo = "flow-minor-mode"; - rev = "75067baceed7d699dda43944da49dc58d22baeff"; - sha256 = "0r1xs3vff3ng0h2w8nn7mxssdnipnrzwk9dh5f5v7prwk2q60byb"; + rev = "93184633933b5aa62e6e92b7fe1311261012e591"; + sha256 = "1laainsc5l4l4r5j17hblv7b1ppxrgfak73ama1qn7kb14y1jfrf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66504f789069922ea56f268f4da90fac52b601ff/recipes/flow-minor-mode"; @@ -23630,12 +22875,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20170911.127"; + version = "20171007.33"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "eeb915b51f2fe9f7afe125b1028737b8c2b44712"; - sha256 = "13dsjngb5lbhzrlcw3skk7v6j7c2k3vn596msin9f6ssjwmgc94k"; + rev = "b339f0efd72db0fea00964c224c20c6ee8ef92c8"; + sha256 = "0vyp9l8190xgy27jil0pfvc9j0hjwfiq0w0ia69flid0jxgirslz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -23861,12 +23106,12 @@ flycheck-color-mode-line = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-color-mode-line"; - version = "20170512.1607"; + version = "20170929.1513"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-color-mode-line"; - rev = "b2b20727d133c05fd31eac7b9b5c0886bbca8f98"; - sha256 = "1dgm9i2b9irp454ag9pv96hbacz1j3gsapk96xr45wjh4hblgwa3"; + rev = "19947b81ddce6df4f10d3facb7c047538036a9df"; + sha256 = "197knp91qx5y3kqbmnm4mcx61w73yr9xkvidvp96mfjzlldbjaz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02b5b60b74581ff0d1815155223e0c6e94a851a1/recipes/flycheck-color-mode-line"; @@ -24344,12 +23589,12 @@ flycheck-joker = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-joker"; - version = "20170415.2009"; + version = "20171003.2222"; src = fetchFromGitHub { owner = "candid82"; repo = "flycheck-joker"; - rev = "43a25fe17ba6ade96fc865bd8ec3fb3c131aa419"; - sha256 = "0m2msyyshbr6pgnjqybv8b1fj0axja3la0drbbbk0va1cn556wfs"; + rev = "c34c3922a2e8bc918f250602e0ddf655cdcad456"; + sha256 = "0fp7h0pmxk02x1kisqvnb9wkjjn9bl91capmnllrb7qmb24w6pd5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/599bf33a5d4a4a590b355001e532cab4e1ee9ef6/recipes/flycheck-joker"; @@ -24428,12 +23673,12 @@ flycheck-liquidhs = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-liquidhs"; - version = "20150618.1922"; + version = "20170412.1626"; src = fetchFromGitHub { owner = "ucsd-progsys"; repo = "flycheck-liquidhs.el"; - rev = "ee0d3bd0d5e07a872e541d02c112f1cc204db922"; - sha256 = "1wwn9dnzn4vrh747dgbcm944bp3z02gzxd32afjc9k2dsn32qvz2"; + rev = "c27252ac24d77f4b6eec76a4ba9cd61761a3fba9"; + sha256 = "1v5s252w2ai0rrci0rkq6wsx110pw8hp60n67990jg6l6lpvir2s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d5921fde4068ff1bb288f6f9e2fe03f4a7fdbbda/recipes/flycheck-liquidhs"; @@ -24743,12 +23988,12 @@ flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pycheckers"; - version = "20170810.1143"; + version = "20170928.1808"; src = fetchFromGitHub { owner = "msherry"; repo = "flycheck-pycheckers"; - rev = "220c551df591792d08fc9d149ab3329171743cb9"; - sha256 = "0q1sz28nlnamcm4l587q94b7cyak9d4wpgpr33a05m9lw4a6z74i"; + rev = "fedb4094976349da1449f821fd79cacd7537e80b"; + sha256 = "0cxpcmx810zkrnqbzj064kgbsyj4qkr7dpps16xdk4ckbiih55rj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; @@ -24810,8 +24055,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25"; - sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39"; + rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; + sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/flycheck-rtags"; @@ -24869,12 +24114,12 @@ flycheck-status-emoji = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "flycheck-status-emoji"; - version = "20170405.1600"; + version = "20170923.1439"; src = fetchFromGitHub { owner = "liblit"; repo = "flycheck-status-emoji"; - rev = "c4e891ad287c12b83b754ada27b4550fb763c07f"; - sha256 = "12nlzs4fha1bmq1xbfgf5j4wg9llacl2m3jr8fbk8144pyss3kg5"; + rev = "e85072a04f4277a48d90364b8e48fcb26a650d38"; + sha256 = "12k0nakwv7z90fprpzfrsnmha0w5zsvpq7qiv0md3k3h41b5mgfv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5abd6aaa8d2bf55ae75cd217820763531f91958b/recipes/flycheck-status-emoji"; @@ -24911,12 +24156,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "20170409.25"; + version = "20170926.317"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "6b0b7c6fffc86809d0535afebd6b0972059992d5"; - sha256 = "0d411idv9ib1jhmdbjb8ycc8clmm1ygpwapaka3d50gkgrmfin4q"; + rev = "756833425f51baa9eb0a2fa7493df6e68612c88d"; + sha256 = "1hvrg717q0nlz4r8wby82gs3vdx8fdhf38rg4j77j3fqfmxdd3fi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -25013,6 +24258,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-yang = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yang-mode }: + melpaBuild { + pname = "flycheck-yang"; + version = "20170915.1308"; + src = fetchFromGitHub { + owner = "andaru"; + repo = "flycheck-yang"; + rev = "c5f65fe3f710f73d56e04d077868719afc1ebfaf"; + sha256 = "00w91mif3wnxgj93qag51yyadnfcsyxik96vf91qlfvwh4wi6ii7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e58b4f4294d11424918b399898c0044f5b76ab14/recipes/flycheck-yang"; + sha256 = "0agfmirjwlz13aq1jh94agav0y1rxkyhj7mngdgys7mwjxy0ac9h"; + name = "flycheck-yang"; + }; + packageRequires = [ flycheck yang-mode ]; + meta = { + homepage = "https://melpa.org/#/flycheck-yang"; + license = lib.licenses.free; + }; + }) {}; flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: melpaBuild { pname = "flycheck-ycmd"; @@ -25020,8 +24286,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "fd037efae08628e41480e9dad705dcc1f64e498d"; - sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6"; + rev = "393724d0d36a8269e57a0e4c2b3723071caf0a3c"; + sha256 = "02pm3x9frscgz5szddvbir0i7amnkzfj7pl4lgiah57bhcg1lhd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/flycheck-ycmd"; @@ -26003,12 +25269,12 @@ folding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "folding"; - version = "20140401.3"; + version = "20170925.838"; src = fetchFromGitHub { owner = "jaalto"; repo = "project-emacs--folding-mode"; - rev = "f738e28cd90d794aff698bcd44bf4f5027c92839"; - sha256 = "1z2dkyzj1gq3gp9cc3lhi240f8f3yjpjnw520xszm0wvx1rp06ny"; + rev = "3bf134fd1ecfa8767ab7020c25281ea5ce9968a2"; + sha256 = "0kcm4k71syz778cbwqf68a63k4vmhygaib3ylwxbm5dq1dmr7iry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1912296b7879019bea5ba8353d511496e3a9ca2d/recipes/folding"; @@ -26021,25 +25287,6 @@ license = lib.licenses.free; }; }) {}; - font-lock-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "font-lock-plus"; - version = "20170222.1755"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/font-lock+.el"; - sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs30"; - name = "font-lock+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/font-lock+"; - sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g"; - name = "font-lock-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/font-lock+"; - license = lib.licenses.free; - }; - }) {}; font-lock-profiler = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "font-lock-profiler"; @@ -26127,16 +25374,16 @@ forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forecast"; - version = "20170618.1048"; + version = "20170924.1440"; src = fetchFromGitHub { owner = "cadadr"; - repo = "forecast.el"; - rev = "96e37ca81a42061f0e837cc3c4dec1844f682e91"; - sha256 = "0hbz2q9sm70r7sxk56dlnzwh71ckrww7w43xxy3ys1r3p7b3j3aq"; + repo = "elisp"; + rev = "b3d8b45c76134e2248448d719c840776e41b747a"; + sha256 = "0fy0b04mf3brx86xjnidkwg4zs4nh123nc6pgrl4mp6d6552vv98"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast"; - sha256 = "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/forecast"; + sha256 = "0zng8xdficpfccq484pghzg8yylihcy8aq0vpxd1w6l40m2qf6zn"; name = "forecast"; }; packageRequires = [ emacs ]; @@ -26355,45 +25602,6 @@ license = lib.licenses.free; }; }) {}; - frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }: - melpaBuild { - pname = "frame-cmds"; - version = "20170819.1358"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/frame-cmds.el?revision=95"; - sha256 = "169g11vs3d5gr8y1lwg7lgl21dpfca33m1c6w24mfmga4xr9042w"; - name = "frame-cmds.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-cmds"; - sha256 = "0xwzp6sgcb5ap76hpzm8g4kl08a8cgq7i2x9w64njyfink7frwc0"; - name = "frame-cmds"; - }; - packageRequires = [ frame-fns ]; - meta = { - homepage = "https://melpa.org/#/frame-cmds"; - license = lib.licenses.free; - }; - }) {}; - frame-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "frame-fns"; - version = "20170222.1759"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/frame-fns.el?revision=31"; - sha256 = "1yl51wnmlmbirrhcf07rnqix62q7ijymwfbahwjsz2s18g2zyj6n"; - name = "frame-fns.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-fns"; - sha256 = "1wq8wva9q1hdzkvjk582a3fgig0lpqz9ch1p2jd6p29kb1i15f5p"; - name = "frame-fns"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/frame-fns"; - license = lib.licenses.free; - }; - }) {}; frame-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "frame-mode"; @@ -26436,25 +25644,6 @@ license = lib.licenses.free; }; }) {}; - framemove = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "framemove"; - version = "20130328.433"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/framemove.el?revision=4"; - sha256 = "03ll68d0j0b55rfxymzcirdigkmxcy8556d0i67ghdzmcqfwily7"; - name = "framemove.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f075338369dbf0694205c1b2c35dc16821f6dc92/recipes/framemove"; - sha256 = "10qf017j0zfnzmcs1i56pznhbvgw7mv4232p8znqaaxphgh6r0ar"; - name = "framemove"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/framemove"; - license = lib.licenses.free; - }; - }) {}; frames-only-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "frames-only-mode"; @@ -26462,8 +25651,8 @@ src = fetchFromGitHub { owner = "davidshepherd7"; repo = "frames-only-mode"; - rev = "dbe2725846ab9d90b309fe0f5e303e600a7d1661"; - sha256 = "0c6xq2l9hzw2gavnwzwp5gg7nzvf7dl1x8qh7aabchd4a8c050rb"; + rev = "d2e6a825e2079adb58012e9677c494d317494724"; + sha256 = "1x8w2788yaqfi5ys541kp4wi3rcfa2lvbhnxgd8dwr9h0da332xa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e628416ad9420b3ac5bbfacf930a86d98958ac8/recipes/frames-only-mode"; @@ -26605,12 +25794,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "20170617.1330"; + version = "20170918.842"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "9766952bd7830cb0d319736961af8e42e67d42fe"; - sha256 = "1krncbzdhp6kpypaqdn6fhvxhhc1pvy2ayn4w4ljmsd7wx6zazyi"; + rev = "71435fdd100712d6894d8d72a5667b250a0d8eb7"; + sha256 = "1c718gfms4zhzj06zmzdw71q6vhbf7mh3cgvq9vf8bnlv910p832"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -26634,12 +25823,12 @@ fstar-mode = callPackage ({ company, company-quickhelp, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, quick-peek, yasnippet }: melpaBuild { pname = "fstar-mode"; - version = "20170824.31"; + version = "20171004.806"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "9ffad30f11e97aeec4c8dcd353da8e14f1d3a9f3"; - sha256 = "15ij1i4a0g7vmb312cdsq70i76accijrjha6lr8bq9a4r167axcr"; + rev = "0e438c206059d268d085bb94d64782d4e2ae46b7"; + sha256 = "02wpp9q4aijv81vspvzgw9pjdmagflfnrd7w1m21xgw56hrg0mj5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c58ace42342c3d3ff5a56d86a16206f2ecb45f77/recipes/fstar-mode"; @@ -26667,8 +25856,8 @@ src = fetchFromGitHub { owner = "factor"; repo = "factor"; - rev = "705e7018c824e8160ecd8f0e81117dbebf6e90a0"; - sha256 = "16j855qg046q8p8dbsry1nr4ljfn90wk36yqrbcklb93m1g0f9ny"; + rev = "b8a0feea5cc28136d053888b45c50a6e0d3d07fd"; + sha256 = "1rmfvvxgjdng1wybri8a2lqcimf4ywpl1wx9q04zzl8zmm5f2diq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/fuel"; @@ -26747,12 +25936,12 @@ function-args = callPackage ({ fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "function-args"; - version = "20170822.1002"; + version = "20171006.1056"; src = fetchFromGitHub { owner = "abo-abo"; repo = "function-args"; - rev = "f4d2d1692f38f5acf6d209610371e008856357b5"; - sha256 = "1s5ajgig4na5mvymbxk4ncs6nfa8qirzgkp15x8rjx5kj1m22rxa"; + rev = "bb0f76412de0f791d82685b4131195e3127e2ccf"; + sha256 = "137fdy398f6fwp96pi7zqm3fmjlvdwh4h1kiivf8xasgp235f92z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80688d85a34b77783140ad2b8a47ef60c762b084/recipes/function-args"; @@ -26793,8 +25982,8 @@ src = fetchFromGitHub { owner = "HIPERFIT"; repo = "futhark"; - rev = "d4a741d1e87123c1691c3fcf9842895ba7d692f6"; - sha256 = "1zvk5mp1hk6lq0bmisl3nzmqclm00qjr74j3zl66q56sxn4sgxwf"; + rev = "a0ab1dc5d3f8e84e505d97041b3ce28a4cac94ce"; + sha256 = "0fka2dpv2gib19czg2p4x69h1d7s3hdg8j102qgc3da8d9vvhng8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; @@ -26828,44 +26017,6 @@ license = lib.licenses.free; }; }) {}; - fuzzy-format = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "fuzzy-format"; - version = "20130824.500"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/fuzzy-format.el?revision=6"; - sha256 = "1iv0x1cb12kknnxyq2gca7m3c3rg9s4cxz397sazkh1csrn0b2i7"; - name = "fuzzy-format.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/154cb0a10c81ce4907029f0eddc51108961c65ae/recipes/fuzzy-format"; - sha256 = "055b8710yxbi2sdqsqk6jqgnzky4nykv8jgqgwy8q2isgj6q98jb"; - name = "fuzzy-format"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fuzzy-format"; - license = lib.licenses.free; - }; - }) {}; - fuzzy-match = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "fuzzy-match"; - version = "20170222.1800"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/fuzzy-match.el?revision=23"; - sha256 = "1wxl900wikkzykzp95v84kcyw3m1d16hklhyqqhsmg58ph4i6r94"; - name = "fuzzy-match.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/fuzzy-match"; - sha256 = "0c1f4q985ag5qhv15iw2jhmpsyy09fbj87srp4k58lspjf40acdj"; - name = "fuzzy-match"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/fuzzy-match"; - license = lib.licenses.free; - }; - }) {}; fvwm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fvwm-mode"; @@ -27119,12 +26270,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20170827.1755"; + version = "20170928.2221"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "9581e61f9d8839281fe42344dd5fe885ea7359ea"; - sha256 = "0nx86pzncab0b7700m8sc7k3nzml4v9frrq77lljjcjhw71gnvnn"; + rev = "839dc555861dbb77ea2632b8dd4d58904f33a396"; + sha256 = "1hykxw6a14d6xivin44bfbgr8dy4l5pr50cg0fk4n18a7dym7pjj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -27245,12 +26396,12 @@ ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ggtags"; - version = "20170827.510"; + version = "20170918.1838"; src = fetchFromGitHub { owner = "leoliu"; repo = "ggtags"; - rev = "9d1ecf961dd964cbe8ea183eac23572bb4f8f4ee"; - sha256 = "1iy7n39kjl8n5qhs2vc9vszq3ff8h883zd380d3g7zs9nw0xx7jf"; + rev = "6293c438a4a7aae08b8f5dd5fc0082d3da0aa530"; + sha256 = "0rb293wjnc36gjy1vvvqsy605nn0vli1b1w210vvcjbg7zgcsak1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags"; @@ -27434,12 +26585,12 @@ ghub-plus = callPackage ({ apiwrap, emacs, fetchFromGitHub, fetchurl, ghub, lib, melpaBuild }: melpaBuild { pname = "ghub-plus"; - version = "20170819.1806"; + version = "20171007.1056"; src = fetchFromGitHub { owner = "vermiculus"; repo = "ghub-plus"; - rev = "d6ee1158676f6fb62601fc20f02f4cbb7f090085"; - sha256 = "1r4zm1frbm2dwsnrfnsghfplxj81grwhhyjc421kjnfavkkflxnq"; + rev = "ac973a806e79ec883a3d041e91d06745084a622e"; + sha256 = "1063wh3h5vv17mmppwbpsi8l8qnph0203h1lr6lz5001xv9rih91"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/03a412fd25218ff6f302734e078a699ff0234e36/recipes/ghub+"; @@ -27623,12 +26774,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20170913.343"; + version = "20171007.346"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "ae72710292a94d9af92799d3ddeb86f365f34a56"; - sha256 = "1344dcngdk899xi9wjipvngq50xggbv06fb1w09zjzs8ckpsh8gf"; + rev = "12fc6cede637c7e2542e2225565366f2a0ad9fce"; + sha256 = "0ap1x0dshfivc0zljp96r2s5fhhnirqisrk3xsa94n2aidsf3y0q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -28274,12 +27425,12 @@ glab = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "glab"; - version = "20160808.539"; + version = "20170924.359"; src = fetchFromGitLab { owner = "tarsius"; repo = "glab"; - rev = "5ced0214622450930bcea105b9aac785c594609d"; - sha256 = "100lz4dqn9ggvlvdrp909cy44br9hnlaa62pj0kp1vdqqxfxwfyn"; + rev = "9848182275e0448390ccdd8dcd8e1e3a1853950c"; + sha256 = "1fw1ck85y9r6z331g1wj7rix29fwy6gwbm7vqj3wff0lszy208ba"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9375cbae3ffe5bf4ba5606358860050f3005d9b7/recipes/glab"; @@ -28295,12 +27446,12 @@ glsl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "glsl-mode"; - version = "20160209.833"; + version = "20170927.736"; src = fetchFromGitHub { owner = "jimhourihan"; repo = "glsl-mode"; - rev = "b4709644bb01b522ba9c8afe16ed2394783c481f"; - sha256 = "14ziljq34k585scwn606hqbkcvy8h1iylsc4h2n1grfmm8ilf0ws"; + rev = "384968506cf25c5c2df61b32fdfdbd041e3bf651"; + sha256 = "0729s4w010vw4ajvh1zpni7szxv9rpm6jk2y9hp7qyi67zbgjjgc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c416822d54df436f29dcf9a5f26398685fdc17a2/recipes/glsl-mode"; @@ -28526,12 +27677,12 @@ gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }: melpaBuild { pname = "gnus-desktop-notify"; - version = "20170305.1215"; + version = "20171007.1235"; src = fetchFromGitHub { owner = "wavexx"; repo = "gnus-desktop-notify.el"; - rev = "7d80d5e1894859e963584c55f570508fdf9c2ee0"; - sha256 = "1slj86f8c4pkl30xkv43vqwijd49nxya1bmhb8mqadncp3wapwr0"; + rev = "52e5de0961ce0f6890d5e7f26bc05152b99d9979"; + sha256 = "0r28hrlkji8z62nra71p0q6gvh21w90pyvmgskzjldmj78yjqbdj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/gnus-desktop-notify"; @@ -28565,25 +27716,6 @@ license = lib.licenses.free; }; }) {}; - gnus-spotlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "gnus-spotlight"; - version = "20130901.735"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/gnus-spotlight.el?revision=2"; - sha256 = "1r6bck1hsvk39ccri1h128jj8zd0fh9bsrlp8ijb0v9f6x3cysw4"; - name = "gnus-spotlight.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/004d48a59063163bfe5fbc5311330893d1b3b41c/recipes/gnus-spotlight"; - sha256 = "065jcix6a4mxwq8wc8gkr0x9lxmn6hlvf0rqmhi8hb840km1syjx"; - name = "gnus-spotlight"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/gnus-spotlight"; - license = lib.licenses.free; - }; - }) {}; gnus-summary-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnus-summary-ext"; @@ -28675,8 +27807,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "c7fddb39ecbc9ebd1ebe7d2a3af473ed0fffffa1"; - sha256 = "0qx8pq38faig41xkl1a4hrgp3ziyjyn6g53vn5wj7cdgm5kk67nb"; + rev = "1a78dd6c36d7f37cbb60073523c2e9ca3f6519fa"; + sha256 = "1bcd62rggq3sk96n3dlpidrv4pbx6x385x17knfnp35avgrhsv4b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -28822,8 +27954,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6"; - sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2"; + rev = "7eb5b3dd0ac31d176e9d56da4172f66aef8fae47"; + sha256 = "1gx8hpgj9pbhpqqg1n5lby03bkg0llbkvb6pnidnfayh338amiqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru"; @@ -28864,8 +27996,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6"; - sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2"; + rev = "7eb5b3dd0ac31d176e9d56da4172f66aef8fae47"; + sha256 = "1gx8hpgj9pbhpqqg1n5lby03bkg0llbkvb6pnidnfayh338amiqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode"; @@ -28948,8 +28080,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "99b06da201afb91e8db0c525c0f3c3590fd92fa6"; - sha256 = "0ss6fpjnz3h3g4d1rjv50sknzr112c2r5zwzy2aqp7sw24cz10r2"; + rev = "7eb5b3dd0ac31d176e9d56da4172f66aef8fae47"; + sha256 = "1gx8hpgj9pbhpqqg1n5lby03bkg0llbkvb6pnidnfayh338amiqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename"; @@ -29158,8 +28290,8 @@ src = fetchFromGitHub { owner = "golang"; repo = "lint"; - rev = "c5fb716d6688a859aae56d26d3e6070808df29f7"; - sha256 = "0bp9aarkinjr6m358qw9x4qxi3v9h06jvipyx1pg3pwsqh61vb12"; + rev = "6aaf7c34af0f4c36a57e0c429bace4d706d8e931"; + sha256 = "1z1j2l0j5175xvin5v56nsq7byg5nfpfvl9xgjszparchkyr8ndz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint"; @@ -29221,8 +28353,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "520cd9f88cc4bb6fa47345d566fffd8dd95c7450"; - sha256 = "1xghwnjl2wi78bcn4nhjdxhann18r1nczq47yia2rxl0yg61wwxk"; + rev = "911d9f4a7e3020578f4609860d7e5ede422a8f28"; + sha256 = "0x2wx34gvz4dab7gyzs1992pf1f8zl5s5n1q1b4ps1d4ralglq1d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -29259,12 +28391,12 @@ google-maps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-maps"; - version = "20161210.458"; + version = "20171002.734"; src = fetchFromGitHub { owner = "jd"; repo = "google-maps.el"; - rev = "956e6ad42bc3819bcaf4cc66a640f5079b385ed7"; - sha256 = "0dqcs9dl3170zddh4npsqm1ql0n0a0378gyqxk0vi0ibzch537vk"; + rev = "c0e5dccfdc9f7f77ff8f29177547be47833d7156"; + sha256 = "1agsfmbd2zbn1xs05kxlb32hhkmrri3hdmcrvf0w1fcsgc5a9085"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-maps"; @@ -29406,12 +28538,12 @@ gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gotham-theme"; - version = "20170822.1030"; + version = "20171007.0"; src = fetchFromGitHub { owner = "wasamasa"; repo = "gotham-theme"; - rev = "417d61978d139cb5d089c5365fc8d3166d76d3ac"; - sha256 = "0rc40cfj2mby1q7bk1pp1fxdi72nh9ip80spjdm1csvjjc4dbkwr"; + rev = "393da2aa55054b3ad06d24bf6f09a90554b6d37c"; + sha256 = "134cw4g0hj6msyxyni71hkhf8wa2v2fxr41zyamg8xf76j75jr5b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme"; @@ -29424,17 +28556,19 @@ license = lib.licenses.free; }; }) {}; - goto-chg = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { + goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "goto-chg"; - version = "20131228.659"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/goto-chg.el?revision=9"; - sha256 = "078d6p4br5vips7b9x4v6cy0wxf6m5ij9gpqd4g33bryn22gnpij"; - name = "goto-chg.el"; + version = "20170917.1200"; + src = fetchFromGitHub { + owner = "emacs-evil"; + repo = "goto-chg"; + rev = "81fca94d2592cf32bab451c39a9cd2d9b03fbd6b"; + sha256 = "033msplvpahkva9ha09gsg9232fyz2bjihrdxaa2z9g4yzql8jkq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/529897b0c076d9031e7ecd13c945d2104ce8c735/recipes/goto-chg"; - sha256 = "0fs0fc1mksbb1266sywasl6pppdn1f9a4q9dwycl9zycr588yjyv"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg"; + sha256 = "1yd4jq4zql4av9nr1sdk4nsnnk54c3brgjhpczndy1ipiaxlnydy"; name = "goto-chg"; }; packageRequires = []; @@ -29488,12 +28622,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20170801.942"; + version = "20170919.645"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "17b8c9ccb7f8c7b015d44c4ea39305c970a7bf31"; - sha256 = "0g1vd8g6kbmz5ni0hdqg4yjlisf1lcxnfhrzcnwim5pw8zj549k2"; + rev = "456200c5d4982d6938b7ed14fc9bb72cc12b1576"; + sha256 = "0i10i311fr7lc2mf7na1jwxfj2lmi3l4f1bx22f01q4yy32kv3ap"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -29618,8 +28752,8 @@ src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "36cd834c9fb1e438dfae4ad15a3580c963dba29f"; - sha256 = "0rkxchxjgpgbhng15knwxfv0bcysdbc6nlh61x8z793aj2m0whi9"; + rev = "167311c6c270f1bbcf51d2181e4af578a34c1ce7"; + sha256 = "17bvizl9m1wdv3k6b289la5q56iy6b0bd96axlhb0ff10n48y29h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/grails-mode"; @@ -29811,15 +28945,36 @@ license = lib.licenses.free; }; }) {}; + grayscale-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "grayscale-theme"; + version = "20171005.102"; + src = fetchFromGitHub { + owner = "belak"; + repo = "emacs-grayscale-theme"; + rev = "53ad50e10e68f2f076ebfc96e10ecef7a932d38d"; + sha256 = "034pa35cjl07bhqdyw3xrcl97xcdg7jg0jvgn034fs3hssmsyxgv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2993881c7285cfbfc590b4118db46bfd435817bc/recipes/grayscale-theme"; + sha256 = "0jbzb1zxv5mg3pivii31d4kz75igm339nw4cmx9kgzia9zal5f1r"; + name = "grayscale-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/grayscale-theme"; + license = lib.licenses.free; + }; + }) {}; green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "green-is-the-new-black-theme"; - version = "20170828.1056"; + version = "20171005.1641"; src = fetchFromGitHub { owner = "fredcamps"; repo = "green-is-the-new-black-emacs"; - rev = "2b1011836fc04940d542e9a783b99670a08b308b"; - sha256 = "16v7l4ynj4p1hq243rqckfgppmj8cvm0lyybjjqaqblqjd1ki90d"; + rev = "b9cdecd04691311c30c94ad4ec81124e63b9b122"; + sha256 = "124q733rirc8a2d9xfparphcjrrbxhp4wxf070l8hqp3p2764bka"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme"; @@ -29895,25 +29050,6 @@ license = lib.licenses.free; }; }) {}; - grep-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "grep-plus"; - version = "20170223.728"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/grep+.el"; - sha256 = "0jx2r21x8ndikvn8zvdnmwg8al56yi9gb0fcmplc3lnq4my6xcjr"; - name = "grep+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/grep+"; - sha256 = "1qj4f6d3l88bdcnq825pylnc76m22x2i15yxdhc2b6rv80df7zsx"; - name = "grep-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/grep+"; - license = lib.licenses.free; - }; - }) {}; greymatters-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "greymatters-theme"; @@ -29999,12 +29135,12 @@ groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "groovy-mode"; - version = "20170828.1026"; + version = "20170928.728"; src = fetchFromGitHub { owner = "Groovy-Emacs-Modes"; repo = "groovy-emacs-modes"; - rev = "36cd834c9fb1e438dfae4ad15a3580c963dba29f"; - sha256 = "0rkxchxjgpgbhng15knwxfv0bcysdbc6nlh61x8z793aj2m0whi9"; + rev = "167311c6c270f1bbcf51d2181e4af578a34c1ce7"; + sha256 = "17bvizl9m1wdv3k6b289la5q56iy6b0bd96axlhb0ff10n48y29h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe318b4e51a280a55c01fa30455e4a180df8bd6/recipes/groovy-mode"; @@ -30062,12 +29198,12 @@ gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruvbox-theme"; - version = "20170828.144"; + version = "20170923.2008"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "4e1c2616a31f33191daf20c0f9f744af5dd14468"; - sha256 = "1cgc8amxbj1839zx6vhpk96r1iag8mwnkdzd4wj6xabb59lvbjld"; + rev = "4241935d9cc786d0b4a3a445830c395f2a9eeb90"; + sha256 = "1x624xc2756pmb4h5ayls8r16zy33d9vxr0as4jm6q682h2swir6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; @@ -30104,12 +29240,12 @@ gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gscholar-bibtex"; - version = "20170713.1934"; + version = "20170913.1457"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "gscholar-bibtex"; - rev = "655bccf0b12c9d95ec992ee4bfb5c7c9a4d0c99b"; - sha256 = "1ivdq3mgym14v5hpv938248vifw1xk9z16d2f38d9xj01icik522"; + rev = "ba4ce159e385d695d8560e8b06b3cbe48424861c"; + sha256 = "0idnfhk17avp0r4706grjqqkz0xl98gs0bx7wrkvwym3y2gadlz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex"; @@ -30209,12 +29345,12 @@ guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: melpaBuild { pname = "guix"; - version = "20170902.1128"; + version = "20171005.137"; src = fetchFromGitHub { owner = "alezost"; repo = "guix.el"; - rev = "54bd174b514c5de11e82c4263ac2723addb0fe87"; - sha256 = "1i5kwzwlb6lx65rgixm8mbdi6x03n0hb4hbc7j76lar4j58ypwz2"; + rev = "6927d5afd2c4543bc97785d3f35e06a8b0fe86f3"; + sha256 = "1hyghwnnkl7fsq3wm7acp4ia7a7zp396wbmmyk3zw93lnpjhwkpn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; @@ -30314,12 +29450,12 @@ habitica = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "habitica"; - version = "20170203.2122"; + version = "20170924.857"; src = fetchFromGitHub { owner = "abrochard"; repo = "emacs-habitica"; - rev = "f3e326b7342953ffd5d3ced9266b46387b2bf9ce"; - sha256 = "0aixxlfp04vmipki7r7aqid2lsrzy7d38g09qc1hrjjdba7jrjlp"; + rev = "752bd376bcf1db563d503d554802aa0ff6e2c054"; + sha256 = "01g9kkfddn7lggbqw6s1vk3igbdjh0v6qslnlbp1llih8wa2vdlr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica"; @@ -30377,12 +29513,12 @@ hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "hackernews"; - version = "20170829.1044"; + version = "20170930.1313"; src = fetchFromGitHub { owner = "clarete"; repo = "hackernews.el"; - rev = "62442f76a0936047b5f66457298811c4f724a4f5"; - sha256 = "0pz3w726485yqww674ydrc3ffd0wrm9w0dgan0qyg3ggjj1fvjvs"; + rev = "520e8dca91b8c2bc1de852f577af46ed1b7cabcd"; + sha256 = "0951vb08sjpxx28cpaa8njirjw6fml60m91wa146cnxpngd68w6b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews"; @@ -30482,12 +29618,12 @@ haml-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haml-mode"; - version = "20170624.2148"; + version = "20170923.2153"; src = fetchFromGitHub { owner = "nex3"; repo = "haml-mode"; - rev = "c7c96a269f9b1a0302ff81360e1b5e693d784774"; - sha256 = "0lh9m0598rmwx9qacb6wjd12hf6njx7r1srl25bw60fs1l5bnvqd"; + rev = "1cbb2de8f0fc25f35448c5cad04642f28078f3bb"; + sha256 = "1045bf7bq914d3577kg9xakm4yciwwsvlh5qwfk4wnsraf7rld0r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/haml-mode"; @@ -30796,12 +29932,12 @@ hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "hasky-stack"; - version = "20170901.154"; + version = "20170928.359"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-stack"; - rev = "38a33e2ed02d57afb6b38bf36741f5bf7e38e45b"; - sha256 = "03zg58hrka2q7sqm3f14xgcs2mjxhlyybkf9w6pp8icr4wdsih4z"; + rev = "a3f890fb8570369898ee9718b128d4e7123a6585"; + sha256 = "0bc5i4s7aclwrsh8yrhfwwlfbcs5hdbzm31glikd487asv30jq9c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; @@ -30960,25 +30096,6 @@ license = lib.licenses.free; }; }) {}; - header2 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "header2"; - version = "20170223.729"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/header2.el?revision=69"; - sha256 = "0cv74cfihr13jrgyqbj4x0na659djfyrhflxni6jdbgbysi4zf6k"; - name = "header2.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/header2"; - sha256 = "1vvxb850njn921djvnf76q1p045sqr5hqk6v0p0amvjvih48v0zx"; - name = "header2"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/header2"; - license = lib.licenses.free; - }; - }) {}; headlong = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "headlong"; @@ -31003,12 +30120,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170912.523"; + version = "20171009.221"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "20fd1fdc80c05b1b2c03a9dd02f4a8358d2ed883"; - sha256 = "08rli1i3k1kvv7bavdb9s1y333cldxla9v0k3g7x72lyqncl25pr"; + rev = "8529bbd8a850bc0c212c38120621f2b2cc8a7656"; + sha256 = "1rav46bbw807cbv93ash7ah3azsxbrnnpcsfm14mmc9x3mmjygrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -31234,12 +30351,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20170808.1124"; + version = "20171003.131"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "8ed898fb5a68f18e9bb9973832a5c1f8abcfc463"; - sha256 = "14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz"; + rev = "299090ecb376ba269f2ffe547a672d210ddaceb3"; + sha256 = "07jym5zh07zksrn1f7x2j8m3agjzq06f9xchmiv7cic6x7b3shcj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -31633,12 +30750,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170906.141"; + version = "20170929.2213"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "20fd1fdc80c05b1b2c03a9dd02f4a8358d2ed883"; - sha256 = "08rli1i3k1kvv7bavdb9s1y333cldxla9v0k3g7x72lyqncl25pr"; + rev = "8529bbd8a850bc0c212c38120621f2b2cc8a7656"; + sha256 = "1rav46bbw807cbv93ash7ah3azsxbrnnpcsfm14mmc9x3mmjygrk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -31948,12 +31065,12 @@ helm-ext = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ext"; - version = "20170411.1049"; + version = "20170914.1348"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "helm-ext"; - rev = "fe50af14eebc9be72b026e823facfd0a80593248"; - sha256 = "1pz7i1byscfq2j73cfgcjqdx8s14h9qxnfmvs5g00m0y3g25hhc0"; + rev = "c2de41c4694ed606b321bcf83493dee93ad5635a"; + sha256 = "0bnnzf7pwg0qyx8hafgx6ckcc7n3pvf5j1qbipkzgnqmfqfli0n7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee74cb0aa3445bc9ae4226c2043ee4de3ac6cd3/recipes/helm-ext"; @@ -32725,12 +31842,12 @@ helm-lastpass = callPackage ({ csv, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-lastpass"; - version = "20170808.511"; + version = "20170914.142"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "helm-lastpass"; - rev = "3d07a1d68586980ae33dd7f84be00eaace31f7d2"; - sha256 = "1rn19hql62fgz1kiyxyw11h3h9m38nnhba9sghlrxj3wk11fm8gs"; + rev = "ae5d1252d60450082a5c26af3ad2be43994201ec"; + sha256 = "0qlcy8g9m3mfnr6p7kax6i1bq0dsxpz22vy5zjp24farx96mj5mi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a39f1b0a5b22e91eb9e298949def6c29e7bc5755/recipes/helm-lastpass"; @@ -32827,18 +31944,19 @@ license = lib.licenses.free; }; }) {}; - helm-ls-svn = callPackage ({ cl-lib ? null, emacs, fetchsvn, fetchurl, helm, lib, melpaBuild }: + helm-ls-svn = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ls-svn"; version = "20150717.39"; - src = fetchsvn { - url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el"; - rev = "154482"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "helm-ls-svn"; + rev = "4d4dc1a272f27fba5fdd7cc47e5d309b53c63ae3"; sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/99cc183c09b97264d243b4fe036574ce9c6b9687/recipes/helm-ls-svn"; - sha256 = "08mwzi340akw4ar20by0q981mzmzvf0wz3mn738q4inn2kqgs60d"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/helm-ls-svn"; + sha256 = "0rqsy6gk114khqr28bp2fi0ixaa8wbqd952yxph517p1pbfwxy66"; name = "helm-ls-svn"; }; packageRequires = [ cl-lib emacs helm ]; @@ -32850,12 +31968,12 @@ helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-make"; - version = "20170430.1053"; + version = "20171004.1018"; src = fetchFromGitHub { owner = "abo-abo"; repo = "helm-make"; - rev = "8bb531fa77fe1259cccdc2fa7629d65989684f16"; - sha256 = "1vvdk2f41aqhcb8hawk0x17ix1fyanvx3m2zd398lhv3r6mll0r4"; + rev = "786104ac0c3cf4fe5b53f841eb9fe10bda2e4031"; + sha256 = "0qdfk0p2j8jah7m0ngy2mm7775cn779m3a84yll86wqc74g331qs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make"; @@ -32980,8 +32098,8 @@ src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29"; - sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq"; + rev = "7007363e773a419203a69798fb0e0731b2eb0f73"; + sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/helm-nixos-options"; @@ -33249,12 +32367,12 @@ helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-projectile"; - version = "20170613.14"; + version = "20170926.1123"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "0e9ba276b3fbc420b8cbdc1b99262ccd5c750db7"; - sha256 = "155df7jyhjgqdks3ba1ca1k8w8aqka9vv3nhzpkvgz7wj84c95pq"; + rev = "4466adbcada8be19ec97b9dba52e12b8da3da849"; + sha256 = "1a4s3vs2vh2dz31an7jjrbyli1dsqwl7qcd1r63ak87klzpqn98b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; @@ -33547,8 +32665,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25"; - sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39"; + rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; + sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/helm-rtags"; @@ -33669,12 +32787,12 @@ helm-smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, smex }: melpaBuild { pname = "helm-smex"; - version = "20161202.1252"; + version = "20171004.1308"; src = fetchFromGitHub { owner = "ptrv"; repo = "helm-smex"; - rev = "7af4e4b44671f739b39584fc50c20084700701ac"; - sha256 = "1dhzglpd48mb47iyii8igb1dldvnr4alg18m7g8xb529dx8z9wni"; + rev = "2269375dfa452b88b5170d1a5d5849ebb2c1e413"; + sha256 = "0n2ki7g0hygsq4bi5zkhp3v772ld7niiajfznxmv11dgn949a52s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85568bd732da952053148e07b95e53f7caf5f62c/recipes/helm-smex"; @@ -33774,12 +32892,12 @@ helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-swoop"; - version = "20160619.953"; + version = "20170923.2127"; src = fetchFromGitHub { owner = "ShingoFukuyama"; repo = "helm-swoop"; - rev = "6d3fdcfb6dea06242efc8ff4cafff9917e558bfc"; - sha256 = "1pjpzccviz95zgl86yw2xda7lhlsfdddf8la8di8rka8sz79nw72"; + rev = "66a951700e0ef0621cc705791bdd6699488ab121"; + sha256 = "1j1qmbj4g5z891i1xyz8p34mk63ckpl1j80pznbhvb9ffl9aw976"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-swoop"; @@ -33900,12 +33018,12 @@ helm-w3m = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, w3m }: melpaBuild { pname = "helm-w3m"; - version = "20170904.711"; + version = "20170918.1017"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-w3m"; - rev = "57b8b0d3cad39abd02fab569ddd1c96336bbbad5"; - sha256 = "059jlyljlp5g7jh6bjdjd157l35apnwvxal1r18pipwfk1fcscxq"; + rev = "158f52abaa216cd64fc2c85f07722eceef508cec"; + sha256 = "1kvvgrfjpifrph1fgn4jvrhsrq8qq9z3w0ag9wjx5lb595svn4vh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f683fc9c7990e9ecb8a94808a7d03eb90c5569b1/recipes/helm-w3m"; @@ -33939,27 +33057,6 @@ license = lib.licenses.free; }; }) {}; - helm-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "helm-words"; - version = "20150413.1318"; - src = fetchFromGitHub { - owner = "pronobis"; - repo = "helm-words"; - rev = "637aa3a7e9cfd34e0127472c5b1f993a4da26185"; - sha256 = "19l8vysjygscr1nsddjz2yv0fjhbsswfq40rdny8zsmaa6qhpj35"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f8c5b91762d47a4d3024f1ed7f19666c6f2d5ce5/recipes/helm-words"; - sha256 = "0l9mb7g3xzasna1bw2p7vh2wdg1hmjkff40p8kpqvwwzszdm9v76"; - name = "helm-words"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/helm-words"; - license = lib.licenses.free; - }; - }) {}; helm-xcdoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-xcdoc"; @@ -34044,72 +33141,15 @@ license = lib.licenses.free; }; }) {}; - help-fns-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "help-fns-plus"; - version = "20170223.733"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/help-fns+.el"; - sha256 = "0n7sdzvplcb0zivpjq9x75kaid59yxr7sl85w7z99irx3kgpy9y4"; - name = "help-fns+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-fns+"; - sha256 = "10vz7w79k3barlcs3ph3pc7914xdhcygagdk2wj3bq0wmwxa1lia"; - name = "help-fns-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/help-fns+"; - license = lib.licenses.free; - }; - }) {}; - help-mode-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "help-mode-plus"; - version = "20170223.737"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/help-mode+.el"; - sha256 = "00yx1rhp7akap63c3nqh766zkjvfarmvm0xvza40i167wc7xmydg"; - name = "help-mode+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-mode+"; - sha256 = "1pmb845bxa5kazjpdxm12rm2wcshmv2cmisigs3kyva1pmi1shra"; - name = "help-mode-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/help-mode+"; - license = lib.licenses.free; - }; - }) {}; - help-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "help-plus"; - version = "20170223.731"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/help+.el"; - sha256 = "0zypqsj940cmb8szbk5acv47kaj3czg6yplx1lg5dynhvab3p29f"; - name = "help+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help+"; - sha256 = "1jx0wa4md1mvdsvjyx2yvi4hhm5w061qqcafsrw4axsz7gjpd4yi"; - name = "help-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/help+"; - license = lib.licenses.free; - }; - }) {}; helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "helpful"; - version = "20170910.1046"; + version = "20171008.1448"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "62ede4c121c0a0a9917682f28adf746e21bbfa45"; - sha256 = "1kp61f18l0ll9k1r72id2xgfdc857d5qhhh5pamp5ps6kjfpz6h6"; + rev = "aec98ee3c44c911936a309b56510384b8e835ff2"; + sha256 = "1x2f34bpzlckiyn2ndknm5gmra8xginsnavjqs4dn6n0knbcrq32"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -34122,6 +33162,27 @@ license = lib.licenses.free; }; }) {}; + hemera-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "hemera-theme"; + version = "20170910.603"; + src = fetchFromGitHub { + owner = "GuidoSchmidt"; + repo = "emacs-hemera-theme"; + rev = "354ae3b788c11ac08e6e2fe7c86adc621e2b16fd"; + sha256 = "00cfi9gsn9fvjpgxkz931p02gs8dcgwwsaqz3anss9qadxxmi9xv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/hemera-theme"; + sha256 = "0lxm06gv5f75s86320m8wh3dirdcspb6zd5n1a6l0pnn585xqkrn"; + name = "hemera-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/hemera-theme"; + license = lib.licenses.free; + }; + }) {}; hemisu-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hemisu-theme"; @@ -34206,25 +33267,6 @@ license = lib.licenses.free; }; }) {}; - hexrgb = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "hexrgb"; - version = "20170304.1213"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hexrgb.el?revision=75"; - sha256 = "1aj1fsc3wr8174xs45j2wc2mm6f8v6zs40xn0r4qisdw0plmsbsy"; - name = "hexrgb.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hexrgb"; - sha256 = "0b8lzmyv91f5bg7n2wj50p1pv6hpd2wygjcrffg4wwa52lp24dzk"; - name = "hexrgb"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hexrgb"; - license = lib.licenses.free; - }; - }) {}; hfst-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hfst-mode"; @@ -34309,25 +33351,6 @@ license = lib.licenses.free; }; }) {}; - hide-comnt = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "hide-comnt"; - version = "20170223.739"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hide-comnt.el?revision=25"; - sha256 = "1shkq45vm60nh2kkvf284nck8jwxh7f7m4c5d53k66mxn214h53m"; - name = "hide-comnt.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hide-comnt"; - sha256 = "0l3qvklyyc6hfinlzif7vfspl8b91ql0qdiwhixcilglyvad8r80"; - name = "hide-comnt"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hide-comnt"; - license = lib.licenses.free; - }; - }) {}; hide-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hide-lines"; @@ -34349,25 +33372,6 @@ license = lib.licenses.free; }; }) {}; - hide-region = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "hide-region"; - version = "20140201.314"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hide-region.el?revision=6"; - sha256 = "1zxrygpf47bzj6p808r3qhj3dfr3m8brp1xgxs33c7f88rinfval"; - name = "hide-region.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c5fc294a4d0cfa74530c98d81149fd0501ea7efe/recipes/hide-region"; - sha256 = "0nsc6m3yza658xsxvjz8766vkp71rcm6vwnvcv225r2pr94mq7vm"; - name = "hide-region"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hide-region"; - license = lib.licenses.free; - }; - }) {}; hideshow-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hideshow-org"; @@ -34389,25 +33393,6 @@ license = lib.licenses.free; }; }) {}; - hideshowvis = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "hideshowvis"; - version = "20170227.1250"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hideshowvis.el?revision=10"; - sha256 = "02a6v2m54r5nfbi54h1502aqh7gnz827pfi1sq266qyzj3p6yz12"; - name = "hideshowvis.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/881fd07512c417c0b98021af2a2c26eac4268a5f/recipes/hideshowvis"; - sha256 = "1ajr71fch3v5g8brb83kwmlakcam5w21i3yr8df00c5j2pnc6v1f"; - name = "hideshowvis"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hideshowvis"; - license = lib.licenses.free; - }; - }) {}; hierarchy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hierarchy"; @@ -34429,25 +33414,6 @@ license = lib.licenses.free; }; }) {}; - highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "highlight"; - version = "20170702.732"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/highlight.el?revision=149"; - sha256 = "0kh72fmqsha25rz0g3ff983badh20clsig7blrhvl8c4bv3sqs56"; - name = "highlight.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/603e9fc90e6e6cf7fe903cb3c38155c1a4f45278/recipes/highlight"; - sha256 = "0clv4mzy9kllcvc0cgsbx3a9anw68dc2c7vzwbrv13sw5gh9skc0"; - name = "highlight"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/highlight"; - license = lib.licenses.free; - }; - }) {}; highlight-blocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-blocks"; @@ -34469,44 +33435,6 @@ license = lib.licenses.free; }; }) {}; - highlight-chars = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "highlight-chars"; - version = "20170223.740"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/highlight-chars.el?revision=18"; - sha256 = "00rna5bs0ilgsdi5168djjpb3hg89yq20pp17sx5r3jcksm2fm4f"; - name = "highlight-chars.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/highlight-chars"; - sha256 = "19jawbjvqx1hsjbynx0jgpziap3r64k8s1xfckajrx8aq8m4c6i0"; - name = "highlight-chars"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/highlight-chars"; - license = lib.licenses.free; - }; - }) {}; - highlight-cl = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "highlight-cl"; - version = "20091012.1030"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/highlight-cl.el?revision=3"; - sha256 = "0r3kzs2fsi3kl5gqmsv75dc7lgfl4imrrqhg09ij6kq1ri8gjxjw"; - name = "highlight-cl.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc85d7fd8e4d7381850f4a379140c64506f86e8/recipes/highlight-cl"; - sha256 = "164h3c3rzriahb7v5hk2pw4i0gk2vk5ak722bai6x4zx4l1xp20w"; - name = "highlight-cl"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/highlight-cl"; - license = lib.licenses.free; - }; - }) {}; highlight-context-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-context-line"; @@ -34528,26 +33456,6 @@ license = lib.licenses.free; }; }) {}; - highlight-current-line = callPackage ({ fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "highlight-current-line"; - version = "20051013.1056"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/highlight-current-line.el?revision=4"; - sha256 = "1aki7a7nnj9n7vh19k4fr0v7cqbwkrpc6b3f3yv95vcqj8a4y34c"; - name = "highlight-current-line.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e2768ed5917ec2e2339412d8fbd146ca5a8a5042/recipes/highlight-current-line"; - sha256 = "01bga6is3frzlzfajpvpgz224vhl0jnc2bl2ipvlygdcmv4h8973"; - name = "highlight-current-line"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/highlight-current-line"; - license = lib.licenses.free; - }; - }) {}; highlight-defined = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-defined"; @@ -34820,34 +33728,15 @@ license = lib.licenses.free; }; }) {}; - highlight-tail = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "highlight-tail"; - version = "20140415.1841"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/highlight-tail.el?revision=5"; - sha256 = "1bbiyqddqkrp3c7xsg1m4143611bhg1kkakrwscqjb4cfmx29qqg"; - name = "highlight-tail.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d033ff8cceb7e6d1e5a9f0ec7b706eb28bfe30f3/recipes/highlight-tail"; - sha256 = "187kv3n262l38jdapi9bwcafz8fh61pdq2zliwiz7m7xdspp2iws"; - name = "highlight-tail"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/highlight-tail"; - license = lib.licenses.free; - }; - }) {}; highlight-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-thing"; - version = "20170207.2239"; + version = "20170919.704"; src = fetchFromGitHub { owner = "fgeller"; repo = "highlight-thing.el"; - rev = "c998172704ac4b96147d862a0eb4a0f97deb5e0a"; - sha256 = "0s441ya0fcw7sv1ah13dh0b0m2rcvf68a442knvnf06a07hpr5sr"; + rev = "4eadd178175772fb04ae50e1199d797a6375ad4d"; + sha256 = "1h2ka1fi0pdh0mx3z8sh4fvwyiyc18d56nl9wd4c96h3n93f7py0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84b6cb403ff9a588771d051e472596f4e3cc974d/recipes/highlight-thing"; @@ -34930,8 +33819,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "dde17a134ae99bd3c6e9b98ed04ad1740c2cd00b"; - sha256 = "1piyzinjz0khfpl96rgxg0f5yy4han16zqj7lcjd9xfzdx9rg4yg"; + rev = "4556ff94e6ed35eabdd28a061a07aadf436f0daf"; + sha256 = "1w5hwy1lszwcgqz43hw2mq95v6qm6ghxrzgrrw9p3cj2c4cz0kis"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -35133,25 +34022,6 @@ license = lib.licenses.free; }; }) {}; - hl-defined = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "hl-defined"; - version = "20170223.744"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hl-defined.el?revision=9"; - sha256 = "0sj1ypfawb1pxblm11zbfyy96f2mbpnmif972yqfrxzf5h20ra1y"; - name = "hl-defined.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/hl-defined"; - sha256 = "1y7vbhvpwxz70kja5hfm4i57mdd1cv43m4y9fr978y3nk265p8xx"; - name = "hl-defined"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hl-defined"; - license = lib.licenses.free; - }; - }) {}; hl-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-indent"; @@ -35173,34 +34043,15 @@ license = lib.licenses.free; }; }) {}; - hl-line-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "hl-line-plus"; - version = "20170621.734"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hl-line+.el"; - sha256 = "03bgx651nrnwqbclbfaabkw4h2iaiswnndqgms0w6lp3jjfc10wc"; - name = "hl-line+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hl-line+"; - sha256 = "16wlvi97wfkj36rnkbhzsky7sib3b76r2ng0lizp7ncr8d0vvhfv"; - name = "hl-line-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hl-line+"; - license = lib.licenses.free; - }; - }) {}; hl-sentence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-sentence"; - version = "20170812.646"; + version = "20171007.755"; src = fetchFromGitHub { owner = "milkypostman"; repo = "hl-sentence"; - rev = "1235ec94af083c3e43559ce0cac6db485aa938e0"; - sha256 = "1b58d79pkakfz2l31lg8nfkb1dfzrnbw4p5cs8mlxpfa5j4z13af"; + rev = "10cead52cb4da5dccfe30ba6756c11973d8ea094"; + sha256 = "1kl38jzgws5mw67yzg4055988sza36sdd8bq1dw68p9wi6kqpdqw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hl-sentence"; @@ -35234,25 +34085,6 @@ license = lib.licenses.free; }; }) {}; - hl-spotlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "hl-spotlight"; - version = "20170223.746"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hl-spotlight.el?revision=15"; - sha256 = "02x7p6hy1mkhbish55mzsdp6a1pnsdcfl4qi9cq48syg6cfm8fw3"; - name = "hl-spotlight.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/adb008d2da35dbd3fca63555f04dd8a0009380c6/recipes/hl-spotlight"; - sha256 = "1166g27fp2pj4j3a8904pzvp5idlq4l22i0w6lbk5c9zh5pqyyf3"; - name = "hl-spotlight"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/hl-spotlight"; - license = lib.licenses.free; - }; - }) {}; hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-todo"; @@ -35277,12 +34109,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20170807.1130"; + version = "20171003.647"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "fb314edbb193a1c640ae8f13c0373c7de26e2c8e"; - sha256 = "1gq6f1dhfwsm1xk5952nxv8j67bz230pnswf9s1zp21drxwgdk20"; + rev = "588c6a2df2ff4b8f77df49894808cf4ad3de6cad"; + sha256 = "18hjnha1imqiygydbbwwfldp0wvfhf02ffzhzd967nq6gvl0vzdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/hledger-mode"; @@ -35657,8 +34489,8 @@ src = fetchFromGitHub { owner = "hniksic"; repo = "emacs-htmlize"; - rev = "88e2cb6588827893d7bc619529393887c264d15a"; - sha256 = "09xpv8dsc39a7w9s6xnilc5kh1krs2jw8cklizxzz4gp36hrsj2n"; + rev = "1f7bd7290e4698ac0b26b911fde7727fcb609bc7"; + sha256 = "1cy1100qzdpkk7kcr54262jgc4zl9jqn66v51g72kmhc90ayj8bh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize"; @@ -35842,12 +34674,12 @@ hy-mode = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "hy-mode"; - version = "20170908.922"; + version = "20171008.1642"; src = fetchFromGitHub { owner = "hylang"; repo = "hy-mode"; - rev = "d44dce8475cd1e8d14a533c604c3c32fcdcd4a9f"; - sha256 = "19zv3xj4lzwv9vvlqsnn4nqxjhnq1hvl81qin1kr7z6bmhmidhns"; + rev = "6d45ce89f26efe7ed0652415d2e999e5afcc5802"; + sha256 = "0ycn3gn442ap6gc1z9snbmmlrwd97rsf10cr3agf1z3xhzz2jycn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154/recipes/hy-mode"; @@ -35926,12 +34758,12 @@ hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydra"; - version = "20170903.218"; + version = "20170924.2259"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "b12d37ac00d4f677b7684ed1af7d04d996167dbb"; - sha256 = "1aw0zca0xrqig7pj5gqfsrz8cblplb4ljh7k3k1hqsl1wpxav9kg"; + rev = "df3025f7e3cf3899168ae8ced1e9b734df2b32a0"; + sha256 = "1sbj699956vxbzbdagw5hbx168sx9cfrc5vx6m6s89v2rkq8fw8k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -36110,44 +34942,6 @@ license = lib.licenses.free; }; }) {}; - icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "icicles"; - version = "20170910.1711"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/icicles.el?revision=1089"; - sha256 = "10w1lghh9jqxxm5cszi2qyk24vnvazfywmyyz1v7zf6cyiwbndrz"; - name = "icicles.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/icicles"; - sha256 = "15h2511gm38q14avsd86j5mnxhsjvcdmwbnhj66ashj5p5nxhr92"; - name = "icicles"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/icicles"; - license = lib.licenses.free; - }; - }) {}; - icomplete-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "icomplete-plus"; - version = "20170303.1456"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/icomplete+.el"; - sha256 = "00wy0jqk6jdfh9izdpqq4y6x2x8q1m38sy6nb4ygfg3055lbhkam"; - name = "icomplete+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/fade28733f33e52a8622479de201f451c9a31c11/recipes/icomplete+"; - sha256 = "0gxqkj4bjrxb046qisfz22wvanxx6bzl4hfv91rfwm78q3484slx"; - name = "icomplete-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/icomplete+"; - license = lib.licenses.free; - }; - }) {}; id-manager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "id-manager"; @@ -36319,12 +35113,12 @@ ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, memoize, s }: melpaBuild { pname = "ido-completing-read-plus"; - version = "20170819.1045"; + version = "20170820.3"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "02f21215ce5ef2234c0e58dac9ec181cfc0900c1"; - sha256 = "1hvimcd3wh5xbmj9awgv4imvmvjigpysrlgsbjxk6j848gll0ll3"; + rev = "e2ea358725f03ae623ae03ed90715efb92a61030"; + sha256 = "1bai04fz6ln4dbc3lgglv11g6mibg40wci5ylmc90wgd38iw9gkn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-completing-read+"; @@ -36631,22 +35425,22 @@ license = lib.licenses.free; }; }) {}; - ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: + ido-ubiquitous = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ido-ubiquitous"; - version = "20170819.1045"; + version = "20170923.842"; src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "ido-completing-read-plus"; - rev = "02f21215ce5ef2234c0e58dac9ec181cfc0900c1"; - sha256 = "1hvimcd3wh5xbmj9awgv4imvmvjigpysrlgsbjxk6j848gll0ll3"; + rev = "e2ea358725f03ae623ae03ed90715efb92a61030"; + sha256 = "1bai04fz6ln4dbc3lgglv11g6mibg40wci5ylmc90wgd38iw9gkn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6104efc035bcf469d133ab9a2caf42c9d4482334/recipes/ido-ubiquitous"; sha256 = "11sdk0ymsqnsw1gycvq2wj4j0g502fp23qk6q9d95lm98nz68frz"; name = "ido-ubiquitous"; }; - packageRequires = [ cl-lib emacs ido-completing-read-plus ]; + packageRequires = [ cl-lib ido-completing-read-plus ]; meta = { homepage = "https://melpa.org/#/ido-ubiquitous"; license = lib.licenses.free; @@ -36760,12 +35554,12 @@ iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iedit"; - version = "20170909.423"; + version = "20170916.1024"; src = fetchFromGitHub { owner = "victorhge"; repo = "iedit"; - rev = "796ee5298dd3f4b7c51fbbcd9510a8631c5cbb4b"; - sha256 = "0k70i4k8rrgcj3cl6k4nki3k55fsd4yz8fnwaazhckjr6pvrwz8w"; + rev = "5b14cc9fcaef509c50f25cff872fba5d70b2c799"; + sha256 = "1vlfqh616id2kh35diwig6jswq5q5z22zwrpbdxkginag3sq8732"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/iedit"; @@ -36841,25 +35635,6 @@ license = lib.licenses.free; }; }) {}; - igrep = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "igrep"; - version = "20130824.507"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/igrep.el?revision=10"; - sha256 = "0qiv69v7ig38iizif7zg8aljdmpa1jk8bsfa0iyhqqqrkvsmhc29"; - name = "igrep.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/83c05578974289527082bb67338c35e70bbff8f2/recipes/igrep"; - sha256 = "1vyhrziy29q6w8w9vvanb7d29r1n7nfkznbcd62il991n48d08i3"; - name = "igrep"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/igrep"; - license = lib.licenses.free; - }; - }) {}; igv = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "igv"; version = "20141210.427"; @@ -36963,6 +35738,27 @@ license = lib.licenses.free; }; }) {}; + imake = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "imake"; + version = "20171006.450"; + src = fetchFromGitHub { + owner = "tarsius"; + repo = "imake"; + rev = "edd2e59f7996c35450987cf8f137ecb54777e9ca"; + sha256 = "12mq1ki001jgjdfr3fx43z1xz4jrki18rb0wkb7n956dvl34w0fg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28de8f7f5302b27c7c6600ad65a998119518be43/recipes/imake"; + sha256 = "0j732fi6999n9990w4l28raw140fvqfbynyh4x65yilhw95r7c34"; + name = "imake"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/imake"; + license = lib.licenses.free; + }; + }) {}; imapfilter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imapfilter"; @@ -37026,25 +35822,6 @@ license = lib.licenses.free; }; }) {}; - imenu-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "imenu-plus"; - version = "20170303.1457"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/imenu+.el"; - sha256 = "0dga9a61ckvd8w4nnz9z8z0iakaxminwn0lgmf8vfj2nwkd0m6hb"; - name = "imenu+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/imenu+"; - sha256 = "1v2h3xs5pnv7z5qphkn2y5pa1p8pivrknkw7xihm5yr4a4dqjv5d"; - name = "imenu-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/imenu+"; - license = lib.licenses.free; - }; - }) {}; imenus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenus"; @@ -37275,30 +36052,22 @@ license = lib.licenses.free; }; }) {}; - indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, memoize, seq, sourcemap, websocket }: + indium = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, sourcemap, websocket }: melpaBuild { pname = "indium"; - version = "20170829.637"; + version = "20171009.444"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "Indium"; - rev = "d98a9e0cd11d8230c4c3d0b59c4ac60520e34ebb"; - sha256 = "1q3yf45fmbjppv3ahb1gdb95pa3kyn18x5m23ihpxz1pziz3a074"; + rev = "261f3a8f4ce7edb8fb04457896fe747013a926b5"; + sha256 = "1yikx5b6yy138aplzpdxda5pssnchbkpp1xr9lsl869vi4q25igi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4292058cc6e31cabc0de575134427bce7fcef541/recipes/indium"; sha256 = "024ljx7v8xahmr8jm41fiy8i5jbg48ybqp5n67k4jwg819cz8wvl"; name = "indium"; }; - packageRequires = [ - company - emacs - js2-mode - memoize - seq - sourcemap - websocket - ]; + packageRequires = [ company emacs js2-mode seq sourcemap websocket ]; meta = { homepage = "https://melpa.org/#/indium"; license = lib.licenses.free; @@ -37328,12 +36097,12 @@ inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-clojure"; - version = "20170910.30"; + version = "20171005.1130"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "inf-clojure"; - rev = "864356a543cac50b24c67901d1d04c4e6160070a"; - sha256 = "07z131rxmwz3gwdy40qczz4is20jqdjylky7rsrxij5da3g017si"; + rev = "b048358406c24f5f22a3fc51c0a1348236bcfde1"; + sha256 = "0hw8981pi5xkcvs5023nj91vjq3agdlqabinmrrl0mj4wfh2q32q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d6112e06d1efcb7cb5652b0bec8d282d7f67bd9/recipes/inf-clojure"; @@ -37451,25 +36220,6 @@ license = lib.licenses.free; }; }) {}; - info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "info-plus"; - version = "20170830.1104"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/info+.el"; - sha256 = "0zxcqcd53fr0rf1s2fhax2a8kymk2mvg7vf7k92g8afvm888jnzj"; - name = "info+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+"; - sha256 = "0flpmi8dsaalg14xd86xcr087j51899sm8ghsa150ag4g4acfggr"; - name = "info-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/info+"; - license = lib.licenses.free; - }; - }) {}; inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inherit-local"; @@ -37787,12 +36537,12 @@ interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "interleave"; - version = "20170630.22"; + version = "20171003.2324"; src = fetchFromGitHub { owner = "rudolfochrist"; repo = "interleave"; - rev = "2c0458038bf0440f271f6e000039027be411eba7"; - sha256 = "0rpw1ms80hr01s76av8cvid4gvkd3sapx0c3g3a05za0bq1jqacw"; + rev = "87549df30cbc681baf86b238bd14c7cf7ec11fc4"; + sha256 = "07430hsyq9q90rjzxq7ifq4mlfc8k8b7l6b31s7xk1xm2snbky6b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave"; @@ -37808,12 +36558,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20170912.648"; + version = "20170926.911"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "7176857391c064e1f16a4f9fd0a51775cfedd42b"; - sha256 = "10w2jgr4nq2iff9jlk2kjbjf3hpbhlwgjvnnpvxnrkz4y4ap0bdi"; + rev = "2d3c04ce523674e79f9339189a79e6841e1fa587"; + sha256 = "1dgdbfxhhcda7hn9njvsjygn59rdx9wv9cgpj3aysll52zri8lh3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -37976,12 +36726,12 @@ ipcalc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ipcalc"; - version = "20160927.220"; + version = "20170926.105"; src = fetchFromGitHub { owner = "dotemacs"; repo = "ipcalc.el"; - rev = "e92afd8b96592b6e2d65ba073bf87c9dd2408e91"; - sha256 = "1s17wpdbrbkbmkndbwm0byy11cmymhs6yn7w0v5lvw5l2cgicxjg"; + rev = "2720f7e3e662e04e195f8338b81a499cf321296a"; + sha256 = "1kmqbb9ca3sca59462ha21grbgxkl4wynz2lr4yqb4qk7cijgd6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ipcalc"; @@ -38099,34 +36849,15 @@ license = lib.licenses.free; }; }) {}; - irfc = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "irfc"; - version = "20130824.507"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/irfc.el?revision=45"; - sha256 = "197ybqwbj8qjh2p9pkf5mvqnrkpcgmv8c5s2gvl6msyrabk0mnca"; - name = "irfc.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0b4f2dc79231b165bd3b03a728e2b872ed6c50c1/recipes/irfc"; - sha256 = "0186l6zk5l427vjvmjvi0xhwk8a4fjhsvw9kd0yw88q3ggpdl25i"; - name = "irfc"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/irfc"; - license = lib.licenses.free; - }; - }) {}; irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20170905.1316"; + version = "20171002.1130"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "72e1e73f3c9da2ad04286e13bfc8fc401626b7a9"; - sha256 = "155wvzsmhb8vz30jcd3xj91z74268pq7szax7jwd725ndx6x7ny8"; + rev = "a571167eca2533343f523f0c9ee3886de2d7b917"; + sha256 = "1jh2w800dgadmc1xgxrhmbs8i7bz4xh0h5bdrambnwl173ca23pf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -38181,44 +36912,6 @@ license = lib.licenses.free; }; }) {}; - isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "isearch-plus"; - version = "20170723.1826"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "0d7xsr71iadqzg81mv17dqyd0bdzkmljxlrpdlpycjyaf3z59aqr"; - name = "isearch+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/isearch+"; - sha256 = "0n9jh3bx2h6k4mvbwss16m34fxzlq6sb057rj16hgrlmbqknynhw"; - name = "isearch-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/isearch+"; - license = lib.licenses.free; - }; - }) {}; - isearch-prop = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "isearch-prop"; - version = "20170303.1504"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/isearch-prop.el?revision=79"; - sha256 = "0q18i76gq2pfnkqlbxlx2hndpy9mhbag302dvr8irk1kjwgngz5r"; - name = "isearch-prop.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/isearch-prop"; - sha256 = "1z9y88b23m4ffil8p3wcq61q1fiyqjxphyd3wacs5fnc53mdzad9"; - name = "isearch-prop"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/isearch-prop"; - license = lib.licenses.free; - }; - }) {}; isearch-symbol-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-symbol-at-point"; @@ -38432,12 +37125,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20170911.1034"; + version = "20171007.224"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "0a1d361b926291874124f8c63a653d83ead64a36"; - sha256 = "0ssbsllpv0lyr7dhnipwd7zgpxvfm36rldr7vkxh5maajdkamls7"; + rev = "6827edffb70890f2e94c3d146ed129bde581992d"; + sha256 = "0xwf8q73xisi1072dkkvf181sf9a7a6j9b9g24ismc3fn0q7216k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -38453,12 +37146,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20170808.1124"; + version = "20171003.131"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "8ed898fb5a68f18e9bb9973832a5c1f8abcfc463"; - sha256 = "14lyx0vbqr97p3anzrsp7m3q0kqclyjcdwplpraim403fcklzbnz"; + rev = "299090ecb376ba269f2ffe547a672d210ddaceb3"; + sha256 = "07jym5zh07zksrn1f7x2j8m3agjzq06f9xchmiv7cic6x7b3shcj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -38562,8 +37255,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "0a1d361b926291874124f8c63a653d83ead64a36"; - sha256 = "0ssbsllpv0lyr7dhnipwd7zgpxvfm36rldr7vkxh5maajdkamls7"; + rev = "6827edffb70890f2e94c3d146ed129bde581992d"; + sha256 = "0xwf8q73xisi1072dkkvf181sf9a7a6j9b9g24ismc3fn0q7216k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -38688,8 +37381,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25"; - sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39"; + rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; + sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/ivy-rtags"; @@ -39060,12 +37753,12 @@ java-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }: melpaBuild { pname = "java-imports"; - version = "20160311.1515"; + version = "20170913.710"; src = fetchFromGitHub { owner = "dakrone"; repo = "emacs-java-imports"; - rev = "f1631adacdd9fcb7a92ee4fdfb9e592a1a9c3b0b"; - sha256 = "1wk9i43b147bjcvhq27vcqxi6y1yl6w3n4i2sw3krk4vxcm1mwnm"; + rev = "e96ff44ed48b362ab6227b8b802b84d84f78bcaa"; + sha256 = "0nryawj8v6gj6hnb81yf6966kjnydcz49zsg2k355gldryqf4v5p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f6f4e4c14c422c2066f2200bb9b8f35e2ecc896/recipes/java-imports"; @@ -39225,22 +37918,22 @@ license = lib.licenses.free; }; }) {}; - jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }: + jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize, s }: melpaBuild { pname = "jdee"; - version = "20170506.1514"; + version = "20171007.835"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "e572d4889604c0b4e1d9180b8a68f9c0f99b99d2"; - sha256 = "1vhwza7xak2im2xp7qzs8b6bmnf9yw2di86rav8wh5xapqr8x7mn"; + rev = "ebe5d2e36a6a367376ed6cde590d5f805830ec9e"; + sha256 = "0rq8vp3pmnyabqzzplc91dk2ka48k809is9v4q486xv7y43013jh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; sha256 = "15n76w0ygjmsa2bym59bkmbbh0kpqx6nacp4zz32hlg48kgz1dx4"; name = "jdee"; }; - packageRequires = [ dash emacs flycheck memoize ]; + packageRequires = [ dash emacs flycheck memoize s ]; meta = { homepage = "https://melpa.org/#/jdee"; license = lib.licenses.free; @@ -39435,25 +38128,6 @@ license = lib.licenses.free; }; }) {}; - jira = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "jira"; - version = "20131210.1022"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/jira.el?revision=11"; - sha256 = "18b6hdqk59gnqh4ibq8lj59kbsg5gbyfb7vfcvpgmxjikpl3cgkz"; - name = "jira.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/jira"; - sha256 = "1zrywkwzqn5ffzzk3rmy01vj6afm2p9gm81rpc7s86cj3ywfy4wx"; - name = "jira"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/jira"; - license = lib.licenses.free; - }; - }) {}; jira-markup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jira-markup-mode"; @@ -39751,12 +38425,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20170815.1415"; + version = "20170930.820"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "df51992a648c7fb3e441106defdbffa2ef2f020d"; - sha256 = "08k0szwbwsgx2q1qm356f88jif36yqz8lnpylib24jy2plx24j5s"; + rev = "5cb52a7de8218bb2d50f67ba422fa7b2d51d1dc6"; + sha256 = "1b4kq8qix2lqhcqabbyhl3rzm99dzjspqqs6srgsgwvb9726q25f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -39958,6 +38632,27 @@ license = lib.licenses.free; }; }) {}; + jsonnet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "jsonnet-mode"; + version = "20171005.24"; + src = fetchFromGitHub { + owner = "mgyucht"; + repo = "jsonnet-mode"; + rev = "efe768fdcff25d746674fbbf229b9e1a7efea4f1"; + sha256 = "1a52266y83z9i3sg7hhc8sw7rhjy5i9wdy2bv7s2fv00lnngaj29"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ba17372732723f73e8eeb6e7c47abc0edeb20da4/recipes/jsonnet-mode"; + sha256 = "1aadys887szlc924qr645lby9f8vzvxkwhq6byhppk1b01h911ia"; + name = "jsonnet-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/jsonnet-mode"; + license = lib.licenses.free; + }; + }) {}; jss = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, websocket }: melpaBuild { pname = "jss"; @@ -40043,12 +38738,12 @@ julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "julia-mode"; - version = "20170710.538"; + version = "20170916.628"; src = fetchFromGitHub { owner = "JuliaLang"; repo = "julia-emacs"; - rev = "edaaff2e971a527460f838bebc0ef679f9a571b0"; - sha256 = "1sm57dq58fjbjjprl1bf7vibrvp6v5m4ipiq7r73c2bdg8rmaapm"; + rev = "115d4dc8a07445301772da8376b232fa8c7168f4"; + sha256 = "1is4dcv6blslpzbjcg8l2jpxi8xj96q4cm0nxjxsyswpm8bw8ki0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8522d197cb1b2c139959e7189765001c5ee7e61a/recipes/julia-mode"; @@ -40064,12 +38759,12 @@ julia-repl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "julia-repl"; - version = "20170708.2324"; + version = "20171005.123"; src = fetchFromGitHub { owner = "tpapp"; repo = "julia-repl"; - rev = "93b9d515e6f5fbacd42069a2ae6da3bd80b7c4d0"; - sha256 = "1xpdr343b5qa1pb92d5nz0m9lswq2s8nzg46msjnb1dvihqyb27w"; + rev = "2c5d681ddd3bc6018c394f797cb01add805ed573"; + sha256 = "0l8asipch5pfk90jzifw0jxwhsfq9kam8msxlxscvhfj7wphc038"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9a2a494969a9caf2f4513b12504379c9685047dc/recipes/julia-repl"; @@ -40316,12 +39011,12 @@ kakapo-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kakapo-mode"; - version = "20160727.2136"; + version = "20171003.2151"; src = fetchFromGitHub { owner = "listx"; repo = "kakapo-mode"; - rev = "bb6de027fb578df31652e58daa92522884ecc274"; - sha256 = "1y6ihk52jza07krz24l9axkwhi46fwi4h6bcjdck9q1qvdrcxw40"; + rev = "67d516138172fd60782df94454b3d0bd247e84f3"; + sha256 = "0r2n410arr48skcwm39c6mjhzsia117lb8xd7pc4854y0rbrvrvs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a43f0f1f6a0773240a51d379ec786c20a9389e7b/recipes/kakapo-mode"; @@ -40419,16 +39114,16 @@ kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-theme"; - version = "20170905.1243"; + version = "20171008.451"; src = fetchFromGitHub { - owner = "0rdy"; + owner = "ogdenwebb"; repo = "kaolin-theme"; - rev = "7bf265de58fe412d7f445ee84c460e6b90d7e0cf"; - sha256 = "1zd8vgg54hj8jycixh3vr34pf8grb02hhk10y1xh0ddpxw3mpb1s"; + rev = "bd105da4115d3685f14b511dbc975b22a1c94483"; + sha256 = "1iz288qygwcsz2gmnbcp9l92hbqvn27vkk07ik4bxgziksxyf2l4"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme"; - sha256 = "1316sn1xpli9aqbhn8sldyvsc2fwk1ql9aw4l0rgkfbivvcklp7c"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a67c2a3ad82efcb32ba4943c7ac10fe2768d9d51/recipes/kaolin-theme"; + sha256 = "009064hhn39f9w9qxa3m0kwqhj5a12j7hg4916j9hslpwy5ghc0c"; name = "kaolin-theme"; }; packageRequires = [ emacs ]; @@ -40927,8 +39622,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "f32bb16e5b477f5b54f3dc23ff048b490e906590"; - sha256 = "05lr10wnwghzsi59y7spy8a2jps11dmpm7wndzaj62nkx0d09a73"; + rev = "fed61946603baf381404ae74009f742ab277d848"; + sha256 = "1gxav0a4934z53sdkfa4wllzcfc5cnz66xcjayrzb17g1dxr3yzj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -40944,12 +39639,12 @@ kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kiwix"; - version = "20170508.1802"; + version = "20170927.120"; src = fetchFromGitHub { owner = "stardiviner"; repo = "kiwix.el"; - rev = "a62f9e7c17ab34b183b36ae63408123a75689a5b"; - sha256 = "0v86haw2nfd7q4yylzd0ls6916l95960c15khjnv1cfyshhri5q7"; + rev = "86dbead6c0017beefd92a0b64a0bb5f5d12c5b16"; + sha256 = "142mm1wy8zvlkzairnc1rjdi1lsq1asfk4zdbs1aria1nxz1sx6x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/kiwix"; @@ -41007,12 +39702,12 @@ kodi-remote = callPackage ({ elnode, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "kodi-remote"; - version = "20170818.2206"; + version = "20171008.2226"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "a032d13a3f39f260d7d00d62f32dce0f8a5927ab"; - sha256 = "0c883yprblda22jq3jjdz9nd6ha6dbwfn6n8y448qln8dzj9sd7p"; + rev = "479075d96857696cf029cd1f482b9f2f31d82452"; + sha256 = "0kvx43ny49j115kj6zpy1i5g87bjgiimfgj9xp2fn9830adymc24"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; @@ -41133,12 +39828,12 @@ kpm-list = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kpm-list"; - version = "20160310.1050"; + version = "20170924.652"; src = fetchFromGitHub { owner = "KMahoney"; repo = "kpm-list"; - rev = "6fb7db35f7dac7fb8f956c67ee2eea9d3fa54034"; - sha256 = "0hbzr5x9ykzrbwzfsf6rc4pbiw9m59ny3cgcx26nbi6ijbjl2fxj"; + rev = "e0f5112e5ce8ec1b603f4428fa51681c68bb28f5"; + sha256 = "1achcr3v0d85narnxqpbfxy9qfk537kl83wiq5lyfy3lwqqf7dmp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b7065d016e2da49277b165edf565bef5819d483/recipes/kpm-list"; @@ -41319,25 +40014,6 @@ license = lib.licenses.free; }; }) {}; - lacarte = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "lacarte"; - version = "20170307.837"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/lacarte.el?revision=41"; - sha256 = "0m3swrvxz0cy01pd4kag626fxqp4l2zzwpgr26yp5wpsfxl9avv8"; - name = "lacarte.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/lacarte"; - sha256 = "07rxgjax6ms0knjj5qplfy0hxzfhs6iqk4ny43566zzqv86n0bhi"; - name = "lacarte"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/lacarte"; - license = lib.licenses.free; - }; - }) {}; lang-refactor-perl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lang-refactor-perl"; @@ -41383,12 +40059,12 @@ langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "langtool"; - version = "20170606.432"; + version = "20170917.2154"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-langtool"; - rev = "d976e4f0cadb2309b798540429558936f8f45889"; - sha256 = "1qlgd5i8jngsq754jm44gb46p5y6j2cccacg72aklvwajay0adyh"; + rev = "bae4bdd240583b2253b4ff03af5295146e285103"; + sha256 = "0zwaddpmvkq7v5nnyzacmx0ql5zjlisvkqwa2knw3pihngr160cd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/503845e79e67c921f1fde31447f3dd4da2b6f993/recipes/langtool"; @@ -41928,12 +40604,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20170907.413"; + version = "20170919.252"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "b6889c336fc4f046138334ed700c5c9a13e39992"; - sha256 = "0j8d6h61nvz2gpkbf73v246srjg6wm93giijc7f0rks9g0nlp1rc"; + rev = "9d31a9d4ed763d6309e9d44985cd8b4a5a2fb500"; + sha256 = "0vr535a32cgkna0h1z8ac9cb4al3jb01bybn956rz51qdbzm2d1h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -41995,8 +40671,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "71d8e5bafc59424bacd23c8af4b368d5a6db686c"; - sha256 = "1wdxi1fbhw6k4dyq91vg7j33hcxjbhb1ydb5qaq292iach525wrq"; + rev = "2880c8a2a7fe998238b6490fe3e3c484b5c5985e"; + sha256 = "1xcnh1hk815wizhp7h1mik3npm7zpbvg4554nwbj072gnbb9j1nx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -42009,25 +40685,6 @@ license = lib.licenses.free; }; }) {}; - lib-requires = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "lib-requires"; - version = "20170307.855"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/lib-requires.el?revision=53"; - sha256 = "04lrkdjrhsgg7vgvw1mkr9a5m9xlyvjvnj2aj6w453bgmnp1mbvv"; - name = "lib-requires.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/lib-requires"; - sha256 = "1a69qf9dlsq5r7nm32hd0srzka7crd08gl82w8hjfvdhn43n2h0c"; - name = "lib-requires"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/lib-requires"; - license = lib.licenses.free; - }; - }) {}; libmpdee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "libmpdee"; @@ -42136,12 +40793,12 @@ link-hint = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "link-hint"; - version = "20170904.1442"; + version = "20170923.855"; src = fetchFromGitHub { owner = "noctuid"; repo = "link-hint.el"; - rev = "366bce32f8cb1aa5f0f1ce4eceb4d60cc802abd6"; - sha256 = "09k1cz3l2ql2fdn3kx43q3bjlwqcz67fw2as6m59951lyd8fnmxp"; + rev = "0294df85aee10b47fcf6c2c9bfe7e1038660fa21"; + sha256 = "0ixfrp6pfljgy5ja79cka0fa6a9ganwhh5myz6czqj4ykjzlyi2c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d24b48fe0bc127ae6ac4084be8059aacb8445afd/recipes/link-hint"; @@ -42288,34 +40945,15 @@ license = lib.licenses.free; }; }) {}; - lispxmp = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "lispxmp"; - version = "20170110.1508"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/lispxmp.el?revision=17"; - sha256 = "120wgxvckrgryfg2lvyx60rkcayii0g4ny2cdk3aiwsrpqcyhlyr"; - name = "lispxmp.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6fc8f86533402e4be8bac87ad66bc8d51c8d40f8/recipes/lispxmp"; - sha256 = "02gfbyng3dh2445jfkasxzjc9dlk02dafbfkjm40iwmb8h0fzji4"; - name = "lispxmp"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/lispxmp"; - license = lib.licenses.free; - }; - }) {}; lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20170911.1138"; + version = "20171007.209"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "134d815c843813950cbffc4516cabafd8ae75ed4"; - sha256 = "1xw8j3hjahp6vl3qnfab0kyl20zxclnbfpy9x1zp344zic61n02m"; + rev = "7de90475f922ea1ec757c16bc96d704b2d876198"; + sha256 = "13rx0ywbcplnh6swkmzq5ypd8a9ymd4w198pkl97cw5s6vzskh62"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -42412,26 +41050,6 @@ license = lib.licenses.free; }; }) {}; - list-processes-plus = callPackage ({ fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "list-processes-plus"; - version = "20131117.1135"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/list-processes+.el"; - sha256 = "1bssvyjgk1h1wiaxxdi2m5gjy6a790a9rwvi0r22hin7iskg300a"; - name = "list-processes+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d508d50d89c914c53211197afc758fc0e1154081/recipes/list-processes+"; - sha256 = "10x7hkba2bmryyl68w769fggw65dl4f3a9g0gqdzmkdj80rcipky"; - name = "list-processes-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/list-processes+"; - license = lib.licenses.free; - }; - }) {}; list-register = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "list-register"; @@ -42523,8 +41141,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "litable"; - rev = "4a57d7aeddca76448e4df2a46b42d49253e5e625"; - sha256 = "1zryrc0d2avb27w6a6yzqcc73rsr2rp795vi10qhb04ixda4a8w4"; + rev = "90a2dca14a6da9b24fe332a65cff899ab4a90810"; + sha256 = "1xaixgjfpnqnsdkhfia107fq5xaq2l0gdb0zp730z97958136mm3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74f2190b653907985e49a96ded986ab11b4946d7/recipes/litable"; @@ -42645,12 +41263,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20170906.2104"; + version = "20170928.2107"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "4d972a859e6a56d969b075688b425ac246b40962"; - sha256 = "0qzg5i9x9f5skp2bk5avxw30nhs44z4didk69prli6p6sfd4bgqg"; + rev = "619a1b35b9a8151703421e2716ea0409162a4b84"; + sha256 = "0dakcsdn6pax0q6wdvg23fg327nk35z3lzk2vlvc76780d0fi85h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -42666,12 +41284,12 @@ lively = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lively"; - version = "20170820.407"; + version = "20171005.54"; src = fetchFromGitHub { owner = "purcell"; repo = "lively"; - rev = "49cf43815c04f0b84d20b527f5d712544a13a4db"; - sha256 = "02in5dj50c82h2bb7l47b00w3hpn3c2788aiyq2bln06vpj1qq4n"; + rev = "348675828c6a81bfa1ac311ca465aad813542c1b"; + sha256 = "1j8w63hhk1wcxcfqz0wimqijp7p1m8a2n947gwqv8nk1wm40aqg3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e4b01286dbc84f01b43955b693ca08e675ffa07/recipes/lively"; @@ -42753,8 +41371,8 @@ version = "20150910.644"; src = fetchgit { url = "https://llvm.org/git/llvm"; - rev = "ae7945dc893db824632135ea16929e14ca185595"; - sha256 = "0vsj8i29qkfl2a6fsdplzdh2kb9vrc2rkbbh7hak81ngn19q41l8"; + rev = "f7ceddc7e61d486863a6bf9ddcf74bb87fd1b977"; + sha256 = "1v0wwdg57l613s5zd47wri75pgbwh6n401q64mnyj8frfb2670j0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/llvm-mode"; @@ -43020,12 +41638,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "20170705.1217"; + version = "20170928.820"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "134b41557ab539219d9e3a1b3c8939df93676726"; - sha256 = "1jfdm64r6rj7pl6270v084fvaga5csa4snvbfjdlhs5bshn1d0v2"; + rev = "72b6c5349206172a146b2c730b8ac040a92ebc3f"; + sha256 = "1f93iyxf8v0jazzh6jljrm7r28z00nn14wr90qrh9y9chyq72n63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -43188,12 +41806,12 @@ lsp-haskell = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, lsp-mode, melpaBuild }: melpaBuild { pname = "lsp-haskell"; - version = "20170814.1358"; + version = "20170919.626"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-haskell"; - rev = "7c4caf7f87392146203ecd0616a059280deecd15"; - sha256 = "1i5rpmz8kzcjgxwvy1g3mlxd4y1bnnjzlk6j2sz4i7c75g2aprn4"; + rev = "a749bd017c293a7231639f75f024ee922f44818a"; + sha256 = "1yynwf0m0mkm0xxbj3sgy0zhkxzfw1qhwyvfq5fcgpqw59xfps6w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-haskell"; @@ -43227,15 +41845,36 @@ license = lib.licenses.free; }; }) {}; + lsp-javacomp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lsp-mode, melpaBuild }: + melpaBuild { + pname = "lsp-javacomp"; + version = "20171005.659"; + src = fetchFromGitHub { + owner = "tigersoldier"; + repo = "lsp-javacomp"; + rev = "e45ac9ac18375d63fc068cbb466ed580ccd9476a"; + sha256 = "0hpidswz1rfy8fmjw3m6jxhl4p9134521nj7fana5x3dl3v5c9kh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6b8a1c034554579a7e271409fa72020cfe441f68/recipes/lsp-javacomp"; + sha256 = "1gp8dlcpik2lmpicccq2kya498pmw9m8vz9m1fbd725p7wk58fhi"; + name = "lsp-javacomp"; + }; + packageRequires = [ emacs lsp-mode ]; + meta = { + homepage = "https://melpa.org/#/lsp-javacomp"; + license = lib.licenses.free; + }; + }) {}; lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "lsp-mode"; - version = "20170905.1130"; + version = "20171005.946"; src = fetchFromGitHub { owner = "emacs-lsp"; repo = "lsp-mode"; - rev = "d69692651742b65398b4c1f9ee06d1670d9443d0"; - sha256 = "1f09shdirq81c37sg2hdgj1wqqvwmg5m7bkprz28fych76xi8jgr"; + rev = "252396b8631c5f6d5fc4725e9430feebe408568b"; + sha256 = "0hbhv6ch23z2wyigsq3270x07kqr7j2kxz254ps6ym67dr3kka4x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a7b69312e688211089a23b75910c05efb507e35/recipes/lsp-mode"; @@ -43500,25 +42139,6 @@ license = lib.licenses.free; }; }) {}; - macros-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "macros-plus"; - version = "20170307.842"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/macros+.el"; - sha256 = "0x9fycqw234s1i0ndy7v0d7vn654id245pi0kwphbqgnga7w3l6p"; - name = "macros+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/macros+"; - sha256 = "0aihszxsjnc93pbbkmkr1iwzvii3jw8yh1f6dpnjykgvb328pvqi"; - name = "macros-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/macros+"; - license = lib.licenses.free; - }; - }) {}; macrostep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "macrostep"; @@ -43627,12 +42247,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170913.343"; + version = "20171009.314"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "ae72710292a94d9af92799d3ddeb86f365f34a56"; - sha256 = "1344dcngdk899xi9wjipvngq50xggbv06fb1w09zjzs8ckpsh8gf"; + rev = "12fc6cede637c7e2542e2225565366f2a0ad9fce"; + sha256 = "0ap1x0dshfivc0zljp96r2s5fhhnirqisrk3xsa94n2aidsf3y0q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -43655,12 +42275,12 @@ magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-annex"; - version = "20170702.832"; + version = "20170913.659"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "2aa23cd169166e92be3e874c723ff224a9d42c15"; - sha256 = "1bjv8a38y75cpbxhzxsnvzpq2cvs80x8ai7pspsqf4pp3w1dj45n"; + rev = "895c229c2b0d822a4debb302d8638105ecb4ee20"; + sha256 = "0316csgc95dalqmkxj6qlb7inzcg4csfs9n3im1ygswcswpdaajh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -43760,12 +42380,12 @@ magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }: melpaBuild { pname = "magit-gitflow"; - version = "20170425.128"; + version = "20170929.124"; src = fetchFromGitHub { owner = "jtatarik"; repo = "magit-gitflow"; - rev = "5bdcfe0a7bf4f5bb9a927baa4880233bf11a4a6b"; - sha256 = "12pi6aw44lnzzcw0zgz5rxvcf4p700fkz4q2skbapwmds8gw3fg9"; + rev = "cc41b561ec6eea947fe9a176349fb4f771ed865b"; + sha256 = "0jz69wrrzvqadaphmjrr146nzvmphsbl7rmc3ccnpw1gw6gnz81f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow"; @@ -43844,12 +42464,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20170913.343"; + version = "20171009.258"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "ae72710292a94d9af92799d3ddeb86f365f34a56"; - sha256 = "1344dcngdk899xi9wjipvngq50xggbv06fb1w09zjzs8ckpsh8gf"; + rev = "12fc6cede637c7e2542e2225565366f2a0ad9fce"; + sha256 = "0ap1x0dshfivc0zljp96r2s5fhhnirqisrk3xsa94n2aidsf3y0q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -43970,12 +42590,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, ghub-plus, lib, magit, melpaBuild, s }: melpaBuild { pname = "magithub"; - version = "20170901.1234"; + version = "20171008.917"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "7051c1bf8e316b116430be63c55b3010578c3eb4"; - sha256 = "0jga49kwp47m39nsp2a12vwaj5n54zgcjnfq214fjjdcdrqcl3n7"; + rev = "50bb82d310d5720db82ad5b437ca47c0ff0d83a3"; + sha256 = "10ri2kqzcq48xvdyz9pm9d5j5vlh6f7nx4095s4wwxf22swkpnr6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/magithub"; @@ -44156,27 +42776,6 @@ license = lib.licenses.free; }; }) {}; - maker-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: - melpaBuild { - pname = "maker-mode"; - version = "20150116.354"; - src = fetchFromGitHub { - owner = "fommil"; - repo = "maker-mode"; - rev = "335c43b08eff589040129dae1ea13c88793b069e"; - sha256 = "0w3kar52yf8clf9801c4jzfrixi10clc8fs8ni2d4pzhdwwca2zw"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ba7edfa6ab6b93c346f92859db706acb3fd5fc6e/recipes/maker-mode"; - sha256 = "03q09jxmhwqy7g09navj08z9ir0rbh7w26c1av7hwhmq4i6xwg8a"; - name = "maker-mode"; - }; - packageRequires = [ dash s ]; - meta = { - homepage = "https://melpa.org/#/maker-mode"; - license = lib.licenses.free; - }; - }) {}; makey = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "makey"; @@ -44327,12 +42926,12 @@ mandm-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mandm-theme"; - version = "20170903.306"; + version = "20170925.321"; src = fetchFromGitHub { owner = "choppsv1"; repo = "emacs-mandm-theme"; - rev = "889cdcb8ea7234d2e6d9dad663e39bd5f872c28d"; - sha256 = "0x7fhzsx7pcbyy5dkx9aa2qvpnn7psc3nf8mqv96mvnzr5q1xg53"; + rev = "078d6d6f11bd48193c5de590cfb0e3d0d687ffc9"; + sha256 = "070280438388q57lpzvd5wdk16abmxixiq01n68hdskfcipdkn2d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/mandm-theme"; @@ -44348,12 +42947,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20170908.247"; + version = "20171002.12"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "14e2d3f7586001ae4b44582ef03728eaf8326643"; - sha256 = "0c1n5lnllm9mqar68jxm9sr5kyzl4v4ckrdmms68a9rvcfrbn6lg"; + rev = "77647573331c602847b06b9e21de69f72cd7bad5"; + sha256 = "0yqxsls9phvd4dgzb908xds4x437rqpm3ddy07pq3qq7ghri1cnv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -44524,12 +43123,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20170830.2131"; + version = "20171001.730"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "2d790a7c72546b96b3fdf57e7b7d6af1663fb721"; - sha256 = "0jfldbw7wpy05rq7xzxm5w49pwcnsz97l1ajh3g526lbj76p2rnl"; + rev = "bc79248c605a5ebd01d96b26e5d5dba39bddcdc7"; + sha256 = "1d0c5l4g3miwzn51a3fsjqnv9shm8kw4inn2hwg2ff40jfrgfy1n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -44926,25 +43525,6 @@ license = lib.licenses.free; }; }) {}; - mb-depth-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "mb-depth-plus"; - version = "20170307.844"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/mb-depth+.el"; - sha256 = "1vqminlfc146c8wr00ck7drs5kf92fvdmhyqyh2hj6394cvqs7w9"; - name = "mb-depth+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mb-depth+"; - sha256 = "031hh227rh7l818p3di4h34i4698yynw5g9a5sl2hj47c0734q6w"; - name = "mb-depth-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/mb-depth+"; - license = lib.licenses.free; - }; - }) {}; mb-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mb-url"; @@ -45239,34 +43819,15 @@ license = lib.licenses.free; }; }) {}; - menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "menu-bar-plus"; - version = "20170720.710"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/menu-bar+.el"; - sha256 = "0yq995jyfw3a1dj49a4wnavfb29amw575dajps6nbv0g1q0rnwkf"; - name = "menu-bar+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/menu-bar+"; - sha256 = "181jxjnzdckmvpsdknhm21xwimvsp0qxn8azfn58dz41gl4xcg90"; - name = "menu-bar-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/menu-bar+"; - license = lib.licenses.free; - }; - }) {}; merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "merlin"; - version = "20170731.907"; + version = "20170917.430"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "b53e4beeeb8da6d7cb035990a7e805fea5da0de6"; - sha256 = "1lw0s78zwr8rd4q4pg34m9q8yd5swh1fff3c5p992a2qlzfb0hax"; + rev = "a5dbf8e321ff162476555e62264468dd6f55c279"; + sha256 = "0mq4ddr3g64dd4bhq812hb5xvlkswfmib1nw34f3m8sghmaxcd5z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -45300,25 +43861,6 @@ license = lib.licenses.free; }; }) {}; - message-x = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "message-x"; - version = "20151029.718"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/message-x.el?revision=9"; - sha256 = "05ic97plsysh4nqwdrsl5m9f24m11w24bahj8bxzfdawfima2bkf"; - name = "message-x.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b7bf124ec30fa5551b31c0e0d39be234f19e2e81/recipes/message-x"; - sha256 = "0z12alizwrqp5f9wq3qllym9k5xljh904c9qhlfhp9biazj6yqwj"; - name = "message-x"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/message-x"; - license = lib.licenses.free; - }; - }) {}; messages-are-flowing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "messages-are-flowing"; @@ -45326,8 +43868,8 @@ src = fetchFromGitHub { owner = "legoscia"; repo = "messages-are-flowing"; - rev = "17a0d91658390ba8d38f325b3ece380e07e3cb49"; - sha256 = "0600is9cynvppdy9vrnr1c0m3cyxim0ha4gq4wbhw9h0cvkz8i1b"; + rev = "ef879726957c850c3a5afd7f1118604991e37e32"; + sha256 = "1mryk48z92r4j8f3qg0j0q5iygv7vnk1k0wgza5pq6bhrl5w13hq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/messages-are-flowing"; @@ -45822,25 +44364,6 @@ license = lib.licenses.free; }; }) {}; - minor-mode-hack = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "minor-mode-hack"; - version = "20141226.1220"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/minor-mode-hack.el?revision=10"; - sha256 = "0vwvvhzqiad82qvfwygb2arq1mdvh1lj6q2as0a92fg1vc95qcb0"; - name = "minor-mode-hack.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/df182bfd8272f3ded761c90826c8cfe6bfd1a48b/recipes/minor-mode-hack"; - sha256 = "1f2wy25iphk3hzjy39ls5j04173g7gaq2rdp2grkawfhwx0ld4pj"; - name = "minor-mode-hack"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/minor-mode-hack"; - license = lib.licenses.free; - }; - }) {}; mip-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mip-mode"; @@ -45883,44 +44406,6 @@ license = lib.licenses.free; }; }) {}; - misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "misc-cmds"; - version = "20170823.842"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/misc-cmds.el?revision=104"; - sha256 = "1spds0fkbvk1br3lpaq3ifyvq0vk5rvyyx5x3cmrvpd0m5s01h87"; - name = "misc-cmds.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/misc-cmds"; - sha256 = "0bylb84icddgznmim18fwq1mhh3qz8yh8ch6lpadf9p3h420qgcl"; - name = "misc-cmds"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/misc-cmds"; - license = lib.licenses.free; - }; - }) {}; - misc-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "misc-fns"; - version = "20170307.848"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/misc-fns.el?revision=50"; - sha256 = "0jjmd33z36dikkbskskgbdv8pflkwaxn4ifajq4ghrdprdhm6gbm"; - name = "misc-fns.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c2cbbe5a718ec961982a7f65de8f6ec1c9513696/recipes/misc-fns"; - sha256 = "1spjbkcac33lyfsgkd6z186a3432x9nw3akmx194gaap2863xcam"; - name = "misc-fns"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/misc-fns"; - license = lib.licenses.free; - }; - }) {}; mixed-pitch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mixed-pitch"; @@ -46007,12 +44492,12 @@ mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mmm-mode"; - version = "20170808.1814"; + version = "20171004.336"; src = fetchFromGitHub { owner = "purcell"; repo = "mmm-mode"; - rev = "c68cee0beaeb99c5bd178fab6fec995bce4e501f"; - sha256 = "1k13q5hwb2p2bq5j84pln9kx18bs2x9zfnzgqm4acrxjp9hnknlc"; + rev = "7661968fa6974996e58dfa28da33bca0cbde777d"; + sha256 = "066qp884qw0bqcglncxvag89i1z5rmqjc73y7ksr7ll3309y1969"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/mmm-mode"; @@ -46235,44 +44720,6 @@ license = lib.licenses.free; }; }) {}; - modeline-char = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "modeline-char"; - version = "20170307.854"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/modeline-char.el?revision=8"; - sha256 = "1c6ij1c0d6r9chzwqcpgdjq1rb2h0m09fpck9rc9rg5jy7fgdc0d"; - name = "modeline-char.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/modeline-char"; - sha256 = "0ksi5vfcwbyhgpp59qdl7l536zw2rd33xf4r2gihcx2g2k52h2w9"; - name = "modeline-char"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/modeline-char"; - license = lib.licenses.free; - }; - }) {}; - modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "modeline-posn"; - version = "20170307.856"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/modeline-posn.el?revision=43"; - sha256 = "1cpab6k0p65nmw78y5v4lbpxw6pczkzk46zmkc76pi55yjpw6pbm"; - name = "modeline-posn.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c62008950ea27b5a47363810f57063c1915b7c39/recipes/modeline-posn"; - sha256 = "0dngfcbcdh22fl6nd47dhg9z9iivj67six67zjr9j1cbngp10dwk"; - name = "modeline-posn"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/modeline-posn"; - license = lib.licenses.free; - }; - }) {}; modern-cpp-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "modern-cpp-font-lock"; @@ -46318,12 +44765,12 @@ moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "moe-theme"; - version = "20170111.1838"; + version = "20170914.2111"; src = fetchFromGitHub { owner = "kuanyui"; repo = "moe-theme.el"; - rev = "70e71ef7404cc5c38254771695eee221090d5110"; - sha256 = "1dpcffb6pyggg2lj7n9lnxyg2clwm4q7hnxvgc87r6b61vjr3a20"; + rev = "b8f0206614ab40ffb75e50ce6c38675fb9c7cf2e"; + sha256 = "0pn3a1rrj7ycxh91x3q008b6rmq7rbl8ir6diqzqfp6y465pn2w2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme"; @@ -46630,25 +45077,6 @@ license = lib.licenses.free; }; }) {}; - mouse-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "mouse-plus"; - version = "20170307.859"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/mouse+.el"; - sha256 = "1f49b10i1iqh0q2s2fa309dc617dzavah7fw0k1rpjk84kb001bd"; - name = "mouse+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/01cbe9b5bb88f8c02fab67a269ac53c8aa4d8326/recipes/mouse+"; - sha256 = "1fv7jnqzskx9iv92dm2pf0mqy2accl0svjl2kkb6v273n1day3f8"; - name = "mouse-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/mouse+"; - license = lib.licenses.free; - }; - }) {}; mouse-slider-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mouse-slider-mode"; @@ -46670,25 +45098,6 @@ license = lib.licenses.free; }; }) {}; - mouse3 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "mouse3"; - version = "20170324.1050"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/mouse3.el?revision=39"; - sha256 = "0rnpfz0d4spxkyssgf3j5kfajm54i1vism2q0giikd0savrh0a1c"; - name = "mouse3.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mouse3"; - sha256 = "1rppn55axjpqwqm2lq4dvwi3z7xkd5jkyqi1x8jqgcsfc9w6m777"; - name = "mouse3"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/mouse3"; - license = lib.licenses.free; - }; - }) {}; move-dup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "move-dup"; @@ -46944,12 +45353,12 @@ mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mtg-deck-mode"; - version = "20170904.2002"; + version = "20170925.1338"; src = fetchFromGitHub { owner = "mattiasb"; repo = "mtg-deck-mode"; - rev = "c1ab6dbfbe83d0c90f2c9ba4dfeb31b09f1fb875"; - sha256 = "1xyd827b6wfdbhzj2ba4mywikfjwjs9xspn2aksbsl2bcby0n6zn"; + rev = "546a62ada70aa89d325cc3941c8c9379a4c21553"; + sha256 = "1gbgsfd04jdw6jrsp13h13jkkac5ndrn684pl18q0wjgx9kk11b6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode"; @@ -47025,6 +45434,27 @@ license = lib.licenses.free; }; }) {}; + mu4e-query-fragments = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mu4e-query-fragments"; + version = "20170923.622"; + src = fetchFromGitHub { + owner = "wavexx"; + repo = "mu4e-query-fragments.el"; + rev = "34ddad4e6785f575333efcc66153d892daa1c884"; + sha256 = "0l5i3a88j9il2y0jq2sfzwi9q3czc1wi8n9nvgdysj5db5m4xsw6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/21277a79a211b4d101809314bdb9963130a3d533/recipes/mu4e-query-fragments"; + sha256 = "0h8rapfz9snvr722vr65gqa0xhgig81b2gvswjlzljwd2m98yzzn"; + name = "mu4e-query-fragments"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/mu4e-query-fragments"; + license = lib.licenses.free; + }; + }) {}; multi = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "multi"; @@ -47067,25 +45497,6 @@ license = lib.licenses.free; }; }) {}; - multi-eshell = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "multi-eshell"; - version = "20120608.1135"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/multi-eshell.el?revision=9"; - sha256 = "1w1jwfznpl214a1xx46zlgqbx9c5yjzpyqqrkn3xqjgnj485yhkl"; - name = "multi-eshell.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a9069a6eb1e57bccb06d26577cac70765de8e52f/recipes/multi-eshell"; - sha256 = "1i0mvgqxsc99dwp9qcdrijqxsxflrbxw846rgw89p1jfs8mp4l7d"; - name = "multi-eshell"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/multi-eshell"; - license = lib.licenses.free; - }; - }) {}; multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "multi-line"; @@ -47256,12 +45667,12 @@ mustache = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "mustache"; - version = "20131117.1407"; + version = "20170923.533"; src = fetchFromGitHub { owner = "Wilfred"; repo = "mustache.el"; - rev = "b0ea352813592424164520a49e86c04600242752"; - sha256 = "1n2ymd92qpvsby6ms0l3kjhdzzc47rri2aiscc6bs07hm4mjpr9q"; + rev = "5e39654b933a18131146a0f3b3e3dc55c5058124"; + sha256 = "0ilsdrvqy9zn0yb1c8zh1zidag32rfb9xhm43qpfcg6n5w6c7r82"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1bcf9599ca6d2c29333071a80f96808d4ab52e2/recipes/mustache"; @@ -47358,25 +45769,6 @@ license = lib.licenses.free; }; }) {}; - muttrc-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "muttrc-mode"; - version = "20090804.1552"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/muttrc-mode.el?revision=7"; - sha256 = "1xihp3zdqs9054j3bfrd9wnahsvvxjk1ags1iy50ncv5850ppjis"; - name = "muttrc-mode.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7d3fd45af3345742cff7be99ad8210d7f8fd2a2f/recipes/muttrc-mode"; - sha256 = "0ym6rfrhrmpnlqhkxv9ck5893qm0yhswslvgc9vb4nl9hyc1b5jn"; - name = "muttrc-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/muttrc-mode"; - license = lib.licenses.free; - }; - }) {}; mvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mvn"; @@ -47566,25 +45958,6 @@ license = lib.licenses.free; }; }) {}; - naked = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "naked"; - version = "20170418.1822"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/naked.el?revision=23"; - sha256 = "1k3j6dyp8p47q43i4ba53krl06yx32rkjnh2f5x1zqk6nxnb1wf8"; - name = "naked.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/naked"; - sha256 = "06p6dzhn34dva3677mrvwq2a2x3bhw7f486y654hszla7i75pilq"; - name = "naked"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/naked"; - license = lib.licenses.free; - }; - }) {}; name-this-color = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "name-this-color"; @@ -47815,25 +46188,6 @@ license = lib.licenses.free; }; }) {}; - narrow-indirect = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "narrow-indirect"; - version = "20170820.1748"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/narrow-indirect.el?revision=14"; - sha256 = "16knfw5h15f7al6sn1n40bcw2ahqsy9ipkvfk0h7r1vlpb92w2fq"; - name = "narrow-indirect.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/38e5dd845c99acaae719562595059154a08a5f00/recipes/narrow-indirect"; - sha256 = "10aq4gssayh3adw8yz2lza1xbypyffi8r03lsc0kiis6gd9ibiyj"; - name = "narrow-indirect"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/narrow-indirect"; - license = lib.licenses.free; - }; - }) {}; narrow-reindent = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "narrow-reindent"; @@ -48362,12 +46716,12 @@ nimbus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nimbus-theme"; - version = "20170909.1336"; + version = "20171003.1044"; src = fetchFromGitHub { owner = "m-cat"; repo = "nimbus-theme"; - rev = "71b3a560e6d017907f43f7dd074d300653c1588b"; - sha256 = "0ip330ylvy6rwgvqravm58qh8ssbrd8nw2rbd3gbhcwiqakawsjl"; + rev = "f62edeb70cc19bc4c8de9b815c4e9d257acff35d"; + sha256 = "04y10x36bfgcg22cazza13ildkcsc3vmrd0z8qcsc74yd05n09zf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc0e6b456b76e2379c64a86ad844362c58146dc6/recipes/nimbus-theme"; @@ -48387,8 +46741,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "87111bff382655075f2577c591745a335f0103c7"; - sha256 = "1rmh2a2q3lw3wmnlh5y7g06nzhcgnhz5libgsjfl3jvpxzdlck76"; + rev = "b26168be150bd1cbdd6daca59f53755a56fe7939"; + sha256 = "1g10scd55asi5mfkbj0mdi098nkhy0phvnllwbv52vy6p0amppq9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -48446,12 +46800,12 @@ nix-sandbox = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "nix-sandbox"; - version = "20170131.241"; + version = "20171004.1006"; src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29"; - sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq"; + rev = "7007363e773a419203a69798fb0e0731b2eb0f73"; + sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66be755a6566e8c0cfb5aafa50de29b434023c7a/recipes/nix-sandbox"; @@ -48471,8 +46825,8 @@ src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "ace629f7645d12778c96ff7b5cf4b1e41a98af29"; - sha256 = "11infdrdjc30kxvfg5rh1zn4idvkhf9s0c6v60qn441m1d5bnavq"; + rev = "7007363e773a419203a69798fb0e0731b2eb0f73"; + sha256 = "00hv8fhyahkdh1vfy1qkahqvsik6d81c7mqh4gjiqxrmb2l1vbcb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/nixos-options"; @@ -48576,8 +46930,8 @@ src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "d1d649711c4ba63e458b229afdc64ed4639cf988"; - sha256 = "0416i7gv89r46x30swvqhqf7na9rkpm0w9lw1v49kxqdrqqdci67"; + rev = "a4b42b185b65e78bc3bb6523e23aefb1213eb3b2"; + sha256 = "1yzcawvz3vbq6pgr0b3sk0qg24jx1fpkinwcmsdl283ib8msbc7g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -48740,12 +47094,12 @@ nord-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nord-theme"; - version = "20170506.2351"; + version = "20171005.1039"; src = fetchFromGitHub { owner = "arcticicestudio"; repo = "nord-emacs"; - rev = "eb7929e41606776a45817946b5d6f79426767a93"; - sha256 = "1cb7la2al8124i4xfmripfzhabpnzh929qi1266p4c7jchyz2gxw"; + rev = "be32879416bbed1d6524f7c30ac53fbfa5a0e024"; + sha256 = "0q347f9bjayfl8y8vz83kjamf1lp58386nhy0iacjxsq4riwpric"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31cb60069825abe3998c8b43bc9177b39a7f3659/recipes/nord-theme"; @@ -48779,11 +47133,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20170912.1817"; + version = "20170927.415"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "f2ed177e6260d835b8a13d2a53e1c8d5fa76edf2"; - sha256 = "0d4110cai0z2h2gggx93wfm8fj2av4dwk57gf835crsmv8y3wkj7"; + rev = "54aef071590cb23f61da943daa29080cf7446696"; + sha256 = "0hh7276br857a5s5wms2wxf24jz3vvdpqm2d3zrzdfgz54ix6cp7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -48820,12 +47174,12 @@ nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nov"; - version = "20170910.1145"; + version = "20170924.512"; src = fetchFromGitHub { owner = "wasamasa"; repo = "nov.el"; - rev = "91c4329f64ddc9a598fa6c58e1d9264aee073e72"; - sha256 = "0x3ijjhjg2q8gdqf4hgr2d8wy32qhxy48kbz0slibkn9yik3pvlz"; + rev = "19ab463864f137b43704b4f34173349c88e84d8e"; + sha256 = "00f5hhw157nwdwy26yn6l3z2hgk6xxvx5xl0hasskj1l9rg0zgh2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov"; @@ -48838,25 +47192,6 @@ license = lib.licenses.free; }; }) {}; - novice-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "novice-plus"; - version = "20170307.925"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/novice+.el"; - sha256 = "1f49c0wv1zsi720g3a8ka3h17n7r81pzz7zfwalz0zxwxmh6jghb"; - name = "novice+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/novice+"; - sha256 = "0r4w4c6y4fny8k0kipzqjsn7idwbi9jq6x9yw51d41ra3pkpvfzf"; - name = "novice-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/novice+"; - license = lib.licenses.free; - }; - }) {}; noxml-fold = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "noxml-fold"; @@ -48962,22 +47297,28 @@ license = lib.licenses.free; }; }) {}; - nu-mode = callPackage ({ fetchFromGitHub, fetchurl, helm, help-fns-plus, lib, melpaBuild, transpose-frame, undo-tree }: + nu-mode = callPackage ({ ace-window, avy, fetchFromGitHub, fetchurl, help-fns-plus, lib, melpaBuild, transpose-frame, undo-tree }: melpaBuild { pname = "nu-mode"; - version = "20170825.1300"; + version = "20171007.1521"; src = fetchFromGitHub { owner = "pyluyten"; repo = "emacs-nu"; - rev = "711b5bd53c77ba66987fe9807a4442084f67789e"; - sha256 = "11iymqm51ky7k8ylwvcq770y8anaqn8giki63kf2a96f4rdglb1x"; + rev = "4a3fe40585031a1c2b323e28f536a3840f0776bd"; + sha256 = "01pl34cn6z1hky7gwh832vrkpyjsbc62ihbnqxj9rma5w9dfwarx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/230d5f8fdd965a24b8ff3cc94acf378d04815fca/recipes/nu-mode"; sha256 = "0nzv3p62k8yyyww6idlxyi94q4d07nis7ydypar8d01jfqlrybkn"; name = "nu-mode"; }; - packageRequires = [ helm help-fns-plus transpose-frame undo-tree ]; + packageRequires = [ + ace-window + avy + help-fns-plus + transpose-frame + undo-tree + ]; meta = { homepage = "https://melpa.org/#/nu-mode"; license = lib.licenses.free; @@ -49151,6 +47492,27 @@ license = lib.licenses.free; }; }) {}; + nyx-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nyx-theme"; + version = "20170910.607"; + src = fetchFromGitHub { + owner = "GuidoSchmidt"; + repo = "emacs-nyx-theme"; + rev = "afe2b8c3b5421b4c292d182dcf77079b278e93d8"; + sha256 = "1qamw4x3yrygy8qkicy6smxksnsfkkp76hlnivswh7dm3fr23v6m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/nyx-theme"; + sha256 = "17ajpsbwbal1rwgd38kckh1kvnd412h6fkvj2x4j5rqvjr9nhgr6"; + name = "nyx-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/nyx-theme"; + license = lib.licenses.free; + }; + }) {}; o-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "o-blog"; @@ -49297,6 +47659,27 @@ license = lib.licenses.free; }; }) {}; + ob-cfengine3 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-cfengine3"; + version = "20170915.634"; + src = fetchFromGitHub { + owner = "nickanderson"; + repo = "ob-cfengine3"; + rev = "f38f87256efcb2b02f5c7042900087be941c1ddc"; + sha256 = "09xn84d2vy3kxk2xihjml8zzrhv2cz2jy20dg7w6ll9wn38gs33h"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d068233c438e76cbcc6e9a97cbec9b2550a18ed6/recipes/ob-cfengine3"; + sha256 = "1pp3mykc5k629qlqixpl2900m1j604xpp6agrngwagsvf7qkhnvl"; + name = "ob-cfengine3"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ob-cfengine3"; + license = lib.licenses.free; + }; + }) {}; ob-coffee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-coffee"; @@ -49510,12 +47893,12 @@ ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-http"; - version = "20170411.1842"; + version = "20170920.2251"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-http"; - rev = "5fd0e99630e07c5e64f2483c6d46aefdd37677d2"; - sha256 = "1i5la27m36xfc8jwmz5i0yiim9ddmfaqjpahxgpbf63zks555vpk"; + rev = "c4da6d47b3f96c31c00f9eaaf712b59afe00daef"; + sha256 = "0rhxp7gw4d5yp6yvjcp80in22wckj4zl9siykalj0jm97hkwqmzz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http"; @@ -49531,12 +47914,12 @@ ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-ipython"; - version = "20170902.1253"; + version = "20171008.1733"; src = fetchFromGitHub { owner = "gregsexton"; repo = "ob-ipython"; - rev = "ed1c2d580037c0592066e1f33c0581890dd09e2e"; - sha256 = "0ciacp8llx0njkrcbzgs13srhjm2nxx0pr7v8ladlx0sfdsxj078"; + rev = "4a181127000e43dd520e600880b49607747d8f08"; + sha256 = "01gfj11pd97xp02bdal3c9wy77ha1dcym1ddrbpzkvck2ja1s6ib"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython"; @@ -49867,12 +48250,12 @@ ob-swift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ob-swift"; - version = "20151204.2311"; + version = "20170921.625"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-swift"; - rev = "f376af0d86fb410e41289df59a0c2625954c9067"; - sha256 = "071rl0bvhwh5vqbl7n84shvzgqgwg2f5l9vb8wfs4y24hsqfgxmz"; + rev = "ed478ddbbe41ce5373efde06b4dd0c3663c9055f"; + sha256 = "1vwg10d33mwb32bpdbpghfihy3ryiqbc4yydpb5hfv3v5k83vs0x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b401383966398d3223032c59baa920ce594e5fef/recipes/ob-swift"; @@ -50329,12 +48712,12 @@ omni-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-kill"; - version = "20150526.2349"; + version = "20171005.955"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-kill.el"; - rev = "4c8dbb6b2c9f1afc0f82077c04eab022e5387e85"; - sha256 = "1925mh47n4x9v780qp5l6cksl64v9mpyb87znsg93x6sxr0cvv4c"; + rev = "192d51d843c6581d593a4eb01f1b49ad59d206cf"; + sha256 = "0n24rhzl1zhlkdkjigsczyc0z3yrihz9qnn1icrk6nkms107qbnn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c24df34d2fa5d908223379e909148423ba327ae2/recipes/omni-kill"; @@ -50350,12 +48733,12 @@ omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "omni-log"; - version = "20170420.407"; + version = "20170930.535"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-log.el"; - rev = "60fd1b7ba77bd82787e43ce1aee2832f53981c68"; - sha256 = "1s81qj4g8nhw6k4b7wi4ya9g51xbsqzyi659zs4zdxjxj7acdq8s"; + rev = "11e959473c1bd9415d0cda785940c36ba6ad44ab"; + sha256 = "081vq3wzl8w9yz1356np6h27d7yi5j8i3va9sc2flfwylmw1y9gr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log"; @@ -50392,12 +48775,12 @@ omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-scratch"; - version = "20170416.329"; + version = "20171008.1207"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-scratch.el"; - rev = "0da549c1386f93ed4de201bf8779ba64ddc91347"; - sha256 = "0qfi54z2jqrkrdzriandwc9myzc27sxsx7nf20jf5qvcdgn13cl1"; + rev = "98cdc402c3663e30a2bd260911b2ac0c93f93129"; + sha256 = "19pwhbg4db5g4nq3j7axdh81k6ikm2jirwdkl38nqyr0sb0s2w33"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch"; @@ -50455,12 +48838,12 @@ omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, emacs, f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, s, shut-up }: melpaBuild { pname = "omnisharp"; - version = "20170909.319"; + version = "20171007.416"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "b425270bed93b427ff519d6f51ad1d97531a0a92"; - sha256 = "0l9dk9idfsr21q0icx9fpgqyi4qlhnqal6sypak5zh8dgchrqif9"; + rev = "40b6251a96057c80a958362a0886c06eea5bfd62"; + sha256 = "176qfjd0qfgypj7pyi2p7v6zn7sic86gcgxz056k4y2akm6aa2p6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -50568,25 +48951,6 @@ license = lib.licenses.free; }; }) {}; - oneonone = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild { - pname = "oneonone"; - version = "20170416.858"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/oneonone.el?revision=129"; - sha256 = "0ag62z31mb5n50m9qph2ww945pr71j95c5xv7krna1iq01qr8ji1"; - name = "oneonone.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/oneonone"; - sha256 = "0v4nvhzgq97zbi18jd3ds57yh1fpv57b2a1cd7r8jbxwaaz3gpg9"; - name = "oneonone"; - }; - packageRequires = [ hexrgb ]; - meta = { - homepage = "https://melpa.org/#/oneonone"; - license = lib.licenses.free; - }; - }) {}; opam = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "opam"; @@ -50882,12 +49246,12 @@ org-autolist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-autolist"; - version = "20150922.705"; + version = "20170924.1201"; src = fetchFromGitHub { owner = "calvinwyoung"; repo = "org-autolist"; - rev = "da332fadcd9be4c5eb21c5e98c392b89743750b2"; - sha256 = "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani"; + rev = "c82d1e83e982b5f0c106b8800e5b0cfd5f73fdc1"; + sha256 = "0ykiafbdjb2iy0s1gr6l51gddjbk08iwj4v13hgm8b675bl0cw56"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca8e2cdb282674b20881bf6b4fc49af42a5d09a7/recipes/org-autolist"; @@ -50987,12 +49351,12 @@ org-brain = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-brain"; - version = "20170908.634"; + version = "20171004.1305"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "org-brain"; - rev = "9a84111f759c264bd6ab435995803d0f6234b78a"; - sha256 = "00a92064bjlrjrmy7xcfc5ajajxviar82pjisdm4pxd3jcab8qcw"; + rev = "35d46695ceffff4069e66fa2a4f039509f1a3c7e"; + sha256 = "0c0jps0gxsk3m8s78yp8141wh7g2nx8acd1jc0v4ffmlr8qi2csj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47480fbae06e4110d50bc89db7df05fa80afc7d3/recipes/org-brain"; @@ -51075,8 +49439,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "48f621b595e748c5e03431f237facf258ffc9443"; - sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89"; + rev = "d57062569e59f598fcad1107f463691ec5d07e5f"; + sha256 = "1s5d9g8a8wgap0hsn5wqwzr20r6xr2jfm720zb404ixpkw4p939y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-category-capture"; @@ -51323,12 +49687,12 @@ org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-download"; - version = "20170605.23"; + version = "20170924.2309"; src = fetchFromGitHub { owner = "abo-abo"; repo = "org-download"; - rev = "131d2409b3639798ebac6d77c98eae446ea915dc"; - sha256 = "1l04vs47pl63daz9n0d2xby43kr2ynbykvdr7hjbyizcg9l9fzp7"; + rev = "14261c2619be224fc4c499624abc2cba3663e7f5"; + sha256 = "0d8lcg9gnzf5bpn1z83i5nni444mzy6mlqggadsrdav9bdf8cfy2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download"; @@ -51491,12 +49855,12 @@ org-evil = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, monitor, org }: melpaBuild { pname = "org-evil"; - version = "20170529.741"; + version = "20171004.255"; src = fetchFromGitHub { owner = "GuiltyDolphin"; repo = "org-evil"; - rev = "aff7bf3885e318287abf7d542916d21372496bdd"; - sha256 = "1z6rj7nrjdmkc7skx2si7s462228bpka96p0zzmkg7wa82j7ywv9"; + rev = "aae5688c15cef9f2f6105d395dab36b163d5af34"; + sha256 = "01ablfw0prcb4bwsaa6fbqc80xz539a48psvnmddz98c8yjhb9g7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil"; @@ -51616,12 +49980,12 @@ org-iv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, impatient-mode, lib, melpaBuild, org }: melpaBuild { pname = "org-iv"; - version = "20160609.1854"; + version = "20171001.322"; src = fetchFromGitHub { owner = "kuangdash"; repo = "org-iv"; - rev = "40fa39ae680794cd493dfa8624e5eff4d04c2363"; - sha256 = "1zn1bvk2kgd6a969m1d63v8ax52lanvb1h2w62ffpxlkap3kl6m8"; + rev = "7f2bb1b32647655fd9d6684f6f09dcc66b61b0cd"; + sha256 = "0s3fi8sk7jm5vr0fz20fbygm4alhpirv0j20jfi1pab14yhhf34h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e7db0c34f0f6fb9c3b9e581a74304cc9a26ed342/recipes/org-iv"; @@ -51658,12 +50022,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "20170712.657"; + version = "20170928.231"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "69b237d1b3c5cc0eb81fb5918df25d01e999b0f1"; - sha256 = "1ss1lxxilbr177mlp4iygg8q74qfw68v8iap9fpj6lvlm7vawins"; + rev = "cda1980b013afabd299e7a2294517897f6442d98"; + sha256 = "1y6idbp74vrr3g0r10n09znky8ih94kzf5fyil47sjkqyzzmpk3s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -51739,55 +50103,15 @@ license = lib.licenses.free; }; }) {}; - org-mac-iCal = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "org-mac-iCal"; - version = "20140107.519"; - src = fetchgit { - url = "git://orgmode.org/org-mode.git"; - rev = "657302b97e222abb262070586c56fe5d64355035"; - sha256 = "0myi67sdr62q0qxjijkxbpmyhxvnrxwjwpq2al1cds0bk8q7nzq4"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; - sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw"; - name = "org-mac-iCal"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/org-mac-iCal"; - license = lib.licenses.free; - }; - }) {}; - org-mac-link = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "org-mac-link"; - version = "20170105.1723"; - src = fetchgit { - url = "git://orgmode.org/org-mode.git"; - rev = "657302b97e222abb262070586c56fe5d64355035"; - sha256 = "0myi67sdr62q0qxjijkxbpmyhxvnrxwjwpq2al1cds0bk8q7nzq4"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; - sha256 = "02rmhrwikppppw8adnzvwj43kp9wsyk60csj5pygg7cd7wah7khw"; - name = "org-mac-link"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/org-mac-link"; - license = lib.licenses.free; - }; - }) {}; org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "20170807.549"; + version = "20171008.644"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "8067e76eb1fb6a9c15229cc93015aba923120a19"; - sha256 = "0r33y6l74i8n2fbqcazq4r2659lqva855mf5lm5yf7spjga2f9vw"; + rev = "0a0aa9b11005ff620b447c75e15122f6c0f9d81b"; + sha256 = "1m5qih09zyi8awwf2badis9czy0biwnpxrhd26an3ssb07i7ajgs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -51977,21 +50301,21 @@ license = lib.licenses.free; }; }) {}; - org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild }: + org-parser = callPackage ({ dash, emacs, fetchhg, fetchurl, ht, lib, melpaBuild }: melpaBuild { pname = "org-parser"; - version = "20170814.2016"; + version = "20171002.2136"; src = fetchhg { url = "https://bitbucket.com/zck/org-parser.el"; - rev = "f568dd98a8b2"; - sha256 = "15lbanb14ip0xwcd3ddq5a0099f299blvf6j3g03hmnzfa4pm7cy"; + rev = "105050acee08"; + sha256 = "1y1ikk950awxhvx4d930ymqa8ds6a0wlywzx09jvrnkvbisd4l63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28d55005cbce276cda21021a8d9368568cb4bcc6/recipes/org-parser"; sha256 = "06yb78mf486b986dhvqg3avflfyi271vykyars465qpk0v8ahq8h"; name = "org-parser"; }; - packageRequires = [ dash emacs ]; + packageRequires = [ dash emacs ht ]; meta = { homepage = "https://melpa.org/#/org-parser"; license = lib.licenses.free; @@ -52104,12 +50428,12 @@ org-projectile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-category-capture, projectile, s }: melpaBuild { pname = "org-projectile"; - version = "20170819.1047"; + version = "20171006.1230"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "48f621b595e748c5e03431f237facf258ffc9443"; - sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89"; + rev = "d57062569e59f598fcad1107f463691ec5d07e5f"; + sha256 = "1s5d9g8a8wgap0hsn5wqwzr20r6xr2jfm720zb404ixpkw4p939y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d7a7ab98f364d3d5e93f83f0cb3d80a95f28689/recipes/org-projectile"; @@ -52129,8 +50453,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "org-projectile"; - rev = "48f621b595e748c5e03431f237facf258ffc9443"; - sha256 = "00n2msmwcjjiibrhrvpawzgz6qcjjfy9qnii1iaass0038g4bd89"; + rev = "d57062569e59f598fcad1107f463691ec5d07e5f"; + sha256 = "1s5d9g8a8wgap0hsn5wqwzr20r6xr2jfm720zb404ixpkw4p939y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6760daac1ef9d9d7ba07e2fc9668873020f901f1/recipes/org-projectile-helm"; @@ -52257,12 +50581,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, pdf-tools, s }: melpaBuild { pname = "org-ref"; - version = "20170808.625"; + version = "20170927.2056"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "0af19a6ed3ccde878c27c27f1413409fdc0de9f8"; - sha256 = "0prwvc3yywivhap6rrji25afcxc553nginzxgrr7fbkxy5vfprzg"; + rev = "5fcbd975523281e5bacaf0284af21b4387147a98"; + sha256 = "0fc5kcz1xy819m960qn28hz9c13qpc542kzihmzkc3ykm5d96x3c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -52520,12 +50844,12 @@ org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-tfl"; - version = "20161120.932"; + version = "20170923.518"; src = fetchFromGitHub { owner = "storax"; repo = "org-tfl"; - rev = "f0405e3ad62b90ea43489bdd6312adbd77edb9f3"; - sha256 = "0cznw60ivaz42ass35sf9i62x7mf9in6z8kr8wc5i1mb7hafy2hk"; + rev = "f0d7d39106a1de5457f5160cddd98ab892b61066"; + sha256 = "1rwdibiq0w4nzccmvdkpwnmfga70y35lfg2xlkqxd02x7bfl7j3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf/recipes/org-tfl"; @@ -52688,12 +51012,12 @@ org-vcard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-vcard"; - version = "20161001.2202"; + version = "20170929.410"; src = fetchFromGitHub { owner = "flexibeast"; repo = "org-vcard"; - rev = "58f83784c580da893c214bd729aae3ab5d285f33"; - sha256 = "122qxg0ji9c7zj52vqlf9d6276w7rdlxg4ippy6dayqs8bhkimbg"; + rev = "dbe266b79df4fb31f1766010322bf4e383ce1c03"; + sha256 = "1rcqcgxvjshbz3n1p376h618xapj03n6m7b3cxgv9gnryviyr6ax"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/df860814a09c376c9a6a2c5e7f528bbae29810b2/recipes/org-vcard"; @@ -52730,12 +51054,12 @@ org-web-tools = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-web-tools"; - version = "20170906.102"; + version = "20171008.2128"; src = fetchFromGitHub { owner = "alphapapa"; repo = "org-web-tools"; - rev = "9ae976aedacefdbe4a827bd66a4642f40bc878d4"; - sha256 = "18hbcjg30fd342mvab3h7v8y5mja90g54823mnvmffhrp657z7qc"; + rev = "dac686b18cddbf3af4632054b15ff53c1ae8d564"; + sha256 = "1bw543dc0lbzf4s3sjwg6y8pszfpkby5dyj0pykg98pcii51agkj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f082bfb480649d21f586b7eb331c19d57e7a84cf/recipes/org-web-tools"; @@ -52856,12 +51180,12 @@ org2web = callPackage ({ cl-lib ? null, dash, el2org, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org2web"; - version = "20170809.411"; + version = "20171005.1617"; src = fetchFromGitHub { owner = "tumashu"; repo = "org2web"; - rev = "b14aaecd9e51b3cc4fa4530bfc6f07dd47c80616"; - sha256 = "04f85kw7d5s8yszbm0270yyb49i3k5a9q35a6zdfhpmpfap48h90"; + rev = "5243b399927a4c474bb3b8d1c8a00799df1f27d7"; + sha256 = "0wsvfn409a2ivbich8b8zqza78sprirg4bl7igx536ydqclmi0n7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org2web"; @@ -53079,8 +51403,8 @@ src = fetchFromGitHub { owner = "DamienCassou"; repo = "orgtbl-show-header"; - rev = "0b63ab4425b6e2af8ffb1f0b94839918d1720d09"; - sha256 = "161bsmgrbdhb73k36gqb5b96mf0y0sl8q9sjg81vx86bs9sbkddw"; + rev = "112d54a44682f065318ed0c9c89a8f5b8907342a"; + sha256 = "1s2bgsm4s33w5275qghw1axdpmz6bbyhki53jr2giyk4f90822gi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c5ea906b1d642405ca532d89dbb32cf79f53582/recipes/orgtbl-show-header"; @@ -53432,12 +51756,12 @@ outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }: melpaBuild { pname = "outshine"; - version = "20170904.1524"; + version = "20171005.955"; src = fetchFromGitHub { owner = "alphapapa"; repo = "outshine"; - rev = "a695215b47ca4a950c47a69a5c6e4c695892b1b3"; - sha256 = "18c1iqfw2q9if6yhvgspcw5arhd549gcvwyphnsl9cl6q40q2vly"; + rev = "75389b7104692f4f6a97dc72020d145f03affd25"; + sha256 = "0j99wx48xq5vpla69yj5w255n3acbgc4bbig4kmbvayr2871ls7n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8edf78a0ecd2ff8e6e066b80751a31e11a068c3f/recipes/outshine"; @@ -53478,8 +51802,8 @@ src = fetchFromGitHub { owner = "tonini"; repo = "overseer.el"; - rev = "3269801dc5145d41c11599430229340e6dfa6cc6"; - sha256 = "1zjp1bw7ipg4ibabrc0wzzsvd4jydjq571768v2hdpzcdw36d8f7"; + rev = "6be1f2a4df1b7a20298865b85502ee89e327898d"; + sha256 = "0ipq5gflymvznb8xzfl524l09sj90787bzga9ymjjpc4rn9zmqlb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/overseer"; @@ -53579,12 +51903,12 @@ ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-epub"; - version = "20170414.0"; + version = "20171003.327"; src = fetchFromGitHub { owner = "ofosos"; repo = "ox-epub"; - rev = "113300ed2c66cca10624e6d7bf5ff0a72e05653a"; - sha256 = "1xj643jybrd6idn6bazp0canj8pm9v3gs199fa17hlag7151ancw"; + rev = "c12467d1c6a2a3f89e1e271c44e29eb5409ed9df"; + sha256 = "0qlnxqzc3xw12w62kgjmmkvm2l25z4rjz77dnl4y15pqrjl4ljak"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; @@ -53642,12 +51966,12 @@ ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "20170912.1322"; + version = "20170930.1905"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "a486141e4e2c3f9f67e799e20af150611d77f850"; - sha256 = "1srrkc0bajmhp614avk4yr51zsp0gnmn47r1wi7qxkr6ybxwx8k1"; + rev = "98346caff78f5e8740505bcade85e00914bc54a6"; + sha256 = "0c1ajqybpcv0nc5fklq01lkz1f0320wnn43i0r22d4m8dflqfhy0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -53705,12 +52029,12 @@ ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-jira"; - version = "20170607.1513"; + version = "20171001.216"; src = fetchFromGitHub { owner = "stig"; repo = "ox-jira.el"; - rev = "a5e7c7166f5d4baf4b6487f44865f2636cda4698"; - sha256 = "14qybj34wvpn91m9hvfmcrsj5d9zzq5pyzjc61gd0zn482bklxz4"; + rev = "db2ec528f46c9e611624ba28611c440a99bff255"; + sha256 = "04zz6359xkn4w7jmmadxyvjd8pw21gw12mqwch1l9yxc4m9q474l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira"; @@ -53894,12 +52218,12 @@ ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-rst"; - version = "20170418.758"; + version = "20171004.1553"; src = fetchFromGitHub { owner = "masayuko"; repo = "ox-rst"; - rev = "70f15591715796b1d96af660481739f019c295cb"; - sha256 = "1q6qfgfajl103hsf5zp4zxpf4svypv0n1kiqkhjp12b0hy45n2l0"; + rev = "6d1eab55ff7c8dc4bcf511c9483e69f2a840e928"; + sha256 = "10z922lcg8hz517kg57knx2irfcac8plp9nsxayrbxpkjx7mmjlj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3af3905e1ce36397645a54078280852a8a7eb1eb/recipes/ox-rst"; @@ -54083,12 +52407,12 @@ package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-build"; - version = "20170910.124"; + version = "20171008.2352"; src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "46055de8792a1c7c01d06f74148dae6d700b00d6"; - sha256 = "1x1kln1bdqxxgan1pkjs98a9d3737j4qfpza4r70va7wvsy3ndhj"; + rev = "6c288fd22eef6332adc5680aa0843d1c678c4832"; + sha256 = "1s2p5c1c8fyiwi6idjl4bw2cxikdim0maw6w5pf12k2j1bwm98qy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/948fb86b710aafe6bc71f95554655dfdfcab0cca/recipes/package-build"; @@ -54125,12 +52449,12 @@ package-lint = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "package-lint"; - version = "20170907.201"; + version = "20171006.1846"; src = fetchFromGitHub { owner = "purcell"; repo = "package-lint"; - rev = "2fc3bc9530caea437a55e23c13d31d8803193107"; - sha256 = "076da92vc86kdc7gdh8id7w8qadh0fbiz068qzk8kr8w5bw6zkr6"; + rev = "ff64e1171e8330972c26bf547042429927aed7c7"; + sha256 = "11hsxvla2vq944zfd8kr0wynvkr7n90jv714ll6f7yhn10nrraks"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9744d8521b4ac5aeb1f28229c0897af7260c6f78/recipes/package-lint"; @@ -54332,25 +52656,6 @@ license = lib.licenses.free; }; }) {}; - palette = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild { - pname = "palette"; - version = "20170307.936"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/palette.el?revision=84"; - sha256 = "112b91z1f4p0j4kzrn8110w9pk2fyndjqiiyh0vkwah2ihpsw3pj"; - name = "palette.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/2cdf2d07307007a95d1fe8dc8d2f105c34a26416/recipes/palette"; - sha256 = "1s9lklvr1b0a496q0ljbhkl8zdx80d7bqvkdjnfp35z2s37f1zz3"; - name = "palette"; - }; - packageRequires = [ hexrgb ]; - meta = { - homepage = "https://melpa.org/#/palette"; - license = lib.licenses.free; - }; - }) {}; palimpsest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "palimpsest"; @@ -54396,12 +52701,12 @@ pamparam = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, lispy, melpaBuild, worf }: melpaBuild { pname = "pamparam"; - version = "20170910.537"; + version = "20170927.1048"; src = fetchFromGitHub { owner = "abo-abo"; repo = "pamparam"; - rev = "d452c3baa19d51fb04c5a52f550b560fe695eb0a"; - sha256 = "02qrc3qxajzxm9lfrd33i9sbawh9nf4gz9i3drzhv11ca549paaq"; + rev = "c840a8f941940bb8e694c635995566faee995c7b"; + sha256 = "0wqnzgkcwhrgxdkrlk6i469gcas9477pbkv878cqq9ifsjwvf42n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/067b5e3594641447478db8c1ffcb36d63018b1b2/recipes/pamparam"; @@ -54480,16 +52785,16 @@ paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, hexrgb, lib, melpaBuild }: melpaBuild { pname = "paper-theme"; - version = "20151231.932"; + version = "20170924.1231"; src = fetchFromGitHub { owner = "cadadr"; - repo = "paper-theme"; - rev = "15af5e31492f79dc0d47787150ef39d6318a2608"; - sha256 = "1xh614czldjvfl66vhkyaai5k4qsg1l3mz6wd5b1w6kd45qrc54i"; + repo = "elisp"; + rev = "b3d8b45c76134e2248448d719c840776e41b747a"; + sha256 = "0fy0b04mf3brx86xjnidkwg4zs4nh123nc6pgrl4mp6d6552vv98"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a35a0888a7a27174b5de58d99b01554769041f46/recipes/paper-theme"; - sha256 = "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a7ea18a56370348715dec91f75adc162c800dd10/recipes/paper-theme"; + sha256 = "1ph6c6g907cnxzl74byc754119qia8rs8y7wvaj8i6q3fz2658zr"; name = "paper-theme"; }; packageRequires = [ emacs hexrgb ]; @@ -54526,8 +52831,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "c508a52aee7f10f5e9b750b4724e264a3e694757"; - sha256 = "1xbys48368a6vcyjqxn71lg6yf7zvb2k9dlf07dl6hvh0a7qlpqa"; + rev = "dfdfbec8b4a3b71966c134f00c3f5edfa87b6245"; + sha256 = "1l0rs49lbclq4ayhnx6vi6bxn37a0h2ylk73fjcbar2lbr1dhf9r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -54769,22 +53074,22 @@ license = lib.licenses.free; }; }) {}; - pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }: + pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, password-store-otp }: melpaBuild { pname = "pass"; - version = "20170911.456"; + version = "20170928.1118"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "pass"; - rev = "f811120c33279fb6881c0a70ae26862adefcd659"; - sha256 = "07m80mscxfi5wmf0cvymlnpcp4aprzn8ynaxs6vxgpr11gwr8zvm"; + rev = "adcafc25e1bbd43b70251305a07252cc46d20308"; + sha256 = "0hbbqgj0vi5xlb48fjdy7yh8qx43hi6rw3jqrcmvlh3gnm47yhky"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/428c2d53db69bed8938ec3486dfcf7fc048cd4e8/recipes/pass"; sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr"; name = "pass"; }; - packageRequires = [ emacs f password-store ]; + packageRequires = [ emacs f password-store password-store-otp ]; meta = { homepage = "https://melpa.org/#/pass"; license = lib.licenses.free; @@ -54874,18 +53179,19 @@ license = lib.licenses.free; }; }) {}; - password-store = callPackage ({ emacs, f, fetchgit, fetchurl, lib, melpaBuild, s, with-editor }: + password-store = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, with-editor }: melpaBuild { pname = "password-store"; version = "20170829.1633"; - src = fetchgit { - url = "https://git.zx2c4.com/password-store"; - rev = "65cead8c0fdb07ce3821f6b97bdcb32684d0c3f7"; - sha256 = "0rm364l9mg2gl16ng5zd02gkfq8592mhrp81sk1v0wwh8wlyrzrh"; + src = fetchFromGitHub { + owner = "zx2c4"; + repo = "password-store"; + rev = "c1b3ff04425844ed88fac2a634232bdb8e2662bc"; + sha256 = "07hfca1r09m5p5i8y62b54xmhw1ymcq68ys0gk579d7lvvy6s5qf"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ceff76206bd44d92c00adc931236c4ae15db5583/recipes/password-store"; - sha256 = "06l4xlvrjswy5kndn6h6swliqcp007nh4fyvma3jaac4f3x2qi65"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store"; + sha256 = "03r8j14l12yc42b51fzvn1jh8j85nyl1rg6c80r0a7ihwkj27jv6"; name = "password-store"; }; packageRequires = [ emacs f s with-editor ]; @@ -54897,12 +53203,12 @@ password-store-otp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, s }: melpaBuild { pname = "password-store-otp"; - version = "20170912.349"; + version = "20170928.18"; src = fetchFromGitHub { owner = "volrath"; repo = "password-store-otp.el"; - rev = "2965da7d8edd32bd4ef62f487ea6bcd08c599c89"; - sha256 = "1svm6rlh4f0rjcl0fjy3x4bfakdn9npi8w7ak217ad2k08j44bzd"; + rev = "a39a64a91de36e87b852339635bd3c5fb0e32441"; + sha256 = "0gb48blvnn6ci2wl45z81p41ny7vbgl610hqy6b2hyr2171qjd60"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc89d02554a6ff150ad42634879073892f3e88be/recipes/password-store-otp"; @@ -55359,12 +53665,12 @@ pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }: melpaBuild { pname = "pdf-tools"; - version = "20170912.711"; + version = "20170918.934"; src = fetchFromGitHub { owner = "politza"; repo = "pdf-tools"; - rev = "c1b183f71e618693ac6ec20f051ca41270be3bce"; - sha256 = "059fmrakfzwq4xqf246ksi9h7gfm37f29565w9mvlq4z7hhbf5z3"; + rev = "52acd65c0db97a83e3f86ca97f9a3bf27135e8f3"; + sha256 = "19d5nmy7kdlysxzig2akbxvg9h1vnjagp4xh1qpyw8iqgm3kpxxn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e3d53913f4e8a618e125fa9c1efb3787fbf002d/recipes/pdf-tools"; @@ -55464,11 +53770,11 @@ pelican-mode = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pelican-mode"; - version = "20170818.1352"; + version = "20171001.503"; src = fetchgit { url = "https://git.korewanetadesu.com/pelican-mode.git"; - rev = "9b2a64b9d57ee4eb95e40a309fbab4bcfa5b5fef"; - sha256 = "19gqg2p56r0iz5l3p5y421c107f3jggwi60xk2wamx5jv9rbrn2d"; + rev = "64d41f0ee5970b2d875880994eb287b97cad24a1"; + sha256 = "0xivc8sdp6h3fajyj7g73xnyfqlkhfpm2cs9x3mpyr42502lmn2c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aede5994c2e76c7fd860661c1e3252fb741f9228/recipes/pelican-mode"; @@ -55501,48 +53807,6 @@ license = lib.licenses.free; }; }) {}; - perl-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "perl-completion"; - version = "20090527.2336"; - src = fetchFromGitHub { - owner = "imakado"; - repo = "perl-completion"; - rev = "f2ec91b88a8b7d97d40d6c90a89eaf8e595c2b89"; - sha256 = "0fzypcxxd5zlkcybz0xppf09l0vf4vsfisr2y3ijsmxhg7yrwzj5"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/987c14a2c4a31e27382d05cdbca18a3d2661d2e1/recipes/perl-completion"; - sha256 = "01p17mlkwjm60f14arda3ly8ng0r98nn3rly94ghn6jr7r7fv14b"; - name = "perl-completion"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/perl-completion"; - license = lib.licenses.free; - }; - }) {}; - perl6-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: - melpaBuild { - pname = "perl6-mode"; - version = "20160730.1455"; - src = fetchFromGitHub { - owner = "hinrik"; - repo = "perl6-mode"; - rev = "14073feeb0f8ad2225616d550133f8f473a51b33"; - sha256 = "1j6zgr9vfyqpdya8975sjh2ny70rqqyj9zbl63kldkirppnw995i"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d4bbb2171c70958d5ab3730f974db3b07561a81b/recipes/perl6-mode"; - sha256 = "0af1djypd8n0n1fq10sl8mrdg27354kg9g87d6xz4q5phvi48cqv"; - name = "perl6-mode"; - }; - packageRequires = [ emacs pkg-info ]; - meta = { - homepage = "https://melpa.org/#/perl6-mode"; - license = lib.licenses.free; - }; - }) {}; perlbrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "perlbrew"; @@ -55735,12 +53999,12 @@ perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "perspeen"; - version = "20170813.1754"; + version = "20170916.404"; src = fetchFromGitHub { owner = "seudut"; repo = "perspeen"; - rev = "6b3a3b0468199a8db10a73d119dfcd8833d181b6"; - sha256 = "13rivw5rafl4pb68l500ksbzpz00yp7lx9wi9vy8nz0hwr80jd0p"; + rev = "525f2f25358f17c7269c3750d56bfb8a6d59b5e6"; + sha256 = "17nv33nl60jdn6cz6abbj6jxnvjcshaq4a22lkssxczp968k1qn3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/perspeen"; @@ -55756,12 +54020,12 @@ pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pfuture"; - version = "20170531.805"; + version = "20170726.1502"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "pfuture"; - rev = "a6c32c69abdb9b91baf8036b88cc4f477f611bd5"; - sha256 = "0ly38dzg754n4s2xs09kaisxs14ikm42d9sjhw9p9xirzqm7zd5j"; + rev = "8b5cd8dfb8769d2b24484a313d3d21938afd3dfb"; + sha256 = "1d63sfwy7qmldhq2xda9dglg91cy2kpjdr2rlmqb48w95wf0am3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture"; @@ -56908,25 +55172,6 @@ license = lib.licenses.free; }; }) {}; - plsql = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "plsql"; - version = "20121115.243"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/plsql.el?revision=5"; - sha256 = "1v0wvy9fd1qq3aq83x5jv3953n0n51x7y2r2ql11j0h8xasy42p1"; - name = "plsql.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/eb457144c112a7a9de2fc4c634dfd6c2dda2e486/recipes/plsql"; - sha256 = "1jvppmfdll34b8dav5dvbabfxiapv92p7lciblj59a707bbdb7l1"; - name = "plsql"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/plsql"; - license = lib.licenses.free; - }; - }) {}; plur = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plur"; @@ -56972,8 +55217,8 @@ version = "20170419.303"; src = fetchgit { url = "https://git.savannah.gnu.org/git/gettext.git"; - rev = "5ad8c92742daaf4434fded196ff23638cdaa621b"; - sha256 = "1z3cy6n727lrsm8smksb48hbj2ckh4wri44c0423hdf84qp5ifg8"; + rev = "b05d13f04990f6ed74637ee8bdb42fd1500974ac"; + sha256 = "03bcknd6y6rhg6185bjga2idswq4p0d87jmyhkx2x56gdybpa9mr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caaa21f235c4864f6008fb454d0a970a2fd22a86/recipes/po-mode"; @@ -57007,6 +55252,27 @@ license = lib.licenses.free; }; }) {}; + pocket-lib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, request }: + melpaBuild { + pname = "pocket-lib"; + version = "20171008.2135"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "pocket-lib.el"; + rev = "9f2a5dad867ef11d6629073ae4c8a43df1c03470"; + sha256 = "1y97zlnxp0lxh21x51bdkvd8yxg59sxbq94s06vkvkbq2pjz86pp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/71f17ce28f4fc8c2c100848be8aec15526ef8697/recipes/pocket-lib"; + sha256 = "0v619blifmvm36dr773wjf35fjji4dj3pyck9nkz0m8zmpz0fg78"; + name = "pocket-lib"; + }; + packageRequires = [ dash emacs kv request ]; + meta = { + homepage = "https://melpa.org/#/pocket-lib"; + license = lib.licenses.free; + }; + }) {}; pocket-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pocket-api }: melpaBuild { pname = "pocket-mode"; @@ -57028,6 +55294,36 @@ license = lib.licenses.free; }; }) {}; + pocket-reader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, org-web-tools, ov, pocket-lib, rainbow-identifiers, s }: + melpaBuild { + pname = "pocket-reader"; + version = "20171008.1411"; + src = fetchFromGitHub { + owner = "alphapapa"; + repo = "pocket-reader.el"; + rev = "410add35782f037e4c42d3f740fb5623901ebf39"; + sha256 = "1lchwlv32b5gfgkp2i3li3rk3w1xyz8axamz5mqs1imb6mkc1dws"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/835a7bf2f72987183e9d15ada7ae747fb5715c11/recipes/pocket-reader"; + sha256 = "0gcgmz4mhjgvqbh2gmv8v09sy80cnfccjym455m0fbl31b8dczhf"; + name = "pocket-reader"; + }; + packageRequires = [ + dash + emacs + kv + org-web-tools + ov + pocket-lib + rainbow-identifiers + s + ]; + meta = { + homepage = "https://melpa.org/#/pocket-reader"; + license = lib.licenses.free; + }; + }) {}; podcaster = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "podcaster"; @@ -57091,25 +55387,6 @@ license = lib.licenses.free; }; }) {}; - point-undo = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "point-undo"; - version = "20100504.129"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/point-undo.el?revision=6"; - sha256 = "13c1iw77ccvrfrv4lyljg8fpm7xqhnv29yzvig8wr8b5j2vsd8bz"; - name = "point-undo.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ce31bd8f9a1ad4f3252f8cd4ef15984495df18bd/recipes/point-undo"; - sha256 = "0by7ifj1lf0w9pp7v1j9liqjs40k8kk9yjnznxchq172816zbg3k"; - name = "point-undo"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/point-undo"; - license = lib.licenses.free; - }; - }) {}; pointback = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pointback"; @@ -57197,12 +55474,12 @@ pomidor = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pomidor"; - version = "20170817.2253"; + version = "20170925.2301"; src = fetchFromGitHub { owner = "TatriX"; repo = "pomidor"; - rev = "58a4368d91d472aa47a83f498be82db8929cf41a"; - sha256 = "1g6mwx6gq6zlzn06izic81qf2ppqprfmap5hgsksx1xbickkmwdx"; + rev = "16bed77ff933cb5f8430b6eacf27509631d22072"; + sha256 = "1w2ql67arjzzjakqm34gbs3vf6w9yzkw5kzi5vrvkcwajqq8qq56"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0d4f313081594df23f357c40feb456847d8bd0/recipes/pomidor"; @@ -57302,12 +55579,12 @@ pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }: melpaBuild { pname = "pophint"; - version = "20170403.701"; + version = "20170917.1948"; src = fetchFromGitHub { owner = "aki2o"; repo = "emacs-pophint"; - rev = "5d1db7c0b92862ba2cc5f3566b25840b8ce3ba59"; - sha256 = "09av2krrmm8g3f3f31kl4j4agmmf8hx9irzrqyvgshljflk0nq1q"; + rev = "909025c5a871ca4b9ec7aed7f1a27c819a94dba1"; + sha256 = "0qbb36qijkzbzxlmqsvvddm7x2gk9rkafnyjbkxsl76rz1ajy6nz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0055c2887acbbd8a2803bf3f81ac2cc444cc805a/recipes/pophint"; @@ -57596,12 +55873,12 @@ powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "powerline"; - version = "20170708.1442"; + version = "20171008.2002"; src = fetchFromGitHub { owner = "milkypostman"; repo = "powerline"; - rev = "8a246902e86a0c59015bb897a9c59be9729ef5c4"; - sha256 = "1q90y0l0vdach8irb9cigw8w5nllvzv5hg8hd8ljpb4j9jhc5y5n"; + rev = "b51217d52ea0b8b91b15783d364562b6668ac0d0"; + sha256 = "0afhs8dpvlc29xpdgwm0jp1syyyraqipscxx89x1yi0idkgvxj29"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f805053cd4dd9ed53ee0df17ad69429bc62325bb/recipes/powerline"; @@ -57656,44 +55933,6 @@ license = lib.licenses.free; }; }) {}; - pp-c-l = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "pp-c-l"; - version = "20170307.939"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/pp-c-l.el?revision=25"; - sha256 = "0q36bq82lp381jnzf8kapiiglqgibzkhsxlhpgfdg3ynbmw5i1cc"; - name = "pp-c-l.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp-c-l"; - sha256 = "0gbqxlrsh9lcdkrj8bqh1mpxyhdlwbaxz4ndp5s90inmisaqb83v"; - name = "pp-c-l"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/pp-c-l"; - license = lib.licenses.free; - }; - }) {}; - pp-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "pp-plus"; - version = "20170307.938"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/pp+.el"; - sha256 = "0a1dj9n3n81xal17djj15hqa71cqphjnf9k9z03vnpw8zq0m93lh"; - name = "pp+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp+"; - sha256 = "1ng5x7dp85y6yqj6q43h08qdnapg2j1ab8rmc47w4w79d1pryniq"; - name = "pp-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/pp+"; - license = lib.licenses.free; - }; - }) {}; ppd-sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, project-persist-drawer, sr-speedbar }: melpaBuild { pname = "ppd-sr-speedbar"; @@ -57820,25 +56059,6 @@ license = lib.licenses.free; }; }) {}; - pretty-lambdada = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "pretty-lambdada"; - version = "20170307.940"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/pretty-lambdada.el?revision=15"; - sha256 = "0b8m96hbqmgyqmv5f890fnyl9vl2wcsaz8w4b11wdprh82ravp4r"; - name = "pretty-lambdada.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pretty-lambdada"; - sha256 = "16v5fgifz672c37xyzv557mm6za4rldvdrb26vdymxqg4fy62fd6"; - name = "pretty-lambdada"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/pretty-lambdada"; - license = lib.licenses.free; - }; - }) {}; pretty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pretty-mode"; @@ -58112,26 +56332,6 @@ license = lib.licenses.free; }; }) {}; - project-local-variables = callPackage ({ fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "project-local-variables"; - version = "20080502.952"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/project-local-variables.el?revision=1"; - sha256 = "1bb5b6hxg3gvwf0sqwkd97nnipsmr60py0rnsfhgvizn4cj3khhw"; - name = "project-local-variables.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/project-local-variables"; - sha256 = "1jys9nac2912jdv40fly1q4i30xa8b1v2ndbc50rk4ysarhbhdd9"; - name = "project-local-variables"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/project-local-variables"; - license = lib.licenses.free; - }; - }) {}; project-persist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "project-persist"; @@ -58218,12 +56418,12 @@ projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20170827.2053"; + version = "20171008.135"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "adf6ae2dbfbdca96aec49115ca35867006f326b1"; - sha256 = "1x39v7lb63k2nfa4xyvkgvgxbd88jcqnwdmd78a86p5zc3m42zk9"; + rev = "933fcbd849781ea5e0ace32b9dc655d00de7df06"; + sha256 = "020j7cpa5ljblanf4y7xsr7gvz12b8cdgpy75k0hb4igc62qzkym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -58369,8 +56569,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "sift.el"; - rev = "ef509ac4c579340e8d924c26d9e5858a9f4fb9de"; - sha256 = "0i8gqzvpl3drzp031dqdpsi1ssr3az8fzb7xpbxnamzscfz6pdyc"; + rev = "4ce8878a0fc396ded7521ce38852d93e1d863065"; + sha256 = "1x78i6svi4cwah9xw85imhpncvxsx4xim4fzykpnd328mxkk07h6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a730e1331b0486c4bd2d309b85d2f8810489eb47/recipes/projectile-sift"; @@ -58428,12 +56628,12 @@ projector = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "projector"; - version = "20170717.1151"; + version = "20171006.1258"; src = fetchFromGitHub { owner = "waymondo"; repo = "projector.el"; - rev = "ec63167ee21d537f410c0971f82e2ffdfd6fa008"; - sha256 = "155wnks7i73c3kvgysnfy0379d1fp78qv2b8lhsaxwx7jh356dbm"; + rev = "03751fca880c95cf47e560c78cfc2aaa056cd455"; + sha256 = "1yg9pcs6pbwd7a35q0jqjwnqwjqz4v5jd24msr51xh0v8kbs2v61"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/420ffea4549f59677a16c1ee89c77b866487e302/recipes/projector"; @@ -58642,8 +56842,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "06aa8dc9e730cc39c67d0ff9c0c95e645ccf03c9"; - sha256 = "0na3apgapd78z57jfdwns35mflqgwjwbcj2lmspg9ipg0x191378"; + rev = "77f64bb7779ec2195f9bc4dc82497d12c18fc6b7"; + sha256 = "0176y1ikr6pi3paz4q588ka3c02al25fnbn0y09z10mi7nplrx85"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -58680,12 +56880,12 @@ psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, s, seq }: melpaBuild { pname = "psc-ide"; - version = "20170817.1206"; + version = "20170923.250"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "fb3040a1204c4a6f7a54abc499fb88074627cb3e"; - sha256 = "0fh2xv0rz5mkhqvcaj55wpx39f953qalz5v46v35nzmhc0fpmzab"; + rev = "e577f84b938a1fb461a016540b06f5d5e399526a"; + sha256 = "14q4bj7cfny1jwsvdjfsl88nhwh5al8hyvf4rxki9k2wim8lx2bv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/384ffc463cc6edb4806f8da68bd251e662718e65/recipes/psc-ide"; @@ -58711,12 +56911,12 @@ psci = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }: melpaBuild { pname = "psci"; - version = "20170818.1301"; + version = "20170914.1048"; src = fetchFromGitHub { owner = "purescript-emacs"; repo = "emacs-psci"; - rev = "875ea3231e4aceadf7718daef75a1426ff8e87e5"; - sha256 = "11yihnlm7cawyhgava70xja8rf0gi6j1jf3z4x8ylf5wjj6fbbfc"; + rev = "47a0ba79e7284c71bebd8abe753246badeb1251d"; + sha256 = "1j2zbxk2d7yjpwhhv48j6qlsnmapk0858zrdiqpcicapddbsv66w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3451719ce5096383db082917716a5ed8346fc186/recipes/psci"; @@ -58813,27 +57013,48 @@ license = lib.licenses.free; }; }) {}; - pug-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + pug-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "20170913.348"; + version = "20171007.1642"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "3a3bdf96e64dc6f5d031bf0ed2b6002a600187ad"; - sha256 = "02mx4gs8hlinrxm8jas9jy83kvglaqjz3sxn4m4hrrj07gz0si96"; + rev = "971ccf8d380965a5268e499a8c8785f2fcdef6f4"; + sha256 = "1zrs94vcp7yjz929x51243jf0lifb8kbxdzr3slkc5wbni5c5jk3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; sha256 = "1njhr95y2rx7inpl9phxxz580844p2iadqlga1kj7xzvjz698x85"; name = "pug-mode"; }; - packageRequires = [ emacs ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/pug-mode"; license = lib.licenses.free; }; }) {}; + pulseaudio-control = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "pulseaudio-control"; + version = "20171004.428"; + src = fetchFromGitHub { + owner = "flexibeast"; + repo = "pulseaudio-control"; + rev = "f542adc0585e7890c11e478bf193ef6f3b1f6eac"; + sha256 = "1h0li679pz683bsnbv08g8sr2q8slh12lad0v7qhyig1if3yh63w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7964f226e12c3a27ff856e28f4b030ebf304aea2/recipes/pulseaudio-control"; + sha256 = "1vdhg85lbdx7sj1xg2vhhfmhrrp5q2x560agnsb0gxi2akp6z9r0"; + name = "pulseaudio-control"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/pulseaudio-control"; + license = lib.licenses.free; + }; + }) {}; punctuality-logger = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "punctuality-logger"; @@ -58900,12 +57121,12 @@ puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "puppet-mode"; - version = "20170719.752"; + version = "20170928.1007"; src = fetchFromGitHub { owner = "voxpupuli"; repo = "puppet-mode"; - rev = "fb1b683191d767eab312ea424de3517062d86420"; - sha256 = "12kxxgm61myna4wf3hgai8dgrssc9dnv75fh2mbcgwqggbfv8wlv"; + rev = "e04f041386ebfe29fc67c3407e85b577b820df4f"; + sha256 = "0hcp7hmxri62qcx80zqphlhwrhzapzi0c07kk4l2cm75xfy20a2l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1de94f0ab39ab18dfd0b050e337f502d894fb3ad/recipes/puppet-mode"; @@ -58921,12 +57142,12 @@ purescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "purescript-mode"; - version = "20161216.133"; + version = "20170926.242"; src = fetchFromGitHub { owner = "dysinger"; repo = "purescript-mode"; - rev = "c88126070c052d636f4dad5525846a1b200fce43"; - sha256 = "1ndclsywvh5x06gmvk44zjlgfamdn55lygdgxf3x1vrznvr0jawy"; + rev = "e2d6519a9669a1443db1040cf098bc3ea30ec861"; + sha256 = "1k8q32ipa684hvk7iwpdzqwikimw8g3j6gkmz9yi5fxflq6z1swr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77175fa470e517fa134751fbb38e144eb5b979ff/recipes/purescript-mode"; @@ -59360,12 +57581,12 @@ pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }: melpaBuild { pname = "pyim"; - version = "20170901.2053"; + version = "20170916.2024"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "54c05392e5a9523e34c7d54f8999632358f0ed89"; - sha256 = "0cxyz8b1djsdd0pxy15aamxx8j4vxvakinmrrwm3k6saqx8frmr9"; + rev = "d44db4cb74c1c0cf6f814ff14d0be8e733f8404a"; + sha256 = "02b2aknx127xvl8amf74krvd7z33kyr049iw5h0665zkzsli4g8w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; @@ -59490,8 +57711,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "e231a409a83a23c24c8b7dbbaca79314eee6d4c6"; - sha256 = "0xkbhd2cgsmqkbkscaa758ngfg01cdym7qgh809wsa0j6xf058lp"; + rev = "0b1b25a63f6d68a4dc21dbc47a0af79d3eed973e"; + sha256 = "0n3ihw3p61y46a8njq1ah5gxb26m13aawqsciy944l203s305845"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -59633,12 +57854,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20170825.20"; + version = "20171005.1620"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "e0fab065042a7e35b73928e94f32f649eac6a3af"; - sha256 = "0vpzzfdr85zp2gsh148yp1b1aynwcgvva69r3qjj0cwm13f28492"; + rev = "93345f0531b03c5bb2bf34417e9c25fc6fcda6d9"; + sha256 = "016igycxn7h3gjklr24a7yhp49y4h55f4hpd05haq9raj7vaa6qf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -59696,12 +57917,12 @@ python-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }: melpaBuild { pname = "python-x"; - version = "20161029.531"; + version = "20171006.336"; src = fetchFromGitHub { owner = "wavexx"; repo = "python-x.el"; - rev = "ef749fe2d3e58d5f6d7f32453d06964786c085d5"; - sha256 = "1nncinrwh0nqy8wn1q8yzi15nf15gj576ccsp5l28951gjgkc6s9"; + rev = "9bf0d16cfe7b5f24b98d6b33cbc8763edaceb174"; + sha256 = "0x255lnfyv2i7yz6ipx5adazqmvgmf4mdcixzs1wv85gazmbgfc5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87ed5ea4868945df1bf92d1eae5d3ebb83ece117/recipes/python-x"; @@ -59738,12 +57959,12 @@ pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyvenv"; - version = "20170826.812"; + version = "20171005.1106"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "pyvenv"; - rev = "fc1e9c1fbac00460a32435390b94a8ce4f5542ce"; - sha256 = "0ckam3mkx44hrdykrhvm147xvw09rn328byl6dcpd3ygdqamwpdk"; + rev = "9f528449dfc35516647118689a2104603f23b49c"; + sha256 = "11yznfndkbyl6cmi7blxrr5yw9b32qw01abhvsj8jz1g1wnxhn45"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e37236b89b9705ba7a9d134b1fb2c3c003953a9b/recipes/pyvenv"; @@ -60095,12 +58316,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20170913.509"; + version = "20170913.534"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "d57b3a6c64835fe334501bb2b1f8e370be777d90"; - sha256 = "11mh94lcmwh0qb68lyqmdkannq9p9y3j32mmwc23q88z1z7vvbf6"; + rev = "33877b1bb24faea68842e0396bd5718b84e47451"; + sha256 = "0681mzwx08zwbh8qg3s26jw1jn4fw2ljp1akxqkhy08sxhafqvb1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -60200,12 +58421,12 @@ rainbow-delimiters = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rainbow-delimiters"; - version = "20160430.2358"; + version = "20170929.432"; src = fetchFromGitHub { owner = "Fanael"; repo = "rainbow-delimiters"; - rev = "93cd2dc873e7fedca7abc599cd97d46db4376ac7"; - sha256 = "0vs9pf8lqq5p5qz1770pxgw47ym4xj8axxmwamn66br59mykdhv0"; + rev = "19b93892afa0494ba749c2ca9c154e04447ad778"; + sha256 = "0c2a8pbhzzy0bxx8gxz320r106k69hvwkn43j06i6sidbgjwh786"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2cf11dbff76f0e3581b865f48bb44a307aa7f23/recipes/rainbow-delimiters"; @@ -60242,12 +58463,12 @@ rake = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rake"; - version = "20161114.605"; + version = "20170921.801"; src = fetchFromGitHub { owner = "asok"; repo = "rake"; - rev = "e680f1a8f2591af7c80cad188340601b101b5ddc"; - sha256 = "1dk2clsnmjy3bfv6laxf8sslvdajjbwpk83ss8v9xm55dcxjvd7n"; + rev = "a27322262ebcce7765574b577000f6f939400206"; + sha256 = "1fzlll8s5vri5hmqsx5ilbrms73b0rsn3k6m5dgq6rhgn5z5k6r1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bf0f84698dda02a5b84a244ee29a23a6faa9de68/recipes/rake"; @@ -60557,12 +58778,12 @@ rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rdf-prefix"; - version = "20170514.859"; + version = "20170915.1200"; src = fetchFromGitHub { owner = "simenheg"; repo = "rdf-prefix"; - rev = "35129521d5b6035e5dd75d5b3481ce4971f46034"; - sha256 = "1iy9385n8a2b7ph4wdf8p92n81slirsxxckrc3khbk5zrpp62z5k"; + rev = "25cc3c8902f16191496b549705b00ffc7dff51f1"; + sha256 = "00ycsqzgn5rq8r4r86z1j43i2a7wj4r3c2vcggdaizyf4parmgmy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix"; @@ -60704,12 +58925,12 @@ real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "real-auto-save"; - version = "20150701.815"; + version = "20170918.730"; src = fetchFromGitHub { owner = "chillaranand"; repo = "real-auto-save"; - rev = "81bf61742ea553ccdee0e22d3abb43fcf07f82cf"; - sha256 = "1kghhps8mqys5l59qwzv3fgy1fvb15cnyaxmk29v818a6khjc5l2"; + rev = "780d6c1c219e1f1efde1159a99af97b1c54c005d"; + sha256 = "1wcyvyc3nwr9a89v8i4wmqvy2fwf7x7f3kcj7a8kdnp2albkvwsa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/525039a3dc29190829bf50d608ef09bc4a8557af/recipes/real-auto-save"; @@ -60725,12 +58946,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20170907.916"; + version = "20171006.1840"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "f41b7a7f8eac0be5c4d8780af1d461f9e51e9cad"; - sha256 = "1k3xsidc05dls9scsi7vvrrqlfgqk343crgh89amg066s5p55s6y"; + rev = "081f7edc79a8e510d47e10c6ce4306b2f850df1f"; + sha256 = "0nj95w5jfck0lhnrrnrl6h31cvgnpizbhnr52k7mf360vwrsjil6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -60875,25 +59096,6 @@ license = lib.licenses.free; }; }) {}; - recentf-ext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "recentf-ext"; - version = "20161210.840"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/recentf-ext.el?revision=5"; - sha256 = "0pzimhqkrdg2s9zw7ysir740cmaycf6fjs08bmlfjads7vdbjfpg"; - name = "recentf-ext.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5a36ac5e0fc3599d50d7926cacf16b7a315f0e76/recipes/recentf-ext"; - sha256 = "1m54w1n3ci5j7i1jhw6cs7dgzmxrj1hsrrarqlrd1d4iqhixjzbq"; - name = "recentf-ext"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/recentf-ext"; - license = lib.licenses.free; - }; - }) {}; recompile-on-save = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "recompile-on-save"; @@ -60918,12 +59120,12 @@ recover-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "recover-buffers"; - version = "20150812.5"; + version = "20171008.2137"; src = fetchFromGitHub { owner = "tripleee"; repo = "recover-buffers"; - rev = "a1db7f084977697081da3497628e3514e032b966"; - sha256 = "114ssmby614xjs7mrpbbsdd4gj5ra6klfh8h6z8iij8xn3kii83q"; + rev = "81a5cb53099955ebc2a411a44cba5a394ee3f2d1"; + sha256 = "07dfdvz5rn5l13xdycd7h75zaq0pw2afb9n1yiq01fqk6gvrhc5b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/43b33cfb794c35de78fde6eabb71ffe01049d23d/recipes/recover-buffers"; @@ -61020,25 +59222,6 @@ license = lib.licenses.free; }; }) {}; - redo-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "redo-plus"; - version = "20131117.351"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/redo+.el"; - sha256 = "1jc4n60spzssa57i3jwrqwy20f741hb271vmmx49riycx1ybx3d3"; - name = "redo+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/redo+"; - sha256 = "0v7nrn6fbjx4mb0xsnkvqxk2hp35wfy83si5bavwwym4jcb5pl2r"; - name = "redo-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/redo+"; - license = lib.licenses.free; - }; - }) {}; redpen-paragraph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "redpen-paragraph"; @@ -61063,12 +59246,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20170903.911"; + version = "20171008.409"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "f96a5a50354cdc8a83b8fe347fafc49ad6c303a0"; - sha256 = "0pq0730b8nxm4xhb3dilnmp7lhv8vb83q7860dc64mds3fl12fg0"; + rev = "887d32fa14ec6e9e024e50077c119b95b22d91d3"; + sha256 = "1ibrqnnnsqplgx2hdj3jf8jcg3dwc01d50pkfb75wwi1w2xvsjmk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -61081,26 +59264,6 @@ license = lib.licenses.free; }; }) {}; - redshank = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "redshank"; - version = "20120510.1230"; - src = fetchgit { - url = "http://www.foldr.org/~michaelw/projects/redshank.git"; - rev = "f98e68f532e622bcd464292ca4a9cf5fbea14ebb"; - sha256 = "1jdkgvd5xy9hl5q611jwah2n05abjp7qcy9sj4k1z11x0ii62b6p"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f2cf21b79d47a4bc154ac15f8111794ca9eeac16/recipes/redshank"; - sha256 = "07s4gja1w8piabkajbzrgq77mkdkxr0jy9bmy2qb9w2svfsyns9b"; - name = "redshank"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/redshank"; - license = lib.licenses.free; - }; - }) {}; redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redtick"; @@ -61457,25 +59620,6 @@ license = lib.licenses.free; }; }) {}; - replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "replace-plus"; - version = "20170801.1947"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/replace+.el"; - sha256 = "0vlk2sjszzzkf94vfgb52ck4qbqp9ll1kdlxnmxixjxxl8iciwzj"; - name = "replace+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/replace+"; - sha256 = "1imsgr3v8g2p2mnkzp92ga3nvckr758pblmlha8gh8mb80089krn"; - name = "replace-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/replace+"; - license = lib.licenses.free; - }; - }) {}; replace-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "replace-symbol"; @@ -61770,25 +59914,6 @@ license = lib.licenses.free; }; }) {}; - reveal-next = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "reveal-next"; - version = "20170101.1120"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/reveal-next.el?revision=7"; - sha256 = "0vqacr3q9n772qmyyj35dxkqp79yqrpfhlf8zj70jzg04xzy6f0m"; - name = "reveal-next.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/38e5dd845c99acaae719562595059154a08a5f00/recipes/reveal-next"; - sha256 = "0fp6ssd4fad0s2pbxbw75bnx7fcgasig8xvcx7nls8m9p6zbbmh2"; - name = "reveal-next"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/reveal-next"; - license = lib.licenses.free; - }; - }) {}; reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "reverse-im"; @@ -61873,41 +59998,22 @@ license = lib.licenses.free; }; }) {}; - rfringe = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "rfringe"; - version = "20110405.820"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/rfringe.el?revision=1"; - sha256 = "02i5znln0aphvmvaia3sz75bvjhqwyjq1blf5qkcbprnn95lm3yh"; - name = "rfringe.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/rfringe"; - sha256 = "16a647gvvn5nzgng7a8pam4ay6aifvhldaxg2xfz9fcafzkvw967"; - name = "rfringe"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/rfringe"; - license = lib.licenses.free; - }; - }) {}; - rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }: + rg = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "20170908.2359"; + version = "20170930.653"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "adfdf6230f02f469a1b508922b6837f95f6434d2"; - sha256 = "0bk0caadn3wq2ck2acyvdssllw45l455binpm5i3i63nzs73v8r2"; + rev = "1a4ebe8bf2e1052a1a8dde3dcbfedb802ca070fb"; + sha256 = "1lpb22ggw17d8bx2gjmaxqk5rbf64gh8llvf9shl18r813d3srrb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm"; name = "rg"; }; - packageRequires = [ cl-lib emacs s seq ]; + packageRequires = [ cl-lib emacs s ]; meta = { homepage = "https://melpa.org/#/rg"; license = lib.licenses.free; @@ -61983,8 +60089,8 @@ src = fetchFromGitHub { owner = "wavexx"; repo = "rigid-tabs.el"; - rev = "d48ba58acbe8934700cd23db2acb574b09306238"; - sha256 = "03dmyn5lnw0mj4ymgyxz6gksl2byw31plxn61qcggkj6gk8g500d"; + rev = "eba84ceaba2e57e76ad2dfbb7a7154238a25d956"; + sha256 = "18rba101m9vmjl4mf3x0k7wvbgn6qmay9la745vzpr3lx1f4nn98"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/689b0060ee5db505fc0ed4603aca204b2d3c63a2/recipes/rigid-tabs"; @@ -62000,12 +60106,12 @@ rimero-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rimero-theme"; - version = "20170819.648"; + version = "20171001.821"; src = fetchFromGitHub { owner = "yveszoundi"; repo = "emacs-rimero-theme"; - rev = "451b9d30f7ef711ee8c9c304677c7dcac6c57cfb"; - sha256 = "0442s4pj8v4ympf8nk1zgrvk3d16djgdhknlvkwi296db3zixbc4"; + rev = "2c15da5a4d56f1b29db2fc178d387eb86e7abd39"; + sha256 = "0pvykjz0a2jgq2dghhshc4w7852jrlk0vy35ppbn956yp7rq9sx3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6d07b0c021001195e6e0951c890566a5a784ce1/recipes/rimero-theme"; @@ -62105,12 +60211,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "20170808.634"; + version = "20171009.608"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "39474fe464d76112e278445996cfd4ff84c39af8"; - sha256 = "11wz3gqdyb4ffsy9qdria0515ry643g3yjzidvaqccx6g59g4d5x"; + rev = "487ce00922571f84918e99ade678fe83d55bd6e0"; + sha256 = "1q396gzpqba7a4knnnx5pjwgbdh7r4q8ac7f81z9mp624w2zlgam"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -62189,12 +60295,12 @@ rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rope-read-mode"; - version = "20170620.237"; + version = "20171003.719"; src = fetchFromGitHub { owner = "marcowahl"; repo = "rope-read-mode"; - rev = "bbb67d54a31ce238e4a8b1aae677ef055aea27ba"; - sha256 = "1l00km1rrnybskv0rv0kqxdrqimmfwz4mmil64m2d6vl0nqickb0"; + rev = "77b183a6f5450138388509f54a6a2ce442766e50"; + sha256 = "0ddm7gwr51ip8mc79jxkvp52sxhlvs0kyy59v7r7pf5mbadbpsbz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode"; @@ -62336,12 +60442,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20170903.1710"; + version = "20171006.1343"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "2af4d6a32e8194f8fbcc23fd94395e3d595a3c25"; - sha256 = "0091w529lvbjlw1fdb3qjgb8fd5fcwxhqyr4ps5cvxl5bqnwlw39"; + rev = "12636847b1ea512ce2d0c1075a74465f38555e69"; + sha256 = "12v3wr2103293fkglbkhp20m2z72n66qka2s5zpcgc3jwqyqnnf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3dea16daf0d72188c8b4043534f0833fe9b04e07/recipes/rtags"; @@ -62396,18 +60502,19 @@ license = lib.licenses.free; }; }) {}; - ruby-additional = callPackage ({ emacs, fetchsvn, fetchurl, lib, melpaBuild, ruby-mode ? null }: + ruby-additional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "ruby-additional"; - version = "20161115.2259"; - src = fetchsvn { - url = "https://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "59866"; - sha256 = "05rkz2wvyr00rr6g5sc2jgx1v2m81cbf24gjazxw4i9b3sf55ykr"; + version = "20171001.2106"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "ruby-additional"; + rev = "14f380893cb7c1d9ddbb4ed1a2fc280999c82fde"; + sha256 = "07mbjnph72l52f0bgz6qn5pbnfiyjx5p1ranq5g4csbfpx9jcc3s"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-additional"; - sha256 = "1x5574swmch89jz2jiq6g34igp94bivzld0lb1nhyb1i3v1msq6i"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/ruby-additional"; + sha256 = "1ivxn787k64q5jl0dxmxbj240ykcyvfhfam5fdvrwvc3yysk2dx7"; name = "ruby-additional"; }; packageRequires = [ emacs ruby-mode ]; @@ -62416,25 +60523,6 @@ license = lib.licenses.free; }; }) {}; - ruby-block = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "ruby-block"; - version = "20131210.1931"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/ruby-block.el?revision=12"; - sha256 = "0c4vy9xsw44g6q9nc8aaav5avgp34h24mvgcnww468afiimivdcq"; - name = "ruby-block.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e2149ce3baef9ac01d5b2e8b1a933a3e1206015f/recipes/ruby-block"; - sha256 = "0jfimjq1xpwxkxya452kp27h0fdiy87aj713w3zsm04k7l6i12hm"; - name = "ruby-block"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/ruby-block"; - license = lib.licenses.free; - }; - }) {}; ruby-compilation = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "ruby-compilation"; @@ -62585,12 +60673,12 @@ ruby-test-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el, ruby-mode ? null }: melpaBuild { pname = "ruby-test-mode"; - version = "20170515.1008"; + version = "20171006.944"; src = fetchFromGitHub { owner = "r0man"; repo = "ruby-test-mode"; - rev = "740ff1a7c81eb8380fd0f0cdb7c32238acf13dd1"; - sha256 = "1a7lhx7ibh9rrxdamxwd107npnmsf9sxbksvy9rm8l3rnm8yjnvy"; + rev = "9a686e6e18ac2d56be41020ed9d0814cdfe86330"; + sha256 = "02m0kaw86p6qmn6jxcq6vqbbp2v57b2dnj75fqai1dz2f521dh0g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ruby-test-mode"; @@ -62645,6 +60733,27 @@ license = lib.licenses.free; }; }) {}; + run-stuff = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "run-stuff"; + version = "20170813.1957"; + src = fetchFromGitHub { + owner = "ideasman42"; + repo = "emacs-run-stuff"; + rev = "2e23a78c26f62141142c743febd57ec54c78c0e3"; + sha256 = "04m7hpda5hbmr0dni4cnpdjxwzk3sygpr5m158gswhbwh2p4r0j4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6e9ce2acd859b887f7e161f4b9969be1a0b8ef/recipes/run-stuff"; + sha256 = "0zx96m6cval5g4p0lhy9kpyycp2jygaq3y2njhkpij9gl4nb2ll2"; + name = "run-stuff"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/run-stuff"; + license = lib.licenses.free; + }; + }) {}; runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "runner"; @@ -62711,12 +60820,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20170827.1300"; + version = "20170920.1919"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "c8280aea1d02ae84bff2a6f02f8dc7701309c8b6"; - sha256 = "105ayzqkcd8q2zhny1x84gdry6mfp92zfa8ihfqlfvva6ax6v1vp"; + rev = "eae291ab7b3e1a52e158261d1192ea1ca2b332f4"; + sha256 = "0g68yy281v232f3f8k9r16nqxlirkb52yca1wknng57addma4cjv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -62795,12 +60904,12 @@ s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "s"; - version = "20170906.1304"; + version = "20170922.900"; src = fetchFromGitHub { owner = "magnars"; repo = "s.el"; - rev = "3a95064647d1f39b90e65a56f1fdfceb7c329f75"; - sha256 = "0n2c6islny418pfmaz1bjij1j2s1qailga0vha32qanx4fx7yf3v"; + rev = "12f116d58ac03706496bd682c6449b452681874e"; + sha256 = "1g8mqd13llj007al4nlxxx4z2lcsg3wk970mgjn0avwrhjjgdmmv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s"; @@ -62834,6 +60943,27 @@ license = lib.licenses.free; }; }) {}; + s12cpuv2-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "s12cpuv2-mode"; + version = "20170828.1901"; + src = fetchFromGitHub { + owner = "AdamNiederer"; + repo = "s12cpuv2-mode"; + rev = "446696222fec364442fa7a52f523be10bb5cff68"; + sha256 = "1l8950p4bakgxwd61n9agiyi15s1l09r1rnrijl4dnyv6vxmwghl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6c1b9bbdc4deb17636270c7f2be0b43b647c695a/recipes/s12cpuv2-mode"; + sha256 = "0mrcf5s7vmkyrsdka7qd2vfcmdy8hzf6a6g14la88rxrv4chv29s"; + name = "s12cpuv2-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/s12cpuv2-mode"; + license = lib.licenses.free; + }; + }) {}; sackspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sackspace"; @@ -62904,8 +61034,8 @@ src = fetchFromGitHub { owner = "glynnforrest"; repo = "salt-mode"; - rev = "ea4980b9c9e8e7570086a2558fe7f66c62a528ad"; - sha256 = "0ygi9kzkfqzizygaqwqpymn8s7kr8ci38v61qmy4n58n9c19fdwx"; + rev = "a41c07660199cfad3f9dd928d5674d2727508035"; + sha256 = "0y7z4lfvhd1aiyhy0yhrx9jdjsy2k1di6y747rjmf0rlwcq2gb2q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9dcf1a93a06fc42581521c88cfd988b03bedc000/recipes/salt-mode"; @@ -63484,25 +61614,6 @@ license = lib.licenses.free; }; }) {}; - screenshot = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "screenshot"; - version = "20120509.405"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/screenshot.el?revision=8"; - sha256 = "0q7yxaaa0fic4d2xwr0qk28clkinwz4xvw3wf8dv1g322s0xx2cw"; - name = "screenshot.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/24f113097db4cc27a2e9c7b9086af6d263e6fcb7/recipes/screenshot"; - sha256 = "0aw2343as38y26r2g7wpn1rq1n6xpw4y5c7ir8qh1crkc1y513hs"; - name = "screenshot"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/screenshot"; - license = lib.licenses.free; - }; - }) {}; scribble-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scribble-mode"; @@ -63569,12 +61680,12 @@ sdcv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, showtip }: melpaBuild { pname = "sdcv"; - version = "20170801.2216"; + version = "20171002.210"; src = fetchFromGitHub { owner = "stardiviner"; repo = "sdcv.el"; - rev = "ebe45a5fb1e465cb4150e4dbe38a069b2a218219"; - sha256 = "0pcbrzii9x7v3qqygr29yi6pg1gvzjbsgcfziispsf24n01lrrly"; + rev = "1aad9defb871dc07e27f603092bb81413be54cf2"; + sha256 = "1ij7inm1f59hmn9s1iqnywk1acfm0pqiim2s36vwrljy9lnb4ls8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/173e233b2dacaaf54d92f3bcc06e54d068520dd4/recipes/sdcv"; @@ -63671,25 +61782,6 @@ license = lib.licenses.free; }; }) {}; - second-sel = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "second-sel"; - version = "20170702.729"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/second-sel.el?revision=29"; - sha256 = "1yq06a04j44r019cjv2jb3kfpfqhnxdf3b4hhz4d3fz7v1hsicwg"; - name = "second-sel.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/second-sel"; - sha256 = "1nzy5ms5qf5big507kg3z5m6d6zgnsv2fswn359r2j59cval3fvr"; - name = "second-sel"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/second-sel"; - license = lib.licenses.free; - }; - }) {}; secretaria = callPackage ({ alert, emacs, f, fetchgit, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "secretaria"; @@ -63962,26 +62054,6 @@ license = lib.licenses.free; }; }) {}; - sequential-command = callPackage ({ fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "sequential-command"; - version = "20151207.1403"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/sequential-command.el?revision=3"; - sha256 = "0vg8rqzzi29swznhra2mnf45czr2vb77dpcxn3j0fi7gynx3wcwk"; - name = "sequential-command.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/31db031dc8712e89042d4ce80438a4267a241739/recipes/sequential-command"; - sha256 = "03qybacgy5fs3lam73x0rds4f68s173mhbah6rr97272nikd50v1"; - name = "sequential-command"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/sequential-command"; - license = lib.licenses.free; - }; - }) {}; servant = callPackage ({ ansi, commander, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up, web-server }: melpaBuild { pname = "servant"; @@ -64507,17 +62579,19 @@ license = lib.licenses.free; }; }) {}; - shimbun = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild { + shimbun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "shimbun"; - version = "20170503.1327"; - src = fetchcvs { - cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; - module = "emacs-w3m"; - sha256 = "6ef1dd834a16cf3b8a0ec7a7412ae7410f0392d616eb3329f78011039384fc6d"; + version = "20171003.2158"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "w3m"; + rev = "284a4cdd394d2d52220c62c24ddbce00ea100471"; + sha256 = "1fnxb3fn6a25sn41isf3frja5iwxi98cbs7rvp9mkzb4jq3bhb89"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/shimbun"; - sha256 = "05dxdyh8xvbpjmc19q733jmjd6kgv8rdahjd3bw5wwsb3smqig4x"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/shimbun"; + sha256 = "1rjykr0y5jfd6r3shm8x23yyra6qjsb55jrfc45rhpb89klyg1nk"; name = "shimbun"; }; packageRequires = []; @@ -64610,25 +62684,6 @@ license = lib.licenses.free; }; }) {}; - showkey = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "showkey"; - version = "20170307.1528"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/showkey.el?revision=11"; - sha256 = "143889knvy6ifvq759869gbjfg10k10mi2by2hajcgzqhby72h61"; - name = "showkey.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/showkey"; - sha256 = "04lw32k1imvpfc4dr5pz11sx74982xr13hcyblvrz1zxhgixb1z1"; - name = "showkey"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/showkey"; - license = lib.licenses.free; - }; - }) {}; showtip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "showtip"; @@ -64758,12 +62813,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "20170805.1619"; + version = "20171004.1113"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "8166b02ebbab43d8a33d47b8221a94b69fc63487"; - sha256 = "0n97iys2xyg1lzkn8bqsx0sgqpzci1pxg69v42cpzmyrz3h54bwp"; + rev = "e53d798ba4a4c07a3ee1c194840c937b18c02087"; + sha256 = "0sig9gpa2wn23skwny9jpvwxax0gbwp143anvgkc5gm87iw2jgrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -64804,8 +62859,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "sift.el"; - rev = "ef509ac4c579340e8d924c26d9e5858a9f4fb9de"; - sha256 = "0i8gqzvpl3drzp031dqdpsi1ssr3az8fzb7xpbxnamzscfz6pdyc"; + rev = "4ce8878a0fc396ded7521ce38852d93e1d863065"; + sha256 = "1x78i6svi4cwah9xw85imhpncvxsx4xim4fzykpnd328mxkk07h6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sift"; @@ -64947,12 +63002,12 @@ simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "simple-httpd"; - version = "20170125.1910"; + version = "20171004.938"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacs-web-server"; - rev = "348483efea6ec2752bc5aa4028a16087d19b2809"; - sha256 = "191aq4zhg5a8g6ypkbh20rnqyk76lhxfhnq5ww0g5hzpig8srxaa"; + rev = "e7775d3bc5c6b73255814d0a62dc954e23a12c15"; + sha256 = "0pjhxhzzxrpcczwvd7b6a6q1nfmsr6m6mnlxn13nwf3r270grz87"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/simple-httpd"; @@ -64986,26 +63041,6 @@ license = lib.licenses.free; }; }) {}; - simple-plus = callPackage ({ fetchurl, lib, melpaBuild, strings }: - melpaBuild { - pname = "simple-plus"; - version = "20170307.1529"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/simple+.el"; - sha256 = "061vw3w8gl1lcjy67ina4w496i91addsl5s3xbffk2q6k1qhjsdi"; - name = "simple+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/simple+"; - sha256 = "12fsgjk53fq2316j8nm6wvdckpyg9hq3v65j5c52i0g0cwmx62ra"; - name = "simple-plus"; - }; - packageRequires = [ strings ]; - meta = { - homepage = "https://melpa.org/#/simple+"; - license = lib.licenses.free; - }; - }) {}; simple-rtm = callPackage ({ dash, fetchFromGitLab, fetchurl, lib, melpaBuild, rtm }: melpaBuild { pname = "simple-rtm"; @@ -65261,12 +63296,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20170903.2004"; + version = "20170927.2004"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "5df0ea55257b2c1f3a4e4352af4854fb81dee5cc"; - sha256 = "0xrmsfi1nzm5yhmsxhn7xq87z70jkb68c3il4xf8r4lz6a0d8m4p"; + rev = "5fabc901a316569ab84edaf7ea3aa7143ab91796"; + sha256 = "076yk65wyqgcqd9w8d4pgada0hsdlb58gvcldhvirlqsbmvjp9wl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -65324,12 +63359,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20170828.451"; + version = "20170929.1441"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "f223388c78ea51ce7717e9bbae14c50ad2386c2c"; - sha256 = "07jks9fnqjv2i9sjfpgj7r3a7g5aha4aipsffjbnw1qd930ygw83"; + rev = "c5fa94f86b61f3a14a7348b4fa001a0e1c62cef2"; + sha256 = "0y9n40knm1r3z0kx0xd5yda5191m5s2ibsxb2sa23qp1yj2qs6xm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -65366,12 +63401,12 @@ slime-docker = callPackage ({ cl-lib ? null, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: melpaBuild { pname = "slime-docker"; - version = "20170718.1157"; + version = "20171004.1151"; src = fetchFromGitHub { owner = "daewok"; repo = "slime-docker"; - rev = "dc41f7c33de497bc622f037f33ea2a1ecfa1069f"; - sha256 = "169vy9wjkf0vzqgdbm30rssl82xl2n73hipnaidncbw9sd8cpx1y"; + rev = "13fa8be2fca516f3ff5fb70fa79dd8404bf86439"; + sha256 = "005zkypg2hkyzpkcv1rzfrmg8amg1bp0534y13xjqq3rz1p602bx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/15ec3f7208287161571c8fc3b29369ceabb44e5f/recipes/slime-docker"; @@ -65492,12 +63527,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20170912.445"; + version = "20170928.1829"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "ac50082050df5274a5d71e182abca0d0b0fe71d1"; - sha256 = "14cknfz1nnk82svdp92sq6cdpndd5d25l7fgd5zi2l4j5i57rj0b"; + rev = "6f7d1c5e5d51100c573f3e5b6d3eb1eabe3dfaa2"; + sha256 = "1684agg19nxc9mirpkr062z9ycri2d78nr9hg8y7kgkq814vbbsi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -65953,12 +63988,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20170913.130"; + version = "20171005.541"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "7d368051dec40e8e129d84bca5070bb7e83ad72a"; - sha256 = "1rbwjmp71wh234qrjss00xgcnh8jcha19lmz15nwrrwvpmmspg0c"; + rev = "456b78c5b7af52f84701aea0ad51a9d6d7de23d5"; + sha256 = "1b5mp87qjyjs0d2mn9rz0iy6qmdmhkb8699ddlbjxrmid2s8g73h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -66289,12 +64324,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20170430.1436"; + version = "20170920.1454"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "8a4da1125dd284e55139084d62fb29af5bcbcc20"; - sha256 = "1c85ycaqyrncp7pbax6mdnz1v91hpi1pc9jspd6irwhhs8b9jxfk"; + rev = "9a29ca3f5c7302a67f969b10defeb75e2fda688a"; + sha256 = "1hskg4llb0wfdmzgnanbvppbjj55zkifh2yan5rvzkkwma1vb2ry"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -66391,22 +64426,22 @@ license = lib.licenses.free; }; }) {}; - snoopy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + snoopy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "snoopy"; - version = "20170730.1951"; + version = "20171008.1304"; src = fetchFromGitHub { owner = "anmonteiro"; repo = "snoopy-mode"; - rev = "8adce636376812df99bd79f3fbb3d9ec19a02351"; - sha256 = "04sq37bpvg6lqsqmjvdm9jzwrq4xhbakfzl5b2rcm3mlhzwnhs88"; + rev = "ec4123bdebfe0bb7bf4feaac2dc02b59caffe386"; + sha256 = "01l44lshw0zvykay9886s1vqryanagkd4ciw3ramchn0baqz11vl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a882cd92964ac195a09469006c9a44dc202f000/recipes/snoopy"; sha256 = "1wa8jykqyj6rxqfhwbiyli6yh8s7n0pqv7fc9sfaymarda93zbgi"; name = "snoopy"; }; - packageRequires = [ emacs ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/snoopy"; license = lib.licenses.free; @@ -66520,12 +64555,12 @@ solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solarized-theme"; - version = "20170831.1159"; + version = "20170924.1440"; src = fetchFromGitHub { owner = "bbatsov"; repo = "solarized-emacs"; - rev = "ae7bc3f102cff597092dad7fc0bfd49e1865b0cf"; - sha256 = "0d4cs7s2k5plf2ya0df72pvpf30xdhdbfybm0179dma4fw9fx0is"; + rev = "a2595627a793c57fa904ac210a6ca07fe1fef656"; + sha256 = "1q65mrarmqxsvc27flr6wy6v3yrmpw5i6hax95hh6y50zx3hfsd1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme"; @@ -66541,12 +64576,12 @@ solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solidity-mode"; - version = "20170712.1442"; + version = "20171001.926"; src = fetchFromGitHub { owner = "ethereum"; repo = "emacs-solidity"; - rev = "e4aa0190145d5cfad7d3f052ba44c88a1ebb6c7f"; - sha256 = "1dh2av9grij2v179vfr2pric6bxibxbg34ij3488ki9crc2zpv4y"; + rev = "d0a09c68912fcd03e384b0b2a9746f4e002d0df8"; + sha256 = "0zs16af2j6l0vypgikvs78x82cq8m5yfdfpi550cymkv7mjydj4v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode"; @@ -66562,12 +64597,12 @@ sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, osc }: melpaBuild { pname = "sonic-pi"; - version = "20170313.810"; + version = "20171002.343"; src = fetchFromGitHub { owner = "repl-electric"; repo = "sonic-pi.el"; - rev = "494981aa8f7828392a930ef8533698944738090e"; - sha256 = "1x9qn6b4nbld9v0r7vi3mg6w7nsa76pzyn1fl118n14a8kkc0is7"; + rev = "f4bb7abafea564c97d3b9a28b1b2c3858191674f"; + sha256 = "1xdv94k830a70hi8cmvv2gxzybk16cfsf5my8c1b2kw7041a074q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/sonic-pi"; @@ -66646,12 +64681,12 @@ sotclojure = callPackage ({ cider, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sotlisp }: melpaBuild { pname = "sotclojure"; - version = "20170512.612"; + version = "20170921.1708"; src = fetchFromGitHub { owner = "Malabarba"; repo = "speed-of-thought-clojure"; - rev = "84e2be5939c33d44f9518aea60cfccff4d6c9707"; - sha256 = "1jz3lscjq8xfkrx464a1s8vyggnh5sjl8jvq8dvx0w7blny2jvz8"; + rev = "ceac82aa691e8d98946471be6aaff9c9a4603c32"; + sha256 = "1a6riq7ksk5m76dsgc75d8b992nyr50l48l8cpms9064m6b0r9jv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2ccef8af91eada4449d9cd4bda6bd28272722e/recipes/sotclojure"; @@ -66905,12 +64940,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20170823.1658"; + version = "20170918.1246"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "30b198ce87a92777f74e34ddee775b99d05b46c3"; - sha256 = "0a77y9njks44xx1c5j0cxpgkqwlz6lrzkbph3qwnbzkydnbyxgiy"; + rev = "7900aca87f9d96bd6ebaa62886e4ab135bf449b3"; + sha256 = "0kai39mqx0i2b46vcf5g2la8q65sp1pb8vnzfjwzv0qip4p9fd62"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -67007,25 +65042,6 @@ license = lib.licenses.free; }; }) {}; - speck = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "speck"; - version = "20160717.951"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/speck.el?revision=12"; - sha256 = "0zn7gjrga1ly1za04jd4s61m1dwkyy960x7g3x9hn4szqvpcsvfa"; - name = "speck.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/speck"; - sha256 = "06x5543pwqazs4airj43208caw3sxw7zb148njbn33qgl09r1iv6"; - name = "speck"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/speck"; - license = lib.licenses.free; - }; - }) {}; speech-tagger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "speech-tagger"; @@ -67074,8 +65090,8 @@ src = fetchFromGitHub { owner = "parkouss"; repo = "speed-type"; - rev = "5d691f57743304db63b6afdc5bd79dabd282d390"; - sha256 = "08qp2b80rh9k8h5vv141lfsg73rqqikhh7ygal789rr278ai1rjf"; + rev = "9940383d94688e7f130b01f9872182ab59edf00f"; + sha256 = "0gfiw3rmqyargc1prkrglmzvzxm03nszqqba1q9zd7cs0m315pmm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type"; @@ -67466,25 +65482,6 @@ license = lib.licenses.free; }; }) {}; - sqlplus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "sqlplus"; - version = "20170710.150"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/sqlplus.el?revision=26"; - sha256 = "19lrk1a9d9ljdnsiar5cgmp68c26b6aihi3rbgf3d5bcg9iqbp7q"; - name = "sqlplus.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/41b1fc299cf8eeba1916a58ad8f50eb4560f0252/recipes/sqlplus"; - sha256 = "1z9pf36b1581flykis9cjv7pynnp94fm4ijzjy6hvqyj81aikxpz"; - name = "sqlplus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/sqlplus"; - license = lib.licenses.free; - }; - }) {}; sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlup-mode"; @@ -67635,12 +65632,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20170907.305"; + version = "20170926.315"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "72a503394ee43023100a6f2624ad40a4325f5938"; - sha256 = "0ss1q3ywznkj180rndpi3zrcxz3bgm3a87wx194xyq5dzijaydw5"; + rev = "af7f33c85fe7d8e6c597fe5c674b1c7bf8ce2bfd"; + sha256 = "0n1h510v1bkq4yrmfyhih2721yagfb2slm97b0vpjfp3f94m2nvz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; @@ -67845,12 +65842,12 @@ steam = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "steam"; - version = "20160427.231"; + version = "20171008.1327"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "steam.el"; - rev = "a0547487ccf40aa582af3dd0d433a1b153d25246"; - sha256 = "142jamr8mi1nkjvivvkh2qgh5fch89xpg5wwi8q0b6hcqcsy8nqn"; + rev = "476da75cce7def2f3323e4a112a500728178e71e"; + sha256 = "1d23m611p001i846ypv9mz78hqn4wmjnh6cwa2yif9h6m44g1dsf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25a45eb6297168cd0ce4c4db5574362addad5c69/recipes/steam"; @@ -67905,25 +65902,6 @@ license = lib.licenses.free; }; }) {}; - sticky = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "sticky"; - version = "20101129.1852"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/sticky.el?revision=4"; - sha256 = "18izyia1j3w2c07qhkp9h6rnvw35m5k1brrrjhm51fpdv2xj65fy"; - name = "sticky.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1c3a9689703b8c8edbffdc966cded9ea98fc8762/recipes/sticky"; - sha256 = "1xjkdwphq3m4jrazsfnzrrcrqikfdxzph3jdzkpbzk3grd4af96w"; - name = "sticky"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/sticky"; - license = lib.licenses.free; - }; - }) {}; stickyfunc-enhance = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stickyfunc-enhance"; @@ -68071,25 +66049,6 @@ license = lib.licenses.free; }; }) {}; - strings = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "strings"; - version = "20170307.1533"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/strings.el?revision=49"; - sha256 = "08sq20ys4xkkg11jyrnlzibl5v73i7zlnj28ygivy3sqvp07z7iz"; - name = "strings.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/strings"; - sha256 = "0n3239y7biq3rlg74m7nqimhf654w4snnw2zm7z84isgwzz2dphk"; - name = "strings"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/strings"; - license = lib.licenses.free; - }; - }) {}; stripe-buffer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stripe-buffer"; @@ -68298,25 +66257,6 @@ license = lib.licenses.free; }; }) {}; - subr-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "subr-plus"; - version = "20170501.916"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/subr+.el"; - sha256 = "1vrs390vqcsjwzf6pzcvqjc3mliac66g7g5kifvz9zp0v3bq6x7d"; - name = "subr+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/subr+"; - sha256 = "17i5sgsv8clh3pzpkv5zvhmm584m1rvsypd6nh6ks2jpidwgs8x1"; - name = "subr-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/subr+"; - license = lib.licenses.free; - }; - }) {}; sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sudo-edit"; @@ -68383,12 +66323,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20170806.1414"; + version = "20171007.930"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "6ae090cab9bc16650c1788e83ccd2fe95a959de2"; - sha256 = "1rnp7zwr5j345l569zhpskf7g6bkg0jmplzjwy79rlv3h3d6rv4d"; + rev = "f9cd0db1c62073b5dacefad20483f181c2d8d019"; + sha256 = "0xhj6x1c9r69sw6xw9kdvdhkvmr000mnmw7ihqmy6fkar945046f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -68422,25 +66362,6 @@ license = lib.licenses.free; }; }) {}; - summarye = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "summarye"; - version = "20130328.327"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/summarye.el?revision=4"; - sha256 = "0q5m8d6p9aqbfx17zgznkqw2jgh027xix4894wrdz91670zxd3py"; - name = "summarye.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/85e28911e6b8173188f45331c6540681691223f2/recipes/summarye"; - sha256 = "1znd96ixg1n90yjiny84igb7m8qsbiibn7s6bky8g6n2k7zzmq65"; - name = "summarye"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/summarye"; - license = lib.licenses.free; - }; - }) {}; sunny-day-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sunny-day-theme"; @@ -68507,12 +66428,12 @@ super-save = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "super-save"; - version = "20160426.729"; + version = "20171008.3"; src = fetchFromGitHub { owner = "bbatsov"; repo = "super-save"; - rev = "701c98eef4b9b21cd6cfd31f190f9988d32353aa"; - sha256 = "1frm90kssrp4s6x0g4vq4jkssh8rnrfjbgwa05igsjnsbnnfxxd1"; + rev = "1c8fbd5e18277e4af0ada2678a854b1c9072db38"; + sha256 = "0mh7xp71l9xybbv17b1rsbpa60bwjw79ql9krj1kzy2c2pv9hmff"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9730b65787b26d3909952cf246a01bd349e5fbab/recipes/super-save"; @@ -68553,8 +66474,8 @@ src = fetchFromGitHub { owner = "TheSuspiciousWombat"; repo = "SusColors-emacs"; - rev = "8f5cdf8de5e58db838ef0e803b60b7d74fc2a889"; - sha256 = "1wc4l7zvb8zmh48cgrl7bkbyfj0sflzq28sc8jssghkcl2735cbg"; + rev = "b946e7924aa02fa7441c970026898f17fe97601f"; + sha256 = "0553fgiyjy2n3wa2agwzvadf6il85waf2vjpsy75ljj6lw8glhka"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f26b8281f9bd05e3c8f2ef21838275711e622c9/recipes/suscolors-theme"; @@ -68672,25 +66593,6 @@ license = lib.licenses.free; }; }) {}; - swbuff-x = callPackage ({ fetchurl, lib, melpaBuild, swbuff }: melpaBuild { - pname = "swbuff-x"; - version = "20130607.314"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/swbuff-x.el?revision=9"; - sha256 = "1fkicyjvanh8yk2y27sq075sarcyqhsdz0r4xhillpnv34ji98r5"; - name = "swbuff-x.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/42bac16fa83eb3df693835326444f4bd4255cf1d/recipes/swbuff-x"; - sha256 = "1wglcxgfr839lynwsl8i7fm70sxxjidy3ib6ibz0kgiwr41rh49y"; - name = "swbuff-x"; - }; - packageRequires = [ swbuff ]; - meta = { - homepage = "https://melpa.org/#/swbuff-x"; - license = lib.licenses.free; - }; - }) {}; sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }: melpaBuild { pname = "sweetgreen"; @@ -68715,12 +66617,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "swift-mode"; - version = "20170909.430"; + version = "20170918.51"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "59dcd603848656c691f76cc5095ea354c307dbcf"; - sha256 = "127xx6qmxlh81pylrvx60d280ginms09qv24xv5g8lg08bi9zmkx"; + rev = "e8d9a5d7af59e8be25997b8b048d7c3e257cd0b0"; + sha256 = "035478shf1crb1qnhk5rmz08xgn0z2p6fsw0yii1a4q5f3h85xrc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -68757,12 +66659,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20170911.1036"; + version = "20170926.937"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "0a1d361b926291874124f8c63a653d83ead64a36"; - sha256 = "0ssbsllpv0lyr7dhnipwd7zgpxvfm36rldr7vkxh5maajdkamls7"; + rev = "6827edffb70890f2e94c3d146ed129bde581992d"; + sha256 = "0xwf8q73xisi1072dkkvf181sf9a7a6j9b9g24ismc3fn0q7216k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -68799,12 +66701,12 @@ switch-buffer-functions = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "switch-buffer-functions"; - version = "20160702.2157"; + version = "20171004.2056"; src = fetchFromGitHub { owner = "10sr"; repo = "switch-buffer-functions-el"; - rev = "4778a2bc9ecfb71bb2b6a65c7108260ec8f30a37"; - sha256 = "0xv57imh6w6kbh1i1ib9k9x2h01l4vdxs2i667a76ym6dmsjbx2x"; + rev = "ce61a74a88bf64afa699d20ed27b8be4cc63f80a"; + sha256 = "1bdcsgbnyabkrri296dgb5q42vjb1v0yji2la5ir6sfxmhw0mrb6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d37ebd28f4a2f770958bd9a2669cce86cc76cbe7/recipes/switch-buffer-functions"; @@ -69027,25 +66929,6 @@ license = lib.licenses.free; }; }) {}; - synonyms = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "synonyms"; - version = "20170307.1537"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/synonyms.el?revision=63"; - sha256 = "0456mmp3niljpghqcngknqkrxmpkba3n95ab4pf0b0021z2zjyxk"; - name = "synonyms.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/synonyms"; - sha256 = "1b000scgba310i7w27c8wj0iflqqgwik524ql084wpqvikwqnlzm"; - name = "synonyms"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/synonyms"; - license = lib.licenses.free; - }; - }) {}; synosaurus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "synosaurus"; @@ -69088,22 +66971,22 @@ license = lib.licenses.free; }; }) {}; - syntactic-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + syntactic-close = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "syntactic-close"; - version = "20170907.6"; + version = "20171004.1037"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "syntactic-close"; - rev = "143faf5ecd6388f4ea76d668b4814415befcf883"; - sha256 = "0dwanswsyxhi7izah9qm6jzl5yvfany62f5m80r9kfkhcq68hyx9"; + rev = "e2cd1f332d111b0e90d9a72f35bc969c7638b7cf"; + sha256 = "18fq9v1kb6bx0xxd1cic2f3gfwv82y4mjs5qg7q2ra1cz5d502w9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2c15c0c8ee37a1de042a974c6daddbfa7f33f1d/recipes/syntactic-close"; sha256 = "19lrzxxyzdj1nrzdgzandjz3b8b4pw7akbv86yf0mdf023d9as1f"; name = "syntactic-close"; }; - packageRequires = []; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/syntactic-close"; license = lib.licenses.free; @@ -69195,12 +67078,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "20170911.625"; + version = "20171006.1352"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "a3d39214b70c3dde0be12a53260e3fa470530ad6"; - sha256 = "1wvf7m6j73y0aavz14f0xjmqs7hxbw0ifzxw5hdvhsw8bsvagbmi"; + rev = "22f024fe8f433af7b6a6b99520cea1e766894fe5"; + sha256 = "11h1nr9gz0mw2gwlplv00i06s9ziw77a7zfcrrzd01rmanz1m4fa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -69467,12 +67350,12 @@ tangotango-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tangotango-theme"; - version = "20150702.104"; + version = "20170924.809"; src = fetchFromGitHub { owner = "juba"; repo = "color-theme-tangotango"; - rev = "08c3b9270547970dbce2cb1e35e66f6ae380c8b2"; - sha256 = "11xb7xpmxvgv7mrjd2vlbjz3h5fa541aydv6bdxngjq6y3qn6wsp"; + rev = "e2f2ea9c35f06dfc43a29c91c14cf0cdb19f2144"; + sha256 = "01gvsvha8z7pyr8c33gh3xmz47lh6b8g0nwf1gzdiw1gd0sfhs4z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ebfcfa3ba4ca77443667a9478d59214810cd8cc2/recipes/tangotango-theme"; @@ -69513,8 +67396,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "f103ace956d5e7039cf0785d93c2956bd7bea4f4"; - sha256 = "0w82lzig3fy4p59rjj5dgi15mlmx6v4s6vm3z58rj65ql7qfzf88"; + rev = "a8fc8300481a1e033a3811ccda54e552392d1689"; + sha256 = "1lkldr6rr21f97vp6kms2ha8hsszhmba4sn07is4k55lpvlnxd49"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -69933,8 +67816,8 @@ src = fetchFromGitHub { owner = "davidshepherd7"; repo = "terminal-here"; - rev = "5e440c33a1d24762477863af5c9b7a896df4be1b"; - sha256 = "0kqn3gzm5q37d2iz0wk2xcl7qlmqkblwy8zdc7plc6syldnh91aj"; + rev = "b17f82e894d5b0f77cea04a64c4f398124eb3290"; + sha256 = "0aawmlzy1w76lajz5lxaix793j3bni3fyb4sws3v765m1rxhnc5c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8df6f7e23476eb52e7fdfbf9de277d3b44db978/recipes/terminal-here"; @@ -69950,12 +67833,12 @@ tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "tern"; - version = "20161222.850"; + version = "20170925.1333"; src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "cbbc2167cabc185c151fcfb32b2094b93b387422"; - sha256 = "02vwq91ra4yrx0davi6sri0hh7p3fbwwz8flqrk5kaxz1rwqgq20"; + rev = "5c395b5d696aad5a185724f56c74a7f83349f3bd"; + sha256 = "11sp1jz0fn8gnc28qvyrmc7qxr1gn5r3vxv6gp46p7cmgg9mflri"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -69975,8 +67858,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "cbbc2167cabc185c151fcfb32b2094b93b387422"; - sha256 = "02vwq91ra4yrx0davi6sri0hh7p3fbwwz8flqrk5kaxz1rwqgq20"; + rev = "5c395b5d696aad5a185724f56c74a7f83349f3bd"; + sha256 = "11sp1jz0fn8gnc28qvyrmc7qxr1gn5r3vxv6gp46p7cmgg9mflri"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -70136,6 +68019,27 @@ license = lib.licenses.free; }; }) {}; + tex-smart-umlauts = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "tex-smart-umlauts"; + version = "20160427.58"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "tex-smart-umlauts"; + rev = "5261b931443558f4252489a1e6616034848aff02"; + sha256 = "1rq1l52mgbasgwvjwpivjrfjf8l8r85wdkfpbw8213449qh9c9zh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/tex-smart-umlauts"; + sha256 = "05q5mzl0pya682hdmjyp09hh121dc5y4d5vgqjffx3yfd5kgsy5w"; + name = "tex-smart-umlauts"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/tex-smart-umlauts"; + license = lib.licenses.free; + }; + }) {}; textile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "textile-mode"; @@ -70241,25 +68145,6 @@ license = lib.licenses.free; }; }) {}; - tfs = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "tfs"; - version = "20120508.1120"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/tfs.el?revision=9"; - sha256 = "16byw8ix7bjh5ldr8rymisq2bhc5sh7db6rhpf0x28yd6mmzn73v"; - name = "tfs.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/tfs"; - sha256 = "0h38qd1xhfd0my26i6w5j1jr91r5qal8x4bp7ij1cym72yxspna6"; - name = "tfs"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/tfs"; - license = lib.licenses.free; - }; - }) {}; theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "theme-changer"; @@ -70323,64 +68208,6 @@ license = lib.licenses.free; }; }) {}; - thesaurus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "thesaurus"; - version = "20121125.1137"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/thesaurus.el?revision=6"; - sha256 = "0zcyasdzb7dvmld8418cy2mg8mpdx01bv44cm0sp5950scrypsaq"; - name = "thesaurus.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/thesaurus"; - sha256 = "1cnna27dlragk4w3f59xbrwppp49r010qdn7n3n7wvhibv3cfyd7"; - name = "thesaurus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/thesaurus"; - license = lib.licenses.free; - }; - }) {}; - thing-cmds = callPackage ({ fetchurl, hide-comnt, lib, melpaBuild }: - melpaBuild { - pname = "thing-cmds"; - version = "20170726.1355"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/thing-cmds.el?revision=58"; - sha256 = "07z49csdlrf08h8d8p9n8j492r22s7wgpzjwafppbsm4mvgshmq9"; - name = "thing-cmds.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thing-cmds"; - sha256 = "133bm2cw9ar6m2amj0rrq4wbj9c3zl61gaprx0vlasxj2cyxs7yw"; - name = "thing-cmds"; - }; - packageRequires = [ hide-comnt ]; - meta = { - homepage = "https://melpa.org/#/thing-cmds"; - license = lib.licenses.free; - }; - }) {}; - thingatpt-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "thingatpt-plus"; - version = "20170307.1539"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/thingatpt+.el"; - sha256 = "1k9y354315gvhbdk0m9xpjx24w1bwrnzlnfiils8xgdwnw4py99a"; - name = "thingatpt+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+"; - sha256 = "0w031lzjl5phvzsmbbxn2fpziwkmdyxsn08h6b9lxbss1prhx7aa"; - name = "thingatpt-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/thingatpt+"; - license = lib.licenses.free; - }; - }) {}; thingopt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thingopt"; @@ -70472,8 +68299,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "1744cdcb674a20c554ae9f23cb95c0c8eff63b90"; - sha256 = "12zclwdqr1v2pbp0i4d5m2bgr7s20bm5yyjpakg61sx5nld2j9sg"; + rev = "9f9e30b51e3912c0b63258badf5501d3cb2550be"; + sha256 = "1pxjsql4d02igqzz4qk5mc1l8as9myfml28bg9q2bqcjsl6rh0s9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -70486,26 +68313,6 @@ license = lib.licenses.free; }; }) {}; - thumb-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }: - melpaBuild { - pname = "thumb-frm"; - version = "20170307.1540"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/thumb-frm.el?revision=62"; - sha256 = "1mfz4gkq71sp9q7pa8q0md36g7x0dpsqz0np507dx2kypzqhklpd"; - name = "thumb-frm.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thumb-frm"; - sha256 = "1fjjd80drm8banni909lww9zqazr1kk9m40xwwa1ln2zicaf091c"; - name = "thumb-frm"; - }; - packageRequires = [ frame-cmds frame-fns ]; - meta = { - homepage = "https://melpa.org/#/thumb-frm"; - license = lib.licenses.free; - }; - }) {}; thumb-through = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thumb-through"; @@ -70530,12 +68337,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "20170911.521"; + version = "20171008.2022"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "af6adf6170e23a44ba773e07899ec602ae659663"; - sha256 = "0y8kfibip9saa9mh1bhgnqjzkx0yyss1z1ssxq1qvndnq8sp4rpz"; + rev = "e5d1d3852aaf63cbfb0abaec1792a62bed024a72"; + sha256 = "1kwssyzbjwl2vyll0p49l57z41yv6k1jnzbsdnh0d1h81nixg5wk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -70548,25 +68355,6 @@ license = lib.licenses.free; }; }) {}; - tidy = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "tidy"; - version = "20111222.956"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/tidy.el?revision=9"; - sha256 = "0psci55a3angwv45z9i8wz8jw634rxg1xawkrb57m878zcxxddwa"; - name = "tidy.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bf079dbd04675ecd5f511b940d7cc5f80ccc94c4/recipes/tidy"; - sha256 = "09xb2k3k99hp3m725f31s6hlaxgl4fsaa1dylahxvdfddhbh290m"; - name = "tidy"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/tidy"; - license = lib.licenses.free; - }; - }) {}; tile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, stream }: melpaBuild { pname = "tile"; @@ -70852,12 +68640,12 @@ toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toc-org"; - version = "20170518.451"; + version = "20171009.156"; src = fetchFromGitHub { owner = "snosov1"; repo = "toc-org"; - rev = "5a8a3f9b3a1440eb207a031685b7f4d77ef05b76"; - sha256 = "0cwc7l8vf6x62s7727a6zr099zxgbbgnqkb2y60js6bys2mxqv99"; + rev = "4d259c9cea3f575e5210974c025ebe3d51cc317f"; + sha256 = "04y7zib1wpxswkh7srxgh4bq25cpsybpi2aaynrwjms695ggh346"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1305d88eca984a66039444da1ea64f29f1950206/recipes/toc-org"; @@ -70873,12 +68661,12 @@ todotxt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "todotxt"; - version = "20160919.2238"; + version = "20170919.1141"; src = fetchFromGitHub { owner = "rpdillon"; repo = "todotxt.el"; - rev = "c0d0e8320ba9284710d46941eaf6847f909b589e"; - sha256 = "08fd5lk1gq9clxhz5i81qm5f0a20yrx49iy13bx1p59gj20f1z41"; + rev = "afa4079f15f705a4fa34ea8e14b122e73028f285"; + sha256 = "07rhjxl8kvsjf23kxyl6xj51a2z1r66h4bsdsfj7nncavvybzqn3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/todotxt"; @@ -71101,44 +68889,6 @@ license = lib.licenses.free; }; }) {}; - tool-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "tool-bar-plus"; - version = "20170307.1542"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/tool-bar+.el"; - sha256 = "09myj10ifjjc43invxbiinskv5xllkqvqfnzmc7893k2hp2miczm"; - name = "tool-bar+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/tool-bar+"; - sha256 = "07nsas600w5kxx7yzg52ax9avry8kq429mqlrs38jg5ycf3b1l6d"; - name = "tool-bar-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/tool-bar+"; - license = lib.licenses.free; - }; - }) {}; - top-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "top-mode"; - version = "20130605.1039"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/top-mode.el?revision=3"; - sha256 = "0a5rl1cgznycqwx4r48mh69lgm8ixbnlfzbqdyvclgm8fldbannn"; - name = "top-mode.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/top-mode"; - sha256 = "0hrjlbiz827v9yf4086wlghw64rhvvlsbzv8lzs6pprdwbpr9pdx"; - name = "top-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/top-mode"; - license = lib.licenses.free; - }; - }) {}; tornado-template-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tornado-template-mode"; @@ -71246,12 +68996,12 @@ traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, request, request-deferred, virtualenvwrapper }: melpaBuild { pname = "traad"; - version = "20170713.2320"; + version = "20170916.252"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-traad"; - rev = "7a443ad17643060f9b4c2897abe185bb9221e304"; - sha256 = "1n91a8bdrji0kca38bh6jzwjfsg90jqqa47vvazsqk072fjjbnkr"; + rev = "bb9e86958a92cb5b6ca107f90d05c1890a47cf63"; + sha256 = "0vjql7z5wda701s63x1h5m6m02342dw1pylngbbxxs29d70mzybn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2b3eb31c077fcaff94b74b757c1ce17650333943/recipes/traad"; @@ -71277,8 +69027,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "452dfb407b640ba6eb288ff25a9de27446a409c4"; - sha256 = "1yqnpvk5ib754bkb8gcd8skf0d3rqxkqwcsbibr052ilrp5ampcl"; + rev = "6b110d4c2c6447c4ed65cfa5b7e8676620081ee2"; + sha256 = "01llr34y9mvgpbz3y10l7gmp40qvislwhm6jb2fvcb7vdn9k9gmz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -71378,12 +69128,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20170906.1911"; + version = "20171005.1043"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "de23122e2c1d0c184e2439dd142ddedb0eb043b3"; - sha256 = "0wa89zppxvr6cbaxn8qjdcqvnfsgq3bdzb45rbab8hwc4p8fv76f"; + rev = "c8be91596420ca8d79de44602d836aa6d1cbe2fc"; + sha256 = "1nbm3m00s5ayicqhymw1y2y7qck5m4sajw467cp4gnsq8qw6ri53"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -71480,22 +69230,22 @@ license = lib.licenses.free; }; }) {}; - treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: + treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "20170911.819"; + version = "20171004.631"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "b967e5ac38625992a19e42eb680892f4fa18e88f"; - sha256 = "18i9aj6ajl41mn2456g48wdpqm188vsc5cqiqsj27gqvpnqkkns3"; + rev = "2e0351ee4f70db36e26b2c603ab8b00cb35ffc05"; + sha256 = "14q5ac76scj0bvv0iypcgmkgh3lkdjcxygqpxgqc213znpik33x9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs"; sha256 = "07npjnhn9a0b537h1wmvy57bmicd2cji7bslp4wbnrfmmg2jdc3a"; name = "treemacs"; }; - packageRequires = [ ace-window cl-lib dash emacs f pfuture s ]; + packageRequires = [ ace-window cl-lib dash emacs f hydra pfuture s ]; meta = { homepage = "https://melpa.org/#/treemacs"; license = lib.licenses.free; @@ -71504,12 +69254,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "20170625.1401"; + version = "20170925.2232"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "b967e5ac38625992a19e42eb680892f4fa18e88f"; - sha256 = "18i9aj6ajl41mn2456g48wdpqm188vsc5cqiqsj27gqvpnqkkns3"; + rev = "2e0351ee4f70db36e26b2c603ab8b00cb35ffc05"; + sha256 = "14q5ac76scj0bvv0iypcgmkgh3lkdjcxygqpxgqc213znpik33x9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -71529,8 +69279,8 @@ src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "b967e5ac38625992a19e42eb680892f4fa18e88f"; - sha256 = "18i9aj6ajl41mn2456g48wdpqm188vsc5cqiqsj27gqvpnqkkns3"; + rev = "2e0351ee4f70db36e26b2c603ab8b00cb35ffc05"; + sha256 = "14q5ac76scj0bvv0iypcgmkgh3lkdjcxygqpxgqc213znpik33x9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile"; @@ -71733,12 +69483,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20170912.206"; + version = "20171008.1240"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "928ed2a5153094d772ad5a0831f4bd84e819755d"; - sha256 = "1844cqykzik3cn9wqas56h2mfh0wlxq53srdl6inx7j27mm1v7ga"; + rev = "3ef5d4c4cad10b63fac200ece4604bf7370994b7"; + sha256 = "09v32d9diky72hrixjqd5k5358wsvyyiwwawf99rziaa33qvyns9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -72024,25 +69774,6 @@ license = lib.licenses.free; }; }) {}; - typing = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "typing"; - version = "20121026.1418"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/typing.el?revision=13"; - sha256 = "0mgvpdp3vlvjy32d163h2mzsf9j2ij2f542sdr3rsy8l80n6nx31"; - name = "typing.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1bc0c7b53431a9d2bc41c9a7a755bdad0fa0f5cf/recipes/typing"; - sha256 = "0b72lbzji105wzvsi58l6pjc08qcwrm5ddf42irdxi956081pzp3"; - name = "typing"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/typing"; - license = lib.licenses.free; - }; - }) {}; typing-game = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typing-game"; @@ -72088,12 +69819,12 @@ typo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typo"; - version = "20160121.330"; + version = "20171005.1045"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "typoel"; - rev = "f7d07cedf90ce65f226a66c428c0788d2bd7b912"; - sha256 = "0bn1bvs334wb64bli9h613zf1vzjyi0pz8bgyq1wy12qmbwwmfwk"; + rev = "73c8d960e9dcbb77a4ad6166b4685122a0f208ee"; + sha256 = "1zlnfjav11842am9n043j3hk23134hp92k1pg86jvnsj5mwmp9ij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/typo"; @@ -72148,25 +69879,6 @@ license = lib.licenses.free; }; }) {}; - ucs-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "ucs-cmds"; - version = "20170308.1512"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/ucs-cmds.el?revision=23"; - sha256 = "072swg5iyx9n4xpdm65ydh2z7g11jqi3jjwkhcd7a389lavfqnbw"; - name = "ucs-cmds.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/ucs-cmds"; - sha256 = "1n0f0qf8w8ark78fs67aaxnqpk0km97hy59pnxwfyahgjl2qz6d1"; - name = "ucs-cmds"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/ucs-cmds"; - license = lib.licenses.free; - }; - }) {}; ucs-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft }: melpaBuild { pname = "ucs-utils"; @@ -72251,25 +69963,6 @@ license = lib.licenses.free; }; }) {}; - unbound = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "unbound"; - version = "20160505.2355"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/unbound.el?revision=11"; - sha256 = "0awmzz9cfr17ggpzsgxqqhz5946l7705vvkfaiz7qx9wg0pbch18"; - name = "unbound.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/118e8df30e4caf2a5ef668af8970cfbfc2327004/recipes/unbound"; - sha256 = "1ys6pgb3lhx4ihhv8i28vrchp1ad37md7lnana40macf5n72d77x"; - name = "unbound"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/unbound"; - license = lib.licenses.free; - }; - }) {}; uncrustify-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "uncrustify-mode"; @@ -72805,25 +70498,6 @@ license = lib.licenses.free; }; }) {}; - usage-memo = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "usage-memo"; - version = "20110722.851"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/usage-memo.el?revision=12"; - sha256 = "00g1zj5fjykdi6gh2wkswpwx132xa6jmwfnrgfg5r96zwb8pib4i"; - name = "usage-memo.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ae8f3adf42300fc0d8f0c5474edf839614d84978/recipes/usage-memo"; - sha256 = "05n50adjnavl7ag24wfjwlnbv5x55qlhmplgsm8j57gjig01nd95"; - name = "usage-memo"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/usage-memo"; - license = lib.licenses.free; - }; - }) {}; use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; @@ -72831,8 +70505,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "360df30683a711c443f87e495ba14cdd125a505d"; - sha256 = "0nz0gk6gf9060hbyqr5vgzwr620k6l5sk9n6jbhfyrwmcscnmilc"; + rev = "16abb66246170fe06325ff32a4889e4b51bfd979"; + sha256 = "1fav32ax7qykclvrimlf00pyp534yfngizm697mbr9346va1zqm6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -73121,16 +70795,16 @@ vc-fossil = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-fossil"; - version = "20170811.1453"; + version = "20171008.1303"; src = fetchFromGitHub { - owner = "emacsorphanage"; - repo = "vc-fossil"; - rev = "0aceef306726815a84e304253711bb6d3bdf497b"; - sha256 = "1i50nyhb3qc404xilm5j31ifyrlh98mjxk98fl0gz1cpbygvklds"; + owner = "venks1"; + repo = "emacs-fossil"; + rev = "7bb3121ccd89f1533c6b91d5f952755b358eb0eb"; + sha256 = "1x2x59k3qxna32a8fjqb0vs6bykynii3i8qnlj770dn6drmnzlfd"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/91f2e615c887f353a82deee75990609d0dc66bbe/recipes/vc-fossil"; - sha256 = "09pslw9gamjn1hly4l3bfci6rf4xw2xq42cr7na2rj0k8c1lvxcx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/31c5ee4b625b90c1af66d7d11a25af8e1aa307b1/recipes/vc-fossil"; + sha256 = "11ps2wrkjrjm1d984mf80wwj1hzskw5qrn0nv7md21lp75kxsvxb"; name = "vc-fossil"; }; packageRequires = []; @@ -73394,12 +71068,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "20170701.1603"; + version = "20170928.822"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "c08343904835cbae12f48e0758b0a6a014d76a74"; - sha256 = "1skh9p5s9nbl6jvljj9bfn19fdzjx8lvx1q6rzldld07xwaif4qb"; + rev = "d4178edf27cfd54a473d10d5adfa819c748dc801"; + sha256 = "1cxfgb068sdlyr8i8r6hi0jm5capbsc58zrh5g7jyknya7z02ajp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -73587,8 +71261,8 @@ src = fetchFromGitHub { owner = "porterjamesj"; repo = "virtualenvwrapper.el"; - rev = "5649028ea0c049cb7dfa2105285dee9c00d189fb"; - sha256 = "1xcjjs394vlaz94xh52kqaq94gkbmmjqmxlg7wly8vfn9vh34mws"; + rev = "15af07004dba640df8202e76bea0b5dc82567f72"; + sha256 = "0ahlp3yfh1yxrlyyhjf9k4qssg2z3192dw4ab8lk62xnxq99bjln"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper"; @@ -73748,25 +71422,6 @@ license = lib.licenses.free; }; }) {}; - vline = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "vline"; - version = "20120108.445"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/vline.el?revision=17"; - sha256 = "1ys6928fgk8mswa4gv10cxggir8acck27g78cw1z3pdz5gakbgnj"; - name = "vline.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/aa860c2ccbaeb19d8b866919cdc45549d9cf9537/recipes/vline"; - sha256 = "0p59xhyrv7fmcn3qi51sp8v9v2y71ray2s756zbhzgzg63h3nbjp"; - name = "vline"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/vline"; - license = lib.licenses.free; - }; - }) {}; vmd-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vmd-mode"; @@ -73854,12 +71509,12 @@ vue-html-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vue-html-mode"; - version = "20170904.1017"; + version = "20170928.1057"; src = fetchFromGitHub { owner = "AdamNiederer"; repo = "vue-html-mode"; - rev = "7358de66280435531dda4dd29dfbcef397edb628"; - sha256 = "0pqjlszacpwrkr41l27d8zlyjm25b38l94plqjy4qk4p5r2zivvg"; + rev = "9218c61ff1ab2bdc6a6711d21ad760198d3511a8"; + sha256 = "1xpbr2fajn0nk53abb2x9m0qs0ygxfl62gdxd2iqfcwj56fswj9y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48588b163ab76204b9054340071e758045480e19/recipes/vue-html-mode"; @@ -73872,22 +71527,22 @@ license = lib.licenses.free; }; }) {}; - vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: + vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: melpaBuild { pname = "vue-mode"; - version = "20170712.930"; + version = "20171004.744"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "a680998d5e597e91be2e7e15e88bd83856a13c84"; - sha256 = "1hmqwv4xdjmly1l4s1hkx1n28navnqy5nplas39pwywik2dlh2cs"; + rev = "3b3cbbf6cb89380a721584dd62528cf3568ad9c7"; + sha256 = "1nfxvfpiwqjyn6h53gwpifmrsv0l4az9fsv7mrvnvf67pk3jawg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; sha256 = "0gy7a5sliaijq0666l55vbkg15anrw7k1828szdn1ppkraw14bn0"; name = "vue-mode"; }; - packageRequires = [ mmm-mode ssass-mode vue-html-mode ]; + packageRequires = [ edit-indirect mmm-mode ssass-mode vue-html-mode ]; meta = { homepage = "https://melpa.org/#/vue-mode"; license = lib.licenses.free; @@ -73914,37 +71569,19 @@ license = lib.licenses.free; }; }) {}; - w32browser-dlgopen = callPackage ({ fetchurl, lib, melpaBuild }: + w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "w32browser-dlgopen"; - version = "20170309.1433"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/w32browser-dlgopen.el?revision=25"; - sha256 = "1fkkrqwhkg58jjjsjf0fzwabaaxarjylp22zng1id6hqfsm7r1cd"; - name = "w32browser-dlgopen.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/w32browser-dlgopen"; - sha256 = "0dnvsnahnbnvjlhfmb0q6agzikv9d42fbnfrwsz6hni92937gz39"; - name = "w32browser-dlgopen"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/w32browser-dlgopen"; - license = lib.licenses.free; - }; - }) {}; - w3m = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild { pname = "w3m"; - version = "20170503.1331"; - src = fetchcvs { - cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; - module = "emacs-w3m"; - sha256 = "6ef1dd834a16cf3b8a0ec7a7412ae7410f0392d616eb3329f78011039384fc6d"; + version = "20171003.2122"; + src = fetchFromGitHub { + owner = "emacsorphanage"; + repo = "w3m"; + rev = "284a4cdd394d2d52220c62c24ddbce00ea100471"; + sha256 = "1fnxb3fn6a25sn41isf3frja5iwxi98cbs7rvp9mkzb4jq3bhb89"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/w3m"; - sha256 = "17mzs126fvlnsvxgfpbil9wmka0i87psblq49phky7dywcwz27lc"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/30de78c9cf83de30093a5647976eeaf552d4b2cb/recipes/w3m"; + sha256 = "0a4jql7ky62ickccbr2xnyggix5wf726d4pfz7mi3yxlw6i8m79s"; name = "w3m"; }; packageRequires = []; @@ -74081,12 +71718,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20170627.2306"; + version = "20170916.37"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "770d54fafb1a0a140b449e6132db22e70b4d6aa9"; - sha256 = "1f6h5n42fwwby880wikh8fdlk2zqimkl7wdb8wvr5kq1nqfqpz3f"; + rev = "0249c9b12dcd13df709441edff3c7fcc4efcb198"; + sha256 = "1xcxg24jwazkvc5afnqnmqisql6cr1brsmbb754a70a0r374965r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -74312,12 +71949,12 @@ web-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20170906.214"; + version = "20171002.1316"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "80e6de3b249c565506e29b2f1eca4104867f989d"; - sha256 = "127z1968znc6m1c5b819wjhiaxq6l6wkdhra5cwxfic4wzghdvbi"; + rev = "c15743454d0de944e5872a2ac4c9111d8cd61940"; + sha256 = "13hndf7ldw6nb2jkr3x1yxj374j2m116q0xl74ihk32vf8kb8j2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -74834,34 +72471,15 @@ license = lib.licenses.free; }; }) {}; - wid-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "wid-edit-plus"; - version = "20170309.1434"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/wid-edit+.el"; - sha256 = "0w2hjahcq68inabjbdyh3a0wcxd6pdgsp81iqcikxzfvwpzm35a9"; - name = "wid-edit+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wid-edit+"; - sha256 = "1wwrsk14hc0wrvy7hm94aw6zg50n2smlqwr6frwpi7yp8y394wiv"; - name = "wid-edit-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/wid-edit+"; - license = lib.licenses.free; - }; - }) {}; wide-column = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wide-column"; - version = "20120814.112"; + version = "20170925.913"; src = fetchFromGitHub { owner = "phillord"; repo = "wide-column"; - rev = "0b382e7a3ceecafcea6c9e7e742fb6d11641b04b"; - sha256 = "0bq39sfipad16skh5q26gp7z24kk93hgnaxb378dzfq1306kmn8q"; + rev = "ce9ef4675485a7bea381077866368ef875226b10"; + sha256 = "0qh8hy4jl59bfg4323a8h4q4a78gn4hsglfk2h23hqssbv4mhsp2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d29def44ae42dc4b60c1d254a57572bd09faf51/recipes/wide-column"; @@ -74902,8 +72520,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "7bc9ba691c838650bd74848c7ebf0bc1ed6c3f2b"; - sha256 = "18wwp5pp6s18f253xy9z2dhkxv7z3fxkgc8ayr3ypp8fskv78l34"; + rev = "597b3e1cab9f32591561a299670999260112afbe"; + sha256 = "1ndxd5s3raw4630zfxp5iz0mmnc6rrim6lgpzp4wjipb4zryjlnk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -74979,25 +72597,6 @@ license = lib.licenses.free; }; }) {}; - wimpy-del = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "wimpy-del"; - version = "20170309.1436"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/wimpy-del.el?revision=26"; - sha256 = "0impy9kp1xnhs0834azzndx93p8q53dxdqd9hz0n1mg0h8331c13"; - name = "wimpy-del.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wimpy-del"; - sha256 = "10qw5lfq2392fr5sdz5a9bc6rvsg0j4dkrwvdhip1kqvajznw49x"; - name = "wimpy-del"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/wimpy-del"; - license = lib.licenses.free; - }; - }) {}; win-switch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "win-switch"; @@ -75145,34 +72744,15 @@ license = lib.licenses.free; }; }) {}; - window-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "window-plus"; - version = "20170309.1437"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/window+.el"; - sha256 = "1l6fwrd2f58xpf7cprp354bq2fz0hvl9bz73hrbrzyqvnd9kix61"; - name = "window+.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/window+"; - sha256 = "0fhzb0ay9g9qgcaxpb2qaw15dh0lfmv3x4akyipi3zx11446d06j"; - name = "window-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/window+"; - license = lib.licenses.free; - }; - }) {}; window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }: melpaBuild { pname = "window-purpose"; - version = "20170722.655"; + version = "20170920.15"; src = fetchFromGitHub { owner = "bmag"; repo = "emacs-purpose"; - rev = "00ddafcf4802e7430ca709769b888656a6eb421b"; - sha256 = "1c3jf1cxfvja1v323wkxkd67n9nwzb57c79x4m010h2700xim8vs"; + rev = "44d31e373ce95d133c560169eb225d2c16a32b7b"; + sha256 = "0wpndc2p4pcq1z07r659pxv0db1g6hqkgdivjs5dxc75sb3mrrmw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose"; @@ -75234,8 +72814,8 @@ src = fetchFromGitHub { owner = "dgtized"; repo = "winnow.el"; - rev = "cbc06fb51883212a5169d33a689d14cd7b0a7c34"; - sha256 = "1hprii3da7y758ihlv308hg9sbcn42jn2f6g4dzb30ql5g2vxcnr"; + rev = "18cb6b94338f3b7b4f2cd0331dad22f82dd9e0d3"; + sha256 = "1wp00zxxcibvl6vjwmvhkgcbi76dyb2g8c30wy4kp7876cpc8hgv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/58891c2057ec834f999e3bf82af15e0617a4d4cf/recipes/winnow"; @@ -75317,8 +72897,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "7ce954278aef"; - sha256 = "116cspnc4lhf6gk73yr9sy7013jp88vq5zayghzgnkbdlaw6zmz3"; + rev = "4d41c0814bbc"; + sha256 = "1xy9a27qdl7hm7x2gbhxql63paxi16441rczl2i8ps032l4ffdnj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -75355,12 +72935,12 @@ with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20170817.1240"; + version = "20171006.352"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "241726118dee067a8d9880d53c6a781d580ba8a1"; - sha256 = "0q06qfir64nib604f23gdmbzl23mcsnysfd0x36cx9nwik95wl0x"; + rev = "ee39f232f2daf997498a4030d104c35ae397f457"; + sha256 = "17m5b7g5sdh0iy6lpj2inv9akscyw83nyx9hl71disdk7diq15hn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -75401,8 +72981,8 @@ src = fetchFromGitHub { owner = "DarwinAwardWinner"; repo = "with-simulated-input"; - rev = "d0f779594243fe85e330fd3f47caeb80068f7134"; - sha256 = "1iadgd99n1ilrdvybbrxj0f8n50sz76j3bji2nfpn3w32krj90w4"; + rev = "af9a38ce28a741e6d8742750bef5d7b5afa13796"; + sha256 = "0iann7zi9bgd3vmvxvg2n6x24hkyzbchbli1ymsmfrn8rif9byf7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4ddf16e19f5018106a423327ddc7e7499cf9248/recipes/with-simulated-input"; @@ -75457,27 +73037,6 @@ license = lib.licenses.free; }; }) {}; - wolfram-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "wolfram-mode"; - version = "20170221.120"; - src = fetchFromGitHub { - owner = "kawabata"; - repo = "wolfram-mode"; - rev = "d27a0f23791abde2bdda22e50108b99f11c13ed7"; - sha256 = "0r82h3x1ggirgd0a03qr71pdcxgkc4s3307ggwy86j4asd308m79"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/299fe35d0a5a11d20f0b917bc8f406bd0f011c93/recipes/wolfram-mode"; - sha256 = "1bq95lamzz45macpklnq1kxw9ak4x4f41kx16f472dn650ff0zlf"; - name = "wolfram-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/wolfram-mode"; - license = lib.licenses.free; - }; - }) {}; wonderland = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi }: melpaBuild { pname = "wonderland"; @@ -75544,12 +73103,12 @@ worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "worf"; - version = "20170818.1105"; + version = "20171002.1118"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "bf812a47e44dfbf4e166dbdbed7a97197bc1fc1d"; - sha256 = "11miqpdg0v27fi6ksrqkqfyi2qrsgsv8jsqfw15nyhqmi3sgxzqh"; + rev = "cf2f382b368bcb3c8ba4785a7fac8ee9300e80b5"; + sha256 = "0rnvmwdks8m4f6dwnyinv9rli58mlvlnrg7swpdjfh0g3bqgr7w5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -75670,12 +73229,12 @@ writegood-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "writegood-mode"; - version = "20160802.1405"; + version = "20170925.647"; src = fetchFromGitHub { owner = "bnbeckwith"; repo = "writegood-mode"; - rev = "a99896531a260db11acb931b68dbdc45030832d7"; - sha256 = "15g133ql8mgjchm6h255q77b6rks843lzva44kgjmfgwmgbfmc1b"; + rev = "416453af5a44da52646052fa2ee3a63acfd7bf8a"; + sha256 = "08z35gc3j25h02jmlkzsis4n7a6sy6zy2qykcnp8b3s8y51d0dg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/75c5a4304999fc3f5a02235a1c2c904238d2ce4f/recipes/writegood-mode"; @@ -75863,8 +73422,8 @@ src = fetchFromGitHub { owner = "jobbflykt"; repo = "x509-mode"; - rev = "a34584f310f3d8afe57dc1950db52b2d079242b8"; - sha256 = "07z0iyz7zgypqjv6izpdccllwrp7jgc86279rk0blf0vazj2927h"; + rev = "240b5045dcce18190bdabd91d74f48d3610a6fe2"; + sha256 = "0pi5hi0n6f2hif5hz1g04rk509rb4jlw6nrlhc8fg5k6x4n7ci3p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/27145423eb4e68e006ef96868a35b99d119a3099/recipes/x509-mode"; @@ -75964,12 +73523,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20170905.840"; + version = "20171009.422"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "0d0b3b96401af0d1e4ddea2713218bee08ab6a04"; - sha256 = "09iyf2xrp3scxr67jm3gl067kb8vsrnrqdwz2sv6la41n04s9lm3"; + rev = "15dc0360011eb8ec542db5e8e5bdfa1147366557"; + sha256 = "0n8j36q16njkcyr23qc8zx19wn4qx7pjiankimgjp96bcxsfa9df"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05eed39bae37cc8359d2cc678052cbbcc946e379/recipes/xah-fly-keys"; @@ -76150,6 +73709,27 @@ license = lib.licenses.free; }; }) {}; + xcode-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "xcode-project"; + version = "20170922.612"; + src = fetchFromGitHub { + owner = "nhojb"; + repo = "xcode-project"; + rev = "ec5d503a51430205daa6f5f382d921b6412b4b55"; + sha256 = "0m3262mqqhjcpzw8m4n403kr75m561kxvwf8clzwmv0fvkf8aazk"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/49b866ebf7e707bc74525f83dd5038e6e860fcef/recipes/xcode-project"; + sha256 = "0igp30f6ypmp4l8zmdfpa5bza4avm7mq2gj8v7b3ii655v91n6vi"; + name = "xcode-project"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/xcode-project"; + license = lib.licenses.free; + }; + }) {}; xcscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xcscope"; @@ -76619,8 +74199,8 @@ src = fetchFromGitHub { owner = "drdv"; repo = "yahtzee"; - rev = "09b18f248c957f74d219a6d1127923e9c786d650"; - sha256 = "05hg6andy8wxrsxf939g77v6ml4rac239vkkfk0fh6723wgiz144"; + rev = "18ee56bd687238be2bb6834062be3f04d9e9a283"; + sha256 = "13a6qy22jwyxrlcxw2xmqw3dckzlkxa84babdwrgpdx7kx4hqa5h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/200169fdabce0ae3a2ecb6f4f3255c15ec3ed094/recipes/yahtzee"; @@ -76759,25 +74339,6 @@ license = lib.licenses.free; }; }) {}; - yaoddmuse = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "yaoddmuse"; - version = "20170325.1752"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/yaoddmuse.el?revision=104"; - sha256 = "0vlllq3xmnlni0ws226pqxj68nshclbl5rgqv6y11i3yvzgiazr6"; - name = "yaoddmuse.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/yaoddmuse"; - sha256 = "1p68f3xjv55m8lnq5x27b8y87mq685hpm3n9kiga9qq8wxdf2rnf"; - name = "yaoddmuse"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/yaoddmuse"; - license = lib.licenses.free; - }; - }) {}; yapfify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yapfify"; @@ -76907,12 +74468,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20170828.1908"; + version = "20170923.1646"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "89eb7ab64d67e96646576dc0d551e8c23d50438a"; - sha256 = "1wr0d14yl3440hkdr436zxl9pk7nqhl76n9m3b3ia4lp6z5aj4jc"; + rev = "35a4df769cbdebd10d043f16d680bdb16ee858ed"; + sha256 = "0rkk39bm12d3d4gf8r99a2ipjaf1yb0b57rpg44bsqz5jada4a86"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -76928,12 +74489,12 @@ yasnippet-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "yasnippet-snippets"; - version = "20170908.435"; + version = "20171006.918"; src = fetchFromGitHub { owner = "AndreaCrotti"; repo = "yasnippet-snippets"; - rev = "5c3bb7ad8f659cb6651cc9c90709528672dd2ad0"; - sha256 = "1nbkgmqgrih99jgpzvmy0h8vdjgkrml9ck9wi19vw80d62b8m9p8"; + rev = "29ce99b8412ef919b7f03f259a877c4111362410"; + sha256 = "0xq3vjlsm4fvk809r69bln8i7fkqx49xi1gk1nff0v8y5b26vnxp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25b8d4efe2e7833eb95dfdf33aa3ecc34af7a687/recipes/yasnippet-snippets"; @@ -76967,6 +74528,25 @@ license = lib.licenses.free; }; }) {}; + yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + pname = "yatex"; + version = "20170916.1826"; + src = fetchhg { + url = "https://www.yatex.org/hgrepos/yatex/"; + rev = "ca7cf34e959c"; + sha256 = "19pczpzl0wvkdassskcssq5qrpica0bffqxxi8sqp1j35px6v4ma"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; + sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6"; + name = "yatex"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/yatex"; + license = lib.licenses.free; + }; + }) {}; yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaxception"; @@ -77012,12 +74592,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20170723.1458"; + version = "20171009.702"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "fd037efae08628e41480e9dad705dcc1f64e498d"; - sha256 = "06scz0d3jzgbr919lkjjfq9x1dyr5nqkhblvfpyk5bdp8l6j06d6"; + rev = "dfb0b02d0e19a05c8712d1877834a3eaafe453d4"; + sha256 = "10w5194lj6s5bvwl9r9zgw479f2a1i4lx87954xymcbridbcih6y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -77166,26 +74746,6 @@ license = lib.licenses.free; }; }) {}; - zeitgeist = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "zeitgeist"; - version = "20131228.1009"; - src = fetchgit { - url = "https://anongit.freedesktop.org/git/zeitgeist/zeitgeist-datasources.git"; - rev = "cdd1c219ed3afa9500403c3c499f49583d599034"; - sha256 = "0xg67asvgav5js03i3bqmh7apndrn0jy5vai0bsh22pq8wgvq083"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/1e2a0e4698d4e71ec28656594f6a83504a823490/recipes/zeitgeist"; - sha256 = "0zbpmdf7fq3qph70m13giir58y1n5z6q6kqixjll5j4fk98k6bkz"; - name = "zeitgeist"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/zeitgeist"; - license = lib.licenses.free; - }; - }) {}; zen-and-art-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zen-and-art-theme"; @@ -77272,12 +74832,12 @@ zephir-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "zephir-mode"; - version = "20170906.320"; + version = "20170917.2125"; src = fetchFromGitHub { owner = "sergeyklay"; repo = "zephir-mode"; - rev = "6b54967c76244ba18040deffd52c03caa8fff49d"; - sha256 = "0a48p08m1kdz1wxmwdcvv8lbph0by3lmxz4ccr6jrfsw3gxnixff"; + rev = "c2c6b7451667e68e29c353616f54ef9195c3fffd"; + sha256 = "1h5iv0ggh4jzv180mg8lz72d91b6kcqwy6ypgy3rn50bk6pz06kg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5bd901c93ce7f64de6082e801327adbd18fd4517/recipes/zephir-mode"; @@ -77293,12 +74853,12 @@ zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild }: melpaBuild { pname = "zerodark-theme"; - version = "20170830.57"; + version = "20170928.827"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "37ec068e6a744274daf1ecd1a64b75db6a7b8a0c"; - sha256 = "1yh1n6647a3fppjhhbs6ir7vgqn6nqhpghwnhlrl3amp74h6di78"; + rev = "248e95616304e4eb1adde458bbb59442c11d1cb9"; + sha256 = "1bckvqfid2acmn5xcxzflid7hqhflsjw51r9gws3vxb9hpj5qqyb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d00b78ead693e844e35c760fe2c39b8ed6cb0d81/recipes/zerodark-theme"; @@ -77311,6 +74871,27 @@ license = lib.licenses.free; }; }) {}; + zig-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "zig-mode"; + version = "20170920.802"; + src = fetchFromGitHub { + owner = "AndreaOrru"; + repo = "zig-mode"; + rev = "814657c5b6b0600ace78a7bbd216c3e90d611cfd"; + sha256 = "0nhx2wsk3qpdplvwxmdzwlka9255x46ca9vcjb58zbpb5wbfckzx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/33895b0ff559ffd18a62c04736597188f55419ee/recipes/zig-mode"; + sha256 = "1rmvlsgx01h62imbksxl164d5p0caz49nlgg0z7spvvd9bmplr09"; + name = "zig-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/zig-mode"; + license = lib.licenses.free; + }; + }) {}; zlc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zlc"; @@ -77479,63 +75060,24 @@ license = lib.licenses.free; }; }) {}; - zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { - pname = "zones"; - version = "20170802.1406"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/zones.el?revision=32"; - sha256 = "02vvkj2nx5ha1ad1zn5jd91jakxwx1pkrysj07a8y2sg657d7nkk"; - name = "zones.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/zones"; - sha256 = "1l4qilawlgvanrz4ny4aaqzg011dlqh65g06d44pf6ha586rvzp2"; - name = "zones"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/zones"; - license = lib.licenses.free; - }; - }) {}; - zonokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "zonokai-theme"; - version = "20160321.1925"; + pname = "zoom"; + version = "20171008.1325"; src = fetchFromGitHub { - owner = "ZehCnaS34"; - repo = "zonokai-emacs"; - rev = "38ee819b711e848437ba6d563594129a0ecac598"; - sha256 = "16ni0va1adpqdnrkiwmpxwrhyanxp5jwbknii2wnbhgq62s7gv43"; + owner = "cyrus-and"; + repo = "zoom"; + rev = "a78361f6db1753ad749f5b865f2076579a276971"; + sha256 = "1c2ww8a6q64w486hb0gp18hcxvxyjjw3qpkwqkx7rfj5smy12zim"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/80c7b1e01eb23f2f9b71fbeeea7d54ac36bae992/recipes/zonokai-theme"; - sha256 = "1hrpgh03mp7yynqamgzkw7fa70c5pmyjfmfblkfhspnsif8j4v29"; - name = "zonokai-theme"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/zonokai-theme"; - license = lib.licenses.free; + url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom"; + sha256 = "09bk0nnfj72an2b3rravd6qp21gdgcm1m55qnf2r8rzbgqymq5ls"; + name = "zoom"; }; - }) {}; - zoom-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }: - melpaBuild { - pname = "zoom-frm"; - version = "20170309.1439"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/zoom-frm.el?revision=44"; - sha256 = "03f3clivm7nfgg16k9pcshdwbwmjaqk0lcdm9d0180dl1c1z2wvs"; - name = "zoom-frm.el"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/zoom-frm"; - sha256 = "111lr29zhj8w8j7dbzl58iisqxjhccxpw4spfxx08zxh4623g5mk"; - name = "zoom-frm"; - }; - packageRequires = [ frame-cmds frame-fns ]; + packageRequires = [ emacs ]; meta = { - homepage = "https://melpa.org/#/zoom-frm"; + homepage = "https://melpa.org/#/zoom"; license = lib.licenses.free; }; }) {}; @@ -77668,11 +75210,11 @@ zpresent = callPackage ({ dash, emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser, request }: melpaBuild { pname = "zpresent"; - version = "20170730.2055"; + version = "20171008.2152"; src = fetchhg { url = "https://bitbucket.com/zck/zpresent.el"; - rev = "33b840f663b7"; - sha256 = "1g9x257bg9mgg1impyk5s8lfhr4qmqf1fzc7iwfdzizvzmgdlas1"; + rev = "eb6f5bf71b00"; + sha256 = "1q3xz4gwqb7ac49w0nq7zvl4n790wk6r97by1kldv54y2fj0ja9g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 0eeeb5f97fda..c97402c0f65b 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -926,12 +926,12 @@ add-node-modules-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "add-node-modules-path"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "codesuki"; repo = "add-node-modules-path"; - rev = "8eef7fa6765af1716fc21db08f19f3d3e9b68998"; - sha256 = "1dm2gdhs9zy5jqhbqipdgzfj24mrzxz064ax9l2dg0lqylk1dc0q"; + rev = "6f7801b2c41e3711406b7e1654257ad5557f5bb3"; + sha256 = "1pfgy1k7vp34k4zb9835y3x4jmf81na60vsf80wlgvfafwk170z6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63e99d8fc0678d7b1831cae8940e9e6547780861/recipes/add-node-modules-path"; @@ -1073,12 +1073,12 @@ ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ahungry-theme"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "ahungry"; repo = "color-theme-ahungry"; - rev = "e3d7e22cb10582a443b0e245be68aca936cd6abf"; - sha256 = "0fsip64bxs55kkqmpfcg4nr391b6wsd8hiq4fxvwww7n52lwsn5s"; + rev = "85a1af27541f6a73a63120fac2cfbb7ba39531c9"; + sha256 = "0z1kh8xj16lp7ydzw1fxypw37vlrcxcb8bpx96w6aj6zcd7pzwmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/520295978fd7de3f4266dd69cc30d0b4fdf09db0/recipes/ahungry-theme"; @@ -1292,12 +1292,12 @@ anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: melpaBuild { pname = "anaconda-mode"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "95fdfab07600171daccb0e9e98fb91c11237fd48"; - sha256 = "0l5h6apjshr6drfak6j66m3rv26hkr2namj85k8isvalmn4dlrj2"; + rev = "89fc16d50b889a17521084347b28f3011b84e113"; + sha256 = "08wdci57vig88iy5kk57k5qjkzphbbzy8g7b87hxakfgdmcwpg3g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -2809,12 +2809,12 @@ bifocal = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bifocal"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "riscy"; repo = "bifocal-mode"; - rev = "5e89ad1a9a47e890ce080a79fd32c71eb128d1c4"; - sha256 = "1rwxw1wniws31gbmpxgglxbc2g4jag19dvsjrym0f43yy4w2mbpw"; + rev = "a8b222b069a6bd64531b4780905989797bad8abe"; + sha256 = "0c6vzh35lj3pg9wd4v2fy6xdmcg9kq3n5br6rp4lx257gxglzpwh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e71995bd8452bad2e717884f148ec74c9735fc/recipes/bifocal"; @@ -3166,12 +3166,12 @@ buffer-manage = callPackage ({ choice-program, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-manage"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "plandes"; repo = "buffer-manage"; - rev = "1c63a3267bc7b790cebcea6308b64ca7ae08ef98"; - sha256 = "1g4qchgf7gcy8mhynxklz3bh2nlrhshczpq6yzh7gpvgcaf2zg32"; + rev = "44b26d5c17a4ecea3484727fa46c3d734569a018"; + sha256 = "0c9hz2532vcbn69am7pd2zyraqgw0q139qsck9hs1vfxnsj4v8dc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage"; @@ -3376,12 +3376,12 @@ buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buttercup"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "emacs-buttercup"; - rev = "e6f97d0ee4da1d061c2ff5f3e3984a30956a9fbc"; - sha256 = "1qizbnychsjv42h9r33l1jm0rylvkgddcwgwxxcckfkj6r75k9p5"; + rev = "18a887957b0e22d3cc8873796bd27f06b2493a03"; + sha256 = "0y0wg0yqmvqjyhjs4dx8yw44hl19k227krd9mds220w0dx8wmhay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d4b187cb5b3cc5b546bfa6b94b6792e6363242d1/recipes/buttercup"; @@ -3646,6 +3646,27 @@ license = lib.licenses.free; }; }) {}; + caml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "caml"; + version = "4.6.0beta1"; + src = fetchFromGitHub { + owner = "ocaml"; + repo = "ocaml"; + rev = "185bf236abb2bf10abfd3bff45c723ba10551c80"; + sha256 = "0057iik539jfcw287vcacb8hfxdnyfk17cc0ymxxy3sk5y1mfjik"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d5a3263cdcc229b11a3e96edbf632d56f32c47aa/recipes/caml"; + sha256 = "1ixs0626nsg1ilqdwj5rd8kicjy7mprswwy0kprppmpmc8y7xf7c"; + name = "caml"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/caml"; + license = lib.licenses.free; + }; + }) {}; cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; @@ -3733,12 +3754,12 @@ cask-package-toolset = callPackage ({ ansi, cl-lib ? null, commander, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "cask-package-toolset"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "cask-package-toolset.el"; - rev = "1e972739dbdf3af5b60a250c99414e76db238f78"; - sha256 = "0padb1zfjkmx9kbqnqh744qvpd3ln0khwxifxld9cpcpdp5k04vc"; + rev = "2c74cd827e88c7f8360581a841e45f0b794510e7"; + sha256 = "1hk5q6p1j7cqg5srr3v21xfyy7aas4hfj1a66h21c2xvfjra3hxw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ed71e45389626e700b93b29d5e2659b6706274d8/recipes/cask-package-toolset"; @@ -3938,6 +3959,27 @@ license = lib.licenses.free; }; }) {}; + cframe = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cframe"; + version = "0.1"; + src = fetchFromGitHub { + owner = "plandes"; + repo = "cframe"; + rev = "bb99672502046e87c8f029ce98c637f762a4fc54"; + sha256 = "088px3wlvr4km913y7hajrjqnxnv6n325rk6353bkbah2d75vxq4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/cframe"; + sha256 = "0pngdaflk1pk2xmwbij4b520b3mlacnjab4r3jby0phah44ziv4l"; + name = "cframe"; + }; + packageRequires = [ buffer-manage dash emacs ]; + meta = { + homepage = "https://melpa.org/#/cframe"; + license = lib.licenses.free; + }; + }) {}; chapel-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chapel-mode"; @@ -4088,12 +4130,12 @@ choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "choice-program"; - version = "0.2"; + version = "0.4"; src = fetchFromGitHub { owner = "plandes"; repo = "choice-program"; - rev = "5a803216d1d7a7ac6fd0f89f04ba4c126182a852"; - sha256 = "0iah71kcrzi22mi1jvyyaiflsx0ry24hqb0wd2w0nbgzc8s5ycqb"; + rev = "27607ec1fe241c58fbc1f861454a8e2ec1fd7b15"; + sha256 = "0q8krgsydrc2xc29y60qljifdvxfmxnvbncxsh64xhrzsnrgwmq5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e39555b2538cc8a955766c5533871396e8fe712/recipes/choice-program"; @@ -4169,15 +4211,36 @@ license = lib.licenses.free; }; }) {}; + circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "circadian"; + version = "0.2.3"; + src = fetchFromGitHub { + owner = "GuidoSchmidt"; + repo = "circadian.el"; + rev = "0034de1551de9f420f42267f3ec081351c2b5d7f"; + sha256 = "1khczk5lsiicyjra7g5m3dcl1rc6g43zbypigkj3izx2dsa47n5d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3440905a20bc91bb2637a87c04ff8410379f150d/recipes/circadian"; + sha256 = "13797y1w1636bibisz5i5p2xp0smd3apnhc1nx8ijm75smx679id"; + name = "circadian"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/circadian"; + license = lib.licenses.free; + }; + }) {}; circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "13c605e639194c3da0c2e685056fac685f8c76a0"; - sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21"; + rev = "59f1096238e6c30303a6fe9fc1c635f49e5946c6"; + sha256 = "19h3983zy3f15cgs86irvbdzz55qyjm48qd7gjlzcxplr7vnnh0j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -4499,12 +4562,12 @@ closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closql"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "emacscollective"; repo = "closql"; - rev = "0bb0fa3dd1e545cbf025d42e253ddb00107156a3"; - sha256 = "1mpycmj88gi62rhzxdv4933l318j3llphbc00b7rvzms55sgpcz5"; + rev = "66597831248bbe14ebc7bbf24b24cafebb5fd362"; + sha256 = "0jxf7k95l2j6rjyafq3zj6bxaa2xn4zmi4zg1n04sachcdrcgh3l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; @@ -4583,12 +4646,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.9.2"; + version = "3.10.0pre1"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "ffa164736ec78f27583ca4515ff3dfc7a82fc702"; - sha256 = "09m6hwlzdrd884h8wcq8pfac098smk1xqjpqm3003bqs4aynm49p"; + rev = "ecaddda2fea374089d867ad17b8b4700b189f397"; + sha256 = "0j6zzirbx1pcb0hyih77w6dbjmz2axknib7aryrcm7pjwd9d0q23"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -4622,6 +4685,27 @@ license = lib.licenses.free; }; }) {}; + cnfonts = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cnfonts"; + version = "0.9.1"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "cnfonts"; + rev = "cbe1ddd49e33b790a568c55351146aa5b909f173"; + sha256 = "11d44lf0m0kbzq1mvyqkl4aprys0xqaarp08nij57xnynin1rynx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0d5787ffeeee68ffa41f3e777071815084e0ed7a/recipes/cnfonts"; + sha256 = "1pryn08fkdrdj7w302205nj1qhfbk1jzqxx6717crrxakkdqmn9w"; + name = "cnfonts"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/cnfonts"; + license = lib.licenses.free; + }; + }) {}; codic = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "codic"; @@ -4748,6 +4832,27 @@ license = lib.licenses.free; }; }) {}; + colormaps = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "colormaps"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "lepisma"; + repo = "colormaps.el"; + rev = "3a88961ba66b09a49ea5aa92b2b8776b2c92d68c"; + sha256 = "083hks2zzalizdsgabiwc1kd114r748v5i3w3kfk8pv37i2gay35"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f4c795d9e323b08bc8354a6933a061644705a2ec/recipes/colormaps"; + sha256 = "16plhgpfz1wb58p6h8wxjhplhgv0mbj3f2xj34p6vydh44l8w8q2"; + name = "colormaps"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/colormaps"; + license = lib.licenses.free; + }; + }) {}; commander = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "commander"; @@ -4790,6 +4895,27 @@ license = lib.licenses.free; }; }) {}; + comment-tags = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: + melpaBuild { + pname = "comment-tags"; + version = "0.1"; + src = fetchFromGitHub { + owner = "vincekd"; + repo = "comment-tags"; + rev = "293a30026d7750f6657d6c2e6d6428abf1d7db5a"; + sha256 = "06s0phgqpzkkv81gl0cm6x8rjs53lhs8b2j56xamflqiydq0fz7n"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6ac71f4ffc19bce4f571001f9270d5be855dfc3c/recipes/comment-tags"; + sha256 = "13slv150zch0b7zpxa2dbqjzpqh0iy559m6rc0zs0dwdagzryp3i"; + name = "comment-tags"; + }; + packageRequires = [ emacs pkg-info ]; + meta = { + homepage = "https://melpa.org/#/comment-tags"; + license = lib.licenses.free; + }; + }) {}; commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "commenter"; @@ -4898,12 +5024,12 @@ company-cabal = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-cabal"; - version = "0.1.1"; + version = "0.2.1"; src = fetchFromGitHub { owner = "iquiw"; repo = "company-cabal"; - rev = "a570559ff92522598b5ed40e21c4539fffb3e976"; - sha256 = "1pja44g15d11kl47abzykrp28j782nkbmb0db0ilpc96xf1fjlsw"; + rev = "f458de88cad16ed48a605e8347e56433e73dcef8"; + sha256 = "0ll9dxzsgrpy4psz3dqhzny990lfccn63swcyfvl8mnqgwbrq8k0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee888b1ba57b6af3a3330607898810cd248862db/recipes/company-cabal"; @@ -6206,12 +6332,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "0.26.1"; + version = "0.27.1"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "39c71d912af541229d24da17987d65e65731d2bf"; - sha256 = "02alpsgmm0csp9yfa4bhsf8yyhf0q9rc44yrss0020qg8n92xs06"; + rev = "32538fc162be830bf01ff96e43a020bc4924a1ee"; + sha256 = "03v4ig9zlh8dz9s0c31f5hz2wfpvjydiidb0zgghnrshlqacpyj3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -6248,12 +6374,12 @@ dad-joke = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dad-joke"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "davep"; repo = "dad-joke.el"; - rev = "92641503c7e93309db12380d5228f99dbe64a53c"; - sha256 = "063cz5k264qbkb5g87xr6z68fjjnw3j1hpckdn6nqy8cin4qhagc"; + rev = "bee47e7b746b403228fa7d7361cb095de19ac9ba"; + sha256 = "14snnnjs28jg6k8x6g90m3dbcx10306ipcd256d3l6czk9p17vpd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/484d571b2737f7c613816333afdde6460c64e635/recipes/dad-joke"; @@ -6395,12 +6521,12 @@ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: melpaBuild { pname = "dashboard"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "f435fd394edc5ad9cf82065ef73b5821e3f93c58"; - sha256 = "0f0ipnij69z90qv9lzl6x9id3f6nayrgqxppbcf4gkxh25pi5nkw"; + rev = "8594c4f55448148b720eda5b72d51667fb7a8a39"; + sha256 = "1hhh1kfsz87qfmh45wjf2r93rz79rq0vbyxlfrsl02092zjbl1zr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; @@ -6458,12 +6584,12 @@ datetime = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "datetime"; - version = "0.2.1"; + version = "0.3"; src = fetchFromGitHub { owner = "doublep"; repo = "datetime"; - rev = "3ecf9985250ecd441e91614b44cf12323af907c0"; - sha256 = "1x8kj6d9p42lffk15m0c955ibwxxvfxhihij43alwq5xab2l16bv"; + rev = "082d2c7b0e38c26a8c46af9c9956a2e100d88e71"; + sha256 = "0fdswqi53qx924lib7nd9dazn0916xf1ybrh3bcn3f8cn6b8ikg5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fff9f0748b0ef76130b24e85ed109325256f956e/recipes/datetime"; @@ -7085,6 +7211,27 @@ license = lib.licenses.free; }; }) {}; + diredfl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "diredfl"; + version = "0.3"; + src = fetchFromGitHub { + owner = "purcell"; + repo = "diredfl"; + rev = "2393653a1518b118180ff90ef2b66cfb7d0b555c"; + sha256 = "04yykal90pc4nsdlk08z6svsnddjzaz1drwvs3bqfjw01fr50xcs"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3da86e18d423198766455929da1dcb3a9a3be381/recipes/diredfl"; + sha256 = "0cybq15yq07x2mnrnwapy020d598yymcy8y9wwf1m7f59p3h9hvn"; + name = "diredfl"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/diredfl"; + license = lib.licenses.free; + }; + }) {}; diredful = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "diredful"; @@ -7172,12 +7319,12 @@ disable-mouse = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "disable-mouse"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "purcell"; repo = "disable-mouse"; - rev = "d1c52d80ed2149d0751afd948ffc2d9f80f589ac"; - sha256 = "1v1y5hf6k6ng7xsvgb27nh740d14m6l4krr0paccda8zgm4mw357"; + rev = "81639930bcaeedadbcc19728e91719afcac84613"; + sha256 = "0l6mai68ns3qw3rlvjvzsnqwdy7bxqiy0vdwflq0l1plxb1vazyc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbbc396373212fdf731e135cde391f27708ff015/recipes/disable-mouse"; @@ -7347,12 +7494,12 @@ docker-compose-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yaml-mode }: melpaBuild { pname = "docker-compose-mode"; - version = "0.3.5"; + version = "1.0.0"; src = fetchFromGitHub { owner = "meqif"; repo = "docker-compose-mode"; - rev = "372df2f0de34a4bd44d4a7274b9ab85117ac7392"; - sha256 = "14vgjhy2j60xhf38zm5nlkr4d3r455kw6paw0wff4mqmdjcg3pds"; + rev = "ae25b0e01394f94995f4b0ceaab1e04eb4b9acbd"; + sha256 = "14xri92dcj52vw1vhrnicibrn9y010zv8w7jw6j3q9lrpmr073lr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/37dd4c1fc11d22598c6faf03ccc860503a68b950/recipes/docker-compose-mode"; @@ -7578,12 +7725,12 @@ drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }: melpaBuild { pname = "drupal-mode"; - version = "0.7.1"; + version = "0.7.3"; src = fetchFromGitHub { owner = "arnested"; repo = "drupal-mode"; - rev = "1e6f973ed5dfdbbfda96c4ab266bd8ef3d6436d7"; - sha256 = "1c3krir3l04rwlyadnhra6kmbnmvdm95aj7iwspa6dssnry4vflj"; + rev = "49ce63c659aa0af7a2daf0c9e74e58fbce6deb71"; + sha256 = "1l2xc24y037b3z62yxmq2bx1x3qqv56d15bf3qmb3mpgm4gh85j6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode"; @@ -7662,12 +7809,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "c96467b3079495353350a6b00fd2e6052b3a3fd0"; - sha256 = "04jhbapf84if54d648mx1fk7b9vwrnd0apyarwjv7p1azasm6vwl"; + rev = "64c0759432334465ccea115d83600b468f86e3be"; + sha256 = "00vhxd7z7fw2cwdzgvfbdzfp668dfaw83c95kkicmmdzlabiz50i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/dumb-jump"; @@ -7686,8 +7833,8 @@ version = "0.7"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "56fa34ea25d4"; - sha256 = "1hk7i557m0m42zdg59z278cylglnp49dr8wa3zbdwzk2xzdg0m00"; + rev = "023d2edde61d"; + sha256 = "1izhlafsbxfav4jvl7bqg188d71895r1sqacxsblvcld8c0brsqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -7871,12 +8018,12 @@ easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "easy-hugo"; - version = "1.7.7"; + version = "1.9.11"; src = fetchFromGitHub { owner = "masasam"; repo = "emacs-easy-hugo"; - rev = "108cc2347507ff8c92b10a817de0850e9eb99ab2"; - sha256 = "1fcq6693cjl0lx67gwsk53lm20zznq9cc9widb3rzpwifns4x8ac"; + rev = "8f16fb1f510a147e7ab846030057d4c74127ffb2"; + sha256 = "15axmg6z1nlaz7xsf70arxazkkskkga2fa71iswpnhwqsrr90w8l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; @@ -8165,12 +8312,12 @@ edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edit-indirect"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "Fanael"; repo = "edit-indirect"; - rev = "1d1dae842505e5ff09644529deec87c056e1b14e"; - sha256 = "145knahvvxbm8qmcdb69ilrg14w7130vav2pqjd7anr1l8n2i6gz"; + rev = "032ac0ec690d4999d564fd882588c7a197efe8dd"; + sha256 = "0by1x53pji39fjrj5bd446kz831nv0vdgw2jqasbym4pc1p2947r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/edit-indirect"; @@ -8614,12 +8761,12 @@ el2org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el2org"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "tumashu"; repo = "el2org"; - rev = "c85837d56ed8fe1b31927755294db49ac46f443e"; - sha256 = "0znnvpngghd9z8a0cakpvrw261mnmxqa15lpjcxfm7w8wgb2d4f6"; + rev = "4a33469cd305e581603d7ef63bc2a1f2156f2e2e"; + sha256 = "0mzddqny6wpg1fv99xrvlv7rxmaifvmy5bvj4in4pldhm4cx4q1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/el2org"; @@ -8950,12 +9097,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "c33794ae03fa787c7f93b93cc9427d864b63e25f"; - sha256 = "1q8zjsl9zbgwqcbvzkdlqy28z4h1qr0kkhhrq037vab0w0l0zi6l"; + rev = "1e65cb6e988df088c299572464335b6f149addcd"; + sha256 = "01mfrn6mn8h9fkpkqg2shp21864ffjr7q5h3rpbnk6wpa3pmjc1m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -9574,12 +9721,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "1.0.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "2b4d4cd764b9fa4757738a6dae87f4d1e99686d6"; - sha256 = "0j7zd3qxh4m5gv5s8pvfacad2mkzwwz1xdrvg1sa035xaxahqsyx"; + rev = "34c7719c9739d1e5d55c3f776e8f32a417b4eea6"; + sha256 = "1dpj31krw0vwrb1pimpbpdm3k2ivqmr6kbgaw8p2dwwwqk1s6nbg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -9645,12 +9792,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "2.3.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "deb9affaadce11c356df53b6b62ab376ef652d16"; - sha256 = "1515gv9bhjwbmkbz6sivq5zhpalvfb0ias4qia9anz9npqfx24y0"; + rev = "1768e91e02a2d6441c2d82a711912a9498d2316e"; + sha256 = "02fknkqxqxzqdqa2vj7ql6swrl83v1xs5iym5r6yr6mpj69di8bd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -9875,12 +10022,12 @@ erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20.0.4"; + version = "20.1.1"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "a230f26086b3db9097f06d4bb91fb3b2e9379c77"; - sha256 = "1g26vf7ab18r9knxa2ykn3j6vrhhiyqbg6jf3gfjxw2c94z51a9m"; + rev = "69292a11cd4b31fd3ff73b44f28d527f2d16f555"; + sha256 = "1v5hna4gf2i9lmiyykbs4w2r1yym2p6jb21nxfa5vlhwq85mldfb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -10081,6 +10228,27 @@ license = lib.licenses.free; }; }) {}; + eshell-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eshell-bookmark"; + version = "2.0.0"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = "eshell-bookmark"; + rev = "deda4b848b2fb979dbe73ead2cb866610e3596ed"; + sha256 = "14dmsnixf9vqdhsixw693sml0fn80zcf0b37z049fb40cmppqxdw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e7bf4702a907727990fcc676980f2b219e22ab0c/recipes/eshell-bookmark"; + sha256 = "1bybxlq1h5chrjxqjb23kq8dmgw2xrjwkrnvpbphblqzpdy5ck0s"; + name = "eshell-bookmark"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/eshell-bookmark"; + license = lib.licenses.free; + }; + }) {}; eshell-did-you-mean = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-did-you-mean"; @@ -10123,6 +10291,27 @@ license = lib.licenses.free; }; }) {}; + eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eshell-prompt-extras"; + version = "0.96"; + src = fetchFromGitHub { + owner = "hiddenlotus"; + repo = "eshell-prompt-extras"; + rev = "7581c109673c40aceff278cd524273f50ffe170d"; + sha256 = "1m1jisjz974cfz89i6l2zq666yzhsqipc6dmqlrm8mw81fxsfm1h"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras"; + sha256 = "0kh4lvjkayjdz5lqvdqmdcblxizxk9kwmigjwa68kx8z6ngmfwa5"; + name = "eshell-prompt-extras"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/eshell-prompt-extras"; + license = lib.licenses.free; + }; + }) {}; eshell-up = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-up"; @@ -10417,22 +10606,22 @@ license = lib.licenses.free; }; }) {}; - evil = callPackage ({ fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: + evil = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "1.2.12"; + version = "1.2.13"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "0ad4c2dae1249558f7b59a78a685e4f8092009c9"; - sha256 = "1z7ysn0h62i674pw47k905713m4ch7hrisk4834rf53zq3c9sabn"; + rev = "427cf5faa57e8794ac93f594dc3d1972e687a25a"; + sha256 = "02xc9zgrabnlwk3wlsxbzbhdzi3fm5fk8kimvgdcp8vsnpdcrhql"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440482c0edac8ee8bd4fe22f6bc5c1607f34c7ad/recipes/evil"; sha256 = "1d36r6mi5nvrwnk4a9338wmhr72fcbrwj0r8gmvivpjdngjy4k39"; name = "evil"; }; - packageRequires = [ goto-chg undo-tree ]; + packageRequires = [ cl-lib emacs goto-chg undo-tree ]; meta = { homepage = "https://melpa.org/#/evil"; license = lib.licenses.free; @@ -10963,6 +11152,27 @@ license = lib.licenses.free; }; }) {}; + evil-test-helpers = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-test-helpers"; + version = "1.2.13"; + src = fetchFromGitHub { + owner = "emacs-evil"; + repo = "evil"; + rev = "427cf5faa57e8794ac93f594dc3d1972e687a25a"; + sha256 = "02xc9zgrabnlwk3wlsxbzbhdzi3fm5fk8kimvgdcp8vsnpdcrhql"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/87da8c50f9167ad9c3844b23becb6904f809611d/recipes/evil-test-helpers"; + sha256 = "0l4skyznzgr76z518q22lf90ymlsfcs02w8vqkg8az1nfl3ch7fs"; + name = "evil-test-helpers"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://melpa.org/#/evil-test-helpers"; + license = lib.licenses.free; + }; + }) {}; evil-text-object-python = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-text-object-python"; @@ -11301,12 +11511,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "63395a2367d1d48983a9363d2d0bf518177297bd"; - sha256 = "15vgv0z4vzdnc3vb98j2hy4bv5x83f4c1dzgx49r61vka7p5is0q"; + rev = "4a79230739cfaa607f39fbfe53339692b83c3933"; + sha256 = "0cdaayp2ca6wcqh11snmc50p4gl6sika58jxvn5dklsipzxv75v8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -11871,6 +12081,27 @@ license = lib.licenses.free; }; }) {}; + flex-compile = callPackage ({ buffer-manage, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "flex-compile"; + version = "0.1"; + src = fetchFromGitHub { + owner = "plandes"; + repo = "flex-compile"; + rev = "4ca317883404a14c1b4920d7b3e6f0bffb04a8f2"; + sha256 = "08ax91bdf4dwky8zp0cwmk53wqyqs893j7q1jah5cimnhgi82ksz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/259caeebc317e81ab9d532a371ea85656c2b1619/recipes/flex-compile"; + sha256 = "1hlh4k7qgln87xajnjjhf1yyg6bgdwd0iczhlfw8gdwfj5xpjd38"; + name = "flex-compile"; + }; + packageRequires = [ buffer-manage dash emacs ]; + meta = { + homepage = "https://melpa.org/#/flex-compile"; + license = lib.licenses.free; + }; + }) {}; floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }: melpaBuild { pname = "floobits"; @@ -11958,12 +12189,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "30"; + version = "31"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "9c063965e893f0cc7c97fabb810ac41ec22f82fb"; - sha256 = "1vyncqicafmy9av2nsawywn56ay50zdyjba9r55vv11baklabg8w"; + rev = "401b115d10e202a1b31f57340438420081af21ce"; + sha256 = "141i6wzqlb0dslmca6930cal7q4y5wbwzmxrpjk3hgm6nxz483p8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -12210,12 +12441,12 @@ flycheck-joker = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-joker"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "candid82"; repo = "flycheck-joker"; - rev = "e7964140cbb0ee7badfc3d67c6412f5c3a461f76"; - sha256 = "0mqnhcpkf86dxqj0y7g5mnn91m81jdvrsbwikyqvx46z1jpi0y37"; + rev = "c34c3922a2e8bc918f250602e0ddf655cdcad456"; + sha256 = "0fp7h0pmxk02x1kisqvnb9wkjjn9bl91capmnllrb7qmb24w6pd5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/599bf33a5d4a4a590b355001e532cab4e1ee9ef6/recipes/flycheck-joker"; @@ -12441,12 +12672,12 @@ flycheck-pycheckers = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-pycheckers"; - version = "0.2"; + version = "0.4"; src = fetchFromGitHub { owner = "msherry"; repo = "flycheck-pycheckers"; - rev = "220c551df591792d08fc9d149ab3329171743cb9"; - sha256 = "0q1sz28nlnamcm4l587q94b7cyak9d4wpgpr33a05m9lw4a6z74i"; + rev = "a3d39139dbe5cdaa64dda90907bb8653f196c71e"; + sha256 = "1i1kliy0n9b7b0rby419030n35f59xb8952widaszz4z8qb7xw9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/af36dca316b318d25d65c9e842f15f736e19ea63/recipes/flycheck-pycheckers"; @@ -12546,12 +12777,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "6b0b7c6fffc86809d0535afebd6b0972059992d5"; - sha256 = "0d411idv9ib1jhmdbjb8ycc8clmm1ygpwapaka3d50gkgrmfin4q"; + rev = "756833425f51baa9eb0a2fa7493df6e68612c88d"; + sha256 = "1hvrg717q0nlz4r8wby82gs3vdx8fdhf38rg4j77j3fqfmxdd3fi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -13299,27 +13530,6 @@ license = lib.licenses.free; }; }) {}; - forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "forecast"; - version = "0.6.2"; - src = fetchFromGitHub { - owner = "cadadr"; - repo = "forecast.el"; - rev = "1eb60db1760572e3b1b87f6d672e3aa0812d6d94"; - sha256 = "1imrn4wc744fdcm1pkfjk8gmilzcrjzawbcg6mhdkzsz5cnb7klb"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast"; - sha256 = "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc"; - name = "forecast"; - }; - packageRequires = [ emacs ]; - meta = { - homepage = "https://melpa.org/#/forecast"; - license = lib.licenses.free; - }; - }) {}; foreman-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "foreman-mode"; @@ -13491,12 +13701,12 @@ fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; - version = "1.9.8"; + version = "1.9.10"; src = fetchFromGitHub { owner = "rneatherway"; repo = "emacs-fsharp-mode-bin"; - rev = "9766952bd7830cb0d319736961af8e42e67d42fe"; - sha256 = "1krncbzdhp6kpypaqdn6fhvxhhc1pvy2ayn4w4ljmsd7wx6zazyi"; + rev = "71435fdd100712d6894d8d72a5667b250a0d8eb7"; + sha256 = "1c718gfms4zhzj06zmzdw71q6vhbf7mh3cgvq9vf8bnlv910p832"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc45611e2b629d8bc5f74555368f964420b79541/recipes/fsharp-mode"; @@ -13601,6 +13811,27 @@ license = lib.licenses.free; }; }) {}; + futhark-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "futhark-mode"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "HIPERFIT"; + repo = "futhark"; + rev = "2a7d824f7265a35bb928bf4de8e46d02e0a56a12"; + sha256 = "0dkx9xl39k0bcspyx37410rb5ngphw9svinwjw1kgq0pqhc2qxdf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0607f01aad7e77d53595ad8db95d32acfd29b148/recipes/futhark-mode"; + sha256 = "1k22xkg6vd60hk58zkxhmsw2gs6ikzmidvxcdglnr46m6x7r7pnq"; + name = "futhark-mode"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/futhark-mode"; + license = lib.licenses.free; + }; + }) {}; fuzzy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuzzy"; @@ -15218,6 +15449,27 @@ license = lib.licenses.free; }; }) {}; + goto-chg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "goto-chg"; + version = "1.7"; + src = fetchFromGitHub { + owner = "emacs-evil"; + repo = "goto-chg"; + rev = "171b1331022caf12d8c3593e9b5075f87ee958d4"; + sha256 = "1jcnrin4j1x8p63fd9r37dq1vr5a7a1nvzk6kp0bdsgn9vbjmapc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cf1fc176430fe3ab55ce537a0efc59780bb812be/recipes/goto-chg"; + sha256 = "1yd4jq4zql4av9nr1sdk4nsnnk54c3brgjhpczndy1ipiaxlnydy"; + name = "goto-chg"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/goto-chg"; + license = lib.licenses.free; + }; + }) {}; goto-gem = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "goto-gem"; @@ -15547,12 +15799,12 @@ green-is-the-new-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "green-is-the-new-black-theme"; - version = "0.0.1"; + version = "0.0.3"; src = fetchFromGitHub { owner = "fredcamps"; repo = "green-is-the-new-black-emacs"; - rev = "2b1011836fc04940d542e9a783b99670a08b308b"; - sha256 = "16v7l4ynj4p1hq243rqckfgppmj8cvm0lyybjjqaqblqjd1ki90d"; + rev = "b9cdecd04691311c30c94ad4ec81124e63b9b122"; + sha256 = "124q733rirc8a2d9xfparphcjrrbxhp4wxf070l8hqp3p2764bka"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3e42528d5677fd90515cad47266c07ea3d4363fb/recipes/green-is-the-new-black-theme"; @@ -15734,12 +15986,12 @@ gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gscholar-bibtex"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "gscholar-bibtex"; - rev = "655bccf0b12c9d95ec992ee4bfb5c7c9a4d0c99b"; - sha256 = "1ivdq3mgym14v5hpv938248vifw1xk9z16d2f38d9xj01icik522"; + rev = "ba4ce159e385d695d8560e8b06b3cbe48424861c"; + sha256 = "0idnfhk17avp0r4706grjqqkz0xl98gs0bx7wrkvwym3y2gadlz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex"; @@ -15881,12 +16133,12 @@ hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "hackernews"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "clarete"; repo = "hackernews.el"; - rev = "452e939211ebc0af7256a2f0e8cdad5c426694e6"; - sha256 = "1c49lfm5saafxks591qyy2nilymxz3aqlxpsmnad5d0kfhvjr47z"; + rev = "22a15dc57dd6aab7793c0f9c2b72e161e0bee00c"; + sha256 = "0bpbiadv4bf3lllsm0w1jcw8nc7c9zl97m972hbxb1dgv90gvs5b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c43a342e47e5ede468bcf51a60d4dea3926f51bd/recipes/hackernews"; @@ -16174,12 +16426,12 @@ hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "hasky-stack"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-stack"; - rev = "38a33e2ed02d57afb6b38bf36741f5bf7e38e45b"; - sha256 = "03zg58hrka2q7sqm3f14xgcs2mjxhlyybkf9w6pp8icr4wdsih4z"; + rev = "a3f890fb8570369898ee9718b128d4e7123a6585"; + sha256 = "0bc5i4s7aclwrsh8yrhfwwlfbcs5hdbzm31glikd487asv30jq9c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; @@ -16237,12 +16489,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.8.4"; + version = "2.8.5"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "0fc89c212b8a90ea8de0401f8d1b446ef9a24d93"; - sha256 = "0yava3cn0g382mgnczgqmc1fhd2nbdr16n48vjlvk8bsb3n4va1m"; + rev = "2385b81edc706f7efc74f2aff4854399254cde17"; + sha256 = "02qhjyaqxh18g23lbcfpygz1ng7skifbqb6xkgh5wii1qykqxy6m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -16573,12 +16825,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.8.4"; + version = "2.8.5"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "0fc89c212b8a90ea8de0401f8d1b446ef9a24d93"; - sha256 = "0yava3cn0g382mgnczgqmc1fhd2nbdr16n48vjlvk8bsb3n4va1m"; + rev = "2385b81edc706f7efc74f2aff4854399254cde17"; + sha256 = "02qhjyaqxh18g23lbcfpygz1ng7skifbqb6xkgh5wii1qykqxy6m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -17623,12 +17875,12 @@ helm-smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, smex }: melpaBuild { pname = "helm-smex"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "ptrv"; repo = "helm-smex"; - rev = "7af4e4b44671f739b39584fc50c20084700701ac"; - sha256 = "1dhzglpd48mb47iyii8igb1dldvnr4alg18m7g8xb529dx8z9wni"; + rev = "2269375dfa452b88b5170d1a5d5849ebb2c1e413"; + sha256 = "0n2ki7g0hygsq4bi5zkhp3v772ld7niiajfznxmv11dgn949a52s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85568bd732da952053148e07b95e53f7caf5f62c/recipes/helm-smex"; @@ -17812,12 +18064,12 @@ helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "helpful"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "Wilfred"; repo = "helpful"; - rev = "a5d8bc41e43177953d8ba3972a83755ddd4e1073"; - sha256 = "0sr31df42cbrhzqxjvx1fcbafwq30jslqf715scrzyiziddf83zq"; + rev = "b9a06978b6ffcd7f0ea213a6f534fa39318f0050"; + sha256 = "1czqvmlca3w7n28c04dl3ljn8gbvfc565lysxlrhvgmv08iagnxm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; @@ -20452,6 +20704,27 @@ license = lib.licenses.free; }; }) {}; + jsonnet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "jsonnet-mode"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "mgyucht"; + repo = "jsonnet-mode"; + rev = "efe768fdcff25d746674fbbf229b9e1a7efea4f1"; + sha256 = "1a52266y83z9i3sg7hhc8sw7rhjy5i9wdy2bv7s2fv00lnngaj29"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ba17372732723f73e8eeb6e7c47abc0edeb20da4/recipes/jsonnet-mode"; + sha256 = "1aadys887szlc924qr645lby9f8vzvxkwhq6byhppk1b01h911ia"; + name = "jsonnet-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/jsonnet-mode"; + license = lib.licenses.free; + }; + }) {}; jsx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jsx-mode"; @@ -20623,16 +20896,16 @@ kaolin-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kaolin-theme"; - version = "0.6"; + version = "0.9"; src = fetchFromGitHub { - owner = "0rdy"; + owner = "ogdenwebb"; repo = "kaolin-theme"; - rev = "041cc6637a58a3a24086d1c2b8c3eb113434127e"; - sha256 = "1qx6568s8wj6ha8wfy8hih1qwwcdiybdb83w3fr9lqwh0lyhjp0f"; + rev = "d43ba0e8e6b13b08e4d74de20c6e594ebb225501"; + sha256 = "0gg19rh5q1gl6ylwrmjq0dqh6p5fkms1av6bbgry6fqv8220xf8n"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/d2abf9d914cdc210bbd47ea92d0dac76683e21f0/recipes/kaolin-theme"; - sha256 = "1316sn1xpli9aqbhn8sldyvsc2fwk1ql9aw4l0rgkfbivvcklp7c"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/a67c2a3ad82efcb32ba4943c7ac10fe2768d9d51/recipes/kaolin-theme"; + sha256 = "009064hhn39f9w9qxa3m0kwqhj5a12j7hg4916j9hslpwy5ghc0c"; name = "kaolin-theme"; }; packageRequires = [ emacs ]; @@ -21617,12 +21890,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "2.16.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "96f22fe5892775b8a9a081898e1a4f00fbb8a674"; - sha256 = "005g84acwjns587lawgms63b9840xswpqj0ccgdaqj6g9p0ynmqa"; + rev = "0da66c7c01e8fea952faa3e21a34664b37918400"; + sha256 = "0xzqg5nrrsapxsnyk919w5nb6pad7w06f0c266x9cs4m9wih82wk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -21784,12 +22057,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "134b41557ab539219d9e3a1b3c8939df93676726"; - sha256 = "1jfdm64r6rj7pl6270v084fvaga5csa4snvbfjdlhs5bshn1d0v2"; + rev = "72b6c5349206172a146b2c730b8ac040a92ebc3f"; + sha256 = "1f93iyxf8v0jazzh6jljrm7r28z00nn14wr90qrh9y9chyq72n63"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -22001,12 +22274,12 @@ magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: melpaBuild { pname = "magit-annex"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit-annex"; - rev = "ae6250aead8f283eac8d6951a249cfc7d85e0b40"; - sha256 = "0n6dhc92z5w67rcfngjzprzbdn42ja263gdqa7fncqq9p66slccq"; + rev = "895c229c2b0d822a4debb302d8638105ecb4ee20"; + sha256 = "0316csgc95dalqmkxj6qlb7inzcg4csfs9n3im1ygswcswpdaajh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-annex"; @@ -22106,12 +22379,12 @@ magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }: melpaBuild { pname = "magit-gitflow"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "jtatarik"; repo = "magit-gitflow"; - rev = "5bdcfe0a7bf4f5bb9a927baa4880233bf11a4a6b"; - sha256 = "12pi6aw44lnzzcw0zgz5rxvcf4p700fkz4q2skbapwmds8gw3fg9"; + rev = "cc41b561ec6eea947fe9a176349fb4f771ed865b"; + sha256 = "0jz69wrrzvqadaphmjrr146nzvmphsbl7rmc3ccnpw1gw6gnz81f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dfaeb33dec2c75d21733b6e51d063664c6544e4d/recipes/magit-gitflow"; @@ -22890,12 +23163,12 @@ merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "merlin"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "the-lambda-church"; repo = "merlin"; - rev = "b53e4beeeb8da6d7cb035990a7e805fea5da0de6"; - sha256 = "1lw0s78zwr8rd4q4pg34m9q8yd5swh1fff3c5p992a2qlzfb0hax"; + rev = "a5dbf8e321ff162476555e62264468dd6f55c279"; + sha256 = "0mq4ddr3g64dd4bhq812hb5xvlkswfmib1nw34f3m8sghmaxcd5z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1b9bfd3164e62758dc0a3362d85c6627ed7cbf8/recipes/merlin"; @@ -23831,6 +24104,27 @@ license = lib.licenses.free; }; }) {}; + mustache = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: + melpaBuild { + pname = "mustache"; + version = "0.23"; + src = fetchFromGitHub { + owner = "Wilfred"; + repo = "mustache.el"; + rev = "b0ea352813592424164520a49e86c04600242752"; + sha256 = "1n2ymd92qpvsby6ms0l3kjhdzzc47rri2aiscc6bs07hm4mjpr9q"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d1bcf9599ca6d2c29333071a80f96808d4ab52e2/recipes/mustache"; + sha256 = "1pjr00xx77mlfw1myxaz6i3y2gbivhbiq5hyjxxbjlfrkm1vxc8g"; + name = "mustache"; + }; + packageRequires = [ dash ht s ]; + meta = { + homepage = "https://melpa.org/#/mustache"; + license = lib.licenses.free; + }; + }) {}; mustache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mustache-mode"; @@ -24338,12 +24632,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.5.10"; + version = "0.5.11"; src = fetchFromGitHub { owner = "emacscollective"; repo = "no-littering"; - rev = "227c2d175e95dbed6a5c6e37b12bb9a3fcf2de94"; - sha256 = "1wgfcghzhsa0siz1vf3rq69h1ilyblj5rsmijnyymp9fhxgyyll6"; + rev = "a4b42b185b65e78bc3bb6523e23aefb1213eb3b2"; + sha256 = "1yzcawvz3vbq6pgr0b3sk0qg24jx1fpkinwcmsdl283ib8msbc7g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57a2fb9524df3fdfdc54c403112e12bd70888b23/recipes/no-littering"; @@ -24481,12 +24775,12 @@ nov = callPackage ({ dash, emacs, esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nov"; - version = "0.1.7"; + version = "0.2.1"; src = fetchFromGitHub { owner = "wasamasa"; repo = "nov.el"; - rev = "91c4329f64ddc9a598fa6c58e1d9264aee073e72"; - sha256 = "0x3ijjhjg2q8gdqf4hgr2d8wy32qhxy48kbz0slibkn9yik3pvlz"; + rev = "19ab463864f137b43704b4f34173349c88e84d8e"; + sha256 = "00f5hhw157nwdwy26yn6l3z2hgk6xxvx5xl0hasskj1l9rg0zgh2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf543955ba2d5d0074fa2a5ba176f9415f6e006d/recipes/nov"; @@ -24712,12 +25006,12 @@ ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-http"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-http"; - rev = "9155a413e41d918042e9839399e3940aa0f8499c"; - sha256 = "1b39g0nifw0000s0x8ir0cfr716jypq6b5n2l1i4mrby6aw3bw1k"; + rev = "20393dd8130d21a3f06d8514da14c5ffdd88ae44"; + sha256 = "0xa7rgsb0d1d96h5bb0n0sy1hgmd2fg6r6g2aqp1c29ld4hpi7r7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http"; @@ -24985,12 +25279,12 @@ omni-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-kill"; - version = "0.2.3"; + version = "0.5.1"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-kill.el"; - rev = "8a1145b58b4736c9163bcd5b28c8fea80b2ea97b"; - sha256 = "07grj81alrr6qgs3jmqkjzphkvi26w6jm5hf1f5wyx7h6q293ady"; + rev = "192d51d843c6581d593a4eb01f1b49ad59d206cf"; + sha256 = "0n24rhzl1zhlkdkjigsczyc0z3yrihz9qnn1icrk6nkms107qbnn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c24df34d2fa5d908223379e909148423ba327ae2/recipes/omni-kill"; @@ -25006,12 +25300,12 @@ omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "omni-log"; - version = "0.3.3"; + version = "0.3.6"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-log.el"; - rev = "e86c80065030306645e28badcb0c25c549560106"; - sha256 = "10nsl45z3a1mvagffcsqj501x8wk3avmsncyn9laq3k4z1hjgdz5"; + rev = "20021eb788cbeec0371145468430b259686f519d"; + sha256 = "1sf2zbhjaz5b9xmz6632338cga7d326ibgw8b8c6c6b4vk16yhqc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/47bb19bb7b4713c3fd82c1035a2fe66588c069e3/recipes/omni-log"; @@ -25048,12 +25342,12 @@ omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omni-scratch"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "AdrieanKhisbe"; repo = "omni-scratch.el"; - rev = "0da549c1386f93ed4de201bf8779ba64ddc91347"; - sha256 = "0qfi54z2jqrkrdzriandwc9myzc27sxsx7nf20jf5qvcdgn13cl1"; + rev = "e73d4c3f9e0d4774261496d018cf944a254e06f5"; + sha256 = "0rmpnqb16v0hxfhw4lq2d27vhfhqv1mh8whq2l718l8c280yfn6k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ba3e128a7fe4476d82266506b18ba9984c37944/recipes/omni-scratch"; @@ -25094,8 +25388,8 @@ src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "b425270bed93b427ff519d6f51ad1d97531a0a92"; - sha256 = "0l9dk9idfsr21q0icx9fpgqyi4qlhnqal6sypak5zh8dgchrqif9"; + rev = "40b6251a96057c80a958362a0886c06eea5bfd62"; + sha256 = "176qfjd0qfgypj7pyi2p7v6zn7sic86gcgxz056k4y2akm6aa2p6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e327c483be04de32638b420c5b4e043d12a2cd01/recipes/omnisharp"; @@ -25290,12 +25584,12 @@ org-autolist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-autolist"; - version = "0.13"; + version = "0.14"; src = fetchFromGitHub { owner = "calvinwyoung"; repo = "org-autolist"; - rev = "da332fadcd9be4c5eb21c5e98c392b89743750b2"; - sha256 = "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani"; + rev = "c82d1e83e982b5f0c106b8800e5b0cfd5f73fdc1"; + sha256 = "0ykiafbdjb2iy0s1gr6l51gddjbk08iwj4v13hgm8b675bl0cw56"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca8e2cdb282674b20881bf6b4fc49af42a5d09a7/recipes/org-autolist"; @@ -25647,12 +25941,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "d9b5512994c54ebcbc0dcccbf1c779fbb8a89d3d"; - sha256 = "0s1b6lgr841iifznbwqn8r0chbfd0vph5v8n6cc0grak8n6nqgxr"; + rev = "cda1980b013afabd299e7a2294517897f6442d98"; + sha256 = "1y6idbp74vrr3g0r10n09znky8ih94kzf5fyil47sjkqyzzmpk3s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -25707,35 +26001,15 @@ license = lib.licenses.free; }; }) {}; - org-mac-iCal = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "org-mac-iCal"; - version = "7.9.3.5"; - src = fetchgit { - url = "git://orgmode.org/org-mode.git"; - rev = "592dc2ee7e4c80b9b61efb77117c8dc22d6cefd1"; - sha256 = "0rvsn085r1sgvv0gwvjlfgn7371bjd254hdzamc97m122pqr7cxr"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; - sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw"; - name = "org-mac-iCal"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/org-mac-iCal"; - license = lib.licenses.free; - }; - }) {}; org-mime = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "0.0.7"; + version = "0.0.9"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "dd1b9881af705b9e78f79791c9f933cabe59c125"; - sha256 = "0ndyqz2hpvnx6kykjz4d8nmngdjfavlwchl2dasi6m98b585liqa"; + rev = "62791db188fa6a9a6b4e53c5c29fb4fa46582b98"; + sha256 = "1l1fyyyyyi8nj4vpkyhpvz1yyqa2vn7042kp9443kqcswdfc9660"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -26139,12 +26413,12 @@ org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-tfl"; - version = "0.3.4"; + version = "0.4.0"; src = fetchFromGitHub { owner = "storax"; repo = "org-tfl"; - rev = "f0405e3ad62b90ea43489bdd6312adbd77edb9f3"; - sha256 = "0cznw60ivaz42ass35sf9i62x7mf9in6z8kr8wc5i1mb7hafy2hk"; + rev = "f0d7d39106a1de5457f5160cddd98ab892b61066"; + sha256 = "1rwdibiq0w4nzccmvdkpwnmfga70y35lfg2xlkqxd02x7bfl7j3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9e97f2fee577c7e3fb42e4ca9d4f422c8907faf/recipes/org-tfl"; @@ -26307,12 +26581,12 @@ org-vcard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-vcard"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "flexibeast"; repo = "org-vcard"; - rev = "5c4e17c166fb0406d5dfdc8876b0e182ba7af8fd"; - sha256 = "1qf4pqsg12y1qx7di0y5dp0f4slyp69h2q6y21hldzknhwxx4yy4"; + rev = "a6ab82ab28fa78f7c985d3ea9c9fafdd17f7ea8b"; + sha256 = "14l3xqahqmnfl3sskqcr33xpcsic8dm9cr9wmbv5la3xv14n10k7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/df860814a09c376c9a6a2c5e7f528bbae29810b2/recipes/org-vcard"; @@ -26367,6 +26641,36 @@ license = lib.licenses.free; }; }) {}; + org2web = callPackage ({ cl-lib ? null, dash, el2org, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: + melpaBuild { + pname = "org2web"; + version = "0.9.1"; + src = fetchFromGitHub { + owner = "tumashu"; + repo = "org2web"; + rev = "5243b399927a4c474bb3b8d1c8a00799df1f27d7"; + sha256 = "0wsvfn409a2ivbich8b8zqza78sprirg4bl7igx536ydqclmi0n7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2864959163442165b9b1cd5471dc2649508decde/recipes/org2web"; + sha256 = "0lcqf0pgkd7jilasw1485fy45k269jxvyl7hl7qrcs94s6fy2vaf"; + name = "org2web"; + }; + packageRequires = [ + cl-lib + dash + el2org + ht + htmlize + mustache + org + simple-httpd + ]; + meta = { + homepage = "https://melpa.org/#/org2web"; + license = lib.licenses.free; + }; + }) {}; orgbox = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "orgbox"; @@ -26706,12 +27010,12 @@ ox-epub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-epub"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "ofosos"; repo = "ox-epub"; - rev = "113300ed2c66cca10624e6d7bf5ff0a72e05653a"; - sha256 = "1xj643jybrd6idn6bazp0canj8pm9v3gs199fa17hlag7151ancw"; + rev = "022406066891d7a0f1fe8e2f1ddd7741dcf0accb"; + sha256 = "1yybx9psjydbrrbdp7fpp4pih8jxflvl3wz9k489hvp6p0nffapp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3ac31dfef00e83fa6b716ea006f35afb5dc6cd5/recipes/ox-epub"; @@ -26724,15 +27028,36 @@ license = lib.licenses.free; }; }) {}; + ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ox-gfm"; + version = "1.0"; + src = fetchFromGitHub { + owner = "larstvei"; + repo = "ox-gfm"; + rev = "99f93011b069e02b37c9660b8fcb45dab086a07f"; + sha256 = "0drdypmgxk3238hmkqw9s3cw9wv94cyfqar5ar0bv0k69s92pxj8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm"; + sha256 = "065ngmzfd3g2h8n903hc4d363hz4z5rrdgizh2xpz03kf3plca6q"; + name = "ox-gfm"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ox-gfm"; + license = lib.licenses.free; + }; + }) {}; ox-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-hugo"; - version = "0.1.2"; + version = "0.2.1"; src = fetchFromGitHub { owner = "kaushalmodi"; repo = "ox-hugo"; - rev = "a486141e4e2c3f9f67e799e20af150611d77f850"; - sha256 = "1srrkc0bajmhp614avk4yr51zsp0gnmn47r1wi7qxkr6ybxwx8k1"; + rev = "a0a1bb95d12fd45e3e111d29fd49b8171db1109b"; + sha256 = "00pn5adk6qw4lpfsw1lxhp0466q3sndgqgrh4y821lbxssx89lh7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e1240bb7b5bb8773f804b987901566a20e3e8a9/recipes/ox-hugo"; @@ -27060,27 +27385,6 @@ license = lib.licenses.free; }; }) {}; - paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, hexrgb, lib, melpaBuild }: - melpaBuild { - pname = "paper-theme"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "cadadr"; - repo = "paper-theme"; - rev = "15af5e31492f79dc0d47787150ef39d6318a2608"; - sha256 = "1xh614czldjvfl66vhkyaai5k4qsg1l3mz6wd5b1w6kd45qrc54i"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a35a0888a7a27174b5de58d99b01554769041f46/recipes/paper-theme"; - sha256 = "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50"; - name = "paper-theme"; - }; - packageRequires = [ emacs hexrgb ]; - meta = { - homepage = "https://melpa.org/#/paper-theme"; - license = lib.licenses.free; - }; - }) {}; paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }: melpaBuild { pname = "paradox"; @@ -27310,18 +27614,19 @@ license = lib.licenses.free; }; }) {}; - password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s }: + password-store = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "password-store"; version = "1.7.1"; - src = fetchgit { - url = "https://git.zx2c4.com/password-store"; + src = fetchFromGitHub { + owner = "zx2c4"; + repo = "password-store"; rev = "38ec1c72e29c872ec0cdde82f75490640d4019bf"; sha256 = "04rqph353qfhnrwji6fmvrbk4yag8brqpbpaysq5z0c9l4p9ci87"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ceff76206bd44d92c00adc931236c4ae15db5583/recipes/password-store"; - sha256 = "06l4xlvrjswy5kndn6h6swliqcp007nh4fyvma3jaac4f3x2qi65"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/207f8ec84572176749d328cb2bbc4e87c36f202c/recipes/password-store"; + sha256 = "03r8j14l12yc42b51fzvn1jh8j85nyl1rg6c80r0a7ihwkj27jv6"; name = "password-store"; }; packageRequires = [ f s ]; @@ -27333,12 +27638,12 @@ password-store-otp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, s }: melpaBuild { pname = "password-store-otp"; - version = "0.1.3"; + version = "0.1.5"; src = fetchFromGitHub { owner = "volrath"; repo = "password-store-otp.el"; - rev = "2965da7d8edd32bd4ef62f487ea6bcd08c599c89"; - sha256 = "1svm6rlh4f0rjcl0fjy3x4bfakdn9npi8w7ak217ad2k08j44bzd"; + rev = "a39a64a91de36e87b852339635bd3c5fb0e32441"; + sha256 = "0gb48blvnn6ci2wl45z81p41ny7vbgl610hqy6b2hyr2171qjd60"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc89d02554a6ff150ad42634879073892f3e88be/recipes/password-store-otp"; @@ -27772,12 +28077,12 @@ pfuture = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pfuture"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "pfuture"; - rev = "a6c32c69abdb9b91baf8036b88cc4f477f611bd5"; - sha256 = "0ly38dzg754n4s2xs09kaisxs14ikm42d9sjhw9p9xirzqm7zd5j"; + rev = "8b5cd8dfb8769d2b24484a313d3d21938afd3dfb"; + sha256 = "1d63sfwy7qmldhq2xda9dglg91cy2kpjdr2rlmqb48w95wf0am3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8/recipes/pfuture"; @@ -28945,12 +29250,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "80a37e0782d2d702d52234b62dd4b9ec74fd2c95"; - sha256 = "0385j54kgr71h0cxh5vqr81qs57ack2g2k9mcdbq188v4ckjacyx"; + rev = "b04e5cba356212e4e8c66c61bbe0c3a20537c5b9"; + sha256 = "1lzxmbqlnmi34kymnf399azv86gmdbrf71xiad6wc24bzpkzqybb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -29323,12 +29628,12 @@ pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }: melpaBuild { pname = "pyim"; - version = "1.6.1"; + version = "1.6.4"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim"; - rev = "f4dacfbac11d6d58f1fcbf766691e03b6983a9f6"; - sha256 = "0dy0y159fqcip805l86gmjbsgbcvj3hm5rfsc6slinmxsrl4nl9l"; + rev = "d44db4cb74c1c0cf6f814ff14d0be8e733f8404a"; + sha256 = "02b2aknx127xvl8amf74krvd7z33kyr049iw5h0665zkzsli4g8w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; @@ -29344,7 +29649,7 @@ pyim-basedict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pyim-basedict"; - version = "0.2"; + version = "0.3.1"; src = fetchFromGitHub { owner = "tumashu"; repo = "pyim-basedict"; @@ -29911,12 +30216,12 @@ rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rdf-prefix"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "simenheg"; repo = "rdf-prefix"; - rev = "35129521d5b6035e5dd75d5b3481ce4971f46034"; - sha256 = "1iy9385n8a2b7ph4wdf8p92n81slirsxxckrc3khbk5zrpp62z5k"; + rev = "25cc3c8902f16191496b549705b00ffc7dff51f1"; + sha256 = "00ycsqzgn5rq8r4r86z1j43i2a7wj4r3c2vcggdaizyf4parmgmy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix"; @@ -30625,12 +30930,12 @@ rjsx-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "rjsx-mode"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "felipeochoa"; repo = "rjsx-mode"; - rev = "4a24c86a1873289538134fe431e544fa3e12e788"; - sha256 = "0yv622nnbcjnnaki49f7cz8cvrg13d0h9higadp83bl1lczhgw8j"; + rev = "79bedb1d188e209be5cfef3bea8906df9c509ab8"; + sha256 = "1dh76r9hy1d1f9xhdywslgv0w3c9nhsbwvpd8icgp300x5c6a3zh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b83be7efdef2457e1320fe3dec46484fbd20263c/recipes/rjsx-mode"; @@ -31066,12 +31371,12 @@ s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "s"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "magnars"; repo = "s.el"; - rev = "a56f0d0fedf9754e1728067ac868100f2499357d"; - sha256 = "08vf62fcrnbmf2ppb759kzznjdz8x72fqdwbc4n8nbswrwgm2ikl"; + rev = "12f116d58ac03706496bd682c6449b452681874e"; + sha256 = "1g8mqd13llj007al4nlxxx4z2lcsg3wk970mgjn0avwrhjjgdmmv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/s"; @@ -31231,22 +31536,22 @@ license = lib.licenses.free; }; }) {}; - sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + sbt-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "217d56bc2ec93a77a9e644233f4fb1815e437c61"; - sha256 = "1lvf7y1n63p8jvnp6ppwmxq2s6h9sk45319576f3s28ixsfa6cp2"; + rev = "bdf31a1ffe637d1445b149804d5f5cc29333a1bd"; + sha256 = "0ygp0c2hy4zp5x0ghplxf2fhrf16cn37sk2zf6i43zqz6gydzq8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8"; name = "sbt-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/sbt-mode"; license = lib.licenses.free; @@ -31255,7 +31560,7 @@ scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scala-mode"; - version = "0.23"; + version = "1.0.0"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; @@ -31946,12 +32251,12 @@ shx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shx"; - version = "0.0.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "riscy"; repo = "shx-for-emacs"; - rev = "8166b02ebbab43d8a33d47b8221a94b69fc63487"; - sha256 = "0n97iys2xyg1lzkn8bqsx0sgqpzci1pxg69v42cpzmyrz3h54bwp"; + rev = "e53d798ba4a4c07a3ee1c194840c937b18c02087"; + sha256 = "0sig9gpa2wn23skwny9jpvwxax0gbwp143anvgkc5gm87iw2jgrd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a2ff78ae3c4289ebf9e06cdfd8f8082c395a16f/recipes/shx"; @@ -32699,22 +33004,22 @@ license = lib.licenses.free; }; }) {}; - snoopy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + snoopy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "snoopy"; - version = "0.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "anmonteiro"; repo = "snoopy-mode"; - rev = "8d2b7b1354414f261b237f2fed0d472803ba3909"; - sha256 = "05q407dg6jppmqdxpp1ba8xs6yjilsa74hga46dbhcc9nzj9850a"; + rev = "ec4123bdebfe0bb7bf4feaac2dc02b59caffe386"; + sha256 = "01l44lshw0zvykay9886s1vqryanagkd4ciw3ramchn0baqz11vl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a882cd92964ac195a09469006c9a44dc202f000/recipes/snoopy"; sha256 = "1wa8jykqyj6rxqfhwbiyli6yh8s7n0pqv7fc9sfaymarda93zbgi"; name = "snoopy"; }; - packageRequires = [ emacs ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/snoopy"; license = lib.licenses.free; @@ -32807,12 +33112,12 @@ sotclojure = callPackage ({ cider, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sotlisp }: melpaBuild { pname = "sotclojure"; - version = "1.2"; + version = "1.3.1"; src = fetchFromGitHub { owner = "Malabarba"; repo = "speed-of-thought-clojure"; - rev = "8d879ef41c004726cca3c27a81b7543cc273c19b"; - sha256 = "13yn2yadkpmykaly3l3xsq1bhm4sxyk8k1px555y11qi0mfdcjhh"; + rev = "ceac82aa691e8d98946471be6aaff9c9a4603c32"; + sha256 = "1a6riq7ksk5m76dsgc75d8b992nyr50l48l8cpms9064m6b0r9jv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2ccef8af91eada4449d9cd4bda6bd28272722e/recipes/sotclojure"; @@ -33562,12 +33867,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "5cb70e500df430cb9ffc8ae0ab67976c1d7d226f"; - sha256 = "1001z5zaj4ln05js08cz13lgc11dqxc6sgp1s35g19sfhip4xyim"; + rev = "05beef9ecf94107d72d0070fa092a8392505b012"; + sha256 = "008d9kk8vb90n8j5dvw1rslfny66q012022na03dzbnmq3f73k7a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -33706,22 +34011,22 @@ license = lib.licenses.free; }; }) {}; - swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "swift-mode"; - version = "2.4.0"; + version = "3.0"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "50394e4ffa80cb395ddd3c3128f995644820e2bc"; - sha256 = "1dwrfbdfgndvv2rv4vl4vr82lzbkvk46z5fxbngd66yrx21rav24"; + rev = "e8d9a5d7af59e8be25997b8b048d7c3e257cd0b0"; + sha256 = "035478shf1crb1qnhk5rmz08xgn0z2p6fsw0yii1a4q5f3h85xrc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d"; name = "swift-mode"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs seq ]; meta = { homepage = "https://melpa.org/#/swift-mode"; license = lib.licenses.free; @@ -34002,12 +34307,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "4c1b2befd0c853dcc7bca52d9b084933c3a08254"; - sha256 = "1sdrga3mmajai2jcf4zpcii0l2b9wch8rhdsbjlzx76ia5snp23l"; + rev = "1e7567a9973bf80cab0d7e0355656a84bee7ca96"; + sha256 = "0ylgnvpfindg4cxccbqy02ic7p0i9rygf1w16dm1filwhbqvjplq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -34653,12 +34958,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: melpaBuild { pname = "tide"; - version = "2.5.2"; + version = "2.5.3"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "f1daf10e931858ac8d6ff676cf02ca73d3c62558"; - sha256 = "1hj5mfpkfczy09ghmivkkzwmn6nawwv0ydm4ckz4mggps42hn0j1"; + rev = "e5d1d3852aaf63cbfb0abaec1792a62bed024a72"; + sha256 = "1kwssyzbjwl2vyll0p49l57z41yv6k1jnzbsdnh0d1h81nixg5wk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -34799,12 +35104,12 @@ tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tracking"; - version = "2.5"; + version = "2.6"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "13c605e639194c3da0c2e685056fac685f8c76a0"; - sha256 = "0n7v0g332ml1ang2fjc8rjbi8h1f4bqazcqi8dlfn99vvv8kcd21"; + rev = "59f1096238e6c30303a6fe9fc1c635f49e5946c6"; + sha256 = "19h3983zy3f15cgs86irvbdzz55qyjm48qd7gjlzcxplr7vnnh0j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -34820,12 +35125,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "0.11.1"; + version = "0.12"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "d465378a59e2eb91372564a56e60a9ab00e48f9c"; - sha256 = "0al0xz59lrqj97fxmyxiphblg1bvbzahc6srd8klg7s0378ybblw"; + rev = "0de5a5fa2438890ae9c2ca61999042ab175df3e9"; + sha256 = "1wqlbbm71s1hvglsdp1qs7nvj6gnkjkai4rr8hhp1lliiyd5vmia"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -34859,22 +35164,22 @@ license = lib.licenses.free; }; }) {}; - treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pfuture, s }: + treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: melpaBuild { pname = "treemacs"; - version = "1.10"; + version = "1.11.5"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "19723297eefdc9d3afef546f1839c88acfbeef9c"; - sha256 = "117644jkyfi0p050hqpy6x4rk85jxnnnldmslzvvr7yprpc04hbw"; + rev = "aa1dabcf28f2b145376141c5a39376eaaf70ad6a"; + sha256 = "1r8fk1y68wscisxi8miia7wbz7agrn3n8gkk5kn8d1b8sk6hxpcs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/486f21e99856a77f470d246f3c71cd32d2e61ad6/recipes/treemacs"; sha256 = "07npjnhn9a0b537h1wmvy57bmicd2cji7bslp4wbnrfmmg2jdc3a"; name = "treemacs"; }; - packageRequires = [ ace-window cl-lib dash emacs f pfuture s ]; + packageRequires = [ ace-window cl-lib dash emacs f hydra pfuture s ]; meta = { homepage = "https://melpa.org/#/treemacs"; license = lib.licenses.free; @@ -34883,12 +35188,12 @@ treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: melpaBuild { pname = "treemacs-evil"; - version = "1.10"; + version = "1.11.5"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "19723297eefdc9d3afef546f1839c88acfbeef9c"; - sha256 = "117644jkyfi0p050hqpy6x4rk85jxnnnldmslzvvr7yprpc04hbw"; + rev = "aa1dabcf28f2b145376141c5a39376eaaf70ad6a"; + sha256 = "1r8fk1y68wscisxi8miia7wbz7agrn3n8gkk5kn8d1b8sk6hxpcs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a52c2770097fe8968bff7c31ac411b3d9b60972e/recipes/treemacs-evil"; @@ -34904,12 +35209,12 @@ treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }: melpaBuild { pname = "treemacs-projectile"; - version = "1.10"; + version = "1.11.5"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "treemacs"; - rev = "19723297eefdc9d3afef546f1839c88acfbeef9c"; - sha256 = "117644jkyfi0p050hqpy6x4rk85jxnnnldmslzvvr7yprpc04hbw"; + rev = "aa1dabcf28f2b145376141c5a39376eaaf70ad6a"; + sha256 = "1r8fk1y68wscisxi8miia7wbz7agrn3n8gkk5kn8d1b8sk6hxpcs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b694918c94e6311745776d451aa2519924beef2d/recipes/treemacs-projectile"; @@ -35771,12 +36076,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "5.6"; + version = "5.7"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "c08343904835cbae12f48e0758b0a6a014d76a74"; - sha256 = "1skh9p5s9nbl6jvljj9bfn19fdzjx8lvx1q6rzldld07xwaif4qb"; + rev = "40d5e1020b1a2b6e8ff04cbd8c84bf7959e4e7af"; + sha256 = "1ndrvwjgfjnmaw71y4452ck9aqlwnpxa7379ldsn7gfl0r67qhsi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -35999,6 +36304,27 @@ license = lib.licenses.free; }; }) {}; + vue-mode = callPackage ({ edit-indirect, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, ssass-mode, vue-html-mode }: + melpaBuild { + pname = "vue-mode"; + version = "0.3.1"; + src = fetchFromGitHub { + owner = "CodeFalling"; + repo = "vue-mode"; + rev = "fe501dba780025066dcdcd2055e772d06c2abdbc"; + sha256 = "0k67kzrh2fjhjiqcy1yq5cmcwjpx85yd2xxvkqvv4791q58f7c4z"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; + sha256 = "0gy7a5sliaijq0666l55vbkg15anrw7k1828szdn1ppkraw14bn0"; + name = "vue-mode"; + }; + packageRequires = [ edit-indirect mmm-mode ssass-mode vue-html-mode ]; + meta = { + homepage = "https://melpa.org/#/vue-mode"; + license = lib.licenses.free; + }; + }) {}; w32-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "w32-browser"; @@ -36737,11 +37063,11 @@ wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wisp-mode"; - version = "0.9.2"; + version = "0.9.6"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "7ce954278aef"; - sha256 = "116cspnc4lhf6gk73yr9sy7013jp88vq5zayghzgnkbdlaw6zmz3"; + rev = "4d41c0814bbc"; + sha256 = "1xy9a27qdl7hm7x2gbhxql63paxi16441rczl2i8ps032l4ffdnj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -36778,12 +37104,12 @@ with-editor = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "241726118dee067a8d9880d53c6a781d580ba8a1"; - sha256 = "0q06qfir64nib604f23gdmbzl23mcsnysfd0x36cx9nwik95wl0x"; + rev = "99d3278b1c79718de16dd4f57dcc8c4aa31a4051"; + sha256 = "1mcfinr1wv87hqn2787dcyn7lkgfni4xfgsji50pwj3zfgg0yqyr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -37090,6 +37416,27 @@ license = lib.licenses.free; }; }) {}; + xcode-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "xcode-project"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "nhojb"; + repo = "xcode-project"; + rev = "f5548a26a1afc0b0d873556c25f6d8b6b9c2aa8c"; + sha256 = "0xb1cvjaw7zjnw6c5aq315vvlc3cncris62jis44jb8s5r8gxcrv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/49b866ebf7e707bc74525f83dd5038e6e860fcef/recipes/xcode-project"; + sha256 = "0igp30f6ypmp4l8zmdfpa5bza4avm7mq2gj8v7b3ii655v91n6vi"; + name = "xcode-project"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/xcode-project"; + license = lib.licenses.free; + }; + }) {}; xcscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xcscope"; @@ -37468,6 +37815,25 @@ license = lib.licenses.free; }; }) {}; + yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { + pname = "yatex"; + version = "1.80"; + src = fetchhg { + url = "https://www.yatex.org/hgrepos/yatex/"; + rev = "ca7cf34e959c"; + sha256 = "19pczpzl0wvkdassskcssq5qrpica0bffqxxi8sqp1j35px6v4ma"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e28710244a1bef8f56156fe1c271520896a9c694/recipes/yatex"; + sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6"; + name = "yatex"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/yatex"; + license = lib.licenses.free; + }; + }) {}; yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaxception"; @@ -37709,6 +38075,27 @@ license = lib.licenses.free; }; }) {}; + zoom = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "zoom"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "cyrus-and"; + repo = "zoom"; + rev = "ed8aca43820678ff6e7b8ed697cba8dbb3a6136e"; + sha256 = "1na1syvbayqwbsvd1d0ajyzjvhg8q3s3mqrx82ffcbxr0ijyzzj8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3fe094c99756ad29eda9bc51f31bb70c4ddc4131/recipes/zoom"; + sha256 = "09bk0nnfj72an2b3rravd6qp21gdgcm1m55qnf2r8rzbgqymq5ls"; + name = "zoom"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/zoom"; + license = lib.licenses.free; + }; + }) {}; zoom-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoom-window"; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index a1cb0b7d4edc..1dd0f37b4687 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20170911"; + version = "20171009"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20170911.tar"; - sha256 = "16d69g1qnfcj7d2q9ni5dz5wh9pid9mzhwyfg4z93s9xizzlnw64"; + url = "http://orgmode.org/elpa/org-20171009.tar"; + sha256 = "1v8y4gmfrnzsdy9mspqzn157da7lb7z2wvp95r1iywf64325gv5s"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20170911"; + version = "20171009"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20170911.tar"; - sha256 = "0bgrsccar4v9viq99w2h4rjavql14zgdwkwaa1bprga3af78jr82"; + url = "http://orgmode.org/elpa/org-plus-contrib-20171009.tar"; + sha256 = "0iv1f7hbqh46mymk097x69q00pqpbkcyzjfd9a9slf5xkw1g1lk1"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 65721361cd6b..b18b27d9c2cc 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -219,12 +219,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2017.2.2"; /* updated by script */ + version = "2017.2.3"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "1rnncii7z44186jv9xl3ax179ws9wfwd6yndyf9pvnpcd4jcs6d0"; /* updated by script */ + sha256 = "02hyndyfcrvfbi4q8vmmj0xh2bggwc2azggm24g3m03iffa7j6fx"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -245,12 +245,12 @@ in gogland = buildGogland rec { name = "gogland-${version}"; - version = "172.3968.45"; /* updated by script */ + version = "173.2696.28"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0nk9g28l414yp5ldyx1yl38qpp9s1pxkfxfwmw9yvlff3bi0kkyw"; /* updated by script */ + sha256 = "07nz2pf7fnjxsvc82vihk2i880cji349czxzshr1dk50ixlydq7n"; /* updated by script */ }; wmClass = "jetbrains-gogland"; update-channel = "gogland_1.0_EAP"; @@ -258,12 +258,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2017.2.4"; /* updated by script */ + version = "2017.2.5"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "179nqzgbb76pyr48faca6k69v32m5kvx66i2apih95g54sd1xgva"; /* updated by script */ + sha256 = "01p63wsy60icy4673ci435rmzpjfkyz7a8w413vw45i2bm76skhr"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IDEA_Release"; @@ -271,12 +271,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2017.2.4"; /* updated by script */ + version = "2017.2.5"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "1qwqk1r42llh8py0w2iq4w1ks3ipzsxkbdz0zkrd1572zngpk90m"; /* updated by script */ + sha256 = "0pp49nck1cad6pz81bd95v4v55vmnvj7cbdzybmldglka1afqjb6"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IDEA_Release"; @@ -323,12 +323,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2017.1.1"; /* updated by script */ + version = "2017.1.2"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/resharper/JetBrains.Rider-${version}.tar.gz"; - sha256 = "1h6p847izddard3227ifg3q5klwvdfixir63i6adkd2fvsqn5935"; /* updated by script */ + sha256 = "0kphjxibrs4ss6hpxbssvs3n35xh9zzw7a1q09x79ibvvk73gwqh"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "rider_2017_1"; diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 02b8d991eae9..b5b2a49c42b6 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.17.0"; + version = "1.17.1"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "1s6nkzdsgfn5x7y91bwb6d7sw4b8s335myc0yhbsfpfks5pgi331"; - "x86_64-linux" = "1av7xcb2sig5p344y2v1zjspg5nl9bds03r1yvgssm7mcy9l1gqk"; - "x86_64-darwin" = "1fn9i5vs4b6xir51zavx7i8m68bwqa1hfr03aagy8byg9v8w5dx8"; + "i686-linux" = "09nvibfn2z5cxjcdxqa2xy63jqwpvfgk7hdy1pc0mnpszz6kn4v7"; + "x86_64-linux" = "1fb3hil7dggnz7hks1i806ckd3wl5g0a2syjdbh9dx5iqarp2782"; + "x86_64-darwin" = "1vgbsmbcsdxc0h0ny61a3rhbwxzrfzkxl47sy3w410xcqlv8ad2v"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index f1b992bea1a0..f68162de4e3e 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.20"; + version = "2.21"; src = fetchurl { url = "https://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "02vhdv16nf4kjna4inpbfy4k3p40bhl7xpc4kh4xvily14146l2b"; + sha256 = "0azgpr4al2pi4858z4xh4lfz84cvzxw3n426fn7rz6cdj34q212j"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index 3d4e8c592abb..a8b4973203d1 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -11,21 +11,13 @@ let ]; in stdenv.mkDerivation rec { - name = "shutter-0.93.1"; + name = "shutter-0.94"; src = fetchurl { - url = "http://shutter-project.org/wp-content/uploads/releases/tars/${name}.tar.gz"; - sha256 = "09cn3scwy98wqxkrjhnmxhpfnnynlbb41856yn5m3zwzqrxiyvak"; + url = "https://launchpad.net/shutter/0.9x/0.94/+download/shutter-0.94.tar.gz"; + sha256 = "943152cdf9e1b2096d38e3da9622d8bf97956a08eda747c3e7fcc564a3f0f40d"; }; - patches = [ - (fetchpatch { - url = "http://svnweb.mageia.org/packages/cauldron/shutter/current/SOURCES/CVE-2015-0854.patch?revision=880308&view=co"; - name = "CVE-2015-0854.patch"; - sha256 = "14r18sxz3ylf39cn9b85snjhjxdk6ngq4vnpljwghw2q5430nb12"; - }) - ]; - buildInputs = [ perl makeWrapper gdk_pixbuf librsvg ] ++ perlModules; installPhase = '' diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 7b30c467b199..43d6229ab2bc 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/share/applications/solvespace.desktop \ - --replace /usr/bin/ $out/bin/ \ + --replace /usr/bin/ $out/bin/ ''; meta = { diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix new file mode 100644 index 000000000000..5fdb8985bbbb --- /dev/null +++ b/pkgs/applications/misc/gummi/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, pkgs, makeWrapper +, glib, gnome2, gnome3, gtk2-x11, gtkspell2, poppler +, pkgconfig, intltool, autoreconfHook, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + version = "0.6.6"; + name = "gummi-${version}"; + + src = pkgs.fetchFromGitHub { + owner = "alexandervdm"; + repo = "gummi"; + rev = "${version}"; + sha256 = "1vw8rhv8qj82l6l22kpysgm9mxilnki2kjmvxsnajbqcagr6s7cn"; + }; + + nativeBuildInputs = [ + pkgconfig intltool autoreconfHook makeWrapper wrapGAppsHook + ]; + buildInputs = [ + glib gnome2.gtksourceview gnome2.pango gtk2-x11 gtkspell2 poppler + gnome3.defaultIconTheme + ]; + + preConfigure = '' + gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${pkgs.gnome2.gtksourceview}/share") + ''; + + postInstall = '' + install -Dpm644 COPYING $out/share/licenses/$name/COPYING + ''; + + meta = { + homepage = http://gummi.midnightcoding.org/; + description = "Simple LaTex editor for GTK users"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ flokli ]; + platforms = with stdenv.lib.platforms; linux; + inherit version; + }; +} diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index 0d8db33bc178..a95dd6adbce6 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -5,6 +5,7 @@ , kcmutils , kconfigwidgets , kdbusaddons +, kdoctools , kiconthemes , ki18n , knotifications @@ -15,34 +16,29 @@ }: stdenv.mkDerivation rec { - name = "kdeconnect-${version}"; - version = "1.0.3"; + pname = "kdeconnect"; + version = "1.2"; + name = "${pname}-${version}"; src = fetchurl { - url = "http://download.kde.org/stable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz"; - sha256 = "0b40402adw7cqz19fh8zw70f6l7b5p400mw668n3wic4favn27r2"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-kde-${version}.tar.xz"; + sha256 = "0w3rdldnr6md70r4ch255vk712d37vy63ml7ly2fhr4cfnk2i1ay"; }; buildInputs = [ - kcmutils - kconfigwidgets - kdbusaddons - qca-qt5 - ki18n - kiconthemes - knotifications - libfakekey - libXtst - qtx11extras + libfakekey libXtst + ki18n kiconthemes kcmutils kconfigwidgets kdbusaddons knotifications + qca-qt5 qtx11extras ]; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - meta = { + enableParallelBuilding = true; + + meta = with lib; { description = "KDE Connect provides several features to integrate your phone and your computer"; - license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ fridh ]; - homepage = https://community.kde.org/KDEConnect; + homepage = https://community.kde.org/KDEConnect; + license = with licenses; [ gpl2 ]; + maintainers = with maintainers; [ fridh ]; }; - } diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 787f97ac1b11..fc702f249de4 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop_file_utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "0.7.97"; + version = "0.7.99"; name = "mediainfo-gui-${version}"; src = fetchurl { - url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "10hp23a9hdlqvrhskssd9g15f4n55yq48cmbpjwdqwzfrblj598n"; + url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; + sha256 = "127d6wsrq3wg3ibbb28m26wrm54qbkv8h8xycanvml6ys4zqsc6a"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files. ''; - homepage = http://mediaarea.net/; + homepage = https://mediaarea.net/; license = licenses.bsd2; platforms = platforms.linux; maintainers = [ maintainers.devhell ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 38888b0ebdc6..84fef1b39832 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "0.7.97"; + version = "0.7.99"; name = "mediainfo-${version}"; src = fetchurl { - url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "10hp23a9hdlqvrhskssd9g15f4n55yq48cmbpjwdqwzfrblj598n"; + url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; + sha256 = "127d6wsrq3wg3ibbb28m26wrm54qbkv8h8xycanvml6ys4zqsc6a"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files. ''; - homepage = http://mediaarea.net/; + homepage = https://mediaarea.net/; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.devhell ]; diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 15313befb628..889f516f00b7 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -1,23 +1,32 @@ -{ stdenv, fetchurl, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }: +{ stdenv, fetchurl, fetchpatch, postgresql, wxGTK, libxml2, libxslt, openssl, zlib, makeDesktopItem }: stdenv.mkDerivation rec { name = "pgadmin3-${version}"; - version = "1.22.1"; + version = "1.22.2"; src = fetchurl { - url = "http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmin3-${version}.tar.gz"; - sha256 = "0gkqpj8cg6jd6yhssrij1cbh960rg9fkjbdzcpryi6axwv0ag7ki"; + url = "http://ftp.postgresql.org/pub/pgadmin/pgadmin3/v${version}/src/pgadmin3-${version}.tar.gz"; + sha256 = "1b24b356h8z188nci30xrb57l7kxjqjnh6dq9ws638phsgiv0s4v"; }; enableParallelBuilding = true; buildInputs = [ postgresql wxGTK openssl zlib ]; + patches = [ + (fetchpatch { + sha256 = "09hp7s3zjz80rpx2j3xyznwswwfxzi70z7c05dzrdk74mqjjpkfk"; + name = "843344.patch"; + url = "https://sources.debian.net/data/main/p/pgadmin3/1.22.2-1/debian/patches/843344"; + }) + ]; + preConfigure = '' substituteInPlace pgadmin/ver_svn.sh --replace "bin/bash" "$shell" ''; configureFlags = [ + "--with-pgsql=${postgresql}" "--with-libxml2=${libxml2.dev}" "--with-libxslt=${libxslt.dev}" ]; diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index c5f4095e59a0..1e8320d75a3c 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git , cairo, glib, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification +, bison, flex, librsvg, check }: stdenv.mkDerivation rec { - version = "1.3.1"; + version = "1.4.1"; name = "rofi-${version}"; src = fetchurl { url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/${name}.tar.gz"; - sha256 = "09i3vd8k6zqphrm382fglsmxc4q6dg00xddzl96kakszgvdd4qfs"; + sha256 = "19x11s71q24gjdnsjf1ar6raq1drav7qp3nzjkw8qajpgvjrxwcn"; }; preConfigure = '' @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libxkbcommon pango cairo git + buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which ]; doCheck = true; diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix index 63d68bbbea4a..eebab6643a68 100644 --- a/pkgs/applications/misc/tnef/default.nix +++ b/pkgs/applications/misc/tnef/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { - version = "1.4.14"; + version = "1.4.15"; name = "tnef-${version}"; src = fetchFromGitHub { owner = "verdammelt"; repo = "tnef"; rev = version; - sha256 = "0p7yji5hqq7k4pcba1cnv4jkl0fkg7jd77c1q164wk0vwinpmsc2"; + sha256 = "0wm5ylppkjg518ldb9kzlx58a9l8z66gpz9ljalmyq6a77khd7pj"; }; doCheck = true; diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 84ecf18c5ae5..a3f6fb09f2b6 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -4,13 +4,13 @@ pythonPackages.buildPythonApplication rec { name = "udiskie-${version}"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "coldfix"; repo = "udiskie"; rev = version; - sha256 = "1dvfhf0d79al0vnrwdknfiy2297m3f7fgn7syr85p29hd6260jnv"; + sha256 = "12d0fc88wlbh5vvsijvy3cwk37wagmg8193n9zcipr1ivmcmhx15"; }; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 75f2dcda6a62..54fee5847e18 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -47,7 +47,7 @@ mkChromiumDerivation (base: rec { meta = { description = "An open source web browser from Google"; homepage = http://www.chromium.org/; - maintainers = with maintainers; [ chaoflow ]; + maintainers = with maintainers; [ chaoflow bendlas ]; license = licenses.bsd3; platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["x86_64-linux"] else []; diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 2bc818695306..24ab054e0a66 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,12 +94,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "27.0.0.130"; + version = "27.0.0.159"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "005sxx3ll18c6idy1db2gb47chd9c5mf83qac0vyvljsrlc7430c"; + sha256 = "00nbn8nv6irsak05cwlx9x8q0n91kbjxnkdg4c66ilx2gq5wrz05"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index f59cb402720d..31bc01ea14ad 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -16,6 +16,7 @@ , gstreamer , gtk2 , gtk3 +, kerberos , libX11 , libXScrnSaver , libxcb @@ -100,6 +101,7 @@ stdenv.mkDerivation { gstreamer gtk2 gtk3 + kerberos libX11 libXScrnSaver libXcomposite @@ -168,6 +170,7 @@ stdenv.mkDerivation { ''; passthru.ffmpegSupport = true; + passthru.gssSupport = true; passthru.updateScript = import ./update.nix { inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl; baseUrl = diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 6834a57c015e..6abdaac0bb74 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,955 +1,955 @@ { - version = "57.0b6"; + version = "57.0b8"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ach/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ach/firefox-57.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "32572bd7029c8123909c35c36d8790efec84b57ffe1607cdbe4b7f9ebf3d09d5b4e750d1c347094790647eddfc3ec20f083576033b2fe5ee147787247d316a1a"; + sha512 = "669b52b7784d7d02178ae2e3aef14fc4197705749ecb5eaff197ea71aae90b399811029da527964cc2f428707a29706bb0cc3911fc77db3c5001c994b1a2a770"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/af/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/af/firefox-57.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "edfda6b78cc45d7f78f59f23e074abc605a7776b27b89b7bd8d0c171eab9843716af28bdc81b53c993ea16d0e057611fdbc4c3fad7c2d6781ee1847e759057c8"; + sha512 = "d2b96148c787bef4db0f0f5c288ebfdcfbd24b43dfbb890b90fb2f490cb08096ee18f990e2e130d5ef78ad8965bd3e719eaaffb9263d7d94e3b6edfc6867e832"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/an/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/an/firefox-57.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "0a6b80080457500b2b0757491d74696eca3132123f146c17b75ceeb5478bf8ff6a4fbc6e397bd08424ca1df36b82f3b9903bd5f7d5b57d52cb82d9e19ecb8d78"; + sha512 = "db3f9b3470173b176ab2d91807dba82fdd938a00eb2a8cbfc27ad9fdae6d7ba5f5c6af11b5ad191168d958aa8972a1c2404a190d6a1b4d14e09cf9e366a64152"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ar/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ar/firefox-57.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "07001d159fb27773b16a8b8a38d9f6585b2304dfd9f02c9210b0dfabaebc8437ff7ecbe6d86d4f9065ebf67a89206ca870c339e0dcb70c1ee265660bfa060f08"; + sha512 = "a86f18c7fe63098b56ec160982438bfacc4a7f93ac27f17ff7a34b179419e0d4a98d180517d2f3af621e14567ecda01805b8dec9df4b35eeab137a73f681b56c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/as/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/as/firefox-57.0b8.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "caf3f545e2bccf5566d2b5913ace96ebd304951a1428790219b74d8fa4461fe8fcae97af30c60c6fddd4cea88f5ad65251db656774acb8bad730ccb75b2ee425"; + sha512 = "78471fa0e2a27101e919efa371be09175b3216174fe321c5258d6b2e02e35cb1b194da1700a7b4392fda6e66ba5034edf70f5b6cc55164327b1f694afda7abd0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ast/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ast/firefox-57.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "b1660d8c853fa8a322d112241c926f48f63e244baa8fde8e7fe5f703a65656c1c33ef33c6ffe77c9f9f2147f8d27f2cf24782c794670034719fbd5b78a9bcc04"; + sha512 = "69b7626e236b45549aa11e7fd98ed5dd9be2b705869bff521cf6c4d3834846728682fdbb0848bb3fc9c74a42fd1614327f4875c6161408773bf3e5eb29a61f8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/az/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/az/firefox-57.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "2d299a7a9aa0e8eadb47cbe2651f4fddb09c21984396d3f41d3d65faa05324768c4a7d88c273dbb3c937aa65086124919f77b0f4a1541d48534a70a01d7077dd"; + sha512 = "d41c8f045b2ff59949297c6d6f8ee4316eb6f7da4d17a670e8c53d5a69fd70ff0b518d5bc6bc1704991a72ae2c43d7718a21966fc56ee4bd27e330fb2d411061"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/be/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/be/firefox-57.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "75a7456d7e7b43118363d0ca7ce24ae6e2727c23542808731a3351c97e2d7fcf2aae44aeb9fdc460dce7ab582d4c8e1a59abbef51284f4fc85e8402307510dc6"; + sha512 = "23e83c6929b13e4738677376832edfc0beae95593f56a18ac359dbbfec0fd9e0280c113f39b53a4b489b5d7a90ec3010bcedc62b5718e5d97905ac402160ae6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/bg/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/bg/firefox-57.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "ca4be119b8cad3fc84eef3eaa0dc86ce9f6322ad39fa815449866ea13c343ca421c0d2de47de91e5f6ffba0be3d3e04af4442e55b8ef44b4b6ef48fd6ec8bfbd"; + sha512 = "4319f4c81b740907aee2fc3149a818b5cf031bf6f002d4eeaaa6e96b5232da5accfcc0dc9beae9505e8b34541743f347914adf044248c504a5edb37602df0dd4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/bn-BD/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/bn-BD/firefox-57.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "4b423a596cdf870b17c2744ba440e0cd7cba5218f76c1a1c9d088c4f1743f5d6f34dd7b0798221b26796afc5e888bdcd2246a84c446d543753c6bb80a9fce701"; + sha512 = "62b1b6dc18a418546ae5fc038eb327889ef44344b1abdfda6714f1564a2173af4ad7ae1fddfa0d495e8f32cf740b0e615549c6a2cb17a92cf1db1cc525a7eb86"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/bn-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/bn-IN/firefox-57.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "ef308ca2bc4eae44d95bf791b42e1950fc969b750e5945b1fd2b1241d1768d0262065ef5f2a5afd8eb422291977e797c7f6fc65a2e81c88bf9f8c6b092be02bf"; + sha512 = "c829a39e7666c6211948ee8a41298d42cfbd3a9c76265846462a220a136ebdb387e764655820d6b2835424433a2f94d974072e6c91962a343fb9f5544181bc68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/br/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/br/firefox-57.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "37660bc33778bbbb6831710fe34e28d07a52fd1f2a5a3f003d32e89f7f3506bd69f97c45546816f2737ff21a280274f1e3b68ede955820a127941b293aaf5f71"; + sha512 = "c9c9ad941fd32e3bd15e1f84ba27691846cd6730b8f1bbfb70d3eabcdb0820087f22419c1c9efd654687d030f663b87bc1cec512da63bd531c99d67df2a80146"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/bs/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/bs/firefox-57.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "fb60c35fd1782d5553f8d479613bd037c6014f7bc15797835bd63537df86146e075879cbe5a144b7f2aa9c2a171f6fd13abe7ea6376cb431f6733305aae79594"; + sha512 = "3fb8b36ededdf18a0e73d3656d063eaa9b68448c4130d3887c554cebd81fe523b986bf82c04e7319a8476ba9b8f1165e30b5f556923099c1503951f5a9a912df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ca/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ca/firefox-57.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "abc66fc5ab47aaf90325df0f699df3db0161fea9ea72d19437e9345b0d3740e80c8e435455941c3eb60aada521c1690dc05f22f833e2ef340677aa85960b46a6"; + sha512 = "502087f8485ba252c0f9ff8bb6e33c8981b3139ef032178984053ed39ff7f82f66c95755e72d14855d1a09e9db29b83d2be9cc8750da80a5c7eb641233005336"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/cak/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/cak/firefox-57.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "7df49494bc2bb59c42f025e89081a3825ec27cf17a27deca9c7aa2757ff8c2e6b5598bed06af0699fbd3d15d0e15aa88c38908ca0a96008a8382a5b4fb058c4c"; + sha512 = "d037360832abf0d7545d1e43e7327dc26e8e009cbb9c8c027d1475f04a02262789acb44f41c45dcf5a3171452cb247b14e60f2e2f4d4a0ecddc45990b5a4b27d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/cs/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/cs/firefox-57.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "316884a24ba4aab3f65df9703ec7b4f201f9536e8b3f8648addc274fd99bb4d5a930e4499be319e040a90097c6b0450a3434a2b1f264625baea5f27b87271233"; + sha512 = "c8d2c9b9347c8b393181ba1021c0f062c711bc2d1316f0512c0374525e3f9e6ea9bcdf8ba5b0466b87493f43ca54c13142528b420df0ca25322b3db68dc1b219"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/cy/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/cy/firefox-57.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "929f32656a4c0ced25edc962d43d4baf4119ae75601cb8b5babc88cff953721edda2ac3e300762a8201a161db0d28abf2823de01b96dee4b36721a986d1cfded"; + sha512 = "8e538100f7707b4ec71318f637af0c880bd411e1d5e2c7dfbd3269e40c5a6360e03c97d28e23b66a91c5dd56b236171566d8f6c75e399deda4e3ec17b8baaae3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/da/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/da/firefox-57.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "a8591c86d85a02c146b4695ccd9839eb311e371db420d05301359c833dbc462bbf33886926c602dcf21f8dd69d76fadb5aba875307b24e5553005fcdd47e0cf1"; + sha512 = "d5c21abf48a38f5eb7c3b2c3d70f051be4fa75f1a939023a2d863fe1d17cf567d4371f82f62343017510092cac061ab74b7aba3a15ded5fe039d1b16352be81a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/de/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/de/firefox-57.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "8156fa17843960aa2913a1f12a59e6f3827dad26d4547cc5758888c7586e1a04360a5f41087356002c110f9ac60fade703291b7fd462cdf11cf00858dd45edb4"; + sha512 = "96f6fccff058ea5b4db4b9ec6aa15337788c7ec4b3a9d6af6d63bd2e3342ec4f01f4ab839ea52033322efe0929b683ed73ec31175e82ee2a9a5e18f8c075a81c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/dsb/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/dsb/firefox-57.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "8d79d413a486073329f40caacffda50f8dc0675dc7d99d48fec9b79b7463cda180e6717fb15cdcb6c4f5aa89984a17c77f3703feb6865d802fbccefc66eb4452"; + sha512 = "4e3e82a2deb88cd2f26a9eb154e94c6f0cdfd1b2dcc2ba67f5a5eb4998cf555e615471b6f9d82a83c4abc36e98235218212eada1dd1bf18ab1660a5e143dd1a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/el/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/el/firefox-57.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "17619db107b1a35c0fb8cd0130517529e9cae38730aed31fc92340379228df3435b45b88038bfe421bf4833eb78ed995997456529e15fbf3ef9c823738dfda5a"; + sha512 = "29602ee19947e2123758e0f7c3c1a7ab98a113ff87d867f8cf888c0736570fec7461da23f50b1326aac421f8670acb87979b2ccbf22fb6c42da6094010fb3041"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/en-GB/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/en-GB/firefox-57.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "5d699c809ea1dac35a73fdfcc3c7c7be5e7f35a34dff1c8e1c5a7e536d72b445c3bc3197ec53cfdcf22a9d9ae43326c958b5d0820218356beafc95690d702860"; + sha512 = "9f8b429a3acc453f143dc36d71e158d0b3473c566790d753a62aff91f9598ce27eea710d6734a205b354d681ea52c4a2ff1c39a6cb1abb2a9c99646718943b96"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/en-US/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/en-US/firefox-57.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "521728456d45ceba010ba8c8dcdcb581d08d64aad0f40294a0f1ecb1fef702e669cca37e35d35a89ef1b9e5bf891d72853aacf225a866c0e0e26ee9d61841efd"; + sha512 = "28a8d28566b79b787ca675221ee918dadbd03b839717eb3bb18b8d9a9b8fae036d6e9e84d68450fe9a6976d856e7a8607edbe71563f7fd4217e75f4c3fb5e952"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/en-ZA/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/en-ZA/firefox-57.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "f86a0034a310fe26d276fcf867c85647bda35f07bca2cfbac289523a618493e7200668bccf2928f0e56f6f789be4db76f2e344cb3a92c63b6af15a3b682f0cbf"; + sha512 = "63853638b5708931f9d8d3b5b6ca995ecd2bb1a15e26341d2b2dcf588bfe306b14758a97384cb03ff9e55cc84d038c74e6735d2c2250a6656bd77859fb25d830"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/eo/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/eo/firefox-57.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "89ea9fff345bcb88bd67eb1c10afb08efb68988c95aa2e489ed706acef083dfb9a1d0c91f00247f7a0afa92592208f356f8539ead8286b4f722014792bfac2a2"; + sha512 = "027c169cebcd4a165b4eb7dee9512f7b46dbf0c31a9f45936d2550dcd80188a4cb9d486cea1c9730a4bdecf555039171d14e887edad77d403e8d877ce55ed1e3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/es-AR/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/es-AR/firefox-57.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "89c07f845771e87e434b36fcf5e9dae459d6b47dfe74715581972ba65cf78418c354eaeb28547de532ae7e53869bff6e94feb9fcf37c7eaead54282e883b0a16"; + sha512 = "fd12bb4da416497eef2ffa824ded23698ac98d83ade117ab758534c1133f3f5b9073d95d84fe2ac518fd4782eaec337d97c60316f0ee1e510f7526cf05c76475"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/es-CL/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/es-CL/firefox-57.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "c03d76db5d9f8f312077fab403712eebe364ac0f25aa57c754f2c2ef42082a475c0fa8e7447f1bd3bbb72aa0849d1604371c63bd28444db568d42c9f2829ccc1"; + sha512 = "05c42be62f9855c56163319f5da721cb2dfec9f0a36d380620e2a4310d1fe3d3adb6c67f4974b057488f569fcb3c0ec97fea17147b1f8ee3d30dbaae3f1f3433"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/es-ES/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/es-ES/firefox-57.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "570b824ca0671c8444e5dff3a837c1726f47b2cb033099d051a1853215c80b928c2a54b129e0d75fa888fff3115e1a51383444737f739f98076b53c44ce6a2a1"; + sha512 = "a081e0ab787190d185259456034266fbac06d8732ad10d608a14871070ff82bb7fa86fbeec8c1fd47df4b2f5b4903da1746762f8c105095dbc09552e8894a7b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/es-MX/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/es-MX/firefox-57.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "1c40abca0e01db35a53afd628e7eb15a9448c6fcf1ad1655f2c201373ee8526c2ebd749715f068254757218be91d25d00c3016132841612c9d5b1fe0ded792f0"; + sha512 = "7159d4ccd541bb5fc0128cf0f9e08ae202a4afc9b9a38a88b5d87f7fe456af8e43cc5a95ded085a327060d1a6c9586489ee2387a872a6777f2b207c4cd4a54cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/et/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/et/firefox-57.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "4df4f29036d1f536b88a95fe78936beff16f0b7ff1c2394b0c10af6f12b0b6594866816d162d700d8ba28307b52cdec46090dfe77dcf161716bfc1266173b05e"; + sha512 = "e76ff5a5d1ed68dede803b3f299ac7e3aa61d6cd40d1863b624c074a1c9c837458cc1b34d78c932e94da7dc5d928c38c645ecfb721d8e8b7edd37b0fc8e3d664"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/eu/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/eu/firefox-57.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "6474ed745f607d8b989ae1bc72c47717fadb63875a706349269d26ed1aae990e4784e2c5147dc93b6e2339562c568f5539d74522b66f94843dc9373b41e1b7b0"; + sha512 = "c673d2a1375c371bfe50288f94cd6879ccf290dce7ba5e755109b67fcbdfd96ced5363a129d0bf0ec6490b322a1d90beb8bab62ea6392d0120b0275d8c86254c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/fa/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/fa/firefox-57.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "6f9c61132f2310c4c0b08ab7356712acae16cca16e66d82cbd77cb9c45e90868b1f901b68334d9e462dd2598e95c3c05b74c5026ede1f01e69ea8090d7fa6e26"; + sha512 = "cb9b3fee5334bfb11e53f9fe4c3edbab8e8db8cc916046bc21f6abe6a0a134191f1e9921e89c443376dd76475ca1521f8e7b39550a151a3f25f9bfa6312d2082"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ff/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ff/firefox-57.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "9551db4c78847a6f8a0431ee47522a7923f9029fcabfdcdf05bad26b238af9926a6b6a1c21bda2b38e87b67ae90b0a33a09c2477504b865c41854b38acef1a1f"; + sha512 = "d8926743a7a15fc7144656ccbf3035ea1ca542421bdfeb0edc0b0a84343236e2cbf19635dcefe68efc44f4afd14697d2a833b9e85e587abb2a65b816cda74d7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/fi/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/fi/firefox-57.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "8d86d0feff634ffdae2be5c691a0da072e86a255addaccc93d9e6ab849fc58b43c2b0bf5b01ecdb28711e88721ef87b772118f096d2da5c893d95acc804ac4fe"; + sha512 = "08b35f12b9182f5a6edf9759e30bdd4b8e8f801e427edbfd53b3c85ddf2f4e28cc7097b1cd08572e79d59a736474353c2bd90dd166eb7f50ca4e713b85f093a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/fr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/fr/firefox-57.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "7784d578af3cc764409f52f72a8de78866088485037512f2d0ed6d7abe6c2881fb14474e4a17e9829d6185a185df9519e7449170af4223c93a0277a2b6264783"; + sha512 = "71e01d15790d27e6466dadbb55965a9f1e5df6409eba80ed6f429f45eb03bd21b0cdeca0b2a162beaf9435c9b75fab57f7ae3a663c944de297b8ab432baeaa8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/fy-NL/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/fy-NL/firefox-57.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "3d986bc10f2a4ae11319e08db71cd50cf8aed27550831a399a99709a73abda01bc2bb85857bdffe5cbea06470c8e78d5ceec94bd93b5c5e714620b975260b53a"; + sha512 = "c86e34b5d16a2915d3c80fb6c69a444343c8993aa39d4589b899d702c029804f1a790fe093bca608c9d7fb6a3ce1e90a37696ad069b2075067c2000323b17262"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ga-IE/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ga-IE/firefox-57.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "8b6728c64452d533f59a899fff367ad03b5b0309fd908086125ddf9c924bb6acbc3a48b35c9787b69e598ef1046a179c0ddc0dc7735fed3fb2176e4c875a054f"; + sha512 = "dc1d58d4b1e480f5dd5883783cb30431fcafdee0612dd1a73585db34a8e42add6a1683b10f3e94765b11637037199eae4517ff416d9db4d12e9126ae07e44a93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/gd/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/gd/firefox-57.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "d511fca44339a41bb9c1e9d72ac333793ebd3b0dbc3a1331b1d230246aa6bd109905aa3fca44212328c3c710868b1de3dba3a2ed4d1f98f2916c14841eba9c6d"; + sha512 = "456b1790f10dec64ce6cff08b7629121710870eab2331019071730a9141b72d714a177a4018847cd66db145a1d3eec5c7fe7d64cd950d106e9fac06fa763af2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/gl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/gl/firefox-57.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "a817aa07f4ecb4d20a14ac7a69a8163c16a9916cc3315c27240356fcad2ee9ae1fd284d6c28b7f6cf587f45959788c2354e3625e83fbf6ea1051d932473ff8d0"; + sha512 = "68e62e4ca5a77e7552e0eada7d82910c00032b77160dcd7a5d054951778600f898fcd1aec690c38388c82b485ff988ceea7b71d67b715c28aab8f2ce02abff65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/gn/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/gn/firefox-57.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "fda261cf0d175e9304dee206f2aa9874dea15422098e2701a269e66a72191167bc56c18c80399a5b703337ab2171925b7ef0410f54bbb265e3245fe4683a42a8"; + sha512 = "25a9a5d82c54129f4a995cde97bac927f499fecf451d4bc6124a845c0a210ae51d3f73ea7ada0c7e336b016f8a779d46bd8adcc82a2af7c8b7ce886ace779449"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/gu-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/gu-IN/firefox-57.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "90c0219912fbed11ef6ecd620fbc1ebbb3324bbb36f049c97fa18402e1a71667c74e5aeab81efbad6093a477fbc0f1a8a96b9d43efc514cc3a8fc657dda063da"; + sha512 = "ba8f2cc4b4576f6a9ecd6d7f41a0f36b465a62131041b4ba60171ec86ba9609852af12b1f3b3a96dff5d1a2ce62cbcd9116791db760e5581abb7689c8eaf2380"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/he/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/he/firefox-57.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "bc8e3a2ce6c6cde3193469247f666159a9f5581a739e20f89d0c9f05d83eda48a6e4211b057df0e201797c7d235ca5b48b56b27a3d7ff9e5b3a80e3f120b4848"; + sha512 = "4e67737700cf23ee51c5023fb7fe19eecd546eed20eb52ed4402a247c060bae29a3bdbcb5a0ed88024b1c501d03d11f195ae36d265c30abc228434fe0f4d7b69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/hi-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/hi-IN/firefox-57.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "f69208237376f4a4f129c15f4f05fd7f2bdceddf0a78cb5498f7bd3db9a466cea6a25429e7a164716cf42bcc4b7c2030ecd452a2dcde4763f2eaa9f1a698d991"; + sha512 = "855db36604b8cf08ec74ae74c36fa3c02b26638d48394d9fdcdc42a6d914b5a214b56e121e26cb28b8cafe1d3488cd153c11a8c717ff36557ea77e31d281187a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/hr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/hr/firefox-57.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "a7cf9db82a924d3a7579fbeccc93b31bbeffe9d044bb71813b3e493d0de40e646860f7fbacca8424d6977cb750c1bd3766ab0ef032113908bf4f4d010c91494e"; + sha512 = "252e9162dd4ebca701425b3c251ca3eaebd6802929049e9087f0e472b60daf645c6a6eebf9d56d2b28dfca97308954e1992c442f2cca5cf21092957af75f03b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/hsb/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/hsb/firefox-57.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "3c6f7fc20aa02c3701d8155dcbab0df13e6692760613ad87f27df2ca0ff5615b927bca9b7359914f07f976354d697b54d5ae306644a7e7aa312500df28353204"; + sha512 = "c554fb601f4764e5518ad78c6c78996b6795926b5a9434cdaa734f88d6debb01b20db6648e3fea77cf02739ca22fdfe2ae953c9c2b26ed5204190f7b05c24eb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/hu/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/hu/firefox-57.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "4f581f0f917fefffd6b7df0c570e3107d36232a9feaf5f5bb9b63bdcb51a0b8f8ec27a6d54a7a73ab17ca579fa95d3be601beca35eca2765ce019f3fda8d9f1a"; + sha512 = "f0a3edb3a55fc25f1ba94a5b372f4f7f284f405be03059f86096119f9077450e53e72ce9144ff1ef075d39f3eea291b3aadd9dcb80efbd67af4681aa8f8afe68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/hy-AM/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/hy-AM/firefox-57.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "1a088aa909fe0feef415698a03665567665f37e1dcf3fe033c45cd7d591a4708f392439b11ec7b96922139575d4edc8442ba08a8974c36255c7a7c349d4ed059"; + sha512 = "2f3f9058f7e7b35bfe9b8203d89696f66b2d9e8985bc563161b38333e6f9065a661452aa41d859094788312c59fdae56c67b15ed11279251f888ba92b038321a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/id/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/id/firefox-57.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "d185592907cda25a41dc8003b2bad9389dc1b56f5d6bf584e3f248abe0bde5ab548c055a039127b18960635338ccf28eea0fd8fd9c1c60f394a8df44f1644fc4"; + sha512 = "100c57b91262c1e7a8ea1c3c4a604c1dbb4b3c3e8c5686c26ce3fbab8c5483e08ea2696b8abd55a19cde310f5b2a41b5327e0c95c5d9daf5c98240cd9cb4b1d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/is/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/is/firefox-57.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "ab1fce5528ef7ca3b08eb21d1a653a91403952165a2a16ab0c270a0e799a616858017e2fa8015952556bb8bc132971453e799b01861e078e8774d3db0686b1cb"; + sha512 = "e57db256ad1555d6d4d0aef0542b3a1bc9dd91a41431a914585bf748b924bf045212435dea6e06e72c04d6a16b9f30f1f99289514044f2ddb0260b5149f76cd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/it/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/it/firefox-57.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "3b0bb483fdbdae0895ab60032ec09ddc40cd5db4b414fe440e8a449cf06c1b28eafee0aba0f8b05bd7fe278dbef8039ad5d44f9c627198ab1d7aedb483f6e2dc"; + sha512 = "662038be5e6317a97530fbae53200d4285cc197e37dc0676bbd0ffec6719f594ae4d6190df5e157635ba922fbb4c37865deb4e2931f3604411bd23ead6713036"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ja/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ja/firefox-57.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "4acec36fe9193d742dac566677526eb0fbf028aaa3f3ba7226667d1ed6e74dd372f7493f01fe0a289aa0ed8ff3ddb27e6fe069777f6412cca6043d66a284e9b9"; + sha512 = "a51fda61928771c55d2ba7ea73fe30837bb70e0aae7bfd51403422afa290b7b89ea5450eaf71c93b26b5f16f47bc7295d3ab47c4eba0dc823256609ae7f12a72"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ka/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ka/firefox-57.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "c2a7dd888e9ab06d2e3da86473a91ca12d25e496d58f5899de51aec2e6e8e8087fb65673af7990931c71439f8445ec040c514729d6d5dc45724130dab5056b45"; + sha512 = "936f9794719ca9c25255eecdded55838190f0277a2ee56d1165b066cfa36f517c1c5ffde024791e73f2e7b1cd4172c7fb230f447ae8237f18ed3e4d98d5a765d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/kab/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/kab/firefox-57.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "dfa0132593d19f2a68c15a3d7a7f9fc42aaf297c4fb8ff7eb6d88df0a569b10da6d52e5a3eaa8e51e48e890f946bf3015df053f4474466a3207768f0a9f28117"; + sha512 = "3d26c9892a8bee295156b6f7357acddf3f7ff6785e4e78ef6fb4c3f1a86c0a453b914eb026f0314e36d9713e901684b06359c143995356623d77e35bdc11a8ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/kk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/kk/firefox-57.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "9ca2aa99f561812ea2420a86b28858d62da2f9f91867c93f5605a9a46354c02b2cee873f828225e5c9f78a5bf147d071b9b6fe9307eed42ea950f0a16cc4047b"; + sha512 = "56b3d70858225aa7b10d711e8fafe34b0c5efa65a7afbdc0aef02bbf6fa0195d4670611f401b541df8be038ed07b202fa53abb421a1d1dbebe0042ecf413d347"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/km/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/km/firefox-57.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "2152dacb572481fe9ed51e45799bd6f723a80a4efb79d1b351cf1cbccc0674874091add0321630fc3f354707e91c042bba43bf9cd6538c3d18743bd887dfaf01"; + sha512 = "f3e29ce7109b22c2f4c1c14698907e1bd00e689386b3cc8a3b21c188ae5f902b7820911908cb2d740028d6e0eb44cb87ef30aef585d8bd110008f4d57e2de0d5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/kn/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/kn/firefox-57.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "046895dc39db3e2f373de35dee990700d30d47fc0e0e9cf4287fad6b55c23dbda107b95b0a1675c897f09d2ec4249cc16fefeec33b1a8e655d334b19e7786320"; + sha512 = "cbd3dc1bc3043450ae175703a34790334c2a0be8ed71703db29c1d31aaa0cf0f7facdf26603cb04d423a905e6ee527750f2e3783377d5466eadc9cb818b2fb04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ko/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ko/firefox-57.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "c87597a98b2c8c46fac817939128353bf9d1b270f5e467c013b7181aed4210527338994c4913d1b902280e6c3a042a3414f518a2e0a716d25db0a12c0b605af3"; + sha512 = "dab096fd4baf083a9bbe22c6c88fdb0278748e34a32dbf0df947c00d0462788d72860ea88baf84bbd524d808e87cc6d153f24c2bba6ea3400b409abb4459748a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/lij/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/lij/firefox-57.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "3edf7e1e21ff356fc20be6bc82253535caa76696b9672ea3f4f29b4880b4ac9c1e6747f2953d6e9526abb4e5262b14f7b931bf9845a3b59bb1ab21facfc858e0"; + sha512 = "c1b52bff2b4943b790ae5088db20472a5d51f103722894a57b77c607ceacf68901f5bc8eb3eed50b1d5039f878a3763fe9d629437e1e598eab2533302078789d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/lt/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/lt/firefox-57.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "7139a914d655ccf53a0cab44fbc3c3ea46e3dac9d1834e6acea59c74329143cdcac5365b828bd21b907e3d3c143a7345ea660c6c4d469418674626c971d9c9ac"; + sha512 = "1cead7d21f0e0535de752038aeb1ea9fc620f84de1f7ec3be49293ed9ac2777fe14ead838c47154ee5e123a010ecf51c9f3effd4f23ebf53fde49196fd9e388f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/lv/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/lv/firefox-57.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "05e98b288b71b2260b9bd8fa2aca1851c3131849b9868c1cbf42bf6b5ed622f4ef2f851db39977d77b3135cfe7cf282d7058d96e68fb5e39d95cdd12cc3deb84"; + sha512 = "52dd4ac89d587d9a486742fbd95dc9bb62ca87818ee252e5795bcbb94de379edcca472f5d666c2f0d2867f6ac342dd6b1c282829373eea90577e32d791d77d25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/mai/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/mai/firefox-57.0b8.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "0a84fcead91325eae96026f9a3439806bef6f589205f42859b3f9515c7fdbb29f37903c93f6e9e86b972eaa3e9b1e682b441753afbf529063dde307c2987ea91"; + sha512 = "ddb5f557241b070a068e26d0b93b0b1755820af1bb58c2dea47efb131ab94fcbedef5482770ec32153aaf676b86aa08642f1e2994cd747a7019b545be8978747"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/mk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/mk/firefox-57.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "c6d3dd3a1123d7094796466fafc9cb7e994824c95204728f7e255abd12004ba9db79ce69c50a3648659217d0c38863010c556bb4075a11883548bd47a51d2212"; + sha512 = "e15d64801baf977b0ad25e3f36dc5745a649dd435f462161f333c6a6ded6430b49a072622574ca17d1a699f65d809badee2f4e0a51b29fe24d03377cb0cd2497"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ml/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ml/firefox-57.0b8.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "778885c609688d163fbbba87227ce79e7df0c9e7db0553f4754e23ab87f0cff0f64f7013b861bf8d96f7f6bf715786ac763e5104c983a46b1a3c23a57178a3fb"; + sha512 = "7cd72cd4656f84c9bd4a97e4569e1409c483fadb91c4acd94f9b728834646ee006b402f8b608164f6f9bd8bbd76084eeaec75dacabaca94707047a99038082dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/mr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/mr/firefox-57.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "929c6fe735b94f52a26559525f3b846c7a9a1cd95c67ace534f19fa78246ed7faeaa817c004c23ff3ecd78352f9dda7a315e9f8ca1f895bde56b1f53ba8ce005"; + sha512 = "10ea9136e20f2243412b73f5180d08eb0082fe66ecb8e445417db126d0c7a774a9721a1038bdc332751ab87222b3e5c45c89b21afa4aa307be6fbef82c7df9c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ms/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ms/firefox-57.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "3e5f73d7934edc570b9a617075ed8deef45dfea01dcf057c712c121302a95cd6e19b0dd5de0529ba38e4b7e08edcae06e4652f462c1c2fdbf423d7c5c8c75c79"; + sha512 = "ee4bec5b6398a2d6e59d2cd5664fc688d6beccb18c75ee2071052680587829ca80aeb320d7ea23dc687c16b3108ef34b33e62d21683cdf698eb9b572716d6e63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/my/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/my/firefox-57.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "98debb77674a17ce8d918e5db0171436dfe62a1633f3a7ddd7df79f1e7e5d1252826ce02f86a231a94158d21f672b40e1714db443f6eecc218e910ffdd3880e8"; + sha512 = "5a239afefe69f6ea857c225358b7569feaa6c5a8eb8442e6a4e194d9e0c902ad8c4faf1ffeb376f87a3cba0bb624363a34f96f53f6e1831c49e4c5b64ba8d24a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/nb-NO/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/nb-NO/firefox-57.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "06ee63a1f1a87c50b8960962a987cd1b91052815bf8b3acd495c9cab6a8f2c7ca70d1aa551269df3a53708e8e2ac48fe3324fb333a11330072b5c0fd3ee9fe7a"; + sha512 = "88e9ee275d203caadaaf271974b6a2173302c855c6c61d59e1f01461477800f0eabbb9c2b181961eb27a253ce4343fca56d4bbaf8efefa4289ec990b9426910f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/nl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/nl/firefox-57.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "978085f2e33c3adf8d540b5ba144e2f1090795758ee3b97367f1392e4a4c96dafd6f76f62d7daae9341b1637a9d6dd52c02fd43e204dac0bdc7fb0db40fef182"; + sha512 = "c04c96ed3922026afa158aad3fb44649f50f1a77afe6b5245b65e852d720f441a86e9d3330cdd0e9115e5f97fb0d641c3fbd924f1e287712245fd19cbbb5cd99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/nn-NO/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/nn-NO/firefox-57.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "c62f38b2855a3ee3fd53461dfd9988ed3be866cea6351dc08f2cdf579313aaf238b3cae066b52d823f5c42f7628ff2158fc8e4d914f9372b804b475b5a2803ae"; + sha512 = "e8013252993b58910fc2aa0ce907e187e357007499cc93342ae9002490dfb49ddeb51121dd4194b4c12915542e8759b0d30faabe54afb0b32919ef636bcd549b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/or/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/or/firefox-57.0b8.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "2094a90bba5a6795dcdd2c56324a8b517460f690194e0f7c1fb0f278dcdc108d6e2b9ed3f50810e86ade74cd5267367874d32011fbad1a52874454fb965882d0"; + sha512 = "f758d21aa24459750cb7d2cc37668d5f92ef372ca72b166c7376cd0a92db907cc79531748deb4e4418bfdba82c6c5f14e8c1e066e90e0cc64707497458f7465a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/pa-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/pa-IN/firefox-57.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "01e4fecff221daf211b9ec2b28ff40c6f8077c1bc06509bb78618ae866e26fafb23d060b3a92e397edb47e5fa291ea0a624ea7b51f3a17255ef56c9969dd74e8"; + sha512 = "19f701e52912da03b68fd99a7e8d76de25287bd46b97616c37d3b7d2703d19e45dbcc42038742ee4b533482c89b8e70aa807b4b11c38660e5a7b3af0ebf1ec79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/pl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/pl/firefox-57.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "c216423e6c6739e2f557b0542f5823e356ca4e494c257a138780f07a27c7173173f3e3a93f5c7e11076ad013d12aad5e4a67dee4845e351a00333e48b34f1edd"; + sha512 = "01339648c867b7f5daf3932ea54febd2130a86e8ff78db6f00a6dd3a7c3b2b474745548a256d8868107a84c005ff73d395c67b2a4e14ec2d9a5d0873ba5b7b24"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/pt-BR/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/pt-BR/firefox-57.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "b949fad120650718d99450a5c5a09b0badc7bf142c5c2a37fdbc97039dacacac2f384e3168ad23811356da1c4768bf23c0a3be5bce50a12dd9915b5777c45369"; + sha512 = "4c04df5d84d833e5f35be55cfe6f4fb28f74108043065019c11cd8add64fcd0669d47d0925ba8a9f076e83f00ea2b25695c9ff279cbc05dfdb8dd6a821da15a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/pt-PT/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/pt-PT/firefox-57.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "aa6ab4f994e4d6049c5d658cbe2b9bf8523fe862c7be632a261caba1a651b12db4e11f160bb18b368234ed8b3c480af7cee1ec7e468551308f4bfdeb6b0a22e4"; + sha512 = "6a7c1d406c620fce6020941bfad7d7623dbd7372eea45d1c8fec1f7553be33b758ffe88e39af0cef59eec02af9d9dd48e540c9cf8e129e70dd33b006f686f842"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/rm/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/rm/firefox-57.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "cb3fbc1954157236c92f884539b38d369ad718ea9004f3b05c4b70cc4588e25ffed97ad68391ad37713740fdf87966c039ecbae97984d89f01555a492c2debec"; + sha512 = "000b1df519f0fd275f58d2cd30f8c826c01c5c1874c16e3e0faab0fa3edeb66000a5c34794c03b88eff16da0c0bf4212c31b1d6097af00ecb1140e03ba50a694"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ro/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ro/firefox-57.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "9ff1f5706e058f72b8fa57c35cda62e14809bb502e648df00bdb37f899a7e3b46ec34fe4fd556343ff11139cfac1e658076cb3c3132acd6bc447044e04adcccf"; + sha512 = "6100f64ae76c8c6c370018403bc72479e9d3e0eb28339637d682d1891eb25fdddb9cba9502fdcc278850a957922572b8e451277b21ceb003a896217b69a5d732"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ru/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ru/firefox-57.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "4ab5bf3f84aa8223e24fa3996148ae9fed8fb98b2ba2e7a1e9c035db7521f9590a437e1861cd6e248c63c790163a04fdd87a3eca5a76b9450317ae7c315c9ba0"; + sha512 = "ff87b10a51db21299b673b753143be28ad5db9680dfe2aebe9dac65ae88ec5445ca47052c553c626fc5819e42c991ef57d504af05738db2b440e9cdcfee6ca8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/si/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/si/firefox-57.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "a54194765e1169219f050ff4d3404a45197029b4a7201125764a52c18de109b252c05321e18c2ef33b7478168c36cb3025629c0deef24fd297a4bc8937c51b6e"; + sha512 = "1d777698daaaab61ed451510ebc905d1b385e4f6f22a32237ff7fba2593173688a4a51fbaa363c8e51a9f957b5efc1c5fe90fef25588c4962184c8749ec00358"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/sk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/sk/firefox-57.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "10551c3d57167b66b3a5a9368cb8b6c298471a43a8a9b144c5ea82f2dcc111b840e273821a42194bde0c793e1c217f7d39f54ffe907a706823b411c307ea0f5f"; + sha512 = "dfaaf1f5e79df8e53b84763542e987f2630d5bd13b4b1b0c73a463fe16029ea8004512e57e8657dcbd00ec3b5f295073327a82fdb8e870ffb84f9edf2c9117c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/sl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/sl/firefox-57.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "cfebbc1438c649a543b5aaecd377a20153917c3f1a07771a3f246c60fe2139f5e3529e26ca507648ffcf062eab301cc3a95f1251df2b586f2f112f9b04aea20f"; + sha512 = "50ac0f9a58b13c26ed7f2368290fd45aafbe991ed0011295e6b7ffffbe1e3deb35c4952b7f107bf195f9e604029da51d3d0f6d00d94348bc9838540be5cc619a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/son/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/son/firefox-57.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "d2f71c72c5c1aadaa76ed17adbb81c3c72f59407279fb2b4670fc2e21604d8c7eafa0b247b30df3ddf2923f023d6ee3d9d1c36b7033d77b3b7b9f4a37a6656b6"; + sha512 = "9bbdb11dca6271f8e1dbe5d96704ea63f55d7d778779d8b06206fdfb25ffaff4216d4266a1f463d343220c2badac6462c7af53afba57561b640bfb0681689c07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/sq/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/sq/firefox-57.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "03833bb8e39665ddee4cf0163123b52fb7184fc6210622597e7fe2084388a662d380a760bb381609b70679217461fa1c6bf69ea4cdbd872528f7bb0ca2e4500d"; + sha512 = "31a6b5bccf5a976732bd2cfddc384923221bb59df027b67cf688fa7c81d67682617e7617b4418a42191decd65d46b0c8cc5db5ce4cb47bbf665de248e4291a91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/sr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/sr/firefox-57.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "3150fc381b81b4903837fb0b076cee1f425dff20dd449899ccc3b540095d80317727600db4b9abe7607ce7e3d280a86bb730ec665525b2efaa4d72d31ef0ec1e"; + sha512 = "7679aa019569d2dc583dba19165da84e0453de6f26c86e11196f5d25ac1f25b3040b375f7a944ddd3550ff4678783efae2dac7990695d9f805a20773196ff287"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/sv-SE/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/sv-SE/firefox-57.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "0d144a98d41dd6372d97c8720cb5a7a28d002f26355379bbd1778446a6ff73670d95d5420940634006dc860e585f26118c20a571ec52bce361a2278ab107b495"; + sha512 = "834a14562bdb8280072daf8ae520296f8ead6278a27048b9cd95b4e31eff83334f7e75369db0febb6b88f333b972eabac94522b1c1dcc1993b51979a9d28da12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ta/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ta/firefox-57.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "c609df57bfc5c637c0da9ac1a7418278ba8856bc7b9a283133d6570a3fb99cb9c517a131406dcf01b111a9d69a8624dce34db6e5db73f6bce715b28ecaf2b6b8"; + sha512 = "5d1b2e8c9e5329c0d3dbf73bafade644b797961e0ca91aa0bda65dbcb6ca7a7dccc063cfce29084a3d66016806bbaf643e74e37049b66293151b727f423128de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/te/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/te/firefox-57.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "8e1eeb91b97f93c9ef8ac1ca7020dd05ae89ff4a42849654411f991e483bf64bdd4b8305d2b1de01b5ed2da53ae3136a2cfd3393be1d27cb64c87f6bc52dd840"; + sha512 = "27dcbc709ff7b203688ada657936428eccad4969875b8416d20963c8aaf146e89dcbc50bd18f343df15c25c89f89078d530f242a0711ea4bad6e74dd83f4e06a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/th/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/th/firefox-57.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "68deab0e83db3fc69526c0ea86a97fcafc2a87c9ef116c7f8ff54bc78a647dcaae8ac164017d46cfb63248cf0bdc531898dec4d8db883d78fb0ce897fed7614d"; + sha512 = "b6fc169928f968db1dd0ed6510be4a4bbce447a100df03bd405c1020e74062f1cfbee22aeb737ff1453a22e596d91a14f3cae309d551532aec2ebd1db98668d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/tr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/tr/firefox-57.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "d48dc92b7bfa0dc0cba2ca5013acc2a5ff4c58eec365b5f80b70b2174624dd94eb199008720c799d5a0a6229e3c2b67a9ba4f93363310de3bb52b62136f3cc3c"; + sha512 = "3d139c2ac6efe0de5c4c58e1e029831e93e49ba40831f38fe7e2d88a8a001302971b0d232bdfae49cdc97d5cce422d4fdd9c8ea47e467c16c2ff5465590ab6e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/uk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/uk/firefox-57.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "a726dd6c12914e95c7a2707e050fff8e671e2c01e31ca964aa6f32eb89768b7ddd1039d20986baee54a746d67615fa4e4a327219816ae52356b1c6224a149690"; + sha512 = "27a75956fe9b4e0a68ee14797b941fab1d2a48e5d78dde9cdae7cfa15395c06268fc9a5b2c9fb7ec52007e7e3662c4b3c5622c41acb8547e362771a4cd6722dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/ur/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/ur/firefox-57.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "f8a0dc9e7e831e72a570bebfefba136e014a27d224537e7eb752a197261b0334cddb28661018c94d41b5c870642288b99d2fca2af3ad64679c7fc41367e8f090"; + sha512 = "b732a652583e99526f2e5d542d09e7f19447683dd30f1674fbcb2b06bf19ada87b66831a0b0e008dfb47be9c581a5981bdc2b6d8642d9c8e40805cfc327578a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/uz/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/uz/firefox-57.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "644ccd2c71a2409e840d87a4e9451b454e6223c83f49f398871acbbd3da9f8e1065ba7ff40aa6c81dc7aaee921c4247e462d49649a042e1fb5f79a6fe786782a"; + sha512 = "8552d4c8d8f39e993c2d35804a9aa00fa39bf294623acbb6362259d8545f5aee1b52b96e5cb8f3d438981da3503b5a31bac008da70c2557ca05d19615efa72ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/vi/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/vi/firefox-57.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "0a439df7d97e4e6dfead990da08f5a62aefb8e8938ae717b64fbe0d0fc83e9e0aede01060a30016a406af6eb91de1c05e10f71fbc4883fe679a9988858b8d488"; + sha512 = "6aeae2edd0fbc60f5bb83abd5cafbe860494dab193315fc1154a820e4dcb1ea35b88eedea5a3f5c6aea424e0f662d42c38eb0fcac1ee233158c9dbe16173f954"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/xh/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/xh/firefox-57.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "8a777c355641cdd14f9b23ed16f139853a7b338dd6d1f66e8c3971cb1a20745ba49aa12bd68ef26e3900b68112333a86988514f91b196127ae7d6e5bc5533770"; + sha512 = "6824264b337517f497c78f6aa6485606c239588d0729a53a9d9333c836051b7f0f65b852eb10c0abf81c57b166b65d99f09ba0f17b55503c836ad6d9ff82a25e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/zh-CN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/zh-CN/firefox-57.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "17103974a976021fe921600d8a5fd697d65a8e90a595779be256e2d0350f4f5fcf51f8f16906b3b355b990ba12dab8cc1684a4268a0425e68d3421699618f480"; + sha512 = "9dcffaf3db7f7f4cccbd36f5e77276faaab2808dd5b70058820d9bb932b2e4ea4176a52c6850cd7f46953596d6b157eede8c5f20b6bd304fe2ab8263378e19b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-x86_64/zh-TW/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-x86_64/zh-TW/firefox-57.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "904aa9865d7f235cc60176e6dff01fa2842178ba812017cc23011f57baf23089da8feb74cfab15968bddd029ee5f161f10bdd2efead5bea33edc53ee27838052"; + sha512 = "9ccd29e7a9e2dce5294cceb2932ccfb7219570e570b58be350fe915464e0cafb7c739c86fdcbe8bbdc8f5112a769cc43dfaf44a292bbe821766d30e11075d20f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ach/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ach/firefox-57.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "6e0076d906a20021a3a161c685404efe584927d39b7e72ea6645a61571c14469b9de07cda7921c24123790fe8f7bfe7b1cf1f644a09f72b86161c3d57be49b7a"; + sha512 = "6c4c5c80365d2b5fb2070528f4072cd6962b7fcbcf4a2444e8af1433c60220a764ed75ba868be95b6f6cb045f76c40903130c354e262e93cb83a94b671cc1243"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/af/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/af/firefox-57.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "a36ba7a0838b00beba5f598281631bc2de5a6cef7399c48c32091cd901abe12356eca4e509e964ba8eb6db011bedce802d060502dcb948de00a57eb754182466"; + sha512 = "9d36a15f517f582303ff10ae09c7eb4e709d19a0b98bb9afb6f1a511ec787121676d749c93b46e301ee3a41010c883aa76b1ce5b248c2141086dd4551c4e9887"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/an/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/an/firefox-57.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "262f3a4a7d7007ba22f155e994bd7fc6b69f92efb6932b96e1d07d4a7923b0eb1ca1b4ca60c93e9e1c9feef5c8aba282b4d9af6ad4dc21e8c83cfdc6f4854238"; + sha512 = "aecf7149169b784593234906230f632d1d6d56efe37d6d2a060090ee2823f837551fdfbd5944960c05c436bb2768f529ba581ebeb6afca6f1b05a77c3a56f26a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ar/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ar/firefox-57.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "6fc5c1e07b4d31e8f5cb21f325e282875ed481de67168b43506c5083741c117d690cf681400778d96b291dc925aa6fd866645bbbe5cd477c1c7254cecc940bb0"; + sha512 = "1a49d7c9819a35f1bb5012191009efcb9c0738bf949bffc48f78f24e57ae9289129922e9beb850a919d6f7a19a86639d9681e4abd2b0f7ab882e4038a1653bae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/as/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/as/firefox-57.0b8.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "381032696886a2839d927c81abf0bfb48452ab2da37a57290e2f50daeba947fc17fa8bc8e95461f981980bf67cdbd022c7fbbf17cf631f27555fc92174c1c4f6"; + sha512 = "a0309c07f5f8e4ba7283e6d852eb3527145f7e756cb7376acf560a17dd56171269d722b8cfd673ddf8107009c8657daba2c66f48f70c262404e1a349de65abcf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ast/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ast/firefox-57.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "5eecf58f91ad77de3f9c4afe211138c79aed460d35f0b4f1a7297b27f72400355e0c1ade4fb2c457ae26d8da114ad711c3c0b2a374e5ba6bc33d107c28b3c3aa"; + sha512 = "a3bb2ab70eccabac6f27df4595dbab2fcb63a0978b6fc1ef965db8d4bf0228eabee91f771c67c5e7b7fc5e322c50c8fb8e35e7b95e5d2e913a0c8f19f8619db8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/az/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/az/firefox-57.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "de90f1e9d1950d1f194d0c5da3bc25bba00da5dd4094c6944b035aa660cd56827183714d9dcc8bb9e7ea4c115792bfb969a218034fc743fe85b65921838db610"; + sha512 = "2c17f965753ef834a010e00055120282e003cec20290a90050a6ef9a6b2e134c6553aa33c247cd15962408fa67e654dc50603fc02b04a43a3584c7ade477a9f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/be/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/be/firefox-57.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "f043a6e2c6499aac4c9b2df0ac0c2d62207a79a34eb727668a42942a4a4027ff545484212c88c0fcd9ab91c66921daa3846c294bc3260db3a0f8f35dc9a8c2cc"; + sha512 = "da69fd5a5e50b870d76754f81c8d492b75c239d44ae36ffb92ce3fa3504b35105c5a08a0c6228041a24d61763c616dca44c2ed2d4cc941fae59d521d6d3ce064"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/bg/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/bg/firefox-57.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "cdad058ee575bf2b4acfd3882769b067959ab8215b351add7558d8a6b6898fdce951db35e23e18c7e7d3fec170a78cf71bf61d20c4ef3c42c23a96e66686f59d"; + sha512 = "f85962ffbcb8f01c896cbf56ccabcf9bb6261b0989b40452e0e3e1bd297c31f6ad30d228d2c733498a6cb97c52b468269a4f76892b495a1c19e43f1294ce0830"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/bn-BD/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/bn-BD/firefox-57.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "ac4e823c753a7b765f1bee0cfc8cc0fb216b5b9e70e147866100d4b90fab0b413850ed15f02585170c3a6dc39b4fd5e7906547626379a70d5d5abe67eac0956c"; + sha512 = "dcc23f3fe7df774b752018153161376cd768eed4dd6b3d0842959f5762145a0bcef3e328e77f6cc021c57c95f2d90fa296579565c21c70cc126c29a5e4a43838"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/bn-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/bn-IN/firefox-57.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "15b12cb32ea9be780dcc68ce75d54afbd16c011fee06a15130e2d1844746ac2cc66dd61397facb083c478f4a754385afc62fe4355442aad31e8ca87dd5270fc4"; + sha512 = "e530547e5d30f8a450f84558d65709568615644373c42e3f442b615742c6d0089f52f04fe15baa8d3b8bc9d1bdc95769f64bb0c555c93d26329968e542944e5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/br/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/br/firefox-57.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "493c260aca10b349b860492b5756814868520f79dc9853745af8e1989f645f2eb17446af9bb5309d21fc79d9139c7e7560dc5a5a1753bfc32ab3df07e5fe729e"; + sha512 = "7a0e21ec418a344d9df7daf1efc14319ab5b44d22701acfe2d15fc04b32fd2c41aa80c592d4357f6fa531c64b74aac6c6bd7cdf2bfad4f1fb90f91c2c966b932"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/bs/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/bs/firefox-57.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "ea865333358b245703fbbaaf621ebab603aa9db3a7c579e244f229696ed1c7176ed44158de6a01817cd410576e69c354d2091704af8dc30b4eed2b2f2f3a0629"; + sha512 = "e5eee2dd28d47efe3dd629826d90ad7ac496bea3f2a750389cce8bd7c3fb03587d52bffb1885fbe21ea2b1078e97bada39ea839573b9821340a4e23626a845b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ca/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ca/firefox-57.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "0961c13ae053299c8f0e0c1d704c0825215c1e77b43abd83ba86709448f22e6ee40c6a1b8d858e4f2d801d7c024b293631ab28ae9fa30553790187896a96da1e"; + sha512 = "ee039ecf51f5548615e5af41e3e77be015bdb679f00355601849c826cd18a1ea422a5f9a7bfc0ed9db72a0e321e52148362a79d1515daa9d8980872e04627f26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/cak/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/cak/firefox-57.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "3a8dc71fc212a35f83d10ecfc8c8f97381699431964d34fa7a278259b1cdd15b4e92fef33cc9c1f37868baff0f6ff1064599ba632ad718ae2d39dd3b044f758f"; + sha512 = "effb915c80355bda7e6d58befda98ff7e92d8cb70af09182f987d3125127a3c06a830fd55976f0d9b0791cfb910aabe7582fe029e0a5e94b3da84b17f797e4f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/cs/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/cs/firefox-57.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "eecb76deb0c420790a37ef24c0956574a4a881cc429f8f78d6ee207b4b9f6c12b8c890e6ebd4f69e9cf4ba120728a319ffba6f90a3eb42affac86fd27dc015d3"; + sha512 = "78987c7192835c39caf8ece474f3778bf7b12a20acfedb544bc5a76c41521dee0b9cf240314cf954e6d2f1964e60ea93ae700c63b97260781db03bcc6026d982"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/cy/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/cy/firefox-57.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "7ca940188627a439f3a3e401075e3dfec2c4082eaa8aa65fc7a58bc669f4e4a4835095225bcba541c3cc8562dc611fefc4a7e1f7089a8d291b4986d557901cb7"; + sha512 = "822ddc34f737d023e833ba4cc156c4f25ab7715e1b80431cb29226d3427a354f16ffe0b98b571a71b0dcf23f6fa35dfa7a8032ad2ba478a08169d44fc89cb802"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/da/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/da/firefox-57.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "366f786e96bbd5c4eb1ae247e2cbe567a7e94b76124a2a78062528daf1aa72236c91aeb2213f623a8214fadb920d10f1ec49a8bdad4a5a855ca23f06665d68dc"; + sha512 = "1379fe59e87b8046373810489af69f4c946b6f28569b684c381a8c573044d81141b7fd88893c211404f3f59b66d65365e0d1a33fd7a2e2cd09d8174c6ee6e1cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/de/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/de/firefox-57.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "43d46c88a8d58f36ebc832afd6b03eea5afaa58bd3eacde85eed36725f248529169f6d396a3580b2d9483d36bdcae3dd9ad53cc1aa69264231b53285915e3d3c"; + sha512 = "dc9cbc7c428704f2f17b50e1b95169e0e922fcefb9d60df73f455384d8cfe37ac56a4e3310de7ec6f29e855ec2f486ebae86544551f91d46f5e7df97566242aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/dsb/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/dsb/firefox-57.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "16006a1e4ac7662e9d343cf31dae5d3032948a90a7eab1bf1122ea2f45b4f3477c53d8f0fbfb860e4725cb3a58678890c5de186ecc0cb76106153edefb011eff"; + sha512 = "1a2cf9e55547aa47205a83d3dd95183c3f8aaa9d9005dbd3cb47cf629ee9e240a7564f69ce6b3b51a6f320fabbc3f53665a7e739a75480f7d2ac86d9f21a5145"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/el/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/el/firefox-57.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "d5f74e30fc7da9c9765bbdff4f946ef5de3c64ae4626833d31161e62de106485f9246efe0b1866d47c52ba7d236880c648a438e1602f0552774573c76e2c79bd"; + sha512 = "b48a7bc131cd0206bd4e024575df5557b848b4f1f7734c59e1101d34c5617fcbb740a8fb0e75cfd957f6f84757588087fccf5923b6e5b58cfaa6371a416a2a89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/en-GB/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/en-GB/firefox-57.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "4a6ebf46697c02c9a3953cfee25d761254cc79b12a88a049b8477806b3d1cd978e46295124e7afb3770b7d4c01bd2e002e1e8a092ddf252f6c22f6f9afb4c9c6"; + sha512 = "2f8b0c7c6fc4525dffc05f2a74b182e93bbedc45f2c44369bc8a00d889c9b50ef5d0a4db842555663cb3b88c65b4177c946930ff747796d3a60eda87800514a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/en-US/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/en-US/firefox-57.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "f5f1af68ea08cc95b449595d9f15f346a8562e4c27529bba6453b0fb713d65d1b4cfb66c9054f25d8a8b6aa2d7029592a7d00a2a68ee5c2fa8cb7d06174f9f41"; + sha512 = "a37875973326916e2f83f9b5ceb625e3fa3d714d5fb5335d33ae59bf8b196a55a1a9aa24b553ceb6c5048c15eade78e0f1e050f253cf580020a9d24c8227bd74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/en-ZA/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/en-ZA/firefox-57.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "554221102e16a5ed426afc41b75be680a6d28012bb66a12c094a719c7d7ea61d0ea378a3eab758b907ad407de78063888b687cab8ef5dabe19f3a54d2bc722ee"; + sha512 = "a35bc33e37b1a2eb9591f2a454c228beddcc1231fba8e7f4dba605b00b93077f031d34ba24da84838dff568fca6fcea686273b75f9c1a09fa3b3cf919dffae8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/eo/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/eo/firefox-57.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "bb31a3422a0d86970649485bad7f78588653ee91551fda7babc9214e9855e7a363eb010ddcfe6d353e292410421bf99c2fcde0aef4113b688dfd3843d1f0377d"; + sha512 = "f52b1b7a86a6819ecb9b978653113a9ca6200d1e2933998bfcc2d71caa2a3b29cbe44c5585d4aa5725ccb74c4fa1d2bc0e7cd51191122a927ffac7c7c83bb332"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/es-AR/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/es-AR/firefox-57.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "a47626bef5d9cc8df045d0a38350f0470f5426f4de8ef45bbcb6a60922532656f60f4fa41c4ef4706af82e5c099af5d5020e6d51ee1d61f8275eced5935ec2d8"; + sha512 = "95e8ba066380a32901f264b1c45905ffed067df81195a717d4d0677b10a54750ddc8946ac8c6528c7919cfd894297ee20f17f4ff3cc765b7946ce246417a24a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/es-CL/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/es-CL/firefox-57.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "cd93d2b921c3fbadd2862f0fd8d1cc628bf5da469d86bcf619c35940560024bf9b461b2fb405a2fde39e7910b6c0367e31e44c8217971f9a82391dfa5a869094"; + sha512 = "8d90f38a6d7b91ed7e63da154ed4a8030ac8648989b3308590153db8c6506e5bd09e4689aedfe785d113d094d8d3b6321aa448755ab236dc2b6513d6ca5aea99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/es-ES/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/es-ES/firefox-57.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "1c911d2898749ab249ddbf7747b7cabda4a33a2b4e426c88aef71055b8483e0e9b408511a14b400ee332358f2e92d3a83817cdb73d8edb9b85ada94538f1bffb"; + sha512 = "fff2d992821815bf09a9bd0dd00100a0a9798b5a546a17d5bfef05a18506b37f84d643fde0d3de34871eddf1563c89549e53d5c826bab5b069998102df924ca8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/es-MX/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/es-MX/firefox-57.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "bc7aebfaefba4a4df95d1c60a85b6f961e0bf0a31249caedfd0653f1c1bcdc3f7c27c6f52f45b7cdcca54562a556bf99581e79ecfee9488094327af69b909c47"; + sha512 = "048b6037291c13ba355177e0a335d4b48409588612791bd5ed3d43d6d69fadfc6228242339dcdeedcce78e91ac8c6ac366ad1f378e5165576cc48dcdcea0bde4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/et/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/et/firefox-57.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "b1871f409cb4a9b1b85215e49ab4620fdd7eeb3db11e5a0145dd40a923ee4192ab6ddd8aaac82c1d28153722973a15c1fe80c822075dfa4baf50204228ea3db6"; + sha512 = "fcef0b940eb21cac6e9c28f4bc13497865539fa24ac7f83fe24fce2e14318f667dfd16c855ab3a7485e9f0f103da60903987a7c6bf275e87a7ecda997775a395"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/eu/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/eu/firefox-57.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "f3bf362364479ea07a0c681d79987f9c80c9e3c06a54eb82a0c0308ad195aef257845e73f72f86dfb45ec36551c9a6afa9b32958c28066e626ca33e2c3c8d628"; + sha512 = "781aec0d080a00ff86c56af7c626fefc6351e86f23059791dc026858ea5cd7f18c2ee63832f75590bbbe43d8fb50b525f115471c1481f84f6c201c4161a086bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/fa/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/fa/firefox-57.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "f7976eeb893f7fa4cf51b2ebb3c6442e731f4a96a2d833d532dbda87412789f044491b3239a7302972664c17dc08606648b011263d63e01e7a51e430ca1f243a"; + sha512 = "94d0b6c20048db72df1bac942c348e9f4b7907620507b65ad7e3bbde08a590d10c556f817f2830a8813723f01826c0fbf68925b35a49a4647f3da5dba3cababd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ff/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ff/firefox-57.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "6381ad86b9ccb65b4aae7359554a49cf630e8f898cca26479b327e9bb14695f87f566da9bd8a31af05c9781fee65dfaa8e23cd0588e4441ce6fb8fb25f7d7fa5"; + sha512 = "669d03edde5124cf1d4c6531e65b62c6948afe3a2710f2d16638fe2aaab85108dde864df49ebc34dc628976782770b5413f33b836a76162edca459c85d19e1fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/fi/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/fi/firefox-57.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "1a80fef046318667a0306cd8870e697ab246df3f1ff7fba30ef3a24c25551b2e265e6b52a13514fe216dc5bbf237df7f04106bca87e0506a53caad9856c1c426"; + sha512 = "475e298d214356b01938ed692853e982a2dc5b40d15c2b029db81525164444e96a1c537279939ce6c7cab283f535aeb246d28d5d75ecc13750becf16870aba87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/fr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/fr/firefox-57.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "26b25a2fdb514cca9638748ec8481f7c36e38f1d3953cd5a45025861145d7851a4441b2a2a472f07620c170864a278dffad3e2d625a31cefc0c348cdfb3ff4ee"; + sha512 = "81c0f51da6cfa79e6de8cfb422b41a0851bfda2c4bb114f72662bec504f302b8f3fe40067fbc712aebd3281ef256a9d3e5c4c901f5ebc7ea3fcf271094ebf34b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/fy-NL/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/fy-NL/firefox-57.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "d0a322d815f08e4cb1b7f49de22dd21401e1871b13272ef33f4e311f52436e97f863943511190b0dd2bb3c99ddc0a0b8acf95740e367a34bd78be3425af6e3bc"; + sha512 = "66f68daf373a3a2a610914f05ec0273e9e5ba795f947e08301bfdea6122cd1684a1fc7c3aae3f40b534dbe24f6cac5ec613aa239fcb5e52af9e231257e04b3c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ga-IE/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ga-IE/firefox-57.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "a736609a8a10782273b79a83cee0929bd2d82958edf6e266245c1a4631c4d4656b128789779806d6c9500f914c749beeac52df3c6c85e149f5357f182603f878"; + sha512 = "4fce38ceac5b1186fb0acf5be6d24bc16d246b4a4ba4b7ae37072c3066de7e9d90638e43875fa7d7fd2cb3b5b88e17b1ce8050b8632f4668ee4a2aed2f5ac6a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/gd/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/gd/firefox-57.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "66e110faabe9a6ee1cc3aad8e471301aa636e00f3c7cd01d49b3aac5dc96ff117aca8c4b0dc2a7d23a8122bbcb152d82200a505a9e534c9a9dc93da8237afa13"; + sha512 = "40574404c29ad847503d3ced707e7ac21cdaec0fca40dba3e31e27f260ae7faf6da07d3852978e3cc190f3ec2102fc151c723d185f626e01e6a21d13e0ba6008"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/gl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/gl/firefox-57.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "5b115d289497efd2c706bdd2f6337b6f3afb57f4fd95178b7a5953b92a5191dbdbdda54fa3324dab23661c49bd5c8992bb1e2bf6afd12dd6e61ccb2900e53d98"; + sha512 = "aeb96aaf9da366ce06e7453f09cda9ee62e576c1ea8b492e71ace5a35b5bc8e2c7239efd733ba565c3c91a9c9e48bba40db3c5b3f39c321b4c3ae8cb1a759218"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/gn/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/gn/firefox-57.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "357bb746ad1f10118e13f439ae58052fb93bf89562eab0f78510c027f24276849df4a69789db6b274a66b5232c4a6794f2d3daf3a3ff35644b8ce1f137febd2f"; + sha512 = "f5a2b9dbeb8d128eb15621d087a753769d40f219c8235eccc3074c014eadd041df5d146d7f43fb15e31990dbca4f138e983ca7ffbf4aaf249c9c58aaa3f03591"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/gu-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/gu-IN/firefox-57.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "ee4af8b2880c16c55f09d9c2385502ef4b099854c123cb6d148df1d2024e267d7ef9b0ebd8f1b70449698dd3b25be8479c932dc27cccd38d8086d4ffb7c3bdb5"; + sha512 = "7afac4dd885bafa5cd07ef661f307c0ca30cc2cd65b10d5789090709637d3e744198a3624308cbdf2049899ee4b407934777867c471f2424bcbccb8c025ed40a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/he/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/he/firefox-57.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "d937ec20e10ce471f658717310b6d361df800eecf54b81156e412c0af1d98efffc33534492c46fbd600f9e5a4d85e0bcd80fc7f711b22b7eebf7182e78e05abf"; + sha512 = "3b572a06423d16f1b925608d5690d88e6870b0644f12b48abe5f084fec8f90bafd573d2e80b4aa06ddc7dfee3104880f98fca843148124fa15e3b524a80875af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/hi-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/hi-IN/firefox-57.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "39d55bfe0d78884fc6f27ddbabc3f80e3075ffb027e656ad07cc56fe39cf097f3c3cc501d123abd172c1d4116bd8fb8bb620a2af8a8ac5c48bba5225cdba58dc"; + sha512 = "734d372db67c55f9992b209a7a36438f04f277fd76be4ae0b04c308dcd538274fc92a9971f1a150b7395341fc42b75dd2073fcbe1ad535e5c373d415a4d7c49f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/hr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/hr/firefox-57.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "aef7a38ccc9ca3a98249bd4d325ec01dd8e12e7b95b9bddd5183bf8b4795f283f8cfc6c87f22e38647fe58c00d40e95e65e1994a21910f3661937042732f0c14"; + sha512 = "bea351913f51977add077afcf79dc3595133631ba35c594dbf0bec5811a7483a6e4e25e10b6c24aa176a07e27142a2668e66bb93da4531e0f9d0dcdcb32551e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/hsb/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/hsb/firefox-57.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "daffc6eadeb9376b42fba1c96b759b3dfef0bbace76472df11b56fd3bcf47d05f85f58affcba193aad39bd58d194b72da32ed5ab7a7d9376adcd17c50d19836e"; + sha512 = "8afbf4d5d1beba8dcc3a4ba8e4181cb854e863d8026ffd4b4a56686d8b8007c3e6b68fca9e3a93b11970124a10dfb5ae369fe15971ac96f91759b5c37b1cc7d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/hu/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/hu/firefox-57.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "bdeef0f11f48cff94a0a80033e2e6f63c12130729ab0af7e0ce7133871282a911936b7c1365319495235ee4336cf2683a84995dc05d424ab70f89553ac8d39d1"; + sha512 = "e3d08f02d76f701ed6f390998a7a14be1636cbaf30bff79c803708d1b389153acfd392f094e17ef3fa84835b7f73e8de16273ac6dc9950f36b6f5f1ec87ae150"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/hy-AM/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/hy-AM/firefox-57.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "2d20876ba70cbbaf66f0f6653ca284f3472511377e9b4cbfc087b763fc96e1343fb4da014523b24731fee709d1d407596b01cf531b390d1c2f3ff5e47c3d3347"; + sha512 = "97bf44b70f307d4a513dc51d5227e7a6763ad0d76ed4d835ae29067831ddd91648a3c03dd4837914f32fb2c8d6c3c23ff0f754cdcc51e7ad6f743981e2f4f9f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/id/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/id/firefox-57.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "09305a81fcd0400239192fcfce0369ed49dd5eb2e014ea1bc12c1470b732e6aea3580d1d34285848e7c12f5017d321e29ea27705cb298fc147abb82d089ad6e6"; + sha512 = "3be0b9be46f1cff625281d30b729016095305bc47af511c6ab9964b7770731d37d956cfffacdf6833c8d30e3ee7357bf4231abcfebabe1a5e9d814e2b1ddbb22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/is/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/is/firefox-57.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "4151a950e6a4fe8a4c9c143ac47714e35d45639a00a3c03c21c7cb974aab46b56b69b4357ce2294abaa84df6b3c561708b74f5d8fc4139221a89d744689d531e"; + sha512 = "e2235cbbfa0ca2c52eda62a9112229dd4e523daea4fdcfc1227cddf69c4f857a433e2cd6f830908ab9fc8660630b873ba4ce269384b89b40bcfb03f024a14873"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/it/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/it/firefox-57.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "3d776b488104b99992e718b2a41c8de09438140143de61625f01ce51cc8461fcc564da883510dd29c854bb181e906b095347c5b34d5b1964ed51c268469842dd"; + sha512 = "1ba58f0668f2890717d18435f7d8d209d523ed368ca06a85514bdaa0ab4c5f822c0dbe4bd398a55bd14d27a7b88b01e557bf76ce00069772f797a8d3265684e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ja/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ja/firefox-57.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "2b0adf6bb4f4729ffa7a4e20e5c5b4973032a4416076cfbd5d1c9d0ca551a8a1ccb0fcbe1998bfa390373ecbb7d74faf163fef47c20d1f2b4d179a9a0f802957"; + sha512 = "723427d8af078aa1be6149d1e495385233f8ac8c6c79a80e2ffd3884dcee5a4f0ccbc0fb81bdef787fabba98d3bf40e12e31f93134237354590a9f58704b0080"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ka/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ka/firefox-57.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "50b718fea376c16b586f1c54012e6215eea03391d2bdbf1227629d5aafdbd864cdcb3e9527fd2e4fe1486bf928392d7cd70ac147f1b35d626ba7072066cb8737"; + sha512 = "7a4aafc51948adceb81d7eed2846320bef587d2b1cf004e75cc2a62c31ada7b02f893a371abbeb2e7a21a51ff39e175610487cb16360736ba601cbbd0dabd412"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/kab/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/kab/firefox-57.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "ac3490642bfe48817d992706d441009ace6866ddcf38ee71b172eeacc3e7b3fe44d433b15fa9bfe238690078950514f7d5aa5c2ae7239e3698c04c71f725508b"; + sha512 = "af33b16216c12ffecbb4033c94b8a6225a9ad3d0a6061b0aa417aa118a7123167378c196355788aad853fbe84d87aba7f7a5cf9dac06606d5e4ec576a3e45420"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/kk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/kk/firefox-57.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "62a6f73528c26264525fa2fb4e1c0a8e1f029c74eb5333c5912ef208146d24e2ce2e037e904bf83fb3f7c10fc81f969586a09c5cc3746213454f206fd6c1286d"; + sha512 = "52b2544a46297a5b6286bbf87a1062155bc843f60ca97cdd5dfe39744caffabca5baf221301bc45666e939d2f8df51f9de3a4230dc5d2ea89f89b8cf1a355d96"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/km/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/km/firefox-57.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "4dee68ffd5f306edc3e49321bb29edf435e7924371c37a2e1e239a1377e0f9be5cd6ee680aeba46465ebde9f8b090d467e93b0c65e75c9627413c5ff7c720589"; + sha512 = "45344b0494274f8f8d17f39e8d5ff6a76143b426e5c7c3ebd2f1ed01c9a4fbb301e16440358d246c8f3c31f7e3a7dc593ee1b6f5bdbe6b453c32ee2b54307b54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/kn/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/kn/firefox-57.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "b0fc37707804ca6cad153528275076ad64b64685c2c34bebe27ce652c7385cef455da75420f0e8c543aaf20bc1358e080cce48b747a23c08b9c72b1f7640d0c4"; + sha512 = "80fe5cb4c47b6e4fe6fb374492abaa509c6ee53f535c7a4b8c894c4b0e78dd592617ca19826e31b1b6d053dd8a3e91bfcd20e4f13ed0afd8f91ef1499ba609aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ko/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ko/firefox-57.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "26534fd7779e1c29e2937399a4a79690fdafd8fe7aa735d4386fbb03d9e7be09ae83a3fb3d9c2691bbebe40f8f73ee18db24133ac4250b787a8e13263bc1ea2f"; + sha512 = "5c87c5fba5a2212a7194bca3e4fcdea1a098690ccc89e376389e41a7f78e5fd0218a1366811cd76e5561c76ed9f75165bc5b0cd99ca7645e3d7a3c11eb67c519"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/lij/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/lij/firefox-57.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "2b42d3afa649bb48d3bef4d67f01fcae216f28d3d912ba096258ad1992914d99c8389abba60128e0198a8ea54ccd87239d857e29b44b297eecc288a08553a6ce"; + sha512 = "d772ee65fb31f00fd77b7d748a79bd4199711c9853552af47de1d1981a7bc79279240c517e89c830bd8ca1ce7301e285d24d994621ae668f9bf53dd9c8656ea5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/lt/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/lt/firefox-57.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ab7194527b65667938ba7e4dabce6ef67c075284b1795fa064a81e1970ff71e1d4e60687e202fb82ea4663f46dd4ebdfb0c7ae30734dbd5662c28499484618a4"; + sha512 = "f8d3816c6ea946cb96e8dcad1d3c1f0d624a669ef46a48440919ccd9e87c67ac48abf4b7d78119302107eb7ee098a0e344336a4f0a2ffe80d970b238fdf1416b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/lv/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/lv/firefox-57.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "33d3fc939a464389fdb0345cd92c29a1c38e4418fa293d131f7bafd2f39444068ae7c168881076b9392019d77c5260ee670bf7131d9501127095441e43e7353b"; + sha512 = "0af6cce7117be80b400880d05163d6ac777a6a7d2260c68f51ecfdf30ea8693c0d63c5b69dcc0dec2a3be1767761ad23104aac5bc79ab088c770fb678886790a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/mai/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/mai/firefox-57.0b8.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "69816c5d46e84d0dd4b5fb1473e49875725ff4dce7d08c9a892f4119f6aabed29e30789a77a56585e2399918aea16a84dc94d3d9e04d3e29b85e1ecfd4289a52"; + sha512 = "a53ac3a64f7b8158858acb52b33d188c695633dd2f06ab92839aaf98adfa3eb79668de07b7bac006fbbd884b76342608d3100a284ee638c161f2307cf241d3d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/mk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/mk/firefox-57.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "93e41429afa3095ec8cd903f7c942ac46b65a39566c7bffaea937b2ad72d219d755fec27d58e351cd70cd697149433b43f26753b389f8f70ddcac9ba9fab78f5"; + sha512 = "a5732502199793959a3595c080c5f146bac8f445ad11becc841f806c8ea11a37ad8ff9d9fb8815af89f38aadb5e4402cf7473a8be56302d6f99b0468651928f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ml/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ml/firefox-57.0b8.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "911e36c834c35664b38c14748f146499bc74217ab7ab6dc3c318df8dc115bf8a5f09ab24f3c650f01d664b85e9edb90b2515f4f4d413fe2c0663a3ec4714df1b"; + sha512 = "fdde429df1c1328f33fe42e5392cb2322350b508deca1467cc14d4f896a32cbc093b43c33e945ddd9199c146ce16676907e2eb458a981618e0871f54124716ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/mr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/mr/firefox-57.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "8ea055ece43abe41c21b726df13587f86987b6a836055fc3bc525adc04e5d360db2e3b5104587546f3192868cc10b02fdf08540644e1d5ccc03e963920220286"; + sha512 = "874b37e2d93870bbf3ef47e8f70bb881e5ed1b0516c266535e627197ae6f2013a63b3405b673c695973097197596572736dfa97e6e913308e619e4b899c8c516"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ms/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ms/firefox-57.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "b3da22c39ba71e28fe6c5f36cf5b99d63014e68f5a1cae4dfe94846393321a15188358e4cda263f4fab2c2c578c78739e3338345d2e7b761286836db435df868"; + sha512 = "f510ae946e97f23ae278da12e67aa293741d145680ae084fa0ec00d02945939b354003e8e08f32929603ba9dd9c54109b2fda957e6d8b20af3e04774e0eecd3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/my/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/my/firefox-57.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "4ad4201d56fcacd6c238a3b60a36238cf5c635f7fa601ab4342516e7860e2966b449113632c9b1047f1721d31e211a67987bc2ef5a439db9cc09ab437afff2ce"; + sha512 = "c107591dbc83704aec6945ce3758c4c3ce809cbb2c4c1a9ad6ce7efce5f2da5fd1226599a083f0008f597bd108e146bebcd1f2fb5be89b078b7bde07c2391e4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/nb-NO/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/nb-NO/firefox-57.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "f167d00296e36ea498df7b331a48161d613cc395c16cd63b83580933a776829cf492213158c22eec1e6df9f2dd1a811ced289046ba404e40230bef5ca28bd4b5"; + sha512 = "18b0e51c9c7ea25dbfd083acf5e0b5220866c0becdfa968e9ee4bd5a431e90db48b61b7e11f1b8854812bbd1ca1e089445a1790d3888295f3d8e3fbce21f205c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/nl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/nl/firefox-57.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "b53257382aa247d4b6745b0abfbc25c1c015f2c770f5ff2bb619e208ccbc4b499d2a60c9b9ce5d345dd65517a41f6cc4041d948ec8af5a43ebef417efeb91505"; + sha512 = "1032fe9f7fab5bcd8358eb7862722c2201654a8bf2f30e6b050771a15a5b5db6d183cd8d467107f6e855943f1e85113d3b8ef8c8db38b41b2445e74230ec4d0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/nn-NO/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/nn-NO/firefox-57.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "b7b50ef1127a07a4bf7aaf3c5e3eb2621c502e660528841dc92c4a937b78aea003fd6eba763374990563a63774e0041893ef952f02a387b4c2916b5a3c18fcc7"; + sha512 = "448c8bce480ea9893b73f92d4151b30e76a3896044121d4f65bae554aec7f945f6498c97bbd458657a2093a16858f7c889da40761e99ed9b3de2edb83bf6bb29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/or/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/or/firefox-57.0b8.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "ba55767451edc408b92d21fc74133a13151c5f1faa532dba0bb27d8ed79f73aebbd76c3acddd2b689023b649665f4b70f72a9495805ffa8de888bb35c1898e78"; + sha512 = "530ffadeba0627ed67af234b282c670c52f8dfee77ba6b43f86e97409d67dee0cc1895ddb8b94c076de8280bba1931427064b5a6f3d9e43892e009fa52dd4070"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/pa-IN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/pa-IN/firefox-57.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "97babdc8ea4541d2a2fe07b0c258d636329a03643ff411c1ed752ec949946b6459f7fd21ddd2a688653f788e30fc166c381dbfef238c0437ce276a0fca80323e"; + sha512 = "bb66b9942c6ec1132b70eb54da3b4d9b918cf44e55e6099571c7df4bfcb670a89c4dd5059cc8402002234bd075643a6d6078a1d8b668a5bac28db3f23e6b388e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/pl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/pl/firefox-57.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "733b22d43c15bc0eba1918a3177654b0742d480bb8891f3ed817c7dcc70e084feb505b6b1c12fed103b73136a74138771fb3a23a0018786cd4cf16f9b745c281"; + sha512 = "146afe4d60e53b7da1f02588f9a6e3b2f6b5d8df81b7a9c857a9d071874dec633b59d7a14dfd2f4a82d9be2eaf1999b4ded98c326add899bbcf825b2c660b9ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/pt-BR/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/pt-BR/firefox-57.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "fff3d62b5d85448f8ae5ad30deff720912a5d8efa5838d908a68d97b3bce84164df57f387068b0e10b51469c5bbec9cbb1602279d0937f6cd211072a1222c8a8"; + sha512 = "b24382c3a8badbae0d2b1c4814a3247c66031ed8a9044979dc59117b7d2bff99d08cfaa238b6ab470d34a5625723dde668beca6dce7601e7184bc3afc7d07050"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/pt-PT/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/pt-PT/firefox-57.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "c49d00cf50d5e6cc8c46e43aa2ef7879c7cdd92783a6834fce58450c8c93553062af060995a2fa8d3e9b5c288fed3522704213d482b60014091569bf12815f81"; + sha512 = "bdbb14b3bd0bcee1182454b54f1c6193e282b3317e715dbe0e1c5314789aefaca248615c1061582e0b3b901173250926e0eababeb4a640865f00dbeafb40e9df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/rm/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/rm/firefox-57.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "5a5e383a1e8f95f938b12ae6509076c595709c737a02f8ca40838e638ecc79112aa25c9277086d13c6d7a00d6bc316c809273c8157cf7970c8b4481c5fd7ca4a"; + sha512 = "84820d377d569c7bc55060b9c1c17f7a2b37f2ee7b079f76515d2b66cb5bd4860a96f840393a75c01e30a21350ffff22c8c00195c341778188be53c5f0f05828"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ro/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ro/firefox-57.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "48392338e19fe9bd0b0094b0247e9d9272fc6ca518e1fadfe628e9607d2e1aa2db9e11895fc835dd4cc1bb6e196960afe601354a24885a3ddeef211f2632af04"; + sha512 = "1b00c3f902993a10f764a258c3317c55fa8fb1461a5d88fca8fc24538dc6ccf9e87026410f196900bf2f4d58b2baa725f3c9257d800040b750eb99b7a080e433"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ru/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ru/firefox-57.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "6543a2002291a87f91d224d223a8f292da4f8137b5916db7bb6d2182fbc23b3047133d3cce311275938317bc85ca992d3158d845797509ebdb765c4db76a5324"; + sha512 = "24b28fbf5031c87ac9051208e931f712fb1edc22edcaf632e7e42e79fcc93a7e75fd336497eeb3ecc1049b0088f75a28f4671f94308feabdf6cefa01490fd26b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/si/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/si/firefox-57.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "1aa8bb875f28bbb99c8ba228485e612f8eb2d449d6518cb88268ae8cf31b572762353a210ad532ac9328bc5266b2710946aebbc39070ed98df633ad5b15ee589"; + sha512 = "946a782caa0da5897cdb776b8256b7c1bca6084b73e27075046232e2361e2a402decbafff916ce1196bf12d4ddde73dee4c32bf9fc3af28b6294f7079e744e47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/sk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/sk/firefox-57.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "ef926b5a984d0f2027cebb405fd48486f1a79595f16f26f74a2f13083453ce5b94e5b123c959101e8b63a9af558f816a2af806cc9f2c87b9f2c3278369e52411"; + sha512 = "a61de035d6c3fbd5d2765f66e3cc0b43b55ec570f841fab19ce28949f68121ffa578db01b89c707e62558dd34e4633de03dd5d9050d805a50e2e22ba2d6cbb06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/sl/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/sl/firefox-57.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "1447deb0e0d97e1a06d795cf66c604301b0c88fb248e96dcee23ffe6954effe11c12bb41706728c4b69f0f807b9f8e7aba6c9535b779a701ce41fbf26cd6a3c5"; + sha512 = "edfc9a836efd8b1a168f1950e47f26c5eb22d7c3e7faf8c6411171271cc0c6c1b7efdc107aeb154b03506ee6997c7805a9f40cc3bb7953a42b952e803988a2c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/son/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/son/firefox-57.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "94c4c28b782268f37601188013957d95fda818d56b242bcd9d4575a787f4aca057c5970bafeebd31a6f31dfc72dd48c07b50fcc20d70ed9926e280b23661ec84"; + sha512 = "e13065f25c6212a9f46cec484c4b532e7c8d7e2985b61f00985a6c03d4f579c057332a889280a07f04a8a73010ac9b07214494913f9dbaf23668d5282f1f37c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/sq/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/sq/firefox-57.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "7fb22a303bb016c37322bbbc3d4170b96d54cdac6e1ce61e48dabd868800b01009263ad69052d919823eb2c104ca41ebadebd00808c581c7eebbd3e82e2ff810"; + sha512 = "fb4820cb33efb10211507ff61caedd569fda0d8c59a49de61bd3c6bc1546865084daa0c477ea1b213c6089eea5508b5e11610df81411b5bbccdd10760ba46daa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/sr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/sr/firefox-57.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "991f3c6aeb48db23a4a569a5f51f22aebaa60b5ed6da149818c2a01dd40256eaebecc738e8623d3662ee9633e04581c4c4033461ac23694f81360e980b2ab406"; + sha512 = "898ca5ad052760db2f4115c7215107ff77295ff56a33e7b9141a491a6a228be88f9c94cf7dab6938c886137ea3aad6e2e4b01db87122c4c05830bdd6a75fc05d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/sv-SE/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/sv-SE/firefox-57.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "381667c64722d04fb102d3d1deee0c13805d4271adb801b5176b9fe842c3916a4ae926dc56256552cc309729e5a0a16d82188b79210c4901e8c4f6d4e2930260"; + sha512 = "55c6e54b316f4649e99d305bae059ca844ee48052ce4e89aac75fb850a0f5e255fdc1654fabff7d3fa1de88092f940f3c77f7c142096a76184a0bed668cd254f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ta/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ta/firefox-57.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "099d94a7f35bb7a6c59e34c0ea500ca4f98a473ee52b3e33e10a085693d09ad0904c4dff4097b0d80cfd43f31cf9e05e300c40482aaecb83ee59d6fdb21d20fb"; + sha512 = "b90c2da5176a07a25521ad510cd77da9171e57608517c89c5a056294fc5237a967355d66979840672bdafe62324405db0da7dd4d6f25ab7b28b37f44f737a5d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/te/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/te/firefox-57.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "506c2538ed1a421631f9492894941ecd022ac3f085673c1447bac8f7c52c7dbe91854ff76efc7964f875444fdb83b54bbabf5c96f217cac6f61107af3ec65545"; + sha512 = "86dc71e9df0524ee3219b614154373a473a54f1132ca5c3997125f28cfb3db2710f630a4d614ddfb0765eb58292d33ee328abdbcc8fd8485f79501f68fcb52cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/th/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/th/firefox-57.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "61ee3a8271478647e2d957e5a8304d88a68438043f6ffdb006c5935700856f7fb16d9ffe65785fde03926743c4c5713bde934383887d81d7e684ae6da14e8776"; + sha512 = "f1a8fdbe928fefb9c7118c3066521cac4dc45819423c687b12576003db9aa318df5a818ed5c56842b3855009974d3fe7a208493614607771813bca29e655be73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/tr/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/tr/firefox-57.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "2204991ea8ff6f06bf9a4aa9de2f395fc7cb88fcbb837476c5dbe2556cfcbcf361934f840b293e09d11e33427d22cd8fec44821779ee671a19e0aa577d9bb2cb"; + sha512 = "1611f4fc7e935d7e5fe8fe7ec08e7dfce1fc9cc82814d39077d7c4a32913dbaa6307131833da8665bc8c01b248c437f826e10fdf2db8859ce788f39fd4c20d6a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/uk/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/uk/firefox-57.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "d550a3637e8a135b750e0932be53b40adcd2b17073a08dee6d02357b679a088d04f8ca1ddee41cd6370da2d611fe4981a70b2f38caf7e8a5bf1145ce94923307"; + sha512 = "271f54090f7e31dc84c4b8298e4db752a12d3eef7b267aac9ec1ed9958baa78cc6178395ff54306b548163acd5428077423ce0cfa5c69449029cb026aa2a8dc5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/ur/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/ur/firefox-57.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "606f376a7fbfce145cc911fa126b3c4bf7d67d5eda3ad6b82b846e6580b2bdaeed7b2ef4a72d5175a1fb7f5f3327b24d028186ce409d82d5b33f2bdc6bbff336"; + sha512 = "51fa2ee142181727c92fac9044068d28cba20e9c88a1bdac27f2a3b58139ed826a73d7b5a3fff23a0228b964f497e0aec3512a809222fffeec0dce6fa06e4e8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/uz/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/uz/firefox-57.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "aa13daf900c1f1557c3c481bf3bfd0eaed7af46b6a1e9c42da6c1c2be160882a02be9eaf62ada680a1f1124e4afff032c4d50057564cc5b2a5b8985039cbb260"; + sha512 = "324696a348ae491f9b3d51a3880a6dec8e78017ac38b613b8c4d405cc7e4a91dcae4191701be821a693eca4d7726b841a0cd8d9e8163a09a5db754896b6526cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/vi/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/vi/firefox-57.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "faa306348b89a9434a3a9068a3a128a9583ebbe647a9d22e5ef9d9b581efee8520f6f76b7590d27d0347c2db34f3d35770f2bdea5c1b6ba73f2c849f228212bc"; + sha512 = "c118e1695938881be2f7c4dfe34273fcd5d8cd6bfa300758de67b220d0f77c8e2d669af8805717dd5ff42ee37e35e3997a37f023361301816243434fe3930a5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/xh/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/xh/firefox-57.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b15a5f62c4dab9e44c620b18d23879886f13807ce8d0008fec028d40f652ba11c75c13cf6f86dbe044afc855d24694872d1ff5502cc82dbc31b75454321a755b"; + sha512 = "44ae616c12b08e2a962944af56ad5ff5845dd44f67cbd634451b3ad5bfb254e91b02b4b73b3d131d88ab0ed7240458312187e1744b4409e6b8012a0bbc809eb1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/zh-CN/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/zh-CN/firefox-57.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "92deabe9058262a81c465b370b128b08872dabd87b527dc524ff3035d2b5068d40f15705449f5fac8df2e1ca291b91af795844154cb7ee37d5d620f952b7d4a2"; + sha512 = "0f39b59fadc0a1ffb5a34dc99db1b6f0c4cb4b3f839a36643d8ca0fa7eaffbb8e638f9f95f5fdcaee09671c6a28f4fdc14e7123aaf8de51dbe3ad2a69cd83a5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b6/linux-i686/zh-TW/firefox-57.0b6.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/57.0b8/linux-i686/zh-TW/firefox-57.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "dd7266ba6bda17fd0194edd2855f1e1484758182a1c5c4ce14cabb046af31b277b2b385b47f6b368c6ba9840a3138416a0a787494cf7382827ff9bcb39b23655"; + sha512 = "57ebfa7473bed8bac3682f74ef66a1235c9be500c5048ecebaf56bd97513bed69a38c69f098296133f842f1243fb46a845816b56ee637764155eb9e36cb59b3d"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 1b72f9e18c30..b8f57eb2edb8 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -19,6 +19,7 @@ , pulseaudioSupport ? true, libpulseaudio , ffmpegSupport ? true, gstreamer, gst-plugins-base , gtk3Support ? !isTorBrowserLike, gtk2, gtk3, wrapGAppsHook +, gssSupport ? true, kerberos ## privacy-related options @@ -72,7 +73,8 @@ stdenv.mkDerivation (rec { ++ lib.optional alsaSupport alsaLib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optionals ffmpegSupport [ gstreamer gst-plugins-base ] - ++ lib.optional gtk3Support gtk3; + ++ lib.optional gtk3Support gtk3 + ++ lib.optional gssSupport kerberos; NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; @@ -128,7 +130,8 @@ stdenv.mkDerivation (rec { "--disable-gconf" "--enable-default-toolkit=cairo-gtk${if gtk3Support then "3" else "2"}" ] - ++ lib.optionals (stdenv.lib.versionAtLeast version "56") [ + ++ lib.optionals (stdenv.lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [ + # on i686-linux: --with-libclang-path is not available in this configuration "--with-libclang-path=${llvmPackages.clang-unwrapped}/lib" "--with-clang-path=${llvmPackages.clang}/bin/clang" ] @@ -155,6 +158,7 @@ stdenv.mkDerivation (rec { ++ flag alsaSupport "alsa" ++ flag pulseaudioSupport "pulseaudio" ++ flag ffmpegSupport "ffmpeg" + ++ flag gssSupport "negotiateauth" ++ lib.optional (!ffmpegSupport) "--disable-gstreamer" ++ flag webrtcSupport "webrtc" ++ flag geolocationSupport "mozril-geoloc" @@ -219,6 +223,7 @@ stdenv.mkDerivation (rec { gtk = gtk2; inherit nspr; inherit ffmpegSupport; + inherit gssSupport; } // lib.optionalAttrs gtk3Support { inherit gtk3; }; } // overrides) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 4b3322140419..d9c55bb87686 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -113,6 +113,7 @@ in rec { } // commonAttrs) { stdenv = overrideCC stdenv gcc5; ffmpegSupport = false; + gssSupport = false; }; tor-browser-7-0 = common (rec { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 2413f1cfdca8..7a7d1368cb23 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -9,6 +9,7 @@ , esteidfirefoxplugin , vlc_npapi , libudev +, kerberos }: ## configurability of the wrapper itself @@ -25,6 +26,7 @@ let cfg = stdenv.lib.attrByPath [ browserName ] {} config; enableAdobeFlash = cfg.enableAdobeFlash or false; ffmpegSupport = browser.ffmpegSupport or false; + gssSupport = browser.gssSupport or false; jre = cfg.jre or false; icedtea = cfg.icedtea or false; @@ -46,6 +48,7 @@ let ++ lib.optional (cfg.enableVLC or false) vlc_npapi ); libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) + ++ lib.optional gssSupport kerberos ++ lib.optionals (cfg.enableQuakeLive or false) (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 559c08ad4f38..f26e815764f7 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "27.0.0.130"; + version = "27.0.0.159"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1sj06x4kfwxi9cnc8adjkxk6p81acl39l2idnyqb429l2s84d1d9" + "0fgz1aszihjrxpzyrs29wr11imfgnyfb2ca9c1i3n6k9wpwv926p" else - "0f9vzdn523m408sw76r32zqf7d86l2mhcfsszbfh2bixg8p2cxzz" + "052dx764b6cfbc7mkxckcr3hbwd5b7l98cp3jqmddkllv4w4h6dp" else if arch == "x86_64" then - "0qkdabcnqfpbfsbs8ssms9xk2pqvps6fbasvcyvhnywclra25ggc" + "1p136zn059hp59j0llk7rfsybjx51qjz2h5sd4xl8zqbs0szynid" else - "0qkwkc6s4ganja4b2jsz4yff0bziirvbzxg0wyf648hqlb3bw5a6"; + "06l8rjnhpqip6ikc97rf3zsgmy381q4wgzyl9rsjwlvhpgqdlhrl"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 7c0125ea1234..4d52047f16cb 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "27.0.0.130"; + version = "27.0.0.159"; src = fetchurl { url = @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/27/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0gqm90j8czjnzar3ia65msd18kydjhgq5l9iv1difgm8lqji5ii0" + "0h9jpkdkf4kvr2sg61r6pkwcdyf4z3qdj0nlnm27whac9w56jjpj" else - "1agplangzlrp326dhz3xcvi6i325a644ggrh8g0cmgq9nfcpssnb"; + "013a0ar5afm62bk7f4s89235bx36n75z65b3afv941jajijiacc9"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 4f179c29996f..d5e6e47e9285 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { name = "palemoon-${version}"; - version = "27.4.2"; + version = "27.5.0"; src = fetchFromGitHub { name = "palemoon-src"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = version + "_Release"; - sha256 = "155c1a76kkx9p8cnz9d33xx30asjr32x10cccx0gyq1lm1b9ffbl"; + sha256 = "0m4fgwxn6hs8r240i6acaajx76cvqy1b7cqmdsxd33qpjrrj1h9d"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 025e4522f065..a94b0973949f 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -2,10 +2,13 @@ , qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, pyopengl, cssutils, glib_networking , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt , gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav -, qtwebkit-plugins -, withWebEngineDefault ? false +, qtwebkit-plugins ? null +, attrs +, withWebEngineDefault ? true }: +assert (! withWebEngineDefault) -> qtwebkit-plugins != null; + let pdfjs = stdenv.mkDerivation rec { name = "pdfjs-${version}"; @@ -26,29 +29,30 @@ let in buildPythonApplication rec { name = "qutebrowser-${version}"; - version = "0.11.0"; + version = "1.0.1"; namePrefix = ""; src = fetchurl { url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz"; - sha256 = "13ihx66jm1dd6vx8px7pm0kbzf2sf9x43hhivc1rp17kahnxxdyv"; + sha256 = "1gphn8a0xfy5iqiznvgd6fbbzp7r5sp697ayfwnvllvmbr5az9vs"; }; # Needs tox doCheck = false; buildInputs = [ - qtbase qtwebkit-plugins + qtbase gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav glib_networking - ]; + ] + ++ lib.optional (! withWebEngineDefault) qtwebkit-plugins; nativeBuildInputs = [ makeWrapper wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; propagatedBuildInputs = [ - pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl + pyyaml pyqt5 jinja2 pygments pypeg2 cssutils pyopengl attrs ]; postPatch = '' @@ -62,7 +66,7 @@ in buildPythonApplication rec { postInstall = '' install -Dm644 doc/qutebrowser.1 "$out/share/man/man1/qutebrowser.1" - install -Dm644 qutebrowser.desktop \ + install -Dm644 misc/qutebrowser.desktop \ "$out/share/applications/qutebrowser.desktop" for i in 16 24 32 48 64 128 256 512; do install -Dm644 "icons/qutebrowser-''${i}x''${i}.png" \ @@ -73,8 +77,8 @@ in buildPythonApplication rec { install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/* ''; - postFixup = lib.optionalString withWebEngineDefault '' - wrapProgram $out/bin/qutebrowser --add-flags "--backend webengine" + postFixup = lib.optionalString (! withWebEngineDefault) '' + wrapProgram $out/bin/qutebrowser --add-flags "--backend webkit" ''; meta = { diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/applications/networking/cluster/kanif/default.nix index bac0cc37af33..5b543854473d 100644 --- a/pkgs/applications/networking/cluster/kanif/default.nix +++ b/pkgs/applications/networking/cluster/kanif/default.nix @@ -4,8 +4,6 @@ stdenv.mkDerivation rec { version = "1.2.2"; name = "kanif-${version}"; - propagateBuildInputs = [ perl taktuk ]; - src = fetchurl { url = "http://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz"; sha256 = "3f0c549428dfe88457c1db293cfac2a22b203f872904c3abf372651ac12e5879"; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index e76d3cf5d08c..cff68c5227ae 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -18,13 +18,13 @@ with lib; stdenv.mkDerivation rec { name = "kubernetes-${version}"; - version = "1.7.1"; + version = "1.7.8"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1frf2nxk45lsbkq73fj72gxgr76icqdrsdqh20f5gpwiqn23n7c3"; + sha256 = "1xfvfdn04wn7ldmr5ypnyi99gsrgz1w8l02jnvyalpdnjbj73b89"; }; buildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index b601bb00c200..32c697ea83ac 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -23,7 +23,7 @@ let in buildGoPackage rec { pname = "minikube"; name = "${pname}-${version}"; - version = "0.22.2"; + version = "0.22.3"; goPackagePath = "k8s.io/minikube"; @@ -31,7 +31,7 @@ in buildGoPackage rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "04h0hp0mkps3ilcig6xnmp41rlgaxhhpxakc86lsknvkk9kmrx89"; + sha256 = "0jcfw0yrd4vqyiyhg15cy2knn2fjw91das8id4famz5gl6dnlm28"; }; # kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix index cf7e4fdcb140..b681f74ed222 100644 --- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix +++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix @@ -36,6 +36,11 @@ stdenv.mkDerivation rec { url = "https://github.com/akrennmair/newsbeuter/commit/26f5a4350f3ab5507bb8727051c87bb04660f333.patch"; sha256 = "1jjxj4z3s4f1n8rfpwyd42a40gjnziykqas6a26s1lsdkklnbp6q"; }) + # https://github.com/akrennmair/newsbeuter/issues/591 / CVE-2017-12904 + (fetchpatch { + url = "https://github.com/akrennmair/newsbeuter/commit/d1460189f6f810ca9a3687af7bc43feb7f2af2d9.patch"; + sha256 = "1a8k73ckziszsbdwdhcmkfvlmgy955gssg9v4sqvg20v91l5rmai"; + }) ]; installFlags = [ "DESTDIR=$(out)" "prefix=" ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix index c4ec4b2614c2..07cf66e572a7 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "purple-hangouts-hg-${version}"; - version = "2016-12-22"; + version = "2017-10-08"; src = fetchhg { url = "https://bitbucket.org/EionRobb/purple-hangouts/"; - rev = "754e3bb971cfe913b90c7fd028fe47a42f9e83cb"; - sha256 = "0b826hj5jgfdckzh9wyycxxhpyxhrhxm3n0mhaf3f57gqarriics"; + rev = "5e769791d282a6e5ae4d94dc66a1ff9d6904ec9c"; + sha256 = "0cs7dcd44lkc2anradyddjvmfvnl46ixw4idaf1m9fd7j35mg7b1"; }; buildInputs = [ pidgin glib json_glib protobuf protobufc ]; diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix index f112d5f61105..441bc020868e 100644 --- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix +++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix @@ -9,7 +9,7 @@ in python3Packages.buildPythonPackage { sha256 = "e0d1cb72115d0fda17db92d28be51558ad8fe250972683fac3086dbe8d350d22"; }; - propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python ]; + propagatedBuildInputs = with python3Packages; [ pyqt5 dbus-python jsmin ]; meta = with stdenv.lib; { description = "Non-official desktop client for Slack"; diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 8ba53b343f30..0324012b278b 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,31 +1,30 @@ -{ stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime, webkitgtk24x-gtk3 +{ stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime3, webkitgtk24x-gtk3 , libsass, notmuch, boost, wrapGAppsHook }: stdenv.mkDerivation rec { name = "astroid-${version}"; - version = "0.9.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "astroidmail"; repo = "astroid"; rev = "v${version}"; - sha256 = "0ha2jd3fvc54amh0x8f58s9ac4r8xgyhvkwd4jvs0h4mfh6cg496"; + sha256 = "0y1i40xbjjvnylqpdkvj0m9fl6f5k9zk1z4pqg3vhj8x1ys8am1c"; }; nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; - buildInputs = [ gnome3.gtkmm gmime webkitgtk24x-gtk3 libsass gnome3.libpeas - notmuch boost gnome3.gsettings_desktop_schemas - gnome3.adwaita-icon-theme ]; + buildInputs = [ gnome3.gtkmm gmime3 webkitgtk24x-gtk3 libsass gnome3.libpeas + notmuch boost gnome3.gsettings_desktop_schemas ]; buildPhase = "scons --propagate-environment --prefix=$out build"; installPhase = "scons --propagate-environment --prefix=$out install"; - meta = { + meta = with stdenv.lib; { homepage = https://astroidmail.github.io/; description = "GTK+ frontend to the notmuch mail system"; - maintainers = [ stdenv.lib.maintainers.bdimcheff ]; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + maintainers = with maintainers; [ bdimcheff SuprDewd ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 6b8cf89fc75b..281bc690bad5 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -1,9 +1,12 @@ -{ stdenv, fetchurl, gettext, gtk3, python2Packages +{ stdenv, fetchurl, gettext, gtk3, pythonPackages , gdk_pixbuf, libnotify, gst_all_1 -, libgnome_keyring3 ? null, networkmanager ? null +, libgnome_keyring3, networkmanager +, wrapGAppsHook, gnome3 +, withGnomeKeyring ? false +, withNetworkManager ? true }: -python2Packages.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "mailnag-${version}"; version = "1.2.1"; @@ -13,26 +16,20 @@ python2Packages.buildPythonApplication rec { }; buildInputs = [ - gettext gtk3 python2Packages.pygobject3 python2Packages.dbus-python - python2Packages.pyxdg gdk_pixbuf libnotify gst_all_1.gstreamer + gettext gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad libgnome_keyring3 networkmanager - ]; - - preFixup = '' - for script in mailnag mailnag-config; do - wrapProgram $out/bin/$script \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" \ - --prefix PYTHONPATH : "$PYTHONPATH" - done - ''; + gst_all_1.gst-plugins-bad + gnome3.defaultIconTheme + ] ++ stdenv.lib.optional withGnomeKeyring libgnome_keyring3 + ++ stdenv.lib.optional withNetworkManager networkmanager; - buildPhase = ""; + nativeBuildInputs = [ + wrapGAppsHook + ]; - installPhase = "python2 setup.py install --prefix=$out"; + propagatedBuildInputs = with pythonPackages; [ + pygobject3 dbus-python pyxdg + ]; doCheck = false; diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index e18d95dc1220..a6cd17878b0c 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,30 +1,23 @@ { stdenv, fetchFromGitHub, which, autoreconfHook, ncurses, perl -, cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl }: +, cyrus_sasl, gss, gpgme, kerberos, libidn, notmuch, openssl, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42 }: stdenv.mkDerivation rec { - version = "20170912"; + version = "20171013"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "0qndszmaihly3pp2wqiqm31nxbv9ys3j05kzffaqhzngfilmar9g"; + sha256 = "0zn8imqfa76bxpkpy111c4vn6vjarbxc8gqv6m18qkksk0ly26l1"; }; - nativeBuildInputs = [ autoreconfHook docbook_xsl libxslt.bin which ]; + nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_42 libxslt.bin which ]; buildInputs = [ cyrus_sasl gss gpgme kerberos libidn ncurses notmuch openssl perl lmdb ]; - postPatch = '' - for f in doc/*.xsl ; do - substituteInPlace $f \ - --replace http://docbook.sourceforge.net/release/xsl/current ${docbook_xsl}/share/xml/docbook-xsl - done - ''; - configureFlags = [ "--enable-debug" "--enable-gpgme" diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix new file mode 100644 index 000000000000..dbdd64d06b5e --- /dev/null +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, gawk, mercury, pandoc, ncurses, gpgme }: + +stdenv.mkDerivation rec { + name = "notmuch-bower-${version}"; + version = "2017-09-27"; + + src = fetchFromGitHub { + owner = "wangp"; + repo = "bower"; + rev = "e4918ed581984bf2813f51f007a0aaaa7fa0da7f"; + sha256 = "13np5yharjik1pp23cfgffi0g0ikl6pl5sqqyy0ki7gk7gyy913i"; + }; + + nativeBuildInputs = [ gawk mercury pandoc ]; + + buildInputs = [ ncurses gpgme ]; + + makeFlags = [ "PARALLEL=-j$(NIX_BUILD_CORES)" "bower" "man" ]; + + installPhase = '' + mkdir -p $out/bin + mv bower $out/bin/ + mkdir -p $out/share/man/man1 + mv bower.1 $out/share/man/man1/ + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://github.com/wangp/bower; + description = "A curses terminal client for the Notmuch email system"; + maintainers = with maintainers; [ erictapen ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index c656ff24df84..0645e9cb6061 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -20,9 +20,11 @@ , fontconfig , gtk_engines , alsaLib +, libidn +, zlib }: -let versionRec = { major = "13"; minor = "4"; patch = "0"; }; +let versionRec = { major = "13"; minor = "7"; patch = "0"; }; in stdenv.mkDerivation rec { name = "citrix-receiver-${version}"; version = with versionRec; "${major}.${minor}.${patch}"; @@ -31,11 +33,14 @@ in stdenv.mkDerivation rec { prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86"; src = with versionRec; requireFile rec { - name = "${prefixWithBitness}-${version}.10109380.tar.gz"; + name = + if stdenv.is64bit + then "${prefixWithBitness}-${version}.10276927.tar.gz" + else "${prefixWithBitness}-${version}.10276925.tar.gz"; sha256 = if stdenv.is64bit - then "133brs0sq6d0mgr19rc6ig1n9ahm3ryi23v5nrgqfh0hgxqcrrjb" - else "0r7jfl5yqv1s2npy8l9gsn0gbb82f6raa092ppkc8xy5pni5sh7l"; + then "18fb374b9fb8e249b79178500dddca7a1f275411c6537e7695da5dcf19c5ba91" + else "4c68723b0327cf6f12da824056fce2b7853c38e6163a48c9d222b93dd8da75b6"; message = '' In order to use Citrix Receiver, you need to comply with the Citrix EULA and download the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from: @@ -79,6 +84,8 @@ in stdenv.mkDerivation rec { xlibs.libXinerama xlibs.libXfixes libpng12 + libidn + zlib gtk_engines freetype fontconfig diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 4e3f0a684239..f2ffcac452ea 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }: stdenv.mkDerivation rec { - version = "0.14.38"; + version = "0.14.39"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0afid083azvrihv1v2cas09dprr2fflmj9gi7iy18gvwy2pg0jj8"; + sha256 = "0bq2vdfnl77qldg1zvfhdbmhsj80qz8pds4slqlwjmmjmk19sqnh"; }; buildInputs = [ go removeReferencesTo ]; diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix index c83d9a2fcd00..e33501a17158 100644 --- a/pkgs/applications/networking/syncthing/inotify.nix +++ b/pkgs/applications/networking/syncthing/inotify.nix @@ -25,8 +25,6 @@ buildGoPackage rec { substitute $src/etc/linux-systemd/user/syncthing-inotify.service \ $bin/lib/systemd/user/syncthing-inotify.service \ --replace /usr/bin/syncthing-inotify $bin/bin/syncthing-inotify - '' + stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/syncthing-inotify ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index bf1623e28cf7..ded8749f10dc 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -19,7 +19,7 @@ let "8.5pl3" = "15c3rdk59nifzihsp97z4vjxis5xmsnrvpb86qiazj143z2fmdgw"; "8.6" = "148mb48zpdax56c0blfi7v67lx014lnmrvxxasi28hsibyz2lvg4"; "8.6.1" = "0llrxcxwy5j87vbbjnisw42rfw1n1pm5602ssx64xaxx3k176g6l"; - "8.7+beta1" = "006rn5896pf39p4z9c6d4xj4zm80j4b67v5gwcixd63msrjqkmxp"; + "8.7+beta2" = "1r274m44z774xigvj43g211ms9z9bwgyp1g43rvq4fswb3gzxc4b"; }."${version}"; coq-version = builtins.substring 0 3 version; camlp5 = ocamlPackages.camlp5_strict; diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix index 65a0f72da5eb..c7108d749061 100644 --- a/pkgs/applications/science/logic/cubicle/default.nix +++ b/pkgs/applications/science/logic/cubicle/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, ocaml, ocamlPackages }: +{ stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { name = "cubicle-${version}"; - version = "1.0.2"; + version = "1.1.1"; src = fetchurl { url = "http://cubicle.lri.fr/cubicle-${version}.tar.gz"; - sha256 = "1fg39vlr2d5067512df32hkw6g8vglxj1m47md5mw3pn3ij6dpsx"; + sha256 = "1sny9c4fm14k014pk62ibpwbrjjirkx8xmhs9jg7q1hk7y7x3q2h"; }; - buildInputs = [ ocaml ocamlPackages.functory ]; + postPatch = '' + substituteInPlace Makefile.in --replace "\\n" "" + ''; + + buildInputs = with ocamlPackages; [ ocaml findlib functory ]; meta = with stdenv.lib; { description = "An open source model checker for verifying safety properties of array-based systems"; homepage = http://cubicle.lri.fr/; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ lucas8 ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix index a4b552bcca37..d68430714deb 100644 --- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix @@ -1,39 +1,41 @@ -{ stdenv, fetchFromGitHub, pandoc }: - -stdenv.mkDerivation rec { +{ stdenv +, fetchFromGitHub +, openssl +, gcc +, zlib +, libssh +, cmake +, perl +, pkgconfig +, rustPlatform +}: + +with rustPlatform; + +buildRustPackage rec { name = "git-dit-${version}"; - version = "0.1.0"; - - buildInputs = [ pandoc ]; + version = "0.4.0"; src = fetchFromGitHub { owner = "neithernut"; repo = "git-dit"; rev = "v${version}"; - sha256 = "1rvp2dhnb8yqrracvfpvf8z1vz4fs0rii18hhrskr6n1sfd7x9kd"; + sha256 = "1sx6sc2dj3l61gbiqz8vfyhw5w4xjdyfzn1ixz0y8ipm579yc7a2"; }; - # the Makefile doesn’t work, we emulate it below - dontBuild = true; - - postPatch = '' - # resolve binaries to the right path - sed -e "s|exec git-dit-|exec $out/bin/git-dit-|" -i git-dit + depsSha256 = "1z2n3z5wkh5z5vc976yscq77fgjszwzwlrp7g17hmsbhzx6x170h"; - # we change every git dit command to the local subcommand path - # (git dit foo -> /nix/store/…-git-dit/bin/git-dit-foo) - for script in git-dit-*; do - sed -e "s|git dit |$out/bin/git-dit-|g" -i "$script" - done - ''; + nativeBuildInputs = [ + cmake + pkgconfig + perl + ]; - installPhase = '' - mkdir -p $out/{bin,share/man/man1} - # from the Makefile - ${stdenv.lib.getBin pandoc}/bin/pandoc -s -t man git-dit.1.md \ - -o $out/share/man/man1/git-dit.1 - cp git-dit* $out/bin - ''; + buildInputs = [ + openssl + libssh + zlib + ]; meta = with stdenv.lib; { inherit (src.meta) homepage; @@ -41,6 +43,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ profpatsch matthiasbeyer ]; }; - - } diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index bf089a03fa0f..0463081fa4bc 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { name = "git-lfs-${version}"; - version = "2.2.1"; - rev = "621d1f821f73efcedc829dda43fd9c1fcf07c6ab"; + version = "2.3.3"; + rev = "c9d3beb098254f067680a5ccbb8742387f81d82e"; goPackagePath = "github.com/git-lfs/git-lfs"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "00wc4gjs4yy2qld1m4yar37jkw9fdi2h8xp25hy2y80cnyiafn7s"; + sha256 = "1hzpzbm46f45vh5liijpyppfcmr7wycnsa09vmilq0wm341ivnsf"; }; preBuild = '' diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 1522f348ca1a..a86a7f96e097 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -29,9 +29,7 @@ buildGoPackage rec { outputs = [ "bin" "out" "data" ]; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib $bin/bin/gogs - '' + '' + postInstall = '' mkdir $data cp -R $src/{public,templates} $data diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index 39a85a03199d..ebc1249dc11d 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { sha256 = "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5"; }; + # Fixup build with icu-59 + postPatch = "sed '1i#include <unicode/unistr.h>' -i src/utils.cpp"; + buildInputs = with stdenv.lib; [ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa libass fftw ffms ffmpeg zlib icu boost boost.out libiconv diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 442e9d8eeb34..2d7f7144f5ff 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -10,13 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "15.0.0"; + version = "16.0.0"; src = fetchFromGitHub { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "06n0hbp484zpsjvnzp6p0nzzssym3illxdicn3y1jf8gy971rxi0"; + sha256 = "0zdmjp0f7sh0bkaj0ls4sy4sg9qdq9ycrl18hlkafnj9xnbijgnn"; }; nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ]; diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index a5d02093e3f6..5e92c52e521b 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -2,6 +2,7 @@ , xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl , configFile ? null, lib , rev, sha256, version +, playerctl }: stdenv.mkDerivation { @@ -20,6 +21,7 @@ stdenv.mkDerivation { buildInputs = [ cairo gdk_pixbuf libconfig pango xcbutilwm docbook_xsl alsaLib wirelesstools asciidoc libxslt makeWrapper + playerctl ]; postPatch = '' @@ -28,7 +30,7 @@ stdenv.mkDerivation { --replace "a2x" "${asciidoc}/bin/a2x --no-xmllint" ''; - makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ]; + makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" "PLAYERCTL=1" ]; postInstall = '' mkdir -p $out/share/yabar/examples diff --git a/pkgs/applications/window-managers/yabar/unstable.nix b/pkgs/applications/window-managers/yabar/unstable.nix index 6baa7ae5c036..b704c480d668 100644 --- a/pkgs/applications/window-managers/yabar/unstable.nix +++ b/pkgs/applications/window-managers/yabar/unstable.nix @@ -2,9 +2,9 @@ let overrides = { - version = "unstable-2017-09-09"; + version = "unstable-2017-10-12"; - rev = "d3934344ba27f5bdf122bf74daacee6d49284dab"; - sha256 = "14zrlzva8i83ffg426mrf6yli8afwq6chvc7yi78ngixyik5gzhx"; + rev = "cbecc7766e37f29d50705da0a82dc76ce7c3b86e"; + sha256 = "1wprjas3k14rxfl06mgr0xq2ra735w1c7dq4xrdvii887wnl37xb"; } // attrs; in callPackage ./build.nix overrides diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh index bbab3c43d6f8..232e1245af07 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -171,11 +171,13 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then done done - if [ -n "${NIX_COREFOUNDATION_RPATH:-}" ]; then - extraAfter+=(-rpath $NIX_COREFOUNDATION_RPATH) - fi fi +# This is outside the DONT_SET_RPATH branch because it's more targeted and we +# usually want it (on Darwin) even if DONT_SET_RPATH is set. +if [ -n "${NIX_COREFOUNDATION_RPATH:-}" ]; then + extraAfter+=(-rpath $NIX_COREFOUNDATION_RPATH) +fi # Only add --build-id if this is a final link. FIXME: should build gcc # with --enable-linker-build-id instead? diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix index e7445186b729..aa7d3d7def4f 100644 --- a/pkgs/data/fonts/inconsolata/lgc.nix +++ b/pkgs/data/fonts/inconsolata/lgc.nix @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "18brmw0h4hjq1m2l0abwc3zmib4rnfalpywdk68djm711zldxr76"; + meta = with stdenv.lib; { description = "Fork of Inconsolata font, with proper support of Cyrillic and Greek"; longDescription = '' diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index c69cc7ae34de..91a7932c2caf 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v"; }; - setSourceRoot = "sourceRoot=`pwd`"; + sourceRoot = "."; nativeBuildInputs = [ fontforge ]; @@ -40,9 +40,14 @@ stdenv.mkDerivation rec { cp *.map $out/share/texmf/fonts/map ''; - meta = { + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "1mj0j0hkp8pn7jcs4pvcan6whba60bfd671g3vhx3s9kxwf7xjvr"; + + meta = with stdenv.lib; { description = "Linux Libertine Fonts"; homepage = http://linuxlibertine.sf.net; - platforms = stdenv.lib.platforms.all; + platforms = platforms.linux; + maintainers = [ maintainers.volth ]; }; } diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix index 5e9a2c219167..77c311ce364c 100644 --- a/pkgs/data/fonts/monoid/default.nix +++ b/pkgs/data/fonts/monoid/default.nix @@ -13,15 +13,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python fontforge ]; - enableParallelBuilding = true; - buildPhase = '' local _d="" local _l="" for _d in {Monoisome,Source}/*.sfdir; do _l="''${_d##*/}.log" echo "Building $_d (log at $_l)" - python Scripts/build.py ${if enableParallelBuilding then "$NIX_BUILD_CORES" else "1"} 0 $_d > $_l + python Scripts/build.py 1 0 $_d > $_l done ''; @@ -31,6 +29,10 @@ stdenv.mkDerivation rec { cp -va Readme.md $out/share/doc ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0lbipgygiva3gg1pqw07phpnnf0s6ka9vqdk1pw7bkybjw3f7wzm"; + meta = with stdenv.lib; { homepage = http://larsenwork.com/monoid; description = "Customisable coding font with alternates, ligatures and contextual positioning"; diff --git a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix index 074fceeac94a..45618972c348 100644 --- a/pkgs/data/fonts/rictydiminished-with-firacode/default.nix +++ b/pkgs/data/fonts/rictydiminished-with-firacode/default.nix @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { }; buildPhase = '' + substituteInPlace apply-feature.py --replace \ + 'ricty = ttLib.TTFont(options.in_font)' \ + 'ricty = ttLib.TTFont(options.in_font, recalcTimestamp=False)' + substituteInPlace build-py3.py --replace \ + 'datetime.date.today()' \ + 'datetime.date.fromtimestamp(float(os.environ["SOURCE_DATE_EPOCH"]))' + make ''; @@ -28,6 +35,10 @@ stdenv.mkDerivation rec { ])) ]; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "09ldviapljn4bb1mcxap2pkz7cq3wr2k2qialbnav5y7ii82acd4"; + meta = with stdenv.lib; { homepage = https://github.com/hakatashi/RictyDiminished-with-FiraCode; description = "The best Japanese programming font meets the awesone ligatures of Firacode"; diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix index 64e01124a67d..092537c216aa 100644 --- a/pkgs/data/fonts/unscii/default.nix +++ b/pkgs/data/fonts/unscii/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { cp *.svg "$out/share/fonts/svg" cp *.woff "$out/share/fonts/web" ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "03zvczdka665zcyf9fjrnx434mwpr5q8396j34kjmc67w7nhc49r"; + meta = { inherit version; description = ''Bitmapped character-art-friendly Unicode fonts''; diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix index c3ba435cbbf9..25431c7f9d70 100644 --- a/pkgs/data/fonts/xits-math/default.nix +++ b/pkgs/data/fonts/xits-math/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { postPatch = '' rm *.otf + + substituteInPlace tools/postprocess.py --replace \ + 'font = ttLib.TTFont(sys.argv[1])' \ + 'font = ttLib.TTFont(sys.argv[1], recalcTimestamp=False)' ''; installPhase = '' @@ -22,6 +26,10 @@ stdenv.mkDerivation rec { cp *.otf $out/share/fonts/opentype ''; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "00xycmb9ka67j5s66nkng53y8q6362igisxz04zb58r2717jk50m"; + meta = with stdenv.lib; { homepage = https://github.com/khaledhosny/xits-math; description = "OpenType implementation of STIX fonts with math support"; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix index 7ff79488a89f..d4cb7bc889d3 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, findXMLCatalogs}: let @@ -12,7 +12,7 @@ let in import ./generic.nix { - inherit stdenv fetchurl unzip; + inherit stdenv fetchurl unzip findXMLCatalogs; name = "docbook-xml-4.1.2"; src = fetchurl { url = http://www.docbook.org/xml/4.1.2/docbkx412.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix index 3875362dcb3d..d2cc69559b86 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv fetchurl unzip; + inherit stdenv fetchurl unzip findXMLCatalogs; name = "docbook-xml-4.2"; src = fetchurl { url = http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix index 19ad49aa9280..e1f9337df941 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv fetchurl unzip; + inherit stdenv fetchurl unzip findXMLCatalogs; name = "docbook-xml-4.3"; src = fetchurl { url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix index 98a1853e4942..1a9d622affc6 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.4.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv fetchurl unzip; + inherit stdenv fetchurl unzip findXMLCatalogs; name = "docbook-xml-4.4"; src = fetchurl { url = http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix index 669536962a12..301b400ac7e1 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl, unzip, findXMLCatalogs}: import ./generic.nix { - inherit stdenv fetchurl unzip; + inherit stdenv fetchurl unzip findXMLCatalogs; name = "docbook-xml-4.5"; src = fetchurl { url = http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix index fc3c4c3c8410..373778d43de6 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, src, name, postInstall ? "true", meta ? {} }: +{ stdenv, fetchurl, unzip, src, name, postInstall ? "true", meta ? {}, findXMLCatalogs }: assert unzip != null; @@ -6,6 +6,7 @@ stdenv.mkDerivation { inherit src name postInstall; builder = ./builder.sh; buildInputs = [unzip]; + propagatedBuildInputs = [ findXMLCatalogs ]; meta = meta // { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index a955f5cf8a48..7bae913ed5e6 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, findXMLCatalogs }: let @@ -10,6 +10,8 @@ let inherit sha256; }; + propagatedBuildInputs = [ findXMLCatalogs ]; + dontBuild = true; installPhase = '' diff --git a/pkgs/desktops/gnome-3/core/libgee/default.nix b/pkgs/desktops/gnome-3/core/libgee/default.nix index 4d59a3f20133..04d9098764f6 100644 --- a/pkgs/desktops/gnome-3/core/libgee/default.nix +++ b/pkgs/desktops/gnome-3/core/libgee/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, autoconf, vala_0_32, pkgconfig, glib, gobjectIntrospection, gnome3 }: +{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }: let - ver_maj = "0.18"; + ver_maj = "0.20"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -8,15 +8,15 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz"; - sha256 = "16a34js81w9m2bw4qd8csm4pcgr3zq5z87867j4b8wfh6zwrxnaa"; + sha256 = "1fy24dr8imrjlmsqj1syn0gi139gba6hwk3j5vd6sr3pxniqnc11"; }; doCheck = true; patches = [ ./fix_introspection_paths.patch ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf vala_0_32 glib gobjectIntrospection ]; + nativeBuildInputs = [ pkgconfig autoconf vala pkgconfig gobjectIntrospection ]; + buildInputs = [ glib ]; meta = with stdenv.lib; { description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index fcb36fb8ded2..10e5f97c38fb 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -366,10 +366,7 @@ let california = callPackage ./misc/california { }; - geary = callPackage ./misc/geary { - # https://bugzilla.gnome.org/show_bug.cgi?id=728002 - webkitgtk = pkgs.webkitgtk24x-gtk3; - }; + geary = callPackage ./misc/geary { }; gfbgraph = callPackage ./misc/gfbgraph { }; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 498ced47a089..6243d1b1d5f1 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,41 +1,34 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32 -, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils +{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_38, enchant +, wrapGAppsHook, gdk_pixbuf, cmake, desktop_file_utils , libnotify, libcanberra_gtk3, libsecret, gmime , libpthreadstubs, sqlite , gnome3, librsvg, gnome_doc_utils, webkitgtk }: let - majorVersion = "0.11"; + majorVersion = "0.12"; in stdenv.mkDerivation rec { - name = "geary-${majorVersion}.3"; + name = "geary-${majorVersion}.0"; src = fetchurl { url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz"; - sha256 = "1r42ijxafach5lv8ibs6y0l5k4nacjg427dnma8fj00xr1sri7j1"; + sha256 = "0ii4qaqfqx90kvqwg0g9jahygkir4mb03ja55fa55yyx6cq0kwff"; }; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils - vala_0_32 webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite + nativeBuildInputs = [ vala_0_38 intltool pkgconfig wrapGAppsHook cmake desktop_file_utils gnome_doc_utils ]; + buildInputs = [ gtk3 enchant webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr gdk_pixbuf librsvg gnome3.defaultIconTheme ]; preConfigure = '' - substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0' - ''; - - postInstall = '' - mkdir -p $out/share/gsettings-schemas/${name}/ - mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name} + substituteInPlace src/CMakeLists.txt --replace '`''${PKG_CONFIG_EXECUTABLE} --variable=girdir gobject-introspection-1.0`' '${webkitgtk.dev}/share/gir-1.0' ''; preFixup = '' - wrapProgram "$out/bin/geary" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + # Add geary to path for geary-attach + gappsWrapperArgs+=(--prefix PATH : "$out/bin") ''; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index 0db1d3f74c0e..dd7d8c5dbb26 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -25,6 +25,7 @@ let mate-menus = callPackage ./mate-menus { }; mate-notification-daemon = callPackage ./mate-notification-daemon { }; mate-panel = callPackage ./mate-panel { }; + mate-power-manager = callPackage ./mate-power-manager { }; mate-session-manager = callPackage ./mate-session-manager { }; mate-settings-daemon = callPackage ./mate-settings-daemon { }; mate-terminal = callPackage ./mate-terminal { }; @@ -55,6 +56,7 @@ let engrampa eom mate-icon-theme-faenza + mate-power-manager mate-terminal pluma ]; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix new file mode 100644 index 000000000000..62b991632840 --- /dev/null +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra_gtk3, dbus_glib, upower, gnome3, libtool, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "mate-power-manager-${version}"; + version = "${major-ver}.${minor-ver}"; + major-ver = "1.18"; + minor-ver = "0"; + + src = fetchurl { + url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; + sha256 = "1gmka9ybxvkrdjaga1md6pbw6q1cx5yxb58ai5315a0f5p45y36x"; + }; + + buildInputs = [ + glib + itstool + libxml2 + libcanberra_gtk3 + gnome3.gtk + gnome3.libgnome_keyring + libnotify + dbus_glib + upower + + mate.mate-panel + ]; + + nativeBuildInputs = [ + pkgconfig + intltool + libtool + wrapGAppsHook + ]; + + configureFlags = [ "--enable-applets" ]; + + meta = with stdenv.lib; { + description = "The MATE Power Manager"; + homepage = http://mate-desktop.org; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.romildo maintainers.chpatrick ]; + }; +} diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index a962d3054f81..2bb4b7deceff 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -137,6 +137,7 @@ let plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {}; polkit-kde-agent = callPackage ./polkit-kde-agent.nix {}; powerdevil = callPackage ./powerdevil.nix {}; + sddm-kcm = callPackage ./sddm-kcm.nix {}; startkde = callPackage ./startkde {}; systemsettings = callPackage ./systemsettings.nix {}; }; diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/pkgs/desktops/plasma-5/sddm-kcm.nix new file mode 100644 index 000000000000..65912083a4cf --- /dev/null +++ b/pkgs/desktops/plasma-5/sddm-kcm.nix @@ -0,0 +1,16 @@ +{ + mkDerivation, extra-cmake-modules, shared_mime_info, + libpthreadstubs, libXcursor, libXdmcp, + qtquickcontrols2, qtx11extras, + karchive, ki18n, kio, knewstuff +}: + +mkDerivation { + name = "sddm-kcm"; + nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; + buildInputs = [ + libpthreadstubs libXcursor libXdmcp + qtquickcontrols2 qtx11extras + karchive ki18n kio knewstuff + ]; +} diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index a4b67425fdb0..fa76596248ee 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -2,8 +2,8 @@ , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng -, libxslt, ocaml, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit -, libvpx, imagemagick, fribidi, gperf, which +, libxslt, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit +, libvpx, imagemagick, fribidi, gperf, which, ocamlPackages }: stdenv.mkDerivation rec { @@ -22,8 +22,9 @@ stdenv.mkDerivation rec { [ cmake pkgconfig boost libunwind mariadb.client libmemcached pcre gdb git perl libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline - libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libkrb5 + libelf uwimap binutils cyrus_sasl pam glog libpng libxslt libkrb5 gmp libyaml libedit libvpx imagemagick fribidi gperf which + ocamlPackages.ocaml ocamlPackages.ocamlbuild ]; patches = [ diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index e0aa815e4dcb..aa3f49ca4d9f 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -7,13 +7,13 @@ let drv = stdenv.mkDerivation rec { pname = "jetbrainsjdk"; - version = "152b970.2"; + version = "152b1036.1"; name = pname + "-" + version; src = if stdenv.system == "x86_64-linux" then fetchurl { url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbsdk8u${version}_linux_x64.tar.gz"; - sha256 = "0i2cqjfab91kr618z88nb5g9yg60j5z08wjl0nlvcmpvg2z6va0m"; + sha256 = "1768f02i3dxdbxn8n29d522h8v0mkgnhpb8ixzq5p54vwjmfl6md"; } else abort "unsupported system: ${stdenv.system}"; diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 0be3af192b42..94f39183345f 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -33,6 +33,12 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ ncurses zlib ]; + prePatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "set(CMAKE_INSTALL_NAME_DIR "$out/lib")" \ + --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' "" + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 558bdcc5ce6a..f8b8948e749e 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -44,7 +44,11 @@ in stdenv.mkDerivation rec { # 10.9. This is a temporary measure until nixpkgs darwin support is # updated. postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc + sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc + + substituteInPlace CMakeLists.txt \ + --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "set(CMAKE_INSTALL_NAME_DIR "$out/lib")" \ + --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' "" ''; # hacky fix: created binaries need to be run before installation @@ -75,7 +79,6 @@ in stdenv.mkDerivation rec { ''; postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' - install_name_tool -id $out/lib/libLLVM.dylib $out/lib/libLLVM.dylib ln -s $out/lib/libLLVM.dylib $out/lib/libLLVM-${version}.dylib ''; diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 5f90e508c5e2..809c49ac24a2 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -82,6 +82,10 @@ in stdenv.mkDerivation rec { + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + + substituteInPlace CMakeLists.txt \ + --replace 'set(CMAKE_INSTALL_NAME_DIR "@rpath")' "set(CMAKE_INSTALL_NAME_DIR "$lib/lib")" \ + --replace 'set(CMAKE_INSTALL_RPATH "@executable_path/../lib")' "" '' # Patch llvm-config to return correct library path based on --link-{shared,static}. + stdenv.lib.optionalString (enableSharedLibraries) '' @@ -130,8 +134,6 @@ in stdenv.mkDerivation rec { + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" - install_name_tool -id $lib/lib/libLLVM.dylib $lib/lib/libLLVM.dylib - install_name_tool -change @rpath/libLLVM.dylib $lib/lib/libLLVM.dylib $out/bin/llvm-config ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${version}.dylib ''; diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 20ab9b44b65c..e90603ffefae 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -58,6 +58,10 @@ in stdenv.mkDerivation rec { postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + + substituteInPlace cmake/modules/AddLLVM.cmake \ + --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir INSTALL_NAME_DIR "$lib/lib")" \ + --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' "" '' # Patch llvm-config to return correct library path based on --link-{shared,static}. + stdenv.lib.optionalString (enableSharedLibraries) '' @@ -121,8 +125,6 @@ in stdenv.mkDerivation rec { + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" - install_name_tool -id $lib/lib/libLLVM.dylib $lib/lib/libLLVM.dylib - install_name_tool -change @rpath/libLLVM.dylib $lib/lib/libLLVM.dylib $out/bin/llvm-config ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib ''; diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 946c04a2ab4e..011eab5678c1 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -58,6 +58,10 @@ in stdenv.mkDerivation rec { postPatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + + substituteInPlace cmake/modules/AddLLVM.cmake \ + --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir INSTALL_NAME_DIR "$lib/lib")" \ + --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' "" '' # Patch llvm-config to return correct library path based on --link-{shared,static}. + stdenv.lib.optionalString (enableSharedLibraries) '' @@ -129,8 +133,6 @@ in stdenv.mkDerivation rec { + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" - install_name_tool -id $lib/lib/libLLVM.dylib $lib/lib/libLLVM.dylib - install_name_tool -change @rpath/libLLVM.dylib $lib/lib/libLLVM.dylib $out/bin/llvm-config ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib ''; diff --git a/pkgs/development/compilers/obliv-c/default.nix b/pkgs/development/compilers/obliv-c/default.nix index 1d9d973572c0..f5bc00118a61 100644 --- a/pkgs/development/compilers/obliv-c/default.nix +++ b/pkgs/development/compilers/obliv-c/default.nix @@ -1,8 +1,9 @@ -{stdenv, fetchurl, ocaml, libgcrypt, fetchFromGitHub, ocamlPackages, perl}: +{ stdenv, fetchurl, libgcrypt, fetchFromGitHub, ocamlPackages, perl }: stdenv.mkDerivation rec { name = "obliv-c-${version}"; version = "0.0pre20170827"; - buildInputs = [ ocaml ocamlPackages.findlib perl ]; + buildInputs = [ perl ] + ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ]); propagatedBuildInputs = [ libgcrypt ]; src = fetchFromGitHub { owner = "samee"; diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/pkgs/development/coq-modules/HoTT/default.nix new file mode 100644 index 000000000000..cb77ac3deac9 --- /dev/null +++ b/pkgs/development/coq-modules/HoTT/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, coq }: + +if !stdenv.lib.versionAtLeast coq.coq-version "8.6" +then throw "This version of HoTT requires Coq 8.6" +else stdenv.mkDerivation rec { + name = "coq${coq.coq-version}-HoTT-${version}"; + version = "20170921"; + + src = fetchFromGitHub { + owner = "HoTT"; + repo = "HoTT"; + rev = "e3557740a699167e6adb1a65855509d55a392fa1"; + sha256 = "0zwfp8g62b50vmmbb2kmskj3v6w7qx1pbf43yw0hr7asdz2zbx5v"; + }; + + buildInputs = [ autoconf automake coq ]; + enableParallelBuilding = true; + + preConfigure = '' + patchShebangs ./autogen.sh + ./autogen.sh + + mkdir -p "$out/bin" + ''; + + configureFlags = [ + "--bindir=$(out)/bin" + ]; + + patchPhase = '' + patchShebangs etc + patchShebangs hoqc hoqchk hoqdep hoqide hoqtop + ''; + + postBuild = '' + patchShebangs hoq-config + ''; + + # Currently, all the scripts like hoqc and hoqtop assume that the *.vo files are + # either (1) in the same directory as the scripts, or (2) in /usr/share/hott. + # We fulfill (1), which means that these files are only accessible via hoqtop, + # hoqc, etc and not via coqtop, coqc, etc. + postInstall = '' + mv $out/share/hott/* "$out/bin" + rmdir $out/share/hott + rmdir $out/share + ''; + + installFlags = [ + "COQBIN=${coq}/bin" + ]; + + meta = with stdenv.lib; { + homepage = http://homotopytypetheory.org/; + description = "Homotopy type theory"; + maintainers = with maintainers; [ siddharthist ]; + platforms = coq.meta.platforms; + }; +} diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7e8e152b21d4..28743ca9481e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -936,12 +936,6 @@ self: super: { sha256 = "1vss7b99zrhw3r29krl1b60r4qk0m2mpwmrz8q8zdxrh33hb8pd7"; }); - # happy 1.19.6+ broke the Agda build. Sticking with the previous version - # avoided that issue, but now the build fails with a segmentation fault - # during the install phase for no apparent reason: - # https://hydra.nixos.org/build/60678124 - Agda = markBroken (super.Agda.override { happy = self.happy_1_19_5; }); - # cryptol-2.5.0 doesn't want happy 1.19.6+. cryptol = super.cryptol.override { happy = self.happy_1_19_5; }; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e696cba3fe23..482d75796150 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 9.6 + # LTS Haskell 9.8 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -167,7 +167,7 @@ default-package-overrides: - amqp ==0.15.1 - annotated-wl-pprint ==0.7.0 - anonymous-sums ==0.6.0.0 - - ansigraph ==0.3.0.3 + - ansigraph ==0.3.0.4 - ansi-terminal ==0.6.3.1 - ansi-wl-pprint ==0.6.7.3 - api-field-json-th ==0.1.0.2 @@ -271,7 +271,7 @@ default-package-overrides: - bits ==0.5.1 - bitx-bitcoin ==0.11.0.1 - blake2 ==0.2.0 - - blank-canvas ==0.6 + - blank-canvas ==0.6.1 - BlastHTTP ==1.2.1 - blastxml ==0.3.2 - blaze-bootstrap ==0.1.0.1 @@ -333,7 +333,7 @@ default-package-overrides: - cabal-rpm ==0.11.2 - cache ==0.1.0.0 - cacophony ==0.10.0 - - cairo ==0.13.3.1 + - cairo ==0.13.4.1 - calendar-recycling ==0.0 - call-stack ==0.1.0 - carray ==0.1.6.8 @@ -421,7 +421,7 @@ default-package-overrides: - concurrent-output ==1.9.2 - concurrent-split ==0.0.1 - concurrent-supply ==0.1.8 - - conduit ==1.2.12 + - conduit ==1.2.12.1 - conduit-combinators ==1.1.1 - conduit-connection ==0.1.0.3 - conduit-extra ==1.1.17 @@ -526,7 +526,7 @@ default-package-overrides: - Decimal ==0.4.2 - declarative ==0.5.1 - deepseq-generics ==0.2.0.0 - - dejafu ==0.7.2.0 + - dejafu ==0.7.3.0 - dependent-map ==0.2.4.0 - dependent-sum ==0.4 - derive ==2.6.3 @@ -552,7 +552,7 @@ default-package-overrides: - digits ==0.3.1 - dimensional ==1.0.1.3 - directory-tree ==0.12.1 - - direct-sqlite ==2.3.20 + - direct-sqlite ==2.3.21 - discord-gateway ==0.2.2 - discord-hs ==0.4.2 - discord-rest ==0.2.2 @@ -612,9 +612,9 @@ default-package-overrides: - either ==4.4.1.1 - either-unwrap ==1.1 - ekg ==0.4.0.14 - - ekg-core ==0.1.1.2 + - ekg-core ==0.1.1.3 - ekg-json ==0.1.0.6 - - ekg-statsd ==0.2.1.1 + - ekg-statsd ==0.2.2.0 - ekg-wai ==0.1.0.2 - elerea ==2.9.0 - elm-bridge ==0.4.1 @@ -627,7 +627,7 @@ default-package-overrides: - encoding-io ==0.0.1 - engine-io ==1.2.17 - engine-io-wai ==1.0.6 - - EntrezHTTP ==1.0.4 + - EntrezHTTP ==1.0.3 - entropy ==0.3.8 - enummapset ==0.5.2.1 - enummapset-th ==0.6.1.1 @@ -669,7 +669,7 @@ default-package-overrides: - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.9 - exp-pairs ==0.1.5.2 - - extensible ==0.4.4 + - extensible ==0.4.5 - extensible-effects ==1.11.1.0 - extensible-exceptions ==0.1.1.4 - extra ==1.5.3 @@ -689,7 +689,7 @@ default-package-overrides: - feed ==0.3.12.0 - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 - - fgl ==5.5.4.0 + - fgl ==5.5.3.1 - fgl-arbitrary ==0.2.0.3 - filecache ==0.2.9 - file-embed ==0.0.10 @@ -698,8 +698,8 @@ default-package-overrides: - file-modules ==0.1.2.4 - fileplow ==0.1.0.0 - filter-logger ==0.6.0.0 - - find-clumpiness ==0.2.3.0 - - fingertree ==0.1.1.0 + - find-clumpiness ==0.2.3.1 + - fingertree ==0.1.2.1 - fingertree-psqueue ==0.3 - finite-typelits ==0.1.2.0 - fixed ==0.2.1.1 @@ -739,7 +739,7 @@ default-package-overrides: - freetype2 ==0.1.2 - free-vl ==0.1.4 - friendly-time ==0.4.1 - - frisby ==0.2 + - frisby ==0.2.1 - from-sum ==0.2.1.0 - frontmatter ==0.1.0.2 - fsnotify ==0.2.1.1 @@ -808,7 +808,7 @@ default-package-overrides: - glazier-react ==0.6.0.0 - glazier-react-widget ==0.6.0.0 - GLFW-b ==1.4.8.1 - - glib ==0.13.4.1 + - glib ==0.13.5.0 - Glob ==0.8.0 - glob-posix ==0.1.0.1 - gloss ==1.11.1.1 @@ -936,10 +936,9 @@ default-package-overrides: - grouped-list ==0.2.1.3 - groupoids ==4.0 - groups ==0.4.0.0 - - gtk ==0.14.6 - - gtk2hs-buildtools ==0.13.2.2 - - gtk3 ==0.14.6 - - gtksourceview3 ==0.13.3.1 + - gtk ==0.14.7 + - gtk2hs-buildtools ==0.13.3.0 + - gtk3 ==0.14.7 - H ==0.9.0.1 - h2c ==1.0.0 - hackage-db ==1.22 @@ -965,11 +964,11 @@ default-package-overrides: - happstack-server-tls ==7.1.6.4 - happy ==1.19.7 - harp ==0.4.3 - - hasbolt ==0.1.2.1 + - hasbolt ==0.1.3.0 - hashable ==1.2.6.1 - hashable-time ==0.2.0.1 - hashmap ==1.3.2 - - hashtables ==1.2.2.0 + - hashtables ==1.2.2.1 - haskeline ==0.7.4.0 - haskell-gi ==0.20.3 - haskell-gi-base ==0.20.4 @@ -1134,7 +1133,7 @@ default-package-overrides: - htaglib ==1.1.1 - HTF ==0.13.2.2 - html ==1.0.1.2 - - html-conduit ==1.2.1.1 + - html-conduit ==1.2.1.2 - html-email-validate ==0.2.0.0 - htoml ==1.0.0.3 - HTTP ==4000.3.7 @@ -1210,7 +1209,7 @@ default-package-overrides: - inline-java ==0.6.5 - inline-r ==0.9.0.1 - insert-ordered-containers ==0.2.1.0 - - instance-control ==0.1.1.1 + - instance-control ==0.1.2.0 - integer-logarithms ==1.0.2 - integration ==0.2.1 - intero ==0.1.23 @@ -1272,7 +1271,7 @@ default-package-overrides: - jwt ==0.7.2 - kan-extensions ==5.0.2 - kansas-comet ==0.4 - - katip ==0.5.0.2 + - katip ==0.5.0.3 - kawhi ==0.3.0 - kdt ==0.2.4 - keter ==1.4.3.2 @@ -1304,7 +1303,7 @@ default-package-overrides: - lattices ==1.5.0 - lazyio ==0.1.0.4 - lca ==0.3 - - leancheck ==0.6.5 + - leancheck ==0.6.7 - leapseconds-announced ==2017 - lens ==4.15.4 - lens-action ==0.2.2 @@ -1339,7 +1338,7 @@ default-package-overrides: - linked-list-with-iterator ==0.1.1.0 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.2.0 - - List ==0.6.1 + - List ==0.6.2 - list-fusion-probe ==0.1.0.6 - ListLike ==4.5.1 - list-prompt ==0.1.1.0 @@ -1350,7 +1349,7 @@ default-package-overrides: - lmdb ==0.2.5 - loch-th ==0.2.1 - log ==0.9.0.1 - - log-base ==0.7.2.0 + - log-base ==0.7.3.0 - log-domain ==0.11.2 - log-elasticsearch ==0.9.1.0 - logfloat ==0.13.3.3 @@ -1363,7 +1362,7 @@ default-package-overrides: - loop ==0.3.0 - lrucache ==1.2.0.0 - lrucaching ==0.3.2 - - lucid ==2.9.8.1 + - lucid ==2.9.9 - lucid-svg ==0.7.0.0 - lzma-conduit ==1.1.3.3 - machines ==0.6.3 @@ -1483,7 +1482,7 @@ default-package-overrides: - multistate ==0.7.1.2 - murmur-hash ==0.1.0.9 - mushu ==0.1.1 - - MusicBrainz ==0.3 + - MusicBrainz ==0.3.1 - mustache ==2.2.3 - mutable-containers ==0.3.3 - mwc-probability ==1.3.0 @@ -1523,7 +1522,7 @@ default-package-overrides: - network-transport-composed ==0.2.0.1 - network-transport-inmemory ==0.5.2 - network-transport-tcp ==0.5.1 - - network-transport-tests ==0.2.4.1 + - network-transport-tests ==0.2.4.2 - network-uri ==2.6.1.0 - newtype ==0.2 - newtype-generics ==0.5.1 @@ -1598,7 +1597,7 @@ default-package-overrides: - pandoc ==1.19.2.4 - pandoc-citeproc ==0.10.5.1 - pandoc-types ==1.17.0.5 - - pango ==0.13.3.1 + - pango ==0.13.4.0 - papillon ==0.1.0.4 - parallel ==3.2.1.1 - parallel-io ==0.3.3 @@ -1656,7 +1655,7 @@ default-package-overrides: - pipes-cacophony ==0.5.0 - pipes-category ==0.2.0.1 - pipes-concurrency ==2.0.8 - - pipes-extras ==1.0.10 + - pipes-extras ==1.0.11 - pipes-fluid ==0.5.0.3 - pipes-group ==1.0.8 - pipes-misc ==0.3.0.0 @@ -1749,7 +1748,7 @@ default-package-overrides: - proxied ==0.3 - psql-helpers ==0.1.0.0 - PSQueue ==1.1 - - psqueues ==0.2.3.0 + - psqueues ==0.2.4.0 - publicsuffix ==0.20170508 - pure-io ==0.2.1 - pureMD5 ==2.1.3 @@ -1802,9 +1801,9 @@ default-package-overrides: - recursion-schemes ==5.0.2 - redis-io ==0.7.0 - redis-resp ==0.4.0 - - reducers ==3.12.1 + - reducers ==3.12.2 - refact ==0.3.0.2 - - references ==0.3.2.2 + - references ==0.3.3.0 - ref-fd ==0.4.0.1 - refined ==0.1.2.1 - reflection ==2.1.2 @@ -1894,7 +1893,7 @@ default-package-overrides: - search-algorithms ==0.2.0 - securemem ==0.1.9 - SegmentTree ==0.3 - - selda ==0.1.11.0 + - selda ==0.1.11.1 - selda-postgresql ==0.1.7.0 - selda-sqlite ==0.1.6.0 - semigroupoid-extras ==5 @@ -1923,7 +1922,7 @@ default-package-overrides: - servant-purescript ==0.8.0.1 - servant-ruby ==0.2.1.0 - servant-server ==0.11 - - servant-static-th ==0.1.0.5 + - servant-static-th ==0.1.0.6 - servant-subscriber ==0.6.0.0 - servant-swagger ==1.1.3.1 - servant-swagger-ui ==0.2.4.3.0.20 @@ -1990,7 +1989,7 @@ default-package-overrides: - sox ==0.2.2.7 - soxlib ==0.0.3 - sparkle ==0.5.0.1 - - sparse-linear-algebra ==0.2.9.7 + - sparse-linear-algebra ==0.2.9.8 - spdx ==0.2.2.0 - speculation ==1.5.0.3 - speedy-slice ==0.3.0 @@ -2030,7 +2029,7 @@ default-package-overrides: - stm-conduit ==3.0.0 - stm-containers ==0.2.16 - stm-delay ==0.1.1.1 - - stm-extras ==0.1.0.2 + - stm-extras ==0.1.0.3 - STMonadTrans ==0.4.3 - stm-split ==0.0.2 - stm-stats ==0.2.0.0 @@ -2039,7 +2038,7 @@ default-package-overrides: - storable-complex ==0.2.2 - storable-endian ==0.2.6 - storable-record ==0.0.3.1 - - storable-tuple ==0.0.3.2 + - storable-tuple ==0.0.3.3 - storablevector ==0.2.12.1 - storablevector-carray ==0.0 - store ==0.4.3.2 @@ -2071,7 +2070,7 @@ default-package-overrides: - superbuffer ==0.3.1.1 - superrecord ==0.3.0.0 - svg-builder ==0.1.0.2 - - SVGFonts ==1.6.0.2 + - SVGFonts ==1.6.0.3 - svg-tree ==0.6.2 - swagger ==0.3.0 - swagger2 ==2.1.6 @@ -2117,7 +2116,7 @@ default-package-overrides: - tasty-stats ==0.2.0.3 - tasty-tap ==0.0.4 - tasty-th ==0.1.7 - - Taxonomy ==1.0.3 + - Taxonomy ==1.0.2 - TCache ==0.12.1 - tce-conf ==1.3 - tcp-streams ==0.6.0.0 @@ -2145,7 +2144,7 @@ default-package-overrides: - test-framework-smallcheck ==0.2 - test-framework-th ==0.2.4 - testing-feat ==0.4.0.3 - - texmath ==0.9.4.2 + - texmath ==0.9.4.4 - text ==1.2.2.2 - text-all ==0.4.1.1 - text-binary ==0.2.1.1 @@ -2180,7 +2179,7 @@ default-package-overrides: - threepenny-editors ==0.4.1 - threepenny-gui ==0.8.2.0 - threepenny-gui-flexbox ==0.4.2 - - th-reify-compat ==0.0.1.2 + - th-reify-compat ==0.0.1.3 - th-reify-many ==0.1.8 - through-text ==0.1.0.0 - throwable-exceptions ==0.1.0.9 @@ -2290,7 +2289,7 @@ default-package-overrides: - unordered-containers ==0.2.8.0 - unsafe ==0.0 - uri-bytestring ==0.2.3.3 - - uri-bytestring-aeson ==0.1.0.2 + - uri-bytestring-aeson ==0.1.0.4 - uri-encode ==1.5.0.5 - uri-templater ==0.2.2.0 - url ==2.1.3 @@ -2327,7 +2326,7 @@ default-package-overrides: - versions ==3.1.1 - vhd ==0.2.2 - ViennaRNAParser ==1.3.2 - - viewprof ==0.0.0.8 + - viewprof ==0.0.0.9 - vinyl ==0.5.3 - vinyl-utils ==0.3.0.0 - void ==0.7.2 @@ -2437,9 +2436,9 @@ default-package-overrides: - xml-basic ==0.1.2 - xml-conduit ==1.5.1 - xml-conduit-parse ==0.3.1.1 - - xml-conduit-writer ==0.1.1.1 + - xml-conduit-writer ==0.1.1.2 - xmlgen ==0.6.2.1 - - xml-hamlet ==0.4.1 + - xml-hamlet ==0.4.1.1 - xml-html-qq ==0.1.0.1 - xml-indexed-cursor ==0.1.1.0 - xml-lens ==0.1.6.3 @@ -5981,7 +5980,6 @@ dont-distribute-packages: liquid: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] - liquidhaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] list-mux: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-html-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 91e95de94af5..1051c4e416f1 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -501,4 +501,6 @@ self: super: builtins.intersectAttrs super { # Without this override, the builds lacks pkg-config. opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; }); + # Written against the 6.X series of megaparsec + htoml-megaparsec = super.htoml-megaparsec.override { megaparsec = self.megaparsec_6_2_0; }; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0d8e4ebd3751..f0fcff013a28 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -849,8 +849,8 @@ self: { }: mkDerivation { pname = "Allure"; - version = "0.6.1.0"; - sha256 = "1358gafgm91vqsdn9wxpd9qzar1via9fl5xcg2pn30bcg7dsqahh"; + version = "0.6.2.0"; + sha256 = "1va5xpyw2plq1f82q2zk64xyrdvkprjzv5p6zycircgc2ficz5a1"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -4800,6 +4800,23 @@ self: { }: mkDerivation { pname = "EntrezHTTP"; + version = "1.0.3"; + sha256 = "16x8z6s17wgf53wmp8lib9nr7a2jsa1n95714q4gqs2vif646p1r"; + libraryHaskellDepends = [ + base biocore bytestring conduit HTTP http-conduit hxt mtl network + Taxonomy text transformers + ]; + homepage = "https://github.com/eggzilla/EntrezHTTP"; + description = "Libary to interface with the NCBI Entrez REST service"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "EntrezHTTP_1_0_4" = callPackage + ({ mkDerivation, base, biocore, bytestring, conduit, HTTP + , http-conduit, hxt, mtl, network, Taxonomy, text, transformers + }: + mkDerivation { + pname = "EntrezHTTP"; version = "1.0.4"; sha256 = "1gp5g3r05rwayk1gdb9dfzjmywwlr5d236dygryzmga9q13gwvxq"; libraryHaskellDepends = [ @@ -4809,6 +4826,7 @@ self: { homepage = "https://github.com/eggzilla/EntrezHTTP"; description = "Libary to interface with the NCBI Entrez REST service"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "EnumContainers" = callPackage @@ -11095,8 +11113,8 @@ self: { }: mkDerivation { pname = "LambdaHack"; - version = "0.6.1.0"; - sha256 = "0h9b67x9mnn3nyz0a8lhh9amd511cgvmwlzaj7lkh8vqqxy2syhz"; + version = "0.6.2.0"; + sha256 = "15fa4kwaa7dzdrppjzkpm8dhazsb5cw372ksfl3smsfxiz8z4af9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -11456,25 +11474,12 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "List"; - version = "0.6.1"; - sha256 = "0ar4bpfv9nqc3bdwg6rlcnwr5si2df38ch8m2wnnl0346yzvmjni"; - libraryHaskellDepends = [ base transformers ]; - homepage = "http://github.com/yairchu/generator"; - description = "List monad transformer and class"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "List_0_6_2" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "List"; version = "0.6.2"; sha256 = "0y5qk6pzpcha01pa9133qgmmk9nkgjqxaxlg04993i9g43hjpff4"; libraryHaskellDepends = [ base transformers ]; homepage = "http://github.com/yairchu/generator"; description = "List monad transformer and class"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ListLike" = callPackage @@ -12602,28 +12607,6 @@ self: { }: mkDerivation { pname = "MusicBrainz"; - version = "0.3"; - sha256 = "1c0vl5zkb8628k5222fg6z806byjqnsxr0h3yw86fzwhgkxqywd4"; - revision = "1"; - editedCabalFile = "1bv1nwl4pijgiw4zpnw6b15d7phj6b8chiqvv42s8vrq51crdvm6"; - libraryHaskellDepends = [ - aeson base bytestring conduit conduit-extra HTTP http-conduit - http-types monad-control resourcet text time time-locale-compat - transformers vector xml-conduit xml-types - ]; - homepage = "http://floss.scru.org/hMusicBrainz"; - description = "interface to MusicBrainz XML2 web service"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "MusicBrainz_0_3_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra - , HTTP, http-conduit, http-types, monad-control, resourcet, text - , time, time-locale-compat, transformers, vector, xml-conduit - , xml-types - }: - mkDerivation { - pname = "MusicBrainz"; version = "0.3.1"; sha256 = "1zgk2ms1a5zd6wndc41z3f8p2pfygiijpijxbjhr1fqwb2bzs61m"; libraryHaskellDepends = [ @@ -12634,7 +12617,6 @@ self: { homepage = "http://floss.scru.org/hMusicBrainz"; description = "interface to MusicBrainz XML2 and JSON web services"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MusicBrainz-libdiscid" = callPackage @@ -14291,8 +14273,8 @@ self: { }: mkDerivation { pname = "Plot-ho-matic"; - version = "0.12.0.0"; - sha256 = "0dmsgmw1gqx3bsdvw4y0gc02pc4shf97kq3hv757gqi1rsg4fsdy"; + version = "0.12.1.0"; + sha256 = "08210lfmbzaazk5d0j9gw81m7416hk0ldiyahp7g9kpj49nhpmrg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -15901,26 +15883,6 @@ self: { }: mkDerivation { pname = "SVGFonts"; - version = "1.6.0.2"; - sha256 = "07rimlhsvb5j77rkp1zw9567lbc0bq6172mzsm3yb4zw6x9aplaa"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - attoparsec base blaze-markup blaze-svg bytestring cereal - cereal-vector containers data-default-class diagrams-core - diagrams-lib directory parsec split text tuple vector xml - ]; - description = "Fonts from the SVG-Font format"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "SVGFonts_1_6_0_3" = callPackage - ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg - , bytestring, cereal, cereal-vector, containers, data-default-class - , diagrams-core, diagrams-lib, directory, parsec, split, text - , tuple, vector, xml - }: - mkDerivation { - pname = "SVGFonts"; version = "1.6.0.3"; sha256 = "11sqycvvsg9avxqh3z82x3wllhy6a9c0d36qzm2w6w4hg5iqi3xw"; enableSeparateDataOutput = true; @@ -15931,7 +15893,6 @@ self: { ]; description = "Fonts from the SVG-Font format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SVGPath" = callPackage @@ -17435,6 +17396,21 @@ self: { }: mkDerivation { pname = "Taxonomy"; + version = "1.0.2"; + sha256 = "076j2jj45insbj9v98iygm7ighk210xja3dm8ar9jnjmrpar8gil"; + libraryHaskellDepends = [ + aeson base bytestring either-unwrap fgl graphviz parsec text vector + ]; + description = "Libary for parsing, processing and vizualization of taxonomy data"; + license = stdenv.lib.licenses.gpl3; + }) {}; + + "Taxonomy_1_0_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, either-unwrap, fgl + , graphviz, parsec, text, vector + }: + mkDerivation { + pname = "Taxonomy"; version = "1.0.3"; sha256 = "0w4j1v2l7c8a8x0rpvq1gxbvjcw83kj84m5bw6bwx3x6gc997xxn"; libraryHaskellDepends = [ @@ -17442,6 +17418,7 @@ self: { ]; description = "Libary for parsing, processing and vizualization of taxonomy data"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TaxonomyTools" = callPackage @@ -23352,6 +23329,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "alternative-vector" = callPackage + ({ mkDerivation, base, vector }: + mkDerivation { + pname = "alternative-vector"; + version = "0.0.0"; + sha256 = "1cf7akvr9nac1483chh7rd3xp5i5zk78f245lw9ixj6v133lnis2"; + libraryHaskellDepends = [ base vector ]; + homepage = "https://github.com/athanclark/alternative-vector#readme"; + description = "Use vectors instead of lists for many and some"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "alternators" = callPackage ({ mkDerivation, base, mmorph, transformers }: mkDerivation { @@ -25740,19 +25729,6 @@ self: { ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: mkDerivation { pname = "ansigraph"; - version = "0.3.0.3"; - sha256 = "1f03lh9zf6kbimg2fsi8hgnz3kvhqls67j5y13f4j2rb7lynxvd3"; - libraryHaskellDepends = [ ansi-terminal base ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "https://github.com/BlackBrane/ansigraph"; - description = "Terminal-based graphing via ANSI and Unicode"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ansigraph_0_3_0_4" = callPackage - ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: - mkDerivation { - pname = "ansigraph"; version = "0.3.0.4"; sha256 = "0gyim5a4b0gc4z45hsbxwl3gn3xcad3068xwcgwh8gc4ikannki9"; libraryHaskellDepends = [ ansi-terminal base ]; @@ -25760,7 +25736,6 @@ self: { homepage = "https://github.com/BlackBrane/ansigraph"; description = "Terminal-based graphing via ANSI and Unicode"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "antagonist" = callPackage @@ -26017,8 +25992,8 @@ self: { }: mkDerivation { pname = "apecs"; - version = "0.2.4.1"; - sha256 = "0dwa02n7s6gpywv8xcnf1mrzks6f1sd2bk5kafwnsm80lixcnzrn"; + version = "0.2.4.2"; + sha256 = "1llbwhws24k8ca22v3zfpz8jzbr1wj92vvwqypqv1iig03bgbbvh"; libraryHaskellDepends = [ async base containers mtl template-haskell vector ]; @@ -28314,6 +28289,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async-refresh-tokens_0_3_0_1" = callPackage + ({ mkDerivation, async-refresh, base, bytestring, criterion + , formatting, HUnit, lifted-async, microlens, microlens-th + , monad-control, monad-logger, safe-exceptions, stm, test-framework + , test-framework-hunit, text + }: + mkDerivation { + pname = "async-refresh-tokens"; + version = "0.3.0.1"; + sha256 = "15m7zrdnla5rjrm33zp1054virx9v58sz8zi89ja7iza8hfwdvdx"; + libraryHaskellDepends = [ + async-refresh base bytestring formatting lifted-async microlens + microlens-th monad-control monad-logger safe-exceptions stm text + ]; + testHaskellDepends = [ + base criterion HUnit monad-logger stm test-framework + test-framework-hunit + ]; + homepage = "https://github.com/mtesseract/async-refresh-tokens#readme"; + description = "Package implementing core logic for refreshing of expiring access tokens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "async-timer" = callPackage ({ mkDerivation, base, containers, criterion, HUnit, lifted-async , lifted-base, monad-control, safe-exceptions, test-framework @@ -35038,34 +35037,6 @@ self: { }: mkDerivation { pname = "blank-canvas"; - version = "0.6"; - sha256 = "1cs81ykw1y2q1kwkdni5w9jxa8bc31b118diaqzf870bqm7mq3ia"; - revision = "12"; - editedCabalFile = "011gssnsg4svv0mz58cvkmy2nr994d4v6ch29yilgh6rna0qfkd9"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring colour - containers data-default-class http-types kansas-comet mime-types - scotty stm text text-show transformers vector wai wai-extra warp - ]; - testHaskellDepends = [ - base containers directory process shake stm text time unix vector - ]; - homepage = "https://github.com/ku-fpg/blank-canvas/wiki"; - description = "HTML5 Canvas Graphics Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "blank-canvas_0_6_1" = callPackage - ({ mkDerivation, aeson, base, base-compat, base64-bytestring - , bytestring, colour, containers, data-default-class, directory - , http-types, kansas-comet, mime-types, process, scotty, shake, stm - , text, text-show, time, transformers, unix, vector, wai, wai-extra - , warp - }: - mkDerivation { - pname = "blank-canvas"; version = "0.6.1"; sha256 = "06jsbqbd67hyb1k2yv0iqn11rhqhycl1c9afrnmwh05bic9wsdf6"; enableSeparateDataOutput = true; @@ -36803,7 +36774,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_27" = callPackage + "brick_0_28" = callPackage ({ mkDerivation, base, containers, contravariant, data-clist , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm , template-haskell, text, text-zipper, transformers, vector, vty @@ -36811,8 +36782,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.27"; - sha256 = "0flpvs9rdkicwvd0pg5y8cf4grcq91xzrji9ygknms96fm3nhq4k"; + version = "0.28"; + sha256 = "03rm4pq65i49hh2nyz9njabsjh7cbv889g5rscpy42mrhdlppqhk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39589,25 +39560,6 @@ self: { }: mkDerivation { pname = "cairo"; - version = "0.13.3.1"; - sha256 = "0nk77lixlf6j3a2870mbakcznigrf43m6ac1xn35d1v3dmy1kjm3"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; - libraryHaskellDepends = [ - array base bytestring mtl text utf8-string - ]; - libraryPkgconfigDepends = [ cairo ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Cairo library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) cairo;}; - - "cairo_0_13_4_1" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, cairo - , gtk2hs-buildtools, mtl, text, utf8-string - }: - mkDerivation { - pname = "cairo"; version = "0.13.4.1"; sha256 = "04ig1v3nyiqycrh2xipmw0mynnsnf6pyr2qgk57dravaisf89s02"; enableSeparateDataOutput = true; @@ -39619,7 +39571,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Cairo library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo;}; "cairo-appbase" = callPackage @@ -43768,6 +43719,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "classy-prelude_1_3_0" = callPackage + ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring + , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim + , hashable, hspec, lifted-async, lifted-base, monad-unlift + , mono-traversable, mono-traversable-instances, mtl + , mutable-containers, primitive, QuickCheck, safe-exceptions, say + , semigroups, stm, stm-chans, text, time, time-locale-compat + , transformers, transformers-base, unordered-containers, vector + , vector-instances + }: + mkDerivation { + pname = "classy-prelude"; + version = "1.3.0"; + sha256 = "048h2pcp0i2xzd92f6w48hhk5zpic040prmddcf4jp725l1ziid5"; + libraryHaskellDepends = [ + async base basic-prelude bifunctors bytestring chunked-data + containers deepseq dlist exceptions ghc-prim hashable lifted-async + lifted-base monad-unlift mono-traversable + mono-traversable-instances mtl mutable-containers primitive + safe-exceptions say semigroups stm stm-chans text time + time-locale-compat transformers transformers-base + unordered-containers vector vector-instances + ]; + testHaskellDepends = [ + base containers hspec QuickCheck transformers unordered-containers + ]; + homepage = "https://github.com/snoyberg/mono-traversable"; + description = "A typeclass-based Prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "classy-prelude-conduit" = callPackage ({ mkDerivation, base, bytestring, classy-prelude, conduit , conduit-combinators, hspec, monad-control, QuickCheck, resourcet @@ -43789,6 +43772,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "classy-prelude-conduit_1_3_0" = callPackage + ({ mkDerivation, base, bytestring, classy-prelude, conduit + , conduit-combinators, hspec, monad-control, QuickCheck, resourcet + , transformers, void + }: + mkDerivation { + pname = "classy-prelude-conduit"; + version = "1.3.0"; + sha256 = "09ibih4k72j0k9bv8yhs7lwdg1ic3gbwqfml0wnvmykpqcl2ff0g"; + libraryHaskellDepends = [ + base bytestring classy-prelude conduit conduit-combinators + monad-control resourcet transformers void + ]; + testHaskellDepends = [ + base bytestring conduit hspec QuickCheck transformers + ]; + homepage = "https://github.com/snoyberg/mono-traversable"; + description = "classy-prelude together with conduit functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "classy-prelude-yesod" = callPackage ({ mkDerivation, aeson, base, classy-prelude , classy-prelude-conduit, data-default, http-conduit, http-types @@ -43808,6 +43813,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "classy-prelude-yesod_1_3_0" = callPackage + ({ mkDerivation, aeson, base, classy-prelude + , classy-prelude-conduit, data-default, http-conduit, http-types + , persistent, yesod, yesod-newsfeed, yesod-static + }: + mkDerivation { + pname = "classy-prelude-yesod"; + version = "1.3.0"; + sha256 = "1hnb0kfjly8l08v1krmcxgk6pc1xh1lg85mbkbz34pkhjx0rf7s6"; + libraryHaskellDepends = [ + aeson base classy-prelude classy-prelude-conduit data-default + http-conduit http-types persistent yesod yesod-newsfeed + yesod-static + ]; + homepage = "https://github.com/snoyberg/mono-traversable"; + description = "Provide a classy prelude including common Yesod functionality"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "classyplate" = callPackage ({ mkDerivation, base, template-haskell, type-list }: mkDerivation { @@ -45901,22 +45926,22 @@ self: { "colorless" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, errors , exceptions, hspec, lifted-async, monad-control, monad-logger, mtl - , random, scientific, text, text-conversions, tuple - , unordered-containers, vector + , random, safe-exceptions, scientific, text, text-conversions + , tuple, unordered-containers, vector }: mkDerivation { pname = "colorless"; - version = "2.2.9"; - sha256 = "0xja34s5g14rqpn26sy8ijlxzlvwnjriz8c07ajqz82hpc8a1kh4"; + version = "2.2.17"; + sha256 = "1l771glmnbgnwkjg0ijg70i0apj66b4n19v1glx6jzdp98z4kgl3"; libraryHaskellDepends = [ aeson base bytestring containers errors exceptions lifted-async - monad-control monad-logger mtl random scientific text - text-conversions unordered-containers vector + monad-control monad-logger mtl random safe-exceptions scientific + text text-conversions unordered-containers vector ]; testHaskellDepends = [ aeson base containers hspec scientific text tuple vector ]; - description = "Colorless"; + description = "Colorless | The Programmatic IDL"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -45926,8 +45951,8 @@ self: { }: mkDerivation { pname = "colorless-http-client"; - version = "0.0.1"; - sha256 = "0ciwb559wr55d5vnllqm29dmfgqam1yg6l8zx1s858yy23zi5xl4"; + version = "0.0.4"; + sha256 = "1mncp7qsb99s4kwyd3z3xrmypb7wjdkkr8jpxaip2892z4n52l22"; libraryHaskellDepends = [ aeson base bytestring colorless http-client http-types text-conversions @@ -45940,8 +45965,8 @@ self: { ({ mkDerivation, aeson, base, colorless, mtl, scotty, text, wai }: mkDerivation { pname = "colorless-scotty"; - version = "0.0.1"; - sha256 = "0drw92gv8gr3927yg2siwnbz91s8gk3v244nydxy4y2bbwih8i2c"; + version = "0.0.2"; + sha256 = "1jbdysm2ya5h5hw0s8149vi6wcnr98wh53iwyhmygdg0hz25nslk"; libraryHaskellDepends = [ aeson base colorless mtl scotty text wai ]; @@ -47401,14 +47426,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_2_1_0" = callPackage + "concurrency_1_2_1_1" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.2.1.0"; - sha256 = "1361ywfwbymnw1siaysswl0hfh5hq8zgzkazy226civxcap4pi47"; + version = "1.2.1.1"; + sha256 = "1zr59s73a0iy27qh1m41lizjy55bgrnkb8zh8s3xp15sqhq9yvgv"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -47561,6 +47586,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "concurrent-st" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "concurrent-st"; + version = "0.1"; + sha256 = "08zjpyf1jrsn161z9dngag63s47vrvz4m8aani9lvmlacbzpjfwd"; + libraryHaskellDepends = [ base ghc-prim ]; + homepage = "https://github.com/andrewthad/concurrent-st#readme"; + description = "Concurrent Haskell in ST"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "concurrent-state" = callPackage ({ mkDerivation, base, exceptions, mtl, stm, transformers }: mkDerivation { @@ -47724,33 +47761,6 @@ self: { }: mkDerivation { pname = "conduit"; - version = "1.2.12"; - sha256 = "05k6kn83mw72xfqhrlsapnbsscyw1dqf1g335mxfifs2a32s1ad4"; - libraryHaskellDepends = [ - base exceptions lifted-base mmorph monad-control mtl primitive - resourcet transformers transformers-base transformers-compat - ]; - testHaskellDepends = [ - base containers exceptions hspec mtl QuickCheck resourcet safe - split transformers - ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq hspec kan-extensions mwc-random - transformers vector - ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Streaming data processing library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit_1_2_12_1" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, exceptions - , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl - , mwc-random, primitive, QuickCheck, resourcet, safe, split - , transformers, transformers-base, transformers-compat, vector - }: - mkDerivation { - pname = "conduit"; version = "1.2.12.1"; sha256 = "0zl6gflh7y36y2vypjhqx13nhkk5y3h12c1zj7kjfclrmwnvnwh0"; libraryHaskellDepends = [ @@ -47768,7 +47778,6 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-algorithms" = callPackage @@ -47780,8 +47789,8 @@ self: { }: mkDerivation { pname = "conduit-algorithms"; - version = "0.0.5.0"; - sha256 = "0c8r4iydvzlp1q2szqnxpk8g95dn905ymzsa3isxdh9cjjqm5lbi"; + version = "0.0.6.0"; + sha256 = "0b3wpmx35bl85mzy9v0hiz48flzv2vjdimkgdv58si24l3drg6g6"; libraryHaskellDepends = [ async base bytestring bzlib-conduit conduit conduit-combinators conduit-extra containers deepseq directory filepath mtl resourcet @@ -51811,6 +51820,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cryptoids" = callPackage + ({ mkDerivation, base, binary, bytestring, cryptoids-types + , cryptonite, directory, exceptions, filepath, memory + }: + mkDerivation { + pname = "cryptoids"; + version = "0.3.0.0"; + sha256 = "1n8mr80n1hmld02n1a97nsxh3x8fmnqmbpnnvjawkq1mj768nbc4"; + libraryHaskellDepends = [ + base binary bytestring cryptoids-types cryptonite directory + exceptions filepath memory + ]; + description = "Reversable and secure encoding of object ids as a bytestring"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "cryptoids-types" = callPackage + ({ mkDerivation, base, binary, http-api-data, path-pieces }: + mkDerivation { + pname = "cryptoids-types"; + version = "0.0.0"; + sha256 = "0qp6lx1k2mqay1i4wgkwgaqamp33gijw0wb13rh71i0qwyvnr51b"; + libraryHaskellDepends = [ base binary http-api-data path-pieces ]; + description = "Shared types for encrypting internal object identifiers before exposure"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cryptol" = callPackage ({ mkDerivation, alex, ansi-terminal, array, async, base , base-compat, bytestring, containers, criterion, deepseq @@ -54101,14 +54137,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse_0_10_0_0" = callPackage + "data-diverse_0_11_0_0" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim , hspec, tagged }: mkDerivation { pname = "data-diverse"; - version = "0.10.0.0"; - sha256 = "0y56xncg73w550wg6r6a1njm9ivx37h3jfzkjbzjkr5v6lv6gn1v"; + version = "0.11.0.0"; + sha256 = "0vbhp2gnmg6nlha4jly6yjpvky2dhk2x099r58r7gdrr5prh1lpi"; libraryHaskellDepends = [ base containers deepseq ghc-prim tagged ]; @@ -54133,12 +54169,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse-lens_0_3_0_0" = callPackage + "data-diverse-lens_0_4_0_0" = callPackage ({ mkDerivation, base, data-diverse, hspec, lens, tagged }: mkDerivation { pname = "data-diverse-lens"; - version = "0.3.0.0"; - sha256 = "0mkys1msxbphlf8814c5bkg8s82zl5a36vzyrqbfbv74668lq4q1"; + version = "0.4.0.0"; + sha256 = "0jwq45b9s2v539lkav84vrjcqznlb2yvprhaflshaz5gsw04dfyc"; libraryHaskellDepends = [ base data-diverse lens tagged ]; testHaskellDepends = [ base data-diverse hspec lens tagged ]; homepage = "https://github.com/louispan/data-diverse-lens#readme"; @@ -56847,8 +56883,8 @@ self: { }: mkDerivation { pname = "dejafu"; - version = "0.7.2.0"; - sha256 = "1jr5k7ky13vvak4jdvfaksil9li1wis0gc1jbaann4pa18y9d358"; + version = "0.7.3.0"; + sha256 = "163aw8qw18lqw0q8pr88d3i3m1r1v5ny73xy5ryxlls5wiyn2ds8"; libraryHaskellDepends = [ base concurrency containers deepseq exceptions leancheck mtl random ref-fd semigroups transformers transformers-base @@ -56859,15 +56895,15 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "dejafu_0_8_0_0" = callPackage + "dejafu_0_9_0_0" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions , leancheck, mtl, random, ref-fd, semigroups, transformers , transformers-base }: mkDerivation { pname = "dejafu"; - version = "0.8.0.0"; - sha256 = "0im33v22m0b9lkq2430g9q5b21qz26sr7zrg4sfr4yn8rr0bgzfa"; + version = "0.9.0.0"; + sha256 = "0n2qj6kaldg006pjz5aj0wjigr3dd7vgbl35fgsz3fx9j64ydi72"; libraryHaskellDepends = [ base concurrency containers deepseq exceptions leancheck mtl random ref-fd semigroups transformers transformers-base @@ -57366,19 +57402,19 @@ self: { }) {}; "derive-topdown" = callPackage - ({ mkDerivation, base, derive, mtl, template-haskell - , template-haskell-util + ({ mkDerivation, base, mtl, primitive, syb, template-haskell + , th-expand-syns, transformers }: mkDerivation { pname = "derive-topdown"; - version = "0.0.0.2"; - sha256 = "0gdalqq1ks9jjp34kzavlx2ncpdad2pf6vdhx64yii5l2nl04r8p"; + version = "0.0.0.7"; + sha256 = "1r566bcp0qqwwbndwbbfnczxwmlyl9dfnsysnija7v8fn46z30ni"; libraryHaskellDepends = [ - base derive mtl template-haskell template-haskell-util + base mtl primitive syb template-haskell th-expand-syns transformers ]; homepage = "https://github.com/HaskellZhangSong/derive-topdown"; - description = "This library will help you generate Haskell empty Generic instances and deriving type instances from the top automatically to the bottom for composited data types"; - license = stdenv.lib.licenses.mit; + description = "Help Haskellers derive class instances for composited data types"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -57661,23 +57697,25 @@ self: { "dhall" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, case-insensitive , charset, containers, contravariant, exceptions, http-client - , http-client-tls, lens, optparse-generic, parsers, system-fileio - , system-filepath, tasty, tasty-hunit, text, text-format - , transformers, trifecta, unordered-containers, vector + , http-client-tls, lens, optparse-generic, parsers, prettyprinter + , system-fileio, system-filepath, tasty, tasty-hunit, text + , text-format, transformers, trifecta, unordered-containers, vector }: mkDerivation { pname = "dhall"; - version = "1.6.0"; - sha256 = "1q48sw96qlvnvqih32fgzdkpabzh13rcgyp8nq917gibmwjrnw85"; + version = "1.7.0"; + sha256 = "1177px9xlvby3wbhwgrvx23wxgmcqhl3qllbry6k42rbgf7rw900"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base bytestring case-insensitive charset containers contravariant exceptions http-client http-client-tls lens parsers - system-fileio system-filepath text text-format transformers - trifecta unordered-containers vector + prettyprinter system-fileio system-filepath text text-format + transformers trifecta unordered-containers vector + ]; + executableHaskellDepends = [ + base optparse-generic prettyprinter system-filepath text trifecta ]; - executableHaskellDepends = [ base optparse-generic text trifecta ]; testHaskellDepends = [ base containers tasty tasty-hunit text vector ]; @@ -57692,8 +57730,8 @@ self: { }: mkDerivation { pname = "dhall-bash"; - version = "1.0.4"; - sha256 = "0xraqhdpbb6f1ng9545lz6b29k3w0flfrk410l7j8inl6i9zpia5"; + version = "1.0.5"; + sha256 = "1cicl18sz969ws64jybxsibcbk1686mfia9avw8asy1fmr2w6ryv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57728,20 +57766,22 @@ self: { }) {}; "dhall-json" = callPackage - ({ mkDerivation, aeson, base, bytestring, dhall, neat-interpolation - , optparse-generic, text, trifecta, vector, yaml + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall + , neat-interpolation, optparse-generic, text, trifecta, vector + , yaml }: mkDerivation { pname = "dhall-json"; - version = "1.0.6"; - sha256 = "0fs6nnkcqwh2m9gws5r3q7z7d7ly9bxgfrgha0f5vsxi66kcfr12"; + version = "1.0.7"; + sha256 = "1wgzj9gfvxs2yvh0hnncfck2qbf4fhqpnibl6n10d0hllmvdbq1b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base dhall neat-interpolation text vector ]; executableHaskellDepends = [ - aeson base bytestring dhall optparse-generic text trifecta yaml + aeson aeson-pretty base bytestring dhall optparse-generic text + trifecta yaml ]; description = "Compile Dhall to JSON or YAML"; license = stdenv.lib.licenses.bsd3; @@ -57754,8 +57794,8 @@ self: { }: mkDerivation { pname = "dhall-nix"; - version = "1.0.7"; - sha256 = "1ivckxwxcdnvp9cdrq02hr3xr2n6p0lpj43pfi8lznx908jbbb2k"; + version = "1.0.8"; + sha256 = "1z6jgcfk1zi0alhpp6ycskb6yd40j2l7bl9bxfkb79443383r2mm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57773,8 +57813,8 @@ self: { ({ mkDerivation, base, dhall, optparse-generic, text }: mkDerivation { pname = "dhall-text"; - version = "1.0.2"; - sha256 = "1482bp3gn36m3ddbka8xa2cb5bg9v095j1bv39d8q2qjz143hdsh"; + version = "1.0.3"; + sha256 = "1kic5mwndqmxqrg9f2a7panawns5j43pik42hl2dds5fvj3cmvr9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base dhall optparse-generic text ]; @@ -58887,19 +58927,20 @@ self: { }) {}; "digit" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, lens, papa - , parsec, parsers, QuickCheck, semigroupoids, semigroups - , template-haskell + ({ mkDerivation, ansi-wl-pprint, base, hedgehog, lens, papa, parsec + , parsers, pretty, semigroupoids, semigroups, tasty, tasty-hedgehog + , tasty-hspec, tasty-hunit, template-haskell, text }: mkDerivation { pname = "digit"; - version = "0.5.0"; - sha256 = "084im8gn0h4l3vwckza7x7s5ax61g6vwcgnn21jgf4ipbbccss4w"; + version = "0.5.1"; + sha256 = "141w8x7r4b3pkalqvgc71p9rdqsfg9nmhyijcg7vr5336qv52p2a"; libraryHaskellDepends = [ base lens papa parsers semigroupoids semigroups template-haskell ]; testHaskellDepends = [ - base directory doctest filepath parsec QuickCheck template-haskell + ansi-wl-pprint base hedgehog lens papa parsec parsers pretty tasty + tasty-hedgehog tasty-hspec tasty-hunit text ]; homepage = "https://github.com/qfpl/digit"; description = "A data-type representing digits 0-9 and other combinations"; @@ -59224,23 +59265,6 @@ self: { }: mkDerivation { pname = "direct-sqlite"; - version = "2.3.20"; - sha256 = "0wdjmqfs968319nl6ikmrrjqajfcb48k11hmmljwg81n1sbdydbf"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ - base base16-bytestring bytestring directory HUnit temporary text - ]; - homepage = "https://github.com/IreneKnapp/direct-sqlite"; - description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "direct-sqlite_2_3_21" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, directory - , HUnit, temporary, text - }: - mkDerivation { - pname = "direct-sqlite"; version = "2.3.21"; sha256 = "101pjvldzbvavjgpzwl0xnpqp0wy7bz1ryfx4sim3w00xj7csfys"; libraryHaskellDepends = [ base bytestring text ]; @@ -59250,7 +59274,6 @@ self: { homepage = "https://github.com/IreneKnapp/direct-sqlite"; description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "directed-cubical" = callPackage @@ -59270,12 +59293,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "directory_1_3_1_4" = callPackage + "directory_1_3_1_5" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.1.4"; - sha256 = "05366w53m2g38ywgbnxs89iivxg738xhyhsszm63xq1pyy90nz4f"; + version = "1.3.1.5"; + sha256 = "0zkqihmdfz7bzv3sxh1p9ijl4vra880kfy3qy9h96flq7d2if0f2"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -61010,6 +61033,8 @@ self: { pname = "doctest-driver-gen"; version = "0.1.0.1"; sha256 = "0drv2zp8mr4sisd27y0bcjamip8vs26a09k65x6zm5ric4psmhqs"; + revision = "1"; + editedCabalFile = "0005s8byp2ww8y2xnmxvdh24fw5qwly4f6sbmzwbs0yi10zsbfkg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base doctest ]; @@ -63854,8 +63879,8 @@ self: { }: mkDerivation { pname = "ekg-core"; - version = "0.1.1.2"; - sha256 = "01gqg5lpn67gc2rsvil4k54c1w9cz9avyxzlvmi2baxbrpj7isrm"; + version = "0.1.1.3"; + sha256 = "1qw9zd4q107c4jy7k8wq3jcyh488gnxxvgk97fm7c2xzyv8f4mmc"; libraryHaskellDepends = [ base containers ghc-prim text unordered-containers ]; @@ -64015,22 +64040,6 @@ self: { }: mkDerivation { pname = "ekg-statsd"; - version = "0.2.1.1"; - sha256 = "1r0x26aqj0nbdl9nrj26xsb5np20bg6mihams394a0c41pv85j6k"; - libraryHaskellDepends = [ - base bytestring ekg-core network text time unordered-containers - ]; - homepage = "https://github.com/tibbe/ekg-statsd"; - description = "Push metrics to statsd"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ekg-statsd_0_2_2_0" = callPackage - ({ mkDerivation, base, bytestring, ekg-core, network, text, time - , unordered-containers - }: - mkDerivation { - pname = "ekg-statsd"; version = "0.2.2.0"; sha256 = "1z1si5zglmwq0qxhd4s8zmp8rps8z4xqnk4l8wlal79f1qkz9862"; libraryHaskellDepends = [ @@ -64039,7 +64048,6 @@ self: { homepage = "https://github.com/tibbe/ekg-statsd"; description = "Push metrics to statsd"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-wai" = callPackage @@ -67875,26 +67883,6 @@ self: { "extensible" = callPackage ({ mkDerivation, base, comonad, constraints, deepseq, ghc-prim - , monad-skeleton, mtl, primitive, profunctors, semigroups, StateVar - , tagged, template-haskell, transformers - }: - mkDerivation { - pname = "extensible"; - version = "0.4.4"; - sha256 = "17ggw3znbx0mh29nqg1g1jp571vsbndswgs28zql32s6nkcd1rby"; - libraryHaskellDepends = [ - base comonad constraints deepseq ghc-prim monad-skeleton mtl - primitive profunctors semigroups StateVar tagged template-haskell - transformers - ]; - testHaskellDepends = [ base ]; - homepage = "https://github.com/fumieval/extensible"; - description = "Extensible, efficient, optics-friendly data types and effects"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extensible_0_4_5" = callPackage - ({ mkDerivation, base, comonad, constraints, deepseq, ghc-prim , lens, monad-skeleton, mtl, primitive, profunctors, QuickCheck , semigroups, StateVar, tagged, template-haskell, transformers }: @@ -67911,7 +67899,6 @@ self: { homepage = "https://github.com/fumieval/extensible"; description = "Extensible, efficient, optics-friendly data types and effects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extensible-data" = callPackage @@ -69712,8 +69699,10 @@ self: { }: mkDerivation { pname = "fgl"; - version = "5.5.4.0"; - sha256 = "04bjm44qr63cl0g5lh07hbq78x5sbvdjf6ryymysi658q0fqjxji"; + version = "5.5.3.1"; + sha256 = "0k1frj6hpiij287sn91qvf1vms1b4zzs3xdq71xbam9cs80p5afy"; + revision = "1"; + editedCabalFile = "00bw87y97ym844ir4mdq0vx5kfb0brzlqmrbqa0iq35lkwsd4k3g"; libraryHaskellDepends = [ array base containers deepseq transformers ]; @@ -70350,32 +70339,6 @@ self: { }: mkDerivation { pname = "find-clumpiness"; - version = "0.2.3.0"; - sha256 = "08aby19vx6mvv606f66yi89bbg7x487drzzbax8437xm7k2fpg73"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base BiobaseNewick bytestring clumpiness containers - hierarchical-clustering listsafe mtl text text-show tree-fun - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base BiobaseNewick bytestring clumpiness containers - optparse-applicative text tree-fun unordered-containers - ]; - homepage = "http://github.com/GregorySchwartz/find-clumpiness#readme"; - description = "Find the clumpiness of labels in a tree"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "find-clumpiness_0_2_3_1" = callPackage - ({ mkDerivation, aeson, base, BiobaseNewick, bytestring, clumpiness - , containers, hierarchical-clustering, listsafe, mtl - , optparse-applicative, text, text-show, tree-fun - , unordered-containers, vector - }: - mkDerivation { - pname = "find-clumpiness"; version = "0.2.3.1"; sha256 = "0aicxjh58cz25kxigz013j07a0vc5jyirs75daqjmlgd3rj5b7h8"; isLibrary = true; @@ -70392,7 +70355,6 @@ self: { homepage = "http://github.com/GregorySchwartz/find-clumpiness#readme"; description = "Find the clumpiness of labels in a tree"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "find-conduit" = callPackage @@ -70448,23 +70410,6 @@ self: { }: mkDerivation { pname = "fingertree"; - version = "0.1.1.0"; - sha256 = "1w6x3kp3by5yjmam6wlrf9vap5l5rrqaip0djbrdp0fpf2imn30n"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 - ]; - description = "Generic finger-tree structure, with example instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fingertree_0_1_2_1" = callPackage - ({ mkDerivation, base, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2 - }: - mkDerivation { - pname = "fingertree"; version = "0.1.2.1"; sha256 = "03vchlbhx9ipjx1w8y4pfc4awb1gjjgr5f95h977lknzb5ad9fx5"; libraryHaskellDepends = [ base ]; @@ -70474,7 +70419,6 @@ self: { ]; description = "Generic finger-tree structure, with example instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fingertree-psqueue" = callPackage @@ -73121,6 +73065,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "free-er" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "free-er"; + version = "0.1.0.0"; + sha256 = "0r6kc117jylp0y88iv8b51glx9nnywfvbcmxsfhd2cps5nkgw030"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/osa1/free-er"; + description = "An extensible effects library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "free-functors" = callPackage ({ mkDerivation, algebraic-classes, base, bifunctors, comonad , constraints, contravariant, profunctors, template-haskell @@ -73623,20 +73582,6 @@ self: { }) {}; "frisby" = callPackage - ({ mkDerivation, array, base, containers, mtl }: - mkDerivation { - pname = "frisby"; - version = "0.2"; - sha256 = "0isj9p7j33va1a4q78vnq32j9jdbjww596rxja235z4whicraf53"; - revision = "1"; - editedCabalFile = "1ip1bykcrnqzfjbsi4gfj59lc24k3kvyn949ryczpqshlpgnbnqj"; - libraryHaskellDepends = [ array base containers mtl ]; - homepage = "http://repetae.net/computer/frisby/"; - description = "Linear time composable parser for PEG grammars"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "frisby_0_2_1" = callPackage ({ mkDerivation, array, base, containers, mtl, semigroups }: mkDerivation { pname = "frisby"; @@ -73646,7 +73591,6 @@ self: { homepage = "http://repetae.net/computer/frisby/"; description = "Linear time composable parser for PEG grammars"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "from-sum" = callPackage @@ -80248,24 +80192,6 @@ self: { }: mkDerivation { pname = "glib"; - version = "0.13.4.1"; - sha256 = "0c16wddkq3ysbcgdngli7g2b680niavwi45km3551k4l83nh4wpm"; - setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; - libraryHaskellDepends = [ - base bytestring containers text utf8-string - ]; - libraryPkgconfigDepends = [ glib ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the GLIB library for Gtk2Hs"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib;}; - - "glib_0_13_5_0" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, glib - , gtk2hs-buildtools, text, utf8-string - }: - mkDerivation { - pname = "glib"; version = "0.13.5.0"; sha256 = "1bd6lfl8l08s28g9wky2bpyl2kh8vhycdni2wh3m7iq91madxgbj"; setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; @@ -80276,7 +80202,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GLIB library for Gtk2Hs"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "glicko" = callPackage @@ -83771,8 +83696,8 @@ self: { }: mkDerivation { pname = "graphite"; - version = "0.5.0.0"; - sha256 = "1942cy8gcx7jwxcfyh605kljzil91g0zw9673l93mjz7ipqhcxz4"; + version = "0.7.0.0"; + sha256 = "0bapl5hvv3dqfrpx9jx70s6akas11xpvfm1zzdkp02w3i106dchj"; libraryHaskellDepends = [ base bytestring cassava containers deepseq dequeue graphviz hashable process QuickCheck random unordered-containers vector @@ -84778,25 +84703,6 @@ self: { }: mkDerivation { pname = "gtk"; - version = "0.14.6"; - sha256 = "09w3f2n2n9n44yf2li3ldlb3cxhbc0rml15j9xqamw5q1h90cybh"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; - libraryHaskellDepends = [ - array base bytestring cairo containers gio glib mtl pango text - ]; - libraryPkgconfigDepends = [ gtk2 ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Gtk+ graphical user interface library"; - license = stdenv.lib.licenses.lgpl21; - }) {gtk2 = pkgs.gnome2.gtk;}; - - "gtk_0_14_7" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers - , gio, glib, gtk2, gtk2hs-buildtools, mtl, pango, text - }: - mkDerivation { - pname = "gtk"; version = "0.14.7"; sha256 = "0fqbr1h2zxa4g6jyias163bnlsnsdhfzfansc63qzh9y10vc2hn4"; enableSeparateDataOutput = true; @@ -84808,7 +84714,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ graphical user interface library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {gtk2 = pkgs.gnome2.gtk;}; "gtk-helpers" = callPackage @@ -84949,28 +84854,6 @@ self: { }: mkDerivation { pname = "gtk2hs-buildtools"; - version = "0.13.2.2"; - sha256 = "0jzvxlssqmd2dpnm35qpaq5xv5jk7hhy87594m74xv0ihygvbr65"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - array base Cabal containers directory filepath hashtables pretty - process random - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Tools to build the Gtk2Hs suite of User Interface libraries"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "gtk2hs-buildtools_0_13_3_0" = callPackage - ({ mkDerivation, alex, array, base, Cabal, containers, directory - , filepath, happy, hashtables, pretty, process, random - }: - mkDerivation { - pname = "gtk2hs-buildtools"; version = "0.13.3.0"; sha256 = "1kz5631vpi4wbi0jldj7gs1xc86vfxdcs750a72x3nbdddbc0asv"; revision = "1"; @@ -84987,7 +84870,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Tools to build the Gtk2Hs suite of User Interface libraries"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk2hs-cast-glade" = callPackage @@ -85128,32 +85010,6 @@ self: { }: mkDerivation { pname = "gtk3"; - version = "0.14.6"; - sha256 = "0n223zgfjfv0p70wd7rh881fv8z00c9jmz7wm3vfa1jy3b2x7h7l"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal gtk2hs-buildtools ]; - libraryHaskellDepends = [ - array base bytestring cairo containers gio glib mtl pango text - ]; - libraryPkgconfigDepends = [ gtk3 ]; - executableHaskellDepends = [ - array base cairo text time transformers - ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Gtk+ 3 graphical user interface library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) gtk3;}; - - "gtk3_0_14_7" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers - , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text, time - , transformers - }: - mkDerivation { - pname = "gtk3"; version = "0.14.7"; sha256 = "0mvzpx4ciral5hnz2iimwag4gbjjciqhjxbbdssg8mg4yvzpb99s"; isLibrary = true; @@ -85170,7 +85026,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ 3 graphical user interface library"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) gtk3;}; "gtk3-mac-integration" = callPackage @@ -87877,6 +87733,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hakyll-shortcode" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, MissingH + , network-uri, parsec, QuickCheck, regex-posix, split, tasty + , tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "hakyll-shortcode"; + version = "0.0.2"; + sha256 = "13z24pg5043s5fr2ak4v3n6vv80xv3c96bibxgrcfcrqfcibvqfx"; + libraryHaskellDepends = [ + base blaze-html blaze-markup MissingH network-uri parsec + regex-posix split + ]; + testHaskellDepends = [ + base blaze-html blaze-markup MissingH network-uri parsec QuickCheck + regex-posix split tasty tasty-hunit tasty-quickcheck + ]; + description = "A shortcode extension module for Hakyll"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "halberd" = callPackage ({ mkDerivation, base, Cabal, containers, haskell-names , haskell-packages, haskell-src-exts, HUnit, mtl, safe, split, syb @@ -89280,6 +89157,25 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "happy_1_19_8" = callPackage + ({ mkDerivation, array, base, Cabal, containers, directory + , filepath, mtl, process + }: + mkDerivation { + pname = "happy"; + version = "1.19.8"; + sha256 = "186ky3bly0i3cc56qk3r7j7pxh2108aackq4n2lli7jmbnb3kxsd"; + isLibrary = false; + isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath ]; + executableHaskellDepends = [ array base containers mtl ]; + testHaskellDepends = [ base process ]; + homepage = "https://www.haskell.org/happy/"; + description = "Happy is a parser generator for Haskell"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happy-meta" = callPackage ({ mkDerivation, array, base, containers, happy, haskell-src-meta , mtl, template-haskell @@ -89599,27 +89495,6 @@ self: { }) {}; "hasbolt" = callPackage - ({ mkDerivation, base, binary, bytestring, containers - , data-binary-ieee754, data-default, hex, hspec, network - , QuickCheck, text, transformers - }: - mkDerivation { - pname = "hasbolt"; - version = "0.1.2.1"; - sha256 = "08pa4df4klijdxpbfkqiqfjrcwl3ip3gwg84kx1zg9wpnvdbjn4l"; - libraryHaskellDepends = [ - base binary bytestring containers data-binary-ieee754 data-default - hex network text transformers - ]; - testHaskellDepends = [ - base bytestring containers hex hspec QuickCheck text - ]; - homepage = "https://github.com/zmactep/hasbolt#readme"; - description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hasbolt_0_1_3_0" = callPackage ({ mkDerivation, base, binary, bytestring, connection, containers , data-binary-ieee754, data-default, hex, network, text , transformers @@ -89635,7 +89510,6 @@ self: { homepage = "https://github.com/zmactep/hasbolt#readme"; description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hascal" = callPackage @@ -90036,20 +89910,6 @@ self: { ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: mkDerivation { pname = "hashtables"; - version = "1.2.2.0"; - sha256 = "0v7kfm04pynj66rkzyzvygxqv3xr3dj3h2aw0qj3h2zzjp33ybbf"; - libraryHaskellDepends = [ - base ghc-prim hashable primitive vector - ]; - homepage = "http://github.com/gregorycollins/hashtables"; - description = "Mutable hash tables in the ST monad"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hashtables_1_2_2_1" = callPackage - ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }: - mkDerivation { - pname = "hashtables"; version = "1.2.2.1"; sha256 = "1g7nvj4cmscv1jjhms1pxb2gj4rflg2pcj3pb2z7x9fck8557bbs"; libraryHaskellDepends = [ @@ -90058,7 +89918,6 @@ self: { homepage = "http://github.com/gregorycollins/hashtables"; description = "Mutable hash tables in the ST monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashtables-plus" = callPackage @@ -96473,8 +96332,8 @@ self: { }: mkDerivation { pname = "hexpat-lens"; - version = "0.1.5"; - sha256 = "13965xm8anbhq8xpg0y5a5aw9xy2gzn5zm1w64p96sdzklw5xrna"; + version = "0.1.6"; + sha256 = "0d395r8rc1s3q1gldynb47g20l4585w18div21jm397gga4cgkmx"; libraryHaskellDepends = [ base bytestring deepseq hexpat hexpat-tagsoup lens ]; @@ -98880,8 +98739,8 @@ self: { pname = "hledger-iadd"; version = "1.2.6"; sha256 = "1l5vzhyya5h6sc3l74iy0mnys8bcjp6m5z0m3lqabk37ik31ld36"; - revision = "4"; - editedCabalFile = "0sb4rs0qh126xbwnza1gq1xlq3vds9rgypd1j02s59p5l725j9l8"; + revision = "5"; + editedCabalFile = "0sv6lqnsi5s28f001xi72bjlaykwl1l7ygf9kqpj01i8km7l5xpr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -98989,8 +98848,8 @@ self: { pname = "hledger-ui"; version = "1.4"; sha256 = "0rm6091nlpijhi6k74dg35g38a7ly22mqfnb0mvjp8pyxb4phq33"; - revision = "3"; - editedCabalFile = "19b2l4xdk504gy5fvwhcklk2ljl4m4kqsyaifn7shnxyb5vc46dw"; + revision = "4"; + editedCabalFile = "0gffnqaf35yscg080p1p50f4w4l5rcvf5q5y19fbwmgwvp9nm687"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -106513,29 +106372,6 @@ self: { }: mkDerivation { pname = "html-conduit"; - version = "1.2.1.1"; - sha256 = "1a5878axl1w65rv3g76d8fwgzbwazikna885jz5156zrrdq79hlq"; - revision = "2"; - editedCabalFile = "1fhna6ck1v05zpf4c715phz102v8vz0p7lsjk3fljmxblamc8kn6"; - libraryHaskellDepends = [ - base bytestring conduit conduit-extra containers resourcet - tagstream-conduit text transformers xml-conduit xml-types - ]; - testHaskellDepends = [ - base bytestring containers hspec HUnit xml-conduit - ]; - homepage = "https://github.com/snoyberg/xml"; - description = "Parse HTML documents using xml-conduit datatypes"; - license = stdenv.lib.licenses.mit; - }) {}; - - "html-conduit_1_2_1_2" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , containers, hspec, HUnit, resourcet, tagstream-conduit, text - , transformers, xml-conduit, xml-types - }: - mkDerivation { - pname = "html-conduit"; version = "1.2.1.2"; sha256 = "172ip4rkn2y3mpzjrj2h3nrmxrf90gcl8ax6dgdhrdjsyg4h8vjk"; libraryHaskellDepends = [ @@ -106548,7 +106384,6 @@ self: { homepage = "https://github.com/snoyberg/xml"; description = "Parse HTML documents using xml-conduit datatypes"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "html-email-validate" = callPackage @@ -106774,6 +106609,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "htoml-megaparsec" = callPackage + ({ mkDerivation, aeson, base, bytestring, composition-prelude + , containers, criterion, deepseq, file-embed, megaparsec, mtl + , old-locale, tasty, tasty-hspec, tasty-hunit, text, time + , unordered-containers, vector + }: + mkDerivation { + pname = "htoml-megaparsec"; + version = "1.0.1.1"; + sha256 = "02zrqdpry6hggd1q71dh85j9g3chzcln904ag507rihilxv90s45"; + libraryHaskellDepends = [ + base composition-prelude containers deepseq megaparsec mtl + old-locale text time unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed megaparsec tasty + tasty-hspec tasty-hunit text time unordered-containers vector + ]; + benchmarkHaskellDepends = [ + aeson base containers criterion text time unordered-containers + vector + ]; + homepage = "https://github.com/vmchale/htoml-megaparsec"; + description = "Parser for TOML files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "htrace" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -108150,12 +108012,12 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "hunit-dejafu_0_7_0_1" = callPackage + "hunit-dejafu_0_7_0_2" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "0.7.0.1"; - sha256 = "01qa52j5xkksq0z24c8shm04q1gxnqm1m3sqpm1s27ywbivl9n6i"; + version = "0.7.0.2"; + sha256 = "1n3vq17rl18kaill8ig30qvmaw60dq8w0phss5v8hhgfij64gmm6"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; @@ -112929,25 +112791,12 @@ self: { ({ mkDerivation, base, mtl, transformers }: mkDerivation { pname = "instance-control"; - version = "0.1.1.1"; - sha256 = "0cgvqd52la1f1r7a8cdjg1j3hx1f7y8s3z2ghddmc8s8sxihhkb6"; - libraryHaskellDepends = [ base mtl transformers ]; - homepage = "https://github.com/lazac/instance-control"; - description = "Controls how the compiler searches for instances using type families"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "instance-control_0_1_2_0" = callPackage - ({ mkDerivation, base, mtl, transformers }: - mkDerivation { - pname = "instance-control"; version = "0.1.2.0"; sha256 = "0wvb3hia5n0nmfd5ih17qp6f7517s164c5mhrn29ai7vv20x6vbx"; libraryHaskellDepends = [ base mtl transformers ]; homepage = "https://github.com/lazac/instance-control"; description = "Controls how the compiler searches for instances using type families"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "instant-aeson" = callPackage @@ -118121,42 +117970,6 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.5.0.2"; - sha256 = "1kiangj6l29ddchfzfp4xjnpnddyc9jzrg08b70z3jxbdv2vgvyg"; - libraryHaskellDepends = [ - aeson async auto-update base bytestring containers either hostname - microlens microlens-th monad-control mtl old-locale resourcet - safe-exceptions scientific semigroups stm string-conv - template-haskell text time transformers transformers-base - transformers-compat unix unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring containers directory microlens - quickcheck-instances regex-tdfa safe-exceptions stm tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - time time-locale-compat unordered-containers - ]; - benchmarkHaskellDepends = [ - aeson async base blaze-builder criterion deepseq directory filepath - safe-exceptions text time transformers unix - ]; - homepage = "https://github.com/Soostone/katip"; - description = "A structured logging framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "katip_0_5_0_3" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , bytestring, containers, criterion, deepseq, directory, either - , filepath, hostname, microlens, microlens-th, monad-control, mtl - , old-locale, quickcheck-instances, regex-tdfa, resourcet - , safe-exceptions, scientific, semigroups, stm, string-conv, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell - , text, time, time-locale-compat, transformers, transformers-base - , transformers-compat, unix, unordered-containers - }: - mkDerivation { - pname = "katip"; version = "0.5.0.3"; sha256 = "18gpj6h9h90nvpb0fb1ns2ygzip4r0v7hna4q1d6gmz88j28s66a"; libraryHaskellDepends = [ @@ -118179,7 +117992,6 @@ self: { homepage = "https://github.com/Soostone/katip"; description = "A structured logging framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katip-elasticsearch" = callPackage @@ -121321,7 +121133,7 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "language-puppet_1_3_11" = callPackage + "language-puppet_1_3_12_1" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, exceptions, filecache, formatting, Glob @@ -121335,8 +121147,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3.11"; - sha256 = "03zvd5xwjdbarfvfy9y8rn2wabzw5ic3vr5f0li0r9cgdg1p66p2"; + version = "1.3.12.1"; + sha256 = "1nznlw81qnnrvfpwrliyz88f1i6wmsg8kksjnwk5zv69q9nxg3z1"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -122270,20 +122082,6 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.6.5"; - sha256 = "05mda73v91y951fc8lph2fq8nhq3q12d30xjwj5h7xqwi2c8sdiy"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base ]; - homepage = "https://github.com/rudymatela/leancheck#readme"; - description = "Cholesterol-free property-based testing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; - }) {}; - - "leancheck_0_6_7" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "leancheck"; version = "0.6.7"; sha256 = "1aia20p6r9b4xncv5r7y1a2zff37ky0v0m3fd5idlg3sshsd02kv"; libraryHaskellDepends = [ base template-haskell ]; @@ -122291,7 +122089,7 @@ self: { homepage = "https://github.com/rudymatela/leancheck#readme"; description = "Cholesterol-free property-based testing"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "leankit-api" = callPackage @@ -125312,8 +125110,8 @@ self: { }: mkDerivation { pname = "liquidhaskell"; - version = "0.8.0.3"; - sha256 = "0w24iib5938wlm8c73j04fqz5aqya7bnaqi3psk3yl6q1fl7i57l"; + version = "0.8.0.5"; + sha256 = "02iixi1ika6rjdf8qzf404prvjl2l0qhq7rgyzbkrfvk7k4x1mbv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -125339,7 +125137,6 @@ self: { homepage = "https://github.com/ucsd-progsys/liquidhaskell"; description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) z3;}; "liquidhaskell-cabal" = callPackage @@ -126099,27 +125896,25 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {llvm-config = null;}; - "llvm-hs_5_0_0" = callPackage + "llvm-hs_5_1_0" = callPackage ({ mkDerivation, array, attoparsec, base, bytestring, Cabal , containers, exceptions, llvm-config, llvm-hs-pure, mtl , pretty-show, QuickCheck, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, temporary, transformers, transformers-compat - , utf8-string + , template-haskell, temporary, transformers, utf8-string }: mkDerivation { pname = "llvm-hs"; - version = "5.0.0"; - sha256 = "1lngf77ir1ffmqmwjpvax3rwmkapqrap66nc5lms3zxkpd3sh31x"; + version = "5.1.0"; + sha256 = "1l6r409zviis70qd3w8ysycy479q0sqjd85kd6z8b0ngjvq1y5ik"; setupHaskellDepends = [ base Cabal containers ]; libraryHaskellDepends = [ array attoparsec base bytestring containers exceptions llvm-hs-pure - mtl template-haskell transformers transformers-compat utf8-string + mtl template-haskell transformers utf8-string ]; libraryToolDepends = [ llvm-config ]; testHaskellDepends = [ base bytestring containers llvm-hs-pure mtl pretty-show QuickCheck tasty tasty-hunit tasty-quickcheck temporary transformers - transformers-compat ]; homepage = "http://github.com/llvm-hs/llvm-hs/"; description = "General purpose LLVM bindings"; @@ -126149,22 +125944,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "llvm-hs-pure_5_0_0" = callPackage + "llvm-hs-pure_5_1_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, mtl , tasty, tasty-hunit, tasty-quickcheck, template-haskell - , transformers, transformers-compat + , transformers }: mkDerivation { pname = "llvm-hs-pure"; - version = "5.0.0"; - sha256 = "1brz1zc9mmx4vyivvidjxv4x3i04wwpn1y060lcpnzmp89zz5pc1"; + version = "5.1.0"; + sha256 = "0m4ahrh2d0h9vfky9852y99g1xwsi7s7qr3xxnbgnw8zci7966f5"; libraryHaskellDepends = [ attoparsec base bytestring containers mtl template-haskell - transformers transformers-compat + transformers ]; testHaskellDepends = [ base containers mtl tasty tasty-hunit tasty-quickcheck transformers - transformers-compat ]; homepage = "http://github.com/llvm-hs/llvm-hs/"; description = "Pure Haskell LLVM functionality (no FFI)"; @@ -126668,10 +126462,8 @@ self: { }: mkDerivation { pname = "log-base"; - version = "0.7.2.0"; - sha256 = "1lxlm76n1yhdkqmi44m4h460sc3a6lmscaz2daci16vvl4kzilds"; - revision = "1"; - editedCabalFile = "0x11xxfvlak8p7p544gknm2k7nqh1wq01bg800gdgppxcpv3m4li"; + version = "0.7.3.0"; + sha256 = "15bf0ly3fl2k7dqn5vskafsihil5lb7ij96vw0nsb3dil80f54qk"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions mmorph monad-control monad-time mtl semigroups stm text time @@ -126734,8 +126526,8 @@ self: { pname = "log-elasticsearch"; version = "0.9.1.0"; sha256 = "0i6mpdh1g25wa9yk9p5isg7idjqh3z0zd2mm43707z4s36pfr9m5"; - revision = "1"; - editedCabalFile = "1c2245z8ajy11n033my5wzj9q79vbj4jlysy477syr6h5840wd6x"; + revision = "2"; + editedCabalFile = "11c7jrc16nwg5jxwsggip5bsvw9zbk8c3gw1my22rwfglnpxg885"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring deepseq http-client http-client-tls log-base semigroups text @@ -126803,8 +126595,8 @@ self: { }: mkDerivation { pname = "log-warper"; - version = "1.3.0"; - sha256 = "0y5bwva06nl1gs1h0m5csg1sly7v8a4w0q2k1424w3zrm11in79q"; + version = "1.3.1"; + sha256 = "0hagc9yxb8dmc2qxjzdddvynx7pygr02alf99dvhnc4p5v2yx4z7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127941,30 +127733,6 @@ self: { }: mkDerivation { pname = "lucid"; - version = "2.9.8.1"; - sha256 = "026s82bh3a4lgmpy9445i5f6q0iiqpc8cxxx8rhmn32nrqhf187b"; - libraryHaskellDepends = [ - base blaze-builder bytestring containers hashable mmorph mtl text - transformers unordered-containers - ]; - testHaskellDepends = [ - base bifunctors hspec HUnit mtl parsec text - ]; - benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion deepseq text transformers - ]; - homepage = "https://github.com/chrisdone/lucid"; - description = "Clear to write, read and edit DSL for HTML"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lucid_2_9_9" = callPackage - ({ mkDerivation, base, bifunctors, blaze-builder, bytestring - , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph - , mtl, parsec, text, transformers, unordered-containers - }: - mkDerivation { - pname = "lucid"; version = "2.9.9"; sha256 = "0cqdlm1kamfn8kv3r3vphz16j2xi9yf15kpb6440rhsyvwddbani"; libraryHaskellDepends = [ @@ -127980,7 +127748,6 @@ self: { homepage = "https://github.com/chrisdone/lucid"; description = "Clear to write, read and edit DSL for HTML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lucid-extras" = callPackage @@ -128268,6 +128035,8 @@ self: { pname = "lxd-client"; version = "0.1.0.2"; sha256 = "1m1rqzbjnd73p6y2iak5fpdq15n52pn2lancvr5s0japw45knqhz"; + revision = "1"; + editedCabalFile = "003vlaqpqcxhdmc2l0851i4c689bzlc2s9rlrdw6mdcsl4l58qwr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128779,8 +128548,8 @@ self: { }: mkDerivation { pname = "madlang"; - version = "2.4.2.10"; - sha256 = "0s6y309prwz148jaa7yiivv17jq4zsvcrkvpgkcs0gah98i601a8"; + version = "2.4.2.14"; + sha256 = "1nimlz7bcn90hzrnb5v26gn8c4jp17ac4i8hl902h0k8ba9rr7i7"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory file-embed process ]; @@ -134735,8 +134504,8 @@ self: { }: mkDerivation { pname = "monad-persist"; - version = "0.0.1.2"; - sha256 = "1k6vfn2a120jxsgscajz9k91ns8spcan555gdyrj4jyrg8fzkbcd"; + version = "0.0.1.4"; + sha256 = "032732piflwzx43rdndbjy757pmkm68p28bb6znz6dsj7r0xv349"; libraryHaskellDepends = [ base exceptions monad-control monad-logger mtl persistent text transformers-base @@ -134745,6 +134514,7 @@ self: { base hspec monad-control monad-logger persistent persistent-sqlite persistent-template text ]; + homepage = "https://github.com/cjdev/monad-persist#readme"; description = "An mtl-style typeclass and transformer for persistent"; license = stdenv.lib.licenses.isc; }) {}; @@ -138097,7 +137867,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mysql-haskell_0_8_1_0" = callPackage + "mysql-haskell_0_8_3_0" = callPackage ({ mkDerivation, base, binary, binary-ieee754, binary-parsers , blaze-textual, bytestring, bytestring-lexing, cryptonite , io-streams, memory, monad-loops, network, scientific, tasty @@ -138106,8 +137876,8 @@ self: { }: mkDerivation { pname = "mysql-haskell"; - version = "0.8.1.0"; - sha256 = "02nxfm3y7f24gqs4hac5pk2q32l0xvaspby6n56zcrdwmpfs3241"; + version = "0.8.3.0"; + sha256 = "1b3sa119m82qmq2mkn0ixhs175i6l92nk4qwvfhh226crj6g5bp9"; libraryHaskellDepends = [ base binary binary-ieee754 binary-parsers blaze-textual bytestring bytestring-lexing cryptonite io-streams memory monad-loops network @@ -138156,6 +137926,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mysql-haskell-openssl_0_8_3_0" = callPackage + ({ mkDerivation, base, binary, HsOpenSSL, mysql-haskell + , tcp-streams, tcp-streams-openssl, wire-streams + }: + mkDerivation { + pname = "mysql-haskell-openssl"; + version = "0.8.3.0"; + sha256 = "0pm5vd2gpb1x68n2i5brvspngfplp283jlw9a351z2yrnpwmwd24"; + libraryHaskellDepends = [ + base binary HsOpenSSL mysql-haskell tcp-streams tcp-streams-openssl + wire-streams + ]; + homepage = "https://github.com/winterland1989/mysql-haskell"; + description = "TLS support for mysql-haskell package using openssl"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mysql-simple" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , blaze-textual, bytestring, hspec, mysql, old-locale, pcre-light @@ -140611,23 +140399,6 @@ self: { }: mkDerivation { pname = "network-transport-tests"; - version = "0.2.4.1"; - sha256 = "1j3sfr8d0fjp7qiqw94rcfwk8hrb55w8vz7cmw891cjjdlf00nb3"; - libraryHaskellDepends = [ - ansi-terminal base bytestring containers mtl network-transport - random - ]; - homepage = "http://haskell-distributed.github.com"; - description = "Unit tests for Network.Transport implementations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "network-transport-tests_0_2_4_2" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl - , network-transport, random - }: - mkDerivation { - pname = "network-transport-tests"; version = "0.2.4.2"; sha256 = "1iyb4zm2iw805qfnlhnlwm2hh1ajhzgzlghsn8g3hnpdgszw896b"; libraryHaskellDepends = [ @@ -140637,7 +140408,6 @@ self: { homepage = "http://haskell-distributed.github.com"; description = "Unit tests for Network.Transport implementations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-transport-zeromq" = callPackage @@ -141064,8 +140834,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "0.8.1.0"; - sha256 = "0ab8hh8dh8rk65zghwhhfpvlkvj5i1652cv5vw9a0pd5mqqygh2z"; + version = "0.9.0.0"; + sha256 = "099q24f9879sdwqa0jnlsamvpz1jbyryn90w7jp7np68avbhv9bf"; libraryHaskellDepends = [ async base binary bytestring monad-loops template-haskell unix ]; @@ -143882,13 +143652,13 @@ self: { ({ mkDerivation, base, type-fun }: mkDerivation { pname = "open-union"; - version = "0.2.0.0"; - sha256 = "1glbnkd62999ybmm7d15m4d6q9j6cjmj27pzj3dfvz3afd75v0z9"; + version = "0.3.0.0"; + sha256 = "01wxkla0034d5i331vzbjm5ilkdn2570qhl0pa6lf3m58aghmccn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base type-fun ]; executableHaskellDepends = [ base type-fun ]; - homepage = "https://github.com/bfopa/open-union"; + homepage = "https://github.com/bfops/open-union"; description = "Extensible, type-safe unions"; license = stdenv.lib.licenses.mit; }) {}; @@ -145268,8 +145038,8 @@ self: { }: mkDerivation { pname = "orgstat"; - version = "0.0.4"; - sha256 = "1229av0i3j69wcnzpxz21z3j02sr2wl491swidfqzp9ifjk4w5l3"; + version = "0.1.1"; + sha256 = "0241f7d996akmqi1id6dqwki5yql7mgw331msxvza616s3gcyd36"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -146496,26 +146266,6 @@ self: { }: mkDerivation { pname = "pango"; - version = "0.13.3.1"; - sha256 = "1frzcgqa1f1i3bk0q229vy8y6gsi423s8hfqvnr56h7ys8blysih"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ]; - libraryHaskellDepends = [ - array base cairo containers directory glib mtl pretty process text - ]; - libraryPkgconfigDepends = [ pango ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Pango text rendering engine"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome2) pango;}; - - "pango_0_13_4_0" = callPackage - ({ mkDerivation, array, base, Cabal, cairo, containers, directory - , filepath, glib, gtk2hs-buildtools, mtl, pango, pretty, process - , text - }: - mkDerivation { - pname = "pango"; version = "0.13.4.0"; sha256 = "1m7as420nh55n0hywnl6rbm7zj4s1ry38xvb1gk3np7k87lwf20z"; enableSeparateDataOutput = true; @@ -146527,7 +146277,6 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Pango text rendering engine"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome2) pango;}; "panhandle" = callPackage @@ -146607,17 +146356,17 @@ self: { }) {}; "papa" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, papa-base - , papa-base-export, papa-base-implement, papa-bifunctors - , papa-bifunctors-export, papa-bifunctors-implement, papa-lens - , papa-lens-export, papa-lens-implement, papa-semigroupoids + ({ mkDerivation, base, papa-base, papa-base-export + , papa-base-implement, papa-bifunctors, papa-bifunctors-export + , papa-bifunctors-implement, papa-lens, papa-lens-export + , papa-lens-implement, papa-semigroupoids , papa-semigroupoids-export, papa-semigroupoids-implement, papa-x - , papa-x-export, papa-x-implement, QuickCheck, template-haskell + , papa-x-export, papa-x-implement }: mkDerivation { pname = "papa"; - version = "0.3.0"; - sha256 = "0rqk37yv5z0fmk5ksmfp5gsx0fvhb9vgzxf699dfzcyjhr2wza4i"; + version = "0.3.1"; + sha256 = "05w1sj78fvdaw8f4dqq2c8vwm9qyjipabafznlib6qylv27x361c"; libraryHaskellDepends = [ base papa-base papa-base-export papa-base-implement papa-bifunctors papa-bifunctors-export papa-bifunctors-implement papa-lens @@ -146625,117 +146374,84 @@ self: { papa-semigroupoids-export papa-semigroupoids-implement papa-x papa-x-export papa-x-implement ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "Reasonable default import"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-base" = callPackage - ({ mkDerivation, base, directory, doctest, filepath - , papa-base-export, papa-base-implement, QuickCheck - , template-haskell - }: + ({ mkDerivation, base, papa-base-export, papa-base-implement }: mkDerivation { pname = "papa-base"; - version = "0.3.0"; - sha256 = "1mj70lipn90jpnadwzs2sl36q72x0z47bhhnmzdcpr79irqf1fx2"; + version = "0.3.1"; + sha256 = "1clilnnhaz4vf5hdi8cmqy5805l2q8g9mfi2czi3g3rr7wp8x89y"; libraryHaskellDepends = [ base papa-base-export papa-base-implement ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-base-export" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , semigroups, template-haskell - }: + ({ mkDerivation, base, semigroups }: mkDerivation { pname = "papa-base-export"; - version = "0.3.0"; - sha256 = "19ix2ckdp22xfjghgb8a7586pbldz291185bc96j37ijmy4lhd5z"; + version = "0.3.1"; + sha256 = "13gd3ldpiwmms3di80smk68x4mf9nigy0irz506cayd9bwqpw3jv"; libraryHaskellDepends = [ base semigroups ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-base-implement" = callPackage - ({ mkDerivation, base, directory, doctest, filepath - , papa-base-export, QuickCheck, semigroups, template-haskell - }: + ({ mkDerivation, base, papa-base-export, semigroups }: mkDerivation { pname = "papa-base-implement"; - version = "0.3.0"; - sha256 = "17swqgg9nja1jlyhynzaybcq47kqmf0ci7rpd6n2vmwmg2d12inx"; + version = "0.3.1"; + sha256 = "07wpz625sdsjajaf3imqns92hs4h5gwjlmmfsr5mk9rbb3zph7ck"; libraryHaskellDepends = [ base papa-base-export semigroups ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "Useful base functions reimplemented"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-bifunctors" = callPackage - ({ mkDerivation, base, directory, doctest, filepath - , papa-bifunctors-export, papa-bifunctors-implement, QuickCheck - , template-haskell + ({ mkDerivation, base, papa-bifunctors-export + , papa-bifunctors-implement }: mkDerivation { pname = "papa-bifunctors"; - version = "0.3.0"; - sha256 = "04yy7v810sff3k4wjlmkpqjxic3wj35c03vpiqi2mnjawy4dv02m"; + version = "0.3.1"; + sha256 = "1yh742vl8lrs8lrihny4l1ss4ngp3i7willvv2xpslizlrr3n02g"; libraryHaskellDepends = [ base papa-bifunctors-export papa-bifunctors-implement ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-bifunctors-export" = callPackage - ({ mkDerivation, base, bifunctors, directory, doctest, filepath - , QuickCheck, template-haskell - }: + ({ mkDerivation, base, bifunctors }: mkDerivation { pname = "papa-bifunctors-export"; - version = "0.3.0"; - sha256 = "0r4sk72ffd6whmmq6x9yjl8yfmq6i8hgywncambhhkprnq0y1lrl"; + version = "0.3.1"; + sha256 = "070br6i23pdhha9kakfw4sq8rslyrjsf1n0iikm60ca5ldbl8vn0"; libraryHaskellDepends = [ base bifunctors ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "export useful functions from `bifunctors`"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-bifunctors-implement" = callPackage - ({ mkDerivation, base, bifunctors, directory, doctest, filepath - , QuickCheck, template-haskell - }: + ({ mkDerivation, base, bifunctors }: mkDerivation { pname = "papa-bifunctors-implement"; - version = "0.3.0"; - sha256 = "0s003pj5mbqrlp14krzah42920ai111nyp9xz3zi9q0qjqd293x5"; + version = "0.3.1"; + sha256 = "0s1hcpchiz9xrip25z677lkglmflnqibrvy98xmn2ppzp489pm24"; libraryHaskellDepends = [ base bifunctors ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "useful `bifunctors` functions reimplemented"; license = stdenv.lib.licenses.bsd3; @@ -146802,54 +146518,38 @@ self: { }) {}; "papa-lens" = callPackage - ({ mkDerivation, base, directory, doctest, filepath - , papa-lens-export, papa-lens-implement, QuickCheck - , template-haskell - }: + ({ mkDerivation, base, papa-lens-export, papa-lens-implement }: mkDerivation { pname = "papa-lens"; - version = "0.3.0"; - sha256 = "0rdxmp9smrbk86hi0n0v4c49mlw4py39961mv7j8mg4szrgnmb8s"; + version = "0.3.1"; + sha256 = "1djx19xr3jbxwnzvr528xwshv1j86cz6ix09zrh32qdilkhfl66v"; libraryHaskellDepends = [ base papa-lens-export papa-lens-implement ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-lens-export" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, lens - , QuickCheck, template-haskell - }: + ({ mkDerivation, base, lens }: mkDerivation { pname = "papa-lens-export"; - version = "0.3.0"; - sha256 = "02pqgkx0xdpcwaknk0hh0b2mvk0kqh5i1m0zfx6fvh9k7yzjm510"; + version = "0.3.1"; + sha256 = "1sckrsfljk8r9jkjv1ccpzw6bk4fq50zwvkddhfidjrjnfvkycfb"; libraryHaskellDepends = [ base lens ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "export useful functions from `lens`"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-lens-implement" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, lens - , QuickCheck, template-haskell - }: + ({ mkDerivation, base, lens }: mkDerivation { pname = "papa-lens-implement"; - version = "0.3.0"; - sha256 = "0scfdiqvjrzimavl6v3g9rlak5rxaa8kdrwxvxsswm4iw7ach1px"; + version = "0.3.1"; + sha256 = "1x7439f7s625mdhnphvwy4pj7llpj6qsvzgvhzjcfg9m3n2a8bn4"; libraryHaskellDepends = [ base lens ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "useful `lens` functions reimplemented"; license = stdenv.lib.licenses.bsd3; @@ -146942,105 +146642,76 @@ self: { }) {}; "papa-semigroupoids" = callPackage - ({ mkDerivation, base, directory, doctest, filepath - , papa-semigroupoids-export, papa-semigroupoids-implement - , QuickCheck, template-haskell + ({ mkDerivation, base, papa-semigroupoids-export + , papa-semigroupoids-implement }: mkDerivation { pname = "papa-semigroupoids"; - version = "0.3.0"; - sha256 = "19gdwj4f2cd25qjakkfwij4igbvx1065dn8gjrdy78vkjsnx9c80"; + version = "0.3.1"; + sha256 = "0z6ibgk0r3d27953i8n031al96djznvnbrak4dpgn05qnh9l0338"; libraryHaskellDepends = [ base papa-semigroupoids-export papa-semigroupoids-implement ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-semigroupoids-export" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , semigroupoids, template-haskell - }: + ({ mkDerivation, base, semigroupoids }: mkDerivation { pname = "papa-semigroupoids-export"; - version = "0.3.0"; - sha256 = "19fr1sdpvs9yf8030ff8kx9qahd7zprck5d8mxz2xgrl86zlaa8d"; + version = "0.3.1"; + sha256 = "0arqnnavjmpk0r9rfmpkyr3cxgc3gcr01ym8p15ix0iv0svghhx3"; libraryHaskellDepends = [ base semigroupoids ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "export useful functions from `semigroupoids`"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-semigroupoids-implement" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , semigroupoids, semigroups, template-haskell - }: + ({ mkDerivation, base, semigroupoids, semigroups }: mkDerivation { pname = "papa-semigroupoids-implement"; - version = "0.3.0"; - sha256 = "0i84p1gffvgq58pmjr9rp774zfbvzs3w9krpp60d8pyz61rmsgjd"; + version = "0.3.1"; + sha256 = "0walc4zzm8cyjmjl577zrc01lkgf321r8law5mwhlr7n9ihiqfxg"; libraryHaskellDepends = [ base semigroupoids semigroups ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "useful `semigroupoids` functions reimplemented"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-x" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, papa-x-export - , papa-x-implement, QuickCheck, template-haskell - }: + ({ mkDerivation, base, papa-x-export, papa-x-implement }: mkDerivation { pname = "papa-x"; - version = "0.3.0"; - sha256 = "0nxhvnhlk622q7qfzl3z6fwzsanjhy26p8i51w1g5p89izwz8yy4"; + version = "0.3.1"; + sha256 = "1dvnnpdbiaxry2mxsfxlm0c42zi8ssx0sxj6m9z5mihwcf76cpld"; libraryHaskellDepends = [ base papa-x-export papa-x-implement ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-x-export" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , template-haskell - }: + ({ mkDerivation, base }: mkDerivation { pname = "papa-x-export"; - version = "0.3.0"; - sha256 = "1y94kfpzk5v5agwhqlysm4jg3q0n09sqpw1wn9r5qqvvxkkjx9s1"; + version = "0.3.1"; + sha256 = "1l0rklbpg9py2cbp22qlshcxh51wxv9ayiixqh32q70jsgfbkind"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "export useful functions"; license = stdenv.lib.licenses.bsd3; }) {}; "papa-x-implement" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, QuickCheck - , template-haskell - }: + ({ mkDerivation, base }: mkDerivation { pname = "papa-x-implement"; - version = "0.3.0"; - sha256 = "1qycam0xb99vgfh01sw3vq5mvlgrq9kgjfs2js8inhmzij3a0nv9"; + version = "0.3.1"; + sha256 = "1hwd93nig7vgqsdy3qyxrgvjcq8wwbj98z6r66wpp7lw8jfpqhff"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell - ]; homepage = "https://github.com/qfpl/papa"; description = "useful functions reimplemented"; license = stdenv.lib.licenses.bsd3; @@ -151467,14 +151138,14 @@ self: { }) {}; "pipes-extras" = callPackage - ({ mkDerivation, base, foldl, HUnit, pipes, test-framework + ({ mkDerivation, base, foldl, HUnit, lens, pipes, test-framework , test-framework-hunit, transformers }: mkDerivation { pname = "pipes-extras"; - version = "1.0.10"; - sha256 = "1an1ca8dbwnz7jsz0l9gyrzgibyhl46p855m3hzvy0jvhai0fz2j"; - libraryHaskellDepends = [ base foldl pipes transformers ]; + version = "1.0.11"; + sha256 = "0hllsd5jk88fv59bqiqksk52iwmqm7835fchzqmavgdsrib0nlmi"; + libraryHaskellDepends = [ base foldl lens pipes transformers ]; testHaskellDepends = [ base HUnit pipes test-framework test-framework-hunit transformers ]; @@ -154056,15 +153727,14 @@ self: { }) {}; "postgres-embedded" = callPackage - ({ mkDerivation, base, directory, filepath, HDBC, HDBC-postgresql - , shell-conduit + ({ mkDerivation, base, directory, filepath, network, shell-conduit }: mkDerivation { pname = "postgres-embedded"; - version = "0.1.0"; - sha256 = "0014lwv8p71krm42dd5nydvfll04hzkfhzfm93csvgbg9s9wiywy"; + version = "0.1.5"; + sha256 = "0g7nvszas7zmx9wh8cdpc5wx5nkv710n7fzipsgbk2qlzj0j7f08"; libraryHaskellDepends = [ - base directory filepath HDBC HDBC-postgresql shell-conduit + base directory filepath network shell-conduit ]; testHaskellDepends = [ base filepath ]; homepage = "https://github.com/ilya-murzinov/postgres-embedded"; @@ -154995,8 +154665,8 @@ self: { }: mkDerivation { pname = "pragmatic-show"; - version = "0.1.0.2"; - sha256 = "0wyn4rdhv8flhcaa41bv7yabs2l5sm5fp7znsdjr137g3v190xpl"; + version = "0.1.1.0"; + sha256 = "0zkvdgghzyarvkx0ggcbpmmcbrkkk9dhbiq6xz4ljvdc9872hya6"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck vector-space @@ -155874,8 +155544,8 @@ self: { ({ mkDerivation, base, criterion, deepseq, HTF, primes }: mkDerivation { pname = "primes-type"; - version = "0.2.0.2"; - sha256 = "0d2nhb0kbpls4ybipnjf2bf73dz1as5qhb0cjz59nmsipkqcr45s"; + version = "0.2.0.3"; + sha256 = "0y0dq283zshkd7gwywr2dvjr073bz5rbjvgqrxkbvnk97dcq4qjx"; libraryHaskellDepends = [ base deepseq primes ]; testHaskellDepends = [ base HTF primes ]; benchmarkHaskellDepends = [ base criterion primes ]; @@ -156107,6 +155777,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "private-hackage-uploader" = callPackage + ({ mkDerivation, base, directory, optparse-applicative, shelly + , text + }: + mkDerivation { + pname = "private-hackage-uploader"; + version = "0.2.3.0"; + sha256 = "0591xfj3wrhkyybycb38kvdvjiyvl62a4174zxzzc9bzj5pr4fji"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory optparse-applicative shelly text + ]; + executableHaskellDepends = [ base directory shelly text ]; + description = "Upload a package to the public or private hackage, building its docs"; + license = stdenv.lib.licenses.mit; + }) {}; + "privileged-concurrency" = callPackage ({ mkDerivation, base, contravariant, lifted-base, monad-control , stm, transformers-base @@ -156748,24 +156436,24 @@ self: { "project-m36" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary - , bytestring, Cabal, cassava, conduit, containers, criterion - , cryptohash-sha256, data-interval, deepseq, deepseq-generics - , directory, distributed-process, distributed-process-async - , distributed-process-client-server, distributed-process-extras - , either, extended-reals, filepath, ghc, ghc-boot, ghc-paths, Glob - , gnuplot, hashable, hashable-time, haskeline, http-api-data, HUnit - , list-t, megaparsec, monad-parallel, MonadRandom, mtl, network - , network-transport, network-transport-tcp, old-locale - , optparse-applicative, parallel, path-pieces, random - , random-shuffle, resourcet, semigroups, stm, stm-containers - , template-haskell, temporary, text, time, transformers, unix - , unordered-containers, uuid, vector, vector-binary-instances - , websockets + , blaze-html, bytestring, Cabal, cassava, conduit, containers + , criterion, cryptohash-sha256, data-interval, deepseq + , deepseq-generics, directory, distributed-process + , distributed-process-async, distributed-process-client-server + , distributed-process-extras, either, extended-reals, filepath, ghc + , ghc-boot, ghc-paths, Glob, gnuplot, hashable, hashable-time + , haskeline, http-api-data, http-types, HUnit, list-t, megaparsec + , monad-parallel, MonadRandom, mtl, network, network-transport + , network-transport-tcp, old-locale, optparse-applicative, parallel + , path-pieces, random, random-shuffle, resourcet, scotty + , semigroups, stm, stm-containers, template-haskell, temporary + , text, time, transformers, unix, unordered-containers, uuid + , vector, vector-binary-instances, websockets, zlib }: mkDerivation { pname = "project-m36"; - version = "0.2"; - sha256 = "0kzsc45qglv89ycj5f39kbpdss0r1b6sl39g6ba4v17syfyb3xxq"; + version = "0.3"; + sha256 = "0l72wafjy12vymsvfjy5xh0gfkswdyzr12hmn1qffham9s280014"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156779,16 +156467,17 @@ self: { network-transport network-transport-tcp old-locale optparse-applicative parallel path-pieces random-shuffle resourcet stm stm-containers temporary text time transformers unix - unordered-containers uuid vector vector-binary-instances + unordered-containers uuid vector vector-binary-instances zlib ]; executableHaskellDepends = [ - aeson attoparsec base base64-bytestring binary bytestring Cabal - cassava conduit containers data-interval deepseq deepseq-generics - directory either filepath ghc ghc-paths gnuplot hashable - hashable-time haskeline http-api-data HUnit list-t megaparsec - MonadRandom mtl network-transport-tcp optparse-applicative parallel - path-pieces random semigroups stm stm-containers template-haskell - temporary text time transformers unordered-containers uuid vector + aeson attoparsec base base64-bytestring binary blaze-html + bytestring Cabal cassava conduit containers data-interval deepseq + deepseq-generics directory either filepath ghc ghc-paths gnuplot + hashable hashable-time haskeline http-api-data http-types HUnit + list-t megaparsec MonadRandom mtl network-transport-tcp + optparse-applicative parallel path-pieces random scotty semigroups + stm stm-containers template-haskell temporary text time + transformers unordered-containers uuid vector vector-binary-instances websockets ]; testHaskellDepends = [ @@ -157825,29 +157514,6 @@ self: { }: mkDerivation { pname = "psqueues"; - version = "0.2.3.0"; - sha256 = "19s36xkbpa8466y56bgcmrqxz7aq1fysliyvw79k2a76bpg9bv95"; - libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; - testHaskellDepends = [ - array base deepseq ghc-prim hashable HUnit QuickCheck tagged - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq fingertree-psqueue ghc-prim - hashable mtl PSQueue random unordered-containers - ]; - description = "Pure priority search queues"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "psqueues_0_2_4_0" = callPackage - ({ mkDerivation, array, base, containers, criterion, deepseq - , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue - , QuickCheck, random, tagged, test-framework, test-framework-hunit - , test-framework-quickcheck2, unordered-containers - }: - mkDerivation { - pname = "psqueues"; version = "0.2.4.0"; sha256 = "1lbjm6mnw91qg1ik73mwh48cq79k4kkaj4l380ilqp0p05a386j9"; libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; @@ -157861,7 +157527,6 @@ self: { ]; description = "Pure priority search queues"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pstemmer" = callPackage @@ -159854,16 +159519,19 @@ self: { }) {}; "quickcheck-state-machine" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, containers, mtl, parallel-io - , QuickCheck, random, stm + ({ mkDerivation, ansi-wl-pprint, async, base, containers + , lifted-async, lifted-base, monad-control, mtl, QuickCheck + , quickcheck-with-counterexamples, random, stm, template-haskell + , th-abstraction }: mkDerivation { pname = "quickcheck-state-machine"; - version = "0.1.0"; - sha256 = "1jczx6c1s5ir7r7r90kf5fhac4sydayr4lm6zsvjs4ykqnnparh6"; + version = "0.2.0"; + sha256 = "19d8n0dx3qw1ln7g1klyl6dd43gpldiczml7cy9cygi70rcrzhwr"; libraryHaskellDepends = [ - ansi-wl-pprint base containers mtl parallel-io QuickCheck random - stm + ansi-wl-pprint async base containers lifted-async lifted-base + monad-control mtl QuickCheck quickcheck-with-counterexamples random + stm template-haskell th-abstraction ]; testHaskellDepends = [ base ]; homepage = "https://github.com/advancedtelematic/quickcheck-state-machine#readme"; @@ -162845,14 +162513,15 @@ self: { "recursion-schemes-ext" = callPackage ({ mkDerivation, base, composition-prelude, criterion, deepseq - , hspec, recursion-schemes, template-haskell + , hspec, lens, recursion-schemes, template-haskell }: mkDerivation { pname = "recursion-schemes-ext"; - version = "0.2.0.1"; - sha256 = "0lnqc4w4lpavs4d6jzdszl35g4qjksgfrqfqsyhv4a8w3w79xnz9"; + version = "0.2.1.0"; + sha256 = "0hm042kqb2dq9j68nsy8a6qgmxicfqclgdg4v3i7q1griscazyjr"; libraryHaskellDepends = [ - base composition-prelude deepseq recursion-schemes template-haskell + base composition-prelude deepseq lens recursion-schemes + template-haskell ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; @@ -163100,26 +162769,6 @@ self: { }: mkDerivation { pname = "reducers"; - version = "3.12.1"; - sha256 = "0pkddg0s3cn759miq0nfrq7lnp3imk5sx784ihsilsbjh9kvffz4"; - revision = "2"; - editedCabalFile = "00zxyyaj0grvr214qdrg68114b93iwp27vmww254s2yq9z701gf8"; - libraryHaskellDepends = [ - array base bytestring containers fingertree hashable semigroupoids - semigroups text transformers unordered-containers - ]; - homepage = "http://github.com/ekmett/reducers/"; - description = "Semigroups, specialized containers and a general map/reduce framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "reducers_3_12_2" = callPackage - ({ mkDerivation, array, base, bytestring, containers, fingertree - , hashable, semigroupoids, semigroups, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "reducers"; version = "3.12.2"; sha256 = "1gbaa5x4zbvnbklcb0d4q4m8hk6w0gz4s0c4m288czi1nw43dl65"; libraryHaskellDepends = [ @@ -163129,7 +162778,6 @@ self: { homepage = "http://github.com/ekmett/reducers/"; description = "Semigroups, specialized containers and a general map/reduce framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reedsolomon" = callPackage @@ -163285,29 +162933,6 @@ self: { }: mkDerivation { pname = "references"; - version = "0.3.2.2"; - sha256 = "1p7ygqdycx1zm4fpilb7db0g66kyss50fddkc007812y2ih4vary"; - libraryHaskellDepends = [ - array base containers directory either filepath instance-control - mtl template-haskell text transformers uniplate - ]; - testHaskellDepends = [ - array base containers directory either filepath HUnit - instance-control lens mtl template-haskell text transformers - uniplate - ]; - homepage = "https://github.com/lazac/references"; - description = "Selectors for reading and updating data"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "references_0_3_3_0" = callPackage - ({ mkDerivation, array, base, containers, directory, either - , filepath, HUnit, instance-control, lens, mtl, template-haskell - , text, transformers, uniplate - }: - mkDerivation { - pname = "references"; version = "0.3.3.0"; sha256 = "186x1j6yg2fh4a96b68jq7kwx2s1kxdbl4yi4izfgvxwimpzcr8w"; libraryHaskellDepends = [ @@ -163322,7 +162947,6 @@ self: { homepage = "https://github.com/lazac/references"; description = "Selectors for reading and updating data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "refh" = callPackage @@ -166404,6 +166028,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rethinkdb-client-driver_0_0_25" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , criterion, hashable, hspec, hspec-smallcheck, mtl, network + , old-locale, scientific, smallcheck, stm, template-haskell, text + , time, unordered-containers, vector + }: + mkDerivation { + pname = "rethinkdb-client-driver"; + version = "0.0.25"; + sha256 = "15l9z7ki81cv97lajxcbddavbd254c5adcdi8yw6df31rmbc378g"; + libraryHaskellDepends = [ + aeson base binary bytestring containers hashable mtl network + old-locale scientific stm template-haskell text time + unordered-containers vector + ]; + testHaskellDepends = [ + base hspec hspec-smallcheck smallcheck text time + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base criterion text time unordered-containers vector + ]; + homepage = "https://github.com/wereHamster/rethinkdb-client-driver"; + description = "Client driver for RethinkDB"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rethinkdb-model" = callPackage ({ mkDerivation, aeson, base, mtl, rethinkdb, text, transformers , unordered-containers @@ -168979,10 +168631,10 @@ self: { }: mkDerivation { pname = "saltine"; - version = "0.0.1.0"; - sha256 = "1vsanah757hvzs1yp36944gvhh6li3xmispk3xvjddmjzdlgzn0g"; + version = "0.1.0.0"; + sha256 = "1hkdvw4fr2p2wmgq9ghna0kq9x9yv3kc9sm9wh0c71cl7gxk9g52"; libraryHaskellDepends = [ base bytestring profunctors ]; - librarySystemDepends = [ libsodium ]; + libraryPkgconfigDepends = [ libsodium ]; testHaskellDepends = [ base bytestring QuickCheck test-framework test-framework-quickcheck2 @@ -171428,8 +171080,8 @@ self: { }: mkDerivation { pname = "selda"; - version = "0.1.11.0"; - sha256 = "1jdy7rf98ycqvrw73f70xnyidq5gjhzbavd2h64ib6v0mpcskdhy"; + version = "0.1.11.1"; + sha256 = "0vml5lmhabzps8la9h361bpsj29yq0n7azhvrpdkdmyjvw28svrs"; libraryHaskellDepends = [ base bytestring exceptions hashable mtl psqueues text time unordered-containers @@ -171748,17 +171400,19 @@ self: { }: mkDerivation { pname = "semiring-num"; - version = "1.4.0.0"; - sha256 = "0p2ipnxj5kpjplspzllxm97y3xfnwvdndb4cllpa9glk21qx03p4"; + version = "1.5.0.0"; + sha256 = "15gn11razis9fzm58dfk4j2bk41lmnzngi3s4izydzsavzm4qyjx"; libraryHaskellDepends = [ base containers hashable log-domain scientific template-haskell time unordered-containers vector ]; testHaskellDepends = [ base containers doctest log-domain nat-sized-numbers QuickCheck - smallcheck tasty tasty-quickcheck tasty-smallcheck + smallcheck tasty tasty-quickcheck tasty-smallcheck vector + ]; + benchmarkHaskellDepends = [ + base containers criterion random vector ]; - benchmarkHaskellDepends = [ base containers criterion random ]; homepage = "https://github.com/oisdk/semiring-num"; description = "Basic semiring class and instances"; license = stdenv.lib.licenses.mit; @@ -173785,8 +173439,8 @@ self: { }: mkDerivation { pname = "servant-static-th"; - version = "0.1.0.5"; - sha256 = "1i1xyn14nc2jg1b6y926pz3dp4hlgg54q3lzzg9zza1jnh6ncjrp"; + version = "0.1.0.6"; + sha256 = "19rb7xmfnls8wkgyq6gf5b6rri6b6z4qfj1m2pxa9rwx5hfajiax"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174317,8 +173971,8 @@ self: { }: mkDerivation { pname = "sessiontypes"; - version = "0.1.0"; - sha256 = "0p5img64ksk2a4in4qamizyp1w59y4hcwv5ll0c0nis7flzyy3js"; + version = "0.1.1"; + sha256 = "0l9chnnyq8mblxqyg89nlfa55cadwy62mj29arakrc988l6ja3gq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180984,29 +180638,6 @@ self: { "sparse-linear-algebra" = callPackage ({ mkDerivation, base, containers, exceptions, hspec , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck - , scientific, transformers, vector, vector-algorithms, vector-space - }: - mkDerivation { - pname = "sparse-linear-algebra"; - version = "0.2.9.7"; - sha256 = "0sskv1bbn1q19jh508wk1d898jwzlsf7662v4crrppmb6k6cq1zq"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base containers exceptions mtl transformers vector - vector-algorithms vector-space - ]; - testHaskellDepends = [ - base containers exceptions hspec matrix-market-attoparsec mtl - mwc-random primitive QuickCheck scientific vector-space - ]; - homepage = "https://github.com/ocramz/sparse-linear-algebra"; - description = "Numerical computation in native Haskell"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "sparse-linear-algebra_0_2_9_8" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec - , matrix-market-attoparsec, mtl, mwc-random, primitive, QuickCheck , scientific, transformers, vector, vector-algorithms }: mkDerivation { @@ -181025,7 +180656,6 @@ self: { homepage = "https://github.com/ocramz/sparse-linear-algebra"; description = "Numerical computation in native Haskell"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sparsebit" = callPackage @@ -184182,25 +183812,12 @@ self: { ({ mkDerivation, base, stm }: mkDerivation { pname = "stm-extras"; - version = "0.1.0.2"; - sha256 = "08c6c53gkfwirgf3lq2ncwbjnhb195zbi7b76m4lwh3f6acckg3y"; - libraryHaskellDepends = [ base stm ]; - homepage = "https://github.com/louispan/stm-extras#readme"; - description = "Extra STM functions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "stm-extras_0_1_0_3" = callPackage - ({ mkDerivation, base, stm }: - mkDerivation { - pname = "stm-extras"; version = "0.1.0.3"; sha256 = "0pmpf1r8q1favrbgvrnggvs93vwvml79yfqbs4xjqnjsglahl8c8"; libraryHaskellDepends = [ base stm ]; homepage = "https://github.com/louispan/stm-extras#readme"; description = "Extra STM functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm-firehose" = callPackage @@ -184534,20 +184151,6 @@ self: { ({ mkDerivation, base, base-orphans, storable-record, utility-ht }: mkDerivation { pname = "storable-tuple"; - version = "0.0.3.2"; - sha256 = "10l9br5kgwi2vrnhyx4w4an8cvcxqpx8qwg5h4gwr6pwpxdz7lrm"; - libraryHaskellDepends = [ - base base-orphans storable-record utility-ht - ]; - homepage = "http://code.haskell.org/~thielema/storable-tuple/"; - description = "Storable instance for pairs and triples"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "storable-tuple_0_0_3_3" = callPackage - ({ mkDerivation, base, base-orphans, storable-record, utility-ht }: - mkDerivation { - pname = "storable-tuple"; version = "0.0.3.3"; sha256 = "0dfzhxgkn1l6ls7zh6iifhyvhm8l47n40z0ar23c6ibsa94w1ynw"; libraryHaskellDepends = [ @@ -184556,7 +184159,6 @@ self: { homepage = "http://code.haskell.org/~thielema/storable-tuple/"; description = "Storable instance for pairs and triples"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "storablevector" = callPackage @@ -187063,8 +186665,8 @@ self: { }: mkDerivation { pname = "swagger-petstore"; - version = "0.0.1.2"; - sha256 = "1027kj163mjp78gxl1g77jgxg5n6q5xkhvy4zdx3wlcjc2b3mjah"; + version = "0.0.1.3"; + sha256 = "008k36ica9l6k77729mvcmgjdjayn47q468wn20bcb7anc04sijn"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq exceptions http-api-data http-client http-client-tls @@ -187074,7 +186676,7 @@ self: { ]; testHaskellDepends = [ aeson base bytestring containers hspec iso8601-time mtl QuickCheck - semigroups text time transformers unordered-containers + semigroups text time transformers unordered-containers vector ]; homepage = "https://github.com/swagger-api/swagger-codegen#readme"; description = "Auto-generated swagger-petstore API Client"; @@ -189690,12 +189292,12 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "tasty-dejafu_0_7_0_1" = callPackage + "tasty-dejafu_0_7_0_2" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "0.7.0.1"; - sha256 = "01n9j9sc4lvm0s2giwqc5ig16jyww61h81m0bcjk2jzmnsk9mp7g"; + version = "0.7.0.2"; + sha256 = "1yj4sdprlz79sk14q5b8089sw1bn0z4nqpbdb2sr90smlxa57zpa"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; @@ -192062,30 +191664,6 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.9.4.2"; - sha256 = "1xx3yp5m0rjs8bi1gb4r0xk0mjh5gm4x2pdsgfmbrisw0pl5x0mv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec syb xml - ]; - executableHaskellDepends = [ network-uri ]; - testHaskellDepends = [ - base bytestring directory filepath process split temporary text - utf8-string xml - ]; - homepage = "http://github.com/jgm/texmath"; - description = "Conversion between formats used to represent mathematics"; - license = "GPL"; - }) {}; - - "texmath_0_9_4_4" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, network-uri, pandoc-types, parsec, process, split, syb - , temporary, text, utf8-string, xml - }: - mkDerivation { - pname = "texmath"; version = "0.9.4.4"; sha256 = "129q33m56diiv35kdwfb07838wrg0mm88kxdqxfyl1zvf9nzkqkd"; isLibrary = true; @@ -192101,7 +191679,6 @@ self: { homepage = "http://github.com/jgm/texmath"; description = "Conversion between formats used to represent mathematics"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "texrunner" = callPackage @@ -193518,25 +193095,12 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "th-reify-compat"; - version = "0.0.1.2"; - sha256 = "102w8zxsgdk1p7478p0sdhapai3paid3wyar2cpia649a17jlhwc"; - libraryHaskellDepends = [ base template-haskell ]; - homepage = "http://github.com/khibino/haskell-th-reify-compat/"; - description = "Compatibility for the result type of TH reify"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-reify-compat_0_0_1_3" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "th-reify-compat"; version = "0.0.1.3"; sha256 = "0byl2n0lj55vx2kyka172bwvw8zcyag78cnqs7y9yp4kl8ivwh8z"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://github.com/khibino/haskell-th-reify-compat/"; description = "Compatibility for the result type of TH reify"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-reify-many" = callPackage @@ -194460,6 +194024,8 @@ self: { pname = "tickle"; version = "0.0.6"; sha256 = "19xv9s3qz2q2jvgzig8rfc47c25m8xl3d10xdx1d4dsmhbj1nw55"; + revision = "1"; + editedCabalFile = "1j0npns8ilxq84087gfdg1isncjssp9q0ijgrpg849cip8h0y5y1"; libraryHaskellDepends = [ base bifunctors bytestring filepath lens mtl semigroupoids semigroups transformers validation @@ -196256,6 +195822,26 @@ self: { license = stdenv.lib.licenses.isc; }) {}; + "tomlcheck" = callPackage + ({ mkDerivation, base, htoml-megaparsec, megaparsec + , optparse-generic, text + }: + mkDerivation { + pname = "tomlcheck"; + version = "0.1.0.2"; + sha256 = "144hqyx13x9gg2xznrh41h9wi7ha70rxr93dpb020qv0af3cknqc"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base htoml-megaparsec megaparsec optparse-generic text + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/vmchale/tomlcheck#readme"; + description = "Command-line tool to check syntax of TOML files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "toolshed" = callPackage ({ mkDerivation, array, base, containers, data-default, deepseq , directory, filepath, HUnit, QuickCheck, random @@ -196464,50 +196050,55 @@ self: { }) {toxcore = null;}; "toysolver" = callPackage - ({ mkDerivation, array, base, bytestring, bytestring-builder - , containers, criterion, data-default-class, data-interval, deepseq - , exceptions, extended-reals, filepath, finite-field, ghc-prim - , hashable, haskeline, heaps, intern, loop, mtl, multiset - , mwc-random, OptDir, parse-dimacs, parsec, prettyclass, primes - , process, pseudo-boolean, queue, QuickCheck, semigroups, sign - , split, stm, tasty, tasty-hunit, tasty-quickcheck, tasty-th - , template-haskell, temporary, time, transformers - , transformers-compat, type-level-numbers, unbounded-delays - , unordered-containers, vector, vector-space + ({ mkDerivation, array, attoparsec, base, bytestring + , bytestring-builder, clock, containers, criterion, data-default + , data-default-class, data-interval, deepseq, directory + , extended-reals, filepath, finite-field, ghc-prim, hashable + , hashtables, haskeline, heaps, intern, lattices, log-domain, loop + , megaparsec, mtl, multiset, mwc-random, OptDir, parsec + , prettyclass, primes, primitive, process, pseudo-boolean, queue + , QuickCheck, scientific, semigroups, sign, split, stm, tasty + , tasty-hunit, tasty-quickcheck, tasty-th, template-haskell + , temporary, text, time, transformers, transformers-compat + , unbounded-delays, unordered-containers, vector, vector-space + , xml-conduit }: mkDerivation { pname = "toysolver"; - version = "0.4.0"; - sha256 = "1gz3z3xx9qb7sajy2nqqk8710absiw4jh8d0gna7vdp6aiw3lqz9"; - revision = "1"; - editedCabalFile = "0bm5v2g4p83km9sv1f72w1qxj0cg0aafldmncjmizij7ifdgqmbx"; + version = "0.5.0"; + sha256 = "0dr34aknbh8p500zj4lcll5mi1km16jxyvjx1gdrp63csdfi1ich"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bytestring bytestring-builder containers - data-default-class data-interval deepseq exceptions extended-reals - filepath finite-field ghc-prim hashable heaps intern loop mtl - multiset mwc-random OptDir parse-dimacs parsec prettyclass primes - process pseudo-boolean queue semigroups sign stm template-haskell - temporary time transformers transformers-compat type-level-numbers - unordered-containers vector vector-space + array base bytestring bytestring-builder clock containers + data-default-class data-interval deepseq extended-reals filepath + finite-field ghc-prim hashable hashtables heaps intern lattices + log-domain loop megaparsec mtl multiset mwc-random OptDir + prettyclass primes primitive process pseudo-boolean queue + scientific semigroups sign stm template-haskell temporary text time + transformers transformers-compat unordered-containers vector + vector-space xml-conduit ]; executableHaskellDepends = [ - array base bytestring containers data-default-class filepath - haskeline mtl mwc-random OptDir parse-dimacs parsec process - pseudo-boolean split time transformers transformers-compat - unbounded-delays vector vector-space + array attoparsec base bytestring bytestring-builder clock + containers data-default data-default-class directory filepath + haskeline intern megaparsec mtl mwc-random OptDir parsec process + pseudo-boolean scientific split temporary text time transformers + transformers-compat unbounded-delays unordered-containers vector ]; testHaskellDepends = [ - array base containers data-default-class data-interval deepseq - finite-field mtl mwc-random OptDir parsec prettyclass QuickCheck - tasty tasty-hunit tasty-quickcheck tasty-th transformers - transformers-compat vector vector-space + array base bytestring bytestring-builder containers + data-default-class data-interval deepseq finite-field hashable + intern lattices megaparsec mtl mwc-random OptDir parsec prettyclass + pseudo-boolean QuickCheck tasty tasty-hunit tasty-quickcheck + tasty-th text transformers transformers-compat unordered-containers + vector vector-space ]; benchmarkHaskellDepends = [ - array base criterion data-default-class parse-dimacs vector + array base criterion data-default-class vector ]; - description = "Assorted decision procedures for SAT, Max-SAT, PB, MIP, etc"; + homepage = "https://github.com/msakai/toysolver/"; + description = "Assorted decision procedures for SAT, SMT, Max-SAT, PB, MIP, etc"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -198983,8 +198574,8 @@ self: { ({ mkDerivation, base, containers, template-haskell }: mkDerivation { pname = "tyfam-witnesses"; - version = "0.0.0.1"; - sha256 = "0h79wsdljd5l34rshmx4r809xfr7szcvgap97zfyr5gzp8p24nh0"; + version = "0.1"; + sha256 = "1sy0ffd0i1s20xw2x1vf8a9ydbrzb9klin7j564hncsjf9bzdc1a"; libraryHaskellDepends = [ base containers template-haskell ]; description = "Provide proof witnesses for closed type family evaluation"; license = stdenv.lib.licenses.mit; @@ -201435,8 +201026,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "0.6.1"; - sha256 = "18q4kydcx273brx24y30i1kqb12h1p20ynvwrl18kfhgprjgz2sk"; + version = "0.7.0"; + sha256 = "1d2887l2g8f9scpwcrvlxk0dm8w9d7qnlpbfjswa08dnmy63kcrf"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions ghc-prim hashable microlens microlens-mtl mtl safe safe-exceptions stm text @@ -202192,20 +201783,6 @@ self: { ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }: mkDerivation { pname = "uri-bytestring-aeson"; - version = "0.1.0.2"; - sha256 = "1i62sr28fxc3k045j8l2iak4f46nf8ygzqafc2k1pa0grm4l7ipa"; - libraryHaskellDepends = [ - aeson base bytestring text uri-bytestring - ]; - homepage = "https://github.com/reactormonk/uri-bytestring-aeson"; - description = "Aeson instances for URI Bytestring"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "uri-bytestring-aeson_0_1_0_4" = callPackage - ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }: - mkDerivation { - pname = "uri-bytestring-aeson"; version = "0.1.0.4"; sha256 = "1nm9d3xq56rrjggky28q72n8afk5nh6m1bbi6j5z538qwccyg348"; libraryHaskellDepends = [ @@ -202214,7 +201791,6 @@ self: { homepage = "https://github.com/reactormonk/uri-bytestring-aeson"; description = "Aeson instances for URI Bytestring"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-conduit" = callPackage @@ -203104,6 +202680,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "uuid-crypto" = callPackage + ({ mkDerivation, base, binary, bytestring, cryptoids + , cryptoids-types, exceptions, uuid + }: + mkDerivation { + pname = "uuid-crypto"; + version = "1.3.0.0"; + sha256 = "02vzxxijz2pdwq4asgvsxvj6gcnjdzrfrhiavwbmc0vckw8s108s"; + libraryHaskellDepends = [ + base binary bytestring cryptoids cryptoids-types exceptions uuid + ]; + description = "Reversable and secure encoding of object ids as uuids"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "uuid-le" = callPackage ({ mkDerivation, base, bytestring, uuid }: mkDerivation { @@ -203452,6 +203043,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "validation_0_6_0" = callPackage + ({ mkDerivation, base, bifunctors, Cabal, cabal-doctest, directory + , doctest, filepath, lens, mtl, QuickCheck, semigroupoids + , semigroups, template-haskell, transformers + }: + mkDerivation { + pname = "validation"; + version = "0.6.0"; + sha256 = "1x2mi8lgy18q7g2gwwk8c31kg77lkfpmjkxf5nkli5pri9z947av"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bifunctors lens mtl semigroupoids semigroups transformers + ]; + testHaskellDepends = [ + base cabal-doctest directory doctest filepath QuickCheck + template-haskell + ]; + homepage = "https://github.com/qfpl/validation"; + description = "A data-type like Either but with an accumulating Applicative"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validations" = callPackage ({ mkDerivation, base, containers, digestive-functors, HUnit, mtl , QuickCheck, test-framework, test-framework-hunit @@ -204763,8 +204377,8 @@ self: { }: mkDerivation { pname = "viewprof"; - version = "0.0.0.8"; - sha256 = "0pll3j9v5fapbawjp86cnyhdscmj2zn6cqwzg8dxi9s7z8nhqxk9"; + version = "0.0.0.9"; + sha256 = "15mvbgf5apb9ysiynv5xc8zynkz8shwbfq16rdfac5bbnl07m97p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -204776,14 +204390,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "viewprof_0_0_0_9" = callPackage + "viewprof_0_0_0_10" = callPackage ({ mkDerivation, base, brick, containers, ghc-prof, lens , scientific, text, vector, vector-algorithms, vty }: mkDerivation { pname = "viewprof"; - version = "0.0.0.9"; - sha256 = "15mvbgf5apb9ysiynv5xc8zynkz8shwbfq16rdfac5bbnl07m97p"; + version = "0.0.0.10"; + sha256 = "000x7xlais9r2f42nbd2cbp6h07d6p31nn16vvbvyg5a12pw44vh"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -211614,23 +211228,6 @@ self: { }) {}; "xml-conduit-writer" = callPackage - ({ mkDerivation, base, containers, dlist, mtl, text, xml-conduit - , xml-types - }: - mkDerivation { - pname = "xml-conduit-writer"; - version = "0.1.1.1"; - sha256 = "1ibiqxjr63gb3v0h9fdfzm205sqjixb5vm5y6413yn4scbf7qm2b"; - libraryHaskellDepends = [ - base containers dlist mtl text xml-conduit xml-types - ]; - testHaskellDepends = [ base text ]; - homepage = "https://bitbucket.org/dpwiz/xml-conduit-writer"; - description = "Warm and fuzzy creation of XML documents"; - license = stdenv.lib.licenses.mit; - }) {}; - - "xml-conduit-writer_0_1_1_2" = callPackage ({ mkDerivation, base, containers, data-default, dlist, mtl, text , xml-conduit, xml-types }: @@ -211645,7 +211242,6 @@ self: { homepage = "https://bitbucket.org/dpwiz/xml-conduit-writer"; description = "Warm and fuzzy creation of XML documents"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-enumerator" = callPackage @@ -211709,29 +211305,6 @@ self: { }: mkDerivation { pname = "xml-hamlet"; - version = "0.4.1"; - sha256 = "1fy29sxby4z6dby518x4za9bpgnh7aqwpwn365lb384rjpsr1wvx"; - revision = "2"; - editedCabalFile = "1qlhn3lir1b534mqwxvx5ndnmn4h4qvmd809zapadx8s1q0i0f53"; - libraryHaskellDepends = [ - base containers parsec shakespeare template-haskell text - xml-conduit - ]; - testHaskellDepends = [ - base containers hspec HUnit parsec shakespeare template-haskell - text xml-conduit - ]; - homepage = "http://www.yesodweb.com/"; - description = "Hamlet-style quasiquoter for XML content"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "xml-hamlet_0_4_1_1" = callPackage - ({ mkDerivation, base, containers, hspec, HUnit, parsec - , shakespeare, template-haskell, text, xml-conduit - }: - mkDerivation { - pname = "xml-hamlet"; version = "0.4.1.1"; sha256 = "0bfhk3hdg70j91g5i9ygz0nmbpffnxa4kh5h828fdgml54i5sv2d"; libraryHaskellDepends = [ @@ -211745,7 +211318,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Hamlet-style quasiquoter for XML content"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-helpers" = callPackage @@ -215641,7 +215213,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-core_0_16_0" = callPackage + "yi-core_0_17_0" = callPackage ({ mkDerivation, array, attoparsec, base, binary, bytestring , containers, criterion, data-default, deepseq, directory, dlist , dynamic-state, filepath, hashable, ListLike, microlens-platform @@ -215653,8 +215225,8 @@ self: { }: mkDerivation { pname = "yi-core"; - version = "0.16.0"; - sha256 = "0r7hbwlc0l45mb5qd949vn0h34kg5aqj7ic9shifz23cxlapkssj"; + version = "0.17.0"; + sha256 = "018fcmviyy0xrzrvmcrdl4r4mk69ig7jgck5zgq58y0h7m4wxkmg"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-default directory dlist dynamic-state filepath hashable ListLike @@ -215663,21 +215235,10 @@ self: { unix-compat unordered-containers xdg-basedir yi-language yi-rope ]; testHaskellDepends = [ - array attoparsec base binary bytestring containers data-default - directory dlist dynamic-state filepath hashable ListLike - microlens-platform mtl old-locale oo-prototypes parsec pointedlist - process process-extras quickcheck-text split tasty tasty-hunit - tasty-quickcheck text time transformers-base unix unix-compat - unordered-containers xdg-basedir yi-language yi-rope - ]; - benchmarkHaskellDepends = [ - array attoparsec base binary bytestring containers criterion - data-default deepseq directory dlist dynamic-state filepath - hashable ListLike microlens-platform mtl old-locale oo-prototypes - parsec pointedlist process process-extras split text time - transformers-base unix unix-compat unordered-containers xdg-basedir - yi-language yi-rope + attoparsec base containers quickcheck-text tasty tasty-hunit + tasty-quickcheck text yi-rope ]; + benchmarkHaskellDepends = [ base criterion deepseq yi-rope ]; homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor core library"; license = stdenv.lib.licenses.gpl2; @@ -215690,8 +215251,8 @@ self: { }: mkDerivation { pname = "yi-dynamic-configuration"; - version = "0.16.0"; - sha256 = "1y439lsrf6akq1db6gkxm44pq83672jbnyg2hcw2s8b0rlr873vz"; + version = "0.17.0"; + sha256 = "1slf3qrq61b171sg6izw212qajvmjwv786gndhql8r9kyi7na9ys"; libraryHaskellDepends = [ base data-default dyre microlens-platform mtl text transformers-base yi-core yi-rope @@ -215721,8 +215282,8 @@ self: { }: mkDerivation { pname = "yi-frontend-pango"; - version = "0.16.0"; - sha256 = "0dbmkh72rrnmcxs8ixgpzvj6bra0nzrgiwnjz19rlpsgzvw5vfhh"; + version = "0.17.0"; + sha256 = "141kp6f6f0xrql8jmghqj1h5vrbim28z7p1a9psa40xry1hhlhr7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers filepath glib gtk microlens-platform mtl @@ -215752,15 +215313,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-frontend-vty_0_16_0" = callPackage + "yi-frontend-vty_0_17_0" = callPackage ({ mkDerivation, base, containers, data-default, dlist , microlens-platform, pointedlist, stm, text, vty, yi-core , yi-language, yi-rope }: mkDerivation { pname = "yi-frontend-vty"; - version = "0.16.0"; - sha256 = "00rmwcm1431rffhq1rif0k0g43wnzdfhw1zhacl4f2n5v2gxkjsq"; + version = "0.17.0"; + sha256 = "12yl4d3dkjkbz8n184lcs8z08mj8yc1ybaj52z7j58nialvq4ibh"; libraryHaskellDepends = [ base containers data-default dlist microlens-platform pointedlist stm text vty yi-core yi-language yi-rope @@ -215789,18 +215350,19 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-fuzzy-open_0_16_0" = callPackage + "yi-fuzzy-open_0_17_0" = callPackage ({ mkDerivation, base, binary, containers, data-default, directory - , filepath, mtl, text, transformers-base, vector, yi-core - , yi-language, yi-rope + , filepath, mtl, pointedlist, text, transformers-base, vector + , yi-core, yi-language, yi-rope }: mkDerivation { pname = "yi-fuzzy-open"; - version = "0.16.0"; - sha256 = "0z59g33rgdpg090sj6ilkwxvcg9r3my0v8wd49vvn72livf3v88k"; + version = "0.17.0"; + sha256 = "1447w8gqwjnala08sysvy1bxhdna1hydh0bnjx2awz7hns5040ap"; libraryHaskellDepends = [ - base binary containers data-default directory filepath mtl text - transformers-base vector yi-core yi-language yi-rope + base binary containers data-default directory filepath mtl + pointedlist text transformers-base vector yi-core yi-language + yi-rope ]; homepage = "https://github.com/yi-editor/yi#readme"; description = "Fuzzy open plugin for yi"; @@ -215837,14 +215399,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-ireader_0_16_0" = callPackage + "yi-ireader_0_17_0" = callPackage ({ mkDerivation, base, binary, bytestring, containers, data-default , microlens-platform, text, yi-core, yi-language, yi-rope }: mkDerivation { pname = "yi-ireader"; - version = "0.16.0"; - sha256 = "1wmkji3sz7hnik7cy25r8wbc7y2x938gy8fyy4cadgrpbpndb58a"; + version = "0.17.0"; + sha256 = "0cwfjajs25lbxhzn8zbpjavy1yjym3k4iliqal9iq3i51k9inacc"; libraryHaskellDepends = [ base binary bytestring containers data-default microlens-platform text yi-core yi-language yi-rope @@ -215871,14 +215433,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-keymap-cua_0_16_0" = callPackage + "yi-keymap-cua_0_17_0" = callPackage ({ mkDerivation, base, microlens-platform, text, yi-core , yi-keymap-emacs, yi-rope }: mkDerivation { pname = "yi-keymap-cua"; - version = "0.16.0"; - sha256 = "082f3jhbas2ww4jmq53gqr7ssl8c0cd5gz2avvhqzvfsfxk1qiay"; + version = "0.17.0"; + sha256 = "0v7gcd5arq33r2cf55ig307cfvapz3r1h9cz3ssvkw0fjzr1p1a3"; libraryHaskellDepends = [ base microlens-platform text yi-core yi-keymap-emacs yi-rope ]; @@ -215907,15 +215469,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-keymap-emacs_0_16_0" = callPackage + "yi-keymap-emacs_0_17_0" = callPackage ({ mkDerivation, base, containers, filepath, Hclip , microlens-platform, mtl, oo-prototypes, text, transformers-base , yi-core, yi-language, yi-misc-modes, yi-rope }: mkDerivation { pname = "yi-keymap-emacs"; - version = "0.16.0"; - sha256 = "0l0xvkb0y3kp0bkvarl6kdvvj4rn5pm70z1g1yavk1krs41xxz6j"; + version = "0.17.0"; + sha256 = "1d90884kjpq13d7nrxjla9kx6gr09xh8lwzbpnf69jg6iiavjlfg"; libraryHaskellDepends = [ base containers filepath Hclip microlens-platform mtl oo-prototypes text transformers-base yi-core yi-language yi-misc-modes yi-rope @@ -216012,7 +215574,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-language_0_16_0" = callPackage + "yi-language_0_17_0" = callPackage ({ mkDerivation, alex, array, base, binary, containers , data-default, hashable, microlens-platform, oo-prototypes , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec @@ -216021,8 +215583,8 @@ self: { }: mkDerivation { pname = "yi-language"; - version = "0.16.0"; - sha256 = "0wq4m665xcy7256iapjwggc3ylrg9y1k1vhvjn5a8716nn23mnr5"; + version = "0.17.0"; + sha256 = "046aavm0pf5s8bx6z0v8fvbizzr3s9s8kq79sj3gvis26im9kzpy"; libraryHaskellDepends = [ array base binary containers data-default hashable microlens-platform oo-prototypes pointedlist regex-base regex-tdfa @@ -216060,14 +215622,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-misc-modes_0_16_0" = callPackage + "yi-misc-modes_0_17_0" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, filepath , microlens-platform, text, yi-core, yi-language, yi-rope }: mkDerivation { pname = "yi-misc-modes"; - version = "0.16.0"; - sha256 = "1vsdfwpqmpmdiaxh30hshxwlpqmkxzih13ic0hnbsx27amd3mv59"; + version = "0.17.0"; + sha256 = "0ki6dc1frzhgn7dfbsrpbf75a5i32iz9a8cvy1c33xmdh9s8k4fw"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -216097,14 +215659,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-mode-haskell_0_16_0" = callPackage + "yi-mode-haskell_0_17_0" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, filepath , microlens-platform, text, yi-core, yi-language, yi-rope }: mkDerivation { pname = "yi-mode-haskell"; - version = "0.16.0"; - sha256 = "0h4796zdcwrj6zkmxcvdjpmwb1rw0zgwzzgsdsch455j770y4dyy"; + version = "0.17.0"; + sha256 = "17cfbww6lpg29dz51pbzlsx95azhxlgv0lqcpxpxk82w9s4c2dji"; libraryHaskellDepends = [ array base binary data-default filepath microlens-platform text yi-core yi-language yi-rope @@ -216135,15 +215697,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-mode-javascript_0_16_0" = callPackage + "yi-mode-javascript_0_17_0" = callPackage ({ mkDerivation, alex, array, base, binary, data-default, dlist , filepath, microlens-platform, mtl, text, yi-core, yi-language , yi-rope }: mkDerivation { pname = "yi-mode-javascript"; - version = "0.16.0"; - sha256 = "09xp4a1w4m6spnzm943zkivaxicipmzs07qn9xqrfvcwavy56kha"; + version = "0.17.0"; + sha256 = "040mc9mfm46alfl21p6p4a8n9p8hr12ywn6sfgq32zrhpa1zn9yb"; libraryHaskellDepends = [ array base binary data-default dlist filepath microlens-platform mtl text yi-core yi-language yi-rope @@ -216230,15 +215792,15 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "yi-snippet_0_16_0" = callPackage + "yi-snippet_0_17_0" = callPackage ({ mkDerivation, base, binary, containers, data-default, free , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector , yi-core, yi-rope }: mkDerivation { pname = "yi-snippet"; - version = "0.16.0"; - sha256 = "0n9m2n8k4k79hi661gpjdz0yca1jhxmbjdkxgzg7gnvwiikmfawh"; + version = "0.17.0"; + sha256 = "10680a4zc5r9mnvhajgfrvzxpf8naclx4sygvbi69c5aann4q4a1"; libraryHaskellDepends = [ base binary containers data-default free microlens-platform mtl text vector yi-core yi-rope diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index 680111dbd77a..5e2e1c7f215d 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -1,9 +1,18 @@ -{ mkDerivation, fetchurl }: +{ mkDerivation, fetchurl, fetchpatch }: mkDerivation rec { version = "19.3"; sha256 = "0pp2hl8jf4iafpnsmf0q7jbm313daqzif6ajqcmjyl87m5pssr86"; + patches = [ + # macOS 10.13 crypto fix from OTP-20.1.2 + (fetchpatch { + name = "darwin-crypto.patch"; + url = "https://github.com/erlang/otp/commit/882c90f72ba4e298aa5a7796661c28053c540a96.patch"; + sha256 = "1gggzpm8ssamz6975z7px0g8qq5i4jqw81j846ikg49c5cxvi0hi"; + }) + ]; + prePatch = '' substituteInPlace configure.in --replace '`sw_vers -productVersion`' '10.10' ''; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 54a844876711..133b39d07974 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babl-0.1.28"; + name = "babl-0.1.34"; src = fetchurl { url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2"; - sha256 = "00w6xfcv960c98qvxv81gcbj8l1jiab9sggmdl77m19awwiyvwv3"; + sha256 = "0nwakj313l2dh5npx18avkg4z17i2prkxbl6vj547a08n6ry1gsy"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 3bfcde57422d..1db991f63fee 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "check-${version}"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "mirror://sourceforge/check/${version}/check-${version}.tar.gz"; - sha256 = "0lhhywf5nxl3dd0hdakra3aasl590756c9kmvyifb3vgm9k0gxgm"; + url = "https://github.com/libcheck/check/releases/download/${version}/check-${version}.tar.gz"; + sha256 = "05jn1pgb7hqb937xky2147nnq3r4qy5wwr79rddpax3bms5a9xr4"; }; # Test can randomly fail: http://hydra.nixos.org/build/7243912 @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { can be used within source code editors and IDEs. ''; - homepage = http://check.sourceforge.net/; + homepage = https://libcheck.github.io/check/; license = licenses.lgpl2Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 17a5c65376b2..aa2af9a2ebc3 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -6,8 +6,8 @@ assert x11Support -> libX11 != null && libSM != null; let - version = "1.10.22"; - sha256 = "15vv9gz5i4f5l7h0d045qz5iyvl89hjk2k83lb4vbizd7qg41cg2"; + version = "1.10.24"; + sha256 = "06ydmrg76l1kwl3190d72zpiy3qxy248x6gskxbj9qiqfsr4w63i"; self = stdenv.mkDerivation { name = "dbus-${version}"; diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 7ec72afc2bff..a46c6bab6479 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -15,25 +15,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # Prevent the manpage builds from attempting to access the Internet. - prePatch = '' - substituteInPlace cmake_admin/CreateManpages.cmake --replace \ - http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \ - ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl - - for xml in doc/*.xml.in; do - substituteInPlace "$xml" --replace \ - http://www.docbook.org/xml/4.5/docbookx.dtd \ - ${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd - done - ''; - #Temporarily remove drumstick-piano; Gives segment fault. Submitted ticket postInstall = '' rm $out/bin/drumstick-vpiano ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_45 ]; buildInputs = [ alsaLib doxygen fluidsynth qt5.qtbase qt5.qtsvg ]; diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix new file mode 100644 index 000000000000..fe14a1b2b77c --- /dev/null +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, gtest }: +stdenv.mkDerivation rec { + name = "easyloggingpp-${version}"; + version = "9.95.0"; + src = fetchFromGitHub { + owner = "muflihun"; + repo = "easyloggingpp"; + rev = "v${version}"; + sha256 = "0gzmznw6ffag9x55lixxffy6x7mvb7691x0md4q9rbh88zkws7kq"; + }; + nativeBuildInputs = [cmake]; + buildInputs = [gtest]; + cmakeFlags = [ "-Dtest=ON" "-Dbuild_static_lib=ON"]; + NIX_CFLAGS_COMPILE = "-std=c++11" + + stdenv.lib.optionalString stdenv.isLinux " -pthread"; + meta = { + description = "C++ logging library"; + homepage = https://muflihun.github.io/easyloggingpp/; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [acowley]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix index 34da3c1f372c..64d61d64bb63 100644 --- a/pkgs/development/libraries/geoclue/2.0.nix +++ b/pkgs/development/libraries/geoclue/2.0.nix @@ -1,23 +1,23 @@ { fetchurl, stdenv, intltool, libintlOrEmpty, pkgconfig, glib, json_glib, libsoup, geoip -, dbus, dbus_glib, modemmanager, avahi +, dbus, dbus_glib, modemmanager, avahi, glib_networking, wrapGAppsHook }: with stdenv.lib; stdenv.mkDerivation rec { - name = "geoclue-2.4.3"; + name = "geoclue-2.4.7"; src = fetchurl { url = "http://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz"; - sha256 = "0pk07k65dlw37nz8z5spksivsv5nh96xmbi336rf2yfxf2ldpadd"; + sha256 = "19hfmr8fa1js8ynazdyjxlyrqpjn6m1719ay70ilga4rayxrcyyi"; }; nativeBuildInputs = [ - pkgconfig + pkgconfig intltool wrapGAppsHook ]; buildInputs = libintlOrEmpty ++ - [ intltool glib json_glib libsoup geoip + [ glib json_glib libsoup geoip dbus dbus_glib avahi ] ++ optionals (!stdenv.isDarwin) [ modemmanager ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"; - propagatedBuildInputs = [ dbus dbus_glib glib ]; + propagatedBuildInputs = [ dbus dbus_glib glib glib_networking ]; meta = with stdenv.lib; { description = "Geolocation framework and some data providers"; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 39140eaf5196..b82fd5f1e299 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -43,7 +43,7 @@ let ''; ver_maj = "2.54"; - ver_min = "0"; + ver_min = "1"; in stdenv.mkDerivation rec { @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; - sha256 = "fe22998ff0394ec31e6e5511c379b74011bee61a4421bca7fcab223dfbe0fc6a"; + sha256 = "50c01b1419324f10fbf9b9709ec2164b18586968bdce7540583bf32302cf47a3"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index f5d75177963a..1d0930d8d03c 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -13,7 +13,7 @@ with stdenv.lib; let ver_maj = "3.22"; - ver_min = "21"; + ver_min = "24"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "1bd3c1a85cfb4db112cabb5379abb05a1a94fe43052d309d573493fca00e6b87"; + sha256 = "cbb16e4cfc928ab8f5f22f7290616f95f6ebc8c97cc724a2007b07ced833592b"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix new file mode 100644 index 000000000000..490732c38025 --- /dev/null +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, libdrm, python }: + +stdenv.mkDerivation rec { + name = "kmsxx-2017-10-10"; + + src = fetchFromGitHub { + owner = "tomba"; + repo = "kmsxx"; + fetchSubmodules = true; + rev = "f32b82c17cd357ae1c8ed2636266113955293feb"; + sha256 = "14panqdqq83wh6wym5afdiyrr78mb12ga63pgrppj27kgv398yjj"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libdrm python ]; + + pythonPath = [ ]; + passthru.python = python; + + meta = with stdenv.lib; { + description = "C++11 library, utilities and python bindings for Linux kernel mode setting"; + homepage = https://github.com/tomba/kmsxx; + license = licenses.mpl20; + maintainers = with maintainers; [ gnidorah ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index c62d31a1e26a..4903d8e66dfe 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1minzvsyz5hgm6ixpj8ysa6jsv7vm8qc8nx390jxdsk0v9ljd983"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "bin" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libpthreadstubs libpciaccess valgrind-light ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { preConfigure = stdenv.lib.optionalString stdenv.isDarwin "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; - configureFlags = [ ] + configureFlags = [ "--enable-install-test-programs" ] ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ] ++ stdenv.lib.optional stdenv.isDarwin "-C"; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 1cc275b30480..0f0e67260321 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,49 +1,40 @@ -{ stdenv, fetchurl, pkgconfig -, libevdev, mtdev, udev, libwacom +{ stdenv, fetchurl, pkgconfig, meson, ninja, libevdev, mtdev, udev, libwacom , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support -, testsSupport ? false, check ? null, valgrind ? null -, autoconf, automake -}: +, testsSupport ? false, check ? null, valgrind ? null }: assert documentationSupport -> doxygen != null && graphviz != null; assert eventGUISupport -> cairo != null && glib != null && gtk3 != null; assert testsSupport -> check != null && valgrind != null; -let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; -in - -with stdenv.lib; -stdenv.mkDerivation rec { +let mkFlag = c: flag: if c then "-D${flag}=true" else "-D${flag}=false"; +in with stdenv.lib; stdenv.mkDerivation rec { name = "libinput-${version}"; - version = "1.7.3"; + version = "1.8.3"; src = fetchurl { - url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89"; + url = "https://freedesktop.org/software/libinput/${name}.tar.xz"; + sha256 = "0b8l2dmzzm20xf2hw1dr9gnzd3fah9jz5f216p2ajw895zsy5qig"; }; outputs = [ "out" "dev" ]; - configureFlags = [ + mesonFlags = [ (mkFlag documentationSupport "documentation") - (mkFlag eventGUISupport "event-gui") + (mkFlag eventGUISupport "debug-gui") (mkFlag testsSupport "tests") ]; - nativeBuildInputs = [ pkgconfig ]; + patches = [ ./udev-absolute-path.patch ]; - buildInputs = [ libevdev mtdev libwacom autoconf automake ] + nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = [ libevdev mtdev libwacom ] ++ optionals eventGUISupport [ cairo glib gtk3 ] ++ optionals documentationSupport [ doxygen graphviz ] ++ optionals testsSupport [ check valgrind ]; propagatedBuildInputs = [ udev ]; - patches = [ ./udev-absolute-path.patch ]; - patchFlags = [ "-p0" ]; - meta = { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; homepage = http://www.freedesktop.org/wiki/Software/libinput; diff --git a/pkgs/development/libraries/libinput/udev-absolute-path.patch b/pkgs/development/libraries/libinput/udev-absolute-path.patch index 2d3fa966b299..4b6bfc96d5a5 100644 --- a/pkgs/development/libraries/libinput/udev-absolute-path.patch +++ b/pkgs/development/libraries/libinput/udev-absolute-path.patch @@ -1,12 +1,11 @@ ---- configure.ac 2016-05-27 14:00:25.248388226 +0200 -+++ configure.ac 2016-05-27 14:01:28.228943416 +0200 -@@ -214,7 +214,8 @@ AM_CONDITIONAL(BUILD_DOCS, [test "x$buil - # Used by the udev rules so we can use callouts during testing without - # installing everything first. Default is the empty string so the installed - # rule will use udev's default path. Override is in udev/Makefile.am --AC_SUBST(UDEV_TEST_PATH, "") -+UDEV_TEST_PATH="${UDEV_DIR}/" -+AC_SUBST(UDEV_TEST_PATH) - AC_PATH_PROG(SED, [sed]) +--- a/meson.build 2017-09-25 11:37:07.787726521 +0000 ++++ b/meson.build 2017-09-25 11:38:48.958233247 +0000 +@@ -100,7 +100,7 @@ + args : model_quirks) - AC_CONFIG_FILES([Makefile + udev_rules_config = configuration_data() +-udev_rules_config.set('UDEV_TEST_PATH', '') ++udev_rules_config.set('UDEV_TEST_PATH', udev_dir + '/') + configure_file(input : 'udev/80-libinput-device-groups.rules.in', + output : '80-libinput-device-groups.rules', + install : true, diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 9ad959ae22e0..764f4442e6cb 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libebml }: stdenv.mkDerivation rec { - name = "libmatroska-1.4.7"; + name = "libmatroska-1.4.8"; src = fetchurl { - url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.bz2"; - sha256 = "1yi5cnv13nhl27xyqayd5l3sf0j3swfj3apzibv71yg9pariwi26"; + url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.xz"; + sha256 = "14n9sw974prr3yp4yjb7aadi6x2yz5a0hjw8fs3qigy5shh2piyq"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index cc6f5205d92a..9e4b23a0919c 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "0.7.97"; + version = "0.7.99"; name = "libmediainfo-${version}"; src = fetchurl { - url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "0rpxxbszi7i4hspdzdif9inhlwxdkf0iggaim6682clqb6pv7sld"; + url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; + sha256 = "126nkxrzs6dxzm3hzx6smvw6xgrqr3zs6hdqvl2xmvqy10p8z6pc"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Shared library for mediainfo"; - homepage = http://mediaarea.net/; + homepage = https://mediaarea.net/; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.devhell ]; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 94a9aa37ad9c..c4a6a246b909 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -5,12 +5,12 @@ assert zlib != null; let - version = "1.6.31"; - patchVersion = "1.6.31"; - sha256 = "0hcbxv9qf4f9q7brrk0ndag526glr8lii43grssv45j9w0nn0ai3"; + version = "1.6.34"; + patchVersion = "1.6.34"; + sha256 = "1xjr0v34fyjgnhvaa1zixcpx5yvxcg4zwvfh0fyklfyfj86rc7ig"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; - sha256 = "0f10ih658j514vpvsli0pk378vcmjn78g52cssyg92r4k1r19rla"; + sha256 = "1ha4npf9mfrzp0srg8a5amks5ww84xzfpjbsj8k3yjjpai798qg6"; }; whenPatched = stdenv.lib.optionalString apngSupport; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 50d588dad79b..8dea502a4ff4 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -2,14 +2,14 @@ , ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.14.1"; + version = "1.15.0"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "1121qvnvpcabq1bl2k41jq8r2hn2x123csiaf7s9vrq66bbxgfdx"; + sha256 = "092hxqjvbb6d03h3msc38359w2kixba1ansyrsbyqq8iqiqwnkw0"; }; postPatch = let diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 96dbc094b55c..0546bdc6359b 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip +{ stdenv, fetchzip, fetchpatch , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff , libwebp, libxml2, proj, python2, scons, sqlite, zlib @@ -16,6 +16,12 @@ stdenv.mkDerivation rec { sha256 = "189wsd6l6awblkiha666l1sdyp7ifmnfsa87y0j37rvym6w4r065"; }; + patches = [(fetchpatch { + name = "icu-59.diff"; + url = https://github.com/mapnik/mapnik/commit/9e58c890430d.diff; + sha256 = "0h546qq8g19gw9s4979hla9vkq5kcwh3q45ryajyjhmlr2z9fi6p"; + })]; + # a distinct dev output makes python-mapnik fail outputs = [ "out" ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 96d226785cab..0fde0192726b 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, fetchpatch, lib , pkgconfig, intltool, autoreconfHook, substituteAll -, file, expat, libdrm, xorg, wayland, openssl +, file, expat, libdrm, xorg, wayland, wayland-protocols, openssl , llvmPackages, libffi, libomxil-bellagio, libva -, libelf, libvdpau, valgrind-light +, libelf, libvdpau, valgrind-light, python2 , grsecEnabled ? false -, enableRadv ? false +, enableRadv ? true # Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa. # It's overridden for mesa_drivers. , enableTextureFloats ? false @@ -36,7 +36,7 @@ let then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"] else if stdenv.isAarch64 then ["nouveau" "vc4" ] - else ["i915" "r300" "r600" "radeonsi" "nouveau"]; + else ["svga" "i915" "r300" "r600" "radeonsi" "nouveau"]; defaultDriDrivers = if (stdenv.isArm || stdenv.isAarch64) then ["nouveau"] @@ -51,8 +51,7 @@ let gallium_ = galliumDrivers; dri_ = driDrivers; vulkan_ = vulkanDrivers; in let galliumDrivers = - ["svga"] - ++ (if gallium_ == null + (if gallium_ == null then defaultGalliumDrivers else gallium_) ++ ["swrast"]; @@ -67,7 +66,7 @@ let in let - version = "17.1.10"; + version = "17.2.2"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -82,7 +81,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" ]; - sha256 = "cbc0d681cc4df47d8deb5a36f45b420978128522fd665b2cd4c7096316f11bdb"; + sha256 = "10jplvxg7rlbp7569w08z0igwlsjjfb7q3n07zgfr8d5sr224lng"; }; prePatch = "patchShebangs ."; @@ -150,9 +149,9 @@ stdenv.mkDerivation { expat llvmPackages.llvm glproto dri2proto dri3proto presentproto libX11 libXext libxcb libXt libXfixes libxshmfence - libffi wayland libvdpau libelf libXvMC + libffi wayland wayland-protocols libvdpau libelf libXvMC libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/ - valgrind-light + valgrind-light python2 ]; diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 6b8ba68adb76..59f674789e47 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,34 +1,29 @@ -{ stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4 +{ stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qtbase , libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private, OpenGL }: stdenv.mkDerivation rec { - name = "pcl-1.8.0"; + name = "pcl-1.8.1"; src = fetchFromGitHub { owner = "PointCloudLibrary"; repo = "pcl"; rev = name; - sha256 = "1pki4y7mc2dryxc8wa7rs4hg74qab80rpy90jnw3j8fzf09kxcll"; + sha256 = "05wvqqi2fyk5innw4mg356r71c1hmc9alc7xkf4g81ds3b3867xq"; }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake qhull flann boost eigen libusb1 libpcap - libpng vtk qt4 libXt ] + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ qhull flann boost eigen libusb1 libpcap + libpng vtk qtbase libXt ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_DEPLOYMENT_TARGET=" "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]; - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed "s,[[:space:]]*-F$NIX_STORE/[[:alnum:]]*-CF-osx-[[:digit:].]*/Library/Frameworks,,g") - sed -i 's,^\( target_link_libraries("''${LIB_NAME}" "-framework Cocoa")\),\1\n target_link_libraries("''${LIB_NAME}" "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"),' visualization/CMakeLists.txt - sed -i 's,^\(set(SUBSYS_DEPS common io kdtree geometry search)\),\1\nset(CMAKE_OSX_SYSROOT "")\nset(CMAKE_OSX_DEPLOYMENT_TARGET ""),' visualization/CMakeLists.txt - ''; - meta = { homepage = http://pointclouds.org/; description = "Open project for 2D/3D image and point cloud processing"; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 171acea90b34..2cb2dde33f7e 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -7,6 +7,9 @@ with lib; let v = "4.9.1"; + + soname = if withQt5 then "phonon4qt5" else "phonon"; + buildsystemdir = "share/cmake/${soname}"; in assert withQt5 -> qtbase != null; @@ -36,17 +39,41 @@ stdenv.mkDerivation rec { [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules; + outputs = [ "out" "dev" ]; + NIX_CFLAGS_COMPILE = "-fPIC"; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ] ++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON"; + preConfigure = '' + cmakeFlags+=" -DPHONON_QT_MKSPECS_INSTALL_DIR=''${!outputDev}/mkspecs" + cmakeFlags+=" -DPHONON_QT_IMPORTS_INSTALL_DIR=''${!outputBin}/$qtQmlPrefix" + cmakeFlags+=" -DPHONON_QT_PLUGIN_INSTALL_DIR=''${!outputBin}/$qtPluginPrefix/designer" + ''; + postPatch = '' sed -i PhononConfig.cmake.in \ -e "/get_filename_component(rootDir/ s/^.*$//" \ - -e "/^set(PHONON_INCLUDE_DIR/ s,\''${rootDir},''${!outputDev}," \ - -e "/^set(PHONON_LIBRARY_DIR/ s,\''${rootDir}/,," \ - -e "/^set(PHONON_BUILDSYSTEM_DIR/ s,\''${rootDir},''${!outputDev}," + -e "/^set(PHONON_INCLUDE_DIR/ s|\''${rootDir}/||" \ + -e "/^set(PHONON_LIBRARY_DIR/ s|\''${rootDir}/||" \ + -e "/^set(PHONON_BUILDSYSTEM_DIR/ s|\''${rootDir}|''${!outputDev}|" + + sed -i cmake/FindPhononInternal.cmake \ + -e "/set(INCLUDE_INSTALL_DIR/ c set(INCLUDE_INSTALL_DIR \"''${!outputDev}/include\")" + + ${optionalString withQt5 '' + sed -i cmake/FindPhononInternal.cmake \ + -e "/set(PLUGIN_INSTALL_DIR/ c set(PLUGIN_INSTALL_DIR \"$qtPluginPrefix/..\")" + ''} + + sed -i CMakeLists.txt \ + -e "/set(BUILDSYSTEM_INSTALL_DIR/ c set(BUILDSYSTEM_INSTALL_DIR \"''${!outputDev}/${buildsystemdir}\")" + ''; + + postFixup = '' + sed -i "''${!outputDev}/lib/pkgconfig/${soname}.pc" \ + -e "/^exec_prefix=/ c exec_prefix=''${!outputBin}/bin" ''; } diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index 2ba5a262e228..bdf537f4375e 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -109,4 +109,30 @@ in rec { ''; }); + v_2_4_0 = pgDerivationBaseNewer.merge ( fix : { + version = "2.4.0"; + sha256 = "02baa90f04da41e04b6c18eedfda53110c45ae943d4e65050f6d202f7de07d29"; + sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"]; + builtInputs = [gdal json_c pkgconfig]; + + # postgis config directory assumes /include /lib from the same root for json-c library + NIX_LDFLAGS = "-L${stdenv.lib.getLib json_c}/lib"; + + dontDisableStatic = true; + preConfigure = '' + sed -i 's@/usr/bin/file@${file}/bin/file@' configure + configureFlags="$configureFlags --with-gdalconfig=${gdal}/bin/gdal-config --with-jsondir=${json_c.dev}" + ''; + postConfigure = '' + sed -i "s|@mkdir -p \$(DESTDIR)\$(PGSQL_BINDIR)||g ; + s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g + " \ + "raster/loader/Makefile"; + sed -i "s|\$(DESTDIR)\$(PGSQL_BINDIR)|$prefix/bin|g + " \ + "raster/scripts/python/Makefile"; + ''; + }); + + } diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 2be2f501518e..c9679d227d88 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -183,10 +183,38 @@ stdenv.mkDerivation rec { sed -i 's/^\(LIBS[[:space:]]*=.*$\)/\1 -lobjc/' ./src/corelib/Makefile.Release ''; - postInstall = - '' + installPhase = optionalString stdenv.isDarwin '' + runHook preInstall + cp -r lib $out + + mkdir -p $out/Applications + mv bin/*.app $out/Applications + rm -rf bin/*.app + + cp -r bin $out + + mkdir -p $out/share/doc/${name} + mkdir -p $out/lib + mkdir -p $out/lib/qt4/plugins + mkdir -p $out/lib/qt4/imports + mkdir -p $out/bin + mkdir -p $out/include + mkdir -p $out/share/${name} + + cp -r mkspecs $out/share/${name} + cp -r translations $out/share/${name} + cp -r tools/linguist/phrasebooks $out/share/${name} + cp tools/porting/src/q3porting.xml $out/share/${name} + + cp -r plugins $out/lib/qt4 + cp -r imports $out/lib/qt4 + cp -r doc/* $out/share/doc/${name} + runHook postInstall + ''; + + postInstall = optionalString (!stdenv.isDarwin) '' rm -rf $out/tests - ''; + ''; crossAttrs = { # I've not tried any case other than i686-pc-mingw32. diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icu-59.patch b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icu-59.patch new file mode 100644 index 000000000000..add365b5dd64 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icu-59.patch @@ -0,0 +1,86 @@ +From: Konstantin Tokarev <annulen@yandex.ru> +Date: Thu, 4 May 2017 12:12:37 +0000 (+0300) +Subject: Fix compilation with ICU 59 +X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtwebkit.git;a=commitdiff_plain;h=bf172ae289a1348842005a9421797970f9b72060;hp=821eaaadc9d63d03aca65cf757230b520daaaa7c + +Fix compilation with ICU 59 + +Upstream fix: https://bugs.webkit.org/show_bug.cgi?id=171612 + +Task-number: QTBUG-60532 +Change-Id: I6014feea213aa70ebe40b09d9d1a03fd1ed3c843 +Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> +--- + +diff --git a/Source/JavaScriptCore/API/JSStringRef.cpp b/Source/JavaScriptCore/API/JSStringRef.cpp +index 812f3d4..77a3fd0 100644 +--- a/Source/JavaScriptCore/API/JSStringRef.cpp ++++ b/Source/JavaScriptCore/API/JSStringRef.cpp +@@ -37,7 +37,7 @@ using namespace WTF::Unicode; + JSStringRef JSStringCreateWithCharacters(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(chars, numChars).leakRef(); ++ return OpaqueJSString::create(reinterpret_cast<const UChar*>(chars), numChars).leakRef(); + } + + JSStringRef JSStringCreateWithUTF8CString(const char* string) +@@ -62,7 +62,7 @@ JSStringRef JSStringCreateWithUTF8CString(const char* string) + JSStringRef JSStringCreateWithCharactersNoCopy(const JSChar* chars, size_t numChars) + { + initializeThreading(); +- return OpaqueJSString::create(StringImpl::createWithoutCopying(chars, numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); ++ return OpaqueJSString::create(StringImpl::createWithoutCopying(reinterpret_cast<const UChar*>(chars), numChars, WTF::DoesNotHaveTerminatingNullCharacter)).leakRef(); + } + + JSStringRef JSStringRetain(JSStringRef string) +@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string) + + const JSChar* JSStringGetCharactersPtr(JSStringRef string) + { +- return string->characters(); ++ return reinterpret_cast<const JSChar*>(string->characters()); + } + + size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string) +diff --git a/Source/JavaScriptCore/runtime/DateConversion.cpp b/Source/JavaScriptCore/runtime/DateConversion.cpp +index 0b57f01..05e2733 100644 +--- a/Source/JavaScriptCore/runtime/DateConversion.cpp ++++ b/Source/JavaScriptCore/runtime/DateConversion.cpp +@@ -107,7 +107,8 @@ String formatDateTime(const GregorianDateTime& t, DateTimeFormat format, bool as + #if OS(WINDOWS) + TIME_ZONE_INFORMATION timeZoneInformation; + GetTimeZoneInformation(&timeZoneInformation); +- const WCHAR* timeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ const WCHAR* winTimeZoneName = t.isDST() ? timeZoneInformation.DaylightName : timeZoneInformation.StandardName; ++ String timeZoneName(reinterpret_cast<const UChar*>(winTimeZoneName)); + #else + struct tm gtm = t; + char timeZoneName[70]; +diff --git a/Source/WTF/wtf/TypeTraits.h b/Source/WTF/wtf/TypeTraits.h +index 9df2c95..f5d6121 100644 +--- a/Source/WTF/wtf/TypeTraits.h ++++ b/Source/WTF/wtf/TypeTraits.h +@@ -72,6 +72,9 @@ namespace WTF { + template<> struct IsInteger<unsigned long> { static const bool value = true; }; + template<> struct IsInteger<long long> { static const bool value = true; }; + template<> struct IsInteger<unsigned long long> { static const bool value = true; }; ++#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || (defined(_HAS_CHAR16_T_LANGUAGE_SUPPORT) && _HAS_CHAR16_T_LANGUAGE_SUPPORT) ++ template<> struct IsInteger<char16_t> { static const bool value = true; }; ++#endif + #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED) + template<> struct IsInteger<wchar_t> { static const bool value = true; }; + #endif +diff --git a/Source/WebKit2/Shared/API/c/WKString.cpp b/Source/WebKit2/Shared/API/c/WKString.cpp +index cbac67d..23400a6 100644 +--- a/Source/WebKit2/Shared/API/c/WKString.cpp ++++ b/Source/WebKit2/Shared/API/c/WKString.cpp +@@ -55,7 +55,7 @@ size_t WKStringGetLength(WKStringRef stringRef) + size_t WKStringGetCharacters(WKStringRef stringRef, WKChar* buffer, size_t bufferLength) + { + COMPILE_ASSERT(sizeof(WKChar) == sizeof(UChar), WKStringGetCharacters_sizeof_WKChar_matches_UChar); +- return (toImpl(stringRef)->getCharacters(static_cast<UChar*>(buffer), bufferLength)); ++ return (toImpl(stringRef)->getCharacters(reinterpret_cast<UChar*>(buffer), bufferLength)); + } + + size_t WKStringGetMaximumUTF8CStringSize(WKStringRef stringRef) diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/series b/pkgs/development/libraries/qt-5/5.6/qtwebkit/series index 140e2a3dd4e2..7828e491c08b 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebkit/series +++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/series @@ -1,3 +1,4 @@ qtwebkit-dlopen-gtk.patch qtwebkit-dlopen-udev.patch qtwebkit-icucore-darwin.patch +qtwebkit-icu-59.patch diff --git a/pkgs/development/libraries/qt-5/5.9/fetch.sh b/pkgs/development/libraries/qt-5/5.9/fetch.sh index 2ae85bba391d..d026d2a922a0 100644 --- a/pkgs/development/libraries/qt-5/5.9/fetch.sh +++ b/pkgs/development/libraries/qt-5/5.9/fetch.sh @@ -1,2 +1,2 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/ \ +WGET_ARGS=( https://download.qt.io/archive/qt/5.9/5.9.2/submodules/ \ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/darwin-series b/pkgs/development/libraries/qt-5/5.9/qtbase/darwin-series new file mode 100644 index 000000000000..1111ff65f440 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/darwin-series @@ -0,0 +1,3 @@ +mkspecs-common-mac.patch +mkspecs-features-mac.patch +darwin-cf.patch diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix index 23dab52b80c5..fc5e5d39c63c 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix @@ -3,7 +3,7 @@ src, version, qtCompatVersion, coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2, - ruby, + ruby, which, # darwin support darwin, libiconv, libcxx, @@ -45,7 +45,7 @@ stdenv.mkDerivation { libjpeg libpng libtiff ] - ++ lib.optional mesaSupported mesa + ++ lib.optional (mesaSupported && !stdenv.isDarwin) mesa ++ lib.optionals (!stdenv.isDarwin) [ dbus glib udev @@ -73,14 +73,14 @@ stdenv.mkDerivation { ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = - [ bison flex gperf lndir perl pkgconfig python2 ] + [ bison flex gperf lndir perl pkgconfig python2 which ] ++ lib.optional (!stdenv.isDarwin) patchelf; outputs = [ "out" "dev" "bin" ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) - ++ stdenv.lib.optional stdenv.isDarwin ./darwin-cf.patch; + ++ stdenv.lib.optional stdenv.isDarwin (copyPathsToStore (lib.readPathsFromFile ./. ./darwin-series)); postPatch = '' @@ -94,7 +94,7 @@ stdenv.mkDerivation { sed -i '/PATHS.*NO_DEFAULT_PATH/ d' mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in '' - + lib.optionalString mesaSupported '' + + lib.optionalString (mesaSupported && !stdenv.isDarwin) '' sed -i mkspecs/common/linux.conf \ -e "/^QMAKE_INCDIR_OPENGL/ s|$|${mesa.dev or mesa}/include|" \ -e "/^QMAKE_LIBDIR_OPENGL/ s|$|${mesa.out}/lib|" @@ -110,10 +110,10 @@ stdenv.mkDerivation { -e 's#sdk_val=$(/usr/bin/xcrun -sdk $sdk -find $(echo $val | cut -d \x27 \x27 -f 1))##' \ -e 's#val=$(echo $sdk_val $(echo $val | cut -s -d \x27 \x27 -f 2-))##' \ ./configure - sed -i '3,$d' ./mkspecs/features/mac/default_pre.prf - sed -i '27,$d' ./mkspecs/features/mac/default_post.prf - sed -i '1,$d' ./mkspecs/features/mac/sdk.prf - sed -i 's/QMAKE_LFLAGS_RPATH = -Wl,-rpath,/QMAKE_LFLAGS_RPATH =/' ./mkspecs/common/mac.conf + substituteInPlace ./mkspecs/common/mac.conf \ + --replace "/System/Library/Frameworks/OpenGL.framework/" "${darwin.apple_sdk.frameworks.OpenGL}/Library/Frameworks/OpenGL.framework/" + substituteInPlace ./mkspecs/common/mac.conf \ + --replace "/System/Library/Frameworks/AGL.framework/" "${darwin.apple_sdk.frameworks.AGL}/Library/Frameworks/AGL.framework/" ''; # Note on the above: \x27 is a way if including a single-quote # character in the sed string arguments. @@ -144,7 +144,7 @@ stdenv.mkDerivation { ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"'' ] - ++ lib.optional mesaSupported + ++ lib.optional (mesaSupported && !stdenv.isDarwin) ''-DNIXPKGS_MESA_GL="${mesa.out}/lib/libGL"'' ++ lib.optionals (!stdenv.isDarwin) diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-common-mac.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-common-mac.patch new file mode 100644 index 000000000000..b77f87781226 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-common-mac.patch @@ -0,0 +1,11 @@ +--- qtbase-opensource-src-5.9.1.orig/mkspecs/common/mac.conf 2017-09-16 16:40:30.000000000 +0800 ++++ qtbase-opensource-src-5.9.1/mkspecs/common/mac.conf 2017-09-16 16:41:27.000000000 +0800 +@@ -23,7 +23,7 @@ + + QMAKE_FIX_RPATH = install_name_tool -id + +-QMAKE_LFLAGS_RPATH = -Wl,-rpath, ++QMAKE_LFLAGS_RPATH = + QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip + + QMAKE_LFLAGS_REL_RPATH = diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-features-mac.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-features-mac.patch new file mode 100644 index 000000000000..6f7baa558db3 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/mkspecs-features-mac.patch @@ -0,0 +1,278 @@ +diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_post.prf qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_post.prf +--- qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_post.prf 2017-09-16 16:40:30.000000000 +0800 ++++ qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_post.prf 2017-09-16 16:41:03.000000000 +0800 +@@ -24,165 +24,3 @@ + } + } + } +- +-# Add the same default rpaths as Xcode does for new projects. +-# This is especially important for iOS/tvOS/watchOS where no other option is possible. +-!no_default_rpath { +- QMAKE_RPATHDIR += @executable_path/Frameworks +- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks +-} +- +-# Don't pass -headerpad_max_install_names when using Bitcode. +-# In that case the linker emits a warning stating that the flag is ignored when +-# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962). +-# Using this flag is also unnecessary in practice on UIKit platforms since they +-# are sandboxed, and only UIKit platforms support bitcode to begin with. +-!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD +- +-app_extension_api_only { +- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +-} +- +-macx-xcode { +- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { +- debug_information_format.name = DEBUG_INFORMATION_FORMAT +- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT +- debug_information_format.build = debug +- QMAKE_MAC_XCODE_SETTINGS += debug_information_format +- } +- +- QMAKE_XCODE_ARCHS = +- +- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" +- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS +- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS +- QMAKE_MAC_XCODE_SETTINGS += arch_device +- +- simulator { +- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" +- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS +- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS +- QMAKE_MAC_XCODE_SETTINGS += arch_simulator +- } +- +- only_active_arch.name = ONLY_ACTIVE_ARCH +- only_active_arch.value = YES +- only_active_arch.build = debug +- QMAKE_MAC_XCODE_SETTINGS += only_active_arch +-} else { +- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS +- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS +- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS +- +- isEmpty(VALID_ARCHS): \ +- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") +- +- single_arch: VALID_ARCHS = $$first(VALID_ARCHS) +- +- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS)) +- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) +- +- QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS +- +- arch_flags = $(EXPORT_ARCH_ARGS) +- +- QMAKE_CFLAGS += $$arch_flags +- QMAKE_CXXFLAGS += $$arch_flags +- QMAKE_LFLAGS += $$arch_flags +- +- QMAKE_PCH_ARCHS = $$VALID_ARCHS +- +- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET +- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET +- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET +- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET +- +- # If we're doing a simulator and device build, device and simulator +- # architectures use different paths and flags for the sysroot and +- # deployment target switch, so we must multiplex them across multiple +- # architectures using -Xarch. Otherwise we fall back to the simple path. +- # This is not strictly necessary, but results in cleaner command lines +- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit +- # individual rules to a different set of architecture(s) from the overall +- # build (such as machtest in QtCore). +- simulator:device { +- QMAKE_XARCH_CFLAGS = +- QMAKE_XARCH_LFLAGS = +- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS +- +- for (arch, VALID_ARCHS) { +- contains(VALID_SIMULATOR_ARCHS, $$arch) { +- sdk = $$simulator.sdk +- version_identifier = $$simulator.deployment_identifier +- } else { +- sdk = $$device.sdk +- version_identifier = $$device.deployment_identifier +- } +- +- version_min_flags = \ +- -Xarch_$${arch} \ +- -m$${version_identifier}-version-min=$$deployment_target +- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \ +- -Xarch_$${arch} \ +- -isysroot$$xcodeSDKInfo(Path, $$sdk) +- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ +- -Xarch_$${arch} \ +- -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk) +- +- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) +- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) +- +- QMAKE_EXTRA_VARIABLES += \ +- QMAKE_XARCH_CFLAGS_$${arch} \ +- QMAKE_XARCH_LFLAGS_$${arch} +- } +- +- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) +- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) +- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) +- } else { +- simulator: \ +- version_identifier = $$simulator.deployment_identifier +- else: \ +- version_identifier = $$device.deployment_identifier +- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target +- QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag +- QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag +- QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_MAC_SDK_PATH $$version_min_flag +- } +- +- # Enable precompiled headers for multiple architectures +- QMAKE_CFLAGS_USE_PRECOMPILE = +- for (arch, VALID_ARCHS) { +- icc_pch_style: \ +- use_flag = "-pch-use " +- else: \ +- use_flag = -include +- +- # Only use Xarch with multi-arch, as the option confuses ccache +- count(VALID_ARCHS, 1, greaterThan): \ +- QMAKE_CFLAGS_USE_PRECOMPILE += \ +- -Xarch_$${arch} +- +- QMAKE_CFLAGS_USE_PRECOMPILE += \ +- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} +- } +- icc_pch_style { +- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} +- QMAKE_CFLAGS_USE_PRECOMPILE = +- } else { +- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- } +- +- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} +-} +- +-cache(QMAKE_XCODE_DEVELOPER_PATH, stash) +-cache(QMAKE_XCODE_VERSION, stash) +- +-QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() +diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_pre.prf qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_pre.prf +--- qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/default_pre.prf 2017-09-16 16:40:30.000000000 +0800 ++++ qtbase-opensource-src-5.9.1/mkspecs/features/mac/default_pre.prf 2017-09-16 16:40:45.000000000 +0800 +@@ -1,51 +1,2 @@ + CONFIG = asset_catalogs rez $$CONFIG + load(default_pre) +- +-isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { +- # Get path of Xcode's Developer directory +- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") +- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ +- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") +- +- # Make sure Xcode path is valid +- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ +- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") +- +- # Make sure Xcode is set up properly +- isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \ +- error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.") +-} +- +-isEmpty(QMAKE_XCODE_VERSION) { +- # Extract Xcode version using xcodebuild +- xcode_version = $$system("/usr/bin/xcodebuild -version") +- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) +- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") +- unset(xcode_version) +-} +- +-isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { +- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist +- exists($$QMAKE_XCODE_PREFERENCES_FILE): \ +- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null") +- +- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \ +- cache(QMAKE_TARGET_BUNDLE_PREFIX) +-} +- +-QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon +- +-# Make the default debug info format for static debug builds +-# DWARF instead of DWARF with dSYM. This cuts down build times +-# for application debug builds significantly, as Xcode doesn't +-# have to pull out all the DWARF info from the Qt static libs +-# and put it into a dSYM file. We don't need that dSYM file in +-# the first place, since the information is available in the +-# object files inside the archives (static libraries). +-macx-xcode:qtConfig(static): \ +- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf +- +-# This variable is used by the xcode_dynamic_library_suffix +-# feature, which allows Xcode to choose the Qt libraries to link to +-# at build time, depending on the current Xcode SDK and configuration. +-QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX +diff -u qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/sdk.prf qtbase-opensource-src-5.9.1/mkspecs/features/mac/sdk.prf +--- qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/sdk.prf 2017-09-16 16:40:30.000000000 +0800 ++++ qtbase-opensource-src-5.9.1/mkspecs/features/mac/sdk.prf 2017-09-16 16:41:16.000000000 +0800 +@@ -1,49 +0,0 @@ +- +-isEmpty(QMAKE_MAC_SDK): \ +- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") +- +-contains(QMAKE_MAC_SDK, .*/.*): \ +- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)") +- +-defineReplace(xcodeSDKInfo) { +- info = $$1 +- sdk = $$2 +- isEmpty(sdk): \ +- sdk = $$QMAKE_MAC_SDK +- +- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { +- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcodebuild -sdk $$sdk -version $$info 2>/dev/null") +- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}): error("Could not resolve SDK $$info for \'$$sdk\'") +- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) +- } +- +- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) +-} +- +-QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) +-QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) +-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) +- +-sysrootified = +-for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val +-QMAKE_INCDIR_OPENGL = $$sysrootified +- +-QMAKESPEC_NAME = $$basename(QMAKESPEC) +- +-# Resolve SDK version of various tools +-for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL)) { +- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool} +- !isEmpty($$tool_variable) { +- $$tool = $$eval($$tool_variable) +- next() +- } +- +- value = $$eval($$tool) +- isEmpty(value): next() +- +- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null") +- isEmpty(sysrooted): next() +- +- $$tool = $$sysrooted $$member(value, 1, -1) +- cache($$tool_variable, set stash, $$tool) +-} +Common subdirectories: qtbase-opensource-src-5.9.1.orig/mkspecs/features/mac/unsupported and qtbase-opensource-src-5.9.1/mkspecs/features/mac/unsupported diff --git a/pkgs/development/libraries/qt-5/5.9/srcs.nix b/pkgs/development/libraries/qt-5/5.9/srcs.nix index 247800b75780..f30802472fb8 100644 --- a/pkgs/development/libraries/qt-5/5.9/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.9/srcs.nix @@ -3,275 +3,283 @@ { qt3d = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qt3d-opensource-src-5.9.1.tar.xz"; - sha256 = "15j9znfnxch1n6fwz9ngi30msdzh0wlpykl53cs8g2fp2awfa7sg"; - name = "qt3d-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qt3d-opensource-src-5.9.2.tar.xz"; + sha256 = "10q7npsl087sja0g2n3v0cg4n75y7sbrs3mfjcsg1wpkw8psjmf9"; + name = "qt3d-opensource-src-5.9.2.tar.xz"; }; }; qtactiveqt = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtactiveqt-opensource-src-5.9.1.tar.xz"; - sha256 = "07zq60xg7nnlny7qgj6dk1ibg3fzhbdh78gpd0s6x1n822iyislg"; - name = "qtactiveqt-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtactiveqt-opensource-src-5.9.2.tar.xz"; + sha256 = "1kz59ns6afnd8s73ys7hqffg9ki9g7px009b2ab72nq7f8cqsib0"; + name = "qtactiveqt-opensource-src-5.9.2.tar.xz"; }; }; qtandroidextras = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtandroidextras-opensource-src-5.9.1.tar.xz"; - sha256 = "0nq879jsa2z1l5q3n0hhiv15mzfm5c6s7zfblcc10sgim90p5mjj"; - name = "qtandroidextras-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtandroidextras-opensource-src-5.9.2.tar.xz"; + sha256 = "1hsx16v17iqjhs20xn7an2ad7g8djwrmxachscjhji1dvk4682nl"; + name = "qtandroidextras-opensource-src-5.9.2.tar.xz"; }; }; qtbase = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtbase-opensource-src-5.9.1.tar.xz"; - sha256 = "1ikm896jzyfyjv2qv8n3fd81sxb4y24zkygx36865ygzyvlj36mw"; - name = "qtbase-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtbase-opensource-src-5.9.2.tar.xz"; + sha256 = "16v0dny4rcyd5p8qsnsfg89w98k8kqk3rp9x3g3k7xjmi53bpqkz"; + name = "qtbase-opensource-src-5.9.2.tar.xz"; }; }; qtcanvas3d = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcanvas3d-opensource-src-5.9.1.tar.xz"; - sha256 = "10fy8wqfw2yhha6lyky5g1a72137aj8pji7mk0wjnggh629z12sb"; - name = "qtcanvas3d-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtcanvas3d-opensource-src-5.9.2.tar.xz"; + sha256 = "1siyzgm1mjx90rwyzzq9vw2s2xzyf6n7q0vn8gw7mdim5indda44"; + name = "qtcanvas3d-opensource-src-5.9.2.tar.xz"; }; }; qtcharts = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtcharts-opensource-src-5.9.1.tar.xz"; - sha256 = "180df5v7i1ki8hc3lgi6jcfdyz7f19pb73dvfkw402wa2gfcna3k"; - name = "qtcharts-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtcharts-opensource-src-5.9.2.tar.xz"; + sha256 = "193a3imkgryw42s0gbwaj9gpqd673h3jrg86jvmy33l2fc5gfyjf"; + name = "qtcharts-opensource-src-5.9.2.tar.xz"; }; }; qtconnectivity = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtconnectivity-opensource-src-5.9.1.tar.xz"; - sha256 = "1mbzmqix0388iq20a1ljd1pgdq259rm1xzp9kx8gigqpamqqnqs0"; - name = "qtconnectivity-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtconnectivity-opensource-src-5.9.2.tar.xz"; + sha256 = "1k7kjmlny0ykm40qx796wbsg3310v6b8hqizkbr597cmxjbrax9c"; + name = "qtconnectivity-opensource-src-5.9.2.tar.xz"; }; }; qtdatavis3d = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdatavis3d-opensource-src-5.9.1.tar.xz"; - sha256 = "14d1q07winh6n1bkc616dapwfnsfkcjyg5zngdqjdj9mza8ang13"; - name = "qtdatavis3d-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtdatavis3d-opensource-src-5.9.2.tar.xz"; + sha256 = "1cmjjbbmdqdix1f8b7qyc2vwhj9pvchc8r4lp65qw11dhycmdbh6"; + name = "qtdatavis3d-opensource-src-5.9.2.tar.xz"; }; }; qtdeclarative = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdeclarative-opensource-src-5.9.1.tar.xz"; - sha256 = "1zwlxrgraxhlsdkwsai3pjbz7f3a6rsnsg2mjrpay6cz3af6rznj"; - name = "qtdeclarative-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtdeclarative-opensource-src-5.9.2.tar.xz"; + sha256 = "020bha6q8byxc8cj5zw7gms5rgsjg71hv31hv1rr2fy7x56zsh0d"; + name = "qtdeclarative-opensource-src-5.9.2.tar.xz"; }; }; qtdoc = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtdoc-opensource-src-5.9.1.tar.xz"; - sha256 = "1d2kk9wzm2261ap87nyf743a4662gll03gz5yh5qi7k620lk372x"; - name = "qtdoc-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtdoc-opensource-src-5.9.2.tar.xz"; + sha256 = "0dfva8h8f9wpszih285qcxlfcijy52qcbfy1zy20gxh72nfi86c9"; + name = "qtdoc-opensource-src-5.9.2.tar.xz"; }; }; qtgamepad = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgamepad-opensource-src-5.9.1.tar.xz"; - sha256 = "055w4649zi93q1sl32ngqwgnl2vxw1idnm040s9gjgjb67gi81zi"; - name = "qtgamepad-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtgamepad-opensource-src-5.9.2.tar.xz"; + sha256 = "0lm5v43psf7r8zc79dcjdmmdnz4jm30ylgkvsyv8k88mj06yklbn"; + name = "qtgamepad-opensource-src-5.9.2.tar.xz"; }; }; qtgraphicaleffects = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtgraphicaleffects-opensource-src-5.9.1.tar.xz"; - sha256 = "1zsr3a5dsmpvrb5h4m4h42wqmkvkks3d8mmyrx4k0mfr6s7c71jz"; - name = "qtgraphicaleffects-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtgraphicaleffects-opensource-src-5.9.2.tar.xz"; + sha256 = "0xpvigfiqfqvf05ywj8x69y57rp8dwq2hs1kpxlxs15pniz4wn8l"; + name = "qtgraphicaleffects-opensource-src-5.9.2.tar.xz"; }; }; qtimageformats = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtimageformats-opensource-src-5.9.1.tar.xz"; - sha256 = "0iwa3dys5rv706cpxwhmgircv783pmlyl1yrsc5i0rha643y7zkr"; - name = "qtimageformats-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtimageformats-opensource-src-5.9.2.tar.xz"; + sha256 = "1wwxxcl24mk1p4w6knyfai09axmwqsm6cgsbkjsmdz3zmjh6qqis"; + name = "qtimageformats-opensource-src-5.9.2.tar.xz"; }; }; qtlocation = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtlocation-opensource-src-5.9.1.tar.xz"; - sha256 = "058mgvlaml9rkfhkpr1n3avhi12zlva131sqhbwj4lwwyqfkri2b"; - name = "qtlocation-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtlocation-opensource-src-5.9.2.tar.xz"; + sha256 = "033b6l6jbvmc0k5qvbgh5vkzvfga7npqcphrywrrqkmx9vj446n8"; + name = "qtlocation-opensource-src-5.9.2.tar.xz"; }; }; qtmacextras = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmacextras-opensource-src-5.9.1.tar.xz"; - sha256 = "0096g9l2hwsiwlzfjkw7rhkdnyvb5gzjzyjjg9kqfnsagbwscv11"; - name = "qtmacextras-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtmacextras-opensource-src-5.9.2.tar.xz"; + sha256 = "0f14xkardmidvwljccrv6adcs4nyn8rzry9k74mwqn0ikvycs3my"; + name = "qtmacextras-opensource-src-5.9.2.tar.xz"; }; }; qtmultimedia = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtmultimedia-opensource-src-5.9.1.tar.xz"; - sha256 = "1r76zvbv6wwb7lgw9jwlx382iyw34i1amxaypb5bg3j1niqvx3z4"; - name = "qtmultimedia-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtmultimedia-opensource-src-5.9.2.tar.xz"; + sha256 = "0815hi3cxy5zy6yc5fkdpx2xd6rk7968j1ziwl2g4wa80802g9n9"; + name = "qtmultimedia-opensource-src-5.9.2.tar.xz"; }; }; qtnetworkauth = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtnetworkauth-opensource-src-5.9.1.tar.xz"; - sha256 = "1fgax3p7lqcz29z2n1qxnfpkj3wxq1x9bfx61q6nss1fs74pxzra"; - name = "qtnetworkauth-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtnetworkauth-opensource-src-5.9.2.tar.xz"; + sha256 = "16i33m8x5yii22ciq97bpfmnw0lwhvgv84i2az30a1ikm9dg00x0"; + name = "qtnetworkauth-opensource-src-5.9.2.tar.xz"; }; }; qtpurchasing = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtpurchasing-opensource-src-5.9.1.tar.xz"; - sha256 = "0b1hlaq6rb7d6b6h8kqd26klcpzf9vcdjrv610kdj0drb00jg3ss"; - name = "qtpurchasing-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtpurchasing-opensource-src-5.9.2.tar.xz"; + sha256 = "04f28y7qcr4kd0pw26mm515qj7haxr0i8lijn1q47wkikxyhawca"; + name = "qtpurchasing-opensource-src-5.9.2.tar.xz"; }; }; qtquickcontrols = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols-opensource-src-5.9.1.tar.xz"; - sha256 = "0bpc465q822phw3dcbddn70wj1fjlc2hxskkp1z9gl7r23hx03jj"; - name = "qtquickcontrols-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtquickcontrols-opensource-src-5.9.2.tar.xz"; + sha256 = "07xxhkfsljwdwlp9jfp88pwkrig02y2pnwhdsaz8mkcackwfq2az"; + name = "qtquickcontrols-opensource-src-5.9.2.tar.xz"; }; }; qtquickcontrols2 = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtquickcontrols2-opensource-src-5.9.1.tar.xz"; - sha256 = "1zq86kqz85wm3n84jcxkxw5x1mrhkqzldkigf8xm3l8j24rf0fr0"; - name = "qtquickcontrols2-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtquickcontrols2-opensource-src-5.9.2.tar.xz"; + sha256 = "1ln83afxyp5dmvdnq6n7as82xrd5k3xvfx7b1jxnljivslyxsm9b"; + name = "qtquickcontrols2-opensource-src-5.9.2.tar.xz"; }; }; qtremoteobjects = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtremoteobjects-opensource-src-5.9.1.tar.xz"; - sha256 = "10kwq0fgmi6zsqhb6s1nkcydpyl8d8flzdpgmyj50c4h2xhg2km0"; - name = "qtremoteobjects-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtremoteobjects-opensource-src-5.9.2.tar.xz"; + sha256 = "1ylphdwis34y4pm9xiwh2xqfd0hh2gp8kkawlps2q5mh2bm11376"; + name = "qtremoteobjects-opensource-src-5.9.2.tar.xz"; }; }; qtscript = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscript-opensource-src-5.9.1.tar.xz"; - sha256 = "13qq2mjfhqdcvkmzrgxg1gr5kww1ygbwb7r71xxl6rjzbn30hshp"; - name = "qtscript-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtscript-opensource-src-5.9.2.tar.xz"; + sha256 = "1wa0rnbphkhgydnwkf5bjwn0llskl6hgs0964nh0jik8qaspv027"; + name = "qtscript-opensource-src-5.9.2.tar.xz"; }; }; qtscxml = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtscxml-opensource-src-5.9.1.tar.xz"; - sha256 = "1m3b6wg5hqasdfc5igpj9bq3czql5kkvvn3rx1ig508kdlh5i5s0"; - name = "qtscxml-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtscxml-opensource-src-5.9.2.tar.xz"; + sha256 = "0pdimqwdrj8hckm81lwy1z58ji4bdv0bzgv336m0a8v3pj914awx"; + name = "qtscxml-opensource-src-5.9.2.tar.xz"; }; }; qtsensors = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsensors-opensource-src-5.9.1.tar.xz"; - sha256 = "1772x7r6y9xv2sv0w2dfz2yhagsq5bpa9kdpzg0qikccmabr7was"; - name = "qtsensors-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtsensors-opensource-src-5.9.2.tar.xz"; + sha256 = "1lxmhi19dbb8vjhpjph0l0ss6zh72hb4908lp4s1pgf8r641ai3r"; + name = "qtsensors-opensource-src-5.9.2.tar.xz"; }; }; qtserialbus = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialbus-opensource-src-5.9.1.tar.xz"; - sha256 = "1hzk377c3zl4dm5hxwvpxg2w096m160448y9df6v6l8xpzpzxafa"; - name = "qtserialbus-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtserialbus-opensource-src-5.9.2.tar.xz"; + sha256 = "025yv7zajz5scrmkjkmgkyvxpgkliqvrzc88is0gr481zpd4phmv"; + name = "qtserialbus-opensource-src-5.9.2.tar.xz"; }; }; qtserialport = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtserialport-opensource-src-5.9.1.tar.xz"; - sha256 = "0sbsc7n701kxl16r247a907zg2afmbx1xlml5jkc6a9956zqbzp1"; - name = "qtserialport-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtserialport-opensource-src-5.9.2.tar.xz"; + sha256 = "0hndc9z7qzxazzjvc6k5yd58afw13444plk70b05nqdi5p19rvah"; + name = "qtserialport-opensource-src-5.9.2.tar.xz"; }; }; qtspeech = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtspeech-opensource-src-5.9.1.tar.xz"; - sha256 = "00daxkf8iwf6n9rhkkv3isv5qa8wijwzb0zy1f6zlm3vcc8fz75c"; - name = "qtspeech-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtspeech-opensource-src-5.9.2.tar.xz"; + sha256 = "0cq33dffi7q7dnvzhdivky5prakb8xnwap0b76fwgirhbbn88ypg"; + name = "qtspeech-opensource-src-5.9.2.tar.xz"; }; }; qtsvg = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtsvg-opensource-src-5.9.1.tar.xz"; - sha256 = "1rg2q4snh2g4n93zmk995swwkl0ab1jr9ka9xpj56ddifkw99wlr"; - name = "qtsvg-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtsvg-opensource-src-5.9.2.tar.xz"; + sha256 = "020icrl9vi8jh8ygsssqrx2bl8bx28m15dwmf9a969qdnvxyp5ms"; + name = "qtsvg-opensource-src-5.9.2.tar.xz"; }; }; qttools = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttools-opensource-src-5.9.1.tar.xz"; - sha256 = "1s50kh3sg5wc5gqhwwznnibh7jcnfginnmkv66w62mm74k7mdsy4"; - name = "qttools-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qttools-opensource-src-5.9.2.tar.xz"; + sha256 = "06nqsa5mj0mc9w9xbm7mgdkb66x4wlvkhnas32f97sb8ic8rdf9b"; + name = "qttools-opensource-src-5.9.2.tar.xz"; }; }; qttranslations = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qttranslations-opensource-src-5.9.1.tar.xz"; - sha256 = "0sdjiqli15fmkbqvhhgjfavff906sg56jx5xf8bg6xzd2j5544ja"; - name = "qttranslations-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qttranslations-opensource-src-5.9.2.tar.xz"; + sha256 = "0byi4s07lfnzzlr2c4sc5qg3hrysswmakwmf80q2mx50kpgnvwax"; + name = "qttranslations-opensource-src-5.9.2.tar.xz"; }; }; qtvirtualkeyboard = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtvirtualkeyboard-opensource-src-5.9.1.tar.xz"; - sha256 = "0k79sqa8bg6gkbsk16320gnila1iiwpnl3vx03rysm5bqdnnlx3b"; - name = "qtvirtualkeyboard-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtvirtualkeyboard-opensource-src-5.9.2.tar.xz"; + sha256 = "1z66chp5746cb0rwy2isnpbvwjj44qvp2hg56n3g47dj901wldp8"; + name = "qtvirtualkeyboard-opensource-src-5.9.2.tar.xz"; }; }; qtwayland = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwayland-opensource-src-5.9.1.tar.xz"; - sha256 = "1yizvbmh26mx1ffq0qaci02g2wihy68ld0y7r3z8nx3v5acb236g"; - name = "qtwayland-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwayland-opensource-src-5.9.2.tar.xz"; + sha256 = "1ipn4xh0dj1kjg5i4vfl4gpx3hg2377w5gls47xpv1ikz41lshzn"; + name = "qtwayland-opensource-src-5.9.2.tar.xz"; }; }; qtwebchannel = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebchannel-opensource-src-5.9.1.tar.xz"; - sha256 = "003h09mla82f2znb8jjigx13ivc68ikgv7w04594yy7qdmd5yhl0"; - name = "qtwebchannel-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwebchannel-opensource-src-5.9.2.tar.xz"; + sha256 = "09iss70c1iqgf8qpik35qlgrdw5y9935v0fm2ppgkmxdxkpls6ww"; + name = "qtwebchannel-opensource-src-5.9.2.tar.xz"; }; }; qtwebengine = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebengine-opensource-src-5.9.1.tar.xz"; - sha256 = "00b4d18m54pbxa1hm6ijh2mrd4wmrs7lkplys8b4liw8j7mpx8zn"; - name = "qtwebengine-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwebengine-opensource-src-5.9.2.tar.xz"; + sha256 = "0251qk04yif4lsn8qvkc2kmzzmaw1v3pfh5ypr06d04zb3j6kc6a"; + name = "qtwebengine-opensource-src-5.9.2.tar.xz"; + }; + }; + qtwebsockets = { + version = "5.9.2"; + src = fetchurl { + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwebsockets-opensource-src-5.9.2.tar.xz"; + sha256 = "0x0nx1ampqsgj9qlc3l32z3ham1a5vq7m2lnxk5pr92yj6yw3pdg"; + name = "qtwebsockets-opensource-src-5.9.2.tar.xz"; }; }; qtwebkit = { @@ -290,44 +298,36 @@ name = "qtwebkit-examples-opensource-src-5.9.1.tar.xz"; }; }; - qtwebsockets = { - version = "5.9.1"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebsockets-opensource-src-5.9.1.tar.xz"; - sha256 = "0r1lya2jj3wfci82zfn0vk6vr8sk9k7xiphnkb0panhb8di769q1"; - name = "qtwebsockets-opensource-src-5.9.1.tar.xz"; - }; - }; qtwebview = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwebview-opensource-src-5.9.1.tar.xz"; - sha256 = "0qmxrh4y3i9n8x6yhrlnahcn75cc2xwlc8mi4g8n2d83c3x7pxyn"; - name = "qtwebview-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwebview-opensource-src-5.9.2.tar.xz"; + sha256 = "1cdqw6pjfqagnwxrha0s18zadjnm65dsildxj07h2qiwqxwyrjpw"; + name = "qtwebview-opensource-src-5.9.2.tar.xz"; }; }; qtwinextras = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtwinextras-opensource-src-5.9.1.tar.xz"; - sha256 = "1x7f944f3g2ml3mm594qv6jlvl5dzzsxq86yinp7av0lhnyrxk0s"; - name = "qtwinextras-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtwinextras-opensource-src-5.9.2.tar.xz"; + sha256 = "07qq9rxl6hhl300w7qxsjjbdd5fwpszfk3rbinxklg20f6c6ixml"; + name = "qtwinextras-opensource-src-5.9.2.tar.xz"; }; }; qtx11extras = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtx11extras-opensource-src-5.9.1.tar.xz"; - sha256 = "00fn3bps48gjyw0pdqvvl9scknxdpmacby6hvdrdccc3jll0wgd6"; - name = "qtx11extras-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtx11extras-opensource-src-5.9.2.tar.xz"; + sha256 = "1ias745j5lfnrfkgyk0pr8n8zlkqs08gq7yyzaj1c645sh54b1fv"; + name = "qtx11extras-opensource-src-5.9.2.tar.xz"; }; }; qtxmlpatterns = { - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/5.9/5.9.1/submodules/qtxmlpatterns-opensource-src-5.9.1.tar.xz"; - sha256 = "094wwap2fsl23cys6rxh2ciw0gxbbiqbshnn4qs1n6xdjrj6i15m"; - name = "qtxmlpatterns-opensource-src-5.9.1.tar.xz"; + url = "${mirror}/archive/qt/5.9/5.9.2/submodules/qtxmlpatterns-opensource-src-5.9.2.tar.xz"; + sha256 = "0knk4bplqhvsxar1wv16bzfw57q0aja12gdaxz7m8mvx121sm9ha"; + name = "qtxmlpatterns-opensource-src-5.9.2.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh index 81fcf5fc3d3c..4458e18a454f 100644 --- a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh +++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh @@ -2,6 +2,12 @@ qtPluginPrefix=@qtPluginPrefix@ qtQmlPrefix=@qtQmlPrefix@ qtDocPrefix=@qtDocPrefix@ +_qtRmCMakeLink() { + find "${!outputLib}" -name "*.cmake" -type l | xargs rm +} + +postInstallHooks+=(_qtRmCMakeLink) + addToSearchPathOnceWithCustomDelimiter() { local delim="$1" local search="$2" diff --git a/pkgs/development/libraries/spdlog/default.nix b/pkgs/development/libraries/spdlog/default.nix index a47eabe5d8d5..1c9e67f87675 100644 --- a/pkgs/development/libraries/spdlog/default.nix +++ b/pkgs/development/libraries/spdlog/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { name = "spdlog-${version}"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { - owner = "gabime"; - repo = "spdlog"; - rev = "v${version}"; - sha256 = "0pfagrkq6afpkl269vbi1fd6ckakzpr5b5cbapb8rr7hgsrilxza"; + owner = "gabime"; + repo = "spdlog"; + rev = "v${version}"; + sha256 = "13730429gwlabi432ilpnja3sfvy0nn2719vnhhmii34xcdyc57q"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; # cmakeFlags = [ "-DSPDLOG_BUILD_EXAMPLES=ON" ]; @@ -28,8 +28,5 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ obadz ]; platforms = platforms.all; - - # This is a header-only library, no point in hydra building it: - hydraPlatforms = []; }; } diff --git a/pkgs/development/libraries/v8/3.24.10.nix b/pkgs/development/libraries/v8/3.24.10.nix deleted file mode 100644 index e7b10f23ac8a..000000000000 --- a/pkgs/development/libraries/v8/3.24.10.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "3.24.10"; - sha256 = "1blz5h9syk93bb4x3shcai3s2jhh6ai4bpymr9rz0f1ysvg60x75"; -}) diff --git a/pkgs/development/libraries/v8/6_x.nix b/pkgs/development/libraries/v8/6_x.nix new file mode 100644 index 000000000000..4095ff20c2bc --- /dev/null +++ b/pkgs/development/libraries/v8/6_x.nix @@ -0,0 +1,171 @@ +{ stdenv, lib, fetchgit, fetchFromGitHub, gn, ninja, python, glib, pkgconfig +, doCheck ? false +, snapshot ? true +}: + +let + arch = if stdenv.isArm + then if stdenv.is64bit + then"arm64" + else "arm" + else if stdenv.is64bit + then"x64" + else "ia32"; + git_url = "https://chromium.googlesource.com"; + + deps = { + "base/trace_event/common" = fetchgit { + url = "${git_url}/chromium/src/base/trace_event/common.git"; + rev = "65d1d42a5df6c0a563a6fdfa58a135679185e5d9"; + sha256 = "0ikk0dj12adzr0138jrmwzhx8n9sl5qzs86a3mc3gva08a8wc84p"; + }; + "build" = fetchgit { + url = "${git_url}/chromium/src/build.git"; + rev = "48a2b7b39debc7c77c868c9ddb0a360af1ebc367"; + sha256 = "0aj554dfdbwnikwaapznfq55wkwbvg4114h7qamixy8ryjkaiy0k"; + }; + "buildtools" = fetchgit { + url = "${git_url}/chromium/buildtools.git"; + rev = "5af0a3a8b89827a8634132080a39ab4b63dee489"; + sha256 = "1841803m40w1hmnmm7qzdpk4b6q1m8cb7q4hsflqfpddpf4lp3v1"; + }; + "test/benchmarks/data" = fetchgit { + url = "${git_url}/v8/deps/third_party/benchmarks.git"; + rev = "05d7188267b4560491ff9155c5ee13e207ecd65f"; + sha256 = "0ad2ay14bn67d61ks4dmzadfnhkj9bw28r4yjdjjyzck7qbnzchl"; + }; + "test/mozilla/data" = fetchgit { + url = "${git_url}/v8/deps/third_party/mozilla-tests.git"; + rev = "f6c578a10ea707b1a8ab0b88943fe5115ce2b9be"; + sha256 = "0rfdan76yfawqxbwwb35aa57b723j3z9fx5a2w16nls02yk2kqyn"; + }; + "test/test262/data" = fetchgit { + url = "${git_url}/external/github.com/tc39/test262.git"; + rev = "1b911a8f8abf4cb63882cfbe72dcd4c82bb8ad91"; + sha256 = "1hbp7vv41k7jka8azc78hhw4qng7gckr6dz1van7cyd067znwvr4"; + }; + "test/test262/harness" = fetchgit { + url = "${git_url}/external/github.com/test262-utils/test262-harness-py.git"; + rev = "0f2acdd882c84cff43b9d60df7574a1901e2cdcd"; + sha256 = "00brj5avp43yamc92kinba2mg3a2x1rcd7wnm7z093l73idprvkp"; + }; + "test/wasm-js" = fetchgit { + url = "${git_url}/external/github.com/WebAssembly/spec.git"; + rev = "17b4a4d98c80b1ec736649d5a73496a0e6d12d4c"; + sha256 = "03nyrrqffzj6xrmqi1v7f9m9395bdk53x301fy5mcq4hhpq6rsjr"; + }; + "testing/gmock" = fetchgit { + url = "${git_url}/external/googlemock.git"; + rev = "0421b6f358139f02e102c9c332ce19a33faf75be"; + sha256 = "1xiky4v98maxs8fg1avcd56y0alv3hw8qyrlpd899zgzbq2k10pp"; + }; + "testing/gtest" = fetchgit { + url = "${git_url}/external/github.com/google/googletest.git"; + rev = "6f8a66431cb592dad629028a50b3dd418a408c87"; + sha256 = "0bdba2lr6pg15bla9600zg0r0vm4lnrx0wqz84p376wfdxra24vw"; + }; + "third_party/icu" = fetchgit { + url = "${git_url}/chromium/deps/icu.git"; + rev = "08cb956852a5ccdba7f9c941728bb833529ba3c6"; + sha256 = "0vn2iv068kmcjqqx5cgyha80x9iraz11hpx3q4n3rkvrlvbb3d7b"; + }; + "third_party/instrumented_libraries" = fetchgit { + url = "${git_url}/chromium/src/third_party/instrumented_libraries.git"; + rev = "644afd349826cb68204226a16c38bde13abe9c3c"; + sha256 = "0d1vkwilgv1a4ghazn623gwmm7h51padpfi94qrmig1y748xfwfa"; + }; + # templates of code generator require jinja2 2.8 (while nixpkgs has 2.9.5, which breaks the template) + "third_party/jinja2" = fetchgit { + url = "${git_url}/chromium/src/third_party/jinja2.git"; + rev = "d34383206fa42d52faa10bb9931d6d538f3a57e0"; + sha256 = "0d9hyw0bvp3p0dbwy833cm9vdqxcam0qbm9jc561ynphddxlkmgd"; + }; + "third_party/markupsafe" = fetchgit { + url = "${git_url}/chromium/src/third_party/markupsafe.git"; + rev = "8f45f5cfa0009d2a70589bcda0349b8cb2b72783"; + sha256 = "168ppjmicfdh4i1l0l25s86mdbrz9fgxmiq1rx33x79mph41scfz"; + }; + "tools/clang" = fetchgit { + url = "${git_url}/chromium/src/tools/clang.git"; + rev = "40f69660bf3cd407e72b8ae240fdd6c513dddbfe"; + sha256 = "1plkb9dcn34yd6lad7w59s9vqwmcc592dasgdk232spkafpg8qcf"; + }; + }; + +in + +stdenv.mkDerivation rec { + name = "v8-${version}"; + version = "6.2.414.27"; + + inherit doCheck; + + src = fetchFromGitHub { + owner = "v8"; + repo = "v8"; + rev = version; + sha256 = "15zrb9bcpnhljhrilqnjaak3a4xnhj8li6ra12g3gkrw3fzir9a2"; + }; + + postUnpack = '' + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (n: v: '' + mkdir -p $sourceRoot/${n} + cp -r ${v}/* $sourceRoot/${n} + '') deps)} + ''; + + prePatch = '' + # use our gn, not the bundled one + sed -i -e 's#gn_path = .*#gn_path = "${gn}/bin/gn"#' tools/mb/mb.py + + # disable tests + if [ "$doCheck" = "" ]; then sed -i -e '/"test:gn_all",/d' BUILD.gn; fi + + # disable sysroot usage + chmod u+w build/config build/config/sysroot.gni + sed -i build/config/sysroot.gni \ + -e '/use_sysroot =/ { s#\(use_sysroot =\).*#\1 false#; :a n; /current_cpu/ { s/^/#/; ba }; }' + + # patch shebangs (/usr/bin/env) + patchShebangs tools/dev/v8gen.py + ''; + + configurePhase = '' + tools/dev/v8gen.py -vv ${arch}.release -- \ + is_component_build=true \ + ${if snapshot then "v8_use_external_startup_data=false" else "v8_use_snapshot=false" } \ + is_clang=false \ + linux_use_bundled_binutils=false \ + treat_warnings_as_errors=false + ''; + + nativeBuildInputs = [ gn ninja pkgconfig ]; + buildInputs = [ python glib ]; + + buildPhase = '' + ninja -C out.gn/${arch}.release/ + ''; + + enableParallelBuilding = true; + + installPhase = '' + install -vD out.gn/${arch}.release/d8 "$out/bin/d8" + install -vD out.gn/${arch}.release/mksnapshot "$out/bin/mksnapshot" + mkdir -p "$out/lib" + for f in libicui18n.so libicuuc.so libv8_libbase.so libv8_libplatform.so libv8.so; do + install -vD out.gn/${arch}.release/$f "$out/lib/$f" + done + install -vD out.gn/${arch}.release/icudtl.dat "$out/lib/icudtl.dat" + mkdir -p "$out/include" + cp -vr include/*.h "$out/include" + cp -vr include/libplatform "$out/include" + ''; + + meta = with lib; { + description = "Google's open source JavaScript engine"; + maintainers = with maintainers; [ cstrahan proglodyte ]; + platforms = platforms.linux; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/libraries/v8/generic.nix b/pkgs/development/libraries/v8/generic.nix deleted file mode 100644 index d603fda3225c..000000000000 --- a/pkgs/development/libraries/v8/generic.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv, fetchurl, gyp, readline, python, which, icu -, version -, sha256 -, ... -}: - -assert readline != null; - -let - arch = if stdenv.is64bit then "x64" else "ia32"; -in - -stdenv.mkDerivation rec { - name = "v8-${version}"; - inherit version; - - src = fetchurl { - url = "https://commondatastorage.googleapis.com/chromium-browser-official/" - + "${name}.tar.bz2"; - inherit sha256; - }; - - patchPhase = '' - sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8 - ''; - - configurePhase = '' - PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ - PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ - build/gyp_v8 \ - -f make \ - --generator-output="out" \ - -Dflock_index=0 \ - -Dv8_enable_i18n_support=1 \ - -Duse_system_icu=1 \ - -Dconsole=readline \ - -Dcomponent=shared_library \ - -Dv8_target_arch=${arch} - ''; - - nativeBuildInputs = [ which ]; - buildInputs = [ readline python icu ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; - - buildFlags = [ - "LINK=g++" - "-C out" - "builddir=$(CURDIR)/Release" - "BUILDTYPE=Release" - ]; - - postPatch = stdenv.lib.optionalString (!stdenv.cc.isClang) '' - sed -i build/standalone.gyp -e 's,-Wno-format-pedantic,,g' - ''; - - enableParallelBuilding = true; - - installPhase = '' - install -vD out/Release/d8 "$out/bin/d8" - ${if stdenv.system == "x86_64-darwin" then '' - install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib" - '' else '' - install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so" - ''} - cp -vr include "$out/" - ''; - - postFixup = if stdenv.isDarwin then '' - install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8 - install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib - '' else null; - - meta = with stdenv.lib; { - description = "Google's open source JavaScript engine"; - platforms = platforms.linux; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/v8/update.sh b/pkgs/development/libraries/v8/update.sh new file mode 100755 index 000000000000..f046bb8e6885 --- /dev/null +++ b/pkgs/development/libraries/v8/update.sh @@ -0,0 +1,47 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p curl -p nix-prefetch-git +VERSION_OVERVIEW=https://omahaproxy.appspot.com/all?os=linux +TARGET_CHANNEL=beta +FILE_PATH=6_x.nix + +set -eo pipefail + +v8_version=$(curl -s "$VERSION_OVERVIEW" | awk -F "," "\$2 ~ /${TARGET_CHANNEL}/ { print \$11 }") + +echo "Using V8 version --> $v8_version" +sed -e "s#\\(version = \\)\"[0-9\.]*\"#\1\"$v8_version\"#" -i ${FILE_PATH} + +sha256=$(nix-prefetch-git --no-deepClone https://github.com/v8/v8.git "refs/tags/${v8_version}" \ + | sed -ne '/sha256/ { s#.*: "\(.*\)".*#\1#; p }') +sed -e "/repo = \"v8\"/ { n;n; s#\".*\"#\"${sha256}\"# }" -i ${FILE_PATH} + +deps="$(mktemp)" + +curl -s -o "$deps" "https://raw.githubusercontent.com/v8/v8/${v8_version}/DEPS" +echo $deps + +sed -ne '/= fetchgit {/ { s/.*"\(.*\)".*/\1/; p }' < ${FILE_PATH} | while read dep; do + echo "Processing dependency --> $dep" + escaped_dep=$(echo "$dep" | sed -e 's#/#\\/#g') + dep_rev=$(sed -ne "/\"v8\/${escaped_dep}\":/ { n; s#.*+ \"##; s#\".*##; p }" "$deps") + + if [ "$dep_rev" = "" ]; then + echo "Failed to resolve dependency $dep, not listed in DEPS file" + rm -f "$deps" + exit 2 + fi + + repo_url=$(sed -ne "/\"${escaped_dep}\" = fetchgit/ { n; s/.*\"\(.*\)\".*/\1/; s#\${git_url}#https://chromium.googlesource.com#; p }" ${FILE_PATH}) + sha256=$(nix-prefetch-git --no-deepClone "$repo_url" "$dep_rev" 2>/dev/null | sed -ne '/sha256/ { s#.*: "\(.*\)".*#\1#; p }') + + if [ "$sha256" = "" ]; then + echo "Failed to get sha256 via nix-prefetch-git $repo_url $dep_rev" + rm -f "$deps" + exit 2 + fi + + sed -e "/\"${escaped_dep}\" = fetchgit/ { n; n; s/\".*\"/\"${dep_rev}\"/; n; s/\".*\"/\"${sha256}\"/ }" -i ${FILE_PATH} +done + +rm -f "$deps" +echo done. diff --git a/pkgs/development/ocaml-modules/ansiterminal/default.nix b/pkgs/development/ocaml-modules/ansiterminal/default.nix index ee25a47670ea..7b9f01751517 100644 --- a/pkgs/development/ocaml-modules/ansiterminal/default.nix +++ b/pkgs/development/ocaml-modules/ansiterminal/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { - name = "ansiterminal-0.6.5"; + version = "0.7"; + + name = "ocaml${ocaml.version}-ansiterminal-${version}"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1206/ANSITerminal-0.6.5.tar.gz"; - sha256 = "1j9kflv2i16vf9hy031cl6z8hv6791mjbhnd9bw07y1pswdlx1r6"; + url = "https://github.com/Chris00/ANSITerminal/releases/download/${version}/ANSITerminal-${version}.tar.gz"; + sha256 = "03pqfxvw9pa9720l8i5fgxky1qx70kw6wxbczd5i50xi668lh0i9"; }; buildInputs = [ ocaml findlib ocamlbuild ]; @@ -20,7 +22,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://forge.ocamlcore.org/projects/ansiterminal; + homepage = "https://github.com/Chris00/ANSITerminal"; description = "A module allowing to use the colors and cursor movements on ANSI terminals"; longDescription = '' ANSITerminal is a module allowing to use the colors and cursor diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index 843cf44a1538..6bd98905afa5 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/36307/javalib-2.3.3.tar.bz2; - sha256 = "0427n3vfb2h51gy2p4878gdwlp0mb03asn3g9kp9v4wfxmksjj11"; + url = "https://gforge.inria.fr/frs/download.php/file/37153/javalib-2.3.4.tar.bz2"; + sha256 = "081ga3qzx0lkz0wy92qyj6k75k3s79518bvqii2q778hh5wif36f"; }; buildInputs = [ which ocaml findlib camlp4 ]; diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix index d8a874a7e2f5..e1b66741215f 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; + dontStrip = true; + meta = with stdenv.lib; { description = "OCaml Bindings to gettext"; homepage = https://forge.ocamlcore.org/projects/ocaml-gettext; diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 0391cd5033fd..5a1689eaeebd 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, opam, cmdliner }: stdenv.mkDerivation rec { - version = "0.9.5"; + version = "0.9.6"; name = "uuidm-${version}"; src = fetchurl { url = "http://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz"; - sha256 = "03bgxs119bphv9ggg97nsl5m61s43ixgby05hhggv16iadx9zndm"; + sha256 = "0hz4fdx0x16k0pw9995vkz5d1hmzz6b16wck9li399rcbfnv5jlc"; }; unpackCmd = "tar -xf $curSrc"; - buildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocaml findlib ocamlbuild topkg opam cmdliner ]; - configurePhase = "ocaml setup.ml -configure --prefix $prefix"; - buildPhase = "ocaml setup.ml -build"; - installPhase = "ocaml setup.ml -install"; + inherit (topkg) buildPhase installPhase; createFindlibDestdir = true; diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix new file mode 100644 index 000000000000..a022fd9fc410 --- /dev/null +++ b/pkgs/development/python-modules/MechanicalSoup/default.nix @@ -0,0 +1,23 @@ +{ fetchPypi, buildPythonPackage, lib +, requests, beautifulsoup4, six }: + + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "MechanicalSoup"; + version = "0.7.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wh93rml446ipx603n5z5i5bpan46pzliq6sw76d0ms9w7w2658d"; + }; + + propagatedBuildInputs = [ requests beautifulsoup4 six ]; + + meta = with lib; { + description = "A Python library for automating interaction with websites"; + homepage = https://github.com/hickford/MechanicalSoup; + license = licenses.mit; + maintainers = [ maintainers.jgillich ]; + }; +} diff --git a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix new file mode 100644 index 000000000000..e0b36de56729 --- /dev/null +++ b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildPythonPackage, sphinx, fetchPypi }: + + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "guzzle_sphinx_theme"; + version = "0.7.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rnkzrrsbnifn3vsb4pfaia3nlvgvw6ndpxp7lzjrh23qcwid34v"; + }; + + doCheck = false; # no tests + + propagatedBuildInputs = [ sphinx ]; + + meta = with stdenv.lib; { + description = "Sphinx theme used by Guzzle: http://guzzlephp.org"; + homepage = https://github.com/guzzle/guzzle_sphinx_theme/; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/python-modules/jsmin/default.nix b/pkgs/development/python-modules/jsmin/default.nix new file mode 100644 index 000000000000..16be096f2bae --- /dev/null +++ b/pkgs/development/python-modules/jsmin/default.nix @@ -0,0 +1,18 @@ +{ stdenv, lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "jsmin"; + version = "2.2.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fsmqbjvpxvff0984x7c0y8xmf49ax9mncz48b9xjx8wrnr9kpxn"; + }; + + meta = with lib; { + description = "JavaScript minifier"; + homepage = "https://github.com/tikitu/jsmin/"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 1379d93c6dd5..877fbe9470d1 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -1,13 +1,6 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, pytest -, pytestcov -, pytestpep8 -, pytest_xdist -, six -, Theano -, pyyaml +{ stdenv, lib, buildPythonPackage, fetchPypi +, pytest, pytestcov, pytestpep8, pytest_xdist +, six, numpy, scipy, pyyaml }: buildPythonPackage rec { @@ -28,7 +21,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - six Theano pyyaml + six pyyaml numpy scipy ]; # Couldn't get tests working diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix index f70c9a57e5fa..3704045d79a3 100644 --- a/pkgs/development/python-modules/libnacl/default.nix +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -1,13 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest, libsodium }: +{ stdenv, buildPythonPackage, fetchFromGitHub, pytest, libsodium }: buildPythonPackage rec { pname = "libnacl"; - version = "1.5.2"; + version = "1.6.0"; name = "${pname}-${version}"; - src = fetchPypi { - inherit pname version; - sha256 = "c58390b0d191db948fc9ab681f07fdfce2a573cd012356bada47d56795d00ee2"; + src = fetchFromGitHub { + owner = "saltstack"; + repo = pname; + rev = "v${version}"; + sha256 = "0iaql3mrj3hf48km8177bi6nmjdar26kmqjc3jw8mrjc940v99fk"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix new file mode 100644 index 000000000000..410a633c46b0 --- /dev/null +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchPypi, buildPythonPackage, numpy +}: + +buildPythonPackage rec { + pname = "plyfile"; + version = "0.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cspvhfy2nw1rfwpvrd69wkz0b6clr4wzqpwpmdk872vk2q89yzi"; + }; + + propagatedBuildInputs = [ numpy ]; + + meta = with lib; { + description = "NumPy-based text/binary PLY file reader/writer for Python"; + homepage = "https://github.com/dranjan/python-plyfile"; + maintainers = with maintainers; [ abbradar ]; + }; + +} diff --git a/pkgs/development/python-modules/pypcap/default.nix b/pkgs/development/python-modules/pypcap/default.nix new file mode 100644 index 000000000000..ab4c5f6034fe --- /dev/null +++ b/pkgs/development/python-modules/pypcap/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, writeText, buildPythonPackage, fetchPypi, isPy3k, libpcap, dpkt }: + +buildPythonPackage rec { + pname = "pypcap"; + version = "1.1.6"; + name = "${pname}-${version}"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1cx7qm0w2a91g5z8k3kmlwz0b8dkr0h8dlb64rwgyhp2laa33syi"; + }; + + patches = [ + # The default setup.py searchs for pcap.h in a static list of default + # folders. So we have to add the path to libpcap in the nix-store. + (writeText "libpcap-path.patch" + '' + --- a/setup.py + +++ b/setup.py + @@ -27,7 +27,8 @@ def recursive_search(path, target_files): + + def get_extension(): + # A list of all the possible search directories + - dirs = ['/usr', sys.prefix] + glob.glob('/opt/libpcap*') + \ + + dirs = ['${libpcap}', '/usr', sys.prefix] + \ + + glob.glob('/opt/libpcap*') + \ + glob.glob('../libpcap*') + glob.glob('../wpdpack*') + \ + glob.glob('/Applications/Xcode.app/Contents/Developer/Platforms/' + + 'MacOSX.platform/Developer/SDKs/*') + '') + ]; + + buildInputs = [ libpcap dpkt ]; + + meta = { + homepage = https://github.com/pynetwork/pypcap; + description = "Simplified object-oriented Python wrapper for libpcap"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ geistesk ]; + }; +} diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 48d4fa68f657..85052a34a568 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { name = "${pname}-${version}"; pname = "Shapely"; - version = "1.5.15"; + version = "1.6.1"; src = fetchPypi { inherit pname version; - sha256 = "0lfqxb3kpdn0g9zzlhzg79yc8iyy4fpsk0p5nd80gar1mmhr8pg7"; + sha256 = "1iyhrkm6g233gwbd20sf4aq4by0kg52cz1d2k7imnqgzjpmkgqas"; }; buildInputs = [ geos glibcLocales cython ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { libc = if stdenv.isDarwin then "libc.dylib" else "libc.so.6"; in '' sed -i "s|_lgeos = load_dll('geos_c', fallbacks=.*)|_lgeos = load_dll('geos_c', fallbacks=['${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}'])|" shapely/geos.py - sed -i "s|free = load_dll('c').free|free = load_dll('c', fallbacks=['${stdenv.cc.libc}/lib/${stdenv.cc.libc}']).free|" shapely/geos.py + sed -i "s|free = load_dll('c').free|free = load_dll('c', fallbacks=['${stdenv.cc.libc}/lib/${libc}']).free|" shapely/geos.py ''; # tests/test_voctorized fails because the vectorized extension is not diff --git a/pkgs/development/python-modules/yowsup/argparse-dependency.patch b/pkgs/development/python-modules/yowsup/argparse-dependency.patch new file mode 100644 index 000000000000..364f0054fe78 --- /dev/null +++ b/pkgs/development/python-modules/yowsup/argparse-dependency.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index 053ed07..60f0d9a 100755 +--- a/setup.py ++++ b/setup.py +@@ -5,7 +5,7 @@ import yowsup + import platform + import sys + +-deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six'] ++deps = ['python-dateutil', 'python-axolotl>=0.1.39', 'six'] + + if sys.version_info < (2,7): + deps += ['importlib'] diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix new file mode 100644 index 000000000000..fce974ccd3ac --- /dev/null +++ b/pkgs/development/python-modules/yowsup/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage, stdenv, fetchFromGitHub, six, python-axolotl, pytest }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "yowsup"; + version = "2.5.2"; + + src = fetchFromGitHub { + owner = "tgalal"; + repo = "yowsup"; + rev = "v${version}"; + sha256 = "16l8jmr32wwvl11m0a4r4id3dkfqj2n7dn6gky1077xwmj2da4fl"; + }; + + checkInputs = [ pytest ]; + checkPhase = '' + HOME=$(mktemp -d) py.test yowsup + ''; + + patches = [ ./argparse-dependency.patch ]; + + propagatedBuildInputs = [ six python-axolotl ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/tgalal/yowsup"; + description = "The python WhatsApp library"; + license = licenses.gpl3; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index fc93d8dc6f84..347abc147294 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "0.56.0"; + version = "0.57.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "0979hcz5qqblcnkc4whkklzdhm4f45gzfl6y4zp0wbq0qi1gv7x4"; + sha256 = "1y2znwiwc3zkwz17a2m0m28dpknw7hpjd7ih4h7zf6p8nnqd3k6d"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index a4cf3bcd649b..1754727bb364 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -13,14 +13,14 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - version = "1.6.0"; + version = "2.0.0"; name = "radare2-${version}"; src = fetchFromGitHub { owner = "radare"; repo = "radare2"; rev = version; - sha256 = "0kb7y0b5kw2p1kxpzjgc8pnwdkqyzkijzp5d2a9zs2ira96668zd"; + sha256 = "1ahai9x6jc15wjzdbdkri3rc88ark2i5s8nv2pxcp0wwldvawlzi"; }; postPatch = let @@ -34,10 +34,6 @@ stdenv.mkDerivation rec { substituteInPlace shlr/Makefile --replace CS_RELEASE=0 CS_RELEASE=1 cp ${capstone} shlr/capstone-${cs_ver}.tar.gz - # make compiler happy (fixed in upstream 2017-08-11) - substituteInPlace libr/asm/arch/hexagon/gnu/hexagon-dis.c --replace \ - '(*info->fprintf_func) (info->stream, errmsg);' \ - '(*info->fprintf_func) (info->stream, "%s", errmsg);' ''; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 0cb9078aede5..94428ecc174d 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -17,7 +17,7 @@ with stdenv.lib; let os = stdenv.lib.optionalString; majorVersion = "3.9"; - minorVersion = "2"; + minorVersion = "4"; version = "${majorVersion}.${minorVersion}"; in @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; - # from https://cmake.org/files/v3.9/cmake-3.9.2-SHA-256.txt - sha256 = "954a5801a456ee48e76f01107c9a4961677dd0f3e115275bbd18410dc22ba3c1"; + # from https://cmake.org/files/v3.9/cmake-3.9.4-SHA-256.txt + sha256 = "b5d86f12ae0072db520fdbdad67405f799eb728b610ed66043c20a92b4906ca1"; }; prePatch = optionalString (!useSharedLibraries) '' diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix new file mode 100644 index 000000000000..5e7dd5214a04 --- /dev/null +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -0,0 +1,77 @@ +{ stdenv, lib, fetchgit, fetchurl, libevent, ninja, python }: + +let + depsGit = { + "tools/gn" = fetchgit { + url = "https://chromium.googlesource.com/chromium/src/tools/gn"; + rev = "d0c518db129975ce88ff1de26c857873b0619c4b"; + sha256 = "0l15vzmjyx6bwlz1qhn3fy7yx3qzzxr3drnkj3l0p0fmyxza52vx"; + }; + "base" = fetchgit { + url = "https://chromium.googlesource.com/chromium/src/base"; + rev = "bc6e3ce8ca01b894751e1f7b22b561e3ae2e7f17"; + sha256 = "1yl49v6nxbrfms52xf7fiwh7d4301m2aj744pa3hzzh989c5j6g5"; + }; + "build" = fetchgit { + url = "https://chromium.googlesource.com/chromium/src/build"; + rev = "e934a19ae908081fba13769924e4ea45a7a451ce"; + sha256 = "0jhy418vaiin7djg9zvk83f8zhasigki4442x5j7gkmgmgmyc4am"; + }; + "config" = fetchgit { + url = "https://chromium.googlesource.com/chromium/src/build/config"; + rev = "df16c6a2c070704b0a25efe46ee9af16de1e65b3"; + sha256 = "1x18syzz1scwhd8lf448hy5lnfpq118l403x9qmwm0np318w09wg"; + }; + "testing/gtest" = fetchgit { + url = "https://chromium.googlesource.com/chromium/testing/gtest"; + rev = "585ec31ea716f08233a815e680fc0d4699843938"; + sha256 = "0csn1cza66851nmxxiw42smsm3422mx67vcyykwn0a71lcjng6rc"; + }; + }; + +in + stdenv.mkDerivation rec { + name = "gn"; + version = "0.0.0.20170629"; + sourceRoot = "."; + + unpackPhase = '' + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (n: v: '' + mkdir -p $sourceRoot/${n} + cp -r ${v}/* $sourceRoot/${n} + '') depsGit)} + ''; + + postPatch = '' + # Patch shebands (for sandbox build) + chmod u+w -R build + patchShebangs build + + # Patch out Chromium-bundled libevent + chmod u+w tools/gn/bootstrap tools/gn/bootstrap/bootstrap.py + sed -i -e '/static_libraries.*libevent/,/^ *\]\?[})]$/d' \ + tools/gn/bootstrap/bootstrap.py + ''; + + NIX_LDFLAGS = "-levent"; + + nativeBuildInputs = [ ninja python ]; + buildInputs = [ libevent ]; + + buildPhase = '' + python tools/gn/bootstrap/bootstrap.py -s + ''; + + installPhase = '' + install -vD out/Release/gn "$out/bin/gn" + ''; + + meta = with stdenv.lib; { + description = "A meta-build system that generates NinjaBuild files"; + homepage = https://chromium.googlesource.com/chromium/src/tools/gn; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.stesie ]; + }; + } diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 114913403577..1c2e726cdc54 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,12 +1,12 @@ { lib, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.42.1"; + version = "0.43.0"; pname = "meson"; name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1phf1xpwm8m85qiiirkqhrf5aigx7ajaw0l59d6lzadf1fmgfx5v"; + sha256 = "0qn5hyzvam3rimn7g3671s1igj7fbkwdnf5nc8jr4d5swy25mq61"; }; postFixup = '' @@ -18,7 +18,11 @@ python3Packages.buildPythonApplication rec { popd ''; - setupHook = ./setup-hook.sh; + postPatch = '' + sed -i -e 's|e.fix_rpath(install_rpath)||' mesonbuild/scripts/meson_install.py + ''; + + setupHook = ./setup-hook.sh; meta = with lib; { homepage = http://mesonbuild.com; diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index 0d9d19c8b939..ed6c7f4fefb6 100644 --- a/pkgs/development/tools/continuous-integration/drone/default.nix +++ b/pkgs/development/tools/continuous-integration/drone/default.nix @@ -53,10 +53,6 @@ buildGoPackage rec { go generate github.com/drone/drone/store/datastore/ddl ''; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/drone - ''; - src = fetchFromGitHub { owner = "drone"; repo = "drone"; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 5c1c586fb901..bcd637699159 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.77"; + version = "2.84"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "1hmj5f14qpq58018q2jmdd4j36v2idsbb9caiakxfy08gppzhz00"; + sha256 = "0pwmviaps4gbv9a3sdn17kqdv9jmh5fpbms1wm95jfj77m5dyyq6"; }; buildCommand = '' diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 9f321ee33097..d5acd487e6b3 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,12 +1,39 @@ { stdenv, makeWrapper, requireFile, unzip, openjdk }: stdenv.mkDerivation rec { - name = "sqldeveloper-4.1.1.19.59"; + version = "17.3.0.271.2323"; + name = "sqldeveloper-${version}"; - src = requireFile { - name = "${name}-no-jre.zip"; + src = requireFile rec { + name = "sqldeveloper-${version}-no-jre.zip"; url = "http://www.oracle.com/technetwork/developer-tools/sql-developer/downloads/"; - sha256 = "1dbbqlz11zps9w5qvzlcv5rdv43s25c3mbzf8il1px4m2j33y3rv"; + message = '' + This Nix expression requires that ${name} already be part of the store. To + obtain it you need to + + - navigate to ${url} + - make sure that it says "Version ${version}" above the list of downloads + - if it does not, click on the "Previous Version" link below the downloads + and repeat until the version is correct. This is necessarry because as the + time of this writing there exists no permanent link for the current version + yet. + Also consider updating this package yourself (you probably just need to + change the `version` variable and update the sha256 to the one of the + new file) or opening an issue at the nixpkgs repo. + - accept the license agreement + - download the file listed under "Other Platforms" + - sign in or create an oracle account if neccessary + + and then add the file to the Nix store using either: + + nix-store --add-fixed sha256 ${name} + + or + + nix-prefetch-url --type sha256 file:///path/to/${name} + ''; + # obtained by `sha256sum sqldeveloper-${version}-no-jre.zip` + sha256 = "06ba5920544bacbea83425548b1b8f69ab3e9bb279076321aece2c0c6d415dad"; }; buildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 506684088343..5f31a2dfb7c6 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, perl, python, libxml2Python, libxslt, which +{ stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which , docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex, gettext, itstool }: stdenv.mkDerivation rec { @@ -10,29 +10,20 @@ stdenv.mkDerivation rec { sha256 = "0hpxcij9xx9ny3gs9p0iz4r8zslw8wqymbyababiyl7603a6x90y"; }; - outputDevdoc = "out"; - - # maybe there is a better way to pass the needed dtd and xsl files - # "-//OASIS//DTD DocBook XML V4.1.2//EN" and "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" - preConfigure = '' - mkdir -p $out/nix-support - cat > $out/nix-support/catalog.xml << EOF - <?xml version="1.0"?> - <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> - <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> - <nextCatalog catalog="${docbook_xsl}/xml/xsl/docbook/catalog.xml" /> - <nextCatalog catalog="${docbook_xml_dtd_43}/xml/dtd/docbook/catalog.xml" /> - </catalog> - EOF + patches = [ + ./respect-xml-catalog-files-var.patch + ]; - configureFlags="--with-xml-catalog=$out/nix-support/catalog.xml --disable-scrollkeeper"; - ''; + outputDevdoc = "out"; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl gnome_doc_utils dblatex gettext which itstool ]; + configureFlags = "--disable-scrollkeeper"; + meta = with stdenv.lib; { homepage = https://www.gtk.org/gtk-doc; description = "Tools to extract documentation embedded in GTK+ and GNOME source code"; diff --git a/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch b/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch new file mode 100644 index 000000000000..78c57306b797 --- /dev/null +++ b/pkgs/development/tools/documentation/gtk-doc/respect-xml-catalog-files-var.patch @@ -0,0 +1,28 @@ +diff --git a/m4/gtkdoc_jh_check_xml_catalog.m4 b/m4/gtkdoc_jh_check_xml_catalog.m4 +index 618c1c9..1842a0d 100644 +--- a/m4/gtkdoc_jh_check_xml_catalog.m4 ++++ b/m4/gtkdoc_jh_check_xml_catalog.m4 +@@ -10,7 +10,21 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], + AC_MSG_RESULT([found]) + ifelse([$3],,,[$3]) + else +- AC_MSG_RESULT([not found]) +- ifelse([$4],,[AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],[$4]) ++ jh_check_xml_catalog_saved_ifs="$IFS" ++ IFS=' ' ++ for f in $XML_CATALOG_FILES; do ++ if [[ -f "$f" ]] && \ ++ AC_RUN_LOG([$XMLCATALOG --noout "$f" "$1" >&2]); then ++ jh_found_xmlcatalog=true ++ AC_MSG_RESULT([found]) ++ ifelse([$3],,,[$3]) ++ break ++ fi ++ done ++ IFS="$jh_check_xml_catalog_saved_ifs" ++ if ! $jh_found_xmlcatalog; then ++ AC_MSG_RESULT([not found]) ++ ifelse([$4],,[AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],[$4]) ++ fi + fi + ]) diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix index 997b1e18fd78..a1c9c11d34d1 100644 --- a/pkgs/development/tools/misc/dbench/default.nix +++ b/pkgs/development/tools/misc/dbench/default.nix @@ -13,10 +13,18 @@ stdenv.mkDerivation rec { preConfigure = '' ./autogen.sh + configureFlagsArray+=("--datadir=$out/share/dbench") ''; postInstall = '' - cp -R loadfiles/ $out/share/ + cp -R loadfiles/* $out/share/dbench/doc/dbench/loadfiles + + # dbench looks here for the file + ln -s doc/dbench/loadfiles/client.txt $out/share/dbench/client.txt + + # backwards compatible to older nixpkgs packaging introduced by + # 3f27be8e5d5861cd4b9487d6c5212d88bf24316d + ln -s dbench/doc/dbench/loadfiles $out/share/loadfiles ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index b7b42b59653a..8328433a823f 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin for d in bin/sqitch etc lib share ; do - ln -s ${sqitchModule}/$d $out/$d + # make sure dest alreay exists before symlink + # this prevents installing a broken link into the path + if [ -e ${sqitchModule}/$d ]; then + ln -s ${sqitchModule}/$d $out/$d + fi done ''; dontStrip = true; diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index 8babfe415dfd..99bf7400088f 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -13,6 +13,9 @@ let param = { "4.05" = { version = "4.05+1"; sha256 = "0wm795hpwvwpib9c9z6p8kw2fh7p7b2hml6g15z8zry3y7w738sv"; }; + "4.06" = { + version = "4.06+1"; + sha256 = "0fazfw2l7wdmbwnqc22xby5n4ri1wz27lw9pfzhsbcdrighykysf"; }; }."${ocaml.meta.branch}"; in diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 5062f53cd71a..b6e439e4e174 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,5 +1,4 @@ -{stdenv, fetchFromGitHub, ocaml, findlib, buildOcaml, type_conv, camlp4, - ocamlmod, ocamlify, ounit, expect}: +{ stdenv, fetchFromGitHub, ocaml, findlib }: let version = "0.11.0"; in diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index b24be7ba6285..74dee630d295 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation rec { name = "ocamlmod-${version}"; - version = "0.0.8"; + version = "0.0.9"; src = fetchurl { - url = "http://forge.ocamlcore.org/frs/download.php/1544/${name}.tar.gz"; - sha256 = "1w0w8lfyymvk300dv13gvhrddpcyknvyp4g2yvq2vaw7khkhjs9g"; + url = "https://forge.ocamlcore.org/frs/download.php/1702/ocamlmod-0.0.9.tar.gz"; + sha256 = "0cgp9qqrq7ayyhddrmqmq1affvfqcn722qiakjq4dkywvp67h4aa"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; + buildInputs = [ ocaml findlib ocamlbuild ounit ]; - configurePhase = "ocaml setup.ml -configure --prefix $out"; + configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; buildPhase = "ocaml setup.ml -build"; installPhase = "ocaml setup.ml -install"; + doCheck = true; + + checkPhase = "ocaml setup.ml -test"; + dontStrip = true; meta = { diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 8912f52ba600..61f5f93ebfaa 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -6,17 +6,17 @@ let allSpecs = { "i686-linux" = { system = "linux32"; - sha256 = "1qi49rcm7r4b8yqx4akmirilp4ifip89n7inji0pihdqzaw604d4"; + sha256 = "13fngjg2v0l3vhlmjnffy785ckgk2kbpm7307li75vinkcly91cj"; }; "x86_64-linux" = { system = "linux64"; - sha256 = "1845nh7kj8scgn85yqwp4nsx7fabcb09w23jp8xa1cxyfvv2wdry"; + sha256 = "0x5vnmnw6mws6iw9s0kcm4crx9gfgy0vjjpk1v0wk7jpn6d0bl47"; }; "x86_64-darwin" = { system = "mac64"; - sha256 = "0zyv8i4dbzyk58g4hr5143akgsfaaq9659bwj1m41jwi965grcxa"; + sha256 = "09y8ijj75q5a7snzchxinxfq2ad2sw0f30zi0p3hqf1n88y28jq6"; }; }; @@ -33,7 +33,7 @@ let in stdenv.mkDerivation rec { name = "chromedriver-${version}"; - version = "2.31"; + version = "2.33"; src = fetchurl { url = "http://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/development/tools/selenium/htmlunit-driver/default.nix index 2fc38db1bb0c..03c3c23c7559 100644 --- a/pkgs/development/tools/selenium/htmlunit-driver/default.nix +++ b/pkgs/development/tools/selenium/htmlunit-driver/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "htmlunit-driver-standalone-${version}"; - version = "2.21"; + version = "2.27"; src = fetchurl { - url = "https://github.com/SeleniumHQ/htmlunit-driver/releases/download/${version}/htmlunit-driver-standalone-${version}.jar"; - sha256 = "1wrbam0hb036717z3y73lsw4pwp5sdiw2i1818kg9pvc7i3fb3yn"; + url = "https://github.com/SeleniumHQ/htmlunit-driver/releases/download/${version}/htmlunit-driver-${version}-with-dependencies.jar"; + sha256 = "1sd3cwpamcbq9pv0mvcm8x6minqrlb4i0r12q3jg91girqswm2dp"; }; unpackPhase = "true"; diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index 6604bc5648d8..c22772149513 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { makeWrapper ${jdk}/bin/java $out/bin/selendroid-selenium \ --add-flags "-Dfile.encoding=UTF-8" \ --add-flags "-cp \"$out/share/lib/selendroid/${name}.jar:${selenium-server-standalone}/share/lib/${selenium-server-standalone.name}/${selenium-server-standalone.name}.jar\"" \ - --add-flags "org.openqa.grid.selenium.GridLauncher" + --add-flags "org.openqa.grid.selenium.GridLauncherV3" ''; meta = { diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index ca225adab6d2..4d506c900ec8 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -4,17 +4,19 @@ with stdenv.lib; let + minorVersion = "3.6"; + patchVersion = "0"; arch = if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.system == "i686-linux" then "i386" else ""; in stdenv.mkDerivation rec { name = "selenium-server-standalone-${version}"; - version = "2.53.0"; + version = "${minorVersion}.${patchVersion}"; src = fetchurl { - url = "http://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-${version}.jar"; - sha256 = "0dp0n5chl1frjy9pcyjvpcdgv1f4dkslh2bpydpxwc5isfzqrf37"; + url = "http://selenium-release.storage.googleapis.com/${minorVersion}/selenium-server-standalone-${version}.jar"; + sha256 = "11v340nm8vzqc2bkmbjfm9a7j4dj0bi9bfk8wdpfan0fb8prf772"; }; unpackPhase = "true"; @@ -25,9 +27,9 @@ in stdenv.mkDerivation rec { mkdir -p $out/share/lib/${name} cp $src $out/share/lib/${name}/${name}.jar makeWrapper ${jre}/bin/java $out/bin/selenium-server \ - --add-flags "-cp ${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar:$out/share/lib/${name}/${name}.jar" \ + --add-flags "-cp $out/share/lib/${name}/${name}.jar:${htmlunit-driver}/share/lib/${htmlunit-driver.name}/${htmlunit-driver.name}.jar" \ --add-flags ${optionalString chromeSupport "-Dwebdriver.chrome.driver=${chromedriver}/bin/chromedriver"} \ - --add-flags "org.openqa.grid.selenium.GridLauncher" + --add-flags "org.openqa.grid.selenium.GridLauncherV3" ''; meta = { diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index bd1dbb3f90a1..eb626d0aa586 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -16,10 +16,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib $bin/bin/textql - ''; - meta = with stdenv.lib; { description = "Execute SQL against structured text like CSV or TSV"; homepage = https://github.com/dinedal/textql; diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index d38c85a5d838..b7b14128048b 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -16,13 +16,16 @@ let }; in stdenv.mkDerivation rec { name = "xcbuild-${version}"; - version = "0.1.1"; + + # Once a version is released that includes https://github.com/facebook/xcbuild/commit/183c087a6484ceaae860c6f7300caf50aea0d710, + # we can stop doing this -pre thing. + version = "0.1.2-pre"; src = fetchFromGitHub { owner = "facebook"; repo = "xcbuild"; - rev = version; - sha256 = "0i98c6lii8r3bgs5gj7div12pxyzjvm4qqzmmzgr7dyhj00qa8r5"; + rev = "32b9fbeb69bfa2682bd0351ec2f14548aaedd554"; + sha256 = "1xxwg2849jizxv0g1hy0b1m3i7iivp9bmc4f5pi76swsn423d41m"; }; prePatch = '' @@ -31,9 +34,6 @@ in stdenv.mkDerivation rec { cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise ''; - # See https://github.com/facebook/xcbuild/issues/238 and remove once that's in - patches = [ ./return-false.patch ]; - # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) '' sed 1i'#include <sys/sysmacros.h>' \ diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index df1e38fb4deb..d0836daf6135 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -102,6 +102,22 @@ let }; } { + Identifier = "com.apple.package-type.static-library"; + Type = "PackageType"; + Name = "Mach-O Static Library"; + DefaultBuildSettings = { + EXECUTABLE_PREFIX = "lib"; + EXECUTABLE_SUFFIX = ".a"; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "archive.ar"; + Name = "$(EXECUTABLE_NAME)"; + IsLaunchable = "NO"; + }; + } + { Identifier = "com.apple.package-type.wrapper"; Type = "PackageType"; Name = "Wrapper"; @@ -172,6 +188,42 @@ let Type = "ProductType"; Name = "Dynamic Library"; PackageTypes = [ "com.apple.package-type.mach-o-dylib" ]; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; + MACH_O_TYPE = "mh_dylib"; + REZ_EXECUTABLE = "YES"; + EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; + EXECUTABLE_EXTENSION = "dylib"; + DYLIB_COMPATIBILITY_VERSION = "1"; + DYLIB_CURRENT_VERSION = "1"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + STRIP_STYLE = "debugging"; + GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; + CODE_SIGNING_ALLOWED = "YES"; + CODE_SIGNING_REQUIRED = "NO"; + }; + } + { + Identifier = "com.apple.product-type.library.static"; + Type = "ProductType"; + Name = "Static Library"; + PackageTypes = [ "com.apple.package-type.static-library" ]; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; + MACH_O_TYPE = "staticlib"; + REZ_EXECUTABLE = "YES"; + EXECUTABLE_PREFIX = "lib"; + EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; + EXECUTABLE_EXTENSION = "a"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + STRIP_STYLE = "debugging"; + SEPARATE_STRIP = "YES"; + CLANG_ENABLE_MODULE_DEBUGGING = "NO"; + }; } { Type = "ProductType"; @@ -211,7 +263,7 @@ let in stdenv.mkDerivation { - name = "nixpkgs.platform"; + name = "MacOSX.platform"; buildInputs = [ xcbuild ]; buildCommand = '' mkdir -p $out/ @@ -228,6 +280,6 @@ stdenv.mkDerivation { mkdir -p $out/Developer/SDKs/ cd $out/Developer/SDKs/ - cp -r ${sdk} nix.nixpkgs.sdk + cp -r ${sdk} ${sdk.name} ''; } diff --git a/pkgs/development/tools/xcbuild/return-false.patch b/pkgs/development/tools/xcbuild/return-false.patch deleted file mode 100644 index 8ec81b5e97ca..000000000000 --- a/pkgs/development/tools/xcbuild/return-false.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Libraries/dependency/Tools/dependency-info-tool.cpp b/Libraries/dependency/Tools/dependency-info-tool.cpp -index 006f53c7..d469f068 100644 ---- a/Libraries/dependency/Tools/dependency-info-tool.cpp -+++ b/Libraries/dependency/Tools/dependency-info-tool.cpp -@@ -271,7 +271,7 @@ main(int argc, char **argv) - */ - std::vector<uint8_t> makefileContents = std::vector<uint8_t>(contents.begin(), contents.end()); - if (!filesystem.write(makefileContents, *options.output())) { -- return false; -+ return -1; - } - - return 0; diff --git a/pkgs/development/tools/xcbuild/sdk.nix b/pkgs/development/tools/xcbuild/sdk.nix index 7d587249bf8e..169fd5f6ec66 100644 --- a/pkgs/development/tools/xcbuild/sdk.nix +++ b/pkgs/development/tools/xcbuild/sdk.nix @@ -19,7 +19,7 @@ let in stdenv.mkDerivation { - name = "nix.nixpkgs.sdk"; + name = "MacOSX.sdk"; buildInputs = [ xcbuild ]; buildCommand = '' mkdir -p $out/ diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index ab6605e91b10..2f6b42e7a00e 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -58,11 +58,14 @@ stdenv.mkDerivation { wrapProgram $out/bin/xcodebuild \ --add-flags "-xcconfig ${xcconfig}" \ --add-flags "DERIVED_DATA_DIR=." \ - --set DEVELOPER_DIR "$out" + --set DEVELOPER_DIR "$out" \ + --set SDKROOT ${sdkName} wrapProgram $out/bin/xcrun \ - --set DEVELOPER_DIR "$out" + --set DEVELOPER_DIR "$out" \ + --set SDKROOT ${sdkName} wrapProgram $out/bin/xcode-select \ - --set DEVELOPER_DIR "$out" + --set DEVELOPER_DIR "$out" \ + --set SDKROOT ${sdkName} ''; inherit (xcbuild) meta; diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix index fda4e9abd456..0e66727ab1df 100644 --- a/pkgs/development/tools/yarn/default.nix +++ b/pkgs/development/tools/yarn/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "yarn-${version}"; - version = "1.0.1"; + version = "1.2.1"; src = fetchzip { url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz"; - sha256 = "1adp5wzxbq5glxbmqfvmjn3vld93mvl65y4bmhjn8clzj7n25piq"; + sha256 = "0jsaszykgmli503jgwdk79qks44krjgjr0qmizh3y7z4lplqdjip"; }; buildInputs = [makeWrapper nodejs]; diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index d7a0a62f5bd6..f795a2ea3a25 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sha256 = "0gmg4ppr4y6ck04mandlp2fmdcyssmck999m012jx5v1rm57g2hn"; }; + hardeningDisable = [ "format" ]; + unpackPhase = '' mkdir src pushd src @@ -22,10 +24,9 @@ stdenv.mkDerivation rec { sourceRoot=`pwd`/src ''; - buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysql - makeWrapper ]; + buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysql makeWrapper ]; - NIX_LDFLAGS="-L${stdenv.lib.getLib libmysql}/lib/mysql"; + NIX_LDFLAGS = "-L${stdenv.lib.getLib libmysql}/lib/mysql"; installPhase = '' mkdir -p $out/bin $out/share/zod diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix index cc9d11f86434..e587151d3e72 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -32,5 +32,6 @@ in stdenv.mkDerivation ({ homepage = http://cdemu.sourceforge.net/; license = licenses.gpl2Plus; platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; [ bendlas ]; }; } // drvParams) diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 7ec83959e38d..d03b18f12d63 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation rec { homepage = http://cdemu.sourceforge.net/about/vhba/; platforms = platforms.linux; licenses = licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ bendlas ]; }; } diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 0f59892cce1e..64bb8b4e356d 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -109,6 +109,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { homepage = http://www.winehq.org/; license = "LGPL"; description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; - maintainers = with stdenv.lib.maintainers; [ avnik raskin ]; + maintainers = with stdenv.lib.maintainers; [ avnik raskin bendlas ]; }; }) diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index caef875ac136..3d7e59f15547 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -113,7 +113,6 @@ appleDerivation rec { install_name_tool \ -id $out/lib/libresolv.9.dylib \ -change "$resolv_libSystem" $out/lib/libSystem.dylib \ - -delete_rpath ${libresolv}/lib \ $out/lib/libresolv.9.dylib ln -s libresolv.9.dylib $out/lib/libresolv.dylib ''; diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index 254b4a231c22..a3d4099399b3 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -1,6 +1,8 @@ -{ stdenv, appleDerivation, fetchurl, xcbuild, libcxx }: +{ stdenv, appleDerivation, fetchurl, xcbuild, ncurses, libutil-new }: appleDerivation { + # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264 + dontUseXcbuild = true; # pkill requires special private headers that are unavailable in # NixPkgs. These ones are needed: @@ -14,7 +16,19 @@ appleDerivation { patchPhase = '' substituteInPlace adv_cmds.xcodeproj/project.pbxproj \ --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" \ - --replace "FDF278D60FC6204E00D7A3C6 /* locale.cc in Sources */," "" + --replace "FDF278D60FC6204E00D7A3C6 /* locale.cc in Sources */," "" \ + --replace '/usr/lib/libtermcap.dylib' 'libncurses.dylib' + ''; + + buildPhase = '' + targets=$(xcodebuild -list \ + | awk '/Targets:/{p=1;print;next} p&&/^\s*$/{p=0};p' \ + | tail -n +2 | sed 's/^[ \t]*//' \ + | grep -v -e Desktop -e Embedded -e mklocale -e colldef) + + for i in $targets; do + xcodebuild -target $i + done ''; # temporary install phase until xcodebuild has "install" support @@ -35,10 +49,7 @@ appleDerivation { # ln -s $out/share/man/man1/pkill.1 $out/share/man/man1/pgrep.1 ''; - buildInputs = [ xcbuild libcxx ]; - - # temporary fix for iostream issue - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + buildInputs = [ xcbuild ncurses libutil-new ]; meta = { platforms = stdenv.lib.platforms.darwin; diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index a8509d1f0095..0e8389948870 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -221,6 +221,7 @@ let libresolv = applePackage "libresolv" "osx-10.11.6" "09flfdi3dlzq0yap32sxidacpc4nn4va7z12a6viip21ix2xb2gf" {}; Libsystem = applePackage "Libsystem" "osx-10.11.6" "1nfkmbqml587v2s1d1y2s2v8nmr577jvk51y6vqrfvsrhdhc2w94" {}; libutil = applePackage "libutil" "osx-10.11.6" "1gmgmcyqdyc684ih7dimdmxdljnq7mzjy5iqbf589wc0pa8h5abm" {}; + libutil-new = applePackage "libutil/new.nix" "osx-10.11.6" "1gmgmcyqdyc684ih7dimdmxdljnq7mzjy5iqbf589wc0pa8h5abm" {}; libunwind = applePackage "libunwind" "osx-10.11.6" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {}; mDNSResponder = applePackage "mDNSResponder" "osx-10.11.6" "069incq28a78yh1bnr17h9cd5if5mwqpq8ahnkyxxx25fkaxgzcf" {}; objc4 = applePackage "objc4" "osx-10.11.6" "00b7vbgxni8frrqyi69b4njjihlwydzjd9zj9x4z5dbx8jabkvrj" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix index 2618b4974f9f..8346ca7a9a76 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix @@ -1,7 +1,7 @@ -{ stdenv, appleDerivation, xcbuild, zlib, bzip2, lzma }: +{ stdenv, appleDerivation, xcbuild, zlib, bzip2, lzma, ncurses, libutil-new }: appleDerivation rec { - buildInputs = [ xcbuild zlib bzip2 lzma ]; + buildInputs = [ xcbuild zlib bzip2 lzma ncurses libutil-new ]; # some commands not working: # mtree: _simple.h not found @@ -11,14 +11,15 @@ appleDerivation rec { substituteInPlace file_cmds.xcodeproj/project.pbxproj \ --replace "FC8A8CAA14B655FD001B97AD /* PBXTargetDependency */," "" \ --replace "FC8A8C9C14B655FD001B97AD /* PBXTargetDependency */," "" \ - --replace "productName = file_cmds;" "" + --replace "productName = file_cmds;" "" \ + --replace '/usr/lib/libcurses.dylib' 'libncurses.dylib' sed -i -re "s/name = ([a-zA-Z]+);/name = \1; productName = \1;/" file_cmds.xcodeproj/project.pbxproj ''; # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install file_cmds-*/Build/Products/Release/* $out/bin/ + install file_cmds-*/Build/Products/Release/* $out/bin for n in 1; do mkdir -p $out/share/man/man$n diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix new file mode 100644 index 000000000000..860a74f61f7f --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix @@ -0,0 +1,33 @@ +{ stdenv, appleDerivation, xcbuild }: + +# TODO: make this the official libutil expression once we've integrated xcbuild in the bootstrap +appleDerivation { + buildInputs = [ xcbuild ]; + + dontUseXcbuild = true; + + prePatch = '' + substituteInPlace tzlink.c \ + --replace '#include <xpc/xpc.h>' "" + ''; + + buildPhase = '' + xcodebuild -target util + ''; + + installPhase = '' + mkdir -p $out/lib $out/include + + cp libutil-*/Build/Products/Release/*.dylib $out/lib + cp libutil-*/Build/Products/Release/*.h $out/include + + # TODO: figure out how to get this to be right the first time around + install_name_tool -id $out/lib/libutil.dylib $out/lib/libutil.dylib + ''; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ copumpkin ]; + platforms = platforms.darwin; + license = licenses.apsl20; + }; +} diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index 562a46d22109..b8b08430de86 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "android-udev-rules-${version}"; - version = "20170612"; + version = "20171014"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "14x22d00zby6wsjaccyh7n8jq1mqzwpx49s85mhmaahbrfd5jwnw"; + sha256 = "15mqngwv7x2xpdsaiga33lb0s9hcrhnambcv9fp6jvgkf6604cdr"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index c09fc0f7dc41..8aa1cec9e12f 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -80,10 +80,6 @@ stdenv.mkDerivation rec { # Drop examples, since they contain non-ASCII characters that break docbook2x :( sed -i 's/ Example: .*$//' doc/config_settings.xml - substituteInPlace cmake/Docbook.cmake \ - --replace "http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl" "${docbook_xsl}/xml/xsl/docbook/html/docbook.xsl" - substituteInPlace doc/docs.xml \ - --replace "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" "${docbook_xml_dtd_44}/xml/dtd/docbook/docbookx.dtd" substituteInPlace cmake/Conky.cmake --replace "#set(RELEASE true)" "set(RELEASE true)" ''; @@ -91,7 +87,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib cmake libXinerama ] - ++ optionals docsSupport [ docbook2x libxslt man less ] + ++ optionals docsSupport [ docbook2x docbook_xsl docbook_xml_dtd_44 libxslt man less ] ++ optional ncursesSupport ncurses ++ optional x11Support xlibsWrapper ++ optional xdamageSupport libXdamage diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 20b64907c22b..6f14e713139a 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -12,14 +12,13 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig docbook_xsl ]; buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap python ]; patchPhase = '' chmod +w ./scripts/gen-offsets.sh substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" "" - substituteInPlace ./Documentation/Makefile --replace "--skip-validation" "--skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl" substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3" substituteInPlace ./Makefile --replace "tar-name := $(shell git tag -l v$(CRIU_VERSION))" "tar-name = 2.0" # --replace "-Werror" "" ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 75c06390f755..3744c28e204f 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -97,11 +97,6 @@ ${optionalString (versionAtLeast version "4.11") '' GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin ''} -${optionalString (versionAtLeast version "4.13") '' - GCC_PLUGIN_RANDSTRUCT y # A port of the PaX randstruct plugin - GCC_PLUGIN_RANDSTRUCT_PERFORMANCE y -''} - # Disable various dangerous settings ACPI_CUSTOM_METHOD n # Allows writing directly to physical memory PROC_KCORE n # Exposes kernel text image layout diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index 043a39ec95a4..d54586c5f4f5 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13.5"; + version = "4.13.7"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1qi5zxby5qwdv0485gia2jz38dly4ncn10zi3grcckwxc3d5ms59"; + sha256 = "16vjjl3qw0a8ci6xbnywhb8bpr3ccbs0i6xa54lc094cd5gvx4v3"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index d897e6097831..b820b6a917b4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.54"; + version = "4.9.56"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1i8g44d3mq7c24mn6b5w59d2z3fxjzbfn5blc36lzkpvdvdha435"; + sha256 = "1jnkf0ir42xkandx1lnqrxmskzwl6j46aqmzrxilddx9pkdjplhi"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index d141d7f4211c..35222f207962 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.13.5"; + version = "4.13.7"; revision = "a"; - sha256 = "139qa6iyyjwn81v6z66ry1sifdvkbnql45m740djc0gv37il7mzv"; + sha256 = "1ddhjj77pslivy6ngkqn020z08n5nvq8p261hz14sgp8h69v30is"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index fb51760ec16a..304455003763 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.14-rc3"; - modDirVersion = "4.14.0-rc3"; + version = "4.14-rc4"; + modDirVersion = "4.14.0-rc4"; extraMeta.branch = "4.14"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "049x4fpcj8d6577lhzrns7w36mj21pfr4ijw01r0l6n3w86z28b7"; + sha256 = "1n9jni7sdawhjnlpl1g3rw89ggfi8d6s088wv1h21cnmsav911ik"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 728e7034a199..d2ad5d0bd8e8 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -21,10 +21,6 @@ buildGoPackage rec { buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=") ''; - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib $bin/bin/consul - ''; - meta = with stdenv.lib; { description = "Tool for service discovery, monitoring and configuration"; homepage = https://www.consul.io/; diff --git a/pkgs/servers/dgraph/default.nix b/pkgs/servers/dgraph/default.nix index 06aef0babd39..5056df06e598 100644 --- a/pkgs/servers/dgraph/default.nix +++ b/pkgs/servers/dgraph/default.nix @@ -31,14 +31,6 @@ buildGoPackage rec { -X github.com/dgraph-io/dgraph/cmd/dgraph/main.uiDir=$dashboard/src/assets/" ''; - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' - # Somehow on Darwin, $out/lib (which doesn't exist) ends up in RPATH. - # Removing it fixes cycle between $out and $bin - install_name_tool -delete_rpath $out/lib $bin/bin/dgraph - install_name_tool -delete_rpath $out/lib $bin/bin/dgraphloader - install_name_tool -delete_rpath $out/lib $bin/bin/bulkloader - ''; - meta = { homepage = "https://dgraph.io/"; description = "Fast, Distributed Graph DB"; diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 5ec0c7d4da5e..0eb8979c3ac4 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.13.5"; - sha256 = "0blzna6h76xd7ddz37yb7yqg4yx7gpwsz8zbg8vlbxxk552bjx8f"; + version = "1.13.6"; + sha256 = "1y7qcdpjskjc1iwwrjqsbgm74jpnf873pwv17clsy83ak1pzq4l5"; }) diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 611543ee87e2..2d2fb26324c4 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -14,10 +14,6 @@ buildGoPackage rec { sha256 = "0rm43jjqv7crfahl973swi4warqmqnmv740cg800yvzvnlp37kl4"; }; - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib $bin/bin/node_exporter - ''; - # FIXME: megacli test fails doCheck = false; diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index 572cfe1f17d6..e6bf634b554c 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, fetchpatch, mono, v8 }: +{ stdenv, fetchFromGitHub, fetchpatch, git, mono, v8 }: # There are some similarities with the pinta derivation. We should # have a helper to make it easy to package these Mono apps. stdenv.mkDerivation rec { name = "EventStore-${version}"; - version = "3.5.0"; + version = "4.0.3"; src = fetchFromGitHub { owner = "EventStore"; repo = "EventStore"; rev = "oss-v${version}"; - sha256 = "0dp5914hxwdzw62q49wavqfqkw3jy0dvml09y7gh8frnbiajcxq9"; + sha256 = "1905bnqyyiqprva67cp49rgib324iipw2l71jzj0ynzi7kxr4mgg"; }; buildPhase = '' @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/clusternode ''; + nativeBuildInputs = [ git ]; buildInputs = [ v8 mono ]; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 317466897194..fa944f5fd26d 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.9.2.4285"; - vsnHash = "9f65b88ae"; - sha256 = "0rz53kb4r32s734jhb3n65dcmb0mylhb6wcqinp0dg8w39ncv571"; + version = "1.9.5.4339"; + vsnHash = "46276db8d"; + sha256 = "09zc2wfpvan2j9h88x1f57lpfiqvml2m5m2azhphi4hb31sd3hch"; }; in stdenv.mkDerivation rec { diff --git a/pkgs/servers/sql/postgresql/plv8/default.nix b/pkgs/servers/sql/postgresql/plv8/default.nix index 158633735623..009f65b9d81c 100644 --- a/pkgs/servers/sql/postgresql/plv8/default.nix +++ b/pkgs/servers/sql/postgresql/plv8/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "plv8-${version}"; - version = "2.0.3"; + version = "2.1.0"; nativeBuildInputs = [ perl ]; buildInputs = [ v8 postgresql ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "plv8"; repo = "plv8"; rev = "v${version}"; - sha256 = "0cn7ynckmdb08dkzjilvc55xz61d1jiya7yrnphizw404j84y3qc"; + sha256 = "1sfpxz0zcbinn6822j12lkwgrw9kfacrs83ic968rm489rl9w241"; }; preConfigure = '' diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 08a9637308cb..d0cd8f8085a4 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "5.6.16"; + version = "5.6.18"; src = fetchurl { - url = "https://www.ubnt.com/downloads/unifi/${version}-86cdeea491/unifi_sysvinit_all.deb"; - sha256 = "1kfrawf48q9rx48hcnmiqndbg84v340yfykh23af7xpcxmzl5jy7"; + url = "https://www.ubnt.com/downloads/unifi/${version}-8261dc5066/unifi_sysvinit_all.deb"; + sha256 = "1xcnfmxwzij9qs9l71d3zkmq6q3ci80a8xbmfckb0gz08cvrw5k1"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/servers/web-apps/piwik/default.nix b/pkgs/servers/web-apps/piwik/default.nix index 091391166d7b..e5d6876ecbf5 100644 --- a/pkgs/servers/web-apps/piwik/default.nix +++ b/pkgs/servers/web-apps/piwik/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "piwik-${version}"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { url = "https://builds.piwik.org/${name}.tar.gz"; - sha512 = "2mqzk12959j9xqb9cqz8np35zcs1313zjx9pikbjw9z9mfcqgv0ccvrnl2ymmwll333drr9qaxs54n0mkk66xbhz04nmzmib0kp9k8h"; + sha512 = "21hss97mms5vavfzw41v2p3qsxx0ar8xa3dnr4d2fw2mps8jg3s5ng9i725lqrbl96q7855fh9ymabjsi1zr4q9nif2yap0izaakxib"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 786192f6a0ae..b2b238997b9d 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -860,11 +860,11 @@ let }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;}; libXfont2 = (mkDerivation "libXfont2" { - name = "libXfont2-2.0.1"; + name = "libXfont2-2.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2; - sha256 = "0znvwk36nhmyqpmhbm9mzisgixp1mp5qkfald8x1n5yxbm3vpyz9"; + url = mirror://xorg/individual/lib/libXfont2-2.0.2.tar.bz2; + sha256 = "04f1lswh1ridkycgaivf1hrr77l5ap8smbfr2rqjrm7phwxqs24l"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libfontenc fontsproto freetype xproto xtrans zlib ]; @@ -980,11 +980,11 @@ let }) // {inherit renderproto libX11 xproto ;}; libXres = (mkDerivation "libXres" { - name = "libXres-1.0.7"; + name = "libXres-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2; - sha256 = "1rd0bzn67cpb2qkc946gch2183r4bdjfhs6cpqbipy47m9a91296"; + url = mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2; + sha256 = "1m0jr0lbz9ixpp9ihk68349q0i7ry2379lnfzdy4mrl86ijc2xgz"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ resourceproto libX11 libXext xextproto xproto ]; @@ -2456,11 +2456,11 @@ let }) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkeyboardconfig = (mkDerivation "xkeyboardconfig" { - name = "xkeyboard-config-2.21"; + name = "xkeyboard-config-2.22"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.21.tar.bz2; - sha256 = "1iffxpchy6dfgbby23nfsqqk17h9lfddlmjnhwagqag1z94p1h9h"; + url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.22.tar.bz2; + sha256 = "1garmbyfjp0han04l2l90zzwlfbdgdxl6r1qnic36i5wkycckbny"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 xproto ]; @@ -2576,11 +2576,11 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.19.4"; + name = "xorg-server-1.19.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.19.4.tar.bz2; - sha256 = "1a690fzv5l5ks45g9zhlzdskdq8q73mcbpb9a3wz3shxm778lxda"; + url = mirror://xorg/individual/xserver/xorg-server-1.19.5.tar.bz2; + sha256 = "0iql4pgsgpyqcrd3256pv227cdadvz01ych61n0d41ixp67gmzqq"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index c3665667107f..c27f6a29e9c0 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -315,11 +315,11 @@ in installFlags = "sdkdir=\${out}/include/xorg"; }; - xf86inputlibinput = attrs: attrs // { - name = "xf86-input-libinput-0.25.1"; + xf86inputlibinput = attrs: attrs // rec { + name = "xf86-input-libinput-0.26.0"; src = args.fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.25.1.tar.bz2; - sha256 = "1q67hjd67ni1nq7kgxdrrdgkyhzaqvvn2vlnsiiq9w4y3icpv7s8"; + url = "mirror://xorg/individual/driver/${name}.tar.bz2"; + sha256 = "0yrqs88b7yn9nljwlxzn76jfmvf0sh939kzij5b2jvr2qa7mbjmb"; }; buildInputs = attrs.buildInputs ++ [ args.libinput ]; installFlags = "sdkdir=\${out}/include/xorg"; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 6cd4e082e8df..42cee12843c2 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -69,7 +69,7 @@ mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2 -mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2 +mirror://xorg/individual/lib/libXfont2-2.0.2.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.9.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 @@ -79,7 +79,7 @@ mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2 mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2 mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2 mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2 -mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2 +mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2 mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2 mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2 @@ -177,7 +177,7 @@ mirror://xorg/individual/app/xinput-1.6.2.tar.bz2 mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.21.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.22.tar.bz2 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 @@ -185,7 +185,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.19.4.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.19.5.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 8a7d49710125..a598d57808c4 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -4,10 +4,6 @@ buildGoPackage rec { name = "elvish-${version}"; version = "0.10"; - postInstall = stdenv.lib.optionalString (stdenv.isDarwin) '' - install_name_tool -delete_rpath $out/lib $bin/bin/elvish - ''; - goPackagePath = "github.com/elves/elvish"; src = fetchFromGitHub { diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 31de28fdc0c2..d5885193b9bc 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -81,7 +81,20 @@ let setup = setupScript; - inherit preHook initialPath shell + # We pretty much never need rpaths on Darwin, since all library path references + # are absolute unless we go out of our way to make them relative (like with CF) + # TODO: This really wants to be in stdenv/darwin but we don't have hostPlatform + # there (yet?) so it goes here until then. + preHook = preHook+ lib.optionalString buildPlatform.isDarwin '' + export NIX_BUILD_DONT_SET_RPATH=1 + '' + lib.optionalString hostPlatform.isDarwin '' + export NIX_DONT_SET_RPATH=1 + export NIX_NO_SELF_RPATH=1 + '' + lib.optionalString targetPlatform.isDarwin '' + export NIX_TARGET_DONT_SET_RPATH=1 + ''; + + inherit initialPath shell defaultNativeBuildInputs defaultBuildInputs; } // lib.optionalAttrs buildPlatform.isDarwin { diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix index dffef09a5d4a..ec7febaa5985 100644 --- a/pkgs/tools/admin/awslogs/default.nix +++ b/pkgs/tools/admin/awslogs/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "awslogs-${version}"; - version = "0.7"; + version = "0.10"; src = fetchFromGitHub { owner = "jorgebastida"; repo = "awslogs"; rev = "${version}"; - sha256 = "0dqf26h595l1fcnagxi8zsdarsxg3smsihxaqrvnki8fshhfdqsm"; + sha256 = "18s3xxdhhbz96mgj9ipgyrdcax3p9gy8gpmr0rblw8g0grj31dsp"; }; doCheck = false; diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix index 27891614f4b2..4024ab9b91f2 100644 --- a/pkgs/tools/admin/intecture/agent.nix +++ b/pkgs/tools/admin/intecture/agent.nix @@ -5,16 +5,16 @@ with rustPlatform; buildRustPackage rec { name = "intecture-agent-${version}"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "intecture"; repo = "agent"; rev = version; - sha256 = "0b59ij9c7hv2p4jx96f3acbygw27wiv8cfzzg6sg73l6k244k6l6"; + sha256 = "0j27qdgyxybaixggh7k57mpm6rifimn4z2vydk463msc8b3kgywj"; }; - depsSha256 = "1f94j54pg94f2x2lmmyj8dlki8plq6vnppmf3hzk3kd0rp7fzban"; + depsSha256 = "1n57i9wkak76ram748mwq0dn32d041ajd31laqc13c76pp29agrp"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix index 88ef137d841c..c4678c8d4b77 100644 --- a/pkgs/tools/admin/intecture/auth.nix +++ b/pkgs/tools/admin/intecture/auth.nix @@ -5,16 +5,16 @@ with rustPlatform; buildRustPackage rec { name = "intecture-auth-${version}"; - version = "0.1.0"; + version = "0.1.2"; src = fetchFromGitHub { owner = "intecture"; repo = "auth"; rev = version; - sha256 = "1p3jahha8k139f22ijg050cl8akfzxda4gzvijpqv869hmhc70py"; + sha256 = "0c7ar3pc7n59lzfy74lwz51p09s2bglc870rfr4c0vmc91jl0pj2"; }; - depsSha256 = "0mki57yzb29y9fhh16xvpi5gfp6c14r5q3f45f3v8sdj95rjahz1"; + depsSha256 = "0wzr8hk63gh3nm8f7dbzwj8pgc3cm8p8mr2q7bbgvri1a5i83sfb"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix index 0f530f636d78..e98b62bd0ea7 100644 --- a/pkgs/tools/admin/intecture/cli.nix +++ b/pkgs/tools/admin/intecture/cli.nix @@ -5,16 +5,16 @@ with rustPlatform; buildRustPackage rec { name = "intecture-cli-${version}"; - version = "0.3.2"; + version = "0.3.4"; src = fetchFromGitHub { owner = "intecture"; repo = "cli"; rev = version; - sha256 = "0f5pyrlkxzz4kdfzwambxzqr48g3n06f1pv163h06ggssqa51wbc"; + sha256 = "16a5fkpyqkf8w20k3ircc1d0qmif7nygkzxj6mzk9609dlb0dmxq"; }; - depsSha256 = "0f3rhjs5addppva4cjx3ngpa5gz2i2n46hyc3zd4l7lhh8gaggix"; + depsSha256 = "0nax7h7f5qgalgxsfidrxrv1ybl5xvrpc1k7xc1kmaf955gqmc46"; buildInputs = [ openssl zeromq czmq zlib ]; diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 5afe14209f64..b50564602256 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -8,12 +8,12 @@ python2Packages.buildPythonApplication rec { pname = "salt"; - version = "2017.7.1"; + version = "2017.7.2"; name = "${pname}-${version}"; src = python2Packages.fetchPypi { inherit pname version; - sha256 = "079kymgxyzhf47dd42l7f42jp45gx5im4k3g31bj25p1s0aq91py"; + sha256 = "0h18zwp1w90rgxpmqgrmn9wp31h03f0vak8lpnnbh0dzbbgcffzz"; }; propagatedBuildInputs = with python2Packages; [ diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 563b21c76d8d..9aedda83fd2c 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unrar-${version}"; - version = "5.5.7"; + version = "5.5.8"; src = fetchurl { - url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "13rd69ss6jqsa6yxr8kmgs84kb67k822d2mbiz29m75zj46hmvwa"; + url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; + sha256 = "1x7wnb6zgs09v2bf5xaqz14daba8k7zikadj1qabqi4r78sy8rlv"; }; postPatch = '' diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 19495b6e1df6..4ff61d1ac954 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -2,18 +2,18 @@ python3Packages.buildPythonApplication rec { name = "borgbackup-${version}"; - version = "1.0.11"; + version = "1.1.0"; namePrefix = ""; src = fetchurl { url = "https://github.com/borgbackup/borg/releases/download/" + "${version}/${name}.tar.gz"; - sha256 = "14fjk5dfwmjkn7nmkbhhbrk3g1wfrn8arvqd5r9jaij534nzsvpw"; + sha256 = "0vwyg0b4kxb0rspqwhvgi5c78dzimgkydf03wif27a40qhh1235l"; }; nativeBuildInputs = with python3Packages; [ # For building documentation: - sphinx sphinx_rtd_theme + sphinx guzzle_sphinx_theme ]; buildInputs = [ acl lz4 openssl python3Packages.setuptools_scm diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix new file mode 100644 index 000000000000..0469ad54eb13 --- /dev/null +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -0,0 +1,79 @@ +{ stdenv, fetchFromGitHub +, cmake, pkgconfig, coreutils +, boost, cryptopp, curl, fuse, openssl, python, spdlog +}: + +stdenv.mkDerivation rec { + name = "cryfs-${version}"; + version = "0.9.7"; + + src = fetchFromGitHub { + owner = "cryfs"; + repo = "cryfs"; + rev = "${version}"; + sha256 = "1wsv4cyjkyg3cyr6vipw1mj41bln2m69123l3miav8r4mvmkfq8w"; + }; + + prePatch = '' + patchShebangs src + + substituteInPlace vendor/scrypt/CMakeLists.txt \ + --replace /usr/bin/ "" + + # scrypt in nixpkgs only produces a binary so we lift the patching from that so allow + # building the vendored version. This is very much NOT DRY. + # The proper solution is to have scrypt generate a dev output with the required files and just symlink + # into vendor/scrypt + for f in Makefile.in autocrap/Makefile.am libcperciva/cpusupport/Build/cpusupport.sh ; do + substituteInPlace vendor/scrypt/scrypt-*/scrypt/$f --replace "command -p " "" + done + + # cryfs is vendoring an old version of spdlog + rm -rf vendor/spdlog/spdlog + ln -s ${spdlog} vendor/spdlog/spdlog + ''; + + buildInputs = [ boost cryptopp curl fuse openssl python spdlog ]; + + patches = [ + ./test-no-network.patch # Disable tests using external networking + ./skip-failing-test-large-malloc.patch + ]; + + # coreutils is needed for the vendored scrypt + nativeBuildInputs = [ cmake coreutils pkgconfig ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DCRYFS_UPDATE_CHECKS=OFF" + "-DBoost_USE_STATIC_LIBS=OFF" # this option is case sensitive + "-DBUILD_TESTING=ON" + ]; + + doCheck = true; + + # Cryfs tests are broken on darwin + checkPhase = stdenv.lib.optionalString (!stdenv.isDarwin) '' + # Skip CMakeFiles directory and tests depending on fuse (does not work well with sandboxing) + SKIP_IMPURE_TESTS="CMakeFiles|fspp|cryfs-cli" + + for test in `ls -d test/*/ | egrep -v "$SKIP_IMPURE_TESTS"`; do + "./$test`basename $test`-test" + done + ''; + + installPhase = '' + # Building with BUILD_TESTING=ON is missing the install target + mkdir -p $out/bin + install -m 755 ./src/cryfs-cli/cryfs $out/bin/cryfs + ''; + + meta = with stdenv.lib; { + description = "Cryptographic filesystem for the cloud"; + homepage = https://www.cryfs.org; + license = licenses.lgpl3; + maintainers = with maintainers; [ peterhoeg ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/tools/filesystems/cryfs/skip-failing-test-large-malloc.patch b/pkgs/tools/filesystems/cryfs/skip-failing-test-large-malloc.patch new file mode 100644 index 000000000000..feb0ed9cfbb9 --- /dev/null +++ b/pkgs/tools/filesystems/cryfs/skip-failing-test-large-malloc.patch @@ -0,0 +1,34 @@ +From ad3f7e9fa2dececfaab43963887a2f03de52d659 Mon Sep 17 00:00:00 2001 +From: adisbladis <adis@blad.is> +Date: Thu, 12 Oct 2017 21:45:26 +0800 +Subject: [PATCH] Skip failing test: large malloc + +--- + test/cpp-utils/data/DataTest.cpp | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/test/cpp-utils/data/DataTest.cpp b/test/cpp-utils/data/DataTest.cpp +index 6f9df070..bd426e62 100644 +--- a/test/cpp-utils/data/DataTest.cpp ++++ b/test/cpp-utils/data/DataTest.cpp +@@ -191,17 +191,6 @@ TEST_F(DataTest, Inequality_DifferentLastByte) { + EXPECT_TRUE(data1 != data2); + } + +-#ifdef __x86_64__ +-TEST_F(DataTest, LargesizeSize) { +- //Needs 64bit for representation. This value isn't in the size param list, because the list is also used for read/write checks. +- uint64_t size = 4.5L*1024*1024*1024; +- Data data(size); +- EXPECT_EQ(size, data.size()); +-} +-#else +-#warning This is not a 64bit architecture. Large size data tests are disabled. +-#endif +- + TEST_F(DataTest, LoadingNonexistingFile) { + TempFile file(false); // Pass false to constructor, so the tempfile is not created + EXPECT_FALSE(Data::LoadFromFile(file.path())); +-- +2.14.2 + diff --git a/pkgs/tools/filesystems/cryfs/test-no-network.patch b/pkgs/tools/filesystems/cryfs/test-no-network.patch new file mode 100644 index 000000000000..3392d3f855ec --- /dev/null +++ b/pkgs/tools/filesystems/cryfs/test-no-network.patch @@ -0,0 +1,24 @@ +From 8b1808e1278d2cb0dc56a4e98781eceeadfb9718 Mon Sep 17 00:00:00 2001 +From: adisbladis <adis@blad.is> +Date: Thu, 12 Oct 2017 18:13:28 +0800 +Subject: [PATCH] Disable tests using external networking + +--- + test/cpp-utils/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/test/cpp-utils/CMakeLists.txt b/test/cpp-utils/CMakeLists.txt +index 5a2bc9f8..d838edba 100644 +--- a/test/cpp-utils/CMakeLists.txt ++++ b/test/cpp-utils/CMakeLists.txt +@@ -20,7 +20,6 @@ set(SOURCES + tempfile/TempFileIncludeTest.cpp + tempfile/TempDirIncludeTest.cpp + tempfile/TempDirTest.cpp +- network/CurlHttpClientTest.cpp + network/FakeHttpClientTest.cpp + io/ConsoleIncludeTest.cpp + io/ConsoleTest_AskYesNo.cpp +-- +2.14.2 + diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index fdad877d34cf..53b17f45f9f4 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "f2fs-tools-${version}"; - version = "1.8.0"; + version = "1.9.0"; src = fetchgit { url = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; rev = "refs/tags/v${version}"; - sha256 = "0mbpg6mng6jcm5vxq0ivhklgpkwvjbhjwgkhzxr50ln46h5kbd2f"; + sha256 = "0aj9dbhv7vv19pyb2rhcg99v5v0s66sb9yzrdmi46bmvzz124pal"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index f46dd74b2660..028aef6024b1 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -16,9 +16,5 @@ buildGoPackage rec { sha256 = "1jcqp9n8fd9psfsnhfj6w97yp0zmyxplsig8pyp2gqzh4lnb5fqm"; }; - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath "$out/lib" $bin/bin/go-mtpfs - ''; - goDeps = ./deps.nix; } diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix index 9c5412ddef7c..c7267aca1071 100644 --- a/pkgs/tools/filesystems/irods/common.nix +++ b/pkgs/tools/filesystems/irods/common.nix @@ -9,8 +9,6 @@ with stdenv; buildInputs = [ bzip2 zlib autoconf automake cmake gnumake help2man texinfo libtool cppzmq libarchive avro-cpp jansson zeromq openssl pam libiodbc kerberos gcc boost libcxx which ]; - propagateBuildInputs = [ boost ]; - cmakeFlags = [ "-DIRODS_EXTERNALS_FULLPATH_CLANG=${stdenv.cc}" "-DIRODS_EXTERNALS_FULLPATH_CLANG_RUNTIME=${stdenv.cc}" diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix index 0714f2901046..523028f5fb2e 100644 --- a/pkgs/tools/filesystems/irods/default.nix +++ b/pkgs/tools/filesystems/irods/default.nix @@ -62,8 +62,6 @@ in rec { buildInputs = common.buildInputs ++ [ irods ]; - propagateBuildInputs = [ boost ]; - preConfigure = common.preConfigure + '' patchShebangs ./bin ''; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index 8c842dbc841e..8c552799432b 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - dconf gtk3 gobjectIntrospection ibus python3 + dconf gtk3 gobjectIntrospection ibus (python3.withPackages (pypkgs: with pypkgs; [ pygobject3 ])) ]; nativeBuildInputs = [ autoreconfHook docbook2x pkgconfig python3.pkgs.wrapPython ]; diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index cfad499a432b..f36a6d51b360 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -25,8 +25,6 @@ buildGoPackage rec { make install DESTDIR=$bin mkdir -p $bin/share/fish/vendor_conf.d echo "eval ($bin/bin/direnv hook fish)" > $bin/share/fish/vendor_conf.d/direnv.fish - '' + stdenv.lib.optionalString (stdenv.isDarwin) '' - install_name_tool -delete_rpath $out/lib $bin/bin/direnv ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 80fb3c6a694c..0d1c81c00a65 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for automating interactive applications"; - homepage = http://expect.nist.gov/; + homepage = http://expect.sourceforge.net/; license = "Expect"; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 4b76b85287a5..e0367dc915d3 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fzf-${version}"; - version = "0.17.0"; + version = "0.17.0-2"; rev = "${version}"; goPackagePath = "github.com/junegunn/fzf"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "junegunn"; repo = "fzf"; - sha256 = "0cj9vvrsrxj7752fxww1bkflz9rap0n4hhwd6shs0qbss1awwqk9"; + sha256 = "0j4m3xf6qxfymfq6y5ml5rgz2rr1glh54k3b5xa9zi4cl5wg43qv"; }; outputs = [ "bin" "out" "man" ]; diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index 1de87e07e049..e3a147b20b17 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -9,9 +9,7 @@ buildGoPackage rec { nativeBuildInputs = [ makeWrapper ]; - postInstall = stdenv.lib.optionalString (stdenv.isDarwin) '' - install_name_tool -delete_rpath $out/lib $bin/bin/assh - '' + '' + postInstall = '' wrapProgram "$bin/bin/assh" \ --prefix PATH : ${openssh}/bin ''; diff --git a/pkgs/tools/networking/djbdns/default.nix b/pkgs/tools/networking/djbdns/default.nix index 7537ab1c47ac..b8a7133e7bc7 100644 --- a/pkgs/tools/networking/djbdns/default.nix +++ b/pkgs/tools/networking/djbdns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibc } : +{ stdenv, fetchurl, glibc, dns-root-data } : let version = "1.05"; @@ -18,11 +18,13 @@ stdenv.mkDerivation { sha256 = "0j3baf92vkczr5fxww7rp1b7gmczxmmgrqc8w2dy7kgk09m85k9w"; }; - patches = [ ./hier.patch ]; + patches = [ ./hier.patch ./fix-nix-usernamespace-build.patch ]; postPatch = '' echo gcc -O2 -include ${glibc.dev}/include/errno.h > conf-cc echo $out > conf-home + # djbdns ships with an outdated list of root servers + awk '/^.?.ROOT-SERVERS.NET/ { print $4 }' ${dns-root-data}/root.hints > dnsroots.global sed -i "s|/etc/dnsroots.global|$out/etc/dnsroots.global|" dnscache-conf.c ''; @@ -45,4 +47,4 @@ stdenv.mkDerivation { license = licenses.publicDomain; maintainers = with maintainers; [ jerith666 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch b/pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch new file mode 100644 index 000000000000..abd9e756a21f --- /dev/null +++ b/pkgs/tools/networking/djbdns/fix-nix-usernamespace-build.patch @@ -0,0 +1,10 @@ +--- djbdns-1.05.org/chkshsgr.c 2001-02-11 21:11:45.000000000 +0000 ++++ djbdns-1.05/chkshsgr.c 2017-10-13 10:06:09.392578927 +0100 +@@ -2,6 +2,7 @@ + + int main() + { ++ return 0; + short x[4]; + + x[0] = x[1] = 0; diff --git a/pkgs/tools/networking/fastd/default.nix b/pkgs/tools/networking/fastd/default.nix index 3a99adb4a9ef..ef356935c56a 100644 --- a/pkgs/tools/networking/fastd/default.nix +++ b/pkgs/tools/networking/fastd/default.nix @@ -11,6 +11,11 @@ stdenv.mkDerivation rec { sha256 = "0c9v3igv3812b3jr7jk75a2np658yy00b3i4kpbpdjgvqzc1jrq8"; }; + postPatch = '' + substituteInPlace src/crypto/cipher/CMakeLists.txt \ + --replace 'add_subdirectory(aes128_ctr)' "" + ''; + nativeBuildInputs = [ pkgconfig bison cmake ]; buildInputs = [ libuecc libsodium libcap json_c ]; diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index b445dd93c4c0..ef50c0ce0847 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -2,7 +2,6 @@ pythonPackages.buildPythonApplication rec { name = "httpie-0.9.9"; - namePrefix = ""; src = fetchurl { url = "mirror://pypi/h/httpie/${name}.tar.gz"; diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix new file mode 100644 index 000000000000..97780d546e43 --- /dev/null +++ b/pkgs/tools/networking/pykms/default.nix @@ -0,0 +1,82 @@ +{ stdenv, fetchFromGitHub, python2Packages, writeText, writeScript +, coreutils, sqlite }: + +let + dbSql = writeText "create_pykms_db.sql" '' + CREATE TABLE clients( + clientMachineId TEXT, + machineName TEXT, + applicationId TEXT, + skuId TEXT, + licenseStatus TEXT, + lastRequestTime INTEGER, + kmsEpid TEXT, + requestCount INTEGER + ); + ''; + + dbScript = writeScript "create_pykms_db.sh" (with stdenv.lib; '' + #!${stdenv.shell} -eu + + db=$1 + + ${getBin coreutils}/bin/install -d $(dirname $db) + + if [ ! -e $db ] ; then + ${getBin sqlite}/bin/sqlite3 $db < ${dbSql} + fi + ''); + +in python2Packages.buildPythonApplication rec { + name = "pykms-${version}"; + version = "20170719"; + + src = fetchFromGitHub { + owner = "ThunderEX"; + repo = "py-kms"; + rev = "27355d88affd740330174a7c2bae9f50b9efce56"; + sha256 = "0cpywj73jmyijjc5hs3b00argjsdwpqzmhawbxkx3mc2l4sgzc88"; + }; + + propagatedBuildInputs = with python2Packages; [ argparse pytz ]; + + prePatch = '' + siteDir=$out/${python2Packages.python.sitePackages} + + substituteInPlace kmsBase.py \ + --replace "'KmsDataBase.xml'" "'$siteDir/KmsDataBase.xml'" + ''; + + dontBuild = true; + + # there are no tests + doCheck = false; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/doc/pykms} $siteDir + + mv * $siteDir + for b in client server ; do + chmod 0755 $siteDir/$b.py + makeWrapper ${python2Packages.python.interpreter} $out/bin/$b.py \ + --add-flags $siteDir/$b.py + done + + install -m755 ${dbScript} $out/bin/create_pykms_db.sh + + mv $siteDir/README.md $out/share/doc/pykms/ + + ${python2Packages.python.interpreter} -m compileall $siteDir + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Windows KMS (Key Management Service) server written in Python"; + homepage = https://github.com/ThunderEX/py-kms; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index fe7327e7d855..8077fb1d93d0 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake perl curl gtest lzma bzip2 lz4 db dpkg libxslt.bin ] ++ lib.optionals withDocs [ - doxygen Po4a w3m + doxygen Po4a w3m docbook_xml_dtd_45 ] ++ lib.optionals withNLS [ gettext ]; @@ -44,15 +44,6 @@ stdenv.mkDerivation rec { -DWITH_DOC=${if withDocs then "ON" else "OFF"} -DUSE_NLS=${if withNLS then "ON" else "OFF"} ) - - for f in doc/*; do - if [[ -f "$f" ]]; then - substituteInPlace "$f" \ - --replace \ - "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \ - "${docbook_xml_dtd_45}/xml/dtd/docbook/docbookx.dtd" - fi - done ''; enableParallelBuilding = true; diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/tools/package-management/nix-bundle/default.nix index e3255afe7fe8..7c02d2d9a638 100644 --- a/pkgs/tools/package-management/nix-bundle/default.nix +++ b/pkgs/tools/package-management/nix-bundle/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "nix-bundle"; name = "${pname}-${version}"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitHub { owner = "matthewbauer"; repo = pname; rev = "v${version}"; - sha256 = "15r77pchf4s4cdv4lvw2zw1yic78k8p0n2r954qq370vscw30yac"; + sha256 = "0klabmygbhzlwxja8p2w8fp8ip3xaa5ym9c15rp9qxzh03hfmdjx"; }; # coreutils, gnutar is actually needed by nix for bootstrap @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeWrapper $out/share/nix-bundle/nix-bundle.sh $out/bin/nix-bundle \ --prefix PATH : ${binPath} + cp $out/share/nix-bundle/nix-run.sh $out/bin/nix-run ''; meta = with lib; { diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index e90f71780ebd..ac697be555ac 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -161,12 +161,12 @@ in rec { nixUnstable = (lib.lowPrio (common rec { name = "nix-1.12${suffix}"; - suffix = "pre5619_346aeee1"; + suffix = "pre5650_1dd29d7a"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "346aeee1cb21b5cab5ddc3e8658c88321f513761"; - sha256 = "0lyrs0mqnh89w1nzrqpxvnh7bdjpg8j22xaidql47f1nwbblmn3f"; + rev = "1dd29d7aebae706f3e90a18bbfae727f2ed03c70"; + sha256 = "182v2rczm8al1ggbaca8qapvrjyp21li1fd3fiwr5nqgazgr5308"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 049867afcd72..7f095a3225bb 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -16,10 +16,6 @@ buildGoPackage rec { sha256 = "1zgvriyir2ga0p4ah9ia1sbl9ydnrnw5ggq4c1ya8gcfgn8vzdsf"; }; - postInstall = stdenv.lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib $bin/bin/keybase - ''; - buildFlags = [ "-tags production" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/modsecurity/Makefile.in.patch b/pkgs/tools/security/modsecurity/Makefile.in.patch new file mode 100644 index 000000000000..98384c754ce7 --- /dev/null +++ b/pkgs/tools/security/modsecurity/Makefile.in.patch @@ -0,0 +1,17 @@ +--- a/apache2/Makefile.in 2017-10-10 09:45:51.000000000 -0400 ++++ b/apache2/Makefile.in 2017-10-10 09:46:04.000000000 -0400 +@@ -1208,14 +1208,12 @@ + @LINUX_TRUE@ for m in $(pkglib_LTLIBRARIES); do \ + @LINUX_TRUE@ base=`echo $$m | sed 's/\..*//'`; \ + @LINUX_TRUE@ rm -f $(DESTDIR)$(pkglibdir)/$$base.*a; \ +-@LINUX_TRUE@ install -D -m444 $(DESTDIR)$(pkglibdir)/$$base.so $(DESTDIR)$(APXS_MODULES)/$$base.so; \ + @LINUX_TRUE@ done + @LINUX_FALSE@install-exec-hook: $(pkglib_LTLIBRARIES) + @LINUX_FALSE@ @echo "Removing unused static libraries..."; \ + @LINUX_FALSE@ for m in $(pkglib_LTLIBRARIES); do \ + @LINUX_FALSE@ base=`echo $$m | sed 's/\..*//'`; \ + @LINUX_FALSE@ rm -f $(DESTDIR)$(pkglibdir)/$$base.*a; \ +-@LINUX_FALSE@ cp -p $(DESTDIR)$(pkglibdir)/$$base.so $(DESTDIR)$(APXS_MODULES); \ + @LINUX_FALSE@ done + + # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index a5e03eb3fe16..2c02a5dd4736 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -1,35 +1,43 @@ { stdenv, lib, fetchurl, pkgconfig -, curl, apacheHttpd, pcre, apr, aprutil, libxml2 }: +, curl, apacheHttpd, pcre, apr, aprutil, libxml2 +, luaSupport ? false, lua5 +}: with lib; +let luaValue = if luaSupport then lua5 else "no"; + optional = stdenv.lib.optional; +in + stdenv.mkDerivation rec { name = "modsecurity-${version}"; - version = "2.9.0"; + version = "2.9.2"; src = fetchurl { url = "https://www.modsecurity.org/tarball/${version}/${name}.tar.gz"; - sha256 = "e2bbf789966c1f80094d88d9085a81bde082b2054f8e38e0db571ca49208f434"; + sha256 = "41a8f73476ec891f3a9e8736b98b64ea5c2105f1ce15ea57a1f05b4bf2ffaeb5"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ curl apacheHttpd pcre apr aprutil libxml2 ]; - configureFlags = [ - "--enable-standalone-module" - "--enable-static" - "--with-curl=${curl.dev}" - "--with-apxs=${apacheHttpd.dev}/bin/apxs" - "--with-pcre=${pcre.dev}" - "--with-apr=${apr.dev}" - "--with-apu=${aprutil.dev}/bin/apu-1-config" - "--with-libxml=${libxml2.dev}" - ]; + buildInputs = [ curl apacheHttpd pcre apr aprutil libxml2 ] ++ + optional luaSupport lua5; + + configureFlags = '' + --enable-standalone-module + --enable-static + --with-curl=${curl.dev} + --with-apxs=${apacheHttpd.dev}/bin/apxs + --with-pcre=${pcre.dev} + --with-apr=${apr.dev} + --with-apu=${aprutil.dev}/bin/apu-1-config + --with-libxml=${libxml2.dev} + --with-lua=${luaValue} + ''; outputs = ["out" "nginx"]; - - preBuild = '' - substituteInPlace apache2/Makefile.in --replace "install -D " "# install -D" - ''; + # by default modsecurity's install script copies compiled output to httpd's modules folder + # this patch removes those lines + patches = [ ./Makefile.in.patch ]; postInstall = '' mkdir -p $nginx @@ -41,6 +49,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; homepage = https://www.modsecurity.org/; maintainers = with maintainers; [offline]; - platforms = platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix index 1835dbdb620b..352a81b2727a 100644 --- a/pkgs/tools/security/scrypt/default.nix +++ b/pkgs/tools/security/scrypt/default.nix @@ -2,27 +2,26 @@ stdenv.mkDerivation rec { name = "scrypt-${version}"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { url = "https://www.tarsnap.com/scrypt/${name}.tgz"; - sha256 = "1m39hpfby0fdjam842773i5w7pa0qaj7f0r22jnchxsj824vqm0p"; + sha256 = "0xy5yhrwwv13skv9im9vm76rybh9f29j2dh4hlh2x01gvbkza8a6"; }; buildInputs = [ openssl ]; patchPhase = '' - substituteInPlace Makefile.in \ - --replace "command -p mv" "mv" - substituteInPlace autocrap/Makefile.am \ - --replace "command -p mv" "mv" + for f in Makefile.in autotools/Makefile.am libcperciva/cpusupport/Build/cpusupport.sh ; do + substituteInPlace $f --replace "command -p " "" + done ''; - meta = { + meta = with stdenv.lib; { description = "Encryption utility"; homepage = https://www.tarsnap.com/scrypt.html; - license = stdenv.lib.licenses.bsd2; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/pkgs/tools/security/sudolikeaboss/default.nix index 066fef39a82a..15f767415890 100644 --- a/pkgs/tools/security/sudolikeaboss/default.nix +++ b/pkgs/tools/security/sudolikeaboss/default.nix @@ -22,10 +22,6 @@ buildGoPackage rec { fixDarwinDylibNames ]; - postInstall = '' - install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/sudolikeaboss - ''; - meta = with stdenv.lib; { inherit version; inherit (src.meta) homepage; diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix index 1e688942a49e..fd4cef27ba17 100644 --- a/pkgs/tools/text/sift/default.nix +++ b/pkgs/tools/text/sift/default.nix @@ -16,10 +16,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - postInstall = lib.optionalString stdenv.isDarwin '' - install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/sift - ''; - meta = with lib; { description = "sift is a fast and powerful alternative to grep"; homepage = https://sift-tool.org; diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index 0e87ef5dacc1..ed6e741b3f9e 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml }: +{ stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { name = "hevea-2.29"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1i7qkar6gjpsxqgdm90xxgp15z7gfyja0rn62n23a9aahc0hpgq6"; }; - buildInputs = [ ocaml ]; + buildInputs = with ocamlPackages; [ ocaml ocamlbuild ]; makeFlags = "PREFIX=$(out)"; @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = http://pauillac.inria.fr/~maranget/hevea/; license = licenses.qpl; maintainers = with maintainers; [ pSub ]; - platforms = with platforms; linux; + platforms = with platforms; unix; }; } diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index 91cb148d8fe8..e43bc18ba70e 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -67,11 +67,11 @@ let in with localPython.pkgs; buildPythonApplication rec { name = "${pname}-${version}"; pname = "awsebcli"; - version = "3.10.5"; + version = "3.11.0"; src = fetchPypi { inherit pname version; - sha256 = "1g53z2flhp3navdf8lw6rgh99akf3k0ng1zkkqswvh66zswkxnwn"; + sha256 = "052388annhyirlzdr89hbgif8k7pw7win2zm1ybn4iiisr5l49zi"; }; checkInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ceb1c7fa2ee..7161f723d355 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1884,6 +1884,8 @@ with pkgs; enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { }; + cryfs = callPackage ../tools/filesystems/cryfs { }; + encfs = callPackage ../tools/filesystems/encfs { tinyxml2 = tinyxml-2; }; @@ -3216,7 +3218,9 @@ with pkgs; mailhog = callPackage ../servers/mail/mailhog {}; - mailnag = callPackage ../applications/networking/mailreaders/mailnag { }; + mailnag = callPackage ../applications/networking/mailreaders/mailnag { + pythonPackages = python2Packages; + }; mailsend = callPackage ../tools/networking/mailsend { }; @@ -7391,6 +7395,8 @@ with pkgs; ninja = callPackage ../development/tools/build-managers/ninja { }; + gn = callPackage ../development/tools/build-managers/gn { }; + nixbang = callPackage ../development/tools/misc/nixbang { pythonPackages = python3Packages; }; @@ -8026,6 +8032,8 @@ with pkgs; dxflib = callPackage ../development/libraries/dxflib {}; + easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; + eccodes = callPackage ../development/libraries/eccodes { }; eclib = callPackage ../development/libraries/eclib {}; @@ -8654,7 +8662,7 @@ with pkgs; icu58 = callPackage ../development/libraries/icu/58.nix { }; icu59 = callPackage ../development/libraries/icu/59.nix { }; - icu = icu58; + icu = icu59; id3lib = callPackage ../development/libraries/id3lib { }; @@ -9811,8 +9819,8 @@ with pkgs; # through /run/opengl-driver*, which is overriden according to config.grsecurity # grsecEnabled = true; # no more support in nixpkgs ATM - # llvm-4.0.0 won't pass tests on aarch64 - llvmPackages = if system == "aarch64-linux" then llvmPackages_39 else llvmPackages_4; + # llvm-4.0.0 and 5.0.0 won't pass tests on aarch64 + llvmPackages = if system == "aarch64-linux" then llvmPackages_39 else llvmPackages_5; }); mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); @@ -10098,8 +10106,7 @@ with pkgs; pcg_c = callPackage ../development/libraries/pcg-c { }; - pcl = callPackage ../development/libraries/pcl { - vtk = vtkWithQt4; + pcl = libsForQt5.callPackage ../development/libraries/pcl { inherit (darwin) cf-private; inherit (darwin.apple_sdk.frameworks) Cocoa AGL OpenGL; }; @@ -10119,7 +10126,9 @@ with pkgs; pgroonga = callPackage ../servers/sql/postgresql/pgroonga {}; - plv8 = callPackage ../servers/sql/postgresql/plv8 {}; + plv8 = callPackage ../servers/sql/postgresql/plv8 { + v8 = v8_6_x; + }; phonon = callPackage ../development/libraries/phonon {}; @@ -10838,14 +10847,14 @@ with pkgs; stdenv = overrideCC stdenv gcc5; }; - v8_3_24_10 = callPackage ../development/libraries/v8/3.24.10.nix { - inherit (python2Packages) python gyp; - stdenv = overrideCC stdenv gcc5; + v8_6_x = callPackage ../development/libraries/v8/6_x.nix { + inherit (python2Packages) python; }; v8 = callPackage ../development/libraries/v8 { inherit (python2Packages) python gyp; cctools = darwin.cctools; + icu = icu58; # v8-5.4.232 fails against icu4c-59.1 }; v8_static = lowPrio (self.v8.override { static = true; }); @@ -11456,7 +11465,8 @@ with pkgs; elasticmq = callPackage ../servers/elasticmq { }; eventstore = callPackage ../servers/nosql/eventstore { - v8 = v8_3_24_10; + mono = mono46; + v8 = v8_6_x; }; etcdctl = etcd; @@ -11472,7 +11482,7 @@ with pkgs; fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { }; firebird = callPackage ../servers/firebird { icu = null; stdenv = overrideCC stdenv gcc5; }; - firebirdSuper = callPackage ../servers/firebird { superServer = true; stdenv = overrideCC stdenv gcc5; }; + firebirdSuper = callPackage ../servers/firebird { icu = icu58; superServer = true; stdenv = overrideCC stdenv gcc5; }; fleet = callPackage ../servers/fleet { }; @@ -12306,6 +12316,8 @@ with pkgs; kmscube = callPackage ../os-specific/linux/kmscube { }; + kmsxx = callPackage ../development/libraries/kmsxx { }; + latencytop = callPackage ../os-specific/linux/latencytop { }; ldm = callPackage ../os-specific/linux/ldm { }; @@ -13822,6 +13834,8 @@ with pkgs; brackets = callPackage ../applications/editors/brackets { gconf = gnome3.gconf; }; + notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { }; + bristol = callPackage ../applications/audio/bristol { }; bs1770gain = callPackage ../applications/audio/bs1770gain { @@ -15349,6 +15363,7 @@ with pkgs; harfbuzz = harfbuzz.override { withIcu = true; withGraphite2 = true; }; + icu = icu58; # checking whether g++ supports C++14 or C++11... configure: error: no stdenv = overrideCC stdenv gcc5; }); @@ -16184,7 +16199,7 @@ with pkgs; falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { - inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils pyopengl; + inherit (python3Packages) buildPythonApplication pyqt5 jinja2 pygments pyyaml pypeg2 cssutils pyopengl attrs; inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav; }; @@ -18229,7 +18244,7 @@ with pkgs; kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-desktop plasma-integration plasma-nm plasma-pa plasma-workspace - plasma-workspace-wallpapers polkit-kde-agent powerdevil startkde + plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm startkde systemsettings; ### SCIENCE @@ -18478,7 +18493,7 @@ with pkgs; }; coq_8_6 = callPackage ../applications/science/logic/coq {}; coq_8_7 = callPackage ../applications/science/logic/coq { - version = "8.7+beta1"; + version = "8.7+beta2"; }; coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix {}; @@ -18524,6 +18539,7 @@ with pkgs; dpdgraph = callPackage ../development/coq-modules/dpdgraph {}; flocq = callPackage ../development/coq-modules/flocq {}; heq = callPackage ../development/coq-modules/heq {}; + HoTT = callPackage ../development/coq-modules/HoTT {}; interval = callPackage ../development/coq-modules/interval {}; mathcomp = callPackage ../development/coq-modules/mathcomp { }; paco = callPackage ../development/coq-modules/paco {}; @@ -19043,6 +19059,8 @@ with pkgs; guetzli = callPackage ../applications/graphics/guetzli { }; + gummi = callPackage ../applications/misc/gummi { }; + gxemul = callPackage ../misc/emulators/gxemul { }; hatari = callPackage ../misc/emulators/hatari { }; @@ -19081,7 +19099,9 @@ with pkgs; }; openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; - mailcore2 = callPackage ../development/libraries/mailcore2 { }; + mailcore2 = callPackage ../development/libraries/mailcore2 { + icu = icu58; + }; martyr = callPackage ../development/libraries/martyr { }; @@ -19211,6 +19231,8 @@ with pkgs; pt = callPackage ../applications/misc/pt { }; + pykms = callPackage ../tools/networking/pykms { }; + pyload = callPackage ../applications/networking/pyload {}; uae = callPackage ../misc/emulators/uae { }; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index c7e5f21910bb..16940761e6dc 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -24,7 +24,9 @@ releaseTools.sourceTarball rec { eval "$preConfigure" releaseName=nixpkgs-$VERSION$VERSION_SUFFIX echo -n $VERSION_SUFFIX > .version-suffix + echo -n ${nixpkgs.rev or nixpkgs.shortRev} > .git-revision echo "release name is $releaseName" + echo "git-revision is $(cat .git-revision)" ''; dontBuild = false; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 20b8c15f388f..5e6192bf6730 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -267,44 +267,23 @@ let }; v8 = assert isPhp7; buildPecl rec { - version = "0.1.0"; + version = "0.1.9"; name = "v8-${version}"; - src = pkgs.fetchurl { - url = "https://github.com/pinepain/php-v8/archive/v${version}.tar.gz"; - sha256 = "18smnxd34b486f5n8j0wk9z7r5x1w84v89mgf76z0bn7gxdxl0xj"; - }; + sha256 = "0bj77dfmld5wfwl4wgqnpa0i4f3mc1mpsp9dmrwqv050gs84m7h1"; - buildInputs = [ pkgs.v8 ]; - configureFlags = [ "--with-v8=${pkgs.v8}" ]; - - patches = [ - (builtins.toFile "link-libv8_libbase.patch" '' - Index: php-v8/config.m4 - =================================================================== - --- php-v8.orig/config.m4 - +++ php-v8/config.m4 - @@ -69,7 +69,7 @@ if test "$PHP_V8" != "no"; then - #static_link_extra="libv8_base.a libv8_libbase.a libv8_libplatform.a libv8_snapshot.a" - ;; - * ) - - static_link_extra="libv8_libplatform.a" - + static_link_extra="libv8_libplatform.a libv8_libbase.a" - #static_link_extra="libv8_base.a libv8_libbase.a libv8_libplatform.a libv8_snapshot.a" - ;; - esac - '' - )]; + buildInputs = [ pkgs.v8_6_x ]; + configureFlags = [ "--with-v8=${pkgs.v8_6_x}" ]; }; v8js = assert isPhp7; buildPecl rec { - version = "1.3.2"; + version = "1.4.1"; name = "v8js-${version}"; - sha256 = "1x7gxi70zgj3vaxs89nfbnwlqcxrps1inlyfzz66pbzdbfwvc8z8"; + sha256 = "0k5dc395gzva4l6n9mzvkhkjq914460cwk1grfandcqy73j6m89q"; - buildInputs = [ pkgs.v8 ]; - configureFlags = [ "--with-v8js=${pkgs.v8}" ]; + buildInputs = [ pkgs.v8_6_x ]; + configureFlags = [ "--with-v8js=${pkgs.v8_6_x}" ]; }; composer = pkgs.stdenv.mkDerivation rec { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ddd851d3719c..1a52015334b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6313,6 +6313,8 @@ in { }; }; + jsmin = callPackage ../development/python-modules/jsmin { }; + jsonpatch = callPackage ../development/python-modules/jsonpatch { }; jsonpointer = buildPythonPackage rec { @@ -7046,6 +7048,8 @@ in { plotly = callPackage ../development/python-modules/plotly { }; + plyfile = callPackage ../development/python-modules/plyfile { }; + podcastparser = callPackage ../development/python-modules/podcastparser { }; pomegranate = callPackage ../development/python-modules/pomegranate { }; @@ -11613,25 +11617,7 @@ in { }; }); - MechanicalSoup = buildPythonPackage rec { - name = "MechanicalSoup-${version}"; - version = "0.4.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/M/MechanicalSoup/${name}.zip"; - sha256 = "02jkwly4gw1jqm55l4wwn0j0ggnysx55inw9j96bif5l49z5cacd"; - }; - - propagatedBuildInputs = with self; [ requests beautifulsoup4 six ]; - - meta = { - description = "A Python library for automating interaction with websites"; - homepage = https://github.com/hickford/MechanicalSoup; - license = licenses.mit; - maintainers = with maintainers; [ jgillich ]; - }; - }; - + MechanicalSoup = callPackage ../development/python-modules/MechanicalSoup/default.nix { }; meld3 = buildPythonPackage rec { name = "meld3-1.0.0"; @@ -15604,6 +15590,8 @@ in { pika-pool = callPackage ../development/python-modules/pika-pool { }; platformio = callPackage ../development/python-modules/platformio { }; + kmsxx = callPackage ../development/libraries/kmsxx { }; + pylibconfig2 = buildPythonPackage rec { name = "pylibconfig2-${version}"; version = "0.2.4"; @@ -17596,6 +17584,8 @@ in { }; }; + pypcap = callPackage ../development/python-modules/pypcap {}; + pyplatec = buildPythonPackage rec { name = "PyPlatec-${version}"; version = "1.4.0"; @@ -20554,6 +20544,8 @@ in { }; }); + guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { }; + sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; sphinxcontrib-blockdiag = buildPythonPackage (rec { @@ -26531,6 +26523,8 @@ EOF }; }; + yowsup = callPackage ../development/python-modules/yowsup { }; + wptserve = callPackage ../development/python-modules/wptserve { }; yenc = callPackage ../development/python-modules/yenc { }; |