diff --git a/.editorconfig b/.editorconfig index 969e613536b..7b40ff1ff56 100644 --- a/.editorconfig +++ b/.editorconfig @@ -22,3 +22,7 @@ indent_size = 2 [*.{sh,py,pl}] indent_style = space indent_size = 4 + +# Match diffs, avoid to trim trailing whitespace +[*.{diff,patch}] +trim_trailing_whitespace = false diff --git a/COPYING b/COPYING index 0408a7e40b7..a632d6f58b1 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2003-2016 Eelco Dolstra and the Nixpkgs/NixOS contributors +Copyright (c) 2003-2017 Eelco Dolstra and the Nixpkgs/NixOS contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/doc/functions.xml b/doc/functions.xml index 70326936a57..6374c15ddf2 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -17,66 +17,6 @@ derivations or even the whole package set. -
- pkgs.overridePackages - - - This function inside the nixpkgs expression (pkgs) - can be used to override the set of packages itself. - - - Warning: this function is expensive and must not be used from within - the nixpkgs repository. - - - Example usage: - - let - pkgs = import <nixpkgs> {}; - newpkgs = pkgs.overridePackages (self: super: { - foo = super.foo.override { ... }; - }; - in ... - - - - The resulting newpkgs will have the new foo - expression, and all other expressions depending on foo will also - use the new foo expression. - - - - The behavior of this function is similar to config.packageOverrides. - - - - The self parameter refers to the final package set with the - applied overrides. Using this parameter may lead to infinite recursion if not - used consciously. - - - - The super parameter refers to the old package set. - It's equivalent to pkgs in the above example. - - - - Note that in previous versions of nixpkgs, this method replaced any changes from config.packageOverrides, - along with that from previous calls if this function was called repeatedly. - Now those previous changes will be preserved so this function can be "chained" meaningfully. - To recover the old behavior, make sure config.packageOverrides is unset, - and call this only once off a "freshly" imported nixpkgs: - - let - pkgs = import <nixpkgs> { config: {}; }; - newpkgs = pkgs.overridePackages ...; - in ... - - -
-
<pkg>.override @@ -91,12 +31,12 @@ Example usages: pkgs.foo.override { arg1 = val1; arg2 = val2; ... } - pkgs.overridePackages (self: super: { + import pkgs.path { overlays = [ (self: super: { foo = super.foo.override { barSupport = true ; }; - }) + })]}; mypkg = pkgs.callPackage ./mypkg.nix { mydep = pkgs.mydep.override { ... }; - }) + } diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 82aeb112c93..3f5d500620b 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -737,18 +737,18 @@ in (pkgs.python35.override {inherit packageOverrides;}).withPackages (ps: [ps.bl ``` The requested package `blaze` depends on `pandas` which itself depends on `scipy`. -If you want the whole of Nixpkgs to use your modifications, then you can use `pkgs.overridePackages` +If you want the whole of Nixpkgs to use your modifications, then you can use `overlays` as explained in this manual. In the following example we build a `inkscape` using a different version of `numpy`. ``` let pkgs = import {}; - newpkgs = pkgs.overridePackages ( pkgsself: pkgssuper: { + newpkgs = import pkgs.path { overlays = [ (pkgsself: pkgssuper: { python27 = let packageOverrides = self: super: { numpy = super.numpy_1_10; }; in pkgssuper.python27.override {inherit packageOverrides;}; - } ); + } ) ]; }; in newpkgs.inkscape ``` @@ -804,6 +804,55 @@ If you want to create a Python environment for development, then the recommended method is to use `nix-shell`, either with or without the `python.buildEnv` function. +### How to consume python modules using pip in a virtualenv like I am used to on other Operating Systems ? + +This is an example of a `default.nix` for a `nix-shell`, which allows to consume a `virtualenv` environment, +and install python modules through `pip` the traditional way. + +Create this `default.nix` file, together with a `requirements.txt` and simply execute `nix-shell`. + +``` +with import {}; +with pkgs.python27Packages; + +stdenv.mkDerivation { + name = "impurePythonEnv"; + buildInputs = [ + # these packages are required for virtualenv and pip to work: + # + python27Full + python27Packages.virtualenv + python27Packages.pip + # the following packages are related to the dependencies of your python + # project. + # In this particular example the python modules listed in the + # requirements.tx require the following packages to be installed locally + # in order to compile any binary extensions they may require. + # + taglib + openssl + git + libxml2 + libxslt + libzip + stdenv + zlib ]; + src = null; + shellHook = '' + # set SOURCE_DATE_EPOCH so that we can use python wheels + SOURCE_DATE_EPOCH=$(date +%s) + virtualenv --no-setuptools venv + export PATH=$PWD/venv/bin:$PATH + pip install -r requirements.txt + ''; +} +``` + +Note that the `pip install` is an imperative action. So every time `nix-shell` +is executed it will attempt to download the python modules listed in +requirements.txt. However these will be cached locally within the `virtualenv` +folder and not downloaded again. + ## Contributing diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml index 15c0802ad69..b52361212f3 100644 --- a/doc/languages-frameworks/ruby.xml +++ b/doc/languages-frameworks/ruby.xml @@ -26,9 +26,8 @@ bundlerEnv rec { version = (import gemset).sensu.version; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + # expects Gemfile, Gemfile.lock and gemset.nix in the same directory + gemdir = ./.; meta = with lib; { description = "A monitoring framework that aims to be simple, malleable, and scalable"; diff --git a/doc/manual.xml b/doc/manual.xml index 6ad66d48652..1c0dac6e4df 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -18,6 +18,7 @@ + diff --git a/doc/overlays.xml b/doc/overlays.xml new file mode 100644 index 00000000000..cb54c33cf65 --- /dev/null +++ b/doc/overlays.xml @@ -0,0 +1,99 @@ + + +Overlays + +This chapter describes how to extend and change Nixpkgs packages using +overlays. Overlays are used to add layers in the fix-point used by Nixpkgs +to compose the set of all packages. + + + +
+Installing Overlays + +The set of overlays is looked for in the following places. The +first one present is considered, and all the rest are ignored: + + + + + + As an argument of the imported attribute set. When importing Nixpkgs, + the overlays attribute argument can be set to a list of + functions, which is described in . + + + + + + In the directory pointed by the environment variable + NIXPKGS_OVERLAYS. + + + + + In the directory ~/.nixpkgs/overlays/. + + + + + +For the second and third options, the directory should contain Nix expressions defining the +overlays. Each overlay can be a file, a directory containing a +default.nix, or a symlink to one of those. The expressions should follow +the syntax described in . + +The order of the overlay layers can influence the recipe of packages if multiple layers override +the same recipe. In the case where overlays are loaded from a directory, they are loaded in +alphabetical order. + +To install an overlay using the last option, you can clone the overlay's repository and add +a symbolic link to it in ~/.nixpkgs/overlays/ directory. + +
+ + + +
+Overlays Layout + +Overlays are expressed as Nix functions which accept 2 arguments and return a set of +packages. + + +self: super: + +{ + boost = super.boost.override { + python = self.python3; + }; + rr = super.callPackage ./pkgs/rr { + stdenv = self.stdenv_32bit; + }; +} + + +The first argument, usually named self, corresponds to the final package +set. You should use this set for the dependencies of all packages specified in your +overlay. For example, all the dependencies of rr in the example above come +from self, as well as the overriden dependencies used in the +boost override. + +The second argument, usually named super, +corresponds to the result of the evaluation of the previous stages of +Nixpkgs. It does not contain any of the packages added by the current +overlay nor any of the following overlays. This set should be used either +to refer to packages you wish to override, or to access functions defined +in Nixpkgs. For example, the original recipe of boost +in the above example, comes from super, as well as the +callPackage function. + +The value returned by this function should be a set similar to +pkgs/top-level/all-packages.nix, which contains +overridden and/or new packages. + +
+ + diff --git a/lib/licenses.nix b/lib/licenses.nix index b62f4f0a5bb..e5784ce2202 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -449,6 +449,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Sleepycat License"; }; + smail = { + shortName = "smail"; + fullName = "SMAIL General Public License"; + url = http://metadata.ftp-master.debian.org/changelogs/main/d/debianutils/debianutils_4.8.1_copyright; + }; + tcltk = spdx { spdxId = "TCL"; fullName = "TCL/TK License"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index f88cd1212fb..d40722dacac 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -109,6 +109,7 @@ cwoac = "Oliver Matthews "; DamienCassou = "Damien Cassou "; danbst = "Danylo Hlynskyi "; + danielfullmer = "Daniel Fullmer "; dasuxullebt = "Christoph-Simon Senjak "; davidak = "David Kleuker "; davidrusu = "David Rusu "; @@ -129,6 +130,7 @@ dochang = "Desmond O. Chang "; domenkozar = "Domen Kozar "; doublec = "Chris Double "; + dpaetzel = "David Pätzel "; drets = "Dmytro Rets "; drewkett = "Andrew Burkett "; dtzWill = "Will Dietz "; @@ -200,22 +202,26 @@ ianwookim = "Ian-Woo Kim "; igsha = "Igor Sharonov "; ikervagyok = "Balázs Lengyel "; + ivan-tkatchev = "Ivan Tkatchev "; j-keck = "Jürgen Keck "; jagajaga = "Arseniy Seroka "; javaguirre = "Javier Aguirre "; jb55 = "William Casarin "; jbedo = "Justin Bedő "; jcumming = "Jack Cummings "; + jdagilliland = "Jason Gilliland "; jefdaj = "Jeffrey David Johnson "; jerith666 = "Matt McHenry "; jfb = "James Felix Black "; jgeerds = "Jascha Geerds "; + jgertm = "Tim Jaeger "; jgillich = "Jakob Gillich "; jirkamarsik = "Jirka Marsik "; joachifm = "Joachim Fasting "; joamaki = "Jussi Maki "; joelmo = "Joel Moberg "; joelteon = "Joel Taylor "; + johbo = "Johannes Bornhold "; joko = "Ioannis Koutras "; jonafato = "Jon Banafato "; jpbernardy = "Jean-Philippe Bernardy "; @@ -232,6 +238,7 @@ KibaFox = "Kiba Fox "; kierdavis = "Kier Davis "; kkallio = "Karn Kallio "; + knedlsepp = "Josef Kemetmüller "; koral = "Koral "; kovirobi = "Kovacsics Robert "; kragniz = "Louis Taylor "; @@ -239,7 +246,9 @@ lassulus = "Lassulus "; layus = "Guillaume Maudoux "; ldesgoui = "Lucas Desgouilles "; + league = "Christopher League "; lebastr = "Alexander Lebedev "; + leemachin = "Lee Machin "; leenaars = "Michiel Leenaars "; leonardoce = "Leonardo Cecchi "; lethalman = "Luca Bruno "; @@ -313,6 +322,7 @@ mudri = "James Wood "; muflax = "Stefan Dorn "; myrl = "Myrl Hex "; + namore = "Roman Naumann "; nand0p = "Fernando Jose Pando "; Nate-Devv = "Nathan Moore "; nathan-gs = "Nathan Bijnens "; @@ -323,6 +333,7 @@ nicknovitski = "Nick Novitski "; nico202 = "Nicolò Balzarotti "; NikolaMandic = "Ratko Mladic "; + nixy = "Andrew R. M. "; notthemessiah = "Brian Cohen "; np = "Nicolas Pouillard "; nslqqq = "Nikita Mikhailov "; @@ -330,6 +341,7 @@ ocharles = "Oliver Charles "; odi = "Oliver Dunkl "; offline = "Jaka Hudoklin "; + oida = "oida "; okasu = "Okasu "; olcai = "Erik Timan "; olejorgenb = "Ole Jørgen Brønner "; @@ -361,6 +373,7 @@ plcplc = "Philip Lykke Carlsen "; pmahoney = "Patrick Mahoney "; pmiddend = "Philipp Middendorf "; + polyrod = "Maurizio Di Pietro "; prikhi = "Pavan Rikhi "; primeos = "Michael Weiss "; profpatsch = "Profpatsch "; @@ -435,6 +448,7 @@ spinus = "Tomasz Czyż "; sprock = "Roger Mason "; spwhitt = "Spencer Whitt "; + srhb = "Sarah Brofeldt "; SShrike = "Severen Redwood "; stephenmw = "Stephen Weinberg "; sternenseemann = "Lukas Epple "; @@ -501,8 +515,10 @@ yurrriq = "Eric Bailey "; z77z = "Marco Maggesi "; zagy = "Christian Zagrodnick "; + zauberpony = "Elmar Athmer "; zef = "Zef Hemel "; zimbatm = "zimbatm "; zohl = "Al Zohali "; zoomulator = "Kim Simmons "; + zraexy = "David Mell "; } diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index d8b0ae01e33..6be2cd3af7f 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -11,7 +11,9 @@ has the following highlights: - + Nixpkgs is now extensible through overlays. See the Nixpkgs + manual for more information. @@ -28,6 +30,14 @@ has the following highlights: following incompatible changes: + + + stdenv.overrides is now expected to take self + and super arguments. See lib.trivial.extends + for what those parameters represent. + + + gnome alias has been removed along with @@ -88,6 +98,32 @@ following incompatible changes: networking.timeServers. + + + + overridePackages function no longer exists. + It is replaced by + overlays. For example, the following code: + + + let + pkgs = import <nixpkgs> {}; + in + pkgs.overridePackages (self: super: ...) + + + should be replaced by: + + + let + pkgs = import <nixpkgs> {}; + in + import pkgs.path { overlays = [(self: super: ...)] } + + + + diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index a87b285c5b7..2e7971cca81 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -1,4 +1,4 @@ -# From an end-user configuration file (`configuration'), build a NixOS +# From an end-user configuration file (`configuration.nix'), build a NixOS # configuration object (`config') from which we can retrieve option # values. diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix index 2baa4f66760..4100af27bec 100644 --- a/nixos/lib/make-squashfs.nix +++ b/nixos/lib/make-squashfs.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { # Generate the squashfs image. mksquashfs nix-path-registration $storePaths $out \ - -keep-as-directory -all-root -comp xz + -keep-as-directory -all-root -b 1048576 -comp xz -Xdict-size 100% ''; } diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh index efb83d91428..73a009d8488 100644 --- a/nixos/lib/make-system-tarball.sh +++ b/nixos/lib/make-system-tarball.sh @@ -54,7 +54,7 @@ mkdir -p $out/tarball rm env-vars -tar --sort=name --mtime='1970-01-01' -cvJf $out/tarball/$fileName.tar.xz * $extraArgs +tar --sort=name --mtime='@1' --owner=0 --group=0 --numeric-owner -cvJf $out/tarball/$fileName.tar.xz * $extraArgs mkdir -p $out/nix-support echo $system > $out/nix-support/system diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 274b16164db..14c39e859bc 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -611,11 +611,37 @@ sub copyFileFromHost { } +my %charToKey = ( + '!' => "shift-0x02", + '@' => "shift-0x03", + '#' => "shift-0x04", + '$' => "shift-0x05", + '%' => "shift-0x06", + '^' => "shift-0x07", + '&' => "shift-0x08", + '*' => "shift-0x09", + '(' => "shift-0x0A", + ')' => "shift-0x0B", + '-' => "0x0C", '_' => "shift-0x0C", + '=' => "0x0D", '+' => "shift-0x0D", + '[' => "0x1A", '{' => "shift-0x1A", + ']' => "0x1B", '}' => "shift-0x1B", + ';' => "0x27", ':' => "shift-0x27", + '\'' => "0x28", '"' => "shift-0x28", + '`' => "0x29", '~' => "shift-0x29", + '\\' => "0x2B", '|' => "shift-0x2B", + ',' => "0x33", '<' => "shift-0x33", + '.' => "0x34", '>' => "shift-0x34", + '/' => "0x35", '?' => "shift-0x35", + ' ' => "spc", + "\n" => "ret", +); + + sub sendKeys { my ($self, @keys) = @_; foreach my $key (@keys) { - $key = "spc" if $key eq " "; - $key = "ret" if $key eq "\n"; + $key = $charToKey{$key} if exists $charToKey{$key}; $self->sendMonitorCommand("sendkey $key"); } } diff --git a/nixos/lib/test-driver/test-driver.pl b/nixos/lib/test-driver/test-driver.pl index 8ad0d67f68c..854be99552a 100644 --- a/nixos/lib/test-driver/test-driver.pl +++ b/nixos/lib/test-driver/test-driver.pl @@ -8,6 +8,7 @@ use IO::Pty; use Logger; use Cwd; use POSIX qw(_exit dup2); +use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC); $SIG{PIPE} = 'IGNORE'; # because Unix domain sockets may die unexpectedly @@ -179,7 +180,12 @@ END { $log->close(); } +my $now1 = clock_gettime(CLOCK_MONOTONIC); runTests; +my $now2 = clock_gettime(CLOCK_MONOTONIC); + +printf STDERR "test script finished in %.2fs\n", $now2 - $now1; + exit ($nrSucceeded < $nrTests ? 1 : 0); diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 0750a1b18c9..7cceac8cbf5 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -19,7 +19,7 @@ rm -f ec2-amis.nix types="hvm pv" stores="ebs s3" -regions="eu-west-1 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1" +regions="eu-west-1 eu-west-2 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1" for type in $types; do link=$stateDir/$type diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index adc05f60231..9e7cfbd686c 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -57,7 +57,7 @@ in networking.dnsExtensionMechanism = lib.mkOption { type = types.bool; - default = false; + default = true; description = '' Enable the edns0 option in resolv.conf. With that option set, glibc supports use of the extension mechanisms for diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index 3f96cea2270..4e5de421d8a 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -9,6 +9,7 @@ let inherit (config.services.avahi) nssmdns; inherit (config.services.samba) nsswins; ldap = (config.users.ldap.enable && config.users.ldap.nsswitch); + sssd = config.services.sssd.enable; hostArray = [ "files" "mymachines" ] ++ optionals nssmdns [ "mdns_minimal [!UNAVAIL=return]" ] @@ -18,12 +19,17 @@ let ++ ["myhostname" ]; passwdArray = [ "files" ] + ++ optional sssd "sss" ++ optionals ldap [ "ldap" ] ++ [ "mymachines" ]; shadowArray = [ "files" ] + ++ optional sssd "sss" ++ optionals ldap [ "ldap" ]; + servicesArray = [ "files" ] + ++ optional sssd "sss"; + in { options = { @@ -60,7 +66,7 @@ in { networks: files ethers: files - services: files + services: ${concatStringsSep " " servicesArray} protocols: files rpc: files ''; diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix index fbd7867a095..a4a4d6e1a6a 100644 --- a/nixos/modules/config/power-management.nix +++ b/nixos/modules/config/power-management.nix @@ -69,7 +69,7 @@ in config = mkIf cfg.enable { - # FIXME: Implement powersave governor for sandy bridge or later Intel CPUs + # Leftover for old setups, should be set by nixos-generate-config now powerManagement.cpuFreqGovernor = mkDefault "ondemand"; systemd.targets.post-resume = { diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 06ce5200420..d5cb4fce0f9 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -160,6 +160,13 @@ in { if activated. ''; }; + + config = mkOption { + type = types.attrsOf types.unspecified; + default = {}; + description = ''Config of the pulse daemon. See man pulse-daemon.conf.''; + example = literalExample ''{ flat-volumes = "no"; }''; + }; }; zeroconf = { @@ -204,14 +211,18 @@ in { (mkIf cfg.enable { environment.systemPackages = [ overriddenPackage ]; - environment.etc = singleton { - target = "asound.conf"; - source = alsaConf; - }; + environment.etc = [ + { target = "asound.conf"; + source = alsaConf; } + + { target = "pulse/daemon.conf"; + source = writeText "daemon.conf" (lib.generators.toKeyValue {} cfg.daemon.config); } + ]; # Allow PulseAudio to get realtime priority using rtkit. security.rtkit.enable = true; + systemd.packages = [ cfg.package ]; }) (mkIf hasZeroconf { @@ -227,31 +238,14 @@ in { target = "pulse/default.pa"; source = myConfigFile; }; - systemd.user = { services.pulseaudio = { - description = "PulseAudio Server"; - # NixOS doesn't support "Also" so we bring it in manually - wantedBy = [ "default.target" ]; serviceConfig = { - Type = "notify"; - ExecStart = binaryNoDaemon; - Restart = "on-failure"; RestartSec = "500ms"; }; environment = { DISPLAY = ":${toString config.services.xserver.display}"; }; restartIfChanged = true; }; - - sockets.pulseaudio = { - description = "PulseAudio Socket"; - wantedBy = [ "sockets.target" ]; - socketConfig = { - Priority = 6; - Backlog = 5; - ListenStream = "%t/pulse/native"; - }; - }; }; }) diff --git a/nixos/modules/hardware/ckb.nix b/nixos/modules/hardware/ckb.nix new file mode 100644 index 00000000000..8429572a882 --- /dev/null +++ b/nixos/modules/hardware/ckb.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.hardware.ckb; + +in + { + options.hardware.ckb = { + enable = mkEnableOption "the Corsair keyboard/mouse driver"; + + package = mkOption { + type = types.package; + default = pkgs.ckb; + defaultText = "pkgs.ckb"; + description = '' + The package implementing the Corsair keyboard/mouse driver. + ''; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + systemd.services.ckb = { + description = "Corsair Keyboard Daemon"; + wantedBy = ["multi-user.target"]; + script = "${cfg.package}/bin/ckb-daemon"; + serviceConfig = { + Restart = "always"; + StandardOutput = "syslog"; + }; + }; + }; + + meta = { + maintainers = with lib.maintainers; [ kierdavis ]; + }; + } diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index c4fad9a6672..5e38a988096 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -96,7 +96,7 @@ in example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]"; description = '' Additional packages to add to OpenGL drivers. This can be used - to add additional VA-API/VDPAU drivers. + to add OpenCL drivers, VA-API/VDPAU drivers etc. ''; }; @@ -107,7 +107,7 @@ in description = '' Additional packages to add to 32-bit OpenGL drivers on 64-bit systems. Used when is - set. This can be used to add additional VA-API/VDPAU drivers. + set. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. ''; }; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix index 4641b8fcf9d..7ec55f159d0 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix @@ -1,11 +1,10 @@ # This module defines a small NixOS installation CD. It does not # contain any graphical stuff. -{ config, lib, ... }: +{ config, lib, pkgs, ... }: { imports = [ ./installation-cd-base.nix - ../../profiles/minimal.nix ]; } diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 4fc8bf5428f..93dba0d882b 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -178,7 +178,7 @@ in image. It significantly increases image size. Use that when you want to be able to keep all the sources needed to build your system or when you are going to install the system on a computer - with slow on non-existent network connection. + with slow or non-existent network connection. ''; }; @@ -232,8 +232,6 @@ in system.boot.loader.kernelFile = "bzImage"; environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ]; - boot.consoleLogLevel = mkDefault 7; - # In stage 1 of the boot, mount the CD as the root FS by label so # that we don't need to know its device. We pass the label of the # root filesystem on the kernel command line, rather than in diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix index 80fb4707228..456ef7c9f54 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix @@ -27,7 +27,6 @@ in boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=ttyO0,115200n8" "console=tty0"]; - boot.consoleLogLevel = 7; # FIXME: this probably should be in installation-device.nix users.extraUsers.root.initialHashedPassword = ""; diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix index dc196468139..e7163f10a3c 100644 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix @@ -26,7 +26,6 @@ in boot.loader.generic-extlinux-compatible.enable = true; boot.kernelPackages = pkgs.linuxPackages_rpi; - boot.consoleLogLevel = 7; # FIXME: this probably should be in installation-device.nix users.extraUsers.root.initialHashedPassword = ""; diff --git a/nixos/modules/installer/netboot/netboot.nix b/nixos/modules/installer/netboot/netboot.nix index 5908ff6cb94..0f6046339b3 100644 --- a/nixos/modules/installer/netboot/netboot.nix +++ b/nixos/modules/installer/netboot/netboot.nix @@ -30,8 +30,6 @@ with lib; system.boot.loader.kernelFile = "bzImage"; environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ]; - boot.consoleLogLevel = mkDefault 7; - fileSystems."/" = { fsType = "tmpfs"; options = [ "mode=0755" ]; diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 747d9d2bcec..d73d67ef472 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,5 +1,5 @@ { - x86_64-linux = "/nix/store/i4mwf2gpvar7dqvlpp5m86llbq3ahbvb-nix-1.11.4"; - i686-linux = "/nix/store/a3gjrbspb0q4hs3sv5g1y2nza43i8nzv-nix-1.11.4"; - x86_64-darwin = "/nix/store/7v21yd3qpv0nclcy5cqr5njj9bril12s-nix-1.11.4"; + x86_64-linux = "/nix/store/qdkzm17csr24snk247a1s0c47ikq5sl6-nix-1.11.6"; + i686-linux = "/nix/store/hiwp53747lxlniqy5wpbql5izjrs8z0z-nix-1.11.6"; + x86_64-darwin = "/nix/store/hca2hqcvwncf23hiqyqgwbsdy8vvl9xv-nix-1.11.6"; } diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index f1874f23977..e17c02d1374 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -94,6 +94,21 @@ sub hasCPUFeature { my $cpus = scalar (grep {/^processor\s*:/} (split '\n', $cpuinfo)); +# Determine CPU governor to use +if (-e "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors") { + my $governors = read_file("/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors"); + # ondemand governor is not available on sandy bridge or later Intel CPUs + my @desired_governors = ("ondemand", "powersave"); + my $e; + + foreach $e (@desired_governors) { + if (index($governors, $e) != -1) { + last if (push @attrs, "powerManagement.cpuFreqGovernor = \"$e\";"); + } + } +} + + # Virtualization support? push @kernelModules, "kvm-intel" if hasCPUFeature "vmx"; push @kernelModules, "kvm-amd" if hasCPUFeature "svm"; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 70705771183..de69ada5bfe 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -281,6 +281,8 @@ riak-cs = 263; infinoted = 264; keystone = 265; + glance = 266; + couchpotato = 267; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -467,7 +469,7 @@ ihaskell = 189; i2p = 190; lambdabot = 191; - #asterisk = 192; # unused + asterisk = 192; plex = 193; sabnzbd = 194; #grafana = 196; #unused @@ -532,6 +534,8 @@ riak-cs = 263; infinoted = 264; keystone = 265; + glance = 266; + couchpotato = 267; # 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 27a0fa6cf3d..3cb5bb1a351 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -15,6 +15,15 @@ in { ''; }; + locate = mkOption { + type = types.package; + default = pkgs.findutils; + example = "pkgs.mlocate"; + description = '' + The locate implementation to use + ''; + }; + interval = mkOption { type = types.str; default = "02:15"; @@ -77,7 +86,7 @@ in { script = '' mkdir -m 0755 -p $(dirname ${toString cfg.output}) - exec updatedb \ + exec ${cfg.locate}/bin/updatedb \ --localuser=${cfg.localuser} \ ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \ --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 7d50b8025bd..7451888484f 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -29,11 +29,19 @@ let }; configType = mkOptionType { - name = "nixpkgs config"; + name = "nixpkgs-config"; + description = "nixpkgs config"; check = traceValIfNot isConfig; merge = args: fold (def: mergeConfig def.value) {}; }; + overlayType = mkOptionType { + name = "nixpkgs-overlay"; + description = "nixpkgs overlay"; + check = builtins.isFunction; + merge = lib.mergeOneOption; + }; + in { @@ -43,23 +51,37 @@ in default = {}; example = literalExample '' - { firefox.enableGeckoMediaPlayer = true; - packageOverrides = pkgs: { - firefox60Pkgs = pkgs.firefox60Pkgs.override { - enableOfficialBranding = true; - }; - }; - } + { firefox.enableGeckoMediaPlayer = true; } ''; type = configType; description = '' The configuration of the Nix Packages collection. (For details, see the Nixpkgs documentation.) It allows you to set - package configuration options, and to override packages - globally through the packageOverrides - option. The latter is a function that takes as an argument - the original Nixpkgs, and must evaluate - to a set of new or overridden packages. + package configuration options. + ''; + }; + + nixpkgs.overlays = mkOption { + default = []; + example = literalExample + '' + [ (self: super: { + openssh = super.openssh.override { + hpnSupport = true; + withKerberos = true; + kerberos = self.libkrb5; + }; + }; + ) ] + ''; + type = types.listOf overlayType; + description = '' + List of overlays to use with the Nix Packages collection. + (For details, see the Nixpkgs documentation.) It allows + you to override packages globally. This is a function that + takes as an argument the original Nixpkgs. + The first argument should be used for finding dependencies, and + the second should be used for overriding recipes. ''; }; diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index ec423768296..70cd3fb9766 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -99,7 +99,7 @@ in }; # Generate /etc/os-release. See - # http://0pointer.de/public/systemd-man/os-release.html for the + # https://www.freedesktop.org/software/systemd/man/os-release.html for the # format. environment.etc."os-release".text = '' diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index cd12fe4f9b3..cd00ea10baa 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -26,6 +26,7 @@ ./config/vpnc.nix ./config/zram.nix ./hardware/all-firmware.nix + ./hardware/ckb.nix ./hardware/cpu/amd-microcode.nix ./hardware/cpu/intel-microcode.nix ./hardware/ksm.nix @@ -66,11 +67,13 @@ ./programs/bash/bash.nix ./programs/blcr.nix ./programs/cdemu.nix + ./programs/chromium.nix ./programs/command-not-found/command-not-found.nix ./programs/dconf.nix ./programs/environment.nix ./programs/fish.nix ./programs/freetds.nix + ./programs/gphoto2.nix ./programs/info.nix ./programs/java.nix ./programs/kbdlight.nix @@ -240,6 +243,7 @@ ./services/misc/cpuminer-cryptonight.nix ./services/misc/cgminer.nix ./services/misc/confd.nix + ./services/misc/couchpotato.nix ./services/misc/devmon.nix ./services/misc/dictd.nix ./services/misc/dysnomia.nix @@ -284,6 +288,7 @@ ./services/misc/siproxd.nix ./services/misc/sonarr.nix ./services/misc/spice-vdagentd.nix + ./services/misc/sssd.nix ./services/misc/subsonic.nix ./services/misc/sundtek.nix ./services/misc/svnserve.nix @@ -292,6 +297,7 @@ ./services/misc/uhub.nix ./services/misc/zookeeper.nix ./services/monitoring/apcupsd.nix + ./services/monitoring/arbtt.nix ./services/monitoring/bosun.nix ./services/monitoring/cadvisor.nix ./services/monitoring/collectd.nix @@ -306,8 +312,13 @@ ./services/monitoring/munin.nix ./services/monitoring/nagios.nix ./services/monitoring/prometheus/default.nix - ./services/monitoring/prometheus/node-exporter.nix ./services/monitoring/prometheus/alertmanager.nix + ./services/monitoring/prometheus/blackbox-exporter.nix + ./services/monitoring/prometheus/json-exporter.nix + ./services/monitoring/prometheus/nginx-exporter.nix + ./services/monitoring/prometheus/node-exporter.nix + ./services/monitoring/prometheus/snmp-exporter.nix + ./services/monitoring/prometheus/varnish-exporter.nix ./services/monitoring/riemann.nix ./services/monitoring/riemann-dash.nix ./services/monitoring/riemann-tools.nix @@ -392,6 +403,7 @@ ./services/networking/minidlna.nix ./services/networking/miniupnpd.nix ./services/networking/mosquitto.nix + ./services/networking/miredo.nix ./services/networking/mstpd.nix ./services/networking/murmur.nix ./services/networking/namecoind.nix @@ -632,4 +644,5 @@ ./virtualisation/xen-dom0.nix ./virtualisation/xe-guest-utilities.nix ./virtualisation/openstack/keystone.nix + ./virtualisation/openstack/glance.nix ] diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index f90d0d992ec..687cd9d80d3 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -45,7 +45,7 @@ ]; # Include support for various filesystems. - boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "zfs" "ntfs" "cifs" ]; + boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ]; # Configure host id for ZFS to work networking.hostId = lib.mkDefault "8425e349"; diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 93736ba256b..b2973d88b15 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -70,5 +70,12 @@ with lib; # the initrd builder. system.extraDependencies = [ pkgs.stdenv pkgs.busybox pkgs.perlPackages.ArchiveCpio ]; + # Show all debug messages from the kernel but don't log refused packets + # because we have the firewall enabled. This makes installs from the + # console less cumbersome if the machine has a public IP. + boot.consoleLogLevel = mkDefault 7; + networking.firewall.logRefusedConnections = mkDefault false; + + environment.systemPackages = [ pkgs.vim ]; }; } diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix new file mode 100644 index 00000000000..54739feab97 --- /dev/null +++ b/nixos/modules/programs/chromium.nix @@ -0,0 +1,85 @@ +{ config, lib, ... }: + +with lib; + +let + cfg = config.programs.chromium; + + defaultProfile = filterAttrs (k: v: v != null) { + HomepageLocation = cfg.homepageLocation; + DefaultSearchProviderSearchURL = cfg.defaultSearchProviderSearchURL; + DefaultSearchProviderSuggestURL = cfg.defaultSearchProviderSuggestURL; + ExtensionInstallForcelist = map (extension: + "${extension};https://clients2.google.com/service/update2/crx" + ) cfg.extensions; + }; +in + +{ + ###### interface + + options = { + programs.chromium = { + enable = mkEnableOption "chromium policies"; + + extensions = mkOption { + type = types.listOf types.str; + description = '' + List of chromium extensions to install. + For list of plugins ids see id in url of extensions on + chrome web store + page. + ''; + default = []; + example = literalExample '' + [ + "chlffgpmiacpedhhbkiomidkjlcfhogd" # pushbullet + "mbniclmhobmnbdlbpiphghaielnnpgdp" # lightshot + "gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere + ] + ''; + }; + + homepageLocation = mkOption { + type = types.nullOr types.str; + description = "Chromium default homepage"; + default = null; + example = "https://nixos.org"; + }; + + defaultSearchProviderSearchURL = mkOption { + type = types.nullOr types.str; + description = "Chromium default search provider url."; + default = null; + example = + "https://encrypted.google.com/search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google: + ↪searchClient}{google:sourceId}{google:instantExtendedEnabledParameter}ie={inputEncoding}"; + }; + + defaultSearchProviderSuggestURL = mkOption { + type = types.nullOr types.str; + description = "Chromium default search provider url for suggestions."; + default = null; + example = + "https://encrypted.google.com/complete/search?output=chrome&q={searchTerms}"; + }; + + extraOpts = mkOption { + type = types.attrs; + description = '' + Extra chromium policy options, see + https://www.chromium.org/administrators/policy-list-3 + for a list of avalible options + ''; + default = {}; + }; + }; + }; + + ###### implementation + + config = lib.mkIf cfg.enable { + environment.etc."chromium/policies/managed/default.json".text = builtins.toJSON defaultProfile; + environment.etc."chromium/policies/managed/extra.json".text = builtins.toJSON cfg.extraOpts; + }; +} diff --git a/nixos/modules/programs/gphoto2.nix b/nixos/modules/programs/gphoto2.nix new file mode 100644 index 00000000000..47822562aee --- /dev/null +++ b/nixos/modules/programs/gphoto2.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs, ... }: + +with lib; + +{ + meta.maintainers = [ maintainers.league ]; + + ###### interface + options = { + programs.gphoto2 = { + enable = mkOption { + default = false; + example = true; + type = types.bool; + description = '' + Whether to configure system to use gphoto2. + To grant digital camera access to a user, the user must + be part of the camera group: + users.extraUsers.alice.extraGroups = ["camera"]; + ''; + }; + }; + }; + + ###### implementation + config = mkIf config.programs.gphoto2.enable { + services.udev.packages = [ pkgs.libgphoto2 ]; + environment.systemPackages = [ pkgs.gphoto2 ]; + users.extraGroups.camera = {}; + }; +} diff --git a/nixos/modules/programs/nano.nix b/nixos/modules/programs/nano.nix index b8803eec7be..27b6d446c75 100644 --- a/nixos/modules/programs/nano.nix +++ b/nixos/modules/programs/nano.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: let cfg = config.programs.nano; @@ -20,16 +20,22 @@ in example = '' set nowrap set tabstospaces - set tabsize 4 + set tabsize 2 ''; }; + syntaxHighlight = lib.mkOption { + type = lib.types.bool; + default = true; + description = "Whether to enable syntax highlight for various languages."; + }; }; }; ###### implementation config = lib.mkIf (cfg.nanorc != "") { - environment.etc."nanorc".text = cfg.nanorc; + environment.etc."nanorc".text = lib.concatStrings [ cfg.nanorc + (lib.optionalString cfg.syntaxHighlight ''include "${pkgs.nano}/share/nano/*.nanorc"'') ]; }; } diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 5b7d9415745..990e6648e82 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -91,6 +91,13 @@ in ''; type = types.bool; }; + + enableAutosuggestions = mkOption { + default = false; + description = '' + Enable zsh-autosuggestions + ''; + }; }; @@ -116,11 +123,6 @@ in setopt HIST_IGNORE_DUPS SHARE_HISTORY HIST_FCNTL_LOCK - ${cfge.interactiveShellInit} - - ${cfg.promptInit} - ${zshAliases} - # Tell zsh how to find installed completions for p in ''${(z)NIX_PROFILES}; do fpath+=($p/share/zsh/site-functions $p/share/zsh/$ZSH_VERSION/functions) @@ -132,6 +134,16 @@ in "source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" } + ${optionalString (cfg.enableAutosuggestions) + "source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh" + } + + ${zshAliases} + ${cfg.promptInit} + + ${cfge.interactiveShellInit} + + HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help" ''; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index a89ce2c743d..ad1ba86980d 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -150,6 +150,23 @@ with lib; # tarsnap (mkRemovedOptionModule [ "services" "tarsnap" "cachedir" ] "Use services.tarsnap.archives..cachedir") + # alsa + (mkRenamedOptionModule [ "sound" "enableMediaKeys" ] [ "sound" "mediaKeys" "enable" ]) + + # postgrey + (mkMergedOptionModule [ [ "services" "postgrey" "inetAddr" ] [ "services" "postgrey" "inetPort" ] ] [ "services" "postgrey" "socket" ] (config: let + value = p: getAttrFromPath p config; + inetAddr = [ "services" "postgrey" "inetAddr" ]; + inetPort = [ "services" "postgrey" "inetPort" ]; + in + if value inetAddr == null + then { path = "/var/run/postgrey.sock"; } + else { addr = value inetAddr; port = value inetPort; } + )) + + # dhcpd + (mkRenamedOptionModule [ "services" "dhcpd" ] [ "services" "dhcpd4" ]) + # Options that are obsolete and have no replacement. (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "") (mkRemovedOptionModule [ "programs" "bash" "enable" ] "") diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index 6fddb27e6a3..823806f4641 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -67,52 +67,30 @@ options for the security.acme module.
Using ACME certificates in Nginx -In practice ACME is mostly used for retrieval and renewal of - certificates that will be used in a webserver like Nginx. A configuration for - Nginx that uses the certificates from ACME for - foo.example.com will look similar to: +NixOS supports fetching ACME certificates for you by setting +enableACME = true; in a virtualHost config. We +first create self-signed placeholder certificates in place of the +real ACME certs. The placeholder certs are overwritten when the ACME +certs arrive. For foo.example.com the config would +look like. -security.acme.certs."foo.example.com" = { - webroot = config.security.acme.directory + "/acme-challenge"; - email = "foo@example.com"; - user = "nginx"; - group = "nginx"; - postRun = "systemctl restart nginx.service"; -}; -services.nginx.httpConfig = '' - server { - server_name foo.example.com; - listen 80; - listen [::]:80; - - location /.well-known/acme-challenge { - root /var/www/challenges; - } - - location / { - return 301 https://$host$request_uri; - } - } - - server { - server_name foo.example.com; - listen 443 ssl; - ssl_certificate ${config.security.acme.directory}/foo.example.com/fullchain.pem; - ssl_certificate_key ${config.security.acme.directory}/foo.example.com/key.pem; - root /var/www/foo.example.com/; - } -''; +services.nginx = { + enable = true; + virtualHosts = { + "foo.example.com" = { + forceSSL = true; + enableACME = true; + locations."/" = { + root = "/var/www"; + }; + }; + }; +} -Now Nginx will try to use the certificates that will be retrieved by ACME. - ACME needs Nginx (or any other webserver) to function and Nginx needs - the certificates to actually start. For this reason the ACME module - automatically generates self-signed certificates that will be used by Nginx to - start. After that Nginx is used by ACME to retrieve the actual ACME - certificates. security.acme.preliminarySelfsigned can be - used to control whether to generate the self-signed certificates. - +At the moment you still have to restart Nginx after the ACME +certs arrive.
diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index 202639f9870..d323a158a4d 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -18,22 +18,30 @@ in default = []; description = "List of files containing AppArmor profiles."; }; + packages = mkOption { + type = types.listOf types.package; + default = []; + description = "List of packages to be added to apparmor's include path"; + }; }; }; config = mkIf cfg.enable { environment.systemPackages = [ pkgs.apparmor-utils ]; - systemd.services.apparmor = { + systemd.services.apparmor = let + paths = concatMapStrings (s: " -I ${s}/etc/apparmor.d") + ([ pkgs.apparmor-profiles ] ++ cfg.packages); + in { wantedBy = [ "local-fs.target" ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = "yes"; - ExecStart = concatMapStrings (p: - ''${pkgs.apparmor-parser}/bin/apparmor_parser -rKv -I ${pkgs.apparmor-profiles}/etc/apparmor.d "${p}" ; '' + ExecStart = map (p: + ''${pkgs.apparmor-parser}/bin/apparmor_parser -rKv ${paths} "${p}"'' ) cfg.profiles; - ExecStop = concatMapStrings (p: - ''${pkgs.apparmor-parser}/bin/apparmor_parser -Rv "${p}" ; '' + ExecStop = map (p: + ''${pkgs.apparmor-parser}/bin/apparmor_parser -Rv "${p}"'' ) cfg.profiles; }; }; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index f9aa4136c8d..96e7c45d496 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -233,6 +233,8 @@ let account sufficient pam_unix.so ${optionalString use_ldap "account sufficient ${pam_ldap}/lib/security/pam_ldap.so"} + ${optionalString config.services.sssd.enable + "account sufficient ${pkgs.sssd}/lib/security/pam_sss.so"} ${optionalString config.krb5.enable "account sufficient ${pam_krb5}/lib/security/pam_krb5.so"} @@ -273,6 +275,8 @@ let "auth sufficient ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"} ${optionalString use_ldap "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass"} + ${optionalString config.services.sssd.enable + "auth sufficient ${pkgs.sssd}/lib/security/pam_sss.so use_first_pass"} ${optionalString config.krb5.enable '' auth [default=ignore success=1 service_err=reset] ${pam_krb5}/lib/security/pam_krb5.so use_first_pass auth [default=die success=done] ${pam_ccreds}/lib/security/pam_ccreds.so action=validate use_first_pass @@ -288,6 +292,8 @@ let "password optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} ${optionalString use_ldap "password sufficient ${pam_ldap}/lib/security/pam_ldap.so"} + ${optionalString config.services.sssd.enable + "password sufficient ${pkgs.sssd}/lib/security/pam_sss.so use_authtok"} ${optionalString config.krb5.enable "password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass"} ${optionalString config.services.samba.syncPasswordsByPam @@ -303,13 +309,15 @@ let if config.boot.isContainer then "optional" else "required" } pam_loginuid.so"} ${optionalString cfg.makeHomeDir - "session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=/etc/skel umask=0022"} + "session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=${config.security.pam.makeHomeDir.skelDirectory} umask=0022"} ${optionalString cfg.updateWtmp "session required ${pkgs.pam}/lib/security/pam_lastlog.so silent"} ${optionalString config.security.pam.enableEcryptfs "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} ${optionalString use_ldap "session optional ${pam_ldap}/lib/security/pam_ldap.so"} + ${optionalString config.services.sssd.enable + "session optional ${pkgs.sssd}/lib/security/pam_sss.so"} ${optionalString config.krb5.enable "session optional ${pam_krb5}/lib/security/pam_krb5.so"} ${optionalString cfg.otpwAuth @@ -397,6 +405,16 @@ in ''; }; + security.pam.makeHomeDir.skelDirectory = mkOption { + type = types.str; + default = "/var/empty"; + example = "/etc/skel"; + description = '' + Path to skeleton directory whose contents are copied to home + directories newly created by pam_mkhomedir. + ''; + }; + security.pam.enableSSHAgentAuth = mkOption { default = false; description = @@ -447,6 +465,7 @@ in # Include the PAM modules in the system path mostly for the manpages. [ pkgs.pam ] ++ optional config.users.ldap.enable pam_ldap + ++ optional config.services.sssd.enable pkgs.sssd ++ optionals config.krb5.enable [pam_krb5 pam_ccreds] ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ] ++ optionals config.security.pam.oath.enable [ pkgs.oathToolkit ] diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix index c63f4dc8d7f..53786dbc627 100644 --- a/nixos/modules/services/audio/alsa.nix +++ b/nixos/modules/services/audio/alsa.nix @@ -33,16 +33,6 @@ in ''; }; - enableMediaKeys = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable volume and capture control with keyboard media keys. - - Enabling this will turn on . - ''; - }; - extraConfig = mkOption { type = types.lines; default = ""; @@ -54,6 +44,31 @@ in ''; }; + mediaKeys = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable volume and capture control with keyboard media keys. + + Enabling this will turn on . + ''; + }; + + volumeStep = mkOption { + type = types.string; + default = "1"; + example = "1%"; + description = '' + The value by which to increment/decrement volume on media keys. + + See amixer(1) for allowed values. + ''; + }; + + }; + }; }; @@ -90,17 +105,17 @@ in }; }; - services.actkbd = mkIf config.sound.enableMediaKeys { + services.actkbd = mkIf config.sound.mediaKeys.enable { enable = true; bindings = [ # "Mute" media key { keys = [ 113 ]; events = [ "key" ]; command = "${alsaUtils}/bin/amixer -q set Master toggle"; } # "Lower Volume" media key - { keys = [ 114 ]; events = [ "key" "rep" ]; command = "${alsaUtils}/bin/amixer -q set Master 1- unmute"; } + { keys = [ 114 ]; events = [ "key" "rep" ]; command = "${alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}- unmute"; } # "Raise Volume" media key - { keys = [ 115 ]; events = [ "key" "rep" ]; command = "${alsaUtils}/bin/amixer -q set Master 1+ unmute"; } + { keys = [ 115 ]; events = [ "key" "rep" ]; command = "${alsaUtils}/bin/amixer -q set Master ${config.sound.mediaKeys.volumeStep}+ unmute"; } # "Mic Mute" media key { keys = [ 190 ]; events = [ "key" ]; command = "${alsaUtils}/bin/amixer -q set Capture toggle"; } diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 5ec2e2c2623..a89215d7382 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -83,11 +83,11 @@ in { listenAddress = mkOption { type = types.str; - default = "any"; + default = "127.0.0.1"; + example = "any"; description = '' - This setting sets the address for the daemon to listen on. Careful attention - should be paid if this is assigned to anything other then the default, any. - This setting can deny access to control of the daemon. + The address for the daemon to listen on. + Use any to listen on all addresses. ''; }; diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index fbf7412a6cd..029b11ad98b 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -737,6 +737,8 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "kube-apiserver.service" ]; serviceConfig = { + RestartSec = "30s"; + Restart = "on-failure"; ExecStart = ''${cfg.package}/bin/kube-controller-manager \ --address=${cfg.controllerManager.address} \ --port=${toString cfg.controllerManager.port} \ diff --git a/nixos/modules/services/hardware/pommed.nix b/nixos/modules/services/hardware/pommed.nix index 7be4dc1e846..bf7d6a46a29 100644 --- a/nixos/modules/services/hardware/pommed.nix +++ b/nixos/modules/services/hardware/pommed.nix @@ -2,7 +2,9 @@ with lib; -{ +let cfg = config.services.hardware.pommed; + defaultConf = "${pkgs.pommed_light}/etc/pommed.conf.mactel"; +in { options = { @@ -12,37 +14,37 @@ with lib; type = types.bool; default = false; description = '' - Whether to use the pommed tool to handle Apple laptop keyboard hotkeys. + Whether to use the pommed tool to handle Apple laptop + keyboard hotkeys. ''; }; configFile = mkOption { - type = types.path; + type = types.nullOr types.path; + default = null; description = '' - The path to the pommed.conf file. + The path to the pommed.conf file. Leave + to null to use the default config file + (/etc/pommed.conf.mactel). See the + files /etc/pommed.conf.mactel and + /etc/pommed.conf.pmac for examples to + build on. ''; }; }; }; - config = mkIf config.services.hardware.pommed.enable { - environment.systemPackages = [ pkgs.polkit ]; + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.polkit pkgs.pommed_light ]; - environment.etc."pommed.conf".source = config.services.hardware.pommed.configFile; - - services.hardware.pommed.configFile = "${pkgs.pommed}/etc/pommed.conf"; - - services.dbus.packages = [ pkgs.pommed ]; + environment.etc."pommed.conf".source = + if cfg.configFile == null then defaultConf else cfg.configFile; systemd.services.pommed = { - description = "Pommed hotkey management"; + description = "Pommed Apple Hotkeys Daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "dbus.service" ]; - postStop = "rm -f /var/run/pommed.pid"; - script = "${pkgs.pommed}/bin/pommed"; - serviceConfig.Type = "forking"; - path = [ pkgs.eject ]; + script = "${pkgs.pommed_light}/bin/pommed -f"; }; }; } diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 14d65978c32..028907693a5 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -143,7 +143,10 @@ let done echo "Generating hwdb database..." - ${udev}/bin/udevadm hwdb --update --root=$(pwd) + # hwdb --update doesn't return error code even on errors! + res="$(${udev}/bin/udevadm hwdb --update --root=$(pwd) 2>&1)" + echo "$res" + [ -z "$(echo "$res" | egrep '^Error')" ] mv etc/udev/hwdb.bin $out ''; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 4c9df935deb..f2097638c63 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -241,6 +241,9 @@ in RuntimeDirectory = [ "dovecot2" ]; }; + # When copying sieve scripts preserve the original time stamp + # (should be 0) so that the compiled sieve script is newer than + # the source file and Dovecot won't try to compile it. preStart = '' rm -rf ${stateDir}/sieve '' + optionalString (cfg.sieveScripts != {}) '' @@ -248,11 +251,11 @@ in ${concatStringsSep "\n" (mapAttrsToList (to: from: '' if [ -d '${from}' ]; then mkdir '${stateDir}/sieve/${to}' - cp "${from}/"*.sieve '${stateDir}/sieve/${to}' + cp -p "${from}/"*.sieve '${stateDir}/sieve/${to}' else - cp '${from}' '${stateDir}/sieve/${to}' + cp -p '${from}' '${stateDir}/sieve/${to}' fi - ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/sieve/${to}' + ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/sieve/${to}' '') cfg.sieveScripts)} chown -R '${cfg.mailUser}:${cfg.mailGroup}' '${stateDir}/sieve' ''; diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix index 0db631868cc..d4ae25c066a 100644 --- a/nixos/modules/services/mail/postgrey.nix +++ b/nixos/modules/services/mail/postgrey.nix @@ -4,6 +4,43 @@ with lib; let cfg = config.services.postgrey; + natural = with types; addCheck int (x: x >= 0); + natural' = with types; addCheck int (x: x > 0); + + socket = with types; addCheck (either (submodule unixSocket) (submodule inetSocket)) (x: x ? "path" || x ? "port"); + + inetSocket = with types; { + options = { + addr = mkOption { + type = nullOr string; + default = null; + example = "127.0.0.1"; + description = "The address to bind to. Localhost if null"; + }; + port = mkOption { + type = natural'; + default = 10030; + description = "Tcp port to bind to"; + }; + }; + }; + + unixSocket = with types; { + options = { + path = mkOption { + type = path; + default = "/var/run/postgrey.sock"; + description = "Path of the unix socket"; + }; + + mode = mkOption { + type = string; + default = "0777"; + description = "Mode of the unix socket"; + }; + }; + }; + in { options = { @@ -13,21 +50,83 @@ in { default = false; description = "Whether to run the Postgrey daemon"; }; - inetAddr = mkOption { - type = nullOr string; - default = null; - example = "127.0.0.1"; - description = "The inet address to bind to. If none given, bind to /var/run/postgrey.sock"; - }; - inetPort = mkOption { - type = int; - default = 10030; - description = "The tcp port to bind to"; + socket = mkOption { + type = socket; + default = { + path = "/var/run/postgrey.sock"; + mode = "0777"; + }; + example = { + addr = "127.0.0.1"; + port = 10030; + }; + description = "Socket to bind to"; }; greylistText = mkOption { type = string; default = "Greylisted for %%s seconds"; - description = "Response status text for greylisted messages"; + description = "Response status text for greylisted messages; use %%s for seconds left until greylisting is over and %%r for mail domain of recipient"; + }; + greylistAction = mkOption { + type = string; + default = "DEFER_IF_PERMIT"; + description = "Response status for greylisted messages (see access(5))"; + }; + greylistHeader = mkOption { + type = string; + default = "X-Greylist: delayed %%t seconds by postgrey-%%v at %%h; %%d"; + description = "Prepend header to greylisted mails; use %%t for seconds delayed due to greylisting, %%v for the version of postgrey, %%d for the date, and %%h for the host"; + }; + delay = mkOption { + type = natural; + default = 300; + description = "Greylist for N seconds"; + }; + maxAge = mkOption { + type = natural; + default = 35; + description = "Delete entries from whitelist if they haven't been seen for N days"; + }; + retryWindow = mkOption { + type = either string natural; + default = 2; + example = "12h"; + description = "Allow N days for the first retry. Use string with appended 'h' to specify time in hours"; + }; + lookupBySubnet = mkOption { + type = bool; + default = true; + description = "Strip the last N bits from IP addresses, determined by IPv4CIDR and IPv6CIDR"; + }; + IPv4CIDR = mkOption { + type = natural; + default = 24; + description = "Strip N bits from IPv4 addresses if lookupBySubnet is true"; + }; + IPv6CIDR = mkOption { + type = natural; + default = 64; + description = "Strip N bits from IPv6 addresses if lookupBySubnet is true"; + }; + privacy = mkOption { + type = bool; + default = true; + description = "Store data using one-way hash functions (SHA1)"; + }; + autoWhitelist = mkOption { + type = nullOr natural'; + default = 5; + description = "Whitelist clients after successful delivery of N messages"; + }; + whitelistClients = mkOption { + type = listOf path; + default = []; + description = "Client address whitelist files (see postgrey(8))"; + }; + whitelistRecipients = mkOption { + type = listOf path; + default = []; + description = "Recipient address whitelist files (see postgrey(8))"; }; }; }; @@ -52,10 +151,10 @@ in { }; systemd.services.postgrey = let - bind-flag = if isNull cfg.inetAddr then - "--unix=/var/run/postgrey.sock" + bind-flag = if cfg.socket ? "path" then + ''--unix=${cfg.socket.path} --socketmode=${cfg.socket.mode}'' else - "--inet=${cfg.inetAddr}:${cfg.inetPort}"; + ''--inet=${optionalString (cfg.socket.addr != null) (cfg.socket.addr + ":")}${toString cfg.socket.port}''; in { description = "Postfix Greylisting Service"; wantedBy = [ "multi-user.target" ]; @@ -67,7 +166,23 @@ in { ''; serviceConfig = { Type = "simple"; - ExecStart = ''${pkgs.postgrey}/bin/postgrey ${bind-flag} --pidfile=/var/run/postgrey.pid --group=postgrey --user=postgrey --dbdir=/var/postgrey --greylist-text="${cfg.greylistText}"''; + ExecStart = ''${pkgs.postgrey}/bin/postgrey \ + ${bind-flag} \ + --group=postgrey --user=postgrey \ + --dbdir=/var/postgrey \ + --delay=${toString cfg.delay} \ + --max-age=${toString cfg.maxAge} \ + --retry-window=${toString cfg.retryWindow} \ + ${if cfg.lookupBySubnet then "--lookup-by-subnet" else "--lookup-by-host"} \ + --ipv4cidr=${toString cfg.IPv4CIDR} --ipv6cidr=${toString cfg.IPv6CIDR} \ + ${optionalString cfg.privacy "--privacy"} \ + --auto-whitelist-clients=${toString (if cfg.autoWhitelist == null then 0 else cfg.autoWhitelist)} \ + --greylist-action=${cfg.greylistAction} \ + --greylist-text="${cfg.greylistText}" \ + --x-greylist-header="${cfg.greylistHeader}" \ + ${concatMapStringsSep " " (x: "--whitelist-clients=" + x) cfg.whitelistClients} \ + ${concatMapStringsSep " " (x: "--whitelist-recipients=" + x) cfg.whitelistRecipients} + ''; Restart = "always"; RestartSec = 5; TimeoutSec = 10; diff --git a/nixos/modules/services/misc/couchpotato.nix b/nixos/modules/services/misc/couchpotato.nix new file mode 100644 index 00000000000..49648762235 --- /dev/null +++ b/nixos/modules/services/misc/couchpotato.nix @@ -0,0 +1,50 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.couchpotato; + +in +{ + options = { + services.couchpotato = { + enable = mkEnableOption "CouchPotato Server"; + }; + }; + + config = mkIf cfg.enable { + systemd.services.couchpotato = { + description = "CouchPotato Server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + preStart = '' + mkdir -p /var/lib/couchpotato + chown -R couchpotato:couchpotato /var/lib/couchpotato + ''; + + serviceConfig = { + Type = "simple"; + User = "couchpotato"; + Group = "couchpotato"; + PermissionsStartOnly = "true"; + ExecStart = "${pkgs.couchpotato}/bin/couchpotato"; + Restart = "on-failure"; + }; + }; + + users.extraUsers = singleton + { name = "couchpotato"; + group = "couchpotato"; + home = "/var/lib/couchpotato/"; + description = "CouchPotato daemon user"; + uid = config.ids.uids.couchpotato; + }; + + users.extraGroups = singleton + { name = "couchpotato"; + gid = config.ids.gids.couchpotato; + }; + }; +} diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index e2bbd4b01aa..7101cadfeed 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -105,7 +105,9 @@ in If set, Nix will perform builds in a sandboxed environment that it will set up automatically for each build. This prevents impurities in builds by disallowing access to dependencies - outside of the Nix store. + outside of the Nix store. This isn't enabled by default for + performance. It doesn't affect derivation hashes, so changing + this option will not trigger a rebuild of packages. "; }; diff --git a/nixos/modules/services/misc/nscd-sssd.conf b/nixos/modules/services/misc/nscd-sssd.conf new file mode 100644 index 00000000000..92380f3e4ba --- /dev/null +++ b/nixos/modules/services/misc/nscd-sssd.conf @@ -0,0 +1,36 @@ +server-user nscd +threads 1 +paranoia no +debug-level 0 + +enable-cache passwd yes +positive-time-to-live passwd 0 +negative-time-to-live passwd 0 +suggested-size passwd 211 +check-files passwd yes +persistent passwd no +shared passwd yes + +enable-cache group yes +positive-time-to-live group 0 +negative-time-to-live group 0 +suggested-size group 211 +check-files group yes +persistent group no +shared group yes + +enable-cache hosts yes +positive-time-to-live hosts 600 +negative-time-to-live hosts 5 +suggested-size hosts 211 +check-files hosts yes +persistent hosts no +shared hosts yes + +enable-cache services yes +positive-time-to-live services 0 +negative-time-to-live services 0 +suggested-size services 211 +check-files services yes +persistent services no +shared services yes diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix index 92b352db416..f6bf2dee986 100644 --- a/nixos/modules/services/misc/plex.nix +++ b/nixos/modules/services/misc/plex.nix @@ -19,6 +19,14 @@ in description = "The directory where Plex stores its data files."; }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open ports in the firewall for the media server + ''; + }; + user = mkOption { type = types.str; default = "plex"; @@ -127,7 +135,7 @@ in User = cfg.user; Group = cfg.group; PermissionsStartOnly = "true"; - ExecStart = "/bin/sh -c '${cfg.package}/usr/lib/plexmediaserver/Plex\\ Media\\ Server'"; + ExecStart = "/bin/sh -c ${cfg.package}/usr/lib/plexmediaserver/Plex\\ Media\\ Server"; Restart = "on-failure"; }; environment = { @@ -141,6 +149,11 @@ in }; }; + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ 32400 3005 8324 32469 ]; + allowedUDPPorts = [ 1900 5353 32410 32412 32413 32414 ]; + }; + users.extraUsers = mkIf (cfg.user == "plex") { plex = { group = cfg.group; diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix new file mode 100644 index 00000000000..e818f4a4804 --- /dev/null +++ b/nixos/modules/services/misc/sssd.nix @@ -0,0 +1,97 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.sssd; + nscd = config.services.nscd; +in { + options = { + services.sssd = { + enable = mkEnableOption "the System Security Services Daemon."; + + config = mkOption { + type = types.lines; + description = "Contents of sssd.conf."; + default = '' + [sssd] + config_file_version = 2 + services = nss, pam + domains = shadowutils + + [nss] + + [pam] + + [domain/shadowutils] + id_provider = proxy + proxy_lib_name = files + auth_provider = proxy + proxy_pam_target = sssd-shadowutils + proxy_fast_alias = True + ''; + }; + + sshAuthorizedKeysIntegration = mkOption { + type = types.bool; + default = false; + description = '' + Whether to make sshd look up authorized keys from SSS. + For this to work, the ssh SSS service must be enabled in the sssd configuration. + ''; + }; + }; + }; + config = mkMerge [ + (mkIf cfg.enable { + assertions = singleton { + assertion = nscd.enable; + message = "nscd must be enabled through `services.nscd.enable` for SSSD to work."; + }; + + systemd.services.sssd = { + description = "System Security Services Daemon"; + wantedBy = [ "multi-user.target" ]; + before = [ "systemd-user-sessions.service" "nss-user-lookup.target" ]; + after = [ "network-online.target" "nscd.service" ]; + requires = [ "network-online.target" "nscd.service" ]; + wants = [ "nss-user-lookup.target" ]; + restartTriggers = [ + config.environment.etc."nscd.conf".source + config.environment.etc."sssd/sssd.conf".source + ]; + script = '' + export LDB_MODULES_PATH+="''${LDB_MODULES_PATH+:}${pkgs.ldb}/modules/ldb:${pkgs.sssd}/modules/ldb" + mkdir -p /var/lib/sss/{pubconf,db,mc,pipes,gpo_cache,secrets} /var/lib/sss/pipes/private /var/lib/sss/pubconf/krb5.include.d + ${pkgs.sssd}/bin/sssd -D + ''; + serviceConfig = { + Type = "forking"; + PIDFile = "/run/sssd.pid"; + }; + }; + + environment.etc."sssd/sssd.conf" = { + text = cfg.config; + mode = "0400"; + }; + + system.nssModules = optional cfg.enable pkgs.sssd; + services.nscd.config = builtins.readFile ./nscd-sssd.conf; + services.dbus.packages = [ pkgs.sssd ]; + }) + + (mkIf cfg.sshAuthorizedKeysIntegration { + # Ugly: sshd refuses to start if a store path is given because /nix/store is group-writable. + # So indirect by a symlink. + environment.etc."ssh/authorized_keys_command" = { + mode = "0755"; + text = '' + #!/bin/sh + exec ${pkgs.sssd}/bin/sss_ssh_authorizedkeys "$@" + ''; + }; + services.openssh.extraConfig = '' + AuthorizedKeysCommand /etc/ssh/authorized_keys_command + AuthorizedKeysCommandUser nobody + ''; + })]; +} diff --git a/nixos/modules/services/monitoring/arbtt.nix b/nixos/modules/services/monitoring/arbtt.nix new file mode 100644 index 00000000000..27d59e367d5 --- /dev/null +++ b/nixos/modules/services/monitoring/arbtt.nix @@ -0,0 +1,63 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.arbtt; +in { + options = { + services.arbtt = { + enable = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Enable the arbtt statistics capture service. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.haskellPackages.arbtt; + defaultText = "pkgs.haskellPackages.arbtt"; + example = literalExample "pkgs.haskellPackages.arbtt"; + description = '' + The package to use for the arbtt binaries. + ''; + }; + + logFile = mkOption { + type = types.str; + default = "%h/.arbtt/capture.log"; + example = "/home/username/.arbtt-capture.log"; + description = '' + The log file for captured samples. + ''; + }; + + sampleRate = mkOption { + type = types.int; + default = 60; + example = 120; + description = '' + The sampling interval in seconds. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.user.services.arbtt = { + description = "arbtt statistics capture service"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + ExecStart = "${cfg.package}/bin/arbtt-capture --logfile=${cfg.logFile} --sample-rate=${toString cfg.sampleRate}"; + Restart = "always"; + }; + }; + }; + + meta.maintainers = [ maintainers.michaelpj ]; +} diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index b8be9296bc9..c5352e5887d 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -585,7 +585,7 @@ in { serviceConfig = { ExecStart = '' ${pkgs.pythonPackages.graphite_beacon}/bin/graphite-beacon \ - --config ${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)} + --config=${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)} ''; User = "graphite"; Group = "graphite"; diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix index a9c0ce4ed6c..cf761edad92 100644 --- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix +++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix @@ -5,6 +5,10 @@ with lib; let cfg = config.services.prometheus.alertmanager; mkConfigFile = pkgs.writeText "alertmanager.yml" (builtins.toJSON cfg.configuration); + alertmanagerYml = + if cfg.configText != null then + pkgs.writeText "alertmanager.yml" cfg.configText + else mkConfigFile; in { options = { services.prometheus.alertmanager = { @@ -34,6 +38,17 @@ in { ''; }; + configText = mkOption { + type = types.nullOr types.lines; + default = null; + description = '' + Alertmanager configuration as YAML text. If non-null, this option + defines the text that is written to alertmanager.yml. If null, the + contents of alertmanager.yml is generated from the structured config + options. + ''; + }; + logFormat = mkOption { type = types.nullOr types.str; default = null; @@ -62,8 +77,8 @@ in { }; listenAddress = mkOption { - type = types.nullOr types.str; - default = null; + type = types.str; + default = ""; description = '' Address to listen on for the web interface and API. ''; @@ -96,7 +111,7 @@ in { after = [ "network.target" ]; script = '' ${pkgs.prometheus-alertmanager.bin}/bin/alertmanager \ - -config.file ${mkConfigFile} \ + -config.file ${alertmanagerYml} \ -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ -log.level ${cfg.logLevel} \ ${optionalString (cfg.webExternalUrl != null) ''-web.external-url ${cfg.webExternalUrl} \''} diff --git a/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix new file mode 100644 index 00000000000..7a343299c31 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/blackbox-exporter.nix @@ -0,0 +1,67 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.blackboxExporter; +in { + options = { + services.prometheus.blackboxExporter = { + enable = mkEnableOption "prometheus blackbox exporter"; + + configFile = mkOption { + type = types.path; + description = '' + Path to configuration file. + ''; + }; + + port = mkOption { + type = types.int; + default = 9115; + description = '' + Port to listen on. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching the blackbox exporter. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; + + systemd.services.prometheus-blackbox-exporter = { + description = "Prometheus exporter for blackbox probes"; + unitConfig.Documentation = "https://github.com/prometheus/blackbox_exporter"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "nobody"; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = /tmp; + ExecStart = '' + ${pkgs.prometheus-blackbox-exporter}/bin/blackbox_exporter \ + -web.listen-address :${toString cfg.port} \ + -config.file ${cfg.configFile} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index d692dd5fc79..a07445ce167 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -191,6 +191,7 @@ let }; labels = mkOption { type = types.attrsOf types.str; + default = {}; description = '' Labels assigned to all metrics scraped from the targets. ''; diff --git a/nixos/modules/services/monitoring/prometheus/json-exporter.nix b/nixos/modules/services/monitoring/prometheus/json-exporter.nix new file mode 100644 index 00000000000..6bc56df9834 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/json-exporter.nix @@ -0,0 +1,74 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.jsonExporter; +in { + options = { + services.prometheus.jsonExporter = { + enable = mkEnableOption "prometheus JSON exporter"; + + url = mkOption { + type = types.str; + description = '' + URL to scrape JSON from. + ''; + }; + + configFile = mkOption { + type = types.path; + description = '' + Path to configuration file. + ''; + }; + + port = mkOption { + type = types.int; + default = 7979; + description = '' + Port to listen on. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching the JSON exporter. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; + + systemd.services.prometheus-json-exporter = { + description = "Prometheus exporter for JSON over HTTP"; + unitConfig.Documentation = "https://github.com/kawamuray/prometheus-json-exporter"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "nobody"; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = /tmp; + ExecStart = '' + ${pkgs.prometheus-json-exporter}/bin/prometheus-json-exporter \ + --port ${toString cfg.port} \ + ${cfg.url} ${cfg.configFile} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix b/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix new file mode 100644 index 00000000000..1ccafee3b18 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/nginx-exporter.nix @@ -0,0 +1,78 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.nginxExporter; +in { + options = { + services.prometheus.nginxExporter = { + enable = mkEnableOption "prometheus nginx exporter"; + + port = mkOption { + type = types.int; + default = 9113; + description = '' + Port to listen on. + ''; + }; + + listenAddress = mkOption { + type = types.string; + default = "0.0.0.0"; + description = '' + Address to listen on. + ''; + }; + + scrapeUri = mkOption { + type = types.string; + default = "http://localhost/nginx_status"; + description = '' + Address to access the nginx status page. + Can be enabled with services.nginx.statusPage = true. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching the nginx exporter. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; + + systemd.services.prometheus-nginx-exporter = { + after = [ "network.target" "nginx.service" ]; + description = "Prometheus exporter for nginx metrics"; + unitConfig.Documentation = "https://github.com/discordianfish/nginx_exporter"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "nobody"; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = /tmp; + ExecStart = '' + ${pkgs.prometheus-nginx-exporter}/bin/nginx_exporter \ + -nginx.scrape_uri '${cfg.scrapeUri}' \ + -telemetry.address ${cfg.listenAddress}:${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/node-exporter.nix b/nixos/modules/services/monitoring/prometheus/node-exporter.nix index 52dc14effc4..0cf0b85afb5 100644 --- a/nixos/modules/services/monitoring/prometheus/node-exporter.nix +++ b/nixos/modules/services/monitoring/prometheus/node-exporter.nix @@ -44,10 +44,20 @@ in { Extra commandline options when launching the node exporter. ''; }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; }; }; config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; + systemd.services.prometheus-node-exporter = { description = "Prometheus exporter for machine metrics"; unitConfig.Documentation = "https://github.com/prometheus/node_exporter"; diff --git a/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix b/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix new file mode 100644 index 00000000000..fe33f8c1f04 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/snmp-exporter.nix @@ -0,0 +1,127 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.snmpExporter; + mkConfigFile = pkgs.writeText "snmp.yml" (if cfg.configurationPath == null then builtins.toJSON cfg.configuration else builtins.readFile cfg.configurationPath); +in { + options = { + services.prometheus.snmpExporter = { + enable = mkEnableOption "Prometheus snmp exporter"; + + user = mkOption { + type = types.str; + default = "nobody"; + description = '' + User name under which snmp exporter shall be run. + ''; + }; + + group = mkOption { + type = types.str; + default = "nogroup"; + description = '' + Group under which snmp exporter shall be run. + ''; + }; + + port = mkOption { + type = types.int; + default = 9116; + description = '' + Port to listen on. + ''; + }; + + listenAddress = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Address to listen on for web interface and telemetry. + ''; + }; + + configurationPath = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to a snmp exporter configuration file. Mutually exclusive with 'configuration' option. + ''; + example = "./snmp.yml"; + }; + + configuration = mkOption { + type = types.nullOr types.attrs; + default = {}; + description = '' + Snmp exporter configuration as nix attribute set. Mutually exclusive with 'configurationPath' option. + ''; + example = '' + { + "default" = { + "version" = 2; + "auth" = { + "community" = "public"; + }; + }; + }; + ''; + }; + + logFormat = mkOption { + type = types.str; + default = "logger:stderr"; + description = '' + Set the log target and format. + ''; + }; + + logLevel = mkOption { + type = types.enum ["debug" "info" "warn" "error" "fatal"]; + default = "info"; + description = '' + Only log messages with the given severity or above. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; + + assertions = singleton + { + assertion = (cfg.configurationPath == null) != (cfg.configuration == null); + message = "Please ensure you have either 'configuration' or 'configurationPath' set!"; + }; + + systemd.services.prometheus-snmp-exporter = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + script = '' + ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \ + -config.file ${mkConfigFile} \ + -log.format ${cfg.logFormat} \ + -log.level ${cfg.logLevel} \ + -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port} + ''; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = "/tmp"; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix b/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix new file mode 100644 index 00000000000..143ebb62aea --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/varnish-exporter.nix @@ -0,0 +1,61 @@ +{ config, pkgs, lib, ... }: + +# Shamelessly cribbed from nginx-exporter.nix. ~ C. +with lib; + +let + cfg = config.services.prometheus.varnishExporter; +in { + options = { + services.prometheus.varnishExporter = { + enable = mkEnableOption "prometheus Varnish exporter"; + + port = mkOption { + type = types.int; + default = 9131; + description = '' + Port to listen on. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching the Varnish exporter. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; + + systemd.services.prometheus-varnish-exporter = { + description = "Prometheus exporter for Varnish metrics"; + unitConfig.Documentation = "https://github.com/jonnenauha/prometheus_varnish_exporter"; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.varnish ]; + script = '' + exec ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \ + -web.listen-address :${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + serviceConfig = { + User = "nobody"; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = /tmp; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + }; +} diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 104b5b92620..d43147a16f3 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -67,6 +67,14 @@ in ''; }; + emptyRepo = mkOption { + type = types.bool; + default = false; + description = '' + If set to true, the repo won't be initialized with help files + ''; + }; + extraFlags = mkOption { type = types.listOf types.str; description = "Extra flags passed to the IPFS daemon"; @@ -103,16 +111,17 @@ in after = [ "network.target" "local-fs.target" ]; path = [ pkgs.ipfs pkgs.su pkgs.bash ]; - preStart = - '' - install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir} - if [[ ! -d ${cfg.dataDir}/.ipfs ]]; then - cd ${cfg.dataDir} - ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c "${ipfs}/bin/ipfs init" - fi - ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c "${ipfs}/bin/ipfs config Addresses.API ${cfg.apiAddress}" - ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c "${ipfs}/bin/ipfs config Addresses.Gateway ${cfg.gatewayAddress}" - ''; + preStart = '' + install -m 0755 -o ${cfg.user} -g ${cfg.group} -d ${cfg.dataDir} + if [[ ! -d ${cfg.dataDir}/.ipfs ]]; then + cd ${cfg.dataDir} + ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c \ + "${ipfs}/bin/ipfs init ${if cfg.emptyRepo then "-e" else ""}" + fi + ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh ${cfg.user} -c \ + "${ipfs}/bin/ipfs --local config Addresses.API ${cfg.apiAddress} && \ + ${ipfs}/bin/ipfs --local config Addresses.Gateway ${cfg.gatewayAddress}" + ''; serviceConfig = { ExecStart = "${ipfs}/bin/ipfs daemon ${ipfsFlags}"; diff --git a/nixos/modules/services/networking/asterisk.nix b/nixos/modules/services/networking/asterisk.nix index 13617a1b6c5..5c71a1d8dda 100644 --- a/nixos/modules/services/networking/asterisk.nix +++ b/nixos/modules/services/networking/asterisk.nix @@ -6,29 +6,38 @@ let cfg = config.services.asterisk; asteriskUser = "asterisk"; + asteriskGroup = "asterisk"; varlibdir = "/var/lib/asterisk"; spooldir = "/var/spool/asterisk"; logdir = "/var/log/asterisk"; + # Add filecontents from files of useTheseDefaultConfFiles to confFiles, do not override + defaultConfFiles = subtractLists (attrNames cfg.confFiles) cfg.useTheseDefaultConfFiles; + allConfFiles = + cfg.confFiles // + builtins.listToAttrs (map (x: { name = x; + value = builtins.readFile (pkgs.asterisk + "/etc/asterisk/" + x); }) + defaultConfFiles); + asteriskEtc = pkgs.stdenv.mkDerivation ((mapAttrs' (name: value: nameValuePair # Fudge the names to make bash happy ((replaceChars ["."] ["_"] name) + "_") (value) - ) cfg.confFiles) // + ) allConfFiles) // { confFilesString = concatStringsSep " " ( - attrNames cfg.confFiles + attrNames allConfFiles ); - name = "asterisk.etc"; + name = "asterisk-etc"; # Default asterisk.conf file # (Notice that astetcdir will be set to the path of this derivation) asteriskConf = '' [directories] - astetcdir => @out@ + astetcdir => /etc/asterisk astmoddir => ${pkgs.asterisk}/lib/asterisk/modules astvarlibdir => /var/lib/asterisk astdbdir => /var/lib/asterisk @@ -169,6 +178,16 @@ in ''; }; + useTheseDefaultConfFiles = mkOption { + default = [ "ari.conf" "acl.conf" "agents.conf" "amd.conf" "calendar.conf" "cdr.conf" "cdr_syslog.conf" "cdr_custom.conf" "cel.conf" "cel_custom.conf" "cli_aliases.conf" "confbridge.conf" "dundi.conf" "features.conf" "hep.conf" "iax.conf" "pjsip.conf" "pjsip_wizard.conf" "phone.conf" "phoneprov.conf" "queues.conf" "res_config_sqlite3.conf" "res_parking.conf" "statsd.conf" "udptl.conf" "unistim.conf" ]; + type = types.listOf types.str; + example = [ "sip.conf" "dundi.conf" ]; + description = ''Sets these config files to the default content. The default value for + this option contains all necesscary files to avoid errors at startup. + This does not override settings via . + ''; + }; + extraArguments = mkOption { default = []; type = types.listOf types.str; @@ -182,12 +201,22 @@ in }; config = mkIf cfg.enable { - users.extraUsers = singleton - { name = asteriskUser; - uid = config.ids.uids.asterisk; - description = "Asterisk daemon user"; - home = varlibdir; - }; + environment.systemPackages = [ pkgs.asterisk ]; + + environment.etc.asterisk.source = asteriskEtc; + + users.extraUsers.asterisk = + { name = asteriskUser; + group = asteriskGroup; + uid = config.ids.uids.asterisk; + description = "Asterisk daemon user"; + home = varlibdir; + }; + + users.extraGroups.asterisk = + { name = asteriskGroup; + gid = config.ids.gids.asterisk; + }; systemd.services.asterisk = { description = '' @@ -196,14 +225,17 @@ in wantedBy = [ "multi-user.target" ]; + # Do not restart, to avoid disruption of running calls. Restart unit by yourself! + restartIfChanged = false; + preStart = '' # Copy skeleton directory tree to /var for d in '${varlibdir}' '${spooldir}' '${logdir}'; do # TODO: Make exceptions for /var directories that likely should be updated if [ ! -e "$d" ]; then mkdir -p "$d" - cp --recursive ${pkgs.asterisk}/"$d" "$d" - chown --recursive ${asteriskUser} "$d" + cp --recursive ${pkgs.asterisk}/"$d"/* "$d"/ + chown --recursive ${asteriskUser}:${asteriskGroup} "$d" find "$d" -type d | xargs chmod 0755 fi done @@ -215,7 +247,9 @@ in # FIXME: This doesn't account for arguments with spaces argString = concatStringsSep " " cfg.extraArguments; in - "${pkgs.asterisk}/bin/asterisk -U ${asteriskUser} -C ${asteriskEtc}/asterisk.conf ${argString} -F"; + "${pkgs.asterisk}/bin/asterisk -U ${asteriskUser} -C /etc/asterisk/asterisk.conf ${argString} -F"; + ExecReload = ''${pkgs.asterisk}/bin/asterisk -x "core reload" + ''; Type = "forking"; PIDFile = "/var/run/asterisk/asterisk.pid"; }; diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 72110e62576..0272b6ceff2 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -155,7 +155,7 @@ in chown ${bindUser} /var/run/named ''; - script = "${pkgs.bind.bin}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f"; + script = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f"; unitConfig.Documentation = "man:named(8)"; }; }; diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix index 174354c9eb4..1a7a1e24b70 100644 --- a/nixos/modules/services/networking/bird.nix +++ b/nixos/modules/services/networking/bird.nix @@ -34,6 +34,7 @@ let ###### implementation config = mkIf cfg.enable { + environment.systemPackages = [ pkg ]; systemd.services.${variant} = { description = "BIRD Internet Routing Daemon"; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index 0dd028997f4..a10851c1652 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -19,21 +19,30 @@ let type = types.str; description = "Public key at the opposite end of the tunnel."; }; + hostname = mkOption { + default = ""; + example = "foobar.hype"; + type = types.str; + description = "Optional hostname to add to /etc/hosts; prevents reverse lookup failures."; + }; }; }; - # check for the required attributes, otherwise - # permit attributes not undefined here - checkPeers = x: - x // { - connectTo = mapAttrs - (name: value: - if !hasAttr "publicKey" value then abort "cjdns peer ${name} missing a publicKey" else - if !hasAttr "password" value then abort "cjdns peer ${name} missing a password" else - value - ) - x.connectTo; - }; + # Additional /etc/hosts entries for peers with an associated hostname + cjdnsExtraHosts = import (pkgs.runCommand "cjdns-hosts" {} + # Generate a builder that produces an output usable as a Nix string value + '' + exec >$out + echo \'\' + ${concatStringsSep "\n" (mapAttrsToList (k: v: + optionalString (v.hostname != "") + "echo $(${pkgs.cjdns}/bin/publictoip6 ${v.publicKey}) ${v.hostname}") + (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo))} + echo \'\' + ''); + + parseModules = x: + x // { connectTo = mapAttrs (name: value: { inherit (value) password publicKey; }) x.connectTo; }; # would be nice to merge 'cfg' with a //, # but the json nesting is wacky. @@ -44,8 +53,8 @@ let }; authorizedPasswords = map (p: { password = p; }) cfg.authorizedPasswords; interfaces = { - ETHInterface = if (cfg.ETHInterface.bind != "") then [ (checkPeers cfg.ETHInterface) ] else [ ]; - UDPInterface = if (cfg.UDPInterface.bind != "") then [ (checkPeers cfg.UDPInterface) ] else [ ]; + ETHInterface = if (cfg.ETHInterface.bind != "") then [ (parseModules cfg.ETHInterface) ] else [ ]; + UDPInterface = if (cfg.UDPInterface.bind != "") then [ (parseModules cfg.UDPInterface) ] else [ ]; }; privateKey = "@CJDNS_PRIVATE_KEY@"; @@ -125,12 +134,12 @@ in ''; }; connectTo = mkOption { - type = types.attrsOf (types.attrsOf types.str); + type = types.attrsOf ( types.submodule ( connectToSubmodule ) ); default = { }; example = { "192.168.1.1:27313" = { - user = "foobar"; - password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; + hostname = "homer.hype"; + password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k"; }; }; @@ -170,12 +179,12 @@ in }; connectTo = mkOption { - type = types.attrsOf (types.attrsOf types.str); + type = types.attrsOf ( types.submodule ( connectToSubmodule ) ); default = { }; example = { "01:02:03:04:05:06" = { - user = "foobar"; - password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; + hostname = "homer.hype"; + password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k"; }; }; @@ -186,6 +195,16 @@ in }; }; + addExtraHosts = mkOption { + type = types.bool; + default = false; + description = '' + Whether to add cjdns peers with an associated hostname to + /etc/hosts. Beware that enabling this + incurs heavy eval-time costs. + ''; + }; + }; }; @@ -248,6 +267,8 @@ in }; }; + networking.extraHosts = mkIf cfg.addExtraHosts cjdnsExtraHosts; + assertions = [ { assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" || cfg.confFile != null ); message = "Neither cjdns.ETHInterface.bind nor cjdns.UDPInterface.bind defined."; diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 5050ecbd749..5928203368d 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -120,7 +120,7 @@ in }; environment.etc."ddclient.conf" = { - enable = config.services.ddclient.configFile == /etc/ddclient.conf; + enable = config.services.ddclient.configFile == "/etc/ddclient.conf"; uid = config.ids.uids.ddclient; mode = "0600"; text = '' @@ -132,7 +132,8 @@ in login=${config.services.ddclient.username} password=${config.services.ddclient.password} protocol=${config.services.ddclient.protocol} - server=${config.services.ddclient.server} + ${let server = config.services.ddclient.server; in + lib.optionalString (server != "") "server=${server}"} ssl=${if config.services.ddclient.ssl then "yes" else "no"} wildcard=YES ${config.services.ddclient.domain} diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix index d2cd00e74a1..86bcaa96f34 100644 --- a/nixos/modules/services/networking/dhcpd.nix +++ b/nixos/modules/services/networking/dhcpd.nix @@ -4,11 +4,10 @@ with lib; let - cfg = config.services.dhcpd; + cfg4 = config.services.dhcpd4; + cfg6 = config.services.dhcpd6; - stateDir = "/var/lib/dhcp"; # Don't use /var/state/dhcp; not FHS-compliant. - - configFile = if cfg.configFile != null then cfg.configFile else pkgs.writeText "dhcpd.conf" + writeConfig = cfg: pkgs.writeText "dhcpd.conf" '' default-lease-time 600; max-lease-time 7200; @@ -29,6 +28,154 @@ let } ''; + dhcpdService = postfix: cfg: optionalAttrs cfg.enable { + "dhcpd${postfix}" = { + description = "DHCPv${postfix} server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + preStart = '' + mkdir -m 755 -p ${cfg.stateDir} + touch ${cfg.stateDir}/dhcpd.leases + ''; + + serviceConfig = + let + configFile = if cfg.configFile != null then cfg.configFile else writeConfig cfg; + args = [ "@${pkgs.dhcp}/sbin/dhcpd" "dhcpd${postfix}" "-${postfix}" + "-pf" "/run/dhcpd${postfix}/dhcpd.pid" + "-cf" "${configFile}" + "-lf" "${cfg.stateDir}/dhcpd.leases" + "-user" "dhcpd" "-group" "nogroup" + ] ++ cfg.extraFlags + ++ cfg.interfaces; + + in { + ExecStart = concatMapStringsSep " " escapeShellArg args; + Type = "forking"; + Restart = "always"; + RuntimeDirectory = [ "dhcpd${postfix}" ]; + PIDFile = "/run/dhcpd${postfix}/dhcpd.pid"; + }; + }; + }; + + machineOpts = {...}: { + config = { + + hostName = mkOption { + type = types.str; + example = "foo"; + description = '' + Hostname which is assigned statically to the machine. + ''; + }; + + ethernetAddress = mkOption { + type = types.str; + example = "00:16:76:9a:32:1d"; + description = '' + MAC address of the machine. + ''; + }; + + ipAddress = mkOption { + type = types.str; + example = "192.168.1.10"; + description = '' + IP address of the machine. + ''; + }; + + }; + }; + + dhcpConfig = postfix: { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable the DHCPv${postfix} server. + ''; + }; + + stateDir = mkOption { + type = types.path; + # We use /var/lib/dhcp for DHCPv4 to save backwards compatibility. + default = "/var/lib/dhcp${if postfix == "4" then "" else postfix}"; + description = '' + State directory for the DHCP server. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + example = '' + option subnet-mask 255.255.255.0; + option broadcast-address 192.168.1.255; + option routers 192.168.1.5; + option domain-name-servers 130.161.158.4, 130.161.33.17, 130.161.180.1; + option domain-name "example.org"; + subnet 192.168.1.0 netmask 255.255.255.0 { + range 192.168.1.100 192.168.1.200; + } + ''; + description = '' + Extra text to be appended to the DHCP server configuration + file. Currently, you almost certainly need to specify something + there, such as the options specifying the subnet mask, DNS servers, + etc. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Additional command line flags to be passed to the dhcpd daemon. + ''; + }; + + configFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + The path of the DHCP server configuration file. If no file + is specified, a file is generated using the other options. + ''; + }; + + interfaces = mkOption { + type = types.listOf types.str; + default = ["eth0"]; + description = '' + The interfaces on which the DHCP server should listen. + ''; + }; + + machines = mkOption { + type = types.listOf (types.submodule machineOpts); + default = []; + example = [ + { hostName = "foo"; + ethernetAddress = "00:16:76:9a:32:1d"; + ipAddress = "192.168.1.10"; + } + { hostName = "bar"; + ethernetAddress = "00:19:d1:1d:c4:9a"; + ipAddress = "192.168.1.11"; + } + ]; + description = '' + A list mapping Ethernet addresses to IPv${postfix} addresses for the + DHCP server. + ''; + }; + + }; + in { @@ -37,85 +184,15 @@ in options = { - services.dhcpd = { - - enable = mkOption { - default = false; - description = " - Whether to enable the DHCP server. - "; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - example = '' - option subnet-mask 255.255.255.0; - option broadcast-address 192.168.1.255; - option routers 192.168.1.5; - option domain-name-servers 130.161.158.4, 130.161.33.17, 130.161.180.1; - option domain-name "example.org"; - subnet 192.168.1.0 netmask 255.255.255.0 { - range 192.168.1.100 192.168.1.200; - } - ''; - description = " - Extra text to be appended to the DHCP server configuration - file. Currently, you almost certainly need to specify - something here, such as the options specifying the subnet - mask, DNS servers, etc. - "; - }; - - extraFlags = mkOption { - default = ""; - example = "-6"; - description = " - Additional command line flags to be passed to the dhcpd daemon. - "; - }; - - configFile = mkOption { - default = null; - description = " - The path of the DHCP server configuration file. If no file - is specified, a file is generated using the other options. - "; - }; - - interfaces = mkOption { - default = ["eth0"]; - description = " - The interfaces on which the DHCP server should listen. - "; - }; - - machines = mkOption { - default = []; - example = [ - { hostName = "foo"; - ethernetAddress = "00:16:76:9a:32:1d"; - ipAddress = "192.168.1.10"; - } - { hostName = "bar"; - ethernetAddress = "00:19:d1:1d:c4:9a"; - ipAddress = "192.168.1.11"; - } - ]; - description = " - A list mapping ethernet addresses to IP addresses for the - DHCP server. - "; - }; - - }; + services.dhcpd4 = dhcpConfig "4"; + services.dhcpd6 = dhcpConfig "6"; }; ###### implementation - config = mkIf config.services.dhcpd.enable { + config = mkIf (cfg4.enable || cfg6.enable) { users = { extraUsers.dhcpd = { @@ -124,36 +201,7 @@ in }; }; - systemd.services.dhcpd = - { description = "DHCP server"; - - wantedBy = [ "multi-user.target" ]; - - after = [ "network.target" ]; - - path = [ pkgs.dhcp ]; - - preStart = - '' - mkdir -m 755 -p ${stateDir} - - touch ${stateDir}/dhcpd.leases - - mkdir -m 755 -p /run/dhcpd - chown dhcpd /run/dhcpd - ''; - - serviceConfig = - { ExecStart = "@${pkgs.dhcp}/sbin/dhcpd dhcpd" - + " -pf /run/dhcpd/dhcpd.pid -cf ${configFile}" - + " -lf ${stateDir}/dhcpd.leases -user dhcpd -group nogroup" - + " ${cfg.extraFlags}" - + " ${toString cfg.interfaces}"; - Restart = "always"; - Type = "forking"; - PIDFile = "/run/dhcpd/dhcpd.pid"; - }; - }; + systemd.services = dhcpdService "4" cfg4 // dhcpdService "6" cfg6; }; diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index 82bf178f4cb..462039803f8 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -263,6 +263,8 @@ in systemd.services.dnscrypt-proxy = { description = "dnscrypt-proxy daemon"; + before = [ "nss-lookup.target" ]; + after = [ "network.target" ] ++ optional apparmorEnabled "apparmor.service" ++ optional useUpstreamResolverList "init-dnscrypt-proxy-statedir.service"; diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 1c0ea5034df..c251b52e03f 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -4,17 +4,29 @@ ‘networking.firewall.extraCommands’. For modularity, the firewall uses several chains: - - ‘nixos-fw-input’ is the main chain for input packet processing. + - ‘nixos-fw’ is the main chain for input packet processing. + + - ‘nixos-fw-accept’ is called for accepted packets. If you want + additional logging, or want to reject certain packets anyway, you + can insert rules at the start of this chain. - ‘nixos-fw-log-refuse’ and ‘nixos-fw-refuse’ are called for refused packets. (The former jumps to the latter after logging the packet.) If you want additional logging, or want to accept certain packets anyway, you can insert rules at the start of - these chain. + this chain. - - ‘nixos-fw-accept’ is called for accepted packets. If you want - additional logging, or want to reject certain packets anyway, you - can insert rules at the start of this chain. + - ‘nixos-fw-rpfilter’ is used as the main chain in the raw table, + called from the built-in ‘PREROUTING’ chain. If the kernel + supports it and `cfg.checkReversePath` is set this chain will + perform a reverse path filter test. + + - ‘nixos-drop’ is used while reloading the firewall in order to drop + all traffic. Since reloading isn't implemented in an atomic way + this'll prevent any traffic from leaking through while reloading + the firewall. However, if the reloading fails, the ‘firewall-stop’ + script will be called which in return will effectively disable the + complete firewall (in the default configuration). */ @@ -26,6 +38,11 @@ let cfg = config.networking.firewall; + kernelPackages = config.boot.kernelPackages; + + kernelHasRPFilter = kernelPackages.kernel.features.netfilterRPFilter or false; + kernelCanDisableHelpers = kernelPackages.kernel.features.canDisableNetfilterConntrackHelpers or false; + helpers = '' # Helper command to manipulate both the IPv4 and IPv6 tables. @@ -49,7 +66,7 @@ let # firewall would be atomic. Apparently that's possible # with iptables-restore. ip46tables -D INPUT -j nixos-fw 2> /dev/null || true - for chain in nixos-fw nixos-fw-accept nixos-fw-log-refuse nixos-fw-refuse FW_REFUSE; do + for chain in nixos-fw nixos-fw-accept nixos-fw-log-refuse nixos-fw-refuse; do ip46tables -F "$chain" 2> /dev/null || true ip46tables -X "$chain" 2> /dev/null || true done @@ -172,13 +189,16 @@ let }-j nixos-fw-accept ''} - # Accept all ICMPv6 messages except redirects and node - # information queries (type 139). See RFC 4890, section - # 4.4. ${optionalString config.networking.enableIPv6 '' + # Accept all ICMPv6 messages except redirects and node + # information queries (type 139). See RFC 4890, section + # 4.4. ip6tables -A nixos-fw -p icmpv6 --icmpv6-type redirect -j DROP ip6tables -A nixos-fw -p icmpv6 --icmpv6-type 139 -j DROP ip6tables -A nixos-fw -p icmpv6 -j nixos-fw-accept + + # Allow this host to act as a DHCPv6 client + ip6tables -A nixos-fw -d fe80::/64 -p udp --dport 546 -j nixos-fw-accept ''} ${cfg.extraCommands} @@ -228,11 +248,6 @@ let fi ''; - kernelPackages = config.boot.kernelPackages; - - kernelHasRPFilter = kernelPackages.kernel.features.netfilterRPFilter or false; - kernelCanDisableHelpers = kernelPackages.kernel.features.canDisableNetfilterConntrackHelpers or false; - in { @@ -290,26 +305,30 @@ in default = false; description = '' - If set, forbidden packets are rejected rather than dropped + If set, refused packets are rejected rather than dropped (ignored). This means that an ICMP "port unreachable" error - message is sent back to the client. Rejecting packets makes + message is sent back to the client (or a TCP RST packet in + case of an existing connection). Rejecting packets makes port scanning somewhat easier. ''; }; networking.firewall.trustedInterfaces = mkOption { type = types.listOf types.str; + default = [ ]; + example = [ "enp0s2" ]; description = '' Traffic coming in from these interfaces will be accepted - unconditionally. + unconditionally. Traffic from the loopback (lo) interface + will always be accepted. ''; }; networking.firewall.allowedTCPPorts = mkOption { - default = []; - example = [ 22 80 ]; type = types.listOf types.int; + default = [ ]; + example = [ 22 80 ]; description = '' List of TCP ports on which incoming connections are @@ -318,9 +337,9 @@ in }; networking.firewall.allowedTCPPortRanges = mkOption { - default = []; - example = [ { from = 8999; to = 9003; } ]; type = types.listOf (types.attrsOf types.int); + default = [ ]; + example = [ { from = 8999; to = 9003; } ]; description = '' A range of TCP ports on which incoming connections are @@ -329,9 +348,9 @@ in }; networking.firewall.allowedUDPPorts = mkOption { - default = []; - example = [ 53 ]; type = types.listOf types.int; + default = [ ]; + example = [ 53 ]; description = '' List of open UDP ports. @@ -339,9 +358,9 @@ in }; networking.firewall.allowedUDPPortRanges = mkOption { - default = []; - example = [ { from = 60000; to = 61000; } ]; type = types.listOf (types.attrsOf types.int); + default = [ ]; + example = [ { from = 60000; to = 61000; } ]; description = '' Range of open UDP ports. @@ -349,8 +368,8 @@ in }; networking.firewall.allowPing = mkOption { - default = true; type = types.bool; + default = true; description = '' Whether to respond to incoming ICMPv4 echo requests @@ -361,36 +380,43 @@ in }; networking.firewall.pingLimit = mkOption { - default = null; type = types.nullOr (types.separatedString " "); + default = null; + example = "--limit 1/minute --limit-burst 5"; description = '' If pings are allowed, this allows setting rate limits - on them. If non-null, this option should be in the form - of flags like "--limit 1/minute --limit-burst 5" + on them. If non-null, this option should be in the form of + flags like "--limit 1/minute --limit-burst 5" ''; }; networking.firewall.checkReversePath = mkOption { - default = kernelHasRPFilter; type = types.either types.bool (types.enum ["strict" "loose"]); + default = kernelHasRPFilter; + example = "loose"; description = '' - Performs a reverse path filter test on a packet. - If a reply to the packet would not be sent via the same interface - that the packet arrived on, it is refused. + Performs a reverse path filter test on a packet. If a reply + to the packet would not be sent via the same interface that + the packet arrived on, it is refused. - If using asymmetric routing or other complicated routing, - set this option to loose mode or disable it and setup your - own counter-measures. + If using asymmetric routing or other complicated routing, set + this option to loose mode or disable it and setup your own + counter-measures. + + This option can be either true (or "strict"), "loose" (only + drop the packet if the source address is not reachable via any + interface) or false. Defaults to the value of + kernelHasRPFilter. (needs kernel 3.3+) ''; }; networking.firewall.logReversePathDrops = mkOption { - default = false; type = types.bool; + default = false; description = '' Logs dropped packets failing the reverse path filter test if @@ -399,9 +425,9 @@ in }; networking.firewall.connectionTrackingModules = mkOption { + type = types.listOf types.str; default = [ "ftp" ]; example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ]; - type = types.listOf types.str; description = '' List of connection-tracking helpers that are auto-loaded. @@ -412,14 +438,14 @@ in networking.firewall.autoLoadConntrackHelpers Loading of helpers is recommended to be done through the new - CT target. More info: + CT target. More info: https://home.regit.org/netfilter-en/secure-use-of-helpers/ ''; }; networking.firewall.autoLoadConntrackHelpers = mkOption { - default = true; type = types.bool; + default = true; description = '' Whether to auto-load connection-tracking helpers. @@ -461,7 +487,8 @@ in '' Additional shell commands executed as part of the firewall shutdown script. These are executed just after the removal - of the nixos input rule, or if the service enters a failed state. + of the NixOS input rule, or if the service enters a failed + state. ''; }; @@ -499,7 +526,7 @@ in path = [ pkgs.iptables ] ++ cfg.extraPackages; # FIXME: this module may also try to load kernel modules, but - # containers don't have CAP_SYS_MODULE. So the host system had + # containers don't have CAP_SYS_MODULE. So the host system had # better have all necessary modules already loaded. unitConfig.ConditionCapability = "CAP_NET_ADMIN"; unitConfig.DefaultDependencies = false; diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 578376764eb..abb7a4e9137 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -147,7 +147,7 @@ let host = ${tun.address} port = ${tun.port} inport = ${tun.inPort} - accesslist = ${concatStringSep "," tun.accessList} + accesslist = ${builtins.concatStringsSep "," tun.accessList} '') } ''; diff --git a/nixos/modules/services/networking/miredo.nix b/nixos/modules/services/networking/miredo.nix new file mode 100644 index 00000000000..3d560338e2c --- /dev/null +++ b/nixos/modules/services/networking/miredo.nix @@ -0,0 +1,92 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.miredo; + pidFile = "/run/miredo.pid"; + miredoConf = pkgs.writeText "miredo.conf" '' + InterfaceName ${cfg.interfaceName} + ServerAddress ${cfg.serverAddress} + ${optionalString (cfg.bindAddress != null) "BindAddress ${cfg.bindAddress}"} + ${optionalString (cfg.bindPort != null) "BindPort ${cfg.bindPort}"} + ''; +in +{ + + ###### interface + + options = { + + services.miredo = { + + enable = mkEnableOption "Whether miredo should be run on startup."; + + package = mkOption { + type = types.package; + default = pkgs.miredo; + defaultText = "pkgs.miredo"; + description = '' + The package to use for the miredo daemon's binary. + ''; + }; + + serverAddress = mkOption { + default = "teredo.remlab.net"; + type = types.str; + description = '' + The hostname or primary IPv4 address of the Teredo server. + This setting is required if Miredo runs as a Teredo client. + "teredo.remlab.net" is an experimental service for testing only. + Please use another server for production and/or large scale deployments. + ''; + }; + + interfaceName = mkOption { + default = "teredo"; + type = types.str; + description = '' + Name of the network tunneling interface. + ''; + }; + + bindAddress = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + Depending on the local firewall/NAT rules, you might need to force + Miredo to use a fixed UDP port and or IPv4 address. + ''; + }; + + bindPort = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + Depending on the local firewall/NAT rules, you might need to force + Miredo to use a fixed UDP port and or IPv4 address. + ''; + }; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + systemd.services.miredo = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + description = "Teredo IPv6 Tunneling Daemon"; + serviceConfig = { + Restart = "always"; + RestartSec = "5s"; + ExecStart = "${cfg.package}/bin/miredo -c ${miredoConf} -p ${pidFile} -f"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + + }; + +} diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index 005655f111a..04312c39062 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -11,17 +11,17 @@ let then '' *** General *** - owner = ${cfg.owner} + cgiurl = ${cfg.cgiUrl} contact = ${cfg.ownerEmail} - ${lib.optionalString (cfg.mailHost != "") "mailhost = ${cfg.mailHost}"} - ${lib.optionalString (cfg.sendmail != null) "sendmail = ${cfg.sendmail}"} - imgcache = ${smokepingHome}/cache - imgurl = http://${cfg.hostName}:${builtins.toString cfg.port}/cache datadir = ${smokepingHome}/data + imgcache = ${smokepingHome}/cache + imgurl = ${cfg.imgUrl} + linkstyle = ${cfg.linkStyle} + ${lib.optionalString (cfg.mailHost != "") "mailhost = ${cfg.mailHost}"} + owner = ${cfg.owner} pagedir = ${smokepingHome}/cache piddir = ${smokepingPidDir} - cgiurl = http://${cfg.hostName}:${builtins.toString cfg.port}/smokeping.cgi - linkstyle = ${cfg.linkStyle} + ${lib.optionalString (cfg.sendmail != null) "sendmail = ${cfg.sendmail}"} smokemail = ${cfg.smokeMailTemplate} *** Presentation *** template = ${cfg.presentationTemplate} @@ -54,72 +54,36 @@ in default = false; description = "Enable the smokeping service"; }; - webService = mkOption { - type = types.bool; - default = true; - description = "Enable a smokeping web interface"; - }; + alertConfig = mkOption { + type = types.string; + default = '' + to = root@localhost + from = smokeping@localhost + ''; + example = literalExample '' + to = alertee@address.somewhere + from = smokealert@company.xy - user = mkOption { - type = types.string; - default = "smokeping"; - description = "User that runs smokeping and (optionally) thttpd"; + +someloss + type = loss + # in percent + pattern = >0%,*12*,>0%,*12*,>0% + comment = loss 3 times in a row; + ''; + description = "Configuration for alerts."; }; - mailHost = mkOption { + cgiUrl = mkOption { type = types.string; - default = ""; - example = "localhost"; - description = "Use this SMTP server to send alerts"; + default = "http://${cfg.hostName}:${builtins.toString cfg.port}/smokeping.cgi"; + example = "https://somewhere.example.com/smokeping.cgi"; + description = "URL to the smokeping cgi."; }; - sendmail = mkOption { - type = types.nullOr types.path; + config = mkOption { + type = types.nullOr types.string; default = null; - example = "/var/setuid-wrappers/sendmail"; - description = "Use this sendmail compatible script to deliver alerts"; + description = "Full smokeping config supplied by the user. Overrides " + + "and replaces any other configuration supplied."; }; - smokeMailTemplate = mkOption { - type = types.string; - default = "${cfg.package}/etc/smokemail.dist"; - description = "Specify the smokemail template for alerts."; - }; - - package = mkOption { - type = types.package; - default = pkgs.smokeping; - defaultText = "pkgs.smokeping"; - description = "Specify a custom smokeping package"; - }; - owner = mkOption { - type = types.string; - default = "nobody"; - example = "Joe Admin"; - description = "Real name of the owner of the instance"; - }; - hostName = mkOption { - type = types.string; - default = config.networking.hostName; - example = "somewhere.example.com"; - description = "DNS name for the urls generated in the cgi."; - }; - linkStyle = mkOption { - type = types.enum ["original" "absolute" "relative"]; - default = "relative"; - example = "absolute"; - description = "DNS name for the urls generated in the cgi."; - }; - port = mkOption { - type = types.int; - default = 8081; - example = 8081; - description = "TCP port to use for the web server."; - }; - ownerEmail = mkOption { - type = types.string; - default = "no-reply@${cfg.hostName}"; - example = "no-reply@yourdomain.com"; - description = "Email contact for owner"; - }; - databaseConfig = mkOption { type = types.string; default = '' @@ -152,30 +116,59 @@ in Once set, changing the interval will require deletion or migration of all the collected data.''; }; - alertConfig = mkOption { - type = types.string; - default = '' - to = root@localhost - from = smokeping@localhost - ''; - example = literalExample '' - to = alertee@address.somewhere - from = smokealert@company.xy - - +someloss - type = loss - # in percent - pattern = >0%,*12*,>0%,*12*,>0% - comment = loss 3 times in a row; - ''; - description = "Configuration for alerts."; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Any additional customization not already included."; }; - presentationTemplate = mkOption { + hostName = mkOption { type = types.string; - default = "${pkgs.smokeping}/etc/basepage.html.dist"; - description = "Default page layout for the web UI."; + default = config.networking.hostName; + example = "somewhere.example.com"; + description = "DNS name for the urls generated in the cgi."; + }; + imgUrl = mkOption { + type = types.string; + default = "http://${cfg.hostName}:${builtins.toString cfg.port}/cache"; + example = "https://somewhere.example.com/cache"; + description = "Base url for images generated in the cgi."; + }; + linkStyle = mkOption { + type = types.enum ["original" "absolute" "relative"]; + default = "relative"; + example = "absolute"; + description = "DNS name for the urls generated in the cgi."; + }; + mailHost = mkOption { + type = types.string; + default = ""; + example = "localhost"; + description = "Use this SMTP server to send alerts"; + }; + owner = mkOption { + type = types.string; + default = "nobody"; + example = "Joe Admin"; + description = "Real name of the owner of the instance"; + }; + ownerEmail = mkOption { + type = types.string; + default = "no-reply@${cfg.hostName}"; + example = "no-reply@yourdomain.com"; + description = "Email contact for owner"; + }; + package = mkOption { + type = types.package; + default = pkgs.smokeping; + defaultText = "pkgs.smokeping"; + description = "Specify a custom smokeping package"; + }; + port = mkOption { + type = types.int; + default = 8081; + example = 8081; + description = "TCP port to use for the web server."; }; - presentationConfig = mkOption { type = types.string; default = '' @@ -217,6 +210,11 @@ in ''; description = "presentation graph style"; }; + presentationTemplate = mkOption { + type = types.string; + default = "${pkgs.smokeping}/etc/basepage.html.dist"; + description = "Default page layout for the web UI."; + }; probeConfig = mkOption { type = types.string; default = '' @@ -225,6 +223,17 @@ in ''; description = "Probe configuration"; }; + sendmail = mkOption { + type = types.nullOr types.path; + default = null; + example = "/var/setuid-wrappers/sendmail"; + description = "Use this sendmail compatible script to deliver alerts"; + }; + smokeMailTemplate = mkOption { + type = types.string; + default = "${cfg.package}/etc/smokemail.dist"; + description = "Specify the smokemail template for alerts."; + }; targetConfig = mkOption { type = types.string; default = '' @@ -243,18 +252,16 @@ in ''; description = "Target configuration"; }; - extraConfig = mkOption { - type = types.lines; - default = ""; - description = "Any additional customization not already included."; + user = mkOption { + type = types.string; + default = "smokeping"; + description = "User that runs smokeping and (optionally) thttpd"; }; - config = mkOption { - type = types.nullOr types.string; - default = null; - description = "Full smokeping config supplied by the user. Overrides " + - "and replaces any other configuration supplied."; + webService = mkOption { + type = types.bool; + default = true; + description = "Enable a smokeping web interface"; }; - }; }; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 073391ffdbb..80659f19c59 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -264,8 +264,7 @@ in StandardInput = "socket"; } else { Restart = "always"; - Type = "forking"; - PIDFile = "/run/sshd.pid"; + Type = "simple"; }); }; @@ -322,8 +321,6 @@ in services.openssh.extraConfig = mkOrder 0 '' - PidFile /run/sshd.pid - Protocol 2 UsePAM yes diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 5657b91c1e7..c91ba91fcb4 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -12,11 +12,13 @@ let psk = if networkConfig.psk != null then ''"${networkConfig.psk}"'' else networkConfig.pskRaw; + priority = networkConfig.priority; in '' network={ ssid="${ssid}" ${optionalString (psk != null) ''psk=${psk}''} ${optionalString (psk == null) ''key_mgmt=NONE''} + ${optionalString (priority != null) ''priority=${toString priority}''} } '') cfg.networks)} '' else "/etc/wpa_supplicant.conf"; @@ -68,6 +70,19 @@ in { Mutually exclusive with psk. ''; }; + priority = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + By default, all networks will get same priority group (0). If some of the + networks are more desirable, this field can be used to change the order in + which wpa_supplicant goes through the networks when selecting a BSS. The + priority groups will be iterated in decreasing priority (i.e., the larger the + priority value, the sooner the network is matched against the scan results). + Within each priority group, networks will be selected based on security + policy, signal strength, etc. + ''; + }; }; }); description = '' diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index b045e140546..f71f30fee97 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -81,6 +81,7 @@ in users.extraUsers = singleton { name = clamavUser; uid = config.ids.uids.clamav; + group = clamavGroup; description = "ClamAV daemon user"; home = stateDir; }; diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index d98ef8a306d..eb4b5281c7c 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -9,8 +9,6 @@ let inherit (lib) singleton; - cfgFile = pkgs.writeText "nscd.conf" cfg.config; - in { @@ -41,6 +39,7 @@ in ###### implementation config = mkIf cfg.enable { + environment.etc."nscd.conf".text = cfg.config; users.extraUsers.nscd = { isSystemUser = true; @@ -61,10 +60,14 @@ in mkdir -m 0755 -p /var/db/nscd ''; - restartTriggers = [ config.environment.etc.hosts.source config.environment.etc."nsswitch.conf".source ]; + restartTriggers = [ + config.environment.etc.hosts.source + config.environment.etc."nsswitch.conf".source + config.environment.etc."nscd.conf".source + ]; serviceConfig = - { ExecStart = "@${pkgs.glibc.bin}/sbin/nscd nscd -f ${cfgFile}"; + { ExecStart = "@${pkgs.glibc.bin}/sbin/nscd nscd"; Type = "forking"; PIDFile = "/run/nscd/nscd.pid"; Restart = "always"; @@ -79,7 +82,7 @@ in # its pid. So wait until it's ready. postStart = '' - while ! ${pkgs.glibc.bin}/sbin/nscd -g -f ${cfgFile} > /dev/null; do + while ! ${pkgs.glibc.bin}/sbin/nscd -g > /dev/null; do sleep 0.2 done ''; diff --git a/nixos/modules/services/torrent/flexget.nix b/nixos/modules/services/torrent/flexget.nix index 1252aa1c549..4b9038e3e25 100644 --- a/nixos/modules/services/torrent/flexget.nix +++ b/nixos/modules/services/torrent/flexget.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.flexget; - pkg = pkgs.python27Packages.flexget; + pkg = pkgs.flexget; ymlFile = pkgs.writeText "flexget.yml" '' ${cfg.config} @@ -54,12 +54,12 @@ in { config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.python27Packages.flexget ]; + environment.systemPackages = [ pkg ]; systemd.services = { flexget = { description = "FlexGet Daemon"; - path = [ pkgs.pythonPackages.flexget ]; + path = [ pkg ]; serviceConfig = { User = cfg.user; Environment = "TZ=${config.time.timeZone}"; diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix index 5e79678023d..ada26f8057b 100644 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -6,7 +6,12 @@ let cfg = config.services.crowd; - pkg = pkgs.atlassian-crowd; + pkg = pkgs.atlassian-crowd.override { + home = cfg.home; + port = cfg.listenPort; + proxyUrl = "${cfg.proxy.scheme}://${cfg.proxy.name}:${toString cfg.proxy.port}"; + openidPassword = cfg.openidPassword; + }; in @@ -45,6 +50,11 @@ in description = "Port to listen on."; }; + openidPassword = mkOption { + type = types.str; + description = "Application password for OpenID server."; + }; + catalinaOptions = mkOption { type = types.listOf types.str; default = []; @@ -119,10 +129,10 @@ in }; preStart = '' - mkdir -p ${cfg.home}/{logs,work} + mkdir -p ${cfg.home}/{logs,work,database} mkdir -p /run/atlassian-crowd - ln -sf ${cfg.home}/{work,server.xml} /run/atlassian-crowd + ln -sf ${cfg.home}/{database,work,server.xml} /run/atlassian-crowd chown -R ${cfg.user} ${cfg.home} @@ -134,7 +144,6 @@ in ''; script = "${pkg}/start_crowd.sh"; - #stopScript = "${pkg}/bin/stop_crowd.sh"; serviceConfig = { User = cfg.user; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 2d71bcc0c79..dc0ca501a48 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -16,6 +16,8 @@ let phpMajorVersion = head (splitString "." php.version); + mod_perl = pkgs.mod_perl.override { apacheHttpd = httpd; }; + defaultListen = cfg: if cfg.enableSSL then [{ip = "*"; port = 443;}] else [{ip = "*"; port = 80;}]; @@ -76,6 +78,7 @@ let robotsEntries = ""; startupScript = ""; enablePHP = false; + enablePerl = false; phpOptions = ""; options = {}; documentRoot = null; @@ -355,6 +358,7 @@ let ++ map (name: {inherit name; path = "${httpd}/modules/mod_${name}.so";}) apacheModules ++ optional mainCfg.enableMellon { name = "auth_mellon"; path = "${pkgs.apacheHttpdPackages.mod_auth_mellon}/modules/mod_auth_mellon.so"; } ++ optional enablePHP { name = "php${phpMajorVersion}"; path = "${php}/modules/libphp${phpMajorVersion}.so"; } + ++ optional enablePerl { name = "perl"; path = "${mod_perl}/modules/mod_perl.so"; } ++ concatMap (svc: svc.extraModules) allSubservices ++ extraForeignModules; in concatMapStrings load allModules @@ -415,6 +419,8 @@ let enablePHP = mainCfg.enablePHP || any (svc: svc.enablePHP) allSubservices; + enablePerl = mainCfg.enablePerl || any (svc: svc.enablePerl) allSubservices; + # Generate the PHP configuration file. Should probably be factored # out into a separate module. @@ -579,6 +585,12 @@ in ''; }; + enablePerl = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the Perl module (mod_perl)."; + }; + phpOptions = mkOption { type = types.lines; default = ""; @@ -697,13 +709,6 @@ in ''} mkdir -m 0700 -p ${mainCfg.logDir} - ${optionalString (mainCfg.documentRoot != null) - '' - # Create the document root directory if does not exists yet - mkdir -p ${mainCfg.documentRoot} - '' - } - # Get rid of old semaphores. These tend to accumulate across # server restarts, eventually preventing it from restarting # successfully. diff --git a/nixos/modules/services/web-servers/apache-httpd/trac.nix b/nixos/modules/services/web-servers/apache-httpd/trac.nix index 87ed36e3530..35b9ab56087 100644 --- a/nixos/modules/services/web-servers/apache-httpd/trac.nix +++ b/nixos/modules/services/web-servers/apache-httpd/trac.nix @@ -99,7 +99,7 @@ in makeSearchPathOutput "lib" "lib/${pkgs.python.libPrefix}/site-packages" [ pkgs.mod_python pkgs.pythonPackages.trac - pkgs.setuptools + pkgs.pythonPackages.setuptools pkgs.pythonPackages.genshi pkgs.pythonPackages.psycopg2 subversion diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix index 32dd4439675..26f0bdec655 100644 --- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix +++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix @@ -6,7 +6,7 @@ with lib; let # Upgrading? We have a test! nix-build ./nixos/tests/wordpress.nix - version = "4.6.1"; + version = "4.7.1"; fullversion = "${version}"; # Our bare-bones wp-config.php file using the above settings @@ -75,7 +75,7 @@ let owner = "WordPress"; repo = "WordPress"; rev = "${fullversion}"; - sha256 = "0n82xgjg1ry2p73hhgpslnkdzrma5n6hxxq76s7qskkzj0qjfvpn"; + sha256 = "1wb4f4zn55d23qi0whsfpbpcd4sjvzswgmni6f5rzrmlawq9ssgr"; }; installPhase = '' mkdir -p $out diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index 0666dfddaff..619e0f90b12 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -39,6 +39,13 @@ in type = types.path; description = "The data directory, for storing certificates."; }; + + package = mkOption { + default = pkgs.caddy; + defaultText = "pkgs.caddy"; + type = types.package; + description = "Caddy package to use."; + }; }; config = mkIf cfg.enable { @@ -47,7 +54,7 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = ''${pkgs.caddy.bin}/bin/caddy -conf=${configFile} \ + ExecStart = ''${cfg.package.bin}/bin/caddy -conf=${configFile} \ -ca=${cfg.ca} -email=${cfg.email} ${optionalString cfg.agree "-agree"} ''; Type = "simple"; diff --git a/nixos/modules/services/web-servers/lighttpd/inginious.nix b/nixos/modules/services/web-servers/lighttpd/inginious.nix index 43deccb6aef..669e81d0f14 100644 --- a/nixos/modules/services/web-servers/lighttpd/inginious.nix +++ b/nixos/modules/services/web-servers/lighttpd/inginious.nix @@ -191,9 +191,8 @@ in virtualisation.docker = { enable = true; # We need docker to listen on port 2375. - extraOptions = "-H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock"; + listenOptions = ["127.0.0.1:2375" "/var/run/docker.sock"]; storageDriver = mkDefault "overlay"; - socketActivation = false; }; users.extraUsers."lighttpd".extraGroups = [ "docker" ]; diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 698d37133d7..68a672c42c9 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -10,6 +10,7 @@ let sslCertificateKey = "/var/lib/acme/${vhostName}/key.pem"; }) ) cfg.virtualHosts; + enableIPv6 = config.networking.enableIPv6; configFile = pkgs.writeText "nginx.conf" '' user ${cfg.user} ${cfg.group}; @@ -84,7 +85,7 @@ let ${optionalString cfg.statusPage '' server { listen 80; - listen [::]:80; + ${optionalString enableIPv6 "listen [::]:80;" } server_name localhost; @@ -92,7 +93,7 @@ let stub_status on; access_log off; allow 127.0.0.1; - allow ::1; + ${optionalString enableIPv6 "allow ::1;"} deny all; } } @@ -116,7 +117,7 @@ let ssl = vhost.enableSSL || vhost.forceSSL; port = if vhost.port != null then vhost.port else (if ssl then 443 else 80); listenString = toString port + optionalString ssl " ssl http2" - + optionalString vhost.default " default"; + + optionalString vhost.default " default_server"; acmeLocation = optionalString vhost.enableACME ('' location /.well-known/acme-challenge { ${optionalString (vhost.acmeFallbackHost != null) "try_files $uri @acme-fallback;"} @@ -132,8 +133,10 @@ let in '' ${optionalString vhost.forceSSL '' server { - listen 80 ${optionalString vhost.default "default"}; - listen [::]:80 ${optionalString vhost.default "default"}; + listen 80 ${optionalString vhost.default "default_server"}; + ${optionalString enableIPv6 + ''listen [::]:80 ${optionalString vhost.default "default_server"};'' + } server_name ${serverName} ${concatStringsSep " " vhost.serverAliases}; ${acmeLocation} @@ -145,7 +148,7 @@ let server { listen ${listenString}; - listen [::]:${listenString}; + ${optionalString enableIPv6 "listen [::]:${listenString};"} server_name ${serverName} ${concatStringsSep " " vhost.serverAliases}; ${acmeLocation} diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 5d1af09e7aa..17e84b1d9a1 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -123,6 +123,7 @@ in { services.packagekit.enable = mkDefault true; hardware.bluetooth.enable = mkDefault true; services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center + services.udev.packages = [ pkgs.gnome3.gnome_settings_daemon ]; fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ]; diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 9b51b92faa4..ee4ec0fc819 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -31,204 +31,225 @@ in ''; }; + extraPackages = mkOption { + type = types.listOf types.package; + default = []; + description = '' + KDE packages that need to be installed system-wide. + ''; + }; + }; }; - config = mkIf (xcfg.enable && cfg.enable) { + config = mkMerge [ + (mkIf (cfg.extraPackages != []) { + environment.systemPackages = [ (kde5.kdeWrapper cfg.extraPackages) ]; + }) - warnings = optional config.services.xserver.desktopManager.kde4.enable - "KDE 4 should not be enabled at the same time as KDE 5"; + (mkIf (xcfg.enable && cfg.enable) { - services.xserver.desktopManager.session = singleton { - name = "kde5"; - bgSupport = true; - start = '' - # Load PulseAudio module for routing support. - # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/ - ${optionalString config.hardware.pulseaudio.enable '' - ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" - ''} + warnings = optional config.services.xserver.desktopManager.kde4.enable + "KDE 4 should not be enabled at the same time as KDE 5"; - exec "${kde5.startkde}" + services.xserver.desktopManager.session = singleton { + name = "kde5"; + bgSupport = true; + start = '' + # Load PulseAudio module for routing support. + # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/ + ${optionalString config.hardware.pulseaudio.enable '' + ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" + ''} - ''; - }; + exec "${kde5.startkde}" - security.setuidOwners = [ - { - program = "kcheckpass"; - source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass"; - owner = "root"; - setuid = true; - } - { - program = "start_kdeinit"; - source = "${kde5.kinit.out}/lib/libexec/kf5/start_kdeinit"; - owner = "root"; - setuid = true; - } - ]; + ''; + }; - environment.systemPackages = - [ - kde5.frameworkintegration - kde5.kactivities - kde5.kauth - kde5.kcmutils - kde5.kconfig - kde5.kconfigwidgets - kde5.kcoreaddons - kde5.kdbusaddons - kde5.kdeclarative - kde5.kded - kde5.kdesu - kde5.kdnssd - kde5.kemoticons - kde5.kfilemetadata - kde5.kglobalaccel - kde5.kguiaddons - kde5.kiconthemes - kde5.kidletime - kde5.kimageformats - kde5.kinit - kde5.kio - kde5.kjobwidgets - kde5.knewstuff - kde5.knotifications - kde5.knotifyconfig - kde5.kpackage - kde5.kparts - kde5.kpeople - kde5.krunner - kde5.kservice - kde5.ktextwidgets - kde5.kwallet - kde5.kwayland - kde5.kwidgetsaddons - kde5.kxmlgui - kde5.kxmlrpcclient - kde5.plasma-framework - kde5.solid - kde5.sonnet - kde5.threadweaver - - kde5.breeze-qt5 - kde5.kactivitymanagerd - kde5.kde-cli-tools - kde5.kdecoration - kde5.kdeplasma-addons - kde5.kgamma5 - kde5.khelpcenter - kde5.khotkeys - kde5.kinfocenter - kde5.kmenuedit - kde5.kscreen - kde5.kscreenlocker - kde5.ksysguard - kde5.kwayland - kde5.kwin - kde5.kwrited - kde5.libkscreen - kde5.libksysguard - kde5.milou - kde5.oxygen - kde5.plasma-integration - kde5.polkit-kde-agent - kde5.systemsettings - - kde5.plasma-desktop - kde5.plasma-workspace - kde5.plasma-workspace-wallpapers - - kde5.dolphin - kde5.dolphin-plugins - kde5.ffmpegthumbs - kde5.kdegraphics-thumbnailers - kde5.kio-extras - kde5.konsole - kde5.print-manager - - # Install Breeze icons if available - (kde5.breeze-icons or kde5.oxygen-icons5 or kde5.oxygen-icons) - pkgs.hicolor_icon_theme - - kde5.kde-gtk-config kde5.breeze-gtk - - pkgs.qt5.phonon-backend-gstreamer - ] - - # Plasma 5.5 and later has a Breeze GTK theme. - # If it is not available, Orion is very similar to Breeze. - ++ lib.optional (!(lib.hasAttr "breeze-gtk" kde5)) pkgs.orion - - # Install activity manager if available - ++ lib.optional (lib.hasAttr "kactivitymanagerd" kde5) kde5.kactivitymanagerd - - # frameworkintegration was split with plasma-integration in Plasma 5.6 - ++ lib.optional (lib.hasAttr "plasma-integration" kde5) kde5.plasma-integration - - ++ lib.optionals cfg.enableQt4Support [ kde5.breeze-qt4 pkgs.phonon-backend-gstreamer ] - - # Optional hardware support features - ++ lib.optional config.hardware.bluetooth.enable kde5.bluedevil - ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm - ++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa - ++ lib.optional config.powerManagement.enable kde5.powerdevil - ++ lib.optional config.services.colord.enable pkgs.colord-kde - ++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ]; - - environment.pathsToLink = [ "/share" ]; - - environment.etc = singleton { - source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; - target = "X11/xkb"; - }; - - # Enable GTK applications to load SVG icons - environment.variables = - { - GST_PLUGIN_SYSTEM_PATH_1_0 = - lib.makeSearchPath "/lib/gstreamer-1.0" - (builtins.map (pkg: pkg.out) (with pkgs.gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-ugly - gst-plugins-bad - gst-libav # for mp3 playback - ])); - } - // (if (lib.hasAttr "breeze-icons" kde5) - then { GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; } - else { }); - - fonts.fonts = [ (kde5.oxygen-fonts or pkgs.noto-fonts) ]; - - programs.ssh.askPassword = "${kde5.ksshaskpass.out}/bin/ksshaskpass"; - - # Enable helpful DBus services. - services.udisks2.enable = true; - services.upower.enable = config.powerManagement.enable; - - # Extra UDEV rules used by Solid - services.udev.packages = [ - pkgs.libmtp - pkgs.media-player-info - ]; - - services.xserver.displayManager.sddm = { - theme = "breeze"; - themes = [ - kde5.ecm # for the setup-hook - kde5.plasma-workspace - kde5.breeze-icons + security.setuidOwners = [ + { + program = "kcheckpass"; + source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass"; + owner = "root"; + setuid = true; + } + { + program = "start_kdeinit"; + source = "${kde5.kinit.out}/lib/libexec/kf5/start_kdeinit"; + owner = "root"; + setuid = true; + } ]; - }; - security.pam.services.kde = { allowNullPassword = true; }; + environment.systemPackages = + [ + kde5.frameworkintegration + kde5.kactivities + kde5.kauth + kde5.kcmutils + kde5.kconfig + kde5.kconfigwidgets + kde5.kcoreaddons + kde5.kdbusaddons + kde5.kdeclarative + kde5.kded + kde5.kdesu + kde5.kdnssd + kde5.kemoticons + kde5.kfilemetadata + kde5.kglobalaccel + kde5.kguiaddons + kde5.kiconthemes + kde5.kidletime + kde5.kimageformats + kde5.kinit + kde5.kio + kde5.kjobwidgets + kde5.knewstuff + kde5.knotifications + kde5.knotifyconfig + kde5.kpackage + kde5.kparts + kde5.kpeople + kde5.krunner + kde5.kservice + kde5.ktextwidgets + kde5.kwallet + kde5.kwayland + kde5.kwidgetsaddons + kde5.kxmlgui + kde5.kxmlrpcclient + kde5.plasma-framework + kde5.solid + kde5.sonnet + kde5.threadweaver - }; + kde5.breeze-qt5 + kde5.kactivitymanagerd + kde5.kde-cli-tools + kde5.kdecoration + kde5.kdeplasma-addons + kde5.kgamma5 + kde5.khotkeys + kde5.kinfocenter + kde5.kmenuedit + kde5.kscreen + kde5.kscreenlocker + kde5.ksysguard + kde5.kwayland + kde5.kwin + kde5.kwrited + kde5.libkscreen + kde5.libksysguard + kde5.milou + kde5.plasma-integration + kde5.polkit-kde-agent + kde5.systemsettings + + kde5.plasma-desktop + kde5.plasma-workspace + kde5.plasma-workspace-wallpapers + + kde5.dolphin-plugins + kde5.ffmpegthumbs + kde5.kdegraphics-thumbnailers + kde5.kio-extras + kde5.print-manager + + # Install Breeze icons if available + (kde5.breeze-icons or kde5.oxygen-icons5 or kde5.oxygen-icons) + pkgs.hicolor_icon_theme + + kde5.kde-gtk-config kde5.breeze-gtk + + pkgs.qt5.phonon-backend-gstreamer + ] + + # Plasma 5.5 and later has a Breeze GTK theme. + # If it is not available, Orion is very similar to Breeze. + ++ lib.optional (!(lib.hasAttr "breeze-gtk" kde5)) pkgs.orion + + # Install activity manager if available + ++ lib.optional (lib.hasAttr "kactivitymanagerd" kde5) kde5.kactivitymanagerd + + # frameworkintegration was split with plasma-integration in Plasma 5.6 + ++ lib.optional (lib.hasAttr "plasma-integration" kde5) kde5.plasma-integration + + ++ lib.optionals cfg.enableQt4Support [ kde5.breeze-qt4 pkgs.phonon-backend-gstreamer ] + + # Optional hardware support features + ++ lib.optional config.hardware.bluetooth.enable kde5.bluedevil + ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm + ++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa + ++ lib.optional config.powerManagement.enable kde5.powerdevil + ++ lib.optional config.services.colord.enable pkgs.colord-kde + ++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ]; + + services.xserver.desktopManager.kde5.extraPackages = + [ + kde5.khelpcenter + kde5.oxygen + + kde5.dolphin + kde5.konsole + ]; + + environment.pathsToLink = [ "/share" ]; + + environment.etc = singleton { + source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; + target = "X11/xkb"; + }; + + environment.variables = + { + # Enable GTK applications to load SVG icons + GST_PLUGIN_SYSTEM_PATH_1_0 = + lib.makeSearchPath "/lib/gstreamer-1.0" + (builtins.map (pkg: pkg.out) (with pkgs.gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gst-plugins-bad + gst-libav # for mp3 playback + ])); + } + // (if (lib.hasAttr "breeze-icons" kde5) + then { GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; } + else { }); + + fonts.fonts = [ (kde5.oxygen-fonts or pkgs.noto-fonts) ]; + + programs.ssh.askPassword = "${kde5.ksshaskpass.out}/bin/ksshaskpass"; + + # Enable helpful DBus services. + services.udisks2.enable = true; + services.upower.enable = config.powerManagement.enable; + services.dbus.packages = + mkIf config.services.printing.enable [ pkgs.system-config-printer ]; + + # Extra UDEV rules used by Solid + services.udev.packages = [ + pkgs.libmtp + pkgs.media-player-info + ]; + + services.xserver.displayManager.sddm = { + theme = "breeze"; + themes = [ + kde5.ecm # for the setup-hook + kde5.plasma-workspace + kde5.breeze-icons + ]; + }; + + security.pam.services.kde = { allowNullPassword = true; }; + + }) + ]; } diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix index 5c068e89dd7..2a7f4e5cbcd 100644 --- a/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixos/modules/services/x11/hardware/synaptics.nix @@ -19,7 +19,7 @@ let cfg = config.services.xserver.synaptics; Option "TapButton3" "0" ''; pkg = pkgs.xorg.xf86inputsynaptics; - etcFile = "X11/xorg.conf.d/50-synaptics.conf"; + etcFile = "X11/xorg.conf.d/70-synaptics.conf"; in { options = { @@ -172,7 +172,7 @@ in { services.xserver.modules = [ pkg.out ]; environment.etc."${etcFile}".source = - "${pkg.out}/share/X11/xorg.conf.d/50-synaptics.conf"; + "${pkg.out}/share/X11/xorg.conf.d/70-synaptics.conf"; environment.systemPackages = [ pkg ]; diff --git a/nixos/modules/services/x11/hardware/wacom.nix b/nixos/modules/services/x11/hardware/wacom.nix index 540ed168b48..a27889c36a7 100644 --- a/nixos/modules/services/x11/hardware/wacom.nix +++ b/nixos/modules/services/x11/hardware/wacom.nix @@ -22,7 +22,7 @@ in which will make Xorg reconfigure the device ? If you're not satisfied by the default behaviour you can override - in + in configuration.nix easily. ''; }; @@ -40,7 +40,7 @@ in services.udev.packages = [ pkgs.xf86_input_wacom ]; - environment.etc."X11/xorg.conf.d/50-wacom.conf".source = "${pkgs.xf86_input_wacom}/share/X11/xorg.conf.d/50-wacom.conf"; + environment.etc."X11/xorg.conf.d/70-wacom.conf".source = "${pkgs.xf86_input_wacom}/share/X11/xorg.conf.d/70-wacom.conf"; }; diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix index 09d0ab07751..785394d9648 100644 --- a/nixos/modules/services/x11/terminal-server.nix +++ b/nixos/modules/services/x11/terminal-server.nix @@ -41,7 +41,7 @@ with lib; { description = "Terminal Server"; path = - [ pkgs.xorgserver.out pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth + [ pkgs.xorg.xorgserver.out pkgs.gawk pkgs.which pkgs.openssl pkgs.xorg.xauth pkgs.nettools pkgs.shadow pkgs.procps pkgs.utillinux pkgs.bash ]; diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 7803f1bd1aa..f0699ad9832 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -318,6 +318,8 @@ mountFS() { [ "$mountPoint" == "/" ] && [ -f "/mnt-root/etc/NIXOS_LUSTRATE" ] && lustrateRoot "/mnt-root" + + true } lustrateRoot () { diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index c5f41cc338c..045cbeb7cff 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -22,12 +22,18 @@ let kernel = config.boot.kernelPackages; - splKernelPkg = kernel.spl; - zfsKernelPkg = kernel.zfs; - zfsUserPkg = pkgs.zfs; + packages = if config.boot.zfs.enableUnstable then { + spl = kernel.splUnstable; + zfs = kernel.zfsUnstable; + zfsUser = pkgs.zfsUnstable; + } else { + spl = kernel.spl; + zfs = kernel.zfs; + zfsUser = pkgs.zfs; + }; autosnapPkg = pkgs.zfstools.override { - zfs = zfsUserPkg; + zfs = packages.zfsUser; }; zfsAutoSnap = "${autosnapPkg}/bin/zfs-auto-snapshot"; @@ -54,6 +60,18 @@ in options = { boot.zfs = { + enableUnstable = mkOption { + type = types.bool; + default = false; + description = '' + Use the unstable zfs package. This might be an option, if the latest + kernel is not yet supported by a published release of ZFS. Enabling + this option will install a development version of ZFS on Linux. The + version will have already passed an extensive test suite, but it is + more likely to hit an undiscovered bug compared to running a released + version of ZFS on Linux. + ''; + }; extraPools = mkOption { type = types.listOf types.str; @@ -218,16 +236,16 @@ in boot = { kernelModules = [ "spl" "zfs" ] ; - extraModulePackages = [ splKernelPkg zfsKernelPkg ]; + extraModulePackages = with packages; [ spl zfs ]; }; boot.initrd = mkIf inInitrd { kernelModules = [ "spl" "zfs" ]; extraUtilsCommands = '' - copy_bin_and_libs ${zfsUserPkg}/sbin/zfs - copy_bin_and_libs ${zfsUserPkg}/sbin/zdb - copy_bin_and_libs ${zfsUserPkg}/sbin/zpool + copy_bin_and_libs ${packages.zfsUser}/sbin/zfs + copy_bin_and_libs ${packages.zfsUser}/sbin/zdb + copy_bin_and_libs ${packages.zfsUser}/sbin/zpool ''; extraUtilsCommandsTest = mkIf inInitrd '' @@ -264,14 +282,14 @@ in zfsSupport = true; }; - environment.etc."zfs/zed.d".source = "${zfsUserPkg}/etc/zfs/zed.d/*"; + environment.etc."zfs/zed.d".source = "${packages.zfsUser}/etc/zfs/zed.d/*"; - system.fsPackages = [ zfsUserPkg ]; # XXX: needed? zfs doesn't have (need) a fsck - environment.systemPackages = [ zfsUserPkg ] - ++ optional enableAutoSnapshots autosnapPkg; # so the user can run the command to see flags + system.fsPackages = [ packages.zfsUser ]; # XXX: needed? zfs doesn't have (need) a fsck + environment.systemPackages = [ packages.zfsUser ] + ++ optional enableAutoSnapshots autosnapPkg; # so the user can run the command to see flags - services.udev.packages = [ zfsUserPkg ]; # to hook zvol naming, etc. - systemd.packages = [ zfsUserPkg ]; + services.udev.packages = [ packages.zfsUser ]; # to hook zvol naming, etc. + systemd.packages = [ packages.zfsUser ]; systemd.services = let getPoolFilesystems = pool: @@ -298,7 +316,7 @@ in RemainAfterExit = true; }; script = '' - zpool_cmd="${zfsUserPkg}/sbin/zpool" + zpool_cmd="${packages.zfsUser}/sbin/zpool" ("$zpool_cmd" list "${pool}" >/dev/null) || "$zpool_cmd" import -d ${cfgZfs.devNodes} -N ${optionalString cfgZfs.forceImportAll "-f"} "${pool}" ''; }; @@ -314,7 +332,7 @@ in RemainAfterExit = true; }; script = '' - ${zfsUserPkg}/sbin/zfs set nixos:shutdown-time="$(date)" "${pool}" + ${packages.zfsUser}/sbin/zfs set nixos:shutdown-time="$(date)" "${pool}" ''; }; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index aaa78daeb3a..83d9854d351 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -910,20 +910,23 @@ in domainname "${cfg.domain}" ''; - environment.etc = mkIf (cfg.hostId != null) - [ - { - target = "hostid"; - source = pkgs.runCommand "gen-hostid" {} '' - hi="${cfg.hostId}" - ${if pkgs.stdenv.isBigEndian then '' - echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > $out - '' else '' - echo -ne "\x''${hi:6:2}\x''${hi:4:2}\x''${hi:2:2}\x''${hi:0:2}" > $out - ''} - ''; - } - ]; + environment.etc."hostid" = mkIf (cfg.hostId != null) + { source = pkgs.runCommand "gen-hostid" {} '' + hi="${cfg.hostId}" + ${if pkgs.stdenv.isBigEndian then '' + echo -ne "\x''${hi:0:2}\x''${hi:2:2}\x''${hi:4:2}\x''${hi:6:2}" > $out + '' else '' + echo -ne "\x''${hi:6:2}\x''${hi:4:2}\x''${hi:2:2}\x''${hi:0:2}" > $out + ''} + ''; + }; + + # static hostname configuration needed for hostnamectl and the + # org.freedesktop.hostname1 dbus service (both provided by systemd) + environment.etc."hostname" = mkIf (cfg.hostName != "") + { + text = cfg.hostName + "\n"; + }; environment.systemPackages = [ pkgs.host diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 17e69b311b4..80e481d79b9 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -94,7 +94,6 @@ let cfg = config.ec2; in elif [ "$fsType" = ext3 ]; then mp="/disk$diskNr" diskNr=$((diskNr + 1)) - echo "mounting $device on $mp..." if mountFS "$device" "$mp" "" ext3; then if [ -z "$diskForUnionfs" ]; then diskForUnionfs="$mp"; fi fi diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 92fe98f3f9c..4b30a38f832 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -28,16 +28,42 @@ in docker command line tool. ''; }; - socketActivation = + + listenOptions = + mkOption { + type = types.listOf types.str; + default = ["/var/run/docker.sock"]; + description = + '' + A list of unix and tcp docker should listen to. The format follows + ListenStream as described in systemd.socket(5). + ''; + }; + + enableOnBoot = mkOption { type = types.bool; default = true; description = '' - This option enables docker with socket activation. I.e. docker will - start when first called by client. + When enabled dockerd is started on boot. This is required for + container, which are created with the + --restart=always flag, to work. If this option is + disabled, docker might be started on demand by socket activation. ''; }; + + liveRestore = + mkOption { + type = types.bool; + default = true; + description = + '' + Allow dockerd to be restarted without affecting running container. + This option is incompatible with docker swarm. + ''; + }; + storageDriver = mkOption { type = types.nullOr (types.enum ["aufs" "btrfs" "devicemapper" "overlay" "overlay2" "zfs"]); @@ -69,69 +95,43 @@ in docker daemon. ''; }; - - postStart = - mkOption { - type = types.lines; - default = '' - while ! [ -e /var/run/docker.sock ]; do - sleep 0.1 - done - ''; - description = '' - The postStart phase of the systemd service. You may need to - override this if you are passing in flags to docker which - don't cause the socket file to be created. This option is ignored - if socket activation is used. - ''; - }; - - }; ###### implementation - config = mkIf cfg.enable (mkMerge [ - { environment.systemPackages = [ pkgs.docker ]; + config = mkIf cfg.enable (mkMerge [{ + environment.systemPackages = [ pkgs.docker ]; users.extraGroups.docker.gid = config.ids.gids.docker; + systemd.packages = [ pkgs.docker ]; + systemd.services.docker = { - description = "Docker Application Container Engine"; - wantedBy = optional (!cfg.socketActivation) "multi-user.target"; - after = [ "network.target" ] ++ (optional cfg.socketActivation "docker.socket") ; - requires = optional cfg.socketActivation "docker.socket"; + wantedBy = optional cfg.enableOnBoot "multi-user.target"; serviceConfig = { - ExecStart = ''${pkgs.docker}/bin/dockerd \ - --group=docker --log-driver=${cfg.logDriver} \ - ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \ - ${optionalString cfg.socketActivation "--host=fd://"} \ - ${cfg.extraOptions} - ''; - # I'm not sure if that limits aren't too high, but it's what - # goes in config bundled with docker itself - LimitNOFILE = 1048576; - LimitNPROC = 1048576; + ExecStart = [ + "" + '' + ${pkgs.docker}/bin/dockerd \ + --group=docker \ + --host=fd:// \ + --log-driver=${cfg.logDriver} \ + ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \ + ${optionalString cfg.liveRestore "--live-restore" } \ + ${cfg.extraOptions} + '']; + ExecReload=[ + "" + "${pkgs.procps}/bin/kill -s HUP $MAINPID" + ]; } // proxy_env; path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs); - - postStart = if cfg.socketActivation then "" else cfg.postStart; - - # Presumably some containers are running we don't want to interrupt - restartIfChanged = false; }; + systemd.sockets.docker.socketConfig.ListenStream = cfg.listenOptions; } - (mkIf cfg.socketActivation { - systemd.sockets.docker = { - description = "Docker Socket for the API"; - wantedBy = [ "sockets.target" ]; - socketConfig = { - ListenStream = "/var/run/docker.sock"; - SocketMode = "0660"; - SocketUser = "root"; - SocketGroup = "docker"; - }; - }; - }) ]); + imports = [ + (mkRemovedOptionModule ["virtualisation" "docker" "socketActivation"] "This option was removed in favor of starting docker at boot") + ]; + } diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index ffd1cbec3ce..0753e2ce994 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -135,51 +135,59 @@ let self = { "16.03".us-west-2.pv-ebs = "ami-5e61a23e"; "16.03".us-west-2.pv-s3 = "ami-734c8f13"; - # 16.09.666.3738950 - "16.09".ap-northeast-1.hvm-ebs = "ami-35578954"; - "16.09".ap-northeast-1.hvm-s3 = "ami-d6528cb7"; - "16.09".ap-northeast-1.pv-ebs = "ami-07548a66"; - "16.09".ap-northeast-1.pv-s3 = "ami-f1548a90"; - "16.09".ap-northeast-2.hvm-ebs = "ami-d48753ba"; - "16.09".ap-northeast-2.hvm-s3 = "ami-4c865222"; - "16.09".ap-northeast-2.pv-ebs = "ami-ca8551a4"; - "16.09".ap-northeast-2.pv-s3 = "ami-9c8551f2"; - "16.09".ap-south-1.hvm-ebs = "ami-922450fd"; - "16.09".ap-south-1.hvm-s3 = "ami-6d3a4e02"; - "16.09".ap-south-1.pv-ebs = "ami-4d394d22"; - "16.09".ap-south-1.pv-s3 = "ami-17384c78"; - "16.09".ap-southeast-1.hvm-ebs = "ami-f824809b"; - "16.09".ap-southeast-1.hvm-s3 = "ami-f924809a"; - "16.09".ap-southeast-1.pv-ebs = "ami-af2480cc"; - "16.09".ap-southeast-1.pv-s3 = "ami-5826823b"; - "16.09".ap-southeast-2.hvm-ebs = "ami-40fecd23"; - "16.09".ap-southeast-2.hvm-s3 = "ami-48fecd2b"; - "16.09".ap-southeast-2.pv-ebs = "ami-dffecdbc"; - "16.09".ap-southeast-2.pv-s3 = "ami-e0fccf83"; - "16.09".eu-central-1.hvm-ebs = "ami-1d8b7472"; - "16.09".eu-central-1.hvm-s3 = "ami-1c8b7473"; - "16.09".eu-central-1.pv-ebs = "ami-8c8d72e3"; - "16.09".eu-central-1.pv-s3 = "ami-3488775b"; - "16.09".eu-west-1.hvm-ebs = "ami-15662766"; - "16.09".eu-west-1.hvm-s3 = "ami-476b2a34"; - "16.09".eu-west-1.pv-ebs = "ami-876928f4"; - "16.09".eu-west-1.pv-s3 = "ami-70682903"; - "16.09".sa-east-1.hvm-ebs = "ami-27bc2e4b"; - "16.09".sa-east-1.hvm-s3 = "ami-e4b92b88"; - "16.09".sa-east-1.pv-ebs = "ami-4dbe2c21"; - "16.09".sa-east-1.pv-s3 = "ami-77fc6e1b"; - "16.09".us-east-1.hvm-ebs = "ami-93347684"; - "16.09".us-east-1.hvm-s3 = "ami-5e347649"; - "16.09".us-east-1.pv-ebs = "ami-b0387aa7"; - "16.09".us-east-1.pv-s3 = "ami-51357746"; - "16.09".us-west-1.hvm-ebs = "ami-06337a66"; - "16.09".us-west-1.hvm-s3 = "ami-76307916"; - "16.09".us-west-1.pv-ebs = "ami-fd327b9d"; - "16.09".us-west-1.pv-s3 = "ami-cc347dac"; - "16.09".us-west-2.hvm-ebs = "ami-49fe2729"; - "16.09".us-west-2.hvm-s3 = "ami-93fc25f3"; - "16.09".us-west-2.pv-ebs = "ami-14fe2774"; - "16.09".us-west-2.pv-s3 = "ami-74f12814"; + # 16.09.1508.3909827 + "16.09".ap-northeast-1.hvm-ebs = "ami-68453b0f"; + "16.09".ap-northeast-1.hvm-s3 = "ami-f9bec09e"; + "16.09".ap-northeast-1.pv-ebs = "ami-254a3442"; + "16.09".ap-northeast-1.pv-s3 = "ami-ef473988"; + "16.09".ap-northeast-2.hvm-ebs = "ami-18ae7f76"; + "16.09".ap-northeast-2.hvm-s3 = "ami-9eac7df0"; + "16.09".ap-northeast-2.pv-ebs = "ami-57aa7b39"; + "16.09".ap-northeast-2.pv-s3 = "ami-5cae7f32"; + "16.09".ap-south-1.hvm-ebs = "ami-b3f98fdc"; + "16.09".ap-south-1.hvm-s3 = "ami-98e690f7"; + "16.09".ap-south-1.pv-ebs = "ami-aef98fc1"; + "16.09".ap-south-1.pv-s3 = "ami-caf88ea5"; + "16.09".ap-southeast-1.hvm-ebs = "ami-80fb51e3"; + "16.09".ap-southeast-1.hvm-s3 = "ami-2df3594e"; + "16.09".ap-southeast-1.pv-ebs = "ami-37f05a54"; + "16.09".ap-southeast-1.pv-s3 = "ami-27f35944"; + "16.09".ap-southeast-2.hvm-ebs = "ami-57ece834"; + "16.09".ap-southeast-2.hvm-s3 = "ami-87f4f0e4"; + "16.09".ap-southeast-2.pv-ebs = "ami-d8ede9bb"; + "16.09".ap-southeast-2.pv-s3 = "ami-a6ebefc5"; + "16.09".eu-central-1.hvm-ebs = "ami-1b884774"; + "16.09".eu-central-1.hvm-s3 = "ami-b08c43df"; + "16.09".eu-central-1.pv-ebs = "ami-888946e7"; + "16.09".eu-central-1.pv-s3 = "ami-06874869"; + "16.09".eu-west-1.hvm-ebs = "ami-1ed3e76d"; + "16.09".eu-west-1.hvm-s3 = "ami-73d1e500"; + "16.09".eu-west-1.pv-ebs = "ami-44c0f437"; + "16.09".eu-west-1.pv-s3 = "ami-f3d8ec80"; + "16.09".eu-west-2.hvm-ebs = "ami-2c9c9648"; + "16.09".eu-west-2.hvm-s3 = "ami-6b9e940f"; + "16.09".eu-west-2.pv-ebs = "ami-f1999395"; + "16.09".eu-west-2.pv-s3 = "ami-bb9f95df"; + "16.09".sa-east-1.hvm-ebs = "ami-a11882cd"; + "16.09".sa-east-1.hvm-s3 = "ami-7726bc1b"; + "16.09".sa-east-1.pv-ebs = "ami-9725bffb"; + "16.09".sa-east-1.pv-s3 = "ami-b027bddc"; + "16.09".us-east-1.hvm-ebs = "ami-854ca593"; + "16.09".us-east-1.hvm-s3 = "ami-2241a834"; + "16.09".us-east-1.pv-ebs = "ami-a441a8b2"; + "16.09".us-east-1.pv-s3 = "ami-e841a8fe"; + "16.09".us-east-2.hvm-ebs = "ami-3f41645a"; + "16.09".us-east-2.hvm-s3 = "ami-804065e5"; + "16.09".us-east-2.pv-ebs = "ami-f1466394"; + "16.09".us-east-2.pv-s3 = "ami-05426760"; + "16.09".us-west-1.hvm-ebs = "ami-c2efbca2"; + "16.09".us-west-1.hvm-s3 = "ami-d71042b7"; + "16.09".us-west-1.pv-ebs = "ami-04e8bb64"; + "16.09".us-west-1.pv-s3 = "ami-31e9ba51"; + "16.09".us-west-2.hvm-ebs = "ami-6449f504"; + "16.09".us-west-2.hvm-s3 = "ami-344af654"; + "16.09".us-west-2.pv-ebs = "ami-6d4af60d"; + "16.09".us-west-2.pv-s3 = "ami-de48f4be"; latest = self."16.09"; }; in self diff --git a/nixos/modules/virtualisation/lxc.nix b/nixos/modules/virtualisation/lxc.nix index 22da012e414..6759ff0f2fe 100644 --- a/nixos/modules/virtualisation/lxc.nix +++ b/nixos/modules/virtualisation/lxc.nix @@ -62,19 +62,17 @@ in . ''; }; - }; ###### implementation config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.lxc ]; - environment.etc."lxc/lxc.conf".text = cfg.systemConfig; environment.etc."lxc/lxc-usernet".text = cfg.usernetConfig; environment.etc."lxc/default.conf".text = cfg.defaultConfig; + security.apparmor.packages = [ pkgs.lxc ]; + security.apparmor.profiles = [ "${pkgs.lxc}/etc/apparmor.d/lxc-containers" ]; }; - } diff --git a/nixos/modules/virtualisation/openstack/common.nix b/nixos/modules/virtualisation/openstack/common.nix index 3fce54a2fa5..2feb0a87395 100644 --- a/nixos/modules/virtualisation/openstack/common.nix +++ b/nixos/modules/virtualisation/openstack/common.nix @@ -51,4 +51,34 @@ rec { }; };}); }; + + databaseOption = name: { + host = mkOption { + type = types.str; + default = "localhost"; + description = '' + Host of the database. + ''; + }; + + name = mkOption { + type = types.str; + default = name; + description = '' + Name of the existing database. + ''; + }; + + user = mkOption { + type = types.str; + default = name; + description = '' + The database user. The user must exist and has access to + the specified database. + ''; + }; + password = mkSecretOption { + name = name + "MysqlPassword"; + description = "The database user's password";}; + }; } diff --git a/nixos/modules/virtualisation/openstack/glance.nix b/nixos/modules/virtualisation/openstack/glance.nix new file mode 100644 index 00000000000..4d85718e369 --- /dev/null +++ b/nixos/modules/virtualisation/openstack/glance.nix @@ -0,0 +1,245 @@ +{ config, lib, pkgs, ... }: + +with lib; with import ./common.nix {inherit lib;}; + +let + cfg = config.virtualisation.openstack.glance; + commonConf = '' + [database] + connection = "mysql://${cfg.database.user}:${cfg.database.password.pattern}@${cfg.database.host}/${cfg.database.name}" + notification_driver = noop + + [keystone_authtoken] + auth_url = ${cfg.authUrl} + auth_plugin = password + project_name = service + project_domain_id = default + user_domain_id = default + username = ${cfg.serviceUsername} + password = ${cfg.servicePassword.pattern} + + [glance_store] + default_store = file + filesystem_store_datadir = /var/lib/glance/images/ + ''; + glanceApiConfTpl = pkgs.writeText "glance-api.conf" '' + ${commonConf} + + [paste_deploy] + flavor = keystone + config_file = ${cfg.package}/etc/glance-api-paste.ini + ''; + glanceRegistryConfTpl = pkgs.writeText "glance-registry.conf" '' + ${commonConf} + + [paste_deploy] + config_file = ${cfg.package}/etc/glance-registry-paste.ini + ''; + glanceApiConf = "/var/lib/glance/glance-api.conf"; + glanceRegistryConf = "/var/lib/glance/glance-registry.conf"; + +in { + options.virtualisation.openstack.glance = { + package = mkOption { + type = types.package; + default = pkgs.glance; + example = literalExample "pkgs.glance"; + description = '' + Glance package to use. + ''; + }; + + enable = mkOption { + default = false; + type = types.bool; + description = '' + This option enables Glance as a single-machine + installation. That is, all of Glance's components are + enabled on this machine. This is useful for evaluating and + experimenting with Glance. Note we are currently not + providing any configurations for a multi-node setup. + ''; + }; + + authUrl = mkOption { + type = types.str; + default = http://localhost:5000; + description = '' + Complete public Identity (Keystone) API endpoint. Note this is + unversionned. + ''; + }; + + serviceUsername = mkOption { + type = types.str; + default = "glance"; + description = '' + The Glance service username. This user is created if bootstrap + is enable, otherwise it has to be manually created before + starting this service. + ''; + }; + + servicePassword = mkSecretOption { + name = "glanceAdminPassword"; + description = '' + The Glance service user's password. + ''; + }; + + database = databaseOption "glance"; + + bootstrap = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Bootstrap the Glance service by creating the service tenant, + an admin account and a public endpoint. This option provides + a ready-to-use glance service. This is only done at the + first Glance execution by the systemd post start section. + The keystone admin account is used to create required + Keystone resource for the Glance service. + + This option is a helper for setting up + development or testing environments. + ''; + }; + + endpointPublic = mkOption { + type = types.str; + default = "http://localhost:9292"; + description = '' + The public image endpoint. The link + create endpoint provides more informations + about that. + ''; + }; + + keystoneAdminUsername = mkOption { + type = types.str; + default = "admin"; + description = '' + The keystone admin user name used to create the Glance account. + ''; + }; + + keystoneAdminPassword = mkSecretOption { + name = "keystoneAdminPassword"; + description = '' + The keystone admin user's password. + ''; + }; + + keystoneAdminTenant = mkOption { + type = types.str; + default = "admin"; + description = '' + The keystone admin tenant used to create the Glance account. + ''; + }; + keystoneAuthUrl = mkOption { + type = types.str; + default = "http://localhost:5000/v2.0"; + description = '' + The keystone auth url used to create the Glance account. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + users.extraUsers = [{ + name = "glance"; + group = "glance"; + uid = config.ids.gids.glance; + + }]; + users.extraGroups = [{ + name = "glance"; + gid = config.ids.gids.glance; + }]; + + systemd.services.glance-registry = { + description = "OpenStack Glance Registry Daemon"; + after = [ "network.target"]; + path = [ pkgs.curl pkgs.pythonPackages.keystoneclient pkgs.gawk ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + mkdir -m 775 -p /var/lib/glance/{images,scrubber,image_cache} + chown glance:glance /var/lib/glance/{images,scrubber,image_cache} + + # Secret file managment + cp ${glanceRegistryConfTpl} ${glanceRegistryConf}; + chown glance:glance ${glanceRegistryConf}; + chmod 640 ${glanceRegistryConf} + ${replaceSecret cfg.database.password glanceRegistryConf} + ${replaceSecret cfg.servicePassword glanceRegistryConf} + + cp ${glanceApiConfTpl} ${glanceApiConf}; + chown glance:glance ${glanceApiConf}; + chmod 640 ${glanceApiConf} + ${replaceSecret cfg.database.password glanceApiConf} + ${replaceSecret cfg.servicePassword glanceApiConf} + + # Initialise the database + ${cfg.package}/bin/glance-manage --config-file=${glanceApiConf} --config-file=${glanceRegistryConf} db_sync + ''; + postStart = '' + set -eu + export OS_AUTH_URL=${cfg.bootstrap.keystoneAuthUrl} + export OS_USERNAME=${cfg.bootstrap.keystoneAdminUsername} + export OS_PASSWORD=${getSecret cfg.bootstrap.keystoneAdminPassword} + export OS_TENANT_NAME=${cfg.bootstrap.keystoneAdminTenant} + + # Wait until the keystone is available for use + count=0 + while ! keystone user-get ${cfg.bootstrap.keystoneAdminUsername} > /dev/null + do + if [ $count -eq 30 ] + then + echo "Tried 30 times, giving up..." + exit 1 + fi + + echo "Keystone not yet started. Waiting for 1 second..." + count=$((count++)) + sleep 1 + done + + # If the service glance doesn't exist, we consider glance is + # not initialized + if ! keystone service-get glance + then + keystone service-create --type image --name glance + ID=$(keystone service-get glance | awk '/ id / { print $4 }') + keystone endpoint-create --region RegionOne --service $ID --internalurl http://localhost:9292 --adminurl http://localhost:9292 --publicurl ${cfg.bootstrap.endpointPublic} + + keystone user-create --name ${cfg.serviceUsername} --tenant service --pass ${getSecret cfg.servicePassword} + keystone user-role-add --tenant service --user ${cfg.serviceUsername} --role admin + fi + ''; + serviceConfig = { + PermissionsStartOnly = true; # preStart must be run as root + TimeoutStartSec = "600"; # 10min for initial db migrations + User = "glance"; + Group = "glance"; + ExecStart = "${cfg.package}/bin/glance-registry --config-file=${glanceRegistryConf}"; + }; + }; + systemd.services.glance-api = { + description = "OpenStack Glance API Daemon"; + after = [ "glance-registry.service" "network.target"]; + requires = [ "glance-registry.service" "network.target"]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + PermissionsStartOnly = true; # preStart must be run as root + User = "glance"; + Group = "glance"; + ExecStart = "${cfg.package}/bin/glance-api --config-file=${glanceApiConf}"; + }; + }; + }; + +} diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 6423432c78b..586f5d9c0a3 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -278,7 +278,7 @@ in description = '' If enabled, the Nix store in the VM is made writable by - layering a unionfs-fuse/tmpfs filesystem on top of the host's Nix + layering an overlay filesystem on top of the host's Nix store. ''; }; @@ -395,6 +395,13 @@ in chmod 1777 $targetRoot/tmp mkdir -p $targetRoot/boot + + ${optionalString cfg.writableStore '' + echo "mounting overlay filesystem on /nix/store..." + mkdir -p 0755 $targetRoot/nix/.rw-store/store $targetRoot/nix/.rw-store/work $targetRoot/nix/store + mount -t overlay overlay $targetRoot/nix/store \ + -o lowerdir=$targetRoot/nix/.ro-store,upperdir=$targetRoot/nix/.rw-store/store,workdir=$targetRoot/nix/.rw-store/work || fail + ''} ''; # After booting, register the closure of the paths in @@ -412,7 +419,8 @@ in ''; boot.initrd.availableKernelModules = - optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx"; + optional cfg.writableStore "overlay" + ++ optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx"; virtualisation.bootDevice = mkDefault (if cfg.qemu.diskInterface == "scsi" then "/dev/sda" else "/dev/vda"); @@ -432,13 +440,13 @@ in ${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} = { device = "store"; fsType = "9p"; - options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ]; + options = [ "trans=virtio" "version=9p2000.L" "veryloose" ]; neededForBoot = true; }; "/tmp/xchg" = { device = "xchg"; fsType = "9p"; - options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ]; + options = [ "trans=virtio" "version=9p2000.L" "veryloose" ]; neededForBoot = true; }; "/tmp/shared" = @@ -447,12 +455,6 @@ in options = [ "trans=virtio" "version=9p2000.L" ]; neededForBoot = true; }; - } // optionalAttrs cfg.writableStore - { "/nix/store" = - { fsType = "unionfs-fuse"; - device = "unionfs"; - options = [ "allow_other" "cow" "nonempty" "chroot=/mnt-root" "max_files=32768" "hide_meta_files" "dirs=/nix/.rw-store=rw:/nix/.ro-store=ro" ]; - }; } // optionalAttrs (cfg.writableStore && cfg.writableStoreUseTmpfs) { "/nix/.rw-store" = { fsType = "tmpfs"; diff --git a/nixos/release.nix b/nixos/release.nix index 366eecf773e..dfa9b67654f 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -242,6 +242,7 @@ in rec { tests.firewall = callTest tests/firewall.nix {}; tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; }); #tests.gitlab = callTest tests/gitlab.nix {}; + tests.glance = callTest tests/glance.nix {}; tests.gocd-agent = callTest tests/gocd-agent.nix {}; tests.gocd-server = callTest tests/gocd-server.nix {}; tests.gnome3 = callTest tests/gnome3.nix {}; diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix index df24686aba8..109fca440e5 100644 --- a/nixos/tests/docker-registry.nix +++ b/nixos/tests/docker-registry.nix @@ -16,13 +16,11 @@ import ./make-test.nix ({ pkgs, ...} : { client1 = { config, pkgs, ...}: { virtualisation.docker.enable = true; - virtualisation.docker.socketActivation = false; virtualisation.docker.extraOptions = "--insecure-registry registry:8080"; }; client2 = { config, pkgs, ...}: { virtualisation.docker.enable = true; - virtualisation.docker.socketActivation = false; virtualisation.docker.extraOptions = "--insecure-registry registry:8080"; }; }; diff --git a/nixos/tests/glance.nix b/nixos/tests/glance.nix new file mode 100644 index 00000000000..992b77227a4 --- /dev/null +++ b/nixos/tests/glance.nix @@ -0,0 +1,77 @@ +{ system ? builtins.currentSystem }: + +with import ../lib/testing.nix { inherit system; }; +with pkgs.lib; + +let + glanceMysqlPassword = "glanceMysqlPassword"; + glanceAdminPassword = "glanceAdminPassword"; + + createDb = pkgs.writeText "db-provisionning.sql" '' + create database keystone; + GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' IDENTIFIED BY 'keystone'; + GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' IDENTIFIED BY 'keystone'; + + create database glance; + GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'localhost' IDENTIFIED BY '${glanceMysqlPassword}'; + GRANT ALL PRIVILEGES ON glance.* TO 'glance'@'%' IDENTIFIED BY '${glanceMysqlPassword}'; + ''; + + image = + (import ../lib/eval-config.nix { + inherit system; + modules = [ ../../nixos/modules/virtualisation/nova-image.nix ]; + }).config.system.build.novaImage; + + # The admin keystone account + adminOpenstackCmd = "OS_TENANT_NAME=admin OS_USERNAME=admin OS_PASSWORD=keystone OS_AUTH_URL=http://localhost:5000/v3 OS_IDENTITY_API_VERSION=3 openstack"; + +in makeTest { + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ lewo ]; + }; + machine = + { config, pkgs, ... }: + { + services.mysql.enable = true; + services.mysql.package = pkgs.mysql; + services.mysql.initialScript = createDb; + + virtualisation = { + openstack.keystone = { + enable = true; + database.password = { value = "keystone"; storage = "fromNixStore"; }; + adminToken = { value = "adminToken"; storage = "fromNixStore"; }; + bootstrap.enable = true; + bootstrap.adminPassword = { value = "keystone"; storage = "fromNixStore"; }; + }; + + openstack.glance = { + enable = true; + database.password = { value = glanceMysqlPassword; storage = "fromNixStore"; }; + servicePassword = { value = glanceAdminPassword; storage = "fromNixStore"; }; + + bootstrap = { + enable = true; + keystoneAdminPassword = { value = "keystone"; storage = "fromNixStore"; }; + }; + }; + + memorySize = 2096; + diskSize = 4 * 1024; + }; + + environment.systemPackages = with pkgs.pythonPackages; with pkgs; [ + openstackclient + ]; + }; + + testScript = + '' + $machine->waitForUnit("glance-api.service"); + + # Since Glance api can take time to start, we retry until success + $machine->waitUntilSucceeds("${adminOpenstackCmd} image create nixos --file ${image}/nixos.img --disk-format qcow2 --container-format bare --public"); + $machine->succeed("${adminOpenstackCmd} image list") =~ /nixos/ or die; + ''; +} diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix index bd8f9502e2f..4787d42d695 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome3.nix @@ -29,7 +29,7 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'"); $machine->succeed("xauth merge ~alice/.Xauthority"); $machine->waitForWindow(qr/Terminal/); - $machine->mustSucceed("timeout 900 bash -c 'journalctl -f|grep -m 1 \"GNOME Shell started\"'"); + $machine->succeed("timeout 900 bash -c 'while read msg; do if [[ \$msg =~ \"GNOME Shell started\" ]]; then break; fi; done < <(journalctl -f)'"); $machine->sleep(10); $machine->screenshot("screen"); ''; diff --git a/nixos/tests/kde5.nix b/nixos/tests/kde5.nix index 30db316dba5..2b61d6f3f0a 100644 --- a/nixos/tests/kde5.nix +++ b/nixos/tests/kde5.nix @@ -18,6 +18,7 @@ import ./make-test.nix ({ pkgs, ...} : }; }; services.xserver.desktopManager.kde5.enable = true; + virtualisation.writableStore = false; # FIXME }; testScript = { nodes, ... }: diff --git a/nixos/tests/kubernetes.nix b/nixos/tests/kubernetes.nix index 273bd3c80c1..dcd25e21197 100644 --- a/nixos/tests/kubernetes.nix +++ b/nixos/tests/kubernetes.nix @@ -59,6 +59,7 @@ in { virtualisation.diskSize = 2048; programs.bash.enableCompletion = true; + environment.systemPackages = with pkgs; [ netcat bind ]; services.kubernetes.roles = ["master" "node"]; virtualisation.docker.extraOptions = "--iptables=false --ip-masq=false -b cbr0"; diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 17d4a878d3a..83103f35d48 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -10,29 +10,61 @@ let vlanIfs = range 1 (length config.virtualisation.vlans); in { virtualisation.vlans = [ 1 2 3 ]; + boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = true; networking = { useDHCP = false; useNetworkd = networkd; firewall.allowPing = true; + firewall.checkReversePath = true; + firewall.allowedUDPPorts = [ 547 ]; interfaces = mkOverride 0 (listToAttrs (flip map vlanIfs (n: nameValuePair "eth${toString n}" { ipAddress = "192.168.${toString n}.1"; prefixLength = 24; + ipv6Address = "fd00:1234:5678:${toString n}::1"; + ipv6PrefixLength = 64; }))); }; - services.dhcpd = { + services.dhcpd4 = { enable = true; interfaces = map (n: "eth${toString n}") vlanIfs; extraConfig = '' - option subnet-mask 255.255.255.0; + authoritative; '' + flip concatMapStrings vlanIfs (n: '' subnet 192.168.${toString n}.0 netmask 255.255.255.0 { - option broadcast-address 192.168.${toString n}.255; option routers 192.168.${toString n}.1; + # XXX: technically it's _not guaranteed_ that IP addresses will be + # issued from the first item in range onwards! We assume that in + # our tests however. range 192.168.${toString n}.2 192.168.${toString n}.254; } ''); }; + services.radvd = { + enable = true; + config = flip concatMapStrings vlanIfs (n: '' + interface eth${toString n} { + AdvSendAdvert on; + AdvManagedFlag on; + AdvOtherConfigFlag on; + + prefix fd00:1234:5678:${toString n}::/64 { + AdvAutonomous off; + }; + }; + ''); + }; + services.dhcpd6 = { + enable = true; + interfaces = map (n: "eth${toString n}") vlanIfs; + extraConfig = '' + authoritative; + '' + flip concatMapStrings vlanIfs (n: '' + subnet6 fd00:1234:5678:${toString n}::/64 { + range6 fd00:1234:5678:${toString n}::2 fd00:1234:5678:${toString n}::2; + } + ''); + }; }; testCases = { @@ -108,8 +140,14 @@ let useNetworkd = networkd; firewall.allowPing = true; useDHCP = true; - interfaces.eth1.ip4 = mkOverride 0 [ ]; - interfaces.eth2.ip4 = mkOverride 0 [ ]; + interfaces.eth1 = { + ip4 = mkOverride 0 [ ]; + ip6 = mkOverride 0 [ ]; + }; + interfaces.eth2 = { + ip4 = mkOverride 0 [ ]; + ip6 = mkOverride 0 [ ]; + }; }; }; testScript = { nodes, ... }: @@ -121,21 +159,31 @@ let # Wait until we have an ip address on each interface $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'"); + $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q 'fd00:1234:5678:1:'"); $client->waitUntilSucceeds("ip addr show dev eth2 | grep -q '192.168.2'"); + $client->waitUntilSucceeds("ip addr show dev eth2 | grep -q 'fd00:1234:5678:2:'"); # Test vlan 1 $client->waitUntilSucceeds("ping -c 1 192.168.1.1"); $client->waitUntilSucceeds("ping -c 1 192.168.1.2"); + $client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::1"); + $client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::2"); $router->waitUntilSucceeds("ping -c 1 192.168.1.1"); $router->waitUntilSucceeds("ping -c 1 192.168.1.2"); + $router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::1"); + $router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:1::2"); # Test vlan 2 $client->waitUntilSucceeds("ping -c 1 192.168.2.1"); $client->waitUntilSucceeds("ping -c 1 192.168.2.2"); + $client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::1"); + $client->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::2"); $router->waitUntilSucceeds("ping -c 1 192.168.2.1"); $router->waitUntilSucceeds("ping -c 1 192.168.2.2"); + $router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::1"); + $router->waitUntilSucceeds("ping6 -c 1 fd00:1234:5678:2::2"); ''; }; dhcpOneIf = { diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index 390363b88e2..29154499688 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -35,6 +35,18 @@ in { ]; }; + server_lazy = + { config, pkgs, ... }: + + { + services.openssh = { enable = true; startWhenNeeded = true; }; + security.pam.services.sshd.limits = + [ { domain = "*"; item = "memlock"; type = "-"; value = 1024; } ]; + users.extraUsers.root.openssh.authorizedKeys.keys = [ + snakeOilPublicKey + ]; + }; + client = { config, pkgs, ... }: { }; @@ -50,6 +62,8 @@ in { subtest "manual-authkey", sub { $server->succeed("mkdir -m 700 /root/.ssh"); $server->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys"); + $server_lazy->succeed("mkdir -m 700 /root/.ssh"); + $server_lazy->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys"); $client->succeed("mkdir -m 700 /root/.ssh"); $client->copyFileFromHost("key", "/root/.ssh/id_ed25519"); @@ -58,6 +72,10 @@ in { $client->waitForUnit("network.target"); $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2"); $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024"); + + $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'echo hello world' >&2"); + $client->succeed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'ulimit -l' | grep 1024"); + }; subtest "configured-authkey", sub { @@ -66,6 +84,11 @@ in { $client->succeed("ssh -o UserKnownHostsFile=/dev/null" . " -o StrictHostKeyChecking=no -i privkey.snakeoil" . " server true"); + + $client->succeed("ssh -o UserKnownHostsFile=/dev/null" . + " -o StrictHostKeyChecking=no -i privkey.snakeoil" . + " server_lazy true"); + }; ''; }) diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 0d2e656bae2..1d9b897188d 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -32,4 +32,6 @@ rec { primecoin = callPackage ./primecoin.nix { withGui = true; }; primecoind = callPackage ./primecoin.nix { withGui = false; }; + stellar-core = callPackage ./stellar-core.nix { }; + } diff --git a/pkgs/applications/altcoins/stellar-core-dirty-version.patch b/pkgs/applications/altcoins/stellar-core-dirty-version.patch new file mode 100644 index 00000000000..57d66ce5919 --- /dev/null +++ b/pkgs/applications/altcoins/stellar-core-dirty-version.patch @@ -0,0 +1,15 @@ +Subject: Prevent "-dirty" from being erroneously added to the version + +diff --git a/src/Makefile.am b/src/Makefile.am +index d36d1a3..00048fc 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -28,7 +28,7 @@ always: + # Always rebuild because .git/HEAD is a symbolic ref one can't depend on + StellarCoreVersion.h: always + @vers=$$(cd "$(srcdir)" \ +- && git describe --always --dirty --tags 2>/dev/null \ ++ && git describe --always --tags 2>/dev/null \ + || echo "$(PACKAGE) $(VERSION)"); \ + echo "#define STELLAR_CORE_VERSION \"$$vers\"" > $@~ + @if cmp -s $@~ $@; then rm -f $@~; else \ diff --git a/pkgs/applications/altcoins/stellar-core.nix b/pkgs/applications/altcoins/stellar-core.nix new file mode 100644 index 00000000000..9942f0898a2 --- /dev/null +++ b/pkgs/applications/altcoins/stellar-core.nix @@ -0,0 +1,46 @@ +{ stdenv, lib, fetchgit, autoconf, libtool, automake, pkgconfig, git +, bison, flex, postgresql }: + +let + pname = "stellar-core"; + version = "0.5.1"; + +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchgit { + url = "https://github.com/stellar/stellar-core.git"; + rev = "refs/tags/v${version}"; + sha256 = "0ldw3qr0sajgam38z2w2iym0214ial6iahbzx3b965cw92n8n88z"; + fetchSubmodules = true; + leaveDotGit = true; + }; + + buildInputs = [ autoconf automake libtool pkgconfig git ]; + + propagatedBuildInputs = [ bison flex postgresql ]; + + patches = [ ./stellar-core-dirty-version.patch ]; + + preConfigure = '' + # Everything needs to be staged in git because the build uses + # `git ls-files` to search for source files to compile. + git add . + + ./autogen.sh + ''; + + meta = with stdenv.lib; { + description = "Implements the Stellar Consensus Protocol, a federated consensus protocol"; + longDescription = '' + Stellar-core is the backbone of the Stellar network. It maintains a + local copy of the ledger, communicating and staying in sync with other + instances of stellar-core on the network. Optionally, stellar-core can + store historical records of the ledger and participate in consensus. + ''; + homepage = https://www.stellar.org/; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ chris-martin ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix deleted file mode 100644 index 13fea9a99af..00000000000 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw -, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 -, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf -, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile -, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango -, perl, pkgconfig, python2, rubberband, serd, sord-svn, sratom, suil, taglib, vampSDK }: - -let - - # Ardour git repo uses a mix of annotated and lightweight tags. Annotated - # tags are used for MAJOR.MINOR versioning, and lightweight tags are used - # in-between; MAJOR.MINOR.REV where REV is the number of commits since the - # last annotated tag. A slightly different version string format is needed - # for the 'revision' info that is built into the binary; it is the format of - # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. - - # Version to build. - #tag = "3.5.403"; - - # Version info that is built into the binary. Keep in sync with 'tag'. The - # last 8 digits is a (fake) commit id. - revision = "3.5-4539-g7024232"; - - # temporarily use a non tagged version, because 3.5.403 has a bug that - # causes loss of audio-files, and it was decided that there won't be a - # hotfix release, and we should use 4.0 when it comes out. - # more info: http://comments.gmane.org/gmane.comp.audio.ardour.user/13665 - - version = "2015-02-20"; -in - -stdenv.mkDerivation rec { - name = "ardour3-git-${version}"; - - src = fetchgit { - url = git://git.ardour.org/ardour/ardour.git; - rev = "7024232855d268633760674d34c096ce447b7240"; - sha256 = "0pnnx22asizin5rvf352nfv6003zarw3jd64magp10310wrfiwbq"; - }; - - buildInputs = - [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc - glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo - libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate - libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 - makeWrapper pango perl pkgconfig python2 rubberband serd sord-svn sratom suil taglib vampSDK - ]; - - patchPhase = '' - printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc - sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript - patchShebangs ./tools/ - ''; - - configurePhase = "${python2.interpreter} waf configure --optimize --docs --with-backends=jack,alsa --prefix=$out"; - - buildPhase = "${python2.interpreter} waf"; - - installPhase = '' - ${python2.interpreter} waf install - - # Install desktop file - mkdir -p "$out/share/applications" - cat > "$out/share/applications/ardour.desktop" << EOF - [Desktop Entry] - Name=Ardour 3 - GenericName=Digital Audio Workstation - Comment=Multitrack harddisk recorder - Exec=$out/bin/ardour3 - Icon=$out/share/ardour3/icons/ardour_icon_256px.png - Terminal=false - Type=Application - X-MultipleArgs=false - Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video; - EOF - ''; - - meta = with stdenv.lib; { - description = "Multi-track hard disk recording software"; - longDescription = '' - Ardour is a digital audio workstation (DAW), You can use it to - record, edit and mix multi-track audio and midi. Produce your - own CDs. Mix video soundtracks. Experiment with new ideas about - music and sound. - - Please consider supporting the ardour project financially: - https://community.ardour.org/node/8288 - ''; - homepage = http://ardour.org/; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; - }; -} diff --git a/pkgs/applications/audio/ardour/ardour4.nix b/pkgs/applications/audio/ardour/ardour4.nix deleted file mode 100644 index b6123f40ee1..00000000000 --- a/pkgs/applications/audio/ardour/ardour4.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, fetchFromGitHub, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw -, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 -, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf -, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile -, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango -, perl, pkgconfig, python2, rubberband, serd, sord-svn, sratom, suil, taglib, vampSDK }: - -let - - # Ardour git repo uses a mix of annotated and lightweight tags. Annotated - # tags are used for MAJOR.MINOR versioning, and lightweight tags are used - # in-between; MAJOR.MINOR.REV where REV is the number of commits since the - # last annotated tag. A slightly different version string format is needed - # for the 'revision' info that is built into the binary; it is the format of - # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. - - # Version to build. - tag = "4.7"; - -in - -stdenv.mkDerivation rec { - name = "ardour-${tag}"; - - src = fetchFromGitHub { - owner = "Ardour"; - repo = "ardour"; - rev = "d84a8222f2b6dab5028b2586f798535a8766670e"; - sha256 = "149gswphz77m3pkzsn2nqbm6yvcfa3fva560bcvjzlgb73f64q5l"; - }; - - buildInputs = - [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc - glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo - libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate - libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 - makeWrapper pango perl pkgconfig python2 rubberband serd sord-svn sratom suil taglib vampSDK - ]; - - # ardour's wscript has a "tarball" target but that required the git revision - # be available. Since this is an unzipped tarball fetched from github we - # have to do that ourself. - patchPhase = '' - printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-${builtins.substring 0 8 src.rev}\"; }\n' > libs/ardour/revision.cc - sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript - patchShebangs ./tools/ - ''; - - configurePhase = "${python2.interpreter} waf configure --optimize --docs --with-backends=jack,alsa --prefix=$out"; - - buildPhase = "${python2.interpreter} waf"; - - installPhase = '' - ${python2.interpreter} waf install - # Install desktop file - mkdir -p "$out/share/applications" - cat > "$out/share/applications/ardour.desktop" << EOF - [Desktop Entry] - Name=Ardour 4 - GenericName=Digital Audio Workstation - Comment=Multitrack harddisk recorder - Exec=$out/bin/ardour4 - Icon=$out/share/ardour4/icons/ardour_icon_256px.png - Terminal=false - Type=Application - X-MultipleArgs=false - Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video; - EOF - ''; - - meta = with stdenv.lib; { - description = "Multi-track hard disk recording software"; - longDescription = '' - Ardour is a digital audio workstation (DAW), You can use it to - record, edit and mix multi-track audio and midi. Produce your - own CDs. Mix video soundtracks. Experiment with new ideas about - music and sound. - Please consider supporting the ardour project financially: - https://community.ardour.org/node/8288 - ''; - homepage = http://ardour.org/; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.goibhniu maintainers.fps ]; - }; -} diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index ab228766e13..6745109d7d0 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -2,8 +2,8 @@ , fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile -, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper -, perl, pkgconfig, python2, rubberband, serd, sord-svn, sratom +, libusb, libuuid, libxml2, libxslt, lilv, lv2, makeWrapper +, perl, pkgconfig, python2, rubberband, serd, sord, sratom , taglib, vampSDK, dbus, fftw, pango, suil, libarchive }: let @@ -16,7 +16,7 @@ let # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. # Version to build. - tag = "5.4"; + tag = "5.5"; in @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate - libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 - makeWrapper pango perl pkgconfig python2 rubberband serd sord-svn + libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lv2 + makeWrapper pango perl pkgconfig python2 rubberband serd sord sratom suil taglib vampSDK libarchive ]; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index cc96f6dbbb3..f91fc03ec01 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, wxGTK30, pkgconfig, gettext, gtk2, glib, zlib, perl, intltool, +{ stdenv, fetchurl, wxGTK30, pkgconfig, file, gettext, gtk2, glib, zlib, perl, intltool, libogg, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, fetchpatch, expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */ }: +with stdenv.lib; + stdenv.mkDerivation rec { version = "2.1.2"; name = "audacity-${version}"; @@ -23,12 +25,34 @@ stdenv.mkDerivation rec { mkdir lib-src mv lib-src-rm/{Makefile*,lib-widget-extra,portaudio-v19,portmixer,portsmf,FileDialog,sbsms,libnyquist} lib-src/ rm -r lib-src-rm/ + + # we will get a (possibly harmless) warning during configure without this + substituteInPlace configure \ + --replace /usr/bin/file ${file}/bin/file ''; - configureFlags = [ "--with-libsamplerate" ]; + configureFlags = [ + "--with-libsamplerate" + ]; + + # audacity only looks for lame and ffmpeg at runtime, so we need to link them in manually + NIX_LDFLAGS = [ + # LAME + "-lmp3lame" + # ffmpeg + "-lavcodec" + "-lavdevice" + "-lavfilter" + "-lavformat" + "-lavresample" + "-lavutil" + "-lpostproc" + "-lswresample" + "-lswscale" + ]; buildInputs = [ - pkgconfig gettext wxGTK30 expat alsaLib + pkgconfig file gettext wxGTK30 expat alsaLib libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil gtk2 ffmpeg libmad lame libvorbis flac soundtouch ]; #ToDo: detach sbsms @@ -36,11 +60,11 @@ stdenv.mkDerivation rec { dontDisableStatic = true; doCheck = false; # Test fails - meta = { + meta = with stdenv.lib; { description = "Sound editor with graphical UI"; homepage = http://audacityteam.org/; - license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + license = licenses.gpl2Plus; + platforms = with platforms; linux; + maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index 3599991551c..babbcc51e40 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -2,7 +2,7 @@ utillinux, pythonPackages, libnotify }: stdenv.mkDerivation { - name = "clerk-unstable-2016-10-14"; + name = "clerk-2016-10-14"; src = fetchFromGitHub { owner = "carnager"; diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index e571758fabb..52e29e3da4c 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libogg }: stdenv.mkDerivation rec { - name = "flac-1.3.1"; + name = "flac-1.3.2"; src = fetchurl { url = "http://downloads.xiph.org/releases/flac/${name}.tar.xz"; - sha256 = "4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c"; + sha256 = "0gymm2j3276kr9nz6vmgfwsdfrq6c449n40a0mzz8h6wc7nw7kwi"; }; buildInputs = [ libogg ]; diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix index 60d9c0e7b12..4f22ca62c1a 100644 --- a/pkgs/applications/audio/game-music-emu/default.nix +++ b/pkgs/applications/audio/game-music-emu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - version = "0.6.0"; + version = "0.6.1"; name = "game-music-emu-${version}"; src = fetchurl { - url = "https://game-music-emu.googlecode.com/files/${name}.tar.bz2"; - sha256 = "11s9l938nxbrk7qb2k1ppfgizcz00cakbxgv0gajc6hyqv882vjh"; + url = "https://bitbucket.org/mpyne/game-music-emu/downloads/${name}.tar.bz2"; + sha256 = "08fk7zddpn7v93d0fa7fcypx7hvgwx9b5psj9l6m8b87k2hbw4fw"; }; buildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/applications/audio/gmu/default.nix index f23ba66a3b5..8446855d190 100644 --- a/pkgs/applications/audio/gmu/default.nix +++ b/pkgs/applications/audio/gmu/default.nix @@ -1,24 +1,20 @@ {stdenv, fetchurl, SDL, SDL_gfx, SDL_image, tremor, flac, mpg123, libmikmod -, speex -, keymap ? "newdefault" +, speex, ncurses +, keymap ? "default" , conf ? "unknown" }: stdenv.mkDerivation rec { - name = "gmu-0.7.2"; - + name = "gmu-0.10.1"; + src = fetchurl { - url = http://wejp.k.vu/files/gmu-0.7.2.tar.gz; - sha256 = "0gvhwhhlj64lc425wqch4g6v59ldd5i3rxll3zdcrdgk2vkh8nys"; + url = "http://wejp.k.vu/files/${name}.tar.gz"; + sha256 = "03x0mc0xw2if0bpf0a15yprcyx1xccki039zvl2099dagwk6xskv"; }; - buildInputs = [ SDL SDL_gfx SDL_image tremor flac mpg123 libmikmod speex ]; + buildInputs = [ SDL SDL_gfx SDL_image tremor flac mpg123 libmikmod speex ncurses ]; - NIX_LDFLAGS = "-lgcc_s"; - - preBuild = '' - makeFlags="$makeFlags PREFIX=$out" - ''; + makeFlags = [ "PREFIX=$(out)" ]; postInstall = '' cp ${keymap}.keymap $out/share/gmu/default.keymap diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index eb9ddf164d4..569326ec375 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pythonPackages, mygpoclient, intltool +{ stdenv, fetchurl, python2Packages, mygpoclient, intltool , ipodSupport ? true, libgpod , gnome3 }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "gpodder-${version}"; version = "3.9.1"; @@ -24,12 +24,12 @@ pythonPackages.buildPythonApplication rec { ''; buildInputs = [ - intltool pythonPackages.coverage pythonPackages.minimock + intltool python2Packages.coverage python2Packages.minimock gnome3.gnome_themes_standard gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ]; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ feedparser dbus-python mygpoclient pygtk eyeD3 ] ++ stdenv.lib.optional ipodSupport libgpod; diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 68990b11ef0..7f4bc0b3e9e 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit, boost, ganv, glibmm, gtk2, gtkmm2, libjack2, lilv -, lv2Unstable, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom +{ stdenv, fetchgit, boost, ganv, glibmm, gtkmm2, libjack2, lilv +, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom , suil }: @@ -14,21 +14,21 @@ stdenv.mkDerivation rec { }; buildInputs = [ - boost ganv glibmm gtk2 gtkmm2 libjack2 lilv lv2Unstable makeWrapper pkgconfig + boost ganv glibmm gtkmm2 libjack2 lilv lv2 makeWrapper pkgconfig python raul serd sord sratom suil ]; configurePhase = '' sed -e "s@{PYTHONDIR}/'@out/'@" -i wscript - python waf configure --prefix=$out + ${python.interpreter} waf configure --prefix=$out ''; propagatedBuildInputs = [ rdflib ]; - buildPhase = "python waf"; + buildPhase = "${python.interpreter} waf"; installPhase = '' - python waf install + ${python.interpreter} waf install for program in ingenams ingenish do wrapProgram $out/bin/$program \ diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix index 5c127a289c0..ba1d88373ff 100644 --- a/pkgs/applications/audio/linuxband/default.nix +++ b/pkgs/applications/audio/linuxband/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, pythonPackages }: +{ stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, python2Packages }: let - inherit (pythonPackages) pyGtkGlade pygtksourceview python; + inherit (python2Packages) pyGtkGlade pygtksourceview python; in stdenv.mkDerivation rec { version = "12.02.1"; name = "linuxband-${version}"; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index d7454741ed5..856da9f742e 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -5,13 +5,13 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-${version}"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy"; rev = "v${version}"; - sha256 = "15i17rj2bh2kda6d6rwcjhs2m3nfsrcyq3lj9vbgmacg0cdb22pp"; + sha256 = "0krq5fbscqxayyc4vxai7iwxm2kdbgs5jicrdb013v04phw2za06"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 4b789e158bb..bbd59f56f70 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,6 +1,4 @@ -{ stdenv, python2Packages, fetchurl, gettext -, pkgconfig, libofa, ffmpeg, chromaprint -}: +{ stdenv, python2Packages, fetchurl, gettext, chromaprint }: let version = "1.3.2"; @@ -14,12 +12,7 @@ in pythonPackages.buildPythonApplication { sha256 = "0821xb7gyg0rhch8s3qkzmak90wjpcxkv9a364yv6bmqc12j6a77"; }; - buildInputs = [ - pkgconfig - ffmpeg - libofa - gettext - ]; + buildInputs = [ gettext ]; propagatedBuildInputs = with pythonPackages; [ pyqt4 diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 631a5701591..c140e1a46e5 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,10 +1,9 @@ { stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }: let - pypkgs = python2Packages; pname = "puddletag"; -in pypkgs.buildPythonApplication rec { +in python2Packages.buildPythonApplication rec { name = "${pname}-${version}"; version = "1.2.0"; @@ -17,11 +16,9 @@ in pypkgs.buildPythonApplication rec { sourceRoot = "${pname}-v${version}-src/source"; - disabled = pypkgs.isPy3k; # work to support python 3 has not begun + disabled = python2Packages.isPy3k; # work to support python 3 has not begun - outputs = [ "out" ]; - - propagatedBuildInputs = [ chromaprint ] ++ (with pypkgs; [ + propagatedBuildInputs = [ chromaprint ] ++ (with python2Packages; [ configobj mutagen pyparsing @@ -35,7 +32,7 @@ in pypkgs.buildPythonApplication rec { siteDir=$(toPythonPath $out) mkdir -p $siteDir PYTHONPATH=$PYTHONPATH:$siteDir - ${pypkgs.python.interpreter} setup.py install --prefix $out + ${python2Packages.python.interpreter} setup.py install --prefix $out ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 7bb8a591612..b28f66aaad7 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. stdenv.mkDerivation rec { - name = "qmmp-1.1.2"; + name = "qmmp-1.1.5"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "023gvgchk6ybkz3miy0z08j9n5awz5cjvav7fqjdmpix4sivhn5q"; + sha256 = "1gfx6nm9v6qrx58gxib6grfhb45mnib1n4wdsnjq16br6bs8h4lv"; }; buildInputs = diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index a1a4d26e2a0..9e310d6e4e4 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -6,7 +6,7 @@ assert stdenv.system == "x86_64-linux"; let # Please update the stable branch! - version = "1.0.45.182.gbbd5909f-72"; + version = "1.0.47.13.gd8e05b1f-47"; deps = [ alsaLib @@ -51,7 +51,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0vpwwla5vrx5ryx434a486l8vcgr1vxh28ri6ab4f28xrz16ipys"; + sha256 = "0079vq2nw07795jyqrjv68sc0vqjy6abjh6jjd5cg3hqlxdf4ckz"; }; buildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 2e14ae339cf..28b6b2b85ad 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,7 +9,6 @@ , gnugrep , gnutar , gzip -, jdk , fontconfig , freetype , libpulseaudio @@ -29,6 +28,7 @@ , writeTextFile , xkeyboard_config , zlib +, fontsConf }: let @@ -44,50 +44,57 @@ let ]; installPhase = '' cp -r . $out - wrapProgram $out/bin/studio.sh --set PATH "${stdenv.lib.makeBinPath [ + wrapProgram $out/bin/studio.sh \ + --set PATH "${stdenv.lib.makeBinPath [ - # Checked in studio.sh - coreutils - findutils - gnugrep - jdk - which + # Checked in studio.sh + coreutils + findutils + gnugrep + which - # For Android emulator - file - glxinfo - pciutils - setxkbmap + # For Android emulator + file + glxinfo + pciutils + setxkbmap - # Used during setup wizard - gnutar - gzip + # Used during setup wizard + gnutar + gzip - # Runtime stuff - git + # Runtime stuff + git - ]}" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ - # Gradle wants libstdc++.so.6 - stdenv.cc.cc.lib - # mksdcard wants 32 bit libstdc++.so.6 - pkgsi686Linux.stdenv.cc.cc.lib + ]}" \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ - # aapt wants libz.so.1 - zlib - pkgsi686Linux.zlib - # Support multiple monitors - libXrandr + # Crash at startup without these + fontconfig + freetype + libXext + libXi + libXrender + libXtst - # For Android emulator - libpulseaudio - libX11 - libXext - libXrender - libXtst - libXi - freetype - fontconfig - ]}" --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" + # Gradle wants libstdc++.so.6 + stdenv.cc.cc.lib + # mksdcard wants 32 bit libstdc++.so.6 + pkgsi686Linux.stdenv.cc.cc.lib + + # aapt wants libz.so.1 + zlib + pkgsi686Linux.zlib + # Support multiple monitors + libXrandr + + # For Android emulator + libpulseaudio + libX11 + + ]}" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + --set FONTCONFIG_FILE ${fontsConf} ''; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 58eb2e568c1..8a0a5d0e0b2 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.12.7"; + version = "1.13.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "1kkw6wixri8iddnmscza1d4riq4m9yr78y0d9y76vdnxarma0bfq"; + sha256 = "17k4v5hibaq4zi86y1sjx09hqng4sm3lr024v2mjnhj65m2nhjb8"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 25538df0384..59e8076c787 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchurl, intltool, pkgconfig , gtk, libxml2 -, enchant, gucharmap, python +{ stdenv, fetchurl, intltool, wrapGAppsHook, pkgconfig , gtk, libxml2 +, enchant, gucharmap, python, gnome3 }: stdenv.mkDerivation rec { - name = "bluefish-2.2.7"; + name = "bluefish-2.2.9"; src = fetchurl { url = "mirror://sourceforge/bluefish/${name}.tar.bz2"; - sha256 = "1psqx3ljz13ylqs4zkaxv9lv1hgzld6904kdp0alwx99p5rlnlr3"; + sha256 = "1l7pg6h485yj84i34jr09y8qzc1yr4ih6w5jdhmnrg156db7nwav"; }; - buildInputs = [ intltool pkgconfig gtk libxml2 + nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; + buildInputs = [ gnome3.defaultIconTheme gtk libxml2 enchant gucharmap python ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 4663e8c64f8..cde3475196f 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -88,16 +88,16 @@ rec { eclipse-platform = eclipse-platform-46; eclipse-platform-46 = buildEclipse { - name = "eclipse-platform-4.6.1"; - description = "Eclipse platform"; + name = "eclipse-platform-4.6.2"; + description = "Eclipse Platform Neon 2"; sources = { "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk-x86_64.tar.gz; - sha256 = "1mr7sj4whz23iwz5j6mbqd80a39177qv0r7b6cip7dji4n2agl8j"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/eclipse-platform-4.6.2-linux-gtk-x86_64.tar.gz; + sha256 = "1fmpirjkp210angyfz3nr5jp58snjy6784zkkbmdxkiyg9kg2wqq"; }; "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk.tar.gz; - sha256 = "0kgj0zpgzwx90q13c4mr8swf63azd56532ycxgq2rbs0d1qbl87j"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/eclipse-platform-4.6.2-linux-gtk.tar.gz; + sha256 = "0274g6ypiqsqkch10868ygbm6avc5pa57saz9wd196kdivl1bdpm"; }; }; }; @@ -123,16 +123,16 @@ rec { ### Eclipse SDK eclipse-sdk-46 = buildEclipse { - name = "eclipse-sdk-4.6.1"; - description = "Eclipse Neon Classic"; + name = "eclipse-sdk-4.6.2"; + description = "Eclipse Neon 2 Classic"; sources = { "x86_64-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk-x86_64.tar.gz; - sha256 = "1mr7sj4whz23iwz5j6mbqd80a39177qv0r7b6cip7dji4n2agl8j"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/eclipse-SDK-4.6.2-linux-gtk-x86_64.tar.gz; + sha256 = "0g3nk1gcz178j8xk6nblkfsaysm8gq8101383fx60x6w25rdfgjb"; }; "i686-linux" = fetchurl { - url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk.tar.gz; - sha256 = "0kgj0zpgzwx90q13c4mr8swf63azd56532ycxgq2rbs0d1qbl87j"; + url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.6.2-201611241400/eclipse-SDK-4.6.2-linux-gtk.tar.gz; + sha256 = "09wlkcxs5h3j8habqxgr4all99vkgmyixc0vr9dj3qs0kl85k5mz"; }; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 1ad97a0f764..68859a7ac41 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -171,12 +171,12 @@ rec { checkstyle = buildEclipseUpdateSite rec { name = "checkstyle-${version}"; - version = "7.2.0.201611082205"; + version = "7.3.0.201612142232"; src = fetchzip { stripRoot = false; - url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/7.2.0/net.sf.eclipsecs-updatesite_${version}.zip"; - sha256 = "1zngyrh5ckgli0xxm52vm6mzbbvrjslwqcymggfqjhzplpcgwqk1"; + url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/7.3.0/net.sf.eclipsecs-updatesite_${version}.zip"; + sha256 = "1mbiszwnakfmjx5mnh9h2rrp9jzizkmz89p8z4spq2m9kwy1lkqj"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index 650a551cb60..ec56667a4ba 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -1,7 +1,8 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "ed-1.13"; + name = "ed-${version}"; + version = "1.14.1"; src = fetchurl { # gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping @@ -9,8 +10,13 @@ stdenv.mkDerivation rec { # When updating, please make sure the sources pulled match those upstream by # Unpacking both tarballs and running `find . -type f -exec sha256sum \{\} \; | sha256sum` # in the resulting directory - url = "http://fossies.org/linux/privat/${name}.tar.bz2"; - sha256 = "1iym2fsamxr886l3sz8lqzgf00bip5cr0aly8jp04f89kf5mvl0j"; + urls = let file_sha512 = "84396fe4e4f0bf0b591037277ff8679a08b2883207628aaa387644ad83ca5fbdaa74a581f33310e28222d2fea32a0b8ba37e579597cc7d6145df6eb956ea75db"; + in [ + ("http://pkgs.fedoraproject.org/repo/extras/ed" + + "/${name}.tar.bz2/sha512/${file_sha512}/${name}.tar.bz2") + "http://fossies.org/linux/privat/${name}.tar.bz2" + ]; + sha256 = "1pk6qa4sr7qc6vgm34hjx44hsh8x2bwaxhdi78jhsacnn4zwi7bw"; }; /* FIXME: Tests currently fail on Darwin: diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 9118344f024..9aa66d12fdc 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -175,10 +175,10 @@ }) {}; auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "auctex"; - version = "11.89.7"; + version = "11.90.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-11.89.7.tar"; - sha256 = "03sxdh6dv4m98yq09hxcph2lgidai8ky22i9acjcp6vfjlsb9mlf"; + url = "https://elpa.gnu.org/packages/auctex-11.90.0.tar"; + sha256 = "04nsndwcf0dimgc2p1yzzrymc36amzdnjg0158nxplmjkzdp28gy"; }; packageRequires = []; meta = { @@ -295,10 +295,10 @@ }) {}; cl-lib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "cl-lib"; - version = "0.5"; + version = "0.6.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cl-lib-0.5.el"; - sha256 = "1z4ffcx7b95bxz52586lhvdrdm5vp473g3afky9h5my3jp5cd994"; + url = "https://elpa.gnu.org/packages/cl-lib-0.6.1.el"; + sha256 = "00w7bw6wkig13pngijh7ns45s1jn5kkbbjaqznsdh6jk5x089j9y"; }; packageRequires = []; meta = { @@ -306,6 +306,19 @@ license = lib.licenses.free; }; }) {}; + cobol-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { + pname = "cobol-mode"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cobol-mode-1.0.0.el"; + sha256 = "1zmcfpl7v787yacc7gxm8mkp53fmrznp5mnad628phf3vj4kwnxi"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/cobol-mode.html"; + license = lib.licenses.free; + }; + }) {}; coffee-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "coffee-mode"; version = "0.4.1.1"; @@ -377,10 +390,10 @@ context-coloring = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "context-coloring"; - version = "8.0.1"; + version = "8.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/context-coloring-8.0.1.tar"; - sha256 = "0c7sb8dzx6f40hz2l6zicc0shpxj3vzsmvdxzx65c4vgvr462js2"; + url = "https://elpa.gnu.org/packages/context-coloring-8.1.0.tar"; + sha256 = "01wm36qgxsg7lgdxkn7avzfmxcpilsmvfwz3s7y04i0sdrsjvzp4"; }; packageRequires = [ emacs ]; meta = { @@ -619,10 +632,10 @@ el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }: elpaBuild { pname = "el-search"; - version = "1.2"; + version = "1.2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/el-search-1.2.tar"; - sha256 = "0sz78kn9nx390aq5wqz174p8ppw987rzsh892ly166qz4ikwys5a"; + url = "https://elpa.gnu.org/packages/el-search-1.2.3.tar"; + sha256 = "1d7iqr4fr0kr171fnjcm2n0bgcwzdh6jl585mwjf2zqnqszv13h0"; }; packageRequires = [ emacs stream ]; meta = { @@ -809,10 +822,10 @@ gnugo = callPackage ({ ascii-art-to-unicode, cl-lib ? null, elpaBuild, fetchurl, lib, xpm }: elpaBuild { pname = "gnugo"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnugo-3.0.0.tar"; - sha256 = "0b94kbqxir023wkmqn9kpjjj2v0gcz856mqipz30gxjbjj42w27x"; + url = "https://elpa.gnu.org/packages/gnugo-3.0.1.tar"; + sha256 = "08z2hg9mvsxdznq027cmwhkb5i7n7s9r2kvd4jha9xskrcnzj3pp"; }; packageRequires = [ ascii-art-to-unicode cl-lib xpm ]; meta = { @@ -956,10 +969,10 @@ js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "js2-mode"; - version = "20160623"; + version = "20170116"; src = fetchurl { - url = "https://elpa.gnu.org/packages/js2-mode-20160623.tar"; - sha256 = "057djy6amda8kyprkb3v733d21nlmq5fgfazi65fywlfwyq1adxs"; + url = "https://elpa.gnu.org/packages/js2-mode-20170116.tar"; + sha256 = "1z4k7710yz1fbm2w8m17q81yyp8sxllld0zmgfnc336iqrc07hmk"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1087,10 +1100,10 @@ loccur = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "loccur"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/loccur-1.2.2.el"; - sha256 = "0ij5wzxysaikiccw7mjbw1sfylvih0n6b6yyp55vn8w1z2dba0xk"; + url = "https://elpa.gnu.org/packages/loccur-1.2.3.el"; + sha256 = "09pxp03g4pg95cpqiadyv9dz6qrwd9igrkwrhm4s38cscmqm7dzq"; }; packageRequires = [ cl-lib ]; meta = { @@ -1364,10 +1377,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20161214"; + version = "20161224"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20161214.tar"; - sha256 = "0pa9d0l6axif5wlzi7lvxl0fpjwwvc79cy9d37z7md4hxyjdvwzm"; + url = "https://elpa.gnu.org/packages/org-20161224.tar"; + sha256 = "0b10bjypn0w5ja776f8sxl1qpvb61iyz1n3c74jx6fqwypv7dmgi"; }; packageRequires = []; meta = { @@ -2103,10 +2116,10 @@ ztree = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "ztree"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ztree-1.0.4.tar"; - sha256 = "0xiiaa660s8z7901siwvmqkqz30agfzsy3zcyry2r017m3ghqjph"; + url = "https://elpa.gnu.org/packages/ztree-1.0.5.tar"; + sha256 = "14pbbsyav1dzz8m8waqdcmcx9bhw5g8m2kh1ahpxc3i2lfhdan1x"; }; packageRequires = [ cl-lib ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index b61f26446a9..4920dfa3f53 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -376,12 +376,12 @@ ac-emacs-eclim = callPackage ({ auto-complete, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-emacs-eclim"; - version = "20160813.1754"; + version = "20170104.743"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "7d3beb299399bc9d8190190fa59943b2a70a7f63"; - sha256 = "14q0qg9a1kxgf89iy48g63nkj7m9hydipmqq670591v09awk877l"; + rev = "5b7d58c783f6453442570ae8cedd489a0659a58e"; + sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; @@ -422,8 +422,8 @@ src = fetchFromGitHub { owner = "syohex"; repo = "emacs-ac-emoji"; - rev = "92b691efea755c32574f9f7d88f14191971c3981"; - sha256 = "1x7l2wm76xbrwzskk4jfd2g3smr4cvhdy4zks7h3n2mhf8k6hx83"; + rev = "40a639764eb654f1b4bb705c817b66032a26ff2b"; + sha256 = "1gk84bv6w9lg5wrygd7cfab3h46j84k1dwmhzr7jay6n02q6y499"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/15f591f9cba367b071046fef5ae01bbbd0475ce3/recipes/ac-emoji"; @@ -733,12 +733,12 @@ ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "ac-php"; - version = "20160910.1747"; + version = "20170110.2036"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "fa4a79892e1097db28dce7ba4058e68998228ddd"; - sha256 = "055hf8shm4b15gvr7cq72laqd87alhmi5pkadbia9ccb8y3m2508"; + rev = "cb15be9d7a7c6aa2aa20188069b07521bfe3cb5f"; + sha256 = "02fvdkz7a3ql4r1vap2yl3m3cb29f9psk4qy4qp1kqrxbcmcrafm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -754,12 +754,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "20161213.2320"; + version = "20170110.2036"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "fa4a79892e1097db28dce7ba4058e68998228ddd"; - sha256 = "055hf8shm4b15gvr7cq72laqd87alhmi5pkadbia9ccb8y3m2508"; + rev = "cb15be9d7a7c6aa2aa20188069b07521bfe3cb5f"; + sha256 = "02fvdkz7a3ql4r1vap2yl3m3cb29f9psk4qy4qp1kqrxbcmcrafm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -772,22 +772,22 @@ license = lib.licenses.free; }; }) {}; - ac-racer = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }: + ac-racer = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }: melpaBuild { pname = "ac-racer"; - version = "20160517.2220"; + version = "20170114.9"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-ac-racer"; - rev = "eef0de84bd61136d2ed46da08537c9a89da8bd57"; - sha256 = "0p0220axf7c0ga4bkd8d2lcwdgwz08xqglw56lnwzdlksgqhsgyf"; + rev = "4408c2d652dec0432e20c05e001db8222d778c6b"; + sha256 = "01154kqzh3pjy57vxhv27nm69p85a1fwl7r95c7pzmzxgxigfz1p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4318daf4dbb6864ee41f41287c89010fb811641/recipes/ac-racer"; sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp"; name = "ac-racer"; }; - packageRequires = [ auto-complete cl-lib racer ]; + packageRequires = [ auto-complete emacs racer ]; meta = { homepage = "https://melpa.org/#/ac-racer"; license = lib.licenses.free; @@ -1048,12 +1048,12 @@ ace-popup-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-popup-menu"; - version = "20160522.519"; + version = "20161231.1553"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ace-popup-menu"; - rev = "8c97cf2cd9decae3acaf6c858a986bdbc9d7ccff"; - sha256 = "1afw9nxxd0shlg62w9ifc1wlf8vsw5ss8r52h5a5s8m3pnswlx2h"; + rev = "423c59ac11899c66741aca3cad5dda46a167dfe4"; + sha256 = "01gh26marr3h61lvqw0mdc7r3s6cr2s6g5vqxf84ip43fzhi9zc3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/53742e2242101c4b3b3901f5c74e24facf62c7d6/recipes/ace-popup-menu"; @@ -1257,12 +1257,12 @@ ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ag"; - version = "20161027.1758"; + version = "20161228.1641"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ag.el"; - rev = "7b7c2d03e10968c6726f8a59ab25fcac0c147fba"; - sha256 = "06nglpfz4xvjgkfxx1g1vhcm846kfb56pqxv3a8l0rd0fqyaziyi"; + rev = "754d0fea35059c583b9613c7924cebba74fe1319"; + sha256 = "0s9idrnzvd8sdx266s3p4jgpx0zd7s0cb7f48wp319xmqh448p84"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/67f410ac3a58a038e194bcf174bc0a8ceceafb9a/recipes/ag"; @@ -1303,8 +1303,8 @@ src = fetchFromGitHub { owner = "Malabarba"; repo = "aggressive-indent-mode"; - rev = "dfdf3b23d147a3b4d5e8ed80ee9ea098f65ca48c"; - sha256 = "01rb57qamwyaip3ar81vdxyri0s4vpbvpyphhcijin0a8ny33qwa"; + rev = "8324b88d54970059b0f8dd4695e38db6223d39f7"; + sha256 = "18jw8y2d9xjcacgv9k32579khjlg9mha23sia7m12paamjpjbm9p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/aggressive-indent"; @@ -1423,12 +1423,12 @@ alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "alchemist"; - version = "20161122.2304"; + version = "20170104.2226"; src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "26762b767419b13211e331251def9159ee3f8c6b"; - sha256 = "1bss5rgdp37zy4rlyx7j6rngrp9q2ijyr54n5z0r8asmd913r73q"; + rev = "b23c0c3578869b3b242a948e8a0d453fd6c437bf"; + sha256 = "02hakng87j9bcrvd310byrr8y01pa5yq5dgxjrwa9mlyb32l5rag"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; @@ -1448,8 +1448,8 @@ src = fetchFromGitHub { owner = "jgkamat"; repo = "alda-mode"; - rev = "d8fcdc769d6b6b0729943b7dee2c85cf8ca3551b"; - sha256 = "0660kfhaf7q82a5zp48938z7ddl47mhdwa3rfk1xzbh84xbd9hc2"; + rev = "86729cd7cac5f86766ebdc76a43e35f261a9e078"; + sha256 = "0cyvq7asv08bp8kjr641m50dwi326kwb6p67vd4h302liac64br6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2612c494a2b6bd43ffbbaef88ce9ee6327779158/recipes/alda-mode"; @@ -1465,12 +1465,12 @@ alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "alect-themes"; - version = "20161022.1101"; + version = "20170117.217"; src = fetchFromGitHub { owner = "alezost"; repo = "alect-themes"; - rev = "ae90b8e05a14e3439a1e4061111fcc3f75776880"; - sha256 = "0d0dw8xjsvavmsvcgc9n4200mdq9csfxhqsjwpfphqabk89kfsdk"; + rev = "714516d3f3695d0673f07721d4cff0043a287495"; + sha256 = "1cxc27579ik7yrjvahdk5ciji1gfwzlzbjrwzx55v67v13y9kz6r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84c25a290ae4bcc4674434c83c66ae128e4c4282/recipes/alect-themes"; @@ -1486,12 +1486,12 @@ alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }: melpaBuild { pname = "alert"; - version = "20160824.821"; + version = "20170106.1020"; src = fetchFromGitHub { owner = "jwiegley"; repo = "alert"; - rev = "2a81fc6642d23a4d825dae96aa2e23e865b0d56a"; - sha256 = "0blyj7m169imfifvhkwsim20163qwcqhv1f7rq9ms1awi5b33pq3"; + rev = "2c21ee4ebe3e0b60e5df5c8e54a7c2b10f110b85"; + sha256 = "119canyh19ck8fzashnwj9yfk0rm9qsg1yibyfjccd9inp8h7k6z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/113953825ac4ff98d90a5375eb48d8b7bfa224e7/recipes/alert"; @@ -1528,12 +1528,12 @@ all-ext = callPackage ({ all, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "all-ext"; - version = "20161214.2250"; + version = "20170114.1805"; src = fetchFromGitHub { owner = "rubikitch"; repo = "all-ext"; - rev = "a441c10ef99df2a639dfd9e8892cb6080db40730"; - sha256 = "1fvha7gkr0ll6dnpp7rb5v6w11i03rbd74g18fd8x0vdi6lw7j10"; + rev = "9f4ef84a147cf4e0af6ef45826d6cb3558db6b88"; + sha256 = "0gdrsi9n9i1ibijkgk5kyjdjdmnsccfbpifpv679371glap9f68b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/all-ext"; @@ -1549,12 +1549,12 @@ all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: melpaBuild { pname = "all-the-icons"; - version = "20161102.415"; + version = "20161219.329"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "b2d923e51d23e84198e21b025c656bf862eaced6"; - sha256 = "0j5230nas9h6rn4wfsaf5pgd3yxxk615j68y2j01pjrrkxvrwqig"; + rev = "1e4a1a0b53ffcb427fdbc6d13ee6e9c8d23e6216"; + sha256 = "0nrihr280aqq58x65fjyrpci4bsam9ddhsnid2cf8jmsngpvhcdc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -1688,8 +1688,8 @@ src = fetchFromGitHub { owner = "proofit404"; repo = "anaconda-mode"; - rev = "4f84759cab7746cf705f75719e701551d47de1e3"; - sha256 = "1sra3blrdkw4yd3ivsyg64vgd8207clfpqhjchja0x2n3z8792v5"; + rev = "fe7a4ece906c5aec242b94e95befa50080414d3c"; + sha256 = "0lisa1j4x13yk5cgdakdk2xly3ds3hw2s2vq0am375a57p65vpq0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e03b698fd3fe5b80bdd24ce01f7fba28e9da0da8/recipes/anaconda-mode"; @@ -1913,12 +1913,12 @@ ansible = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ansible"; - version = "20161016.1658"; + version = "20161218.1707"; src = fetchFromGitHub { owner = "k1LoW"; repo = "emacs-ansible"; - rev = "c5e4c00135ae8860b8301d1227c3382a7c05ab09"; - sha256 = "0v1asp6q1c744nad3hvhyw3llmpr0jz5yp8dlzfi82pdxk66qhp4"; + rev = "a712d9b48809c975525cb059ea278cbe8a839f5a"; + sha256 = "1jfksnk5fvr4h8mqb0mr2czyxnjmcdlrqdylvj0k0ks6xnskza91"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e45bf58b980ff542a5e887707a6361eb5ac0492/recipes/ansible"; @@ -1955,12 +1955,12 @@ ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ansible-vault"; - version = "20161115.1128"; + version = "20170111.1318"; src = fetchFromGitHub { owner = "zellio"; repo = "ansible-vault-mode"; - rev = "f4d9b3a77490071b8c59caa473bb54df86e90362"; - sha256 = "0f6dmj3b57sy6xl6d50982lnsin0lzyjwk0q1blpz0h2imadr8qm"; + rev = "57cf7e6da30250587c28ebf592d7bca9a3bae1df"; + sha256 = "1m9r3vicmljypq6mhgr86lzgi26dnnlp7g0jbl9bjdk48xfg79wb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault"; @@ -2452,10 +2452,10 @@ apropos-fn-plus-var = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropos-fn-plus-var"; - version = "20151231.1205"; + version = "20170102.902"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/apropos-fn+var.el"; - sha256 = "0wc9zg30a48cj2ssfj9wc7ga0ip9igcxcdbn1wr0qmndzxxa7x5k"; + sha256 = "0a9cfycj4y9z7sm7501bcyn6d66fq1jlna3zmr85m9fbkk42zlyj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd66a7c1a54ede8a279effeee5326be392058d1c/recipes/apropos-fn+var"; @@ -2471,12 +2471,12 @@ apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apropospriate-theme"; - version = "20161207.1248"; + version = "20170106.1329"; src = fetchFromGitHub { owner = "waymondo"; repo = "apropospriate-theme"; - rev = "5a5bbbb1f6a82efb19b0a75deea4c6b1d52347a1"; - sha256 = "0nfpvb20jy9h8g1i7agz153cdvw45sxifsryngfxnnmxd6s6pdmn"; + rev = "c1088e51a0e678930bf147c46faa9c9ec59a6035"; + sha256 = "0l2wdvipwf4m1834zbsnlldjlign9m93hh9lkkkbg99jfkppnzkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1da33013f15825ab656260ce7453b8127e0286f4/recipes/apropospriate-theme"; @@ -2801,12 +2801,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20161101.1955"; + version = "20170113.743"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "ff2990e56f5ff7abf6c20dac7d4d96fa9090221b"; - sha256 = "1mph3sr9mb2hizx02xn4yaag5h6yanhg5zabrpg5cqz2w6ifagaq"; + rev = "ab59b076afe892a0dafe56f943533dafb4594369"; + sha256 = "05k4x5gg0gga2nks0jnk0c4vwv383irm60q1b2z45yqykj9cn1f9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -2906,12 +2906,12 @@ aurel = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aurel"; - version = "20161214.825"; + version = "20170114.137"; src = fetchFromGitHub { owner = "alezost"; repo = "aurel"; - rev = "122c10cf6359b6d353d7ac4e1cb9776f285853ee"; - sha256 = "0i9ganx0n0dmy9p8xgd6mk0qxzw99y893f3nl61dah4yrcmlhcg7"; + rev = "fc7ad208f43f8525f84a18941c9b55f956df8961"; + sha256 = "0mcbw8p4wrnnr39wzkfz9kc899w0k1jb00q1926mchf202cmnz94"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1612acd2cf1fea739739608113923ec51d307e9/recipes/aurel"; @@ -3054,8 +3054,8 @@ src = fetchFromGitHub { owner = "auto-complete"; repo = "auto-complete"; - rev = "ed1abca79bf476287bdf55ed8f7e0af53e5fdbae"; - sha256 = "0478sfs8gsn3x9q4ld2lrm1qgf6yfv34nqljh202n6fh982iqdxn"; + rev = "297e2f77a35dba222c24dd2e3eb0a5d8d0d1ee09"; + sha256 = "0185d1dc0fld06fk5n77q06wrmrphffs9xz3a6c2clyxf8mfx2vy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083fb071191bccd6feb3fb84569373a597440fb1/recipes/auto-complete"; @@ -3614,10 +3614,10 @@ autofit-frame = callPackage ({ fetchurl, fit-frame, lib, melpaBuild }: melpaBuild { pname = "autofit-frame"; - version = "20151231.1209"; + version = "20170102.903"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/autofit-frame.el"; - sha256 = "1af45z1w69dkdk4mzjphwn420m9rrkc3djv5kpp6lzbxxnmswbqw"; + sha256 = "05pww6hqfknrkhn8iq53r8lzikggw6is6syrypxybkmxhfbx4d9h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/autofit-frame"; @@ -3714,6 +3714,27 @@ license = lib.licenses.free; }; }) {}; + autothemer = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "autothemer"; + version = "20170112.1324"; + src = fetchFromGitHub { + owner = "sebastiansturm"; + repo = "autothemer"; + rev = "8c467f57571c154129d660dfccebd151c998f2d9"; + sha256 = "0cd2pqh6k32sjidkcd8682y4l6mx52xw4a05f38kk8nsrk28m74k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3d7d7beed6ba10d7aa6a36328a696ba2d0d21dc2/recipes/autothemer"; + sha256 = "1lcyqfzx7qpkr3ajk0zi0mn32yvcwn06f61vhghn9c66xambsr7f"; + name = "autothemer"; + }; + packageRequires = [ cl-lib dash emacs ]; + meta = { + homepage = "https://melpa.org/#/autothemer"; + license = lib.licenses.free; + }; + }) {}; autumn-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "autumn-light-theme"; @@ -3735,17 +3756,19 @@ license = lib.licenses.free; }; }) {}; - avandu = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + avandu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { pname = "avandu"; - version = "20140412.1426"; - src = fetchgit { - url = "git://ryuslash.org/avandu.git"; - rev = "891a847b0fff0ec1abfa717ede28250a16d5c429"; - sha256 = "01mcp4q8qsbcz2nfsfd5wndpnka7qfiqfn2f35y0pm56di7a49v5"; + version = "20170101.1103"; + src = fetchFromGitHub { + owner = "ryuslash"; + repo = "avandu"; + rev = "f44588d8e747fa880411cb4542cc39962252b90a"; + sha256 = "097wls9k6qrf12nn8mpszfbqsaqc81956yqxns1sjs6dmjqi0c7z"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/7a67d2cd2d62c5deb4b9bbbe8efcd014c151f58e/recipes/avandu"; - sha256 = "1pyjpdyk8s4zandz8n1wgyvn0mpvrqn7g34ljnpjr8xciv6qsfpq"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e1344e49e6a41ce390a047cb8d48090160b37b50/recipes/avandu"; + sha256 = "174bd3vbvh0l9282bg8575nqc71zkg90bwbxbv1b7dz8qaaczhcy"; name = "avandu"; }; packageRequires = []; @@ -3757,12 +3780,12 @@ avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avk-emacs-themes"; - version = "20161029.504"; + version = "20170110.1046"; src = fetchFromGitHub { owner = "avkoval"; repo = "avk-emacs-themes"; - rev = "d8c91d67c78d90d04f2cda01ded019c6931250d6"; - sha256 = "1lyxx55yd1fd52r588j9g0vrx6nl5nl8msc5si8qfh7naprr4hh9"; + rev = "c75079ec9a84116c84c884c3bf258c95afcce7a7"; + sha256 = "1s9hn4y918h1ly1s8gfkidlwqijdzpbkfx1px8xfkia3b35qinvv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b986c7c981ccc5c7169930908543f2a515edaefa/recipes/avk-emacs-themes"; @@ -3820,12 +3843,12 @@ avy-menu = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy-menu"; - version = "20160126.425"; + version = "20161231.1554"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "avy-menu"; - rev = "bd32dde9b8d5695f28b87a198e683cf7c94a043b"; - sha256 = "0bjx6fsrnx373fzndhwq4k6nbrvq4q2pxrmgd9lpi4fpdwxq635c"; + rev = "75f4025ca53b9700ca5b478d85f5e53e887a6023"; + sha256 = "05smmmf8hc8ksgq711gn7hd8a7z6zw6l2i86zbx5fb79s11sqjg0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f0b4cfb30c405d44803b36ebcaccef0cf87fe2d/recipes/avy-menu"; @@ -3841,12 +3864,12 @@ avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: melpaBuild { pname = "avy-migemo"; - version = "20161129.621"; + version = "20161229.605"; src = fetchFromGitHub { owner = "momomo5717"; repo = "avy-migemo"; - rev = "f7861aa9607c0f05b3336443df5380a6daba0485"; - sha256 = "0vxam51g7r4wixw7w8frk1af6m5n7bswjbjya77dnwxcizgwiq6m"; + rev = "26e87aa7905a252b797e0bf592c9ff9eede165c1"; + sha256 = "1bfrc7wxnzhjn07psa5z1cflxxr1k8qc4jgsz5w7ds3sn48aji48"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo"; @@ -4048,6 +4071,27 @@ license = lib.licenses.free; }; }) {}; + backward-forward = callPackage ({ emacs, fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "backward-forward"; + version = "20161228.2150"; + src = fetchFromGitLab { + owner = "vancan1ty"; + repo = "emacs-backward-forward"; + rev = "58489957a62a0da25dfb5df902624d2548d800b4"; + sha256 = "14v9q58vd0iggs8x8hjh24cv58g2pbwnr6zghd2anaygbj74ij24"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cb44d7b604c50d4e07404c0dff071fbc66ea903d/recipes/backward-forward"; + sha256 = "0kpy761xdk2s21s92cw03fgw5xq9glybrhnjv2v89xrg16vdvamf"; + name = "backward-forward"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/backward-forward"; + license = lib.licenses.free; + }; + }) {}; badger-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "badger-theme"; @@ -4135,12 +4179,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20161012.1122"; + version = "20161227.1040"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "df75fdf19e9159d1249b1708c0d416dc334c97cb"; - sha256 = "0zqhcm3i2aldhwrrd8wgq85jr5lxgwqvmd34zwykb76pcj0a21a4"; + rev = "82e8fff5c22acbfeb1c77ea9442aada938b41d19"; + sha256 = "1k1lm0hlp771vayv0laah2q67751ykc3gkv94s6axj02n8rs2zdv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4841,12 +4885,12 @@ bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bind-key"; - version = "20160227.48"; + version = "20161218.1520"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "c7adfdde3d50d783dcde21ac3ea8195bbd30369f"; - sha256 = "1qkcnk2h1k6yv9sbkir2nkbjjnzcj3ndk20cysk2wcmwqxm85840"; + rev = "38034854ac21bd5ddc1a1129fd6c8ff86d939f8a"; + sha256 = "0s20z5njwmk591674mb2lyv50agg6496hkr5b11904jq5ca3xagz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -5006,6 +5050,27 @@ license = lib.licenses.free; }; }) {}; + blackboard-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "blackboard-theme"; + version = "20161215.2256"; + src = fetchFromGitHub { + owner = "don9z"; + repo = "blackboard-theme"; + rev = "d8b984f2541bb86eb4363a2b4c94631e49843d4a"; + sha256 = "1jh2960yab6rhdq7ci1slpmnr43619cza0g8bfbq759yz5b7xryh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/eca8cbcc1282bb061f769daf86b1938d1f30f704/recipes/blackboard-theme"; + sha256 = "19cnfxrm85985ic55y5x7nwxdynjp7djyd33dhj8r7s92cs25fn7"; + name = "blackboard-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/blackboard-theme"; + license = lib.licenses.free; + }; + }) {}; blank-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "blank-mode"; version = "20130824.459"; @@ -5069,12 +5134,12 @@ bln-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bln-mode"; - version = "20161210.610"; + version = "20170112.527"; src = fetchFromGitHub { owner = "mgrachten"; repo = "bln-mode"; - rev = "74563279cb98e42d8649bff53229d5f89a5fb5e0"; - sha256 = "0mjlbih1dnfmqy41jgs37b8yi39mqwppw7yn5pgdyh8lzr1qh9vw"; + rev = "1de92cec97a4693b8b932713e333730118db9183"; + sha256 = "0dlcxh3acaiw3q9sa74jw4bpz7fv9lvpws68gw1qhs39f1plyzfx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee12ef97df241b7405feee69c1e66b3c1a67204b/recipes/bln-mode"; @@ -5108,22 +5173,22 @@ license = lib.licenses.free; }; }) {}; - blog-admin = callPackage ({ ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }: + blog-admin = callPackage ({ cl-lib ? null, ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, s }: melpaBuild { pname = "blog-admin"; - version = "20160609.1935"; + version = "20170110.751"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "blog-admin"; - rev = "fd97d405a5cd06b6246a433f31fc5af2077bb255"; - sha256 = "0fia93kxmw5xkzyf434n3j4f0d6gijkli2mqi82j32z8wayrf307"; + rev = "f01c9ed030a85800b4ebdce8ec71b195db446ee9"; + sha256 = "1jlbxa9qw56rhqm72sqmz5isjmaidmh7p08vlbr8qsxi0kjaipv9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/blog-admin"; sha256 = "03wnci5903c6jikkvlzc2vfma9h9qk673cc3wm756rx94jxinmyk"; name = "blog-admin"; }; - packageRequires = [ ctable f names s ]; + packageRequires = [ cl-lib ctable f names s ]; meta = { homepage = "https://melpa.org/#/blog-admin"; license = lib.licenses.free; @@ -5132,12 +5197,12 @@ bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bm"; - version = "20161024.1006"; + version = "20170103.1424"; src = fetchFromGitHub { owner = "joodland"; repo = "bm"; - rev = "d1beef99733062ffc6f925a6b3a0d389e1f3ee45"; - sha256 = "19hjv6f43y2dm4b3854mssjqgzphkdj911f1y2sipc43icdwb4b4"; + rev = "dd5dc454c62ceae6432cef6639e08db6ea6a865f"; + sha256 = "0pjgiqhbch0kzlyqq0ij86nc8gjv5g9ammgx92z2k2pyj2zglh7h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm"; @@ -5257,10 +5322,10 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20161211.1601"; + version = "20170113.1310"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; - sha256 = "05jf7rbaxfxrlmk2vq09p10mj80p529raqfy3ajsk8adgqsxw1lr"; + sha256 = "02akakw7zfjx8bjb3sjlf8rhbh1xzx00h3dz7cp84f7jy9xak5v1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/bookmark+"; @@ -5276,12 +5341,12 @@ bool-flip = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bool-flip"; - version = "20161030.1654"; + version = "20161215.739"; src = fetchFromGitHub { owner = "michaeljb"; repo = "bool-flip"; - rev = "04354f6412bd096cce59138e2113eb1db3dcba63"; - sha256 = "1pdylz85sarhaakh8hdvn5mjhh4j3y6yy5sn4cjvqz9xan4g3yyl"; + rev = "f58a9a7b9ab875bcfbd57c8262697ae404eb4485"; + sha256 = "06q86a6dhc7jvq25yqqq3dsmrbm67h0ayb6nhd0q5l90yrmfqfjh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f56377a7c3f4b75206ad9ba570c35dbf752079e9/recipes/bool-flip"; @@ -5297,12 +5362,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20161125.448"; + version = "20170109.1223"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "981d5becae30a31b6ef4f87680386148d0535455"; - sha256 = "0755qhf0h7m18hwv6lkpgi0jcrcm58w4l3815m3kl86q1yz2mpda"; + rev = "c0a5a8763ea617de58e595ee30f8e20533e663c0"; + sha256 = "1mfxcdh6m1s0v43hbiprysflm3yb0b3j9b22vzxclf4sfz2yywz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -5528,10 +5593,10 @@ browse-kill-ring-plus = callPackage ({ browse-kill-ring, fetchurl, lib, melpaBuild }: melpaBuild { pname = "browse-kill-ring-plus"; - version = "20151231.1221"; + version = "20170102.910"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/browse-kill-ring+.el"; - sha256 = "1z6pix1ml3s97jh34fwjj008ihlrz4hkipdh5yzcvc6nhrimjw2f"; + sha256 = "0qps93fx9x7iy9m2061fkizw90y0d6y4q9wk0c8krpbny73a18v2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e700f4066e67991dd67f6476c783e0a5134723db/recipes/browse-kill-ring+"; @@ -5709,6 +5774,27 @@ license = lib.licenses.free; }; }) {}; + buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "buffer-manage"; + version = "20170109.1220"; + src = fetchFromGitHub { + owner = "plandes"; + repo = "buffer-manage"; + rev = "e320ae7e05803551d8b534aaee84cae6e53155e2"; + sha256 = "1dns2ngvmyyyr2a0ww9af0s8yzhbgm1gqqlc6686b04wnj8gdphf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage"; + sha256 = "0fwri332faybv2apjh8zajqpryi0g4kk3and8djibpvci40l42jb"; + name = "buffer-manage"; + }; + packageRequires = [ choice-program emacs ]; + meta = { + homepage = "https://melpa.org/#/buffer-manage"; + license = lib.licenses.free; + }; + }) {}; buffer-move = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-move"; @@ -5730,19 +5816,18 @@ license = lib.licenses.free; }; }) {}; - buffer-sets = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + buffer-sets = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-sets"; - version = "20160811.1911"; - src = fetchFromGitHub { - owner = "swflint"; - repo = "buffer-sets"; - rev = "9f266fb9b6325286ea312c9997071b74b5bb45cc"; - sha256 = "0pxykjnq892k93i1yil1f51gv9286gpwlnddq82jhq20hzh79r9c"; + version = "20161231.1331"; + src = fetchgit { + url = "https://git.flintfam.org/swf-projects/buffer-sets.git"; + rev = "f29c30f7cef4e29837c1e6e1282cf99a37c4210c"; + sha256 = "0kdi330p5xk67nzhj7mrz8arsblbx39lj1z4zy863294fn3ark7g"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/dc99dde16a23ba5f07848bd4a8483cbe384e7a6d/recipes/buffer-sets"; - sha256 = "1011x76h8sqk4lp85gddwc9hagmcsykywn0h7qpv0z9bmwqj1s43"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/buffer-sets"; + sha256 = "0r8mr53bd5cml5gsvq1hbl9894xsq0wwv4p1pp2q4zlcyxlwf4fl"; name = "buffer-sets"; }; packageRequires = [ cl-lib ]; @@ -5793,12 +5878,12 @@ bufshow = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bufshow"; - version = "20130711.1039"; + version = "20130726.1138"; src = fetchFromGitHub { owner = "pjones"; repo = "bufshow"; - rev = "afabb87e07da7f035ca0ca85ed95e3936ea64547"; - sha256 = "1plh77xzpbhgmjdagm5rhqx6nkhc0g39ir0b6s5yh003wmx6r1hh"; + rev = "d60a554e7239e6f7520d9c3436d5ecdbc9cf6957"; + sha256 = "1rh848adjqdl42rw8yf1fqbr143m0pnbrlznx0d97v4vszvbby2s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/543a734795eed11aa47a8e1348d14e362b341af0/recipes/bufshow"; @@ -5835,12 +5920,12 @@ bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bui"; - version = "20161213.735"; + version = "20170113.124"; src = fetchFromGitHub { owner = "alezost"; repo = "bui.el"; - rev = "b8f2fcfcdf4eff7fb502e75f25a2e6d974c3ca01"; - sha256 = "1s7iigrdbdgavigssi2j82dky6cjahnrsnq9m9i5nvczj5xjdnpq"; + rev = "8d0c5e3dd6bcd11943dd23615be9b89367eabade"; + sha256 = "1h1jzpq1rq9jvvihq9n7agsdr86ppwgs38wmmi8qn6w2p99r6k5p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui"; @@ -6362,7 +6447,7 @@ version = "20151009.845"; src = fetchsvn { url = "http://caml.inria.fr/svn/ocaml/trunk/emacs/"; - rev = "16555"; + rev = "16556"; sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw"; }; recipeFile = fetchurl { @@ -6400,12 +6485,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20161116.35"; + version = "20170107.651"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "fb19a7e66f8478578edf7be71dadc1d75876248d"; - sha256 = "0ksliwv8f2dhrgr423qn4zjmwm37v3hh5wpbfbz6ij6c2lrhx6j4"; + rev = "670b34d9bf4207680b0783c2a0ea8b1c8f914e58"; + sha256 = "1slj9gkxknm56k16x827021b1q6384px8pja5xia524b0809hyqg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -6572,8 +6657,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "4b69fa39539eec2c1cea5ba11ddf9cf20363a500"; - sha256 = "0lh2dqmdy76ibp78pjsxvlm7j0649v7bqfifw9a5mfvwzlkihs85"; + rev = "df9d8a8332c9f75498bfecd870d7296c6ba0b42e"; + sha256 = "05ay6qkx77yl581jvikkf11dzny0v9h70iahss4bz5a37hawp4dd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc"; @@ -6614,8 +6699,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "4b69fa39539eec2c1cea5ba11ddf9cf20363a500"; - sha256 = "0lh2dqmdy76ibp78pjsxvlm7j0649v7bqfifw9a5mfvwzlkihs85"; + rev = "df9d8a8332c9f75498bfecd870d7296c6ba0b42e"; + sha256 = "05ay6qkx77yl581jvikkf11dzny0v9h70iahss4bz5a37hawp4dd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb"; @@ -6801,8 +6886,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "334d1fc9b5638725ac7454dee5e95ea4f6ba8793"; - sha256 = "1n8bz9j5qwkbyfp4jf5wr1injwybwnm66hp2rlfqnlrf9w54pyi2"; + rev = "d31c2ffc3171030c04eddbf50bcac7be27db9c77"; + sha256 = "1skhqpyx3qgrlby92qb1p2qarzagj6hc91ph818wb8id2z26k71i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -6841,7 +6926,7 @@ version = "20160801.615"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "11922"; + rev = "11945"; sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl"; }; recipeFile = fetchurl { @@ -6900,12 +6985,12 @@ char-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "char-menu"; - version = "20160203.2215"; + version = "20161231.1609"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "char-menu"; - rev = "da1524f37453086d2c5178b62c5173fb66b2ca8e"; - sha256 = "00jf4nv7i1ppsag5p91ldqa47i92ikxkfr7fzzp5kkp9swx1zvyb"; + rev = "d0f87d8077e8516f562ae71d037839e164c987b1"; + sha256 = "0nxpm9bq8003wyjb8sg741nn7fcgvmsd0lhi0i907xpmii7bbjp6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f6676747e853045b3b19e7fc9524c793c6a08303/recipes/char-menu"; @@ -6918,25 +7003,6 @@ license = lib.licenses.free; }; }) {}; - character-fold-plus = callPackage ({ fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "character-fold-plus"; - version = "20160227.1503"; - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/character-fold+.el"; - sha256 = "0xvgxjyl6s6hds7m9brzly6vxj06m47hxkw5h2riscq6l4nwc9vz"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0bb32513eaaafded547058e3de84fc87710d2cf0/recipes/character-fold+"; - sha256 = "01ibdwd7vap9m64w0bhyknxa3iank3wfss49gsgg4xbbxibyrjh3"; - name = "character-fold-plus"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/character-fold+"; - license = lib.licenses.free; - }; - }) {}; charmap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "charmap"; @@ -6982,12 +7048,12 @@ cheatsheet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cheatsheet"; - version = "20161106.1219"; + version = "20170114.2251"; src = fetchFromGitHub { owner = "darksmile"; repo = "cheatsheet"; - rev = "329ac84def1af01c19761bd745ee4f275003161f"; - sha256 = "0981dkn8vkjyw50cbsx1zsa2nmyhsbz6kmrprj5jd828m49c1kc5"; + rev = "00f8f3cdf6131d1eafe1107e5c82ef69661e1318"; + sha256 = "0ba2j3g12mf1rckbpfcpb0j0fv7wwxln8jcw7mn8a05c5pcikjp6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d2cd657fcadb2dd3fd12864fe94a3465f8c9bd7/recipes/cheatsheet"; @@ -7028,8 +7094,8 @@ src = fetchFromGitHub { owner = "eikek"; repo = "chee"; - rev = "979279d9b15a1885b0e0c3143a9e422f98c11b9c"; - sha256 = "0jp4ivzbdpk4wzhj4qy4fr7zn45plnfmirl0ylrb4hiwqd7kwbd8"; + rev = "aba1317a57cb673f61038d217aab88709aa254d5"; + sha256 = "04cpvwkbmcjf69m8xp6p4ldn0qc48saq87k6cpa9pgxhf8z84lxa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9f4a3775720924e5a292819511a8ea42efe1a7dc/recipes/chee"; @@ -7192,12 +7258,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "20161123.1614"; + version = "20170111.1209"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "68d73adfe17a51c3e2ce8e5e3a0efd5ae800d32f"; - sha256 = "02j722h445ibdy1g6fxpsk8hb3d1f41cncibygqppp4nr0rqkfc3"; + rev = "577a3438d14e1a1f08baf0399ec8138c9d1dcba4"; + sha256 = "0i9nqhqbj12ilr5fsa4cwai9kf2ydv84m606zqca2xyvvdzw22as"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -7375,6 +7441,27 @@ license = lib.licenses.free; }; }) {}; + choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "choice-program"; + version = "20161230.1721"; + src = fetchFromGitHub { + owner = "plandes"; + repo = "choice-program"; + rev = "691ced104adc6dbb3ddf8c28563c1cd36eb165b1"; + sha256 = "1jd0zj8g9nnzdfy76z9565sz6sd6690nbbi4zg71pxssmsqgkc3w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/894357125db5035999a39514516852d7e957453e/recipes/choice-program"; + sha256 = "0hhp6qhrshqrw4978xq6biwddm7gv7yf4avbb64xvz66i3a2kgy1"; + name = "choice-program"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/choice-program"; + license = lib.licenses.free; + }; + }) {}; chronos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chronos"; @@ -7396,22 +7483,22 @@ license = lib.licenses.free; }; }) {}; - chruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + chruby = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chruby"; - version = "20151204.430"; + version = "20161222.430"; src = fetchFromGitHub { owner = "plexus"; repo = "chruby.el"; - rev = "0b210f5bb8c38dbe4581e660055cf9bac93304d0"; - sha256 = "0gx0bd7j71rlniq64vw8k59yzl070mdia05ry18br8kpsbk3bhrl"; + rev = "04182d666e19963fa0389cb744fc5cce62049a62"; + sha256 = "0cj5cs2bj7r5ijhz9vyfyzcq4mfccya34n9gs2vjdr2fg9mhgynx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1989a3c6fa4cd7aaf6b0b202f197eb7db51936b9/recipes/chruby"; sha256 = "0pk6vdvmifiq52n452lbrkklxa69c40bfyzra9qhrghxr2q5v3mk"; name = "chruby"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/chruby"; license = lib.licenses.free; @@ -7420,12 +7507,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20161201.757"; + version = "20170112.26"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "d19cf7d9d36c93eda56e1de63705a9c6c92e92ef"; - sha256 = "1hn6kzbz3n1jxfsv23m49b0rjjzh7inf4klm31avhyndgas3bvgn"; + rev = "460a1dc948ea8994eb8b379d132448d26cf7572c"; + sha256 = "0j9f6gi8zhws12vcwzng2a4bg4hdyvqsb08ha70as7xm9ym8vv6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7546,12 +7633,12 @@ ciel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ciel"; - version = "20161213.2141"; + version = "20161230.2212"; src = fetchFromGitHub { owner = "cs14095"; repo = "ciel.el"; - rev = "bf0c83ff06e229a15aabfa132237b7d4a05abcbe"; - sha256 = "1967vgfmi0asa7zwhzwpp63hhckp4wcmdxwbpi7rixhqp521cp7k"; + rev = "ea047b6c097255ea3709b56007d0d1a3b3d5c9bc"; + sha256 = "1f0f2l3na49964wlyv8w99q2qqv5dsr880i6n1xin0q6yqms61yw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9c70c007a557ea9fb9eb4d3f8b7adbe4dac39c8a/recipes/ciel"; @@ -7609,12 +7696,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "20161118.414"; + version = "20170107.632"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "e549f0a7f8c6a39cc3129581b85682e3977d2bdd"; - sha256 = "16c45hb216b3r214p8v7zzlpz26s39lc9fmjl6ll3jwvqpq19kb1"; + rev = "5444a8dd90691de941509f7cc9ac8329c442dbdd"; + sha256 = "00dcdszskzqggg4gjp5f2k2v1a03jad52q2pqf04jqjycapkx227"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -7696,8 +7783,8 @@ version = "20161004.253"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "289815"; - sha256 = "1vbngm8xf7i8f3140y0dk704vagcws6is9waj9qsy6yg0vxmqp0y"; + rev = "292208"; + sha256 = "0li360592lv9hw3a73lva1bjj5qx518ky0yy1sqsb0mw1y7l5rip"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -7797,12 +7884,12 @@ click-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "click-mode"; - version = "20160331.1448"; + version = "20170105.20"; src = fetchFromGitHub { owner = "bmalehorn"; repo = "click-mode"; - rev = "10b129740907155fd8290f24efe0f374358a02f3"; - sha256 = "0hbdk1xdh753g59dgyqjj6wgjkf3crsd6pzaq7p5ifbfhrph0qjl"; + rev = "3c31e65b0b8476a15a3e2394fa05477ce42ea790"; + sha256 = "0117qn81gbjnx48wl53riqz65yxr8h691fa8j7bgrz32xnjpxz77"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1859bb26e3efd66394d7d9f4d2296cbeeaf5ba4d/recipes/click-mode"; @@ -7818,12 +7905,12 @@ cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "cliphist"; - version = "20160916.513"; + version = "20170116.1431"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cliphist"; - rev = "5cddd9c0b3aacc9941214a749edd19ceb2cde7f4"; - sha256 = "0hifxb3r54yinlal6bwhycwaspbz1kwkybvrcppkpdfg9jd88nfd"; + rev = "72a8a92f69b280c347afe2f8b5f5eb57606a9aec"; + sha256 = "0arilk9msbrx4kwg6nk0faw1yi2ss225wdlz6ycdgqc1531h6jkm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist"; @@ -7902,12 +7989,12 @@ clj-refactor = callPackage ({ cider, clojure-mode, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }: melpaBuild { pname = "clj-refactor"; - version = "20161211.1451"; + version = "20170114.1148"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "1b49cddfff0420aa5f1ca7b6d1753b4e1d35cb7d"; - sha256 = "0ywvww3r3lb90hi41ngkxgxxw2y7kigr2a31nbbg2b6h508r44qr"; + rev = "7941d906d603a650d836e3a2ba25554772adb236"; + sha256 = "0gjmhwx4ibyr7fm2lssah9xbqfwm0174w5zv2hm27v37a8ncvzhv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; @@ -8082,12 +8169,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "20161215.49"; + version = "20161221.523"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "fe76682dba2b8b231c664d2e0903a791996d89a1"; - sha256 = "01qvw35wsjlydfdcymy81vcv07j5rmh4zrsy17v6q09n7sz4kg8a"; + rev = "423c9e4ee43212c42e22b15fff4aa52c050ca90d"; + sha256 = "09ik49nb40p082ykf2giszbxzlsc5m1zgsmfkq1j571qkn0cdzc9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -8107,8 +8194,8 @@ src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "fe76682dba2b8b231c664d2e0903a791996d89a1"; - sha256 = "01qvw35wsjlydfdcymy81vcv07j5rmh4zrsy17v6q09n7sz4kg8a"; + rev = "423c9e4ee43212c42e22b15fff4aa52c050ca90d"; + sha256 = "09ik49nb40p082ykf2giszbxzlsc5m1zgsmfkq1j571qkn0cdzc9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -8163,22 +8250,22 @@ license = lib.licenses.free; }; }) {}; - clomacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "clomacs"; - version = "20161124.552"; + version = "20161227.131"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "0938671fef3311c5d7c1e46e06d5264e98254c96"; - sha256 = "08qaw7g5mldi886hr0i46wihmij2sip81bdj9p8r4zmvm1gxly00"; + rev = "6d8a3eb84f1c65724680f4a0dcef3d1d0a29f4e6"; + sha256 = "082y5acfxbbihfxvzbps9f6k5p08nnrk604yvpi2m8hkyspyy4cb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; sha256 = "1vfjzrzp58ap75i0dh5bwnlkb8qbpfmrd3fg9n6aaibvvd2m3hyh"; name = "clomacs"; }; - packageRequires = []; + packageRequires = [ cider emacs s ]; meta = { homepage = "https://melpa.org/#/clomacs"; license = lib.licenses.free; @@ -8191,8 +8278,8 @@ src = fetchFromGitHub { owner = "emacscollective"; repo = "closql"; - rev = "8b063e70808049210b749164b8f22f56924b9949"; - sha256 = "1qhm8zmidinr35lk0pff6nla3d05cqf81hjb55yrwvdvyr5gyl1k"; + rev = "0bb0fa3dd1e545cbf025d42e253ddb00107156a3"; + sha256 = "1mpycmj88gi62rhzxdv4933l318j3llphbc00b7rvzms55sgpcz5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; @@ -8271,12 +8358,12 @@ cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cm-mode"; - version = "20160914.148"; + version = "20170112.614"; src = fetchFromGitHub { owner = "joostkremers"; repo = "criticmarkup-emacs"; - rev = "12b7460691dc502d27329d6ac11c51cc83cd098e"; - sha256 = "018limfwcb396yr2kn6jixxdmpmiif3l7gp0p1pmwbg07fldllha"; + rev = "64913b0107a5ccf3ba4a3569ee03c020c45a3566"; + sha256 = "1smj4iig5x3va3jl91aassk0smcg67naknk81fshigshif1vs273"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42dda804ec0c7338c39c57eec6ba479609a38555/recipes/cm-mode"; @@ -8313,12 +8400,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }: melpaBuild { pname = "cmake-ide"; - version = "20161203.804"; + version = "20161229.138"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "379f8a45e6a210da53b7ee76f081420f371a2c2f"; - sha256 = "189pvk3kgay05s671dq4xsqvvylz7rl38djr3hw5finjkrb26rkf"; + rev = "393d6e9affa6f9978600b6c0ef8a4fe8bf73d813"; + sha256 = "0lg6ky9h4a96w8mma668kxfv9dffw97h1swjq33cvhv5pp3p9rrr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8338,8 +8425,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "517c7cca8c856546a93454cf0cf98fe6bad3f856"; - sha256 = "0hami0cq0sqakh98qw39iyv93jdpwxi0j2frc37az9y2zimbbcwr"; + rev = "020cba316bb3a4d33da5108ab10d2c06b4712427"; + sha256 = "1c2hsy6b6b7vwg7fdjliz3f0yy7j7f8cj3627w5alhp5k6r6mnv1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8396,10 +8483,10 @@ }) {}; cmds-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmds-menu"; - version = "20160830.1130"; + version = "20170102.917"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/cmds-menu.el"; - sha256 = "00wl9qqqqznd3hk0zxc6l5zsnmkmqikzpirm5gj2lp1wqdkrbmi4"; + sha256 = "0zkqpv7n4idzqkayildxkgaqsy1rjkmsf5ppkjld3jk1j53kacfc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de6366e4b3e72a5e68b960d6bf4bab2683ad6800/recipes/cmds-menu"; @@ -8625,10 +8712,10 @@ col-highlight = callPackage ({ fetchurl, lib, melpaBuild, vline }: melpaBuild { pname = "col-highlight"; - version = "20151231.1233"; + version = "20170102.918"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/col-highlight.el"; - sha256 = "1fpkymmgv58b734d2rr7cfj2j2if1qkwgrpk3yp2ibw2n2567y0s"; + sha256 = "0ayr0psmfjy8iqq779v12ccgzclwakzlcfsl7g98qvxxmkh1vm8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a16dca0068d9d4f25ad6b699ec8cb8da6ba17e5/recipes/col-highlight"; @@ -8790,12 +8877,12 @@ color-theme-modern = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-modern"; - version = "20161029.720"; + version = "20161219.344"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "replace-colorthemes"; - rev = "c76b6e8e702457fc2e8907b367efdafd3b7123d9"; - sha256 = "0ffvjilk59mbq8mn069hr9q0a0w3yqy6v3r3q94ca22bsv0gwcmm"; + rev = "42a79266f1d7b473e9328e67a455e505e6c3eff5"; + sha256 = "0mw5rnzzc4yfcflg59viy81ziws680r44xr05qg032b5x02l8ar9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2db82e101916d8709b711034da5ca6e4072e1077/recipes/color-theme-modern"; @@ -8832,12 +8919,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20160916.1758"; + version = "20170106.1620"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "81d8990085960824f700520d08027e6aca58feaa"; - sha256 = "1x3aq6hadp158vh8mf9hmj5rikq0qz7a1frv7vbl39xr3wcnjj23"; + rev = "ed7bcd2dd40989c99fe0ff13802432de8e0e8edd"; + sha256 = "0z65y0wda3rwymmjy7q8g4h1ar1a9crqgf3i8y9cyq5n8bmc5z7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -8895,12 +8982,12 @@ column-enforce-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "column-enforce-mode"; - version = "20161020.434"; + version = "20170103.1231"; src = fetchFromGitHub { owner = "jordonbiondo"; repo = "column-enforce-mode"; - rev = "858a49daca67188cbcc151a7b531556552d48d00"; - sha256 = "1hb2lwnq7f81qnp3kymhld0y05kqd249nnpnbiby4pdfwwfc92fl"; + rev = "379366fe0a5bcb333db2d55cddcf18d6e76ab3fc"; + sha256 = "1vqydf174rydclwmcq6j8xpr16k9w049x9rilg1lvyjc67p7pyaf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91bebef8e97665a5d076c557d559367911a25ea2/recipes/column-enforce-mode"; @@ -9060,12 +9147,12 @@ common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "common-lisp-snippets"; - version = "20160531.903"; + version = "20161231.1557"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "common-lisp-snippets"; - rev = "442ec783ee0e691a7b5554b13a317abd090ba080"; - sha256 = "0iz5fgcp542hx26q6vmycfrfxyn58yjkdjr6zfn3mzhmxssaf1rc"; + rev = "bb8d22994592a7e69ef8e613e8638882e4e0e404"; + sha256 = "0i4w5jkz0yxnnapyijvjd5z1rcp0g3r3abj6hchb5yd26h1jcz8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/48d0166ccd3dcdd3df4719349778c6c5ab6872ca/recipes/common-lisp-snippets"; @@ -9081,12 +9168,12 @@ company = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company"; - version = "20161211.1850"; + version = "20170112.2005"; src = fetchFromGitHub { owner = "company-mode"; repo = "company-mode"; - rev = "21357f6d6274420d0f4fda07841daf0853b4749c"; - sha256 = "0nywpm89vw2qsplwndijxzl8bga7i69j3aspf9qbypnhlbmkvm0z"; + rev = "c494fc65d35f7f00c2da17206e6550385ae9b300"; + sha256 = "07ys3rbsdvhi60lan2gsk7rccikf9gsl2ddmm0sz2g8qal7d2a2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96e7b4184497d0d0db532947f2801398b72432e4/recipes/company"; @@ -9310,8 +9397,8 @@ src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-company-dict"; - rev = "d51b801fe319e7984cbc202c4745214d84039942"; - sha256 = "16ai8ljp0i75kby1knj7ldysd8s6kd6drmlh9ygyddxbi2i35x61"; + rev = "0589c2c3980a8f0df1705e3c0e5e075557eaac75"; + sha256 = "1bfl7b1lj4rgifqcpz4p8nhamxyyh29lbgl1g35rizw4nzv9sizq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/212c077def5b4933c6001056132181e1a5850a7c/recipes/company-dict"; @@ -9369,12 +9456,12 @@ company-emacs-eclim = callPackage ({ cl-lib ? null, company, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-emacs-eclim"; - version = "20160813.1754"; + version = "20170104.743"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "7d3beb299399bc9d8190190fa59943b2a70a7f63"; - sha256 = "14q0qg9a1kxgf89iy48g63nkj7m9hydipmqq670591v09awk877l"; + rev = "5b7d58c783f6453442570ae8cedd489a0659a58e"; + sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; @@ -9390,12 +9477,12 @@ company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-emoji"; - version = "20161108.1800"; + version = "20161230.1937"; src = fetchFromGitHub { owner = "dunn"; repo = "company-emoji"; - rev = "b971ab0a66126f0d1410254ba1e21f17c2270101"; - sha256 = "1c9r1j7xpq6c27y6akfarrcg87idww3c10rkhm26m1vprqk73vr3"; + rev = "8dc88ffe0773ef44321f245d39430c14a1bc2b82"; + sha256 = "1y8l9wnc13g79znyw2qsbm33da2bhkj270ppikkg9h4x2qpmxilq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji"; @@ -9408,6 +9495,27 @@ license = lib.licenses.free; }; }) {}; + company-erlang = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, ivy-erlang-complete, lib, melpaBuild }: + melpaBuild { + pname = "company-erlang"; + version = "20170107.115"; + src = fetchFromGitHub { + owner = "s-kostyaev"; + repo = "company-erlang"; + rev = "70f65acb5912b27284ae2ff55d72e4687b862432"; + sha256 = "0dpkm6fh1qw8nz75n3na4hbvw9ggxn9dq9p9qmb7pdbcc78nsi44"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ca96ed0b5d6f8aea4de56ddeaa003b9c81d96219/recipes/company-erlang"; + sha256 = "0qlc89c05523kjzsb7j3yfi022la47kgixl74ggkafhn60scwdm7"; + name = "company-erlang"; + }; + packageRequires = [ company emacs ivy-erlang-complete ]; + meta = { + homepage = "https://melpa.org/#/company-erlang"; + license = lib.licenses.free; + }; + }) {}; company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-flow"; @@ -9432,12 +9540,12 @@ company-flx = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }: melpaBuild { pname = "company-flx"; - version = "20160423.1713"; + version = "20161228.1736"; src = fetchFromGitHub { owner = "PythonNut"; repo = "company-flx"; - rev = "bd2035390c285769c39a2bd2fdd0f24da0cd7ec9"; - sha256 = "1di3nndif2gkzwvs8bvqg994z422ql308lh47hbjdjnqm182mwy7"; + rev = "0c9fddf7c11c918ed42bd6a5108f8969b37704d5"; + sha256 = "1nv2hlmjdd7y9d25n22gwl0qzrsc0qpfwyhf44g0xq6dg5lgbpkj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f27d718ee67f8c91b208a35adbbcdac67bbb89ce/recipes/company-flx"; @@ -9457,8 +9565,8 @@ src = fetchFromGitHub { owner = "iquiw"; repo = "company-ghc"; - rev = "976f10fca813e851d395b8c52ae6edf23d35ae63"; - sha256 = "1gmnll0m9lh4p9i44ddnxlnbg5lf20410imyfbk88jwhidx1pg7s"; + rev = "ff2205c0b309467eea763521d30220e7849c75b0"; + sha256 = "1a93q5q91xjyvfxbf5q57ndjarqdm9av11bb3dmc72v9bmwgpi7s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/28f6a983444f796c81df7e5ee94d74c480b21298/recipes/company-ghc"; @@ -9600,12 +9708,12 @@ company-lua = callPackage ({ company, f, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild, s }: melpaBuild { pname = "company-lua"; - version = "20160514.1420"; + version = "20161227.1139"; src = fetchFromGitHub { owner = "ptrv"; repo = "company-lua"; - rev = "fb32b394ebfae63bd3a0468171a864b1cb7eadd4"; - sha256 = "1fwb333p4yv02msx67p0n4bgzwa73d2zh78mwx79jani32m730ci"; + rev = "0be8122f3adf57ad27953bf4b03545d6298d3da4"; + sha256 = "1d9i165apgmwns7b2fd5wcpjpkah3dyj20v5sb8ynvz6qhhr5r9c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8191ab2aaa72041be46091e363d216cf1b73fde/recipes/company-lua"; @@ -9667,8 +9775,8 @@ src = fetchFromGitHub { owner = "kshramt"; repo = "company-ngram"; - rev = "6a39e9c22d6f1e5d5a725c6a1c276f9ecfacdad4"; - sha256 = "1cjrw0g8hjbk8d2vmgy8brfvamswf24iylgwvqpz90x4si22xrzc"; + rev = "98491c830d0867c211b773818610ace51f243640"; + sha256 = "196c870n7d46n4yhppq5np8mn9i0i74aykkbfk33kr4mgilss4cw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram"; @@ -9705,12 +9813,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "20160910.1747"; + version = "20170111.2112"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "fa4a79892e1097db28dce7ba4058e68998228ddd"; - sha256 = "055hf8shm4b15gvr7cq72laqd87alhmi5pkadbia9ccb8y3m2508"; + rev = "cb15be9d7a7c6aa2aa20188069b07521bfe3cb5f"; + sha256 = "02fvdkz7a3ql4r1vap2yl3m3cb29f9psk4qy4qp1kqrxbcmcrafm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -9858,12 +9966,12 @@ company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }: melpaBuild { pname = "company-sourcekit"; - version = "20160604.2331"; + version = "20170115.1551"; src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "0c3ccf910e108b4a69d10b56853959a6cc352018"; - sha256 = "0b0qs398kqy6jsq22hahmfrlb6v8v3bcdgi3z2kamczb0a5k0zhf"; + rev = "a28ac4811fac929686aca6aa6976845c02d6efd3"; + sha256 = "09vv6bhiahazjwzg5083b23z3xz5f4b3d4jra61m5xffkmjnbs9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/company-sourcekit"; @@ -9988,8 +10096,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "5bff8525adbe01a9af905c92f0834902ac3c1c73"; - sha256 = "15sg07dvvmmfhcp83b388zy43wgyq2qcns4qqcm2jaqq9hpvqxf9"; + rev = "386f6101fec6975000ad724f117816c01ab55f16"; + sha256 = "12m3fh2xipb6sxf44vinx12pv4mh9yd98v4xr7drim2c95mqx2y4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; @@ -10044,22 +10152,22 @@ license = lib.licenses.free; }; }) {}; - concurrent = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }: + concurrent = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "concurrent"; - version = "20160109.2046"; + version = "20161228.1930"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "9b46dedcb89923de417f7557743c4c22421f5787"; - sha256 = "0bq00qc0hyjczqjm8nawbyqlm67azi501v7q3bhapi4rhyn0lp7i"; + rev = "9668749635472a63e7a9282e2124325405199b79"; + sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent"; sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf"; name = "concurrent"; }; - packageRequires = [ deferred ]; + packageRequires = [ deferred emacs ]; meta = { homepage = "https://melpa.org/#/concurrent"; license = lib.licenses.free; @@ -10235,12 +10343,12 @@ copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copy-as-format"; - version = "20161208.2152"; + version = "20161231.1628"; src = fetchFromGitHub { owner = "sshaw"; repo = "copy-as-format"; - rev = "a7f468f8d809ae1d2d9a3c74e8ab0b4fb6728380"; - sha256 = "1ndksvs1f2xg5gkxzpf06a4wzkx49kjl7lmzf118fijd2cxx92d6"; + rev = "f10105bb5a6a9ccc557649a56f46546b25a5460b"; + sha256 = "0p27jdwp580x6namdklk7472ajj72h2zka4q70yccszh52c44iyq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; @@ -10340,12 +10448,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20161213.439"; + version = "20170104.737"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "c2c0e2d7bd79a0c7cb8a6df98d2a87a0891730d8"; - sha256 = "19v6l6xfhyxnmq7ajc0f4qac1ns5wjl9l78sfpa39jn6cm9wbyy5"; + rev = "ee91a2511797c9293d3b0efa444bb98414d5aca5"; + sha256 = "0mrv0z62k0pk8k0ik9kazl86bn8x4568ny5m8skimvi2gwxb08w6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10445,12 +10553,12 @@ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "counsel-projectile"; - version = "20161212.146"; + version = "20170111.456"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "5728486a2852cda5b6b12890de917326ce3bd75c"; - sha256 = "1kbzsk2c2lhz78fynrghwd94j3da92jz59ypcysgyrpqv9cvhzb5"; + rev = "6d126d599b36aeaf840ca5fc3cd595e8fad4697e"; + sha256 = "1lmmgwgggwh9h2rkfrwdy6bdi1j3z3498kbmzmlj72i3b1lx9w8n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; @@ -10631,22 +10739,22 @@ license = lib.licenses.free; }; }) {}; - creamsody-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + creamsody-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "creamsody-theme"; - version = "20161105.144"; + version = "20170105.2029"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-creamsody"; - rev = "06a1142d7601dd2e9f31bbcd6b33458636c6a2bd"; - sha256 = "1dmnlsdhcsvlzpfcshlk7p0yjry5626i07yl08rgjhxcgbhillf8"; + rev = "409ea24a0dace764ce22cec4a7ef4616ce94533f"; + sha256 = "1gfx26gsyxv9bywbl85z9bdn8fyv0w2g9dzz5lf5jwc9wx0d3wdi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme"; sha256 = "0l3mq43bszxrz0bxmxb76drp4c8721cw8akgk3l5a800wqbfp2l7"; name = "creamsody-theme"; }; - packageRequires = []; + packageRequires = [ autothemer ]; meta = { homepage = "https://melpa.org/#/creamsody-theme"; license = lib.licenses.free; @@ -10800,12 +10908,12 @@ crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "crux"; - version = "20161005.634"; + version = "20161219.2313"; src = fetchFromGitHub { owner = "bbatsov"; repo = "crux"; - rev = "b60d9f49e4874a9f333a9477e2c2440f4e419782"; - sha256 = "04dnlsfachgigpz8q5nprk2hflh0vabkavhbk8n6fzslaxvxys33"; + rev = "430235753cda1e9af75d209e36a2c9c4f6599a80"; + sha256 = "1v16ac9wfvnhy5h8v82ym165lz27bv9p0wma44c8nz24cl848rrm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/575e3442a925500a5806e0b900208c1e6bfd11ae/recipes/crux"; @@ -10884,12 +10992,12 @@ csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; - version = "20161105.512"; + version = "20170111.1133"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "4516a18c0dd1797a2d1eb2ae3069c0e16efa14a7"; - sha256 = "0v5kd8n9hd3aqd4p1z30rnbqiwxxd1mv30d4bkwrba6k5814qy4z"; + rev = "bc6a4190194f27cba46aa019d62d5e602b6d891e"; + sha256 = "1xx9nls695gf6fd4dxqxgvcwvwvkwzw3gm5vnc74h3hcfk05msij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; @@ -11025,38 +11133,19 @@ license = lib.licenses.free; }; }) {}; - ctags = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "ctags"; - version = "20110911.304"; - src = fetchhg { - url = "https://bitbucket.com/semente/ctags.el"; - rev = "afb16c5b2530"; - sha256 = "1xgrb4ivgz7gmingfafmclqqflxdvkarmfkqqv1zjk6yrjhlcvwf"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ctags"; - sha256 = "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y"; - name = "ctags"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/ctags"; - license = lib.licenses.free; - }; - }) {}; ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ctags-update"; - version = "20150427.2014"; + version = "20170111.2150"; src = fetchFromGitHub { owner = "jixiuf"; - repo = "helm-etags-plus"; - rev = "eeed834b25a1c084b2c672bf15e4f96ee3df6a4e"; - sha256 = "1va394nls4yi77rgm0kz5r00xiidj6lwcabhqxisz08m3h8gfkh2"; + repo = "ctags-update"; + rev = "b0b5f88bb8a617871692429cf099c4203eff610c"; + sha256 = "0wdxqkhflwnaic3ydr8an23z2cwsm1sj3di2qj5svs84y0nvyw7s"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/23f6ae3d3c8e414031bf524ff75d9d6f8d8c3fe9/recipes/ctags-update"; - sha256 = "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/ctags-update"; + sha256 = "07548jjpx4var2817y47i6br8iicjlj66n1b33h0av6r1h514nci"; name = "ctags-update"; }; packageRequires = []; @@ -11114,8 +11203,8 @@ src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "f66ed8d4cf4cd9caa26351e27185329ca74c4cc5"; - sha256 = "0yh4hynpq7wxwnl10nrhfbxa160p8d211637x665rqqcgsc40sp3"; + rev = "87c067150e955e3f2b0864e2ec9929fa3289ff28"; + sha256 = "13xrln4fqdq3siz8p2vilwwma1p0fnk7rxxd89v0pc7zw1nl8yrr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -11172,10 +11261,10 @@ }) {}; cursor-chg = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "cursor-chg"; - version = "20151231.1240"; + version = "20170102.922"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/cursor-chg.el"; - sha256 = "1w0msh4mfhwglkwgb8ksqfdzbd1bvspllydnjzhc0yl3s7qrifbd"; + sha256 = "04as4z0sbirdi68swcia783caz7hlbk5qicnpq0d4ihmnbagy3fd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/871d02540951a217ea3d4aed9ce6b66a77223fbf/recipes/cursor-chg"; @@ -11211,10 +11300,10 @@ }) {}; cus-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "cus-edit-plus"; - version = "20160529.1437"; + version = "20170102.923"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/cus-edit+.el"; - sha256 = "0d62nv8i208ysi5cg906p9ribpnrn2jvzdcwm35km4i0q0bp6yg7"; + sha256 = "1mmcnx0i9jz1xzxgl9wqlfk4yl8y3bz88jf8078b80y34489lky9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57370fc617f4f10cc67e9d3c6dc113ff0a18cace/recipes/cus-edit+"; @@ -11332,12 +11421,12 @@ cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyphejor"; - version = "20160531.905"; + version = "20161231.1558"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "cyphejor"; - rev = "9e1cdaaaf86f3acae074e40d96de008115d81ef9"; - sha256 = "04add8i0g4x5kzi1yd49i5viq9i2f5r5gzq33k05q6rimsp2ga02"; + rev = "2c65c3f111573e1919e0a35e0ef84b9e861572b7"; + sha256 = "1lclz4k4xh535ilxqxpaqzdzn4j6zml9a0vrzxn6ffgd378dxn31"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ad7cacfa39d8f85e26372ef21898663aebb68e43/recipes/cyphejor"; @@ -11378,8 +11467,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "c9bcf1bed3acf367d6deb0c273cf22db0f18dab2"; - sha256 = "16yd296n0nh96pnkjpdbdz4i7ga4j961pkzm3cbnika26xwndx03"; + rev = "d02cc4c5d831da27cd871cbb3feaf8bea72ec0c0"; + sha256 = "055wjr2kgvqji9ifwjchi8m4f095sq8df3vfxcv2n6ifgdwlmzkf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11483,8 +11572,8 @@ src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "a984cded7522b2cdad7f33542d3b5cb9ad095860"; - sha256 = "0dhnm3f7dd9wdbpsvnwc0hh1sa6cd48r8sw49f70pf76z58iss53"; + rev = "af41b9146b8c374477aeb8e739686a2006ce7479"; + sha256 = "0k60jr11jnvn4fpx7jr7jlcnfsrdv4kp26fd71jv0j4gvin2ljxj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -11500,12 +11589,12 @@ dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dante"; - version = "20161125.455"; + version = "20170103.420"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "6280169aec81fe9deb3a78d722ae0ab15866e78e"; - sha256 = "0vdvs76bhrq07ak25vasg6pq1hfdjhksl325g5idsjjnhvb0mp83"; + rev = "04da558e4d693ab320c1aea62160c2a4e2152326"; + sha256 = "1rmai7ysacaaqw7s56s18zg2aqiv0iys9m0z584ymczvszgvjl6v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -11686,22 +11775,22 @@ license = lib.licenses.free; }; }) {}; - darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + darktooth-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "20161210.2038"; + version = "20161227.655"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "9b349813bee4e0b0f1c89e6e9796f43de3930fc5"; - sha256 = "1iivrz48h8f7rqbihxk2m2ffxlqfikd4bmf57d4z428d6yp31sr5"; + rev = "37987cccd3f06f02a76cab39bad9a83719e65dcd"; + sha256 = "1mfpw97y87cccgng7j3chhai1ln1jwppk01i11rzhm96b7vffc5w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs"; name = "darktooth-theme"; }; - packageRequires = []; + packageRequires = [ autothemer ]; meta = { homepage = "https://melpa.org/#/darktooth-theme"; license = lib.licenses.free; @@ -11710,12 +11799,12 @@ dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dart-mode"; - version = "20161026.1510"; + version = "20161218.1548"; src = fetchFromGitHub { owner = "nex3"; repo = "dart-mode"; - rev = "1f65c88dbc55dfc6c7d5322e693d6d30962b27ea"; - sha256 = "1ki5a104r302cxbmqj8h9ddbrp46la7yz3bxj1kxv8sl9afgbqcd"; + rev = "e6635b390235cf16a8081763768cf925ca2d9133"; + sha256 = "1cwwwxmv7d1blv88c6nlm0z94gjfdgw2ri1libzyfzirincyicdx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9cb763cb8e929d9442be8d06e9af02de90714a/recipes/dart-mode"; @@ -11794,16 +11883,16 @@ dashboard = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, page-break-lines }: melpaBuild { pname = "dashboard"; - version = "20161204.1138"; + version = "20161229.1711"; src = fetchFromGitHub { owner = "rakanalh"; repo = "emacs-dashboard"; - rev = "cd9899342bc94e59aa42275554810e50d045aaa4"; - sha256 = "1klmjdym4w3cbarabzvkxddjdcisfk62wkpys3z4nclp4g91p8as"; + rev = "89875ba44ef9f69dd561591ea8ec6d39a0b4aa6d"; + sha256 = "0qx2kb30s1z0mlr2sk1jx538v768g7df7v5ymmnvipl8xkr2ams3"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b047625aebdbf7b5d644b55afbdccfc6c4ac14a8/recipes/dashboard"; - sha256 = "04lp8ylfnbdj65s8z0m5kyj4rwxcsdwinlkpj00j1my0m74y5i0p"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; + sha256 = "08pdpjfrg8v80gljy146cwpz624dshhbz8843zl1zszwp2p00kqy"; name = "dashboard"; }; packageRequires = [ emacs page-break-lines ]; @@ -11987,8 +12076,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "4b69fa39539eec2c1cea5ba11ddf9cf20363a500"; - sha256 = "0lh2dqmdy76ibp78pjsxvlm7j0649v7bqfifw9a5mfvwzlkihs85"; + rev = "df9d8a8332c9f75498bfecd870d7296c6ba0b42e"; + sha256 = "05ay6qkx77yl581jvikkf11dzny0v9h70iahss4bz5a37hawp4dd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk"; @@ -12148,22 +12237,22 @@ license = lib.licenses.free; }; }) {}; - deferred = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "deferred"; - version = "20160109.2046"; + version = "20161228.1930"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "9b46dedcb89923de417f7557743c4c22421f5787"; - sha256 = "0bq00qc0hyjczqjm8nawbyqlm67azi501v7q3bhapi4rhyn0lp7i"; + rev = "9668749635472a63e7a9282e2124325405199b79"; + sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e9a114d85f630648d05a7b552370fa8413da0c2/recipes/deferred"; sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr"; name = "deferred"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/deferred"; license = lib.licenses.free; @@ -12317,12 +12406,12 @@ desktop-plus = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "desktop-plus"; - version = "20160330.612"; + version = "20170107.1332"; src = fetchFromGitHub { owner = "ffevotte"; repo = "desktop-plus"; - rev = "5da49fbf2d8c45843466ae9f7f9e2a2295e9b914"; - sha256 = "1klgf1w2lvb537l48cgpncw51f429vhvy5qcz1p0hkdzav6v5d9z"; + rev = "88055cee526a000056201898499cebbd35e3ea76"; + sha256 = "1nkljslx8cwmm4z18mhnwrc1lmd6lxdyhk8bwhzms7g1p6yi99d8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b009b42c73490d56d4613dcf5a57447fb4ccab4/recipes/desktop+"; @@ -12732,10 +12821,10 @@ dired-details-plus = callPackage ({ dired-details, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-details-plus"; - version = "20151231.1250"; + version = "20170101.918"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired-details+.el"; - sha256 = "07z4h5l8763ks6b6m8dcmq78jiyq4xvan1mb0z8fbasmi1bsrya4"; + sha256 = "1bm4q66wi476ppf8xiz9p0x491rqdxx9gpmn6sl9izjfg2xck4wb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b6a13a5dfd977979d3185139000e7a639d32ec4/recipes/dired-details+"; @@ -13023,10 +13112,10 @@ }) {}; dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-plus"; - version = "20161120.1849"; + version = "20170112.1427"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired+.el"; - sha256 = "1pidj3658rrj4sn9kmjay9bb90a8p67n6gfw8gk90pqb1nxfx1v2"; + sha256 = "136nacjnnfd8j771k90zszbjq96fsvm944l1zb06gqlm7x94psll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+"; @@ -13162,10 +13251,10 @@ dired-sort-menu-plus = callPackage ({ dired-sort-menu, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-sort-menu-plus"; - version = "20151231.1251"; + version = "20170101.923"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired-sort-menu+.el"; - sha256 = "1hjci4zfzig04ji1jravxg9n67rdr4wyhmxmahbrzq9kjnql510i"; + sha256 = "1ajx4nd14pzbj2629psc3aqmsfb7wsdggcrwyxy94mnvg553m5q9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/dired-sort-menu+"; @@ -13494,12 +13583,12 @@ discover-my-major = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }: melpaBuild { pname = "discover-my-major"; - version = "20160108.1041"; + version = "20170113.2306"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "discover-my-major"; - rev = "af36998444ac6844ba85f72abbc8575040cb4cc2"; - sha256 = "0b73nc4jkf9bggnlp0l34jfcgx91vxbpavz6bpnf5rjvm0v1bil9"; + rev = "ac83b24b5130eb0944f820736012df0924cce528"; + sha256 = "1hkz2sg8wnjqmsqm0di1h9cf9hb1j6qbw30hda3w8z3m0apzr5fr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/274185fa94a3442c56593f3c8b99bdc6b9bd4994/recipes/discover-my-major"; @@ -13637,12 +13726,12 @@ dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix"; - version = "20161114.142"; + version = "20170109.331"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "5df503b66d8b726e19812ff0fa82bcbcc6bf5cd6"; - sha256 = "164w42rqjyn8xrbb6w6z9wi1r8fs5sv6fdvfk5arv4g8ab2wnish"; + rev = "f9dd686922cf89dc7859c793be84969a2529a14b"; + sha256 = "02cayawahsa59mkr0f4rhsm9lnpyv8qpx59w3040xmhf8dx95378"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix"; @@ -13658,12 +13747,12 @@ dix-evil = callPackage ({ dix, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix-evil"; - version = "20160603.1517"; + version = "20170105.623"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "5df503b66d8b726e19812ff0fa82bcbcc6bf5cd6"; - sha256 = "164w42rqjyn8xrbb6w6z9wi1r8fs5sv6fdvfk5arv4g8ab2wnish"; + rev = "f9dd686922cf89dc7859c793be84969a2529a14b"; + sha256 = "02cayawahsa59mkr0f4rhsm9lnpyv8qpx59w3040xmhf8dx95378"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil"; @@ -13952,12 +14041,12 @@ docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20161214.532"; + version = "20170114.440"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "9ecfa0b16d86998c380f08f82743c4dce9accf5e"; - sha256 = "0783v9qf06gy7miw80x1lf1z59yhcmiilprpcjdlf3fyvvym56a7"; + rev = "2c2f3c68f8136caeef67c4e74cc84d52a7664535"; + sha256 = "0qyksf5svcpz263ah197bcmpnfn2rfq8x049wbalxi638bmbvzfg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; @@ -14104,22 +14193,22 @@ license = lib.licenses.free; }; }) {}; - doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + doom-themes = callPackage ({ all-the-icons, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "20161206.2238"; + version = "20170111.2138"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-theme"; - rev = "d27dc431972d4b645cc41412e6fe052bf8d9f061"; - sha256 = "1pqmbq4lbcyxhkzqxany8il9crh8sqgaamn45fbjrm70g6g80yak"; + rev = "bb1e7d7ad7bb8cfe3dccf6499076941a08169e9d"; + sha256 = "024am5z7ihibkr5pbavdybxdq9q1pnsxhnfppwlzl8kaijqmmzs4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; sha256 = "1ckr8rv1i101kynnx666lm7qa73jf9i5lppgwmhlc76lisg07cik"; name = "doom-themes"; }; - packageRequires = [ all-the-icons dash emacs ]; + packageRequires = [ all-the-icons cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/doom-themes"; license = lib.licenses.free; @@ -14127,10 +14216,10 @@ }) {}; doremi = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "doremi"; - version = "20151231.1255"; + version = "20170101.922"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/doremi.el"; - sha256 = "0201clwq9nbl8336lddcbwah8d6xipr7q8135yq79szfxq2bdg6v"; + sha256 = "11cxhfps8d0b0nsqq4mvwxpppmwagzxmlzy70icf85iv83xa74kv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi"; @@ -14146,10 +14235,10 @@ doremi-cmd = callPackage ({ doremi, fetchurl, lib, melpaBuild }: melpaBuild { pname = "doremi-cmd"; - version = "20160512.1712"; + version = "20170101.919"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/doremi-cmd.el"; - sha256 = "1ay8rkcyydjqi1081vphb8iw3w2zc73m5bg1dz2mkxhksqwchqvj"; + sha256 = "01x19bsdmz2z18s5a30mnbsgk1xjmff9rsd6dd2phaj750j6aiyb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-cmd"; @@ -14165,10 +14254,10 @@ doremi-frm = callPackage ({ doremi, faces-plus, fetchurl, frame-fns, hexrgb, lib, melpaBuild }: melpaBuild { pname = "doremi-frm"; - version = "20151231.1253"; + version = "20170101.920"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/doremi-frm.el"; - sha256 = "0v7ycmddh1ds64m1y5yai5nh34bd32q3wcm5y2pdzhj6jk7nj5wz"; + sha256 = "1gbm3iyfg96fafnydha5zyj3sip1i7bk2qhr3hpa2g895mjfv6kd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-frm"; @@ -14183,10 +14272,10 @@ }) {}; doremi-mac = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "doremi-mac"; - version = "20151231.1254"; + version = "20170101.921"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/doremi-mac.el"; - sha256 = "157kvlb4dqiyk1h7b4p0dhrr6crdakwnrxydyl6yh51w2hdnnigw"; + sha256 = "1ilsnyzh4kka0kncd8w4fc5v9nm7q05i3g25z3m49zqifxp1vlfa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/doremi-mac"; @@ -14511,12 +14600,12 @@ drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }: melpaBuild { pname = "drupal-mode"; - version = "20161215.414"; + version = "20170112.1136"; src = fetchFromGitHub { owner = "arnested"; repo = "drupal-mode"; - rev = "dea5a8da789e5c707fa6c63cd400282ea7205a14"; - sha256 = "1zxsa6fapbxa5yfpawivjmav9i80j9752bc6gmpq7ilzsnd67h0v"; + rev = "6f40ad04b760d2266b8c07283df266471d85a9b2"; + sha256 = "13wlgy1g1nl3xxkibh0cj983lq3snw4xxmq4nsphq92pjd2lggs7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode"; @@ -14555,7 +14644,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1774435"; + rev = "1779173"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -14656,12 +14745,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20161126.2045"; + version = "20161218.110"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "14a6751d3858a21a8d4bdeff18f7f7b07daf056d"; - sha256 = "1khnzv5kzw2654yjalnvabdxrp3ahjl9sfl1x28l4valm8b5ndj4"; + rev = "0c7fed68916de6bcbbfbc6c9f787d610a3316b1e"; + sha256 = "1a5jg1344s18bj6v33wfrxxg1cxlx6aha40wyw9dbwj1pjpw7vqd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump"; @@ -14719,11 +14808,11 @@ dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; - version = "20161213.651"; + version = "20161231.1437"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "20a2166c8210"; - sha256 = "0gz0aiks3f53lqvnrnb33a1clq52ipd3i3miymvkkgspnz3vl12p"; + rev = "4004050a9771"; + sha256 = "0p7g7sfkdr473gpj2xdgg5fb5d336w2ddvx44i1d6575p6rcs5w6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -15117,12 +15206,12 @@ ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }: melpaBuild { pname = "ebal"; - version = "20160531.906"; + version = "20161231.1559"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "ebal"; - rev = "1155c70b8dbb2f2caed2958782afe3d8018ab0b2"; - sha256 = "0fbfdhz1fmxiy9hg038qqw7r3gvhvzyk68qaww0saja9zywx8hal"; + rev = "c0df139972c52200db417cc18e65f8748969fb79"; + sha256 = "19yxfc6lbd4311w291lxsw1v3hp0ha4inlp5fcakszd76bc69c4w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/629aa451162a0085488caad4052a56366b7ce392/recipes/ebal"; @@ -15159,12 +15248,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20161209.1546"; + version = "20170112.443"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "87abf50dcb8cc1a68620691dbf78ccae4707ec7c"; - sha256 = "07ndy86ld8cz627iwh76spj296z7f8ivcimcv3dhna788q6v46xd"; + rev = "4c2581ad17a636909e7ed0f46bd813cd6d9c45d3"; + sha256 = "1ic55fml4ll7pvakcf32ahps4za8mf4q10jgdyi8xj5bccvi3n3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -15205,8 +15294,8 @@ src = fetchFromGitHub { owner = "ecb-home"; repo = "ecb"; - rev = "7df501f5e9bc38f8fdd0d0ecc1e60d2b32914afa"; - sha256 = "0h50amhz0yzp9zz9nviaimmh9i0rgrr10pdf5fjxc8nc669b35z5"; + rev = "661edbfcddcdb75331cf28870e6a5fb4ba9ca27f"; + sha256 = "1ac9b6k10kniqkiadzfa7mjhy1nf6ypd3fl6yvmr8yigc2phszny"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4db5183f35bedbc459843ad9f442f9cb6608c5fc/recipes/ecb"; @@ -15221,10 +15310,10 @@ }) {}; echo-bell = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "echo-bell"; - version = "20151231.1256"; + version = "20170101.925"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/echo-bell.el"; - sha256 = "0jk7pb2sr4qbxwcn4ipcjc9phl9zjmgg8sf91qj113112xx7vvxa"; + sha256 = "1q1z151cfw1775gcfzpnm4afp62skqlnj5z2miizbnraincqy24b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a81e339e9c7cf1ae5fe91ab4442164336a6fbf13/recipes/echo-bell"; @@ -15240,12 +15329,12 @@ eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }: melpaBuild { pname = "eclim"; - version = "20161206.908"; + version = "20170116.1335"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "7d3beb299399bc9d8190190fa59943b2a70a7f63"; - sha256 = "14q0qg9a1kxgf89iy48g63nkj7m9hydipmqq670591v09awk877l"; + rev = "5b7d58c783f6453442570ae8cedd489a0659a58e"; + sha256 = "16bgzyrj5y4k43hm2hfn2bggiixap3samq69cxw8k376w8yqmsyh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; @@ -15282,12 +15371,12 @@ ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ecukes"; - version = "20160913.5"; + version = "20170104.1041"; src = fetchFromGitHub { owner = "ecukes"; repo = "ecukes"; - rev = "dbaac412c465dcee0a637fbaf64d6fc954f6ae6c"; - sha256 = "14cv67nbn10j43h9s60a4h8wjg67m2xw4s19lrdhj3fbyp0g0zby"; + rev = "36db74ef44edfc654618d681f3452b9904740f9a"; + sha256 = "1hc1hb0lnkjanjddcwax783n2fcv5lvi1xl1kszbdzlck4sz1i1r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes"; @@ -15618,12 +15707,12 @@ editorconfig = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig"; - version = "20161212.1946"; + version = "20170103.2124"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-emacs"; - rev = "0e89a891eeffe942d71b93f7792958b38ea1ecf3"; - sha256 = "09k3rqlwwssmqgynaww3ddfvgvarbsaspgr2c2xzbp9l5gg3rr4h"; + rev = "99011d5780dd726ec46b7936e2cbbade66b725db"; + sha256 = "1757lgjbycbf5368s908xbj6dwn3xm9a9zix6ixwxd7j4gyhy16n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/50d4f2ed288ef38153a7eab44c036e4f075b51d0/recipes/editorconfig"; @@ -15639,12 +15728,12 @@ editorconfig-custom-majormode = callPackage ({ editorconfig, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "editorconfig-custom-majormode"; - version = "20160729.24"; + version = "20170102.751"; src = fetchFromGitHub { owner = "10sr"; repo = "editorconfig-custom-majormode-el"; - rev = "601ce5a04634003075396a8ff74d0b09cfa7c11a"; - sha256 = "0jdvg1a76r8vg2d0n8hl2kczg8hybk2hcbd732g3vhzl8i4izfi2"; + rev = "8216ce7d20703a8ce923b4c0284c098ae85621f9"; + sha256 = "02qkvdgn78asz1i7gh8198z0as4yhax3yans96c8lxwmbac125kz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fcd47bf4630442ad1a941ad432cef64c7746aa71/recipes/editorconfig-custom-majormode"; @@ -15778,8 +15867,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "636c5bca8faf9e116e8447cf73646257a85f1bfc"; - sha256 = "1a7vlqwyh2c2qfdir52l2f62g53jcign6q65z66rkdqcdizmjqw7"; + rev = "62c99118f32dd23a088e2d9c0d6b7b755206cac6"; + sha256 = "1f0s9pvns4gq6xzp4vp74xxxbmzp06vdv0jgh0x1xy0mfklgll8x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -15795,12 +15884,12 @@ ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "ego"; - version = "20161024.2138"; + version = "20170112.2043"; src = fetchFromGitHub { owner = "emacs-china"; repo = "EGO"; - rev = "17364e05fc69cd3c9b554f9675d95bf0a3cf4104"; - sha256 = "1ikbw771j0a8y4wgx5whmgsfimw6a6bv3bc5qkl8r8ch5lph85z4"; + rev = "d81561d39524a5f78d5f94216b0ca5fef4b5700b"; + sha256 = "0scnhpj4naaicxp62hd0b5g3kf05gpldbi1z1sfnq4mqi84fnfgx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0090a628a5d566a887cac0d24b080ee6bafe4612/recipes/ego"; @@ -15856,12 +15945,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "20161214.1102"; + version = "20170111.542"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "d85717bd24ec32c41cceaee2defc0957f2f0b4d3"; - sha256 = "0z3mw1i5iwmnjd2qqsyw0ka159dalrfsviv1lbi0ff4x0sqxsd5q"; + rev = "e226b30139e283bf5c3bbf7419b9383c72237c88"; + sha256 = "04szmzri65qagy7af4rrq43idmy5qpl9lqvwq708rzsv8mkqpkqr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -15916,22 +16005,22 @@ license = lib.licenses.free; }; }) {}; - ejc-sql = callPackage ({ auto-complete, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: + ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20161117.543"; + version = "20170103.1427"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "646f72944d9fb792cd21346d0234650eb5dc9c87"; - sha256 = "1jm9fsbyrx7l7bmv50zalxjwrazcmjpdrrqm0y3c56ckix9fpqfv"; + rev = "dffc4f16a0bbaf2a767961297df4570423479117"; + sha256 = "198cii3nk0cmqciyhs0gjlhn6gnsslbry36hm9zp7r3kzk8hsc6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; sha256 = "0v9mmwc2gm58nky81q7fibj93zi7zbxq1jzjw55dg6cb6qb87vnx"; name = "ejc-sql"; }; - packageRequires = [ auto-complete clomacs dash emacs spinner ]; + packageRequires = [ auto-complete cider clomacs dash emacs spinner ]; meta = { homepage = "https://melpa.org/#/ejc-sql"; license = lib.licenses.free; @@ -15961,12 +16050,12 @@ el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-get"; - version = "20161022.614"; + version = "20170112.2204"; src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "ce9dc5ec48dae139338c69a53f9779876038bb54"; - sha256 = "0wknmkv38zf8q4qd2iasng08mia1x7l813qzvysw8lv1x45gspsy"; + rev = "a6510f13c15d9811b51ccb1a96293bbe05162dbb"; + sha256 = "03i8ma0npxfixlbn4g5ffycpk1fagfjgsl4qg4hkrj9l0dmnm7qq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -16024,12 +16113,12 @@ el-mock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-mock"; - version = "20160923.1157"; + version = "20170114.2257"; src = fetchFromGitHub { owner = "rejeep"; repo = "el-mock.el"; - rev = "e3cff9f127ab62dc177b043ce319c7866f6fe2f0"; - sha256 = "1qclqb5g50m208hwyalc6gc0y04lbai8fplxs0nadas3478x5344"; + rev = "5fb2867d2e0350dda047a903ce60d264f78ef424"; + sha256 = "0fdnvsdnkc9xlxch3zavq7ya463g7m7xsc60ymx7a4350zl2vwyn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1989beb927657c0ff7e79fe448f62ac58c11be7/recipes/el-mock"; @@ -16246,6 +16335,27 @@ license = lib.licenses.free; }; }) {}; + eldoc-overlay-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eldoc-overlay-mode"; + version = "20170114.2125"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "eldoc-overlay-mode"; + rev = "794c2b959611d1352cdda9e930f2ddd866b4118a"; + sha256 = "04lndhm1jb0kvv0npr5wmgj8v18537fgp62c6m4gzgcjyfxihmr7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/de4d7c143f24d34eed093cfcdf481e98a6d2f839/recipes/eldoc-overlay-mode"; + sha256 = "158w2ffayqlcbgka3894p3zbq45kw9mijf421yzf55y1f1ipzqqs"; + name = "eldoc-overlay-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/eldoc-overlay-mode"; + license = lib.licenses.free; + }; + }) {}; electric-case = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "electric-case"; @@ -16270,12 +16380,12 @@ electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }: melpaBuild { pname = "electric-operator"; - version = "20161211.1122"; + version = "20170102.307"; src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "86d5ae04c35642cbccfa75a12008f7b65d63312b"; - sha256 = "189vxvhp018bs42qb6z9nfw51nsmjfb5q66w3hr5zgkapxwgjpsv"; + rev = "1670a0d8e4a09b48da312afc57d35e0cf7033b5f"; + sha256 = "0cm1zg2hgwzwwkri0wsb6x9jhgma6vm9jga81jjiasih33nd0zy4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -16354,12 +16464,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20161211.1108"; + version = "20170116.1128"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "4f7699913ee1e9c815276760ced3393e88e506f4"; - sha256 = "11fsfki4cz2q3xnrm1mrb94sf2achl3g2bwmi21d1xn68z4zg79x"; + rev = "3be3ff04438eec593f058d0f948dfc9f85a0ad47"; + sha256 = "1siviasw7863prsyxw7ggb0n71b32kzq647f60jnx75y69s05zds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -16428,8 +16538,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "4f7699913ee1e9c815276760ced3393e88e506f4"; - sha256 = "11fsfki4cz2q3xnrm1mrb94sf2achl3g2bwmi21d1xn68z4zg79x"; + rev = "3be3ff04438eec593f058d0f948dfc9f85a0ad47"; + sha256 = "1siviasw7863prsyxw7ggb0n71b32kzq647f60jnx75y69s05zds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -16466,16 +16576,16 @@ elisp-depend = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elisp-depend"; - version = "20120428.1304"; + version = "20161230.750"; src = fetchFromGitHub { - owner = "tehom"; + owner = "emacsorphanage"; repo = "elisp-depend"; - rev = "817ab94db56e3c23da6d7d4ae0422c48f260a7e3"; - sha256 = "1a73zdh4jkx8f74cq802b5j4bx8k1z7cbsp10lz40lmwwxbl3czq"; + rev = "e4b201ac7dcee4489d58800c299fd04aaa61d07a"; + sha256 = "0i1wpz6hr934x3lcr0y9x82dm7c1j477j14jqccn8q7d4cb1lfaj"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/elisp-depend"; - sha256 = "1x3acgkpd9a8xxjg5zjw0d4nv4q9xx30ipr6v3544mn16sv4ab7c"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/7ea159f0cc8c6e4b8483401a6e6687ab4ed73b7f/recipes/elisp-depend"; + sha256 = "0zpafwnm52g6v867f1ghfb492nnmm66imcwlhm5v9hhgwy3z17jm"; name = "elisp-depend"; }; packageRequires = []; @@ -16533,8 +16643,8 @@ src = fetchFromGitHub { owner = "Wilfred"; repo = "refs.el"; - rev = "412dafa219ab4eac6eddcc793588d26d2df6fe21"; - sha256 = "0nl39ikk8nlc0xar8r8s2g9dp2n52qi1gmksnck7klbphmw6xx3n"; + rev = "6ef632c8922e01714a25c6e04fd5522be6e5ea26"; + sha256 = "00c9s60g7rl784q4slfaavqkjhj8j73pglflpjh8pvrgj77c4y6y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs"; @@ -16592,12 +16702,12 @@ elixir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "elixir-mode"; - version = "20161015.1200"; + version = "20170102.942"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "emacs-elixir"; - rev = "b71145e1f23f1222220549bd28bce3557711717e"; - sha256 = "06m937mkd4hiqi28drqnkk8pr089ijkbcacgbxf86d5iy8qwyhw4"; + rev = "384d8daf8ad563ebf2cb3437c71d30241adbe099"; + sha256 = "0idgfjwd6116zaag0lmq2i9by2mr054nrqmpnsvyhk26hw71k3vn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6374ced0de38d83bf99147f702f30706615480ed/recipes/elixir-mode"; @@ -16823,12 +16933,12 @@ elpa-clone = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-clone"; - version = "20160724.719"; + version = "20161222.1009"; src = fetchFromGitHub { owner = "dochang"; repo = "elpa-clone"; - rev = "77e45f3ac7de504ff65e17dfd52bfde7bdfc78f2"; - sha256 = "09q54j0n52493smhdrngn2isnifvy0x3s6vlicllkm8qykr06z9v"; + rev = "8d0827b03b08eb4844e2b8465c27d5aa0e12101d"; + sha256 = "1ik2k6ngzg3znfp4a36f7m5ca6p3iivfb7w280w3gm5x1ja8as2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone"; @@ -16865,12 +16975,12 @@ elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, s, yasnippet }: melpaBuild { pname = "elpy"; - version = "20161211.1045"; + version = "20161229.1103"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "6b139ed3f28cfe255288aa07f14c49f1f15132bf"; - sha256 = "0hmk1pi9mv74ry3mff854qz07rpiirn275wkd6s4vqpy7m8za4rv"; + rev = "d93ad53fb55c1ff2cbbafcc8c85bddc30484bc80"; + sha256 = "1ii3p81hn84f155mywz906pnjkp5qca501qrplh96c5d0xkzz14l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d8fcd8745bb15402c9f3b6f4573ea151415237a/recipes/elpy"; @@ -17166,12 +17276,12 @@ emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }: melpaBuild { pname = "emacsql"; - version = "20161102.1605"; + version = "20170110.1853"; src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; - sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; + rev = "327b09b4b99ccb6b5605b804027a42fd73589929"; + sha256 = "056zpjvzinljmz90ymd8ggya3mxbk8zxl0a61x4naa64r28rjgkx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql"; @@ -17191,8 +17301,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; - sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; + rev = "327b09b4b99ccb6b5605b804027a42fd73589929"; + sha256 = "056zpjvzinljmz90ymd8ggya3mxbk8zxl0a61x4naa64r28rjgkx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-mysql"; @@ -17212,8 +17322,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; - sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; + rev = "327b09b4b99ccb6b5605b804027a42fd73589929"; + sha256 = "056zpjvzinljmz90ymd8ggya3mxbk8zxl0a61x4naa64r28rjgkx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-psql"; @@ -17233,8 +17343,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "emacsql"; - rev = "c93f52159fc5117f2ba1fbdc16876ae4d8edf12b"; - sha256 = "0z9pw9fgaiqb0dcz908qfrsdc3px8biiylsrmfi9bgi7kmc3z674"; + rev = "327b09b4b99ccb6b5605b804027a42fd73589929"; + sha256 = "056zpjvzinljmz90ymd8ggya3mxbk8zxl0a61x4naa64r28rjgkx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9cc47c05fb0d282531c9560252090586e9f6196e/recipes/emacsql-sqlite"; @@ -17376,12 +17486,12 @@ embrace = callPackage ({ cl-lib ? null, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "embrace"; - version = "20160513.1913"; + version = "20161228.1948"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "embrace.el"; - rev = "875601a077795e036b470bdacd292a97b075d8e7"; - sha256 = "07phgsc7lv9326gdjg23q0lzw45vcpx4biw93r10v0ln6bg21mz8"; + rev = "7e0cc702bc15915f4e4be4c334faa37dca94e749"; + sha256 = "0w746jbyfjd8z8ga5nlsipw02pcbi98wxfdw51zv088ml0647v6j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8f07e3b5ba4ec4b0b79fba5a2cca5a3986218b6/recipes/embrace"; @@ -17438,11 +17548,11 @@ }) {}; emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms"; - version = "20161108.644"; + version = "20161222.1446"; src = fetchgit { url = "git://git.sv.gnu.org/emms.git"; - rev = "cf6903c22b49b2e3efe338a9ccbd0df36b6d0cbf"; - sha256 = "05hqz1rlcl54fgnh40qy60ji60lycpgiqv6nnkzp29c7gc4sa40d"; + rev = "dde22abffb7a47adfe2cf98e4505ac0048e0b5fd"; + sha256 = "1r7gkilgmk2gll1ps0z7n0i74wbg66jla9cf8fvppvajxmmng4gv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/205eeed002b0848809a4c5f8ad99d925b48799ec/recipes/emms"; @@ -17672,8 +17782,8 @@ src = fetchFromGitHub { owner = "zonuexe"; repo = "emoji-fontset.el"; - rev = "e460c9a08e48ec4103e38a7a04acae20880149a9"; - sha256 = "0xdlqsrwdf0smi5z9rjj46nwrrfpl0gzanf0jmdg8zzn62l6ldck"; + rev = "10be897fa5165fd40fd35a89e38c759e008fa775"; + sha256 = "1aanl5dd2m8jlyq27ymhc6l9i00cpi30wwhpaf67dlvk9gk89f64"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/60df435eb82fcc9a8a02a0a271bb6a2d5a161bc4/recipes/emoji-fontset"; @@ -17752,12 +17862,12 @@ emr = callPackage ({ cl-lib ? null, clang-format, dash, emacs, fetchFromGitHub, fetchurl, iedit, lib, list-utils, melpaBuild, paredit, popup, projectile, redshank, s }: melpaBuild { pname = "emr"; - version = "20161207.1229"; + version = "20170109.1526"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "emacs-refactor"; - rev = "483877f912944ff0e4a51362548c3528c4df068c"; - sha256 = "0i426ri2fk2wijk4k95yiqbky4as9w4gpw264rrh14y43fx0ncyj"; + rev = "c671b08facf37be6fc6783260cee686866cfed14"; + sha256 = "05v90g6ybdp2fmnnklnbdxygnw8xw0whmxbdw45qdww8idf2swfs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2cd2ebec5bd6465bffed284130e1d534f52169a9/recipes/emr"; @@ -17932,12 +18042,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20161203.1059"; + version = "20161227.301"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "5156f9b1b748c3e2246730d3234121b36e6d7553"; - sha256 = "08m5ps972fbjwz97s6bs92icf7x32kh2invjdypy59zj2q0pdixv"; + rev = "42598cab15985e6fc5e95989b0c73e2259cdadf5"; + sha256 = "1k8nfxfd4y3r1y293r6sqlk4wq59rdvpbhsdvr3j0mx0a9yzdxdm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -18045,12 +18155,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "20161201.1358"; + version = "20161231.850"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "846c5ee182e6572af3034c5b43d439a6c915d243"; - sha256 = "17i68vsl1grffs7j5n7lzkwi870fci7y84q5i7qwvip3vhpxlczr"; + rev = "6e1d989fbfa357a7c268ea30fe8b3e3cefafc36d"; + sha256 = "0avlmqcbm07692ir5z04gy4klhyan3h25ni4l4k4p0dszjsqmdi0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -18171,12 +18281,12 @@ erc-colorize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-colorize"; - version = "20160108.220"; + version = "20170107.539"; src = fetchFromGitHub { owner = "thisirs"; repo = "erc-colorize"; - rev = "391391582b3c34750d56a3b3e819e03ad7c3bd42"; - sha256 = "18r66yl52xm1gjbn0dm8z80gv4p3794pi91qa8i2sri4grbsyi5r"; + rev = "d026a016dcb9d63d9ac66d30627a92a8f1681bbd"; + sha256 = "1zzmsrlknrpw26kizd4dm1g604y9nkgh85xal9la70k94qcgv138"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e69214e89ec0e00b36609fce3efe22b5c1add1f9/recipes/erc-colorize"; @@ -18192,12 +18302,12 @@ erc-crypt = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-crypt"; - version = "20161105.623"; + version = "20161228.739"; src = fetchFromGitHub { owner = "atomontage"; repo = "erc-crypt"; - rev = "d30f426b4cae10efcb91ea57afa9cc51feb4c39f"; - sha256 = "0r9n9jhd0sbf1mf3mzizaal5kqd20msm20vl73z589ph2q5vxnii"; + rev = "731f9264a5bf08a8fc0b5ce69e72058c86f873a5"; + sha256 = "13jpq5ws5dm8fyjrskk4icxwz8k5wgh396cc8f8wxrjna4wb843w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a71b46c0370d2ed25aa3f39983048a04576ad5/recipes/erc-crypt"; @@ -18527,12 +18637,12 @@ ergoemacs-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }: melpaBuild { pname = "ergoemacs-mode"; - version = "20161206.1258"; + version = "20170112.1108"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-mode"; - rev = "d5d7e5b6a5537cdcfcc79efd43bbde138fc7863c"; - sha256 = "1jj7pgcbspallki9in4dn2d0wzis873r89y5kniycnydqfzadpjs"; + rev = "b4b5241e679cc1a7bd7b1f3703f1a7ce602cd1f6"; + sha256 = "1zmwzpp410hxgwycys7ij4xjmzz8piykx4scclvvyl63hhqlrrfh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; @@ -18573,8 +18683,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "37933d48e1569bdf538686d8a1f82e7be4125ed5"; - sha256 = "0h7jm42xj22jb512lsbjjd7gddgx4dh0711kblz3qazkm0ngw0ds"; + rev = "eadc98327e3fb173d80a92e6ae2e7d7e85f92d67"; + sha256 = "1bn43p122ld3269klzcpfwacswnlpj2hdz9kx6n5691zv0w3qi5b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -18587,6 +18697,27 @@ license = lib.licenses.free; }; }) {}; + eros = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "eros"; + version = "20161221.826"; + src = fetchFromGitHub { + owner = "xiongtx"; + repo = "eros"; + rev = "a42e45c9b2397156c684330b0fc90ee0eba773f5"; + sha256 = "0whlsq90v13fz69k3wjrwcwb9gkpfxqjd75mg3nrp85j9nwhb5i4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ee5807cfb3973348b901142b317e1c7edc3b38db/recipes/eros"; + sha256 = "0xry221mj1achsyc8mkmipza2zn2xmsx96fqznf6mqvx4s271nvs"; + name = "eros"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/eros"; + license = lib.licenses.free; + }; + }) {}; ert-async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ert-async"; @@ -18877,6 +19008,27 @@ license = lib.licenses.free; }; }) {}; + eshell-fixed-prompt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "eshell-fixed-prompt"; + version = "20170108.1301"; + src = fetchFromGitHub { + owner = "mallt"; + repo = "eshell-fixed-prompt-mode"; + rev = "0b1d7cc05a7f59e8c06c321401cea86c6cb068af"; + sha256 = "0kr9nv9dd2i4ar6mx4bjhid4sxsvvgx713bajia4jsby34jbgfi2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b0bc9259d7ee9eaf015f6583f82f1313d69e6f29/recipes/eshell-fixed-prompt"; + sha256 = "0r0dbqmxzlh1sqadivwq762qw7p6hbrqprykd6b1m9m9gbb2qnkg"; + name = "eshell-fixed-prompt"; + }; + packageRequires = [ emacs s ]; + meta = { + homepage = "https://melpa.org/#/eshell-fixed-prompt"; + license = lib.licenses.free; + }; + }) {}; eshell-fringe-status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-fringe-status"; @@ -18943,12 +19095,12 @@ eshell-up = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-up"; - version = "20161120.1117"; + version = "20170108.749"; src = fetchFromGitHub { owner = "peterwvj"; repo = "eshell-up"; - rev = "e763b4c0bcd70252396d7825cb53bf00e60a547e"; - sha256 = "00ckk2x9k8ksjlw54sajcg13m6c9hp3m6n71awqbm9z17prnkzl1"; + rev = "e30081fdfb20e380bdcd00b04fcca41aa2bc57af"; + sha256 = "1xq1y6ddq9hxcc13wzj55snc7dg75y1z78f5bhnm9ps3ww7nmc9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d033b20d047db8ddd42bdfa2fcf190de559f706/recipes/eshell-up"; @@ -18964,12 +19116,12 @@ eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-z"; - version = "20161206.2249"; + version = "20170116.2038"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-z"; - rev = "033924f138f19f22a30c1845e728691e5615fa38"; - sha256 = "0kp9yw56l8bl4zqganclnpf6x5g2rmcf23265n8cp24j6d7c7r4h"; + rev = "c9334cbc1552234df3437f35d98e32f4d18446b8"; + sha256 = "1zja4hb2lj4m5w4j9mpc7xyqgg2ivpslllffjsg8x1w8xsxpj8fh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8079cecaa59ad2ef22812960838123effc46a9b3/recipes/eshell-z"; @@ -19090,12 +19242,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20161101.215"; + version = "20170116.214"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "bcb5fff9e9fc4f17f780149c6ba38002ce044176"; - sha256 = "1h3jlfblwsrqzw98lw4dq550zidab1f6l557fdcjkqlgjf74c4bb"; + rev = "8ba2d5c5a5d9abb5fa907e2e27e6ccb9a130158e"; + sha256 = "12kx8wbr4wzvrlcbk48qbpfp4pdfsxxgx19qvl127c91ajbxksxa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -19336,12 +19488,12 @@ euslisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "euslisp-mode"; - version = "20160524.747"; + version = "20161226.840"; src = fetchFromGitHub { owner = "iory"; repo = "euslisp-mode"; - rev = "e42a512f5bf204ac9c149a8dfbe9abdfe24c9bc2"; - sha256 = "1zrf652ipy701s6n5k1aga0l97ws66imhk7dj6ii9qf4587byy7z"; + rev = "cbbb60cf7d301c19906678bae933060af21c1a86"; + sha256 = "0xz4asnwg52f02jmyz2flmkl748isacvjylfwi23xdcxqiab454a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09a7c4b73203d75c5260f1d08845236cbbeae46/recipes/euslisp-mode"; @@ -19378,12 +19530,12 @@ eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: melpaBuild { pname = "eval-in-repl"; - version = "20160418.1843"; + version = "20161224.1932"; src = fetchFromGitHub { owner = "kaz-yos"; repo = "eval-in-repl"; - rev = "4ac77eb80f6df21f5a8621982bcafc71ac2ef7dd"; - sha256 = "07jlrngmnfp1jp30hx9vk42h065c74dz92b38sa18swzfmhwd4y5"; + rev = "674873139ebde439fbeecaf0fb217d54f470bc14"; + sha256 = "1fzsq6fkkrsxg6mimrnls0kn59rq7w332b94gg04j0khl61s1v1s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl"; @@ -19650,12 +19802,12 @@ evil-easymotion = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-easymotion"; - version = "20161023.2356"; + version = "20170110.2004"; src = fetchFromGitHub { owner = "PythonNut"; repo = "evil-easymotion"; - rev = "6d5cb5825ce3a266cc3e10c5ad40a1e038f068f3"; - sha256 = "1qgmpvwbay7s1b9gsll06nf5hygrb1ixw155538ckhcaxra48719"; + rev = "f9b5aa52f238ea14c2b16982e56c3b2c8f739101"; + sha256 = "098x03vlz3gvkaa3wahi1557l9x39n1v8jclj5aqxvjdzapi6myi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e67955ead0b9d69acab40d66d4e0b821229d635c/recipes/evil-easymotion"; @@ -19713,12 +19865,12 @@ evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-escape"; - version = "20160607.1015"; + version = "20170115.1343"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "evil-escape"; - rev = "09e0622e167c89cd4dfa4e2037aaff0aceee52ad"; - sha256 = "0lk1wsv7k53774mn6ggrm28i9mxzg0xqv8hj372ka66v6ahlb34f"; + rev = "b4d44fc5015341e484495fc86b73d09b2ac062ec"; + sha256 = "0s8lmmm25qabicwaj9jybpbd8mkc62yl7jnhk1lpablydjkv3w2i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/770fc6dd82c4d30f98e973958044e4d47b8fd127/recipes/evil-escape"; @@ -20007,12 +20159,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20161213.2138"; + version = "20170113.19"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "c8796e3c611cd8ca55e80a0487b93c4b0551d45c"; - sha256 = "16xs6aj3ws6skhvqfda2i7y1gj0gg20yra99hpnkz05f4gcpjfmh"; + rev = "d5b50be73b4288400d418abe86f92504081ea32d"; + sha256 = "13wvjif6479c1l6hvyhm7jhf41kdh4c56n4rmnncc9cw5z9z7fcb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -20074,8 +20226,8 @@ src = fetchFromGitHub { owner = "hlissner"; repo = "evil-multiedit"; - rev = "5f263a9388dd3593b5acefe9f523c819bd3b338f"; - sha256 = "0bsdyy5jw8adj26p85831n4f34d0sv4rrv9xlhjqkzx9gsr4h7d1"; + rev = "e2df8629971df7c905256c504ff5f90b94eebdb8"; + sha256 = "127x55msyy54n6lkml615akhafnbn62cxnmwj1brjwzzi5cbk6bn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/997f5a6999d1add57fae33ba8eb3e3bc60d7bb56/recipes/evil-multiedit"; @@ -20322,12 +20474,12 @@ evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-snipe"; - version = "20161103.1020"; + version = "20170104.1209"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "c3b9db1628192299cc3901ff21aec316bdbdb1b8"; - sha256 = "19s0d2c9d942zqi5pyav4srn0cn4yrdhd2dlds4pn7qxmvdkvyvb"; + rev = "b1bcddda1e2fe7f239223fe0fe0994c1745657d1"; + sha256 = "0vpa0hbi1m3f2yxy56wyhm9fja35frnq6xs7bb93gmigbpa96f47"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; @@ -20364,12 +20516,12 @@ evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-surround"; - version = "20161029.606"; + version = "20170115.1604"; src = fetchFromGitHub { owner = "timcharper"; repo = "evil-surround"; - rev = "5c07befaf7930bbd61c24f3e251f8ce41026cfc2"; - sha256 = "0gd9dh1k0ydgc8nz575613bry240jb3qymzakkrq8pvcpl57nx7y"; + rev = "27dc66d5d8ee64917bf5077a4d408f41099622ed"; + sha256 = "1s0ffrk1avn008ns6qvj4mnjb476bvgsg74b22piq3s3fl8yycr4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da8b46729f3bd9aa74c4f0ee2a9dc60804aa661c/recipes/evil-surround"; @@ -20700,12 +20852,12 @@ exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "exec-path-from-shell"; - version = "20160812.159"; + version = "20161229.1338"; src = fetchFromGitHub { owner = "purcell"; repo = "exec-path-from-shell"; - rev = "5836fb1656493be4152e8f20b5b0ec3d49ca2787"; - sha256 = "1laii7pvw18pp71r0fssw67lgw7wb5wqbjrpdrg5xr7smx8fxccc"; + rev = "0f53502d463eeeaefe48dfeb0c2fbaac1e6302e3"; + sha256 = "12mkh5sna8j0ijxc6fd8sr2zlk3p6w9q3fv5l3n16sjmnlj3cf0r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d8545191031bece15cf1706d81ad1d064f2a4bd/recipes/exec-path-from-shell"; @@ -20847,12 +20999,12 @@ eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eyebrowse"; - version = "20161119.442"; + version = "20161226.1438"; src = fetchFromGitHub { owner = "wasamasa"; repo = "eyebrowse"; - rev = "a009536514409fdf0a1745504a7d7e0e376cc2c9"; - sha256 = "0kw13w3q1q4gb3ql728bk9m0rymkp21rrjmy4hyx8im84xh093ls"; + rev = "e7c3de9c8b3197f3a310d8d9259761fc70dfa3ef"; + sha256 = "0d2vc50m2wr6f0fd04xm3bzca25im3ka57y7lg6p0bn5fp6a62vl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse"; @@ -20868,10 +21020,10 @@ eyedropper = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild { pname = "eyedropper"; - version = "20151231.1301"; + version = "20170101.930"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/eyedropper.el"; - sha256 = "1fg3j0jlww2rqc6k2nq95hcg6i26nqdp043h7kyjcwrgqbjfsigl"; + sha256 = "1132mc9c79k07gh51i50qaykilnxwzb58rf18pja9fdqc9vzcs7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/eyedropper"; @@ -20991,10 +21143,10 @@ }) {}; face-remap-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "face-remap-plus"; - version = "20151231.1302"; + version = "20170101.931"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/face-remap+.el"; - sha256 = "0yr3fqpn9pj6y8bsb6g7hkg75sl703pzngn8gp0sgs3v90c180l5"; + sha256 = "1mjh7hjpfxy476nwn0kbcq1zyaklrxd3l8482y5dlbcziwg85s1f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/face-remap+"; @@ -21009,10 +21161,10 @@ }) {}; facemenu-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "facemenu-plus"; - version = "20151231.1305"; + version = "20170101.934"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/facemenu+.el"; - sha256 = "1kayc4hsalvqnn577y3f97w9kz94c53vcxwx01s0k34ffav919c2"; + sha256 = "0xdrmmygyynk0rinfhikw5zjbh8kf8xbcs5a79irhm5mv88jiikf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/facemenu+"; @@ -21027,10 +21179,10 @@ }) {}; faces-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "faces-plus"; - version = "20151231.1305"; + version = "20170101.934"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/faces+.el"; - sha256 = "0sqrymmr583cgqmv4bs6rjms5ij5cm8vvxjrfc9alacwyz5f7w8m"; + sha256 = "1cvwna544xk5jlmimsszvvqcf2h8xmx6f9ripbpvkldgqalb91mn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/faces+"; @@ -21211,22 +21363,22 @@ license = lib.licenses.free; }; }) {}; - fasd = callPackage ({ fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }: + fasd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fasd"; - version = "20161203.2208"; + version = "20161216.831"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "emacs-fasd"; - rev = "9883cf23f632357fa42ffde3e4942bf9022a4fac"; - sha256 = "12i5n7aw9nhlh1ghj98jsigbj55qx85v0i8j154sqv7spx8anf2c"; + rev = "5940b84dfa1ea7225b740d3a8dd215290d964873"; + sha256 = "1wqh7x0c1i0w5lfh0j7xilvp5vmwvbsblp2jd6bz3n5j2ydgpc00"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f0fefb25f03677080c9adeeb48046d6ea163053/recipes/fasd"; sha256 = "0i49z50bpi7fx0dm5jywlndnq9hb0dm5a906k4017w8y7sfpfl6c"; name = "fasd"; }; - packageRequires = [ grizzl ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/fasd"; license = lib.licenses.free; @@ -21442,10 +21594,10 @@ }) {}; files-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "files-plus"; - version = "20151231.1307"; + version = "20170101.936"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/files+.el"; - sha256 = "0s79b5jj3jfl3aih6r3fa0zix40arysk6mz4fijapd8ybaflz25n"; + sha256 = "01391gkkzciahi2azad5gd260i9s48c5k73m2w3qinv7clqwxc32"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/files+"; @@ -21460,10 +21612,10 @@ }) {}; filesets-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "filesets-plus"; - version = "20151231.1308"; + version = "20170101.937"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/filesets+.el"; - sha256 = "020rpjrjp2gh4w6mrphrvk27kdizfqbjsw2sxraf8jz0dibg9gfg"; + sha256 = "0d30i1vnmja1vjhqs25vdph2gcvrsrrxvzgnm5hp8pscf8wz1igf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/filesets+"; @@ -21562,10 +21714,10 @@ }) {}; find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "find-dired-plus"; - version = "20161128.1426"; + version = "20170101.938"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/find-dired+.el"; - sha256 = "1h4q2v88wvfmzdmaqnp9fywna7n9a94kziz6hjdf1xhc5a7lxqsc"; + sha256 = "1ll1qr9kkx3fy0j7s5zz95gwsfj0j925cgkcs5ic5rds474881q0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c8f884334b7eb83647146e7e8be028935ba12ce/recipes/find-dired+"; @@ -21623,12 +21775,12 @@ find-temp-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "find-temp-file"; - version = "20160108.213"; + version = "20170107.539"; src = fetchFromGitHub { owner = "thisirs"; repo = "find-temp-file"; - rev = "c6c44c69b3edf2a56cc56b1fc166dc8ce4144228"; - sha256 = "1d6zn3qsg4lpk13cvn5r1w88dnhfydnhwf59x6cb4sy5q1ihk0g3"; + rev = "513005d19d72d71f34481ee00158dd57bd93206f"; + sha256 = "129jnn16vxmp6r9gx8k4rvv6spag5q0if52b5fhsybicnsl35mrz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c01efd0cb3e3bab4661a358c084b645dc7e31736/recipes/find-temp-file"; @@ -21664,10 +21816,10 @@ }) {}; finder-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "finder-plus"; - version = "20151231.1313"; + version = "20170101.945"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/finder+.el"; - sha256 = "0x3f9qygp26c4yw32cgyy35bb4f1fq0fg7q8s9vs777skyl3rvp4"; + sha256 = "1ip8y3qhswfhshh61c7b8iajdnlsyg2cpypbv87825mzy8vbgp6z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/finder+"; @@ -21827,12 +21979,12 @@ firestarter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "firestarter"; - version = "20160318.1342"; + version = "20161219.523"; src = fetchFromGitHub { owner = "wasamasa"; repo = "firestarter"; - rev = "e40af9b4ff53e5d2eccbce66159cffd5f2481edd"; - sha256 = "0ssx3qjv600n8x83g34smphiyywgl97dh4wx8kzm9pp42jnp29cj"; + rev = "4d6b106f325ac1802eabce3c8a7cd0a4c7a32864"; + sha256 = "13daz15v0sshl7lxcg1xcbpl64gklgh50pzk0qxmn5ygw7nlifn0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b046eb3b63220b937e1b70f633cb5424dc782a1/recipes/firestarter"; @@ -21868,10 +22020,10 @@ }) {}; fit-frame = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "fit-frame"; - version = "20161002.912"; + version = "20170101.946"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/fit-frame.el"; - sha256 = "1v4c3l2lcglrvcqk27amrpg29rnn6009w968sf6kdab8k2yz5f4b"; + sha256 = "0l48zayzmlpzvqx02g1d2ilwijakwl2ql5svk78w3vx4nj41xxj7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e13c77f822db3c9eaeb3fd5fa95cc2dbe5133f2c/recipes/fit-frame"; @@ -21887,12 +22039,12 @@ fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fix-input"; - version = "20160122.2119"; + version = "20161231.1554"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-input"; - rev = "7c3f4770fd068fc789f80ec33934dc3aceb47ddf"; - sha256 = "1hw3fvj2xq96di4xfs852vy1268hi3a4n10pzrnwnrn0mqy0hn30"; + rev = "483365fb3c4ba5e08f5df07436294e7f8714dbd2"; + sha256 = "09c6ynmsypjpiwwn29npsbf4lq20i5cks41maxifnpvqxmkk6a4c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d31f907997d1d07ec794a4f09824f43818f035c/recipes/fix-input"; @@ -21929,12 +22081,12 @@ fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fix-word"; - version = "20150716.602"; + version = "20161231.1555"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "fix-word"; - rev = "36a513e401e850ecf884ef43290ad4ea3cec9af5"; - sha256 = "02ixv7ckf419sy0r596fkc7f81bfwk410jl23z6cvdh3j64q12l6"; + rev = "bcc22ef05b5cdd43632121bfc9d77b27df7c34e7"; + sha256 = "066wif5p96yrcb944ic84jxxps80qxl17igagw3cdfj868y7nfik"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22636390e8a15c09293a1506a901286dd72e565f/recipes/fix-word"; @@ -22289,12 +22441,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20161117.144"; + version = "20170112.1646"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "a4dfb0eb5e5d59ab41646dfda06d551b15bfdf21"; - sha256 = "049r2ycy4gxzmxhfjyq9g00y2jm8byfzh2j214jig3pssx12amwr"; + rev = "d0b058ecbfbf7f1d130aa46580cb77ac67a1fc9d"; + sha256 = "17x8na9wbclznr4rvvznpljizx6vaw4a8cvpk45c2mijwbh1bz2d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -22436,12 +22588,12 @@ flycheck-clojure = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "flycheck-clojure"; - version = "20160704.1221"; + version = "20161231.836"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "squiggly-clojure"; - rev = "7d5e714339509108f9dd3f32ded4b678744a809a"; - sha256 = "0nxw62mn03jhcx71rg5xlp2s0kwcppahjl8drh9jvhqw3lfx9yjr"; + rev = "254bd6a65a262896a4cc4f2061a6bbce51a5b73f"; + sha256 = "0315x1j55wkff0fizqvalfmxjiy1rl9fjk6hl7xziiw3rdvb943a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c9c642a234f93ed4cf5edcf27a552a8916984946/recipes/flycheck-clojure"; @@ -22646,12 +22798,12 @@ flycheck-dmd-dub = callPackage ({ f, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-dmd-dub"; - version = "20160609.14"; + version = "20161223.856"; src = fetchFromGitHub { owner = "atilaneves"; repo = "flycheck-dmd-dub"; - rev = "030ebb45e7eef9e2bb41ccf3b9557ef2207c29b1"; - sha256 = "1z4z53n8hivshyv15mn31d0hr6qs09xwlxm118a78zfd167xckwj"; + rev = "8c6220f45c24d662f1c4afae54f311139f0242b1"; + sha256 = "0n0q5qhwpx3v0d3aw6swzv8w09cs5mlnx9aybfhclzfa44adn6rq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a812594901c1099283bdf51fbea1aa077cfc588d/recipes/flycheck-dmd-dub"; @@ -22706,6 +22858,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-flawfinder = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-flawfinder"; + version = "20170115.1927"; + src = fetchFromGitHub { + owner = "alexmurray"; + repo = "flycheck-flawfinder"; + rev = "7d964d38023b088adf3ffc2fddeead81f4491a45"; + sha256 = "0y023brz8adwa6gdaaixk6dnrq4kj2i5h56rj54cxrjkagyklfxl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e67a84d1a8c890ea56bd842549d70d9841d1e7a7/recipes/flycheck-flawfinder"; + sha256 = "1nabj00f5p1klzh6509ywnazxx2m017isdjdzzixg94g5mp0kv5i"; + name = "flycheck-flawfinder"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-flawfinder"; + license = lib.licenses.free; + }; + }) {}; flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-flow"; @@ -22751,12 +22924,12 @@ flycheck-gometalinter = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-gometalinter"; - version = "20160714.2232"; + version = "20161225.1721"; src = fetchFromGitHub { owner = "favadi"; repo = "flycheck-gometalinter"; - rev = "33cc9c2d7101e0448e5e49e23487c50df163f7db"; - sha256 = "0fjm1ll2958rjs2kzn8zgdl9ifjah6rrcsgfb1razbhf57qwbc0i"; + rev = "b6fa2468401d9035b2aeb1dc9bdb12a518e0d13b"; + sha256 = "08cr2jij9iaa117l4b4mg977hi6klw9qj8knc42lfzz37d91r3i6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bfe9f2d030c04fb292297eb9226072bfea2ac64/recipes/flycheck-gometalinter"; @@ -22982,12 +23155,12 @@ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; - version = "20161214.509"; + version = "20161229.205"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "3140e4c74dbaa10e6f8edd794144d07399a8fda8"; - sha256 = "0zzb03qxfs5wky40hzmldkzq5gn4c7qknkd5ra2lghzj0az6n9ld"; + rev = "11805f1d420e297db0346a6657f144b08e2ca556"; + sha256 = "1s9bk3k7ys79m2iww4yf1abfy01d08z9x9pfq8l045q0snsh64il"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -23318,12 +23491,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "20161214.501"; + version = "20161229.331"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "846b3045d018a13cadb8a8bfde83587802d7e1a2"; - sha256 = "06wzsi3lw938mc8sz06jxyclxpvrlyjgvs9998kpiyhz752sgfsw"; + rev = "ae7b29111cb160774c317997902d7ef29cedd7d9"; + sha256 = "17s34rqxkirb88y8jzl3ybs7j3ylp9ckdfx3sqwfn0cyspnj5f1d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -23385,8 +23558,8 @@ src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "5bff8525adbe01a9af905c92f0834902ac3c1c73"; - sha256 = "15sg07dvvmmfhcp83b388zy43wgyq2qcns4qqcm2jaqq9hpvqxf9"; + rev = "386f6101fec6975000ad724f117816c01ab55f16"; + sha256 = "12m3fh2xipb6sxf44vinx12pv4mh9yd98v4xr7drim2c95mqx2y4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; @@ -24200,12 +24373,12 @@ fm-bookmarks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fm-bookmarks"; - version = "20151203.603"; + version = "20170104.916"; src = fetchFromGitHub { owner = "kuanyui"; repo = "fm-bookmarks.el"; - rev = "e1440334a4fe161bd8872996b6862d079d8eb24e"; - sha256 = "0984fhf1nlpdh9mh3gd2xak3v2rlv76qxppqvr6a4kl1dxwg37r3"; + rev = "11dacfd16a926bfecba96a94c6b13e162c7717f7"; + sha256 = "0is4617ivga8qrw19y7fy883fgczzdxvrl15ja1dydzj2cbn5d97"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ca020aff7f19cc150cd6968ae7c441372e240c2/recipes/fm-bookmarks"; @@ -24367,10 +24540,10 @@ }) {}; font-lock-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "font-lock-plus"; - version = "20151231.1319"; + version = "20170101.947"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/font-lock+.el"; - sha256 = "04j9xybn9an3bm2p2aqmqnswxxg3gwq2mc96brkgxkr88h316d4q"; + sha256 = "0ffs2c7gyhfa2mskdh7a1yp0na99kk282zm4zn56ljp55rrnnnh0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/font-lock+"; @@ -24425,22 +24598,22 @@ license = lib.licenses.free; }; }) {}; - fontawesome = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: + fontawesome = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "fontawesome"; - version = "20151202.630"; + version = "20161219.312"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-fontawesome"; - rev = "66650efea4a044afe0e5f482ccac465082cd5e62"; - sha256 = "103xz042h8w6c85hn19cglfsa34syjh18asm41rjhr9krp15sdl1"; + rev = "72b4f2f83c7fdacd225aee58f93acefc53166626"; + sha256 = "1icwjd1rbyr1g8ifyhvpi21wjff2qrddq2rmp5lmiajnwrlfli0d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93b92f10802ceffc353db3d220dccfd47ea7fa41/recipes/fontawesome"; sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3"; name = "fontawesome"; }; - packageRequires = [ cl-lib helm-core ]; + packageRequires = [ emacs helm-core ]; meta = { homepage = "https://melpa.org/#/fontawesome"; license = lib.licenses.free; @@ -24449,12 +24622,12 @@ forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forecast"; - version = "20160513.1159"; + version = "20170109.859"; src = fetchFromGitHub { owner = "cadadr"; repo = "forecast.el"; - rev = "ff307fd24c64577d204d0c1b7b245f190f70bd61"; - sha256 = "1x4l24cbgc4apv9cfzf6phmj5pm32hfdgv37wpbh7ml8v3p8xm0w"; + rev = "1bae400e5154d7494fd989b1be47450565810e23"; + sha256 = "0kcyn2m122wbbsp7mwji5acsrdfdkfpf427zj6dn88rfx90q82w2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast"; @@ -24575,12 +24748,12 @@ forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forth-mode"; - version = "20161214.1236"; + version = "20170101.1245"; src = fetchFromGitHub { owner = "larsbrinkhoff"; repo = "forth-mode"; - rev = "ccb14b4a477e13353ced9658b8e7adfe90bbcd15"; - sha256 = "1g0dmrlqlwp6zaaixcksns2gzw7nsk4lk138qmfw5l6mvazjy4sk"; + rev = "05e8a027960c77ac5a09bda959889de57ecbb486"; + sha256 = "1s0543dc69ciz6ll7m62kaac92jmpk9yqaa37jrv5lscrp6sgamz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e46832079ee34c655835f06bf565ad5a5ab48ebd/recipes/forth-mode"; @@ -24680,10 +24853,10 @@ frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }: melpaBuild { pname = "frame-cmds"; - version = "20160124.826"; + version = "20170101.950"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/frame-cmds.el"; - sha256 = "1867zmm3pyqz8p9ig44jf598z9jkyvbp04mfg6j6ys3hyqfkw942"; + sha256 = "0yscijwwm31551ysagysdrryr1w33kg34j3bnrq92mxsmb6i19ad"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-cmds"; @@ -24698,10 +24871,10 @@ }) {}; frame-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "frame-fns"; - version = "20151231.1322"; + version = "20170101.951"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/frame-fns.el"; - sha256 = "0lvlyxb62sgrm37hc21dn7qzlrq2yagiwpspa926q6dpzcsbam15"; + sha256 = "00b2bb3rfraps47mcv0vb51ygjx0f311i95g0b7dh1jqi6nxdfb1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-fns"; @@ -24717,12 +24890,12 @@ frame-tag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "frame-tag"; - version = "20151120.2318"; + version = "20170110.1606"; src = fetchFromGitHub { owner = "liangzan"; repo = "frame-tag.el"; - rev = "7018490dbc3c39f2c959e38c448001d1864bfa17"; - sha256 = "1vvkdgj8warl40kqmd0408q46dxy9qp2sclq4q92b6falry9qy30"; + rev = "73d6163568c7d32952175e663318b872f995a4e5"; + sha256 = "1ks8qw1vq30mjp7bpgrk3f11jhm9viibiap6zjk8r5rykjzl1ifv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e69899b53c158903b9b147754021acf1a6136eda/recipes/frame-tag"; @@ -24890,12 +25063,12 @@ fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fstar-mode"; - version = "20161211.2200"; + version = "20170112.1727"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "b633674651d324a2aa09a53134e5a617d7ee5f87"; - sha256 = "0vhd8wpshgcgpq836d7048vxrr7wzy0z473kz6xn7ql10sxiz4i2"; + rev = "3a9be64827bbed8e34d38803b5c44d8d4f6cd688"; + sha256 = "0manmkd66355g1fw2q1q96ispd0vxf842i8dcr6g592abrz5lhi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode"; @@ -24911,11 +25084,11 @@ fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuel"; - version = "20161123.2000"; + version = "20170107.626"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "20a98a38fb23d61bf92bb25b2062f0d07f7af91d"; - sha256 = "0wai0z3zf2blmr9f6sfawq9977n2shf4m42771grn65mgmldlzha"; + rev = "0701902122308f376dab4f2a4371600ddc05ae3e"; + sha256 = "0ahjhr7bmmpkvqxmr0m8c3agaiffqg8p6h5xnbjv93ar6ajk2pz9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -25053,10 +25226,10 @@ }) {}; fuzzy-match = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "fuzzy-match"; - version = "20151231.1323"; + version = "20170101.952"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/fuzzy-match.el"; - sha256 = "1q3gbv9xp2jxrf9vfarjqk9k805xc9z72zbaw7aqdxrj1bafxwnz"; + sha256 = "130rx8x0d64pb5sz9xq3qvgq698xlkvlb76fk9xfq7n895kxf1bp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e00737be152e9082d0f0c9076cac7fcd08bd4e7b/recipes/fuzzy-match"; @@ -25156,12 +25329,12 @@ fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fzf"; - version = "20160908.806"; + version = "20161226.936"; src = fetchFromGitHub { owner = "bling"; repo = "fzf.el"; - rev = "383a050920e9b99d37c21d041deb7f38b202485c"; - sha256 = "14drm6b6rxbcdilcms1jlqyrqbipcqbdil6q06ni9pgafi7xp8hz"; + rev = "779254fe1ec7a0c9110af36fd039cece3040a312"; + sha256 = "1p0k71vz9v8vx5h85ph1krb9v0jyhmq73h91ws9zcxpf1bdgy050"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf"; @@ -25177,12 +25350,12 @@ gams-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gams-mode"; - version = "20161203.231"; + version = "20170108.35"; src = fetchFromGitHub { owner = "ShiroTakeda"; repo = "gams-mode"; - rev = "a803f9e4509b8f8fed17ef25737d941bbe846c96"; - sha256 = "1avbdfw3hvwqnrlg3hv8p64m9gqgvwl9ggqzn6rhxh1zlr7i5cwy"; + rev = "ce7014cb298f01ff96f52cba38fc7714daa7d5a6"; + sha256 = "1cz4sn325fy87xs6zs5xg6l9vsq06hsf4aksn87vg4mdnkj53xym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c895a716636b00c2a158d33aab18f664a8601833/recipes/gams-mode"; @@ -25259,12 +25432,12 @@ geben = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geben"; - version = "20161214.650"; + version = "20170103.448"; src = fetchFromGitHub { owner = "ahungry"; repo = "geben"; - rev = "6b805aea456f7a899066f3caa7f17bfc3d199cee"; - sha256 = "05gzdlz5nwz2vd7f7xk9abpv2ifn1w5djcz19v1qh7xyarickszq"; + rev = "b6379dd479f28b2ace418e2cc57d30559f634036"; + sha256 = "0x97xqk9xs6h1h3jqwkwi7q32j4pzw0rygsqmgb3n80l7zja6114"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; @@ -25322,12 +25495,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20161202.1657"; + version = "20170116.1834"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "6893f692259c0241049bf614147160c44dd4ba3e"; - sha256 = "12gimg3qhnl2r2hx00q602k1rnjcj49hc1v7a23d58c0gmqr4yb6"; + rev = "46b4c82278029d7193176b72ed3f0d3b1fa8899a"; + sha256 = "16hvw10xg3nd8scybn95szppa1p5v30hdawxl1wzvafnfz83yf2r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -25515,8 +25688,8 @@ src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "8be4885d8638b52acb16f26ce03f4182902c0a7b"; - sha256 = "1jpf76kmqhmhz6gizm9njiid9ahlk5254ag71fgqhij5a0cqijm7"; + rev = "e20bb704f61776926ce1d7d3852b54b76dd43644"; + sha256 = "085ym61ll1ixk7lp3kxcp7aryf6ih9nqkx1nbm93i5asb4h8v996"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -25742,12 +25915,12 @@ git-auto-commit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-auto-commit-mode"; - version = "20150404.751"; + version = "20161229.817"; src = fetchFromGitHub { owner = "ryuslash"; repo = "git-auto-commit-mode"; - rev = "075e5f9ded66c2035581a7b216896556cc586814"; - sha256 = "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh"; + rev = "2c8197e5d7813734d6a49f9b9c0b227b7ae022a8"; + sha256 = "0h8kma09r5fw4b2fbbia5z42x8gg72w6zk39pxnsw876kwa8798f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5660fb76ce93e5fe56227698d079c6994ef3305f/recipes/git-auto-commit-mode"; @@ -25805,12 +25978,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20161214.519"; + version = "20170112.334"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "2fc26ea8f8a188a23dc1f819d8b512ddbf7307bb"; - sha256 = "0mymbcm7i1y325n0p9q5qmx92j8j2ny61imv8w7m6xx30ylf1pdw"; + rev = "875f913b8edfdd85dfdaba9403a9d5ae2b952afc"; + sha256 = "04cdbv8xqhbzqx1lzcm0n2s80b25mp9s6izzflv88qzpcc0z6wv2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -25826,12 +25999,12 @@ git-commit-insert-issue = callPackage ({ fetchFromGitLab, fetchurl, github-issues, gitlab, helm, lib, melpaBuild, projectile, s }: melpaBuild { pname = "git-commit-insert-issue"; - version = "20161206.1051"; + version = "20170109.734"; src = fetchFromGitLab { owner = "emacs-stuff"; repo = "git-commit-insert-issue"; - rev = "fcfbb9cea98426c65edeb989f7470fbd5ce4b608"; - sha256 = "12rzzysjq7c8jnhwlyppgcn8h9am95iw3la1h1y3bxpfisxkshy8"; + rev = "7b8cf1f5ce9b2c19e9b7efe1ef03f3e37098eea7"; + sha256 = "13vd83k6sc3wy4552gvx7zmnmjpa7zs9nk1dlp5v8fc8p3j7afgb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2356f63464e06c37514447c315c23735da22383a/recipes/git-commit-insert-issue"; @@ -25889,12 +26062,12 @@ git-gutter-fringe = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, fringe-helper, git-gutter, lib, melpaBuild }: melpaBuild { pname = "git-gutter-fringe"; - version = "20160929.854"; + version = "20170112.2133"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-git-gutter-fringe"; - rev = "b52080a72042d60939db2281c234a6b9c5a56492"; - sha256 = "08p0nrdwz37yagaaln9xcvyvd9zmj9j6f2hy43nhjhv4bxcapbg6"; + rev = "16226caab44174301f1659f7bf8cc67a76153445"; + sha256 = "1y77gjl0yznamdj0f55d418zb75k22izisjg7ikvrfsl2yfqf3pm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter-fringe"; @@ -25991,22 +26164,22 @@ license = lib.licenses.free; }; }) {}; - git-messenger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: + git-messenger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "git-messenger"; - version = "20160815.1952"; + version = "20170101.2040"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-git-messenger"; - rev = "199601fe9a71473e9c015fb2ae13f6e1ca1764e0"; - sha256 = "1k66j0fi7101icn5a0v0km0jdckhwagmi5p6rf1fv9r90pkln1k0"; + rev = "83815915eb8c1cb47443ff34bca3fecf7d2edf3a"; + sha256 = "1jkfzcn8gl3s5y2hwqkac7lm88q80hgcp66zvy7vnylka1scb6lz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e791293133f30e5d96c4b29e972f9016c06c476d/recipes/git-messenger"; sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn"; name = "git-messenger"; }; - packageRequires = [ cl-lib popup ]; + packageRequires = [ emacs popup ]; meta = { homepage = "https://melpa.org/#/git-messenger"; license = lib.licenses.free; @@ -26015,12 +26188,12 @@ git-ps1-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-ps1-mode"; - version = "20151228.102"; + version = "20170102.1944"; src = fetchFromGitHub { owner = "10sr"; repo = "git-ps1-mode-el"; - rev = "bb177a87a06ec928a008fc50b06ed1967b68867a"; - sha256 = "1v0jk35ynfg9hivw9gdz2snk73pac67xlfx7av8argdcss1bmyb0"; + rev = "e41c630f5d04cb1a4d38a4b500d7a154a96a4655"; + sha256 = "11bg953nk5x501vkr0jrz710pz3qxla27bgrd4gp503fbygnixkz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea177b5ea168828881bd8dcd29ef6b4cb81317f0/recipes/git-ps1-mode"; @@ -26243,6 +26416,27 @@ license = lib.licenses.free; }; }) {}; + github-pullrequest = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, request }: + melpaBuild { + pname = "github-pullrequest"; + version = "20170115.2216"; + src = fetchFromGitHub { + owner = "jakoblind"; + repo = "github-pullrequest"; + rev = "9ccdeea36b2cb78f0bd2907cb45d1ab287a6af90"; + sha256 = "12j81h095rsfqbways4hm9wdr91wwc31b8hr1my55m91r204b9r4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3dca88ef598d676661abea79cdbc41bad6dd28be/recipes/github-pullrequest"; + sha256 = "1icyxvkqy2vyx4b6f7ln0h3hfg0a4lkyajd596fch81irl8cjl34"; + name = "github-pullrequest"; + }; + packageRequires = [ dash emacs magit request ]; + meta = { + homepage = "https://melpa.org/#/github-pullrequest"; + license = lib.licenses.free; + }; + }) {}; github-search = callPackage ({ fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }: melpaBuild { pname = "github-search"; @@ -26264,6 +26458,27 @@ license = lib.licenses.free; }; }) {}; + github-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "github-theme"; + version = "20170112.2207"; + src = fetchFromGitHub { + owner = "philiparvidsson"; + repo = "emacs-github-theme"; + rev = "cf9a167e8940ee8f678f2c72495f4ffff9e88509"; + sha256 = "01wxs4vywfnzb0j2inxmm37glqz004laay711scrizwvqs3bhjd6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f4ace4a150faa312ef531182f328a3e039045bd7/recipes/github-theme"; + sha256 = "1c22p17a1d0s30cj40zrszyznch6nji2risq3b47jhh9i6m32jif"; + name = "github-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/github-theme"; + license = lib.licenses.free; + }; + }) {}; gitignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitignore-mode"; @@ -26519,12 +26734,12 @@ gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnu-apl-mode"; - version = "20161129.303"; + version = "20170111.804"; src = fetchFromGitHub { owner = "lokedhs"; repo = "gnu-apl-mode"; - rev = "8a2bdfe945ff2d1a78f6159528f6ad3420701046"; - sha256 = "0spn4lkvilmy48xvkpma4l30i7rzxknp56nr2kcvpdlb0mk3svzz"; + rev = "40c591698f04a9f1563a6ff969d3ea3acea43abb"; + sha256 = "0ns8vp4vi225q9vd2alvw9yihdvbnmcm5rr5w31hi9d0b6figqfs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode"; @@ -26603,12 +26818,12 @@ gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }: melpaBuild { pname = "gnus-desktop-notify"; - version = "20160210.247"; + version = "20170104.1240"; src = fetchFromGitHub { owner = "wavexx"; repo = "gnus-desktop-notify.el"; - rev = "c363af85f341cc878d6c0be53fd32efa8ca9423b"; - sha256 = "1zizmxjf55bkm9agmrym80h2mnyvpc9bamkjy2azs42fqgi9pqjn"; + rev = "6eea368514eb38bc36aee0bc5d948a214784a90c"; + sha256 = "1bakg8maf626r9q8b8j022s63gip90qpz97iz4x7h3s9055i1dxr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/gnus-desktop-notify"; @@ -26873,12 +27088,12 @@ go-guru = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-guru"; - version = "20161103.1316"; + version = "20161117.331"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "259110bfd7acb62196b09487d0883429b444bf1b"; - sha256 = "02ikkx044l5iqzz1hxyjjlxvk58liddmgapx39g7yj976rp6844f"; + rev = "d9647672717bb5d507de42975a337c738a0461a3"; + sha256 = "18x01y9qlqmpvyl638ymc1ml6j33xgc0xhig6qfx0y7s484zblm8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru"; @@ -26894,12 +27109,12 @@ go-impl = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-impl"; - version = "20161123.512"; + version = "20161225.1819"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-go-impl"; - rev = "3544b590e9867f2697c2be62389a4c1edb39aed8"; - sha256 = "0dsn8dpfsikchbcsr009sfhics87hzb3fch4wxxxlhgh5j77nxiv"; + rev = "5d2037e16cf354abffba68fb9ea86790e0be5eb3"; + sha256 = "1b1628z1rlb2varxk3svwm13s5x6db0503q4d0yb3kk7hk38wpm8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa1a0845cc1a6970018b397d13394aaa8147e5d0/recipes/go-impl"; @@ -26915,12 +27130,12 @@ go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-mode"; - version = "20161110.1750"; + version = "20161231.1134"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "259110bfd7acb62196b09487d0883429b444bf1b"; - sha256 = "02ikkx044l5iqzz1hxyjjlxvk58liddmgapx39g7yj976rp6844f"; + rev = "d9647672717bb5d507de42975a337c738a0461a3"; + sha256 = "18x01y9qlqmpvyl638ymc1ml6j33xgc0xhig6qfx0y7s484zblm8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode"; @@ -26936,12 +27151,12 @@ go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }: melpaBuild { pname = "go-playground"; - version = "20161203.1747"; + version = "20161227.1105"; src = fetchFromGitHub { owner = "grafov"; repo = "go-playground"; - rev = "d0d772bb60c872d81572c5293d5d0a7517e4b839"; - sha256 = "1gf8djbnm6x9d9s2qg33cfrn2fbxh5pq441rrfi7il13vgf83v70"; + rev = "8365cac2f5bc2a71c454fe60856da0f97745ef65"; + sha256 = "1pb5k05x02ccfk52rj97wbf5q2wrcrs60h7ds9j5ri4r1v6baflq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground"; @@ -26978,12 +27193,12 @@ go-projectile = callPackage ({ fetchFromGitHub, fetchurl, go-eldoc, go-guru, go-mode, go-rename, lib, melpaBuild, projectile }: melpaBuild { pname = "go-projectile"; - version = "20160825.1644"; + version = "20170104.1730"; src = fetchFromGitHub { owner = "dougm"; repo = "go-projectile"; - rev = "6b721aba171fd4aaef890369b11972eee1dfc8ce"; - sha256 = "0hkkl70ihmnc93wli2ryxr4il1fis85mjkvs520ac8w3g84g19rv"; + rev = "46e937a88cbfd9715706fbc319672bb3297cc579"; + sha256 = "17q23d29q0kw2vqcf8psjvhiqnk4ynpbbflcy35kihilwvrsx2l5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3559a179be2a5cda71ee0a5a18bead4b3a1a8138/recipes/go-projectile"; @@ -26999,12 +27214,12 @@ go-rename = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: melpaBuild { pname = "go-rename"; - version = "20161019.1204"; + version = "20161117.331"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "259110bfd7acb62196b09487d0883429b444bf1b"; - sha256 = "02ikkx044l5iqzz1hxyjjlxvk58liddmgapx39g7yj976rp6844f"; + rev = "d9647672717bb5d507de42975a337c738a0461a3"; + sha256 = "18x01y9qlqmpvyl638ymc1ml6j33xgc0xhig6qfx0y7s484zblm8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename"; @@ -27276,8 +27491,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "db0a26320f3e930c6ea7225ed53539b4fb31310c"; - sha256 = "0kwb4vszahr7iwl1znhklsjkmqckj011z6akj9pzz33iabcah6mf"; + rev = "b282a74fea1455f4648d7f3098c954cce46e3a8d"; + sha256 = "0q2vkzr2vvkvnb3zw3mzcggpa897adv1hq4sk1mcfav2s4zri9jk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -27293,12 +27508,12 @@ google-contacts = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2 }: melpaBuild { pname = "google-contacts"; - version = "20160111.211"; + version = "20170112.1022"; src = fetchFromGitHub { owner = "jd"; repo = "google-contacts.el"; - rev = "bb1a149bbcc5627250be8267481e884795b448cb"; - sha256 = "1h7nj570drp2l9x6475gwzcjrp75ms8dkixa7qsgszjdk58qyhnb"; + rev = "cf654c59b197a028eb8bf432d52776c2e0ad4135"; + sha256 = "1qrn9zqn25wpsrqbacamn3ixf90xmgxa8ifkday6cxn5ks0kgyj4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/671afe0ff3889ae8c4b2d7b8617a3a25c16f3f0f/recipes/google-contacts"; @@ -27521,12 +27736,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20161213.1524"; + version = "20170107.2101"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "45a5351755f12668ca9a0b63f1d1c906431157f6"; - sha256 = "07ympvkvhbbfk7nrzr801qnqyh92nqs050cy4b0y22c3c52i6k6l"; + rev = "733acc9e4cb9ce9e867734f298fdfc89ab05f771"; + sha256 = "0jna5a3w8nr819q3rwcagbin75dk9drgyy04z5b3m8k2rpxyikwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -27909,10 +28124,10 @@ }) {}; grep-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "grep-plus"; - version = "20160923.1514"; + version = "20170101.953"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/grep+.el"; - sha256 = "17ly744dcnir98mk48prgmia7v7dpvp73l9kkni9vdz4lw5mapxj"; + sha256 = "13ivcicjdg3ig1jfgl2n39acmrwif5h7hwvb5677i7p8i69w3nds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/grep+"; @@ -28070,22 +28285,22 @@ license = lib.licenses.free; }; }) {}; - gruvbox-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruvbox-theme"; - version = "20161019.1949"; + version = "20161229.1817"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "89b060abf49791cad2639f234b230dc4882bdc39"; - sha256 = "0bhg2za2a67r6hkb0628zvzxx65rcj7cm3kq3m44wls8q8cr2jxj"; + rev = "9a9f384a19742eb07b03b1975478c2e71a09b2e3"; + sha256 = "1pbb8ihvldpbcvr4bwqjmlyc6wv51h49fn522vxzl9kjmhs9fqi1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; sha256 = "042mnwlmixygk2mf24ygk7rkv1rfavc5a36hs9x8b68jnf3khj32"; name = "gruvbox-theme"; }; - packageRequires = []; + packageRequires = [ autothemer ]; meta = { homepage = "https://melpa.org/#/gruvbox-theme"; license = lib.licenses.free; @@ -28175,6 +28390,27 @@ license = lib.licenses.free; }; }) {}; + guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: + melpaBuild { + pname = "guix"; + version = "20170114.133"; + src = fetchFromGitHub { + owner = "alezost"; + repo = "guix.el"; + rev = "2794ab96de95fae8aad12c33ff1726d5348cae7b"; + sha256 = "0cj5mlshh76m3fmnzxjyrq8kw0y22qvcd9wjqwkg392jw9s5kaqc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; + sha256 = "0h4jwc4h2jv09c6rngb614fc39qfy04rmvqrn1l54hn28s6q7sk9"; + name = "guix"; + }; + packageRequires = [ bui dash emacs geiser magit-popup ]; + meta = { + homepage = "https://melpa.org/#/guix"; + license = lib.licenses.free; + }; + }) {}; gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gulp-task-runner"; @@ -28241,12 +28477,12 @@ gxref = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gxref"; - version = "20161126.706"; + version = "20161215.2352"; src = fetchFromGitHub { owner = "dedi"; repo = "gxref"; - rev = "7cb746755a47e90aa286e32f49fd3417f632e98b"; - sha256 = "07qbrk904iw3c4kj5ql5hy9znkpi8hcf5b9aag2x5m2c6jh066y1"; + rev = "ffb2139cb9a8299ce965c28cb5d3a617405fb1b4"; + sha256 = "052j24k1svdnryss983dxjpnz4d51wx1vzqqpgckc86bkc4vfjzf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/429b9150d4054fcadab8c5ca3b688921eeb19b78/recipes/gxref"; @@ -28266,8 +28502,8 @@ src = fetchFromGitHub { owner = "abrochard"; repo = "emacs-habitica"; - rev = "868893474ebe8bd58d799dd1d065230cf1ac1e8c"; - sha256 = "0msp9h8xzgpbdydihsgsbijxcw8gliqrlpnkvb3bd3ra9xp57wrm"; + rev = "e0fba32899da6bd0484b1b820578184d5764ec5b"; + sha256 = "1vch1m605m5nxga08i49fga6ik2xxf3n6pibhr6q9wj59zv515hi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica"; @@ -28388,12 +28624,12 @@ haml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "haml-mode"; - version = "20150508.2011"; + version = "20170104.2224"; src = fetchFromGitHub { owner = "nex3"; repo = "haml-mode"; - rev = "7717db6fa4a90d618b4a5e3fef2ac1d24ce39be3"; - sha256 = "0fmcm4pcivigz9xhf7z9wsxz9pg1yfx9qv8na2dxj426bibk0a6w"; + rev = "813530d171b233a42f52b97958f1245e1a09c16a"; + sha256 = "0ylpw01g0mwk61rjlv8wc8bqh5y2xh2s7s8avfvcc689hafp7c2j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/haml-mode"; @@ -28619,12 +28855,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20161212.116"; + version = "20170116.407"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "319020de4a79a005eb0fe651222430ceedcd332d"; - sha256 = "1slagi6f0mkzsjhy0cldlp5g1aqgiazkdb1mrzafw5cr12pdi9zw"; + rev = "6f729159ea21997f629473652266dcd32dcba523"; + sha256 = "0hmynqg4qv10w2s4wlh3k1ignzxspqfr67860xy9g7vyyifyrhqj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -28681,12 +28917,12 @@ hasky-extensions = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hasky-extensions"; - version = "20160813.609"; + version = "20170110.631"; src = fetchFromGitHub { owner = "hasky-mode"; repo = "hasky-extensions"; - rev = "3f1862989a2ca3b79761dccfa352a1b6d518ee77"; - sha256 = "10214654gvnyqimh4950jsw1r42p0y79pfl8h0x44mzll62bvz87"; + rev = "c94662f0efdc9f350d8554e62955f0a7405ab545"; + sha256 = "0hlwv3m0mmwwvqa0nla9b8n7mi43zxmpg6fmmqi311ii75sqb2pa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3f73e3df8476fa231d04211866671dd74911603/recipes/hasky-extensions"; @@ -28824,22 +29060,22 @@ license = lib.licenses.free; }; }) {}; - hcl-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + hcl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hcl-mode"; - version = "20161006.950"; + version = "20170107.27"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-hcl-mode"; - rev = "4ce807c57c755b1eb15e17e35f2680c86595c171"; - sha256 = "0mb0knl84wzgyizxf2p82wwslla7s13bvxb7yd05xlnskr0yrnk8"; + rev = "0f2c5ec7e7bcf77c8548e8cac8721ea935ca1b5e"; + sha256 = "0qggby20h8sir4cs5af9y6b2cibix3r067sadygsrvx9ml17indw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66b441525dc300b364d9be0358ae1e0fa2a8b4fe/recipes/hcl-mode"; sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin"; name = "hcl-mode"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/hcl-mode"; license = lib.licenses.free; @@ -28847,10 +29083,10 @@ }) {}; header2 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "header2"; - version = "20160810.1234"; + version = "20170101.954"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/header2.el"; - sha256 = "1fiqmbmnq07v70ak6jvvdb27val420zvq5xlwyrqdj5qjri8z83r"; + sha256 = "124cqzhhkaplq3nxlmy2dizpbllcazqbpv9k2yjxj5zk50s8dzxr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d16829cb4dea98908735be13aa632bc13d308acb/recipes/header2"; @@ -28887,12 +29123,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20161212.2159"; + version = "20170116.2331"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "3d0e7df0b11bc19a81fb557856821e9fcd38ef85"; - sha256 = "0a2ww6jw315r7v06s1s65mvsyzna9glsgilpywlhzcci44621jw4"; + rev = "bc2bfb3017f327a5307e7c46be27d1b614b3e90d"; + sha256 = "1jfdbbzv6prxkiz9hxvyjfgdbzb9yzf8g71nny0xcfm76r18vrwi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -29097,12 +29333,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20161213.2242"; + version = "20170103.1125"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "58dc08b8b8e6ea0c809052e082c867e05acef16a"; - sha256 = "0cf3h0lkya6rsmg60qzbiz63vp8lm7nd4xlxym44hpp75nw06mgb"; + rev = "8735714d6be62187538ffd9187e8aee87b49b969"; + sha256 = "19sqp3789a9w0nm48rb2yjj5bhllpilrvbljp8h8nsv3nlf5dz84"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -29286,12 +29522,12 @@ helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }: melpaBuild { pname = "helm-cider"; - version = "20160912.1935"; + version = "20170115.1740"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "9481f84bfbc6538e1cbe1a4cb01255088bfe1491"; - sha256 = "00zciia468svzhk4f7w9bwj20ixb280gwd7vfrxr1iw60p23x237"; + rev = "d678f1346331f12bdb6fe95536608fb3e94b2f70"; + sha256 = "0gmi23yx8l85923y0arm7v0v9zgspbp6gkb8a8jmnl5z2akqpzgh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider"; @@ -29374,8 +29610,8 @@ src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-cmd-t"; - rev = "8749f0b2b8527423cd146fa2d5c0e7a9e159eefb"; - sha256 = "10cp21v8vwgp8hv2rkdn9x8v2n8wqbphgslb561rlwc2rfpvzqvs"; + rev = "684dfb764e0e3660c053cb465f115e21c5ee4f80"; + sha256 = "18d2fgxyij31rffh9qbgbaf42par9nami4pi1yfvbw9a5z5w2yxi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/helm-cmd-t"; @@ -29454,12 +29690,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20161213.1754"; + version = "20170116.2331"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "3d0e7df0b11bc19a81fb557856821e9fcd38ef85"; - sha256 = "0a2ww6jw315r7v06s1s65mvsyzna9glsgilpywlhzcci44621jw4"; + rev = "bc2bfb3017f327a5307e7c46be27d1b614b3e90d"; + sha256 = "1jfdbbzv6prxkiz9hxvyjfgdbzb9yzf8g71nny0xcfm76r18vrwi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -29626,8 +29862,8 @@ src = fetchFromGitHub { owner = "jixiuf"; repo = "helm-dired-history"; - rev = "75416fa6ca9c5e113cca409ef63518266b4d8d56"; - sha256 = "17z84dx3z48mx2ssdhlhgzaqrxlzdy9mx3d14qlm0rcrmc0sck8i"; + rev = "8149f5cbb1b2915afcdcfa3cb44e2c5663b872e6"; + sha256 = "1h7700lf5bmbwaryf0jswd9q8hgfkpazak5ypidwvqwacd1wvx15"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/56036d496c2a5fb1a6b32cdfcd1814944618e652/recipes/helm-dired-history"; @@ -29724,6 +29960,27 @@ license = lib.licenses.free; }; }) {}; + helm-etags-plus = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-etags-plus"; + version = "20170113.614"; + src = fetchFromGitHub { + owner = "jixiuf"; + repo = "helm-etags-plus"; + rev = "704f0991ee4a2298b01c33aafc224eef322e15e3"; + sha256 = "03n7c9jlpqkz5z1gygx2s3yf46caav2l11d9xnmqhyhbvyimjqf9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/helm-etags-plus"; + sha256 = "0lw21yp1q6iggzlb1dks3p6qdfppnqf50f3rijjs18lisp4izp99"; + name = "helm-etags-plus"; + }; + packageRequires = [ helm ]; + meta = { + homepage = "https://melpa.org/#/helm-etags-plus"; + license = lib.licenses.free; + }; + }) {}; helm-filesets = callPackage ({ fetchFromGitHub, fetchurl, filesets-plus, helm, lib, melpaBuild }: melpaBuild { pname = "helm-filesets"; @@ -29752,8 +30009,8 @@ src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-firefox"; - rev = "294850c4ce16ae25f2214f863cee0118add60974"; - sha256 = "1kaa58xlnr82qsvdzn8sxk5kkd2lxqnvfciyw7kfi2fdrl6nr4pf"; + rev = "0ad34b7b5abc485a86cae6920c14de861cbeb085"; + sha256 = "08mjsi2f9s29fkk35cj1rrparjnkm836qmbfdwdz7y51f9varjbs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/257e452d37768d2f3a6e0a5ccd062d128b2bc867/recipes/helm-firefox"; @@ -29769,12 +30026,12 @@ helm-flx = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, helm, lib, melpaBuild }: melpaBuild { pname = "helm-flx"; - version = "20160227.1652"; + version = "20170110.957"; src = fetchFromGitHub { owner = "PythonNut"; repo = "helm-flx"; - rev = "3cb3587297c3b6e863d79b7d4d7564043c888b61"; - sha256 = "0mrck7qbqjqz5kpih3zb1yn2chjgv5ghrqc5cp80kmsmxasvk8zw"; + rev = "4ba59e1db2d3c33c8ebd40207456f31ab05c5d75"; + sha256 = "1bh0nbw2ylgfba0k2bvhasxr6nlcvs5g62ls0xy8207dayjrbjxk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1418d260f34d698cec611978001c7fd1d1a8a89/recipes/helm-flx"; @@ -30147,12 +30404,12 @@ helm-gtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-gtags"; - version = "20160917.2238"; + version = "20170115.2129"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-gtags"; - rev = "76c573d2c0bd277041d917c9968b180d48a0fdce"; - sha256 = "1dxm1r5qfriv33kaqf9gzwdrlmsww08lzvmxvfg9505qsjma4b5c"; + rev = "108e93d0d099ebb7b98847388f368311cf177033"; + sha256 = "0hfshcnzrrvf08yw4xz5c93g9pw6bvjp2bmv0s6acrsjqgwhx158"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-gtags"; @@ -30252,12 +30509,12 @@ helm-hunks = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-hunks"; - version = "20161019.144"; + version = "20161229.657"; src = fetchFromGitHub { owner = "torgeir"; repo = "helm-hunks.el"; - rev = "1fb924561748c17b471ce14a5fe4fb11b1b038db"; - sha256 = "0972vwzhzq2c1axfvxk5vg0y90078pn74bvv3k96a7jmdjbc4yah"; + rev = "aa266c87d5ac08f8a4021627d104972679bba21c"; + sha256 = "1g7mr04mhf0cx68ww28zfppigjp9m4b11sc037gn770n1vm0xvcm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d61cbe53ad42f2405a66de9f551f5b870a60709f/recipes/helm-hunks"; @@ -30860,12 +31117,12 @@ helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-projectile"; - version = "20161213.2311"; + version = "20170113.209"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "10531b2634559ea2179f2530423beaac815e9a38"; - sha256 = "1bh9cvkp5gr8ykmy8fr94appkhpqx9hicqyj6ahvi2ykgb50ib4c"; + rev = "6d750dee69befb97bda1e8b6045973e5a5eca233"; + sha256 = "0dsc8k7qk24qvk8msxla9z3r4299rrcwmm4k5fslplh66h0b8z85"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; @@ -30923,12 +31180,12 @@ helm-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, window-purpose }: melpaBuild { pname = "helm-purpose"; - version = "20160218.1009"; + version = "20170114.836"; src = fetchFromGitHub { owner = "bmag"; repo = "helm-purpose"; - rev = "de9e38c55b114cadeed60e70fc406f5181ff30d8"; - sha256 = "1lxknzjfhl6irrspynlkc1dp02s0byp94y4qp69gcl9sla9262ip"; + rev = "9ff4c21c1e9ebc7afb851b738f815df7343bb287"; + sha256 = "1xh6v5xlf1prgk6mrvkc6qa0r0bz74s5f4z3dl7d00chsi7i2m5v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/931471b9df5e722d579aab378887890bf6e854a5/recipes/helm-purpose"; @@ -31552,10 +31809,10 @@ }) {}; help-fns-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "help-fns-plus"; - version = "20160917.1126"; + version = "20170101.959"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/help-fns+.el"; - sha256 = "12hjki054sm7gaky7q3b3sp8y4lxpnaq1vphjg85pfvad72rz71p"; + sha256 = "14i48b139m7kp2qmmm8vfv359i74zmbjw1mck2n67xdxrh8bsk0k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-fns+"; @@ -31570,10 +31827,10 @@ }) {}; help-mode-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "help-mode-plus"; - version = "20151231.1331"; + version = "20170101.1004"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/help-mode+.el"; - sha256 = "0qmf81maq6yvs68b8vlbxwkjk72qldamq75znrma9mhvlv8igrgx"; + sha256 = "1aj53ihdhrxsncw14v4npgfsbpjnzmz481nx8xmzlcxs16xayyqv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-mode+"; @@ -31588,10 +31845,10 @@ }) {}; help-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "help-plus"; - version = "20151231.1328"; + version = "20170101.956"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/help+.el"; - sha256 = "1r7kf9plnsjx87bhflsdh47wybvhis7gb10izqa1p6w0aqsg178s"; + sha256 = "1k772rdakq2br8ahlk5l84s534wnb8jarlfhv4nbfaip6hidfqgk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help+"; @@ -31690,10 +31947,10 @@ }) {}; hexrgb = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hexrgb"; - version = "20151231.1332"; + version = "20170101.1007"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hexrgb.el"; - sha256 = "0rqjidjxa5j6rjknklfks743lczbq3qsyiranrf2z3ghzi0gf7fd"; + sha256 = "1cpf5kj49iam5bfw2mddv4c5vr8d4j0sipbzjry3s8jvcxw2lzbi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c9d7811584920508184a84ee4049e159cce3bb4/recipes/hexrgb"; @@ -31792,10 +32049,10 @@ }) {}; hide-comnt = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hide-comnt"; - version = "20151231.1333"; + version = "20170116.1012"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hide-comnt.el"; - sha256 = "1l5jvgjgd0kzv1sn6h467fbnl487hma4h4pkwq4x1dhbc26yvfpz"; + sha256 = "1g58gvbh5qrfc5r1af2plxdc1ygd6rxspmhhdz9z8hbf172b8j62"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05a695ab2bc358690c54611d21ef80cb51812739/recipes/hide-comnt"; @@ -31885,10 +32142,10 @@ }) {}; highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight"; - version = "20161127.1729"; + version = "20170101.1010"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/highlight.el"; - sha256 = "19niikr5608xq67hcknmg5s7qxcb867ff79xcn58162px8d41v3k"; + sha256 = "19mj1fw9hwqz5kybjbmac6l4gh8g52s1lgd01x34452zy69qdcnp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/603e9fc90e6e6cf7fe903cb3c38155c1a4f45278/recipes/highlight"; @@ -31924,10 +32181,10 @@ }) {}; highlight-chars = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-chars"; - version = "20160729.2320"; + version = "20170101.1008"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/highlight-chars.el"; - sha256 = "1qpx5bpb2iyhdv2d6lnk3vmdxwsvf8ylriarr0hw79zli0l167kp"; + sha256 = "0hkspc6skyra2lhrlg8wm008llmp4asxvxxkk6xbvlx3p0ajihjv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/highlight-chars"; @@ -32022,12 +32279,12 @@ highlight-indent-guides = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-indent-guides"; - version = "20161214.1619"; + version = "20170106.1025"; src = fetchFromGitHub { owner = "DarthFennec"; repo = "highlight-indent-guides"; - rev = "a1eeb2e50ca51b5b2e3a5cd190d2f1d79cf6ad28"; - sha256 = "0bm5lqdvy0g2q7hd621vdc78430rk4fjbd94a6dj5wjh8vpcw7vd"; + rev = "087f719fda7d60c837146c81b1d9d0aab22ba88e"; + sha256 = "0q8ch945h9slfp636clf0f60ws78zcbnc1grld8n59chhq22nfyb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8acca65a5c134d4405900a43b422c4f4e18b586/recipes/highlight-indent-guides"; @@ -32295,8 +32552,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "4b0b4f44bcf14d603f88842d66a62099f1e81a47"; - sha256 = "0hfr0njzz5czprqb4sg06vhdfs7vsw079p7v8xilz32s3priz4lq"; + rev = "19e73ed76974f7c6a75c277e7e99e09f26d3ad66"; + sha256 = "0q22iay0n4asqm378s4fcb7vdsyfhddls1ij6v1m4mhsjq7a6inw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -32479,10 +32736,10 @@ }) {}; hl-defined = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-defined"; - version = "20151231.1338"; + version = "20170101.1011"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hl-defined.el"; - sha256 = "170sz6hjd85cw1x0y2g81ks3x3niib4f7y2xz6k8x0dpw357ggv3"; + sha256 = "1m21l7hlk46pkpbzmglpkpigynsf8121dx8swslpbn0lck9wrg21"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/hl-defined"; @@ -32518,10 +32775,10 @@ }) {}; hl-line-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-line-plus"; - version = "20151231.1339"; + version = "20170101.1012"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hl-line+.el"; - sha256 = "1kxq79pfs83gp12p2g093m6shsf25q88mi29bvhapxx77ahmxpkn"; + sha256 = "16mv6h2mx1z47nds4q2crym8idj9i6y9jbdsqbafxmzwp54hfl3p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d5d1cf2f29d46e8abd821095da86f137650a2ff/recipes/hl-line+"; @@ -32578,10 +32835,10 @@ }) {}; hl-spotlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "hl-spotlight"; - version = "20151231.1340"; + version = "20170101.1013"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/hl-spotlight.el"; - sha256 = "0m84d1rdsp9r5ip79jlrp69pf1daw0ch8c378q3kc328606i3p2d"; + sha256 = "0f16nalmz7pdrxmmxznqgbb8m7kkwfpf8a31r0b98wqrw8n5nnwg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/adb008d2da35dbd3fca63555f04dd8a0009380c6/recipes/hl-spotlight"; @@ -32618,12 +32875,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20161121.848"; + version = "20170101.650"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "413e34e748b3bbd168dec8d38f673c41232c51e2"; - sha256 = "0hniidrs8dzaq11micc0l4sdp2zrv6ry0r34c5b3w32cnb33xp47"; + rev = "a9d6377b15999718462e96c079503594940507ef"; + sha256 = "163k8crlyvgzag9mwb8q5cx40jlislxz533yr7nkh3ks6ricsj31"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode"; @@ -32851,8 +33108,8 @@ version = "20160928.439"; src = fetchgit { url = "git://git.osdn.jp/gitroot/howm/howm.git"; - rev = "364c5be487539b16f4e879b95e27964580c59d36"; - sha256 = "05x7q4gchjj3pyq309w4lh7m27436qk53kh5glk9404ysnk3kqya"; + rev = "e0237b07f60011a1926b36848c73340ae46cdb3e"; + sha256 = "0ljsvrpbj7y690pq6llnqqkvm9mlrhksxihv9jpx06d1g4ghknpq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4f66d7b6835d06b8e7451aec9e32bb9288a6020/recipes/howm"; @@ -33222,12 +33479,12 @@ hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydra"; - version = "20161204.505"; + version = "20170108.148"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "2751f00c2c3daa8cc00f0fee7d01c803ddde7bb2"; - sha256 = "146w0mqgcaz80la42i6i9si8kii6dn8al7iaj0ay292sq9f9dbfl"; + rev = "36fb5e0149795404d0271419fd4354ba58f81dbc"; + sha256 = "1yycpyr1pc7jzb7fdkiyrbyz7wfgs2g0r27c034pmykcmj02sb1q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -33261,6 +33518,25 @@ license = lib.licenses.free; }; }) {}; + i3wm = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { + pname = "i3wm"; + version = "20170116.1825"; + src = fetchgit { + url = "https://git.flintfam.org/swf-projects/emacs-i3.git"; + rev = "7daad9bcbb545ed5cd75706eef56172cef1498cf"; + sha256 = "1y69hh9gaz8q3kljgjarqkxmc70qpf83rzwsb1rzsglf4aqlr2rq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/i3wm"; + sha256 = "11246d71g82iv9zrd44013zwkmnf32m1x8zbrbb656dnzx7ps4rl"; + name = "i3wm"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/i3wm"; + license = lib.licenses.free; + }; + }) {}; iasm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iasm-mode"; @@ -33389,10 +33665,10 @@ }) {}; icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icicles"; - version = "20161127.1745"; + version = "20170115.1431"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/icicles.el"; - sha256 = "1j7x19jlr42mdncc3ignyra1m3w5a5gf0x51hjygrk7fh627i1jr"; + sha256 = "072pxihvwpj6zkzrgw8bq9z71mcx5f6xsjr95bm42xqh4ag2qq0x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/icicles"; @@ -33407,10 +33683,10 @@ }) {}; icomplete-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "icomplete-plus"; - version = "20160704.1959"; + version = "20170101.1028"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/icomplete+.el"; - sha256 = "1rncxvai45akrg1qp0rzf3f821r52bp47mf2bpfnba86bnsl396c"; + sha256 = "0r2s3vwqs31pj7jfya8l46ij1jc894bar4pk4i9zk2l69d7pwllr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fade28733f33e52a8622479de201f451c9a31c11/recipes/icomplete+"; @@ -33808,8 +34084,8 @@ src = fetchFromGitHub { owner = "pjones"; repo = "ido-select-window"; - rev = "946db3db7a3fec582cc1a0097877f1250303b53a"; - sha256 = "0qvf3h2ljlbf3z36dhywzza62mfi6mqbrfc0sqfsbyia9bn1df4f"; + rev = "a64707d8d154664d50d12e26417d586e4c3dd78b"; + sha256 = "1iifpgdpa98si0g2ykr0xbxcbqrvzqfl6r1dv9zihmxhdr7hs9c8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/775c8361322c2ba9026130dd60083e0255170b8f/recipes/ido-select-window"; @@ -33867,12 +34143,12 @@ ido-springboard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ido-springboard"; - version = "20150505.1011"; + version = "20170105.2355"; src = fetchFromGitHub { owner = "jwiegley"; repo = "springboard"; - rev = "ffcfaade6f69328084a0613d43d323f790d23048"; - sha256 = "0p13q8xax2h3m6rddvmh1p9biw3d1shvwwmqfhg0c93xajlwdfqi"; + rev = "263a8cd4582c81bfc29d7db37d5267e2488b148c"; + sha256 = "14mbmkqnw2kkzcb8f9z1g3c8f8f9lca3zb6f3q8jk9dsyp9vh81z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/409d847fb464a320e626fae56521a81a8e862a3e/recipes/ido-springboard"; @@ -34014,12 +34290,12 @@ iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iedit"; - version = "20161030.1920"; + version = "20161228.2111"; src = fetchFromGitHub { owner = "victorhge"; repo = "iedit"; - rev = "abcc27a9f07a7f855b0a8314f18640fd5cd7a0b6"; - sha256 = "152vxkwndv7ffggsnb1jhizf8p2fd5mbplwiln6ig2lzn21drdpa"; + rev = "03b647be8bd35ca82916f2ace27a95d5b85e8ecf"; + sha256 = "1pbbkizaa2f8lazpsc1j7qs3snvwkmw7schzhminzxrvdx15yids"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa2b2745bd1f1778070954c834158c19d4cfb788/recipes/iedit"; @@ -34281,10 +34557,10 @@ }) {}; imenu-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenu-plus"; - version = "20151231.1401"; + version = "20170101.1029"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/imenu+.el"; - sha256 = "00w88d37mg2hdrzpw5cxrgqz5jbf7rylmir95hs8j1cm8fk787bb"; + sha256 = "039s81faqg5y3vhl9hlwn5qffdghshn6867pp8nf93f6zhj9mxr0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/imenu+"; @@ -34300,12 +34576,12 @@ imenus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "imenus"; - version = "20160220.1332"; + version = "20170115.1226"; src = fetchFromGitHub { owner = "alezost"; repo = "imenus.el"; - rev = "c24bc3a5b3bb942afcdf2dfb568968cf836ddafc"; - sha256 = "1p6b7wvzf63dca446gpxm90pmbh9f7r097hbhwj2jmm2i9j5d0lg"; + rev = "5449180574f52a3a9f8de7408594ccf45c92d5d5"; + sha256 = "1xd9ymqmxdfnw6l6bz2bvpn764h3y9abgymm3c66403cq3dx8rz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cc571105a8d7e2ea85391812f1fa639787fa7563/recipes/imenus"; @@ -34425,12 +34701,12 @@ import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }: melpaBuild { pname = "import-js"; - version = "20161128.1613"; + version = "20161220.508"; src = fetchFromGitHub { owner = "galooshi"; repo = "emacs-import-js"; - rev = "4818ece32dae9df773972815559617b803a3ac2c"; - sha256 = "08hk5z5n1jk6wkwqn5lwk530ykrdf2v5xzds9z540vmk4dzv406q"; + rev = "15d395126f57408d770a72db2e5f43271f90fa52"; + sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js"; @@ -34467,12 +34743,12 @@ importmagic = callPackage ({ emacs, epc, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "importmagic"; - version = "20161208.108"; + version = "20170101.1603"; src = fetchFromGitHub { owner = "anachronic"; repo = "importmagic.el"; - rev = "e536d96fdf4bfcbe44eb22827dec0955551f537e"; - sha256 = "05ayg63v3a57d0x6lzkb25z7gwf4dwa4j56q25fk0p6y5ynrhfwr"; + rev = "c75afbb93b024307c4cf67e6dd44cda80bbea697"; + sha256 = "1xz99g9j8gfd6qrdsmrf98mq61168divw8lrwl3zylfw04x20b4b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/695534126f0caa52f66bb90b0277d08d524daa21/recipes/importmagic"; @@ -34488,12 +34764,12 @@ indent-guide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "indent-guide"; - version = "20161207.1714"; + version = "20161226.2332"; src = fetchFromGitHub { owner = "zk-phi"; repo = "indent-guide"; - rev = "38cc1c64d6f897230125c3590157f25c09703044"; - sha256 = "10ymf5fwkxcs94pxvv754krqnvzz9hjv44ma7bakz0r1rfgn1jhc"; + rev = "c0343c76362b25148738ccc11317f7ccb89580d0"; + sha256 = "1r6cq0984yacby96hphvsvvbifa4qz2j6s25mz72l15r344m769q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d7110054801e3af5e5ef710a29f73116a2bc746/recipes/indent-guide"; @@ -34506,6 +34782,27 @@ license = lib.licenses.free; }; }) {}; + indent-tools = callPackage ({ fetchFromGitLab, fetchurl, hydra, lib, melpaBuild, s, yafolding }: + melpaBuild { + pname = "indent-tools"; + version = "20161220.856"; + src = fetchFromGitLab { + owner = "emacs-stuff"; + repo = "indent-tools"; + rev = "3b0e62e15091123cc6d54bf4d401ccf0d5e22062"; + sha256 = "1rklsf6x7lwhpvzs9s8sdlfj98wh6zjsdb28pnlha09g2nm5c7jj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9d8c79e455b3a567b179812754f82452469dc267/recipes/indent-tools"; + sha256 = "1i81pk62lnjww80dpi5b55fz7p0z2qxm19z6v3225x2jpylwcab3"; + name = "indent-tools"; + }; + packageRequires = [ hydra s yafolding ]; + meta = { + homepage = "https://melpa.org/#/indent-tools"; + license = lib.licenses.free; + }; + }) {}; indicators = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "indicators"; @@ -34614,12 +34911,12 @@ inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inf-ruby"; - version = "20161204.1637"; + version = "20170115.1602"; src = fetchFromGitHub { owner = "nonsequitur"; repo = "inf-ruby"; - rev = "e05cc847385f9160703ae00b8046bb2a9eafdd64"; - sha256 = "1zgqvsgv6b6bysw22yybkasra45fy9i8v7dp8bhnkiwgldjsk98i"; + rev = "bf380c13e50c18b6bac6651b22b6fc6ba349062f"; + sha256 = "1in57d8q33x68ccxng13yp8l4frdgab3nx74p4n4lxa183qcs2n5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/inf-ruby"; @@ -34639,8 +34936,8 @@ src = fetchFromGitHub { owner = "hiddenlotus"; repo = "inferior-spim"; - rev = "93f67ee49f1c6899a7efd52ea4e80e9f9da3371c"; - sha256 = "1ffa29clfsr3wb00irzqlazk9d0qmjxn9wy8zfca61lh0ax5khbg"; + rev = "fb9aa091f6058bf320793f1a608c1ed7322c1f47"; + sha256 = "0855w29rsgy04bc6m6bjggpzmlkv5z9zxx1p0qlhqr3msj1dqgfn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2ce70b5dc05096a6de46069e8d26323d3df78b6/recipes/inferior-spim"; @@ -34674,12 +34971,33 @@ license = lib.licenses.free; }; }) {}; + info-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "info-buffer"; + version = "20170112.622"; + src = fetchFromGitHub { + owner = "llvilanova"; + repo = "info-buffer"; + rev = "d35dad6e766c6e2ddb8dc6acb4ce5b6e10fbcaa7"; + sha256 = "0czkp7cf7qmdm1jdn67gxyxz8b4qj2kby8if50d450xqwbx0da7x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3c44a1d69725b687444329d8af43c9799112b407/recipes/info-buffer"; + sha256 = "1vkgkwgwym0j5xip7mai11anlpa2h7vd5m9i1xga1b23hcs9r1w4"; + name = "info-buffer"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/info-buffer"; + license = lib.licenses.free; + }; + }) {}; info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "info-plus"; - version = "20161213.646"; + version = "20170109.1240"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/info+.el"; - sha256 = "0d3qf6vlz8qbxm8i2f3qqj005mmkr35k2xr9jr1hwvwm30jrwy4z"; + sha256 = "087svwy5s8pkvfmg5s1qk4vfg315fsvhqkdjq0pa3zavly3vm1kq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e77aadd8195928eed022f1e00c088151e68aa280/recipes/info+"; @@ -34821,16 +35139,16 @@ inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inkpot-theme"; - version = "20120505.708"; + version = "20161220.2134"; src = fetchFromGitHub { - owner = "siovan"; - repo = "emacs24-inkpot"; - rev = "374a72794ebcb92bd7b50b5578d4c2ffa6049966"; - sha256 = "063v3a783si5fi8jrnysss60qma1c3whvyb48i10qbrrrx750cmv"; + owner = "ideasman42"; + repo = "emacs-inkpot-theme"; + rev = "e175dbd7d0484ae905525ff157cda4e190977ba6"; + sha256 = "0cpmc92234xhddb14np8v9fq3cq06ci3qcc25a72dnmjf19kkjcm"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/bd6ce27c31a1c73d6ee1f6b22147eda8c6b34243/recipes/inkpot-theme"; - sha256 = "0w4q74w769n88zb2q7x326cxji42278lf95wnpslgjybnaxycgw7"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/dd3e02aaf8865d8038b9c590c8545e7a1b21d620/recipes/inkpot-theme"; + sha256 = "1m3iygb8vbqcnsxsnwr7g2mq1n2a9r7qxp3pgm1fpwz1lngvaagf"; name = "inkpot-theme"; }; packageRequires = []; @@ -34888,8 +35206,8 @@ src = fetchFromGitHub { owner = "psachin"; repo = "insert-shebang"; - rev = "52928a0259cd5081e2b92cc2826cf1a79f231296"; - sha256 = "043kn7iwr1489rszicsg9c1lbr1my4r0aycnr3aspvsh8jv0280s"; + rev = "d5a827ce9ee1bdabb7561203a3e774ca599514c1"; + sha256 = "11dxkgn9d6slcwq1zpi13g2cy80ns97gprxakqjvy9gi2l5wl634"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c257f4f5011cd7d0b2a5ef3adf13f9871bf0be92/recipes/insert-shebang"; @@ -34988,12 +35306,12 @@ interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "interleave"; - version = "20161214.515"; + version = "20170110.234"; src = fetchFromGitHub { owner = "rudolfochrist"; repo = "interleave"; - rev = "f4a31271362fd3610a83f6c93ea52581c1ffb3c5"; - sha256 = "0n4p02yf7faajwnrdinphbqc6akq657cndh7h5k7bgsakykflja2"; + rev = "0993383bf4a36f8e4480e5ea50226e1f8fa549c8"; + sha256 = "1f4syyfga5f49nvlcw4ajxabxki9hglf89mslxkh15zib3mpakf9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c43d4aaaf4fca17f2bc0ee90a21c51071886ae2/recipes/interleave"; @@ -35009,12 +35327,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20161204.626"; + version = "20170110.430"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "c03881e03973972b44fa0e775ed2e832ebb76815"; - sha256 = "1dlpnnajp1qg4kc99c9zhwxwy36cjicnfvbnlvjwn6flz415lavx"; + rev = "5b727f41e70aaf1d9d4dad7d4e7c4bafe122bec1"; + sha256 = "1z712b1kgmkhwcchagb8sdlcxv3ji7f8jfkig09z49af7hvg4g7v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -35279,12 +35597,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20161106.830"; + version = "20161227.348"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "bfe703a4c0e91a960c606bf2420b1f118e53a0a6"; - sha256 = "1dy0as8n5syf4cbpdpw7fpd205jzkj0k7av1c73nxvd4zd28pxj2"; + rev = "ebc373b0b4f2b3f491c91d3a7f6dc9ce565a2960"; + sha256 = "1594q15664awzb4ylr74x4ab8lram135rr0fr1l1gq4nsqzv4pg9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -35341,10 +35659,10 @@ }) {}; isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-plus"; - version = "20161213.1957"; + version = "20170101.2341"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "1pmp9r48m62zq4r5xbwjm1h2rhlgb5ibfs27gkw5i5lcr2pvvsz3"; + sha256 = "0iagsqqsxjxz0j30ljynwjpjn6i5klaxka4ygrsbxh0ys6cv5yfh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+"; @@ -35359,10 +35677,10 @@ }) {}; isearch-prop = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-prop"; - version = "20161127.1755"; + version = "20170101.1034"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch-prop.el"; - sha256 = "1nni8lbmh215icv2n5kzq59vbnjq2z3h021drk6szdxm5hcsgmg4"; + sha256 = "0n83qikh3mlnd3f9qwcsflg5x10sxvs9fkidyyv79jr673x4ljpv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/isearch-prop"; @@ -35567,12 +35885,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20161213.719"; + version = "20170109.626"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "abdbfa790074632800a449b190a8fc8d0770c738"; - sha256 = "0g54crkziiw7ll1kifqg3shw9k50rnqvpdkf1w6zk3c2v4h40yll"; + rev = "ee91a2511797c9293d3b0efa444bb98414d5aca5"; + sha256 = "0mrv0z62k0pk8k0ik9kazl86bn8x4568ny5m8skimvi2gwxb08w6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -35588,12 +35906,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20161213.2242"; + version = "20170103.1125"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "58dc08b8b8e6ea0c809052e082c867e05acef16a"; - sha256 = "0cf3h0lkya6rsmg60qzbiz63vp8lm7nd4xlxym44hpp75nw06mgb"; + rev = "8735714d6be62187538ffd9187e8aee87b49b969"; + sha256 = "19sqp3789a9w0nm48rb2yjj5bhllpilrvbljp8h8nsv3nlf5dz84"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -35609,12 +35927,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-erlang-complete"; - version = "20161018.1145"; + version = "20170113.247"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "8d3716a93200226625b11dda8230862933f9bef6"; - sha256 = "1rfn2jfinqxdqrjns0h9wjbxsy1g28x89g85nyl51xx7n4b2cbgf"; + rev = "65d80ff0052be9aa65e9a1cd8f6b1f5fb112ee36"; + sha256 = "05qjpv95xrhwpg1g0znsp33a8827w4p7vl6iflrrmi15kij5imb4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -35655,8 +35973,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "abdbfa790074632800a449b190a8fc8d0770c738"; - sha256 = "0g54crkziiw7ll1kifqg3shw9k50rnqvpdkf1w6zk3c2v4h40yll"; + rev = "ee91a2511797c9293d3b0efa444bb98414d5aca5"; + sha256 = "0mrv0z62k0pk8k0ik9kazl86bn8x4568ny5m8skimvi2gwxb08w6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -35714,12 +36032,12 @@ ivy-rich = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "ivy-rich"; - version = "20161213.302"; + version = "20170102.1820"; src = fetchFromGitHub { owner = "yevgnen"; repo = "ivy-rich"; - rev = "92d7312059f8c1f055f3336580ae77437038b472"; - sha256 = "098xsg2yggfv1b931yw4r87l8rqmgxbib5ca8bgvr3nafxfya6la"; + rev = "7ff0b3e43b27353fabcb01d2252236e266916e50"; + sha256 = "1gy45rm8pznrkqh7d7wrppd2z2bd654yzi9ddav1ibzaip52g5m3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fc297f4949e8040d1b0b3271c9a70c64887b960/recipes/ivy-rich"; @@ -35753,6 +36071,27 @@ license = lib.licenses.free; }; }) {}; + ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }: + melpaBuild { + pname = "ivy-youtube"; + version = "20170109.338"; + src = fetchFromGitHub { + owner = "squiter"; + repo = "ivy-youtube"; + rev = "f8bc1eadaa46b4c9585c03dc8cbb325193df016e"; + sha256 = "1b973qq2dawdal2220lixg52bg8qlwn2mkdw7ca3yjm6gy9fv07b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/33cc202ff0f0f283da23dbe7c7bdc5a1a86fb1d8/recipes/ivy-youtube"; + sha256 = "1llrlxbvpqahivd3wfjfwijzbngijfl786p7ligsb458s69jv1if"; + name = "ivy-youtube"; + }; + packageRequires = [ cl-lib ivy request ]; + meta = { + homepage = "https://melpa.org/#/ivy-youtube"; + license = lib.licenses.free; + }; + }) {}; ix = callPackage ({ fetchFromGitHub, fetchurl, grapnel, lib, melpaBuild }: melpaBuild { pname = "ix"; @@ -35819,11 +36158,11 @@ jabber = callPackage ({ fetchgit, fetchurl, fsm, lib, melpaBuild }: melpaBuild { pname = "jabber"; - version = "20160124.552"; + version = "20170106.1603"; src = fetchgit { url = "git://git.code.sf.net/p/emacs-jabber/git"; - rev = "98dc8e429ba6f79065f1c9fc3878d92314d4b510"; - sha256 = "0v1w7hk0s0a971248chi4nzsppjwrhxsfjbvi4yklnylm2hm2y3s"; + rev = "2ef76cff4a5a932cf17dc6107a0c5adee806081e"; + sha256 = "0jvgp121544vc0yd31cncz06dkgw4za605nkk914vmql321zjzr2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cff77a688d51ff2e2f03389593465990089ce83d/recipes/jabber"; @@ -36045,6 +36384,27 @@ license = lib.licenses.free; }; }) {}; + jastadd-ast-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "jastadd-ast-mode"; + version = "20161219.126"; + src = fetchFromGitHub { + owner = "rudi"; + repo = "jastadd-ast-mode"; + rev = "a29fdb470cbf0a398164950a3b0d2217de48e0c0"; + sha256 = "01fv0ixkshy7i6wzcgq6xvijvh3n402vyhmh3qzjwi9p0vxvdyxv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/32d59dd9e796438f1752d36a30d4e062abbb6dd1/recipes/jastadd-ast-mode"; + sha256 = "1cwqxzmqx5wxaax12rq0hy0whpaivqncykym43p3an2sl9s6ngva"; + name = "jastadd-ast-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/jastadd-ast-mode"; + license = lib.licenses.free; + }; + }) {}; jaunte = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jaunte"; @@ -36174,12 +36534,12 @@ jazz-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "jazz-theme"; - version = "20160715.829"; + version = "20170115.723"; src = fetchFromGitHub { owner = "donderom"; repo = "jazz-theme"; - rev = "17f6dd1625e32567ccde4848aa660501032963d6"; - sha256 = "1wpq3aclamk2rk8dh2l4yhafcghqrl5dwmz7gc83ag7zyb77np32"; + rev = "0ae13bd12ddc339b8ef6f112c59b916a2da6922e"; + sha256 = "12iz3hvxha9mya2629azvmrwgkxk6b4fgmgpx1n30wlaw8ap69gj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da25345df9d8d567541ed6b0ec832310cde67115/recipes/jazz-theme"; @@ -36216,12 +36576,12 @@ jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }: melpaBuild { pname = "jdee"; - version = "20161207.1325"; + version = "20170109.1138"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "c4ee9b3fefe42e00475af452d7c664c62dbe067b"; - sha256 = "11sz08a59hqcyynmd2zyllbvqnh7ll0ql22vj4gxrvkv18sb79za"; + rev = "5ac4f497f8226acc23dd9c266c958fb82f6816b4"; + sha256 = "17l07r0wf5gj77lln6bmi1c4fg4igf2qnrla2s9piyrqffa4jgrv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; @@ -36441,22 +36801,22 @@ license = lib.licenses.free; }; }) {}; - jist = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, magit, melpaBuild, pkg-info, request }: + jist = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, magit, melpaBuild, request, seq }: melpaBuild { pname = "jist"; - version = "20160803.1758"; + version = "20161229.921"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "jist.el"; - rev = "1a0252e47b4ae5be6f8a16680752f6c69b1291a8"; - sha256 = "0wa7gbm1nn5q97bkz1zsrzwhga4m028bsiixzf14qml8pfq6q5ml"; + rev = "da0692452e312a99bb27d8708504b521798aca48"; + sha256 = "13dic7bmj7a8vvjz47s1fnz8p5m22d2m2h2vlkmlq7322qwxxw6p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/898bfa0b315240ef9335fde24ff0386a4c6c6595/recipes/jist"; sha256 = "11m9li1016cfkm4931h69d7g1dc59lwjl83wy3yipswdg3zlw0ar"; name = "jist"; }; - packageRequires = [ dash emacs let-alist magit pkg-info request ]; + packageRequires = [ dash emacs let-alist magit request seq ]; meta = { homepage = "https://melpa.org/#/jist"; license = lib.licenses.free; @@ -36595,8 +36955,8 @@ src = fetchFromGitHub { owner = "redguardtoo"; repo = "js-comint"; - rev = "067d52cd5f1f30634b7f332b33d0ee181594508f"; - sha256 = "08k8pcswk8d31mqnld0pk3jawskxjzc4sa1mh15jqpli9phym0va"; + rev = "2f42249c0a18ad2e17cfb272d75aa9fd3ec5e4ec"; + sha256 = "17f99cih28lfral5iq43pjrvimlx0bnigirv44wm81n58widismy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint"; @@ -36633,12 +36993,12 @@ js-format = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }: melpaBuild { pname = "js-format"; - version = "20161215.33"; + version = "20161220.1427"; src = fetchFromGitHub { owner = "futurist"; repo = "js-format.el"; - rev = "dc5078de6bfdab3b23b0c5a4cbea4b96066c762e"; - sha256 = "1b67nv9m30243pwarjqbvd3xwbcxgms21qdlgljpq7pjbjfh26yf"; + rev = "1fb87a5b21cdc2dc4e29245d14d82e81a5983393"; + sha256 = "0cwxyfqiwl19gvx0smcdy8immvyj0rnsrxsqy2pch1s6m5sz4wxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0d6deaa93f7deaba9f5f36f1963522b6dc5c673a/recipes/js-format"; @@ -36654,12 +37014,12 @@ js-import = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "js-import"; - version = "20161027.2259"; + version = "20170115.853"; src = fetchFromGitHub { owner = "jakoblind"; repo = "js-import"; - rev = "e57a8dc4a61d2b33add3da7ac44ea28979b792f9"; - sha256 = "1prcifdih35nnbbgz04dd4prfmi25fdxjwajp4wms2hm0q8z4mkr"; + rev = "7b1b7c963e3df9c76ed6cfb66c908c80775c6cfb"; + sha256 = "03a13bcipk32hdvh5bm2z8kxs4b2xp3r1phwxmvb49lxx6417bs9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69613bafcb5ca5d5436a4b27be6863f37a7d2fab/recipes/js-import"; @@ -36717,12 +37077,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20161212.1716"; + version = "20170116.733"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "90e37cdfdec06c7127cbb35f03a341c9d39cc2d5"; - sha256 = "1m40hsfybqkplhwcn5b2kgm6czgdfiv7bp155fng7j045nmc8jgw"; + rev = "03c679eb9914d58d7d9b7afc2036c482a9a01236"; + sha256 = "1kgmljgh71f2sljdsr134jrj1i6kgj9bwyh4pl1lrz0v4ahwgd6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -37239,11 +37599,11 @@ }) {}; kanban = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kanban"; - version = "20150930.917"; + version = "20170117.316"; src = fetchhg { url = "https://bitbucket.com/ArneBab/kanban.el"; - rev = "54d855426372"; - sha256 = "14g0f51jig8b1y6zfaw7b1cp692lddqzkc0ngf4y89sw9gbmsh3w"; + rev = "713e6c7d8e07"; + sha256 = "1m1rgkdwb9zm3k131l6xh2pz4750arvflly7fbmsik3y1pr5f60r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/kanban"; @@ -37655,12 +38015,12 @@ kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kill-or-bury-alive"; - version = "20160531.908"; + version = "20161231.1559"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "kill-or-bury-alive"; - rev = "62557d5d45a27773cc4f079549e98ca8aad203d0"; - sha256 = "1d1kygn2l675rigz29hjmqkh0x7061ax0a60v5mjn9q87y4jd760"; + rev = "beadb20a0f436b5f3413a0dee215a20f614f070e"; + sha256 = "1ck9v01xih9ik85q46ijhl1m3ppazkr6f9fjcamxgxcwxrniwj4j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/25016ed09b6333bd79b989a8f6b7b03cd92e08b3/recipes/kill-or-bury-alive"; @@ -37764,8 +38124,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "76138882e7fb7c609ae8f8f83d60d1ff1c11b64f"; - sha256 = "1gq3wnf2rwm5gcf1kvz3vxhsnsymhnnh17vn9l0n42dy9r2jn50a"; + rev = "80f1f82759d5e4f2537da7620e2c0d3ea88aa7da"; + sha256 = "0bk7ixm4dvblmal8xi0n061xqb13ipdgxpl9gx7aihzi18429i8n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -37781,12 +38141,12 @@ kiwix = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kiwix"; - version = "20161215.535"; + version = "20170116.503"; src = fetchFromGitHub { owner = "stardiviner"; repo = "kiwix.el"; - rev = "6fb8354e1770e752ae4eb3b79d5b873f65682904"; - sha256 = "02k0pvax9gf8gx9gcgm6zv25pvn4962c8zipp1sn5ik7i8z4fcwq"; + rev = "edea2234a7a5267c1888dbe2271e9100bdc3f5a8"; + sha256 = "0b9bwcgxm2gachh2g5cn4fih2n5mzqzvl591ahq0rylgajxmxvhp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673b4ecec96562bb860caf5c08d016d6c4b89d8c/recipes/kiwix"; @@ -38075,12 +38435,12 @@ labburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "labburn-theme"; - version = "20161212.313"; + version = "20170104.211"; src = fetchFromGitHub { owner = "ksjogo"; repo = "labburn-theme"; - rev = "ed5481c4fe2cc7ffab8ff066e3cae5118c582484"; - sha256 = "0wza7rn34y0p7drgrl9w10ij9w4z03vvy775zkp4qifryv78rzk2"; + rev = "c77596042d4f96e1cfdc2e8a542dd30cd55227a6"; + sha256 = "0wrwx1lgy38hvp7axwkgm3a760nw8gwl1b61ll33vc4qajgp525g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1bfc9870fbe61f58f107b72fd7f16efba22c902/recipes/labburn-theme"; @@ -38095,10 +38455,10 @@ }) {}; lacarte = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "lacarte"; - version = "20161127.1758"; + version = "20170101.1036"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/lacarte.el"; - sha256 = "0bpjrnxfxfmrjj07hf5sgxjm4v8i6hr7ssq235jbh4r29vgf9qlc"; + sha256 = "0xlbv4hhmg85x8i2zzbma29r5674cbmjrqwda9bjxf00wfid0a76"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85457b78a0fcc4ac0e0910d09594397b21cb1aa8/recipes/lacarte"; @@ -38195,27 +38555,6 @@ license = lib.licenses.free; }; }) {}; - latest-clojure-libraries = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "latest-clojure-libraries"; - version = "20140314.617"; - src = fetchFromGitHub { - owner = "AdamClements"; - repo = "latest-clojure-libraries"; - rev = "6db8709a746194800a3ffea3f906e3c9f5d4ca22"; - sha256 = "1cqbdgk3sd0xbw76qrhlild9dvgds3vgldq0rcl200kh7y8l6g4k"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/35c24ed9ea2793ae3469a3927dc66716603cfa6b/recipes/latest-clojure-libraries"; - sha256 = "1vnm9piq71nx7q1843izm4vydfjq1564ax4ffwmqmlpisqzd6wq5"; - name = "latest-clojure-libraries"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/latest-clojure-libraries"; - license = lib.licenses.free; - }; - }) {}; latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "latex-extra"; @@ -38341,6 +38680,27 @@ license = lib.licenses.free; }; }) {}; + launch-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "launch-mode"; + version = "20170105.2112"; + src = fetchFromGitHub { + owner = "iory"; + repo = "launch-mode"; + rev = "25ebd4ba77afcbe729901eb74923dbe9ae81c313"; + sha256 = "1pjb4gwzkk6djzyfqqxf6y5xvrsh4bi5ijg60zrdlnhivggnfbvn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/876755fff14914b10a26d15f0c7ff32be7c51aa3/recipes/launch-mode"; + sha256 = "1za0h16z84ls7da17qzqady0simzy5pk1mlw3mb0nhlg2cfmn060"; + name = "launch-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/launch-mode"; + license = lib.licenses.free; + }; + }) {}; launchctl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "launchctl"; @@ -38428,12 +38788,12 @@ leanote = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pcache, request, s }: melpaBuild { pname = "leanote"; - version = "20161029.756"; + version = "20161222.1739"; src = fetchFromGitHub { owner = "aborn"; repo = "leanote-emacs"; - rev = "f5f0ed732e8fb2316591e5152306e090774c4d49"; - sha256 = "0cj8nd63sjp8iysmxl1a1qqb5qpmmd95yp5g5b1g4ikak17mx2vq"; + rev = "d499e7b59bb1f1a2fabc0e4c26fb101ed62ebc7b"; + sha256 = "1lg4zml26q97bx9jrmjikhnm3d74b12q2li5h8gpxx9m35wc360c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b00b806ae4562ca5a74f41c12ef35bfa597bcfa8/recipes/leanote"; @@ -38449,12 +38809,12 @@ ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20161204.758"; + version = "20161231.914"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "187851c47cd5a2ab397fbbdb09d2cf9ce6d50cae"; - sha256 = "1xhc5cvw7j6ninfw5knxqsjyxwg7p7ccf24gx72ik4gmddlki1x9"; + rev = "a2ce924c4447daa92228d5904e5c31555d27fbf7"; + sha256 = "0j9ppsxn9q3h4lh9ak3r1n8jpg5x0zs2az016jiw2q3h6n6sw564"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode"; @@ -38638,12 +38998,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20161211.1055"; + version = "20170114.617"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "10585a4333b409ee8b6e1a329de912464b69351d"; - sha256 = "18id5zhf4kk8ws22zp3cfzxcrpc3cj5k9a1m51xrfqg3ykqbg8g1"; + rev = "fa5f6105a18d08727172e6b9200cd0dec737d4ba"; + sha256 = "0pmhg22rx6yd431lfcvyai1cahiljs1dr670i9i6m5ckdakcl1f4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -38698,12 +39058,12 @@ lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lfe-mode"; - version = "20161204.908"; + version = "20170111.1330"; src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "96ca72844dab04a5330e0f33d95a18544b7ba369"; - sha256 = "1nzixvacppw37z5vfxp5ggg58ppqxrw86xhf2x4mfyyk9vs7jgg7"; + rev = "0d412fc713efb893c7f44f1bd8dd66eb01693f30"; + sha256 = "1hsr21fzd3kkavznjcgd9jv6galkx3aky73fs91plr5l7gdvqz38"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -38718,10 +39078,10 @@ }) {}; lib-requires = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "lib-requires"; - version = "20151231.1410"; + version = "20170101.1038"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/lib-requires.el"; - sha256 = "077cy2clllrvabw44wb1pzcqz97r3y92j7cb9lnhd9pix0wpcq6g"; + sha256 = "03y99c1cg368c3647w8jypf2nlx26qkygrijw2vxcp4ha5v9f44z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3f0d443964f98bb65f2fe8f57048fbee844f2ba/recipes/lib-requires"; @@ -38842,12 +39202,12 @@ link-hint = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "link-hint"; - version = "20160412.2218"; + version = "20161216.857"; src = fetchFromGitHub { owner = "noctuid"; repo = "link-hint.el"; - rev = "1d97e43fef29338b63c7a3b8c90df14887afc3bd"; - sha256 = "0w6n6m766vr7d2i5jw30dkq9326r1mx02n222vm8z1mxydkw1n3i"; + rev = "5c3bac30fea5ff74493712273a64a1a6a9f72957"; + sha256 = "18s5frmaf7d3l15by9yvr8hzgnk9fing4bjpfj53bcck2nmfd7qj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d24b48fe0bc127ae6ac4084be8059aacb8445afd/recipes/link-hint"; @@ -38996,10 +39356,10 @@ }) {}; lispxmp = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "lispxmp"; - version = "20130824.507"; + version = "20170110.1508"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/lispxmp.el"; - sha256 = "1m07gb3v1a7al0h4nj3914y8lqrwzi8fwb1ih66nxzn6kb0qj3mf"; + sha256 = "120wgxvckrgryfg2lvyx60rkcayii0g4ny2cdk3aiwsrpqcyhlyr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6fc8f86533402e4be8bac87ad66bc8d51c8d40f8/recipes/lispxmp"; @@ -39015,12 +39375,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20161212.1048"; + version = "20170112.236"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "8e4f8c6545520cbb206588bc2989b5f942e95089"; - sha256 = "0h09niqzzcc42sjrdr56n4ayddv9798naiwi7ws9w45nrpghz9b5"; + rev = "f66433837a4ccabcfc7f05d74d7ee8217691d943"; + sha256 = "154kwk1h1grcjbimaglsir5i5j72bak1lxw69bjm5d5yf3qg60p5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -39057,12 +39417,12 @@ lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }: melpaBuild { pname = "lispyville"; - version = "20160816.1536"; + version = "20170116.1335"; src = fetchFromGitHub { owner = "noctuid"; repo = "lispyville"; - rev = "a5648a611c7d538176b86dd1b3dcb6477c136f12"; - sha256 = "1h9a8jx0jajpi1kfw9n10q9zq842psh89z60ka3pvma5kwn8njyd"; + rev = "c951f65a2300d884eff7afdd941fea275550c9fe"; + sha256 = "0hhllm6b0gkllpbfkc6ifcax1vmfplll9vbrfa8wqi0lghmy4npm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville"; @@ -39328,12 +39688,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20161212.1937"; + version = "20170116.1607"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "cec5ce8bbfc04ec36c09e349b707f5941c9883b5"; - sha256 = "075jdy3mpn90kc894lcppmznp78k1csxf3acrrkxm3r6gncf4vkg"; + rev = "f702dd8475b48526d1701b11776800388f6d8c70"; + sha256 = "0zdxz5zyy8xgrsbl3kpnzxifgbr670qnrq02sbc208al9jn8blk9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -39415,8 +39775,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "152f85e176aa00afd6dde8544d6735151a019991"; - sha256 = "16jvypkrrnnabxva089k8fy23fvr405jka1bw0a47mlgrdfxan04"; + rev = "fca725c1928670ccc48510f431d96f19751dbc1b"; + sha256 = "1ag3h8jcrfdbhs1zil6xra5abngkl35yw6av769x0vp6wldxklrv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -39492,22 +39852,22 @@ license = lib.licenses.free; }; }) {}; - loccur = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + loccur = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "loccur"; - version = "20161122.1107"; + version = "20161227.251"; src = fetchFromGitHub { owner = "fourier"; repo = "loccur"; - rev = "08aeadc69571bddf44f2708dd75f57c7e027d32f"; - sha256 = "0wlz3skimgxbfvrd0xjj17ymm24c86847hd90wik861a4ig3wby0"; + rev = "650d91dda0d313c8f445a0803c07809d857dee0f"; + sha256 = "09xc2207dhlbw0x9pks2gay09adzijzcabdwg55iszrs7pxjjfa0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72550b043794331e85bc4b124f6d8ab70d969eff/recipes/loccur"; sha256 = "06pv2i05yzjzal4q21krbnp9rp4bsainxcwvpc98020vsmms0z8h"; name = "loccur"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/loccur"; license = lib.licenses.free; @@ -39641,12 +40001,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "20161108.1149"; + version = "20170114.1515"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "4f1db3f2081e819dd35545497529a03466bd0397"; - sha256 = "0f96wxijls743qyqfgkdqil3p5nn0sm02rlz1nqkm6bd8k28rcg1"; + rev = "c22ac44d14de8aaad532e47ea60c21c24d661a50"; + sha256 = "02842gbxlq6crvd3817aqvj5irshls5km675vmhk0qd4cqg38abv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -39747,8 +40107,8 @@ src = fetchFromGitHub { owner = "jschaf"; repo = "emacs-lorem-ipsum"; - rev = "893a27505734a1497b79bc26e0736a78221b35d9"; - sha256 = "0grzl4kqpc1x6569yfh9xdzzbgmhcskxwk6f7scjpl32acr88cmx"; + rev = "4b39f6fed455d67f635b3837cf5668bf74d0f6cd"; + sha256 = "0a3b18p3vdjci89prsgdzjnfxsl8p67vjhf8ai4qdng7zvh50lir"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c09f9b82430992d119d9148314c758f067832cd/recipes/lorem-ipsum"; @@ -39782,6 +40142,27 @@ license = lib.licenses.free; }; }) {}; + lsp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "lsp-mode"; + version = "20170106.1709"; + src = fetchFromGitHub { + owner = "vibhavp"; + repo = "emacs-lsp"; + rev = "d117f2d8d5b23688e0d32372a2c2d03e7bcd44c5"; + sha256 = "0g13hslwl9303k69mg4l5yrga4fsjbm0phvqr0kjycsq2zfipa2r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b192c90c96e24ccb464ac56e624a2fd527bc5cc9/recipes/lsp-mode"; + sha256 = "0acgfzm9irk8s5lv3chwh9kp7nrwqwlidwaqzf2f4jk3yr3ww9p1"; + name = "lsp-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/lsp-mode"; + license = lib.licenses.free; + }; + }) {}; lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lua-mode"; @@ -40013,12 +40394,12 @@ magic-latex-buffer = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magic-latex-buffer"; - version = "20161214.1726"; + version = "20161231.2300"; src = fetchFromGitHub { owner = "zk-phi"; repo = "magic-latex-buffer"; - rev = "572bc5d9054ba5a7e78abd333141722be9013a1f"; - sha256 = "0hmmsn1i2izasfpgmz2p0zi1fhj96yym2vz6m7yb0gxd2ijhk1jw"; + rev = "49a9ac6aff0a45aa6630dc0044533b7b3d3be7ad"; + sha256 = "1r9zq16n546xd9i27kiifdl7mwld8jk88rll2h0lbd77ir6wdlfm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/07e240ebe71d389d314c4a27bbcfe1f88b215c3b/recipes/magic-latex-buffer"; @@ -40034,12 +40415,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20161214.1516"; + version = "20170114.1211"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "2fc26ea8f8a188a23dc1f819d8b512ddbf7307bb"; - sha256 = "0mymbcm7i1y325n0p9q5qmx92j8j2ny61imv8w7m6xx30ylf1pdw"; + rev = "875f913b8edfdd85dfdaba9403a9d5ae2b952afc"; + sha256 = "04cdbv8xqhbzqx1lzcm0n2s80b25mp9s6izzflv88qzpcc0z6wv2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -40192,8 +40573,8 @@ src = fetchFromGitHub { owner = "qoocku"; repo = "magit-p4"; - rev = "eb88123f184a20e6727c9829a4a08f2eae850599"; - sha256 = "10y702vj5p7pbgny2b8w1kkm69bfy1angna8fgz7336bqwcpmf8a"; + rev = "9c5ef8bbe70c916bc3742025ce0098e3bdf7be6e"; + sha256 = "12avgqcm7za16m84sx2gnrf6y87gj8g4lxk4hld98myxkvfp04zc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/440d47ca465845eaa601ca8a6e4b15fc197e522b/recipes/magit-p4"; @@ -40209,12 +40590,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20161214.519"; + version = "20170104.924"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "2fc26ea8f8a188a23dc1f819d8b512ddbf7307bb"; - sha256 = "0mymbcm7i1y325n0p9q5qmx92j8j2ny61imv8w7m6xx30ylf1pdw"; + rev = "875f913b8edfdd85dfdaba9403a9d5ae2b952afc"; + sha256 = "04cdbv8xqhbzqx1lzcm0n2s80b25mp9s6izzflv88qzpcc0z6wv2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -40314,12 +40695,12 @@ magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }: melpaBuild { pname = "magithub"; - version = "20161129.934"; + version = "20170115.1723"; src = fetchFromGitHub { owner = "vermiculus"; repo = "magithub"; - rev = "c9bff9889650bee96c6d4f5cd46ac469ac1c3dbb"; - sha256 = "0vzln1b6cf90nnv7a28n2w781qrc17sss1s8h6i7fmnaldr0913j"; + rev = "dc03f31edb5f45a1c9ada8ae00c1c9baf0126213"; + sha256 = "1sv7h3gnqxm6vw4ygqm28grckxzvcfr39fgd4qhrzj0d6sss9gr5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub"; @@ -40650,12 +41031,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20161211.2253"; + version = "20170115.2357"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "04f1aaf687ad1d3bf6bf032b817032b82a6cd6bb"; - sha256 = "0pf6hcbd13gfjb58z2cgc4ql2m08kx0inxz1x7sfrpg1cvh8nb8f"; + rev = "c58481b5dacc62dcc53a9886e032ccaf4a41a627"; + sha256 = "023kpmj01ixpb2yfsfxym7zvbldhj8486ndanma0srzf1p9lmqq6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -40776,12 +41157,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20160928.932"; + version = "20161222.1416"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "c81e26ff477d46f68bcf0c6397d5f5346d9b0129"; - sha256 = "000g0l3al6qsl6h47jiz7kgny6svd9i8ppza53wj3p1i4yxrzmdx"; + rev = "df4ac404ce92abdf1a0b78da8ef1675f1cd1f196"; + sha256 = "1k5bxqbcz174b6g3av6hr2q828bybinq96avab0561zqwqxlhkql"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -40843,8 +41224,8 @@ src = fetchFromGitHub { owner = "ancane"; repo = "markdown-preview-mode"; - rev = "b55c8ddba2f9c4e87f0dd9bed586f4d94890350f"; - sha256 = "18x7mk4xysiihr707xl4s52a73mpj9bwlh53gli37wmpjfgdlp1y"; + rev = "65f48df07c87d37275cc6a135741df4b585f1836"; + sha256 = "0gkfwm7zxwdi7x7xd6m9sl9q1p5f2q8mxryq6cd4xldbvbcki71f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3c5d222cf0d7eca6a4e3eb914907f8ca58e40f0/recipes/markdown-preview-mode"; @@ -41179,10 +41560,10 @@ }) {}; mb-depth-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "mb-depth-plus"; - version = "20151231.1421"; + version = "20170101.1046"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/mb-depth+.el"; - sha256 = "0w8clp96jblsc9v87404zpc280ms0d644in34jdgjc5r33f4i0g3"; + sha256 = "1sk8x91gxwk17kv7whwfh9szxmgyy9ys1h4hx17hyzlvhz9smncg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mb-depth+"; @@ -41198,12 +41579,12 @@ mb-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mb-url"; - version = "20160724.725"; + version = "20161224.1806"; src = fetchFromGitHub { owner = "dochang"; repo = "mb-url"; - rev = "178b03d2cbc31e889c095a6c25426c297e5fe6fc"; - sha256 = "0y22bn4zvyw2qivjrvwkhx96mwvfpx74901r0m4l31nvyh559aq0"; + rev = "129a0bb6a684be76fb9f09010e710065d0e5baaa"; + sha256 = "1apy7abjhdbgh8001rzv41q40bfl444rcz62lvgdwj3lg45zb8xc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd9a8ff6e094b061a7b9d790df1fd4086c5d0a9d/recipes/mb-url"; @@ -41324,12 +41705,12 @@ mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mediawiki"; - version = "20160902.827"; + version = "20170113.1308"; src = fetchFromGitHub { owner = "hexmode"; repo = "mediawiki-el"; - rev = "7cc465af1d95a814387d241ff8a4c89d03b1e86e"; - sha256 = "1bhp0cx8kdr7mnmwg5q59qv019aalk4z7ic625qaa03gd6xr2ym4"; + rev = "03c5ca4e884782950d2bcc784ecc2167e43e4aa9"; + sha256 = "1d2dxpgbccd0p818xpj2wghfhvngyf4mad1ds84v2lbzyxphp6qa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/865e0ba1dbace58784181d214000d090478173bd/recipes/mediawiki"; @@ -41345,12 +41726,12 @@ meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: melpaBuild { pname = "meghanada"; - version = "20161018.259"; + version = "20170104.2224"; src = fetchFromGitHub { owner = "mopemope"; repo = "meghanada-emacs"; - rev = "ce923c93124c60c2eda1e3ffa2e03d2adc43bff0"; - sha256 = "043d6d1ajr19l78prg8c8gbg661p6c9d9l2xghj4zybwr0byv53f"; + rev = "fe384624b5e382b331ff80bc74a17becb5b01c7c"; + sha256 = "1l2wqjdmsh77vcxfmm8437z7rlx1avdk2bvq8w1wmps32gi52lhg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; @@ -41366,12 +41747,12 @@ melancholy-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "melancholy-theme"; - version = "20161110.120"; + version = "20161228.1643"; src = fetchFromGitHub { owner = "techquila"; repo = "melancholy-theme"; - rev = "bf15e39ed0579fa1cf1ceb5fb91876c2be115bfb"; - sha256 = "0wphlp2vq8clv0q9c5lrpbajzhn7pr4z6x661q6vd51z9azh3qp2"; + rev = "033cb2690c3f4deb6188dabeb811d42debd78a5a"; + sha256 = "0qv1dv0l7q6j0r1s9mvw40h4wj44g0lsd1nmcpg2pv48mk6dhdjk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8f708d1300d401697c099709718fcb70d5db1f/recipes/melancholy-theme"; @@ -41489,22 +41870,22 @@ license = lib.licenses.free; }; }) {}; - mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: + mentor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, seq, xml-rpc }: melpaBuild { pname = "mentor"; - version = "20161212.1342"; + version = "20170105.221"; src = fetchFromGitHub { owner = "skangas"; repo = "mentor"; - rev = "c0cf0fcac1a2bbc9887e15bed00dce10fcb6ecab"; - sha256 = "1v2dqwbfwf21az6qpqxd5bskspampp3mdhdzy7vsmfd50gq3jb5l"; + rev = "9a160d718b02a95b1bb24072cca87b4348e1e261"; + sha256 = "16n5dd00ajr2qqwm51v1whf2kmyr27mx30n3xlydf9np3f34hlax"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor"; sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s"; name = "mentor"; }; - packageRequires = [ xml-rpc ]; + packageRequires = [ cl-lib seq xml-rpc ]; meta = { homepage = "https://melpa.org/#/mentor"; license = lib.licenses.free; @@ -41512,10 +41893,10 @@ }) {}; menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "menu-bar-plus"; - version = "20161209.734"; + version = "20170101.1047"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/menu-bar+.el"; - sha256 = "18i4isl86ldmbxkyiqiawby1izhdhpa8x7zyvzbfhzrny15dp32p"; + sha256 = "0s460zm9k8b76vih5wgyrg8a7w5alwd43ia00mp110ipq2sy9pd2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/menu-bar+"; @@ -41675,12 +42056,12 @@ mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mew"; - version = "20161123.1840"; + version = "20161224.1535"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "Mew"; - rev = "90485fb0f21c250d308d1952ccad1049e766fcd8"; - sha256 = "03bksshs2n3jxiccbgd86kbbwm79hmvsrbxw4yyjv311w8p2i1gw"; + rev = "8138c83339071884a2d6c5365a088ba8da4a0fc0"; + sha256 = "0yvqarinibrg7f362gg1i3r2wgjmzzv0j71zcrp9id30gfwbs6z3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/362dfc4d0fdb3e5cb39564160de62c3440ce182e/recipes/mew"; @@ -42116,8 +42497,8 @@ src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-mips-mode"; - rev = "00b9c0d92cca89a1313e203c33ec420a833c929b"; - sha256 = "1bza70z7kfbv0yi4f3zvr1qid9wypqypngw3kcx9majx7mim54gq"; + rev = "8857384be127b55bd7a20437e4592d8a0175ebc7"; + sha256 = "0z9zlij7w51iz1ds7njvg8g2mqp80vi65fmxr67rhbfsb7i568cl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode"; @@ -42132,10 +42513,10 @@ }) {}; misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "misc-cmds"; - version = "20161102.1111"; + version = "20170113.904"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/misc-cmds.el"; - sha256 = "1d55k9x2x29s0n2pkvp9lv8lbbha46f349dayniirspi55r89z02"; + sha256 = "05ymqzikn16538iqjiwyhwhqzshx9kx9v8amarb8ybr96l1ci4bz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/misc-cmds"; @@ -42150,10 +42531,10 @@ }) {}; misc-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "misc-fns"; - version = "20161016.1519"; + version = "20170101.1050"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/misc-fns.el"; - sha256 = "13m2j1ixfgx2m61yxznvk38jp6xfalq6vsmhxsc3klsal8mrkrhn"; + sha256 = "0q5if5p0yy2b3h93lsrhy7z8f5mjmm3kkh1ql94jng4a0hl64jqr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c2cbbe5a718ec961982a7f65de8f6ec1c9513696/recipes/misc-fns"; @@ -42231,12 +42612,12 @@ mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mmt"; - version = "20150906.959"; + version = "20161231.1556"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "mmt"; - rev = "3420eb014f86327ac68638e841ab7860aead5087"; - sha256 = "0l5lpyiygikm9rwgk6jgx23wmc26hvhnqn9964d60l5a4b9fam74"; + rev = "66adeeeccc52121fae7350698c11583b31cbb5c3"; + sha256 = "01s1i7cc653yzxdmnlamz177sjlgjbknmz717kvrwd6wixgn2p08"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1137bb53ecd92b1a8537abcd2635602c5ab3277/recipes/mmt"; @@ -42336,12 +42717,12 @@ mocha-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "mocha-snippets"; - version = "20160912.514"; + version = "20170103.2127"; src = fetchFromGitHub { owner = "cowboyd"; repo = "mocha-snippets.el"; - rev = "6f09ba894a3f5fbaecd5c91597c6f0d1918e9d71"; - sha256 = "1jd5ji48myirqqhwrkm254zdrxgrdkfny9bvxc29vwgm8gjcpspw"; + rev = "e054137bd78f0d236e983874da1f345d30a71816"; + sha256 = "0lxc5zhb03jpy48ql4mn2l35qhsdwav4dkxyqim72b7c75cy1cml"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93c472e3d7f318373342907ca7253253ef12dab8/recipes/mocha-snippets"; @@ -42378,12 +42759,12 @@ modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "modalka"; - version = "20160531.912"; + version = "20161231.1639"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "modalka"; - rev = "95627e660768c7ab7af4d8ad35c2bc0c4fa7195b"; - sha256 = "0yf5lwd95j55dkrkplsgnynq37ww0g97vw517j9q7spn7dqnq5f6"; + rev = "1831129c063fbef5f5378389281ecccca095b9e8"; + sha256 = "0jyczwam7xipw2qrk27wph3j4jd9gbkawvnsiad5xr1h9d019a41"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa0a02da851a603b81e183f461da55bf4c71f0e9/recipes/modalka"; @@ -42399,12 +42780,12 @@ mode-icons = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mode-icons"; - version = "20161125.2230"; + version = "20170116.1230"; src = fetchFromGitHub { owner = "ryuslash"; repo = "mode-icons"; - rev = "1b3ab62793b0e5f31e1ee2d8053a219ec34287f8"; - sha256 = "0jz2mb3xinjkxw4dzgpfpxzzi27j9wdzbnn7rnfwkpj66v4fcl20"; + rev = "60d5b4dbbb07d2515f195f8ffe75f12f0913a3d7"; + sha256 = "0ck7v4pzhzymq0cjwyl0iv721k9m0cx36m8ff7lw0bmgbzdi8izn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f/recipes/mode-icons"; @@ -42440,10 +42821,10 @@ }) {}; modeline-char = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "modeline-char"; - version = "20161210.852"; + version = "20170101.1054"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/modeline-char.el"; - sha256 = "06n97a196rqc88py7jnydv8a4q1vd0bb2ich2mx25sl3pylmd6lq"; + sha256 = "0y5bjny8j9lvf94rfk3nrwdfmbp24i1b96909xpifn3l1r1xl6qr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9655505f56fc90ea8ef61e7595af0de7427b273b/recipes/modeline-char"; @@ -42458,10 +42839,10 @@ }) {}; modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "modeline-posn"; - version = "20160112.649"; + version = "20170114.1554"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/modeline-posn.el"; - sha256 = "1r4zq355h570hk7qq0ik121bwsr4hjnhacal4d4h119d11gq2p8d"; + sha256 = "068kdgzzv76ls5hyxs77vzm5ai7x8zcsmhjk78pmfirfrjrxcjgf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c62008950ea27b5a47363810f57063c1915b7c39/recipes/modeline-posn"; @@ -42519,12 +42900,12 @@ moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "moe-theme"; - version = "20161129.115"; + version = "20170111.1838"; src = fetchFromGitHub { owner = "kuanyui"; repo = "moe-theme.el"; - rev = "1a77b2ee52f5077ef3a31c794ecf13b37b3b4fd3"; - sha256 = "1gimdcrkbanzl1zxxw2955k7a4ygyqgls12g31g8nvjjp46hgjhr"; + rev = "70e71ef7404cc5c38254771695eee221090d5110"; + sha256 = "1dpcffb6pyggg2lj7n9lnxyg2clwm4q7hnxvgc87r6b61vjr3a20"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme"; @@ -42645,12 +43026,12 @@ monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; - version = "20161215.347"; + version = "20161216.628"; src = fetchFromGitHub { owner = "oneKelvinSmith"; repo = "monokai-emacs"; - rev = "241f7a218d7697efe47ac2fc7751717a1c47ef5c"; - sha256 = "1fgadbbvsh78xq3gg203jc7c93b3ypmxsnncx0kpq3rhd96ym730"; + rev = "1a921469d0d3a974bf626a76bc5e9fb342fb32d6"; + sha256 = "1xby4jxxjwcgpai242y5c6ha2cj07hs1nndvxa6f1ncfkh5a7azx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bc9ce95a02fc4bcf7bc7547849c1c15d6db5089/recipes/monokai-theme"; @@ -42666,12 +43047,12 @@ monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monroe"; - version = "20161025.621"; + version = "20170103.1555"; src = fetchFromGitHub { owner = "sanel"; repo = "monroe"; - rev = "fd742eee779c16f608d2369913ff067e1c47261f"; - sha256 = "0abs920fs4gk7rf2ch2h4mk956aimx0plp1xnawv08iippj185li"; + rev = "7a72255d1b271ff11ad8e66c26a476aa4542c8f7"; + sha256 = "16laq4q8mc85kc658ni6kflcfinyxl446fdih2llmg7dji0xarpl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/590e5e784c5a1c12a241d90c9a0794d2737a61ef/recipes/monroe"; @@ -42791,10 +43172,10 @@ }) {}; mouse-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "mouse-plus"; - version = "20161209.737"; + version = "20170101.1057"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/mouse+.el"; - sha256 = "1jr6m5cm6j6bfdk2f2n632aybjna4pcpyqm6j9flcr537fciwvap"; + sha256 = "0drv4r30jj1bsgd9jv6znicc9jgxd0hzjd3xlsp7l2ynjbg86n4g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01cbe9b5bb88f8c02fab67a269ac53c8aa4d8326/recipes/mouse+"; @@ -42830,10 +43211,10 @@ }) {}; mouse3 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "mouse3"; - version = "20151231.1526"; + version = "20170101.1058"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/mouse3.el"; - sha256 = "1831jpi06hi5v2jdjgs83jma7fp8xiqdmvvwxfyp2zpbfwi1lkb6"; + sha256 = "1d6192r5iqyvs21ip78wcsvwc4lpx2jiv6pljcm9blxr1bpsk3gl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/mouse3"; @@ -42870,12 +43251,12 @@ move-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "move-text"; - version = "20161002.2035"; + version = "20170101.125"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "move-text"; - rev = "3d9fe18c4015d82cdb85f7af3bb22e54ee907555"; - sha256 = "14mykiz7q93xjz0lhr17vk1hna64apsplkk424q7hv28fpahzfbp"; + rev = "df534f345b960cd3315caa9dca9e4893c38e48fd"; + sha256 = "0svrdyij17nasdsj3fnj31p92ff7byzrwvbr49mifsqh2isibs54"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82bfd0f41e42eed1d4c2361ec1d1685edebbac1b/recipes/move-text"; @@ -43101,12 +43482,12 @@ msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "msvc"; - version = "20150530.151"; + version = "20161221.558"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "msvc"; - rev = "e7a61fa5b98a129637f970ac6db9163e330b3d02"; - sha256 = "1draiwbwb8zfi6rdr5irv8091xv2pmnifq7pzi3rrvjb8swb28z3"; + rev = "71c38323187c98b32250b89088768599bb216ddb"; + sha256 = "1wwa861a8bnrqv59bx6l5k3qi98wqv6cicvg5gjyx8rdvpcq28dg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc"; @@ -43185,12 +43566,12 @@ mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mu4e-maildirs-extension"; - version = "20161209.635"; + version = "20170110.519"; src = fetchFromGitHub { owner = "agpchil"; repo = "mu4e-maildirs-extension"; - rev = "19ff86e117f33a5e3319f19c6d84cf46854ba874"; - sha256 = "02pmnvq3crrivrv5l1x40y2ab0x2mmg7zkxl7q08bpglxzc8i4k0"; + rev = "c8c22773d13450ed1a49ca05d02a285d479a9e45"; + sha256 = "1jc16dvvgg9x17gckljd013d8rjjbr5992mrrhcnpdn5qvj145i8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b20c61c62309f27895f7427f681266e393ef867/recipes/mu4e-maildirs-extension"; @@ -43783,10 +44164,10 @@ }) {}; naked = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "naked"; - version = "20151231.1527"; + version = "20170101.1100"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/naked.el"; - sha256 = "0zq13qjqfpxjba1bhdqqxkvgxq1dxyb7hd1bpnk6cbhsxr6mr50i"; + sha256 = "06j2kijshd6ywx0rfvl4d08r0rh0b0rj69zypz63p418liymzcn6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/naked"; @@ -44031,10 +44412,10 @@ }) {}; narrow-indirect = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "narrow-indirect"; - version = "20151231.1539"; + version = "20170101.1101"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/narrow-indirect.el"; - sha256 = "1lyszm94pd3jxs73v7k0aaazm0sd2rpz2pphcdag7lk7k6vppd9n"; + sha256 = "0rlj647azpj5v7lzap88992f7mf2y94708f4aw2cvnzj6hf1rsvy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e5dd845c99acaae719562595059154a08a5f00/recipes/narrow-indirect"; @@ -44113,12 +44494,12 @@ nasm-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nasm-mode"; - version = "20160525.1826"; + version = "20161216.736"; src = fetchFromGitHub { owner = "skeeto"; repo = "nasm-mode"; - rev = "c3f5475c2f4bd930411b6d716765d094b36ce219"; - sha256 = "0d8bfz41ry5bvkz2894dqkk3244n7xcjk3pf58fcsagvmmkkln7b"; + rev = "d990ed94d902b74a5c834fb567e03307607cee45"; + sha256 = "1dyc50a1zskx9fqxl2iy2x74f3bkb2ccz908v0aj13rqfqqnns9j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a832b3bd7c2f2d3cee8bcfb5421d22acf5523e/recipes/nasm-mode"; @@ -44285,8 +44666,8 @@ src = fetchFromGitHub { owner = "rsdn"; repo = "nemerle"; - rev = "9339ad5534676dac089048f9955a77c282862b25"; - sha256 = "17wq5lsrps94qgxhmk2xgp6j8lr17g8c2liz39ffvvwawcr207k7"; + rev = "95a09d97fdc86a570a9276a05fe42dc3c90dcbc5"; + sha256 = "1lydpljxf0air78qrc04x9g71ixmh5g5q6ln77acnivq9gn3xha5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8477d0cf950efcfd9a85618a5ca48bff590b22d7/recipes/nemerle"; @@ -44323,12 +44704,12 @@ neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "20161214.2346"; + version = "20170110.321"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "cfef6036b69d53a83689694f5f257e5aaaeef265"; - sha256 = "0bbhvldxid7g4jg6pp9ywcf0xipbf9y2wqbg3pr7g45sbl3i7zz3"; + rev = "d2ae6ac8a919f164f34c589f2f46ddd140a79f81"; + sha256 = "0xqcrxmpk2z4pd9scqn2nannqy0a76mkkqv9bz037a36w8v481nd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; @@ -44579,8 +44960,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "7d705a3dfcd09a31c67c440ca2120d3994357e57"; - sha256 = "0x2bkdbv0p5rj4nwybnajdwbyhnbyk4vxjlpmf5zljs5kc49h3zs"; + rev = "9e71431e6f8323be8ced8997409cfe7a389c6583"; + sha256 = "0lnahkq47x9w8gi89bm91mjvap4dvwpn88pjysmp4ciw04v2h8s2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -44621,8 +45002,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "5278bb7c16c227d64551fc6578cb1b1b22f3b036"; - sha256 = "11f3fk1w40ynjzabs9rmzjzbwlkr91bhc5a0wk6m9pmm9lmshl6b"; + rev = "c0d55f918379f46b87e43457745895439a85555c"; + sha256 = "05kmk92f7zzincs84z6zphmwsli6jhb81hha1ili9xibqpg5983w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -44743,12 +45124,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20161212.956"; + version = "20161223.607"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "0421f2c8aba7d369135d9e7e0d181d0da8c08d8c"; - sha256 = "1vk4cz12r0aw1rapf9k2g730ak5q8b5rpylhwsr819ixyr9zpz7a"; + rev = "e7d3ebbd12f176707e63766a7a19bcaa08e01331"; + sha256 = "0y8wvagn4yf7fwvwzqcrx46wigmvyl25fa94kzvkanjl04zid3i1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -44827,12 +45208,12 @@ nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nodejs-repl"; - version = "20151229.603"; + version = "20170110.940"; src = fetchFromGitHub { owner = "abicky"; repo = "nodejs-repl.el"; - rev = "868339fffedc38f0fd0a3c21d167d8d48830ef84"; - sha256 = "03vcs458rcn1hgfvmgmijadjvri7zlh2z4lxgaplzfnga13mapym"; + rev = "53b7f09a9be6700934321297758e29180e7850d7"; + sha256 = "1fwz6wpair617p9l2wdx923zpbbklfcdrygsryjx5gpnnm649mmy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl"; @@ -44890,8 +45271,8 @@ version = "20161215.457"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "5de84d07526d330a46e50d955bdfeed8f629637d"; - sha256 = "0zz3xg9v8g9vj4lwdx4phwr54ky49bws2amm1cq7yijwzgj2qbjk"; + rev = "4a2ce7b5706b53cdd30c474d556f18d731c21bb5"; + sha256 = "1hhdaapyj6kg9zys7fw5rh7rqc4540wyh3c5dkhb4b9jlbzslj40"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -44927,10 +45308,10 @@ }) {}; novice-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "novice-plus"; - version = "20151231.1540"; + version = "20170101.1103"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/novice+.el"; - sha256 = "0mmdf3z9299hbs3wr8hqgpmg74sb2xm0rxyh38sjcqmk8f310rqh"; + sha256 = "04lsjzj0a0z7wn7jzlpzjdv9d2w591gs2mwvsh1j8hmgl4x5p9vp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/novice+"; @@ -45344,12 +45725,12 @@ ob-dart = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-dart"; - version = "20160707.2040"; + version = "20170106.824"; src = fetchFromGitHub { owner = "mzimmerm"; repo = "ob-dart"; - rev = "ded30450a1550af30edb422cfa8cb7b43995b684"; - sha256 = "0896mpjbl5j1b4d0h25k03xbi8dzb99gz1gvmwj5x1i7fcflhv6r"; + rev = "2e463d83a3fe1c9c86f2040e0d22c06dfa49ecbf"; + sha256 = "0qkyyrrgs0yyqzq6ks1xcb8iwm1qfxwan1n8ichmrsbhwsc05jd3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb3219b9623587365f56e9eeb4bd97f3dc449a11/recipes/ob-dart"; @@ -45596,12 +45977,12 @@ ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-prolog"; - version = "20150530.937"; + version = "20170102.953"; src = fetchFromGitHub { owner = "ljos"; repo = "ob-prolog"; - rev = "548986d0e6f678789216a882f0a19daf1b89ab93"; - sha256 = "14scbds1rlmii52i0zr3s0r1wmga7qysj63c2dpinhagxa36d51n"; + rev = "7e94309d3a21d7e265f3a85b41801397f286af00"; + sha256 = "0qxpgnjrx04dl43i949vcwv70sc7i23ivyvfk82hdvl8c2lwfd7w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fb87868cd74325f0a4a38c5542c264501000951d/recipes/ob-prolog"; @@ -45659,12 +46040,12 @@ ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }: melpaBuild { pname = "ob-sagemath"; - version = "20160922.1638"; + version = "20170105.516"; src = fetchFromGitHub { owner = "stakemori"; repo = "ob-sagemath"; - rev = "5715748b3448b1b1e4856387c5486c7b56c0699b"; - sha256 = "1jhzrlvwf02g0v4wybyry6n9dqcihv47n11m1rpmaxpg2z8551rb"; + rev = "dfa6cf72a0e38d7d4f0f130c6f2f0f367f05a8ea"; + sha256 = "1scyjca5niiv1ccr18ninpb0fmgyqklbn6z9pja84a2wb1w9r6mm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath"; @@ -45974,12 +46355,12 @@ ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ocp-indent"; - version = "20160428.2334"; + version = "20170105.122"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-indent"; - rev = "c0d5d453e192a5301e20042c6984823ec46b64d3"; - sha256 = "1wv24c6lybjkx63gl6lm2gvc2faw6nibdhi5w9yqgkaq6x6d7jvh"; + rev = "4bd1a2a4df1757dfc13e19b29b74e21a9b074f99"; + sha256 = "07ng57g25nik345p9cnjrxf7mpcfi3wqqbmk2i4yxyd4cai8hp1f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1af061328b15360ed25a232cc6b8fbce4a7b098/recipes/ocp-indent"; @@ -45999,8 +46380,8 @@ src = fetchFromGitHub { owner = "syohex"; repo = "emacs-octicons"; - rev = "b993e666977e92432eab197c02728f18e81eaa72"; - sha256 = "13v7nivp2rdqg6ndp553mlkkxh9cz8fn8n62qwl5sib7svcr2jwc"; + rev = "a61e561966ffd8faa3b48ce5b3a4eec10c59708b"; + sha256 = "0w98ii2ny57al94a4h927xx1hn99df5if543v2gh36zqdlwc7xci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c62867eae1a254eb5fe820d4387dd4e8a0ff9be2/recipes/octicons"; @@ -46037,12 +46418,12 @@ octopress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "octopress"; - version = "20161009.1232"; + version = "20161222.343"; src = fetchFromGitHub { owner = "aaronbieber"; repo = "octopress.el"; - rev = "0e06723eb725e775bd4e3d506695f5b902b94b0d"; - sha256 = "0hj96wcd1dpvm3y4h0chfb4539s1pvaiiyxqy95a6dsl57y38l1j"; + rev = "85bab12adbd985767233eb1622c4b8f7c1fe7e1a"; + sha256 = "012g0mf8g602f53x3bc35ahy4bq31s3m7cv13hm46zj8syvdckvq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7205d3d43797755077f19f57f531b4b39e77bae3/recipes/octopress"; @@ -46272,8 +46653,8 @@ src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "f956929891e77ba4ce2fb1361129d5d3ebc7bb55"; - sha256 = "1xds6fqs1l6q9vak3v4xlzl1w084mhz86xrnycibcwm8q3q9hmb3"; + rev = "e7eaa1202486f996121cc0ef17a8d72b915c8165"; + sha256 = "1f66k2l996vzf5rm2scyz4bv1cyn365a8yfh1cfq13vrmvah57xb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp"; @@ -46381,10 +46762,10 @@ }) {}; oneonone = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild { pname = "oneonone"; - version = "20151231.1541"; + version = "20170101.1104"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/oneonone.el"; - sha256 = "05njigqi9061d34530d76kwsdzqgk9qxnwhn9xis64w59f5nzf1h"; + sha256 = "04jjdfbn8ah3gk4fpc56il8j4q52l9raxkbkxivqn440as7nkrn4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/oneonone"; @@ -46734,12 +47115,12 @@ org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-board"; - version = "20161120.1201"; + version = "20170103.239"; src = fetchFromGitHub { owner = "scallywag"; repo = "org-board"; - rev = "cdb62dd5bf1e316d2dcc6da9661231f6c8e3be72"; - sha256 = "0clpx15lcbjsml10z87zbbi3jwzm76f01f7ikgjj8y5xxj09nhh9"; + rev = "55c52745f6f156062a7187795b6b0c6aaa1f1e2b"; + sha256 = "0ca8lbm5gzcmpzwnghs0f8klxrz5sy1brw78h7rhpv4rdwfw1ji5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board"; @@ -46965,12 +47346,12 @@ org-context = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-context"; - version = "20160108.214"; + version = "20170107.537"; src = fetchFromGitHub { owner = "thisirs"; repo = "org-context"; - rev = "d09878d247cd4fc9702d6da1f79eca1b07942120"; - sha256 = "0q4v216ihhwv8rlb9xc8xy7nj1p058xabfflglhgcd7mfjrsyayx"; + rev = "a3b4a4ce6d15e3c2d45eb5dcb78bea81913f3e21"; + sha256 = "18swz38q8z1nga6l8f1l27b7ba3y5y3ikk0baplmich3hxav58xj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f33b6157eb172719a56c3e86233708b1e545e451/recipes/org-context"; @@ -47070,12 +47451,12 @@ org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-download"; - version = "20161119.315"; + version = "20170105.1740"; src = fetchFromGitHub { owner = "abo-abo"; repo = "org-download"; - rev = "37d323034b09fe17029985aa556999acb2f9a0e5"; - sha256 = "0g77grkhy76nlxq4fblw3biiik5mpq7r444dmvwi8fslkyshfkgs"; + rev = "bbfca2fe4149f21105c70d3df76bb789b3868643"; + sha256 = "19729mfbvsi2gpikv7c6c5a3ah7vrxkjc3s863783kginq28n8yl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download"; @@ -47262,8 +47643,8 @@ src = fetchFromGitHub { owner = "myuhe"; repo = "org-gcal.el"; - rev = "5d3cfb2cfe3a9cd8b504d4712a60840d4df17fe6"; - sha256 = "0hjiza2p7br5wkz1xas2chlzb2d15c3fvv30232z0q5ax9w428m0"; + rev = "d32031f7c488be0d9845c47cc1452d6d6489e561"; + sha256 = "0b3jwrfr55hqar5kyhv4wg05x21gzxab0n93xm1371vimhahgmbl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c2d5bd8d8f2616dae19b9232d9442fe423d6e5e/recipes/org-gcal"; @@ -47381,22 +47762,22 @@ license = lib.licenses.free; }; }) {}; - org-jira = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "20161209.2253"; + version = "20170111.2044"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "370c05876f151e7aba9c63562d41d9b7cade30ed"; - sha256 = "0scslv9il8i6yz2akrz88q7dig1lf2sz34c7hn2adbkl0ykj4wh6"; + rev = "af4115f4e8b4e77de5642fb28ce6d5e0d7cb0b70"; + sha256 = "1g775f9gpl0nqq3vn6h9cnjazimn9bjwk31dc7fdylz3nf7f3h03"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib"; name = "org-jira"; }; - packageRequires = [ cl-lib request ]; + packageRequires = [ cl-lib emacs request ]; meta = { homepage = "https://melpa.org/#/org-jira"; license = lib.licenses.free; @@ -47405,12 +47786,12 @@ org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-journal"; - version = "20161024.46"; + version = "20170104.648"; src = fetchFromGitHub { owner = "bastibe"; repo = "org-journal"; - rev = "c5c8724ca987da77446161c0400d444ebd5bd983"; - sha256 = "17pjhs6x2qnqrag56f7rgnraydl6nbz6y21hj981zsjy3mv899hs"; + rev = "008ef4549135a5daa2382e57a4d04a439d22cdc6"; + sha256 = "1m0fmyj4rzc8hdxjmfzianzna6929p5xfrwj0azybv9cmcwfyw8w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/org-journal"; @@ -47471,8 +47852,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "901d2470ddc862b07a2cbf30d3b0e5fed997030b"; - sha256 = "0absbqlgghp3znlq0pkw4261f3liv5hcn8ydfi66ar6rx2awp92w"; + rev = "4d0609f8af0db7248fa5f8eb2b69ee02665e8cbd"; + sha256 = "1kv13imxw6k4mv8hi2ns80p78zc0r8y91mcv01nvpzvh28qnkwa2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -47488,11 +47869,11 @@ org-mac-link = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mac-link"; - version = "20161126.239"; + version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "901d2470ddc862b07a2cbf30d3b0e5fed997030b"; - sha256 = "0absbqlgghp3znlq0pkw4261f3liv5hcn8ydfi66ar6rx2awp92w"; + rev = "4d0609f8af0db7248fa5f8eb2b69ee02665e8cbd"; + sha256 = "1kv13imxw6k4mv8hi2ns80p78zc0r8y91mcv01nvpzvh28qnkwa2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -47505,6 +47886,27 @@ license = lib.licenses.free; }; }) {}; + org-mime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-mime"; + version = "20170110.2011"; + src = fetchFromGitHub { + owner = "org-mime"; + repo = "org-mime"; + rev = "e554d8821d8513d4e8c33ca6efb147e3dfce2a5b"; + sha256 = "000zgp2palvn12rahbjg8vrl4r3x2gjzbxxw2fkaqc2bx4rkjiv7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; + sha256 = "14154pajl2bbawdd8iqfwgc67pcjp2lxl6f92c62nwq12wkcnny6"; + name = "org-mime"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/org-mime"; + license = lib.licenses.free; + }; + }) {}; org-mobile-sync = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-mobile-sync"; @@ -47622,15 +48024,15 @@ org-password-manager = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, org, s }: melpaBuild { pname = "org-password-manager"; - version = "20160430.1851"; + version = "20161226.1624"; src = fetchgit { - url = "https://git.leafac.com/leafac/org-password-manager"; - rev = "5dffcd5f7d7f1852fdd31a193bea5c70ea130082"; - sha256 = "023xsyvppq771yvxd9kqhn9lffhr83sfb0h9g405ayfjys94m2xd"; + url = "https://git.leafac.com/org-password-manager"; + rev = "b4c8de24950d9c13e90277359d078d2dc2b01063"; + sha256 = "0azk28ib6ch3anav7xlw41lqx5lfcqwg85sai4jk6gb9qgnibv5v"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5a8ee7c233b8dca97fd7a4a0527657050714286e/recipes/org-password-manager"; - sha256 = "021yhp417b9c8cjh8ynmz2fqyplpr2qvc0djxf74kd8lhn4pl397"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager"; + sha256 = "0n07k2nng3zkrcif85f1r2g2l4vha78lmrdnj590axn7l5q5fidm"; name = "org-password-manager"; }; packageRequires = [ org s ]; @@ -47837,12 +48239,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20161208.1825"; + version = "20170107.1308"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "f5a5e5e20e5f99d069d3fd8c89ee5b186a02f1de"; - sha256 = "0szn5rg3xwlfgkq26fadkdsxdx2a1srshwcri9j0rlj4111c2fp4"; + rev = "31e2e9cd247a4613bcdf45703473a6345b281ee5"; + sha256 = "15lr7v5p1n46m3lfh84fwydkbxj9x11vd81x6i5adgj68msh0pcg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -47928,6 +48330,27 @@ license = lib.licenses.free; }; }) {}; + org-seek = callPackage ({ ag, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-seek"; + version = "20161216.2102"; + src = fetchFromGitHub { + owner = "stardiviner"; + repo = "org-seek.el"; + rev = "1f51e6634e3b9a6a29d335d0d14370a6ffef2265"; + sha256 = "0aq3af6fd16lm9iirzya6hmc8g48kfp8pc4dx51mgb5d6jjiizkv"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/05a83750e745f16b15cbdf123165a3192363bfd1/recipes/org-seek"; + sha256 = "08l5zl3wk2f632hslcl5fi9ylaml5my6qx481yvdrbi6m8bchkpp"; + name = "org-seek"; + }; + packageRequires = [ ag emacs ]; + meta = { + homepage = "https://melpa.org/#/org-seek"; + license = lib.licenses.free; + }; + }) {}; org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-sync"; @@ -48316,12 +48739,12 @@ organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "organic-green-theme"; - version = "20160919.229"; + version = "20161222.232"; src = fetchFromGitHub { owner = "kostafey"; repo = "organic-green-theme"; - rev = "3b4601264c41ddbe62ba25a78c00365379cd2c9f"; - sha256 = "0sb17krqla5l2bk14p55dbxxkghsvs6ynsmcjg7qlhspv53zdcn4"; + rev = "dc66586b8581b35a723f68211fb1efeb7f00ffef"; + sha256 = "012s9m3cysnfbr0s2l53inm3k06k7ra8jlp68cdnslhb41az2kp7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9383ef5f0372724b34f4bb9173ef8ccbb773e19e/recipes/organic-green-theme"; @@ -48925,12 +49348,12 @@ ox-clip = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, org }: melpaBuild { pname = "ox-clip"; - version = "20161012.1107"; + version = "20170108.1348"; src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "6f9cf1691cd8e597f3c6ca20ef299d5c62c9920a"; - sha256 = "15i877mr3mwzh44dzi1y4rx86kkx783fg3lai78vsby2c7jd0w42"; + rev = "0e9fa4ba5fc454e2312f8b3a6eb86cb63d3ff7ec"; + sha256 = "12qp9s9h56230882dfqz5006f5mjkxxvsp87y8n1jyx4vs10rk4i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -48946,12 +49369,12 @@ ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-gfm"; - version = "20160906.1035"; + version = "20170104.249"; src = fetchFromGitHub { owner = "larstvei"; repo = "ox-gfm"; - rev = "cc4f3cdb0075d988d4ba3e4c638d97fd0155ab73"; - sha256 = "1wx58j4ffy9sy63nrywjz23yyy4948bjlly0s9sk2yw0lmzvwpa3"; + rev = "0741216c637946a243b6c3b97fe6906486c17068"; + sha256 = "1d1341k9kd44wm8wg2h20mgsn7n0bbsivamakn7daxsazym2h89f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10e90430f29ce213fe57c507f06371ea0b29b66b/recipes/ox-gfm"; @@ -49030,12 +49453,12 @@ ox-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-jira"; - version = "20161026.429"; + version = "20170112.1537"; src = fetchFromGitHub { owner = "stig"; repo = "ox-jira.el"; - rev = "1a73ccb857fa5ded871808f0283bd7d727c54f61"; - sha256 = "0zab9dfzjb9qkxisx7a0wrqspf2di5xrap6gb13qxnaknmpavp28"; + rev = "3a2467d4050637a0551e1fac957f85644147d280"; + sha256 = "1c09rfwx5ywcdbjsmkb4a6ixmqn1f289986dx96pvh26jnh2k2vp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8a77d9c903acd6d7fdcb53f63384144e85589c9/recipes/ox-jira"; @@ -49072,12 +49495,12 @@ ox-mediawiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ox-mediawiki"; - version = "20161115.541"; + version = "20161228.850"; src = fetchFromGitHub { owner = "tomalexander"; repo = "orgmode-mediawiki"; - rev = "9017740cbe5866e21d81838e540dec310cc0dec0"; - sha256 = "00c7l8skxjkphqpviwkgl28gqsj5cm63h64ffg09gkvp42mwjshz"; + rev = "9e13392fe88817564f46a7a9f1eadebf54a2c346"; + sha256 = "1x584gbwr1jhbxgzmjr6z801lqzqcaqzypkz25zz2spmh4n8fz9f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/24244d146306ce965df382c8958c7574c74313f2/recipes/ox-mediawiki"; @@ -49198,12 +49621,12 @@ ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-rst"; - version = "20161006.821"; + version = "20161227.1109"; src = fetchFromGitHub { owner = "masayuko"; repo = "ox-rst"; - rev = "b4aceca6babd5f59a14225df1e3e99a3e313bae7"; - sha256 = "13kk5cb2v1pv0zjrqvhprqpxxh96xv7jv920jgznbvgypvwbs9p0"; + rev = "7b6095c53211978c73e1d686cd2d672cf28eb4c3"; + sha256 = "05fb1xflv82600lzlm3icf4vvcfiyh8lmcp0f4w8xybkp0f4kdpc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3af3905e1ce36397645a54078280852a8a7eb1eb/recipes/ox-rst"; @@ -49597,12 +50020,12 @@ pager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pager"; - version = "20100330.1131"; + version = "20151201.1720"; src = fetchFromGitHub { owner = "emacsorphanage"; repo = "pager"; - rev = "347e48d150d5e9a1ce2ca33ec12924d5fa89264d"; - sha256 = "1dq5ibz7rx9a7gm9zq2pz4c1sxgrm59yibyq92bvmi68lvf2q851"; + rev = "5c791ed23f1136e04040d6f4bc9b4ca5b6dc919f"; + sha256 = "198zlh7zrql1185b9qjim44a09kbbgs9zyahak9nhv1gxqn7mrdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/pager"; @@ -49638,10 +50061,10 @@ }) {}; palette = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild { pname = "palette"; - version = "20151231.1545"; + version = "20170101.1109"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/palette.el"; - sha256 = "1qnv84y0s437xcsjxh0gs9rb36pydba3qfrihvz5pqs9g9w7m94k"; + sha256 = "0kx41b6axq9ba1mhp7icjq165aklskiq9ddmcn8yrcx480v4gf11"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/palette"; @@ -49928,12 +50351,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "20161119.2133"; + version = "20170113.956"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "9e1ce1dfb5e0958d5fbff62ed09357db14082a38"; - sha256 = "1nq99i2piyd06yc0vsxkrfxsnj0yza3i9rdglvfaic9vnpf5riz3"; + rev = "a91b1ee5392c6a98c102ddba2f0c15ab67f8ad1b"; + sha256 = "09337fpv492rzd2ah7d8kxyv5spcgwf58xr943ya09sgi2invkbx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -50030,6 +50453,27 @@ license = lib.licenses.free; }; }) {}; + passmm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "passmm"; + version = "20170113.837"; + src = fetchFromGitHub { + owner = "pjones"; + repo = "passmm"; + rev = "076df7221f9450b96855c36684ae4a7481e0bb71"; + sha256 = "0nap42jhjh3nq57a5hpv6wd8gli6i9g6n5rbjza685sifqn27dbf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae2a1e10375f9cd55d19502c9740b2737eba209/recipes/passmm"; + sha256 = "0p6qps9ww7s6w5x7p6ha26xj540pk4bjkr629lcicrvnfr5jsg4b"; + name = "passmm"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/passmm"; + license = lib.licenses.free; + }; + }) {}; passthword = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "passthword"; @@ -50078,8 +50522,8 @@ version = "20151027.1449"; src = fetchgit { url = "http://git.zx2c4.com/password-store"; - rev = "0b2f803fe61992af02b8820c400984b1f615a299"; - sha256 = "011sz1rlr7mbsvn1z1kxl3psjv3g2vkbndcim5jnp1wwlc5bibh3"; + rev = "77f1384a6321eef06265ea5e5b11eabdc53ab720"; + sha256 = "0b4qlbrz6g39x1p89lx3xk4h7159jj14rf6mgsyv1fasc7yyxxiz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e204fb4d672220ee1a4a49975fd3999916e60f8c/recipes/password-store"; @@ -50304,12 +50748,12 @@ pcache = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcache"; - version = "20160724.1929"; + version = "20170105.1414"; src = fetchFromGitHub { owner = "sigma"; repo = "pcache"; - rev = "7f441f69bd5ed6cb6c2a86f59f48f4960174c71f"; - sha256 = "0j1p2jr475jkkxcsqm1xpjxq5qrnl1xj1kdxyzhjkwr2dy3bqvas"; + rev = "025ef2411fa1bf82a9ac61dfdb7bd4cedaf2d740"; + sha256 = "1jkdyacpcvbsm1g2rjpnk6hfr01r3j5ibgh09441scz41v6xk248"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/pcache"; @@ -50388,12 +50832,12 @@ pcmpl-homebrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcmpl-homebrew"; - version = "20161122.1843"; + version = "20170110.1609"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "pcmpl-homebrew"; - rev = "eaa725fd86a6ea641f78893021d23a426d62e715"; - sha256 = "0yhy6k71sd00kxadladnkpmragpn1l7j3xl6p6385x1whh58vqph"; + rev = "d001520fec4715c9a4c73f02fd948bac371cc50a"; + sha256 = "0mw8w2jd9qgyhxdbnvjays5q6c83i0sb3diizrkq23axprfg6d70"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/pcmpl-homebrew"; @@ -50723,12 +51167,12 @@ persistent-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persistent-scratch"; - version = "20160404.915"; + version = "20170110.546"; src = fetchFromGitHub { owner = "Fanael"; repo = "persistent-scratch"; - rev = "107cf4022bed13692e6ac6a544c06227f30e3535"; - sha256 = "0j72rqd96dz9pp9zwc88q3358m4b891dg0szmbyvs4myp3yandz2"; + rev = "551c655fa349e6f48e4e29f427fff7594f76ac1d"; + sha256 = "1iqfr8s4cvnnmqw5yxyr6b6nghbsc95mgjlc61qxa8wa1mpv31rz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e32702bfa15490b692d5db59e22d2c07b292d1/recipes/persistent-scratch"; @@ -50765,12 +51209,12 @@ persp-fr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, persp-mode }: melpaBuild { pname = "persp-fr"; - version = "20161108.1138"; + version = "20161226.1241"; src = fetchFromGitHub { owner = "rocher"; repo = "persp-fr"; - rev = "0b2a021be802d5a39f1551c0ad1d8bceaa136afa"; - sha256 = "1m1k6i1h7smfmn68k29bq3w301bwf76l0r8qhq5drd51nk0vp0dc"; + rev = "ba989ad309c2023d1826e79446908bd1b881a56a"; + sha256 = "1l9yb14sqxxfxzh76yv415ifnmrdi5qqp4m0858drs9wcm9f23pm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e09213dddf003a1275eafb767431a507ecf7639/recipes/persp-fr"; @@ -50786,12 +51230,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20161214.243"; + version = "20170115.651"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "28eaf5e56e18be4bab1639ce2c31b64bd2828746"; - sha256 = "1y4l21f81xc1bz9w0jm7vyab00k402zjlbdgki618sas9bk4rfdk"; + rev = "06d56333d738c57fa543e47e7eb1c4962bd14344"; + sha256 = "0khzfh7qqfqpmjqb0kaz3s5kpf1a8inxln5awap5xh2z6fv6wysy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -50846,6 +51290,27 @@ license = lib.licenses.free; }; }) {}; + perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: + melpaBuild { + pname = "perspeen"; + version = "20170117.417"; + src = fetchFromGitHub { + owner = "seudut"; + repo = "perspeen"; + rev = "057f145f88fdfc021c574b7c263269e381494f4b"; + sha256 = "1a5cjvc21ga2j2y7rxcfxwkc0x9v5mrwla9prm021q4sg07gvld7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/19bead132fbc4c179bfe8720c28424028c9c1323/recipes/perspeen"; + sha256 = "1g8qp7d5h9nfki6868gcbdf9bm696zgd49nsghi67wd2x7hq66x1"; + name = "perspeen"; + }; + packageRequires = [ emacs powerline ]; + meta = { + homepage = "https://melpa.org/#/perspeen"; + license = lib.licenses.free; + }; + }) {}; pg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pg"; @@ -51206,12 +51671,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20161213.806"; + version = "20161217.537"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "cca3fe0fdbabb9f8256fef948972e5d5d823dd69"; - sha256 = "11xdjdlvld9xnvwbaglc57n17v56p8jqd2qb6cqz3i1cvqhpfm8y"; + rev = "a6c998937341f49138f07c15050efe7e5809be23"; + sha256 = "1g0m9vsx0n2rzph4ipyab8fl6bv26y2dmyrgkici545k2mhhhiqp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -51311,12 +51776,12 @@ phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "phpunit"; - version = "20160808.212"; + version = "20161219.319"; src = fetchFromGitHub { owner = "nlamirault"; repo = "phpunit.el"; - rev = "165ca257d4840c266e1e79e806b4b943b5785fe6"; - sha256 = "1xgjhq1nxj4zfcns0q8a1kdlmqcjrxlblyj9vrspv1qck3akrp3z"; + rev = "791d1b33b63887cdeaf287fa657b8109f9d1dd18"; + sha256 = "0j9ym19pz17wsjh1ky65x9mz8aiiryxbw1nsygvy9isbdzjx591k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit"; @@ -51647,12 +52112,12 @@ plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plain-theme"; - version = "20160903.1029"; + version = "20170114.1146"; src = fetchFromGitHub { owner = "yegortimoshenko"; repo = "plain-theme"; - rev = "4210122812df9b5fe375ad35a3b933bf040460a3"; - sha256 = "184rw6pri55mkab8wv2n483zp0cvd6j911abq290pcqw1pgswcgh"; + rev = "43fc59d487d39e6110230a073f1376ab877aa739"; + sha256 = "0g44qdpn3ni291awjklia4r26qyiavpjib04k761hfacrdkvsdys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme"; @@ -51710,12 +52175,12 @@ plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plantuml-mode"; - version = "20161111.205"; + version = "20161225.1142"; src = fetchFromGitHub { owner = "skuro"; repo = "plantuml-mode"; - rev = "87417ad75b215ababf153cba533575ac0273a5db"; - sha256 = "1jrck9wybpm2p2imjn0x6g3ybasiqkfzxc1halm3rq6xvc4zvrsm"; + rev = "c7e83c260778467be5f82500a5541ce76da662ac"; + sha256 = "0lf2438ia39idxbz2b7qaagajnlfgf74cgvwppdl53hsy12b421n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode"; @@ -51917,8 +52382,8 @@ version = "20160827.857"; src = fetchgit { url = "git://git.savannah.gnu.org/gettext.git"; - rev = "89b77b3e3229c3df9c67de17fdef1086422fe6cc"; - sha256 = "1sbdk6ijak2p1wkm9cbgvvml2hx1kc7ny9p0z9zfw9lz9mrwckdi"; + rev = "b631191323cd789137c14a3e00ea2d355c2fbbdc"; + sha256 = "1qgsdawr0b05h8xdc8mw2rkzs6y66rl2cqmva9k82f7776d3x02w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode"; @@ -52057,12 +52522,12 @@ polymode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "polymode"; - version = "20161205.46"; + version = "20161218.1326"; src = fetchFromGitHub { owner = "vspinu"; repo = "polymode"; - rev = "ef56a732cbfe86e982d5c982c0c7bd3909c7f840"; - sha256 = "13pj6hxz5018qyv08xh9q3bmng9qrikpnv55a3c1y8v0z68ppmkr"; + rev = "a29b8a07cc9081bd75114d68fc7afdcef2e5bc94"; + sha256 = "1vsvnia8px35ip13zc94l7nh4201z6z15dzrhfcj6bd0jnbqpxh6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/polymode"; @@ -52476,10 +52941,10 @@ }) {}; pp-c-l = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "pp-c-l"; - version = "20151231.1547"; + version = "20170101.1116"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/pp-c-l.el"; - sha256 = "10gsdjdr8qngimqh57qxcljjnypbf38asxqb3zlfwc2ls52fc19q"; + sha256 = "07favccg34khq0rnkdmbmhagpn6sg0vrmxcql35vh1p0jalp208s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp-c-l"; @@ -52494,10 +52959,10 @@ }) {}; pp-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "pp-plus"; - version = "20161114.1346"; + version = "20170101.1114"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/pp+.el"; - sha256 = "1fc2ii689f92255817cv0aiz0h83z1iyrgxmywpayiv58r8j3k4f"; + sha256 = "0v8gm9z9dqxmqqvgz4dwmh79ssmir0zf4p3c6wbwrbak16b2ad6m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pp+"; @@ -52596,10 +53061,10 @@ }) {}; pretty-lambdada = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "pretty-lambdada"; - version = "20151231.1548"; + version = "20170101.1117"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/pretty-lambdada.el"; - sha256 = "1fn24399wsn12453py0hw2vbbkrkakiwi06cjvjzsdk7g3326ma4"; + sha256 = "17vji7y92ahmhff6ax7znhi7dbfhi8zpghhnl408n5hzcvmqmf06"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/pretty-lambdada"; @@ -52969,12 +53434,12 @@ projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20161215.443"; + version = "20170106.606"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "7717fb86c1959e936f13cf2407f1ffd1c9c18e7f"; - sha256 = "1ycz38bgdgcb57i4l52lqza3ffy9pva8lxicz6adk8vfx2bl85rc"; + rev = "cdf9c228ccdcb57b73184f10ea3f1e2e4e03d320"; + sha256 = "02md2hmf21w03xc8imqmcbhildnkj9s69pig1zd9nbs1svgqbycp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -53074,12 +53539,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "20161130.1025"; + version = "20170115.731"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "fe0cb5597d9e87ceebfadd1815beadfc04a194f1"; - sha256 = "0yg7xbv0mnrcc6kgh8ci6pxzfjiq1qkrw6hx2zs5m4ryfrrfclz2"; + rev = "8c41f3c92cd7f5eb5a983f6f3d42cb67dff04366"; + sha256 = "1rial7py4n451d6ylymf5q4cb57ala4rvvi7619r1c5y1m493qi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -53099,8 +53564,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "ddb7dcadf8980b9f458343aa853e4b6c3febaee0"; - sha256 = "0ln81fgvp8sk7f01icrjz8nyicd71kp7fg2rsh9hxjr948jx5ncd"; + rev = "876d9b410f9a183ab6bbba8fa2b9e1eb79f3f7d2"; + sha256 = "0s2vg3c2hvlbsgbs83hvgcbg63salj7scizc52ry5m0abx6dl298"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/195f340855b403128645b59c8adce1b45e90cd18/recipes/projectile-ripgrep"; @@ -53141,8 +53606,8 @@ src = fetchFromGitHub { owner = "anshulverma"; repo = "projectile-speedbar"; - rev = "93561bbe264b23958b72f951d2f0701450ad01e9"; - sha256 = "1cn5wvagbgn4snrv8f6y6sgq7l51bd0l5z0ns3vs4753wx2y5dxw"; + rev = "a00c6c0e52acd2223997b1a7a996cd786e68f6f2"; + sha256 = "0bsk1336ak5bq9v26m2ql61yvhv15gyh8wrc6j4c655lxysbq9gs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8cb5a175258404c347ffa30fca002504467a0/recipes/projectile-speedbar"; @@ -53351,8 +53816,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "83d681ee2caef1feb009656417830f846382d8ba"; - sha256 = "12a94bxkg18mfv9a4pkqzyjiinm1b9wflbk9ib3ialmdadrmjdda"; + rev = "c9cd6acd71e928164db10602b9d0837216ee367e"; + sha256 = "0rm2476gvsqsyhblw0bwa4qacpdckp6r44d2qrznysdq9086lyjj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -53368,12 +53833,12 @@ psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "psc-ide"; - version = "20161212.1626"; + version = "20161220.553"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "30ec730fdf887579df7bed9f43b2fc25be2c9307"; - sha256 = "1znprm47539g5jbygqr9ln1m7y37vgx46rhax13fm4cxgsm657vc"; + rev = "5a1cce36241cd0ec3781d748d6ef151e685079a3"; + sha256 = "191gvvliarvvkcjw54ajjfshv6n29sk5m0dj3h8j5zw5ndnlw6cj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide"; @@ -53410,12 +53875,12 @@ psession = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "psession"; - version = "20161119.2248"; + version = "20170110.228"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "psession"; - rev = "33f9020e87732e14473c5fc4d986e572fd95c5f3"; - sha256 = "0ag57g4w44w90gh09w774jmwplpqn7h1lni1kwldwi7b7n3mhli7"; + rev = "3488f7777486aa6c85ebc04d011860163d3cf0fc"; + sha256 = "0v9pg9ywwdqmahmmhg4gwzmibznlbmiyz4hf90brb59ns013jb53"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/669342d2b3e6cb622f196571d776a98ec8f3b1d3/recipes/psession"; @@ -53473,12 +53938,12 @@ pt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pt"; - version = "20160119.817"; + version = "20161226.1159"; src = fetchFromGitHub { owner = "bling"; repo = "pt.el"; - rev = "97e04eb77154234d946064a573762bcd72219f75"; - sha256 = "0ca8j7xlqxbidqfz2iarwn7qq4v12pwvsq6vzj2473n2g1c09xzj"; + rev = "6d99b2aaded3ece3db19a20f4b8f1d4abe382622"; + sha256 = "1vi97hgwrf7n8vsbkvvhn398m20755jnbbbz4kxgqfmcgpimc8nc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34c51783af154f203489f5f7df7012ca61932caa/recipes/pt"; @@ -53491,22 +53956,22 @@ license = lib.licenses.free; }; }) {}; - pug-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + pug-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "20161208.2016"; + version = "20161221.1154"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "e8099627829aef2d382d9a5df4a24881086879dd"; - sha256 = "1w9lb3r92l0rcflkivd0k9gz2gy33xpmyxd1ikjbsr2mf7h0r1i7"; + rev = "8967d57715ad303b9c987f4390a18c51c2f30cb3"; + sha256 = "0kk5i7dynxg53g7wx5k6lkk1015pqphxzanqw0m6nhvv1p56w84x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; sha256 = "1njhr95y2rx7inpl9phxxz580844p2iadqlga1kj7xzvjz698x85"; name = "pug-mode"; }; - packageRequires = [ cl-lib ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/pug-mode"; license = lib.licenses.free; @@ -53599,12 +54064,12 @@ purescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "purescript-mode"; - version = "20161013.911"; + version = "20161216.133"; src = fetchFromGitHub { owner = "dysinger"; repo = "purescript-mode"; - rev = "96c5ce0b22023ff6e2944d43ffeb34a34dd57db6"; - sha256 = "0znwimxdh0jc3z0y1b9lrv680wi0ixlnmhm5i5xypkxis65n2yrb"; + rev = "c88126070c052d636f4dad5525846a1b200fce43"; + sha256 = "1ndclsywvh5x06gmvk44zjlgfamdn55lygdgxf3x1vrznvr0jawy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77175fa470e517fa134751fbb38e144eb5b979ff/recipes/purescript-mode"; @@ -53680,19 +54145,18 @@ license = lib.licenses.free; }; }) {}; - pushover = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + pushover = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pushover"; version = "20160718.857"; - src = fetchFromGitHub { - owner = "swflint"; - repo = "pushover.el"; - rev = "c43f149eaef832f6af399723a5a59424aa093aaa"; - sha256 = "0vrx8m7jcxavbfsyh35mf289vfyal0yrfl6h2m2yfx81whbinb5j"; + src = fetchgit { + url = "https://git.flintfam.org/swf-projects/emacs-pushover.git"; + rev = "0d821fc23818918bf136e47449bce53d4e51e404"; + sha256 = "0v0dkhymh81z1wcd3nm5vrs5scz9466brr8xng0254bi3yn0yi57"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/c9f2e3a155266e7534b4e77138fdfba4fafe9bac/recipes/pushover"; - sha256 = "1ja3xp8nxzyhzg85791s4rb9rm938fyvgkdjxhyyy36wmda1djwr"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/2e12638554a13ef49ab24da08fe20ed2a53dbd11/recipes/pushover"; + sha256 = "0im5bf2r69s2jb6scm8xdk63y1xi5zm4kg9ghfixlvyvipfli4kl"; name = "pushover"; }; packageRequires = [ cl-lib ]; @@ -54039,12 +54503,12 @@ pyimport = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "pyimport"; - version = "20161209.557"; + version = "20170117.402"; src = fetchFromGitHub { owner = "Wilfred"; repo = "pyimport"; - rev = "c0c12b64a189f99d3b1477d2dea35528a856c860"; - sha256 = "1kn38j9fgn0ja2xhvj69jdw5h6j5dqnnqk0zzd6ypk5zbwhxncp6"; + rev = "e2f6d2cf5a6772a8de698e67768ae2f82a43419e"; + sha256 = "0lkkycflmkzziwr90njx8d68903m1bpb71awlb23dslw92qvl3fj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport"; @@ -54085,8 +54549,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "ea4273cdff22cb5c0bc5fd8a408cd03b454c43bf"; - sha256 = "18kb7ia9wm9j3iyfhklvb56x0kw1zawa5q80z3vmmfx381v33wj6"; + rev = "da1da56853380a5a387ad287f4398402b14ef123"; + sha256 = "1rvflbiz6ick1v2v6fw3f227rgs5fvhxaxyhvri0lv5n6ixljk8l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -54228,12 +54692,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20161124.930"; + version = "20170117.130"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "d30c9033fde2f4ce03b4f4792792a9603cd26bab"; - sha256 = "1bgzkbhl00cc60y0d34cx7i6y560wf9jx9fb3d4wz06vh3322mb4"; + rev = "d20b482c2c10f086174c6bf7d5aa86867d9a9b8a"; + sha256 = "01jhzrm4w4lpslivkc1d9f00qmnnrfai5agl7pv6fjfhd7njwzg1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -54246,6 +54710,27 @@ license = lib.licenses.free; }; }) {}; + python-switch-quotes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "python-switch-quotes"; + version = "20161228.9"; + src = fetchFromGitHub { + owner = "werehuman"; + repo = "python-switch-quotes"; + rev = "93f1e9b40e061a6cea480139e8b1362b6404abd0"; + sha256 = "1x04hnf3m8cgqp0i566q4n7kh59cayzfxka3g07kv0h543xbys4n"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d99fbd3d0c486bf89c9c0937e2ebf378be39293f/recipes/python-switch-quotes"; + sha256 = "1wc27q9ac8p7c5mfk3kznbmdd5ds4ray0csgba79n19g152y5jjc"; + name = "python-switch-quotes"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/python-switch-quotes"; + license = lib.licenses.free; + }; + }) {}; python-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-test"; @@ -54519,22 +55004,22 @@ license = lib.licenses.free; }; }) {}; - quickrun = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + quickrun = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quickrun"; - version = "20160808.1753"; + version = "20170114.645"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-quickrun"; - rev = "487a74c7db513ceba86e849c8f42f834234c1f7b"; - sha256 = "04n6y5ymn29saaikzfg8ak57kqysh8915bvvzkiijmzbqr6ndsgj"; + rev = "70e93e06778f44113f405aedec6187b925311d57"; + sha256 = "0swbgsidq11w7vyjhf06dn8vsj06j9scj8n2dm9m7fasj0yh3ghw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun"; sha256 = "0f989d6niw6ghf9mq454kqyp0gy7gj34vx5l6krwc52agckyfacy"; name = "quickrun"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/quickrun"; license = lib.licenses.free; @@ -54585,12 +55070,12 @@ racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }: melpaBuild { pname = "racer"; - version = "20161209.1533"; + version = "20170106.1524"; src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "485b827cfaca5e4e204e5529912d7999bc29bde7"; - sha256 = "0xjv8pi8rc0dbmllkv8gchp05j1k20pgqdi97h7s0xwjkwcpbqym"; + rev = "d83091ff6b55b4663fed49de63ec2c751cdb2603"; + sha256 = "1fj2zq9cjlnf45z1xqcfir3y739jpiv08sqlgv807i6dgbr0vxls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; @@ -54606,12 +55091,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20161101.1859"; + version = "20170104.754"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "ab625571837c96446e3704febea48b453787c5ce"; - sha256 = "0wnas67q1njg6czx86zywgq6a142rkh8qv4vbdjvqnyxd4y8jrsq"; + rev = "351aa58d75491c789280a3703786f35c8be28bec"; + sha256 = "1dfmjfw0sz0mfqry65nq7811fv4lydqvl8v47k9jw7prw4g29hhr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -54960,22 +55445,22 @@ license = lib.licenses.free; }; }) {}; - rbt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + rbt = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, melpaBuild, popup }: melpaBuild { pname = "rbt"; - version = "20161109.1506"; + version = "20161220.1352"; src = fetchFromGitHub { owner = "joeheyming"; repo = "rbt.el"; - rev = "402d7465f68706d051e8117b6f00ecdc18134f15"; - sha256 = "12kqw7cxv54agy7k8y550cixnv4zjpy8rhamwp36bf6nqch4ly2j"; + rev = "25ed055ffa444cb077042f95622ef253759f3ee2"; + sha256 = "1gv0bm25c5v6sygpcxg1h7cnn8md8q7njh8jz1was5cmgkq3i3kg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7241985be1e8a26a454b8136a537040b7ae801/recipes/rbt"; sha256 = "1mrb6v8zybvhh242vvq0kdvg6cvws7gabfhcydrw5g2njhyqkygm"; name = "rbt"; }; - packageRequires = []; + packageRequires = [ magit popup ]; meta = { homepage = "https://melpa.org/#/rbt"; license = lib.licenses.free; @@ -55131,12 +55616,12 @@ rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rdf-prefix"; - version = "20160813.829"; + version = "20161221.1216"; src = fetchFromGitHub { owner = "simenheg"; repo = "rdf-prefix"; - rev = "07f1b914f0bf0ca154831e13202eacecf27cf4c4"; - sha256 = "0cis7lcsjpr2gbh59v4sj1irkdkzx893rl3z3q35pq2yklrmx9nv"; + rev = "12fdb54d6e7b1e00dba566448280ec878bf9057c"; + sha256 = "1gfhvq2cdvq72jppiajig6khql7f7f9n8q3akb12pipbzak1xw1g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5f083bd629697038ea6391c7a4eeedc909a5231/recipes/rdf-prefix"; @@ -55278,12 +55763,12 @@ realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: melpaBuild { pname = "realgud"; - version = "20161209.1829"; + version = "20170117.415"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-dbgr"; - rev = "7689f4910ce081dcecdcc8a7c534af037c65295e"; - sha256 = "1aq8r2yqwspil9l4jxprkknnj2cl9x9srx4qd8fw07ad7razcf99"; + rev = "20b8d5dd7bd96f4e8d143596a6435d84fb8d4125"; + sha256 = "0ckd7jya4368qin90x20dqf5kh3300n03f9g2qb54s93d430n0yi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; @@ -55326,12 +55811,12 @@ realgud-old-debuggers = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, realgud }: melpaBuild { pname = "realgud-old-debuggers"; - version = "20160805.713"; + version = "20161225.626"; src = fetchFromGitHub { owner = "rocky"; repo = "realgud-old-debuggers"; - rev = "1362a42dec1ee859d4c339cbe6cf4813bf826f51"; - sha256 = "0zf8vxcn0lyajjz2dbmr98k2004qp6ydf3y4a696krvk1gm0vf79"; + rev = "fd38ebe7d4a59786d34b0cf972c315278871bf47"; + sha256 = "1p3dk81f1cyisv6fb7fny6a9nij4c0yljypcdwiy79zq3fniskhp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/260b4d5a85c380dda0f7bb0370e3ffa8cc3c0275/recipes/realgud-old-debuggers"; @@ -55386,6 +55871,27 @@ license = lib.licenses.free; }; }) {}; + rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rebecca-theme"; + version = "20161227.2131"; + src = fetchFromGitHub { + owner = "vic"; + repo = "rebecca-theme"; + rev = "ae1463a7118f5e50ca82267824c86a77e35e9697"; + sha256 = "1k6f90kjsx1mjihy6l7h7f1ld66g0qxkzbbq203010fjdlsmlhk6"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme"; + sha256 = "1m72jqyqx18i1vpj07v3vkbi0di9dks5sz46wb2h0f23xqyx00md"; + name = "rebecca-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/rebecca-theme"; + license = lib.licenses.free; + }; + }) {}; rebox2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rebox2"; @@ -55597,8 +56103,8 @@ src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "1a1df16146118d3e4cdfa1730eb7616550b2c4a4"; - sha256 = "1qvbi0iwbvkyc1wq5kv5jh1lkvmmq56bh53ww921z3fhsvrgkqmj"; + rev = "d06d39486348a74981b2c4c4c2ed3af95b01d5ca"; + sha256 = "0k3f7pa332d0fs1js8hi7zszcirir1943bhkgwfxzsqx17m26x3n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -55718,12 +56224,12 @@ regex-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "regex-tool"; - version = "20160907.2129"; + version = "20170104.1118"; src = fetchFromGitHub { owner = "jwiegley"; repo = "regex-tool"; - rev = "0de0716dc26b1182f7f986d8442345aad135019e"; - sha256 = "1xjm3pqj1cf7cizbc6arqmk608w6cg49j284zrij0bvmyc5pbrj9"; + rev = "0b4a0111143c88ef94bec56624cb2e00c1a054e6"; + sha256 = "03qm8s7nqsj0pjnnb0p84gk7hvad4bywn3rhr3ibzj6hxqvppbqj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9585fc1f0576e82a6a199828fa9773a0694da63/recipes/regex-tool"; @@ -56010,10 +56516,10 @@ }) {}; replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "replace-plus"; - version = "20161209.738"; + version = "20170101.1119"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/replace+.el"; - sha256 = "1898bwn0slhvkqcriwipa8d25554npj9b1hkz7rxz1pw7s8hgmck"; + sha256 = "0cbm5g5d1d4bdfmx3nkldpq8k5ah0cz5ddq7cn4278rjx1h9ml5f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/replace+"; @@ -56092,12 +56598,12 @@ request = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "request"; - version = "20161121.600"; + version = "20170113.423"; src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "4f5dd0aa8b788fe825461dbcccfd5a3fb2750f9b"; - sha256 = "1d3xz5hgb1cpaf1ijk05l1ffr99i621wa0192qiipc6fxxy0gpl6"; + rev = "e2b031a4e7655ce7513b8e7d7f83c024cb2a9f35"; + sha256 = "0r6wf3h7rwjid818aqrvf2r6dwq02mwn3y4lj7lrkl7vyf5g3va5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request"; @@ -56117,8 +56623,8 @@ src = fetchFromGitHub { owner = "tkf"; repo = "emacs-request"; - rev = "4f5dd0aa8b788fe825461dbcccfd5a3fb2750f9b"; - sha256 = "1d3xz5hgb1cpaf1ijk05l1ffr99i621wa0192qiipc6fxxy0gpl6"; + rev = "e2b031a4e7655ce7513b8e7d7f83c024cb2a9f35"; + sha256 = "0r6wf3h7rwjid818aqrvf2r6dwq02mwn3y4lj7lrkl7vyf5g3va5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8d113615dde757a60ce91e156f0714a1394c4bfc/recipes/request-deferred"; @@ -56301,10 +56807,10 @@ }) {}; reveal-next = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "reveal-next"; - version = "20151231.1550"; + version = "20170101.1120"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/reveal-next.el"; - sha256 = "1h27kg2k8f6smbqxandmvg859qk66jydbbbiwwjmk7316k66w8qa"; + sha256 = "0vqacr3q9n772qmyyj35dxkqp79yqrpfhlf8zj70jzg04xzy6f0m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e5dd845c99acaae719562595059154a08a5f00/recipes/reveal-next"; @@ -56362,12 +56868,12 @@ review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "review-mode"; - version = "20160825.1846"; + version = "20170105.2156"; src = fetchFromGitHub { owner = "kmuto"; repo = "review-el"; - rev = "d84a1a017b4c2871a9a39734be08fb8285f0b6a3"; - sha256 = "0b6vhl9cy9p51pa6gk6p3x2bmwsd03c7abkbw8j5gd8r3iyam4ng"; + rev = "fc7a2f152be63874da4211ec0b49ff1fadb6465e"; + sha256 = "1fg18kb5y8rsxnh166r0yj5wb0927rsdhpwmfwq3i9kgycgpznix"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2f9e2667389577d0703874ca69ebe4800ae3e01/recipes/review-mode"; @@ -56440,6 +56946,27 @@ license = lib.licenses.free; }; }) {}; + rg = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rg"; + version = "20170115.45"; + src = fetchFromGitHub { + owner = "dajva"; + repo = "rg.el"; + rev = "96114ceeea83db703f41bed18f03d87e217c1c67"; + sha256 = "00k9lyzy11igk0j1raq3qgymfc872rf85fj42244lpmbnij4hgjd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; + sha256 = "0i78qvqdznh1z3b0mnzihv07j8b9r86dc1lsa1qlzacv6a2i9sbm"; + name = "rg"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/rg"; + license = lib.licenses.free; + }; + }) {}; rhtml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rhtml-mode"; @@ -56548,12 +57075,12 @@ ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ripgrep"; - version = "20161116.211"; + version = "20170116.47"; src = fetchFromGitHub { owner = "nlamirault"; repo = "ripgrep.el"; - rev = "ddb7dcadf8980b9f458343aa853e4b6c3febaee0"; - sha256 = "0ln81fgvp8sk7f01icrjz8nyicd71kp7fg2rsh9hxjr948jx5ncd"; + rev = "876d9b410f9a183ab6bbba8fa2b9e1eb79f3f7d2"; + sha256 = "0s2vg3c2hvlbsgbs83hvgcbg63salj7scizc52ry5m0abx6dl298"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep"; @@ -56821,12 +57348,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20161214.1014"; + version = "20170111.2258"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "66e1d804e53ccbc5bcdcd9d67c77566a08de4b4f"; - sha256 = "1761658vaav6x6b7j2izbprjm3rs3b8jvqkanwjcmhhhfp4ymwxw"; + rev = "6e60bce8ae998e61c9cea6ceff3564a73a9efe73"; + sha256 = "1y9m1dh946qzpad2fp2dlyjsaj9hqhwf8gvg8zffxvchd5clhnls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -56887,7 +57414,7 @@ version = "20161115.2259"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57085"; + rev = "57357"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -56967,7 +57494,7 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57085"; + rev = "57357"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -57191,15 +57718,36 @@ license = lib.licenses.free; }; }) {}; + russian-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "russian-holidays"; + version = "20170109.1340"; + src = fetchFromGitHub { + owner = "grafov"; + repo = "russian-holidays"; + rev = "b285a30f29d85c48e3ea4eb93972d34a090c167b"; + sha256 = "1mz842gvrscklg2w2r2q2wbj92qr31h895k700j3axqx6k30ni0h"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d4830900e371e7036225ea434c52204f4d2481a7/recipes/russian-holidays"; + sha256 = "0lawjwz296grbvb4a1mm1j754q7mpcanyfln1gqxr339kqx2aqd8"; + name = "russian-holidays"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/russian-holidays"; + license = lib.licenses.free; + }; + }) {}; rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20161031.2109"; + version = "20170107.451"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "e32765893ce2efb2db6662f507fb9d33d5c1b61b"; - sha256 = "03i79iqhr8fzri018hx65rix1fsdxk38pkvbw5z6n5flbfr4m0k4"; + rev = "c091852fbda25c62095513753b44d3fcaf8eb340"; + sha256 = "09m20csdn5f33cixq1wzi0682d85ld9rvi408s64h4bzkrgfn6h8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -57212,6 +57760,27 @@ license = lib.licenses.free; }; }) {}; + rust-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: + melpaBuild { + pname = "rust-playground"; + version = "20170106.1734"; + src = fetchFromGitHub { + owner = "grafov"; + repo = "rust-playground"; + rev = "29075a3753cc0b48b4fcc0a99340306a856a8bc1"; + sha256 = "1g0b0jg45pf7xivk8xjsm77vd8fvpp2vwdwvgzr810hj8npnqhs7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ebbcca659bb6d79ca37dc347894fac7bafd9dd/recipes/rust-playground"; + sha256 = "1w29plj06ld3iq8xhjnfh8hphcp7aji15y1xqp8bb9m1k07wza7l"; + name = "rust-playground"; + }; + packageRequires = [ emacs rust-mode ]; + meta = { + homepage = "https://melpa.org/#/rust-playground"; + license = lib.licenses.free; + }; + }) {}; rustfmt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rustfmt"; @@ -57341,12 +57910,12 @@ sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "sage-shell-mode"; - version = "20161026.532"; + version = "20170113.631"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage-shell-mode"; - rev = "ca8930f2f7ba3dcfa6b09d23b9f4cdc5c466d141"; - sha256 = "0mmbx11k8w26mc4f1x43l9nai6s37yjr98wrl4dgz24bg1qh27q1"; + rev = "80f2f7b06e48c2a771411c39f7d0067c9d145050"; + sha256 = "0ljd2v60f9i5pkqw2j8yylv1ya994hymrblx8dks38mx9br8m7b0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode"; @@ -57534,8 +58103,8 @@ src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "035af95164f7bce342d4663aa7da00852dfec500"; - sha256 = "06j16hgvzbbp9d4bvn3fdsmw3isaw017dydjyiqmjpfzbaxg9yac"; + rev = "6caabd4e68fb878e743a29d16356a2c2c3bd7637"; + sha256 = "0fq70lwwv5q0mzxli9x1m244i30nkc457mib07qypax9n51vfqyv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; @@ -57555,8 +58124,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "51923888a39137f2c46bf3a650fef66206e81b2c"; - sha256 = "18vf195fd2p8wiw4qag1pq1vrv6ria8j76lgzf3ghkqj0s7bd5rb"; + rev = "acb5331a94091b13ee9f9caec926d57386eded65"; + sha256 = "1jbcxd5ws9prlzglpxdfv3f22ncmb2b596l3zxym5z645521bcar"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -57593,12 +58162,12 @@ scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scala-mode"; - version = "20161122.2325"; + version = "20161222.900"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "4b492b9fa5f97521426f50c8dcfb6c0a251840ea"; - sha256 = "01d907ph36yzfxgchqvk102ld1mvlb84sjxhmmq5xrzj4zbb0khm"; + rev = "9b8db623b13fcb0aad9271d1fae73e1257dda13c"; + sha256 = "0q41dqlhp0cds16inmh7jrvhqrnjsdiv2in6pq3f0srhwms81ff3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -57844,12 +58413,12 @@ scratch-message = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scratch-message"; - version = "20160825.644"; + version = "20170107.536"; src = fetchFromGitHub { owner = "thisirs"; repo = "scratch-message"; - rev = "8f9957a83788f391bf513e35bc877366b399dcae"; - sha256 = "0x2961bqby1ciqaz2r55bmyhddxjr2slffgkqb8fd788d5l5m927"; + rev = "3ecc7f5e3b8a597ebd1492fd426d3720a7f34302"; + sha256 = "1kb664r3gbhv2ja8jyyzfw22db99ini8qbgzcy9xsl56lha4x4xi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/24c5ff6b643de9fb79334eff57b702281b20bc10/recipes/scratch-message"; @@ -58194,12 +58763,12 @@ sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "sekka"; - version = "20150708.459"; + version = "20170115.237"; src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "8f256be87564653aeef702b3c09f235f0bcb6ae8"; - sha256 = "031aiypx1n8hq613zq4j6gh61ajzja2j60df9mwy50a0qma34awr"; + rev = "001e205b37ae0dded430b9a809425dc7ed730366"; + sha256 = "113i8i705qkd3nccspacnmk9ysy5kwavg8h9z9djdgki611q700q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; @@ -58940,12 +59509,12 @@ shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shm"; - version = "20160615.31"; + version = "20170102.531"; src = fetchFromGitHub { owner = "chrisdone"; repo = "structured-haskell-mode"; - rev = "39b1070cf52b3f134f386b40cc7dfc2d0d30d5b8"; - sha256 = "067s1zwgr5kzxshcnyh96y8jz2j93bqp2fr0a5460fi27pnhyyl0"; + rev = "993ff90454389401e606ee3d4ad1548c5e6508f1"; + sha256 = "1bvzi12z2rlc7p4n731dbmw68719yfy585f8g6xr0dsj5x20gh11"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68a2fddb7e000487f022b3827a7de9808ae73e2a/recipes/shm"; @@ -59023,10 +59592,10 @@ }) {}; showkey = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "showkey"; - version = "20161027.653"; + version = "20170101.1132"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/showkey.el"; - sha256 = "0nqf2pdphc820faijnarg4mq3zblsl2dj3scralhxnqwl68ky7ch"; + sha256 = "1mx48ly135wmqrr0srwnxby46b0mcnyw4vyd0jykih9ygd8kk4dj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2b5576d501aee95c8f62d721a69077a1f3df424/recipes/showkey"; @@ -59144,12 +59713,12 @@ sicp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sicp"; - version = "20161215.428"; + version = "20161219.542"; src = fetchFromGitHub { owner = "webframp"; repo = "sicp-info"; - rev = "c1a6af5719fc8872d40bcf8b41e02745eefd9808"; - sha256 = "0vq8mkdh7bk5vbf74dln86a3dmlba2iiaxiim8n553qnpm4ln0ay"; + rev = "d2abe9ef3c4630511bca320161752d1d4babdbef"; + sha256 = "089mnsaqdr2bcmnrwkrvd0hyq2j0fdnh4ap393m5xnj2riyszdjf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/sicp"; @@ -59354,10 +59923,10 @@ simple-plus = callPackage ({ fetchurl, lib, melpaBuild, strings }: melpaBuild { pname = "simple-plus"; - version = "20151231.1600"; + version = "20170101.1133"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/simple+.el"; - sha256 = "01fdk790jlpxy95y67yv6944ws4zjh7gs6ymnj1yflf19ccsdsnn"; + sha256 = "1z1l1lsddd865ma1q714hj4y9p89z1m3hr7z9fir53ipsa31cnl1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/simple+"; @@ -59457,12 +60026,12 @@ simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "simplenote2"; - version = "20161212.642"; + version = "20170106.2358"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "simplenote2.el"; - rev = "d005d6567cc484b61f2d233f4bf828a2365223c2"; - sha256 = "1fp1pz6qsb3yg7wdp680i12909bv00m64102cq4pwl29cz9cgpv1"; + rev = "9a97863bc8e089b2a751d8659a7fa2d19876d9bc"; + sha256 = "0vd1n2wsgzhwz6ir5cr90cl844r1yph28iav0kwa6bmk6zkfd3c6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2"; @@ -59604,12 +60173,12 @@ sl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sl"; - version = "20161206.730"; + version = "20161217.604"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "sl.el"; - rev = "be3ef1bad689ce9f7e20a15728a07d75eb9066a9"; - sha256 = "18xdny9da1vr79jlnhm34kvjrm0wy82ir7885a64z77pjbnxxs2k"; + rev = "0882117728be91276b815e18c2a66106bf9d69d3"; + sha256 = "1cr3ilf96d8kkyc48nasd4iy2q84kkxjssmvlclanss1hj95nj2l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7188a93d33e38f360930b5090c6ef872116f8a7c/recipes/sl"; @@ -59625,12 +60194,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20161212.300"; + version = "20170111.732"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "6eb6b336dd65ecac2b07553fdab8b190b1fcdaf0"; - sha256 = "1xcvhhcl58g3prl7dxhg69dm005fwnn0bp9knp281xi73fpfrqly"; + rev = "1b5c7e82e3ee9c1cd4b23498d7516503cdb7d18a"; + sha256 = "0x7lc5l2mmr3c8jj37hb9gyyd0r682fx8rmyqi73yaq01bpqswnk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -59643,27 +60212,6 @@ license = lib.licenses.free; }; }) {}; - slamhound = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "slamhound"; - version = "20140506.1618"; - src = fetchFromGitHub { - owner = "technomancy"; - repo = "slamhound"; - rev = "0c9de69557cea66e056c7c3e0ffd5a4e82c82145"; - sha256 = "04vrhv2dp1rq475ka43bhdh7c5gb5cyflf4w0ykxb9rbkahwm8fj"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/54c191408ceb09ca21ef52df171f02d700aee5ba/recipes/slamhound"; - sha256 = "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x"; - name = "slamhound"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/slamhound"; - license = lib.licenses.free; - }; - }) {}; slideview = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slideview"; @@ -59751,12 +60299,12 @@ slime-company = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: melpaBuild { pname = "slime-company"; - version = "20151210.614"; + version = "20161229.743"; src = fetchFromGitHub { owner = "anwyn"; repo = "slime-company"; - rev = "a50e8f02df03f37bee3cbaafae1a6891f02c847b"; - sha256 = "0cc8xb2p1j2vs00h4sq6x0mwwrxkidqj4l7kg3n3150bj37v55rs"; + rev = "6c244690c80387a32b0cb984843e00c8b75ad6bb"; + sha256 = "1hl1hqkc1pxga9k2k8k15d7dip7sfsmwf4wm4sh346m6nj606q8g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/abe5036c6de996a723bc800e0f031314e1188660/recipes/slime-company"; @@ -59898,12 +60446,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20161003.631"; + version = "20170110.629"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "2c772f5a98f8be4a8a10d537690abc64f4d44513"; - sha256 = "0v4hqgf12hgwyk6zw6mpwp324qrpfkzmav2kl4j9g09px73k2kjg"; + rev = "98962b4eacf1621699a2f6183fdc3ff9d7e0a07d"; + sha256 = "0x5lwi0lcy2hnhnygcff2zrchjj5307086pqkiaisl940yhi0g5k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -60003,12 +60551,12 @@ sly-quicklisp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sly }: melpaBuild { pname = "sly-quicklisp"; - version = "20160204.815"; + version = "20170112.135"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly-quicklisp"; - rev = "fccc00b2e9c123c4fb88131ce471191c3ad289ea"; - sha256 = "1mb78cdkmik9rwccvzl8slv4dfy8sdq69dkys7q11jyn8lfm476y"; + rev = "8a9e3c0c07c6861ec33b338cc46ac12e7ce6a477"; + sha256 = "17xx79s2nx8prmg0xhfs9i8sdprbysaajc8k4131lnahj65v159l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/330d04e4e79eee221bcffb8be3e46e097306b175/recipes/sly-quicklisp"; @@ -60377,12 +60925,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20161203.436"; + version = "20170104.410"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "f55a741c9e54b271c7fd9c213937fb668e6771d6"; - sha256 = "0rx8wgpxfc31ynm2lzqnnbqzx8c308hv9flxv2qs1ajj4c55wrpz"; + rev = "199006a0a8ae23ee6a8ee9948bf2512f2bcf1151"; + sha256 = "0m4n5nhr8dqa14syy5907fyjsc3lnrpchdg2ai26jz4cw97v67ig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -60754,12 +61302,12 @@ snapshot-timemachine = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "snapshot-timemachine"; - version = "20161004.122"; + version = "20161221.129"; src = fetchFromGitHub { owner = "mrBliss"; repo = "snapshot-timemachine"; - rev = "ceeb0e559d0f25974493c35b580381959633c219"; - sha256 = "19w4shkhxwx9k5x6abcanh9xln779axwvg8i7363lgixkqdyx05f"; + rev = "99efcebab309b11ed512a8dc62555d3834df5efb"; + sha256 = "18qibcyqxjwpvphmpghppb8ky1xcch1dd4pz91qj5f4h42684ips"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69376b802f0687227a78838877d89163b2893c5b/recipes/snapshot-timemachine"; @@ -60880,12 +61428,12 @@ solarized-theme = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solarized-theme"; - version = "20161203.301"; + version = "20161222.109"; src = fetchFromGitHub { owner = "bbatsov"; repo = "solarized-emacs"; - rev = "f4840394caba81909eacc8807cab904a0af87419"; - sha256 = "0s6zs2mmwwq6df8yiwp8ykz3qqfn7scwkz35rj7bzdnbls8rwaaq"; + rev = "64fa78256efdc11bbc63ec311a976aeddb4808e4"; + sha256 = "0pg7v1lrf12vigakzcjz3i9yqirqp5m0n7ryp430hyv92mk01l40"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/solarized-theme"; @@ -61122,8 +61670,8 @@ src = fetchFromGitHub { owner = "nathankot"; repo = "company-sourcekit"; - rev = "0c3ccf910e108b4a69d10b56853959a6cc352018"; - sha256 = "0b0qs398kqy6jsq22hahmfrlb6v8v3bcdgi3z2kamczb0a5k0zhf"; + rev = "a28ac4811fac929686aca6aa6976845c02d6efd3"; + sha256 = "09vv6bhiahazjwzg5083b23z3xz5f4b3d4jra61m5xffkmjnbs9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45969cd5cd936ea61fbef4722843b0b0092d7b72/recipes/sourcekit"; @@ -61136,22 +61684,22 @@ license = lib.licenses.free; }; }) {}; - sourcemap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + sourcemap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sourcemap"; - version = "20160511.2137"; + version = "20161215.2140"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-sourcemap"; - rev = "c29f0f1fba16622b2349593d420bcc4e3c0f5195"; - sha256 = "1n33d8pjvmsjq38qw1v405jkmrb2sffhp68w4h2jfsgl4y5w1mdg"; + rev = "64c89d296186f48d9135fb8aad501de19f64bceb"; + sha256 = "115g2mfpbfywp8xnag4gsb50klfvplqfh928a5mabb5s8v4a3582"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557d18259543263932fccdbaf44c4e7986bd277b/recipes/sourcemap"; sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5"; name = "sourcemap"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/sourcemap"; license = lib.licenses.free; @@ -61223,12 +61771,12 @@ spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }: melpaBuild { pname = "spaceline"; - version = "20161209.1140"; + version = "20170102.59"; src = fetchFromGitHub { owner = "TheBB"; repo = "spaceline"; - rev = "d40f4b972e307a043963f2262e66d43b6eaf7803"; - sha256 = "0k51sm7qrhvda3gbj35gx3svvlvdvpcch76d20lnvh6y035ymmkg"; + rev = "75cc751c3da252bd84f33b12daf11655a9f98fa6"; + sha256 = "1jn3qjxjhbgjixxny1n68ha80c2zqmfrj24ws7ni4zia264phxs0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline"; @@ -61244,12 +61792,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20161205.1104"; + version = "20170106.539"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "069cb4c14e33270a6316fa7e60a1cee20eb7f13e"; - sha256 = "18xr5vy1va2ppd8fbrmrjgm0izly9fzjznp6mp3b85qfczv1wz4k"; + rev = "4342800a4a12d7d67f2a58792ab6a18542e7fc3e"; + sha256 = "0bzdc8d3q5gxwfkgk31368vpw06i4y2qji0wi4c2d3vwg02b4ihl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -61328,12 +61876,12 @@ sparql-mode = callPackage ({ async, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sparql-mode"; - version = "20161127.955"; + version = "20161219.550"; src = fetchFromGitHub { owner = "ljos"; repo = "sparql-mode"; - rev = "1a806aabb8d9405c3d09248f6cd9905883c05b71"; - sha256 = "07fg44skbkkwwjd3173ilf0p6fp6sp0bwz1s1ccqjcsb7p21mrvn"; + rev = "e5bedd0b1df135bb1e42b756da850dac5955aeb8"; + sha256 = "11vpx9cq81ld6k4710nbvnfhpwq0v0bw0zg5aljr2j1pyfyh0pcs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3d729130a41903bb01465d0f01c34fbc508b56e/recipes/sparql-mode"; @@ -61408,16 +61956,16 @@ speed-type = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "speed-type"; - version = "20150120.2034"; + version = "20161230.815"; src = fetchFromGitHub { - owner = "hagleitn"; + owner = "parkouss"; repo = "speed-type"; - rev = "d3a6745dbaaf6b1eacee10ce9b50108482dbe758"; - sha256 = "102hjyr9ii2rmq8762irbwansbi023s7dg4a8n6lkadcvzfibmag"; + rev = "5d691f57743304db63b6afdc5bd79dabd282d390"; + sha256 = "08qp2b80rh9k8h5vv141lfsg73rqqikhh7ygal789rr278ai1rjf"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/18d6365232a78877c78b31afb95103e5c3f6971b/recipes/speed-type"; - sha256 = "14q423an7v5hhfx1x039fizxcn5hcscqf2jfn9rqifg4jpq8bq5g"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type"; + sha256 = "0lsbi3b6v7fiwpvydgwcqx3y5i7bysfjammly22qpz3kcjmlvi06"; name = "speed-type"; }; packageRequires = [ cl-lib ]; @@ -61639,12 +62187,12 @@ springboard = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "springboard"; - version = "20160329.1109"; + version = "20170105.2355"; src = fetchFromGitHub { owner = "jwiegley"; repo = "springboard"; - rev = "ffcfaade6f69328084a0613d43d323f790d23048"; - sha256 = "0p13q8xax2h3m6rddvmh1p9biw3d1shvwwmqfhg0c93xajlwdfqi"; + rev = "263a8cd4582c81bfc29d7db37d5267e2488b148c"; + sha256 = "14mbmkqnw2kkzcb8f9z1g3c8f8f9lca3zb6f3q8jk9dsyp9vh81z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/138b8a589725ead2fc1de9ea76c55e3eb2473872/recipes/springboard"; @@ -61765,12 +62313,12 @@ sql-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sql-indent"; - version = "20150424.1716"; + version = "20170112.1507"; src = fetchFromGitHub { owner = "bsvingen"; repo = "sql-indent"; - rev = "f85bc91535b64b5d538e5aec2ce4c5e2312ec862"; - sha256 = "17nbcaqx58fq4rz501xcqqcjhmibdlkaavmmzwcfwra7jv8hqljy"; + rev = "761a5724d181b75f30e64040408b8836d41f9db9"; + sha256 = "13xspvqn3y3hikacv6w6jf2x1gb33gxkva6chrz0fd8bkhwdf335"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/500ec53f14b8b0dca8ff80e8a2b1b60f4266562c/recipes/sql-indent"; @@ -61948,12 +62496,12 @@ ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-config-mode"; - version = "20160326.552"; + version = "20170110.1756"; src = fetchFromGitHub { owner = "jhgorrell"; repo = "ssh-config-mode-el"; - rev = "da93f32cfe7d8a43b093b7a2c0b4845afb7a96a7"; - sha256 = "08nx1iwvxqs1anng32w3c2clhnjf45527j0gxz5fy6h9svmb921q"; + rev = "badbd859517e0a7c0cb8002cf79f4c474478b16d"; + sha256 = "13dqzyc99qvspy8fxdjai0x0s0ggyhdlf6apyrq2r1z0j6gaf88g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce38cac422ad82f8b77a1757490daa1f5e284b0/recipes/ssh-config-mode"; @@ -61969,12 +62517,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20161206.2115"; + version = "20170109.2256"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "740c27df2a6cfc688267e97ee8017b8fb3ac624c"; - sha256 = "0qy02zifxfwvvy12jfx83lrkdjlglfb6m5ifm4b8waa6nbmfpvy2"; + rev = "1c1e379b153bc6206985c765969fd6a9f56aec25"; + sha256 = "10p5yaagv5lhv6d0jcfk8pynqcw6njkjgjmgicl32nwrkgfapa6f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy"; @@ -62137,12 +62685,12 @@ state = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "state"; - version = "20161008.535"; + version = "20170107.535"; src = fetchFromGitHub { owner = "thisirs"; repo = "state"; - rev = "ff38227310347ed088fe34ff781037774cc7456b"; - sha256 = "0hanisrni8i0bbq7f2flvfla990nyv8238nb9dfjpvimkw7rjbsg"; + rev = "ea6e2cf6f592cbcfc5800b68f0fc2462555cacce"; + sha256 = "1bb2rrmvkxymqdyv3w4kr36qzszwgmadqck5h87j8pi82nh9j973"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82e955112089569c775e11888d9811119f84a4f8/recipes/state"; @@ -62218,6 +62766,27 @@ license = lib.licenses.free; }; }) {}; + stem-english = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "stem-english"; + version = "20170113.24"; + src = fetchFromGitHub { + owner = "kawabata"; + repo = "stem-english"; + rev = "c8d9ccf1ea38ea403ba360b79b1042b0fd449a70"; + sha256 = "15bwbqapr3kfazpxagpzy6fpkgc669mb8n8psz7gaqhlpxsliwiz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5c8e97e70e7a86b9f5e55bdd2db492994e8abdd5/recipes/stem-english"; + sha256 = "15d13palwdwrki9p804cdls08ph7sxxzd44nl4bhfm3dxic4sw7x"; + name = "stem-english"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/stem-english"; + license = lib.licenses.free; + }; + }) {}; stgit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stgit"; version = "20140213.348"; @@ -62363,12 +62932,12 @@ string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "string-inflection"; - version = "20161213.1737"; + version = "20161220.1825"; src = fetchFromGitHub { owner = "akicho8"; repo = "string-inflection"; - rev = "af1fb965784eff308d6b4031dc2ef5f6961cd38a"; - sha256 = "017rq1vll53i4xs1l24insjkfvr7nlq6l9g7gjmgnd8g9ck6jqg0"; + rev = "f11e732a582419e14a36c53130dd3a7b2c9da8c5"; + sha256 = "1sq7h58v61cdyca5kfhf9rf3ybj25zgbhfdvb29qd7b2b33px7a5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection"; @@ -62404,10 +62973,10 @@ }) {}; strings = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "strings"; - version = "20151231.1607"; + version = "20170101.1137"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/strings.el"; - sha256 = "1sa6wd2z2qkcnjprkkm9b945qz8d0l702sv9w15wl0lngbhw84na"; + sha256 = "0gvj39cjc50ks31dzridskync3dnaxsr28wmyky781l87cgna4hq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/strings"; @@ -62630,10 +63199,10 @@ }) {}; subr-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "subr-plus"; - version = "20151231.1607"; + version = "20170101.1138"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/subr+.el"; - sha256 = "1xxf8kgxzcwwjm96isj4zg31vw63ahivr6xch5dw8wsvk0mjks9y"; + sha256 = "057h7hshdvzm3qcwdnbyw0qb7ijw3jz38cff0n9ln4xgsma6cgm1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/400c7aede8fee84660b5010eacb93536f1c0b0a4/recipes/subr+"; @@ -63084,12 +63653,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "20161016.709"; + version = "20170114.521"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "58f31cc50ee8fac236f5aa3936152e6e70ee3ce5"; - sha256 = "0ncz4bcnbh64p3iqbr65g6b1p8lfpqviszpz80909izi8awjgbgf"; + rev = "6cd2948589771d926e545d8cbe054705eebce18f"; + sha256 = "1zz5jv2qgcnhidyhnw3wbcpqb80jqqbs74kpa66assfigyvivyj6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -63130,8 +63699,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "2bc1d7bd8d0f12d5b6b821a0ffa698e6564d865a"; - sha256 = "0z5hdhb6bgqk2qax59xin8vig2kksmrxf6vyk412kbpa17sm71zm"; + rev = "ee91a2511797c9293d3b0efa444bb98414d5aca5"; + sha256 = "0mrv0z62k0pk8k0ik9kazl86bn8x4568ny5m8skimvi2gwxb08w6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -63252,12 +63821,12 @@ sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }: melpaBuild { pname = "sx"; - version = "20161109.1903"; + version = "20161222.1205"; src = fetchFromGitHub { owner = "vermiculus"; repo = "sx.el"; - rev = "cb338d7e314f4d29333f59a947ef27c9d22c6958"; - sha256 = "1sfvgk61cm0idmviadjsni9gy1kfjcdi455zynjc2181q0ax3qy9"; + rev = "de73e993930f910862698727b5c0d93a1f656deb"; + sha256 = "03dah9rn6ray0c65rkqcmak77b1hgyi2fc1nqgb5vfgf65jk7z7c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f16958a09820233fbe2abe403561fd9a012d0046/recipes/sx"; @@ -63377,10 +63946,10 @@ }) {}; synonyms = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "synonyms"; - version = "20160328.654"; + version = "20170101.1140"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/synonyms.el"; - sha256 = "1zkrh1krhjmhb924dlihfnmjf4gigk9lqkai8aal67h90g2q2dsz"; + sha256 = "0f1krqbmbdkpll6ggryblcr7gw0wqm3d9hvq145sdwhwi5jw8b4v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fd538439982dd7bd281bf78e96373b93f4d4a6b8/recipes/synonyms"; @@ -63500,12 +64069,12 @@ syslog-mode = callPackage ({ fetchFromGitHub, fetchurl, hide-lines, lib, melpaBuild }: melpaBuild { pname = "syslog-mode"; - version = "20161124.910"; + version = "20170107.1517"; src = fetchFromGitHub { owner = "vapniks"; repo = "syslog-mode"; - rev = "b2582df8f6c1125636f113100a77edcde0879c22"; - sha256 = "0am4dfaxflhyn4f0vx79w3p302fi0rr1zh7cx07s9id5q4ws7ddm"; + rev = "e2ade4f27672a644fcb69ceaa8a08f04eaa2ccf2"; + sha256 = "0b3p91f44ghzlma3vw607fsvzzgrfjq4k3zchv0drlga2kv771vw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/478b307f885a06d9ced43758d8c117370152baae/recipes/syslog-mode"; @@ -63563,12 +64132,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "20161201.2217"; + version = "20161231.2103"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "fa1277d1cd955b031a943d52d370e97aec3f2cac"; - sha256 = "1j1q60hjfx6ma82j6dil0a16jrablzskh76l0gcdq0c8rjdqb4i4"; + rev = "b561c6bce9828e67c986903c24fb524451a02e64"; + sha256 = "19jkiiyaxqyxqzmgg2n0hcp7az23jhkajsr5n7ha48mh690n2ga1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -63856,12 +64425,12 @@ tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tao-theme"; - version = "20161213.739"; + version = "20170116.2155"; src = fetchFromGitHub { owner = "11111000000"; repo = "tao-theme-emacs"; - rev = "2e66c3045e46621d4e01959628c398283b423c72"; - sha256 = "0abs0h9xhjv1bnpdv4r3ki4cgwak56v92c8lzcj879rqwskpvssy"; + rev = "69b816277c334c8f4ec7da8f283d52df951d5584"; + sha256 = "0fz59291wwrm5jdrq3qzkbihh2wvypp23hxcy24d0pp3nmav5g0a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme"; @@ -64297,12 +64866,12 @@ tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "tern"; - version = "20160817.522"; + version = "20161222.850"; src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "de94445e6c4bea4a1342bdf5a093f9104f0884b6"; - sha256 = "1q5i30lqfr0ah0rj581mn4qhi3ap45wsdfczggwyydscdaxzv8wi"; + rev = "2489fd3177a670ad6fdb864d0abf6e79355b2b7a"; + sha256 = "0m4bj93i42705hqnjzd6b1ahh2ibbg05wxggnxanmqssfv7hmq18"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -64322,8 +64891,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "de94445e6c4bea4a1342bdf5a093f9104f0884b6"; - sha256 = "1q5i30lqfr0ah0rj581mn4qhi3ap45wsdfczggwyydscdaxzv8wi"; + rev = "2489fd3177a670ad6fdb864d0abf6e79355b2b7a"; + sha256 = "0m4bj93i42705hqnjzd6b1ahh2ibbg05wxggnxanmqssfv7hmq18"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -64339,12 +64908,12 @@ tern-context-coloring = callPackage ({ context-coloring, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }: melpaBuild { pname = "tern-context-coloring"; - version = "20160709.837"; + version = "20161217.2347"; src = fetchFromGitHub { owner = "jacksonrayhamilton"; repo = "tern-context-coloring"; - rev = "42e2f0177e8d3017c07826361cc981b2883d34dc"; - sha256 = "0jdm1s8pqs40xligbhmqgk4vaxkqyb2i5wkx1zgjazq8fhcql9jv"; + rev = "3a8e979d6cc83aabcb3dda3f5f31a6422532efba"; + sha256 = "1rq5aqmsd7jqvwypafad9gmfcwjqjah00j7cws46k5f0dirjaa1y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db2119d2c2d167d771ee02c2735b435d59991b93/recipes/tern-context-coloring"; @@ -64378,22 +64947,22 @@ license = lib.licenses.free; }; }) {}; - terraform-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }: + terraform-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }: melpaBuild { pname = "terraform-mode"; - version = "20160823.31"; + version = "20170111.2117"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-terraform-mode"; - rev = "6337c5eda0abacc5b38e241dae0fadd8cecc81e5"; - sha256 = "0cyijxjxdhkc555hwgdv0jxnsqp22b12ys35v2hai3p9w5x22jxc"; + rev = "6973d1acaba2835dfdf174f5a5e27de6366002e1"; + sha256 = "12ww36g7mz4p4nslajcsdcm8xk6blwjwqjwhyp0n10ym6ssbh820"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93e06adf34bc613edf95feaca64c69a0a2a4b567/recipes/terraform-mode"; sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn"; name = "terraform-mode"; }; - packageRequires = [ cl-lib hcl-mode ]; + packageRequires = [ emacs hcl-mode ]; meta = { homepage = "https://melpa.org/#/terraform-mode"; license = lib.licenses.free; @@ -64444,12 +65013,12 @@ test-simple = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "test-simple"; - version = "20160303.36"; + version = "20170117.411"; src = fetchFromGitHub { owner = "rocky"; repo = "emacs-test-simple"; - rev = "e199434a2ba2e19f9854504bfb0cee22fcd03975"; - sha256 = "0i38pzqi2ih3ckfjz323d3bc3p8y9syfjr96im16wxrs1c77h814"; + rev = "604942d36021a8b14877a0a640234a09c79e0927"; + sha256 = "1ydbhd1xkwhd5zmas06rw7v5vzcmvri8gla3pyf2rcf2li5sz247"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4b76e053faee299f5b770a0e41aa615bf5fbf10/recipes/test-simple"; @@ -64669,10 +65238,10 @@ thing-cmds = callPackage ({ fetchurl, hide-comnt, lib, melpaBuild }: melpaBuild { pname = "thing-cmds"; - version = "20151231.1609"; + version = "20170101.1143"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/thing-cmds.el"; - sha256 = "1nclwxb63ffbc4wsga9ngkfcxsw88za0c4663fh9x64rl4db4hn8"; + sha256 = "1qpszba6ajwqphhk39y6j4wlg7s5lch63lwfa9y28qipwkbn6zlq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thing-cmds"; @@ -64687,10 +65256,10 @@ }) {}; thingatpt-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "thingatpt-plus"; - version = "20161121.1523"; + version = "20170101.1144"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/thingatpt+.el"; - sha256 = "0xxd6qi6xw9zn0yykyl1ys8ckpfngxkbswy00s6hf7gd9jbknkm3"; + sha256 = "0hb3fyqzq0312isid5vji0j74dmkh08p41sss32f4w60yhd8p19x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+"; @@ -64773,8 +65342,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "0d9b713b173f35ce02552b2f4372899440a99b25"; - sha256 = "0rld7j1j5i3f5y9yarg9liabmf597c8yz9bw3jax0azfi5ls6lvm"; + rev = "5f723cd53980f395a92c438790a127cbd5699d90"; + sha256 = "1zf3ddyz8579kcwrbhb09nn5r0wxjwmafmrnrwljlch0kxwp79nl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -64790,10 +65359,10 @@ thumb-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }: melpaBuild { pname = "thumb-frm"; - version = "20151231.1612"; + version = "20170101.1145"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/thumb-frm.el"; - sha256 = "0nyp1sp55l3mlhlxw8kyp6hxan3rbgwc4fmfs174n6hlj3zr5vg8"; + sha256 = "19fiafq5nl29wr35l7nkzjs70fvnw0g27424x7xnm425gwaags8s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thumb-frm"; @@ -64830,12 +65399,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20161205.2257"; + version = "20170107.1619"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "2351b8240faaf7fc7785516c0480d54e78e0d3e3"; - sha256 = "14wfh3siwsxdicb382w9ygjmz6xxqm1724xypxva4n26666fc2da"; + rev = "026af0842856bcc6dba26272feb1c9bec557de9d"; + sha256 = "0315lr5xs2ncw6k8d24ms0jk4k83x9jrzvn7534ciny7jjkll6fq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -64869,12 +65438,12 @@ tile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, stream }: melpaBuild { pname = "tile"; - version = "20161104.1737"; + version = "20161224.1957"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "tile"; - rev = "2e0bb114d8cf9276ee73f616cae0a3baa64fbf5c"; - sha256 = "06kc90cy5nq5w87f253a70n6r234lq5kw06m5yb19vw7ph94bx9c"; + rev = "22660f21f6e95de5aba55cd5d293d4841e9a4661"; + sha256 = "1qxhrm852j93sqi1lznlrjn7s0vscsixm48g46ja70gl320chyzm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/424cfd28378ef328721bb0dc3651808e64c01306/recipes/tile"; @@ -65411,10 +65980,10 @@ }) {}; tool-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "tool-bar-plus"; - version = "20151231.1615"; + version = "20170101.1147"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/tool-bar+.el"; - sha256 = "1sqflxj3hzxdlwn5qmpqm4dwik5vsyp7lypkvshcghdplxymb38a"; + sha256 = "19ayc57vnv9348nfc10392kr4xd6wg0b6v2ya3x2zlpfsq3a6w2n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/tool-bar+"; @@ -65562,8 +66131,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "e549f0a7f8c6a39cc3129581b85682e3977d2bdd"; - sha256 = "16c45hb216b3r214p8v7zzlpz26s39lc9fmjl6ll3jwvqpq19kb1"; + rev = "5444a8dd90691de941509f7cc9ac8329c442dbdd"; + sha256 = "00dcdszskzqggg4gjp5f2k2v1a03jad52q2pqf04jqjycapkx227"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -65663,12 +66232,12 @@ transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "transmission"; - version = "20161103.1632"; + version = "20161231.2101"; src = fetchFromGitHub { owner = "holomorph"; repo = "transmission"; - rev = "fc0af768454f7964ba0c8b6934fc0cae24b8ebe8"; - sha256 = "05zrdgv0b7a3y89phg66y8cfpmshm34yg7ahhc861k6wh4kvkv89"; + rev = "39b1fdb924727698e5b85c588bc6fd83200e4b90"; + sha256 = "08wgqx48b3kbggxmkjjxwyinfl1j6b8wi4xvg0hwbkyw0zka0cii"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ed7e414687c0bd82b140a1bd8044084d094d18f/recipes/transmission"; @@ -65970,12 +66539,12 @@ tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tuareg"; - version = "20161207.1239"; + version = "20170109.1459"; src = fetchFromGitHub { owner = "ocaml"; repo = "tuareg"; - rev = "18596179aa3da630e544ecb3ad02bcfde8c3a845"; - sha256 = "1clx74wpb3bp5njy95clvz14zcipf8mcldnp6xsv39x8xwsvgi26"; + rev = "5d53d1cc0478356602dc3d8a838445de9aa2a84a"; + sha256 = "0qj4racbh4fwsbgm08phbgcam2m348rcli950nd27sn7vza8vcy4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01fb6435a1dfeebdf4e7fa3f4f5928bc75526809/recipes/tuareg"; @@ -66282,12 +66851,12 @@ typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }: melpaBuild { pname = "typit"; - version = "20161125.1205"; + version = "20170101.318"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "typit"; - rev = "0ec57775db48d3a2d73998d569626cc720618786"; - sha256 = "15wl6vymbdc3fzsk4fn12j7nzdg9iqzfi3lnw68bl0p00s3i37pg"; + rev = "eb2d9a73851c64e21c211136c36b9de34812dc0f"; + sha256 = "0r8cr4h3pkc23zxv01kkqv7bn34vppw6wgm7npzc9c04l40hs7iq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17d019155e19c156f123dcd702f18cfba488701/recipes/typit"; @@ -66365,10 +66934,10 @@ }) {}; ucs-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "ucs-cmds"; - version = "20161118.1423"; + version = "20170101.1149"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/ucs-cmds.el"; - sha256 = "08yfz2mhhfqmx2icwpwizcaqkzngddhgp4ya3ga77fziyb6xjrdv"; + sha256 = "0ql6qyzcj067vx2amwfh2m4vi056zf7qra4pkyskv829nxqg9mk8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/ucs-cmds"; @@ -66426,12 +66995,12 @@ ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ujelly-theme"; - version = "20161024.353"; + version = "20170116.1121"; src = fetchFromGitHub { owner = "marktran"; repo = "color-theme-ujelly"; - rev = "8c67c84d0486f3398653d7d4f5ed6e0059854b85"; - sha256 = "0vksd0zay5wp9hmq1xrqb18fqyqgnmp1yp6fgqx9miacfasg18qf"; + rev = "1837cfbf3d0b09d7e1da678e5dfb3b560a759734"; + sha256 = "0jjr5798nqm5lwjv1j4r21vhbqy10qy3gn977g0ysb31wp2209r4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme"; @@ -66913,6 +67482,27 @@ license = lib.licenses.free; }; }) {}; + untitled-new-buffer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magic-filetype, melpaBuild }: + melpaBuild { + pname = "untitled-new-buffer"; + version = "20161212.708"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "untitled-new-buffer.el"; + rev = "4eabc6937b0e83062ffce9de0d42110224063a6c"; + sha256 = "139gysva6hpsk006bcbm1689pzaj18smxs2ar5pv0yvkh60wjvlr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/de62e48115e1e5f9506e6d47a3b23c0420c1205b/recipes/untitled-new-buffer"; + sha256 = "1hpv7k7jhpif9csdrd2gpz71s3fp4svsvrd1nh8hbx7avjl66pjf"; + name = "untitled-new-buffer"; + }; + packageRequires = [ emacs magic-filetype ]; + meta = { + homepage = "https://melpa.org/#/untitled-new-buffer"; + license = lib.licenses.free; + }; + }) {}; url-shortener = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "url-shortener"; @@ -66976,12 +67566,12 @@ use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "use-package"; - version = "20161031.1025"; + version = "20170116.1309"; src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "c7adfdde3d50d783dcde21ac3ea8195bbd30369f"; - sha256 = "1qkcnk2h1k6yv9sbkir2nkbjjnzcj3ndk20cysk2wcmwqxm85840"; + rev = "38034854ac21bd5ddc1a1129fd6c8ff86d939f8a"; + sha256 = "0s20z5njwmk591674mb2lyv50agg6496hkr5b11904jq5ca3xagz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -67228,12 +67818,12 @@ vc-auto-commit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-auto-commit"; - version = "20160108.215"; + version = "20170107.533"; src = fetchFromGitHub { owner = "thisirs"; repo = "vc-auto-commit"; - rev = "9e60dd775df9771185c8ff79fa0ce7f7cfb90c17"; - sha256 = "09h7yg44hbxv3pyazfypkvk8j3drlwz0zn8x1wj0kbsviksl1wxk"; + rev = "446f664f4ec835532f4f18ba18b5fb731f6030aa"; + sha256 = "18jjl656ps75p7n3hf16mcjrgiagnjvb8m8dl4i261cbnq98qmav"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/770ab1e99fe63789726fc6c8c5d7e9a0287bc5fa/recipes/vc-auto-commit"; @@ -67249,12 +67839,12 @@ vc-check-status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vc-check-status"; - version = "20160108.216"; + version = "20170107.534"; src = fetchFromGitHub { owner = "thisirs"; repo = "vc-check-status"; - rev = "7c2e8a4e26d16c50343677fd769fc9d9d9778920"; - sha256 = "0icc4kqfpimxlja4jgcy9gjj4myc8y84vbvacyf79lxixygpaxi1"; + rev = "37734beb16bfd8633ea328059bf9a47eed826d5c"; + sha256 = "0mspksr2i6hkb7bhs38ydmn0d2mn7g1hjva60paq86kl7k76f7ra"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0387e08dd7ed69b291e896d85bd975c4f5dcbd09/recipes/vc-check-status"; @@ -67375,12 +67965,12 @@ vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "vdiff"; - version = "20160803.1035"; + version = "20170116.1154"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-vdiff"; - rev = "eda4b1bee033d3fde19a70ccfd2abbe278230f0e"; - sha256 = "1yhvizfcl71j6j8dz2la7z90zn4x1mka3qavpmgjcrpck77a9k5x"; + rev = "f4332f26f7a88c6339e357d19f56354d2a2489fa"; + sha256 = "1jbhv430g2vsq0jhjypg9wdyax57m0r6hppqm2rqf0hlgn38v8d5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff"; @@ -67564,12 +68154,12 @@ viewer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "viewer"; - version = "20141021.1136"; + version = "20170106.1802"; src = fetchFromGitHub { owner = "rubikitch"; repo = "viewer"; - rev = "4cc7bba34fbf6ff65e26c1f0c3b16af7adf0a190"; - sha256 = "1ch8lr514f9lp3wdhy1z4dqcbnqkbqkgflnchwd82r5ylzbdxy2a"; + rev = "6c8db025bf4021428f7f2c3ef9d74fb13f5d267a"; + sha256 = "1sj4a9zwfv94m0ac503gan6hf9sl2658khab1fnj8szcq7hrdvq1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/viewer"; @@ -67669,12 +68259,12 @@ vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "vimish-fold"; - version = "20160718.126"; + version = "20161231.1600"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "vimish-fold"; - rev = "2ba97302f76d83df3ec8dd1a2d76b02e1a0aadd6"; - sha256 = "0mfrydhndr4a77231kwnh1zljsfpn6sczw51li1kbdbkg8xbps33"; + rev = "1eb00dc2d803df411d7b2eae1c775eecc6512728"; + sha256 = "1shxvnlpb3hw3pa7883nmpzjy2q6cyww3r8x4yx3h315nvxwxfkq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4862b0a3d43f073e645803cbbf11d973a4b51d5/recipes/vimish-fold"; @@ -68002,12 +68592,12 @@ vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: melpaBuild { pname = "vue-mode"; - version = "20161009.1916"; + version = "20161227.133"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "3847c3132dc743932507b622dadb83bed935b6f9"; - sha256 = "0m541ib25fcva8kzbpxi3bwyimdqzzx3w6m9m4yz90cxc3hzvl9i"; + rev = "1561da428a1a30170b71cab71c576a508e4f4367"; + sha256 = "1081kypg9lhc0d3kjw4vkk9s3g9dbb5rr2rh4d2s1zicy7rxhadn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; @@ -68022,10 +68612,10 @@ }) {}; w32-browser = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "w32-browser"; - version = "20160814.1433"; + version = "20170101.1154"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/w32-browser.el"; - sha256 = "0cb42vmvjhgjg34klxfrqx8fc39awv0gcr2i2n3ma2xdknzb9z7b"; + sha256 = "0x30ldv2wbv3vhj85jss7hwf672m61f5r4z9l1sg3v0ibalqry45"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/w32-browser"; @@ -68041,10 +68631,10 @@ w32browser-dlgopen = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "w32browser-dlgopen"; - version = "20151231.1621"; + version = "20170101.1155"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/w32browser-dlgopen.el"; - sha256 = "0nyara81bnd0rvgyljqrrbvjvndkngdc7qzf6scl5iz3vlglfgy7"; + sha256 = "1dv4l7rcm34p78cvyjv7b1lcc1d28pia18vj3swgnan9g1mi7zdf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/w32browser-dlgopen"; @@ -68120,22 +68710,22 @@ license = lib.licenses.free; }; }) {}; - wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: + wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "wand"; - version = "20141104.1645"; + version = "20170116.223"; src = fetchFromGitHub { owner = "cmpitg"; repo = "wand"; - rev = "da6284ab75c3afa1275420faa9934037052e2967"; - sha256 = "09gqsssc2sk0vwfg0h4zxq9a779sdjdgvxsw7p6n2k0g4wk0phri"; + rev = "08c9511cd0f07ba65ef5a07ad93851549391333f"; + sha256 = "16zd914kwnnhp6zc81z9acq69prrgiwi25ggbpn4lcx7xm8h5hv3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38be840bbb32094b753ec169b717a70817006655/recipes/wand"; sha256 = "052zq5dp800hynd9fb6c645kjb9rp3bpkz41ifazjnx4h4864r0l"; name = "wand"; }; - packageRequires = [ dash ]; + packageRequires = [ dash s ]; meta = { homepage = "https://melpa.org/#/wand"; license = lib.licenses.free; @@ -68165,12 +68755,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20161212.1531"; + version = "20161227.2220"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "dda6c57fa58ef19cfd1be199a791a3e35096b5cf"; - sha256 = "0cdplbyglzfd62j12dmjsxywsx5w22v6x05rvqrvjljm2n9jpz95"; + rev = "59a4d97286251a0c0871c085aea01fa1abc1e192"; + sha256 = "1k7kkdr2kr7qivvbifqgw9hx111bscbh376q1f44p825flxnzyn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -68396,12 +68986,12 @@ web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20161210.243"; + version = "20170114.906"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "98be3285362a512d28a96ce4220c6dc295d5fee8"; - sha256 = "1mylmz3xl4yj80i1n8xv8jiszrqywhiavd7db0qxx04lrl71n02b"; + rev = "3e74b741abf8d3113a67ab6b48fba7fdd404e712"; + sha256 = "0lagq9gzm8wrypks2zc5qjz1pqjhhlg4dxji9c1zdji5kq3bhqz5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -68732,12 +69322,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20161207.714"; + version = "20161222.1221"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "f0eb183af6ce87344af40813a20fbe81bf98c80a"; - sha256 = "0p1hzhcqy17cb90hsii1xiy9bw5129q847wpdbz8i58345svzm83"; + rev = "49ab7afd93ef36e5f0261eff7151360edeeea4e6"; + sha256 = "0cqq1w9cjrp61mjzi7y49yrbhclpf0cab9fcylq14v1ilhipfdxa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -68878,10 +69468,10 @@ }) {}; wid-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "wid-edit-plus"; - version = "20151231.1622"; + version = "20170101.1156"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/wid-edit+.el"; - sha256 = "18bnwwjk8jj4ns08sxhnznj0d8n1bxm2kj43r06nwyibh6ajpl7f"; + sha256 = "0pzxarpwabbg67ajg340yrp1gqly8y71qrd5gcv9vjzgvvh9anws"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/wid-edit+"; @@ -69184,10 +69774,10 @@ }) {}; window-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "window-plus"; - version = "20151231.1624"; + version = "20170101.1158"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/window+.el"; - sha256 = "0mqdcgk6mdxgl9if7jzgg16zqdwnsp8icrdhnygphw5m9h2dqcnm"; + sha256 = "06igqiwvnwm68k6gf9h85p4ppqab20sxl6qnxb57z8lpczpsssqa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/window+"; @@ -69284,14 +69874,35 @@ license = lib.licenses.free; }; }) {}; + winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "winum"; + version = "20170111.29"; + src = fetchFromGitHub { + owner = "deb0ch"; + repo = "emacs-winum"; + rev = "25fbb9524ac7cde601b07cecd81fd1446e571282"; + sha256 = "1aibzgb9np9ik27jzaxg1gl1n15q1chxr5lhjvvpp05rr70ykll0"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum"; + sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw"; + name = "winum"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/winum"; + license = lib.licenses.free; + }; + }) {}; wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wisp-mode"; version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "a67adbf5fc75"; - sha256 = "1av071s0s6x0idbklfnps8j7vgjqxapk9y23prk6jrdbbwhfzb8n"; + rev = "280ab84bf8ad"; + sha256 = "088khr4ha37nvxzg620a6gyq7pc40rb13bbi9vgqhgjgggpq61d9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -69328,12 +69939,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20161201.925"; + version = "20161231.826"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "ee41302fea917eb113182bc1eb8d44de882233f8"; - sha256 = "165shk1bi5lhbx06mavvlpcqvdjpnwdp29l9gqnyxclc7nm0i05b"; + rev = "2248a63f6eb6e7720881b508639d9a00d2db9ea0"; + sha256 = "0g5ch1a5myrmazxcbbak01q4k3x8yp3kbn73d2h26j2jmsqvdy1n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -69517,12 +70128,12 @@ worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "worf"; - version = "20161206.201"; + version = "20161231.217"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "c1a5e644320b98467a31b0c363edc8229927ed78"; - sha256 = "11pb3sd1jn5jfhx0q4pwpiszaadbyag9zjb6iy6sl1nhs2z22acn"; + rev = "ca9a42b64938f43d757c6e0c41f21610bea87dba"; + sha256 = "0nwsryj7xiizvrcnwb1an8siihqjbdvcwg6mjc36cyr6cv3icqmw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; @@ -69626,8 +70237,8 @@ src = fetchFromGitHub { owner = "bnbeckwith"; repo = "writegood-mode"; - rev = "253710702282c2a789b9a6cd64d53a5fcfe08638"; - sha256 = "1kppxgq2hcra1a978r5m589y7cya07hpqlhg19qa3i6m92wz6jcj"; + rev = "a99896531a260db11acb931b68dbdc45030832d7"; + sha256 = "15g133ql8mgjchm6h255q77b6rks843lzva44kgjmfgwmgbfmc1b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/75c5a4304999fc3f5a02235a1c2c904238d2ce4f/recipes/writegood-mode"; @@ -69664,12 +70275,12 @@ ws-butler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ws-butler"; - version = "20160913.1902"; + version = "20170111.1534"; src = fetchFromGitHub { owner = "lewang"; repo = "ws-butler"; - rev = "b59e36b2451193bf96176f5a006bf506770a40f3"; - sha256 = "0ij88qr7gk07dchhjsn3nlk8fqgbkp4qhvn14dqxndn3zr64ix7v"; + rev = "80dabd5d158929e8433e46207bb521282b21e4f3"; + sha256 = "0s4kfg2ga3qa6gb2ji1jv73fv66d9vn054cl0mif7n16kic4bkr4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1645a51d487c8902eb6e59fb1884f85f48cec6f/recipes/ws-butler"; @@ -69832,12 +70443,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20161210.2152"; + version = "20170116.919"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "c2ca5a4422e8c05ff1428c76b3b9c20d38bcfcb7"; - sha256 = "1wkibjznxg1khvgnabgh8808hp31i2zrkzq9crjc37xv65vkb3v1"; + rev = "ed4539971dd9c32752c7ff5a1d280150446bc769"; + sha256 = "1nw7mwbiaq4i28his4l7hx1qrgqykr59sw1909s1l165ygl85jb2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode"; @@ -69853,12 +70464,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20161210.2135"; + version = "20170116.1037"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "d541d7940a078c7cec64578bf51fa1023df7d931"; - sha256 = "0l3jadf5zlkva7lcrd7z7gfhb71p8dccsbn5mwwwhcfv449z0a5x"; + rev = "d49a743fede497d102d4dc2b739dbe35b41163ca"; + sha256 = "00v20p99njhh2wgk8jfccpigss2y6vd40wl1cs0ra67a4bjwn8di"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -69871,148 +70482,169 @@ license = lib.licenses.free; }; }) {}; - xah-find = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + xah-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-find"; - version = "20161116.1515"; + version = "20161221.1705"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-find"; - rev = "44a8ccf067e86bf9db7c7e73016b23ddcb212254"; - sha256 = "02zx485l9ilfblz2ma5wqb97prbnvph9a7ija66sac2aklw19i8w"; + rev = "27fabf6ef557007ba93b667d0a79823420a0144f"; + sha256 = "0pli4p1q43hk2zy9lgm324njm82jwmpldhbvdiv4f6zbkv44xrhr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d94ffd9c3380cd56770f253e43d566a95083e37/recipes/xah-find"; sha256 = "1d3x9yhm7my3yhvgqnjxr2v28g5w1h4ri40sy6dqcx09bjf3jhyq"; name = "xah-find"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/xah-find"; license = lib.licenses.free; }; }) {}; - xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20161210.2112"; + version = "20170116.2003"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "a6c454132d00f7140f8130b55981c343b4c1b7a6"; - sha256 = "07h9x74g66z3nw6d07sa0pkjsb1ddnyrs2pmka9ly9n35irix2ms"; + rev = "9c8d51eb4441351c71854612eb990246ff23b8b5"; + sha256 = "11l2jhn82r6aavc4wkcn0w5f2g2hilaz3a3v2fv70gd1x7spw0w7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; sha256 = "0bzfz8q7yd1jai0pgngxwjp82nsfx5ivn24cb20vc5r8hhzj17cs"; name = "xah-fly-keys"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/xah-fly-keys"; license = lib.licenses.free; }; }) {}; - xah-get-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + xah-get-thing = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-get-thing"; - version = "20161210.2058"; + version = "20161218.2145"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-get-thing-or-selection"; - rev = "1604ebb340b31eae31596716489b99043c237ccc"; - sha256 = "19wjiwdlmpj9yax0zv401ah0zp80dvr2mhxwyhqsnfd802yp1n00"; + rev = "14bf7ad0d8366b3b8754c252ca45660181ba5a1d"; + sha256 = "0025g3ikdfpmcaa6pkdyh1vp7wxbbdd5slxxdzyvshmi7lm2p2nc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e8dc32a5317f0ff0e72fa87220243dd742eb1ef/recipes/xah-get-thing"; sha256 = "0m61bmfgqy19h4ivw655mqj547ga8hrpaswcp48hx00hx8mqzcvg"; name = "xah-get-thing"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/xah-get-thing"; license = lib.licenses.free; }; }) {}; - xah-lookup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-lookup"; - version = "20160928.1232"; + version = "20161218.2303"; src = fetchFromGitHub { owner = "xahlee"; repo = "lookup-word-on-internet"; - rev = "e391dc7b6667e60802606500d475fb4ea529408d"; - sha256 = "1wrf9fmqjig7iamrl4h40xff19qgkja2kqj1zz2mnlmcr4hml3vh"; + rev = "219b0d58760bad26b2e07c55c229d989b983c089"; + sha256 = "1n1w9jcq1bz4qqps33p3dmmjv9hyvpa0zrxhxcp2q3vh7j0714qj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e6609a846a3c7781e0f03730b79bbf8d0355a9/recipes/xah-lookup"; sha256 = "0z0h1myw6wmybyd0z2lw4l59vgm6q6kh492q77kf3s0fssc0facc"; name = "xah-lookup"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/xah-lookup"; license = lib.licenses.free; }; }) {}; - xah-math-input = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + xah-math-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-math-input"; - version = "20161206.1107"; + version = "20161222.327"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-math-input"; - rev = "4f36d0d949ec8d930aa5e3a0cdaa9fb136244436"; - sha256 = "184kciyvs9qgzlf33y11y8x4rixfg1sx067qh67yjwgl2wzwbwfm"; + rev = "4ab83f7d9bcd6f2697a77507930542bc2a00a1a3"; + sha256 = "13h7gkdy47mnks1r80j94j3h825s93fwi43l9r7wp9jbngdx057f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/95d57e33e6d60dc20d6452b407ea1486604ba23a/recipes/xah-math-input"; sha256 = "1afikjk46sjf97fb5fc8h63h7b9af010wxhsbpnmabsb4j72rx5a"; name = "xah-math-input"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/xah-math-input"; license = lib.licenses.free; }; }) {}; - xah-replace-pairs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + xah-reformat-code = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "xah-reformat-code"; + version = "20170111.812"; + src = fetchFromGitHub { + owner = "xahlee"; + repo = "xah-reformat-code"; + rev = "7e5bbd09be8035a482a76417d900cb5d3a70e1cd"; + sha256 = "04xwf9jxk4805bl7xj05kjfgl7m71zp94qdvw4g37s6q8v25j73d"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/45e731ccee5ccbf97169e32a16300b5fb78e1155/recipes/xah-reformat-code"; + sha256 = "1sj407nbh4x586hvsq4ycr0ahhxin0wgfwdj0551cz8793wvjpzp"; + name = "xah-reformat-code"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/xah-reformat-code"; + license = lib.licenses.free; + }; + }) {}; + xah-replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-replace-pairs"; - version = "20161210.2059"; + version = "20170111.652"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-replace-pairs"; - rev = "2cf602c6d8136a44799e8799f17c3b12e2bec5c8"; - sha256 = "09bb516srdjkdibv5p2gsmwhqahwnlka0wbpcx4064w54afgh5a6"; + rev = "fb1b37f482ae2082d0a26214b2160760324d3fce"; + sha256 = "1am9zyszav8mr1g60g7jdmxd1hnvm2p7zpdrzv3awmr92y3psn1i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs"; sha256 = "0r4aq9davh3ypzcjixr3aw9g659dhiblwbmcyhm8iqhkavcpqr1x"; name = "xah-replace-pairs"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/xah-replace-pairs"; license = lib.licenses.free; }; }) {}; - xahk-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + xahk-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xahk-mode"; - version = "20150504.1611"; + version = "20161218.2311"; src = fetchFromGitHub { owner = "xahlee"; repo = "xahk-mode.el"; - rev = "91301b8eae7fd703b258a4c68066d9d5af943c4b"; - sha256 = "0dc74kqwi0hpihdbb9a9lrqb7823w6j96mah47zyd9d4rd3vx850"; + rev = "24aa00cd0a8c47f7d8906379eeccbeca22c1a50b"; + sha256 = "1npa30kp5jaqn7qmsca0a3ch0428l4n8w0hix0bvlfwr5s4zksfy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d6422756b435f59ead15fa7e8081f5c88b2e93f/recipes/xahk-mode"; sha256 = "1bs12z7lnqlhm44hq0l98d0ka1bjgvm2yv97yivaj9akd53znca9"; name = "xahk-mode"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/xahk-mode"; license = lib.licenses.free; @@ -70168,12 +70800,12 @@ xmlgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xmlgen"; - version = "20160810.331"; + version = "20170116.833"; src = fetchFromGitHub { owner = "philjackson"; repo = "xmlgen"; - rev = "fa99dbc8fa233100242a234e915fe658154d2a34"; - sha256 = "0j2yp6fy3gvgvpjdlrrxxwyax24ngv7jhxfj4rmf8wghf7i2flvg"; + rev = "331dbe01037873c209fbca2aeeaf42da446f1d79"; + sha256 = "03hksc2ng5dl4rq9yprj65d1x8kp0ccyb913hc6byz1n6gp0jkll"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cd19fded2de4e7549121485e81f7405c0176e203/recipes/xmlgen"; @@ -70315,12 +70947,12 @@ xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xterm-color"; - version = "20161128.1657"; + version = "20170102.1525"; src = fetchFromGitHub { owner = "atomontage"; repo = "xterm-color"; - rev = "67860d31c4a4e8e8781bf2c8888f40001614f54a"; - sha256 = "01if8ggkpli7md0yg4c3gv8nn0di3drs2frcfm9cd4d4jc7wc7l5"; + rev = "5873477fd7bd6e54142ab35fbc623ea9b55200aa"; + sha256 = "1328avc28barirwipasnhq81sn4nw6w6x6fffgqcxayv2r5bl1d8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; @@ -70609,12 +71241,12 @@ yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yang-mode"; - version = "20161213.1247"; + version = "20161220.157"; src = fetchFromGitHub { owner = "mbj4668"; repo = "yang-mode"; - rev = "351a17bfd4b78616cf740fc1c7148bc1d85b63a4"; - sha256 = "14hrr4ix77g795b4xhdwwqkgpbbb3axpim1r4yl1bv9jbbkqllx5"; + rev = "bcf698acbdb4df91f587942348739b407a8b0807"; + sha256 = "1rrmailvhxvivmdjamm2vvciym484cw0lqn1hgdw1lz999g5a5vs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode"; @@ -70630,12 +71262,12 @@ yankpad = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yankpad"; - version = "20160903.1935"; + version = "20170116.1451"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "yankpad"; - rev = "76ecf21a8b59f35087716ac713eb072fd3d98f00"; - sha256 = "1h0gnnsqfb6q88002pjzmhmq9is1f3knwh24nw2rbsg3mpfg378x"; + rev = "ff1064bbc4189f93433c3eebb9d0dde72a27e6c6"; + sha256 = "1spriw8c4qv7c349p8m29j5x6b72ysbpffcc444rdd9s1yypizzf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64746d10f9e0158621a7c4dc41dc2eca6ad573c/recipes/yankpad"; @@ -70774,12 +71406,12 @@ yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yasnippet"; - version = "20161211.1918"; + version = "20161221.1953"; src = fetchFromGitHub { owner = "joaotavora"; repo = "yasnippet"; - rev = "e878afb8832ecf05d654d99cd7ecb3406f7a425e"; - sha256 = "0nlw4c9cfcg04zfjfv1z097yn8cqv1l6dsbdcmf34ccgmncr076y"; + rev = "48cd7163b2475bbbea166cd0d02b4bf588f1435f"; + sha256 = "1y5bip792p76lx2hx0z459jyvx7f7y8sncd7q8rcfd581vlsyc04"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1927dc3351d3522de1baccdc4ce200ba52bd6e/recipes/yasnippet"; @@ -70815,11 +71447,11 @@ }) {}; yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yatex"; - version = "20161214.2131"; + version = "20170105.615"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "5428250c886a"; - sha256 = "0q1b0wpdfdghp6hchc59jgkyra5qqqdam47q7g2ni4ym8nlhwd3c"; + rev = "59459111e042"; + sha256 = "072aminyiw7pwm74sq3xqqyd1f2l2ilcwg98r094xjvw4fz3yjq5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; @@ -70877,12 +71509,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 = "20161128.358"; + version = "20170114.445"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "5bff8525adbe01a9af905c92f0834902ac3c1c73"; - sha256 = "15sg07dvvmmfhcp83b388zy43wgyq2qcns4qqcm2jaqq9hpvqxf9"; + rev = "386f6101fec6975000ad724f117816c01ab55f16"; + sha256 = "12m3fh2xipb6sxf44vinx12pv4mh9yd98v4xr7drim2c95mqx2y4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -70905,6 +71537,27 @@ license = lib.licenses.free; }; }) {}; + ydk-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ydk-mode"; + version = "20170113.121"; + src = fetchFromGitHub { + owner = "jacksonrayhamilton"; + repo = "ydk-mode"; + rev = "f3f125b29408e0b0a34fec27dcb7c02c5dbfd04e"; + sha256 = "0ndmbswrv8vyw18zhbmjr11400l546zqaj7dzfvwb5rhdv2d0abi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/865b9ee86ca28fc1cedc0a432a292400184711ae/recipes/ydk-mode"; + sha256 = "1z9digf39d7dd736svp0cy6773l3nklzc263q23gwfcg0jswbdyg"; + name = "ydk-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ydk-mode"; + license = lib.licenses.free; + }; + }) {}; yesql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "yesql-ghosts"; @@ -71054,12 +71707,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "20161213.324"; + version = "20170103.2328"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "f63e357ee845d95a26f48b1001c9168a0e3fefa1"; - sha256 = "1jhl9bi9qvkrdfvnrcfjims2gf11jlhp0pnxb3l9xxn2ys344lj8"; + rev = "554778b48ffa35b0ebfbed31a6dc249afa16ba24"; + sha256 = "19zh9ifaqgf8d9lkxsgznd935p4yfhxcrdi583gp8m2vwa22kgrm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -71120,8 +71773,8 @@ src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "e2e58a4aabb2b8973b318f5ad1013150f8d06678"; - sha256 = "1jnjiypm2zarfws1w5ql1c9d6zgl47cjnr8zq5lk0raxwx968lqc"; + rev = "3f93de4fd1ed7e989873b556517e018f1436f8ed"; + sha256 = "0rqg3mmh7jxsasai6i8y8r2hngvhnncn38ihvbbylyx4f71h59hi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; @@ -71304,10 +71957,10 @@ }) {}; zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "zones"; - version = "20161127.1801"; + version = "20170101.1159"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/zones.el"; - sha256 = "09lwqkfcz97jpzfr4q5ir6m8zxligkkf70b2ppnnchhmdghs0yx8"; + sha256 = "1m88lqfmfayx2pj5ws14cfysf4pv8rm9v768x6xvsknjb4sl0q8l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f768556f3fbe2537d6ebb08a5285d040e851e85d/recipes/zones"; @@ -71344,10 +71997,10 @@ zoom-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }: melpaBuild { pname = "zoom-frm"; - version = "20160809.716"; + version = "20170101.1201"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/zoom-frm.el"; - sha256 = "0k165zzqc65sl1glhh6qnlfrjx5qx1gcv5a0l445z7ny12r69xwb"; + sha256 = "1n16qx3ag9cdds04l4s2a79ijqg4k5gg1144vyn5p6ih10casw32"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/zoom-frm"; @@ -71363,12 +72016,12 @@ zoom-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoom-window"; - version = "20161123.405"; + version = "20170115.120"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-zoom-window"; - rev = "eefe36d26e04a9f89aad27671d1f06e9d4736ac6"; - sha256 = "08splg49ncgfsap3ivpc974wmg22ikshwv33l0i6advjjv9cskhm"; + rev = "5d1ea2a67ca4c74557183d62ebd90bae5a81cfc6"; + sha256 = "11qj8mqqmcxc7c14mzf84k7mpgzarpv1y2mgsky2a7hnb0si14fx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55cc66cc0deb1c24023f638b8e920c9d975859/recipes/zoom-window"; @@ -71447,12 +72100,12 @@ zotxt = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "zotxt"; - version = "20160427.1922"; + version = "20170109.2040"; src = fetchFromGitLab { owner = "egh"; repo = "zotxt-emacs"; - rev = "43c0c6d23b31126bac6b14bb85608180fd9c866f"; - sha256 = "0qksa67aazs9vx7v14nlakr34z6l0h6mhfzi2c0vhrr0c210r6hp"; + rev = "1a010ea5db617269adc132e4cc028a44d9b629bd"; + sha256 = "10i5hq0mkb0b88n9lb40ad4d98fwv5inbdfiyxyrflvl4qj0q60r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b633453e77a719f6b6b6564e66c1c1260db38aa6/recipes/zotxt"; @@ -71489,12 +72142,12 @@ ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ztree"; - version = "20161026.1249"; + version = "20170105.208"; src = fetchFromGitHub { owner = "fourier"; repo = "ztree"; - rev = "6826c3f3f3735fbf060206072392d67f0990f817"; - sha256 = "1ybrx6p9i55zsjnxa7cgali6x77aam2h55b8g5fqw23wnvr11x4q"; + rev = "3a4df17edddef84160194802acc034cfa2dbd678"; + sha256 = "1a5sk4b00sgkgq23xmv0rlx89686dx3p8cmscrcf2lcddx8cq9pl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree"; @@ -71507,6 +72160,27 @@ license = lib.licenses.free; }; }) {}; + zweilight-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "zweilight-theme"; + version = "20170112.2205"; + src = fetchFromGitHub { + owner = "philiparvidsson"; + repo = "emacs-zweilight-theme"; + rev = "7f45ab9e23164d65538edb2beb9692ecdc24c31e"; + sha256 = "142ixk47a1x6xz8ibavzq7jxppjc2qvfwbly4sdyiwfpznbi4l3a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/37422e259ada59122e1b4a31a4ae4dc00be797b9/recipes/zweilight-theme"; + sha256 = "1ykhnyiv5jvn34178mzg2cy6ynvc7jild6zwdqwr3qay87zffmjf"; + name = "zweilight-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/zweilight-theme"; + license = lib.licenses.free; + }; + }) {}; zygospore = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zygospore"; @@ -71531,12 +72205,12 @@ zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zzz-to-char"; - version = "20160122.440"; + version = "20161231.1557"; src = fetchFromGitHub { owner = "mrkkrp"; repo = "zzz-to-char"; - rev = "25272ccdb8ef5b943037e161bc7d2561f899e23a"; - sha256 = "1wphpxnh7sisqfx7ngil3ixnjkfgwy3j2bvv33bxcwslvfggimi6"; + rev = "aaa854efb6b9e4451e97dfe90d37f368ff868b9e"; + sha256 = "1k66wsbgb7fqb5mbani0lzffy3yf0801rlgxwbkj34ciblz6a197"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7063cbc1f1501ce81552d7ef1d42d1309f547c42/recipes/zzz-to-char"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 6d3ec36277c..9d945859ffe 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -230,6 +230,27 @@ license = lib.licenses.free; }; }) {}; + ac-emacs-eclim = callPackage ({ auto-complete, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ac-emacs-eclim"; + version = "0.4"; + src = fetchFromGitHub { + owner = "emacs-eclim"; + repo = "emacs-eclim"; + rev = "8203fbf8544e65324a948a67718f7a16ba2d52e6"; + sha256 = "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; + sha256 = "0bkh7x6zj5drdvm9ji4vwqdxv7limd9a1idy8lsg0lcca3rjq3s5"; + name = "ac-emacs-eclim"; + }; + packageRequires = [ auto-complete eclim ]; + meta = { + homepage = "https://melpa.org/#/ac-emacs-eclim"; + license = lib.licenses.free; + }; + }) {}; ac-emoji = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-emoji"; @@ -485,12 +506,12 @@ ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "ac-php"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "f66d13c98543032d2773c83441f49d4b6e109e97"; - sha256 = "0zi16x56jmas70srphd07ycxfdw4ny1y8vsdcvfvmgvg1mgys8f6"; + rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a"; + sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -506,12 +527,12 @@ ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: melpaBuild { pname = "ac-php-core"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "f66d13c98543032d2773c83441f49d4b6e109e97"; - sha256 = "0zi16x56jmas70srphd07ycxfdw4ny1y8vsdcvfvmgvg1mgys8f6"; + rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a"; + sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -524,22 +545,22 @@ license = lib.licenses.free; }; }) {}; - ac-racer = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }: + ac-racer = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }: melpaBuild { pname = "ac-racer"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-ac-racer"; - rev = "2708b0a49afc89fb99a6d74a016cff6b94138ed0"; - sha256 = "0g7xbfsfqpmcay56y8xbmif52ccz430s3rjxf5bgl9ahkk7zgkzl"; + rev = "4408c2d652dec0432e20c05e001db8222d778c6b"; + sha256 = "01154kqzh3pjy57vxhv27nm69p85a1fwl7r95c7pzmzxgxigfz1p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4318daf4dbb6864ee41f41287c89010fb811641/recipes/ac-racer"; sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp"; name = "ac-racer"; }; - packageRequires = [ auto-complete cl-lib racer ]; + packageRequires = [ auto-complete emacs racer ]; meta = { homepage = "https://melpa.org/#/ac-racer"; license = lib.licenses.free; @@ -1292,12 +1313,12 @@ ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ansible-vault"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "zellio"; repo = "ansible-vault-mode"; - rev = "f4d9b3a77490071b8c59caa473bb54df86e90362"; - sha256 = "0f6dmj3b57sy6xl6d50982lnsin0lzyjwk0q1blpz0h2imadr8qm"; + rev = "57cf7e6da30250587c28ebf592d7bca9a3bae1df"; + sha256 = "1m9r3vicmljypq6mhgr86lzgi26dnnlp7g0jbl9bjdk48xfg79wb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault"; @@ -1687,22 +1708,22 @@ license = lib.licenses.free; }; }) {}; - aurel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + aurel = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "aurel"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "alezost"; repo = "aurel"; - rev = "2b462d08c0e21f7fee0039457a02fa766fc6181c"; - sha256 = "0dqr1yrzf7a8655dsbcch4622rc75j9yjbn9zhkyikqjicddnlda"; + rev = "fc7ad208f43f8525f84a18941c9b55f956df8961"; + sha256 = "0mcbw8p4wrnnr39wzkfz9kc899w0k1jb00q1926mchf202cmnz94"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d1612acd2cf1fea739739608113923ec51d307e9/recipes/aurel"; sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl"; name = "aurel"; }; - packageRequires = [ emacs ]; + packageRequires = [ bui dash emacs ]; meta = { homepage = "https://melpa.org/#/aurel"; license = lib.licenses.free; @@ -2065,6 +2086,27 @@ license = lib.licenses.free; }; }) {}; + autothemer = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "autothemer"; + version = "0.2.2"; + src = fetchFromGitHub { + owner = "sebastiansturm"; + repo = "autothemer"; + rev = "8c467f57571c154129d660dfccebd151c998f2d9"; + sha256 = "0cd2pqh6k32sjidkcd8682y4l6mx52xw4a05f38kk8nsrk28m74k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3d7d7beed6ba10d7aa6a36328a696ba2d0d21dc2/recipes/autothemer"; + sha256 = "1lcyqfzx7qpkr3ajk0zi0mn32yvcwn06f61vhghn9c66xambsr7f"; + name = "autothemer"; + }; + packageRequires = [ cl-lib dash emacs ]; + meta = { + homepage = "https://melpa.org/#/autothemer"; + license = lib.licenses.free; + }; + }) {}; avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; @@ -2617,6 +2659,27 @@ license = lib.licenses.free; }; }) {}; + bool-flip = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "bool-flip"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "michaeljb"; + repo = "bool-flip"; + rev = "0f7cc9b387429239fb929896511727d4e49a795b"; + sha256 = "1051gy7izy25jwh079231d4lh9azchbqc6nvfrkv8s9ck407a65a"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f56377a7c3f4b75206ad9ba570c35dbf752079e9/recipes/bool-flip"; + sha256 = "1xfspqxshx7m8gh6g1snkaahka9f71fnq7hx81nik4s9s8pmxj9c"; + name = "bool-flip"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/bool-flip"; + license = lib.licenses.free; + }; + }) {}; boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; @@ -2722,6 +2785,27 @@ license = lib.licenses.free; }; }) {}; + buffer-manage = callPackage ({ choice-program, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "buffer-manage"; + version = "0.1"; + src = fetchFromGitHub { + owner = "plandes"; + repo = "buffer-manage"; + rev = "09c7e652010ce84ea43c0ac20a943e7733bea0af"; + sha256 = "0dhqx4zlqznl4kn8cqp2a4a7c8nsw58pxss2852pfaz11pyv22ma"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/28f8f376df810e6ebebba9fb2c93eabbe3526cc9/recipes/buffer-manage"; + sha256 = "0fwri332faybv2apjh8zajqpryi0g4kk3and8djibpvci40l42jb"; + name = "buffer-manage"; + }; + packageRequires = [ choice-program emacs ]; + meta = { + homepage = "https://melpa.org/#/buffer-manage"; + license = lib.licenses.free; + }; + }) {}; buffer-move = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "buffer-move"; @@ -2809,12 +2893,12 @@ bui = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bui"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "alezost"; repo = "bui.el"; - rev = "70ea295ec04cb34e383dc7d62927452410876999"; - sha256 = "1whpln3zibqxnszvrm9chsaaxxxfb0kg3vvfy6j4drrjy5ah2vky"; + rev = "3bf8af2f339d2483203eda2c97a61b8771c3269d"; + sha256 = "1qx7cdm7jd15rf1silwj1yh0mg5fhldfi001k1msi50nyni90c82"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38b7c9345de75a707b4a73e8bb8e2f213e4fd739/recipes/bui"; @@ -3313,12 +3397,12 @@ cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cfengine-code-style"; - version = "3.9.1"; + version = "3.10.0"; src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "843fb337d8fe849860ca2f2aeb55c7f549f75a52"; - sha256 = "0mw7xif23949d2hg4pgg2b1sj4afjc19522zqk4dmv2cz7qdmqi2"; + rev = "dc823da05d6790e9f95e3cb75618b51d6273e303"; + sha256 = "0xfdlzdcccz80qp3jbzv7wr1kwkh8797j9d3lfkh8apl4wkgvwpq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -3520,6 +3604,27 @@ license = lib.licenses.free; }; }) {}; + choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "choice-program"; + version = "0.1"; + src = fetchFromGitHub { + owner = "plandes"; + repo = "choice-program"; + rev = "154c12ed7e2afc2d5dae031698be4787d7d647b0"; + sha256 = "1695pmz0j93pz3pkcyqk0ngajcf8cyzxihmpp2zfspya3ihxj4ia"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/894357125db5035999a39514516852d7e957453e/recipes/choice-program"; + sha256 = "0hhp6qhrshqrw4978xq6biwddm7gv7yf4avbb64xvz66i3a2kgy1"; + name = "choice-program"; + }; + packageRequires = [ cl-lib emacs ]; + meta = { + homepage = "https://melpa.org/#/choice-program"; + license = lib.licenses.free; + }; + }) {}; cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; @@ -3691,12 +3796,12 @@ cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "cliphist"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cliphist"; - rev = "5cddd9c0b3aacc9941214a749edd19ceb2cde7f4"; - sha256 = "0hifxb3r54yinlal6bwhycwaspbz1kwkybvrcppkpdfg9jd88nfd"; + rev = "72a8a92f69b280c347afe2f8b5f5eb57606a9aec"; + sha256 = "0arilk9msbrx4kwg6nk0faw1yi2ss225wdlz6ycdgqc1531h6jkm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist"; @@ -3828,12 +3933,12 @@ clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode"; - version = "5.6.0"; + version = "5.6.1"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "2ee4ca6c3a156afac4565ef250b6a3b99e0e8d3d"; - sha256 = "1n77d6mn2z7v6w52kx6y4d6sqpbx21mnx0s37kkj0zwwj3b9rk2y"; + rev = "fdbdfb91e0a5731bf9a739b70c5f217c5d12ae6d"; + sha256 = "1qadymqzs5fn1sb347xzfw8lqq6s85vvkh4kzm35m61g5i2lm86y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode"; @@ -3849,12 +3954,12 @@ clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clojure-mode-extra-font-locking"; - version = "5.6.0"; + version = "5.6.1"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clojure-mode"; - rev = "2ee4ca6c3a156afac4565ef250b6a3b99e0e8d3d"; - sha256 = "1n77d6mn2z7v6w52kx6y4d6sqpbx21mnx0s37kkj0zwwj3b9rk2y"; + rev = "fdbdfb91e0a5731bf9a739b70c5f217c5d12ae6d"; + sha256 = "1qadymqzs5fn1sb347xzfw8lqq6s85vvkh4kzm35m61g5i2lm86y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e3cd2e6ee52692dc7b2a04245137130a9f521c7/recipes/clojure-mode-extra-font-locking"; @@ -3912,12 +4017,12 @@ closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "closql"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "emacscollective"; repo = "closql"; - rev = "5e9d64288863d6d33fac73ccf356427215daa9fb"; - sha256 = "0snhwix51bfs6gsg2knklkg791k2mvn3ydyk388k3k9xmn5sr7xj"; + rev = "0bb0fa3dd1e545cbf025d42e253ddb00107156a3"; + sha256 = "1mpycmj88gi62rhzxdv4933l318j3llphbc00b7rvzms55sgpcz5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql"; @@ -3996,12 +4101,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.7.1"; + version = "3.7.2"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "db3499df5d06ab2cacc61e9f7720a33456aeafe4"; - sha256 = "17ab5xln94z2ybvn8s9pivyd6xvi9h448fxjc8yk7605zsjmr9i0"; + rev = "35413bf2c1b33980afd418030af27f184872af6b"; + sha256 = "1kk0xri88h4lla8r8y5gksiwpyxb468h8qn0f61sfa1kni73z09s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -4392,22 +4497,22 @@ license = lib.licenses.free; }; }) {}; - company-emacs-eclim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + company-emacs-eclim = callPackage ({ cl-lib ? null, company, eclim, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-emacs-eclim"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "c5c7272ae30e5017ebd08d4e03508abc6b23bf4c"; - sha256 = "0b9hr3xg53nap6sik9d2cwqi8vfwzv8yqjcin4hab6rg2fkr5mra"; + rev = "8203fbf8544e65324a948a67718f7a16ba2d52e6"; + sha256 = "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; sha256 = "1l56hcy0y3cr38z1pjf0ilsdqdzvj3zwd40markm6si2xhdr8xig"; name = "company-emacs-eclim"; }; - packageRequires = []; + packageRequires = [ cl-lib company eclim ]; meta = { homepage = "https://melpa.org/#/company-emacs-eclim"; license = lib.licenses.free; @@ -4416,12 +4521,12 @@ company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-emoji"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "dunn"; repo = "company-emoji"; - rev = "b971ab0a66126f0d1410254ba1e21f17c2270101"; - sha256 = "1c9r1j7xpq6c27y6akfarrcg87idww3c10rkhm26m1vprqk73vr3"; + rev = "8dc88ffe0773ef44321f245d39430c14a1bc2b82"; + sha256 = "1y8l9wnc13g79znyw2qsbm33da2bhkj270ppikkg9h4x2qpmxilq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji"; @@ -4434,6 +4539,27 @@ license = lib.licenses.free; }; }) {}; + company-erlang = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, ivy-erlang-complete, lib, melpaBuild }: + melpaBuild { + pname = "company-erlang"; + version = "0.1"; + src = fetchFromGitHub { + owner = "s-kostyaev"; + repo = "company-erlang"; + rev = "3296baf45e354171acfddf33071b0f5af64371b5"; + sha256 = "00r0rr2c11b8mpis7a64dj6bzpm2jm17lpqmrhjjnc66zpq1vq8y"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ca96ed0b5d6f8aea4de56ddeaa003b9c81d96219/recipes/company-erlang"; + sha256 = "0qlc89c05523kjzsb7j3yfi022la47kgixl74ggkafhn60scwdm7"; + name = "company-erlang"; + }; + packageRequires = [ company emacs ivy-erlang-complete ]; + meta = { + homepage = "https://melpa.org/#/company-erlang"; + license = lib.licenses.free; + }; + }) {}; company-ghc = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, ghc, lib, melpaBuild }: melpaBuild { pname = "company-ghc"; @@ -4563,12 +4689,12 @@ company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ngram"; - version = "0.7.8"; + version = "0.7.9"; src = fetchFromGitHub { owner = "kshramt"; repo = "company-ngram"; - rev = "1d43d7df4c5d7a58e1176c7c57a8dce60dba2e8a"; - sha256 = "1isfyzjik8a5fr8sfy7462hpv5zh5bgbm8zc7d0lk50ggrazz7l5"; + rev = "98491c830d0867c211b773818610ace51f243640"; + sha256 = "196c870n7d46n4yhppq5np8mn9i0i74aykkbfk33kr4mgilss4cw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram"; @@ -4605,12 +4731,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "1.7.5"; + version = "1.7.6"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "f66d13c98543032d2773c83441f49d4b6e109e97"; - sha256 = "0zi16x56jmas70srphd07ycxfdw4ny1y8vsdcvfvmgvg1mgys8f6"; + rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a"; + sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -4818,22 +4944,22 @@ license = lib.licenses.free; }; }) {}; - concurrent = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }: + concurrent = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "concurrent"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "8827106c83f0fc773bc406d381ea25a29a5965e1"; - sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf"; + rev = "9668749635472a63e7a9282e2124325405199b79"; + sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc29a8d518ce7a584277089bd4654f52ac0f358/recipes/concurrent"; sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf"; name = "concurrent"; }; - packageRequires = [ deferred ]; + packageRequires = [ deferred emacs ]; meta = { homepage = "https://melpa.org/#/concurrent"; license = lib.licenses.free; @@ -4926,12 +5052,12 @@ copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copy-as-format"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "sshaw"; repo = "copy-as-format"; - rev = "e3e130a34d70deaa1ff81fe1e3b3898c1121c107"; - sha256 = "1llkzvbw7ci4x20pqaacri82qplsfzxb20xw7v373i5jc83wjv9z"; + rev = "6c47295597c69b3b08dd8f137f6a5973a5588674"; + sha256 = "1d4x8rvmzqi3cby01ahgr3fqcsq4kpd6sglr9slxcw7hp7rlih0i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; @@ -5154,22 +5280,22 @@ license = lib.licenses.free; }; }) {}; - creamsody-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + creamsody-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "creamsody-theme"; - version = "0.1.3"; + version = "0.3.6"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-creamsody"; - rev = "41164f285735383848aba1bfef4282bca4e9a8e8"; - sha256 = "0inql6g8f1nhx0k781ahm26fjpmpqq1cm3i7bf64ib9g5izjf91d"; + rev = "409ea24a0dace764ce22cec4a7ef4616ce94533f"; + sha256 = "1gfx26gsyxv9bywbl85z9bdn8fyv0w2g9dzz5lf5jwc9wx0d3wdi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme"; sha256 = "0l3mq43bszxrz0bxmxb76drp4c8721cw8akgk3l5a800wqbfp2l7"; name = "creamsody-theme"; }; - packageRequires = []; + packageRequires = [ autothemer ]; meta = { homepage = "https://melpa.org/#/creamsody-theme"; license = lib.licenses.free; @@ -5343,38 +5469,19 @@ license = lib.licenses.free; }; }) {}; - ctags = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "ctags"; - version = "1.1.1"; - src = fetchhg { - url = "https://bitbucket.com/semente/ctags.el"; - rev = "afb16c5b2530"; - sha256 = "1xgrb4ivgz7gmingfafmclqqflxdvkarmfkqqv1zjk6yrjhlcvwf"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/ctags"; - sha256 = "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y"; - name = "ctags"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/ctags"; - license = lib.licenses.free; - }; - }) {}; ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ctags-update"; - version = "0.2.0"; + version = "1.0"; src = fetchFromGitHub { owner = "jixiuf"; - repo = "helm-etags-plus"; - rev = "d3f3162d5a3291d84b15fd325859c87e1a374923"; - sha256 = "05vhryqcydvcfm18fwby344931kzzh47x4l5ixy95xkcjkzrj8c7"; + repo = "ctags-update"; + rev = "ff4f211e42df94fdeba376e62b65dc67f0388589"; + sha256 = "09vdfmm846zhn5nxnndi7qg7rdsf5xd4zhynbx0mnm00cfw1vf0y"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/23f6ae3d3c8e414031bf524ff75d9d6f8d8c3fe9/recipes/ctags-update"; - sha256 = "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/ctags-update"; + sha256 = "07548jjpx4var2817y47i6br8iicjlj66n1b33h0av6r1h514nci"; name = "ctags-update"; }; packageRequires = []; @@ -5533,12 +5640,12 @@ darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "0.1.60"; + version = "0.2.100"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "1a5d0dc5ae9c57bcb07085ded6fa82c3512ff80f"; - sha256 = "0hz3hhkyg6m2wvffanpclc2wq7y8n63sgz726kg87iqgq2lfa096"; + rev = "380fdcff12f44faf099bc5a38984d88784b495a2"; + sha256 = "1pragypiv59rrvq2xjzmldkf1v007viwwcvr3f5iyv31n0bmd0cn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -5554,12 +5661,12 @@ dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dart-mode"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "nex3"; repo = "dart-mode"; - rev = "07edf4d4448ede128d13c27bd76cf06f5ef5bb3b"; - sha256 = "1vkn95dyc0pppnflyqlrlx32g9zc7wdcgc9fgf1hgvqp313ydfcs"; + rev = "e6635b390235cf16a8081763768cf925ca2d9133"; + sha256 = "1cwwwxmv7d1blv88c6nlm0z94gjfdgw2ri1libzyfzirincyicdx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7d9cb763cb8e929d9442be8d06e9af02de90714a/recipes/dart-mode"; @@ -5625,8 +5732,8 @@ sha256 = "1klmjdym4w3cbarabzvkxddjdcisfk62wkpys3z4nclp4g91p8as"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b047625aebdbf7b5d644b55afbdccfc6c4ac14a8/recipes/dashboard"; - sha256 = "04lp8ylfnbdj65s8z0m5kyj4rwxcsdwinlkpj00j1my0m74y5i0p"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard"; + sha256 = "08pdpjfrg8v80gljy146cwpz624dshhbz8843zl1zszwp2p00kqy"; name = "dashboard"; }; packageRequires = [ emacs page-break-lines ]; @@ -5782,22 +5889,22 @@ license = lib.licenses.free; }; }) {}; - deferred = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + deferred = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "deferred"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "kiwanami"; repo = "emacs-deferred"; - rev = "8827106c83f0fc773bc406d381ea25a29a5965e1"; - sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf"; + rev = "9668749635472a63e7a9282e2124325405199b79"; + sha256 = "1ch5br9alvwcpijl9g8w5ypjrah29alpfpk4hjw23rwzyq5p4izq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e9a114d85f630648d05a7b552370fa8413da0c2/recipes/deferred"; sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr"; name = "deferred"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/deferred"; license = lib.licenses.free; @@ -6454,12 +6561,12 @@ dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "c7a699fdab0c8f3de32000c804b1504b39c936ad"; - sha256 = "0xbzw4wvhaz7h4zq2pnfcps7wfm99vyhsk25hhsr632jnz790xdf"; + rev = "f9dd686922cf89dc7859c793be84969a2529a14b"; + sha256 = "02cayawahsa59mkr0f4rhsm9lnpyv8qpx59w3040xmhf8dx95378"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix"; @@ -6475,12 +6582,12 @@ dix-evil = callPackage ({ dix, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix-evil"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "c7a699fdab0c8f3de32000c804b1504b39c936ad"; - sha256 = "0xbzw4wvhaz7h4zq2pnfcps7wfm99vyhsk25hhsr632jnz790xdf"; + rev = "f9dd686922cf89dc7859c793be84969a2529a14b"; + sha256 = "02cayawahsa59mkr0f4rhsm9lnpyv8qpx59w3040xmhf8dx95378"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil"; @@ -6585,22 +6692,22 @@ license = lib.licenses.free; }; }) {}; - doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: melpaBuild { pname = "doom-themes"; - version = "1.1.2"; + version = "1.1.5"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-doom-theme"; - rev = "dbe6ed4b4cf27ab676843505cb7c5edba50b455b"; - sha256 = "0npzshc9mv1zy8dmghz34nwdjlpgxxd4iiv2zp3l6qa0m78j52ri"; + rev = "f07088c1a6c177cdb5e2ff674489c17a8a7a8426"; + sha256 = "1c6id6d42p38viwd0x6cic0v08g117gj7im1m15k9j52rkvgvvn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; sha256 = "1ckr8rv1i101kynnx666lm7qa73jf9i5lppgwmhlc76lisg07cik"; name = "doom-themes"; }; - packageRequires = [ all-the-icons dash emacs ]; + packageRequires = [ all-the-icons dash emacs font-lock-plus ]; meta = { homepage = "https://melpa.org/#/doom-themes"; license = lib.licenses.free; @@ -6801,8 +6908,8 @@ version = "0.7"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "20a2166c8210"; - sha256 = "0gz0aiks3f53lqvnrnb33a1clq52ipd3i3miymvkkgspnz3vl12p"; + rev = "4004050a9771"; + sha256 = "0p7g7sfkdr473gpj2xdgg5fb5d336w2ddvx44i1d6575p6rcs5w6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -7088,43 +7195,43 @@ license = lib.licenses.free; }; }) {}; - ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }: + ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "2.8.1"; + version = "2.10"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "219665ba1c9aad885cee6e9914448139be7f7299"; - sha256 = "0s9hyyhjzf7ldr67znhmhl5k1q6qacnlnqw20cdc0iihidj2fg2j"; + rev = "4c2581ad17a636909e7ed0f46bd813cd6d9c45d3"; + sha256 = "1ic55fml4ll7pvakcf32ahps4za8mf4q10jgdyi8xj5bccvi3n3r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid"; name = "ebib"; }; - packageRequires = [ dash emacs parsebib ]; + packageRequires = [ dash emacs parsebib seq ]; meta = { homepage = "https://melpa.org/#/ebib"; license = lib.licenses.free; }; }) {}; - eclim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s, yasnippet }: melpaBuild { pname = "eclim"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "c5c7272ae30e5017ebd08d4e03508abc6b23bf4c"; - sha256 = "0b9hr3xg53nap6sik9d2cwqi8vfwzv8yqjcin4hab6rg2fkr5mra"; + rev = "8203fbf8544e65324a948a67718f7a16ba2d52e6"; + sha256 = "10bbbxhvlwm526g1wib1f87grnayirlg8jbsvmpzxr9nmdjgikz3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; sha256 = "1n60ci6kjmzy2khr3gs7s8gf21j1f9zjaj5a1yy2dyygsarbxw7b"; name = "eclim"; }; - packageRequires = []; + packageRequires = [ cl-lib dash json popup s yasnippet ]; meta = { homepage = "https://melpa.org/#/eclim"; license = lib.licenses.free; @@ -7196,12 +7303,12 @@ ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ede-php-autoload"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "stevenremot"; repo = "ede-php-autoload"; - rev = "c748354c6398aa7e5d3f00ee4c5422f4eca09a91"; - sha256 = "1imr45s2a1lilqfgfccgxasqlmh1nkc1ivf5iq01w31wik2hii0z"; + rev = "c6896c648fbc90f4d083f511353d6b165836d0e8"; + sha256 = "0dfx0qiyd23jhxi0y1n4s1pk9906b91qnp25xbyiqdacs54l6d8a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload"; @@ -7385,12 +7492,12 @@ egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "egison-mode"; - version = "3.6.3"; + version = "3.6.4"; src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "4cf38946096c185ac794d594a791da23675297aa"; - sha256 = "0k6qh99jbzirgsa3qkhcxsivncbvk5wr4yag2s9c2y9akipxivrq"; + rev = "62c99118f32dd23a088e2d9c0d6b7b755206cac6"; + sha256 = "1f0s9pvns4gq6xzp4vp74xxxbmzp06vdv0jgh0x1xy0mfklgll8x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -7887,12 +7994,12 @@ elpa-clone = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-clone"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "dochang"; repo = "elpa-clone"; - rev = "77e45f3ac7de504ff65e17dfd52bfde7bdfc78f2"; - sha256 = "09q54j0n52493smhdrngn2isnifvy0x3s6vlicllkm8qykr06z9v"; + rev = "8d0827b03b08eb4844e2b8465c27d5aa0e12101d"; + sha256 = "1ik2k6ngzg3znfp4a36f7m5ca6p3iivfb7w280w3gm5x1ja8as2a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11861edd9c7f9deebd44fd1f8ef648e7a04caf2b/recipes/elpa-clone"; @@ -8644,12 +8751,12 @@ epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "epkg"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "emacscollective"; repo = "epkg"; - rev = "de33177656d8f48b65abbb71ab4d25b7bd799dee"; - sha256 = "0lhb8b4i8r8a6pagwa0p3iqb1bk25as4nd4pjwbdjn0800ncv9nh"; + rev = "6e1d989fbfa357a7c268ea30fe8b3e3cefafc36d"; + sha256 = "0avlmqcbm07692ir5z04gy4klhyan3h25ni4l4k4p0dszjsqmdi0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg"; @@ -8704,22 +8811,22 @@ license = lib.licenses.free; }; }) {}; - erc-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + erc-crypt = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erc-crypt"; - version = "1.0"; + version = "1.6"; src = fetchFromGitHub { owner = "atomontage"; repo = "erc-crypt"; - rev = "1573189240d8b58e65385414d9a9514238c77805"; - sha256 = "1xw56sir6gkr0p9g4s6p4qc0rajnl6ifbzrky07j28y9vsa59nsz"; + rev = "731f9264a5bf08a8fc0b5ce69e72058c86f873a5"; + sha256 = "13jpq5ws5dm8fyjrskk4icxwz8k5wgh396cc8f8wxrjna4wb843w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a71b46c0370d2ed25aa3f39983048a04576ad5/recipes/erc-crypt"; sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3"; name = "erc-crypt"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/erc-crypt"; license = lib.licenses.free; @@ -8874,12 +8981,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "19.2"; + version = "19.2.1"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "3473ecd83a7bbe7e0bebb865f25dddb93e3bf10f"; - sha256 = "06pr4ydrqpp1skx85zjb1an4kvzv6vacb771vy71k54j7w6lh9hk"; + rev = "bca5bf5a2d68a0e9ca681363a8943809c4751950"; + sha256 = "1bxksxp2ggzskmrzh4k66w27ckh77jjjriq85xfz52n963al9crr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -9125,12 +9232,12 @@ eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-z"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "eshell-z"; - rev = "033924f138f19f22a30c1845e728691e5615fa38"; - sha256 = "0kp9yw56l8bl4zqganclnpf6x5g2rmcf23265n8cp24j6d7c7r4h"; + rev = "96ec3f5f8a801c893d2c6a6b140e333ef2bfd8b5"; + sha256 = "1aac4m814jgxwpz7lbyx5r4z5dmawp4sk7pwbx0zqpnbcsaq5wwc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8079cecaa59ad2ef22812960838123effc46a9b3/recipes/eshell-z"; @@ -9314,12 +9421,12 @@ eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: melpaBuild { pname = "eval-in-repl"; - version = "0.9.2"; + version = "0.9.4"; src = fetchFromGitHub { owner = "kaz-yos"; repo = "eval-in-repl"; - rev = "2b5d1bee767de4f21b14cefd7ce310f862226bd7"; - sha256 = "077rj7yj6laxyhcsmrmlpg438962jv0fm2yiqx6i365fbgyx0hck"; + rev = "674873139ebde439fbeecaf0fb217d54f470bc14"; + sha256 = "1fzsq6fkkrsxg6mimrnls0kn59rq7w332b94gg04j0khl61s1v1s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0bee5fb7a7874dd20babd1de7f216c5bda3e0115/recipes/eval-in-repl"; @@ -9481,12 +9588,12 @@ evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-escape"; - version = "3.12"; + version = "3.14"; src = fetchFromGitHub { owner = "syl20bnr"; repo = "evil-escape"; - rev = "befb07d03c0c06ff5c40eb9cdd436c97fc49f394"; - sha256 = "0cj17gk7cxia2p9xzqnlnmqqbw2afd3x61gfw9fpf65j9wik5hbz"; + rev = "b4d44fc5015341e484495fc86b73d09b2ac062ec"; + sha256 = "0s8lmmm25qabicwaj9jybpbd8mkc62yl7jnhk1lpablydjkv3w2i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/770fc6dd82c4d30f98e973958044e4d47b8fd127/recipes/evil-escape"; @@ -10111,12 +10218,12 @@ eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eyebrowse"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitHub { owner = "wasamasa"; repo = "eyebrowse"; - rev = "a009536514409fdf0a1745504a7d7e0e376cc2c9"; - sha256 = "0kw13w3q1q4gb3ql728bk9m0rymkp21rrjmy4hyx8im84xh093ls"; + rev = "e7c3de9c8b3197f3a310d8d9259761fc70dfa3ef"; + sha256 = "0d2vc50m2wr6f0fd04xm3bzca25im3ka57y7lg6p0bn5fp6a62vl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90d052bfc0b94cf177e33b2ffc01a45d254fc1b1/recipes/eyebrowse"; @@ -10489,12 +10596,12 @@ firestarter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "firestarter"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "wasamasa"; repo = "firestarter"; - rev = "4b7428477980e12578ebbbb121115696b352d6b2"; - sha256 = "0s8rml5xbskvnjpi8qp7vqflxhh5yis6zr6ay2bxmd2chjlhli55"; + rev = "4d6b106f325ac1802eabce3c8a7cd0a4c7a32864"; + sha256 = "13daz15v0sshl7lxcg1xcbpl64gklgh50pzk0qxmn5ygw7nlifn0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b046eb3b63220b937e1b70f633cb5424dc782a1/recipes/firestarter"; @@ -10958,12 +11065,12 @@ flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-objc-clang"; - version = "1.0.2"; + version = "1.0.6"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-objc-clang"; - rev = "3140e4c74dbaa10e6f8edd794144d07399a8fda8"; - sha256 = "0zzb03qxfs5wky40hzmldkzq5gn4c7qknkd5ra2lghzj0az6n9ld"; + rev = "11805f1d420e297db0346a6657f144b08e2ca556"; + sha256 = "1s9bk3k7ys79m2iww4yf1abfy01d08z9x9pfq8l045q0snsh64il"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang"; @@ -11126,12 +11233,12 @@ flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-swift3"; - version = "1.0.5"; + version = "1.0.8"; src = fetchFromGitHub { owner = "GyazSquare"; repo = "flycheck-swift3"; - rev = "846b3045d018a13cadb8a8bfde83587802d7e1a2"; - sha256 = "06wzsi3lw938mc8sz06jxyclxpvrlyjgvs9998kpiyhz752sgfsw"; + rev = "ae7b29111cb160774c317997902d7ef29cedd7d9"; + sha256 = "17s34rqxkirb88y8jzl3ybs7j3ylp9ckdfx3sqwfn0cyspnj5f1d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3"; @@ -11795,22 +11902,22 @@ license = lib.licenses.free; }; }) {}; - fontawesome = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: + fontawesome = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "fontawesome"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-fontawesome"; - rev = "ccb03b8329daa3130491c9c4d285b325dbeb5cc7"; - sha256 = "0qq13jhn9i2ls6n3fbay4i2r0hfs426pkmmif43b87gjxb510irc"; + rev = "72b4f2f83c7fdacd225aee58f93acefc53166626"; + sha256 = "1icwjd1rbyr1g8ifyhvpi21wjff2qrddq2rmp5lmiajnwrlfli0d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93b92f10802ceffc353db3d220dccfd47ea7fa41/recipes/fontawesome"; sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3"; name = "fontawesome"; }; - packageRequires = [ cl-lib helm-core ]; + packageRequires = [ emacs helm-core ]; meta = { homepage = "https://melpa.org/#/fontawesome"; license = lib.licenses.free; @@ -11819,12 +11926,12 @@ forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forecast"; - version = "0.4.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "cadadr"; repo = "forecast.el"; - rev = "ff307fd24c64577d204d0c1b7b245f190f70bd61"; - sha256 = "1x4l24cbgc4apv9cfzf6phmj5pm32hfdgv37wpbh7ml8v3p8xm0w"; + rev = "1bae400e5154d7494fd989b1be47450565810e23"; + sha256 = "0kcyn2m122wbbsp7mwji5acsrdfdkfpf427zj6dn88rfx90q82w2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ff6a4ee29b96bccb2e4bc0644f2bd2e51971ee/recipes/forecast"; @@ -12560,12 +12667,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "acb8efe770b55ae23f24cf8d2dc4e62bc37c1b88"; - sha256 = "11vhdz75yqp0c9vp64mv2c2bh4dwb8skvix5gbqhfykd5wa565ay"; + rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59"; + sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -12704,22 +12811,22 @@ license = lib.licenses.free; }; }) {}; - git-messenger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: + git-messenger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "git-messenger"; - version = "0.17"; + version = "0.18"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-git-messenger"; - rev = "9412a975f4723e9bc9c9feb4ec064b2e8c0c659d"; - sha256 = "1hh99ippc1bpqpnchvhbh7yzcsjx9v7bbpy5r9hx82kx0xqih0sc"; + rev = "9297464c010dd8a2d584ac8e012876856655a8b5"; + sha256 = "04fnby2nblk8l70gv09asxkmnn53fh1pdfs77ix44npp99fyw8ix"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e791293133f30e5d96c4b29e972f9016c06c476d/recipes/git-messenger"; sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn"; name = "git-messenger"; }; - packageRequires = [ cl-lib popup ]; + packageRequires = [ emacs popup ]; meta = { homepage = "https://melpa.org/#/git-messenger"; license = lib.licenses.free; @@ -13316,12 +13423,12 @@ go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }: melpaBuild { pname = "go-playground"; - version = "1.0"; + version = "1.2"; src = fetchFromGitHub { owner = "grafov"; repo = "go-playground"; - rev = "2e1497517d13d813768b3f8e25bb3cce7a449acd"; - sha256 = "08ka2wlwq5v13ni8n5zd5vp4iynwcirsqdw0an20gqg0hrcvs1ba"; + rev = "97be0b3a19d7b8476663c9b16148c4dfd9783cfe"; + sha256 = "0wz79iwcfql8kfq5q9b0fccj9590giqlzd2kzjaj0fl89n0sx9gq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/900aabb7bc2350698f8740d72a5fad69c9219c33/recipes/go-playground"; @@ -13547,12 +13654,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "ab40ac7324b5d45b8f1677d87ec0d26349448d41"; - sha256 = "0rb55f4yx8wpqs93xy80wn6k8pyrhj8zh3q5lbi78afgscjrgjlr"; + rev = "6103db21b38cbdfda3100fed08b988fc2d83aa1a"; + sha256 = "0hlqrqi1s94cr828qyfbr95np5xwr3bn98l4gv59rnqa1vmx49gy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -13952,22 +14059,22 @@ license = lib.licenses.free; }; }) {}; - gruvbox-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruvbox-theme"; - version = "0.17"; + version = "1.12.0"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "89b060abf49791cad2639f234b230dc4882bdc39"; - sha256 = "0bhg2za2a67r6hkb0628zvzxx65rcj7cm3kq3m44wls8q8cr2jxj"; + rev = "e57f494fd94e49321a6396f530b8a13bae8b57df"; + sha256 = "16f9vszl0f1dkjvqk5hxi570gf4l8p6fk27p0d7j11grsck0yzly"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; sha256 = "042mnwlmixygk2mf24ygk7rkv1rfavc5a36hs9x8b68jnf3khj32"; name = "gruvbox-theme"; }; - packageRequires = []; + packageRequires = [ autothemer ]; meta = { homepage = "https://melpa.org/#/gruvbox-theme"; license = lib.licenses.free; @@ -14036,6 +14143,27 @@ license = lib.licenses.free; }; }) {}; + guix = callPackage ({ bui, dash, emacs, fetchFromGitHub, fetchurl, geiser, lib, magit-popup, melpaBuild }: + melpaBuild { + pname = "guix"; + version = "0.2.2"; + src = fetchFromGitHub { + owner = "alezost"; + repo = "guix.el"; + rev = "b832ff6c417b83652b7aa6d9ecfa75803fabe23c"; + sha256 = "153fr29lvhfkfmfhpinaffc2dpll2r3dlsk1hpxkw4j2cac5visl"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b3d8c73e8a946b8265487a0825d615d80aa3337d/recipes/guix"; + sha256 = "0h4jwc4h2jv09c6rngb614fc39qfy04rmvqrn1l54hn28s6q7sk9"; + name = "guix"; + }; + packageRequires = [ bui dash emacs geiser magit-popup ]; + meta = { + homepage = "https://melpa.org/#/guix"; + license = lib.licenses.free; + }; + }) {}; guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "guru-mode"; @@ -14392,22 +14520,22 @@ license = lib.licenses.free; }; }) {}; - hcl-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + hcl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hcl-mode"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-hcl-mode"; - rev = "cc13180e3af748d53c4a1d433ce2edf99bf68a7d"; - sha256 = "0hiw226gv73jh7s3jg4p1c15p4km4rs7i9ab4wgpkl5lg4vrz5i6"; + rev = "6a6daf37522188a2f2fcdebc60949fc3bdabbc06"; + sha256 = "0jqrgq15jz6pvx38pnwkizzfiih0d3nxqphyrc92nqpcyimg8b6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66b441525dc300b364d9be0358ae1e0fa2a8b4fe/recipes/hcl-mode"; sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin"; name = "hcl-mode"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/hcl-mode"; license = lib.licenses.free; @@ -14416,12 +14544,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.3.3"; + version = "2.4.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "2fca3400574e5f2666c942c674ce0f8e6ca6b232"; - sha256 = "1qbvgp2pca0n5ahpc1gss8ldn07mgs96xxgb5dg62b08ch8ry2jf"; + rev = "a1bc339cbdaad200cb947e1e6264e9013322b434"; + sha256 = "1pjp629xwya55ld6hkys4gmgn0mvnd7qzpzz1qraaympsnymrh3w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -14668,12 +14796,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.3.3"; + version = "2.4.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "2fca3400574e5f2666c942c674ce0f8e6ca6b232"; - sha256 = "1qbvgp2pca0n5ahpc1gss8ldn07mgs96xxgb5dg62b08ch8ry2jf"; + rev = "a1bc339cbdaad200cb947e1e6264e9013322b434"; + sha256 = "1pjp629xwya55ld6hkys4gmgn0mvnd7qzpzz1qraaympsnymrh3w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -14770,6 +14898,27 @@ license = lib.licenses.free; }; }) {}; + helm-etags-plus = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-etags-plus"; + version = "1.1"; + src = fetchFromGitHub { + owner = "jixiuf"; + repo = "helm-etags-plus"; + rev = "99512856918e485862ceb21460476adb0349f525"; + sha256 = "08ddxp1hm0ckx6gq9yl6dhh0jrfb6f747snchykl3z5p0ayknvlm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e5d0c347ff8cf6e0ade80853775fd6b84f387fa5/recipes/helm-etags-plus"; + sha256 = "0lw21yp1q6iggzlb1dks3p6qdfppnqf50f3rijjs18lisp4izp99"; + name = "helm-etags-plus"; + }; + packageRequires = [ helm ]; + meta = { + homepage = "https://melpa.org/#/helm-etags-plus"; + license = lib.licenses.free; + }; + }) {}; helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-firefox"; @@ -15928,12 +16077,12 @@ hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hindent"; - version = "5.2.1"; + version = "5.2.2"; src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "5de979e1e001608c9fe73d552c4e29110957bbb8"; - sha256 = "1qaklfhf92zibj2wrpiyjqrzba7j00iqzb46nd7p64wyqqhh7ncp"; + rev = "d67cee32231aee30984b9c5d0250d21b5377b620"; + sha256 = "126q56673w7yz1p58550k6aya47nhbzn29g4zvq6wjbnicn0vwd1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -16243,12 +16392,12 @@ htmlize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "htmlize"; - version = "1.50"; + version = "1.51"; src = fetchFromGitHub { owner = "hniksic"; repo = "emacs-htmlize"; - rev = "f74ea313ad364ffd648e330b2e6ddabb89f6e797"; - sha256 = "16jxd5nfpqlg46zzp0yvvn5aynprd5xv655fcql8cvxkkg111d5z"; + rev = "88e2cb6588827893d7bc619529393887c264d15a"; + sha256 = "09xpv8dsc39a7w9s6xnilc5kh1krs2jw8cklizxzz4gp36hrsj2n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/075aa00a0757c6cd1ad392f0300bf5f1b937648d/recipes/htmlize"; @@ -17017,22 +17166,22 @@ license = lib.licenses.free; }; }) {}; - import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }: melpaBuild { pname = "import-js"; - version = "0.7.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "galooshi"; repo = "emacs-import-js"; - rev = "231d3d5924adea2d0127aa50acbd2b6a4bab5d25"; - sha256 = "1zsjaz69gbfmsy0zr6byag31m9jv3nglhxhz56xzhaabsk218f74"; + rev = "15d395126f57408d770a72db2e5f43271f90fa52"; + sha256 = "1ipbfacjx9vqqhvsf9sgfci8vqx0plks510w1gsjj0xwrpqn1f6l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/048344edd471a473c9e32945b021b3f26f1666e0/recipes/import-js"; sha256 = "0qzr4vfv3whdly73k7x621dwznca7nlhd3gpppr2w2sg12jym5ha"; name = "import-js"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs grizzl ]; meta = { homepage = "https://melpa.org/#/import-js"; license = lib.licenses.free; @@ -17143,6 +17292,27 @@ license = lib.licenses.free; }; }) {}; + info-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "info-buffer"; + version = "0.2"; + src = fetchFromGitHub { + owner = "llvilanova"; + repo = "info-buffer"; + rev = "d35dad6e766c6e2ddb8dc6acb4ce5b6e10fbcaa7"; + sha256 = "0czkp7cf7qmdm1jdn67gxyxz8b4qj2kby8if50d450xqwbx0da7x"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3c44a1d69725b687444329d8af43c9799112b407/recipes/info-buffer"; + sha256 = "1vkgkwgwym0j5xip7mai11anlpa2h7vd5m9i1xga1b23hcs9r1w4"; + name = "info-buffer"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/info-buffer"; + license = lib.licenses.free; + }; + }) {}; inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "inherit-local"; @@ -17499,6 +17669,27 @@ license = lib.licenses.free; }; }) {}; + ivy-erlang-complete = callPackage ({ async, counsel, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "ivy-erlang-complete"; + version = "0.1.2"; + src = fetchFromGitHub { + owner = "s-kostyaev"; + repo = "ivy-erlang-complete"; + rev = "65d80ff0052be9aa65e9a1cd8f6b1f5fb112ee36"; + sha256 = "05qjpv95xrhwpg1g0znsp33a8827w4p7vl6iflrrmi15kij5imb4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; + sha256 = "00fqjgrhvcn3ibpgiy4b0sr4x9p6ym5r1rvi4rdzsw2i3nxmgf3a"; + name = "ivy-erlang-complete"; + }; + packageRequires = [ async counsel emacs erlang ivy ]; + meta = { + homepage = "https://melpa.org/#/ivy-erlang-complete"; + license = lib.licenses.free; + }; + }) {}; ivy-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, ivy, lib, melpaBuild, s }: melpaBuild { pname = "ivy-gitlab"; @@ -17583,6 +17774,27 @@ license = lib.licenses.free; }; }) {}; + ivy-youtube = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, request }: + melpaBuild { + pname = "ivy-youtube"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "squiter"; + repo = "ivy-youtube"; + rev = "f8bc1eadaa46b4c9585c03dc8cbb325193df016e"; + sha256 = "1b973qq2dawdal2220lixg52bg8qlwn2mkdw7ca3yjm6gy9fv07b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/33cc202ff0f0f283da23dbe7c7bdc5a1a86fb1d8/recipes/ivy-youtube"; + sha256 = "1llrlxbvpqahivd3wfjfwijzbngijfl786p7ligsb458s69jv1if"; + name = "ivy-youtube"; + }; + packageRequires = [ cl-lib ivy request ]; + meta = { + homepage = "https://melpa.org/#/ivy-youtube"; + license = lib.licenses.free; + }; + }) {}; ix = callPackage ({ fetchFromGitHub, fetchurl, grapnel, lib, melpaBuild }: melpaBuild { pname = "ix"; @@ -17941,12 +18153,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20160623"; + version = "20170116"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "0cda39255827f283e7578cd469ae42daad9556a2"; - sha256 = "1k91nckxg6d9q9pmn2ikcw85yrmj4yrw20i8v0pq8499wz8i15gs"; + rev = "03c679eb9914d58d7d9b7afc2036c482a9a01236"; + sha256 = "1kgmljgh71f2sljdsr134jrj1i6kgj9bwyh4pl1lrz0v4ahwgd6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -18382,12 +18594,12 @@ keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "keymap-utils"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "tarsius"; repo = "keymap-utils"; - rev = "14c86914b708081299cf6a290570ff8e11853cab"; - sha256 = "15zsx296cqzmwivrkkknr8lmdsr6dkggxbwp2yggr20278vsvbhv"; + rev = "a4f6ff724eeade5612c01c6f6bf401f264687793"; + sha256 = "0jgmw8798g3ikhwnic3fbbjld0hj8fvg50q6x78pngf78ws92mkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils"; @@ -19250,12 +19462,12 @@ logview = callPackage ({ datetime, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "logview"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "doublep"; repo = "logview"; - rev = "4f1db3f2081e819dd35545497529a03466bd0397"; - sha256 = "0f96wxijls743qyqfgkdqil3p5nn0sm02rlz1nqkm6bd8k28rcg1"; + rev = "c22ac44d14de8aaad532e47ea60c21c24d661a50"; + sha256 = "02842gbxlq6crvd3817aqvj5irshls5km675vmhk0qd4cqg38abv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1df3c11ed7738f32e6ae457647e62847701c8b19/recipes/logview"; @@ -19418,12 +19630,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "acb8efe770b55ae23f24cf8d2dc4e62bc37c1b88"; - sha256 = "11vhdz75yqp0c9vp64mv2c2bh4dwb8skvix5gbqhfykd5wa565ay"; + rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59"; + sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -19572,12 +19784,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "2.9.0"; + version = "2.10.0"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "acb8efe770b55ae23f24cf8d2dc4e62bc37c1b88"; - sha256 = "11vhdz75yqp0c9vp64mv2c2bh4dwb8skvix5gbqhfykd5wa565ay"; + rev = "9cc74bfc9804918d1b296424bc0fb0aca6d65a59"; + sha256 = "1dr4c0vv6mb1jmqg6s8yml58sg9yx3da1kqbsv97gv4vasd0s0dn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -20097,12 +20309,12 @@ mb-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mb-url"; - version = "0.0.9"; + version = "0.1.0"; src = fetchFromGitHub { owner = "dochang"; repo = "mb-url"; - rev = "178b03d2cbc31e889c095a6c25426c297e5fe6fc"; - sha256 = "0y22bn4zvyw2qivjrvwkhx96mwvfpx74901r0m4l31nvyh559aq0"; + rev = "129a0bb6a684be76fb9f09010e710065d0e5baaa"; + sha256 = "1apy7abjhdbgh8001rzv41q40bfl444rcz62lvgdwj3lg45zb8xc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dd9a8ff6e094b061a7b9d790df1fd4086c5d0a9d/recipes/mb-url"; @@ -20220,22 +20432,22 @@ license = lib.licenses.free; }; }) {}; - mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }: + mentor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, seq, xml-rpc }: melpaBuild { pname = "mentor"; - version = "0.1.1"; + version = "0.3.1"; src = fetchFromGitHub { owner = "skangas"; repo = "mentor"; - rev = "f53dac51a29f67e31f1fb82702b19d158cc6fa22"; - sha256 = "0qqapsp4gpkrj3faii7qbfssddl3vqfmwqcy259s7f896kzwaaky"; + rev = "2b6aea26fd998d6e6fdac5e6b768f9a1751e268a"; + sha256 = "1j6wf2z4816qj17bm45frhmxk1snsad3jvkjpasyg8pscf4kqi07"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor"; sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s"; name = "mentor"; }; - packageRequires = [ xml-rpc ]; + packageRequires = [ cl-lib seq xml-rpc ]; meta = { homepage = "https://melpa.org/#/mentor"; license = lib.licenses.free; @@ -20978,12 +21190,12 @@ msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "msvc"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "yaruopooner"; repo = "msvc"; - rev = "e7a61fa5b98a129637f970ac6db9163e330b3d02"; - sha256 = "1draiwbwb8zfi6rdr5irv8091xv2pmnifq7pzi3rrvjb8swb28z3"; + rev = "71c38323187c98b32250b89088768599bb216ddb"; + sha256 = "1wwa861a8bnrqv59bx6l5k3qi98wqv6cicvg5gjyx8rdvpcq28dg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69939b85353a23f374cab996ede879ab315a323b/recipes/msvc"; @@ -21185,6 +21397,27 @@ license = lib.licenses.free; }; }) {}; + mysql-to-org = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "mysql-to-org"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "mallt"; + repo = "mysql-to-org-mode"; + rev = "0f51b174a0ee6c9820baf9d79783923b270f3ffc"; + sha256 = "1gxp1a26sna0p3xq6by8bk4yphhh32bvll0sdm2p3wkpdaci7hyz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ca23f61be1dc8b0ae2ec0ae38d4614cf9c855023/recipes/mysql-to-org"; + sha256 = "13ysgvqp7bafiaz0f9kg4pq2idndj4r804q6ih64bac8gqhnmcv9"; + name = "mysql-to-org"; + }; + packageRequires = [ emacs s ]; + meta = { + homepage = "https://melpa.org/#/mysql-to-org"; + license = lib.licenses.free; + }; + }) {}; name-this-color = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "name-this-color"; @@ -21293,12 +21526,12 @@ nasm-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nasm-mode"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "skeeto"; repo = "nasm-mode"; - rev = "c3f5475c2f4bd930411b6d716765d094b36ce219"; - sha256 = "0d8bfz41ry5bvkz2894dqkk3244n7xcjk3pf58fcsagvmmkkln7b"; + rev = "d990ed94d902b74a5c834fb567e03307607cee45"; + sha256 = "1dyc50a1zskx9fqxl2iy2x74f3bkb2ccz908v0aj13rqfqqnns9j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a832b3bd7c2f2d3cee8bcfb5421d22acf5523e/recipes/nasm-mode"; @@ -21440,12 +21673,12 @@ neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "0.5"; + version = "0.5.1"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "ba1f4bacd97c99d55ad37e5940bd7567d2ae50d4"; - sha256 = "1a8riwz37sws2g2992zj6y8q4ypr76gxfwril6vnfig367anv4js"; + rev = "d2ae6ac8a919f164f34c589f2f46ddd140a79f81"; + sha256 = "0xqcrxmpk2z4pd9scqn2nannqy0a76mkkqv9bz037a36w8v481nd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; @@ -21545,12 +21778,12 @@ nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; - version = "1.11.4"; + version = "1.11.6"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "fb577a431f5ef1a29fdf3b818dceb4f6b4e8fa52"; - sha256 = "1vzs5y0ib9bqvcyap7f6v75pf8z0xpdwgq554zxci4dlwp68fp2p"; + rev = "1fa2c86db50af806916d72e76f10bef39dd65e7d"; + sha256 = "1l4xfv38famawrxs6lg9k7gxghgmlgbpp2dbchnqln21d32b6a8h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -21587,12 +21820,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "12a4cc1155b938da947cce5b3dff7ffb91f2203c"; - sha256 = "1x7xmqvmna5h5dg352v6pzm9ijdivaz7wcc2nhnshxc5pywpc1cg"; + rev = "e7d3ebbd12f176707e63766a7a19bcaa08e01331"; + sha256 = "0y8wvagn4yf7fwvwzqcrx46wigmvyl25fa94kzvkanjl04zid3i1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -21629,12 +21862,12 @@ nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nodejs-repl"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "abicky"; repo = "nodejs-repl.el"; - rev = "a7fd82b2fafe086da442f0f2f62b4dd7c8107ab9"; - sha256 = "03vcs458rcn1hgfvmgmijadjvri7zlh2z4lxgaplzfnga13mapym"; + rev = "d821ef49a8eae0e405fd2a000246f0475542a575"; + sha256 = "1fwz6wpair617p9l2wdx923zpbbklfcdrygsryjx5gpnnm649mmy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14f22f97416111fcb02e299ff2b20c44fb75f049/recipes/nodejs-repl"; @@ -21668,11 +21901,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.23.3"; + version = "0.23.5"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "fd7f3d0829725bf9ce209cf597dfb0acd4d59b10"; - sha256 = "0w1nwr7brgapnzsbp9cjcx30lk90ir5hscllpxzw44sq25ir85g5"; + rev = "cff1e0673a7ca91d9b9907072c501a8bdcf0e3f8"; + sha256 = "1vxxksq4w6gl3wnh77jcpmjyph0x9r3ibqp9dvgmzxlwig495vfk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -21916,6 +22149,27 @@ license = lib.licenses.free; }; }) {}; + ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-prolog"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "ljos"; + repo = "ob-prolog"; + rev = "7e94309d3a21d7e265f3a85b41801397f286af00"; + sha256 = "0qxpgnjrx04dl43i949vcwv70sc7i23ivyvfk82hdvl8c2lwfd7w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fb87868cd74325f0a4a38c5542c264501000951d/recipes/ob-prolog"; + sha256 = "0ki8yd20yk5xwn0zpk06zjxzgrsf8paydif9n98svb9s2l9wrh1s"; + name = "ob-prolog"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ob-prolog"; + license = lib.licenses.free; + }; + }) {}; ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }: melpaBuild { pname = "ob-sagemath"; @@ -22196,8 +22450,8 @@ src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "f956929891e77ba4ce2fb1361129d5d3ebc7bb55"; - sha256 = "1xds6fqs1l6q9vak3v4xlzl1w084mhz86xrnycibcwm8q3q9hmb3"; + rev = "e7eaa1202486f996121cc0ef17a8d72b915c8165"; + sha256 = "1f66k2l996vzf5rm2scyz4bv1cyn365a8yfh1cfq13vrmvah57xb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp"; @@ -22618,22 +22872,22 @@ license = lib.licenses.free; }; }) {}; - org-jira = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "2.2.0"; + version = "2.5.2"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "d2db2827ff030a8c11b52402adcd3a4b3050f3c1"; - sha256 = "16wzrq2syk03710iklrayf4s9ap4brvlzyd4b0rya0rxy2q2rck7"; + rev = "af4115f4e8b4e77de5642fb28ce6d5e0d7cb0b70"; + sha256 = "1g775f9gpl0nqq3vn6h9cnjazimn9bjwk31dc7fdylz3nf7f3h03"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; sha256 = "0dvh9k0i75jxyy3v01c4cfyws8ij6718hsivi2xyrgig7pwp16ib"; name = "org-jira"; }; - packageRequires = [ cl-lib request ]; + packageRequires = [ cl-lib emacs request ]; meta = { homepage = "https://melpa.org/#/org-jira"; license = lib.licenses.free; @@ -22722,6 +22976,27 @@ license = lib.licenses.free; }; }) {}; + org-mime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-mime"; + version = "0.0.4"; + src = fetchFromGitHub { + owner = "org-mime"; + repo = "org-mime"; + rev = "3c4f24c8d43c24332c4f2f4bf763459b11ead956"; + sha256 = "04xs06sgdigi9hpciqb0d12rsgzg5b5vyf08rlvkjiddkqclp5pw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; + sha256 = "14154pajl2bbawdd8iqfwgc67pcjp2lxl6f92c62nwq12wkcnny6"; + name = "org-mime"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/org-mime"; + license = lib.licenses.free; + }; + }) {}; org-multiple-keymap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-multiple-keymap"; @@ -22785,6 +23060,26 @@ license = lib.licenses.free; }; }) {}; + org-password-manager = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, org, s }: + melpaBuild { + pname = "org-password-manager"; + version = "0.0.1"; + src = fetchgit { + url = "https://git.leafac.com/org-password-manager"; + rev = "d3a33ddfe583180bdb76cfb8bbd772e0078b24a3"; + sha256 = "0pqmnhd3qdg06agj6h8v8lm4m5q8px0qmd7a1bfn6i5g2bq9zrck"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager"; + sha256 = "0n07k2nng3zkrcif85f1r2g2l4vha78lmrdnj590axn7l5q5fidm"; + name = "org-password-manager"; + }; + packageRequires = [ org s ]; + meta = { + homepage = "https://melpa.org/#/org-password-manager"; + license = lib.licenses.free; + }; + }) {}; org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }: melpaBuild { pname = "org-pdfview"; @@ -24000,12 +24295,12 @@ parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parinfer"; - version = "0.4.5"; + version = "0.4.7"; src = fetchFromGitHub { owner = "DogLooksGood"; repo = "parinfer-mode"; - rev = "a1a5bce179fe694f07d28a75339bf8e4f5b285db"; - sha256 = "0m0k4lb79qy61j0n2a9amx6zz36vgxhadlvyjg9kqg9xwlks5yxc"; + rev = "a91b1ee5392c6a98c102ddba2f0c15ab67f8ad1b"; + sha256 = "09337fpv492rzd2ah7d8kxyv5spcgwf58xr943ya09sgi2invkbx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; @@ -24081,6 +24376,27 @@ license = lib.licenses.free; }; }) {}; + passmm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "passmm"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "pjones"; + repo = "passmm"; + rev = "983fc8e3e6d24bb8088e2e89254ecd5e03db787d"; + sha256 = "1mcxfk3yqhxslsjl3j25n87di5i2a3v9rk1cj1vnf46695s2fk38"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8ae2a1e10375f9cd55d19502c9740b2737eba209/recipes/passmm"; + sha256 = "0p6qps9ww7s6w5x7p6ha26xj540pk4bjkr629lcicrvnfr5jsg4b"; + name = "passmm"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/passmm"; + license = lib.licenses.free; + }; + }) {}; passthword = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "passthword"; @@ -24209,12 +24525,12 @@ pcache = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcache"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "sigma"; repo = "pcache"; - rev = "7f441f69bd5ed6cb6c2a86f59f48f4960174c71f"; - sha256 = "0j1p2jr475jkkxcsqm1xpjxq5qrnl1xj1kdxyzhjkwr2dy3bqvas"; + rev = "025ef2411fa1bf82a9ac61dfdb7bd4cedaf2d740"; + sha256 = "1jkdyacpcvbsm1g2rjpnk6hfr01r3j5ibgh09441scz41v6xk248"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/pcache"; @@ -24355,12 +24671,12 @@ persistent-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persistent-scratch"; - version = "0.2.5"; + version = "0.3"; src = fetchFromGitHub { owner = "Fanael"; repo = "persistent-scratch"; - rev = "107cf4022bed13692e6ac6a544c06227f30e3535"; - sha256 = "0j72rqd96dz9pp9zwc88q3358m4b891dg0szmbyvs4myp3yandz2"; + rev = "551c655fa349e6f48e4e29f427fff7594f76ac1d"; + sha256 = "1iqfr8s4cvnnmqw5yxyr6b6nghbsc95mgjlc61qxa8wa1mpv31rz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1e32702bfa15490b692d5db59e22d2c07b292d1/recipes/persistent-scratch"; @@ -24397,12 +24713,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "2.9.4"; + version = "2.9.5"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "8200c8753513b14ebc1a8b40b917d7c0a6f5ac6a"; - sha256 = "13pcdy18pqanjhkacl5rbfmyw3y52d9ll0b6w0w4ffc2lhqpi7nd"; + rev = "1116ead88123a11efef346db0045ee8389250bd2"; + sha256 = "11xncsvzy13xc939qfvlzplsz2izvf16hy45k500h44g2dxcvq3m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -24457,6 +24773,27 @@ license = lib.licenses.free; }; }) {}; + perspeen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "perspeen"; + version = "0.1"; + src = fetchFromGitHub { + owner = "seudut"; + repo = "perspeen"; + rev = "30ee14339cf8fe2e59e5384085afee3f8eb58dda"; + sha256 = "0mi7ipx0zg0vrm9da24i4j0300xj0dm3jjg35f466pm3a7xafrsg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/19bead132fbc4c179bfe8720c28424028c9c1323/recipes/perspeen"; + sha256 = "1g8qp7d5h9nfki6868gcbdf9bm696zgd49nsghi67wd2x7hq66x1"; + name = "perspeen"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/perspeen"; + license = lib.licenses.free; + }; + }) {}; ph = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ph"; @@ -24586,12 +24923,12 @@ phpunit = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }: melpaBuild { pname = "phpunit"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "nlamirault"; repo = "phpunit.el"; - rev = "165ca257d4840c266e1e79e806b4b943b5785fe6"; - sha256 = "1xgjhq1nxj4zfcns0q8a1kdlmqcjrxlblyj9vrspv1qck3akrp3z"; + rev = "791d1b33b63887cdeaf287fa657b8109f9d1dd18"; + sha256 = "0j9ym19pz17wsjh1ky65x9mz8aiiryxbw1nsygvy9isbdzjx591k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0670b42c0c998daa7bf01080757976ac3589ec06/recipes/phpunit"; @@ -24754,12 +25091,12 @@ plain-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plain-theme"; - version = "1"; + version = "2"; src = fetchFromGitHub { owner = "yegortimoshenko"; repo = "plain-theme"; - rev = "4210122812df9b5fe375ad35a3b933bf040460a3"; - sha256 = "184rw6pri55mkab8wv2n483zp0cvd6j911abq290pcqw1pgswcgh"; + rev = "43fc59d487d39e6110230a073f1376ab877aa739"; + sha256 = "0g44qdpn3ni291awjklia4r26qyiavpjib04k761hfacrdkvsdys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d7ad3737f081f101500317f7e183be6b1e7e8122/recipes/plain-theme"; @@ -24775,12 +25112,12 @@ plantuml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plantuml-mode"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "skuro"; repo = "plantuml-mode"; - rev = "87417ad75b215ababf153cba533575ac0273a5db"; - sha256 = "1jrck9wybpm2p2imjn0x6g3ybasiqkfzxc1halm3rq6xvc4zvrsm"; + rev = "eb380bac5663ec8e73482db6c6ba9d1394766eb3"; + sha256 = "19zxwmn5mjbzqgk7l444h57ninrlhi22l85l9zphryx2992plf0k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a658eb8085f2bf413c276af19c77597132cf569b/recipes/plantuml-mode"; @@ -25381,12 +25718,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "fe0cb5597d9e87ceebfadd1815beadfc04a194f1"; - sha256 = "0yg7xbv0mnrcc6kgh8ci6pxzfjiq1qkrw6hx2zs5m4ryfrrfclz2"; + rev = "8c41f3c92cd7f5eb5a983f6f3d42cb67dff04366"; + sha256 = "1rial7py4n451d6ylymf5q4cb57ala4rvvi7619r1c5y1m493qi7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -26050,22 +26387,22 @@ license = lib.licenses.free; }; }) {}; - quickrun = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + quickrun = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quickrun"; - version = "2.2.7"; + version = "2.2.8"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-quickrun"; - rev = "fe23f324b0198f8827cc0768e8507a02194eec68"; - sha256 = "1iypwvdgdh30c9br7jnibgwbdca2mqjy95x2ppsc51sik2mz2db1"; + rev = "70e93e06778f44113f405aedec6187b925311d57"; + sha256 = "0swbgsidq11w7vyjhf06dn8vsj06j9scj8n2dm9m7fasj0yh3ghw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun"; sha256 = "0f989d6niw6ghf9mq454kqyp0gy7gj34vx5l6krwc52agckyfacy"; name = "quickrun"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/quickrun"; license = lib.licenses.free; @@ -26221,12 +26558,12 @@ ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ranger"; - version = "0.9.8.4"; + version = "0.9.8.5"; src = fetchFromGitHub { owner = "ralesi"; repo = "ranger.el"; - rev = "cbde94a417d9d93fcee74de119aae867cbe772d7"; - sha256 = "0v3y77z8l5lg1ppl4szp9k80wjjnmlyxqjmmakc5l2vkq98gzcpq"; + rev = "584e4ae8cce1c54a44b40dd4c77fbb2f06d73ecb"; + sha256 = "01rphv92g1r0cw5bwkbrh02s0na7fjrddxx1dckk2y7qr97s7l8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger"; @@ -26407,6 +26744,27 @@ license = lib.licenses.free; }; }) {}; + rebecca-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "rebecca-theme"; + version = "1.2.1"; + src = fetchFromGitHub { + owner = "vic"; + repo = "rebecca-theme"; + rev = "239115183e0a354ccd5c2cb299893b558fbde05c"; + sha256 = "0n6xf9s39frnyvchk40zzxbkn0hyga5ridkxbf50n7hr5j19yrmb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/19f40f30113c7dabd76a2d0e52898e6d6be69a35/recipes/rebecca-theme"; + sha256 = "1m72jqyqx18i1vpj07v3vkbi0di9dks5sz46wb2h0f23xqyx00md"; + name = "rebecca-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/rebecca-theme"; + license = lib.licenses.free; + }; + }) {}; recover-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "recover-buffers"; @@ -26491,6 +26849,27 @@ license = lib.licenses.free; }; }) {}; + redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "redprl"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "RedPRL"; + repo = "sml-redprl"; + rev = "d06d39486348a74981b2c4c4c2ed3af95b01d5ca"; + sha256 = "0k3f7pa332d0fs1js8hi7zszcirir1943bhkgwfxzsqx17m26x3n"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; + sha256 = "1zinzs3vzf2alsnxf5k71i7lp90fm26wv4y20ci52n0hnh5nz861"; + name = "redprl"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/redprl"; + license = lib.licenses.free; + }; + }) {}; redtick = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redtick"; @@ -27103,12 +27482,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "8b6d0cdf57c951769ead8aad1d8538308e1b6861"; - sha256 = "07qjpvkhv556p3pfm1hxswky4irp7f4wxb2blcvk3s7qmqirqshj"; + rev = "6ac7740eaf05cdd9b699185f71cc2d1f634a761b"; + sha256 = "1w506qaklrly1lnq1i5kshl8m9aki8h2ba1y7h578gwx6lph3vhi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -27268,6 +27647,27 @@ license = lib.licenses.free; }; }) {}; + russian-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "russian-holidays"; + version = "0.4"; + src = fetchFromGitHub { + owner = "grafov"; + repo = "russian-holidays"; + rev = "b285a30f29d85c48e3ea4eb93972d34a090c167b"; + sha256 = "1mz842gvrscklg2w2r2q2wbj92qr31h895k700j3axqx6k30ni0h"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d4830900e371e7036225ea434c52204f4d2481a7/recipes/russian-holidays"; + sha256 = "0lawjwz296grbvb4a1mm1j754q7mpcanyfln1gqxr339kqx2aqd8"; + name = "russian-holidays"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/russian-holidays"; + license = lib.licenses.free; + }; + }) {}; rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; @@ -27289,6 +27689,27 @@ license = lib.licenses.free; }; }) {}; + rust-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: + melpaBuild { + pname = "rust-playground"; + version = "0.1"; + src = fetchFromGitHub { + owner = "grafov"; + repo = "rust-playground"; + rev = "6a23f8956bce1deaa38f52c01f5571c5cff77445"; + sha256 = "1aqcpmzzww4fd63l65rfyj0f8skdqh7j1vznwqnj71x65xlda0ys"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a5ebbcca659bb6d79ca37dc347894fac7bafd9dd/recipes/rust-playground"; + sha256 = "1w29plj06ld3iq8xhjnfh8hphcp7aji15y1xqp8bb9m1k07wza7l"; + name = "rust-playground"; + }; + packageRequires = [ emacs rust-mode ]; + meta = { + homepage = "https://melpa.org/#/rust-playground"; + license = lib.licenses.free; + }; + }) {}; rvm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rvm"; @@ -27352,22 +27773,22 @@ license = lib.licenses.free; }; }) {}; - sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: melpaBuild { pname = "sage-shell-mode"; - version = "0.2.1"; + version = "0.3"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage-shell-mode"; - rev = "2cfc3b712796d1ed22e9c8a39d24e11316aab065"; - sha256 = "14wcnv78dwkxaq4g45kw0p34y5c5snscix0ar22bbryclqr929qy"; + rev = "e8bc089e8dfd76f688160e2ac77aee985afeade7"; + sha256 = "166plwg9ggivr3im0yfxw8k6m9ral37jzznnb06kb6g0zycb4aps"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode"; sha256 = "0ivqiigmp9cf88j4xapzanjpbx692r70wb4i25mnppqsi3jlwxdv"; name = "sage-shell-mode"; }; - packageRequires = [ cl-lib deferred emacs ]; + packageRequires = [ cl-lib deferred emacs let-alist ]; meta = { homepage = "https://melpa.org/#/sage-shell-mode"; license = lib.licenses.free; @@ -27464,8 +27885,8 @@ src = fetchFromGitHub { owner = "ensime"; repo = "emacs-scala-mode"; - rev = "4b492b9fa5f97521426f50c8dcfb6c0a251840ea"; - sha256 = "01d907ph36yzfxgchqvk102ld1mvlb84sjxhmmq5xrzj4zbb0khm"; + rev = "9b8db623b13fcb0aad9271d1fae73e1257dda13c"; + sha256 = "0q41dqlhp0cds16inmh7jrvhqrnjsdiv2in6pq3f0srhwms81ff3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/564aa1637485192a97803af46b3a1f8e0d042c9a/recipes/scala-mode"; @@ -27584,12 +28005,12 @@ sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "sekka"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "kiyoka"; repo = "sekka"; - rev = "2b0facc87e743e21534672aadac6db3164e38daf"; - sha256 = "0nsm7z056rh32sq7abgdwyaz4dbz8v9pgbha5jvpk7y0zmnabrgs"; + rev = "001e205b37ae0dded430b9a809425dc7ed730366"; + sha256 = "113i8i705qkd3nccspacnmk9ysy5kwavg8h9z9djdgki611q700q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/350bbb5761b5ba69aeb4acf6d7cdf2256dba95a6/recipes/sekka"; @@ -28232,48 +28653,27 @@ license = lib.licenses.free; }; }) {}; - sl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + sl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sl"; - version = "0.1.1"; + version = "0.2"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "sl.el"; - rev = "76a8eae2b3fc449ed81b2a577c53939434851635"; - sha256 = "1nkgqva4l4nwpixavky8gm38371z7mrkpqdkgrya4j5mrx4kiw86"; + rev = "51d92f820f3e93776fff6cdb9690458816888bdc"; + sha256 = "1faklr7jz1s6hs1xrzhvddlibhbjbqwxsb8iz6i5c8dg9sj3hw45"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7188a93d33e38f360930b5090c6ef872116f8a7c/recipes/sl"; sha256 = "0h90ajikr6kclsy73vs9f50jg8z3d6kqbpanm9ryh2pw3sd4rnii"; name = "sl"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/sl"; license = lib.licenses.free; }; }) {}; - slamhound = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "slamhound"; - version = "1.5.5"; - src = fetchFromGitHub { - owner = "technomancy"; - repo = "slamhound"; - rev = "7e38841ecdda7b3b569cca0b96c155ae2d3d433d"; - sha256 = "1kiczjqa1jhs24lgvizcs355rivx59psxw0fixc9yj8fgld7r4xs"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/54c191408ceb09ca21ef52df171f02d700aee5ba/recipes/slamhound"; - sha256 = "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x"; - name = "slamhound"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/slamhound"; - license = lib.licenses.free; - }; - }) {}; slideview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "slideview"; @@ -28340,12 +28740,12 @@ slime-company = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }: melpaBuild { pname = "slime-company"; - version = "0.9.1"; + version = "1.1"; src = fetchFromGitHub { owner = "anwyn"; repo = "slime-company"; - rev = "b4a770b1c1e9638f13e339e7debbdb3b25217e39"; - sha256 = "0rdhd6kymbzhkc96dxy3nr21ajrkc7iy6zvq1va22r90f96jj9x4"; + rev = "6c244690c80387a32b0cb984843e00c8b75ad6bb"; + sha256 = "1hl1hqkc1pxga9k2k8k15d7dip7sfsmwf4wm4sh346m6nj606q8g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/abe5036c6de996a723bc800e0f031314e1188660/recipes/slime-company"; @@ -28883,22 +29283,22 @@ license = lib.licenses.free; }; }) {}; - sourcemap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + sourcemap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sourcemap"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-sourcemap"; - rev = "065a0c3bd8ca5fe6a45e8f983f932c3c9fac5db9"; - sha256 = "1k2gfw4dydzqxbfdmcghajbb2lyg1j4wgdhp8chlql3dax1f503d"; + rev = "64c89d296186f48d9135fb8aad501de19f64bceb"; + sha256 = "115g2mfpbfywp8xnag4gsb50klfvplqfh928a5mabb5s8v4a3582"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557d18259543263932fccdbaf44c4e7986bd277b/recipes/sourcemap"; sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5"; name = "sourcemap"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/sourcemap"; license = lib.licenses.free; @@ -29009,6 +29409,27 @@ license = lib.licenses.free; }; }) {}; + speed-type = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "speed-type"; + version = "1.0"; + src = fetchFromGitHub { + owner = "parkouss"; + repo = "speed-type"; + rev = "d9d98b9744e21d5e12a695096efcde288bdb5c18"; + sha256 = "043ydcik23ykphbh89haagxbdn11s1b44wkziwibnb7d3r9hd8p7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa/recipes/speed-type"; + sha256 = "0lsbi3b6v7fiwpvydgwcqx3y5i7bysfjammly22qpz3kcjmlvi06"; + name = "speed-type"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/speed-type"; + license = lib.licenses.free; + }; + }) {}; sphinx-doc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "sphinx-doc"; @@ -29201,12 +29622,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "1.0.0"; + version = "1.1"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "94fc9e677c864bd2c302c4842b95f7580cda6cef"; - sha256 = "1zxgqlfipbympgg8i58r1pwn50fq6vb42y8fmipxy25s0j3x53k7"; + rev = "3569e5ea6892d6d7f4ef36bf41462af011e1a114"; + sha256 = "0l3h6w13xc81i6vavfsg617ly8m2y8yjzbwa6zwwkfqi301kgpij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy"; @@ -29346,12 +29767,12 @@ string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "string-inflection"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "akicho8"; repo = "string-inflection"; - rev = "af1fb965784eff308d6b4031dc2ef5f6961cd38a"; - sha256 = "017rq1vll53i4xs1l24insjkfvr7nlq6l9g7gjmgnd8g9ck6jqg0"; + rev = "f11e732a582419e14a36c53130dd3a7b2c9da8c5"; + sha256 = "1sq7h58v61cdyca5kfhf9rf3ybj25zgbhfdvb29qd7b2b33px7a5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5c2e2b6dba8686236c2595475cfddac5fd700e60/recipes/string-inflection"; @@ -29702,12 +30123,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "2.2"; + version = "2.2.1"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "a07be7a34d4f677a28878f4b72a2095addc628fd"; - sha256 = "14l8cm82fx0p1xcbf48a303llx2p9p0i17ly1vx8y5ff3a0i0l0h"; + rev = "6cd2948589771d926e545d8cbe054705eebce18f"; + sha256 = "1zz5jv2qgcnhidyhnw3wbcpqb80jqqbs74kpa66assfigyvivyj6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -30352,12 +30773,12 @@ tern-context-coloring = callPackage ({ context-coloring, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }: melpaBuild { pname = "tern-context-coloring"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "jacksonrayhamilton"; repo = "tern-context-coloring"; - rev = "42e2f0177e8d3017c07826361cc981b2883d34dc"; - sha256 = "0jdm1s8pqs40xligbhmqgk4vaxkqyb2i5wkx1zgjazq8fhcql9jv"; + rev = "3a8e979d6cc83aabcb3dda3f5f31a6422532efba"; + sha256 = "1rq5aqmsd7jqvwypafad9gmfcwjqjah00j7cws46k5f0dirjaa1y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/db2119d2c2d167d771ee02c2735b435d59991b93/recipes/tern-context-coloring"; @@ -30391,22 +30812,22 @@ license = lib.licenses.free; }; }) {}; - terraform-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }: + terraform-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }: melpaBuild { pname = "terraform-mode"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-terraform-mode"; - rev = "3458515359c1f3c82b40e72317b7dd49c05ea873"; - sha256 = "1k0v56v7mwpb5p228c0g252szpxvpqswrmjfpk75kh32v56wp5xi"; + rev = "6286aa42132a7fcad49271d63be33deeeb8d4efc"; + sha256 = "05hn8kskx9lcgn7bzgam99c629zlryir2pickwrqndacjrqpdykx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93e06adf34bc613edf95feaca64c69a0a2a4b567/recipes/terraform-mode"; sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn"; name = "terraform-mode"; }; - packageRequires = [ cl-lib hcl-mode ]; + packageRequires = [ emacs hcl-mode ]; meta = { homepage = "https://melpa.org/#/terraform-mode"; license = lib.licenses.free; @@ -30562,12 +30983,12 @@ thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "thrift"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "53dd39833a08ce33582e5ff31fa18bb4735d6731"; - sha256 = "1srylw9wwkyq92f9v6ds9zp9z8sl800wbxjbir80g1lwv4hghaii"; + rev = "b2a4d4ae21c789b689dd162deb819665567f481c"; + sha256 = "1b1fnzhy5qagbzhphgjxysad64kcq9ggcvp0wb7c7plrps72xfjh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -32370,14 +32791,35 @@ license = lib.licenses.free; }; }) {}; + winum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "winum"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "deb0ch"; + repo = "emacs-winum"; + rev = "e89791b90e45f588f9e8c11884ea1daf3dc98518"; + sha256 = "1gd0byijl5cyn6gkf5pkadzqvczshgizfrr3ddg6czvgblf1vgl9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c1caa7a54a910a44322fdee300e8cce6ddcde071/recipes/winum"; + sha256 = "0yyvjmvqif6glh9ri6049nxcmgib9mxdhy6816kjhsaqr570f9pw"; + name = "winum"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/winum"; + license = lib.licenses.free; + }; + }) {}; wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wisp-mode"; version = "0.9.1"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "a67adbf5fc75"; - sha256 = "1av071s0s6x0idbklfnps8j7vgjqxapk9y23prk6jrdbbwhfzb8n"; + rev = "280ab84bf8ad"; + sha256 = "088khr4ha37nvxzg620a6gyq7pc40rb13bbi9vgqhgjgggpq61d9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -32414,12 +32856,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "2.5.8"; + version = "2.5.9"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "ab73c028e8dbe088d7545406efc5c5c7b8fd503a"; - sha256 = "1hf2py6dby3wnvzv027x0555532aapn20bkhb7x8k020c6yr59s9"; + rev = "2248a63f6eb6e7720881b508639d9a00d2db9ea0"; + sha256 = "0g5ch1a5myrmazxcbbak01q4k3x8yp3kbn73d2h26j2jmsqvdy1n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -32582,12 +33024,12 @@ ws-butler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ws-butler"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "lewang"; repo = "ws-butler"; - rev = "b59e36b2451193bf96176f5a006bf506770a40f3"; - sha256 = "0ij88qr7gk07dchhjsn3nlk8fqgbkp4qhvn14dqxndn3zr64ix7v"; + rev = "323b651dd70ee40a25accc940b8f80c3a3185205"; + sha256 = "1a4b0lsmwq84qfx51c5xy4fryhb1ysld4fhgw2vr37izf53379sb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1645a51d487c8902eb6e59fb1884f85f48cec6f/recipes/ws-butler"; @@ -32810,22 +33252,22 @@ license = lib.licenses.free; }; }) {}; - xterm-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xterm-color"; - version = "1.0"; + version = "1.6"; src = fetchFromGitHub { owner = "atomontage"; repo = "xterm-color"; - rev = "380cc8c6c6969f8a262ad4ddc61117691db7f4d1"; - sha256 = "1zdj4664gvwc4kyx7fx5232l3c5anm0xyrrnrw596q604q6xxj2x"; + rev = "ed3d0f4ccb2b28ff034192c50f244a97197d3911"; + sha256 = "0djh18lm3xn9h4fa5ra0jrlzdzwhvhcalipj73j5gmmfaif4ya9q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color"; sha256 = "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj"; name = "xterm-color"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/xterm-color"; license = lib.licenses.free; @@ -32918,12 +33360,12 @@ yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yang-mode"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "mbj4668"; repo = "yang-mode"; - rev = "351a17bfd4b78616cf740fc1c7148bc1d85b63a4"; - sha256 = "14hrr4ix77g795b4xhdwwqkgpbbb3axpim1r4yl1bv9jbbkqllx5"; + rev = "bcf698acbdb4df91f587942348739b407a8b0807"; + sha256 = "1rrmailvhxvivmdjamm2vvciym484cw0lqn1hgdw1lz999g5a5vs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode"; @@ -33004,8 +33446,8 @@ version = "1.78"; src = fetchhg { url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "5428250c886a"; - sha256 = "0q1b0wpdfdghp6hchc59jgkyra5qqqdam47q7g2ni4ym8nlhwd3c"; + rev = "c2c547e147c7"; + sha256 = "1khsvzg7ma98ijpj21xmdlnp18wwxf2n9jr2y1xia4a6qgkmlchb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; @@ -33070,6 +33512,27 @@ license = lib.licenses.free; }; }) {}; + ydk-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ydk-mode"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "jacksonrayhamilton"; + repo = "ydk-mode"; + rev = "f3f125b29408e0b0a34fec27dcb7c02c5dbfd04e"; + sha256 = "0ndmbswrv8vyw18zhbmjr11400l546zqaj7dzfvwb5rhdv2d0abi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/865b9ee86ca28fc1cedc0a432a292400184711ae/recipes/ydk-mode"; + sha256 = "1z9digf39d7dd736svp0cy6773l3nklzc263q23gwfcg0jswbdyg"; + name = "ydk-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ydk-mode"; + license = lib.licenses.free; + }; + }) {}; yesql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "yesql-ghosts"; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 438abd8afed..8de489549b8 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 = "20161214"; + version = "20161224"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20161214.tar"; - sha256 = "1x3wvagx7437xr4lawxr24kivb661997bncq2w9iz3fkg9rrr73m"; + url = "http://orgmode.org/elpa/org-20161224.tar"; + sha256 = "15fnc65k5mn5ssl53z4f9nlkz5m8a59zkaripcapdcq87ys5imqm"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20161214"; + version = "20161224"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20161214.tar"; - sha256 = "1rc3p1cys15i9vnll946w5hlckmmbgkw22yw98mna9cwqdpc387c"; + url = "http://orgmode.org/elpa/org-plus-contrib-20161224.tar"; + sha256 = "1pj3h5qllhcqyqvm2kln7056m34k5flipvslnn1rvsk4iwwjlv1a"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index dc85b5402bd..204fd60d2bc 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -172,12 +172,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2016.3"; + version = "2016.3.2"; 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 = "1bp2a1x8nl5flklf160n7ka5clnb0xx9gwv5zd9li2bsf04zlzf3"; + sha256 = "0ngign34gq7i121ss2s9wfziy3vkv1jb79pw8nf1qp7rb15xn4vc"; }; wmClass = "jetbrains-idea-ce"; }; @@ -208,12 +208,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2016.3.1"; + version = "2016.3.2"; 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}.tar.gz"; - sha256 = "1696gfmqi76ybgi5r84kisjx9mv0hd70hsn16banw61zy4rfllhw"; + sha256 = "13pd95zad29c3i9qpwhjii601ixb4dgcld0kxk3liq4zmnv6wqxa"; }; wmClass = "jetbrains-idea"; }; @@ -340,12 +340,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2016.3"; + version = "2016.3.2"; description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "10nah7v330qrrczzz5jldnr0k7w2xzljiny32gm9pqmjbl0i70il"; + sha256 = "19njb6i7nl6szql7cy99jmig59b304c6im3988p1dd8dj2j6csv3"; }; wmClass = "jetbrains-datagrip"; }; diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 73ee7ed64cd..14b13c394f3 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -4,17 +4,18 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "kakoune-nightly-${version}"; - version = "2016-12-10"; + version = "2016-12-30"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; - rev = "e44129577a010ebb4dc609b806104d3175659074"; - sha256 = "1jkpbk6wa9x5nlv002y1whv6ddhqawxzbp3jcbzcb51cg8bz0b1l"; + rev = "76c58aa022a896dc170c207ff821992ee354d934"; + sha256 = "0hgpcp6444cyg4bm0a9ypywjwfh19qpqpfr5w0wcd2y3clnsvsdz"; }; buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ]; buildPhase = '' sed -ie 's#--no-xmllint#--no-xmllint --xsltproc-opts="--nonet"#g' src/Makefile + substituteInPlace src/Makefile --replace "boost_regex-mt" "boost_regex" export PREFIX=$out (cd src && make ) ''; @@ -28,6 +29,6 @@ stdenv.mkDerivation rec { description = "A vim inspired text editor"; license = licenses.publicDomain; maintainers = with maintainers; [ vrthra ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/kile/frameworks.nix b/pkgs/applications/editors/kile/frameworks.nix index 7a02c3d3f8c..34ea7647893 100644 --- a/pkgs/applications/editors/kile/frameworks.nix +++ b/pkgs/applications/editors/kile/frameworks.nix @@ -60,8 +60,9 @@ let }; }; in -kdeWrapper unwrapped +kdeWrapper { + inherit unwrapped; targets = [ "bin/kile" ]; paths = [ konsole.unwrapped ]; } diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 738476b98e2..9814e697d22 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, fetchFromGitHub , ncurses , texinfo , gettext ? null @@ -10,12 +10,19 @@ assert enableNls -> (gettext != null); with stdenv.lib; -stdenv.mkDerivation rec { +let + nixSyntaxHighlight = fetchFromGitHub { + owner = "seitz"; + repo = "nanonix"; + rev = "17e0de65e1cbba3d6baa82deaefa853b41f5c161"; + sha256 = "1g51h65i31andfs2fbp1v3vih9405iknqn11fzywjxji00kjqv5s"; + }; +in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "2.7.2"; + version = "2.7.3"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "1hlhwgvzdgkc7k74fbbn49hn6vmvzqr7h8gclgl7r1c6qrrny0bp"; + sha256 = "1z0bfyc5cvv83l3bjmlcwl49mpxrp65k5ffsfpnayfyjc18fy9nr"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; buildInputs = [ ncurses ]; @@ -30,6 +37,10 @@ stdenv.mkDerivation rec { substituteInPlace src/text.c --replace "__time_t" "time_t" ''; + postInstall = '' + cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/ + ''; + meta = { homepage = http://www.nano-editor.org/; description = "A small, user-friendly console text editor"; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 354aaf6db54..cbaf14cee60 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey -, libtool, libuv, luajit, luaPackages, man, ncurses, perl, pkgconfig +, libtool, libuv, luajit, luaPackages, ncurses, perl, pkgconfig , unibilium, makeWrapper, vimUtils, xsel, gperf , withPython ? true, pythonPackages, extraPythonPackages ? [] @@ -118,10 +118,7 @@ let # triggers on buffer overflow bug while running tests hardeningDisable = [ "fortify" ]; - preConfigure = '' - substituteInPlace runtime/autoload/man.vim \ - --replace /usr/bin/man ${man}/bin/man - '' + stdenv.lib.optionalString stdenv.isDarwin '' + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' export DYLD_LIBRARY_PATH=${jemalloc}/lib substituteInPlace src/nvim/CMakeLists.txt --replace " util" "" ''; @@ -167,7 +164,7 @@ let in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation { name = "neovim-${neovim.version}-configured"; - inherit (neovim) version; + inherit (neovim) version meta; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index 89762d5bc33..82c89ebdca6 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { patchPhase = '' sed -i build/configure \ -e s@vi_cv_path_preserve=no@vi_cv_path_preserve=/tmp/vi.recover@ \ - -e s@/var/tmp@@ + -e s@/var/tmp@@ \ + -e s@-lcurses@-lncurses@ ''; configurePhase = '' diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 0749f58ecea..82bcc485da3 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper }: +{ stdenv, fetchurl, makeDesktopItem, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper }: let version = "0.98.110"; ginVer = "1.5"; gwtVer = "2.5.1"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "RStudio-${version}"; buildInputs = [ cmake boost155 zlib openssl R qt4 libuuid unzip ant jdk makeWrapper ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation { sha256 = "0fjr2rcr8lnywj54mzhg9i4xz1b6fh8yv12p5i2q5mgfld2xymy4"; }; - hunspellDicts = builtins.attrValues hunspellDicts; + hunspellDictionaries = builtins.attrValues hunspellDicts; mathJaxSrc = fetchurl { url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-20.zip; @@ -50,7 +50,7 @@ stdenv.mkDerivation { mv gwt-$gwtVer $GWT_LIB_DIR/gwt/$gwtVer mkdir dependencies/common/dictionaries - for dict in $hunspellDicts; do + for dict in $hunspellDictionaries; do for i in "$dict/share/hunspell/"* do ln -sv $i dependencies/common/dictionaries/ done @@ -61,8 +61,23 @@ stdenv.mkDerivation { cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" ]; + desktopItem = makeDesktopItem { + name = name; + exec = "rstudio %F"; + icon = "rstudio"; + desktopName = "RStudio"; + genericName = "IDE"; + comment = meta.description; + categories = "Development;"; + mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; + }; + postInstall = '' wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin + mkdir $out/share + cp -r ${desktopItem}/share/applications $out/share + mkdir $out/share/icons + ln $out/rstudio.png $out/share/icons ''; meta = with stdenv.lib; diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 689a1537b69..97fc30c237c 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,22 +2,23 @@ makeWrapper, libXScrnSaver }: let - version = "1.8.0"; - rev = "38746938a4ab94f2f57d9e1309c51fd6fb37553d"; + version = "1.8.1"; + rev = "ee428b0eead68bf0fb99ab5fdc4439be227b6281"; + channel = "stable"; - sha256 = if stdenv.system == "i686-linux" then "0p7r1i71v2ab4dzlwh43hqih958a31cqskf64ds4vgc35x2mfjcq" - else if stdenv.system == "x86_64-linux" then "1k15701jskk7w5kwzlzfri96vvw7fcinyfqqafls8nms8h5csv76" - else if stdenv.system == "x86_64-darwin" then "12fqz62gs2wcg2wwx1k6gv2gqil9c54yq254vk3rqdf82q9zyapk" + sha256 = if stdenv.system == "i686-linux" then "f48c2eb302de0742612f6c5e4ec4842fa474a85c1bcf421456526c9472d4641f" + else if stdenv.system == "x86_64-linux" then "99bd463707f3a21bc949eec3e857c80aafef8f66e06a295148c1c23875244760" + else if stdenv.system == "x86_64-darwin" then "9202c85669853b07d1cbac9e6bcb01e7c08e13fd2a2b759dd53994e0fa51e7a1" else throw "Unsupported system: ${stdenv.system}"; - urlBase = "https://az764295.vo.msecnd.net/stable/${rev}/"; + urlBase = "https://az764295.vo.msecnd.net/${channel}/${rev}/"; urlStr = if stdenv.system == "i686-linux" then - urlBase + "code-stable-code_${version}-1481650382_i386.tar.gz" + urlBase + "code-${channel}-code_${version}-1482159060_i386.tar.gz" else if stdenv.system == "x86_64-linux" then - urlBase + "code-stable-code_${version}-1481651903_amd64.tar.gz" + urlBase + "code-${channel}-code_${version}-1482158209_amd64.tar.gz" else if stdenv.system == "x86_64-darwin" then - urlBase + "VSCode-darwin-stable.zip" + urlBase + "VSCode-darwin-${channel}.zip" else throw "Unsupported system: ${stdenv.system}"; in stdenv.mkDerivation rec { @@ -33,10 +34,7 @@ in name = "code"; exec = "code"; icon = "code"; - comment = '' - Code editor redefined and optimized for building and debugging modern - web and cloud applications - ''; + comment = "Code editor redefined and optimized for building and debugging modern web and cloud applications"; desktopName = "Visual Studio Code"; genericName = "Text Editor"; categories = "GNOME;GTK;Utility;TextEditor;Development;"; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 44e07cc22c0..790997e328b 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -59,7 +59,8 @@ stdenv.mkDerivation { postInstall = '' wrapProgram $out/bin/grass70 \ --set PYTHONPATH $PYTHONPATH \ - --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} + --set GRASS_PYTHON ${python2Packages.python}/bin/${python2Packages.python.executable} \ + --suffix LD_LIBRARY_PATH ':' '${gdal}/lib' ln -s $out/grass-*/lib $out/lib ''; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix new file mode 100644 index 00000000000..f5c475ef93a --- /dev/null +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -0,0 +1,90 @@ +{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool +, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg +, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp +, ApplicationServices +}: + +let + arch = + if stdenv.system == "i686-linux" then "i686" + else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64" + else if stdenv.system == "armv7l-linux" then "armv7l" + else throw "ImageMagick is not supported on this platform."; + + cfg = { + version = "7.0.4-0"; + sha256 = "0hfkdvfl60f9ksh07c06cpq8ib05apczl767yyvc671gd90n11ds"; + patches = []; + }; +in + +stdenv.mkDerivation rec { + name = "imagemagick-${version}"; + inherit (cfg) version; + + src = fetchurl { + urls = [ + "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz" + # the original source above removes tarballs quickly + "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz" + "https://bintray.com/homebrew/mirror/download_file?file_path=imagemagick-${version}.tar.xz" + ]; + inherit (cfg) sha256; + }; + + patches = [ ./imagetragick.patch ] ++ cfg.patches; + + outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big + outputMan = "out"; # it's tiny + + enableParallelBuilding = true; + + configureFlags = + [ "--with-frozenpaths" ] + ++ [ "--with-gcc-arch=${arch}" ] + ++ lib.optional (librsvg != null) "--with-rsvg" + ++ lib.optionals (ghostscript != null) + [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts" + "--with-gslib" + ] + ++ lib.optionals (stdenv.cross.libc or null == "msvcrt") + [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM + ; + + nativeBuildInputs = [ pkgconfig libtool ]; + + buildInputs = + [ zlib fontconfig freetype ghostscript + libpng libtiff libxml2 + ] + ++ lib.optionals (stdenv.cross.libc or null != "msvcrt") + [ openexr librsvg openjpeg ] + ++ lib.optional stdenv.isDarwin ApplicationServices; + + propagatedBuildInputs = + [ bzip2 freetype libjpeg lcms2 ] + ++ lib.optionals (stdenv.cross.libc or null != "msvcrt") + [ libX11 libXext libXt libwebp ] + ; + + postInstall = '' + (cd "$dev/include" && ln -s ImageMagick* ImageMagick) + moveToOutput "bin/*-config" "$dev" + moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params + for file in "$dev"/bin/*-config; do + substituteInPlace "$file" --replace pkg-config \ + "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkgconfig}/bin/pkg-config'" + done + '' + lib.optionalString (ghostscript != null) '' + for la in $out/lib/*.la; do + sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la + done + ''; + + meta = with stdenv.lib; { + homepage = http://www.imagemagick.org/; + description = "A software suite to create, edit, compose, or convert bitmap images"; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ the-kenny wkennington ]; + }; +} diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 8030302cdcf..3364a661e0c 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg , lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp +, ApplicationServices }: let @@ -11,8 +12,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.6-7"; - sha256 = "1ls3g4gpdh094n03szr9arpr0rfwd1krv2s9gnck8j0ab10ccgs5"; + version = "6.9.7-0"; + sha256 = "0c6ff1am2mhc0dc26h50l78yx6acwqymwpwgkxgx69cb6jfpwrdx"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. @@ -70,7 +71,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.cross.libc or null != "msvcrt") [ openexr librsvg openjpeg ] - ; + ++ lib.optional stdenv.isDarwin ApplicationServices; propagatedBuildInputs = [ bzip2 freetype libjpeg lcms2 ] diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index a9ad0210baa..7213ddcc366 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -11,12 +11,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "2.0.7"; + version = "2.2.1"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "1aqxiaw89xdx0s0h3gb9nvdzw4690y3kp7h794sihf2581bn28m9"; + sha256 = "da843190f08e02df19ccbc02b9d1bef6bd242b81499494c7da2cccdc520e24fc"; }; buildInputs = @@ -34,6 +34,16 @@ stdenv.mkDerivation rec { "-DBUILD_USERMANUAL=False" ]; + # darktable changed its rpath handling in commit + # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the + # binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in + # the wrappers: + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH ":" "$out/lib/darktable" + ) + ''; + meta = with stdenv.lib; { description = "Virtual lighttable and darkroom for photographers"; homepage = https://www.darktable.org; diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index e042b15855c..6d82db4bac1 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -1,25 +1,35 @@ { stdenv, fetchurl, libjpeg, mesa, freeglut, zlib, cmake, libX11, libxml2, libpng, - libXxf86vm }: + libXxf86vm, gcc6 }: stdenv.mkDerivation { - name = "freepv-0.3.0_beta1"; + name = "freepv-0.3.0"; src = fetchurl { - url = mirror://sourceforge/freepv/freepv-0.3.0_beta1.tar.gz; - sha256 = "084qqa361np73anvqrv78ngw8hjxglmdm3akkpszbwnzniw89qla"; + url = mirror://sourceforge/freepv/freepv-0.3.0.tar.gz; + sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56"; }; buildInputs = [ libjpeg mesa freeglut zlib cmake libX11 libxml2 libpng - libXxf86vm ]; + libXxf86vm gcc6 ]; - patchPhase = '' + postPatch = '' sed -i -e '/GECKO/d' CMakeLists.txt sed -i -e '/mozilla/d' src/CMakeLists.txt + sed -i -e '1i \ + #include ' src/libfreepv/OpenGLRenderer.cpp + sed -i -e '1i \ + #include ' src/libfreepv/Image.cpp + substituteInPlace src/libfreepv/Action.h \ + --replace NULL nullptr + substituteInPlace src/libfreepv/pngReader.cpp \ + --replace png_set_gray_1_2_4_to_8 png_set_expand_gray_1_2_4_to_8 ''; + NIX_CFLAGS_COMPILE = "-fpermissive -Wno-narrowing"; + meta = { description = "Open source panorama viewer using GL"; homepage = http://freepv.sourceforge.net/; - license = "LGPL"; + license = [ stdenv.lib.licenses.lgpl21 ]; }; } diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index b123dcade1d..4cb67cde751 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper -, python2Packages, libart_lgpl, libexif, gettext, xorg }: +, python2Packages, libart_lgpl, libexif, gettext, xorg +, AppKit, Cocoa, gtk-mac-integration }: let inherit (python2Packages) pygtk wrapPython python; @@ -26,7 +27,8 @@ in stdenv.mkDerivation rec { libmng librsvg libwmf zlib libzip ghostscript aalib jasper python pygtk libart_lgpl libexif gettext xorg.libXpm wrapPython - ]; + ] + ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]; pythonPath = [ pygtk ]; @@ -51,6 +53,6 @@ in stdenv.mkDerivation rec { description = "The GNU Image Manipulation Program"; homepage = http://www.gimp.org/; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 06b2fa63c7f..2f72d00bd15 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -2,45 +2,24 @@ , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool , gsl, python2, poppler, imagemagick, libwpg, librevenge -, libvisio, libcdr, libexif, unzip, automake114x, autoconf -, boxMakerPlugin ? false # boxmaker plugin +, libvisio, libcdr, libexif, automake114x, cmake }: let python2Env = python2.withPackages(ps: with ps; [ numpy lxml ]); - -boxmaker = fetchurl { - # http://www.inkscapeforum.com/viewtopic.php?f=11&t=10403 - url = "http://www.keppel.demon.co.uk/111000/files/BoxMaker0.91.zip"; - sha256 = "5c5697f43dc3a95468f61f479cb50b7e2b93379a1729abf19e4040ac9f43a1a8"; -}; - -stdcxx-patch = fetchpatch { - url = http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/diff/14542?context=3; - sha256 = "15h831lsh61ichgdygkdkbdm1dlb9mhprldq27hkx2472lcnyx6y"; -}; - in stdenv.mkDerivation rec { - name = "inkscape-0.91"; + name = "inkscape-0.92.0"; src = fetchurl { - url = "https://inkscape.global.ssl.fastly.net/media/resources/file/" - + "${name}.tar.bz2"; - sha256 = "06ql3x732x2rlnanv0a8aharsnj91j5kplksg574090rks51z42d"; + url = "https://inkscape.org/gallery/item/10552/${name}.tar.bz2"; + sha256 = "0mmssxnxsvb3bpm7ck5pqvwyacrz1nkyacs571jx8j04l1cw3d5q"; }; - patches = [ ./deprecated-scopedptr.patch ]; - postPatch = '' - patch -i ${stdcxx-patch} -p 0 patchShebangs share/extensions - '' - # Clang gets misdetected, so hardcode the right answer - + stdenv.lib.optionalString stdenv.cc.isClang '' - substituteInPlace src/ui/tool/node.h \ - --replace "#if __cplusplus >= 201103L" "#if true" + patchShebangs fix-roff-punct ''; # Python is used at run-time to execute scripts, e.g., those from @@ -51,24 +30,12 @@ stdenv.mkDerivation rec { pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext makeWrapper intltool gsl poppler imagemagick libwpg librevenge - libvisio libcdr libexif automake114x autoconf - ] ++ stdenv.lib.optional boxMakerPlugin unzip; + libvisio libcdr libexif automake114x cmake + ]; enableParallelBuilding = true; - doCheck = true; postInstall = '' - ${if boxMakerPlugin then " - mkdir -p $out/share/inkscape/extensions/ - # boxmaker packaged version 0.91 in a directory called 0.85 ?!?? - unzip ${boxmaker}; - cp boxmake-upd-0.85/* $out/share/inkscape/extensions/ - rm -Rf boxmake-upd-0.85 - " - else - "" - } - # Make sure PyXML modules can be found at run-time. rm "$out/share/icons/hicolor/icon-theme.cache" ''; diff --git a/pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch b/pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch deleted file mode 100644 index 94ae901394f..00000000000 --- a/pkgs/applications/graphics/inkscape/deprecated-scopedptr.patch +++ /dev/null @@ -1,16 +0,0 @@ -glibmm deprecated ScopedPtr ---- -diff -u src/ui/clipboard.cpp src/ui/clipboard.cpp ---- a/src/ui/clipboard.cpp 2015-01-28 04:32:28.162676000 +0100 -+++ b/src/ui/clipboard.cpp 2016-04-03 09:13:12.360980533 +0200 -@@ -1402,7 +1402,7 @@ - - Glib::ustring target; - if (atom_name) { -- target = Glib::ScopedPtr(atom_name).get(); //This frees the gchar*. -+ target = Glib::make_unique_ptr_gfree(atom_name).get(); //This frees the gchar*. - } - - listTargets.push_back(target); - -Diff finished. Sun Apr 3 09:13:51 2016 diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 3f9fd132c09..ca74cd1a4aa 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { version = "${major}.${minor}"; - major = "0.23"; - minor = "5"; + major = "0.25"; + minor = "2"; name = "shotwell-${version}"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${major}/${name}.tar.xz"; - sha256 = "0fgs1rgvkmy79bmpxrsvm5w8rvqml4l1vnwma0xqx5zzm02p8a07"; + sha256 = "1bih5hr3pvpkx3fck55bnhngn4fl92ryjizc34wb8pwigbkxnaj1"; }; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { pkgconfig gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev libgudev gnome3.gexiv2 hicolor_icon_theme libraw json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg - wrapGAppsHook gnome_doc_utils gnome3.rest + wrapGAppsHook gnome_doc_utils gnome3.rest gnome3.gcr gnome3.defaultIconTheme itstool ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index 8fef29fa107..1bb57538cd5 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -16,7 +16,6 @@ let version = "1.0"; - pkgversion = "1"; arch = if stdenv.system == "x86_64-linux" then "x64" @@ -26,8 +25,8 @@ let abort "Unsupported platform"; in - stdenv.mkDerivation { - name = "unigine-valley-${version}-${pkgversion}"; + stdenv.mkDerivation rec { + name = "unigine-valley-${version}"; src = fetchurl { url = "http://assets.unigine.com/d/Unigine_Valley-${version}.run"; @@ -35,6 +34,7 @@ in }; sourceRoot = "Unigine_Valley-${version}"; + instPath = "lib/unigine/valley"; buildInputs = [file makeWrapper]; @@ -56,22 +56,16 @@ in ./extractor.run --target $sourceRoot ''; - # The executable loads libGPUMonitor_${arch}.so "manually" (i.e. not through the ELF interpreter). - # However, it still uses the RPATH to look for it. patchPhase = '' # Patch ELF files. elfs=$(find bin -type f | xargs file | grep ELF | cut -d ':' -f 1) for elf in $elfs; do - echo "Patching $elf" patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $elf || true done ''; - configurePhase = ""; - buildPhase = ""; - installPhase = '' - instdir=$out/opt/unigine/valley + instdir=$out/${instPath} # Install executables and libraries mkdir -p $instdir/bin @@ -94,10 +88,12 @@ in --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$instdir/bin:$libPath ''; + stripDebugList = ["${instPath}/bin"]; + meta = { description = "The Unigine Valley GPU benchmarking tool"; homepage = "http://unigine.com/products/benchmarks/valley/"; - license = stdenv.lib.licenses.unfree; # see also: /nix/store/*-unigine-valley-1.0/opt/unigine/valley/documentation/License.pdf + license = stdenv.lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf maintainers = [ stdenv.lib.maintainers.kierdavis ]; platforms = ["x86_64-linux" "i686-linux"]; }; diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/applications/graphics/xfractint/default.nix new file mode 100644 index 00000000000..4b1040ce765 --- /dev/null +++ b/pkgs/applications/graphics/xfractint/default.nix @@ -0,0 +1,30 @@ +{stdenv, fetchurl, libX11, libXft}: +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "xfractint"; + version = "20.04p14"; + # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) + src = fetchurl { + url = "https://www.fractint.net/ftp/current/linux/xfractint-${version}.tar.gz"; + sha256 = "0jdqr639z862qrswwk5srmv4fj5d7rl8kcscpn6mlkx4jvjmca0f"; + }; + + buildInputs = [libX11 libXft]; + + configurePhase = '' + sed -e 's@/usr/bin/@@' -i Makefile + ''; + + makeFlags = ["PREFIX=$(out)"]; + + meta = { + inherit version; + description = ""; + # Code cannot be used in commercial programs + # Looks like the definition hinges on the price, not license + license = stdenv.lib.licenses.unfree; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://www.fractint.net/"; + }; +} diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 669fc5a28a7..38573989266 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -3,6 +3,11 @@ , libgnomecanvas, libgnomeprint, libgnomeprintui , pango, libX11, xproto, zlib, poppler , autoconf, automake, libtool, pkgconfig}: + +let + isGdkQuartzBackend = (gtk2.gdktarget == "quartz"); +in + stdenv.mkDerivation rec { version = "0.4.8"; name = "xournal-" + version; @@ -13,13 +18,20 @@ stdenv.mkDerivation rec { buildInputs = [ ghostscript atk gtk2 glib fontconfig freetype - libgnomecanvas libgnomeprint libgnomeprintui + libgnomecanvas pango libX11 xproto zlib poppler + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ + libgnomeprint libgnomeprintui ]; nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; - NIX_LDFLAGS = [ "-lX11" "-lz" ]; + patches = stdenv.lib.optionals isGdkQuartzBackend [ + ./gdk-quartz-backend.patch + ]; + + NIX_LDFLAGS = [ "-lz" ] + ++ stdenv.lib.optionals (!isGdkQuartzBackend) [ "-lX11" ]; desktopItem = makeDesktopItem { name = name; @@ -47,11 +59,11 @@ stdenv.mkDerivation rec { cp $out/share/xournal/pixmaps/xournal.png $out/share/icons ''; - meta = { + meta = with stdenv.lib; { homepage = http://xournal.sourceforge.net/; description = "Note-taking application (supposes stylus)"; - maintainers = [ stdenv.lib.maintainers.guibert ]; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + maintainers = [ maintainers.guibert ]; + license = licenses.gpl2; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/graphics/xournal/gdk-quartz-backend.patch b/pkgs/applications/graphics/xournal/gdk-quartz-backend.patch new file mode 100644 index 00000000000..d1a42443a88 --- /dev/null +++ b/pkgs/applications/graphics/xournal/gdk-quartz-backend.patch @@ -0,0 +1,90 @@ +diff -rup xournal-0.4.8-orig/src/Makefile.am xournal-0.4.8/src/Makefile.am +--- xournal-0.4.8-orig/src/Makefile.am 2012-07-04 23:12:47.000000000 +0200 ++++ xournal-0.4.8/src/Makefile.am 2016-12-25 03:04:00.000000000 +0100 +@@ -31,6 +31,5 @@ if WIN32 + xournal_LDFLAGS = -mwindows + xournal_LDADD = win32/xournal.res ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz + else +- xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lX11 -lz -lm ++ xournal_LDADD = ttsubset/libttsubset.a @PACKAGE_LIBS@ $(INTLLIBS) -lz -lm + endif +- +diff -rup xournal-0.4.8-orig/src/xo-file.c xournal-0.4.8/src/xo-file.c +--- xournal-0.4.8-orig/src/xo-file.c 2014-06-28 21:52:25.000000000 +0200 ++++ xournal-0.4.8/src/xo-file.c 2016-12-25 03:07:19.000000000 +0100 +@@ -31,11 +31,6 @@ + #include + #include + +-#ifndef WIN32 +- #include +- #include +-#endif +- + #include "xournal.h" + #include "xo-interface.h" + #include "xo-support.h" +@@ -1275,50 +1270,8 @@ GList *attempt_load_gv_bg(char *filename + + struct Background *attempt_screenshot_bg(void) + { +-#ifndef WIN32 +- struct Background *bg; +- GdkPixbuf *pix; +- XEvent x_event; +- GdkWindow *window; +- GdkColormap *cmap; +- int x,y,w,h; +- Window x_root, x_win; +- +- x_root = gdk_x11_get_default_root_xwindow(); +- +- if (!XGrabButton(GDK_DISPLAY(), AnyButton, AnyModifier, x_root, +- False, ButtonReleaseMask, GrabModeAsync, GrabModeSync, None, None)) +- return NULL; +- +- XWindowEvent (GDK_DISPLAY(), x_root, ButtonReleaseMask, &x_event); +- XUngrabButton(GDK_DISPLAY(), AnyButton, AnyModifier, x_root); +- +- x_win = x_event.xbutton.subwindow; +- if (x_win == None) x_win = x_root; +- +- window = gdk_window_foreign_new_for_display(gdk_display_get_default(), x_win); +- +- gdk_window_get_geometry(window, &x, &y, &w, &h, NULL); +- cmap = gdk_drawable_get_colormap(window); +- if (cmap == NULL) cmap = gdk_colormap_get_system(); +- +- pix = gdk_pixbuf_get_from_drawable(NULL, window, +- cmap, 0, 0, 0, 0, w, h); +- +- if (pix == NULL) return NULL; +- +- bg = g_new(struct Background, 1); +- bg->type = BG_PIXMAP; +- bg->canvas_item = NULL; +- bg->pixbuf = pix; +- bg->pixbuf_scale = DEFAULT_ZOOM; +- bg->filename = new_refstring(NULL); +- bg->file_domain = DOMAIN_ATTACH; +- return bg; +-#else + // not implemented under WIN32 + return FALSE; +-#endif + } + + /************** pdf annotation ***************/ +diff -rup xournal-0.4.8-orig/src/xo-misc.c xournal-0.4.8/src/xo-misc.c +--- xournal-0.4.8-orig/src/xo-misc.c 2014-06-28 15:17:44.000000000 +0200 ++++ xournal-0.4.8/src/xo-misc.c 2016-12-25 03:05:50.000000000 +0100 +@@ -2288,9 +2288,7 @@ void hide_unimplemented(void) + } + + /* screenshot feature doesn't work yet in Win32 */ +-#ifdef WIN32 + gtk_widget_hide(GET_COMPONENT("journalScreenshot")); +-#endif + } + + // toggle fullscreen mode diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 85d3c4e49f9..a0414786ba4 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -2,14 +2,14 @@ }: with pythonPackages; buildPythonApplication rec { - version = "2.5"; + version = "2.7"; name = "buku-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "0m6km37zylinsblwm2p8pm760xlsf9m82xyws3762xs8zxbnfmsd"; + sha256 = "1hb5283xaz1ll3iv5542i6f9qshrdgg33dg7gvghz0fwdh8i0jbk"; }; buildInputs = [ diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index b98d327d3b8..5c05d1e1787 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.73.0"; + version = "2.76.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "17qs7dakzd25wbshsny2x82ppdqa6kwwfbp2vp1i8qmfc1nq61gc"; + sha256 = "1xfm586n6gm44mkyn25mbiyhj6w9ji9yl6fvmnr4zk1q6qcga3v8"; }; patches = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { apsw beautifulsoup cssselect cssutils dateutil lxml mechanize netifaces pillow python pyqt5 sip # the following are distributed with calibre, but we use upstream instead - chardet cherrypy html5lib odfpy routes + chardet cherrypy html5lib_0_9999999 odfpy routes ]); installPhase = '' diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index 1c7fd62f8ec..cdde212275d 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, fftw, ncurses, libpulseaudio }: +{ stdenv, fetchFromGitHub, fftw, ncurses, libpulseaudio }: stdenv.mkDerivation rec { - version = "2016-06-02"; + version = "1.5"; name = "cli-visualizer-${version}"; - src = fetchgit { - url = "https://github.com/dpayne/cli-visualizer.git"; - rev = "bc0104eb57e7a0b3821510bc8f93cf5d1154fa8e"; - sha256 = "16768gyi85mkizfn874q2q9xf32knw08z27si3k5bk99492dxwzw"; + src = fetchFromGitHub { + owner = "dpayne"; + repo = "cli-visualizer"; + rev = version; + sha256 = "18qv4ya64qmczq94dnynrnzn7pwhmzbn14r05qcvbbwv7r8gclzs"; }; postPatch = '' diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix new file mode 100644 index 00000000000..08f654cdec4 --- /dev/null +++ b/pkgs/applications/misc/confclerk/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, qt4, qmake4Hook }: + +let version = "0.6.1"; in +stdenv.mkDerivation { + name = "confclerk-${version}"; + + src = fetchurl { + url = "http://www.toastfreeware.priv.at/tarballs/confclerk/confclerk-${version}.tar.gz"; + sha256 = "1wprndshmc7k1919n7k93c4ha2jp171q31gx7xsbzx7g4sw6432g"; + }; + + buildInputs = [ qt4 ]; + + nativeBuildInputs = [ qmake4Hook ]; + + installPhase = '' + mkdir -p $out/bin + cp src/bin/confclerk $out/bin + ''; + + meta = { + description = "Offline conference schedule viewer"; + homepage = "http://www.toastfreeware.priv.at/confclerk"; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ ehmry ]; + inherit (qt4.meta) platforms; + }; +} diff --git a/pkgs/applications/misc/cortex/default.nix b/pkgs/applications/misc/cortex/default.nix index 777a759177c..42565ae7fa8 100644 --- a/pkgs/applications/misc/cortex/default.nix +++ b/pkgs/applications/misc/cortex/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, python3 }: stdenv.mkDerivation { - name = "cortex-2014-08-01"; + name = "cortex-2015-08-23"; src = fetchgit { url = "https://github.com/gglucas/cortex"; - rev = "e749de6c21aae02386f006fd0401d22b9dcca424"; - sha256 = "d5d59c5257107344122c701eb370f3740f9957b6b898ac798d797a4f152f614c"; + rev = "ff10ff860479fe2f50590c0f8fcfc6dc34446639"; + sha256 = "0pa2kkkcnmf56d5d5kknv0gfahddym75xripd4kgszaj6hsib3zg"; }; buildInputs = [ stdenv python3 ]; diff --git a/pkgs/applications/misc/ding/default.nix b/pkgs/applications/misc/ding/default.nix index 38cd9dbcc37..e76f95b6a50 100644 --- a/pkgs/applications/misc/ding/default.nix +++ b/pkgs/applications/misc/ding/default.nix @@ -10,11 +10,11 @@ let }; in stdenv.mkDerivation rec { - name = "ding-1.8"; + name = "ding-1.8.1"; src = fetchurl { url = "http://ftp.tu-chemnitz.de/pub/Local/urz/ding/${name}.tar.gz"; - sha256 = "00z97ndwmzsgig9q6y98y8nbxy76pyi9qyj5qfpbbck24gakpz5l"; + sha256 = "0chjqs3z9zs1w3l7b5lsaj682rgnkf9kibcbzhggqqcn1pbvl5sq"; }; buildInputs = [ aspellEnv fortune gnugrep makeWrapper tk tre ]; @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { sed -i "s@/usr/bin/ding@$out/bin/ding@g" ding.desktop - cp ding $out/bin/ - cp de-en.txt $out/share/dict/ - cp ding.1 $out/share/man/man1/ - cp ding.png $out/share/pixmaps/ - cp ding.desktop $out/share/applications/ + cp -v ding $out/bin/ + cp -v de-en.txt $out/share/dict/ + cp -v ding.1 $out/share/man/man1/ + cp -v ding.png $out/share/pixmaps/ + cp -v ding.desktop $out/share/applications/ wrapProgram $out/bin/ding --prefix PATH : ${stdenv.lib.makeBinPath [ gnugrep aspellEnv tk fortune ]} --prefix ASPELL_CONF : "\"prefix ${aspellEnv};\"" ''; diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 5f8d00ce996..6d67d3a340f 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { gnome3.gucharmap gnome3.libgee gnome3.file-roller + gnome3.defaultIconTheme ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/gnome15/default.nix b/pkgs/applications/misc/gnome15/default.nix new file mode 100644 index 00000000000..c4f8be88bb5 --- /dev/null +++ b/pkgs/applications/misc/gnome15/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, gnome_python, gnome_python_desktop }: + +stdenv.mkDerivation rec { + name = "gnome15-2016-06-10"; + + src = fetchFromGitHub { + owner = "achilleas-k"; + repo = "gnome15"; + rev = "1077c890d9ba8ef7a5e448e70a792de5c7443c84"; + sha256 = "0z5k2rgvv5zyi3lbbk6svncypidj44qzfchivb4vlr7clmh16m95"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig python2.pkgs.wrapPython ]; + buildInputs = [ python2 ]; + propagatedBuildInputs = with python2.pkgs; [ + pygtk keyring virtkey pillow dbus-python pyinotify lxml pyxdg pyusb gnome_python gnome_python_desktop + python-uinput xlib pyudev pyinputevent + ]; + + postPatch = '' + touch README + export UDEV_RULES_PATH="$out/lib/udev/rules.d" + ''; + + postFixup = '' + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + description = "A set of tools for configuring the Logitech G15 keyboard"; + license = licenses.gpl3; + homepage = "https://gnome15.org/"; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index 1c58aec0233..1f3cc9e27c0 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -5,9 +5,7 @@ bundlerEnv rec { version = "4.0.1"; ruby = ruby_2_2; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = with lib; { description = "A simple, Git-powered wiki"; diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index e4074547d78..e925885f05f 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - version = "0.3.1"; + version = "0.4.1"; name = "haxor-news-${version}"; src = fetchurl { - url = "https://github.com/donnemartin/haxor-news/archive/0.3.1.tar.gz"; - sha256 = "0jglx8fy38sjyszvvg7mvmyk66l53kyq4i09hmgdz7hb1hrm9m2m"; + url = "https://github.com/donnemartin/haxor-news/archive/${version}.tar.gz"; + sha256 = "0d3an7by33hjl8zg48y7ig6r258ghgbdkpp1psa9jr6n2nk2w9mr"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index cc4f0d2e773..05a4db7a250 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.17"; + version = "0.18.1"; goPackagePath = "github.com/spf13/hugo"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "spf13"; repo = "hugo"; rev = "v${version}"; - sha256 = "1h5d7m019r4zhk7xlcdbn4z3w6x7jq2lcdgq7w377688rk58wbgp"; + sha256 = "1nmabcrq96b339in2yr2zwcd41nadr4bha3rlpyaxlzbyyhz2f81"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 70781708f6e..0a95b083c0b 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -229,8 +229,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/fsync"; - rev = "eefee59ad7de621617d4ff085cf768aab4b919b1"; - sha256 = "0d56xdczawikyczc12i661qc79dbv4q8ihlj4p20zsjkyxxym59p"; + rev = "cb2da332d00cbc04e4f3f677520dc3e7cc11874b"; + sha256 = "03ib2xj80cbz77hx2baanyi50qr40akrybg49fzdvdm3lv9x100z"; }; } { @@ -341,4 +341,13 @@ sha256 = "0jwn2g4jfdb3wvpqisd8h055099pwx6c5i3bb4zxk5l9vybg1c5f"; }; } + { + goPackagePath = "github.com/bep/gitmap"; + fetch = { + type = "git"; + url = "https://github.com/bep/gitmap"; + rev = "a1a71abe12823e27ae7507189fe2e914ba9626ac"; + sha256 = "0qfhb72y6wbypaqv6dkl42syifnhps3qcy1karpd6ziw4pxak18g"; + }; + } ] diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 71418732a48..bce5b6cf589 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20160905"; + version = "3.20170111"; lib = stdenv.lib; in @@ -31,8 +31,8 @@ stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { - url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "1xbjj5qpxh7f05b69z9vvajg05zv63fj8js77c47yx01xifgd3vn"; + url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.tar.xz"; + sha256 = "00d7yzv426fvqbhvzyafddv7fa6b4j2647b0wi371wd5yjj9j3sz"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index e9536055ca3..b06a28513b8 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -5,9 +5,7 @@ bundlerEnv rec { version = "3.0.1"; ruby = ruby_2_2; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = with lib; { description = "Simple, blog aware, static site generator"; diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index a44f4bff83e..5206feb215c 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "1.0.7"; + version = "1.0.9"; name = "mdp-${version}"; src = fetchFromGitHub { owner = "visit1985"; repo = "mdp"; rev = version; - sha256 = "10jkv8g04vvhik42y0qqcbn05hlnfsgbljhx69hx1sfn7js2d8g4"; + sha256 = "183flp52zfady4f8f3vgapr5f5k6cvanmj2hw293v6pw71qnafmd"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 2fe806649c2..e60d1619685 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.87"; + version = "0.7.91"; name = "mediainfo-gui-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1ws4hyfcw289hax0bq8y3bbw5y321xmh0va1x4zv5rjwfzcd51pv"; + sha256 = "15jrph9hjza4c87m739s7c9v27gji94ha7rpchb8li0rcdvy40dm"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index 77c1badbf40..0ddee228e9d 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.87"; + version = "0.7.91"; name = "mediainfo-${version}"; src = fetchurl { url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1ws4hyfcw289hax0bq8y3bbw5y321xmh0va1x4zv5rjwfzcd51pv"; + sha256 = "15jrph9hjza4c87m739s7c9v27gji94ha7rpchb8li0rcdvy40dm"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix index 7f4311c2f49..a8bde39a278 100644 --- a/pkgs/applications/misc/monero/default.nix +++ b/pkgs/applications/misc/monero/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, cmake, boost, miniupnpc, pkgconfig, unbound }: let - version = "0.9.4"; + version = "0.10.1"; in stdenv.mkDerivation { name = "monero-${version}"; src = fetchFromGitHub { owner = "monero-project"; - repo = "bitmonero"; + repo = "monero"; rev = "v${version}"; - sha256 = "1qzpy1mxz0ky6hfk1gf67ybbr9xy6p6irh6zwri35h1gb97sbc3c"; + sha256 = "1zngskpgxz3vqq348h0mab2kv95z6g9ckvqkr77mx15m5z3qi6aw"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -27,19 +27,17 @@ stdenv.mkDerivation { installPhase = '' install -Dt "$out/bin/" \ - bin/bitmonerod \ - bin/blockchain_converter \ - bin/blockchain_dump \ - bin/blockchain_export \ - bin/blockchain_import \ - bin/cn_deserialize \ - bin/simpleminer \ - bin/simplewallet + bin/monerod \ + bin/monero-blockchain-export \ + bin/monero-blockchain-import \ + bin/monero-utils-deserialize \ + bin/monero-wallet-cli \ + bin/monero-wallet-rpc ''; meta = with stdenv.lib; { description = "Private, secure, untraceable currency"; - homepage = http://monero.cc/; + homepage = https://getmonero.org/; license = licenses.bsd3; maintainers = [ maintainers.ehmry ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index fbb10bc9ceb..b9fcd1a7f15 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -12,12 +12,12 @@ let inherit (pythonPackages) pexpect pycrypto python paramiko; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "6.3.7"; + version = "6.3.8"; name = "${pname}-${version}"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "1v4k04facdn2qzflf0clf3ir5hghqlabq89ssm2s4x1nqdniz544"; + sha256 = "1bxd828nrawmym6d8awh1vrni8dsbwh1k5am1lrq5ihp5c3kw9ka"; }; buildInputs = [ cmake pkgconfig glibc gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index fb655ceba5d..87c4df3446e 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { buildInputs = [ gtk2 libXft intltool automake115x autoconf libtool pkgconfig ]; - preConfigurePhases = '' + preConfigure = '' ./autogen.sh ''; diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 848b39eeb07..2f023412faf 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -4,17 +4,17 @@ stdenv.mkDerivation rec { name = "${product}-${version}"; product = "pdfpc"; - version = "4.0.4"; + version = "4.0.5"; src = fetchFromGitHub { repo = "pdfpc"; owner = "pdfpc"; rev = "v${version}"; - sha256 = "07wpf3gkgiq7dpgsrv7whk0pzm18cni4s53hd7zz40319jmlaf4q"; + sha256 = "13spngkp0lq2qlw4mxsngx4ckr201axzn5ppjax0bhlckirvzr2s"; }; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ gstreamer gst-plugins-base vala gtk3 libgee poppler + nativeBuildInputs = [ cmake pkgconfig vala ]; + buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler libpthreadstubs makeWrapper librsvg ]; postInstall = '' diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index 0bdc771e2bd..b62c6b77cac 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -6,11 +6,15 @@ stdenv.mkDerivation { patches = [ ./CVE-2014-3618.patch ]; # getline is defined differently in glibc now. So rename it. + # Without the .PHONY target "make install" won't install anything on Darwin. postPatch = '' sed -e "s%^RM.*$%#%" -i Makefile sed -e "s%^BASENAME.*%\BASENAME=$out%" -i Makefile sed -e "s%^LIBS=.*%LIBS=-lm%" -i Makefile sed -e "s%getline%thisgetline%g" -i src/*.c src/*.h + sed -e "3i\ +.PHONY: install +" -i Makefile ''; src = fetchurl { diff --git a/pkgs/applications/misc/pt/default.nix b/pkgs/applications/misc/pt/default.nix index d85a3266bdf..a400bb04da4 100644 --- a/pkgs/applications/misc/pt/default.nix +++ b/pkgs/applications/misc/pt/default.nix @@ -4,9 +4,7 @@ bundlerEnv { name = "pt-0.7.3"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = with lib; { description = "Minimalist command-line Pivotal Tracker client"; diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix new file mode 100644 index 00000000000..96d2aa0c85b --- /dev/null +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub +, qtbase, qtwebengine +, qmakeHook }: + +stdenv.mkDerivation rec { + version = "0.5.5rc2"; + name = "qsyncthingtray-${version}"; + + src = fetchFromGitHub { + owner = "sieren"; + repo = "QSyncthingTray"; + rev = "${version}"; + sha256 = "1x7j7ylgm4ih06m7gb5ls3c9bdjwbra675489caq2f04kgw4yxq2"; + }; + + buildInputs = [ qtbase qtwebengine ]; + nativeBuildInputs = [ qmakeHook ]; + enableParallelBuilding = true; + + postInstall = '' + mkdir -p $out/bin + cp binary/QSyncthingTray $out/bin + cat > $out/bin/qt.conf < "hack/update-munge-docs.sh" patchShebangs ./hack ''; diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 2fe9db26765..cd1ace993d6 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -4,12 +4,12 @@ let then "linux-amd64" else "darwin-amd64"; checksum = if stdenv.isLinux - then "17r8w4lvj7fhh7qppi9z5i2fpqqry4s61zjr9zmsbybc5flnsw2j" - else "0jf0kd1mm35qcf0ydr5yyzfq6qi8ifxchvpjsydb1gm1kikp5g3p"; + then "1g6k3va84nm2h9z2ywbbkc8jabgkarqlf8wv1sp2p6s6hw7hi5h3" + else "0jpwyvgpl34n07chcyd7ldvk3jq3rx72cp8yf0bh7gnzr5lcnxnc"; in stdenv.mkDerivation rec { pname = "minikube"; - version = "0.13.1"; + version = "0.15.0"; name = "${pname}-${version}"; src = fetchurl { @@ -30,9 +30,6 @@ stdenv.mkDerivation rec { installPhase = '' cp $src $out/bin/${pname} chmod +x $out/bin/${pname} - - mkdir -p $out/share/bash-completion/completions/ - HOME=$(pwd) $out/bin/minikube completion bash > $out/share/bash-completion/completions/minikube ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix index 2b801ec1acf..3347af83585 100644 --- a/pkgs/applications/networking/cluster/panamax/api/default.nix +++ b/pkgs/applications/networking/cluster/panamax/api/default.nix @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { env = bundlerEnv { name = "panamax-api-gems-${version}"; inherit ruby; - gemset = ./gemset.nix; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; + gemdir = ./.; }; bundler = args.bundler.override { inherit ruby; }; diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix index fbeb3de810f..4a6481e3e5e 100644 --- a/pkgs/applications/networking/cluster/panamax/ui/default.nix +++ b/pkgs/applications/networking/cluster/panamax/ui/default.nix @@ -10,9 +10,7 @@ stdenv.mkDerivation rec { env = bundlerEnv { name = "panamax-ui-gems-${version}"; inherit ruby; - gemset = ./gemset.nix; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; + gemdir = ./.; }; bundler = args.bundler.override { inherit ruby; }; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 78e167cc0e9..ffbdec6e117 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terraform-${version}"; - version = "0.8.1"; + version = "0.8.4"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/terraform"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "terraform"; - sha256 = "1fgnivhn6hrxpwwajl80vj2w81lv6vypprlbgif8m0z0na7p8956"; + sha256 = "0wjz7plzi7bgrbw22kgqpbai1j3rmqayrmjcp9dq6a361l9a0msw"; }; postInstall = '' diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix new file mode 100644 index 00000000000..4362d7cff90 --- /dev/null +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub, terraform, makeWrapper }: + +buildGoPackage rec { + name = "terragrunt-${version}"; + version = "0.9.1"; + + goPackagePath = "github.com/gruntwork-io/terragrunt"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "gruntwork-io"; + repo = "terragrunt"; + sha256 = "19im4sazw09854lnzalljwx22qswly8ffyys3yrjkd2l9vfxfly3"; + }; + + goDeps = ./deps.nix; + + buildInputs = [ makeWrapper terraform ]; + + postInstall = '' + wrapProgram $bin/bin/terragrunt \ + --set TERRAGRUNT_TFPATH ${lib.getBin terraform}/bin/terraform + ''; + + meta = with stdenv.lib; { + description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices."; + homepage = https://github.com/gruntwork-io/terragrunt/; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terragrunt/deps.nix b/pkgs/applications/networking/cluster/terragrunt/deps.nix new file mode 100644 index 00000000000..d903863118c --- /dev/null +++ b/pkgs/applications/networking/cluster/terragrunt/deps.nix @@ -0,0 +1,66 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "5e1afe1c0a077fb2da9b5f74232b790d99397ce8"; + sha256 = "073yx5acqybw0h2zshg209wmldm0g5h5x9bhbn6h08ak0r4i80al"; + }; + } + { + goPackagePath = "github.com/go-errors/errors"; + fetch = { + type = "git"; + url = "https://github.com/go-errors/errors"; + rev = "8fa88b06e5974e97fbf9899a7f86a344bfd1f105"; + sha256 = "02mvb2clbmfcqb4yclv5zhs4clkk9jxi2hiawsynl5fwmgn0d3xa"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "eb6f65b2d77ed5078887f960ff570fbddbbeb49d"; + sha256 = "1wx6hpxmq5sby54025j9hliz10gv5v0bq6q1z2cd0asznj154ij1"; + }; + } + { + goPackagePath = "github.com/mattn/go-zglob"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-zglob"; + rev = "1783ae1a9f7ff3a79240e8c249d8b575d70a6528"; + sha256 = "0g4ih6swqpq0bqwsv5mv8ymicgr92xh9i6sm1793lqwb63x8ga1x"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "bfdb1a85537d60bc7e954e600c250219ea497417"; + sha256 = "141kkh801jyp1r6hba14krydqg1iivp13j12is70j0g05z9fbji8"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "2402e8e7a02fc811447d11f881aa9746cdc57983"; + sha256 = "01qaz781cvrv3h1428xqq8knf5ahdcj93m5k9dnivg2hcrlnqibj"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "8ef3805c9de2519805c3f060524b695bba2cd715"; + sha256 = "0680rd87skmz8p8s3cwy55siz4bgjls314agfi03d7640gz7mp24"; + }; + } +] diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 20d50bd0f7a..2ea1de96109 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "16.4.29"; + version = "17.4.33"; sha256 = { - "x86_64-linux" = "0zng19qisbr3c9d312ar43p1b44xidabj4x2l3g3q85i300vj661"; - "i686-linux" = "0hc5fs0akc437valbxwlymk7ncjkdnhc51pja5bbiy48gqmd42bb"; + "x86_64-linux" = "0q3afwzd48mdv4mj4zbm6bvafj4hv18ianzhwjxz5dj6njv7s47y"; + "i686-linux" = "0wgq94if8wx08kqzsj6n20aia29h1qfn448ww63yn8dvkp6nlpya"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index d3be9c28df3..a79404e77c8 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -27,5 +27,6 @@ buildRustPackage rec { license = stdenv.lib.licenses.mit; maintainers = with maintainers; [ colemickens ]; platforms = with platforms; linux; + broken = true; }; } diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix index d2c1a2aeb07..e570a6e7c10 100644 --- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix +++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix @@ -27,11 +27,15 @@ stdenv.mkDerivation rec { url = "https://github.com/akrennmair/newsbeuter/commit/cdacfbde9fe3ae2489fc96d35dfb7d263ab03f50.patch"; sha256 = "1lhvn63cqjpikwsr6zzndb1p5y140vvphlg85fazwx4xpzd856d9"; }) + (fetchpatch { + url = "https://github.com/akrennmair/newsbeuter/commit/33577f842d9b74c119f3cebda95ef8652304db81.patch"; + sha256 = "1kwhp6k14gk1hclgsr9w47qg7hs60p23zsl6f6vw13mczp2naqlb"; + }) ]; installFlags = [ "DESTDIR=$(out)" "prefix=" ]; - installPhase = stdenv.lib.optionalString stdenv.isDarwin '' + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' for prog in $out/bin/*; do wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib" done @@ -42,6 +46,6 @@ stdenv.mkDerivation rec { description = "An open-source RSS/Atom feed reader for text terminals"; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix new file mode 100644 index 00000000000..f7dd9618307 --- /dev/null +++ b/pkgs/applications/networking/flexget/default.nix @@ -0,0 +1,39 @@ +{ lib +, pythonPackages +, fetchurl +, transmission +, deluge +, config +}: + +with pythonPackages; + +buildPythonPackage rec { + version = "1.2.337"; + name = "FlexGet-${version}"; + disabled = isPy3k; + + src = fetchurl { + url = "mirror://pypi/F/FlexGet/${name}.tar.gz"; + sha256 = "0f7aaf0bf37860f0c5adfb0ba59ca228aa3f5c582131445623a4c3bc82d45346"; + }; + + doCheck = false; + + buildInputs = [ nose ]; + propagatedBuildInputs = [ + paver feedparser sqlalchemy pyyaml rpyc + beautifulsoup_4_1_3 html5lib_0_9999999 pyrss2gen pynzb progressbar jinja2 flask + cherrypy requests dateutil_2_1 jsonschema python_tvrage tmdb3 + guessit pathpy apscheduler ] + # enable deluge and transmission plugin support, if they're installed + ++ lib.optional (config.deluge or false) deluge + ++ lib.optional (transmission != null) transmissionrpc; + + meta = { + homepage = http://flexget.com/; + description = "Multipurpose automation tool for content like torrents"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ domenkozar ]; + }; +} \ No newline at end of file diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index dbb7b3fe237..3ce638e6b58 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -4,11 +4,11 @@ , gsm, speex, portaudio, spandsp, libuuid, ccache }: stdenv.mkDerivation rec { - version = "0.4.20"; + version = "0.5.0"; name = "baresip-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; - sha256 = "0m8afbfdc9a57cy94ny7g6jv2ndfmrvkx0lgk64i8w870958gkwb"; + sha256 = "0dhlgjkqn7jkd1pmdyid41c829clzmi5kczjdwxzh5ygn95lydjc"; }; buildInputs = [zlib openssl libre librem pkgconfig cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 89ee38a7380..8b0dda1694d 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -2,15 +2,16 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "bitlbee-3.4.2"; + name = "bitlbee-3.5"; src = fetchurl { url = "mirror://bitlbee/src/${name}.tar.gz"; - sha256 = "0mza8lnfwibmklz8hdzg4f7p83hblf4h6fbf7d732kzpvra5bj39"; + sha256 = "06c371bjly38yrkvfwdh5rjfx9xfl7bszyhrlbldy0xk38c057al"; }; - buildInputs = [ gnutls glib pkgconfig libotr python ] - ++ optional doCheck check; + nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check; + + buildInputs = [ gnutls glib libotr python ]; configureFlags = [ "--gcov=1" diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 8387d2f7c38..1d1ae151caa 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "discord"; - version = "0.0.11"; + version = "0.0.13"; name = "${pname}-${version}"; src = fetchurl { url = "https://cdn-canary.discordapp.com/apps/linux/${version}/${pname}-canary-${version}.tar.gz"; - sha256 = "1lk53vm14vr5pb8xxcx6hinpc2mkdns2xxv0bfzxvlmhfr6d6y18"; + sha256 = "1pwb8y80z1bmfln5wd1vrhras0xygd1j15sib0g9vaig4mc55cs6"; }; libPath = stdenv.lib.makeLibraryPath [ @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { --set-rpath "$out:$libPath" \ $out/DiscordCanary + paxmark m $out/DiscordCanary + ln -s $out/DiscordCanary $out/bin/ ln -s $out/discord.png $out/share/pixmaps diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 11e2b13653d..3041d6e045e 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -7,7 +7,7 @@ , enableRST ? true , enableSpelling ? true, gtkspell2 ? null , enableNotifications ? false -, enableOmemoPluginDependencies ? false +, enableOmemoPluginDependencies ? true , extraPythonPackages ? pkgs: [] }: diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix new file mode 100644 index 00000000000..a75835b3c7e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildGoPackage, fetchFromGitLab }: + +buildGoPackage rec { + name = "mm-${version}"; + version = "2016.11.04"; + + goPackagePath = "gitlab.com/meutraa/mm"; + + src = fetchFromGitLab { + owner = "meutraa"; + repo = "mm"; + rev = "473fdd97285168054b672dbad2ffc4047324c518"; + sha256 = "1s8v5gxpw1sms1g3i8nq2x2mmmyz97qkmxs1fzlspfcd6i8vknkp"; + }; + + meta = { + description = "A file system based matrix client"; + homepage = https://gitlab.com/meutraa/mm; + license = stdenv.lib.licenses.isc; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix index 9c0f64d6574..ff065e7e2ce 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchurl, pidgin, xosd +{ stdenv, fetchFromGitHub, pidgin, xosd , autoreconfHook } : stdenv.mkDerivation rec { - name = "pidgin-osd-0.1.0"; - src = fetchurl { - url = https://github.com/mbroemme/pidgin-osd/archive/pidgin-osd-0.1.0.tar.gz; - sha256 = "11hqfifhxa9gijbnp9kq85k37hvr36spdd79cj9bkkvw4kyrdp3j"; + name = "pidgin-osd-0.2.0"; + src = fetchFromGitHub { + owner = "edanaher"; + repo = "pidgin-osd"; + rev = name; + sha256 = "07wa9anz99hnv6kffpcph3fbq8mjbyq17ij977ggwgw37zb9fzb5"; }; - makeFlags = "PIDGIN_LIBDIR=$(out)"; - # autoreconf is run such that it *really* wants all the files, and there's no # default ChangeLog. So make it happy. preAutoreconf = "touch ChangeLog"; postInstall = '' mkdir -p $out/lib/pidgin - ln -s $out/pidgin $out/lib/pidgin + mv $out/lib/pidgin-osd.{la,so} $out/lib/pidgin ''; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 15cc5a0f093..d1af2ad70d1 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "ricochet-${version}"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { url = "https://github.com/ricochet-im/ricochet/archive/v${version}.tar.gz"; - sha256 = "1szb5vmlqal0vhan87kgbks184f7xbfay1hr3d3vm8r1lvcjjfkr"; + sha256 = "1kfj42ksvj7axc809lb8siqzj5hck2pib427b63a3ipnqc5h1faf"; }; desktopItem = makeDesktopItem { @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { description = "Anonymous peer-to-peer instant messaging"; homepage = "https://ricochet.im"; license = licenses.bsd3; - maintainers = [ maintainers.codsl maintainers.jgillich ]; + maintainers = [ maintainers.codsl maintainers.jgillich maintainers.np ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/skype/default.nix b/pkgs/applications/networking/instant-messengers/skype/default.nix index 5bb2121b1fd..a84b9cbf31c 100644 --- a/pkgs/applications/networking/instant-messengers/skype/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype/default.nix @@ -38,6 +38,9 @@ stdenv.mkDerivation rec { mkdir -p $out/{libexec/skype/,bin} cp -r * $out/libexec/skype/ + # Fix execution on PaX-enabled kernels + paxmark m $out/libexec/skype/skype + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${lib.makeLibraryPath buildInputs}" $out/libexec/skype/skype diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 9f2fee47d8d..240aebe9175 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -4,7 +4,7 @@ let - version = "2.2.1"; + version = "2.3.4"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -43,7 +43,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "1x08bmkanllv3lpi2s722xs7qia8igf6zxzkc3g7vs5jms3mdrad"; + sha256 = "01kr7maj8f4yinyri7rs4pmzab9cvp48xfqw3ilirx4mvh8mr1fd"; } else throw "Slack is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index c07258a7837..16956782a24 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -3,7 +3,7 @@ , breakpad, ffmpeg, openalSoft, openssl, zlib, libexif, lzma, libopus , gtk2, glib, cairo, pango, gdk_pixbuf, atk, libappindicator-gtk2 , libwebp, libunity, dee, libdbusmenu-glib, libva-full, wayland -, xcbutilrenderutil, icu, libSM, libICE, libproxy +, xcbutilrenderutil, icu, libSM, libICE, libproxy, libvdpau , libxcb, xcbutilwm, xcbutilimage, xcbutilkeysyms, libxkbcommon , libpng, libjpeg, freetype, harfbuzz, pcre16, xproto, libX11 @@ -19,20 +19,20 @@ let in stdenv.mkDerivation rec { name = "telegram-desktop-${version}"; - version = "0.10.19"; + version = "1.0.0"; qtVersion = lib.replaceStrings ["."] ["_"] packagedQt; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; - sha256 = "1p07kxfmcd90sx9bq046x03h1h807vs0pn64lfghr6m6ln8z44s3"; + sha256 = "1qxzi82cgd8klk6rn83rzrmik0s76alarfaknknww5iw5px7gi8b"; }; tgaur = fetchgit { url = "https://aur.archlinux.org/telegram-desktop.git"; - rev = "99bb0519f14e23fafb6884fe296d34b6f8bed5c3"; - sha256 = "0z5m3binbl06kk34plmfblhqz6hlnkbnjb93sam0c6c995k3sz82"; + rev = "957a76f9fb691486341bcf4781ad0ef3d16f6b69"; + sha256 = "01nrvvq0mrdyvamjgqr4z5aahyd1wrf28jyddpfsnixp2w5kxqj8"; }; buildInputs = [ @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { # Qt dependencies libxcb xcbutilwm xcbutilimage xcbutilkeysyms libxkbcommon libpng libjpeg freetype harfbuzz pcre16 xproto libX11 - inputproto sqlite dbus libwebp wayland + inputproto sqlite dbus libwebp wayland libvdpau ]; nativeBuildInputs = [ pkgconfig gyp cmake ]; diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix new file mode 100644 index 00000000000..86cc9bded10 --- /dev/null +++ b/pkgs/applications/networking/insync/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, makeWrapper }: + +stdenv.mkDerivation rec { + name = "insync-${version}"; + version = "1.3.13.36129"; + src = fetchurl { + url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2"; + sha256 = "18d8ww529nvhwcl5k31qmkzb83k9753ics0dw64w202r8vwbm3cd"; + }; + + buildInputs = [ makeWrapper ]; + + postPatch = '' + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" client/insync-portable + ''; + + installPhase = '' + mkdir -p $out/bin + cp -a client $out/client + makeWrapper $out/client/insync-portable $out/bin/insync --set LC_TIME C + ''; + + meta = { + platforms = ["x86_64-linux"]; + license = stdenv.lib.licenses.unfree; + maintainers = [ stdenv.lib.maintainers.benley ]; + homepage = https://www.insynchq.com; + description = "Google Drive sync and backup with multiple account support"; + longDescription = '' + Insync is a commercial application that syncs your Drive files to your + computer. It has more advanced features than Google's official client + such as multiple account support, Google Doc conversion, symlink support, + and built in sharing. + + There is a 15-day free trial, and it is a paid application after that. + ''; + }; +} diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 5fd45368536..88e2ede631b 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,20 +1,23 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }: stdenv.mkDerivation rec { - - version = "0.8.20"; + version = "1.0.0"; name = "irssi-${version}"; src = fetchurl { - urls = [ "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz" ]; - sha256 = "0riz2wsdcs5hx5rwynm99fi01973lfrss21y8qy30dw2m9v0zqpm"; + url = "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz"; + sha256 = "11x47ahkvzzx3xkvqak34235ghnpln65v13k77xx32c85nvb63kr"; }; - buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses glib openssl perl libintlOrEmpty ]; - NIX_LDFLAGS = ncurses.ldflags; - - configureFlags = "--with-proxy --with-ncurses --enable-ssl --with-perl=yes"; + configureFlags = [ + "--with-proxy" + "--with-bot" + "--with-perl=yes" + "--enable-true-color" + ]; meta = { homepage = http://irssi.org; diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix index 4d73648edf7..1141f563918 100644 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -1,35 +1,23 @@ { stdenv, fetchurl, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: -let - versionFix = fetchurl { - url = https://patch-diff.githubusercontent.com/raw/cryptodotis/irssi-otr/pull/60.patch; - sha256 = "18fk9nbzf3fvhvvvkrxv5l004hhimapqb6ra09m83268kbl4q3jy"; - }; -in with stdenv.lib; stdenv.mkDerivation rec { name = "irssi-otr-${version}"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "cryptodotis"; repo = "irssi-otr"; - rev = "4ad3b7b6c85be0154ab3694fe9831796db20c4fe"; - sha256 = "1hm1whx1wzlx4fh4xf2y68rx9x6whi8bsbrhd6hqjhskg5msssrg"; + rev = "v${version}"; + sha256 = "0c5wb2lg9q0i1jdhpyb5vpvxaa2xx00gvp3gdk93ix9v68gq1ppp"; }; - prePatch = '' - sed -i 's,/usr/include/irssi,${irssi}/include/irssi,' src/Makefile.am - sed -i "s,/usr/lib/irssi,$out/lib/irssi," configure.ac - sed -i "s,/usr/share/irssi,$out/share/irssi," help/Makefile.am - ''; - - patches = [ versionFix ]; - preConfigure = "sh ./bootstrap"; buildInputs = [ libotr automake autoconf libtool glib pkgconfig irssi ]; + NIX_CFLAGS_COMPILE="-I ${irssi}/include/irssi -I ${irssi}/include/irssi/src/core -I ${irssi}/include/irssi/src/"; + meta = { homepage = https://github.com/cryptodotis/irssi-otr; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/networking/irc/konversation/1.6.nix b/pkgs/applications/networking/irc/konversation/1.6.nix index c6876405462..9724ae5f4bf 100644 --- a/pkgs/applications/networking/irc/konversation/1.6.nix +++ b/pkgs/applications/networking/irc/konversation/1.6.nix @@ -75,7 +75,8 @@ let homepage = https://konversation.kde.org; }; }; -in kdeWrapper unwrapped { +in kdeWrapper { + inherit unwrapped; targets = [ "bin/konversation" ]; } diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix new file mode 100644 index 00000000000..31cad15296c --- /dev/null +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime, webkitgtk24x + , libsass, notmuch, boost, makeWrapper }: + +stdenv.mkDerivation rec { + name = "astroid-${version}"; + version = "0.6"; + + src = fetchFromGitHub { + owner = "astroidmail"; + repo = "astroid"; + rev = "v${version}"; + sha256 = "0zashjmqv8ips9q8ckyhgm9hfyf01wpgs6g21cwl05q5iklc5x7r"; + }; + + patches = [ ./propagate-environment.patch ]; + + buildInputs = [ scons pkgconfig gnome3.gtkmm gmime webkitgtk24x libsass + gnome3.libpeas notmuch boost gnome3.gsettings_desktop_schemas + makeWrapper ]; + + buildPhase = "scons --prefix=$out build"; + installPhase = "scons --prefix=$out install"; + + preFixup = '' + wrapProgram "$out/bin/astroid" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + ''; + + meta = { + 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; + }; +} diff --git a/pkgs/applications/networking/mailreaders/astroid/propagate-environment.patch b/pkgs/applications/networking/mailreaders/astroid/propagate-environment.patch new file mode 100644 index 00000000000..db536ea721f --- /dev/null +++ b/pkgs/applications/networking/mailreaders/astroid/propagate-environment.patch @@ -0,0 +1,13 @@ +diff --git a/SConstruct b/SConstruct +index a80bca3..ed2cd6d 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -5,7 +5,7 @@ from subprocess import * + def getGitDesc(): + return Popen('git describe --abbrev=8 --tags --always', stdout=PIPE, shell=True).stdout.read ().strip () + +-env = Environment () ++env = Environment(ENV = os.environ) + + AddOption ("--release", action="store", dest="release", default="git", help="Make a release (default: git describe output)") + AddOption ("--enable-debug", action="store", dest="debug", default=None, help="Enable the -g flag for debugging (default: true when release is git)") diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 2033dfc8e91..57f633d2c99 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, which, autoconf, automake, ncurses, perl -, cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl }: +, cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl, lmdb }: stdenv.mkDerivation rec { - version = "20161104"; + version = "20161126"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "070p18khvxsrcn30jhyrnagka5mgza9mi5vmrrr6xl8mpgkyrlaw"; + sha256 = "10ycfya11pvwv0rdyyak56r6f8ia8yf0h8qyi904bbpvm8lqvqfd"; }; buildInputs = [ autoconf automake cyrus_sasl gdbm gpgme kerberos libidn ncurses - notmuch which openssl perl ]; + notmuch which openssl perl lmdb ]; configureFlags = [ "--enable-debug" @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { "--with-curses" "--with-regex" "--with-idn" + "--with-lmdb" # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail "ac_cv_path_SENDMAIL=sendmail" diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 83eace00b0a..c1a32341ffe 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation rec { - version = "0.23.2"; + version = "0.23.4"; name = "notmuch-${version}"; passthru = { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://notmuchmail.org/releases/${name}.tar.gz"; - sha256 = "1g4p5hsrqqbqk6s2w756als60wppvjgpyq104smy3w9vshl7bzgd"; + sha256 = "0fs5crf8v3jghc8jnm61cv7wxhclcg88hi5894d8fma9kkixcv8h"; }; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix index 79b5f7b737f..5d385eeb950 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -1,585 +1,585 @@ { - version = "45.5.1"; + version = "45.6.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ar/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ar/thunderbird-45.6.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "b5760210c14df4648d6bbd48136dbb3221c682ecebb649be848f8fbecf89d2251630c8d8208438f0ab66b73964bbdf8e05035bb88f0c773ea253cab163b569b1"; + sha512 = "7a2976d272ecc0a3727e34b0841865fea6de9f05195089aa912831836c6f74b9fd34de0ed327cf96cf5b8c0e39829e2db5dd364a92e4ffc48e7139a0fd9cf066"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ast/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ast/thunderbird-45.6.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "64028617fe76832663fd69e2305ca84dfd576507348dcffc680d94d6d1de640fdd13874a73638767d3aedd2c84d38fd370e57ba3f95281a0fc0ad9d21b4d727d"; + sha512 = "fcb1efd553617825e5ca55afe56a6e36cd8a0c067f4e851c6527058fe1b8169da2e548932e21bc7a52eacec9fa2c55b0cc1369a850a9927ba6c686ed6f5940e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/be/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/be/thunderbird-45.6.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "932f0dbe85e6cf43c70ea6f9537785322bc5280106c97b4e21ea828ebc5d997d027c260f4e1b4441909c3a3b7e61f51b95167cf6a632bce98fd2b6aa33eb413d"; + sha512 = "7ca8e07771a984510f2114bcf58397e49e6d64013dfba94e3312ad926e05afb01dc5beced22e5c00f0e43d742752f8a96b5ef167f4d892a01fbaedc194b76d49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/bg/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/bg/thunderbird-45.6.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "359973dc382c7565623f63ede93e37b1d1a2bbcf9690710e05fc066a8c7f67b059b9d14c978c93741d65544029e5970f520d7a64dd07902d89f0331b9a3330f3"; + sha512 = "fe717fc5590f420e13a0c8bedba031b8ed5e2379ddf613fc14d82f718afe9341d953baf4f056fca88366248a5f3777cbcc3c12e5bccc33ac07698d3de8306370"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/bn-BD/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/bn-BD/thunderbird-45.6.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "f2d5b0c3fadb19d89733feecb50a7507b1c29dd93b5064a0db95292be1635c29bb3d98b84fb29ac38224c97dc7af29ff6024652562273eeca2a6ee38a0d19de3"; + sha512 = "9e87ff7976eed19137767b0e9ee2b43b41701edc060201da8d54c68d40f26d88f07c3972d59d59e74191bf30163eec642d6b72f7e633fe48d5cc34f1624d7983"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/br/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/br/thunderbird-45.6.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "3d1aba23ef4d969548b2fa729ad1795496f7123b4437f7692bfcbda4c87b0bd7edd1caf00cdb207eb4aaaf6c8ec8d0554d553a7db5a85e1e24d07c401d507794"; + sha512 = "2c829c85255d15aa6ad9a941404290a546dbe7522877bfc0b9869415e6f806f853252bb646650d8a9f9729cfd139121dceafc4c1c052030ff7ff7b17e9cef4c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ca/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ca/thunderbird-45.6.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "a1c04f9846edba32587b1f62379e703a62af0b9886f1e56e86854629a034657d86a4f06ace3bca9f75a21c734b559f17522692e4c90607ab353669bfe02a3dc4"; + sha512 = "452f701dd496fe6da40372188f7db2628cbe9b7db737b167d052a4dd75c668fb2505e68b6ec299b8a9d0e4cb448a57f8805aabd0d898e21cb67e89eba0163014"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/cs/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/cs/thunderbird-45.6.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "f93ab27ec7e126aa309ba4d6d5900be7c427a29ccbbe141cd4e7f211daaeca6459163711204f02fafda285020173417d89a9c46f593114c81b73ce430a2c7743"; + sha512 = "2574febad30bf072d7a0674ff821ca35845d6a5fda09cfce9cff18960af210ded42370bd148324e3599b14977cea770e59e8425c1bf0e6a52824c52f0a864457"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/cy/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/cy/thunderbird-45.6.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "9166a6c737dde179411e1a0d509141f29c7df7e3fe7e4f6def229be08bba4ccf5963804a86490d08e5ae3dd602f246c2fdce717562616445257b81b8c17ee795"; + sha512 = "f07456acf596b6e3e98586177ebe41cdc09a7476c465371153062b394f0e89a0bf17ead255375cd0616c2db063dce3ac9aeba8d29f7e5906fc1c323000b49f22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/da/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/da/thunderbird-45.6.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "6965968613889d69182ddf3dadf7e109e958d7561cb2b1a3936d9302b725d9c59c8cb8730ecf62e422a38c108da2ffa6ae5b012df348dd9250047a15b046e760"; + sha512 = "7bda2aeb26814fc9b2b1afb4470ec17f0b069b779e99ddd3ee423ac3776ca47d23223009cd35d2f6e495e7b5523787a228fa55db6e56f0c724b45e5ba2bac9d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/de/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/de/thunderbird-45.6.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "2a33d8104e1149181e91e9588a4236b481a8837835af2a1b08f3cc2dd55eecb3059aafbabccae8b0dbb8cfc632bdc8fc6198bb600b60a9dbff5a96a8609699d1"; + sha512 = "7a9c629f957c74e54c2e82912836fc1f2688f37ceee43a31b29d1d4b9b2c477e7ebff3f4b4969386e7aee458215f22a76ede4abba9138fd8d64411a0bd7103d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/dsb/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/dsb/thunderbird-45.6.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "91314f8c8c7a9e1d13f618a1b71df8141933e6fe5f3317da06ac84ce1ea269bfe0740d94b2d8e240005a315a469cab39e79f70c06169712fdf318c9b3b5ac9c8"; + sha512 = "666a64764cbd0f216f9b960f78b1e45d63c008332efd93b9e233842f37478d9c0f2d1faac494a5b28d43ff21a9e01059fa8b46554d05f47d919483b6d63befab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/el/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/el/thunderbird-45.6.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "601ed7cd8f6f1e867647036ab3f8fadca0507f4441998ac29dfd15a6c8cf0c65b94cd647b0b4602d7624f041a8fd14a8210fde26a7c09763746d31008699e0d3"; + sha512 = "02a7f06adfb93ee1694e0389e01b6bd2fe51e5e2379cf3c0fd34b8c7c8d7f58a848679fae19a7cea851bbfcf96fae493a020701841b2753678a142e3925b56e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/en-GB/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/en-GB/thunderbird-45.6.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "07222127e045d41f912baa160b08e22a373ba605f857d001c92792ebbcf789e1094c68e0f16bf9c609fda0321ee0a0f702c7d47481f4da6a9cb80071b7e21095"; + sha512 = "1e45378d32c04db6b802480e245663f3c4522105da6c548d6ff1e5eebead55f53322909b87ecf0b97b85fab30b684ef8e9f3c0175a033824bccadffbb42cad7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/en-US/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/en-US/thunderbird-45.6.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "3dfeaa5e64b4063e0b5ae552bc47db1ab06e4381c55ccd35b05766aeac5add880804f07a40d39db08395a467ffa96d67261971359c46bce8d9ec6adde5948f2a"; + sha512 = "ab06b894f881ebc847cdcc11ffabcf7d9b626da9ce17c4195e7c401963bb3937b8a05eb73ea2fb988662f318568af3ad7142d3fc556cfe139d4393249c353446"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/es-AR/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/es-AR/thunderbird-45.6.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "087caecb722222c3950c8a644cf7af37cd356b62b4802fcac1a4b93620fa086e2b3e97a6c5f6b22aa61d3478dad41bc7b8ab39d31bf76b710f2e53b36cea2049"; + sha512 = "07be1c0f88aa49a8264bfccbc6db3e738dcde83d93f86939bf3ffb5f85c835252f2f4a74a8cb3eb5d2ea6a1b4af31d3d84418090a23be36aa11965cd4ed67b66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/es-ES/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/es-ES/thunderbird-45.6.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "f335002365f68e28cf0e28c407843f8de3184b33a7e57638104d1ac3515cfcbd14842ecc6d61a7de012e2cb1d7c5ff170598b5f81dbcbb71b81549f6a8bb5531"; + sha512 = "2c51ff6931dea175ad6d8eb64c768792f61bef1cb5762efa3e7261cbf14c7619c81ef44a8d6e1ebe7d9764d2608b85e6ddbe47ec437f500c65037d6be8341d88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/et/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/et/thunderbird-45.6.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "555874dfde25076892647a451bd9e02879eb5c8584dd22d5bb73f9c5deab5f64103d80c57292ed6a04b73fe27aa28d78210a1a5da7147fdae0980faaa8d19641"; + sha512 = "e726a397cecb1d624fef5840b89a177591c8a10d397042b2c5f47574d9b88d0725a1b53999e2d268a67c4efd1b4551ffa2052398c1ad14903a8b0217b5b353bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/eu/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/eu/thunderbird-45.6.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "5f4361f43bca179613f24045835fe31e17fe949da0e2f9e470635d714f521abac45d0104e663ab44806a7e45f4d44d515b002508e8388c2c72e0b91c793ec8bf"; + sha512 = "85c2fdc7e27a8298d8e553f221595ae0d7872eae4e78d143d533a18582d8f40195db38f179aa2ed558e790fb7c58510a8ad6037c698ab149d3bd582e34528e5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/fi/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/fi/thunderbird-45.6.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "5ee311ba705cdfd7a6687a1a17e7c5b40fda22fa7acb3a9a0c236e2aa3d8037bbf568d9be29853abf3d52d6840ea96b7ee59cf9264709973aee3bc43e8c07979"; + sha512 = "ad4516f11670424d31e7fc5c9b12bcf1f0c63110b81ab45a3c5b5a897e1d0a3ce1855117254902ca177a04fc422c193c742098a431dbd8b760bdefe1d7c4c6a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/fr/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/fr/thunderbird-45.6.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "ffa44a92d3ab3ac8bcdd945b910e6da6a4c0b05f4c95572fd2a56fe73f935f7a387fb98100c7a84e4adc22c9b1cf8a0aa84ac04eb14c4b60b7989053c2021a0a"; + sha512 = "4abb3fd8430867262811a4aa56304666ad6a1336959afff73fcdc38f157505975d6c340219db4980157f38dcb4b2596cdf623f311f6fbd29e613a89bed35beca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/fy-NL/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/fy-NL/thunderbird-45.6.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "3cf5e391adca05195ea24be90a2414640f0fd72ffc858e971fc82675f49def7238c30f3ac48c08312414f436f9bde0ac2b05e11db94b40079c9d37f3d1a8ac5c"; + sha512 = "dddab8f7453bfc074f3cd8d6aea33402f66be1bec08ea7c152873af63c802e03edf01e74db236dac6e088f836f188258d3dc62fefa833ffc525ca15b71cfbf21"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ga-IE/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ga-IE/thunderbird-45.6.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "4260f3a7245d8c7f0b6f3a0a47793c84eb83be44e19105a3efbc35ef1a1455f872a987c714eb95a1cfd4157816cd9eb09c5a6098460e90584e9d630812d66716"; + sha512 = "66acfc92a997ef6a2f1dfdf6a6952eebd7788b14d3080867349619b3f9559bbac4cfe6e983ad87900e089a0cb15dab2b9f77dcac69adb66ef0f97f9b5cc4e809"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/gd/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/gd/thunderbird-45.6.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "b9ce9839cd3a4e8fbbba4f107a934ab4733b1feb65dd1e40a1c064f39026d03d1208b67b413ed4c643c7039f91e1ceb8747f3a46cc44d1bedb22275512f867b8"; + sha512 = "e4d2fefb8e7c0c14395af7f695e216f6fdb685ca150cb803a347228aaea988169a7093747e770921716123a9333bbc00560e6324ff2f4f966cd895c2fbe6e21d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/gl/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/gl/thunderbird-45.6.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "fbd8a4eae6a94d966f8e1e9e2bcc7a6aed8b5a9991fc8367de28c11fc7b341fcf745c983f8259b89767a762604e55ade6212f5c1496dbf843c8eb49f89e8810c"; + sha512 = "6cc628399fa0adce0fe740e77a8e708988f7dee4d004bcb785fe567ca680fca79fde756e479cab9017828cebe48fa091e402d52d6bed54aae9cc5b6e28f246d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/he/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/he/thunderbird-45.6.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "51f3acbaf8971bd0bc93502605526f6d0be5093810f8a91f43c2597541dc23eb590a10b4f2839cd9ce1e13685fc7e38668184b12a23ae99356ffacf3f6481d83"; + sha512 = "82bbf5a5fe84953d9118948fe3e9d4d6a46ceaafe42f76ea3dda36134458d30f0c73f2ab61682d2627b8c3d598d2174d549d8b4b80bf5c3071627b57b713329a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/hr/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/hr/thunderbird-45.6.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "65110b98cea4a6174dd31de4aea53d2efb1fee822025f9a7ccd6ef3ac80c0baa605fefd7078c3528451ffad7d9e86400c5b7b527b026aaca022a0099673442af"; + sha512 = "c70dcfc8506132ce0764de325c8e0debafdc8460052bfa4901172f880b935d1c0bd70b1f7d227604f6bfd155c2ff165c1ad7a5b509d512483b54eff80e910a1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/hsb/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/hsb/thunderbird-45.6.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "d50057bc3cdff3820f0bc09679f672d14a35240fc3e997836f9c04bd8aa922e41b627e0f632c2e76982439d4510262618d7d59adaa530708cadaf1fb111159e3"; + sha512 = "5baeaa2ae960514551d062979cd60644971b6603ab33b9773a3eff10e267f0029b2edd5d48734dfcf99697ec77c88e12f4f240ea18a7433a0a2eb07f70283389"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/hu/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/hu/thunderbird-45.6.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "bbff40d50155756c0d06fc4c9f7bf31f770901139b0a8d475ee0d8bd7ff1b2d4e8f5f3343fffd7af83f5f53f0567845f6c7ddde8abbd3f9f004c31a1479ec4ed"; + sha512 = "bbba8bfef9168efcf0aca6fa98596b3d7bbfaf456ceca263825d2f96b054d6dbc672e1086db645a48966f82cd0d6f4c85e9846935dc7b2595faeefa81c66904f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/hy-AM/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/hy-AM/thunderbird-45.6.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "570815807b0ea61bcf506effb2acc52ee6e8089b1328a046a8c55de0e3e72227a2d097ffe61f383733ca6f11405e5689595bc31f931f41e854f71770e18230de"; + sha512 = "b58088defd9a2f76aa779bf080135a5735e1531de065b1a3ac6f9048266e763bee8a22be634f435584d308aa5a532b72687bbddc8f7dedaca39642ed04137bfa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/id/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/id/thunderbird-45.6.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "ac9a78df1a8c6228560247e07cd7695eedf9ef0afd2c25a770aaffc8d96555f229e9332204e73ba803df2b8a7f590b970020b277123668ff20375608b093dc8c"; + sha512 = "c83198b8ac60132f3124253c082ea0d5a45f1db7a7a6509ea18e3d084e26796364e6ced3c20675620cfc7f849b4e7fe342c86d0cea24eee48c815dc02730074f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/is/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/is/thunderbird-45.6.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "cb78e3c2e1824d1da479e8ca5cdbdf420f7e046895a60b8912d44cbecf6966a32acbe2811545961a6da72f22052d8d2bed8d8ee1208b9c4e16250e6900265335"; + sha512 = "285427b6f53c181889b78d005071f71211a2a51b6fa5f3eaf5a573a4a5e15cd83d946b97f3da89d383fd797a6985f8c1d589fe40e1267a73224848080af9b79c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/it/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/it/thunderbird-45.6.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "84c053e27ecd67a15d84bb2c222ed97061c130fde590db558c7f5919dd8acc8bcc5f032f84c53fe364f95607aa04bcf43375d2cc9fac2d4990535aa38d939793"; + sha512 = "5e763b01fce3bb3ce5deaea0d3e4bb51b5cd752ab5fa191a064400f7961d237924b98013179f0d32017bc527478d665d6fbc74482680aaf041444d3c376497ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ja/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ja/thunderbird-45.6.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "dada1c9e859b27a1bad7ba277749e77d68a20ad4c033861ee5ec54f78627efcaf336d082b1a8f9e4dfc91f6b16adde3eda873ae261351c3292c73c7f7ff05526"; + sha512 = "7dd7b1f9fcfe103d8b70587e2a8307bec93766b504390ee138cab52bb8b8f76759af84568eccc71e5a88ee8cf3e326313930760cc92267ecf7e0fb29fc09f8e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ko/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ko/thunderbird-45.6.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "3eead074a7c82570db1923b8a64afdd8d8d802d33c4087c8b647f905f580d27ede2913e1323b98c46fdeb83a91db1a43dd155d013d3f42b54a7daac1d541b449"; + sha512 = "1776ae557e7f7d6df013d178a68f969aee4da9de6049f0055e290a808da61af4bd712d7915ac05a04c159db93fab7d994bd0317a471dc0498c2b5c0b8696cf71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/lt/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/lt/thunderbird-45.6.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "2926b5ec95101dc682723a3157de86fcfd9974a7a74486c1d80481145feeb49264bc661621fed4739238e852ca2759dda155a2c22094da90c6d5dcf43107b3d4"; + sha512 = "499a710619b3e9f86fe7e77e35ddbfece5609af92d79b50b697ea8539cd0b198ec88702a7c19a9169cdb2b1dead19fe786d0af16bc6fe2b9f3e0414780a1e1e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/nb-NO/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/nb-NO/thunderbird-45.6.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "cde8fcd4b1cd8202085aa7a04b5781cd561a2d2ad3e1551af420397816addee8d57f4c49036ba79e49bd6f4452107cf8f3acc7c238beca5814ac5522aff2195d"; + sha512 = "d97a5f532a000f3cf44e1b741a3a7026d07bf2c6012b4f6361021b81058aa93876304014d3d8d7181695c526cfd887523e217b7b502c493f5327bb4ba4d00461"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/nl/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/nl/thunderbird-45.6.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "a78658fcd3cd6c9cf5c775d37e5ebb38f72e0317e30abf7dcbd57c0f400355bbe242ae4ae9862eeeccdfe0fe2cdfe6c6b1c06b8bda3010e941041bdeb6a51fab"; + sha512 = "06df0ab52f6a9916bef1605283c7669a1afbe5ce7f6bed5746673ad5ad222034333bb41a6a1d81e87165105e3493d095bc90c5a910cb48041042367972dd9d61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/nn-NO/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/nn-NO/thunderbird-45.6.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "e76bbf55d900e8c7c92e3ad130e58c061685f2abeb2f3ced71e52c36bd0d979eca58cc3a74daa394469281011e7339c15b423847bc43631bd6b3da7f1d4aecd5"; + sha512 = "3509fbcb2955b226d869e43812665c7d2752956f68cff8cd4df3dbb3d0bda2b060218ede3eb9fdae285ed6765ce89c720793f905e09a97d6d22c2e36db890261"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/pa-IN/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/pa-IN/thunderbird-45.6.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "0de6495b746c39e5117f5662b4896b206cb7a4f22a8a8c4f6c080f434b856fdf1f4029c7b8aa9a3372b6bd66d883c26ec82dc2aa17ce89005f462d58b6e3ecea"; + sha512 = "b113f1134df372dd4d369eb9d4c9c30dfe15fc8d65c153ca2087a6ce3ade368554ea2e9561b7d4642f7ec52247071bb323649e884ebd89b8472bc046c1e3be5e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/pl/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/pl/thunderbird-45.6.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "4179561c6fdb2b48a0ab87ac6d823b702181b18c3ca7f28f28a546cd7bbd7453a525e80600a5cebd89912fd69b78d768e136bf12398e5b0471a6fac310fafbe9"; + sha512 = "4ea27afc66451ba40c8cfa22930598925dc18b4b074ab190d8c8866d0f516e9887e8c006ec1564b490a79f67b0b2c88d3fdfa616727e36bf705d780af82a27f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/pt-BR/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/pt-BR/thunderbird-45.6.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "ed1c438050b3e0a22d61f39b9771f22e2425a9b7cca1fc9ae41606f708b32354f5cfe7321f87f3a77dd50270a7e38554215c6f8fbaa0ffbbc1a1c7f01c8c4c6c"; + sha512 = "263ac30d26e20733eb332c6ae6837e3ebe7b8c41ff1cc15e47951f22e89873a620218e9caa2a3cfb74a93e619575a4812b362d4908372fd3ce05406d7ef295d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/pt-PT/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/pt-PT/thunderbird-45.6.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "07b00355b73786d61dfa2cf1752fe42f8c464291f77f8192117414b66ef5f3c627064a608abb18c6938c8a2b1e4dfe223ebeb4f1c4590bb8c80dadb0b77841d7"; + sha512 = "90ed68c12871e11165f9357a1e836fe8cf872bf654303c07e26f1bf30979d756e9fe6f034b4265d8f22fe8d31853ba76a983a8c7fe3759d7793f904f8cd0f788"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/rm/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/rm/thunderbird-45.6.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "b95336e5ae9bf794e35dcf58fb8b4c17c4b4e58b4fd8552d708f15e6d9518640f42599350fcb6f140bac57e7d54d49946ab5c910ed67ac453b0c1c3150a195ed"; + sha512 = "ba6aa5a07a06e57a4241f1e9962f4a28b4221032b8b3220cbfec2f3675f808367c586da0fba987e7d1309bb3bcc4d2ed48ea8ef98a6f4a3e65d4fd9fe06c527d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ro/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ro/thunderbird-45.6.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "8a613cf9fbf8a96ee2b3a6610ad2638f388530601cb7af4bf9c44f73e92f21e97ea3a147887ebcb5080570bf6f7d9c0965e834eec011c646fc57100d8fcb7df1"; + sha512 = "caeecf69a9da3dfeb2c3ef8b0d8733e81e32ac201c0c5b60206160d47172863c91f2a0fddf3e7d2f707918934467c01a0dbbe1f63e3859a7106974b3a5f084a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ru/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ru/thunderbird-45.6.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "e74578096eca86f68e993f620eaf66f220cc577522e73592092b6c63657640cea95d0b41ea035d505580aee258629e2f36e2abca9952372d102bcb0136e995d8"; + sha512 = "22727502ca4dec94470a71456c19ffd7f01b75118480ae67ed4849510bf77c8ec1359ddb0233e41c1b1dbad219ad5111d0b11c6c7ae7258ec10167f27b08f197"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/si/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/si/thunderbird-45.6.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "00666797cc9b4ba2b3ec7c9914639ef5fda3df3c124aaa3255b37f721289f1b2e33a99e6e68d40a66daf96860b21c6af10a68a216b6e3a35d8261ba704be7081"; + sha512 = "b872fb53f0380f77dd4dd87ccde7151db206adaa81801aa907db398df1a51bf3ae65510c452b035cf71c9000dd949106c9d64f44cbde7f1419cc41e403ac6d29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sk/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sk/thunderbird-45.6.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "5ce7dbdf5f9ac2b46c1a27aace9607011dd064de64a778ae39009d9ae6d729da903f5a3c09def1ad7d571a8b717a3f66889053abb38eddfe4146b04597fc2a0c"; + sha512 = "32b1e962e7e4e6aa8d198e080a09b43d21cb307bb8a3af50fc7170748604ce3b6f96b5f59b56b5c0edd61f7af31ccec9446aac50ef9eb94e5ef7a48c71e99541"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sl/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sl/thunderbird-45.6.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "673413e23de2de7daa9c4230105c6e58f21d4ebfc55b1df58c0351448d2f252e128c03ee59ba43525d6c92e2578af4c073e08f6250b4c94bb42beba81ae20f7a"; + sha512 = "c9192435795c677aae642884e773362d17e5afd8e5943e2759d1486e4ca5bddb35be3c99a4b6869aa7018db4bffa09f0b63e500eb26a00cd35c141543eec0a00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sq/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sq/thunderbird-45.6.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "aa560ee3859d3bed0c5d5c4203b05ff47f7357b674c9d4ddad403a5f0c403994ecb982ca15b542ec9a32d0f27a5e04f41c574a1cbdc5f056c8a57e62de778f7b"; + sha512 = "2150abcdded45107ce54ee58f55bbb78f9fdd0fae143fe423e14f4debfa4819c23b021c8d4d36dfe606e206d3dc3deda0671cd08f6d82f7ceca7e7591e7df3a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sr/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sr/thunderbird-45.6.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "5a86b2a9c67d489b21077eda647585291ddea2ea98d678b60fda134e11ee074ee39b06f84d3263d04b43358a10c04d4b238a65e9e3015801847e319850643bd3"; + sha512 = "a9bdf3062d72095d080ad309f25bb8aa27635d3497fd99e6982ae3ba635f61c97e66fe9aefb88466f6f22c6e691692d70abe00c10294353d88fc288111dad6f1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/sv-SE/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/sv-SE/thunderbird-45.6.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "5d044f32243d99ffa8ab0b7345b0ea1a78d83cf6a921af0e89154c4f9f7caa21260f1e3c2c8287050dc44381f2979af51ab028efca7d197310d175dc86aecfcc"; + sha512 = "4353836558baf234d4dd3376a6262ac0af576f16d725c71ec5eb994a72599e748d2334cb916a3050db8f719aa68f2f9d7204aaa4a41ff9da339db933fb64d496"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/ta-LK/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/ta-LK/thunderbird-45.6.0.tar.bz2"; locale = "ta-LK"; arch = "linux-x86_64"; - sha512 = "e8f88dbf82414cf680d9748c606ef73fef11a37bafd82a3cd79b5c5abebedf629993e7ecb3e3d6dcd3524fbda10b8b0af743e2948ac49141c76d008432706c4f"; + sha512 = "9f4c8192c6d683325efcfed3d5ccea7218e2eaf3193ccde00be8542f13e8b3771d2a3690ff212cabaef067452f72061fb47a8184ef16fdf59d687e3b760126a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/tr/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/tr/thunderbird-45.6.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "cc5c84cd0854c0626e6c880e1abf4090f5488c84f39f52d466f2deb871ed55ad9890bf9f4a104c182ec292979eda56e4de114d328deddac5746ec9e969b6ecc6"; + sha512 = "12f567a390f44a79af8615f677b87164d74172f7540ebe6d08023e017576493b0da5a63c466ffc2c3a4c406b0d9e8753e00aaa45dd1acb751621cbb8d9e53415"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/uk/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/uk/thunderbird-45.6.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "42e535767e82c01868d2cd574805c814e7d67caaab9e531d0b82d36df92a2e42e19d8d6593b28c237b645e60035100d85a54b8acaba8c7a48ef83e865553cfc8"; + sha512 = "844e7ee825d304ae19edfbd4c324ba11c2037c9a97fc96f8b99da7fc3ad0137d3106069fdfb06814d2df20a75c6051416b52448ec56980858c70110676294f90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/vi/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/vi/thunderbird-45.6.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "9a5b7cae14bcb8e390f7c8b7924a107058dc382e2627984f8c9eb5f380eb1d38b1152c928a5852d387d5d2b7ef7aa0d7393176a03dec0d3f1c1fade399149b7d"; + sha512 = "35c0fee2083c922284fc11a048150d53a343fe7980160d2c4cf2046e588056457b4e5876dfceb51b79a828886d9671a1934d51079c6d1e64e9af979927d9d8db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/zh-CN/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/zh-CN/thunderbird-45.6.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "d025a3d878c6bf3ae9c1d07c023d89fc83b1c1314179f986fdac46066d334e209689d662bc7fef0fb7bfd7943cc741db5f397188b258ab42247a85c559ac27d7"; + sha512 = "039cb44b4e07fdaf6d9b1eb717baf798b3f3a3cf8726ce97b4fa7ab7e938b9365158597747e406916ae35150c9cf96af74590c5189a64ddfbf65740c1cd45c5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-x86_64/zh-TW/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-x86_64/zh-TW/thunderbird-45.6.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "6c750b1f7f1253f1702178cdc80a1f8962961e16fd1f2e3f2f9d91062785349183e52799a399e60dcf7a3b7208a0755c3d7c137c28ee0b6ac99ccfa75e63b60f"; + sha512 = "4721eed25de2cc71728d7cee651fdf51ef5b791873a3e59df2720c0f46269bf375e0e9456024ca4ec9ca31f8178b5af704e2fa9cb057860fa46b72ff4b22970c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ar/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ar/thunderbird-45.6.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "a2495d8d9a56104b5c5d87e795689d0334563fdb98fa751a2d7bedc9993ba66d3b1cfdc9d0d3711b8c8a2f91d8267c97035d1120051baa4aefcba1b968b9edc8"; + sha512 = "e149770dd3229d3a00e56cd34848afbb1ff6765e66da4fa449156dc58c6990bd35e442ea8c14cf90e63541a34fbcfec8d8714350186e863ded72391b60622c69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ast/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ast/thunderbird-45.6.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "b1ccb4d51d9f5aec0cef3ccb0d5fcd14ca69a446cb18fc8b9f22d98325c0be45ea608f9c9ac15fb33e2b426b84c53e908a05331e360af728e088ad9c3cc77107"; + sha512 = "3bf557b9e9ce9f4b84e3407dfed2fbaaa280893033d4bee0724543b6951e0533050b8feeb0a01b4693140815ced705a5ef16e800d149f967bb39329dcbecb5f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/be/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/be/thunderbird-45.6.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "32d89785e95667d17b7b4d19d37557c7d592370e42613c8c171e1b816d38a16197fdf8397211f61a9261457ea426f6de84af721462e4296c825f931655e64e66"; + sha512 = "ace07c8982b68ed259b344aab73790fc9f90f98f39b65a57c6be7463c3918d545c4a0a6ff6df5b8ef7b7b07ae44c7e69a1bfa84c7cc82b9dd62bba075a2a113c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/bg/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/bg/thunderbird-45.6.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "b5d2ed68959cc6a473e83db35634c6322f4638edae1a19f81d5ae1ab0080aed0940b751e96d3d3a562aa1811ca3c5435f2f3b0a205948f06c2d479cd98109e88"; + sha512 = "fed2ed25fe530939c4116daa3a3a09075812b005a937c36cab385bfb867d703a84feef50e2006f83009a25c0736c9b032c17605b2364d8fde4799d1e9f479b8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/bn-BD/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/bn-BD/thunderbird-45.6.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "a76fb786e1cb0485b4e212097685fa259ff76386bce3cbbec1d47e061c7116df76adb8bf419e51ade098fdb9b55a7aad5348e13917104d22a0aa39518205ca47"; + sha512 = "84190d0cc6884f14ccf4ce06dbd69193f90591becd5d8064ea89c7ec12ec411bf766bff1bc5d5c6f142fa53ed2b9ce494718f7d32a74a027819de32381b24526"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/br/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/br/thunderbird-45.6.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "51c1402350cec63a60f4ea96cdaedb1aa74250583a3cfed575060fb5990294446a8254108fcbd99607a286b8bde43357ccc8e0195330352d1497b8c173a7b283"; + sha512 = "619857fadb8721ccf103a3739a1336e2cafbfa62a0a2ab074254481d50f0d301f7718d47b5a3d42922fa562f1382de2aa8b5256bc62d829400926a494bc19403"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ca/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ca/thunderbird-45.6.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "1df09781962fdfc7abc425f9f96d2efcc7471bb9bb8cf2c0152846673c7fbfc86b6b4c05d73d3c949607d056478661be0e0d24b769f816820d1e4670fdf240f7"; + sha512 = "3314b1129be6ce854a6b028849167af5f93c289073f962f5de09eb37fc7a2c40eb75b8b361289c879c4b7f752170f05a01dc6ae996bba4a5b706c1deb037cfc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/cs/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/cs/thunderbird-45.6.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "463f336f49ababdb13397a10db3b189e3d364b07f9f42a4d31e770edd846c56fdb81f79228ffa51ab7f6555818bc3a0a3e5f1e546727bb3cd81f95f2264c392d"; + sha512 = "07d21c5f4aef38b9f7b330bf0c06f10ba3fc7cfeedcdd45e45ffb9ad4e5b1f729cb5d249028a87a8ce122da96c240447a6eed4be2220e302a2c55ac39cb1628a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/cy/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/cy/thunderbird-45.6.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "8a4802763162dd32577e02f878482094b3bae4c51b9ac7c109d188c8b5ab9fd0053c34eb2fabaed873e0ba9e7f5fac2ebe6604a0da00b806594e28fd0f823721"; + sha512 = "b2f86ed9ebfd8124611f6d9e20cf36322e36cecc2fea688649b9f6df231d65ed4cad192e12b7a27367b3b7706e510c5547c5bb22aedab76d420540cea9b81ee5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/da/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/da/thunderbird-45.6.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "bc430839b463ee22e4d1736be48f8f9e958307c3069b337b0ad816e3f88274b22b98ce66fec267f4ed134750fed656b1ebad0bce29637594d053bd82d1be3d34"; + sha512 = "00ef125afcb33ebd5f11b765c9c3ea9e3e240e3416d00012cbf1b82377f8d610ab2b4aac800d7a0ae0f443447840b35d92e58600d83dfb6c6dd76e8ecabd3924"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/de/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/de/thunderbird-45.6.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "0a9ac8af9a823d69c8b2671f24bb203239a888d1423656241926dc5fa978e989ca5df303211e4a5208624d01ba34dd93915463eb88b0ee8ed027dad592a057c0"; + sha512 = "05e1cae57b9a2e2fb274c2efc130e596c5f6c35ce14055156f728a662e9f8f5423a42708629726e0a70e3420aeb1d9b3b224c019cbbaa6f4a0cee69f78c740ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/dsb/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/dsb/thunderbird-45.6.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "9f089cc93ed4660250ebb0d4c677d36515d9dbf29f78947c88558c69362663fffff293fbb3acaf4fca2e40a88d093d7637e385db757812cad29c31b6b746e87c"; + sha512 = "dd0dadb02dd11dc9c39c6aa67eb995b786fdec47e966cb79177bde56400300b214ba90509a50ad839b36908da18829eb02431a4e1cae3e878dcb3debed258bc1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/el/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/el/thunderbird-45.6.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "1099c8443c089ac7f430023960802ab2ce914f103983d68dd283f0f1bb7d36ff8b35e44b7e766237cf19e9c6f02e5dbbab5f62e4cfdd8b80816d0892779732bd"; + sha512 = "12fc5fe4fb9fcccc295cd05c46850dab1ebfa81e0fc1ea073c493ef7c8db73e2c96999e9b1a29cda8f8cfa5437920f8a6b88d3b6911fd88dfde2673563e2afc1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/en-GB/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/en-GB/thunderbird-45.6.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "1efadd60994808919b24214c1610dccda0a76bf0de6cf3518b6eb665d035272f1a2e5e4e9e09fc2d4eb5a7021bdfaf3c3391e166737824355bb859b1d3fa54b8"; + sha512 = "0e195cd68923d8b8bedb4028d17b08d029eecc82d0b40de575b55d573dda6227684043cf50c959c790746a6b38089e02cc996cc8a23cb31011c6fe4c3fd2ae89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/en-US/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/en-US/thunderbird-45.6.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "663ff453dfc556bd85633030e271174d96f039d8ea77bb1a338df02298feaea297ca7b4010d9c2973d19ba988b6e2b807486ca40f69bbfce84d0b7f8b21f7c32"; + sha512 = "d3ceea1ef1e3562d682882b14f518f917143e4c4417ac07e8a474c52a57ccf0169fe1580355dcda0710e03c67b46eeb78fd59b31b831b8f431ef1a0cd9a37c2e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/es-AR/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/es-AR/thunderbird-45.6.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "34fbd5a614ef5a0b9c46b63c80292dfe7caf2f65758a52d130ad4567311cde3e84ca1ab41d5fa87509b5ad9c6ce4ab136a4c08f1977b3695e5471265a758bd7d"; + sha512 = "19a3703f4f3fc5ce82ac8f69468fabb494ff663ed0b507af4a7cb74fcfefc5eb7e8090771392a800cbec88897c9c00315b457289eb1be860e1b47dff2f25a5d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/es-ES/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/es-ES/thunderbird-45.6.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "e429e936f7d022b421c995ea8df18d72a3abf8a9dd2a0a6ae87435333c94a8abdcfa3c2416e36f883b1d2b5f573a17d8a38161fed5ff323767fc25756dc72d69"; + sha512 = "706987651522f9c843c8771a4e58c474661da8a45104e1dfdd1b72be74c3a43d9eaaf4f9eb3661718c4237515afc90272c535579d0db1fa3715a29d03bef36af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/et/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/et/thunderbird-45.6.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "3ec9056dc49cbc6b7734498ab5522fef93eeb6f08668cd04bb610bf0d2519759c614de07562706a3efc2b5e64325a70c04b18fb3138c2ce3cabe6ba1a51bdde5"; + sha512 = "3ec0d0fa4ab85a3ce958b8c637e4d208f803e861f3b544d3f15a79ac1e1704efa963eb127f1687cbe5f4e75926bf1731bd9fd781a6e7fdda07035766eba8d39d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/eu/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/eu/thunderbird-45.6.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "951a9fcb82f77cb45a5ccaf300d0516da7d1be069931fde87e729b9c9d99a0a07ee810a4bf4791698741ff52128f66d6ecc3d8c7887cf22462006929c582cacf"; + sha512 = "54eaeebfce0f0c805954be911c3ac666993d9bf927ccdb01ce0f322524451523ccb7d6d8fee473eebd9cac14d6653655de8f0e6861f8d4fb0953658cd808b74e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/fi/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/fi/thunderbird-45.6.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "e28371194085e689d6445ce3a0de77c7b8127aeb740769ff2aaa8f0345cfbc7b3e8ad5f2d891c8ca34c2fa004cfcaace649b900248493e5c6ac4404b6f581e19"; + sha512 = "51d09e9b7ecbf4891ceee5fde9fe00ce2ac9cbf4a2fc0a3f1433e7004677d6fc35067734c3f0506362b346953423f71844937c1187db9194ebe952adad1abef6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/fr/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/fr/thunderbird-45.6.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "f135ff1b365df65cc9fab35941628be6f6264d2c91d8394d22fc35e945207640c8238cf2e0046598348d7521c1684eccdae0d7f0dc2bb22f415a862cad72d67a"; + sha512 = "0c3b9635cf107cdfb91c4cdc4771c25b112fd7d87341c88259a5670c5fa716e105cb910b1b6b85d8c22d518abba5a538f87250c8bb34c71df4cb98bf7026f8be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/fy-NL/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/fy-NL/thunderbird-45.6.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "c90579ec9607992f4e551d327a3122d6bfd87ef3f1fb4708579c1a07deb2270a252c7443f3a3551bb725ef46a8cd9fa61cf59910260f9775eb8805e5e8acd61e"; + sha512 = "45adb1b96d4d57c5302ca373f193b5a7e0a9f8577fabcb37c184bc8aaa66cdd4b0136e810af0ca8f1a7727fd51d60ee1006f6dc3e5fd182ff45056fc923d7d13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ga-IE/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ga-IE/thunderbird-45.6.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "a6a9f52acd576b615075f8829cff2ed085e7254e8a4a2380c0eb088cba1986ac81f9d0badecbf0ece1f7ba7b7b169c8cda23fb32a9e79fa78d29fe8c0cb4c8de"; + sha512 = "4c3453566e747b57f94ef980a7d9b4d2a1c5b78584b0bcf1eea4d8c6b26ca177f18cf94811e5301a12e7de8939a11bbebe202683449b367f29a391a94d020cb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/gd/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/gd/thunderbird-45.6.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "12edcfd67dbc5d093d1c22eb707668e4f534a6baf96986e436684c9271d165fb2f422a2e84ef35b72063f1a91100230c92df2b08aee428ea0b384d6658f6bcb3"; + sha512 = "ba0f0ee9c8a2a64c414e1621c8d5ce47194ef144f026e3306cf2c81d214fd0e1df541fea11dfdc2de7629cdc8ba2a4aaccb16dc7cc0c3404925177b893ca5d73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/gl/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/gl/thunderbird-45.6.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "d357cc4f8a9ba8ff47458b03d17e4d10dc7be8bb16493ac3e896f63a3229962034012c7ecda4a70d4dd1d9c4aa76c349bf21725c6164fc96e6fc36f9b0fea9ea"; + sha512 = "f1d948b366842bfc2fd349ccae3c6c9f586fd69e99f0a0f9804bf3bff25ce6262451513952ad30f128626bffd6f9719d377868fb7d2fa56d8b6f54b2f4751ea8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/he/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/he/thunderbird-45.6.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "440a86fb6a94657f05eda2bde2a2e74d17398468a0b603866a03a7f37458e69a921e81d2ac1af2718f1168a56ee03ad596c39e8d88c933576efecb99a724957e"; + sha512 = "1e0f048b272b4927d19f66390577ae2a37a32dadc24e36a7cdfd48e4257db09f5433c2812429c1700a5fa1f3630deb3c43db316de921d8e9be58f41388d2502d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/hr/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/hr/thunderbird-45.6.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "1b5960e4df8a6247c63fb3f5e80b1795b4e098f446debd96b6344dbf97694337d6437dad53635fac57036ed6551b8a780ca4880dc35626aee83860a5934f3f9f"; + sha512 = "a821b66d67f32c84d0bf4172fb82ee487c13703122821042b00739890777573288c31c5178f4dfb6fce587eb58a19eaccd6f23b4b8f3d851fc203293674fb510"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/hsb/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/hsb/thunderbird-45.6.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "bba6aa43cfee2422414c526f0c40fdc70984acb54e25e5eb75ef684e674b17a8dbf606e31d5d609bd572647ab3a9bbd78c76669156a1d2d4d45d8402650148b5"; + sha512 = "c756ae475fc1964ae915a68313411ec8ab4a7d4744685de2ffeaaae33d58fcc08712657a2f030b1b358d02d9653c26478515ecbd915881e33cdaca9d9842fb38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/hu/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/hu/thunderbird-45.6.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "026a686dbe81a4c52bd3997de66e0919ea870954a3d14c4483f5f76f618424013b82a2478ec9eb3f506a1f666ef3333832a3e4533adcce41901db79120d2a454"; + sha512 = "d2f68c86f57fb9351c5c2ba74a8976bc89810634dbf5a521c34a553ccb6ff27eaf66fdc92e50c0f226246e9fc25316d4305feea1c3801513f418f58dff1955bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/hy-AM/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/hy-AM/thunderbird-45.6.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "a798c9581cdb2debbe773ed952bbc56f7d7444eac5a448fce0f17ba2b260405526cdcec306c39c39b2e80ce7addba810bc659312505af8c0a928c8a2f8107245"; + sha512 = "42ad523ad7f30638a69d8d549491af06ab9f740f8eb0b81e681236a09ce39de3758e2af61f2857293d085603f3530df3edaa23c19a014034528d3d130517fcef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/id/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/id/thunderbird-45.6.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "ce54045626941976435a94bc5cf7513b79bc4e3e6a3b03bf1036ce9433cc6042689735b95d60afc4bf1de2ea31fe0ebc55b856bb51f0ba468744931a8c0727fa"; + sha512 = "42a023e474e440b8201dbe5caaa7354546f89d5e4e9fcd34152dae93349bab8872f6060e5029fa629fd9853999ecf08688e51a2d9a16400265bc5c61a9abf783"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/is/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/is/thunderbird-45.6.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "7e0a2c31968102010d1fba379a25c4bcbbf447f2a0005e01271faf1e19dc7e71a5f8cfcfbf36ed510743d53886864aa4164284e99f7ab86ac27629ffaca6000a"; + sha512 = "6fe784f65ee584a1fb9fdc962be412e09ff43e88afa29365ddabf6a237ae7a1c854c05d5e3b3bbef83653fae94646c7a32144c2f7907304573b5f71e5f978ac9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/it/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/it/thunderbird-45.6.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "4852e13d1be422f107e18537bb364b04fb06fbb4854bb30f97753b0e0138ca2d9073e29c4b5905154fcd215701b300c0680025310479c6dca4294e3a591ff841"; + sha512 = "dae36c69bfa5cc80ad9489c76acdc6094f5fcd2c41f8c2f5dcd5d8d103aca564daaa96b27426f8096aaf555b6786f7d2c2227cbf1096d7eae53285b337d8221c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ja/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ja/thunderbird-45.6.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "c539473ab434e20528f252f76f542f1938accde06b7d460b8e4a767a2721cded73710cca2264d2b18cd533a6118dfa9ae1c2701a6e1b18afe398f42a109439e9"; + sha512 = "c33ba443ee0556b28b60ba4517913d54a931cc2b63339262b35a1d576166e9abe1e7f6297f11683397a13f5c7b71cd96f97e60ad1a956aa27ba9fbd7f0c5fb43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ko/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ko/thunderbird-45.6.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "59421684c74f6c9fce41c4769ef725445bc84224357db21f1f4c9f5154c695a337445bfa05fca1f045d0e05ce64faf2d2e5a9be8cac0d62dfa17bf1571f9db57"; + sha512 = "0587a7bb7218b16c859717e99a3fd96e697b3a32dd322361edfbaf0b069522914e84b74160466d3b25fac76d925af485b9688fb5a3e072f1eff94dabb0239669"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/lt/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/lt/thunderbird-45.6.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "317315c0c436ddf882ac2d5a5c76a942f0fe04f80c1d7634ff7223b363b5fedd0778b127e1cbe21e737acdb869e770b9c828a9df075eb19f4d4870767297b912"; + sha512 = "0789f1357a0c2a61fa676c9c375c79c29e78c3b3bf8faa2a392ec90714e1e581bd07eb75628284e6873c66553c613e7b43a18532a01cc66510f0bdcbef5f5b83"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/nb-NO/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/nb-NO/thunderbird-45.6.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "36638e01b76b608c2af0dd6f6336877fab6e0c8b8d16c5f90095c0bb24d475bf5486782fc26061dea134e7817288d84b8b805351411b7e70f39f3a76c9354b92"; + sha512 = "906ebc96274cc490b82b434f648ba33f16a4f2b641e99142fcf18cd24701ed0b4b34558b2b380a0ff1d4ebe253ffd99d6b2cf4b9cf059a3f071c9e3bee94dd0b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/nl/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/nl/thunderbird-45.6.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "03aa22ab612c39e9a7df2a346a338b70c6ee13802860ab9359322e6fae425c1f8416cab762b9e061e3d8b34417043c3979e49a5c7079bc8327c0a317e5b98abf"; + sha512 = "d18b521eddf0e71cecb33473275bb44038717cefadddc648441b0d4c7a01aaa08e45fad28e3eb74e8d01d1a637db1ef4d999d45a83c2fcb3aa3e7430b73b666f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/nn-NO/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/nn-NO/thunderbird-45.6.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "4594fdc88d66a61567652f4ef7fbf43b55853933f098526671801e0fcd6256367e71c5a179419b1015d410b49a26505879ba0397013c8b510a2462798e5b3821"; + sha512 = "66f7b07352f7a6064d3a805d8d348ae4956240b42359a2d3fbd1d96291a025e1f4920ddcb0cd9312e1d8f146fcceae4e0d9811a9e6ae43479307aa204d8de8d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/pa-IN/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/pa-IN/thunderbird-45.6.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "590b974b9785db9843b35dfdd9aa9d8422379570b6511a02564d5a0edbaeafad38f99aba403cb996ed47416a9944ca7fcc74d8aacda74c8113de7f112b10f397"; + sha512 = "828e57876a063979f945d0cee371b57e43d2f26eba4723a8983b448b85a091a303da068f17ba73f1eb23b35e06d9b3a37b56d9a3be49c202c950d2bd2ed9db05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/pl/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/pl/thunderbird-45.6.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "f03e723aebf1c7709a0f08b9416acef98b5e4082b981fae3276d26e3c11650153cc56fd8f96653eb9d2b5213f5ccc42e062b42cf6182dc910c56a24f07440102"; + sha512 = "6ca824649b5f030423213dd573018af5b6a8033fa86b6b23c5b99e59afdd5234cd2c7a8237124dabbf75175511afff980dd3d971f59967c3522b633680d7277a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/pt-BR/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/pt-BR/thunderbird-45.6.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "906510719e6d7149fe2c8cee9d5a88ae0a86cbd4bb6e2c4ec0bc4d77b252f71b98939f4002dab69a24db75d022e485d1711350ca1f26b3b55b05701dfff6f9da"; + sha512 = "399dc86d31375ea3af21e6032b686ffdec65a3c0ca403d95bc89e0e7715e6c998dc846057ff4a6b919fda794a9fdabb53eafd7a07d8894a65e1109c9c52e43d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/pt-PT/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/pt-PT/thunderbird-45.6.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "1ed53b8ac706dc2750276928b507c072e3b2e49f7df2ab6d382b31b0618da6e41ce3fcf50f7815b4736859fe899017ea4a646f4594f4ac7ef5c272ccdd6d69a7"; + sha512 = "f758fb69c99c02fe1bcab8c9a4b02eeebcc190c30e73f4b009521c36956cc7f076e1f544181a332807bee93ec39d7d170cca3f0d87fc6ed89b60a4515c394749"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/rm/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/rm/thunderbird-45.6.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "6fa680229b2dadfe6984af37d1ec93ef9d5f2d9014bc62618690c2e71a6bf8bd7d945fb0312553f0f2858fee89b454b84375a65fbb90f8479d1812d838ef1109"; + sha512 = "d338c243cbfa41e5b54195923bc12876e45683271df477d492058973dbc0f7352d59863a3bde571ab001612b8ce5704512f1bc0ad1e8af066f7aa448b5c89f0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ro/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ro/thunderbird-45.6.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "102b3a1c23742bf9fad04c1d87a43cf4b6f805b93528ec7139d5b3eecf141990594f32c2c89a7a950aa4257801ec2e5aa91ca6fcf2e1a067978f47cec500f6b3"; + sha512 = "2c011b2cef9c5761c1297b2cc2dcd442ae9fd8d0f28d0f469aa2abbd6da80fe11bd607df8fb224ff03bd21932bdd40591532722756c467b498313da0f639c3fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ru/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ru/thunderbird-45.6.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "6d2a1bb3db76516f1011b701827b43e66099a50d575facd3b5be9718be21d4b7ef80feba091e4273960af8f56f416514c2d308877b039be06898bb50365e9e27"; + sha512 = "90fe536806f6e2ec20c470c72812ff8e54af58499ba220f9b6a5b6043c3a6072c78dc834c4204ca4e1f9d5ab71093296c958fe12409e50435136903f3ea3d544"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/si/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/si/thunderbird-45.6.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "9900c9462c97d7e783dc9893a4a6f87a0e000866ddb3dffefd67548b30ffa4e9db8a2e93247027a45aae03c9d0bac305991a1684de17e8bd28f3c2d3e5a38309"; + sha512 = "36fed4f969775870a3e224aef66b36d8b8f1adec2471b4b45d75c52318b9481bdd81a9f583589b4c5450045e4a8abff91f3fb9083f4bafd237c742015626291f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sk/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sk/thunderbird-45.6.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "ca001243f8359c38b781fea53c3ede7baabea25af516d852e75b6beaca9ea1b9ce4964c345ff5754657a1a953a18bef2c631e962d92f699e2dc5a31a9d594d39"; + sha512 = "e89ac23a25ae446f69e9c31478cc844253ba57de01893bd12b6b2bbe0e599fa09bf1506e9cfcbeab506998d81bc170fe1cff2d0e9aa13411299a5441d40d8959"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sl/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sl/thunderbird-45.6.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "ff9784d31a9233c925d1745752497cbe055df378b702169ed4cf1df144b00936566d9dbef4ae5ed9821933e70bec3ef71de4086b0a89f639df2bd57e1796ef3c"; + sha512 = "6a74cc252d64d6d11a98af51e8fffc8a4bba8c74e2647afee9cfaae55ffcabe7ef9d82ee95a1a4d169fc057025c84f1253f455c6bd5e8f5fb9e33d7372c96a01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sq/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sq/thunderbird-45.6.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "f2e3bccba1c8ad67d696e54e2001726cabe6f61e41daaa9dab2eee00cac7877a8af15c4876993ebed6042fe540c68b25fcee52888a6bd5ad6726875bb4489e05"; + sha512 = "2ab4b18e5560eb495093aa0e5867f6e91148fe1cf7123f50306cb19b646b0834cde8cbd449df46f7e12b597465ee69910ad386e9920e26cdadc2085ca92e7af9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sr/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sr/thunderbird-45.6.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "9739c33d30b7e6d6c28fc29f8f1badb06d32ae686fc684ec6743a5ffc4ba42d6060ba95c2bd1e3c2486c4d36ee0f14a1201f74768197073136991e49acec79ff"; + sha512 = "dc23ac3a9c3fc8b0105bdac2b14f24a0cd76b7f6c3bcd3994d979ef2db44a9f11bc2e5648148bd45008ea832261399898737b39727c0a61a03b8315aeede6bde"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/sv-SE/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/sv-SE/thunderbird-45.6.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "e394654340d4f2da306149ed7cf0413ac0d40fb1488402e12e15c09c831585ecfcf6c355b420a902d76ec0aea7a5c9e234004f1ee19ed295d7b52343ab67c9a6"; + sha512 = "ebcac4ddcb84291613eeb64289e1f9f374a6085eb587df3cffc906dd7d7950f7564be1aed17c794d37f415840459b82c0c6edebefab2d8ba6f3e34c20426757a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/ta-LK/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/ta-LK/thunderbird-45.6.0.tar.bz2"; locale = "ta-LK"; arch = "linux-i686"; - sha512 = "08154b5030c58cb52ef6b6584fc3d20d62e02cc0ee919f37c3a2e97f5afdac777f9dc6dd5881e3a87e5c20dfefdf816c068da014e42e111a3a8c7043b6e9002a"; + sha512 = "b164c7e70aa313517ecd85828a3734113f504f7e86ae615a24465a4334f41197af42b181f1f0048782d841422c3847eff1b8868450d190e362a36ffb5d1f2b6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/tr/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/tr/thunderbird-45.6.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "63bcbce3c8f6e635cbfc73f83b33c6c6e9fd5f45f8878aa500772f807f1acdf611dcf4002084902937f95cd1abab1a76e00822327235e7b61ffb369b327974de"; + sha512 = "6c3d65c4c277382961238e491f90e0f33a265614614428f2abeeb3779cc3b23b068d8ddf7f4a7c98a4c7497b22df79b3ba16ef0191b9cfb752aa24316d4fb8e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/uk/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/uk/thunderbird-45.6.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "c55ae7ae3e388ec11d8c9bbeb3f18fa5883a5ea5b90d924e5f9a7d61876142a7b336eb50d35e54a405cee803ab7ad4d754a7ceb02cb9a2b9adeb415c44bd0c88"; + sha512 = "6754bead8887f244c6d87a6c76f45247933fae42fc74240c453bbef8acfa7a85ba282db4185c1fb6ec9e93115e3d9e4ac0ee113c00db9634f26a4eec6f79ea6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/vi/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/vi/thunderbird-45.6.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "52e05acb6c681ba62b608cb60d24816aaa35f296b6552b7006fe56b2f2d908a71736490c85e8bfb350d468510a031deedad65f691e4b77fc1dfee26bd30bdb41"; + sha512 = "34110501557ea23c1c854fbba9e6c043e25634f5993f34197b8d5842ee88d4717c87a0a8fe326a35dd12e74fcfbf9ddb0b6e7db0b09a058d710680e37cd5b939"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/zh-CN/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/zh-CN/thunderbird-45.6.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "caa4533f57b85ed57ef66fe4807f8079d8bef73ad9a454e23a90154253c205a110e13fe1376c0a7d644b326f7dde888d8ed97ffedb8282d8887bb7131749f510"; + sha512 = "493073bee16e9e22db0d3c2700f13f1304129c28528a80fb9a548afbabaaa147b7ac46a254cc3b05619d47e94e61c29ff7cc80618c8af09b3659e6c91883c017"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.5.1/linux-i686/zh-TW/thunderbird-45.5.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/45.6.0/linux-i686/zh-TW/thunderbird-45.6.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "d3e44f2f92ec4bf6b4a5dfebbcd2f05b323050ff88a1eb3b19301224a6815051e0e884e663dde834cef0a6889217ae94e446669aa0c97201c2d1f1bc2729c1b3"; + sha512 = "7ac66a0ee967e7f87d084acda72120c65bb64c2572f42249b97baf9755b0b7dc314a1d88049941a7be86846f98f236cdfe54b87b22ff7f66b6099397788373b2"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index fb78c3cca24..5f1483672b2 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -4,6 +4,7 @@ , yasm, mesa, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx , cairo, gstreamer, gst_plugins_base, icu +, writeScript, xidel, coreutils, gnused, gnugrep, curl, ed , debugBuild ? false , # If you want the resulting program to call itself "Thunderbird" # instead of "Earlybird", enable this option. However, those @@ -13,7 +14,7 @@ enableOfficialBranding ? false }: -let version = "45.5.1"; in +let version = "45.6.0"; in let verName = "${version}"; in stdenv.mkDerivation rec { @@ -21,9 +22,16 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.xz"; - sha512 = "f6dc5f526e50facb9947627fcbc8db222cc20438fa62c552090dcabeabcc31dba2c66c20345090deaf5b58fd42b54938935eb1b3904528dce5949fd4cfc1ceb7"; + sha512 = "1f4579ac37b8ab98c91fe2e3e6742ba1b005ca9346d23f467d19e6af45eb457cab749bf91ed2a79f2058bd66f54da661da3ea5d5786f8c4b472d8a2a6c34db4b"; }; + # New sed no longer tolerates this mistake. + postPatch = '' + for f in mozilla/{js/src,}/configure; do + substituteInPlace "$f" --replace '[:space:]*' '[[:space:]]*' + done + ''; + buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx [ pkgconfig which libpng gtk2 perl zip libIDL libjpeg zlib bzip2 python2 dbus dbus_glib pango freetype fontconfig xorg.libXi @@ -128,4 +136,12 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.pierron maintainers.eelco ]; platforms = platforms.linux; }; + + passthru.updateScript = import ./../../browsers/firefox/update.nix { + name = "thunderbird"; + sourceSectionRegex = "."; + basePath = "pkgs/applications/networking/mailreaders/thunderbird"; + baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; + inherit writeScript xidel coreutils gnused gnugrep curl ed; + }; } diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index b85970df4b4..12692b9566f 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -1,6 +1,9 @@ { stdenv, fetchurl, pkgconfig, intltool, file, makeWrapper , openssl, curl, libevent, inotify-tools, systemd, zlib , enableGTK3 ? false, gtk3 +, enableSystemd ? stdenv.isLinux +, enableDaemon ? true +, enableCli ? true }: let @@ -17,18 +20,24 @@ stdenv.mkDerivation rec { sha256 = "0pykmhi7pdmzq47glbj8i2im6iarp4wnj4l1pyvsrnba61f0939s"; }; - buildInputs = [ pkgconfig intltool file openssl curl libevent inotify-tools zlib ] + buildInputs = [ pkgconfig intltool file openssl curl libevent zlib ] ++ optionals enableGTK3 [ gtk3 makeWrapper ] - ++ optional stdenv.isLinux systemd; + ++ optionals enableSystemd [ systemd ] + ++ optionals stdenv.isLinux [ inotify-tools ]; postPatch = '' substituteInPlace ./configure \ --replace "libsystemd-daemon" "libsystemd" \ - --replace "/usr/bin/file" "${file}/bin/file" + --replace "/usr/bin/file" "${file}/bin/file" \ + --replace "test ! -d /Developer/SDKs/MacOSX10.5.sdk" "false" ''; - configureFlags = [ "--with-systemd-daemon" ] - ++ [ "--enable-cli" ] + configureFlags = [ + ("--enable-cli=" + (if enableCli then "yes" else "no")) + ("--enable-daemon=" + (if enableDaemon then "yes" else "no")) + "--disable-mac" # requires xcodebuild + ] + ++ optional enableSystemd "--with-systemd-daemon" ++ optional enableGTK3 "--with-gtk"; preFixup = optionalString enableGTK3 /* gsettings schemas for file dialogues */ '' @@ -37,6 +46,8 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; + NIX_LDFLAGS = optionalString stdenv.isDarwin "-framework CoreFoundation"; + meta = with stdenv.lib; { description = "A fast, easy and free BitTorrent client"; longDescription = '' @@ -53,7 +64,7 @@ stdenv.mkDerivation rec { homepage = http://www.transmissionbt.com/; license = licenses.gpl2; # parts are under MIT maintainers = with maintainers; [ astsmtl vcunat wizeman ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 2b157604f48..ec31beb0080 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -4,11 +4,14 @@ , pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon , libsecret, spice_protocol, spice_gtk, epoxy, at_spi2_core -, openssl }: +, openssl, gsettings_desktop_schemas +# The themes here are soft dependencies; only icons are missing without them. +, hicolor_icon_theme, adwaita-icon-theme +}: let version = "1.2.0-rcgit.15"; - + desktopItem = makeDesktopItem { name = "remmina"; desktopName = "Remmina"; @@ -45,13 +48,13 @@ stdenv.mkDerivation { sha256 = "07lj6a7x9cqcff18pwfkx8c8iml015zp6sq29dfcxpfg4ai578h0"; }; - buildInputs = [ cmake pkgconfig wrapGAppsHook + buildInputs = [ cmake pkgconfig wrapGAppsHook gsettings_desktop_schemas glib gtk3 gettext libxkbfile libgnome_keyring libX11 freerdp_git libssh libgcrypt gnutls pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon libsecret spice_protocol spice_gtk epoxy at_spi2_core - openssl ]; + openssl hicolor_icon_theme adwaita-icon-theme ]; cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF -DWINPR_INCLUDE_DIR=${freerdp_git}/include/winpr2"; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index dc10b8d2ec8..adbadba411c 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "rclone-${version}"; - version = "1.33"; + version = "1.35"; goPackagePath = "github.com/ncw/rclone"; @@ -10,16 +10,14 @@ buildGoPackage rec { owner = "ncw"; repo = "rclone"; rev = "v${version}"; - sha256 = "00y48ww40x73xpdvkzfhllwvbh9a2ffmmkc6ri9343wvmb53laqk"; + sha256 = "15dmppb7qgr3vg76dsv770l51lmsl8n8k3rvbnhhks5a2cz0kf2i"; }; - goDeps = ./deps.nix; - - meta = { + meta = with stdenv.lib; { description = "Command line program to sync files and directories to and from major cloud storage"; homepage = "http://rclone.org"; - license = stdenv.lib.licenses.mit; - maintainers = [ ]; - platforms = stdenv.lib.platforms.all; + license = licenses.mit; + maintainers = with maintainers; [ danielfullmer ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/sync/rclone/deps.nix b/pkgs/applications/networking/sync/rclone/deps.nix deleted file mode 100644 index 4fd802f66c0..00000000000 --- a/pkgs/applications/networking/sync/rclone/deps.nix +++ /dev/null @@ -1,219 +0,0 @@ -# This file was generated by go2nix. -[ - { - goPackagePath = "bazil.org/fuse"; - fetch = { - type = "git"; - url = "https://github.com/bazil/fuse"; - rev = "371fbbdaa8987b715bdd21d6adc4c9b20155f748"; - sha256 = "1x5p301py7mcxgwklfm6pqqkzssln0nfzllng49pnk60m03ilp4w"; - }; - } - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "90296fd601ebfc594192e722a022663b0c3f8756"; - sha256 = "0qg0d1afhqmpfaq2lh29c87d18s5148yshg0s295dhzdn1m9nhww"; - }; - } - { - goPackagePath = "github.com/Unknwon/goconfig"; - fetch = { - type = "git"; - url = "https://github.com/Unknwon/goconfig"; - rev = "5aa4f8cd5a472c2411c778b4680f59f2223f1966"; - sha256 = "0r6na17sz762c1dyn6gb16v2zhvzg6krmz7pcjg1m0l5wxdf4n0d"; - }; - } - { - goPackagePath = "github.com/VividCortex/ewma"; - fetch = { - type = "git"; - url = "https://github.com/VividCortex/ewma"; - rev = "c595cd886c223c6c28fc9ae2727a61b5e4693d85"; - sha256 = "0f09886vm4rkhgqqh2b20r8rws4syvny3la107hh6qby027bpab2"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "13a12060f716145019378a10e2806c174356b857"; - sha256 = "09yl85kk2y4ayk44af5rbnkq4vy82vbh2z5ac4vpl2vgv7zyh46h"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa"; - sha256 = "1rm3zjrmfpzy0l3qp02xmd5pqzl77pdql9pbxhl0k1qw2vfzrjv6"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "9235644dd9e52eeae6fa48efd539fdc351a0af53"; - sha256 = "0q398679fwp7vlnpd2rlzz452a7a4qvpcspak81psfl3xwimpzgq"; - }; - } - { - goPackagePath = "github.com/mreiferson/go-httpclient"; - fetch = { - type = "git"; - url = "https://github.com/mreiferson/go-httpclient"; - rev = "31f0106b4474f14bc441575c19d3a5fa21aa1f6c"; - sha256 = "1iz95p7fl43smyh1lzjnwk6gq9y7q15m2qdkf0f4kxf3x5731v9i"; - }; - } - { - goPackagePath = "github.com/ncw/go-acd"; - fetch = { - type = "git"; - url = "https://github.com/ncw/go-acd"; - rev = "56da839497f9854a91f99fe752c33c7977a6f48b"; - sha256 = "1va6hpl73ps443r0s2icplcx113gkhmi2gbsgpaw2iii5lji5085"; - }; - } - { - goPackagePath = "github.com/ncw/swift"; - fetch = { - type = "git"; - url = "https://github.com/ncw/swift"; - rev = "b964f2ca856aac39885e258ad25aec08d5f64ee6"; - sha256 = "0c86ap1zb56r6g96cnbn5j3i3r96c5l8rl98h3sxlqi5agwp3km4"; - }; - } - { - goPackagePath = "github.com/ogier/pflag"; - fetch = { - type = "git"; - url = "https://github.com/ogier/pflag"; - rev = "45c278ab3607870051a2ea9040bb85fcb8557481"; - sha256 = "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/rfjakob/eme"; - fetch = { - type = "git"; - url = "https://github.com/rfjakob/eme"; - rev = "601d0e278ceda9aa2085a61c9265f6e690ef5255"; - sha256 = "1ryh5f2a42psrqcpjh73shk3p0mva2vcyyfav4nhxmfqall77k5z"; - }; - } - { - goPackagePath = "github.com/skratchdot/open-golang"; - fetch = { - type = "git"; - url = "https://github.com/skratchdot/open-golang"; - rev = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c"; - sha256 = "1b67imqbsdvg19vif1q1dfmapxy3v2anagacbql95fwnnw0v8jga"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744"; - sha256 = "02bgp0yy9bi05k2in9axqi3db1c6mjffdsmki51pn9iryxz4zkh3"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "c7e63cf4530bcd3ba943729cee0efeff2ebea63f"; - sha256 = "197mlkgb01zk86fxfl8r8maymcxsspqblg7hmngjxf7ivdid1i1l"; - }; - } - { - goPackagePath = "github.com/stacktic/dropbox"; - fetch = { - type = "git"; - url = "https://github.com/stacktic/dropbox"; - rev = "58f839b21094d5e0af7caf613599830589233d20"; - sha256 = "1psmxpnn40ri9bgjvivljnd4p977f635mh3w7m5mglxxgc9392pi"; - }; - } - { - goPackagePath = "github.com/tsenart/tb"; - fetch = { - type = "git"; - url = "https://github.com/tsenart/tb"; - rev = "19f4c3d79d2bd67d0911b2e310b999eeea4454c1"; - sha256 = "148vy4xij5qm8dq5plyczx2wbpi4gpg8ksr5r3b4m8j0z1kjws8y"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3"; - sha256 = "18c1vpqlj10z1id66hglgnv51d9gwphgsdvxgghc6mcm01f1g5xj"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "6acef71eb69611914f7a30939ea9f6e194c78172"; - sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "3c3a985cb79f52a3190fbc056984415ca6763d01"; - sha256 = "0c7x8wkya56z03j2qfm61932npsddgqyggi75hkla9755d1inqlv"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "a71fd10341b064c10f4a81ceac72bcf70f26ea34"; - sha256 = "1igxqrgnnb6983fl0yck0xal2hwnkcgbslr7cxyrg7a65vawd0q1"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "eb84d1a029af1654777e7ba65c979085305c3e38"; - sha256 = "0ldmzcx5lxa81lcr39djcvyhd0ls11jlswj5877rinq3505ayf5l"; - }; - } - { - goPackagePath = "github.com/stretchr/testify/"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "1f4a1643a57e798696635ea4c126e9127adb7d3c"; - sha256 = "0nam9d68rn8ha8ldif22kkgv6k6ph3y88fp26159wdrs63ca3bzl"; - }; - } -] diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 4263b7e6f77..16e3c61bcc1 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,20 @@ { stdenv, lib, fetchFromGitHub, go, pkgs }: +let + removeExpr = ref: '' + sed -i "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \ + ''; + +in stdenv.mkDerivation rec { - version = "0.14.15"; + version = "0.14.19"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0iq7pzb9f0vgikxxxwvrhi5rlgw9frcwy0lgvc61l6lbw3vl0rd7"; + sha256 = "16wpw9ndx3x37mfnymp2fx9n2az9ibyr61zgq3mh2mszzzl7bkcg"; }; buildInputs = [ go ]; @@ -42,11 +48,15 @@ stdenv.mkDerivation rec { --replace /usr/bin/syncthing $out/bin/syncthing ''; + preFixup = '' + find $out/bin -type f -exec ${removeExpr go} '{}' '+' + ''; + meta = with stdenv.lib; { homepage = https://www.syncthing.net/; description = "Open Source Continuous File Synchronization"; - license = stdenv.lib.licenses.mpl20; - maintainers = with stdenv.lib.maintainers; [ pshendry joko peterhoeg ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.mpl20; + maintainers = with maintainers; [ pshendry joko peterhoeg ]; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index 3afb7ce4b10..4e73a305ea4 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, python3Packages }: stdenv.mkDerivation rec { - name = "bean-add-2016-10-03"; + name = "bean-add-2016-12-02"; src = fetchFromGitHub { owner = "simon-v"; repo = "bean-add"; - rev = "41deacc09b992db5eede34fefbfb2c0faeba1652"; - sha256 = "09xdsskk5rc3xsf1v1vq7nkdxrxy8w2fixx2vdv8c97ak6a4hrca"; + rev = "8038dabf5838c880c8e750c0e65cf0da4faf40b9"; + sha256 = "016ybq570xicj90x4kxrbxhzdvkjh0d6v3r6s3k3qfzz2c5vwh09"; }; propagatedBuildInputs = with python3Packages; [ python ]; diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix index 2034c832294..72f6c5de8a1 100644 --- a/pkgs/applications/office/beancount/default.nix +++ b/pkgs/applications/office/beancount/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchhg, pkgs, pythonPackages }: pythonPackages.buildPythonApplication rec { - version = "2.0b12"; + version = "2.0b13"; name = "beancount-${version}"; namePrefix = ""; src = pkgs.fetchurl { url = "mirror://pypi/b/beancount/${name}.tar.gz"; - sha256 = "0n0wyi2yhmf8l46l5z68psk4rrzqkgqaqn93l0wnxsmp1nmqly9z"; + sha256 = "16gkcq28bwd015b1qhdr5d7vhxid8xfn6ia4n9n8dnl5n448yqkm"; }; buildInputs = with pythonPackages; [ nose ]; diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 5ed7d25667e..a246c7290a5 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -1,19 +1,17 @@ { stdenv, pkgs, fetchurl, python3Packages, fetchFromGitHub, fetchzip, python3, beancount }: python3Packages.buildPythonApplication rec { - version = "1.0"; + version = "1.2"; name = "fava-${version}"; - src = fetchFromGitHub { - owner = "aumayr"; - repo = "fava"; - rev = "v${version}"; - sha256 = "0dm4x6z80m04r9qa55psvz7f41qnh13hnj2qhvxkrk22yqmkqrka"; + src = fetchurl { + url = "https://github.com/beancount/fava/archive/v${version}.tar.gz"; + sha256 = "0sykx054w4cvr0pgbqph0lmkxffafl83k5ir252gl5znxgcvg6yw"; }; assets = fetchzip { - url = "https://github.com/aumayr/fava/releases/download/v${version}/beancount-fava-${version}.tar.gz"; - sha256 = "1vvidwfn5882dslz6qqkkd84m7w52kd34x10qph8yhipyjv1dimc"; + url = "https://github.com/beancount/fava/releases/download/v${version}/beancount-fava-${version}.tar.gz"; + sha256 = "1lk6s3s6xvvwbcbkr1qpr9bqdgwspk3vms25zjd6xcs21s3hchmp"; }; buildInputs = with python3Packages; [ pytest_30 ]; diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index 1a4461e2f8c..3232abfb268 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -1,9 +1,9 @@ { fetchurl, stdenv, python2Packages, makeWrapper, lib -, xpdf, mesa, freeglut }: +, xpdf, mesa, SDL, freeglut }: let inherit (python2Packages) python pyopengl pygame setuptools pillow; - version = "0.10.5"; + version = "0.11.1"; in stdenv.mkDerivation { # This project was formerly known as KeyJNote. # See http://keyj.s2000.ws/?p=77 for details. @@ -12,7 +12,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/impressive/Impressive-${version}.tar.gz"; - sha256 = "0fz1zahxlfjang53wn06svy4s4aw28c79v24gwadvjvv3h1g5wam"; + sha256 = "0b3rmy6acp2vmf5nill3aknxvr9a5aawk1vnphkah61anxp62gsr"; }; # Note: We need to have `setuptools' in the path to be able to use @@ -39,13 +39,13 @@ in stdenv.mkDerivation { # honors $LIBRARY_PATH. See # http://python.net/crew/theller/ctypes/reference.html#id1 . wrapProgram "$out/bin/impressive" \ - --prefix PATH ":" "${xpdf}" \ + --prefix PATH ":" "${xpdf}/bin" \ --prefix PYTHONPATH ":" \ ${lib.concatStringsSep ":" (map (path: path + "/lib/${python.libPrefix}/site-packages") [ pillow pyopengl pygame setuptools ])} \ - --prefix LIBRARY_PATH ":" "${lib.makeLibraryPath [ mesa freeglut ]}" + --prefix LIBRARY_PATH ":" "${lib.makeLibraryPath [ mesa freeglut SDL ]}" ''; meta = { diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index 6904d1873aa..ef21b37b59e 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, makeDesktopItem, ant, jdk, jre }: stdenv.mkDerivation rec { - version = "3.6"; + version = "3.8.1"; name = "jabref-${version}"; src = fetchurl { url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}.jar"; - sha256 = "140fixwffw463dprgg6kcccsp833dnclzjzvwmqs7dq0f9y2nyc5"; + sha256 = "11asfym74zdq46i217z5n6vc79gylcx8xn7nvwacfqmym0bz79cg"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix index 6be5ad525db..6f571bd2a1b 100644 --- a/pkgs/applications/office/ledger-web/default.nix +++ b/pkgs/applications/office/ledger-web/default.nix @@ -6,11 +6,9 @@ bundlerEnv rec { name = "ledger-web-${version}"; - version = (import gemset).ledger_web.version; + version = (import ./gemset.nix).ledger_web.version; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; buildInputs = lib.optional withPostgresql postgresql ++ lib.optional withSqlite sqlite; diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index 52b81595e43..497d4305873 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -3,8 +3,8 @@ rec { major = "5"; minor = "2"; - patch = "3"; - tweak = "3"; + patch = "4"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1h9j3j7drhr49nw2p6by5vvrr8nc8rpldn3yp724mwkb2rfkdwd8"; + sha256 = "047byvyg13baws1bycaq1s6wqhkcr2pk27xbag0npzx1lspx2wwb"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index cbe159857eb..29cc1dc118f 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0j0ajli1cbfwbgzrcqkx3db174jv1fgm22ds0gqlgkci9cffa0c4"; + sha256 = "075f7jpp8qi6piwrw4n8inynvsgp0270pdd9jmc2fqv6j5gsn332"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0fndi6cv8rw426c3l071z130ks9sqf6ca5yas7am9d666mmy4fs4"; + sha256 = "10p1xd077278gm3syd3lc54fzjsvrvzm0zr6csn9iq90kmlsgwzy"; }; }; @@ -251,6 +251,8 @@ in stdenv.mkDerivation rec { inherit srcs; }; + requiredSystemFeatures = [ "big-parallel" ]; + meta = with lib; { description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; homepage = http://libreoffice.org/; @@ -258,6 +260,5 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ viric raskin ]; platforms = platforms.linux; hydraPlatforms = []; - requiredSystemFeatures = [ "big-parallel" ]; }; } diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index bf9150b98ec..6cacff49fc6 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -112,11 +112,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.43.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/curl-7.43.0.tar.bz2"; - sha256 = "baa654a1122530483ccc1c58cc112fec3724a82c11c6a389f1e6a37dc8858df9"; - md5 = "11bddbb452a8b766b932f859aaeeed39"; - md5name = "11bddbb452a8b766b932f859aaeeed39-curl-7.43.0.tar.bz2"; + name = "curl-7.51.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/curl-7.51.0.tar.gz"; + sha256 = "65b5216a6fbfa72f547eb7706ca5902d7400db9868269017a8888aa91d87977c"; + md5 = "490e19a8ccd1f4a244b50338a0eb9456"; + md5name = "490e19a8ccd1f4a244b50338a0eb9456-curl-7.51.0.tar.gz"; } { name = "libe-book-0.1.2.tar.bz2"; @@ -224,11 +224,11 @@ md5name = "c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"; } { - name = "source-code-font-1.009.tar.gz"; - url = "http://dev-www.libreoffice.org/src/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz"; - sha256 = "9b295127164c81bcf28c7ebb687f1555b71796108b443a04d40202b7364e4cce"; - md5 = "0279a21fab6f245e85a6f85fea54f511"; - md5name = "0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz"; + name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz"; + url = "http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; + sha256 = "09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f"; + md5 = "907d6e99f241876695c19ff3db0b8923"; + md5name = "907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; } { name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; @@ -497,11 +497,11 @@ md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; } { - name = "mdds-1.2.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds-1.2.0.tar.bz2"; - sha256 = "f44fd0635de94c7d490f9a65f74b5e55860d7bdd507951428294f9690fda45b6"; - md5 = "9f3383fb7bae825eab69f3a6ec1d74b2"; - md5name = "9f3383fb7bae825eab69f3a6ec1d74b2-mdds-1.2.0.tar.bz2"; + name = "mdds-1.2.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2"; + sha256 = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d"; + md5 = "8855cf852a6088cfdc792c6f7ceb0243"; + md5name = "8855cf852a6088cfdc792c6f7ceb0243-mdds-1.2.2.tar.bz2"; } { name = "mDNSResponder-576.30.4.tar.gz"; @@ -546,11 +546,11 @@ md5name = "231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz"; } { - name = "nss-3.22.2-with-nspr-4.12.tar.gz"; - url = "http://dev-www.libreoffice.org/src/6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz"; - sha256 = "7bc7e5483fc90071be5facd3043f94c69b153055a369c8f0b751ad374c5ae09e"; - md5 = "6b254cf2f8cb4b27a3f0b8b7b9966ea7"; - md5name = "6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz"; + name = "nss-3.27-with-nspr-4.13.tar.gz"; + url = "http://dev-www.libreoffice.org/src/0e3eee39402386cf16fd7aaa7399ebef-nss-3.27-with-nspr-4.13.tar.gz"; + sha256 = "c74ad468ed5da0304b58ec56fa627fa388b256451b1a44fd184145c6d8203820"; + md5 = "0e3eee39402386cf16fd7aaa7399ebef"; + md5name = "0e3eee39402386cf16fd7aaa7399ebef-nss-3.27-with-nspr-4.13.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index b3d69ef7f19..75d295887f6 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -254,12 +254,13 @@ in stdenv.mkDerivation rec { inherit srcs; }; + requiredSystemFeatures = [ "big-parallel" ]; + meta = with lib; { description = "Comprehensive, professional-quality productivity suite (Still/stable release)"; homepage = http://libreoffice.org/; license = licenses.lgpl3; maintainers = with maintainers; [ viric raskin ]; platforms = platforms.linux; - requiredSystemFeatures = [ "big-parallel" ]; }; } diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 9e02377eaa5..2981a0f7f89 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -2,7 +2,7 @@ let - version = "1.2.7"; + version = "1.3.1"; in stdenv.mkDerivation { name = "money-manager-ex-${version}"; @@ -10,14 +10,9 @@ in src = fetchgit { url = "https://github.com/moneymanagerex/moneymanagerex.git"; rev = "refs/tags/v${version}"; - sha256 = "0d6jcsj3m3b9mj68vfwr7dn67dws11p0pdys3spyyiv1464vmywi"; + sha256 = "1cmwmvlzg7r85qq23lbbmq2y91vhf9f5pblpja5ph98bsd218pc0"; }; - preConfigure = '' - export CFLAGS="-I`pwd`/include" - export CXXFLAGS="$CFLAGS" - ''; - buildInputs = [ sqlite wxGTK30 gettext ]; meta = { diff --git a/pkgs/applications/office/ppl-address-book/Gemfile b/pkgs/applications/office/ppl-address-book/Gemfile new file mode 100644 index 00000000000..0039c436696 --- /dev/null +++ b/pkgs/applications/office/ppl-address-book/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'ppl' diff --git a/pkgs/applications/office/ppl-address-book/Gemfile.lock b/pkgs/applications/office/ppl-address-book/Gemfile.lock new file mode 100644 index 00000000000..5054bb8b9c8 --- /dev/null +++ b/pkgs/applications/office/ppl-address-book/Gemfile.lock @@ -0,0 +1,34 @@ +GEM + remote: https://rubygems.org/ + specs: + colored (1.2) + greencard (0.0.5) + i18n (0.7.0) + inifile (2.0.2) + mail (2.5.3) + i18n (>= 0.4.0) + mime-types (~> 1.16) + treetop (~> 1.4.8) + mime-types (1.25.1) + morphine (0.1.1) + polyglot (0.3.5) + ppl (2.4.0) + colored (= 1.2) + greencard (= 0.0.5) + inifile (= 2.0.2) + mail (= 2.5.3) + morphine (= 0.1.1) + rugged (= 0.17.0.b6) + rugged (0.17.0.b6) + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) + +PLATFORMS + ruby + +DEPENDENCIES + ppl + +BUNDLED WITH + 1.12.5 diff --git a/pkgs/applications/office/ppl-address-book/default.nix b/pkgs/applications/office/ppl-address-book/default.nix new file mode 100644 index 00000000000..f15affaa8d6 --- /dev/null +++ b/pkgs/applications/office/ppl-address-book/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, bundlerEnv, ruby, makeWrapper, which }: + +let + pname = "ppl-address-book"; + + version = (import ./gemset.nix).ppl.version; + + env = bundlerEnv rec { + name = "${pname}-env-${version}"; + inherit ruby; + gemdir = ./.; + + gemConfig.rugged = attrs: { buildInputs = [ which ]; }; + }; + +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + phases = [ "installPhase" ]; + + buildInputs = [ env makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${env}/bin/ppl $out/bin/ppl + ''; + + meta = with lib; { + description = "Address book software for command-line users"; + homepage = http://ppladdressbook.org/; + license = with licenses; mit; + maintainers = with maintainers; [ chris-martin ]; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/applications/office/ppl-address-book/gemset.nix b/pkgs/applications/office/ppl-address-book/gemset.nix new file mode 100644 index 00000000000..e8229f6153f --- /dev/null +++ b/pkgs/applications/office/ppl-address-book/gemset.nix @@ -0,0 +1,90 @@ +{ + colored = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx"; + type = "gem"; + }; + version = "1.2"; + }; + greencard = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11pxrl1w8c7m7rmnnmdaplrv53qgylyvkv8bzsfyjna7k16hynvq"; + type = "gem"; + }; + version = "0.0.5"; + }; + i18n = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758"; + type = "gem"; + }; + version = "0.7.0"; + }; + inifile = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03rpacxnrnisjhd2zhc7629ica958bkdbakicl5kipw1wbprck25"; + type = "gem"; + }; + version = "2.0.2"; + }; + mail = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1afr3acz7vsvr4gp6wnrkw1iwbjhf14mh8g8mlm40r86wcwzr39k"; + type = "gem"; + }; + version = "2.5.3"; + }; + mime-types = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8"; + type = "gem"; + }; + version = "1.25.1"; + }; + morphine = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05aw93cijd1gq39ikw2dw3i2c79bjq05kvxrs81mqxqdlini5wwa"; + type = "gem"; + }; + version = "0.1.1"; + }; + polyglot = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr"; + type = "gem"; + }; + version = "0.3.5"; + }; + ppl = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vpp4s12ggbk5kpl9z1i7vi9vvghgxrc8my35yk8knckg5waxg47"; + type = "gem"; + }; + version = "2.4.0"; + }; + rugged = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "025rj3rkj5yxf4pjj1s8x4yzshlyni3hgrjwhggg54nvw6b688qi"; + type = "gem"; + }; + version = "0.17.0.b6"; + }; + treetop = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zqj5y0mvfvyz11nhsb4d5ch0i0rfcyj64qx19mw4qhg3hh8z9pz"; + type = "gem"; + }; + version = "1.4.15"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/office/skrooge/2.nix b/pkgs/applications/office/skrooge/2.nix index 6751e7d6d11..98c1c4c8b79 100644 --- a/pkgs/applications/office/skrooge/2.nix +++ b/pkgs/applications/office/skrooge/2.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "skrooge-${version}"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { url = "http://download.kde.org/stable/skrooge/${name}.tar.xz"; - sha256 = "03ayrrr7rrj1jl1qh3sgn56hbi44wn4ldgcj08b93mqw7wdvpglp"; + sha256 = "13sd669rx66fpk9pm72nr2y69k2h4mcs4b904i9xm41i0fiy6szp"; }; nativeBuildInputs = [ cmake ecm makeQtWrapper ]; diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index f6a408d0384..e68c753750f 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -4,9 +4,7 @@ bundlerEnv { name = "timetrap-1.10.0"; inherit ruby; - gemfile = ./Gemfile; - lockfile = ./Gemfile.lock; - gemset = ./gemset.nix; + gemdir = ./.; meta = { description = "A simple command line time tracker written in ruby"; diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix new file mode 100644 index 00000000000..31774b6b55c --- /dev/null +++ b/pkgs/applications/office/tryton/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, python2Packages, librsvg }: + +with stdenv.lib; + +python2Packages.buildPythonApplication rec { + name = "tryton-${version}"; + version = "4.2.1"; + src = fetchurl { + url = "mirror://pypi/t/tryton/${name}.tar.gz"; + sha256 = "1ry3kvbk769m8rwqa90pplfvmmgsv4jj9w1aqhv892smia8f0ybm"; + }; + propagatedBuildInputs = with python2Packages; [ + chardet + dateutil + pygtk + librsvg + ]; + makeWrapperArgs = [ + ''--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"'' + ]; + meta = { + description = "The client of the Tryton application platform"; + longDescription = '' + The client for Tryton, a three-tier high-level general purpose + application platform under the license GPL-3 written in Python and using + PostgreSQL as database engine. + + It is the core base of a complete business solution providing + modularity, scalability and security. + ''; + homepage = http://www.tryton.org/; + license = licenses.gpl3Plus; + maintainers = [ maintainers.johbo ]; + }; +} diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 93f51ce3f8b..227b982689e 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pythonPackages }: +{ stdenv, lib, fetchurl, python2Packages }: # # TODO: Declare configuration options for the following optional dependencies: @@ -7,17 +7,16 @@ # - pyxdg: Need to make it work first (see setupPyInstallFlags). # -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { name = "zim-${version}"; version = "0.65"; - namePrefix = ""; src = fetchurl { url = "http://zim-wiki.org/downloads/${name}.tar.gz"; sha256 = "15pdq4fxag85qjsrdmmssiq85qsk5vnbp8mrqnpvx8lm8crz6hjl"; }; - propagatedBuildInputs = with pythonPackages; [ pyGtkGlade pyxdg pygobject2 ]; + propagatedBuildInputs = with python2Packages; [ pyGtkGlade pyxdg pygobject2 ]; preBuild = '' export HOME=$TMP @@ -30,12 +29,13 @@ pythonPackages.buildPythonApplication rec { export makeWrapperArgs="--prefix XDG_DATA_DIRS : $out/share --argv0 $out/bin/.zim-wrapped" ''; - postFixup = '' - substituteInPlace $out/bin/.zim-wrapped \ - --replace "sys.argv[0] = 'zim'" "sys.argv[0] = '$out/bin/zim'" + # RuntimeError: could not create GtkClipboard object + doCheck = false; + + checkPhase = '' + python test.py ''; - doCheck = true; meta = { description = "A desktop wiki"; diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 6f7d1b7b764..49c774f7039 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,20 +1,22 @@ { stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv , qtscript, qtserialport, qttools, makeQtWrapper +, qtmultimedia }: stdenv.mkDerivation rec { - name = "stellarium-0.14.3"; + name = "stellarium-${version}"; + version = "0.15.0"; src = fetchurl { url = "mirror://sourceforge/stellarium/${name}.tar.gz"; - sha256 = "1919wzlvhfxdxficbwhp31xlhm0571grgcmsfdp5y36z9yqwahfy"; + sha256 = "0il751lgnfkx35h1m8fzwwnrygpxjx2a80gng1i1rbybkykf7l3l"; }; nativeBuildInputs = [ makeQtWrapper ]; buildInputs = [ cmake freetype libpng mesa gettext openssl perl libiconv qtscript - qtserialport qttools + qtserialport qttools qtmultimedia ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/biology/freebayes/builder.sh b/pkgs/applications/science/biology/freebayes/builder.sh new file mode 100644 index 00000000000..a9f56e77d7e --- /dev/null +++ b/pkgs/applications/science/biology/freebayes/builder.sh @@ -0,0 +1,11 @@ +source $stdenv/setup + +unpackPhase + +cd freebayes-* + +make + +mkdir -p $out/bin +cp bin/freebayes bin/bamleftalign $out/bin +cp scripts/* $out/bin diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix new file mode 100644 index 00000000000..ef0da619b25 --- /dev/null +++ b/pkgs/applications/science/biology/freebayes/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, gcc, zlib}: + +stdenv.mkDerivation rec { + name = "freebayes-${version}"; + version = "1.1.0"; + + src = fetchFromGitHub { + name = "freebayes-${version}-src"; + owner = "ekg"; + repo = "freebayes"; + rev = "refs/tags/v${version}"; + sha256 = "0xb8aicb36w9mfs1gq1x7mcp3p82kl7i61d162hfncqzg2npg8rr"; + fetchSubmodules = true; + }; + + buildInputs = [ cmake gcc zlib ]; + + builder = ./builder.sh; + + meta = with stdenv.lib; { + description = "Bayesian haplotype-based polymorphism discovery and genotyping"; + license = licenses.mit; + homepage = https://github.com/ekg/freebayes; + maintainers = with maintainers; [ jdagilliland ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 3d0f7154e0e..3acf7d96527 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "igv-${version}"; - version = "2.3.77"; + version = "2.3.89"; src = fetchurl { url = "http://data.broadinstitute.org/igv/projects/downloads/IGV_${version}.zip"; - sha256 = "9d8c622649f9f02026e92fa44006bb57e897baad4359c8708ca9cdbb71f94bb5"; + sha256 = "06bmj9jsnk5010ipv0w4qlcvgw67dy8hsvgcx9l74v3s0zp5di3y"; }; buildInputs = [ unzip jre ]; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/8.4.nix similarity index 100% rename from pkgs/applications/science/logic/coq/default.nix rename to pkgs/applications/science/logic/coq/8.4.nix diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 7f128340bf3..2409936ab69 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -1,26 +1,25 @@ -{ stdenv, fetchurl, perl, nettools, java, polyml }: +{ stdenv, fetchurl, perl, nettools, java, polyml, z3 }: # nettools needed for hostname let - dirname = "Isabelle2016"; - theories = ["HOL" "FOL" "ZF"]; + dirname = "Isabelle2016-1"; in stdenv.mkDerivation { - name = "isabelle-2016"; - inherit dirname theories; + name = "isabelle-2016-1"; + inherit dirname; src = if stdenv.isDarwin then fetchurl { url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}.dmg"; - sha256 = "0wawf0cjc52h8hif1867p33qhlh6qz0fy5i2kr1gbf7psickd6iw"; + sha256 = "0553l7m2z32ajmiv6sgg11rh16n490w8i4q9hr7vx4zzggr9nrlr"; } else fetchurl { url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; - sha256 = "0jh1qrsyib13fycymwvw7dq7xfy4iyplwq0s65ash842cdzkbxb4"; + sha256 = "1w1cgfmmi1sr43z6hczyc29lxlnlz7dd8fa88ai44wkc13y05b5r"; }; - buildInputs = [ perl polyml ] + buildInputs = [ perl polyml z3 ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ nettools java ]; sourceRoot = dirname; @@ -42,7 +41,14 @@ stdenv.mkDerivation { --replace '$POLYML_HOME/$PLATFORM/polyml' ${polyml}/bin/poly substituteInPlace lib/scripts/run-polyml* lib/scripts/polyml-version \ --replace '$ML_HOME/poly' ${polyml}/bin/poly - ''; + substituteInPlace contrib/z3*/etc/settings \ + --replace '$Z3_HOME/z3' '${z3}/bin/z3' + '' + (if ! stdenv.isLinux then "" else '' + arch=${if stdenv.system == "x86_64-linux" then "x86_64-linux" else "x86-linux"} + for f in contrib/*/$arch/{bash_process,epclextract,eprover,nunchaku,SPASS}; do + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" + done + ''); installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index d1f4bc0a414..b6de57951ca 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lean-${version}"; - version = "2016-12-08"; + version = "3.0.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "lean"; - rev = "7b63d6566faaf1dc0f2c8e873c61f51dce9ab618"; - sha256 = "0xxr7dnh7pmdbpxhl3cq9clwamxjk54zcxplsrz6xirk0qy7ga4l"; + rev = "v${version}"; + sha256 = "1ds25213vir8llans7na3laqs8rgr06clgp9xzq8akiwfy87b74i"; }; buildInputs = [ gmp mpfr cmake gperftools ]; diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index fa5c9ba175e..9683579af47 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python2 }: +{ stdenv, fetchFromGitHub, python2, fixDarwinDylibNames }: let python = python2; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "0ssp190ksak93hiz61z90x6hy9hcw1ywp8b2dzmbhn6fbd4bnxzp"; }; - buildInputs = [ python ]; + buildInputs = [ python fixDarwinDylibNames ]; enableParallelBuilding = true; configurePhase = '' diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 55443f90c6f..85a13f7ac37 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -4,7 +4,7 @@ tk ? null, gnuplot ? null, ecl ? null, ecl-fasl ? false let name = "maxima"; - version = "5.38.1"; + version = "5.39.0"; searchPath = stdenv.lib.makeBinPath @@ -15,7 +15,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "1p6646rvq43hk09msyp0dk50cqpkh07mf4x0bc2fqisqmcv6b1hf"; + sha256 = "1cvignn5y6qzrby6qb885yc8zdcdqdr1d50vcvc3gapw2f0gk3zm"; }; buildInputs = stdenv.lib.filter (x: x != null) diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index 7d9f8542eed..1c1cac203f8 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -3,7 +3,7 @@ let name = "fityk"; - version = "1.3.0"; + version = "1.3.1"; in stdenv.mkDerivation { name = "${name}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "wojdyr"; repo = "fityk"; rev = "v${version}"; - sha256 = "07xzhy47q5ddg1qn51qds4wp6r5g2cx8bla0hm0a9ipr2hg92lm9"; + sha256 = "0kmrjjjwrh6xgw590awcd52b86kksmv6rfgih75zvpiavr1ygwsi"; }; buildInputs = [ autoreconfHook wxGTK30 boost lua zlib bzip2 xylib readline diff --git a/pkgs/applications/science/misc/gplates/boostfix.patch b/pkgs/applications/science/misc/gplates/boostfix.patch new file mode 100644 index 00000000000..e429600b709 --- /dev/null +++ b/pkgs/applications/science/misc/gplates/boostfix.patch @@ -0,0 +1,612 @@ +--- a/src/app-logic/ApplicationState.h ++++ b/src/app-logic/ApplicationState.h +@@ -33,6 +33,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "FeatureCollectionFileState.h" + #include "Layer.h" + #include "LayerTaskRegistry.h" +@@ -48,6 +49,7 @@ + #include "model/ModelInterface.h" + #include "model/types.h" + #include "model/WeakReferenceCallback.h" ++#endif + + //////////////////////////////////////////////////////////////////////////////////////////////// + // NOTE: Please use forward declarations (and boost::scoped_ptr) instead of including headers +--- a/src/app-logic/CoRegistrationLayerTask.h ++++ b/src/app-logic/CoRegistrationLayerTask.h +@@ -32,11 +32,13 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "CoRegistrationLayerParams.h" + #include "CoRegistrationLayerProxy.h" + #include "LayerTask.h" + + #include "model/FeatureCollectionHandle.h" ++#endif + + namespace GPlatesAppLogic + { +--- a/src/app-logic/RasterLayerTask.h ++++ b/src/app-logic/RasterLayerTask.h +@@ -32,11 +32,13 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "LayerTask.h" + #include "RasterLayerParams.h" + #include "RasterLayerProxy.h" + + #include "model/FeatureCollectionHandle.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/app-logic/ReconstructGraph.h ++++ b/src/app-logic/ReconstructGraph.h +@@ -46,6 +46,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "FeatureCollectionFileState.h" + #include "Layer.h" + #include "Reconstruction.h" +@@ -53,6 +54,7 @@ + + #include "model/FeatureCollectionHandle.h" + #include "model/WeakReferenceCallback.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/app-logic/ReconstructLayerTask.h ++++ b/src/app-logic/ReconstructLayerTask.h +@@ -33,6 +33,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "LayerTask.h" + #include "ReconstructLayerProxy.h" + #include "ReconstructLayerParams.h" +@@ -42,6 +43,7 @@ + #include "maths/types.h" + + #include "model/FeatureCollectionHandle.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/app-logic/ReconstructScalarCoverageLayerParams.h ++++ b/src/app-logic/ReconstructScalarCoverageLayerParams.h +@@ -30,6 +30,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "LayerParams.h" + #include "ReconstructScalarCoverageLayerProxy.h" + #include "ReconstructScalarCoverageParams.h" +@@ -38,6 +39,7 @@ + #include "property-values/ValueObjectType.h" + + #include "utils/SubjectObserverToken.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/app-logic/ReconstructScalarCoverageLayerTask.h ++++ b/src/app-logic/ReconstructScalarCoverageLayerTask.h +@@ -30,12 +30,14 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "LayerTask.h" + #include "ReconstructScalarCoverageLayerParams.h" + #include "ReconstructScalarCoverageLayerProxy.h" + #include "ScalarCoverageFeatureProperties.h" + + #include "model/FeatureCollectionHandle.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/app-logic/TopologyNetworkResolverLayerTask.h ++++ b/src/app-logic/TopologyNetworkResolverLayerTask.h +@@ -33,6 +33,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "LayerParams.h" + #include "LayerTask.h" + #include "ReconstructLayerProxy.h" +@@ -41,6 +42,7 @@ + #include "TopologyNetworkResolverLayerProxy.h" + + #include "model/FeatureCollectionHandle.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/app-logic/VelocityFieldCalculatorLayerTask.h ++++ b/src/app-logic/VelocityFieldCalculatorLayerTask.h +@@ -32,9 +32,11 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "LayerTask.h" + #include "VelocityFieldCalculatorLayerParams.h" + #include "VelocityFieldCalculatorLayerProxy.h" ++#endif + + #include "model/FeatureCollectionHandle.h" + +--- a/src/data-mining/CoRegConfigurationTable.h ++++ b/src/data-mining/CoRegConfigurationTable.h +@@ -28,6 +28,7 @@ + + #include + #include ++#ifndef Q_MOC_RUN + #include + + #include "CoRegFilter.h" +@@ -44,6 +45,7 @@ + #include "scribe/Transcribe.h" + #include "scribe/TranscribeContext.h" + ++#endif + + namespace GPlatesDataMining + { +--- a/src/gui/CommandServer.h ++++ b/src/gui/CommandServer.h +@@ -38,9 +38,11 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "app-logic/ApplicationState.h" + + #include "presentation/ViewState.h" ++#endif + + namespace GPlatesGui + { +--- a/src/gui/FeatureTableModel.h ++++ b/src/gui/FeatureTableModel.h +@@ -32,8 +32,10 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "app-logic/Layer.h" + #include "app-logic/ReconstructionGeometry.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/gui/TopologyTools.h ++++ b/src/gui/TopologyTools.h +@@ -35,6 +35,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "TopologySectionsContainer.h" + + #include "app-logic/Layer.h" +@@ -64,6 +65,7 @@ + #include "utils/UnicodeStringUtils.h" + + #include "view-operations/RenderedGeometryCollection.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/opengl/GLVisualLayers.h ++++ b/src/opengl/GLVisualLayers.h +@@ -35,6 +35,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "GLAgeGridMaskSource.h" + #include "GLContext.h" + #include "GLLight.h" +@@ -79,6 +80,7 @@ + + #include "view-operations/RenderedGeometry.h" + #include "view-operations/ScalarField3DRenderParameters.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/presentation/VisualLayer.h ++++ b/src/presentation/VisualLayer.h +@@ -32,6 +32,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "VisualLayerParams.h" + #include "VisualLayerType.h" + +@@ -42,6 +43,7 @@ + #include "model/FeatureCollectionHandle.h" + + #include "view-operations/RenderedGeometryCollection.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/presentation/VisualLayers.h ++++ b/src/presentation/VisualLayers.h +@@ -34,6 +34,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "VisualLayer.h" + + #include "app-logic/FeatureCollectionFileState.h" +@@ -42,6 +43,7 @@ + #include "gui/Symbol.h" + + #include "view-operations/RenderedGeometryCollection.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/qt-widgets/AssignReconstructionPlateIdsDialog.h ++++ b/src/qt-widgets/AssignReconstructionPlateIdsDialog.h +@@ -39,6 +39,7 @@ + #include "GPlatesDialog.h" + #include "InformationDialog.h" + ++#ifndef Q_MOC_RUN + #include "app-logic/AssignPlateIds.h" + + #include "file-io/File.h" +@@ -47,6 +48,7 @@ + #include "model/ModelInterface.h" + + #include "presentation/VisualLayer.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/qt-widgets/CoRegistrationLayerConfigurationDialog.h ++++ b/src/qt-widgets/CoRegistrationLayerConfigurationDialog.h +@@ -38,6 +38,7 @@ + + #include "OpenDirectoryDialog.h" + ++#ifndef Q_MOC_RUN + #include "app-logic/ApplicationState.h" + #include "app-logic/Layer.h" + #include "app-logic/LayerInputChannelName.h" +@@ -45,6 +46,7 @@ + + #include "data-mining/CheckAttrTypeVisitor.h" + #include "data-mining/CoRegConfigurationTable.h" ++#endif + + #include "global/PointerTraits.h" + +--- a/src/qt-widgets/CoRegistrationOptionsWidget.h ++++ b/src/qt-widgets/CoRegistrationOptionsWidget.h +@@ -31,6 +31,7 @@ + #include "CoRegistrationLayerConfigurationDialog.h" + #include "CoRegistrationOptionsWidgetUi.h" + #include "LayerOptionsWidget.h" ++#ifndef Q_MOC_RUN + #include "CoRegistrationResultTableDialog.h" + + #include "app-logic/CoRegistrationLayerTask.h" +@@ -41,7 +42,7 @@ + #include "file-io/File.h" + + #include "presentation/VisualLayer.h" +- ++#endif + + namespace GPlatesAppLogic + { +--- a/src/qt-widgets/CoRegistrationResultTableDialog.h ++++ b/src/qt-widgets/CoRegistrationResultTableDialog.h +@@ -36,6 +36,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "CoRegistrationResultTableDialogUi.h" + #include "SaveFileDialog.h" + +@@ -43,6 +44,7 @@ + #include "data-mining/OpaqueDataToQString.h" + + #include "presentation/VisualLayer.h" ++#endif + + namespace GPlatesPresentation + { +--- a/src/qt-widgets/DrawStyleDialog.h ++++ b/src/qt-widgets/DrawStyleDialog.h +@@ -33,6 +33,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "DrawStyleDialogUi.h" + #include "GPlatesDialog.h" + #include "PythonArgumentWidget.h" +@@ -41,6 +42,7 @@ + #include "gui/PythonConfiguration.h" + + #include "presentation/Application.h" ++#endif + + namespace GPlatesAppLogic + { +--- a/src/qt-widgets/EditTableActionWidget.h ++++ b/src/qt-widgets/EditTableActionWidget.h +@@ -27,8 +27,11 @@ + #define GPLATES_QTWIDGETS_EDITTABLEACTIONWIDGET_H + + #include ++ ++#ifndef Q_MOC_RUN + #include "app-logic/ApplicationState.h" + #include "EditTableActionWidgetUi.h" ++#endif + + namespace GPlatesQtWidgets + { +--- a/src/qt-widgets/GlobeCanvas.h ++++ b/src/qt-widgets/GlobeCanvas.h +@@ -41,6 +41,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "gui/ColourScheme.h" + #include "gui/Globe.h" + #include "gui/ViewportZoom.h" +@@ -58,6 +59,7 @@ + #include "qt-widgets/SceneView.h" + + #include "view-operations/RenderedGeometryFactory.h" ++#endif + + + namespace GPlatesGui +--- a/src/qt-widgets/LogDialog.h ++++ b/src/qt-widgets/LogDialog.h +@@ -34,7 +34,9 @@ + #include "GPlatesDialog.h" + #include "LogDialogUi.h" + ++#ifndef Q_MOC_RUN + #include "app-logic/ApplicationState.h" ++#endif + + + namespace GPlatesGui +--- a/src/qt-widgets/MapCanvas.h ++++ b/src/qt-widgets/MapCanvas.h +@@ -39,6 +39,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "gui/ColourScheme.h" + #include "gui/Map.h" + #include "gui/TextOverlay.h" +@@ -47,6 +48,7 @@ + #include "opengl/GLMatrix.h" + #include "opengl/GLOffScreenContext.h" + #include "opengl/GLVisualLayers.h" ++#endif + + + namespace GPlatesGui +--- a/src/qt-widgets/MapView.h ++++ b/src/qt-widgets/MapView.h +@@ -36,6 +36,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "gui/ColourScheme.h" + + #include "maths/LatLonPoint.h" +@@ -44,6 +45,7 @@ + #include "opengl/GLVisualLayers.h" + + #include "qt-widgets/SceneView.h" ++#endif + + + namespace GPlatesGui +--- a/src/qt-widgets/MergeReconstructionLayersDialog.h ++++ b/src/qt-widgets/MergeReconstructionLayersDialog.h +@@ -33,7 +33,9 @@ + + #include "MergeReconstructionLayersDialogUi.h" + ++#ifndef Q_MOC_RUN + #include "app-logic/Layer.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/qt-widgets/RasterLayerOptionsWidget.h ++++ b/src/qt-widgets/RasterLayerOptionsWidget.h +@@ -31,6 +31,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "RasterLayerOptionsWidgetUi.h" + + #include "LayerOptionsWidget.h" +@@ -40,6 +41,7 @@ + + #include "gui/BuiltinColourPaletteType.h" + #include "gui/RasterColourPalette.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/qt-widgets/ReconstructScalarCoverageLayerOptionsWidget.h ++++ b/src/qt-widgets/ReconstructScalarCoverageLayerOptionsWidget.h +@@ -28,6 +28,7 @@ + + #include + ++#ifndef Q_MOC_RUN + #include "ReconstructScalarCoverageLayerOptionsWidgetUi.h" + + #include "LayerOptionsWidget.h" +@@ -37,6 +38,7 @@ + + #include "gui/BuiltinColourPaletteType.h" + #include "gui/RasterColourPalette.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/qt-widgets/ScalarField3DLayerOptionsWidget.h ++++ b/src/qt-widgets/ScalarField3DLayerOptionsWidget.h +@@ -30,6 +30,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "ScalarField3DLayerOptionsWidgetUi.h" + + #include "LayerOptionsWidget.h" +@@ -41,6 +42,7 @@ + #include "gui/RasterColourPalette.h" + + #include "view-operations/ScalarField3DRenderParameters.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/qt-widgets/TotalReconstructionPolesDialog.h ++++ b/src/qt-widgets/TotalReconstructionPolesDialog.h +@@ -32,12 +32,14 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "TotalReconstructionPolesDialogUi.h" + + #include "GPlatesDialog.h" + #include "SaveFileDialog.h" + + #include "presentation/VisualLayer.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/qt-widgets/VisualLayersComboBox.h ++++ b/src/qt-widgets/VisualLayersComboBox.h +@@ -32,8 +32,10 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "presentation/VisualLayer.h" + #include "presentation/VisualLayerType.h" ++#endif + + + namespace GPlatesPresentation +--- a/src/qt-widgets/VisualLayerWidget.h ++++ b/src/qt-widgets/VisualLayerWidget.h +@@ -36,11 +36,13 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "VisualLayerWidgetUi.h" + + #include "app-logic/Layer.h" + + #include "gui/Colour.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/view-operations/InternalGeometryBuilder.h ++++ b/src/view-operations/InternalGeometryBuilder.h +@@ -30,9 +30,11 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "maths/GeometryOnSphere.h" + #include "maths/GeometryType.h" + #include "maths/PointOnSphere.h" ++#endif + + namespace GPlatesViewOperations + { +--- a/src/view-operations/RenderedGeometryCollection.h ++++ b/src/view-operations/RenderedGeometryCollection.h +@@ -39,7 +39,9 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "RenderedGeometryLayer.h" ++#endif + + namespace GPlatesViewOperations + { +--- a/src/view-operations/RenderedGeometryFactory.h ++++ b/src/view-operations/RenderedGeometryFactory.h +@@ -33,6 +33,7 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "RenderedGeometry.h" + #include "RenderedColouredEdgeSurfaceMesh.h" + #include "RenderedColouredTriangleSurfaceMesh.h" +@@ -62,6 +63,7 @@ + #include "property-values/TextContent.h" + + #include "view-operations/ScalarField3DRenderParameters.h" ++#endif + + + namespace GPlatesAppLogic +--- a/src/view-operations/RenderedGeometryLayer.h ++++ b/src/view-operations/RenderedGeometryLayer.h +@@ -35,10 +35,12 @@ + #include + #include + ++#ifndef Q_MOC_RUN + #include "RenderedGeometry.h" + + #include "maths/CubeQuadTreeLocation.h" + ++#endif + + namespace GPlatesMaths + { diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix new file mode 100644 index 00000000000..9dd7b6b72db --- /dev/null +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal, proj, boost, cmake, python2, doxygen, graphviz, gmp }: + +stdenv.mkDerivation rec { + name = "gplates-${version}"; + version = "2.0.0"; + + src = fetchurl { + url = "mirror://sourceforge/gplates/${name}-unixsrc.tar.bz2"; + sha256 = "02scnjj5nlc2d2c8lbx0xvj8gg1bgkjliv3wxsx564c55a9x69qw"; + }; + + patches = [ + ./boostfix.patch + ]; + + buildInputs = [ qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost cmake python2 doxygen graphviz gmp ]; + + meta = with stdenv.lib; { + description = "Desktop software for the interactive visualisation of plate-tectonics"; + homepage = https://www.gplates.org; + license = licenses.gpl2; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index d1106a75847..220b2e06360 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "root-${version}"; - version = "6.04.18"; + version = "6.08.02"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "00f3v3l8nimfkcxpn9qpyh3h23na0mi4wkds2y5gwqh8wh3jryq9"; + sha256 = "0530v1r4rvds52hgb13f00l3phhn76z6vii550mwv8bj3sl5070k"; }; buildInputs = [ cmake pcre pkgconfig python2 zlib lzma gsl ] @@ -16,10 +16,6 @@ stdenv.mkDerivation rec { ; patches = [ - (fetchpatch { - url = "https://github.com/root-mirror/root/commit/ee9964210c56e7c1868618a4434c5340fef38fe4.patch"; - sha256 = "186i7ni75yvjydy6lpmaplqxfb5z2019bgpbhff1n6zn2qlrff2r"; - }) ./sw_vers.patch # this prevents thisroot.sh from setting $p, which interferes with stdenv setup diff --git a/pkgs/applications/science/misc/root/sw_vers.patch b/pkgs/applications/science/misc/root/sw_vers.patch index 3de2b839bf4..c4632d62b4f 100644 --- a/pkgs/applications/science/misc/root/sw_vers.patch +++ b/pkgs/applications/science/misc/root/sw_vers.patch @@ -42,12 +42,12 @@ diff --git a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake @@ -38,27 +24,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") - SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m64") + SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m64") - else(${SYSCTL_OUTPUT} MATCHES 64) - MESSAGE(STATUS "Found a 32bit system") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") -- SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m32") +- SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -m32") - endif(${SYSCTL_OUTPUT} MATCHES 64) - endif() - diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix new file mode 100644 index 00000000000..e815ddfc1c2 --- /dev/null +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, gfortran, hepmc, fastjet, lhapdf, rivet, sqlite }: + +stdenv.mkDerivation rec { + name = "sherpa-${version}"; + version = "2.2.1"; + + src = fetchurl { + url = "http://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; + sha256 = "13vkz6w8kqyv8sgy3mxnlps5ykml5rnlj50vjj0pp9rgbl5y8ali"; + }; + + buildInputs = [ gfortran sqlite lhapdf rivet ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--with-sqlite3=${sqlite.dev}" + "--enable-hepmc2=${hepmc}" + "--enable-fastjet=${fastjet}" + "--enable-lhapdf=${lhapdf}" + "--enable-rivet=${rivet}" + ]; + + CXXFLAGS = "-std=c++11"; # needed for rivet on OSX + + meta = { + description = "Simulation of High-Energy Reactions of PArticles in lepton-lepton, lepton-photon, photon-photon, lepton-hadron and hadron-hadron collisions"; + license = stdenv.lib.licenses.gpl2; + homepage = https://sherpa.hepforge.org; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/applications/version-management/cvsps/01_ignoretrunk.dpatch b/pkgs/applications/version-management/cvsps/01_ignoretrunk.dpatch deleted file mode 100644 index 39185ae2bfa..00000000000 --- a/pkgs/applications/version-management/cvsps/01_ignoretrunk.dpatch +++ /dev/null @@ -1,23 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_ignoretrunk.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Ignore TRUNK branch name patch - -@DPATCH@ - -diff -urN cvsps-2.1.orig/cvsps.c cvsps-2.1/cvsps.c ---- cvsps-2.1.orig/cvsps.c 2005-05-25 22:39:40.000000000 -0500 -+++ cvsps-2.1/cvsps.c 2005-06-19 23:07:20.000000000 -0500 -@@ -2104,6 +2109,11 @@ - - if (!get_branch_ext(rev, eot, &leaf)) - { -+ if (strcmp(tag, "TRUNK") == 0) -+ { -+ debug(DEBUG_STATUS, "ignoring the TRUNK branch/tag"); -+ return; -+ } - debug(DEBUG_APPERROR, "malformed revision"); - exit(1); - } diff --git a/pkgs/applications/version-management/cvsps/02_dynamicbufferalloc.dpatch b/pkgs/applications/version-management/cvsps/02_dynamicbufferalloc.dpatch deleted file mode 100644 index 70ffb02a21a..00000000000 --- a/pkgs/applications/version-management/cvsps/02_dynamicbufferalloc.dpatch +++ /dev/null @@ -1,125 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_dynamicbufferalloc.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Dynamic buffer allocation - -@DPATCH@ - -diff -urN cvsps-2.1-orig/cache.c cvsps-2.1/cache.c ---- cvsps-2.1-orig/cache.c 2005-05-25 22:39:40.000000000 -0500 -+++ cvsps-2.1/cache.c 2005-07-26 15:21:29.716569500 -0500 -@@ -108,10 +108,19 @@ - int tag_flags = 0; - char branchbuff[LOG_STR_MAX] = ""; - int branch_add = 0; -- char logbuff[LOG_STR_MAX] = ""; -+ int logbufflen = LOG_STR_MAX + 1; -+ char * logbuff = malloc(logbufflen); - time_t cache_date = -1; - int read_version; - -+ if (logbuff == NULL) -+ { -+ debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in read_cache", logbufflen); -+ exit(1); -+ } -+ -+ logbuff[0] = 0; -+ - if (!(fp = cache_open("r"))) - goto out; - -@@ -299,8 +308,19 @@ - else - { - /* Make sure we have enough in the buffer */ -- if (strlen(logbuff)+strlen(buff)= LOG_STR_MAX) -+ { -+ logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX); -+ char * newlogbuff = realloc(logbuff, logbufflen); -+ if (newlogbuff == NULL) -+ { -+ debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in read_cache", logbufflen); -+ exit(1); -+ } -+ logbuff = newlogbuff; -+ } -+ strcat(logbuff, buff); - } - break; - case CACHE_NEED_PS_MEMBERS: -@@ -332,6 +352,7 @@ - out_close: - fclose(fp); - out: -+ free(logbuff); - return cache_date; - } - -diff -urN cvsps-2.1-orig/cvsps.c cvsps-2.1/cvsps.c ---- cvsps-2.1-orig/cvsps.c 2005-05-25 22:39:40.000000000 -0500 -+++ cvsps-2.1/cvsps.c 2005-07-26 15:22:02.558230700 -0500 -@@ -265,7 +265,8 @@ - PatchSetMember * psm = NULL; - char datebuff[20]; - char authbuff[AUTH_STR_MAX]; -- char logbuff[LOG_STR_MAX + 1]; -+ int logbufflen = LOG_STR_MAX + 1; -+ char * logbuff = malloc(logbufflen); - int loglen = 0; - int have_log = 0; - char cmd[BUFSIZ]; -@@ -273,6 +274,12 @@ - char use_rep_buff[PATH_MAX]; - char * ltype; - -+ if (logbuff == NULL) -+ { -+ debug(DEBUG_SYSERROR, "could not malloc %d bytes for logbuff in load_from_cvs", logbufflen); -+ exit(1); -+ } -+ - if (!no_rlog && !test_log_file && cvs_check_cap(CAP_HAVE_RLOG)) - { - ltype = "rlog"; -@@ -480,24 +487,22 @@ - */ - if (have_log || !is_revision_metadata(buff)) - { -- /* if the log buffer is full, that's it. -- * -- * Also, read lines (fgets) always have \n in them -- * which we count on. So if truncation happens, -- * be careful to put a \n on. -- * -- * Buffer has LOG_STR_MAX + 1 for room for \0 if -- * necessary -- */ -- if (loglen < LOG_STR_MAX) -+ /* If the log buffer is full, try to reallocate more. */ -+ if (loglen < logbufflen) - { - int len = strlen(buff); - -- if (len >= LOG_STR_MAX - loglen) -+ if (len >= logbufflen - loglen) - { -- debug(DEBUG_APPMSG1, "WARNING: maximum log length exceeded, truncating log"); -- len = LOG_STR_MAX - loglen; -- buff[len - 1] = '\n'; -+ debug(DEBUG_STATUS, "reallocating logbufflen to %d bytes for file %s", logbufflen, file->filename); -+ logbufflen += (len >= LOG_STR_MAX ? (len+1) : LOG_STR_MAX); -+ char * newlogbuff = realloc(logbuff, logbufflen); -+ if (newlogbuff == NULL) -+ { -+ debug(DEBUG_SYSERROR, "could not realloc %d bytes for logbuff in load_from_cvs", logbufflen); -+ exit(1); -+ } -+ logbuff = newlogbuff; - } - - debug(DEBUG_STATUS, "appending %s to log", buff); diff --git a/pkgs/applications/version-management/cvsps/03_diffoptstypo.dpatch b/pkgs/applications/version-management/cvsps/03_diffoptstypo.dpatch deleted file mode 100644 index eb3818ed97e..00000000000 --- a/pkgs/applications/version-management/cvsps/03_diffoptstypo.dpatch +++ /dev/null @@ -1,19 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 03_diffoptstypo.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Diff opts typo fix - -@DPATCH@ - ---- cvsps-2.1-orig/cvsps.1 2005-05-26 05:39:40.000000000 +0200 -+++ cvsps-2.1/cvsps.1 2005-07-28 15:17:48.885112048 +0200 -@@ -83,7 +83,7 @@ - disable the use of rlog internally. Note: rlog is - required for stable PatchSet numbering. Use with care. - .TP --.B \-\-diffs\-opts