diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 98cbc93bcd5..1afd32bc763 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -140,6 +140,7 @@ dtzWill = "Will Dietz "; e-user = "Alexander Kahl "; ebzzry = "Rommel Martinez "; + edanaher = "Evan Danaher "; ederoyd46 = "Matthew Brown "; eduarrrd = "Eduard Bachmakov "; edwtjo = "Edward Tjörnhammar "; @@ -361,6 +362,7 @@ paholg = "Paho Lurie-Gregg "; pakhfn = "Fedor Pakhomov "; palo = "Ingolf Wanger "; + paperdigits = "Mica Semrick "; pashev = "Igor Pashev "; pawelpacana = "Paweł Pacana "; periklis = "theopompos@gmail.com"; @@ -461,6 +463,7 @@ SShrike = "Severen Redwood "; stephenmw = "Stephen Weinberg "; sternenseemann = "Lukas Epple "; + stesie = "Stefan Siegl "; steveej = "Stefan Junker "; swarren83 = "Shawn Warren "; swistak35 = "Rafał Łasocha "; diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index 448e2a932e9..8677c13db40 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -21,6 +21,7 @@ effect after you run nixos-rebuild. + diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml index 59a4e3b33ba..30da064ac57 100644 --- a/nixos/doc/manual/configuration/modularity.xml +++ b/nixos/doc/manual/configuration/modularity.xml @@ -36,9 +36,8 @@ latter might look like this: { config, pkgs, ... }: { services.xserver.enable = true; - services.xserver.displayManager.kdm.enable = true; - services.xserver.desktopManager.kde4.enable = true; - environment.systemPackages = [ pkgs.kde4.kscreensaver ]; + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.kde5.enable = true; } diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 3040839861c..93d10d19b20 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -25,7 +25,7 @@ Otherwise, you can only log into a plain undecorated xterm window. Thus you should pick one or more of the following lines: -services.xserver.desktopManager.kde4.enable = true; +services.xserver.desktopManager.kde5.enable = true; services.xserver.desktopManager.xfce.enable = true; services.xserver.windowManager.xmonad.enable = true; services.xserver.windowManager.twm.enable = true; @@ -35,9 +35,9 @@ services.xserver.windowManager.icewm.enable = true; NixOS’s default display manager (the program that provides a graphical login prompt and manages the X -server) is SLiM. You can select KDE’s kdm instead: +server) is SLiM. You can select KDE’s sddm instead: -services.xserver.displayManager.kdm.enable = true; +services.xserver.displayManager.sddm.enable = true; diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml new file mode 100644 index 00000000000..af6278e9c92 --- /dev/null +++ b/nixos/doc/manual/configuration/xfce.xml @@ -0,0 +1,105 @@ + + + Xfce Desktop Environment + + + To enable the Xfce Desktop Environment, set + + services.xserver.desktopManager = { + xfce.enable = true; + default = "xfce"; + }; + + + + + Optionally, compton + can be enabled for nice graphical effects, some example settings: + + services.compton = { + enable = true; + fade = true; + inactiveOpacity = "0.9"; + shadow = true; + fadeDelta = 4; + }; + + + + + Some Xfce programs are not installed automatically. + To install them manually (system wide), put them into your + environment.systemPackages. + + + + NixOS’s default display manageris SLiM. + (DM is the program that provides a graphical login prompt + and manages the X server.) + You can, for example, select KDE’s + sddm instead: + + services.xserver.displayManager.sddm.enable = true; + + + + + Thunar Volume Support + + + To enable + Thunar + volume support, put + + services.xserver.desktopManager.xfce.enable = true; + + into your configuration.nix. + + + + + + Polkit Authentication Agent + + + There is no authentication agent automatically installed alongside + Xfce. To allow mounting of local (non-removable) filesystems, you + will need to install one. + + Installing polkit_gnome, a rebuild, logout and + login did the trick. + + + + + + Troubleshooting + + + Even after enabling udisks2, volume management might not work. + Thunar and/or the desktop takes time to show up. + + Thunar will spit out this kind of message on start + (look at journalctl --user -b). + + + Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported + + + This is caused by some needed GNOME services not running. + This is all fixed by enabling "Launch GNOME services on startup" in + the Advanced tab of the Session and Startup settings panel. + Alternatively, you can run this command to do the same thing. + + $ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true + + A log-out and re-log will be needed for this to take effect. + + + + + diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index ce432a7fa6c..d62d0896bb7 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -65,22 +65,22 @@ options = { -
Extensible Option +<section xml:id="sec-option-declarations-eot"><title>Extensible Option Types - Extensible option types is a feature that allow to extend certain types + Extensible option types is a feature that allow to extend certain types declaration through multiple module files. - This feature only work with a restricted set of types, namely + This feature only work with a restricted set of types, namely enum and submodules and any composed forms of them. - Extensible option types can be used for enum options - that affects multiple modules, or as an alternative to related + Extensible option types can be used for enum options + that affects multiple modules, or as an alternative to related enable options. As an example, we will take the case of display managers. There is a central display manager module for generic display manager options and a - module file per display manager backend (slim, kdm, gdm ...). + module file per display manager backend (slim, sddm, gdm ...). There are two approach to this module structure: @@ -96,7 +96,7 @@ options = { Both approachs have problems. - + Making backends independent can quickly become hard to manage. For display managers, there can be only one enabled at a time, but the type system can not enforce this restriction as there is no relation between @@ -108,18 +108,18 @@ options = { central module will require to change the central module option every time a new backend is added or removed. - By using extensible option types, it is possible to create a placeholder - option in the central module (), and to extend it in each backend module (, ). - + By using extensible option types, it is possible to create a placeholder + option in the central module (), and to extend it in each backend module (, ). + As a result, displayManager.enable option values can be added without changing the main service module file and the type system automatically enforce that there can only be a single display manager enabled. -Extensible type +<example xml:id='ex-option-declaration-eot-service'><title>Extensible type placeholder in the service module services.xserver.displayManager.enable = mkOption { @@ -127,29 +127,29 @@ services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ ]); }; -Extending - <literal>services.xserver.displayManager.enable</literal> in the +<example xml:id='ex-option-declaration-eot-backend-slim'><title>Extending + <literal>services.xserver.displayManager.enable</literal> in the <literal>slim</literal> module services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "slim" ]); }; -Extending - <literal>services.foo.backend</literal> in the <literal>kdm</literal> +<example xml:id='ex-option-declaration-eot-backend-sddm'><title>Extending + <literal>services.foo.backend</literal> in the <literal>sddm</literal> module services.xserver.displayManager.enable = mkOption { - type = with types; nullOr (enum [ "kdm" ]); + type = with types; nullOr (enum [ "sddm" ]); }; -The placeholder declaration is a standard mkOption - declaration, but it is important that extensible option declarations only use +The placeholder declaration is a standard mkOption + declaration, but it is important that extensible option declarations only use the type argument. -Extensible option types work with any of the composed variants of - enum such as - with types; nullOr (enum [ "foo" "bar" ]) +Extensible option types work with any of the composed variants of + enum such as + with types; nullOr (enum [ "foo" "bar" ]) or with types; listOf (enum [ "foo" "bar" ]).
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index 278dc88e1de..ae8aeb6e707 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -97,6 +97,15 @@ following incompatible changes: + + + Two lone top-level dict dbs moved into dictdDBs. This + affects: dictdWordnet which is now at + dictdDBs.wordnet and dictdWiktionary + which is now at dictdDBs.wiktionary + + + Parsoid service now uses YAML configuration format. @@ -117,6 +126,36 @@ following incompatible changes: + + + service.nylon is now declared using named instances. + As an example: + + + services.nylon = { + enable = true; + acceptInterface = "br0"; + bindInterface = "tun1"; + port = 5912; + }; + + + should be replaced with: + + + services.nylon.myvpn = { + enable = true; + acceptInterface = "br0"; + bindInterface = "tun1"; + port = 5912; + }; + + + this enables you to declare a SOCKS proxy for each uplink. + + + + overridePackages function no longer exists. It is replaced by /dev/null || true") + (block.doNotRedirect ++ (optionals block.redirectInternetOnly internetOnly)); + in + optionalString (block.redirectCondition != false) + '' + ip46tables -t nat -F ${chain} 2>/dev/null || true + ip46tables -t nat -N ${chain} 2>/dev/null || true + ${doNotRedirect} + ip46tables -t nat -A ${chain} -p tcp -j REDIRECT --to-ports ${toString block.port} + + # TODO: show errors, when it will be easily possible by a switch to + # iptables-restore + ip46tables -t nat -A OUTPUT -p tcp ${redCond block} -j ${chain} 2>/dev/null || true + '' + ) cfg.redsocks; + in + mkIf cfg.enable { + users.groups.redsocks = {}; + users.users.redsocks = { + description = "Redsocks daemon"; + group = "redsocks"; + isSystemUser = true; + }; + + systemd.services.redsocks = { + description = "Redsocks"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + script = "${pkgs.redsocks}/bin/redsocks -c ${configfile}"; + }; + + networking.firewall.extraCommands = iptables; + + networking.firewall.extraStopCommands = + concatImapStringsSep "\n" (idx: block: + let chain = "REDSOCKS${toString idx}"; in + optionalString (block.redirectCondition != false) + "ip46tables -t nat -D OUTPUT -p tcp ${redCond block} -j ${chain} 2>/dev/null || true" + ) cfg.redsocks; + }; +} diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index b29db58af99..b852e4e6dc8 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -34,6 +34,11 @@ in "; }; + package = mkOption { + default = pkgs.pythonPackages.searx; + description = "searx package to use."; + }; + }; }; @@ -61,14 +66,13 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { User = "searx"; - ExecStart = "${pkgs.pythonPackages.searx}/bin/searx-run"; + ExecStart = "${cfg.package}/bin/searx-run"; }; } // (optionalAttrs (configFile != "") { environment.SEARX_SETTINGS_PATH = configFile; }); - - environment.systemPackages = [ pkgs.pythonPackages.searx ]; + environment.systemPackages = [ cfg.package ]; }; diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix index 619e0f90b12..a49838c876f 100644 --- a/nixos/modules/services/web-servers/caddy.nix +++ b/nixos/modules/services/web-servers/caddy.nix @@ -61,6 +61,7 @@ in User = "caddy"; Group = "caddy"; AmbientCapabilities = "cap_net_bind_service"; + LimitNOFILE = 8192; }; }; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index c0daf30d04e..98d2d0ea834 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -1,5 +1,5 @@ # This module declares the options to define a *display manager*, the -# program responsible for handling X logins (such as xdm, kdm, gdb, or +# program responsible for handling X logins (such as xdm, gdb, or # SLiM). The display manager allows the user to select a *session # type*. When the user logs in, the display manager starts the # *session script* ("xsession" below) to launch the selected session diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix index 785394d9648..09a7f386876 100644 --- a/nixos/modules/services/x11/terminal-server.nix +++ b/nixos/modules/services/x11/terminal-server.nix @@ -16,18 +16,8 @@ with lib; services.xserver.enable = true; services.xserver.videoDrivers = []; - # Enable KDM. Any display manager will do as long as it supports XDMCP. - services.xserver.displayManager.kdm.enable = true; - services.xserver.displayManager.kdm.enableXDMCP = true; - services.xserver.displayManager.kdm.extraConfig = - '' - [General] - # We're headless, so don't bother starting an X server. - StaticServers= - - [Xdmcp] - Xaccess=${pkgs.writeText "Xaccess" "localhost"} - ''; + # Enable GDM. Any display manager will do as long as it supports XDMCP. + services.xserver.displayManager.gdm.enable = true; systemd.sockets.terminal-server = { description = "Terminal Server Socket"; diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index aa86fc85feb..062598de83e 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -104,15 +104,19 @@ in # Set the default gateway. ${optionalString (cfg.defaultGateway != null && cfg.defaultGateway.address != "") '' # FIXME: get rid of "|| true" (necessary to make it idempotent). - ip route add default via "${cfg.defaultGateway.address}" ${ + ip route add default ${optionalString (cfg.defaultGateway.metric != null) + "metric ${toString cfg.defaultGateway.metric}" + } via "${cfg.defaultGateway.address}" ${ optionalString (cfg.defaultGatewayWindowSize != null) "window ${toString cfg.defaultGatewayWindowSize}"} ${ optionalString (cfg.defaultGateway.interface != null) - "dev ${cfg.defaultGateway.interface}"}|| true + "dev ${cfg.defaultGateway.interface}"} || true ''} ${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6.address != "") '' # FIXME: get rid of "|| true" (necessary to make it idempotent). - ip -6 route add ::/0 via "${cfg.defaultGateway6.address}" ${ + ip -6 route add ::/0 ${optionalString (cfg.defaultGateway6.metric != null) + "metric ${toString cfg.defaultGateway6.metric}" + } via "${cfg.defaultGateway6.address}" ${ optionalString (cfg.defaultGatewayWindowSize != null) "window ${toString cfg.defaultGatewayWindowSize}"} ${ optionalString (cfg.defaultGateway6.interface != null) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 3f56419d2a6..d8ebe0af088 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -134,6 +134,13 @@ let description = "The default gateway interface."; }; + metric = mkOption { + type = types.nullOr types.int; + default = null; + example = 42; + description = "The default gateway metric/preference."; + }; + }; }; diff --git a/nixos/modules/virtualisation/ecs-agent.nix b/nixos/modules/virtualisation/ecs-agent.nix new file mode 100644 index 00000000000..ed17fbf4931 --- /dev/null +++ b/nixos/modules/virtualisation/ecs-agent.nix @@ -0,0 +1,41 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.ecs-agent; +in { + options.services.ecs-agent = { + enable = mkEnableOption "Amazon ECS agent"; + + package = mkOption { + type = types.path; + description = "The ECS agent package to use"; + default = pkgs.ecs-agent; + }; + + extra-environment = mkOption { + type = types.attrsOf types.str; + description = "The environment the ECS agent should run with. See the ECS agent documentation for keys that work here."; + default = {}; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.ecs-agent = { + inherit (cfg.package.meta) description; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + environment = cfg.extra-environment; + + script = '' + if [ ! -z "$ECS_DATADIR" ]; then + mkdir -p "$ECS_DATADIR" + fi + ${cfg.package.bin}/bin/agent + ''; + }; + }; +} + diff --git a/nixos/modules/virtualisation/vmware-guest.nix b/nixos/modules/virtualisation/vmware-guest.nix index ac5f87817fe..ce1224a8f13 100644 --- a/nixos/modules/virtualisation/vmware-guest.nix +++ b/nixos/modules/virtualisation/vmware-guest.nix @@ -4,12 +4,19 @@ with lib; let cfg = config.services.vmwareGuest; - open-vm-tools = pkgs.open-vm-tools; + open-vm-tools = if cfg.headless then pkgs.open-vm-tools-headless else pkgs.open-vm-tools; xf86inputvmmouse = pkgs.xorg.xf86inputvmmouse; in { options = { - services.vmwareGuest.enable = mkEnableOption "VMWare Guest Support"; + services.vmwareGuest = { + enable = mkEnableOption "VMWare Guest Support"; + headless = mkOption { + type = types.bool; + default = false; + description = "Whether to disable X11-related features."; + }; + }; }; config = mkIf cfg.enable { @@ -28,7 +35,7 @@ in environment.etc."vmware-tools".source = "${pkgs.open-vm-tools}/etc/vmware-tools/*"; - services.xserver = { + services.xserver = mkIf (!cfg.headless) { videoDrivers = mkOverride 50 [ "vmware" ]; modules = [ xf86inputvmmouse ]; diff --git a/nixos/release.nix b/nixos/release.nix index 2d78a4db973..0f298188c6c 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -325,8 +325,8 @@ in rec { kde = makeClosure ({ pkgs, ... }: { services.xserver.enable = true; - services.xserver.displayManager.kdm.enable = true; - services.xserver.desktopManager.kde4.enable = true; + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.kde5.enable = true; }); xfce = makeClosure ({ pkgs, ... }: diff --git a/nixos/tests/grsecurity.nix b/nixos/tests/grsecurity.nix index ee9e0709e5e..d4a419fd0e3 100644 --- a/nixos/tests/grsecurity.nix +++ b/nixos/tests/grsecurity.nix @@ -36,7 +36,7 @@ import ./make-test.nix ({ pkgs, ...} : { # paxmark actually works (otherwise, the process should be terminated) subtest "tcc", sub { $machine->execute("echo -e '#include \nint main(void) { puts(\"hello\"); return 0; }' >main.c"); - $machine->succeed("${pkgs.tinycc.bin}/bin/tcc -run main.c"); + $machine->succeed("${pkgs.tinycc}/bin/tcc -run main.c"); }; subtest "RBAC", sub { diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix index 3bf83ab6665..85faafd5689 100644 --- a/nixos/tests/phabricator.nix +++ b/nixos/tests/phabricator.nix @@ -54,7 +54,7 @@ import ./make-test.nix ({ pkgs, ... }: { client = { config, pkgs, ... }: { imports = [ ./common/x11.nix ]; - services.xserver.desktopManager.kde4.enable = true; + services.xserver.desktopManager.kde5.enable = true; }; }; diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix index e7d9759ae0c..0d56c564e18 100644 --- a/nixos/tests/trac.nix +++ b/nixos/tests/trac.nix @@ -45,7 +45,7 @@ import ./make-test.nix ({ pkgs, ... }: { client = { config, pkgs, ... }: { imports = [ ./common/x11.nix ]; - services.xserver.desktopManager.kde4.enable = true; + services.xserver.desktopManager.kde5.enable = true; }; }; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 3acb64559fd..c91028b7fe4 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.13.1"; + version = "1.14.1"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0nkd0nrnnmln5fjs1c97dligzqp744j4y6lqanfbs9vrxms6mnq3"; + sha256 = "0dmzqz1j2nfcm459zgfzqym26kmbspdn9lipf77aawbbn2y36xqp"; name = "${name}.deb"; }; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 817d7f62924..4298f605744 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -822,10 +822,10 @@ gnugo = callPackage ({ ascii-art-to-unicode, cl-lib ? null, elpaBuild, fetchurl, lib, xpm }: elpaBuild { pname = "gnugo"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnugo-3.0.1.tar"; - sha256 = "08z2hg9mvsxdznq027cmwhkb5i7n7s9r2kvd4jha9xskrcnzj3pp"; + url = "https://elpa.gnu.org/packages/gnugo-3.0.2.tar"; + sha256 = "12xm960awsn2k8ph1yibhrxdg8iz1icifdqimysg3qxljmhmnb3k"; }; packageRequires = [ ascii-art-to-unicode cl-lib xpm ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index a0a6b2ec53b..a47b5d69760 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -127,12 +127,12 @@ abl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "abl-mode"; - version = "20170130.105"; + version = "20170208.647"; src = fetchFromGitHub { owner = "afroisalreadyinu"; repo = "abl-mode"; - rev = "478ad2570f763b63a7369cc9f243b4f952a546bf"; - sha256 = "0xcj8vr9fcxf6cpck5gdb7vddlsk4vswl0wdwmxv6rwv459j5war"; + rev = "9c928c2968d7960ef672c3312051f0fbd4a7aeb3"; + sha256 = "0fxl67nmy6vi6viwxday4j81m9lg4l8vg6yw2phgagm4zlp65k58"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/70a52edb381daa9c4dcc9f7e511175b38fc141be/recipes/abl-mode"; @@ -737,8 +737,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "a347cda40cfd8924e86fdb597d8f2b5129697645"; - sha256 = "02njmfl7hmdpn1wxx50vfvai5w9gkmmajydccfz4r937knr0gibq"; + rev = "436567c1e28cce979aab7820a8fc74b5b5294218"; + sha256 = "07w8fpnglany530jksjsl5qs9mfbc52gh6pfnqlqx6ppp01k8lw4"; }; 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 = "20170124.1452"; + version = "20170209.2128"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "a347cda40cfd8924e86fdb597d8f2b5129697645"; - sha256 = "02njmfl7hmdpn1wxx50vfvai5w9gkmmajydccfz4r937knr0gibq"; + rev = "436567c1e28cce979aab7820a8fc74b5b5294218"; + sha256 = "07w8fpnglany530jksjsl5qs9mfbc52gh6pfnqlqx6ppp01k8lw4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -1549,12 +1549,12 @@ all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, font-lock-plus, lib, melpaBuild }: melpaBuild { pname = "all-the-icons"; - version = "20170203.1928"; + version = "20170208.433"; src = fetchFromGitHub { owner = "domtronn"; repo = "all-the-icons.el"; - rev = "34a6bf1b036e162b61cdfbad2165c8f8b63dec0d"; - sha256 = "1j11453x3229mm28sw88nc2pvdbw4i97ddgqnjy0s2hqz9z2ykzn"; + rev = "51079bb7f25d5c3d30517023e2bf13b28aa6d2c0"; + sha256 = "0jpnv9j1f6q459kzgvn2k0qh2li9qb9116c39qaxid8j1r1jp6lg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; @@ -2266,6 +2266,27 @@ license = lib.licenses.free; }; }) {}; + anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "anything-tramp"; + version = "20170208.539"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-anything-tramp"; + rev = "52b8c8dac2f56979a14504e3c97f00ad275f9345"; + sha256 = "1z0ylrl4scm0faapq9xhl4r20ljr4bl489ggyxi1v3rbksw1lp0q"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/bf5be5351cb187dff8388865ac424f8e5be71639/recipes/anything-tramp"; + sha256 = "1dpah5c35j552ixbd9mw2400vnfbibwhk1ihyz2n8b1c06syfny1"; + name = "anything-tramp"; + }; + packageRequires = [ anything emacs ]; + meta = { + homepage = "https://melpa.org/#/anything-tramp"; + license = lib.licenses.free; + }; + }) {}; anzu = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anzu"; @@ -2347,12 +2368,12 @@ apel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "apel"; - version = "20160427.152"; + version = "20170122.1458"; src = fetchFromGitHub { owner = "wanderlust"; repo = "apel"; - rev = "74e1e49626a4bc7b1e9b87d844d3852e976d1df2"; - sha256 = "1aywxk77vfgr1mk7j4pygy9hl4q7lbbx4iik1rs9frkmw6sb8qni"; + rev = "339eb28ffae3165255a79de9b1fd362f43cd37c3"; + sha256 = "1f0zxydh2pkwbjx5bh1bzl3r5g50vqg18azvqkvv9r0nn42hkhmi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4976446a8ae40980d502186615902fc05c15ec7c/recipes/apel"; @@ -2759,12 +2780,12 @@ async-await = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, promise }: melpaBuild { pname = "async-await"; - version = "20170203.2134"; + version = "20170208.350"; src = fetchFromGitHub { owner = "chuntaro"; repo = "emacs-async-await"; - rev = "0a7a504a6a1b38fffc037b4c5671b20047c55402"; - sha256 = "12xrcms2jhps63mjisd81pcam14larpascdix7lcdqd38vcxnzdm"; + rev = "56ab90e4019ed1f81fd4ad9e8701b5cec7ffa795"; + sha256 = "1k6wisls6dqn63r4f4brnhrjbvzqpigw2zxdl9v8g1qcw49spk5s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d74ecf94e5dbb46a939d26833b7cd0efd159ca1/recipes/async-await"; @@ -3822,12 +3843,12 @@ avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; - version = "20160814.250"; + version = "20170208.148"; src = fetchFromGitHub { owner = "abo-abo"; repo = "avy"; - rev = "0f5e99b5e9a0fe709e5bce8ea4462dc732b2a281"; - sha256 = "1p2x7k5106dlz4l1p5avkkvfxls7g35zbsbiranxsgmd1x2dyl7a"; + rev = "b8d71639158b44a2a700b84cb02fc8518ad7d542"; + sha256 = "1yddpl78krl2y5l3w6f1h53f5qsc09ad4qcwv31k549ziwiz1vd4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/77fac7a702d4086fb860514e377037acedc60412/recipes/avy"; @@ -4200,12 +4221,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20170124.1103"; + version = "20170208.1225"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "b50e90a39344402d169b8fdd5d18cc43fb16a256"; - sha256 = "13b9ccm7yw95zc8v8sri762fgqdp2hp107nj5b40yv90g3y4fwby"; + rev = "53a4b2175ad58db5314105244f74d1f03a9f3df2"; + sha256 = "1la5qljl8jcvnla5xfql509pwrcyjbamc6a3bzdxq55snh6hdkda"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4717,12 +4738,12 @@ better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "better-shell"; - version = "20170130.2222"; + version = "20170205.2308"; src = fetchFromGitHub { owner = "killdash9"; repo = "better-shell"; - rev = "43e43d43f049d8eafb7508b5cd3cccbb2eac4a68"; - sha256 = "1s31rjfq50lh2d2bs7afzwqi2282d9kwl2vpf5r9q10dvc0xb4bp"; + rev = "6ae157da700a4473734dca75925f6bf60e6b3ba7"; + sha256 = "14ym7gp57yflf86hxpsjnagxnc0z1jrdc4mbq7wcbh5z8kjkbfpd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc553c9fb6de69dafe9fbe44a955b307f4d9507f/recipes/better-shell"; @@ -4889,8 +4910,8 @@ src = fetchFromGitHub { owner = "waymondo"; repo = "use-package-chords"; - rev = "8dedc76617cbabd605f4c0d486018e3c4d3c8a9b"; - sha256 = "0d69hckz6xbll1x2mll385kcw7mwx8cwxg1wdhphnww0s810isgp"; + rev = "e8551ce8a514d865831d3a889acece79103fc627"; + sha256 = "0500pqsszg7h7923i0kyjirdyhj8aza3a2h5wbqzdpli2aqra5a5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/bind-chord"; @@ -4948,12 +4969,12 @@ bing-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bing-dict"; - version = "20160616.1820"; + version = "20170209.1459"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "bing-dict.el"; - rev = "bcad59c4f3a35d83aeaa4a88f0935e89cc2da764"; - sha256 = "04zfq3d1h9givycp182a9lb19dbny98qgvc43s08kb0gdjj0f6xx"; + rev = "7c067b7a3a1a4797476f03a65f4a0b4a269a70c7"; + sha256 = "1cw8zxcj7ygj73dc8xf6b4sdjrwxfl6h07mrwym8anllqs2v0fa6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5653d2b6c2a9b33cfed867e7f6e552d4ed90b181/recipes/bing-dict"; @@ -6928,8 +6949,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "6ac74e951bf11593ce134cf002456ae5d420a2b4"; - sha256 = "0ywq2lg95a1r1hls4pnns7pjii42ai8qyp87hsxbbci88ay0i81i"; + rev = "6fc41c74644a457f1f426e2ac62ac2ac88b1fa30"; + sha256 = "1lx3qcj9khalasx3xd1b8za41zmjylypx7cp0sn0flbhmw1irybk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -6968,7 +6989,7 @@ version = "20170201.347"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "11993"; + rev = "12000"; sha256 = "0lv9lsh1dnsmida4hhj04ysq48v4m12nj9yq621xn3i6s2qz7s1k"; }; recipeFile = fetchurl { @@ -7300,12 +7321,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "20170111.1209"; + version = "20170208.501"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "577a3438d14e1a1f08baf0399ec8138c9d1dcba4"; - sha256 = "0i9nqhqbj12ilr5fsa4cwai9kf2ydv84m606zqca2xyvvdzw22as"; + rev = "113d93e02ae41767342fe9b24b3758e75fd3af23"; + sha256 = "06xryf0wmlsyr2g9m0vxqdnsaicf6jb8nxc20n3jg89b96688wnq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -7325,8 +7346,8 @@ src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim-basedict"; - rev = "59ea301585ef832022f92e2d75dec7e000611301"; - sha256 = "0zbdb8snwxwyhm7inynsnx0rrr6dm9mh5lslzy29c6837jzgg2f6"; + rev = "3bca2760d78fd1195dbd4c2d570db955023a5623"; + sha256 = "07dd90bhmayacgvv5k6j079wk3zhlh83zw471rd37n2hmw8557mv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e2315ffe7d13928eddaf217a5f67a3e0dd5e62a1/recipes/chinese-pyim-basedict"; @@ -7738,12 +7759,12 @@ circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "circe"; - version = "20170107.632"; + version = "20170205.1414"; src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "5444a8dd90691de941509f7cc9ac8329c442dbdd"; - sha256 = "00dcdszskzqggg4gjp5f2k2v1a03jad52q2pqf04jqjycapkx227"; + rev = "773e48624edc32022764d9b3bab861f32c336ac3"; + sha256 = "0s0ksk4f8hz2jajh7hx8b5qv8vrv5mr8mvk8n51ycip0gmrl98nf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/circe"; @@ -7825,7 +7846,7 @@ version = "20170120.137"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "294096"; + rev = "294752"; sha256 = "13516xv7ypswhlarh4sd97sc17zar10snbmrcn14wd53jgxx440y"; }; recipeFile = fetchurl { @@ -7947,12 +7968,12 @@ cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "cliphist"; - version = "20170117.1437"; + version = "20170208.514"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cliphist"; - rev = "8aaee153e0561625c35a8c178e57385c2ec92731"; - sha256 = "0swsvzz20szfcgfaarga9apla1kl0ph0lrpk0ccl6mcf93zbnvby"; + rev = "acbd9782d82d7ae6bfb22fb0955597b9c5fcbb6c"; + sha256 = "1gj5fqjyr4m4qim9qjsvzzk42rm3vw3yycvq3nj0wpj90zb1yh14"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist"; @@ -8467,8 +8488,8 @@ src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "d5f0c696116541ff4d58513d5fa2970ab70cccf7"; - sha256 = "12pl3wy4cp457ha58w9xk6jd6x66nk4sq08h02hhpyrz7d3wi3cp"; + rev = "ada0bc21f42e25882ddf5a8aab10eaf3ea7e0b89"; + sha256 = "0cl8c2kbsd8jcc9mdpdriamxv9bk5fnjra5c7rpwc19qahgf2w3a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -9386,12 +9407,12 @@ company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "company-coq"; - version = "20170110.1633"; + version = "20170206.2151"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "company-coq"; - rev = "84eae262728392ae1d077e0435ebbd2e75c3bdeb"; - sha256 = "0cxvrlal884pmk7hf0c5dn0b93jd6wchag1a9vwh9x458hm9h4gy"; + rev = "f77e4b12a7deebc83125d69ac1e2288d8aecf521"; + sha256 = "04a8vlw3999yhmn3jg9d3jvvmfwmc88xnpfw1qm820s97cinzsgf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f89e3097c654774981953ef125679fec0b5b7c9/recipes/company-coq"; @@ -9561,12 +9582,12 @@ company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-flow"; - version = "20161111.2147"; + version = "20170208.756"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "company-flow"; - rev = "1f10d38135679f705494f23cd866ded0130e2993"; - sha256 = "0alkxdd171dwk6rnq2yc6gpljdazz7yz7q3mzs3q4rcmrvlr8h84"; + rev = "b86eaff31a66e311c210da93b83fa218f8def24b"; + sha256 = "1lpihk96pz3v7qd62icm950wds1xc02mx08ygfv7ia1zv1m4m6w5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow"; @@ -9855,12 +9876,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "20170111.2112"; + version = "20170209.2128"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "a347cda40cfd8924e86fdb597d8f2b5129697645"; - sha256 = "02njmfl7hmdpn1wxx50vfvai5w9gkmmajydccfz4r937knr0gibq"; + rev = "436567c1e28cce979aab7820a8fc74b5b5294218"; + sha256 = "07w8fpnglany530jksjsl5qs9mfbc52gh6pfnqlqx6ppp01k8lw4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -9922,8 +9943,8 @@ src = fetchFromGitHub { owner = "expez"; repo = "company-quickhelp"; - rev = "e204a80b5231486145902df4abd063b8c9d20376"; - sha256 = "1ijzsa1l1ispd0zc0bzbcrvwcf3i4siqbvccnpdpr6i32sd3kwsq"; + rev = "639baefc78ee9346229969cf794fba596e15a7d3"; + sha256 = "0ql5a34cgkdbz1bxml5sam5kwd78zllkf8hm0r6zcnjykh4b5wv4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/022cc4fee54bb0194822947c70058145e2980b94/recipes/company-quickhelp"; @@ -10180,8 +10201,8 @@ src = fetchFromGitHub { owner = "zonuexe"; repo = "composer.el"; - rev = "2d16d3bb65c53e9e26f4b7b22ad38590a4a48ee1"; - sha256 = "1zxqqd12p1db75icbwbdj51fvp8zzhivi8ssnxda1r5y5crbiqdv"; + rev = "00b00cc48dec28ef4f993ad7044cd79f44b4cbd6"; + sha256 = "16vv7s3g4in3zl5yl2iqgcmfmay64gk6z8mc7pb199alk7m0dlyq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/39c5002f0688397a51b1b0c6c15f6ac07c3681bc/recipes/composer"; @@ -10385,12 +10406,12 @@ copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copy-as-format"; - version = "20161231.1628"; + version = "20170208.1921"; src = fetchFromGitHub { owner = "sshaw"; repo = "copy-as-format"; - rev = "f10105bb5a6a9ccc557649a56f46546b25a5460b"; - sha256 = "0p27jdwp580x6namdklk7472ajj72h2zka4q70yccszh52c44iyq"; + rev = "22239b22b63393222143857825098b03c53a1044"; + sha256 = "1r4f04ca4w60qqrc5s7ic69ah3z63ygc1xagxqbp85wavq7vk8rc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; @@ -10490,12 +10511,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20170203.1430"; + version = "20170208.107"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "7c73f7166486eeca829446a62efdb9520802ebea"; - sha256 = "0q8wjynrlq2n6wf0x2nnmvj9h1i2pl39xpz6b7f3jbm7720182ld"; + rev = "d23d1feefccd658f013cbf7d1b052767bed9b2b6"; + sha256 = "0fffs5l45hrz7qv4gxwdn4prabl49zgx74daxyflrlkmbffy0gr4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -10700,12 +10721,12 @@ cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cpputils-cmake"; - version = "20161201.1441"; + version = "20170203.155"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cpputils-cmake"; - rev = "2c48c1bacee286d927038bf0c893678931f0f956"; - sha256 = "03a0y508znl91c6893wf5l9d98nc4dbfgg9c594c542mdbrk54z0"; + rev = "5bad6a1f1042e45fa6d2c20fd901100d14d455ff"; + sha256 = "0ag0wkyf1y4q0cnv8gixrbhhaf871x3r97izb82v42i47cnwk228"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b84a159e97f7161d0705da5dd5e8c34ae5cb848/recipes/cpputils-cmake"; @@ -11342,10 +11363,10 @@ }) {}; cus-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "cus-edit-plus"; - version = "20170102.923"; + version = "20170206.1603"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/cus-edit+.el"; - sha256 = "1mmcnx0i9jz1xzxgl9wqlfk4yl8y3bz88jf8078b80y34489lky9"; + sha256 = "02mcvr8fnaflqwxzafr6i745wcw8akhjjq8ami312aibf5yjadik"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57370fc617f4f10cc67e9d3c6dc113ff0a18cace/recipes/cus-edit+"; @@ -11509,8 +11530,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "68336b38580db34bb85cfed03a3243522c328d09"; - sha256 = "04qcq9nsy57hy23r6crrk7i7hy95424bag5ymqa378vkqw490s9s"; + rev = "e4b8a88d1e9b0ff053705b5082d6f9e12a839069"; + sha256 = "1m4h0jw4baa70z5difns5afbylagdw11w3ppc92sjzjpicxn2g9v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11610,12 +11631,12 @@ danneskjold-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "danneskjold-theme"; - version = "20161214.703"; + version = "20170210.708"; src = fetchFromGitHub { owner = "rails-to-cosmos"; repo = "danneskjold-theme"; - rev = "af41b9146b8c374477aeb8e739686a2006ce7479"; - sha256 = "0k60jr11jnvn4fpx7jr7jlcnfsrdv4kp26fd71jv0j4gvin2ljxj"; + rev = "95805f95aa780ecdb6ff35aaa6a56f3acc4c8be3"; + sha256 = "1bpyzx6i2z73y70na9a450bpv9gw4av5jx6njbwzjbapdcl7dxz6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557244a3b60c7cd3ca964ff843aa1e9d5a1e32ec/recipes/danneskjold-theme"; @@ -11631,12 +11652,12 @@ dante = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "dante"; - version = "20170201.1425"; + version = "20170207.234"; src = fetchFromGitHub { owner = "jyp"; repo = "dante"; - rev = "385dd8114bb9eaba44943f00f9f7aea71af7bf34"; - sha256 = "1jkdq9li3vqzdmmznpaxak7mf9y9vlk0abdb7ffzvvlry19dvgs8"; + rev = "7acaefbf36fe53e9af9f812957eea404e11f8a61"; + sha256 = "0ascjab014sbv9fvkswyxwhg50f0siwa9v6s67k5g58n9f7r7bls"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5afa8226077cbda4b76f52734cf8e0b745ab88e8/recipes/dante"; @@ -11862,12 +11883,12 @@ dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dash"; - version = "20161121.55"; + version = "20170207.2056"; src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "958e3fb62fd326d3743c0603b80d24ab85712c03"; - sha256 = "1a1zca0lh01wayd4qdjihimhd1bn00qpwfiybgdcb7yn5xfwv9a1"; + rev = "98e819e407bbc35478cde30a74be15f077bd6d4b"; + sha256 = "1ws57p9y9fjpzk63x5qfibqc4xz6q4iczrxdmrgvm0p3mj3gmvwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -11908,8 +11929,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "958e3fb62fd326d3743c0603b80d24ab85712c03"; - sha256 = "1a1zca0lh01wayd4qdjihimhd1bn00qpwfiybgdcb7yn5xfwv9a1"; + rev = "98e819e407bbc35478cde30a74be15f077bd6d4b"; + sha256 = "1ws57p9y9fjpzk63x5qfibqc4xz6q4iczrxdmrgvm0p3mj3gmvwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -12240,12 +12261,12 @@ dedukti-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dedukti-mode"; - version = "20160329.1002"; + version = "20170206.514"; src = fetchFromGitHub { owner = "rafoo"; repo = "dedukti-mode"; - rev = "dab509952b6c64d0bb12b5f60dd93e3b38b01d62"; - sha256 = "1lnvr1rxgf1i0dh1gqlkghz6r4lm1llpv3vhky313220ibxrpsvm"; + rev = "6f5513a1dd7ff5d76da2402287a58f55f8891efa"; + sha256 = "1vxbringd99w6mraq4d3b2k4rh5ldc4wvxjvg1z95xawhznv3v0r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/767a685fbe8ae86177e90a17dac3815d41d74df4/recipes/dedukti-mode"; @@ -12552,12 +12573,12 @@ dictcc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "dictcc"; - version = "20151221.357"; + version = "20170207.835"; src = fetchFromGitHub { owner = "cqql"; repo = "dictcc.el"; - rev = "1fd76499cf5d2045e8594aec3c0b62168802f887"; - sha256 = "0b8yg03h5arfl5rlzlg2a6q7nhx452mdyngizjzxlvkmrqnlra4v"; + rev = "a1e87dad68faee956e4614c4f0f0bb98ba81ab6a"; + sha256 = "086nq9ngn06n605s21733456knna2py5dfymm8824zslzz39i8fy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5e867df96915a0c4f22fdccd4e2096878895bda6/recipes/dictcc"; @@ -13768,12 +13789,12 @@ dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix"; - version = "20170201.316"; + version = "20170209.538"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "43a2d386b6c6c314db2a1ab8e772ee68d8256806"; - sha256 = "0qkh35widg3b6cfyv651xx9xyq35r7zjfygcp9wv3w3wcvxdaznk"; + rev = "fc19b2e0c387a545901365a01c4a355bf0504405"; + sha256 = "0qavf6q8gk4sli28rm4wgvwwj28qxd3qkvj921l8sqr49paah0vy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix"; @@ -13793,8 +13814,8 @@ src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "43a2d386b6c6c314db2a1ab8e772ee68d8256806"; - sha256 = "0qkh35widg3b6cfyv651xx9xyq35r7zjfygcp9wv3w3wcvxdaznk"; + rev = "fc19b2e0c387a545901365a01c4a355bf0504405"; + sha256 = "0qavf6q8gk4sli28rm4wgvwwj28qxd3qkvj921l8sqr49paah0vy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil"; @@ -14133,12 +14154,12 @@ docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "docker-tramp"; - version = "20161020.2220"; + version = "20170206.1925"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "docker-tramp.el"; - rev = "d8b510365d8e65551f4f792f251e7212411708c3"; - sha256 = "0lxvzmfg52fhxrhbvp92zwp7cv4i1rlxnkyyzgngj3sjm7y60yvg"; + rev = "8e2b671eff7a81af43b76d9dfcf94ddaa8333a23"; + sha256 = "1lgjvrss25d4hwgygr1amsbkh1l4kgpsdjpxxpyfgil1542haan1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker-tramp"; @@ -14686,7 +14707,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1781698"; + rev = "1782484"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -15290,12 +15311,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, seq }: melpaBuild { pname = "ebib"; - version = "20170118.1625"; + version = "20170208.1223"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "d415b91c91581ff39364384fec35c219cb89d43a"; - sha256 = "13283ymm4av2gk7zj2rsppg6sk0lixy9g4lic4arrm8b5yb0vcsd"; + rev = "1ae554d1b67cb81b96c828e9710a4658db35b9fd"; + sha256 = "0ch8ws46r55rdap67xa40gb9h4llad6wx75iga4fyjzh6fxv9q9d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -15311,12 +15332,12 @@ ebib-handy = callPackage ({ chinese-pyim, ebib, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ebib-handy"; - version = "20161126.140"; + version = "20170208.524"; src = fetchFromGitHub { owner = "tumashu"; repo = "ebib-handy"; - rev = "e4815b2d127300361b8528681d2d36ad5465e574"; - sha256 = "03pnapalpdyfcy4irmxwljpwxmbcgz3dzbxd8b0058gkhzan9vrz"; + rev = "d70731bd02dd86500cb7807d0d11fc05b53d2a69"; + sha256 = "03db4k69qkp4s9xj910ynkq4ky68hs404djsglhlcirdpwj58d80"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8843caa0d80000c70d3b264854f50daac94e6962/recipes/ebib-handy"; @@ -15946,11 +15967,11 @@ }) {}; eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eide"; - version = "20170202.1345"; + version = "20170207.1259"; src = fetchgit { url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git"; - rev = "c812097018143642cf8164309581b805fb947c78"; - sha256 = "0ynxz0xlb2iak8riz404gb4spy6x7xr3rmhsm65apylkmj999g06"; + rev = "756ebff43c4c2393a679ea7d26e22743831d4564"; + sha256 = "135ymq7pc9478dlx6q4nln439r9d64ylmbbykcpisgw6ypn1yzbz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d384f185f76039b06a1b5b12c792b346c6d47a22/recipes/eide"; @@ -15987,12 +16008,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "20170201.751"; + version = "20170209.956"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "0ede9e7ef64017039748b8f47de4df834b0443ed"; - sha256 = "03fm7lhfzrhn4dddlhqx6v1dqfgz6rj352y0znnfdaskzychw1sa"; + rev = "faf61c3cc371a9d4caa2e84687c31e5efb4577e9"; + sha256 = "1rhd7l5pjfg11m6njc6z13p92v3fdswjr354rfrc2p0w03vc6nyb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/215e163755fe391ce1f049622e7b9bf9a8aea95a/recipes/ein"; @@ -16050,12 +16071,12 @@ ejc-sql = callPackage ({ auto-complete, cider, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, spinner }: melpaBuild { pname = "ejc-sql"; - version = "20170201.734"; + version = "20170210.30"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "f9bb4917058a71f92f4a22703d90eecc17354d97"; - sha256 = "14s40q1jf73dql09a1mzpk2q14kl5m4x7y7j4iazh2lca9kf61lz"; + rev = "4046b291dce26148e62fed3974b94489ccc24674"; + sha256 = "127kiplrwf1wkwpjf1fra6j1ic0wwiiza7d4ih47ffs40cq1f91r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; @@ -16180,8 +16201,8 @@ src = fetchFromGitHub { owner = "raxod502"; repo = "el-patch"; - rev = "2714aa06af088155bc3d163f8ebde7d410c0694a"; - sha256 = "0fdf05g6lsjwa1qx5h1yx3lzvkcw26lbn90022jb3f70b38adhf0"; + rev = "df3cb294fdbed717fd7f7fcb8dd917226c5f2d8d"; + sha256 = "01z824qxbqzgggj07x1ryx7mvw0jqq2s9hwg1jn23vzy7fchij44"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2f4f57e0edbae35597aa4a7744d22d2f971d5de5/recipes/el-patch"; @@ -18197,12 +18218,12 @@ epic = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }: melpaBuild { pname = "epic"; - version = "20150503.37"; + version = "20170209.1623"; src = fetchFromGitHub { owner = "yoshinari-nomura"; repo = "epic"; - rev = "02f6472bb490a39d42ed49c0364972173202f6e1"; - sha256 = "18gfi1287skv5xvh12arkvxy2c4fism8bdk42wc5q3y21h8nsiim"; + rev = "a41826c330eb0ea061d58a08cc861b0c4ac8ec4e"; + sha256 = "0mvg52f2y3725hlzqcn2mh8jihnbg68wlqmq951sa3qfma7m40pp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7c7162791d560846fe386746c00a9fe88c8007bb/recipes/epic"; @@ -18742,12 +18763,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "20161129.304"; + version = "20170208.306"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "181d1c60def42e938dc3642cf798a73fa73d1425"; - sha256 = "14fpiyq68nw4z4wykrxhqic0y9ghr7yjx0wx3zff4l001c0lqr4w"; + rev = "47b4abf118e2dac88c5c2cbd531372cc217854ec"; + sha256 = "13fhkkfnvyf938gznl4av9gn7r4yyvw2rv438pabf0d0min37qqf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -18906,12 +18927,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, spark }: melpaBuild { pname = "es-mode"; - version = "20161103.1024"; + version = "20170207.1035"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "673506ec3d9eedc06f1e9f2953ac2720bf66f992"; - sha256 = "07r7zr38hqv0njc8zwdqmslh422kwahri2s7gp56abfk6wc0ndkm"; + rev = "996730ebce57d810d2c275c7fadb11c2b1134dea"; + sha256 = "1qhfnd5anp5qrmravv7ks5ix763xnki2f5jwcyj70qyxwr0l60cg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode"; @@ -19305,12 +19326,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20170118.232"; + version = "20170206.310"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "b67756eb72fc813196e1b1915eeaa36d3ef95ecc"; - sha256 = "1rwvp4gqr0nd81k7125hfgk60m7b2cjwg2ilwfg1ym85cqlqp8l3"; + rev = "2ca23d826dfeeeb248739d68e5528286af3346a5"; + sha256 = "16i6zqnnj4c12y7bfhmk723gffqn05mjc9zs8lyb0c59s6la54c9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -19677,12 +19698,12 @@ evil = callPackage ({ fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: melpaBuild { pname = "evil"; - version = "20160825.1343"; + version = "20170209.1259"; src = fetchFromGitHub { owner = "emacs-evil"; repo = "evil"; - rev = "16eb854e18d1ec79b00a0a49c1f60aed710b303b"; - sha256 = "1n5bm2264fgx9a462yl9nw0rm742x40b0c8w7c21dc8rz4r76a9z"; + rev = "c29c32be3327294036a8a56513836ee515091f16"; + sha256 = "05g7wp9aaf767d4277q86nrz1azhbhlxxc1pncf2f5dmid9pbgbq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil"; @@ -19887,12 +19908,12 @@ evil-ediff = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-ediff"; - version = "20160821.1950"; + version = "20170208.848"; src = fetchFromGitHub { owner = "justbur"; repo = "evil-ediff"; - rev = "81be356eaf5dc9ee1cc624c237007892d7c191f9"; - sha256 = "1x831myijdnzxjfpm1gb8fqfvfwv5ixsaqkax37cim2yf2fbvln1"; + rev = "b77232b82ca0d81f2acd0d3ff60a8b99e0a30460"; + sha256 = "18rlwn2yn6yf11hfhvs76qk3i9l45gry3lpahpsd2gf426hd48mg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/45eb1339792849b80a3ec94b96a88dd36262df2b/recipes/evil-ediff"; @@ -20223,12 +20244,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20170131.2119"; + version = "20170205.1355"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "3ab7942cec9bd8afbc64349ab24f9558934810d5"; - sha256 = "1nyak4vp0h2cjls12sqcgvk07iap6m88zrrlq65702jpcqp9hycj"; + rev = "17a469799a5fe0df8d9b3589c6719634acd065eb"; + sha256 = "0rwz0xg76kvyz959r8bywdbddxaxn69z9lqq95z71qq980w3d4g7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -20307,12 +20328,12 @@ evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "20170203.505"; + version = "20170208.1712"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "e1de1d759bcbd1026aeff8e402a2ef7edf546c0d"; - sha256 = "1zm878w3lmsc76zf8ddvpm3lxsbqdvwcrxjyrhz8amfiw75klja4"; + rev = "01a98a20c536a575ee5bc897f38116155154d5fe"; + sha256 = "160h4qasqr04fnv9w5dar327i074dsyac2md5y7p3hnz1c05skhl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -20811,12 +20832,12 @@ evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-visual-replace"; - version = "20161122.1641"; + version = "20170201.1920"; src = fetchFromGitHub { owner = "troyp"; repo = "evil-visual-replace"; - rev = "f88c8aa9e3a0d7e415bec50dcdf4bc5bb8feee45"; - sha256 = "1rmdjlbh3ah1pcdsd6yzb15g15b10x0py1alfywvyc1p227lv4v8"; + rev = "9bfbaf71898294e25d588a887fb4753641edfbe9"; + sha256 = "00mhqb9rn4hq90x5i44jyq51lg351bv8hdj4c443nxrbldi73k9s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/165aea6697a6041bb83303f3ec8068a537accd4a/recipes/evil-visual-replace"; @@ -21145,12 +21166,12 @@ eziam-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eziam-theme"; - version = "20170130.834"; + version = "20170209.613"; src = fetchFromGitHub { owner = "thblt"; repo = "eziam-theme-emacs"; - rev = "97e2b9d551e92d47a5baf78d6b5399e45eea2ae8"; - sha256 = "0pxxzb2szp0bw7ayj65yfzy5h59dci541k7fs5m7xkzakyyx0b8i"; + rev = "5580dad950d866ff0110c01480b02b792167b83d"; + sha256 = "06ww18igmy7v07gqgw6yn9qb8h76a8mwd43pyi25y615k48ilrg6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e0411583bd4fdbe425eb07de98851136fa1eeb0/recipes/eziam-theme"; @@ -21535,12 +21556,12 @@ fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fcitx"; - version = "20161118.1128"; + version = "20170208.1012"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "fcitx.el"; - rev = "830fa2e665d7bcba8f7e7de754937c1ae6e9b60b"; - sha256 = "0qds4sqj9hppi5dfsfbpvba86fwigjprr75900rb50bb06ql4dqh"; + rev = "ec1d202c11a1c81f7ab0b9cf235d64c68d8e3134"; + sha256 = "1p32lqmnp7k0gck6my1cy4hd5sck28zkfvlg8q23lpkcg1vcsqlx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e8c40f09d9397b3ca32a7ed37203f490497dc984/recipes/fcitx"; @@ -21776,22 +21797,22 @@ license = lib.licenses.free; }; }) {}; - find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }: melpaBuild { pname = "find-by-pinyin-dired"; - version = "20150202.216"; + version = "20170206.208"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "find-by-pinyin-dired"; - rev = "d049cc7f507a6f801c497a3d401b260300874f58"; - sha256 = "18a4ydp30ycx5w80j3xgghclzmzbvrkl2awxixy4aj68nmljk480"; + rev = "2c48434637bd63840fca4d2c6cf9ebd5dd44658f"; + sha256 = "0ial0lbvg0xbrwn8cm68xc5wxj3xgp110y2zgypkdpak8gkv8b5h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0aa68b4603bf4071d7d12b40de0138ecab1989d7/recipes/find-by-pinyin-dired"; sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq"; name = "find-by-pinyin-dired"; }; - packageRequires = []; + packageRequires = [ pinyinlib ]; meta = { homepage = "https://melpa.org/#/find-by-pinyin-dired"; license = lib.licenses.free; @@ -22526,12 +22547,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20170117.1430"; + version = "20170209.1145"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "13fba48c63d4823a19ef5782df8ad3b0e50ecae2"; - sha256 = "0l5p1ih3a5d2g7hwz2yr0adxdvhrvm9174whihqnagbb8lxfvvyq"; + rev = "4c0aa8e00d9419a37dbb58a4faef36ab273b69c3"; + sha256 = "0ridbz5xnxr8lj83xn45h4y5pl09mwl053b3b3vq0z8dh3r8ac7n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -23009,12 +23030,12 @@ flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild }: melpaBuild { pname = "flycheck-flow"; - version = "20170126.1007"; + version = "20170207.605"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-flycheck-flow"; - rev = "da2d0834e1d7b2f1157f579e3ee157db325caae7"; - sha256 = "0nsi5km1f0p6l25i4kylvnzfxz4wi9108k2zsspfshw3b6bbk7mf"; + rev = "090e89455b1f1dcb2de7a2f40c36d2a002417795"; + sha256 = "1vp2mswzxfd88i253l7mx5qj8x1h47fgvgy7dwi31xvp7vr40n6g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d18fb21d8ef9b33aa84bc26f5918e636c5771e5/recipes/flycheck-flow"; @@ -23366,12 +23387,12 @@ flycheck-pkg-config = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "flycheck-pkg-config"; - version = "20170129.1315"; + version = "20170209.1545"; src = fetchFromGitHub { owner = "Wilfred"; repo = "flycheck-pkg-config"; - rev = "c85f543a682cdda1f8c9a2e255c8230257715cb4"; - sha256 = "02xv8w5pgsara2wf6zp6992n52a363kw2xiqdv5kcz8y1bxcliz1"; + rev = "f615b9da412425f65f2818e26970412a7736b178"; + sha256 = "02if6mjxjlbgdsfzgmbn7j65c3zrszr92mnpydbbksg1abqr7146"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b2e88f2f126c9ff8b4261d6adb4c0d8d3049f33/recipes/flycheck-pkg-config"; @@ -24521,12 +24542,12 @@ fn = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fn"; - version = "20170130.1745"; + version = "20170209.1804"; src = fetchFromGitHub { owner = "troyp"; repo = "fn.el"; - rev = "463cd9b82aec7c90a529a98c4fcad636069fd978"; - sha256 = "0pwic988mp4x0x1icklsvkxy8nw72ljz93j8s3cimmic7dslnmza"; + rev = "2842e3c6d1b5c96184fa638c37b25ce5b347a1a6"; + sha256 = "0kxpy87f44gkfzrnhcrprca0irkpddpbw7wbrm4aidw0synpab91"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6d2929604b6dd21d6cf425643927a9c216801dc1/recipes/fn"; @@ -24896,12 +24917,12 @@ forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "forth-mode"; - version = "20170101.1245"; + version = "20170208.2305"; src = fetchFromGitHub { owner = "larsbrinkhoff"; repo = "forth-mode"; - rev = "05e8a027960c77ac5a09bda959889de57ecbb486"; - sha256 = "1s0543dc69ciz6ll7m62kaac92jmpk9yqaa37jrv5lscrp6sgamz"; + rev = "45650c28a2cdc149a4480d5ea754758c75f8eb01"; + sha256 = "14p0qygs2ng0jq7hqnhq3za52pzs8gv8qr75a6ic0irh21mvspzp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e46832079ee34c655835f06bf565ad5a5ab48ebd/recipes/forth-mode"; @@ -25001,10 +25022,10 @@ frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }: melpaBuild { pname = "frame-cmds"; - version = "20170101.950"; + version = "20170207.1045"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/frame-cmds.el"; - sha256 = "0yscijwwm31551ysagysdrryr1w33kg34j3bnrq92mxsmb6i19ad"; + sha256 = "05mdds242vcav9gy15phvlk9q8iy29wnc8bp0c7i6z6bblairfzj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b528544841995045fb1f8344aaaa38946bb3915/recipes/frame-cmds"; @@ -25232,12 +25253,12 @@ fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fstar-mode"; - version = "20170124.521"; + version = "20170209.744"; src = fetchFromGitHub { owner = "FStarLang"; repo = "fstar-mode.el"; - rev = "323271293e82cd03440a8bb6d11077c1c3f5b44b"; - sha256 = "1rxpnlda4r3gc4bb8390a4gscqhxgvbp2gk27l7qyavn0jfxmq0h"; + rev = "826422333deac91b390836a3bb4bb0b696c4f926"; + sha256 = "1zrpz6qdfwa9p7wp5pd0xsax1cvlz0vr177w9bkvwvnax8cy1n42"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e1198ee309675c391c479ce39efcdca23f548d2a/recipes/fstar-mode"; @@ -25256,8 +25277,8 @@ version = "20170107.626"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "f342fd04d9aad172dca83533ab8d3a525f47784f"; - sha256 = "0b3vraxxgxp7x6mz6d25ha6dkgxzy847bdw2157h12f0p7pac0j4"; + rev = "d63c992d97f415ba97b115356d796e2da2dadbe1"; + sha256 = "15scnv8gbinazwf97da7crpmj6nlqi8ai4psk257x9c82p3jyln6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -25710,8 +25731,8 @@ src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "66fa3050e59137763bc207c1cc7eb09922ce2e01"; - sha256 = "1g50iyvcgkkniq9dj6q2b6yw04cja3z97hn85i7b2qrj161yinps"; + rev = "b626fae4f0fbf2ec2bf7df850dd1c8ad15e70b65"; + sha256 = "1p9kwh9yadai0ijn98rag0sln18fj9ciy51p88967bgvbx1rx8x3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -26172,8 +26193,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "b43de68002e77c06e3bc288eca5e849d077864cb"; - sha256 = "00f0g34hmfyjqyy0zmzssani9wppi1bqbbvnqqfxdlcbf7chxr74"; + rev = "ac9c50592722a2f03e6f28e54b9fb05e9460674b"; + sha256 = "0fyb5x22svqxpm7krd061hd2dzd30z2pnkxzqf8lx82j1zapqkqj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -27008,12 +27029,12 @@ gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }: melpaBuild { pname = "gnus-desktop-notify"; - version = "20170130.543"; + version = "20170208.546"; src = fetchFromGitHub { owner = "wavexx"; repo = "gnus-desktop-notify.el"; - rev = "66bfa697c49973f3bbc47bcde2304b1f16d30309"; - sha256 = "1xa9bqr1pbdx8zan81d6phyv473ihlvm8lif594m630hn68b5yw9"; + rev = "8fd980c4a4ba18085ec87a2f0c71875c5d01087f"; + sha256 = "00zh5v24pxkfg240z6c5y9ngsn6rnvmxphiilf84bxxpwn030brk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/gnus-desktop-notify"; @@ -27282,8 +27303,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "d9647672717bb5d507de42975a337c738a0461a3"; - sha256 = "18x01y9qlqmpvyl638ymc1ml6j33xgc0xhig6qfx0y7s484zblm8"; + rev = "5737e59cbac9bc480546766c9502c527fa2be26f"; + sha256 = "089w4qibcxj6x1ssq9c6pwsibrr3dih9k343ncxavhyqvyf9irxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-guru"; @@ -27320,12 +27341,12 @@ go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-mode"; - version = "20161231.1134"; + version = "20170206.1507"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "d9647672717bb5d507de42975a337c738a0461a3"; - sha256 = "18x01y9qlqmpvyl638ymc1ml6j33xgc0xhig6qfx0y7s484zblm8"; + rev = "5737e59cbac9bc480546766c9502c527fa2be26f"; + sha256 = "089w4qibcxj6x1ssq9c6pwsibrr3dih9k343ncxavhyqvyf9irxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0cede3a468b6f7e4ad88e9fa985f0fdee7d195f5/recipes/go-mode"; @@ -27408,8 +27429,8 @@ src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "d9647672717bb5d507de42975a337c738a0461a3"; - sha256 = "18x01y9qlqmpvyl638ymc1ml6j33xgc0xhig6qfx0y7s484zblm8"; + rev = "5737e59cbac9bc480546766c9502c527fa2be26f"; + sha256 = "089w4qibcxj6x1ssq9c6pwsibrr3dih9k343ncxavhyqvyf9irxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d806abe90da9a8951fdb0c31e2167bde13183c5c/recipes/go-rename"; @@ -27618,8 +27639,8 @@ src = fetchFromGitHub { owner = "golang"; repo = "lint"; - rev = "5295072ea38460cda1ff822cf6d30a7bf64329bd"; - sha256 = "1q21ll8ip9zgdc9vqmad96dv39swch2zwkar840yk9ydbv46sbyp"; + rev = "6d7efc48f3ecdd4fdd4035680f25173dbb22fdba"; + sha256 = "1i50sxyvvykdw51iafaw87aj2dwisgj0qcxi5gl1czdfw9x0v06k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint"; @@ -27866,12 +27887,12 @@ gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gotham-theme"; - version = "20161022.848"; + version = "20170210.151"; src = fetchFromGitHub { owner = "wasamasa"; repo = "gotham-theme"; - rev = "223f3771d84f2d5a9f20390e496cecc529f769d6"; - sha256 = "0y28gqmnvbagnv9qp7173bylkbl4sgpy8szzn1s9q46fjysdj8b8"; + rev = "a5bfe13e7bba81d25b32d836c0b870e8f3f6c463"; + sha256 = "02hb0znxwbxlkchlkya4j6hm6p1djza6ajij6d94a7p13dnpmygb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b388de872be397864a1217a330ba80437c287c0/recipes/gotham-theme"; @@ -28291,6 +28312,27 @@ license = lib.licenses.free; }; }) {}; + green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "green-screen-theme"; + version = "20170209.1208"; + src = fetchFromGitHub { + owner = "rbanffy"; + repo = "green-screen-emacs"; + rev = "e47e3eb903b4d9dbcc66342d91915947b35e5e1e"; + sha256 = "0gv434aab9ar624l4r7ky4ksvkchzlgj8pyvkc73kfqcxg084pdn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme"; + sha256 = "0a45xcl74kp3v39bl169sq46mqxiwvvis6jzwcy6yrl2vqqi4mab"; + name = "green-screen-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/green-screen-theme"; + license = lib.licenses.free; + }; + }) {}; gregorio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gregorio-mode"; @@ -28562,12 +28604,12 @@ guess-language = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, typo }: melpaBuild { pname = "guess-language"; - version = "20170204.956"; + version = "20170210.216"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "guess-language.el"; - rev = "8450268f18610e552942641e67bc16f7347fffd5"; - sha256 = "08qqljcvpm76hm57vd8r67w4zjbrdlbkq5mcyhk1qifa38cah52r"; + rev = "9763f9e81892c7dd2f5ffa6e771b356beeefafee"; + sha256 = "07k0cf3n3c9hmrhnj2h6yfp4hbw09qn22a5wq5c54bskfyhrkj4s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6e78cb707943fcaaba0414d7af2af717efce84d0/recipes/guess-language"; @@ -28748,22 +28790,22 @@ license = lib.licenses.free; }; }) {}; - hacker-typer = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + hacker-typer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hacker-typer"; - version = "20170204.838"; + version = "20170206.720"; src = fetchFromGitHub { owner = "therockmandolinist"; repo = "emacs-hacker-typer"; - rev = "baff7225a4ea340b35e341baea3cd2b25e7fc15e"; - sha256 = "0yfngpkc8w5y8sagf4jh126m5dw37hgilyw6h24qw5cvan1ndbz7"; + rev = "d5a23714a4ccc5071580622f278597d5973f40bd"; + sha256 = "13wp7cg9d9ij44inxxyk1knczglxrbfaq50wyhc4x5zfhz5yw7wx"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/561661965a7a500f24671454b3b680816457e180/recipes/hacker-typer"; - sha256 = "0i9kkxcz0fz4yviksl3f0ggh9kpwr9sidg7945r46bmblni3f0j9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8e04a3a1606ea23865c04d93e3dc77cb55b9931f/recipes/hacker-typer"; + sha256 = "128y562cxi8rblnqjdzhqc6b58bxi67f6hz569gqw4jywz0xcd0g"; name = "hacker-typer"; }; - packageRequires = [ async emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/hacker-typer"; license = lib.licenses.free; @@ -28877,12 +28919,12 @@ haml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "haml-mode"; - version = "20170104.2224"; + version = "20170208.28"; src = fetchFromGitHub { owner = "nex3"; repo = "haml-mode"; - rev = "813530d171b233a42f52b97958f1245e1a09c16a"; - sha256 = "0ylpw01g0mwk61rjlv8wc8bqh5y2xh2s7s8avfvcc689hafp7c2j"; + rev = "e232abdb908d92a1a346ee1a7671d4a3121310c5"; + sha256 = "1qqwh28rf94pfcvazs0fl4yjz430aw6sadf07i4r408lq6r089dx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/haml-mode"; @@ -29108,12 +29150,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20170204.556"; + version = "20170209.415"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "f299294968faa2a5115467abc086d04fd4145964"; - sha256 = "0vjhqv72ak6wdz33r7vkmjm4sb9wr0r4zmhpbs8g8g0yisdpgdjk"; + rev = "f430fdce5ff747fb3c6490d29bc6be23d5444480"; + sha256 = "0z31wsbjq67dm8bfb5gcrncp3xif47vxr51gjyprsam9k5ixlmm4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -29376,12 +29418,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20170203.715"; + version = "20170209.513"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "6105ddd0be224e5b60a1a8d8fcdd176a21c76848"; - sha256 = "1i1xk75zs5q1f4z50ywi8l2qnc9vh2hyd01112vjp6qgqspn0kkk"; + rev = "bbd39ac5d2833e50882a8736b846e432aea3a754"; + sha256 = "0px36psp6lp3wih8i8xv0q4yb6c3ps39mkrlc8b8a50zf7bi75x7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -29460,12 +29502,12 @@ helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ag"; - version = "20170127.2155"; + version = "20170209.745"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ag"; - rev = "c925ab0d3e50c100c7a1ffa54c724f39df1ae526"; - sha256 = "0m5cap2ssp2yklvxlrfp3p5admaz3qhhakh81743r4klgkxv0kdk"; + rev = "39ed137823665fca2fa5b215f7c3e8701173f7b7"; + sha256 = "0a6yls52pkqsaj6s5nsi70kzpvssdvb87bfnp8gp26q2y3syx4ni"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag"; @@ -29775,12 +29817,12 @@ helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }: melpaBuild { pname = "helm-cider"; - version = "20170203.1535"; + version = "20170209.2316"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "24972f395de6ee261d01c06301e9b4480f865a9c"; - sha256 = "15qn0xcci4mb8bh6mh4bf80ss8hqj0fzd1mqvhnmihlfww8a3jpd"; + rev = "8e092d0d2e9cf27195296c684b4fab831208b98a"; + sha256 = "081wkmp4mcdszyirgifdn4qzpvc9bz3qkvwnlp0c9jzimkizpgsl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider"; @@ -29943,12 +29985,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20170204.906"; + version = "20170210.5"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "6105ddd0be224e5b60a1a8d8fcdd176a21c76848"; - sha256 = "1i1xk75zs5q1f4z50ywi8l2qnc9vh2hyd01112vjp6qgqspn0kkk"; + rev = "bbd39ac5d2833e50882a8736b846e432aea3a754"; + sha256 = "0px36psp6lp3wih8i8xv0q4yb6c3ps39mkrlc8b8a50zf7bi75x7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -31013,12 +31055,12 @@ helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-make"; - version = "20161109.1107"; + version = "20170206.1323"; src = fetchFromGitHub { owner = "abo-abo"; repo = "helm-make"; - rev = "11744341b10b35200ebb6789de52ce1a79336ef4"; - sha256 = "1kzv11admqzdbswhahh28imkvjhwmp3pggpf5igpi019p8v3y91c"; + rev = "ed406557c814bb2521cf826370e57ffe9d40d33e"; + sha256 = "02dfrr474yza18xvshjx41h1fsk81g950k6p3h4j1hpdqgjkv96k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f25f066c60d4caff1fbf885bc944cac47515ec8/recipes/helm-make"; @@ -31304,6 +31346,27 @@ license = lib.licenses.free; }; }) {}; + helm-perspeen = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, perspeen }: + melpaBuild { + pname = "helm-perspeen"; + version = "20170205.742"; + src = fetchFromGitHub { + owner = "jimo1001"; + repo = "helm-perspeen"; + rev = "9f1cfd4b9a4881e089486a02eeba07c551d5d706"; + sha256 = "1jdcvli9j5q5n4qp4qa5ylyb47mrh3crhbq316qkxk473r8hprlc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/1ee26a57aacbd571da0cfaca2c31eec6ea86a543/recipes/helm-perspeen"; + sha256 = "07cnsfhph807fqyai3by2c5ml9a40gxkq280f27disf8sc45rg1y"; + name = "helm-perspeen"; + }; + packageRequires = [ helm perspeen ]; + meta = { + homepage = "https://melpa.org/#/helm-perspeen"; + license = lib.licenses.free; + }; + }) {}; helm-phpunit = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, phpunit }: melpaBuild { pname = "helm-phpunit"; @@ -31892,6 +31955,27 @@ license = lib.licenses.free; }; }) {}; + helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + melpaBuild { + pname = "helm-tramp"; + version = "20170208.546"; + src = fetchFromGitHub { + owner = "masasam"; + repo = "emacs-helm-tramp"; + rev = "18bb091ed100895a1dfbc3ee1f85c08de541f742"; + sha256 = "12fbpsn7wywgbr1npxv3smb0z5s7j8zpg4s60zs28hz49j8v4058"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4a69f0a17c4efbaea012be8e878af4060fa0c93b/recipes/helm-tramp"; + sha256 = "1113qxl34sf27a88vpvckrfrigp8vnm42nmfrcxz156maa1g9cbv"; + name = "helm-tramp"; + }; + packageRequires = [ emacs helm ]; + meta = { + homepage = "https://melpa.org/#/helm-tramp"; + license = lib.licenses.free; + }; + }) {}; helm-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-unicode"; @@ -32738,12 +32822,12 @@ highlight-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "highlight-thing"; - version = "20160817.126"; + version = "20170207.2239"; src = fetchFromGitHub { owner = "fgeller"; repo = "highlight-thing.el"; - rev = "f9eaebdd80815d1cc30dbf56d8b171da3135ee7c"; - sha256 = "00nvmp8fcc55hmy37wxnwhvg3m85a5fyrqpli9zjgbblckfz1v55"; + rev = "c998172704ac4b96147d862a0eb4a0f97deb5e0a"; + sha256 = "0s441ya0fcw7sv1ah13dh0b0m2rcvf68a442knvnf06a07hpr5sr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/84b6cb403ff9a588771d051e472596f4e3cc974d/recipes/highlight-thing"; @@ -32805,8 +32889,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "2b0b236ab55d1ef629e458882666ca01b7c84ef5"; - sha256 = "17bxdskaqxy6dfcg7nhc1wjwrw4qdmaix64avdkb4lkcsn5n9myv"; + rev = "cd3d3241c7dbd88a0505fb005d4072965c1bfe1f"; + sha256 = "144arwryhp464v8k1w12v87mf70bq372dc4pxvl2giqssmaq7jms"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -33128,12 +33212,12 @@ hledger-mode = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, popup }: melpaBuild { pname = "hledger-mode"; - version = "20170203.1909"; + version = "20170209.938"; src = fetchFromGitHub { owner = "narendraj9"; repo = "hledger-mode"; - rev = "0038c446bfc5cb1b65fc1b3e181f8d57e73887fe"; - sha256 = "1z2251slpymbrqh09ismyq36kd34s81a677i26b9jzcd4x4ns4bb"; + rev = "76d60bd3f740aabc8c9d3e25240aa71bb20f7d2b"; + sha256 = "1wwj9sqjhkjdwn69nd5h9mmrqb42d7c066bl3f7szmg6mhwgffw3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c656975c61396d8d4ded0f13ab52b17ccc238408/recipes/hledger-mode"; @@ -34585,12 +34669,12 @@ iflipb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iflipb"; - version = "20141123.1316"; + version = "20170205.200"; src = fetchFromGitHub { owner = "jrosdahl"; repo = "iflipb"; - rev = "2e0d1719abeec7982341761ee5dabb01574e6862"; - sha256 = "18rlyjsn9w0zbs0c002s84qzark3rrcmjn9vq4nap7i6zpaq8hki"; + rev = "8eb478535aa4847b94ea4ce29d9476a6b652be2b"; + sha256 = "0plvjg1nkq37mpdbli2fyqhvabzi18mq5kjrgxk9d6s6ki2m26kq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fad6fc8bc3c0be0d5789a0d7626ebc3f298b4318/recipes/iflipb"; @@ -35601,12 +35685,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20170203.248"; + version = "20170206.1238"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "bde85cc8af5d9b038bb58acc0763ef0be7278675"; - sha256 = "0lhcq4cl8vx9bvcl2ab4iv4bqiw49jpc20kkj54ms40npfgfjksc"; + rev = "9cd5e5047cb0147f50bc722bb748e9b55ae89fa2"; + sha256 = "1j6r8nswgnjd343dlvf4b43sym7cypw6m54gzdg9sbgqgr51avbc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -35933,10 +36017,10 @@ }) {}; isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-plus"; - version = "20170101.2341"; + version = "20170207.2149"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "0iagsqqsxjxz0j30ljynwjpjn6i5klaxka4ygrsbxh0ys6cv5yfh"; + sha256 = "1h2pn8qvxpnn2y0h54fijgqb47l047hq5g2n42x0nmiky2hjqras"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+"; @@ -35991,12 +36075,12 @@ isend-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "isend-mode"; - version = "20130419.258"; + version = "20170208.110"; src = fetchFromGitHub { owner = "ffevotte"; repo = "isend-mode.el"; - rev = "274163f5c42834ce0391fcc8800e169104ad518f"; - sha256 = "022j39r2vvppnh3p5rp9i4cgc3lg24ksjcmcjmbmna1vf624izn0"; + rev = "95ba9e71390858bf706b148276f37428dd2774d2"; + sha256 = "0njfglyspdl7jzybvi67wlqrdfbqhfv36fx48yz5v16018pd856h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ef6e4dab78a4c333647a85ed07a81da8083ec0c/recipes/isend-mode"; @@ -36096,12 +36180,12 @@ iterator = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iterator"; - version = "20160406.1206"; + version = "20170207.38"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "iterator"; - rev = "1523f1dcbf4086e91561ec5dec4c2f6fcba778bd"; - sha256 = "006lw8zjxz0702wlrs0nb0ijwh5air3yc3cam7dbkyy7mh632vhi"; + rev = "9da54f9aed945b46866782cdf962c9e530419297"; + sha256 = "0r50hdyr9s18p7ggiyv36g011jgg47bgszvjgcmpp23rz131mxyw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66aa4c3b43083a0098ee3163005dcc36d7251146/recipes/iterator"; @@ -36159,12 +36243,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20170202.223"; + version = "20170208.956"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "7c73f7166486eeca829446a62efdb9520802ebea"; - sha256 = "0q8wjynrlq2n6wf0x2nnmvj9h1i2pl39xpz6b7f3jbm7720182ld"; + rev = "d23d1feefccd658f013cbf7d1b052767bed9b2b6"; + sha256 = "0fffs5l45hrz7qv4gxwdn4prabl49zgx74daxyflrlkmbffy0gr4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -36247,8 +36331,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "7c73f7166486eeca829446a62efdb9520802ebea"; - sha256 = "0q8wjynrlq2n6wf0x2nnmvj9h1i2pl39xpz6b7f3jbm7720182ld"; + rev = "d23d1feefccd658f013cbf7d1b052767bed9b2b6"; + sha256 = "0fffs5l45hrz7qv4gxwdn4prabl49zgx74daxyflrlkmbffy0gr4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -36850,12 +36934,12 @@ jdee = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, memoize }: melpaBuild { pname = "jdee"; - version = "20170122.800"; + version = "20170209.1026"; src = fetchFromGitHub { owner = "jdee-emacs"; repo = "jdee"; - rev = "09d0d4981fe340e7608cd2e1af3d7e72a87edb92"; - sha256 = "01c9w0qfx5yvbfj3yz2xys8w9gy3nnp5iqhcqnkb2y76syn6w4qk"; + rev = "60bf9339d1871e06e37865b58be4b6716d081a7c"; + sha256 = "09hv4pm5p1m4wpr7wfvxda6w1y5wacg6apbn90c6w0zgivq89k4i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a6d2c98f3bf2075e33d95c7befe205df802e798d/recipes/jdee"; @@ -38398,8 +38482,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "57d41c920997ae2b373b0bfa57862845d99337fb"; - sha256 = "1pb3kid4jb5fr37n2p19h7yvnip9gmp1gjjkbaz7k176r73bf16q"; + rev = "b15c6507a60ed3ef6dc3cb9489ddc8ca6ebba4b2"; + sha256 = "0bkk8cld7g0id0xs7ql6piyzdng6rzn4w0i3xlkhlq759mv413dg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -38478,12 +38562,12 @@ kodi-remote = callPackage ({ fetchFromGitHub, fetchurl, json ? null, let-alist, lib, melpaBuild, request }: melpaBuild { pname = "kodi-remote"; - version = "20161126.1914"; + version = "20170206.1833"; src = fetchFromGitHub { owner = "spiderbit"; repo = "kodi-remote.el"; - rev = "ddb4e59bcbac9d198f0ba6c5e8acebb4c5005946"; - sha256 = "0gkg0n71fg74a95ckpblizwlp3a59iqqlcq7ix0q6055q6gcvixc"; + rev = "f028d330e0220d7719f1504ad3b25bab9c1b8e4a"; + sha256 = "0pmchrsw59ng8vilgml7ba5b17bwh0ac4b31s55nhy3f59l7y0d1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08f06dd824e67250afafdecc25128ba794ca971f/recipes/kodi-remote"; @@ -39083,12 +39167,12 @@ ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20170202.448"; + version = "20170208.425"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "63b47814b0f44fdd2c5e3a16144588a78923ec55"; - sha256 = "0ng4giaz54iycp3lcvfzfvfpl0cr1w3m0qrz19kdgk7p3ag1c8in"; + rev = "574093b4bdbf4854f7a661556ec9ebfe5a9a9611"; + sha256 = "0irxj5w6yrqbyr9js1mp3fh19cfwijd7brpvzas6j7v3fb0mf7zx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode"; @@ -39336,8 +39420,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "fefa5e03592513d0e435650df52a53f861ce7b04"; - sha256 = "0sxlcy19bds9yjpcsx731h69w8q2xs8gl3vbk33h2qq5imhd0q18"; + rev = "332f39d3fef443ef2d869b6a393e8a1c16a7e1f9"; + sha256 = "11n8d8rbjgi3wfhcwidavg3wfsn1fvdzpqi4s3m8lqc2gq2srccn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -39649,12 +39733,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20170203.2342"; + version = "20170209.125"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "5c160ffc38caa1e62614550e9e74981163f07c2c"; - sha256 = "0p2z907wy090fq4ln0mysflwqialxs0hpvi85j4k8hwfrpir0yl6"; + rev = "205cd556621d5d1db0c6e9f2608a80fc014b492d"; + sha256 = "080azhzp6gd1ihkd6ydbcrqzrhggprwn08n9pz7ms0cd75vwxj9k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -39691,12 +39775,12 @@ lispyville = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, lispy, melpaBuild }: melpaBuild { pname = "lispyville"; - version = "20170120.2353"; + version = "20170205.1833"; src = fetchFromGitHub { owner = "noctuid"; repo = "lispyville"; - rev = "8b6e97c906e87203c8034bfda35aa95f2fc02109"; - sha256 = "16r4p4fh2i41ai0bsppdhyk1w6sb1l8hjbs0apv20f4jssv36hjs"; + rev = "3ba91c5908484188971e952d98256139123c4cbe"; + sha256 = "15zfpa2bd80537vcmlp4i39rpxvn6396wynh7sa9yiwrnq246sj6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5d96d3603dc328467fcce29d3ac1b0a02833d51/recipes/lispyville"; @@ -39962,12 +40046,12 @@ live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "live-py-mode"; - version = "20170203.2106"; + version = "20170209.2119"; src = fetchFromGitHub { owner = "donkirkby"; repo = "live-py-plugin"; - rev = "2134cfef9c7194a2f7b093e037374673e03d2267"; - sha256 = "1q4vskmkpwk10lwxvhsf4f5p43pjfkh2pvnjip95dp6vn5hgc1p2"; + rev = "61822a570283987d93543a4fd230c738813072cf"; + sha256 = "1chf8vkr3sn3i63q1rzpn3cxw16fqv29bbhrzw64scgdjqjn796w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7615237e80b46b5c50cb51a3ed5b07d92566fb7/recipes/live-py-mode"; @@ -40049,8 +40133,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "e6120c3c7f5ba8ac0ab6e087c794b1881aa2ef24"; - sha256 = "1mhcm8id257jdwa4qvyh90a125nfkz33mjwysa21iqqp6fhy4qgy"; + rev = "7f4371b614a6e25f0efd2133d11d631329eba1fb"; + sha256 = "0wa86zmbs3i8v50yvww5anzl29194vfkgn9zdh24vkzwxlshfmwk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -40710,12 +40794,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20170203.1633"; + version = "20170208.834"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "b43de68002e77c06e3bc288eca5e849d077864cb"; - sha256 = "00f0g34hmfyjqyy0zmzssani9wppi1bqbbvnqqfxdlcbf7chxr74"; + rev = "ac9c50592722a2f03e6f28e54b9fb05e9460674b"; + sha256 = "0fyb5x22svqxpm7krd061hd2dzd30z2pnkxzqf8lx82j1zapqkqj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -40761,14 +40845,14 @@ pname = "magit-filenotify"; version = "20151116.1540"; src = fetchFromGitHub { - owner = "emacsorphanage"; + owner = "ruediger"; repo = "magit-filenotify"; rev = "c0865b3c41af20b6cd89de23d3b0beb54c8401a4"; sha256 = "0nkxxhxkhy314jv1l3hza84vigl8q7fc8hjjvrx58gfgsfgifx6r"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/41aeebef8ed914fb378fef13ba47572accee332c/recipes/magit-filenotify"; - sha256 = "0bbw6ay3csbc5zc6wa9p9nxpbxl3k35xz9jwqlw8mgz2b1xq083d"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ca5541d2ce3553e9ade2c1ec1c0d78103dfd0c4d/recipes/magit-filenotify"; + sha256 = "1ihk5yi6psqkccpi2bq2h70kn7k874zl7wcinjaq21lirk4z7bvn"; name = "magit-filenotify"; }; packageRequires = [ emacs magit ]; @@ -40885,12 +40969,12 @@ magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magit-popup"; - version = "20170128.745"; + version = "20170209.1031"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "b43de68002e77c06e3bc288eca5e849d077864cb"; - sha256 = "00f0g34hmfyjqyy0zmzssani9wppi1bqbbvnqqfxdlcbf7chxr74"; + rev = "ac9c50592722a2f03e6f28e54b9fb05e9460674b"; + sha256 = "0fyb5x22svqxpm7krd061hd2dzd30z2pnkxzqf8lx82j1zapqkqj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -41092,22 +41176,22 @@ license = lib.licenses.free; }; }) {}; - major-mode-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + major-mode-icons = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "major-mode-icons"; - version = "20170130.108"; + version = "20170208.40"; src = fetchFromGitHub { owner = "stardiviner"; repo = "major-mode-icons"; - rev = "278e11182c900ea5bed7004e015ef18e383e40bb"; - sha256 = "13dfm08w2l8fxmb77pz33yf410hmb1606fy8avslsflaczdm67kw"; + rev = "8773a4d01a77f0562373633692c8ded0305aa374"; + sha256 = "1pqbqybv21j4a9h5spyv780khky80n5bwvh1dg9sqia47kf3z5ak"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c8f551bec8bdc5dee4b31edea0c2f92b3c77ec56/recipes/major-mode-icons"; sha256 = "02p5h9q2j7z3wcmvkbqbbzzk3lyfdq43psppy9x9ypic9fij8j95"; name = "major-mode-icons"; }; - packageRequires = [ emacs ]; + packageRequires = [ emacs powerline ]; meta = { homepage = "https://melpa.org/#/major-mode-icons"; license = lib.licenses.free; @@ -41137,12 +41221,12 @@ make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "make-it-so"; - version = "20161009.43"; + version = "20170206.741"; src = fetchFromGitHub { owner = "abo-abo"; repo = "make-it-so"; - rev = "9e10518a2fed8a4a5961b6abad50ef92b4747600"; - sha256 = "0ilqa7jdfzyhjjnxn69cx93nj3py429jwyg8rgzas87kjk9qiv7m"; + rev = "c674b25e6b3eb7c848a62727e69bdafdc92a37be"; + sha256 = "1qjcwvqbxl0iqlbwcisqmq2m3giwkm2sq5i2a5crrwhzxjasbbsj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aad592089ed2200e2f8c5191e8adeac1db4bce54/recipes/make-it-so"; @@ -41347,12 +41431,12 @@ mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }: melpaBuild { pname = "mandoku"; - version = "20170204.332"; + version = "20170210.348"; src = fetchFromGitHub { owner = "mandoku"; repo = "mandoku"; - rev = "5c4320254840dfeee410c46ab36ba94fa2efb6e1"; - sha256 = "1wy2xs87ndvsg821chq9apnvh2l6ny2bdq815fqw1kyr3ml5x8mk"; + rev = "2727f2b1b217764e8217fb0db9ab87a8bcc80201"; + sha256 = "1lxmxka6jg3ma6nmg5b4b6a2lz94in43pgb7gh1kprwl3i13578w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1aac4ae2c908de2c44624fb22a3f5ccf0b7a4912/recipes/mandoku"; @@ -41470,6 +41554,27 @@ license = lib.licenses.free; }; }) {}; + markdown-edit-indirect = callPackage ({ edit-indirect, emacs, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }: + melpaBuild { + pname = "markdown-edit-indirect"; + version = "20170208.722"; + src = fetchFromGitHub { + owner = "emacs-pe"; + repo = "markdown-edit-indirect.el"; + rev = "f617397e5f1a77d87a1d189f66c5a2f012f66b4d"; + sha256 = "00l6mkvsfq37jy3c7qmw4ca5h0an9326ambrkrna4ii03qlshqik"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fa4da9d5c63da3bd777101098168696f5c4d3fbc/recipes/markdown-edit-indirect"; + sha256 = "19038vb6ph7l9w1yv8pszyd13ac38l44vb46l9jmgyby773m7644"; + name = "markdown-edit-indirect"; + }; + packageRequires = [ edit-indirect emacs markdown-mode ]; + meta = { + homepage = "https://melpa.org/#/markdown-edit-indirect"; + license = lib.licenses.free; + }; + }) {}; markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; @@ -43176,10 +43281,10 @@ }) {}; modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "modeline-posn"; - version = "20170114.1554"; + version = "20170205.926"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/modeline-posn.el"; - sha256 = "068kdgzzv76ls5hyxs77vzm5ai7x8zcsmhjk78pmfirfrjrxcjgf"; + sha256 = "085q998d7b4i3ay5cg4dcny7jw8a3hbvx2hifshwx4cck10p8f8b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c62008950ea27b5a47363810f57063c1915b7c39/recipes/modeline-posn"; @@ -45062,12 +45167,12 @@ neotree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "20170201.712"; + version = "20170206.804"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "b7479d0d96e44983917c7e3546bee2e215bb4a30"; - sha256 = "09cjnybyd9mgvy9vn1hd3r0fzmxla5ijpa83mx5ddjbig10wrva1"; + rev = "ab9a1559d01857252b85d787666ea24a103003b4"; + sha256 = "04473ay2hcpw696x9k2gh1dvj2h4nb898q4g3nf3b0rdg2cpb250"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; @@ -45360,8 +45465,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "1351b0df87a0984914769c5dc76489618b3a3fec"; - sha256 = "09zvphzik9pypi1bnjs0v83qwgl5cfb5w0c788jlr5wbd8x3crv1"; + rev = "4724903c78e80481fc63d627081fac6a98e4205d"; + sha256 = "1wqyha271xvlyjmk4ygqhdj8m8gcz2f9npknpz5vriqnpv22hwmr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -45482,12 +45587,12 @@ no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "no-littering"; - version = "20170122.942"; + version = "20170206.33"; src = fetchFromGitHub { owner = "tarsius"; repo = "no-littering"; - rev = "87fffa1973376bd1837fcf84277cd16db9c96957"; - sha256 = "1nfllm98d0893wk49fkijc071pg3v3qmpy4apyppj88k6m58y573"; + rev = "1a6ca91e4a2cb48cccc989b6473191f42b606ab6"; + sha256 = "1kd65x4bg9xrqp7241yxs352p2hiwa5hnggi2sw4718wcfbim1zw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering"; @@ -47473,12 +47578,12 @@ org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-board"; - version = "20170103.239"; + version = "20170207.634"; src = fetchFromGitHub { owner = "scallywag"; repo = "org-board"; - rev = "55c52745f6f156062a7187795b6b0c6aaa1f1e2b"; - sha256 = "0ca8lbm5gzcmpzwnghs0f8klxrz5sy1brw78h7rhpv4rdwfw1ji5"; + rev = "7f07d1bb5758a28f7e1618a14281ad4da71c26e2"; + sha256 = "18ngnd4fkh59az0mj4lgvp5zil56qxn01d9aif6n6xszfcbgsnj1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8063ee17586d9b1e7415f7b924239826b81ab08/recipes/org-board"; @@ -48123,12 +48228,12 @@ org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "20170117.2024"; + version = "20170207.2145"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "8d3a36c68a948676cfc0512c68200fb2e9456508"; - sha256 = "0pp05wxbn627y1yapya2phda2s3ddgcblvqyzv5i6q231slc3c69"; + rev = "e665315fc041851e19c759e51173f9ddc0445512"; + sha256 = "0fgir67cm6gmwj80gmhblg9j7pp6qvkksm9qnsdj2r5q1c9s33kc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; @@ -48210,8 +48315,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "de58e0ae3351f4333752da07ad13db549b2a44bc"; - sha256 = "176i7pwljwwq5dy7ch39ydk87njjmcqdxb55zpyhdg8bimvkg4xy"; + rev = "eb59c75f394ddec8f0714ccff3e9a6280ee1898d"; + sha256 = "0sk3232jgrnfjxix8mrrcq8zwxww16iy6vpsq5njh8avqdf6mi9n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -48230,8 +48335,8 @@ version = "20170105.1723"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "de58e0ae3351f4333752da07ad13db549b2a44bc"; - sha256 = "176i7pwljwwq5dy7ch39ydk87njjmcqdxb55zpyhdg8bimvkg4xy"; + rev = "eb59c75f394ddec8f0714ccff3e9a6280ee1898d"; + sha256 = "0sk3232jgrnfjxix8mrrcq8zwxww16iy6vpsq5njh8avqdf6mi9n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -48247,12 +48352,12 @@ org-mime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "20170204.531"; + version = "20170205.149"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "91d8f487755a3b7159891e4da77ccfa7ff2836f4"; - sha256 = "164gqknhb1ddfafkafjdr2a2a34m71sm8pbglfh5q0qg52f832za"; + rev = "a0b82a6c1a0dbcf5b7bebfe2e5817d54a1cd3cc8"; + sha256 = "11wldx6c53ncw3pmdwxn31q82vkcffqvr2cfphl5bhb4q8r5lrjn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; @@ -48352,12 +48457,12 @@ org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, git, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "org-page"; - version = "20161121.2129"; + version = "20170206.1845"; src = fetchFromGitHub { owner = "kelvinh"; repo = "org-page"; - rev = "bef1e2fbcb60e85b3d27887fb0c6c988a18a0b59"; - sha256 = "1yhy98rg7zqj91hkabkf00mzgzk9cb5mvp5mad09gfy9ijkkm6sg"; + rev = "c2f54f310e0f50b5ca291a45356717e932505bb5"; + sha256 = "1q76daimscr2mp0wi6cp0mbph7cp4gdm818cdi76rsz48xa83gxi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/872f163d4da58760009001472e2240f00d4d2d89/recipes/org-page"; @@ -48405,8 +48510,8 @@ version = "20170124.549"; src = fetchgit { url = "https://git.leafac.com/org-password-manager"; - rev = "ec862fa9680aa37b18a7e937e84472a5bdd94635"; - sha256 = "1ia7sjnd6z6x2m2cbf17md2adbsbnfg30z8aalb991avv9bj9lm2"; + rev = "a982506652a2f5f4afeb338238e724d361cbc74d"; + sha256 = "0x9f0vlgawbvga56yj95pdcx1j9r51ax76xsbbyrir0iyawgh258"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02ef86ffe6923921cc1246e51ad8db87faa00ecb/recipes/org-password-manager"; @@ -48617,12 +48722,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20170130.1818"; + version = "20170209.623"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "ad34032f07a8eac49f091824ac80b7752e8bdf74"; - sha256 = "03869nki9c0msmqclm7mgsqnhdbkp0xahnpk8h9d7zldqiqck0x7"; + rev = "2d9c53509e6930d8857ac74ef710637b7c34d77c"; + sha256 = "1ja8b60w5snnkks94qb63fy6rscwcpkx3anaq6z9fdv78yjbx1x1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -49369,12 +49474,12 @@ osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-dictionary"; - version = "20161207.810"; + version = "20170208.505"; src = fetchFromGitHub { owner = "xuchunyang"; repo = "osx-dictionary.el"; - rev = "0e5e5f1b0077a62673855889d529dd4f0cc8f665"; - sha256 = "1zpr50q7i4wg1x7vsj69rh1b8xvk9r0591y4fvvs3a2l1llca2mq"; + rev = "ec16c40cc4db0140db1cf6ad1fb1198c7c344b2b"; + sha256 = "0n09s09qaqwdrpd4dgxj16bh3lgc8nzdld49z8zkipf3cfh5v040"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ae4467ad646d663f0266f39a76f9764004903424/recipes/osx-dictionary"; @@ -49642,12 +49747,12 @@ overseer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "overseer"; - version = "20160517.2343"; + version = "20170207.2241"; src = fetchFromGitHub { owner = "tonini"; repo = "overseer.el"; - rev = "817c2d4c40071f1cd11fc91c60a1eb44c9f1543f"; - sha256 = "0pzrsag2hxg4kys57w2ragk6kfrpilaamwrzw0czi53r6vmddfdp"; + rev = "3269801dc5145d41c11599430229340e6dfa6cc6"; + sha256 = "1zjp1bw7ipg4ibabrc0wzzsvd4jydjq571768v2hdpzcdw36d8f7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82e6b86f20a2d2d687b13091da31150c467bf271/recipes/overseer"; @@ -49730,8 +49835,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "18d63e2823ad481414499d070623f898f9c0ba3a"; - sha256 = "0k4ddlhpjinc5h0ajv58qjgj28b3zp6nhk6ivi8ygivxin228r00"; + rev = "f0eae25e9d5c7e426551c2ae2ba5695f0df2cff2"; + sha256 = "1lxh2zangf0r8xd11h9fja6jcgxfs6miw2n5r89z92nj0b0vsh3g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -51018,6 +51123,27 @@ license = lib.licenses.free; }; }) {}; + pastery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + melpaBuild { + pname = "pastery"; + version = "20170206.1934"; + src = fetchFromGitHub { + owner = "diasbruno"; + repo = "pastery.el"; + rev = "3f60a2660613c09be5a0b6e299828b44ee3c8732"; + sha256 = "1dzbkiy2qjdq4isrpiwj25qj069nhydzngg6avyh2c2qmxkibjsr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6058218450071db0af9a5b8ce8ec09a735c4ab66/recipes/pastery"; + sha256 = "006qawjc86spbbs2pxvhg9w94rcsxap577cndqwaiw1k0cc8vkhp"; + name = "pastery"; + }; + packageRequires = [ emacs request ]; + meta = { + homepage = "https://melpa.org/#/pastery"; + license = lib.licenses.free; + }; + }) {}; path-headerline-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "path-headerline-mode"; @@ -51671,12 +51797,12 @@ perspeen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "perspeen"; - version = "20170121.1844"; + version = "20170205.300"; src = fetchFromGitHub { owner = "seudut"; repo = "perspeen"; - rev = "beff7fd743b0fcbc1091e1e9d28688e52962225e"; - sha256 = "0csa5cqbzj3kggl10bf6mcq4v3nq9y282hlk68p6qbz79injg7bv"; + rev = "8fc32cf57fe8f38bf47e8bce99058ba3cc2561ad"; + sha256 = "1n69jshs35cafx6p7ibdr1mqzbp2k1gdknb1k9f9nfzasr0nma56"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19bead132fbc4c179bfe8720c28424028c9c1323/recipes/perspeen"; @@ -51773,6 +51899,27 @@ license = lib.licenses.free; }; }) {}; + phan = callPackage ({ composer, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "phan"; + version = "20170205.604"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "phan.el"; + rev = "6442663bf7618bc614b6c47b0ad7bc591c68f947"; + sha256 = "0s38vbnsbpazca0jsahjmms7qgq74gsvfn2zkrfkhx9y8cpfxrrb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d591d9ba70b1e32f25204ad9409aad78fd68a93c/recipes/phan"; + sha256 = "16r1d2bgbb2y7l141sw7nzhx0s50gzwq5ang00y7f4sfldqvshzf"; + name = "phan"; + }; + packageRequires = [ composer emacs f ]; + meta = { + homepage = "https://melpa.org/#/phan"; + license = lib.licenses.free; + }; + }) {}; phi-autopair = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }: melpaBuild { pname = "phi-autopair"; @@ -51797,12 +51944,12 @@ phi-grep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phi-grep"; - version = "20150212.724"; + version = "20170206.2055"; src = fetchFromGitHub { owner = "zk-phi"; repo = "phi-grep"; - rev = "9f1eb3548311816920864a171de303245a001301"; - sha256 = "1rchxhp4kji5kbg8kzkzdbfy8sdbgbqd5g59cch7ia9agh5jvwyx"; + rev = "efccc26f3beb6a3d8c1b655c31aa3c457115cfa4"; + sha256 = "0r67zzc6b2f330zixywxcy4xxd9hxww7x77brrs242bcgi2d7ryc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/992655fa4bd209abdf1149572e95f853e595125e/recipes/phi-grep"; @@ -52053,8 +52200,8 @@ src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "e41a44f39d5d78acc2bd59d2a614f5fc9ff80cd3"; - sha256 = "0ykdi8k6qj97r6nx9icd5idakksw1p10digfgl8r8z4qgwb00gcr"; + rev = "2a335398928a4fdab24335ed7aceed95c1bd0871"; + sha256 = "0i8ns9jncih3s33wv66gkd45brixlc4smbssb3j47dqp3drpn0nw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -53998,22 +54145,22 @@ license = lib.licenses.free; }; }) {}; - projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "projectile-variable"; - version = "20161109.625"; + version = "20170208.918"; src = fetchFromGitHub { owner = "zonuexe"; repo = "projectile-variable"; - rev = "dedd0f1669d9498d59231912c4ee80a1080ac93b"; - sha256 = "1wmwy5iamc2g5grhshss0cmxjspz83kl8iclkv42c4vc1l1nsgfw"; + rev = "8d348ac70bdd6dc320c13a12941b32b38140e264"; + sha256 = "0l38nldx6lwjb7mxixykiyj10xwb35249dxfg0k2wkmb2vy1fkxs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ff603b43235f546cd47f72e675aee88d5f41e855/recipes/projectile-variable"; sha256 = "1cj8nwxf1jp5q5zzxp92fxla6jhwzd21gw649ar6mygi4hgymsji"; name = "projectile-variable"; }; - packageRequires = [ cl-lib emacs projectile ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/projectile-variable"; license = lib.licenses.free; @@ -54085,12 +54232,12 @@ promise = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "promise"; - version = "20170203.2139"; + version = "20170208.348"; src = fetchFromGitHub { owner = "chuntaro"; repo = "emacs-promise"; - rev = "8b176ba4354e9b6e6c2fa87231b85424c25c511c"; - sha256 = "11mx0gcyi4dmhh45n6r93xqvi9s94dhx7ii1iy4g35f4ki2cqfdx"; + rev = "06161da00e73afa013f3de59f2cf2a2d5a721f36"; + sha256 = "13k6cj3igvslwwiar92vg58vr8jd24ns927xxxjjb5wdgzvbj5i9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3eaf5ac668008759677b9cc6f11406abd573012a/recipes/promise"; @@ -54215,8 +54362,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "39756643df2f88805649595e651b719c8f5a4dea"; - sha256 = "012d27q0b9cw1jahi47k0473w96l1wp6sr4rcm5ywa29nxrirgg0"; + rev = "c6e0d0e7f3dca63c006edae515dfca2a89b9c1e4"; + sha256 = "00808ymwd7y0qq3xkyxkn3bvmp806qwd6jil3x4kqhymnwqnah7g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -54323,22 +54470,22 @@ license = lib.licenses.free; }; }) {}; - psysh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + psysh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "psysh"; - version = "20160711.1048"; + version = "20170205.1142"; src = fetchFromGitHub { owner = "zonuexe"; repo = "psysh.el"; - rev = "6932f03447c3d821e4c03e99f1630928f0979452"; - sha256 = "00dssrdsdvwdg6a6fwl3wv0y94axcd4jb3b3ndd1p3bcr56fxq49"; + rev = "429b59ba8fd5ac7b6d3c6c4e3ad72867062c96db"; + sha256 = "0ldv1lyra05g91hdsif131x7yqdmwld8hdpg4h3qi040kls9bix1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b3131d9a0ad359f15bc3550868a12f02476449a/recipes/psysh"; sha256 = "0ygnfmfx1ifppg6j3vfz10srbcpr5ird2bhw6pvydijxkyd75vy5"; name = "psysh"; }; - packageRequires = []; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/psysh"; license = lib.licenses.free; @@ -54958,8 +55105,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "854bfe802145355a659e0b1ec068d31d8000988d"; - sha256 = "1hc17wqg5sp51j0k8iv7m0xkc483ay514c2mfc5nkbrq6kxz05dq"; + rev = "a59a1581571c8f27708778a9ded58435c05f7703"; + sha256 = "0r3pwq7hy8cawljk63lm239cjf4q9zfs1cmhjaq493dd9xjizwms"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -55101,12 +55248,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20170203.606"; + version = "20170208.237"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "7df57bba67d5c8aab9382d41a28018d1e0fda891"; - sha256 = "1jyk8y7yijxwn0196fz75yxxmd8s53r240wi3555g3fr2898x16x"; + rev = "ad91fe544cc8f361c718ca8a538bd44a4fb331d8"; + sha256 = "1wcgaydw7fnix5c5ka2lkjliznbavls51sgzq5l5s6l48190a7l9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -55311,12 +55458,12 @@ quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }: melpaBuild { pname = "quelpa"; - version = "20160818.2249"; + version = "20170205.2155"; src = fetchFromGitHub { owner = "quelpa"; repo = "quelpa"; - rev = "d68a45fe0c4a1d4125b98adbeab65e3c8a30e908"; - sha256 = "16sva8zl0hv6a6cr63d1g9038c304x6qxqgip117zxy1w36cfzdl"; + rev = "c1fe1dce4740ca1fcc3ac4c72db6999579d867a1"; + sha256 = "1m0mx8marrhc3wb925x66rpr15ynax2vx0crljqqsxk04bralj27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7dc3ba4f3efbf66142bf946d9cd31ff0c7a0b60e/recipes/quelpa"; @@ -55773,12 +55920,12 @@ ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ranger"; - version = "20161002.2336"; + version = "20170207.2133"; src = fetchFromGitHub { owner = "ralesi"; repo = "ranger.el"; - rev = "584e4ae8cce1c54a44b40dd4c77fbb2f06d73ecb"; - sha256 = "01rphv92g1r0cw5bwkbrh02s0na7fjrddxx1dckk2y7qr97s7l8j"; + rev = "efd54e6090114138f6b3acaf21168eca29363cd4"; + sha256 = "02hi45xd6vgaj98v772nmwhwqzlz68d9h5ywndp3i18zddnpr9y7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger"; @@ -57235,12 +57382,12 @@ reverse-im = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "reverse-im"; - version = "20160813.208"; + version = "20170209.556"; src = fetchFromGitHub { owner = "a13"; repo = "reverse-im.el"; - rev = "76a391a26957eaf5030f85cb0f302a45ea771df1"; - sha256 = "0vjw7l0zgvailxvn1jqfn66hp7bzfixkd0qz75q7dg1b61fzz067"; + rev = "47033e0597675a45d2b6852682e392e848a51af8"; + sha256 = "0kd55p8hl7mhcbsqxhqqyfkzq31cnk4aaqzrka681dk6d1xzk8z5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f282ebbed8ad01b63b0e708ab273db51bf65fdbb/recipes/reverse-im"; @@ -57358,12 +57505,12 @@ rg = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "20170121.945"; + version = "20170206.833"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "be8a125addb795a8f695c1064a4e0a90549ba4bf"; - sha256 = "019h11faj6fzz54gpilxcqbl78wx9vfpqmwn31y5syjmjp9d3fxx"; + rev = "ec9eb5240191612debf0392ee7a7f491c7dae27e"; + sha256 = "0773d0n5jq42yr5p1xbbfji027j0kw4msv1p8b7zk82ij1yc7hyr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -57761,8 +57908,8 @@ src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "9f9e3d1e915927a2e4202b411933261cc1599b4d"; - sha256 = "1fzaaj5y9p13x3laycacxidf4lmhb9pz210w1iqlavyjsf6vdw6g"; + rev = "4e4f6c01cda75dde0cba313751897c3b8c67b014"; + sha256 = "097niszwri76g5sbwh4hnsv27wk1nfqd7gpx974rh1bwfk735jxg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -57823,7 +57970,7 @@ version = "20161115.2259"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57535"; + rev = "57597"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -57903,7 +58050,7 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "57535"; + rev = "57597"; sha256 = "0n4gnpms3vyvnag3sa034yisfcfy5gnwl2l46krfwy6qjm1nyzhf"; }; recipeFile = fetchurl { @@ -58533,8 +58680,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "757c43bdd3ff9f3d35f5714e7ee695dc964bf8dc"; - sha256 = "0di1lzfx17002rssl7ys57kg56pmadwcsm7km3301qd8b95ihzvv"; + rev = "2ef5333d8dbeddf7f862c76c84a8550275b13c3c"; + sha256 = "0jxns9jzmlzr7qvsprid2ij26y246nb8yzhw9i8w2xv09gbmfxvw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -60603,12 +60750,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20170202.700"; + version = "20170209.1932"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "4f5912550a876bcc08e8c4342c2faccd1e6ab5c6"; - sha256 = "0mb7pszpgjpzkwsmsqpccssv5zzca0j92pgxpd453kjknp5l24ag"; + rev = "97ed24213df302b5848b57b0e9a17a3af40cee32"; + sha256 = "1pj8zl7nk31mr94izpqhhan7fav0n7k37yipwphs6f1sbxdi8h3l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -60666,12 +60813,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "20170203.1728"; + version = "20170209.1240"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "7a2b4694ab8f70cbaabfda83fc17cb23d7c0b987"; - sha256 = "1izfrm0j98wdmd3lnxf62b6g4sqv4686m8lrx42m5s8y1knr5igk"; + rev = "9eeb7163f07a88450871fff2be78446ee7a4fd52"; + sha256 = "0pxc5ygjc3jz42nxim5l0yc0wns4rfzs2rxwpxy027rqwkk0ap6j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -60855,12 +61002,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20170110.629"; + version = "20170205.1642"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "98962b4eacf1621699a2f6183fdc3ff9d7e0a07d"; - sha256 = "0x5lwi0lcy2hnhnygcff2zrchjj5307086pqkiaisl940yhi0g5k"; + rev = "8b676ee14a3bdfef503472e31d1a5e89fcee63ff"; + sha256 = "1kyryixfmqzjyh6f2bcsrsqvklcvmf9saqm6f0cnxa86rvcdkln0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -61296,8 +61443,8 @@ src = fetchFromGitHub { owner = "jcsalomon"; repo = "smarttabs"; - rev = "1b2f34cc33335486f2b08b864a8037092c1a2956"; - sha256 = "07zc2iw5ijyn822z29g5xb6hhhdmg9b98pfrdwrm0kw86pypxyxk"; + rev = "9cc2594b82b03e7d68645a4878f9359f8b8c34c5"; + sha256 = "0bjl3j047jh674vyfmh9izwak2yic8f7aqv832hn1inhnavsl3xx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d712f0fb9538945713faf773772bb359fe6f509f/recipes/smart-tabs-mode"; @@ -61334,12 +61481,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20170129.956"; + version = "20170209.246"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "add86ac3eeef160787728cad3e58b035dc540dba"; - sha256 = "0d7rgj3b858w79g3nwimqaiqza2400y6c0v17ncsa7x1kvxrxk1f"; + rev = "7647f790e005b0e3e18edcf54e425d01a30ae3b4"; + sha256 = "1s0kz75m3hazgdhqi7a28v6qzxy2sbmlxlpqyix6874gvkfcwchz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -62905,12 +63052,12 @@ ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-agency"; - version = "20160101.1435"; + version = "20170205.1306"; src = fetchFromGitHub { owner = "magit"; repo = "ssh-agency"; - rev = "f8042250174fb72dd935b3e65820580e3232a6fd"; - sha256 = "0076g1yb8xvn6s8gz5jxiz8mn448fmab574yizgakbxaxd91s1dj"; + rev = "94abffa716aff963175196066526c7ee8b4efae7"; + sha256 = "1r41hgh0kaf9x56jllqjz7f9ypzgyf9pqqpm3r49xyi8fr1drbxc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency"; @@ -64083,12 +64230,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "20170128.2303"; + version = "20170205.348"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "42669da0b68bba2d12f9d5fc38f30def118bb999"; - sha256 = "0l7f7mm4a7qrw0i6fnakgy7payghjgmamln9ldbdx593hg1jjzr8"; + rev = "75cbae223fbf84d19e14a7f7734ded4f46078654"; + sha256 = "1ilawg15l6j3w2mlybz01h1dk9mym37wq4illz1llc3q3v9n7nny"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -64125,12 +64272,12 @@ swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20161213.719"; + version = "20170208.2028"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "7c73f7166486eeca829446a62efdb9520802ebea"; - sha256 = "0q8wjynrlq2n6wf0x2nnmvj9h1i2pl39xpz6b7f3jbm7720182ld"; + rev = "d23d1feefccd658f013cbf7d1b052767bed9b2b6"; + sha256 = "0fffs5l45hrz7qv4gxwdn4prabl49zgx74daxyflrlkmbffy0gr4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -64520,12 +64667,12 @@ system-packages = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "system-packages"; - version = "20160726.1344"; + version = "20170205.1305"; src = fetchFromGitHub { owner = "jabranham"; repo = "system-packages"; - rev = "19ab3e959c04dc084f0c679228ab675e5a559c30"; - sha256 = "1slycdacara1y4zqw0vvn3rixx3r33lk9y7ls99bb87a8k2zxlll"; + rev = "5b3f7f5ae08d306604423f48e9a2ab5daaf58584"; + sha256 = "0b7hjgxr6pv6dj3q233mxlm8ssxpvkhckibn0cfr5xb7ycfkd6rm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c423d8c1ff251bd34df20bdb8b425c2f55ae1b1/recipes/system-packages"; @@ -64855,12 +65002,12 @@ tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tao-theme"; - version = "20170126.1021"; + version = "20170209.950"; src = fetchFromGitHub { owner = "11111000000"; repo = "tao-theme-emacs"; - rev = "a808ce58441de6256e670d39b27079d8630b031a"; - sha256 = "0yf0hqm20mgiks9098231ry5sdv702agfj5pasgyyb19inawk13z"; + rev = "a3bcc27b53b08f2114261795d4b4422bd75c94a8"; + sha256 = "1l439z9wa9jwb1ascfvjzm8699cjr8hxip20536ph8dql8hk7rsz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme"; @@ -64880,8 +65027,8 @@ src = fetchFromGitHub { owner = "phillord"; repo = "tawny-owl"; - rev = "944c523029a40a68ce8896ca69ebccfe8db8b0ec"; - sha256 = "1c1vmvg007vrbxhrq41ylfckppkkijgf3n2bij3x5db86ylfd9qs"; + rev = "1cb37c49e97aff263ecb5f20746256126b048628"; + sha256 = "1310pw200l6jdlpdyscnhf9cwll5wc1vyayi55x7jyvm02nngbq1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ea9a114ff739f7d6f5d4c3167f5635ddf79bf60c/recipes/tawny-mode"; @@ -65300,8 +65447,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "21b4f4b7f1f36724a18d2f70c50b2e5b634cf6b1"; - sha256 = "0kq56iiqpclf6yl9g1fhhi9pk4icv5k1f0nyips88nhsq41j395c"; + rev = "db13aac6c89c48410d674bcddaf23716b77d0c16"; + sha256 = "0d3grla09br7vxk91ncv2wzfwh5jfaniw62ydmccrnvm5sy32zgk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -65321,8 +65468,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "21b4f4b7f1f36724a18d2f70c50b2e5b634cf6b1"; - sha256 = "0kq56iiqpclf6yl9g1fhhi9pk4icv5k1f0nyips88nhsq41j395c"; + rev = "db13aac6c89c48410d674bcddaf23716b77d0c16"; + sha256 = "0d3grla09br7vxk91ncv2wzfwh5jfaniw62ydmccrnvm5sy32zgk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -65793,8 +65940,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "a3d6be906b339ce4e55e8fb8d98ff11480792949"; - sha256 = "1wf143c5d5kwg6a7rs3x56jf5pvcpba121pr8178rn45lqdnimr0"; + rev = "3590f1e7ca49c3eea879008d510023edf30b6408"; + sha256 = "0kh2ws9ryfk5qgnaszacsznrg3bwr9vx6riiy2za02in0dlbldk9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -65850,12 +65997,12 @@ tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20170128.2207"; + version = "20170210.255"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "13f6f64cb4e1236ba51d05b8acd70f36968851bd"; - sha256 = "1xisk3s1sygb38gcr73m4iqpssbp6vms3162dn090g2sf0g4sssv"; + rev = "1d000d8cebd5ae8768b0acba065cf267ba5d9c23"; + sha256 = "059q2pijha146hpiz19ykckbcprdfmw825p45wfqqm4lll1dfd9y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; @@ -66582,8 +66729,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "circe"; - rev = "5444a8dd90691de941509f7cc9ac8329c442dbdd"; - sha256 = "00dcdszskzqggg4gjp5f2k2v1a03jad52q2pqf04jqjycapkx227"; + rev = "773e48624edc32022764d9b3bab861f32c336ac3"; + sha256 = "0s0ksk4f8hz2jajh7hx8b5qv8vrv5mr8mvk8n51ycip0gmrl98nf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a2b295656d53fddc76cacc86b239e5648e49e3a4/recipes/tracking"; @@ -67425,12 +67572,12 @@ ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ujelly-theme"; - version = "20170202.2206"; + version = "20170209.24"; src = fetchFromGitHub { owner = "marktran"; repo = "color-theme-ujelly"; - rev = "0a339a439390f9bec41f66b1f058e8e8ca90ba31"; - sha256 = "13qsbncz6plld5y5n1klrliag6v8lzng7z4m5906vfw6sbpfyqx5"; + rev = "2b54793859c0569b0e201f5c32cb796097250393"; + sha256 = "07c25f129948j52vfy42fzfhpd9dvq2568iclnbhzn9jpiz8m9d8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/ujelly-theme"; @@ -68014,22 +68161,22 @@ license = lib.licenses.free; }; }) {}; - use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }: + use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild, use-package }: melpaBuild { pname = "use-package-chords"; - version = "20160530.1042"; + version = "20170208.1035"; src = fetchFromGitHub { owner = "waymondo"; repo = "use-package-chords"; - rev = "8dedc76617cbabd605f4c0d486018e3c4d3c8a9b"; - sha256 = "0d69hckz6xbll1x2mll385kcw7mwx8cwxg1wdhphnww0s810isgp"; + rev = "e8551ce8a514d865831d3a889acece79103fc627"; + sha256 = "0500pqsszg7h7923i0kyjirdyhj8aza3a2h5wbqzdpli2aqra5a5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92fbae4e0bcc1d5ad9f3f42d01f08ab4c3450f1f/recipes/use-package-chords"; sha256 = "18av8gkz3nzyqigyd88ajvylsz2nswsfywxrk2w8d0ykc3p37ass"; name = "use-package-chords"; }; - packageRequires = [ bind-chord bind-key use-package ]; + packageRequires = [ bind-chord bind-key key-chord use-package ]; meta = { homepage = "https://melpa.org/#/use-package-chords"; license = lib.licenses.free; @@ -68395,12 +68542,12 @@ vdiff = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }: melpaBuild { pname = "vdiff"; - version = "20170204.1156"; + version = "20170204.1636"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-vdiff"; - rev = "ff1fbc409f816574a230bfdaa17ea73f65196654"; - sha256 = "1h2arynqw3ps960cb18nyhkj00rjn7xdrrn7vlbrvzxqawpjhn82"; + rev = "c32fe46ad8362b4d918e194cca5ef84dd09981bf"; + sha256 = "16xw159pydkqiki21axv3vhf56yqn8jgg9n97xws2swfkh4drafm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e90f19c8fa4b0d267d269b76f117995e812e899c/recipes/vdiff"; @@ -68777,8 +68924,8 @@ src = fetchFromGitLab { owner = "iankelling"; repo = "visible-mark"; - rev = "c1852e13b6b61982738b56977a452ec9026faf1b"; - sha256 = "15zdbvv6c114mv6hdq375l7ax70sss06p9d7m86hgssc3kiv9vsv"; + rev = "a584db9bc88953b23a9648b3e14ade90767207f8"; + sha256 = "1rsi9irv9i03627cmfaqz03f9cvpm7555ga8n2gs622lzp6bb3jf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/76ac7178ee5381e08ae881f3fc6061106eeb1c1d/recipes/visible-mark"; @@ -69022,12 +69169,12 @@ vue-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: melpaBuild { pname = "vue-mode"; - version = "20161227.133"; + version = "20170206.120"; src = fetchFromGitHub { owner = "CodeFalling"; repo = "vue-mode"; - rev = "1561da428a1a30170b71cab71c576a508e4f4367"; - sha256 = "1081kypg9lhc0d3kjw4vkk9s3g9dbb5rr2rh4d2s1zicy7rxhadn"; + rev = "0b159770abc865796a1fa02be2f5959138b2f8a6"; + sha256 = "1i6a6g4l9xy45kllgr6kgai3mfg8b060dpspn6vv69kpwjcqiza7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2e5e0a9fff332aeec09f6d3d758e2b67dfdf8397/recipes/vue-mode"; @@ -69077,6 +69224,25 @@ license = lib.licenses.free; }; }) {}; + w3m = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild { + pname = "w3m"; + version = "20170203.647"; + src = fetchcvs { + cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; + module = "emacs-w3m"; + sha256 = "ac08d29a884ac5e692a18fd47a7d3a43f1fe7464c3acb923e63da39201bf6453"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/w3m"; + sha256 = "17mzs126fvlnsvxgfpbil9wmka0i87psblq49phky7dywcwz27lc"; + name = "w3m"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/w3m"; + license = lib.licenses.free; + }; + }) {}; wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wacspace"; @@ -69185,12 +69351,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20161227.2220"; + version = "20170204.530"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "59a4d97286251a0c0871c085aea01fa1abc1e192"; - sha256 = "1k7kkdr2kr7qivvbifqgw9hx111bscbh376q1f44p825flxnzyn8"; + rev = "1a49ac05e9558edd4993d345c25cf2d166bfc17e"; + sha256 = "1bvq0wwc013f6aapwql1rwv9r5nifgff2iwc17kaiwlwwqd6j70z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -69752,12 +69918,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20161222.1221"; + version = "20170209.729"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "49ab7afd93ef36e5f0261eff7151360edeeea4e6"; - sha256 = "0cqq1w9cjrp61mjzi7y49yrbhclpf0cab9fcylq14v1ilhipfdxa"; + rev = "0d56e4369b53af2c5960af4827b56b06d9162d62"; + sha256 = "08dw13hn1w9m37gd2cch3z9af504x55w0hlinn05j1jgvja50c7f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -69963,8 +70129,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "b5bcc7d5dd37a658a1fa77ec2272c9b2a8ca30b8"; - sha256 = "0jgrx90n17h9ib9vjymxxra2abjk7pbdk1h9whqby2jg2xvzp0hm"; + rev = "0afc3a524ec4c900f7ac1291e37b4f7da19e9ae6"; + sha256 = "15rjaxzwq7wh6zmyh8nzkbr4c75z8qjlbhpi8yjmf9bik3srr14d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -70331,8 +70497,8 @@ version = "20160419.1232"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "280ab84bf8ad"; - sha256 = "088khr4ha37nvxzg620a6gyq7pc40rb13bbi9vgqhgjgggpq61d9"; + rev = "3a654cfe6632"; + sha256 = "1ahmpk0302g375w9ikkzagjvx8qblkzx40w960ka0cqf7nzyk75d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; @@ -70936,12 +71102,12 @@ xah-fly-keys = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20170129.304"; + version = "20170210.354"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "fd63ec17a77d82c565f7ec181dbd928af3da8c9a"; - sha256 = "0lgxw7vjy7kvh7lhp6a0yxgk0m77a5wpj7x45s1c33vcblwzsgdy"; + rev = "7fd0ae4bd2afbe59273b224b299519aad564189c"; + sha256 = "1di8i2x7gg8w3kviz7az7wrg6gfr06p67rkmkm2z7pwblbsbd57f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -70978,12 +71144,12 @@ xah-lookup = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-lookup"; - version = "20161218.2303"; + version = "20170209.342"; src = fetchFromGitHub { owner = "xahlee"; repo = "lookup-word-on-internet"; - rev = "219b0d58760bad26b2e07c55c229d989b983c089"; - sha256 = "1n1w9jcq1bz4qqps33p3dmmjv9hyvpa0zrxhxcp2q3vh7j0714qj"; + rev = "55e4e539f65e260418ead77c138bc2af2bdfa638"; + sha256 = "0b9q2y42v73c49l4s7z8qgsj02g2yvn2vbf4kv5m26k8x7547cja"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e6609a846a3c7781e0f03730b79bbf8d0355a9/recipes/xah-lookup"; @@ -72569,15 +72735,35 @@ license = lib.licenses.free; }; }) {}; + zpresent = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild, org-parser }: + melpaBuild { + pname = "zpresent"; + version = "20170205.2239"; + src = fetchhg { + url = "https://bitbucket.com/zck/zpresent.el"; + rev = "b02b168a98c7"; + sha256 = "0vkywpzlrpwasjnjksmsy7ab5vn1l3frb3ygvy0c98wds0g8dxgc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3aae38ad54490fa650c832fb7d22e2c73b0fb060/recipes/zpresent"; + sha256 = "0316qyspmdbg94aw620133ilh8kfpr3db1p2cifgccgcacjv3v5j"; + name = "zpresent"; + }; + packageRequires = [ emacs org-parser ]; + meta = { + homepage = "https://melpa.org/#/zpresent"; + license = lib.licenses.free; + }; + }) {}; ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ztree"; - version = "20170105.208"; + version = "20170208.4"; src = fetchFromGitHub { owner = "fourier"; repo = "ztree"; - rev = "3a4df17edddef84160194802acc034cfa2dbd678"; - sha256 = "1a5sk4b00sgkgq23xmv0rlx89686dx3p8cmscrcf2lcddx8cq9pl"; + rev = "bf343665c9d97a5cb370572364865e42074af95c"; + sha256 = "1hpyymmg5mxrcmj0pngnj8fxyalfxzdqgpghk7lba2r35da05ph5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 6081c96006a..60cbf486777 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -13,7 +13,7 @@ To update the list of packages from MELPA, */ -{ lib }: +{ lib, external }: self: @@ -174,6 +174,17 @@ self: # upstream issue: missing file header zeitgeist = markBroken super.zeitgeist; + + w3m = super.w3m.override (args: { + melpaBuild = drv: args.melpaBuild (drv // { + prePatch = + let w3m = "${lib.getBin external.w3m}/bin/w3m"; in '' + substituteInPlace w3m.el \ + --replace 'defcustom w3m-command nil' \ + 'defcustom w3m-command "${w3m}"' + ''; + }); + }); }; melpaPackages = super // overrides; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index 07748209b7e..cc794cc6cf2 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -2470,6 +2470,27 @@ license = lib.licenses.free; }; }) {}; + better-shell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "better-shell"; + version = "1.1"; + src = fetchFromGitHub { + owner = "killdash9"; + repo = "better-shell"; + rev = "6ae157da700a4473734dca75925f6bf60e6b3ba7"; + sha256 = "14ym7gp57yflf86hxpsjnagxnc0z1jrdc4mbq7wcbh5z8kjkbfpd"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fc553c9fb6de69dafe9fbe44a955b307f4d9507f/recipes/better-shell"; + sha256 = "1mr39xz8chnc28zw1rrw5yqf44v44pby7ki22yyz6rp1j5ishp4v"; + name = "better-shell"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/better-shell"; + license = lib.licenses.free; + }; + }) {}; biblio = callPackage ({ biblio-core, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "biblio"; @@ -3565,12 +3586,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "b210c0d5275e1e8c0b78bed186cc18fc27061dd4"; - sha256 = "1jixkb7jw07lykbfv022ccnys4xypcbv03f9bxl2r16wizzymvvd"; + rev = "577a3438d14e1a1f08baf0399ec8138c9d1dcba4"; + sha256 = "0i9nqhqbj12ilr5fsa4cwai9kf2ydv84m606zqca2xyvvdzw22as"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -3838,12 +3859,12 @@ cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "cliphist"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cliphist"; - rev = "8aaee153e0561625c35a8c178e57385c2ec92731"; - sha256 = "0swsvzz20szfcgfaarga9apla1kl0ph0lrpk0ccl6mcf93zbnvby"; + rev = "acbd9782d82d7ae6bfb22fb0955597b9c5fcbb6c"; + sha256 = "1gj5fqjyr4m4qim9qjsvzzk42rm3vw3yycvq3nj0wpj90zb1yh14"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist"; @@ -4143,12 +4164,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "3.7.2"; + version = "3.8.0pre1"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "35413bf2c1b33980afd418030af27f184872af6b"; - sha256 = "1kk0xri88h4lla8r8y5gksiwpyxb468h8qn0f61sfa1kni73z09s"; + rev = "84df4a49500e51ac6e2a19a77e385e66234386f7"; + sha256 = "1kkycphqbz8j3jp70n9vh3lgpb2fxy2461q6x365h8mg5ab4w7x3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -5094,12 +5115,12 @@ copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "copy-as-format"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "sshaw"; repo = "copy-as-format"; - rev = "6c47295597c69b3b08dd8f137f6a5973a5588674"; - sha256 = "1d4x8rvmzqi3cby01ahgr3fqcsq4kpd6sglr9slxcw7hp7rlih0i"; + rev = "edc6d2313b321988fdf780fac229d395e4752702"; + sha256 = "1gnm9r42nkp349d5ry2bv9in83ikmh5pnrfcw96yigxrzkbajb2s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; @@ -9066,12 +9087,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "19.2.2"; + version = "19.2.3"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "51faafa9a20c4afa7944b8089b26f22c774bed19"; - sha256 = "0shy3ckxw9scsg3j8brzk5r3p0rdpfbr9ys7akmdp2pq88d867i9"; + rev = "aa315e1cf1b79ab782e5b4c944595495ebf4e2f4"; + sha256 = "1lsmjpz2g4hj44fz95w7sswzj40iv7jq5jk64x0095lhvxmlf57c"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; @@ -9170,12 +9191,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, spark }: melpaBuild { pname = "es-mode"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "f5e6054a1d25d5eb8e21ddb931b7f65b0735c5f8"; - sha256 = "04lll5sscbpqcq3sv5gsfky5qcj6asqql7fw1bp6g12qqf9r02nd"; + rev = "996730ebce57d810d2c275c7fadb11c2b1134dea"; + sha256 = "1qhfnd5anp5qrmravv7ks5ix763xnki2f5jwcyj70qyxwr0l60cg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode"; @@ -9566,6 +9587,27 @@ license = lib.licenses.free; }; }) {}; + evil = callPackage ({ fetchFromGitHub, fetchurl, goto-chg, lib, melpaBuild, undo-tree }: + melpaBuild { + pname = "evil"; + version = "1.2.12"; + src = fetchFromGitHub { + owner = "emacs-evil"; + repo = "evil"; + rev = "0ad4c2dae1249558f7b59a78a685e4f8092009c9"; + sha256 = "1z7ysn0h62i674pw47k905713m4ch7hrisk4834rf53zq3c9sabn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/514964d788f250e1e7893142bc094c63131bc6a5/recipes/evil"; + sha256 = "044k9p32y4cys3zwdfanr1zddgkxz16ahqspfz7vfszyw8yml1jb"; + name = "evil"; + }; + packageRequires = [ goto-chg undo-tree ]; + meta = { + homepage = "https://melpa.org/#/evil"; + license = lib.licenses.free; + }; + }) {}; evil-anzu = callPackage ({ anzu, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-anzu"; @@ -9842,12 +9884,12 @@ evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-nerd-commenter"; - version = "2.3.1"; + version = "2.3.3"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "evil-nerd-commenter"; - rev = "54c618aada776bfda0742819ff9e91845a91e095"; - sha256 = "04iyr6ys453pyfvif91qnhn6xyhl4z4cz2apj6vga61pa8lc70da"; + rev = "01a98a20c536a575ee5bc897f38116155154d5fe"; + sha256 = "160h4qasqr04fnv9w5dar327i074dsyac2md5y7p3hnz1c05skhl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a3e1ff69e7cc95a5b5d628524ad836833f4ee736/recipes/evil-nerd-commenter"; @@ -10574,22 +10616,22 @@ license = lib.licenses.free; }; }) {}; - find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pinyinlib }: melpaBuild { pname = "find-by-pinyin-dired"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "find-by-pinyin-dired"; - rev = "3137c367d58958858daa6d3dee1993b2eb9dd9b4"; - sha256 = "1xjb66pydm3yf0jxnm2mri98pxq3b26xvwjkaj1488qgj27i05jr"; + rev = "2c48434637bd63840fca4d2c6cf9ebd5dd44658f"; + sha256 = "0ial0lbvg0xbrwn8cm68xc5wxj3xgp110y2zgypkdpak8gkv8b5h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0aa68b4603bf4071d7d12b40de0138ecab1989d7/recipes/find-by-pinyin-dired"; sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq"; name = "find-by-pinyin-dired"; }; - packageRequires = []; + packageRequires = [ pinyinlib ]; meta = { homepage = "https://melpa.org/#/find-by-pinyin-dired"; license = lib.licenses.free; @@ -14105,6 +14147,27 @@ license = lib.licenses.free; }; }) {}; + green-screen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "green-screen-theme"; + version = "1.0.0.1"; + src = fetchFromGitHub { + owner = "rbanffy"; + repo = "green-screen-emacs"; + rev = "e47e3eb903b4d9dbcc66342d91915947b35e5e1e"; + sha256 = "0gv434aab9ar624l4r7ky4ksvkchzlgj8pyvkc73kfqcxg084pdn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/821744ca106f1b74941524782e4581fc93800fed/recipes/green-screen-theme"; + sha256 = "0a45xcl74kp3v39bl169sq46mqxiwvvis6jzwcy6yrl2vqqi4mab"; + name = "green-screen-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/green-screen-theme"; + license = lib.licenses.free; + }; + }) {}; grin = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grin"; version = "1.0"; @@ -14376,22 +14439,22 @@ license = lib.licenses.free; }; }) {}; - hacker-typer = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: + hacker-typer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hacker-typer"; - version = "1.0.1"; + version = "1.0.6"; src = fetchFromGitHub { owner = "therockmandolinist"; repo = "emacs-hacker-typer"; - rev = "de208bb6d69f6f45eca8522d41012c7f729b8c9f"; - sha256 = "0lhsj9j17sd43w96zk84ssfvk5q518znbp1zkb5znl2q7ky8cwrg"; + rev = "d5a23714a4ccc5071580622f278597d5973f40bd"; + sha256 = "13wp7cg9d9ij44inxxyk1knczglxrbfaq50wyhc4x5zfhz5yw7wx"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/561661965a7a500f24671454b3b680816457e180/recipes/hacker-typer"; - sha256 = "0i9kkxcz0fz4yviksl3f0ggh9kpwr9sidg7945r46bmblni3f0j9"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/8e04a3a1606ea23865c04d93e3dc77cb55b9931f/recipes/hacker-typer"; + sha256 = "128y562cxi8rblnqjdzhqc6b58bxi67f6hz569gqw4jywz0xcd0g"; name = "hacker-typer"; }; - packageRequires = [ async ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/hacker-typer"; license = lib.licenses.free; @@ -14735,12 +14798,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "b54d937634986dbebe97c0283137bcde07ed2275"; - sha256 = "0cq4pcx0rn9kzf55pbad1lcn1xq58vcdng9sx50485wdxqr0bxzc"; + rev = "7d7c16f10103aeee591daf46b143d23efdf3a825"; + sha256 = "0mn36dxd70nsk1dwn0mzz94sy28hk41af8chdpl2cd09bkpw113l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -14777,12 +14840,12 @@ helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ag"; - version = "0.57"; + version = "0.58"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ag"; - rev = "49e1f66fa80674513ca898e32d62d6dad875cb90"; - sha256 = "0vzgiix2c8jwpk2hhxvz9gqb78glmd4dk1myrgvxs9fhsj54dkk3"; + rev = "39ed137823665fca2fa5b215f7c3e8701173f7b7"; + sha256 = "0a6yls52pkqsaj6s5nsi70kzpvssdvb87bfnp8gp26q2y3syx4ni"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag"; @@ -15029,12 +15092,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "b54d937634986dbebe97c0283137bcde07ed2275"; - sha256 = "0cq4pcx0rn9kzf55pbad1lcn1xq58vcdng9sx50485wdxqr0bxzc"; + rev = "7d7c16f10103aeee591daf46b143d23efdf3a825"; + sha256 = "0mn36dxd70nsk1dwn0mzz94sy28hk41af8chdpl2cd09bkpw113l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -23129,12 +23192,12 @@ org-jira = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: melpaBuild { pname = "org-jira"; - version = "2.5.2"; + version = "2.6.0"; src = fetchFromGitHub { owner = "ahungry"; repo = "org-jira"; - rev = "af4115f4e8b4e77de5642fb28ce6d5e0d7cb0b70"; - sha256 = "1g775f9gpl0nqq3vn6h9cnjazimn9bjwk31dc7fdylz3nf7f3h03"; + rev = "0ff62665231df2be5d5bc84c4748c272664eeff3"; + sha256 = "0qn203bw0v7g8kmpkqp9vwh7m8cjjhklvwbhgmr8szaz1i1m9d0i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/730a585e5c9216a2428a134c09abcc20bc7c631d/recipes/org-jira"; @@ -23230,22 +23293,22 @@ license = lib.licenses.free; }; }) {}; - org-mime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + org-mime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-mime"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "org-mime"; repo = "org-mime"; - rev = "3c4f24c8d43c24332c4f2f4bf763459b11ead956"; - sha256 = "04xs06sgdigi9hpciqb0d12rsgzg5b5vyf08rlvkjiddkqclp5pw"; + rev = "a0b82a6c1a0dbcf5b7bebfe2e5817d54a1cd3cc8"; + sha256 = "11wldx6c53ncw3pmdwxn31q82vkcffqvr2cfphl5bhb4q8r5lrjn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/521678fa13884dae69c2b4b7a2af718b2eea4b28/recipes/org-mime"; sha256 = "14154pajl2bbawdd8iqfwgc67pcjp2lxl6f92c62nwq12wkcnny6"; name = "org-mime"; }; - packageRequires = []; + packageRequires = [ cl-lib ]; meta = { homepage = "https://melpa.org/#/org-mime"; license = lib.licenses.free; @@ -24734,6 +24797,27 @@ license = lib.licenses.free; }; }) {}; + pastery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }: + melpaBuild { + pname = "pastery"; + version = "0.1.14"; + src = fetchFromGitHub { + owner = "diasbruno"; + repo = "pastery.el"; + rev = "3f60a2660613c09be5a0b6e299828b44ee3c8732"; + sha256 = "1dzbkiy2qjdq4isrpiwj25qj069nhydzngg6avyh2c2qmxkibjsr"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/6058218450071db0af9a5b8ce8ec09a735c4ab66/recipes/pastery"; + sha256 = "006qawjc86spbbs2pxvhg9w94rcsxap577cndqwaiw1k0cc8vkhp"; + name = "pastery"; + }; + packageRequires = [ emacs request ]; + meta = { + homepage = "https://melpa.org/#/pastery"; + license = lib.licenses.free; + }; + }) {}; pathify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pathify"; @@ -25069,6 +25153,27 @@ license = lib.licenses.free; }; }) {}; + phan = callPackage ({ composer, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "phan"; + version = "0.0.2"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "phan.el"; + rev = "4e3528f490e77d3aa6d81729b30b569434ef679f"; + sha256 = "1aif1hshwpzi353k2gcpwk9s76jlmz3s5dyf357qfv14b5ddhw6l"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d591d9ba70b1e32f25204ad9409aad78fd68a93c/recipes/phan"; + sha256 = "16r1d2bgbb2y7l141sw7nzhx0s50gzwq5ang00y7f4sfldqvshzf"; + name = "phan"; + }; + packageRequires = [ composer emacs f ]; + meta = { + homepage = "https://melpa.org/#/phan"; + license = lib.licenses.free; + }; + }) {}; phi-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "phi-search"; @@ -26032,22 +26137,22 @@ license = lib.licenses.free; }; }) {}; - projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "projectile-variable"; - version = "0.0.1"; + version = "0.0.2"; src = fetchFromGitHub { owner = "zonuexe"; repo = "projectile-variable"; - rev = "810394eabf330325a86ec6f60c69e160eb837ac3"; - sha256 = "183azck3bi4qwpprcc07kvwm3piwqgql7ryy1czvmw3kbdmk1rpj"; + rev = "8d348ac70bdd6dc320c13a12941b32b38140e264"; + sha256 = "0l38nldx6lwjb7mxixykiyj10xwb35249dxfg0k2wkmb2vy1fkxs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ff603b43235f546cd47f72e675aee88d5f41e855/recipes/projectile-variable"; sha256 = "1cj8nwxf1jp5q5zzxp92fxla6jhwzd21gw649ar6mygi4hgymsji"; name = "projectile-variable"; }; - packageRequires = [ cl-lib emacs projectile ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/projectile-variable"; license = lib.licenses.free; @@ -27505,12 +27610,12 @@ rg = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "rg"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "dajva"; repo = "rg.el"; - rev = "f1af862ba50b344d2f039f18fe83e32b6f0829a9"; - sha256 = "18i5rspwx48xik8yaw0znsfqarwab7nra6wiiznjkpzm0cgh4av1"; + rev = "ec9eb5240191612debf0392ee7a7f491c7dae27e"; + sha256 = "0773d0n5jq42yr5p1xbbfji027j0kw4msv1p8b7zk82ij1yc7hyr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce1f721867383a841957370946f283f996fa76f/recipes/rg"; @@ -28322,12 +28427,12 @@ selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "selectric-mode"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "rbanffy"; repo = "selectric-mode"; - rev = "0dd7ef28a9d9d6fbb95fdeeab6b576ad8762ad16"; - sha256 = "18xdkisxvdizsk51pnyimp9mwc6k9cpcxqr5hgndkz9q97p5dp79"; + rev = "a8e8c8899c749bd36bdd161e161cdc51301defc6"; + sha256 = "1dj8vccdk1s0ynl5znpg02xp182srn3s8cqcxqrxjllp7wbgab31"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/08922071b9854142eab726302e75f1db2d326ec5/recipes/selectric-mode"; @@ -28994,12 +29099,12 @@ slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }: melpaBuild { pname = "slime"; - version = "2.18"; + version = "2.19"; src = fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "2da9fef009f2380daf9404022ca69cb87573f509"; - sha256 = "0d1fcjv11my4sa11zim99ylzfsc5q989x4izrrxs3y9ii0nq8kax"; + rev = "6e20d01e446334848ea31ace0ce041cec25647ab"; + sha256 = "1ywlbdk9ywfkv8z6pb69r29nh03krfdg676d086i8qjaas7ly2yp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14c60acbfde13d5e9256cea83d4d0d33e037d4b9/recipes/slime"; @@ -29915,6 +30020,27 @@ license = lib.licenses.free; }; }) {}; + ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ssh-agency"; + version = "0.3"; + src = fetchFromGitHub { + owner = "magit"; + repo = "ssh-agency"; + rev = "94abffa716aff963175196066526c7ee8b4efae7"; + sha256 = "1r41hgh0kaf9x56jllqjz7f9ypzgyf9pqqpm3r49xyi8fr1drbxc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b9a9e4bd0205908bfb99762c7daaf3be276bb03a/recipes/ssh-agency"; + sha256 = "0lci3fhl2p9mwilvq1njzy13dkq5cp5ighymf3zs4gzm3w0ih3h8"; + name = "ssh-agency"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/ssh-agency"; + license = lib.licenses.free; + }; + }) {}; ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; @@ -30419,12 +30545,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "42669da0b68bba2d12f9d5fc38f30def118bb999"; - sha256 = "0l7f7mm4a7qrw0i6fnakgy7payghjgmamln9ldbdx593hg1jjzr8"; + rev = "75cbae223fbf84d19e14a7f7734ded4f46078654"; + sha256 = "1ilawg15l6j3w2mlybz01h1dk9mym37wq4illz1llc3q3v9n7nny"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -32838,12 +32964,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "1.2.1"; + version = "2.0"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "17f4b0069273f9c9877dc079e5cf49ed9cb4d278"; - sha256 = "1h673yjl0hp6p244pkk6hmazgfrj2sbz9cvd1r6rnrp1lpn8z1dl"; + rev = "ea6f1dc5aacff2f3d909e410db05af01966555aa"; + sha256 = "0pckvxk2vpwqfypz5vyk0ig6g5697ibnlk8vspvqpanahvgaj0nh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -33114,8 +33240,8 @@ version = "0.9.1"; src = fetchhg { url = "https://bitbucket.com/ArneBab/wisp"; - rev = "280ab84bf8ad"; - sha256 = "088khr4ha37nvxzg620a6gyq7pc40rb13bbi9vgqhgjgggpq61d9"; + rev = "3a654cfe6632"; + sha256 = "1ahmpk0302g375w9ikkzagjvx8qblkzx40w960ka0cqf7nzyk75d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode"; diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index aacc3f9e792..d5ca5e39442 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -3,8 +3,8 @@ , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO , withX ? !stdenv.isDarwin -, withGTK2 ? true, gtk2 ? null -, withGTK3 ? false, gtk3 ? null +, withGTK2 ? false, gtk2 ? null +, withGTK3 ? true, gtk3 ? null , withXwidgets ? false, webkitgtk24x ? null, wrapGAppsHook ? null, glib_networking ? null , withCsrc ? true , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch b/pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch new file mode 100644 index 00000000000..ba5140c77fc --- /dev/null +++ b/pkgs/applications/editors/kdevelop5/kdevplatform-projectconfigskeleton.patch @@ -0,0 +1,55 @@ +From e84645d1694bdad7f179cd41babce723fe07aa63 Mon Sep 17 00:00:00 2001 +From: Kevin Funk +Date: Mon, 5 Dec 2016 15:20:53 +0100 +Subject: Hotfix for restoring build with newer KConfig + +https://phabricator.kde.org/D3386 is a SIC change, handle that +--- + project/projectconfigskeleton.cpp | 4 ++++ + project/projectconfigskeleton.h | 14 +++++--------- + 2 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/project/projectconfigskeleton.cpp b/project/projectconfigskeleton.cpp +index 0e06149..c4c9767 100644 +--- a/project/projectconfigskeleton.cpp ++++ b/project/projectconfigskeleton.cpp +@@ -46,6 +46,10 @@ ProjectConfigSkeleton::ProjectConfigSkeleton( const QString & configname ) + ProjectConfigSkeleton::ProjectConfigSkeleton( KSharedConfigPtr config ) + : KConfigSkeleton( config ), d( new ProjectConfigSkeletonPrivate ) + { ++ // FIXME: Check if that does the right thing. ++ // https://phabricator.kde.org/D3386 broke source compat in kconfig, thus requiring us to make this ctor public ++ Q_ASSERT(config); ++ d->m_developerTempFile = config->name(); + } + + void ProjectConfigSkeleton::setDeveloperTempFile( const QString& cfg ) +diff --git a/project/projectconfigskeleton.h b/project/projectconfigskeleton.h +index ed17ed0..c8314df 100644 +--- a/project/projectconfigskeleton.h ++++ b/project/projectconfigskeleton.h +@@ -55,16 +55,12 @@ public: + + Path projectFile() const; + Path developerFile() const; ++ ++protected: ++ explicit ProjectConfigSkeleton( KSharedConfigPtr config ); ++ + private: +- /** +- * There's no way in KDE4 API to find out the file that the config object +- * was created from, so we can't apply defaults when using this +- * constructors. Thus I'm making this private, so we can find out when +- * this constructor is used and see if we need to add appropriate API to +- * kdelibs +- */ +- explicit ProjectConfigSkeleton( KSharedConfigPtr config ); +- struct ProjectConfigSkeletonPrivate * const d; ++ struct ProjectConfigSkeletonPrivate * const d; + }; + + } +-- +cgit v0.11.2 + diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix index 93c3eac9c34..c36885a9e13 100644 --- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix +++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { sha256 = "643d1145e1948af221f9ae148d0a10809f3d89af4b97ff0d6c4d571004f46bd4"; }; + patches = [ ./kdevplatform-projectconfigskeleton.patch ]; + nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ]; propagatedBuildInputs = [ ]; diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix new file mode 100644 index 00000000000..487d9c842b8 --- /dev/null +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +with stdenv.lib; + +pythonPackages.buildPythonPackage rec { + name = "neovim-remote-${version}"; + version = "v1.4.0"; + disabled = !pythonPackages.isPy3k; + + src = fetchFromGitHub { + owner = "mhinz"; + repo = "neovim-remote"; + rev = version; + sha256 = "0msvfh27f56xj5ki59ikzavxz863nal5scm57n43618m49qzg8iz"; + }; + + propagatedBuildInputs = [ pythonPackages.neovim ]; + + meta = { + description = "A tool that helps controlling nvim processes from a terminal"; + homepage = https://github.com/mhinz/neovim-remote/; + license = licenses.mit; + maintainers = with maintainers; [ edanaher ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 07660eaddf6..66c538a1976 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -1,46 +1,46 @@ -{ stdenv, fetchFromGitHub, cmake, qt5, pythonPackages, libmsgpack -, makeWrapper, neovim -}: +{ stdenv, fetchFromGitHub, cmake, doxygen +, libmsgpack, makeWrapper, neovim, pythonPackages, qtbase }: -let # not very usable ATM - version = "0.2.4"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "neovim-qt-${version}"; + version = "0.2.4"; src = fetchFromGitHub { - owner = "equalsraf"; - repo = "neovim-qt"; - rev = "v${version}"; + owner = "equalsraf"; + repo = "neovim-qt"; + rev = "v${version}"; sha256 = "0yf9wwkl0lbbj3vyf8hxnlsk7jhk5ggivszyqxply69dbar9ww59"; }; - # It tries to download libmsgpack; let's use ours. - postPatch = let use-msgpack = '' - cmake_minimum_required(VERSION 2.8.11) - project(neovim-qt-deps) - - # Similar enough to FindMsgpack - set(MSGPACK_INCLUDE_DIRS ${libmsgpack}/include PARENT_SCOPE) - set(MSGPACK_LIBRARIES msgpackc PARENT_SCOPE) - ''; - in "echo '${use-msgpack}' > third-party/CMakeLists.txt"; - - buildInputs = with pythonPackages; [ - cmake qt5.qtbase - python msgpack jinja2 libmsgpack - makeWrapper + cmakeFlags = [ + "-DMSGPACK_INCLUDE_DIRS=${libmsgpack}/include" + "-DMSGPACK_LIBRARIES=${libmsgpack}/lib/libmsgpackc.so" ]; + doCheck = false; # 5 out of 7 fail + + buildInputs = with pythonPackages; [ + qtbase libmsgpack + ] ++ (with pythonPackages; [ + jinja2 msgpack python + ]); + + nativeBuildInputs = [ cmake doxygen makeWrapper ]; + enableParallelBuilding = true; + # avoid cmake trying to download libmsgpack + preConfigure = "echo \"\" > third-party/CMakeLists.txt"; + postInstall = '' wrapProgram "$out/bin/nvim-qt" --prefix PATH : "${neovim}/bin" ''; meta = with stdenv.lib; { - description = "A prototype Qt5 GUI for neovim"; + description = "Neovim client library and GUI, in Qt5"; license = licenses.isc; + maintainers = with maintainers; [ peterhoeg ]; inherit (neovim.meta) platforms; + inherit version; }; } diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index d1794363975..816a310f758 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,24 +2,24 @@ makeWrapper, libXScrnSaver }: let - version = "1.9.0"; - rev = "27240e71ef390bf2d66307e677c2a333cebf75af"; + version = "1.9.1"; + rev = "f9d0c687ff2ea7aabd85fb9a43129117c0ecf519"; channel = "stable"; # The revision can be obtained with the following command (see https://github.com/NixOS/nixpkgs/issues/22465): # curl -w "%{url_effective}\n" -I -L -s -S https://vscode-update.azurewebsites.net/latest/linux-x64/stable -o /dev/null - sha256 = if stdenv.system == "i686-linux" then "05f1sk2lq2skp8fxq6q229kf89vi2sq3zz6lywq7nk81pwvp8jap" - else if stdenv.system == "x86_64-linux" then "0wj17lwq8f88xvfa6wfbqm580kp0470ib2yxn15j9mv0iw7nzqry" - else if stdenv.system == "x86_64-darwin" then "1k067h099j6fv820nn6h4i8ax35yvd1h8f4h5216dm66cpikv7nd" + sha256 = if stdenv.system == "i686-linux" then "03lv792rkb1hgn1knd8kpic7q07cd194cr4fw1bimnjblrvyy586" + else if stdenv.system == "x86_64-linux" then "1vrcb4y2y83bhxx9121afwbzm8yddfin4zy3nyxfi805pjmszwjm" + else if stdenv.system == "x86_64-darwin" then "0s92ing4m2qyqdkpmkhl2zj40hcdsr5x764sb6zprwwhfv4npymr" else throw "Unsupported system: ${stdenv.system}"; urlBase = "https://az764295.vo.msecnd.net/${channel}/${rev}/"; urlStr = if stdenv.system == "i686-linux" then - urlBase + "code-${channel}-code_${version}-1486024310_i386.tar.gz" + urlBase + "code-${channel}-code_${version}-1486596246_i386.tar.gz" else if stdenv.system == "x86_64-linux" then - urlBase + "code-${channel}-code_${version}-1486023356_amd64.tar.gz" + urlBase + "code-${channel}-code_${version}-1486597190_amd64.tar.gz" else if stdenv.system == "x86_64-darwin" then urlBase + "VSCode-darwin-${channel}.zip" else throw "Unsupported system: ${stdenv.system}"; diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 4cb67cde751..8c430435dd7 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -8,7 +8,7 @@ let inherit (python2Packages) pygtk wrapPython python; in stdenv.mkDerivation rec { name = "gimp-${version}"; - version = "2.8.18"; + version = "2.8.20"; # This declarations for `gimp-with-plugins` wrapper, # (used for determining $out/lib/gimp/${majorVersion}/ paths) @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; - sha256 = "0halh6sl3d2j9gahyabj6h6r3yyldcy7sfb4qrfazpkqqr3j5p9r"; + sha256 = "939ca1df70be865c672ffd654f4e20f188121d01601c5c90237214101533c805"; }; buildInputs = diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index fa6db4e7f02..20a9648e839 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -125,7 +125,7 @@ rec { Filters/Enhance/Smart remove selection */ name = "resynthesizer-2.0.1"; - buildInputs = [ gimp pkgs.fftw pkgs.autoreconfHook ] + buildInputs = [ gimp pkgs.fftw pkgs.autoreconfHook ] ++ gimp.nativeBuildInputs; makeFlags = "GIMP_LIBDIR=$out/lib/gimp/2.0/"; src = fetchFromGitHub { @@ -178,31 +178,16 @@ rec { gmic = pluginDerivation rec { - name = "gmic-1.6.5.0"; + inherit (pkgs.gmic) name src meta; - buildInputs = [pkgconfig pkgs.fftw pkgs.opencv gimp] ++ gimp.nativeBuildInputs; - - src = fetchurl { - url = http://gmic.eu/files/source/gmic_1.6.5.0.tar.gz; - sha256 = "1vb6zm5zpqfnzxjvb9yfvczaqacm55rf010ib0yk9f28b17qrjgb"; - }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ pkgs.fftw pkgs.opencv gimp ] ++ gimp.nativeBuildInputs; sourceRoot = "${name}/src"; buildFlags = "gimp"; installPhase = "installPlugins gmic_gimp"; - - meta = { - description = "Script language for image processing which comes with its open-source interpreter"; - homepage = http://gmic.eu/gimp.shtml; - license = stdenv.lib.licenses.cecill20; - /* - The purpose of this Free Software license agreement is to grant users - the right to modify and redistribute the software governed by this - license within the framework of an open source distribution model. - [ ... ] */ - }; }; # this is more than a gimp plugin ! diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 651bfafcead..4b75d0ccc6b 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -38,6 +38,10 @@ stdenv.mkDerivation { url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-5/debian/patches/CVE-2016-8684.patch"; sha256 = "1p36gpz904wnmbz1n64x4pdpg8lp9zs3gx0awklxqdvgl8m82vvy"; }) + (fetchpatch { + url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-7/debian/patches/CVE-2016-9830.patch"; + sha256 = "0qh15sd7nx7vf9sld4453iml951bwsx2fx84hxc7plhds2k3gjpa"; + }) ]; configureFlags = [ diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 1f263a2b1dd..07fcf31ed26 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gpsprune-${version}"; - version = "18.5"; + version = "18.6"; src = fetchurl { url = "http://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "0xd97b7rs5i41hyih6zdbvls090903yfr1r9lflq93dyqhmzpdhn"; + sha256 = "1ii9pkj24jcwzs225nyi17ks07dfc5x3940hpqrsb5xzxy2vkw7q"; }; phases = [ "installPhase" ]; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 30398747d43..fb60babebe2 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "11223"; + version = "11526"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "0fv1hlp98f178jy7lxnvq2rk6rq1zj62q6dv0vn02fvm00ia53s8"; + sha256 = "1164vfqbbys0032amk85219y0paihvi8jkx0kwc5lramwsk57pld"; }; phases = [ "installPhase" ]; diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index 9da087d4969..1317c035792 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "mlterm-${version}"; - version = "3.7.2"; + version = "3.8.0"; src = fetchurl { url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz"; - sha256 = "1b24w8hfck1ylfkdz9z55vlmsb36q9iyfr0i9q9y98dfk0f0rrw8"; + sha256 = "00dzx5rqsp73shgvn2jvgk85v3lirby06wxkqjcm1i1xwigidq3b"; }; nativeBuildInputs = [ pkgconfig autoconf ]; @@ -20,17 +20,15 @@ stdenv.mkDerivation rec { harfbuzz fribidi m17n_lib openssl libssh2 ]; - patches = [ ./x_shortcut.c.patch ]; #fixes numlock in 3.7.2. should be safe to remove by 3.7.3 since it's already in the trunk: https://bitbucket.org/arakiken/mlterm/commits/4820d42c7abfe1760a5ea35492c83be469c642b3 - #bad configure.ac and Makefile.in everywhere preConfigure = '' sed -ie 's;-L/usr/local/lib -R/usr/local/lib;;g' \ - xwindow/libtype/Makefile.in \ main/Makefile.in \ tool/mlfc/Makefile.in \ tool/mlimgloader/Makefile.in \ tool/mlconfig/Makefile.in \ - xwindow/libotl/Makefile.in + uitoolkit/libtype/Makefile.in \ + uitoolkit/libotl/Makefile.in sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' \ tool/mlconfig/po/Makefile.in.in #utmp and mlterm-fb @@ -68,14 +66,9 @@ stdenv.mkDerivation rec { ]; postInstall = '' - mkdir -p "$out/share/icons/hicolor/scalable/apps" - cp contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg" - - mkdir -p "$out/share/icons/hicolor/48x48/apps" - cp contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png" - - mkdir -p "$out/share/applications" - cp $desktopItem/share/applications/* $out/share/applications + install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg" + install -D contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png" + install -D -t $out/share/applications $desktopItem/share/applications/* ''; desktopItem = makeDesktopItem rec { diff --git a/pkgs/applications/misc/mlterm/x_shortcut.c.patch b/pkgs/applications/misc/mlterm/x_shortcut.c.patch deleted file mode 100644 index f0f929b7965..00000000000 --- a/pkgs/applications/misc/mlterm/x_shortcut.c.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- mlterm-3.7.2/xwindow/x_shortcut.c -+++ mlterm-3.7.2/xwindow/x_shortcut.c -@@ -292,6 +292,11 @@ - /* ingoring except these masks */ - state &= (ModMask|ControlMask|ShiftMask|CommandMask|button_mask) ; - -+ if( state & button_mask) -+ { -+ state &= ~Mod2Mask ; /* XXX NumLock */ -+ } -+ - if( shortcut->map[func].ksym == ksym && - shortcut->map[func].state == - ( state | -@@ -318,6 +323,11 @@ - /* ingoring except these masks */ - state &= (ModMask|ControlMask|ShiftMask|CommandMask|button_mask) ; - -+ if( state & button_mask) -+ { -+ state &= ~Mod2Mask ; /* XXX NumLock */ -+ } -+ - for( count = 0 ; count < shortcut->str_map_size ; count ++) - { - if( shortcut->str_map[count].ksym == ksym && diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix new file mode 100644 index 00000000000..5d03989a39e --- /dev/null +++ b/pkgs/applications/misc/tomboy/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, itstool, intltool, pkgconfig +, libxml2, gnome2, atk, gtk2, glib +, mono, mono-addins, dbus-sharp-2_0, dbus-sharp-glib-2_0, gnome-sharp, gtk-sharp-2_0 +, makeWrapper, lib}: + +let + version = "1.15.7"; +in + +stdenv.mkDerivation { + name = "tomboy-${version}"; + + src = fetchurl { + url = "https://github.com/tomboy-notes/tomboy/releases/download/${version}/tomboy-${version}.tar.xz"; + sha256 = "1i6sv6w2ms2x0nkgxq11agljiyg0yl4x2rzmcyvs2hxyf574hd1y"; + }; + + buildInputs = [ itstool intltool pkgconfig + libxml2 gnome2.GConf atk gtk2 + mono mono-addins dbus-sharp-2_0 dbus-sharp-glib-2_0 gnome-sharp gtk-sharp-2_0 + makeWrapper ]; + + postInstall = '' + makeWrapper "${mono}/bin/mono" "$out/bin/tomboy" \ + --add-flags "$out/lib/tomboy/Tomboy.exe" \ + --prefix MONO_GAC_PREFIX : ${dbus-sharp-2_0} \ + --prefix MONO_GAC_PREFIX : ${dbus-sharp-glib-2_0} \ + --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ + --prefix MONO_GAC_PREFIX : ${gnome-sharp} \ + --prefix MONO_GAC_PREFIX : ${mono-addins} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gtk-sharp-2_0 gtk-sharp-2_0.gtk gnome2.GConf ]} + ''; + + meta = with stdenv.lib; { + homepage = "https://wiki.gnome.org/Apps/Tomboy"; + description = "A simple note-taking application with synchronization"; + platforms = platforms.linux; + license = stdenv.lib.licenses.lgpl2; + maintainers = with maintainers; [ stesie ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index f9521a4dc17..8db066516c2 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.5"; + version = "0.8.6"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/terraform"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "terraform"; - sha256 = "1cxwv3652fpsbm2zk1akw356cd7w7vhny1623ighgbz9ha8gvg09"; + sha256 = "1yrsb940xx4iqjz4s6c4dbmxzmqzffrxn6if7ywixg4dgpi279mx"; }; postInstall = '' diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 60bcadf7463..a083b17dcb0 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 = "18.4.32"; + version = "19.4.13"; sha256 = { - "x86_64-linux" = "0rm91gic6qwlvkclhwpw9mhsb1l9qdxqi7kyvn5ij6a978c70k5r"; - "i686-linux" = "0xzk4hxykacvrym8ls8q4zv2277adg6b5m7zmncmfwb6igx4ipap"; + "x86_64-linux" = "06lgmjj204xpid35cqrp2msasg4s4w6lf1zpz1lnk3f9x6q10254"; + "i686-linux" = "1kdj3c5s8s4smd52p2mqbzjsk68a9cd5f8x92xgsx9zzdzjqmagl"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 31cad15296c..96b1b7d285e 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,31 +1,28 @@ { stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime, webkitgtk24x - , libsass, notmuch, boost, makeWrapper }: +, libsass, notmuch, boost, wrapGAppsHook }: stdenv.mkDerivation rec { name = "astroid-${version}"; - version = "0.6"; + version = "0.7"; src = fetchFromGitHub { owner = "astroidmail"; repo = "astroid"; rev = "v${version}"; - sha256 = "0zashjmqv8ips9q8ckyhgm9hfyf01wpgs6g21cwl05q5iklc5x7r"; + sha256 = "0r3hqwwr68bjhqaa1r3l9brbmvdp11pf8vhsjlvm5zv520z5y1rf"; }; patches = [ ./propagate-environment.patch ]; - buildInputs = [ scons pkgconfig gnome3.gtkmm gmime webkitgtk24x libsass - gnome3.libpeas notmuch boost gnome3.gsettings_desktop_schemas - makeWrapper ]; + nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ]; + + buildInputs = [ gnome3.gtkmm gmime webkitgtk24x libsass gnome3.libpeas + notmuch boost gnome3.gsettings_desktop_schemas + gnome3.adwaita-icon-theme ]; 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"; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 59c0f6d92b0..864acacaa9f 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -6,14 +6,14 @@ let ''; in stdenv.mkDerivation rec { - version = "0.14.21"; + version = "0.14.23"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0gxv4r7zg2rxjj0q8iiq3p5s75kwshcy6drjv65k8p2778bbvcjl"; + sha256 = "1himf8yhfpjsv5m068y2f6f696d7ip0jq7jmg69kn7035zlxicis"; }; buildInputs = [ go ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index ea265ae6661..b74483b8274 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -13,7 +13,7 @@ , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas , defaultIconTheme, glib, ncurses -, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ] +, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" ] , withHelp ? true , kdeIntegration ? false }: diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 40ab4e6a2d6..26bb53c9b38 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -13,7 +13,7 @@ , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas , defaultIconTheme, glib, ncurses -, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ] +, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" ] , withHelp ? true , kdeIntegration ? false }: diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index c31b97bd5c5..41298269a18 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -111,11 +111,11 @@ in plugin = "exodus"; namespace = "plugin.video.exodus"; - version = "2.0.12"; + version = "3.0.5"; src = fetchurl { url = "https://offshoregit.com/${plugin}/${namespace}/${namespace}-${version}.zip"; - sha256 = "02cdyvyxay6jiw9xj8hqnkp5w6drqj67pkh243znrsc06f26qkql"; + sha256 = "0di34sp6y3v72l6gfhj7cvs1vljs9vf0d0x2giix3jk433cj01j0"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/aqemu/default.nix b/pkgs/applications/virtualization/aqemu/default.nix new file mode 100644 index 00000000000..e7cd5b7bde6 --- /dev/null +++ b/pkgs/applications/virtualization/aqemu/default.nix @@ -0,0 +1,26 @@ +{ cmake, fetchFromGitHub, libvncserver, qemu, qtbase, stdenv +}: + +stdenv.mkDerivation rec { + name = "aqemu-${version}"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "tobimensch"; + repo = "aqemu"; + rev = "v${version}"; + sha256 = "1h1mcw8x0jir5p39bs8ka0lcisiyi4jq61fsccgb9hsvl1i8fvk5"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libvncserver qtbase qemu ]; + + meta = with stdenv.lib; { + description = "A virtual machine manager GUI for qemu"; + homepage = https://github.com/tobimensch/aqemu; + license = licenses.gpl2; + maintainers = with maintainers; [ hrdinka ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix new file mode 100644 index 00000000000..5b3610243be --- /dev/null +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "${pname}-${version}"; + pname = "amazon-ecs-agent"; + version = "1.14.0"; + + goPackagePath = "github.com/aws/${pname}"; + subPackages = [ "agent" ]; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "aws"; + repo = pname; + sha256 = "12c8l0x8pm883rlbdr1m07r0kjkzggkfz35cjqz8pzyr5ymjdrc3"; + }; + + meta = with stdenv.lib; { + description = "The agent that runs on AWS EC2 container instances and starts containers on behalf of Amazon ECS"; + homepage = "https://github.com/aws/amazon-ecs-agent"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ copumpkin ]; + }; +} + diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index dd8ddfd0e0b..78fa090f925 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,42 +1,48 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, - libmspack, openssl, pam, xercesc, icu, libdnet, procps, - xlibsWrapper, libXinerama, libXi, libXrender, libXrandr, libXtst, - pkgconfig, glib, gtk, gtkmm, iproute, dbus, systemd }: + fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, + libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, + pkgconfig, glib, gtk, gtkmm, iproute, dbus, systemd, which, + withX ? true }: -let - majorVersion = "10.0"; - minorVersion = "7"; - version = "${majorVersion}.${minorVersion}"; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "open-vm-tools-${version}"; + version = "10.1.0"; + src = fetchFromGitHub { owner = "vmware"; repo = "open-vm-tools"; rev = "stable-${version}"; - sha256 = "0xxgppxjisg3jly21r7mjk06rc4n7ssyvapasxhbi2d1bw0xkvrj"; + sha256 = "1qzk4mvw618ca4j9agsfpqch9jgwghvdc4rpkvlyz8kirvh9iniz"; }; sourceRoot = "${src.name}/open-vm-tools"; - buildInputs = - [ autoreconfHook makeWrapper libmspack openssl pam xercesc icu libdnet procps - pkgconfig glib gtk gtkmm xlibsWrapper libXinerama libXi libXrender libXrandr libXtst ]; + outputs = [ "out" "dev" ]; - postPatch = '' - sed -i s,-Werror,,g configure.ac - sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am - sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am - ''; + nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; + buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ] + ++ lib.optionals withX [ gtk gtkmm libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; patches = [ ./recognize_nixos.patch ]; + postPatch = '' + # Build bugfix for 10.1.0, stolen from Arch PKGBUILD + mkdir -p common-agent/etc/config + sed -i 's|.*common-agent/etc/config/Makefile.*|\\|' configure.ac - configureFlags = "--without-kernel-modules --without-xmlsecurity"; + sed -i 's,^confdir = ,confdir = ''${prefix},' scripts/Makefile.am + sed -i 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,' services/vmtoolsd/Makefile.am + sed -i 's,$(PAM_PREFIX),''${prefix}/$(PAM_PREFIX),' services/vmtoolsd/Makefile.am + sed -i 's,$(UDEVRULESDIR),''${prefix}/$(UDEVRULESDIR),' udev/Makefile.am + ''; + + configureFlags = [ "--without-kernel-modules" "--without-xmlsecurity" ] + ++ lib.optional (!withX) "--without-x"; + + enableParallelBuilding = true; postInstall = '' - sed -i 's,which ,command -v ,' "$out/etc/vmware-tools/scripts/vmware/network" - wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \ - --prefix PATH ':' "${lib.makeBinPath [ iproute dbus systemd ]}" + wrapProgram "$out/etc/vmware-tools/scripts/vmware/network" \ + --prefix PATH ':' "${lib.makeBinPath [ iproute dbus systemd which ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch b/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch index 64991a152bc..46d8ea7f7f3 100644 --- a/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch +++ b/pkgs/applications/virtualization/open-vm-tools/recognize_nixos.patch @@ -1,30 +1,20 @@ -diff -ruN open-vm-tools.orig/lib/include/guest_os.h open-vm-tools/lib/include/guest_os.h ---- open-vm-tools.orig/lib/include/guest_os.h 2016-02-12 00:50:33.000000000 +0000 -+++ open-vm-tools/lib/include/guest_os.h 2016-04-18 20:07:41.677251511 +0000 -@@ -222,6 +222,7 @@ +diff --git a/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h +index ef202e3..c7a105d 100644 +--- a/lib/include/guest_os.h ++++ b/lib/include/guest_os.h +@@ -238,6 +238,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); #define STR_OS_MANDRAKE_FULL "Mandrake Linux" #define STR_OS_MANDRIVA "mandriva" #define STR_OS_MKLINUX "MkLinux" +#define STR_OS_NIXOS "NixOS" #define STR_OS_NOVELL "nld9" #define STR_OS_NOVELL_FULL "Novell Linux Desktop 9" - #define STR_OS_ORACLE "oraclelinux" -diff -ruN open-vm-tools.orig/lib/include/vmblock.h open-vm-tools/lib/include/vmblock.h ---- open-vm-tools.orig/lib/include/vmblock.h 2016-02-12 00:50:33.000000000 +0000 -+++ open-vm-tools/lib/include/vmblock.h 2016-04-18 21:51:15.651235848 +0000 -@@ -145,7 +145,7 @@ - # define VMBLOCK_DEVICE_MODE VMBLOCK_FUSE_DEVICE_MODE - # define VMBLOCK_MOUNT_POINT VMBLOCK_FUSE_MOUNT_POINT - --#elif defined(linux) -+#elif defined(__linux__) - # define VMBLOCK_ADD_FILEBLOCK 98 - # define VMBLOCK_DEL_FILEBLOCK 99 - # ifdef VMX86_DEVEL -diff -ruN open-vm-tools.orig/lib/misc/hostinfoPosix.c open-vm-tools/lib/misc/hostinfoPosix.c ---- open-vm-tools.orig/lib/misc/hostinfoPosix.c 2016-02-12 00:50:33.000000000 +0000 -+++ open-vm-tools/lib/misc/hostinfoPosix.c 2016-04-18 20:09:45.841668252 +0000 -@@ -195,6 +195,7 @@ + #define STR_OS_ORACLE6 "oraclelinux6" +diff --git a/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c +index 0f55070..2d8467c 100644 +--- a/lib/misc/hostinfoPosix.c ++++ b/lib/misc/hostinfoPosix.c +@@ -195,6 +195,7 @@ static const DistroInfo distroArray[] = { {"Mandrake", "/etc/mandrake-release"}, {"Mandriva", "/etc/mandriva-release"}, {"MkLinux", "/etc/mklinux-release"}, @@ -32,12 +22,12 @@ diff -ruN open-vm-tools.orig/lib/misc/hostinfoPosix.c open-vm-tools/lib/misc/hos {"Novell", "/etc/nld-release"}, {"OracleLinux", "/etc/oracle-release"}, {"Photon", "/etc/lsb-release"}, -@@ -619,6 +620,8 @@ - Str_Strcpy(distroShort, STR_OS_MANDRIVA, distroShortSize); - } else if (strstr(distroLower, "mklinux")) { - Str_Strcpy(distroShort, STR_OS_MKLINUX, distroShortSize); +@@ -554,6 +555,8 @@ HostinfoGetOSShortName(char *distro, // IN: full distro name + } + } else if (strstr(distroLower, "mandrake")) { + Str_Strcpy(distroShort, STR_OS_MANDRAKE, distroShortSize); + } else if (strstr(distroLower, "nixos")) { + Str_Strcpy(distroShort, STR_OS_NIXOS, distroShortSize); - } else if (strstr(distroLower, "pld")) { - Str_Strcpy(distroShort, STR_OS_PLD, distroShortSize); - } else if (strstr(distroLower, "slackware")) { + } else if (strstr(distroLower, "turbolinux")) { + Str_Strcpy(distroShort, STR_OS_TURBO, distroShortSize); + } else if (strstr(distroLower, "sun")) { diff --git a/pkgs/build-support/vm/windows/cygwin-iso/default.nix b/pkgs/build-support/vm/windows/cygwin-iso/default.nix index 625071c9c33..01884f48878 100644 --- a/pkgs/build-support/vm/windows/cygwin-iso/default.nix +++ b/pkgs/build-support/vm/windows/cygwin-iso/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, runCommand, python, perl, cdrkit, pathsFromGraph +{ stdenv, fetchurl, runCommand, python, perl, xorriso, pathsFromGraph , arch ? "x86_64" }: @@ -10,10 +10,10 @@ let cygPkgList = if arch == "x86_64" then fetchurl { url = "${mirror}/x86_64/setup.ini"; - sha256 = "0ljsxdkx9s916wp28kcvql3bjx80zzzidan6jicby7i9s3sm96n9"; + sha256 = "0arrxvxbl85l82iy648snx5cl952w791p45p0dfg1xpiaf96cbkj"; } else fetchurl { url = "${mirror}/x86/setup.ini"; - sha256 = "1slyj4qha7x649ggwdski9spmyrbs04z2d46vgk8krllg0kppnjv"; + sha256 = "1fayx34868vd5h2nah7chiw65sl3i9qzrwvs7lrlv2h8k412vb69"; }; cygwinCross = (import ../../../../.. { @@ -25,23 +25,24 @@ let inherit arch; config = "${arch}-w64-mingw32"; }; - }).windows.cygwinSetup.crossDrv; + }).windows.cygwinSetup; makeCygwinClosure = { packages, packageList }: let expr = import (runCommand "cygwin.nix" { buildInputs = [ python ]; } '' python ${./mkclosure.py} "${packages}" ${toString packageList} > "$out" ''); - gen = { url, md5 }: { + gen = { url, hash }: { source = fetchurl { url = "${mirror}/${url}"; - inherit md5; + sha512 = hash; }; target = url; }; in map gen expr; in import ../../../../../nixos/lib/make-iso9660-image.nix { - inherit stdenv perl cdrkit pathsFromGraph; + inherit stdenv perl xorriso pathsFromGraph; + syslinux = null; contents = [ { source = "${cygwinCross}/bin/setup.exe"; target = "setup.exe"; diff --git a/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py b/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py index 48d569a6bd3..4c0d67c43ba 100644 --- a/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py +++ b/pkgs/build-support/vm/windows/cygwin-iso/mkclosure.py @@ -63,12 +63,12 @@ def main(): if install_line is None: continue - url, size, md5 = install_line.split(' ', 2) + url, size, hash = install_line.split(' ', 2) pack = [ ' {', ' url = "{0}";'.format(url), - ' md5 = "{0}";'.format(md5), + ' hash = "{0}";'.format(hash), ' }', ]; sys.stdout.write('\n'.join(pack) + '\n') diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix index dbb162dc432..2ec9189964a 100644 --- a/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix +++ b/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "epiphany-3.22.5"; + name = "epiphany-3.22.6"; src = fetchurl { url = mirror://gnome/sources/epiphany/3.22/epiphany-3.22.5.tar.xz; - sha256 = "e9c307b3f53a77c16ca698fb62fbb8d9b16773702d8163d83699bd623afa6745"; + sha256 = "0ib7z8x65gcr6vc6709df1rngcfrp3xn5ywqlrnc2xrsynrhghz9"; }; } diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix index dde8481b519..9a5d390f3b8 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel.nix @@ -7,14 +7,14 @@ let inherit (stdenv.lib) optional; p_name = "xfce4-panel"; ver_maj = "4.12"; - ver_min = "0"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1c4p3ckghvsad1sj5v8wmar5mh9cbhail9mmhad2f9pwwb10z4ih"; + sha256 = "1s52k80911pkp65zkxw9mrnczxsd81svr0djmmcfpjd9rj08pmck"; }; patches = [ ./xfce4-panel-datadir.patch ]; diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix index 3696cb6ed88..edbc11b8605 100644 --- a/pkgs/desktops/xfce/core/xfconf.nix +++ b/pkgs/desktops/xfce/core/xfconf.nix @@ -2,14 +2,14 @@ let p_name = "xfconf"; ver_maj = "4.12"; - ver_min = "0"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r"; + sha256 = "0dns190bwb615wy9ma2654sw4vz1d0rcv061zmaalkv9wmj8bx1m"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 446db73bacc..d9f33bcc6b2 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -1,14 +1,11 @@ { stdenv, fetchFromRepoOrCz, perl, texinfo }: - -assert (stdenv.isGlibc); - with stdenv.lib; let - date = "20160525"; + date = "20170108"; version = "0.9.27pre-${date}"; - rev = "1ca685f887310b5cbdc415cdfc3a578dbc8d82d8"; - sha256 = "149s847jkg2zdmk09h0cp0q69m8kxxci441zyw8b08fy9b87ayd8"; + rev = "5420bb8a67f5f782ac49c90afb7da178a60c448a"; + sha256 = "0gf1ys4vv5qfkh6462fkdv44mz5chhrchlvgcl0m44f8mm8cjwa3"; in stdenv.mkDerivation rec { @@ -20,8 +17,6 @@ stdenv.mkDerivation rec { inherit sha256; }; - outputs = [ "bin" "dev" "out" ]; - nativeBuildInputs = [ perl texinfo ]; hardeningDisable = [ "fortify" ]; @@ -32,17 +27,20 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - configureFlagsArray+=("--elfinterp=$(cat $NIX_CC/nix-support/dynamic-linker)") - configureFlagsArray+=("--crtprefix=${stdenv.glibc.out}/lib") - configureFlagsArray+=("--sysincludepaths=${stdenv.glibc.dev}/include:{B}/include") - configureFlagsArray+=("--libpaths=${stdenv.glibc.out}/lib") + echo ${version} > VERSION + + configureFlagsArray+=("--cc=cc") + configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)") + configureFlagsArray+=("--crtprefix=${getLib stdenv.cc.libc}/lib") + configureFlagsArray+=("--sysincludepaths=${getDev stdenv.cc.libc}/include:{B}/include") + configureFlagsArray+=("--libpaths=${getLib stdenv.cc.libc}/lib") ''; doCheck = true; checkTarget = "test"; postFixup = '' - paxmark m $bin/bin/tcc + paxmark m $out/bin/tcc ''; meta = { diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 7a421e4f7b6..09ab30bb176 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -20,7 +20,8 @@ # TODO enable shared libs for cross-compiling , enableSharedExecutables ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)) , enableSharedLibraries ? !isCross && (((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)) -, enableSplitObjs ? !stdenv.isDarwin # http://hackage.haskell.org/trac/ghc/ticket/4013 +, enableSplitObjs ? null # OBSOLETE, use enableDeadCodeElimination +, enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin , enableStaticLibraries ? true , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] , homepage ? "http://hackage.haskell.org/package/${pname}" @@ -53,6 +54,8 @@ } @ args: assert editedCabalFile != null -> revision != null; +# OBSOLETE, use enableDeadCodeElimination +assert enableSplitObjs == null; let @@ -108,13 +111,15 @@ let (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES") (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") - (enableFeature enableSplitObjs "split-objs") + (enableFeature (enableDeadCodeElimination && (stdenv.lib.versionAtLeast "8.0.1" ghc.version)) "split-objs") (enableFeature enableLibraryProfiling "library-profiling") (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling")) (enableFeature enableSharedLibraries "shared") (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature enableStaticLibraries "library-vanilla")) (optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic")) (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests")) + ] ++ optionals (enableDeadCodeElimination && (stdenv.lib.versionOlder "8.0.1" ghc.version)) [ + "--ghc-option=-split-sections" ] ++ optionals isGhcjs [ "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" "--ghcjs" diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 246a9f305db..f7c9811234e 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -50,8 +50,8 @@ rec { enableSharedLibraries = drv: overrideCabal drv (drv: { enableSharedLibraries = true; }); disableSharedLibraries = drv: overrideCabal drv (drv: { enableSharedLibraries = false; }); - enableSplitObjs = drv: overrideCabal drv (drv: { enableSplitObjs = true; }); - disableSplitObjs = drv: overrideCabal drv (drv: { enableSplitObjs = false; }); + enableDeadCodeElimination = drv: overrideCabal drv (drv: { enableDeadCodeElimination = true; }); + disableDeadCodeElimination = drv: overrideCabal drv (drv: { enableDeadCodeElimination = false; }); enableStaticLibraries = drv: overrideCabal drv (drv: { enableStaticLibraries = true; }); disableStaticLibraries = drv: overrideCabal drv (drv: { enableStaticLibraries = false; }); diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 62b5ddf8011..7f173b21156 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5-cpp }: +{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: stdenv.mkDerivation rec { - version = "7.200.2"; + version = "7.700.0"; name = "armadillo-${version}"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1yvx75caks477jqwx5gspi6946jialddk00wdvg6dnh5wdi2xasm"; + sha256 = "152x274hd3f59xgd27k9d3ikwb3w62v1v5hpw4lp1yzdyy8980pr"; }; - buildInputs = [ cmake openblasCompat superlu hdf5-cpp ]; + buildInputs = [ cmake openblasCompat superlu hdf5 ]; cmakeFlags = [ "-DDETECT_HDF5=ON" ]; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = http://arma.sourceforge.net; license = licenses.mpl20; platforms = platforms.unix; - maintainers = [ maintainers.juliendehos ]; + maintainers = with maintainers; [ juliendehos knedlsepp ]; }; } diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix index 3118caffb11..76cffa89dbc 100644 --- a/pkgs/development/libraries/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/default.nix @@ -27,4 +27,6 @@ rec { }; gst-validate = callPackage ./validate { inherit gst-plugins-base; }; + + # note: gst-python is in ./python/default.nix - called under pythonPackages } diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index 1fd346f6425..7db887e36be 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { "${meta.homepage}/src/gst-python/${name}.tar.xz" "mirror://gentoo/distfiles/${name}.tar.xz" ]; - sha256 = "1sljnqkxf2ix7yzghrapw5irl0rbp8aa8w2hggk7i6d9js10ls71"; + sha256 = "bdfa2d06dfe0ce68f638b04fed6890db506416c1dcf1279e83458269d719a4e8"; }; patches = [ ./different-path-with-pygobject.patch ]; diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 48853b63c79..a0e72f2b561 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,30 +1,51 @@ { stdenv, fetchurl, libelf }: -stdenv.mkDerivation rec { - name = "libdwarf-20161124"; - +let + version = "20161124"; src = fetchurl { - url = "http://www.prevanders.net/${name}.tar.gz"; + url = "http://www.prevanders.net/libdwarf-${version}.tar.gz"; sha512 = "38e480bce5ae8273fd585ec1d8ba94dc3e865a0ef3fcfcf38b5d92fa1ce41f8b" + "8c95a7cf8a6e69e7c6f638a3cc56ebbfb37b6317047309725fa17e7929096799"; }; - - configureFlags = [ "--enable-shared" "--disable-nonshared" ]; - - preConfigure = '' - cd libdwarf - ''; - buildInputs = [ libelf ]; - - installPhase = '' - mkdir -p $out/lib $out/include - cp libdwarf.so.1 $out/lib - ln -s libdwarf.so.1 $out/lib/libdwarf.so - cp libdwarf.h dwarf.h $out/include - ''; - meta = { homepage = https://www.prevanders.net/dwarf.html; platforms = stdenv.lib.platforms.linux; }; + +in rec { + libdwarf = stdenv.mkDerivation rec { + name = "libdwarf-${version}"; + + configureFlags = [ "--enable-shared" "--disable-nonshared" ]; + + preConfigure = '' + cd libdwarf + ''; + buildInputs = [ libelf ]; + + installPhase = '' + mkdir -p $out/lib $out/include + cp libdwarf.so.1 $out/lib + ln -s libdwarf.so.1 $out/lib/libdwarf.so + cp libdwarf.h dwarf.h $out/include + ''; + + inherit meta src; + }; + + dwarfdump = stdenv.mkDerivation rec { + name = "dwarfdump-${version}"; + + preConfigure = '' + cd dwarfdump + ''; + + buildInputs = [ libelf libdwarf ]; + + installPhase = '' + install -m755 -D dwarfdump $out/bin/dwarfdump + ''; + + inherit meta src; + }; } diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix new file mode 100644 index 00000000000..07d63c66b78 --- /dev/null +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchFromGitHub, autoreconfHook, python2, pkgconfig, mesa_noglu, libX11, libXext, glproto }: + +# Git version is needed for EGL and GLES handling. + +stdenv.mkDerivation rec { + name = "libglvnd-2016-12-22"; + + src = fetchFromGitHub { + owner = "NVIDIA"; + repo = "libglvnd"; + rev = "dc16f8c337703ad141f83583a4004fcf42e07766"; + sha256 = "1dbwf1216np77xf1kx3ci3y7hfa1p4vgrrzg71gw36hqxf36vg5f"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig python2 ]; + buildInputs = [ libX11 libXext glproto ]; + + NIX_CFLAGS_COMPILE = [ + "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS" + "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${mesa_noglu.driverLink}/share/glvnd/egl_vendor.d\"" + ]; + + outputs = [ "out" "dev" ]; + + meta = with stdenv.lib; { + description = "The GL Vendor-Neutral Dispatch library"; + homepage = "https://github.com/NVIDIA/libglvnd"; + license = licenses.bsd2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 53feba1d191..7efff3412a3 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -57,13 +57,13 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { name = "libvpx-${version}"; - version = "1.5.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "webmproject"; repo = "libvpx"; rev = "v${version}"; - sha256 = "19ill4c7dak5f8m4pdbas87zknw3a34sca8a4i952q0l0jnif0np"; + sha256 = "10fs7xilf2bsj5bqw206lb5r5dgl84p5m6nibiirk28lmjx1i3l0"; }; patchPhase = ''patchShebangs .''; @@ -89,7 +89,6 @@ stdenv.mkDerivation rec { (enableFeature gcovSupport "gcov") # Required to build shared libraries (enableFeature (!isCygwin) "pic") - (enableFeature (isi686 || isx86_64) "use-x86inc") (enableFeature optimizationsSupport "optimizations") (enableFeature runtimeCpuDetectSupport "runtime-cpu-detect") (enableFeature thumbSupport "thumb") diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 5e296e8d754..e7c64b9a76d 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -9,10 +9,10 @@ let mpiSupport = hdf5.mpiSupport; mpi = hdf5.mpi; in stdenv.mkDerivation rec { - name = "netcdf-4.3.3.1"; + name = "netcdf-4.4.1.1"; src = fetchurl { url = "http://www.unidata.ucar.edu/downloads/netcdf/ftp/${name}.tar.gz"; - sha256 = "06ds8zm4qvjlqvv4qb637cqr0xgvbhnghrddisad5vj81s5kvpmx"; + sha256 = "1blc7ik5yin7i0ls2kag0a9xjk12m0dzx6v1x88az3ras3scci2d"; }; buildInputs = [ hdf5 m4 curl mpi]; diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix new file mode 100644 index 00000000000..db4a8229064 --- /dev/null +++ b/pkgs/development/libraries/olm/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "olm-${version}"; + version = "2.2.1"; + + meta = { + description = "Implements double cryptographic ratchet and Megolm ratchet"; + license = stdenv.lib.licenses.asl20; + homepage = "https://matrix.org/git/olm/about"; + }; + + src = fetchurl { + url = "https://matrix.org/git/olm/snapshot/${name}.tar.gz"; + sha256 = "1spgsjmsw8afm2hg1mrq9c7cli3p17wl0ns7qbzn0h6ksh193709"; + }; + + doCheck = true; + checkTarget = "test"; + + installFlags = "PREFIX=$(out)"; +} diff --git a/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix b/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix index 0820897b81d..cf00f780901 100644 --- a/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/8.0-5.1/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://developer.download.nvidia.com/compute/redist/cudnn/v5.1/cudnn-8.0-linux-x64-v5.1.tgz"; - sha256 = "a87cb2df2e5e7cc0a05e266734e679ee1a2fadad6f06af82a76ed81a23b102c8"; + sha256 = "1kj50smlkm347wfbfqvy09ylvad1zapqjc9yqvfykmiddyrij1y1"; }; installPhase = '' diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 7fd7de1f756..c59f15c57ad 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp5 } : +{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp4 } : let pname = "lablgl"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0qabydd219i4ak7hxgc67496qnnscpnydya2m4ijn3cpbgih7zyq"; }; - buildInputs = [ ocaml findlib lablgtk freeglut camlp5 ]; + buildInputs = [ocaml findlib lablgtk freeglut camlp4]; propagatedBuildInputs = [ mesa ]; patches = [ ./Makefile.config.patch ./META.patch ]; diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix new file mode 100644 index 00000000000..b8565a8b758 --- /dev/null +++ b/pkgs/development/python-modules/incremental/default.nix @@ -0,0 +1,19 @@ +{ stdenv, buildPythonPackage, fetchurl }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "incremental"; + version = "16.10.1"; + + src = fetchurl { + url = "mirror://pypi/i/${pname}/${name}.tar.gz"; + sha256 = "0hh382gsj5lfl3fsabblk2djngl4n5yy90xakinasyn41rr6pb8l"; + }; + + meta = with stdenv.lib; { + homepage = http://github.com/twisted/treq; + description = "Incremental is a small library that versions your Python projects"; + license = licenses.mit; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/python-modules/netcdf4.nix b/pkgs/development/python-modules/netcdf4.nix new file mode 100644 index 00000000000..979a741e1ab --- /dev/null +++ b/pkgs/development/python-modules/netcdf4.nix @@ -0,0 +1,36 @@ +{ stdenv, buildPythonPackage, fetchurl, isPyPy +, numpy, zlib, netcdf, hdf5, curl, libjpeg +}: +buildPythonPackage rec { + name = "netCDF4-${version}"; + version = "1.2.7"; + + disabled = isPyPy; + + src = fetchurl { + url = "mirror://pypi/n/netCDF4/${name}.tar.gz"; + sha256 = "1fllizmnpw0zkzzm4j9pgamarlzfn3kmv9zrm0w65q1y31h9ni0c"; + }; + + propagatedBuildInputs = [ + numpy + zlib + netcdf + hdf5 + curl + libjpeg + ]; + + # Variables used to configure the build process + USE_NCCONFIG="0"; + HDF5_DIR="${hdf5}"; + NETCDF4_DIR="${netcdf}"; + CURL_DIR="${curl.dev}"; + JPEG_DIR="${libjpeg.dev}"; + + meta = with stdenv.lib; { + description = "Interface to netCDF library (versions 3 and 4)"; + homepage = https://pypi.python.org/pypi/netCDF4; + license = licenses.free; # Mix of license (all MIT* like) + }; +} diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix new file mode 100644 index 00000000000..37f9e3324c7 --- /dev/null +++ b/pkgs/development/python-modules/treq/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, buildPythonPackage, service-identity, requests2, + six, mock, twisted, incremental, coreutils, gnumake, pep8, sphinx, + openssl, pyopenssl }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "treq"; + version = "16.12.0"; + + src = fetchurl { + url = "mirror://pypi/t/${pname}/${name}.tar.gz"; + sha256 = "1aci3f3rmb5mdf4s6s4k4kghmnyy784cxgi3pz99m5jp274fs25h"; + }; + + buildInputs = [ + pep8 + mock + ]; + + propagatedBuildInputs = [ + service-identity + requests2 + twisted + incremental + sphinx + six + openssl + pyopenssl + ]; + + checkPhase = '' + ${pep8}/bin/pep8 --ignore=E902 treq + trial treq + ''; + + doCheck = false; + # Failure: twisted.web._newclient.RequestTransmissionFailed: [] + + postBuild = '' + ${coreutils}/bin/mkdir -pv treq + ${coreutils}/bin/echo "${version}" | ${coreutils}/bin/tee treq/_version + cd docs && ${gnumake}/bin/make html && cd .. + ''; + + meta = with stdenv.lib; { + homepage = http://github.com/twisted/treq; + description = "A requests-like API built on top of twisted.web's Agent"; + license = licenses.mit; + maintainers = with maintainers; [ nand0p ]; + }; +} diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 8e85c645e2e..427ff705840 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -1,21 +1,13 @@ -{ stdenv, - lib, - pythonPackages, - fetchurl, - coreutils, - openssh, - buildbot-worker, - plugins ? [], - enableLocalWorker ? false -}: +{ stdenv, lib, fetchurl, coreutils, openssh, buildbot-worker, makeWrapper, + pythonPackages, gnused, plugins ? [] }: pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "0.9.0.post1"; + version = "0.9.3"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "18rnsp691cnmbymlch6czx3mrcmifmf6dk97h9nslgfkkyf25n5g"; + sha256 = "1yw7knk5dcvwms14vqwlp89flhjf8567l17s9cq7vydh760nmg62"; }; buildInputs = with pythonPackages; [ @@ -31,7 +23,11 @@ pythonPackages.buildPythonApplication (rec { pylint astroid pyflakes - ] ++ lib.optionals (enableLocalWorker) [openssh]; + openssh + buildbot-worker + makeWrapper + treq + ]; propagatedBuildInputs = with pythonPackages; [ @@ -39,7 +35,6 @@ pythonPackages.buildPythonApplication (rec { twisted jinja2 zope_interface - future sqlalchemy sqlalchemy_migrate future @@ -61,32 +56,21 @@ pythonPackages.buildPythonApplication (rec { ramlfications sphinx-jinja - ] ++ plugins ++ - lib.optionals (enableLocalWorker) [buildbot-worker]; - - preInstall = '' - # writes out a file that can't be read properly - sed -i.bak -e '69,84d' buildbot/test/unit/test_www_config.py - ''; + ] ++ plugins; postPatch = '' - # re-hardcode path to tail - sed -i 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py + ${gnused}/bin/sed -i 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py ''; postFixup = '' - mv -v $out/bin/buildbot $out/bin/.wrapped-buildbot - echo "#!/bin/sh" > $out/bin/buildbot - echo "export PYTHONPATH=$PYTHONPATH" >> $out/bin/buildbot - echo "exec $out/bin/.wrapped-buildbot \"\$@\"" >> $out/bin/buildbot - chmod -c 555 $out/bin/buildbot + makeWrapper $out/bin/.buildbot-wrapped $out/bin/buildbot --set PYTHONPATH "$PYTHONPATH" ''; meta = with stdenv.lib; { homepage = http://buildbot.net/; description = "Continuous integration system that automates the build/test cycle"; maintainers = with maintainers; [ nand0p ryansydnor ]; - platforms = platforms.all; + platforms = platforms.linux; license = licenses.gpl2; }; }) diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index 2875f6942a9..f2fdd1535bf 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -4,11 +4,11 @@ let buildbot-pkg = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-pkg"; - version = "0.9.0.post1"; + version = "0.9.3"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "0frmnc73dsyc9mjnrnpm4vdrwb7c63gc6maq6xvlp486v7sdhjbi"; + sha256 = "02949cvmghyh313i1hmplwxp3nzq789kk85xjx2ir82cpr1d6h6j"; }; propagatedBuildInputs = with pythonPackages; [ setuptools ]; @@ -26,14 +26,15 @@ in { www = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot_www"; - version = "0.9.0.post1"; + version = "0.9.3"; # NOTE: wheel is used due to buildbot circular dependency format = "wheel"; - src = fetchurl { - url = "https://pypi.python.org/packages/02/d0/fc56ee27a09498638a47dcc5637ee5412ab7a67bfb4b3ff47e041f3d7b66/${name}-py2-none-any.whl"; - sha256 = "14ghch67k6090736n89l401swz7r9hnk2zlmdb59niq8lg7dyg9q"; + src = pythonPackages.fetchPypi { + inherit pname version format; + python = "py2"; + sha256 = "0yggg6mcykcnv41srl2sp2zwx2r38vb6a8jgxh1a4825mspm2jf7"; }; meta = with stdenv.lib; { @@ -48,14 +49,14 @@ in { console-view = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-console-view"; - version = "0.9.0.post1"; + version = "0.9.3"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "0dc7rb7mrpva5gj7l57i96a78d6yj28pkkj9hfim1955z9dgn58l"; + sha256 = "1rkzakm05x72nvdivc5bc3gab3nyasdfvlwnwril90jj9q1b92dk"; }; - propagatedBuildInputs = [ buildbot-pkg ]; + propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; meta = with stdenv.lib; { homepage = http://buildbot.net/; @@ -69,14 +70,14 @@ in { waterfall-view = pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; pname = "buildbot-waterfall-view"; - version = "0.9.0.post1"; + version = "0.9.3"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "0x9vvw15zzgj4w3qcxh8r10rb36ni0qh1215y7wbawh5lggnjm0g"; + sha256 = "033x2cs0znhk1j0lw067nmjw2m7yy1fdq5qch0sx50jnpjiq6g6g"; }; - propagatedBuildInputs = [ buildbot-pkg ]; + propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ]; meta = with stdenv.lib; { homepage = http://buildbot.net/; diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 7d7ecc1c52d..861ed647c5d 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -1,18 +1,22 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, gnused, coreutils, pythonPackages }: pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "0.9.0.post1"; + version = "0.9.3"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "1f8ij3y62r9z7qv92x21rg9h9whhakkwv59rgniq09j64ggjz8lx"; + sha256 = "176kp04g4c7gj15f73wppraqrirbfclyx214gcz966019niikcsp"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; propagatedBuildInputs = with pythonPackages; [ twisted future ]; + postPatch = '' + ${gnused}/bin/sed -i 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot_worker/scripts/logwatcher.py + ''; + meta = with stdenv.lib; { homepage = http://buildbot.net/; description = "Buildbot Worker Daemon"; diff --git a/pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch b/pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch new file mode 100644 index 00000000000..76b996ec2cc --- /dev/null +++ b/pkgs/development/tools/misc/ycmd/2-ycm-cmake.patch @@ -0,0 +1,40 @@ +diff --git a/cpp/ycm/CMakeLists.txt b/cpp/ycm/CMakeLists.txt +index 2074c58e..9ecd6e57 100644 +--- a/cpp/ycm/CMakeLists.txt ++++ b/cpp/ycm/CMakeLists.txt +@@ -366,35 +366,6 @@ if( LIBCLANG_TARGET ) + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy "${LIBCLANG_TARGET}" "$" + ) +- +- if( APPLE ) +- # In OS X El Capitan, Apple introduced System Integrity Protection. +- # Amongst other things, this introduces features to the dynamic loader +- # (dyld) which cause it to "sanitise" (and complain about) embedded +- # LC_RPATH entries which contain @executable_path when then are loaded +- # into "restricted" binaries. For our purposes, "restricted" here means +- # "supplied by Apple" and includes the system versions of python. For +- # unknown reasons, the libclang.dylib that comes from llvm.org includes an +- # LC_RPATH entry '@executable_path/../lib' which causes the OS X dynamic +- # loader to print a cryptic warning to stderr of the form: +- # +- # dyld: warning, LC_RPATH @executable_path/../lib in +- # /path/to/ycmd/libclang.dylib being ignored in restricted program +- # because of @executable_path +- # +- # In order to prevent this harmless and annoying message appearing, we +- # simply strip the rpath entry from the dylib. There's no way any +- # @executable_path that python might have could be in any way useful to +- # libclang.dylib, so this seems perfectly safe. +- get_filename_component( LIBCLANG_TAIL ${LIBCLANG_TARGET} NAME ) +- add_custom_command( TARGET ${PROJECT_NAME} +- POST_BUILD +- COMMAND install_name_tool +- "-delete_rpath" +- "@executable_path/../lib" +- "$/${LIBCLANG_TAIL}" +- ) +- endif() + endif() + endif() + diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 57b4fe99b2f..9ac227ac006 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -1,40 +1,84 @@ -{ stdenv, fetchgit, cmake, llvmPackages, boost, python2Packages +{ stdenv, lib, fetchgit, cmake, llvmPackages, boost, python +, gocode ? null +, godef ? null +, rustracerd ? null +, Cocoa ? null }: -let - inherit (python2Packages) python mkPythonDerivation waitress frozendict bottle; -in mkPythonDerivation rec { - name = "ycmd-2016-01-12"; - namePrefix = ""; +stdenv.mkDerivation rec { + name = "ycmd-${version}"; + version = "2017-02-03"; src = fetchgit { url = "git://github.com/Valloric/ycmd.git"; - rev = "f982f6251c5ff85e3abe6e862aad8bcd19e85ece"; - sha256 = "1g0hivv3wla7z5dgnkcn3ny38p089pjfj36nx6k29zmprgmjinyr"; + rev = "ec7a154f8fe50c071ecd0ac6841de8a50ce92f5d"; + sha256 = "0rzxgqqqmmrv9r4k2ji074iprhw6sb0jkvh84wvi45yfyphsh0xi"; }; - buildInputs = [ cmake boost ]; - - propagatedBuildInputs = [ waitress frozendict bottle ]; + buildInputs = [ cmake boost ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; buildPhase = '' export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped} ${python.interpreter} build.py --clang-completer --system-boost ''; + patches = [ ./2-ycm-cmake.patch ]; + configurePhase = ":"; + # remove the tests + # + # make __main__.py executable and add shebang + # + # copy over third-party libs + # note: if we switch to using our packaged libs, we'll need to symlink them + # into the same spots, as YouCompleteMe (the vim plugin) expects those paths + # to be available + # + # symlink completion backends where ycmd expects them installPhase = '' - mkdir -p $out/lib/ycmd/third_party $out/bin - cp -r ycmd/ CORE_VERSION libclang.so.* ycm_client_support.so ycm_core.so $out/lib/ycmd/ + rm -rf ycmd/tests + + chmod +x ycmd/__main__.py + sed -i "1i #!${python.interpreter}\ + " ycmd/__main__.py + + mkdir -p $out/lib/ycmd + cp -r ycmd/ CORE_VERSION libclang.so.* ycm_core.so $out/lib/ycmd/ + + mkdir -p $out/bin ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd + + mkdir -p $out/lib/ycmd/third_party/{gocode,godef,racerd/target/release} + + cp -r third_party/JediHTTP $out/lib/ycmd/third_party + for p in waitress frozendict bottle python-future argparse requests; do + cp -r third_party/$p $out/lib/ycmd/third_party + done + + '' + lib.optionalString (gocode != null) '' + ln -s ${gocode}/bin/gocode $out/lib/ycmd/third_party/gocode + '' + lib.optionalString (godef != null) '' + ln -s ${godef}/bin/godef $out/lib/ycmd/third_party/godef + '' + lib.optionalString (rustracerd != null) '' + ln -s ${rustracerd}/bin/racerd $out/lib/ycmd/third_party/racerd/target/release + ''; + + # fixup the argv[0] and replace __file__ with the corresponding path so + # python won't be thrown off by argv[0] + postFixup = '' + substituteInPlace $out/lib/ycmd/ycmd/__main__.py \ + --replace $out/lib/ycmd/ycmd/__main__.py \ + $out/bin/ycmd \ + --replace __file__ \ + "'$out/lib/ycmd/ycmd/__main__.py'" ''; meta = with stdenv.lib; { description = "A code-completion and comprehension server"; homepage = https://github.com/Valloric/ycmd; license = licenses.gpl3; - maintainers = with maintainers; [ rasendubi ]; + maintainers = with maintainers; [ rasendubi cstrahan ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 9ff9b05b5ed..84e57e267c2 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -2,12 +2,14 @@ stdenv.mkDerivation rec { name = "yodl-${version}"; - version = "3.08.01"; + version = "3.08.02"; - buildInputs = [ perl icmake ]; + nativeBuildInputs = [ icmake ]; + + buildInputs = [ perl ]; src = fetchFromGitHub { - sha256 = "0sks4phdy8qf6lmbjardrk0gl4v7crr4vjdgwpkkc8d5lzvcx7j5"; + sha256 = "0z4pjrl4bq03fxc50c9h0bnc90vqn5c2dy830mjyzjrn1ms3i003"; rev = version; repo = "yodl"; owner = "fbb-git"; diff --git a/pkgs/games/zdoom/zdbsp.nix b/pkgs/games/zdoom/zdbsp.nix new file mode 100644 index 00000000000..e3453628ba9 --- /dev/null +++ b/pkgs/games/zdoom/zdbsp.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, cmake, unzip, zlib }: + +stdenv.mkDerivation rec { + name = "zdbsp-${version}"; + version = "1.19"; + + src = fetchurl { + url = "https://zdoom.org/files/utils/zdbsp/zdbsp-${version}-src.zip"; + sha256 = "0j82q7g7hgvnahk6gdyhmn9880mqii3b4agqc98f5xaj3kxmd2dr"; + }; + + nativeBuildInputs = [cmake unzip]; + buildInputs = [zlib]; + sourceRoot = "."; + enableParallelBuilding = true; + installPhase = '' + install -Dm755 zdbsp $out/bin/zdbsp + ''; + + meta = with stdenv.lib; { + description = "ZDoom's internal node builder for DOOM maps"; + homepage = "https://zdoom.org/wiki/ZDBSP"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ertes]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix new file mode 100644 index 00000000000..4b8378368a3 --- /dev/null +++ b/pkgs/misc/emulators/attract-mode/default.nix @@ -0,0 +1,33 @@ +{ expat, fetchFromGitHub, ffmpeg, fontconfig, freetype, libarchive, libjpeg +, mesa, openal, pkgconfig, sfml, stdenv, zlib +}: + +stdenv.mkDerivation rec { + name = "attract-mode-${version}"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "mickelson"; + repo = "attract"; + rev = "v${version}"; + sha256 = "1arkfj0q3n1qbq5jwmal0kixxph8lnmv3g9bli36inab4r8zzmp8"; + }; + + nativeBuildInputs = [ pkgconfig ]; + + patchPhase = '' + sed -i "s|prefix=/usr/local|prefix=$out|" Makefile + ''; + + buildInputs = [ + expat ffmpeg fontconfig freetype libarchive libjpeg mesa openal sfml zlib + ]; + + meta = with stdenv.lib; { + description = "A frontend for arcade cabinets and media PCs"; + homepage = http://attractmode.org; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hrdinka ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 6a87ff395b3..e86c6bef05a 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -6,34 +6,11 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "1.8.6"; - url = "https://dl.winehq.org/wine/source/1.8/wine-${version}.tar.bz2"; - sha256 = "1lq6770pkv3342ss2ih18s2hw6i1srbcfg3mljwalqrvxfb7hydi"; + version = "2.0"; + url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.bz2"; + sha256 = "1ik6q0h3ph3jizmp7bxhf6kcm1pzrdrn2m0yf2x86slv2aigamlp"; ## see http://wiki.winehq.org/Gecko - gecko32 = fetchurl rec { - version = "2.40"; - url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86.msi"; - sha256 = "00nkaxhb9dwvf53ij0q75fb9fh7pf43hmwx6rripcax56msd2a8s"; - }; - gecko64 = fetchurl rec { - version = "2.40"; - url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86_64.msi"; - sha256 = "0c4jikfzb4g7fyzp0jcz9fk2rpdl1v8nkif4dxcj28nrwy48kqn3"; - }; - ## see http://wiki.winehq.org/Mono - mono = fetchurl rec { - version = "4.6.3"; - url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi"; - sha256 = "1f98xwgv665zb9cwc5zphcdbffyh3sm26h62hzca6zlcwy5fi0zq"; - }; - }; - - unstable = fetchurl rec { - version = "2.0-rc3"; - url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.bz2"; - sha256 = "0sq8li7p30h2a5bbpv27vxpzihr8h890qm78nq21fnh0zflg8x8y"; - inherit (stable) mono; gecko32 = fetchurl rec { version = "2.47"; url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86.msi"; @@ -44,11 +21,25 @@ in rec { url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86_64.msi"; sha256 = "0zaagqsji6zaag92fqwlasjs8v9hwjci5c2agn9m7a8fwljylrf5"; }; + + ## see http://wiki.winehq.org/Mono + mono = fetchurl rec { + version = "4.6.4"; + url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi"; + sha256 = "0lj1rhp9s8aaxd6764mfvnyswwalafaanz80vxg3badrfy0xbdwi"; + }; + }; + + unstable = fetchurl rec { + version = "2.0"; + url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.bz2"; + sha256 = "1ik6q0h3ph3jizmp7bxhf6kcm1pzrdrn2m0yf2x86slv2aigamlp"; + inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "1nk8s54nrlws0d8wpyj1vv2z0l2jansn990xw73v15wzwc3j9p6l"; + sha256 = "02jrdm49zlc0f357m0z65pilmg4lxh16va32ll3p4y8vr13nwawk"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index 51c5e3b7565..0d62f99e1e7 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "android-udev-rules-${version}"; - version = "20170202"; + version = "20170208"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - sha256 = "0apl22i27kgwld670wrlf5lv6iknx57grjbw0x0h4q0il2k4nmn7"; + sha256 = "0bqwb2xwwihyj8sw084qpyi8d4xx9sn7jlza6hfc57qnj4dha76w"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index a342f0c44f5..db5aa849f1e 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.47"; + version = "4.4.48"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1rsdz7bqqc3vzh24ii74rwphgi317f9nadxdr2dkxfipdw0w02nf"; + sha256 = "09c0rfm9ycyjyz0nsz34fa1cvfzx8pyzcmxhyz0dqiw6x4fqal3w"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 884adc77fd1..ac51cb73a91 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.8"; + version = "4.9.9"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0i8f1gn7jsl0gcpa54yb3yg24j2a542qvkcc3g9baja8vprbf2qm"; + sha256 = "1vnr6688gg8njmivdzlx21v1f3w02ahca194bjvm15apajcccd96"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/nvidia-x11/beta.nix b/pkgs/os-specific/linux/nvidia-x11/beta.nix deleted file mode 100644 index 6fd5fb6c0b6..00000000000 --- a/pkgs/os-specific/linux/nvidia-x11/beta.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl -, gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences -, # Whether to build the libraries only (i.e. not the kernel module or - # nvidia-settings). Used to support 32-bit binaries on 64-bit - # Linux. - libsOnly ? false -}: - -with stdenv.lib; - -assert (!libsOnly) -> kernel != null; - -let - - versionNumber = "349.12"; - - # Policy: use the highest stable version as the default (on our master). - inherit (stdenv.lib) makeLibraryPath; - -in - -stdenv.mkDerivation { - name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; - - builder = ./builder.sh; - - src = - if stdenv.system == "i686-linux" then - fetchurl { - url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0x9zfw66nxv98zpkdkymlyqzspksk850bhfmza7g7pba4yba085h"; - } - else if stdenv.system == "x86_64-linux" then - fetchurl { - url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "19mfkigzffxsik3h4bsjsl481q410h804fz3rdc7chs86q4bg9h3"; - } - else throw "nvidia-x11 does not support platform ${stdenv.system}"; - - inherit versionNumber libsOnly; - - kernel = if libsOnly then null else kernel.dev; - - hardeningDisable = [ "pic" "format" ]; - - dontStrip = true; - - glPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; - cudaPath = makeLibraryPath [zlib stdenv.cc.cc]; - openclPath = makeLibraryPath [zlib]; - allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; - - gtkPath = optionalString (!libsOnly) (makeLibraryPath - [ gtk atk pango glib gdk_pixbuf cairo ] ); - programPath = makeLibraryPath [ xorg.libXv ]; - - buildInputs = [ perl nukeReferences ]; - - disallowedReferences = if libsOnly then [] else [ kernel.dev ]; - - meta = with stdenv.lib.meta; { - homepage = http://www.nvidia.com/object/unix.html; - description = "X.org driver and kernel module for NVIDIA graphics cards"; - license = licenses.unfreeRedistributable; - platforms = platforms.linux; - maintainers = [ maintainers.vcunat ]; - }; -} diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh deleted file mode 100755 index fe826783141..00000000000 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh +++ /dev/null @@ -1,104 +0,0 @@ -source $stdenv/setup - -dontPatchELF=1 # must keep libXv, $out in RPATH - - -unpackFile() { - sh $src -x -} - - -buildPhase() { - if test -z "$libsOnly"; then - # Create the module. - echo "Building linux driver against kernel: $kernel"; - cd kernel - kernelVersion=$(cd $kernel/lib/modules && ls) - sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) - sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) - unset src # used by the nv makefile - make SYSSRC=$sysSrc SYSOUT=$sysOut module - cd .. - fi -} - - -installPhase() { - - # Install libGL and friends. - mkdir -p $out/lib/vendors - - for f in \ - libcuda libGL libnvcuvid libnvidia-cfg libnvidia-compiler \ - libnvidia-glcore libnvidia-ml libnvidia-opencl \ - libnvidia-tls libOpenCL libnvidia-tls libvdpau_nvidia - do - cp -prd $f.* $out/lib/ - ln -snf $f.so.$versionNumber $out/lib/$f.so - ln -snf $f.so.$versionNumber $out/lib/$f.so.1 - done - - cp -p nvidia.icd $out/lib/vendors/ - cp -prd tls $out/lib/ - cp -prd libOpenCL.so.1.0.0 $out/lib/ - ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so - ln -snf libOpenCL.so.1.0.0 $out/lib/libOpenCL.so.1 - - patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* - patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.* - patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* - - if test -z "$libsOnly"; then - - # Install the kernel module. - mkdir -p $out/lib/modules/$kernelVersion/misc - cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc - - # Install the X driver. - mkdir -p $out/lib/xorg/modules - cp -p libnvidia-wfb.* $out/lib/xorg/modules/ - mkdir -p $out/lib/xorg/modules/drivers - cp -p nvidia_drv.so $out/lib/xorg/modules/drivers - mkdir -p $out/lib/xorg/modules/extensions - cp -p libglx.so.* $out/lib/xorg/modules/extensions - - ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1 - ln -snf libglx.so.$versionNumber $out/lib/xorg/modules/extensions/libglx.so - - patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.* - - # Install the programs. - mkdir -p $out/bin - - for i in nvidia-settings nvidia-xconfig; do - cp $i $out/bin/$i - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $out/lib:$programPath:$glPath $out/bin/$i - done - - # Header files etc. - mkdir -p $out/include/nvidia - cp -p *.h $out/include/nvidia - - mkdir -p $out/share/man/man1 - cp -p *.1.gz $out/share/man/man1 - - mkdir -p $out/share/applications - cp -p *.desktop $out/share/applications - - mkdir -p $out/share/pixmaps - cp -p nvidia-settings.png $out/share/pixmaps - - # Patch the `nvidia-settings.desktop' file. - substituteInPlace $out/share/applications/nvidia-settings.desktop \ - --replace '__UTILS_PATH__' $out/bin \ - --replace '__PIXMAP_PATH__' $out/share/pixmaps - - # Move VDPAU libraries to their place - mkdir "$out"/lib/vdpau - mv "$out"/lib/libvdpau* "$out"/lib/vdpau - fi -} - - -genericBuild diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh deleted file mode 100755 index 899f12daf6b..00000000000 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh +++ /dev/null @@ -1,120 +0,0 @@ -source $stdenv/setup - -dontPatchELF=1 # must keep libXv, $out in RPATH - - -unpackFile() { - skip=$(sed 's/^skip=//; t; d' $src) - tail -n +$skip $src | xz -d | tar xvf - - sourceRoot=. -} - - -buildPhase() { - if test -z "$libsOnly"; then - # Create the module. - echo "Building linux driver against kernel: $kernel"; - cd kernel - kernelVersion=$(cd $kernel/lib/modules && ls) - sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) - sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) - unset src # used by the nv makefile - make SYSSRC=$sysSrc SYSOUT=$sysOut module - cd uvm - make SYSSRC=$sysSrc SYSOUT=$sysOut module - cd .. - cd .. - fi -} - - -installPhase() { - - if test -z "$libsOnly"; then - # Install the kernel module. - mkdir -p $out/lib/modules/$kernelVersion/misc - cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc - cp kernel/uvm/nvidia-uvm.ko $out/lib/modules/$kernelVersion/misc - - # Install the X driver. - mkdir -p $out/lib/xorg/modules - cp -p libnvidia-wfb.* $out/lib/xorg/modules/ - mkdir -p $out/lib/xorg/modules/drivers - cp -p nvidia_drv.so $out/lib/xorg/modules/drivers - mkdir -p $out/lib/xorg/modules/extensions - cp -p libglx.so.* $out/lib/xorg/modules/extensions - - #patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.* - - # Install the programs. - mkdir -p $out/bin - - for i in nvidia-settings nvidia-smi; do - cp $i $out/bin/$i - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $out/lib:$programPath:$glPath $out/bin/$i - done - - # Header files etc. - mkdir -p $out/include/nvidia - cp -p *.h $out/include/nvidia - - mkdir -p $out/share/man/man1 - cp -p *.1.gz $out/share/man/man1 - rm $out/share/man/man1/nvidia-xconfig.1.gz - - mkdir -p $out/share/applications - cp -p *.desktop $out/share/applications - - mkdir -p $out/share/pixmaps - cp -p nvidia-settings.png $out/share/pixmaps - - # Patch the `nvidia-settings.desktop' file. - substituteInPlace $out/share/applications/nvidia-settings.desktop \ - --replace '__UTILS_PATH__' $out/bin \ - --replace '__PIXMAP_PATH__' $out/share/pixmaps - - # Test a bit. - $out/bin/nvidia-settings --version - fi - - - # Install libGL and friends. - mkdir -p "$out/lib/vendors" - cp -p nvidia.icd $out/lib/vendors/ - - cp -prd *.so.* tls "$out/lib/" - rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately - - for libname in `find "$out/lib/" -name '*.so.*'` - do - # I'm lazy to differentiate needed libs per-library, as the closure is the same. - # Unfortunately --shrink-rpath would strip too much. - patchelf --set-rpath "$out/lib:$allLibPath" "$libname" - - libname_short=`echo -n "$libname" | sed 's/so\..*/so/'` - - # nvidia's EGL stack seems to expect libGLESv2.so.2 to be available - if [ $(basename "$libname_short") == "libGLESv2.so" ]; then - ln -srnf "$libname" "$libname_short.2" - fi - - ln -srnf "$libname" "$libname_short" - ln -srnf "$libname" "$libname_short.1" - done - - #patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* - #patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.* - #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* - #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.* - - # We distribute these separately in `libvdpau` - rm "$out"/lib/libvdpau{.*,_trace.*} - - # Move VDPAU libraries to their place - mkdir "$out"/lib/vdpau - mv "$out"/lib/libvdpau* "$out"/lib/vdpau -} - - -genericBuild diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index b739fde15f7..98858c4c985 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -1,17 +1,19 @@ source $stdenv/setup -dontPatchELF=1 # must keep libXv, $out in RPATH - - -unpackFile() { +unpackManually() { skip=$(sed 's/^skip=//; t; d' $src) tail -n +$skip $src | xz -d | tar xvf - sourceRoot=. } +unpackFile() { + sh $src -x || unpackManually +} + + buildPhase() { - if test -z "$libsOnly"; then + if [ -n "$bin" ]; then # Create the module. echo "Building linux driver against kernel: $kernel"; cd kernel @@ -25,45 +27,55 @@ buildPhase() { fi } - + installPhase() { # Install libGL and friends. - mkdir -p "$out/etc/OpenCL/vendors" - cp -p nvidia.icd $out/etc/OpenCL/vendors/ - - mkdir -p "$out/share/vulkan/icd.d" - cp -p nvidia_icd.json "$out/share/vulkan/icd.d/" - mkdir -p "$out/lib" cp -prd *.so.* tls "$out/lib/" - rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately + rm $out/lib/lib{glx,nvidia-wfb}.so.* # handled separately + rm -f $out/lib/libnvidia-gtk* # built from source + if [ "$useGLVND" = "1" ]; then + # Pre-built libglvnd + rm $out/lib/lib{GL,GLX,EGL,GLESv1_CM,GLESv2,OpenGL,GLdispatch}.so.* + fi + # Use ocl-icd instead + rm $out/lib/libOpenCL.so* + # Move VDPAU libraries to their place + mkdir $out/lib/vdpau + mv $out/lib/libvdpau* $out/lib/vdpau - rm $out/lib/libGL.so.1.* # GLVND - rm $out/lib/libOpenCL.so* # ocl-icd is used instead + # Install ICDs. + install -Dm644 nvidia.icd $out/etc/OpenCL/vendors/nvidia.icd + if [ -e nvidia_icd.json ]; then + install -Dm644 nvidia_icd.json $out/share/vulkan/icd.d/nvidia.json + fi + if [ "$useGLVND" = "1" ]; then + install -Dm644 10_nvidia.json $out/share/glvnd/egl_vendor.d/nvidia.json + fi - if test -z "$libsOnly"; then + if [ -n "$bin" ]; then # Install the X drivers. - mkdir -p $out/lib/xorg/modules - cp -p libnvidia-wfb.* $out/lib/xorg/modules/ - mkdir -p $out/lib/xorg/modules/drivers - cp -p nvidia_drv.so $out/lib/xorg/modules/drivers - mkdir -p $out/lib/xorg/modules/extensions - cp -p libglx.so.* $out/lib/xorg/modules/extensions + mkdir -p $bin/lib/xorg/modules + cp -p libnvidia-wfb.* $bin/lib/xorg/modules/ + mkdir -p $bin/lib/xorg/modules/drivers + cp -p nvidia_drv.so $bin/lib/xorg/modules/drivers + mkdir -p $bin/lib/xorg/modules/extensions + cp -p libglx.so.* $bin/lib/xorg/modules/extensions # Install the kernel module. - mkdir -p $out/lib/modules/$kernelVersion/misc + mkdir -p $bin/lib/modules/$kernelVersion/misc for i in $(find ./kernel -name '*.ko'); do nuke-refs $i - cp $i $out/lib/modules/$kernelVersion/misc/ + cp $i $bin/lib/modules/$kernelVersion/misc/ done fi - # All libs except GUI-only are in $out now, so fixup them. - for libname in `find "$out/lib/" -name '*.so.*'` + # All libs except GUI-only are installed now, so fixup them. + for libname in `find "$out/lib/" -name '*.so.*'` `find "$bin/lib/" -name '*.so.*'` do # I'm lazy to differentiate needed libs per-library, as the closure is the same. # Unfortunately --shrink-rpath would strip too much. - patchelf --set-rpath "$out/lib:$allLibPath" "$libname" + patchelf --set-rpath "$out/lib:$libPath" "$libname" libname_short=`echo -n "$libname" | sed 's/so\..*/so/'` @@ -82,55 +94,23 @@ installPhase() { fi done - #patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* - #patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.* - #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* - #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.* - - if test -z "$libsOnly"; then - # Install headers and /share files etc. - mkdir -p $out/include/nvidia - cp -p *.h $out/include/nvidia - - mkdir -p $out/share/man/man1 - cp -p *.1.gz $out/share/man/man1 - rm $out/share/man/man1/nvidia-xconfig.1.gz - - mkdir -p $out/share/applications - cp -p *.desktop $out/share/applications - - mkdir -p $out/share/pixmaps - cp -p nvidia-settings.png $out/share/pixmaps - - # Patch the `nvidia-settings.desktop' file. - substituteInPlace $out/share/applications/nvidia-settings.desktop \ - --replace '__UTILS_PATH__' $out/bin \ - --replace '__PIXMAP_PATH__' $out/share/pixmaps - + if [ -n "$bin" ]; then + # Install /share files. + mkdir -p $bin/share/man/man1 + cp -p *.1.gz $bin/share/man/man1 + rm -f $bin/share/man/man1/{nvidia-xconfig,nvidia-settings,nvidia-persistenced}.1.gz # Install the programs. - mkdir -p $out/bin - - for i in nvidia-settings nvidia-smi; do - cp $i $out/bin/$i - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $out/lib:$programPath:$glPath $out/bin/$i + for i in nvidia-cuda-mps-control nvidia-cuda-mps-server nvidia-smi nvidia-debugdump; do + if [ -e "$i" ]; then + install -Dm755 $i $bin/bin/$i + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath $out/lib:$libPath $bin/bin/$i + fi done - - patchelf --set-rpath $glPath:$gtkPath $out/lib/libnvidia-gtk2.so.*.* - - # Test a bit. - $out/bin/nvidia-settings --version - else - rm $out/lib/libnvidia-gtk2.* + # FIXME: needs PATH and other fixes + # install -Dm755 nvidia-bug-report.sh $bin/bin/nvidia-bug-report.sh fi - - # For simplicity and dependency reduction, don't support the gtk3 interface. - rm $out/lib/libnvidia-gtk3.* - - # Move VDPAU libraries to their place - mkdir "$out"/lib/vdpau - mv "$out"/lib/libvdpau* "$out"/lib/vdpau } diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 967a98d9566..204ef62138a 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,74 +1,43 @@ -{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl -, gtk2, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences -, # Whether to build the libraries only (i.e. not the kernel module or - # nvidia-settings). Used to support 32-bit binaries on 64-bit - # Linux. - libsOnly ? false -}: - -with stdenv.lib; - -assert (!libsOnly) -> kernel != null; +{ callPackage }: let - - versionNumber = "375.26"; - - # Policy: use the highest stable version as the default (on our master). - inherit (stdenv.lib) makeLibraryPath; - - nameSuffix = optionalString (!libsOnly) "-${kernel.version}"; - + generic = args: callPackage (import ./generic.nix args) { }; in - -stdenv.mkDerivation { - name = "nvidia-x11-${versionNumber}${nameSuffix}"; - - builder = ./builder.sh; - - src = - if stdenv.system == "i686-linux" then - fetchurl { - url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0yv19rkz2wzzj0fygfjb1mh21iy769kff3yg2kzk8bsiwnmcyybw"; - } - else if stdenv.system == "x86_64-linux" then - fetchurl { - url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}.run"; - sha256 = "1kqy9ayja3g5znj2hzx8pklz8qi0b0l9da7c3ldg3hlxf31v4hjg"; - } - else throw "nvidia-x11 does not support platform ${stdenv.system}"; - - inherit versionNumber libsOnly; - inherit (stdenv) system; - - kernel = if libsOnly then null else kernel.dev; - - hardeningDisable = [ "pic" "format" ]; - - dontStrip = true; - - glPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; - cudaPath = makeLibraryPath [zlib stdenv.cc.cc]; - openclPath = makeLibraryPath [zlib]; - allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; - - gtkPath = optionalString (!libsOnly) (makeLibraryPath - [ gtk2 atk pango glib gdk_pixbuf cairo ] ); - programPath = makeLibraryPath [ xorg.libXv ]; - - - - buildInputs = [ perl nukeReferences ]; - - disallowedReferences = if libsOnly then [] else [ kernel.dev ]; - - meta = with stdenv.lib.meta; { - homepage = http://www.nvidia.com/object/unix.html; - description = "X.org driver and kernel module for NVIDIA graphics cards"; - license = licenses.unfreeRedistributable; - platforms = platforms.linux; - maintainers = [ maintainers.vcunat ]; - priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" +{ + # Policy: use the highest stable version as the default (on our master). + stable = generic { + version = "375.26"; + sha256_32bit = "0yv19rkz2wzzj0fygfjb1mh21iy769kff3yg2kzk8bsiwnmcyybw"; + sha256_64bit = "1kqy9ayja3g5znj2hzx8pklz8qi0b0l9da7c3ldg3hlxf31v4hjg"; + settingsSha256 = "1s8zf5cfhx8m05fvws0gh1q0wy5zyyg2j510zlwp4hk35y7dic5y"; + persistencedSha256 = "15r6rbzyk4yaqkpkqs8j00zc7jbhgp8naskv93dwjyw0lnj0wgky"; }; + + beta = generic { + version = "378.09"; + sha256_32bit = "0a1vwvsqi89pn29c9aii53xq8292dxf68sr8lxzx4bpqjqmsbapy"; + sha256_64bit = "018qqg9zlpwd2cad99vbn18rnrrkrqybs7q65h8dmxirkx4pcvh8"; + settingsSha256 = "1fjkpqmzdzk46p1chzxqvbj3cpqcwwx4qmv33yjq7z2a5zab9z8v"; + persistencedSha256 = "1svaa5a0zz0r8qy6pg9lnhy5zmffvw0h120h46qqd01pkb4yv5lc"; + }; + + legacy_340 = generic { + version = "340.101"; + sha256_32bit = "0qmhkvxj6h63sayys9gldpafw5skpv8nsm2gxxb3pxcv7nfdlpjz"; + sha256_64bit = "02k8j0xzxp2y4vay0kf982q382ny1i4g1kai93f2h5sak6sq3kyj"; + settingsSha256 = "1mavbhff24n0jn154af152fp04njd505scdlxdm850h1ycb2i3g9"; + persistencedSha256 = "1396bmmg9b1z805dzljgi2f219ji84wfnnifdbk32dpd5mrywjk0"; + useGLVND = false; + }; + + legacy_304 = generic { + version = "304.134"; + sha256_32bit = "178wx0a2pmdnaypa9pq6jh0ii0i8ykz1sh1liad9zfriy4d8kxw4"; + sha256_64bit = "0pydw7nr4d2dply38kwvjbghsbilbp2q0mas4nfq5ad050d2c550"; + settingsSha256 = "0q92xw4fr9p5nbhj1plynm50d32881861daxfwrisywszqijhmlf"; + persistencedSha256 = null; + useGLVND = false; + }; + + legacy_173 = callPackage ./legacy173.nix { }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix new file mode 100644 index 00000000000..1398dae0e64 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -0,0 +1,81 @@ +{ version +, sha256_32bit +, sha256_64bit +, settingsSha256 +, persistencedSha256 +, useGLVND ? true +, preferGtk2 ? false +}: + +{ stdenv, callPackage, callPackage_i686, buildEnv, fetchurl +, kernel ? null, xorg, zlib, perl, nukeReferences +, # Whether to build the libraries only (i.e. not the kernel module or + # nvidia-settings). Used to support 32-bit binaries on 64-bit + # Linux. + libsOnly ? false +}: + +with stdenv.lib; + +assert (!libsOnly) -> kernel != null; + +let + nameSuffix = optionalString (!libsOnly) "-${kernel.version}"; + pkgSuffix = optionalString (versionOlder version "304") "-pkg0"; + + self = stdenv.mkDerivation { + name = "nvidia-x11-${version}${nameSuffix}"; + + builder = ./builder.sh; + + src = + if stdenv.system == "i686-linux" then + fetchurl { + url = "http://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run"; + sha256 = sha256_32bit; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"; + sha256 = sha256_64bit; + } + else throw "nvidia-x11 does not support platform ${stdenv.system}"; + + inherit version useGLVND; + inherit (stdenv) system; + + outputs = [ "out" ] ++ optional (!libsOnly) "bin"; + outputDev = if libsOnly then null else "bin"; + + kernel = if libsOnly then null else kernel.dev; + + hardeningDisable = [ "pic" "format" ]; + + dontStrip = true; + dontPatchELF = true; + + libPath = makeLibraryPath [ xorg.libXext xorg.libX11 xorg.libXv xorg.libXrandr zlib stdenv.cc.cc ]; + + nativeBuildInputs = [ perl nukeReferences ]; + + disallowedReferences = optional (!libsOnly) [ kernel.dev ]; + + passthru = { + settings = callPackage (import ./settings.nix self settingsSha256) { + withGtk2 = preferGtk2; + withGtk3 = !preferGtk2; + }; + persistenced = if persistencedSha256 == null then null else callPackage (import ./persistenced.nix self persistencedSha256) { }; + }; + + meta = with stdenv.lib; { + homepage = http://www.nvidia.com/object/unix.html; + description = "X.org driver and kernel module for NVIDIA graphics cards"; + license = licenses.unfreeRedistributable; + platforms = platforms.linux; + maintainers = [ maintainers.vcunat ]; + priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" + }; + }; + +in self diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index d1f6d36a6a7..19199579e77 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -38,6 +38,12 @@ stdenv.mkDerivation { programPath = stdenv.lib.makeLibraryPath [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ]; + passthru = { + settings = null; + persistenced = null; + useGLVND = false; + }; + meta = { homepage = http://www.nvidia.com/object/unix.html; description = "X.org driver and kernel module for Legacy NVIDIA graphics cards"; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix deleted file mode 100644 index a6728f40cda..00000000000 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl -, gtk2, atk, pango, glib, gdk_pixbuf -, # Whether to build the libraries only (i.e. not the kernel module or - # nvidia-settings). Used to support 32-bit binaries on 64-bit - # Linux. - libsOnly ? false -}: - -with stdenv.lib; - -let versionNumber = "304.134"; in - -stdenv.mkDerivation { - name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; - - builder = ./builder-legacy304.sh; - - src = - if stdenv.system == "i686-linux" then - fetchurl { - url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "178wx0a2pmdnaypa9pq6jh0ii0i8ykz1sh1liad9zfriy4d8kxw4"; - } - else if stdenv.system == "x86_64-linux" then - fetchurl { - url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0hy4q1v4y7q2jq2j963mwpjhjksqhaiing3xcla861r8rmjkf8a2"; - } - else throw "nvidia-x11 does not support platform ${stdenv.system}"; - - inherit versionNumber libsOnly; - - kernel = if libsOnly then null else kernel.dev; - - hardeningDisable = [ "pic" "format" ]; - - dontStrip = true; - - glPath = stdenv.lib.makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; - - cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc]; - - programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath - [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ] ); - - buildInputs = [ perl ]; - - meta = { - homepage = http://www.nvidia.com/object/unix.html; - description = "X.org driver and kernel module for NVIDIA graphics cards"; - license = stdenv.lib.licenses.unfree; - }; -} diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix deleted file mode 100644 index 5707fc4a1eb..00000000000 --- a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv, fetchurl, kernel ? null, xorg, zlib, perl -, gtk2, atk, pango, glib, gdk_pixbuf -, # Whether to build the libraries only (i.e. not the kernel module or - # nvidia-settings). Used to support 32-bit binaries on 64-bit - # Linux. - libsOnly ? false -}: - -with stdenv.lib; - -assert (!libsOnly) -> kernel != null; - -let - - versionNumber = "340.101"; - /* This branch is needed for G8x, G9x, and GT2xx GPUs, and motherboard chipsets based on them. - Ongoing support for new Linux kernels and X servers, as well as fixes for critical bugs, - will be included in 340.* legacy releases through the end of 2019. - */ - inherit (stdenv.lib) makeLibraryPath; -in - -stdenv.mkDerivation { - name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; - - builder = ./builder-legacy340.sh; - - src = - if stdenv.system == "i686-linux" then - fetchurl { - url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0qmhkvxj6h63sayys9gldpafw5skpv8nsm2gxxb3pxcv7nfdlpjz"; - } - else if stdenv.system == "x86_64-linux" then - fetchurl { - url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0ln7fxm78zrzrjk3j5ychi5xxlgkzg2m7anw8nklr3d17c3jxxjy"; - } - else throw "nvidia-x11 does not support platform ${stdenv.system}"; - - inherit versionNumber libsOnly; - - kernel = if libsOnly then null else kernel.dev; - - hardeningDisable = [ "pic" "format" ]; - - dontStrip = true; - - glPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr]; - cudaPath = makeLibraryPath [zlib stdenv.cc.cc]; - openclPath = makeLibraryPath [zlib]; - allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; - - programPath = optionalString (!libsOnly) (makeLibraryPath - [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ] ); - - buildInputs = [ perl ]; - - meta = with stdenv.lib.meta; { - homepage = http://www.nvidia.com/object/unix.html; - description = "X.org driver and kernel module for NVIDIA graphics cards"; - license = licenses.unfreeRedistributable; - platforms = platforms.linux; - maintainers = [ maintainers.vcunat ]; - priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" - }; -} diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix new file mode 100644 index 00000000000..bc79e0efe63 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -0,0 +1,30 @@ +nvidia_x11: sha256: + +{ stdenv, lib, fetchurl, m4 }: + +stdenv.mkDerivation rec { + name = "nvidia-persistenced-${nvidia_x11.version}"; + inherit (nvidia_x11) version; + + src = fetchurl { + url = "ftp://download.nvidia.com/XFree86/nvidia-persistenced/${name}.tar.bz2"; + inherit sha256; + }; + + nativeBuildInputs = [ m4 ]; + + installFlags = [ "PREFIX=$(out)" ]; + + postFixup = '' + patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-persistenced):${nvidia_x11}/lib" \ + $out/bin/nvidia-persistenced + ''; + + meta = with stdenv.lib; { + homepage = "http://www.nvidia.com/object/unix.html"; + description = "Settings application for NVIDIA graphics cards"; + license = licenses.unfreeRedistributable; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix new file mode 100644 index 00000000000..de60c9ccf4f --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -0,0 +1,51 @@ +nvidia_x11: sha256: + +{ stdenv, lib, fetchurl, pkgconfig, m4, gtk2, gtk3, libXv, libvdpau +, withGtk2 ? false, withGtk3 ? true +}: + +stdenv.mkDerivation rec { + name = "nvidia-settings-${nvidia_x11.version}"; + inherit (nvidia_x11) version; + + src = fetchurl { + url = "ftp://download.nvidia.com/XFree86/nvidia-settings/${name}.tar.bz2"; + inherit sha256; + }; + + nativeBuildInputs = [ pkgconfig m4 ]; + + buildInputs = [ gtk2 gtk3 libXv libvdpau ]; + + installFlags = [ "PREFIX=$(out)" ]; + + preBuild = '' + if [ -e src/libXNVCtrl/libXNVCtrl.a ]; then + ( cd src/libXNVCtrl + make + ) + fi + ''; + + postInstall = '' + ${lib.optionalString (!withGtk2) '' + rm -f $out/lib/libnvidia-gtk2.so.* + ''} + ${lib.optionalString (!withGtk3) '' + rm -f $out/lib/libnvidia-gtk3.so.* + ''} + ''; + + postFixup = '' + patchelf --set-rpath "$(patchelf --print-rpath $out/bin/nvidia-settings):$out/lib:${nvidia_x11}/lib" \ + $out/bin/nvidia-settings + ''; + + meta = with stdenv.lib; { + homepage = "http://www.nvidia.com/object/unix.html"; + description = "Settings application for NVIDIA graphics cards"; + license = licenses.unfreeRedistributable; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix index 312ac0c281a..ea49f9e4029 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -6,25 +6,24 @@ nss_wrapper, docbook_xml_dtd_44, ncurses, Po4a, http-parser, jansson }: let - name = "sssd-${version}"; - version = "1.14.2"; - docbookFiles = "${pkgs.docbook_xml_xslt}/share/xml/docbook-xsl/catalog.xml:${pkgs.docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml"; in -stdenv.mkDerivation { - inherit name; - inherit version; +stdenv.mkDerivation rec { + name = "sssd-${version}"; + version = "1.14.2"; src = fetchurl { url = "https://fedorahosted.org/released/sssd/${name}.tar.gz"; sha1 = "167b2216c536035175ff041d0449e0a874c68601"; }; + # Something is looking for instead of + NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; + preConfigure = '' export SGML_CATALOG_FILES="${docbookFiles}" export PYTHONPATH=${ldap}/lib/python2.7/site-packages export PATH=$PATH:${pkgs.openldap}/libexec - export CPATH=${pkgs.libxml2.dev}/include/libxml2 configureFlagsArray=( --prefix=$out @@ -82,6 +81,7 @@ stdenv.mkDerivation { description = "System Security Services Daemon"; homepage = https://fedorahosted.org/sssd/; license = licenses.gpl3; + platforms = platforms.linux; maintainers = [ maintainers.e-user ]; }; } diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index ff64e83820f..0c9f72f66d5 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -1,7 +1,7 @@ { stdenv, pkgs, lib, fetchurl, fetchgit, jansson, libxml2, libxslt, ncurses, openssl, sqlite, utillinux, dmidecode, libuuid, binutils, newt, - lua, + lua, speex, srtp, wget, curl, subversionClient }: @@ -11,7 +11,7 @@ let inherit version; name = "asterisk-${version}"; - buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua srtp wget curl subversionClient ]; + buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux dmidecode libuuid binutils newt lua speex srtp wget curl subversionClient ]; patches = [ # We want the Makefile to install the default /var skeleton @@ -83,8 +83,8 @@ in }; asterisk-stable = common { - version = "14.1.2"; - sha256 = "0w9s4334rwvpyxm169grmnb4k9yq0l2al73dyh4cb8769qcs0ij8"; + version = "14.2.1"; + sha256 = "193yhyjn0fwrd7hsmr3qwcx3k2pc6cq70v1mnfdwidix4cqm32xj"; externals = { "externals_cache/pjproject-2.5.5.tar.bz2" = pjproject-255; }; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index fb8c9da5f8e..0741603b3ec 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchurl, openssl, libtool, perl, libxml2 , libseccomp ? null }: -let version = "9.10.4-P5"; in +let version = "9.10.4-P6"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "1sqg7wg05h66vdjc8j215r04f8pg7lphkb93nsqxvzhk6r0ppi49"; + sha256 = "0rgffdm0h6dks0np4h9q4kd8nyb3azrdxw2skqnjzd8ws78vzpx1"; }; outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ]; diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 603709b31ce..89845fff9c6 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -13,11 +13,11 @@ }: stdenv.mkDerivation rec { - name = "nsd-4.1.13"; + name = "nsd-4.1.14"; src = fetchurl { url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "1bwiabj1m7h14ppsa2azw017dqkqjgdl9gmj6ghjg80146xd8p64"; + sha256 = "bdfc61c5f3bf11febd8f4776eef1d4f2d95ed70f12f11d4eeee943c186ffd802"; }; buildInputs = [ libevent openssl ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index f7890aa8e3c..587ec52c421 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -24,13 +24,13 @@ let }; in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "02zbyfnkc8a0bmaz3ylcwc8010cy0c1vrr7k2yywv5wd3ril4cp6"; + sha256 = "1jjfa3vigghnk201zkhp97mh25cx17gic0cjn0fgn7yxs83wrh5c"; }; patches = [ ./matrix-synapse.patch ]; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 977df396755..477338a3317 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mattermost-${version}"; - version = "3.3.0"; + version = "3.6.2"; src = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz"; - sha256 = "16mp75hv4lzkj99lj18c5vyqsmk9kqk5r81hirq41fgb6bdqx509"; + sha256 = "1wf8xvy8njmhym45dwag6mdwhfgzg5xccvhyv7c68rz5h57vfgsb"; }; installPhase = '' diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index f3b20add96d..d830af19bdc 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "matterircd-${version}"; - version = "0.9.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${version}"; - sha256 = "1sh34vwi8ycmdsgpzqwa7gcjzb0rn46aig6n40hxy6q1lk2l6m3c"; + sha256 = "0yxqlckir50kdlbi36kak5ncfzl6sh811hzicdar5yzanzcip8ja"; }; goPackagePath = "github.com/42vim/matterircd"; diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix index 35b6ee92cdc..30beec7b873 100644 --- a/pkgs/servers/search/elasticsearch/2.x.nix +++ b/pkgs/servers/search/elasticsearch/2.x.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1qjq04sfqb35pf2xpvr8j5p27chfxpjp8ymrp1h5bfk5rbk9444q"; }; - patches = [ ./es-home-2.x.patch ]; + patches = [ ./es-home-2.x.patch ./es-classpath-2.x.patch ]; buildInputs = [ makeWrapper jre ] ++ (if (!stdenv.isDarwin) then [utillinux] else [getopt]); @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { # don't want to have binary with name plugin mv $out/bin/plugin $out/bin/elasticsearch-plugin - wrapProgram $out/bin/elasticsearch ${if (!stdenv.isDarwin) + wrapProgram $out/bin/elasticsearch \ + --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*" \ + ${if (!stdenv.isDarwin) then ''--prefix PATH : "${utillinux}/bin/"'' else ''--prefix PATH : "${getopt}/bin"''} \ --set JAVA_HOME "${jre}" diff --git a/pkgs/servers/search/elasticsearch/es-classpath-2.x.patch b/pkgs/servers/search/elasticsearch/es-classpath-2.x.patch new file mode 100644 index 00000000000..46a3f0be71b --- /dev/null +++ b/pkgs/servers/search/elasticsearch/es-classpath-2.x.patch @@ -0,0 +1,38 @@ +diff -rupN a/bin/elasticsearch b/bin/elasticsearch +--- a/bin/elasticsearch 2017-02-08 18:32:28.000298543 -0500 ++++ b/bin/elasticsearch 2017-02-08 19:10:45.692916675 -0500 +@@ -81,12 +81,7 @@ ES_HOME=`cd "$ES_HOME"; pwd` + # If an include wasn't specified in the environment, then search for one... + if [ "x$ES_INCLUDE" = "x" ]; then + # Locations (in order) to use when searching for an include file. +- for include in /usr/share/elasticsearch/elasticsearch.in.sh \ +- /usr/local/share/elasticsearch/elasticsearch.in.sh \ +- /opt/elasticsearch/elasticsearch.in.sh \ +- ~/.elasticsearch.in.sh \ +- "$ES_HOME/bin/elasticsearch.in.sh" \ +- "`dirname "$0"`"/elasticsearch.in.sh; do ++ for include in "`dirname "$0"`"/elasticsearch.in.sh; do + if [ -r "$include" ]; then + . "$include" + break +diff -rupN a/bin/elasticsearch.in.sh b/bin/elasticsearch.in.sh +--- a/bin/elasticsearch.in.sh 2017-02-08 18:32:28.000298543 -0500 ++++ b/bin/elasticsearch.in.sh 2017-02-08 18:33:46.816634599 -0500 +@@ -1,17 +1,5 @@ + #!/bin/sh + +-# check in case a user was using this mechanism +-if [ "x$ES_CLASSPATH" != "x" ]; then +- cat >&2 << EOF +-Error: Don't modify the classpath with ES_CLASSPATH. Best is to add +-additional elements via the plugin mechanism, or if code must really be +-added to the main classpath, add jars to lib/ (unsupported). +-EOF +- exit 1 +-fi +- +-ES_CLASSPATH="$ES_HOME/lib/elasticsearch-2.4.4.jar:$ES_HOME/lib/*" +- + if [ "x$ES_MIN_MEM" = "x" ]; then + ES_MIN_MEM=256m + fi diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index d5ffd5361e4..a94d8d101d2 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -89,33 +89,33 @@ in { }; postgresql92 = common { - version = "9.2.19"; + version = "9.2.20"; psqlSchema = "9.2"; - sha256 = "1bfvx1h1baxp40y4xi88974p43vazz13mwc0h8scq3sr9wxdfa8x"; + sha256 = "09lgvl996py3mciybnlv0hycfwfxr41n0wksb2jvxjh0hjpbv2hb"; }; postgresql93 = common { - version = "9.3.15"; + version = "9.3.16"; psqlSchema = "9.3"; - sha256 = "0kswvs4rzcmjz12hhyi61w5x2wh4dxskar8v7rgajfm98qabmz59"; + sha256 = "0wv8qsi0amdhcl1qvkvas3lm37w6zsi818f5fxm6n0ngr155wpw4"; }; postgresql94 = common { - version = "9.4.10"; + version = "9.4.11"; psqlSchema = "9.4"; - sha256 = "1kvfhalf3rs59887b5qa14zp85zcnsc6pislrs0wd08rxn5nfqbh"; + sha256 = "08wxrk8wdhnz0756dsa8jkj0pqanjfpw7w715lyv10618p853sz3"; }; postgresql95 = common { - version = "9.5.5"; + version = "9.5.6"; psqlSchema = "9.5"; - sha256 = "157kf6mdazmxfmd11f0akya2xcz6sfgprn7yqc26dpklps855ih2"; + sha256 = "0bz1b9r249ffjfvldaiah2g78ccwq30ddh8hdvlq61z26inmz7mv"; }; postgresql96 = common { - version = "9.6.1"; + version = "9.6.2"; psqlSchema = "9.6"; - sha256 = "1k8zwnabsl8f7vlp3azm4lrklkb9jkaxmihqf0mc27ql9451w475"; + sha256 = "1jahzqqw5inyvmacic2ihhj5f8z50lapci2fwws91h719ccbb1q1"; }; } diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix index 0c96c72ffd0..3ac1ca2172d 100644 --- a/pkgs/shells/bash-completion/default.nix +++ b/pkgs/shells/bash-completion/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { doCheck = true; + prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i -e 's/readlink -f/readlink/g' bash_completion completions/* + ''; + meta = with stdenv.lib; { homepage = https://github.com/scop/bash-completion; description = "Programmable completion for the bash shell"; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index eac44efdf27..7b725bfeb57 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -19,12 +19,13 @@ { stdenv, lib, fetchurl, fetchpatch, pkgconfig, help2man, makeWrapper , glib, libbsd , libX11, libXext, xorgserver, xkbcomp, kmod, xf86videonouveau -, nvidia_x11, virtualgl, primusLib +, nvidia_x11, virtualgl, libglvnd, primusLib , automake111x, autoconf # The below should only be non-null in a x86_64 system. On a i686 # system the above nvidia_x11 and virtualgl will be the i686 packages. # TODO: Confusing. Perhaps use "SubArch" instead of i686? , nvidia_x11_i686 ? null +, libglvnd_i686 ? null , primusLib_i686 ? null , useDisplayDevice ? false , extraNvidiaDeviceOptions ? "" @@ -40,7 +41,10 @@ let primusLibs = lib.makeLibraryPath ([primus] ++ lib.optional (primusLib_i686 != null) primus_i686); - nvidia_x11s = [nvidia_x11] ++ lib.optional (nvidia_x11_i686 != null) nvidia_x11_i686; + nvidia_x11s = [ nvidia_x11 ] + ++ lib.optional nvidia_x11.useGLVND libglvnd + ++ lib.optionals (nvidia_x11_i686 != null) + ([ nvidia_x11_i686 ] ++ lib.optional nvidia_x11_i686.useGLVND libglvnd_i686); nvidiaLibs = lib.makeLibraryPath nvidia_x11s; @@ -120,7 +124,7 @@ in stdenv.mkDerivation rec { #"CONF_PRIMUS_LD_PATH=${primusLibs}" ] ++ lib.optionals useNvidia [ "CONF_LDPATH_NVIDIA=${nvidiaLibs}" - "CONF_MODPATH_NVIDIA=${nvidia_x11}/lib/xorg/modules" + "CONF_MODPATH_NVIDIA=${nvidia_x11.bin}/lib/xorg/modules" ]; CFLAGS = [ diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index 88589a05878..229e228e405 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -5,6 +5,8 @@ # Other distributions do the same. { stdenv , stdenv_i686 +, lib +, bumblebee , primusLib , writeScriptBin , primusLib_i686 ? null @@ -18,7 +20,7 @@ let primus = if useNvidia then primusLib_ else primusLib_.override { nvidia_x11 = null; }; primus_i686 = if useNvidia then primusLib_i686_ else primusLib_i686_.override { nvidia_x11 = null; }; - ldPath = stdenv.lib.makeLibraryPath ([primus] ++ stdenv.lib.optional (primusLib_i686 != null) primus_i686); + ldPath = lib.makeLibraryPath ([ primus primus.glvnd ] ++ lib.optionals (primusLib_i686 != null) [ primus_i686 primus_i686.glvnd ]); in writeScriptBin "primusrun" '' #!${stdenv.shell} diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix index fccd01eaead..f3119a1a147 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/tools/X11/primus/lib.nix @@ -1,10 +1,16 @@ -{ stdenv, fetchFromGitHub -, xlibsWrapper, mesa +{ stdenv, fetchFromGitHub, fetchpatch +, libX11, mesa_noglu , nvidia_x11 ? null -, libX11 +, libglvnd }: -stdenv.mkDerivation { +let + aPackage = + if nvidia_x11 == null then mesa_noglu + else if nvidia_x11.useGLVND then libglvnd + else nvidia_x11; + +in stdenv.mkDerivation { name = "primus-lib-2015-04-28"; src = fetchFromGitHub { @@ -14,18 +20,28 @@ stdenv.mkDerivation { sha256 = "118jm57ccawskb8vjq3a9dpa2gh72nxzvx2zk7zknpy0arrdznj1"; }; - buildInputs = [ libX11 mesa ]; + patches = [ + # Bump buffer size for long library paths. + (fetchpatch { + url = "https://github.com/abbradar/primus/commit/2f429e232581c556df4f4bf210aee8a0c99c60b7.patch"; + sha256 = "1da6ynz7r7x98495i329sf821308j1rpy8prcdraqahz7p4c89nc"; + }) + ]; + + buildInputs = [ libX11 mesa_noglu ]; makeFlags = [ "LIBDIR=$(out)/lib" - "PRIMUS_libGLa=${if nvidia_x11 == null then mesa else nvidia_x11}/lib/libGL.so" - "PRIMUS_libGLd=${mesa}/lib/libGL.so" - "PRIMUS_LOAD_GLOBAL=${mesa}/lib/libglapi.so" + "PRIMUS_libGLa=${aPackage}/lib/libGL.so" + "PRIMUS_libGLd=${mesa_noglu}/lib/libGL.so" + "PRIMUS_LOAD_GLOBAL=${mesa_noglu}/lib/libglapi.so" ]; installPhase = '' ln -s $out/lib/libGL.so.1 $out/lib/libGL.so ''; + passthru.glvnd = if nvidia_x11 != null && nvidia_x11.useGLVND then nvidia_x11 else null; + meta = with stdenv.lib; { description = "Low-overhead client-side GPU offloading"; homepage = "https://github.com/amonakov/primus"; diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix index ef7299966a7..06c44aa2cd9 100644 --- a/pkgs/tools/backup/obnam/default.nix +++ b/pkgs/tools/backup/obnam/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "obnam-${version}"; - version = "1.20.2"; + version = "1.21"; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz"; - sha256 = "0r8gngjir9pinj5vp2aq326g74wnhv075n8y9i0hgc5cfvckjjmq"; + sha256 = "0qlipsq50hca71zc0dp1mg9zs12qm0sbblw7qfzl0hj6mk2rv1by"; }; buildInputs = [ pythonPackages.sphinx attr ]; @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; meta = { - homepage = http://liw.fi/obnam/; + homepage = http://obnam.org; description = "Backup program supporting deduplication, compression and encryption"; maintainers = [ stdenv.lib.maintainers.rickynils ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index ccee4f21314..edcfc67ee29 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gmic-${version}"; - version = "1.7.8"; + version = "1.7.9"; src = fetchurl { url = "http://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "1921s0n2frj8q95l8lm8was64cypnychgcgcavx9q8qljzbk4brs"; + sha256 = "0cvi5kmcrrg5pm774ligyy33fasgsfp3mr6ingjzd99rn4710bqm"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix new file mode 100644 index 00000000000..40d729d063d --- /dev/null +++ b/pkgs/tools/misc/dateutils/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + version = "0.4.1"; + name = "dateutils-${version}"; + + src =fetchurl { + url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${name}.tar.xz"; + sha256 = "0y2jsmvilljbid14lzmk3kgvasn4h7hr6y3wwbr3lkgwfn4y9k3c"; + }; + + meta = with stdenv.lib; { + description = "A bunch of tools that revolve around fiddling with dates and times in the command line"; + homepage = http://www.fresse.org/dateutils/; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.paperdigits ]; + }; +} diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix index 547e3fb49eb..e5daee11b59 100644 --- a/pkgs/tools/misc/ding-libs/default.nix +++ b/pkgs/tools/misc/ding-libs/default.nix @@ -1,26 +1,23 @@ -{ stdenv, fetchurl, glibc, doxygen, check }: +{ stdenv, fetchurl, check }: -let - name = "ding-libs"; +stdenv.mkDerivation rec { + name = "ding-libs-${version}"; version = "0.6.0"; -in stdenv.mkDerivation { - inherit name; - inherit version; src = fetchurl { - url = "https://fedorahosted.org/released/${name}/${name}-${version}.tar.gz"; + url = "https://fedorahosted.org/released/ding-libs/ding-libs-${version}.tar.gz"; sha1 = "c8ec86cb93a26e013a13b12a7b0b3fbc1bca16c1"; }; enableParallelBuilding = true; - buildInputs = [ glibc doxygen check ]; + buildInputs = [ check ]; - buildFlags = "docs"; doCheck = true; meta = { description = "'D is not GLib' utility libraries"; homepage = https://fedorahosted.org/sssd/; + platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ e-user ]; license = [ stdenv.lib.licenses.gpl3 stdenv.lib.licenses.lgpl3 ]; }; diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index aff329e04b6..2333a6576e4 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { name = "mimeo-${version}"; - version = "2016.11"; + version = "2017.2.9"; src = fetchurl { url = "http://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz"; - sha256 = "1yygdxqnkh506fknxsp9xa3rnxn0901dzqc7c7qjjj80lk6xnfxb"; + sha256 = "1xbhz08aanix4bibz5jla58cmi6rnf946pf64wb0ka3s8jx0l5a0"; }; buildInputs = [ file desktop_file_utils ]; diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/tools/networking/redsocks/default.nix new file mode 100644 index 00000000000..e9aced06728 --- /dev/null +++ b/pkgs/tools/networking/redsocks/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, libevent }: + +let + pkg = "redsocks"; + version = "0.5"; +in +stdenv.mkDerivation rec { + name = "${pkg}-${version}"; + + src = fetchFromGitHub { + owner = "darkk"; + repo = pkg; + rev = "release-${version}"; + sha256 = "170cpvvivb6y2kwsqj9ppx5brgds9gkn8mixrnvj8z9c15xhvplm"; + }; + + installPhase = + '' + mkdir -p $out/{bin,share} + mv redsocks $out/bin + mv doc $out/share + ''; + + buildInputs = [ libevent ]; + + meta = { + description = "Transparent redirector of any TCP connection to proxy"; + homepage = http://darkk.net.ru/redsocks/; + license = stdenv.lib.licenses.asl20; + maintainers = [ ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix index 7a6e72e0f12..87b962b9154 100644 --- a/pkgs/tools/networking/wuzz/default.nix +++ b/pkgs/tools/networking/wuzz/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "wuzz-${version}"; - version = "2017-02-05"; + version = "2017-02-09"; goPackagePath = "https://github.com/asciimoo/wuzz"; src = fetchFromGitHub { owner = "asciimoo"; repo = "wuzz"; - rev = "45b6a64e667b3647216af68e06e253958b81b3c4"; - sha256 = "0jjdyqh1jvfg1dg5fwwavcvkn8fkm1a44gyv35c1g5cd9gxwj8nw"; + rev = "dd696dc6e014e08b6042a71dca600356eb3156c2"; + sha256 = "0m7jcb6rk0cb3giz1cbfhy3h4nzjl6qrk2k6czhn9267688rznpx"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index 0e2cac36f76..7fc84e6ec74 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, cmake, python }: stdenv.mkDerivation { - name = "opencc-1.0.4"; + name = "opencc-1.0.5"; src = fetchurl { - url = "https://github.com/BYVoid/OpenCC/archive/ver.1.0.4.tar.gz"; - sha256 = "0553b7461ebd379d118d45d7f40f8a6e272750115bdbc49267595a05ee3481ac"; + url = "https://github.com/BYVoid/OpenCC/archive/ver.1.0.5.tar.gz"; + sha256 = "1ce1649ba280cfc88bb76e740be5f54b29a9c034400c97a3ae211c37d7030705"; }; buildInputs = [ cmake python ]; diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix index ffbf9784f80..e87a8bc0275 100644 --- a/pkgs/tools/text/sgml/jade/default.nix +++ b/pkgs/tools/text/sgml/jade/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgs, gcc, gzip, gnum4 }: +{ stdenv, fetchurl, pkgs, gnum4 }: -stdenv.mkDerivation (rec { - name = "jade"; +stdenv.mkDerivation rec { + name = "jade-${version}-${debpatch}"; version = "1.2.1"; debpatch = "47.3"; src = fetchurl { - url = "ftp://ftp.jclark.com/pub/${name}/${name}-${version}.tar.gz"; + url = "ftp://ftp.jclark.com/pub/jade/jade-${version}.tar.gz"; sha256 = "84e2f8a2a87aab44f86a46b71405d4f919b219e4c73e03a83ab6c746a674b187"; }; @@ -17,14 +17,14 @@ stdenv.mkDerivation (rec { patches = [ patchsrc ]; - buildInputs = [ gcc gzip gnum4 ]; + buildInputs = [ gnum4 ]; NIX_CFLAGS_COMPILE = [ "-Wno-deprecated" ]; preInstall = '' install -d -m755 "$out"/lib ''; - + postInstall = '' mv "$out/bin/sx" "$out/bin/sgml2xml" ''; @@ -33,6 +33,7 @@ stdenv.mkDerivation (rec { description = "James Clark's DSSSL Engine"; license = "custom"; homepage = http://www.jclark.com/jade/; + platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ e-user ]; }; -}) +} diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile b/pkgs/tools/typesetting/asciidoctor/Gemfile index d382e6397e1..92abd4f5cf2 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile @@ -4,3 +4,4 @@ gem 'asciidoctor-diagram' gem 'asciidoctor-bespoke' gem 'asciidoctor-pdf' gem 'asciidoctor-latex' +gem 'pygments.rb' diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index 0212db3816a..34ed4a975a1 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -2,14 +2,15 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.0.2) - addressable (2.4.0) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) afm (0.2.2) asciidoctor (1.5.5) asciidoctor-bespoke (1.0.0.alpha.1) asciidoctor (>= 1.5.0) slim (~> 3.0.6) thread_safe (~> 0.3.5) - asciidoctor-diagram (1.5.2) + asciidoctor-diagram (1.5.4) asciidoctor (~> 1.5.0) asciidoctor-latex (1.5.0.17.dev) asciidoctor (~> 1.5, >= 1.5.2) @@ -25,17 +26,18 @@ GEM safe_yaml (~> 1.0.4) thread_safe (~> 0.3.5) treetop (= 1.5.3) - concurrent-ruby (1.0.2) - css_parser (1.4.6) + concurrent-ruby (1.0.4) + css_parser (1.4.8) addressable hashery (2.1.2) htmlentities (4.3.4) - json (2.0.2) + json (2.0.3) + multi_json (1.12.1) opal (0.6.3) source_map sprockets pdf-core (0.6.1) - pdf-reader (1.4.0) + pdf-reader (1.4.1) Ascii85 (~> 1.0.0) afm (~> 0.2.1) hashery (~> 2.0) @@ -55,6 +57,9 @@ GEM prawn-templates (0.0.3) pdf-reader (~> 1.3) prawn (>= 0.15.0) + public_suffix (2.0.5) + pygments.rb (1.1.1) + multi_json (>= 1.0.0) rack (2.0.1) ruby-rc4 (0.1.5) safe_yaml (1.0.4) @@ -63,12 +68,12 @@ GEM tilt (>= 1.3.3, < 2.1) source_map (3.0.1) json - sprockets (3.7.0) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) temple (0.7.7) thread_safe (0.3.5) - tilt (2.0.5) + tilt (2.0.6) treetop (1.5.3) polyglot (~> 0.3) ttfunk (1.4.0) @@ -82,6 +87,7 @@ DEPENDENCIES asciidoctor-diagram asciidoctor-latex asciidoctor-pdf + pygments.rb BUNDLED WITH 1.13.6 diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/tools/typesetting/asciidoctor/gemset.nix index 4c26c6a434a..c436d6f9751 100644 --- a/pkgs/tools/typesetting/asciidoctor/gemset.nix +++ b/pkgs/tools/typesetting/asciidoctor/gemset.nix @@ -2,10 +2,10 @@ addressable = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs"; + sha256 = "1j5r0anj8m4qlf2psnldip4b8ha2bsscv11lpdgnfh4nnchzjnxw"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; afm = { source = { @@ -42,10 +42,10 @@ asciidoctor-diagram = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1di271v0ic6d5xkqbbwg6scjyj1ypklgy211gdmhf18xzpka3fvi"; + sha256 = "06kqlij2yc84zqxmb39bqi9pihapgac7gxyzrwm4kxfnmfdqmxrk"; type = "gem"; }; - version = "1.5.2"; + version = "1.5.4"; }; asciidoctor-latex = { source = { @@ -66,18 +66,18 @@ concurrent-ruby = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1kb4sav7yli12pjr8lscv8z49g52a5xzpfg3z9h8clzw6z74qjsw"; + sha256 = "0p7ji1h1l407kci9w4b4yspzd58ssmlx7p91npx55kw08836dlpb"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.4"; }; css_parser = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0zsldn0ihmzl7nqk4lww9h8ijv1zb3l8g92y7b4w0da2d6cnyjw8"; + sha256 = "1aqv5ds1109s0g76ybvvaff41a71i03fjy0ix6272r8n0gdnjc3f"; type = "gem"; }; - version = "1.4.6"; + version = "1.4.8"; }; hashery = { source = { @@ -98,10 +98,18 @@ json = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1lhinj9vj7mw59jqid0bjn2hlfcnq02bnvsx9iv81nl2han603s0"; + sha256 = "0cpw154il64w6q20rrnsbjx1cdfz1yrzz1lgdbpn59lcwc6mprql"; type = "gem"; }; - version = "2.0.2"; + version = "2.0.3"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + type = "gem"; + }; + version = "1.12.1"; }; opal = { source = { @@ -122,10 +130,10 @@ pdf-reader = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0j9cimzw2waic800108qmnds7w33xd9y3bdvf9qzijwv9wjv0iq1"; + sha256 = "0ivmgm73jjk3hv7896mgld5ki8jhxdvksw766rqxp6i863y9v4jq"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; polyglot = { source = { @@ -175,6 +183,22 @@ }; version = "0.0.3"; }; + public_suffix = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "040jf98jpp6w140ghkhw2hvc1qx41zvywx5gj7r2ylr1148qnj7q"; + type = "gem"; + }; + version = "2.0.5"; + }; + "pygments.rb" = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g0ipgxqfw0vf2md3s8sqf8y7m5lxqza2gwnr05z3vrf1nc6v6hk"; + type = "gem"; + }; + version = "1.1.1"; + }; rack = { source = { remotes = ["https://rubygems.org"]; @@ -218,10 +242,10 @@ sprockets = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0jzsfiladswnzbrwqfiaj1xip68y58rwx0lpmj907vvq47k87gj1"; + sha256 = "0sv3zk5hwxyjvg7iy9sggjc7k3mfxxif7w8p260rharfyib939ar"; type = "gem"; }; - version = "3.7.0"; + version = "3.7.1"; }; temple = { source = { @@ -242,10 +266,10 @@ tilt = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0lgk8bfx24959yq1cn55php3321wddw947mgj07bxfnwyipy9hqf"; + sha256 = "0qsyzq2k7blyp1rph56xczwfqi8gplns2whswyr67mdfzdi60vvm"; type = "gem"; }; - version = "2.0.5"; + version = "2.0.6"; }; treetop = { source = { diff --git a/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch b/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch new file mode 100644 index 00000000000..8e1d9dfc191 --- /dev/null +++ b/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3fdabb0..378621a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,6 +59,12 @@ include_directories(${FONTFORGE_INCLUDE_DIRS}) + link_directories(${FONTFORGE_LIBRARY_DIRS}) + set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${FONTFORGE_LIBRARIES}) + ++# add glib dependency ++pkg_check_modules(GLIB REQUIRED glib-2.0) ++include_directories(${GLIB_INCLUDE_DIRS}) ++link_directories(${GLIB_INCLUDE_DIRS}) ++set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${GLIB_LIBRARIES}) ++ + # debug build flags (overwrite default cmake debug flags) + set(CMAKE_C_FLAGS_DEBUG "-ggdb -pg") + set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -pg") diff --git a/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/pkgs/tools/typesetting/pdf2htmlEX/default.nix new file mode 100644 index 00000000000..b214e986be9 --- /dev/null +++ b/pkgs/tools/typesetting/pdf2htmlEX/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, poppler, xlibs, pcre, python, glib, fontforge-gtk, cairo, pango, openjdk8 +}: + +stdenv.mkDerivation rec { + name = "pdf2htmlEX-0.14.6"; + + src = fetchFromGitHub { + repo = "pdf2htmlEX"; + owner = "coolwanglu"; + rev = "v0.14.6"; + sha256 = "1nh0ab8f11fsyi4ldknlkmdzcfvm1dfh8b9bmprjgq6q0vjj7f78"; + }; + + patches = [ ./add-glib-cmake.patch ]; + + cmakeFlags = [ "-DENABLE_SVG=ON" ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + cmake + pkgconfig + ]; + + buildInputs = [ + xlibs.libpthreadstubs + xlibs.libXdmcp + pcre + python + glib + cairo + pango + (poppler.override { withData = true; }) + fontforge-gtk + openjdk8 + ]; + + meta = with stdenv.lib; { + description = "Render PDF files to beautiful HTML"; + homepage = "https://github.com/coolwanglu/pdf2htmlEX"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.taktoa ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index ce23c5f4193..547700639bb 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -11,13 +11,13 @@ assert opensslSupport -> openssl != null && !gnutlsSupport; with stdenv.lib; stdenv.mkDerivation rec { name = "rtmpdump-${version}"; - version = "2015-01-15"; + version = "2015-12-30"; src = fetchgit { url = git://git.ffmpeg.org/rtmpdump; # Currently the latest commit is used (a release has not been made since 2011, i.e. '2.4') - rev = "a107cef9b392616dff54fabfd37f985ee2190a6f"; - sha256 = "03x7dy111dk8b23cq2wb5h8ljcv58fzhp0xm0d1myfvzhr9amqqs"; + rev = "fa8646daeb19dfd12c181f7d19de708d623704c0"; + sha256 = "17m9rmnnqyyzsnnxcdl8258hjmw16nxbj1n1lr7fj3kmcs189iig"; }; makeFlags = [ ''prefix=$(out)'' ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f986f37b9b1..56c00c2a51b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -785,6 +785,8 @@ with pkgs; datefudge = callPackage ../tools/system/datefudge { }; + dateutils = callPackage ../tools/misc/dateutils { }; + ddate = callPackage ../tools/misc/ddate { }; dehydrated = callPackage ../tools/admin/dehydrated { }; @@ -3330,6 +3332,8 @@ with pkgs; pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { }; + pdf2htmlEX = callPackage ../tools/typesetting/pdf2htmlEX { }; + pdf2odt = callPackage ../tools/typesetting/pdf2odt { }; pdf2svg = callPackage ../tools/graphics/pdf2svg { }; @@ -3583,6 +3587,8 @@ with pkgs; redmine = callPackage ../applications/version-management/redmine { }; + redsocks = callPackage ../tools/networking/redsocks { }; + rt = callPackage ../servers/rt { }; rtmpdump = callPackage ../tools/video/rtmpdump { }; @@ -5878,6 +5884,7 @@ with pkgs; pypy27 = callPackage ../development/interpreters/python/pypy/2.7 { self = pypy27; python = python27.override{x11Support=true;}; + db = db.override { dbmSupport = true; }; }; python2nix = callPackage ../tools/package-management/python2nix { }; @@ -6144,7 +6151,6 @@ with pkgs; }; buildbot-full = self.buildbot.override { plugins = with self.buildbot-plugins; [ www console-view waterfall-view ]; - enableLocalWorker = true; }; buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { }; @@ -6802,7 +6808,10 @@ with pkgs; yacc = bison; - ycmd = callPackage ../development/tools/misc/ycmd { }; + ycmd = callPackage ../development/tools/misc/ycmd { + inherit (darwin.apple_sdk.frameworks) Cocoa; + python = python2; + }; yodl = callPackage ../development/tools/misc/yodl { }; @@ -8021,7 +8030,8 @@ with pkgs; libdvdread = callPackage ../development/libraries/libdvdread { }; libdvdread_4_9_9 = callPackage ../development/libraries/libdvdread/4.9.9.nix { }; - libdwarf = callPackage ../development/libraries/libdwarf { }; + inherit (callPackage ../development/libraries/libdwarf { }) + libdwarf dwarfdump; libeatmydata = callPackage ../development/libraries/libeatmydata { }; @@ -8069,6 +8079,8 @@ with pkgs; libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { }; libgnome_keyring3 = gnome3.libgnome_keyring; + libglvnd = callPackage ../development/libraries/libglvnd { }; + libgnurl = callPackage ../development/libraries/libgnurl { }; libgringotts = callPackage ../development/libraries/libgringotts { }; @@ -8947,6 +8959,8 @@ with pkgs; ogrepaged = callPackage ../development/libraries/ogrepaged { }; + olm = callPackage ../development/libraries/olm { }; + oniguruma = callPackage ../development/libraries/oniguruma { }; openal = self.openalSoft; @@ -11364,12 +11378,13 @@ with pkgs; nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; - nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { }; - nvidia_x11_legacy340 = callPackage ../os-specific/linux/nvidia-x11/legacy340.nix { }; - nvidia_x11_beta = nvidia_x11; # latest beta is lower version ATM - # callPackage ../os-specific/linux/nvidia-x11/beta.nix { }; - nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; + nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { }; + + nvidia_x11_legacy173 = nvidiaPackages.legacy_173; + nvidia_x11_legacy304 = nvidiaPackages.legacy_304; + nvidia_x11_legacy340 = nvidiaPackages.legacy_340; + nvidia_x11_beta = nvidiaPackages.beta; + nvidia_x11 = nvidiaPackages.stable; rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { }; @@ -11596,6 +11611,7 @@ with pkgs; open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { inherit (gnome2) gtk gtkmm; }; + open-vm-tools-headless = open-vm-tools.override { withX = false; }; delve = callPackage ../development/tools/delve { }; @@ -12443,6 +12459,8 @@ with pkgs; ao = callPackage ../applications/graphics/ao {}; + aqemu = qt5.callPackage ../applications/virtualization/aqemu { }; + ardour = callPackage ../applications/audio/ardour { inherit (gnome2) libgnomecanvas libgnomecanvasmm; inherit (vamp) vampSDK; @@ -12892,6 +12910,8 @@ with pkgs; eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { }); + ecs-agent = callPackage ../applications/virtualization/ecs-agent { }; + ed = callPackage ../applications/editors/ed { }; edbrowse = callPackage ../applications/editors/edbrowse { }; @@ -13107,7 +13127,7 @@ with pkgs; external = { inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent; inherit (pythonPackages) elpy; - inherit rtags libffi autoconf automake libpng zlib poppler pkgconfig; + inherit rtags libffi autoconf automake libpng zlib poppler pkgconfig w3m; }; }; @@ -14997,7 +15017,7 @@ with pkgs; bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { }; bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { }; - dropbox = qt55.callPackage ../applications/networking/dropbox { }; + dropbox = qt5.callPackage ../applications/networking/dropbox { }; dropbox-cli = callPackage ../applications/networking/dropbox-cli { }; @@ -15387,13 +15407,12 @@ with pkgs; neovim = callPackage ../applications/editors/neovim { }; - neovim-qt = callPackage ../applications/editors/neovim/qt.nix { - qt5 = qt55; - libmsgpack = libmsgpack_1_4; - }; + neovim-qt = qt5.callPackage ../applications/editors/neovim/qt.nix { }; neovim-pygui = pythonPackages.neovim_gui; + neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { pythonPackages = python3Packages; }; + vis = callPackage ../applications/editors/vis { inherit (lua52Packages) lpeg; }; @@ -15458,6 +15477,9 @@ with pkgs; primusLib_i686 = if system == "x86_64-linux" then pkgsi686Linux.primusLib else null; + libglvnd_i686 = if system == "x86_64-linux" + then pkgsi686Linux.libglvnd + else null; }; vkeybd = callPackage ../applications/audio/vkeybd {}; @@ -16492,6 +16514,8 @@ with pkgs; zangband = callPackage ../games/zangband { }; + zdbsp = callPackage ../games/zdoom/zdbsp.nix { }; + zdoom = callPackage ../games/zdoom { }; zod = callPackage ../games/zod { }; @@ -17400,6 +17424,8 @@ with pkgs; areca = callPackage ../applications/backup/areca { }; + attract-mode = callPackage ../misc/emulators/attract-mode { }; + beep = callPackage ../misc/beep { }; blackbird = callPackage ../misc/themes/blackbird { }; @@ -18031,6 +18057,8 @@ with pkgs; tomb = callPackage ../os-specific/linux/tomb {}; + tomboy = callPackage ../applications/misc/tomboy {}; + imatix_gsl = callPackage ../development/tools/imatix_gsl {}; iterm2 = callPackage ../applications/misc/iterm2 {}; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 092f352ec5b..5c50fe383bb 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -56,7 +56,7 @@ let }; melpaPackages = import ../applications/editors/emacs-modes/melpa-packages.nix { - inherit lib; + inherit external lib; }; orgPackages = import ../applications/editors/emacs-modes/org-packages.nix { diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index 98094e93160..61ef729fa10 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -18,6 +18,11 @@ in # so we do it now. localSystem ? builtins.intersectAttrs { system = null; platform = null; } args +, # These are needed only because nix's `--arg` command-line logic doesn't work + # with unnamed parameters allowed by ... + system ? localSystem.system +, platform ? localSystem.platform + , # Fallback: The contents of the configuration file found at $NIXPKGS_CONFIG or # $HOME/.config/nixpkgs/config.nix. config ? let diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index bcca2aaf0f8..73669c58b55 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -227,9 +227,7 @@ let jsonm = callPackage ../development/ocaml-modules/jsonm { }; - lablgl = callPackage ../development/ocaml-modules/lablgl { - camlp5 = camlp5_strict; - }; + lablgl = callPackage ../development/ocaml-modules/lablgl { }; lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix { inherit (pkgs.gnome2) libgnomecanvas libglade gtksourceview; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 70d01fbc143..6105fcf54aa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13829,7 +13829,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ pkgs.glibc TextCharWidth ]; preConfigure = '' - substituteInPlace WrapI18N.pm --replace '/usr/bin/locale' '${pkgs.glibc}/bin/locale' + substituteInPlace WrapI18N.pm --replace '/usr/bin/locale' '${pkgs.glibc.bin}/bin/locale' ''; meta = { description = "Line wrapping module with support for multibyte, fullwidth, and combining characters and languages without whitespaces between words"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bafbb2441af..0588ab5b3e2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1554,11 +1554,11 @@ in { awscli = buildPythonPackage rec { name = "awscli-${version}"; - version = "1.11.35"; + version = "1.11.45"; namePrefix = ""; src = pkgs.fetchurl { url = "mirror://pypi/a/awscli/${name}.tar.gz"; - sha256 = "0k6y8cg311bqak5x9pilg80w6f76dcbzm6xcdrw6rjnk6v4xwy70"; + sha256 = "0sv9dw4zsra8fm7ddbnwhlh80w534z4h8llz2p8asssaaj5nq2ya"; }; # No tests included @@ -3099,13 +3099,13 @@ in { boto3 = buildPythonPackage rec { name = "boto3-${version}"; - version = "1.4.2"; + version = "1.4.4"; src = pkgs.fetchFromGitHub { owner = "boto"; repo = "boto3"; rev = version; - sha256 = "19hzxqr7ba07b3zg2wsrz6ic3g7pq50rrcp4616flfgny5vw42j3"; + sha256 = "1zngj38a2dmc02p3ha9crzv9k682f0zgyyfx1bgg8hwwrnggikwl"; }; propagatedBuildInputs = [ self.botocore self.jmespath self.s3transfer ] ++ @@ -3136,11 +3136,11 @@ in { }; botocore = buildPythonPackage rec { - version = "1.4.92"; # This version is required by awscli + version = "1.5.8"; # This version is required by awscli name = "botocore-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/b/botocore/${name}.tar.gz"; - sha256 = "08rpsfqd2g4iqvi1id8yhmyz2mc299dnr4aikkwjm24rih75p9aj"; + sha256 = "1qhrq2l9kvhi3gnrgwqhvy42aqbsk93j8mfr4ixqx18yqgbnylvz"; }; propagatedBuildInputs = @@ -7853,7 +7853,7 @@ in { }; jug = buildPythonPackage rec { - version = "1.3.0"; + version = "1.4.0"; name = "jug-${version}"; buildInputs = with self; [ nose numpy ]; propagatedBuildInputs = with self; [ @@ -7867,7 +7867,7 @@ in { src = pkgs.fetchurl { url = "mirror://pypi/J/Jug/Jug-${version}.tar.gz"; - sha256 = "1262v63f1jljfd3rqvavzc2xfcray1m7vhqav3p6wlymgd342wrl"; + sha256 = "0s9m34k8w59k32sjcg74qqdz8r492sxhsdmlhca1z7jazdk56dzb"; }; meta = { @@ -8175,6 +8175,16 @@ in { inherit pname version; sha256 = "01nw6r08jkipx6v92kw49z34wmwikrpvc5j9xawdiyg1n2526wrx"; }; + + # Some sort of mysterious failure with lmdb.tool + doCheck = !isPy3k; + + meta = { + description = "Universal Python binding for the LMDB 'Lightning' Database"; + homepage = "https://github.com/dw/py-lmdb"; + license = licenses.openldap; + maintainers = with maintainers; [ copumpkin ]; + }; }; logilab_astng = buildPythonPackage rec { @@ -8390,39 +8400,7 @@ in { }; }; - netcdf4 = buildPythonPackage rec { - name = "netCDF4-${version}"; - version = "1.2.4"; - - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/netCDF4/${name}.tar.gz"; - sha256 = "0lakjix9dhc26f33f03c13ffwspqcrk5j3mnnjczwxbb23ppwwx6"; - }; - - propagatedBuildInputs = with self ; [ - numpy - pkgs.zlib - pkgs.netcdf - pkgs.hdf5 - pkgs.curl - pkgs.libjpeg - ]; - - # Variables used to configure the build process - USE_NCCONFIG="0"; - HDF5_DIR="${pkgs.hdf5}"; - NETCDF4_DIR="${pkgs.netcdf}"; - CURL_DIR="${pkgs.curl.dev}"; - JPEG_DIR="${pkgs.libjpeg.dev}"; - - meta = { - description = "Interface to netCDF library (versions 3 and 4)"; - homepage = https://pypi.python.org/pypi/netCDF4; - license = licenses.free; # Mix of license (all MIT* like) - }; - }; + netcdf4 = callPackage ../development/python-modules/netcdf4.nix { }; nxt-python = buildPythonPackage rec { version = "unstable-20160819"; @@ -23093,12 +23071,12 @@ in { }; s3transfer = buildPythonPackage rec { - version = "0.1.9"; + version = "0.1.10"; name = "s3transfer-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/s/s3transfer/${name}.tar.gz"; - sha256 = "0m67nhdnp2pd11j8h4bgz63zq0mvn2f205vrxmr3my8m45kpvb8p"; + sha256 = "1h8g9bknvxflxkpbnxyfxmk8pvgykbbk9ljdvhqh6z4vjc2926ms"; }; foo = 1; @@ -30023,23 +30001,6 @@ EOF ''; }; - neovim-remote = buildPythonPackage rec { - name = "neovim-remote-${version}"; - version = "v1.4.0"; - disabled = !isPy3k; - - src = pkgs.fetchFromGitHub { - owner = "mhinz"; - repo = "neovim-remote"; - rev = version; - sha256 = "0msvfh27f56xj5ki59ikzavxz863nal5scm57n43618m49qzg8iz"; - }; - - propagatedBuildInputs = [ - self.neovim - ]; - }; - ghp-import = buildPythonPackage rec { version = "0.4.1"; name = "ghp-import-${version}"; @@ -32131,6 +32092,10 @@ EOF }; }; + incremental = callPackage ../development/python-modules/incremental { }; + + treq = callPackage ../development/python-modules/treq { }; + }); in fix' (extends overrides packages)