JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát 2017-01-04 23:20:27 +01:00
commit ea7b252c9a
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
29 changed files with 1375 additions and 1156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/maintainers.nix
View File

@ -368,6 +368,7 @@
plcplc = "Philip Lykke Carlsen <plcplc@gmail.com>";
pmahoney = "Patrick Mahoney <pat@polycrystal.org>";
pmiddend = "Philipp Middendorf <pmidden@secure.mailbox.org>";
polyrod = "Maurizio Di Pietro <dc1mdp@gmail.com>";
prikhi = "Pavan Rikhi <pavan.rikhi@gmail.com>";
primeos = "Michael Weiss <dev.primeos@gmail.com>";
profpatsch = "Profpatsch <mail@profpatsch.de>";

2
nixos/lib/eval-config.nix
View File

@ -1,4 +1,4 @@
# From an end-user configuration file (`configuration'), build a NixOS
# From an end-user configuration file (`configuration.nix'), build a NixOS
# configuration object (`config') from which we can retrieve option
# values.

61
nixos/modules/services/networking/cjdns.nix
View File

@ -19,21 +19,30 @@ let
type = types.str;
description = "Public key at the opposite end of the tunnel.";
};
hostname = mkOption {
default = "";
example = "foobar.hype";
type = types.str;
description = "Optional hostname to add to /etc/hosts; prevents reverse lookup failures.";
};
};
};
# check for the required attributes, otherwise
# permit attributes not undefined here
checkPeers = x:
x // {
connectTo = mapAttrs
(name: value:
if !hasAttr "publicKey" value then abort "cjdns peer ${name} missing a publicKey" else
if !hasAttr "password" value then abort "cjdns peer ${name} missing a password" else
value
)
x.connectTo;
};
# Additional /etc/hosts entries for peers with an associated hostname
cjdnsExtraHosts = import (pkgs.runCommand "cjdns-hosts" {}
# Generate a builder that produces an output usable as a Nix string value
''
exec >$out
echo \'\'
${concatStringsSep "\n" (mapAttrsToList (k: v:
optionalString (v.hostname != "")
"echo $(${pkgs.cjdns}/bin/publictoip6 ${v.publicKey}) ${v.hostname}")
(cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo))}
echo \'\'
'');
parseModules = x:
x // { connectTo = mapAttrs (name: value: { inherit (value) password publicKey; }) x.connectTo; };
# would be nice to merge 'cfg' with a //,
# but the json nesting is wacky.
@ -44,8 +53,8 @@ let
};
authorizedPasswords = map (p: { password = p; }) cfg.authorizedPasswords;
interfaces = {
ETHInterface = if (cfg.ETHInterface.bind != "") then [ (checkPeers cfg.ETHInterface) ] else [ ];
UDPInterface = if (cfg.UDPInterface.bind != "") then [ (checkPeers cfg.UDPInterface) ] else [ ];
ETHInterface = if (cfg.ETHInterface.bind != "") then [ (parseModules cfg.ETHInterface) ] else [ ];
UDPInterface = if (cfg.UDPInterface.bind != "") then [ (parseModules cfg.UDPInterface) ] else [ ];
};
privateKey = "@CJDNS_PRIVATE_KEY@";
@ -125,12 +134,12 @@ in
'';
};
connectTo = mkOption {
type = types.attrsOf (types.attrsOf types.str);
type = types.attrsOf ( types.submodule ( connectToSubmodule ) );
default = { };
example = {
"192.168.1.1:27313" = {
user = "foobar";
password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
hostname = "homer.hype";
password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k";
};
};
@ -170,12 +179,12 @@ in
};
connectTo = mkOption {
type = types.attrsOf (types.attrsOf types.str);
type = types.attrsOf ( types.submodule ( connectToSubmodule ) );
default = { };
example = {
"01:02:03:04:05:06" = {
user = "foobar";
password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
hostname = "homer.hype";
password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM";
publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k";
};
};
@ -186,6 +195,16 @@ in
};
};
addExtraHosts = mkOption {
type = types.bool;
default = false;
description = ''
Whether to add cjdns peers with an associated hostname to
<filename>/etc/hosts</filename>. Beware that enabling this
incurs heavy eval-time costs.
'';
};
};
};
@ -248,6 +267,8 @@ in
};
};
networking.extraHosts = mkIf cfg.addExtraHosts cjdnsExtraHosts;
assertions = [
{ assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" || cfg.confFile != null );
message = "Neither cjdns.ETHInterface.bind nor cjdns.UDPInterface.bind defined.";

203
nixos/modules/services/networking/smokeping.nix
View File

@ -11,17 +11,17 @@ let
then
''
*** General ***
owner = ${cfg.owner}
cgiurl = ${cfg.cgiUrl}
contact = ${cfg.ownerEmail}
${lib.optionalString (cfg.mailHost != "") "mailhost = ${cfg.mailHost}"}
${lib.optionalString (cfg.sendmail != null) "sendmail = ${cfg.sendmail}"}
imgcache = ${smokepingHome}/cache
imgurl = http://${cfg.hostName}:${builtins.toString cfg.port}/cache
datadir = ${smokepingHome}/data
imgcache = ${smokepingHome}/cache
imgurl = ${cfg.imgUrl}
linkstyle = ${cfg.linkStyle}
${lib.optionalString (cfg.mailHost != "") "mailhost = ${cfg.mailHost}"}
owner = ${cfg.owner}
pagedir = ${smokepingHome}/cache
piddir = ${smokepingPidDir}
cgiurl = http://${cfg.hostName}:${builtins.toString cfg.port}/smokeping.cgi
linkstyle = ${cfg.linkStyle}
${lib.optionalString (cfg.sendmail != null) "sendmail = ${cfg.sendmail}"}
smokemail = ${cfg.smokeMailTemplate}
*** Presentation ***
template = ${cfg.presentationTemplate}
@ -54,72 +54,36 @@ in
default = false;
description = "Enable the smokeping service";
};
webService = mkOption {
type = types.bool;
default = true;
description = "Enable a smokeping web interface";
};
alertConfig = mkOption {
type = types.string;
default = ''
to = root@localhost
from = smokeping@localhost
'';
example = literalExample ''
to = alertee@address.somewhere
from = smokealert@company.xy
user = mkOption {
type = types.string;
default = "smokeping";
description = "User that runs smokeping and (optionally) thttpd";
+someloss
type = loss
# in percent
pattern = >0%,*12*,>0%,*12*,>0%
comment = loss 3 times in a row;
'';
description = "Configuration for alerts.";
};
mailHost = mkOption {
cgiUrl = mkOption {
type = types.string;
default = "";
example = "localhost";
description = "Use this SMTP server to send alerts";
default = "http://${cfg.hostName}:${builtins.toString cfg.port}/smokeping.cgi";
example = "https://somewhere.example.com/smokeping.cgi";
description = "URL to the smokeping cgi.";
};
sendmail = mkOption {
type = types.nullOr types.path;
config = mkOption {
type = types.nullOr types.string;
default = null;
example = "/var/setuid-wrappers/sendmail";
description = "Use this sendmail compatible script to deliver alerts";
description = "Full smokeping config supplied by the user. Overrides " +
"and replaces any other configuration supplied.";
};
smokeMailTemplate = mkOption {
type = types.string;
default = "${cfg.package}/etc/smokemail.dist";
description = "Specify the smokemail template for alerts.";
};
package = mkOption {
type = types.package;
default = pkgs.smokeping;
defaultText = "pkgs.smokeping";
description = "Specify a custom smokeping package";
};
owner = mkOption {
type = types.string;
default = "nobody";
example = "Joe Admin";
description = "Real name of the owner of the instance";
};
hostName = mkOption {
type = types.string;
default = config.networking.hostName;
example = "somewhere.example.com";
description = "DNS name for the urls generated in the cgi.";
};
linkStyle = mkOption {
type = types.enum ["original" "absolute" "relative"];
default = "relative";
example = "absolute";
description = "DNS name for the urls generated in the cgi.";
};
port = mkOption {
type = types.int;
default = 8081;
example = 8081;
description = "TCP port to use for the web server.";
};
ownerEmail = mkOption {
type = types.string;
default = "no-reply@${cfg.hostName}";
example = "no-reply@yourdomain.com";
description = "Email contact for owner";
};
databaseConfig = mkOption {
type = types.string;
default = ''
@ -152,30 +116,59 @@ in
Once set, changing the interval will require deletion or migration of all
the collected data.'';
};
alertConfig = mkOption {
type = types.string;
default = ''
to = root@localhost
from = smokeping@localhost
'';
example = literalExample ''
to = alertee@address.somewhere
from = smokealert@company.xy
+someloss
type = loss
# in percent
pattern = >0%,*12*,>0%,*12*,>0%
comment = loss 3 times in a row;
'';
description = "Configuration for alerts.";
extraConfig = mkOption {
type = types.lines;
default = "";
description = "Any additional customization not already included.";
};
presentationTemplate = mkOption {
hostName = mkOption {
type = types.string;
default = "${pkgs.smokeping}/etc/basepage.html.dist";
description = "Default page layout for the web UI.";
default = config.networking.hostName;
example = "somewhere.example.com";
description = "DNS name for the urls generated in the cgi.";
};
imgUrl = mkOption {
type = types.string;
default = "http://${cfg.hostName}:${builtins.toString cfg.port}/cache";
example = "https://somewhere.example.com/cache";
description = "Base url for images generated in the cgi.";
};
linkStyle = mkOption {
type = types.enum ["original" "absolute" "relative"];
default = "relative";
example = "absolute";
description = "DNS name for the urls generated in the cgi.";
};
mailHost = mkOption {
type = types.string;
default = "";
example = "localhost";
description = "Use this SMTP server to send alerts";
};
owner = mkOption {
type = types.string;
default = "nobody";
example = "Joe Admin";
description = "Real name of the owner of the instance";
};
ownerEmail = mkOption {
type = types.string;
default = "no-reply@${cfg.hostName}";
example = "no-reply@yourdomain.com";
description = "Email contact for owner";
};
package = mkOption {
type = types.package;
default = pkgs.smokeping;
defaultText = "pkgs.smokeping";
description = "Specify a custom smokeping package";
};
port = mkOption {
type = types.int;
default = 8081;
example = 8081;
description = "TCP port to use for the web server.";
};
presentationConfig = mkOption {
type = types.string;
default = ''
@ -217,6 +210,11 @@ in
'';
description = "presentation graph style";
};
presentationTemplate = mkOption {
type = types.string;
default = "${pkgs.smokeping}/etc/basepage.html.dist";
description = "Default page layout for the web UI.";
};
probeConfig = mkOption {
type = types.string;
default = ''
@ -225,6 +223,17 @@ in
'';
description = "Probe configuration";
};
sendmail = mkOption {
type = types.nullOr types.path;
default = null;
example = "/var/setuid-wrappers/sendmail";
description = "Use this sendmail compatible script to deliver alerts";
};
smokeMailTemplate = mkOption {
type = types.string;
default = "${cfg.package}/etc/smokemail.dist";
description = "Specify the smokemail template for alerts.";
};
targetConfig = mkOption {
type = types.string;
default = ''
@ -243,18 +252,16 @@ in
'';
description = "Target configuration";
};
extraConfig = mkOption {
type = types.lines;
default = "";
description = "Any additional customization not already included.";
user = mkOption {
type = types.string;
default = "smokeping";
description = "User that runs smokeping and (optionally) thttpd";
};
config = mkOption {
type = types.nullOr types.string;
default = null;
description = "Full smokeping config supplied by the user. Overrides " +
"and replaces any other configuration supplied.";
webService = mkOption {
type = types.bool;
default = true;
description = "Enable a smokeping web interface";
};
};
};

2
pkgs/applications/altcoins/default.nix
View File

@ -32,4 +32,6 @@ rec {
primecoin = callPackage ./primecoin.nix { withGui = true; };
primecoind = callPackage ./primecoin.nix { withGui = false; };
stellar-core = callPackage ./stellar-core.nix { };
}

15
pkgs/applications/altcoins/stellar-core-dirty-version.patch Normal file
View File

@ -0,0 +1,15 @@
Subject: Prevent "-dirty" from being erroneously added to the version
diff --git a/src/Makefile.am b/src/Makefile.am
index d36d1a3..00048fc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,7 +28,7 @@ always:
# Always rebuild because .git/HEAD is a symbolic ref one can't depend on
StellarCoreVersion.h: always
@vers=$$(cd "$(srcdir)" \
- && git describe --always --dirty --tags 2>/dev/null \
+ && git describe --always --tags 2>/dev/null \
|| echo "$(PACKAGE) $(VERSION)"); \
echo "#define STELLAR_CORE_VERSION \"$$vers\"" > $@~
@if cmp -s $@~ $@; then rm -f $@~; else \

46
pkgs/applications/altcoins/stellar-core.nix Normal file
View File

@ -0,0 +1,46 @@
{ stdenv, lib, fetchgit, autoconf, libtool, automake, pkgconfig, git
, bison, flex, postgresql }:
let
pname = "stellar-core";
version = "0.5.1";
in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchgit {
url = "https://github.com/stellar/stellar-core.git";
rev = "refs/tags/v${version}";
sha256 = "0ldw3qr0sajgam38z2w2iym0214ial6iahbzx3b965cw92n8n88z";
fetchSubmodules = true;
leaveDotGit = true;
};
buildInputs = [ autoconf automake libtool pkgconfig git ];
propagatedBuildInputs = [ bison flex postgresql ];
patches = [ ./stellar-core-dirty-version.patch ];
preConfigure = ''
# Everything needs to be staged in git because the build uses
# `git ls-files` to search for source files to compile.
git add .
./autogen.sh
'';
meta = with stdenv.lib; {
description = "Implements the Stellar Consensus Protocol, a federated consensus protocol";
longDescription = ''
Stellar-core is the backbone of the Stellar network. It maintains a
local copy of the ledger, communicating and staying in sync with other
instances of stellar-core on the network. Optionally, stellar-core can
store historical records of the ledger and participate in consensus.
'';
homepage = https://www.stellar.org/;
platforms = platforms.linux;
maintainers = with maintainers; [ chris-martin ];
license = licenses.asl20;
};
}

6
pkgs/applications/editors/emacs-modes/elpa-generated.nix
View File

@ -619,10 +619,10 @@
el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib, stream }:
elpaBuild {
pname = "el-search";
version = "1.2.1";
version = "1.2.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/el-search-1.2.1.tar";
sha256 = "1a5gqcl9v0ppizz0c61rcpahym3vr52f8azp2pjvrxvkmx4sj8c1";
url = "https://elpa.gnu.org/packages/el-search-1.2.3.tar";
sha256 = "1d7iqr4fr0kr171fnjcm2n0bgcwzdh6jl585mwjf2zqnqszv13h0";
};
packageRequires = [ emacs stream ];
meta = {

1336
pkgs/applications/editors/emacs-modes/melpa-generated.nix
View File

File diff suppressed because it is too large Load Diff

256
pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
View File

@ -485,12 +485,12 @@
ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild {
pname = "ac-php";
version = "1.7.5";
version = "1.7.6";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
rev = "f66d13c98543032d2773c83441f49d4b6e109e97";
sha256 = "0zi16x56jmas70srphd07ycxfdw4ny1y8vsdcvfvmgvg1mgys8f6";
rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a";
sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@ -506,12 +506,12 @@
ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
melpaBuild {
pname = "ac-php-core";
version = "1.7.5";
version = "1.7.6";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
rev = "f66d13c98543032d2773c83441f49d4b6e109e97";
sha256 = "0zi16x56jmas70srphd07ycxfdw4ny1y8vsdcvfvmgvg1mgys8f6";
rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a";
sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@ -3334,12 +3334,12 @@
cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "cfengine-code-style";
version = "3.9.1";
version = "3.10.0";
src = fetchFromGitHub {
owner = "cfengine";
repo = "core";
rev = "843fb337d8fe849860ca2f2aeb55c7f549f75a52";
sha256 = "0mw7xif23949d2hg4pgg2b1sj4afjc19522zqk4dmv2cz7qdmqi2";
rev = "dc823da05d6790e9f95e3cb75618b51d6273e303";
sha256 = "0xfdlzdcccz80qp3jbzv7wr1kwkh8797j9d3lfkh8apl4wkgvwpq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style";
@ -3541,6 +3541,27 @@
license = lib.licenses.free;
};
}) {};
choice-program = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "choice-program";
version = "0.1";
src = fetchFromGitHub {
owner = "plandes";
repo = "choice-program";
rev = "154c12ed7e2afc2d5dae031698be4787d7d647b0";
sha256 = "1695pmz0j93pz3pkcyqk0ngajcf8cyzxihmpp2zfspya3ihxj4ia";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/894357125db5035999a39514516852d7e957453e/recipes/choice-program";
sha256 = "0hhp6qhrshqrw4978xq6biwddm7gv7yf4avbb64xvz66i3a2kgy1";
name = "choice-program";
};
packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://melpa.org/#/choice-program";
license = lib.licenses.free;
};
}) {};
cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
melpaBuild {
pname = "cider";
@ -3933,12 +3954,12 @@
closql = callPackage ({ emacs, emacsql-sqlite, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "closql";
version = "0.3.2";
version = "0.3.3";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "closql";
rev = "5e9d64288863d6d33fac73ccf356427215daa9fb";
sha256 = "0snhwix51bfs6gsg2knklkg791k2mvn3ydyk388k3k9xmn5sr7xj";
rev = "0bb0fa3dd1e545cbf025d42e253ddb00107156a3";
sha256 = "1mpycmj88gi62rhzxdv4933l318j3llphbc00b7rvzms55sgpcz5";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/closql";
@ -4437,12 +4458,12 @@
company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-emoji";
version = "2.4.1";
version = "2.5.0";
src = fetchFromGitHub {
owner = "dunn";
repo = "company-emoji";
rev = "b971ab0a66126f0d1410254ba1e21f17c2270101";
sha256 = "1c9r1j7xpq6c27y6akfarrcg87idww3c10rkhm26m1vprqk73vr3";
rev = "8dc88ffe0773ef44321f245d39430c14a1bc2b82";
sha256 = "1y8l9wnc13g79znyw2qsbm33da2bhkj270ppikkg9h4x2qpmxilq";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5733dccdffe97911a30352fbcda2900c33d79810/recipes/company-emoji";
@ -4584,12 +4605,12 @@
company-ngram = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-ngram";
version = "0.7.8";
version = "0.7.9";
src = fetchFromGitHub {
owner = "kshramt";
repo = "company-ngram";
rev = "1d43d7df4c5d7a58e1176c7c57a8dce60dba2e8a";
sha256 = "1isfyzjik8a5fr8sfy7462hpv5zh5bgbm8zc7d0lk50ggrazz7l5";
rev = "98491c830d0867c211b773818610ace51f243640";
sha256 = "196c870n7d46n4yhppq5np8mn9i0i74aykkbfk33kr4mgilss4cw";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/937e6a23782450525c4a90392c414173481e101b/recipes/company-ngram";
@ -4626,12 +4647,12 @@
company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "company-php";
version = "1.7.5";
version = "1.7.6";
src = fetchFromGitHub {
owner = "xcwen";
repo = "ac-php";
rev = "f66d13c98543032d2773c83441f49d4b6e109e97";
sha256 = "0zi16x56jmas70srphd07ycxfdw4ny1y8vsdcvfvmgvg1mgys8f6";
rev = "35fdc09f95050cc76d06f3e6ff1620927aa6377a";
sha256 = "14ywlbxpkwi7fc7axfcnpisddn2886v134llgh0glrl4xkiyd0sf";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@ -4947,12 +4968,12 @@
copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "copy-as-format";
version = "0.0.1";
version = "0.0.2";
src = fetchFromGitHub {
owner = "sshaw";
repo = "copy-as-format";
rev = "e3e130a34d70deaa1ff81fe1e3b3898c1121c107";
sha256 = "1llkzvbw7ci4x20pqaacri82qplsfzxb20xw7v373i5jc83wjv9z";
rev = "6c47295597c69b3b08dd8f137f6a5973a5588674";
sha256 = "1d4x8rvmzqi3cby01ahgr3fqcsq4kpd6sglr9slxcw7hp7rlih0i";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
@ -5178,12 +5199,12 @@
creamsody-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "creamsody-theme";
version = "0.3.0";
version = "0.3.4";
src = fetchFromGitHub {
owner = "emacsfodder";
repo = "emacs-theme-creamsody";
rev = "c897adf63cfd928779d90a54366ca5bdb24d4d35";
sha256 = "0bw1p0l52fgvw2bapq9anwxzfwpwr6d2ddskzp2r2whyy0w3jc9b";
rev = "c1b2de723d1047ffa199a2cfb14131218962a07d";
sha256 = "0kncywrxpb8yn8i0wqspx9igljzlv57zc9r32s1mwgqfz0p2z823";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/488f95b9e425726d641120130d894babcc3b3e85/recipes/creamsody-theme";
@ -5646,8 +5667,8 @@
sha256 = "1klmjdym4w3cbarabzvkxddjdcisfk62wkpys3z4nclp4g91p8as";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b047625aebdbf7b5d644b55afbdccfc6c4ac14a8/recipes/dashboard";
sha256 = "04lp8ylfnbdj65s8z0m5kyj4rwxcsdwinlkpj00j1my0m74y5i0p";
url = "https://raw.githubusercontent.com/milkypostman/melpa/e9a79341ccaa82a8c065e71c02fe6aee22007c66/recipes/dashboard";
sha256 = "08pdpjfrg8v80gljy146cwpz624dshhbz8843zl1zszwp2p00kqy";
name = "dashboard";
};
packageRequires = [ emacs page-break-lines ];
@ -6822,8 +6843,8 @@
version = "0.7";
src = fetchhg {
url = "https://bitbucket.com/harsman/dyalog-mode";
rev = "20a2166c8210";
sha256 = "0gz0aiks3f53lqvnrnb33a1clq52ipd3i3miymvkkgspnz3vl12p";
rev = "4004050a9771";
sha256 = "0p7g7sfkdr473gpj2xdgg5fb5d336w2ddvx44i1d6575p6rcs5w6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@ -8665,12 +8686,12 @@
epkg = callPackage ({ closql, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "epkg";
version = "2.0.0";
version = "2.1.0";
src = fetchFromGitHub {
owner = "emacscollective";
repo = "epkg";
rev = "de33177656d8f48b65abbb71ab4d25b7bd799dee";
sha256 = "0lhb8b4i8r8a6pagwa0p3iqb1bk25as4nd4pjwbdjn0800ncv9nh";
rev = "6e1d989fbfa357a7c268ea30fe8b3e3cefafc36d";
sha256 = "0avlmqcbm07692ir5z04gy4klhyan3h25ni4l4k4p0dszjsqmdi0";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2df16abf56e53d4a1cc267a78797419520ff8a1c/recipes/epkg";
@ -8725,22 +8746,22 @@
license = lib.licenses.free;
};
}) {};
erc-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
erc-crypt = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "erc-crypt";
version = "1.0";
version = "1.6";
src = fetchFromGitHub {
owner = "atomontage";
repo = "erc-crypt";
rev = "1573189240d8b58e65385414d9a9514238c77805";
sha256 = "1xw56sir6gkr0p9g4s6p4qc0rajnl6ifbzrky07j28y9vsa59nsz";
rev = "731f9264a5bf08a8fc0b5ce69e72058c86f873a5";
sha256 = "13jpq5ws5dm8fyjrskk4icxwz8k5wgh396cc8f8wxrjna4wb843w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/a1a71b46c0370d2ed25aa3f39983048a04576ad5/recipes/erc-crypt";
sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3";
name = "erc-crypt";
};
packageRequires = [];
packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/erc-crypt";
license = lib.licenses.free;
@ -10979,12 +11000,12 @@
flycheck-objc-clang = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-objc-clang";
version = "1.0.5";
version = "1.0.6";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-objc-clang";
rev = "9dbfad340090523db0b936517d8543d8aa2f2e2c";
sha256 = "0cky0zxlfajhq5kh868yh17d0pr5pqjgj8v8xhj14sbch5jvd3bz";
rev = "11805f1d420e297db0346a6657f144b08e2ca556";
sha256 = "1s9bk3k7ys79m2iww4yf1abfy01d08z9x9pfq8l045q0snsh64il";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ff4412f507371b93cfb85fc744e54110cd87338/recipes/flycheck-objc-clang";
@ -11147,12 +11168,12 @@
flycheck-swift3 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
melpaBuild {
pname = "flycheck-swift3";
version = "1.0.6";
version = "1.0.8";
src = fetchFromGitHub {
owner = "GyazSquare";
repo = "flycheck-swift3";
rev = "6e1079576d30397eefea0300bf31a248a26cf98c";
sha256 = "0c8a5bgrirf3ms6v75w4jaiwfxf1acv2isf7x02jms7m8h36bzxz";
rev = "ae7b29111cb160774c317997902d7ef29cedd7d9";
sha256 = "17s34rqxkirb88y8jzl3ybs7j3ylp9ckdfx3sqwfn0cyspnj5f1d";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f1fb8c731c118327dc0bbb726e046fec46bcfb82/recipes/flycheck-swift3";
@ -12725,22 +12746,22 @@
license = lib.licenses.free;
};
}) {};
git-messenger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
git-messenger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
melpaBuild {
pname = "git-messenger";
version = "0.17";
version = "0.18";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-git-messenger";
rev = "9412a975f4723e9bc9c9feb4ec064b2e8c0c659d";
sha256 = "1hh99ippc1bpqpnchvhbh7yzcsjx9v7bbpy5r9hx82kx0xqih0sc";
rev = "9297464c010dd8a2d584ac8e012876856655a8b5";
sha256 = "04fnby2nblk8l70gv09asxkmnn53fh1pdfs77ix44npp99fyw8ix";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e791293133f30e5d96c4b29e972f9016c06c476d/recipes/git-messenger";
sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn";
name = "git-messenger";
};
packageRequires = [ cl-lib popup ];
packageRequires = [ emacs popup ];
meta = {
homepage = "https://melpa.org/#/git-messenger";
license = lib.licenses.free;
@ -13973,22 +13994,22 @@
license = lib.licenses.free;
};
}) {};
gruvbox-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
gruvbox-theme = callPackage ({ autothemer, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "gruvbox-theme";
version = "0.18.0";
version = "1.12.0";
src = fetchFromGitHub {
owner = "Greduan";
repo = "emacs-theme-gruvbox";
rev = "fa9cafdaf2b126a06a0196a668c14821ceba44fa";
sha256 = "1fn0dgnharn18xs6aq202y0jyldvg12sbf67jxmxjdn20w44g1d3";
rev = "e57f494fd94e49321a6396f530b8a13bae8b57df";
sha256 = "16f9vszl0f1dkjvqk5hxi570gf4l8p6fk27p0d7j11grsck0yzly";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme";
sha256 = "042mnwlmixygk2mf24ygk7rkv1rfavc5a36hs9x8b68jnf3khj32";
name = "gruvbox-theme";
};
packageRequires = [];
packageRequires = [ autothemer ];
meta = {
homepage = "https://melpa.org/#/gruvbox-theme";
license = lib.licenses.free;
@ -14413,22 +14434,22 @@
license = lib.licenses.free;
};
}) {};
hcl-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
hcl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "hcl-mode";
version = "0.2";
version = "0.3";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-hcl-mode";
rev = "cc13180e3af748d53c4a1d433ce2edf99bf68a7d";
sha256 = "0hiw226gv73jh7s3jg4p1c15p4km4rs7i9ab4wgpkl5lg4vrz5i6";
rev = "6a6daf37522188a2f2fcdebc60949fc3bdabbc06";
sha256 = "0jqrgq15jz6pvx38pnwkizzfiih0d3nxqphyrc92nqpcyimg8b6g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/66b441525dc300b364d9be0358ae1e0fa2a8b4fe/recipes/hcl-mode";
sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin";
name = "hcl-mode";
};
packageRequires = [ cl-lib emacs ];
packageRequires = [ emacs ];
meta = {
homepage = "https://melpa.org/#/hcl-mode";
license = lib.licenses.free;
@ -14437,12 +14458,12 @@
helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
melpaBuild {
pname = "helm";
version = "2.3.3";
version = "2.3.4";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
rev = "2fca3400574e5f2666c942c674ce0f8e6ca6b232";
sha256 = "1qbvgp2pca0n5ahpc1gss8ldn07mgs96xxgb5dg62b08ch8ry2jf";
rev = "26415fdb3ebc66fa721b94aa1eaeba1693eae624";
sha256 = "12jy8448gj8a1mw2njzxyvrrc2q059xrq65my1zqx1k1lcrknhp8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm";
@ -14689,12 +14710,12 @@
helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "helm-core";
version = "2.3.3";
version = "2.3.4";
src = fetchFromGitHub {
owner = "emacs-helm";
repo = "helm";
rev = "2fca3400574e5f2666c942c674ce0f8e6ca6b232";
sha256 = "1qbvgp2pca0n5ahpc1gss8ldn07mgs96xxgb5dg62b08ch8ry2jf";
rev = "26415fdb3ebc66fa721b94aa1eaeba1693eae624";
sha256 = "12jy8448gj8a1mw2njzxyvrrc2q059xrq65my1zqx1k1lcrknhp8";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core";
@ -18403,12 +18424,12 @@
keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "keymap-utils";
version = "2.0.0";
version = "2.1.0";
src = fetchFromGitHub {
owner = "tarsius";
repo = "keymap-utils";
rev = "14c86914b708081299cf6a290570ff8e11853cab";
sha256 = "15zsx296cqzmwivrkkknr8lmdsr6dkggxbwp2yggr20278vsvbhv";
rev = "a4f6ff724eeade5612c01c6f6bf401f264687793";
sha256 = "0jgmw8798g3ikhwnic3fbbjld0hj8fvg50q6x78pngf78ws92mkl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c03acebf1462dea36c81d4b9ab41e2e5739be3c3/recipes/keymap-utils";
@ -20241,22 +20262,22 @@
license = lib.licenses.free;
};
}) {};
mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
mentor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, seq, xml-rpc }:
melpaBuild {
pname = "mentor";
version = "0.2";
version = "0.3";
src = fetchFromGitHub {
owner = "skangas";
repo = "mentor";
rev = "256c59ab8562300c8de027afaec989239ad89395";
sha256 = "0xlaanyv6k8ski6c45mrha8n4yinqvjgn6kn64mwy4n64fvlrvv5";
rev = "074bd57a1e19d7807d682552fee63f326d1ad05c";
sha256 = "1p2wlwl8771w8m0i8f6qx11n1f13kkf681v0v4zcd161jgmklp5q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/083de4bd25b6b013a31b9d5ecdffad139a4ba91e/recipes/mentor";
sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s";
name = "mentor";
};
packageRequires = [ xml-rpc ];
packageRequires = [ cl-lib seq xml-rpc ];
meta = {
homepage = "https://melpa.org/#/mentor";
license = lib.licenses.free;
@ -21566,12 +21587,12 @@
nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "nix-mode";
version = "1.11.4";
version = "1.11.5";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "fb577a431f5ef1a29fdf3b818dceb4f6b4e8fa52";
sha256 = "1vzs5y0ib9bqvcyap7f6v75pf8z0xpdwgq554zxci4dlwp68fp2p";
rev = "d39f51fa3472ccc30f1b2896f5538d0b2dbce916";
sha256 = "0ms42pmnmzhn0b74s3b441m0nqbckgm64bc00qdlvb1s644j32i6";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode";
@ -21608,12 +21629,12 @@
no-littering = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "no-littering";
version = "0.5.0";
version = "0.5.2";
src = fetchFromGitHub {
owner = "tarsius";
repo = "no-littering";
rev = "12a4cc1155b938da947cce5b3dff7ffb91f2203c";
sha256 = "1x7xmqvmna5h5dg352v6pzm9ijdivaz7wcc2nhnshxc5pywpc1cg";
rev = "e7d3ebbd12f176707e63766a7a19bcaa08e01331";
sha256 = "0y8wvagn4yf7fwvwzqcrx46wigmvyl25fa94kzvkanjl04zid3i1";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cf5d2152c91b7c5c38181b551db3287981657ce3/recipes/no-littering";
@ -21937,6 +21958,27 @@
license = lib.licenses.free;
};
}) {};
ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ob-prolog";
version = "1.0.0";
src = fetchFromGitHub {
owner = "ljos";
repo = "ob-prolog";
rev = "7e94309d3a21d7e265f3a85b41801397f286af00";
sha256 = "0qxpgnjrx04dl43i949vcwv70sc7i23ivyvfk82hdvl8c2lwfd7w";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/fb87868cd74325f0a4a38c5542c264501000951d/recipes/ob-prolog";
sha256 = "0ki8yd20yk5xwn0zpk06zjxzgrsf8paydif9n98svb9s2l9wrh1s";
name = "ob-prolog";
};
packageRequires = [];
meta = {
homepage = "https://melpa.org/#/ob-prolog";
license = lib.licenses.free;
};
}) {};
ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }:
melpaBuild {
pname = "ob-sagemath";
@ -24041,12 +24083,12 @@
parinfer = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "parinfer";
version = "0.4.5";
version = "0.4.6";
src = fetchFromGitHub {
owner = "DogLooksGood";
repo = "parinfer-mode";
rev = "a1a5bce179fe694f07d28a75339bf8e4f5b285db";
sha256 = "0m0k4lb79qy61j0n2a9amx6zz36vgxhadlvyjg9kqg9xwlks5yxc";
rev = "3d5b8d4a3f7e73f15f816f7555abed09c5516338";
sha256 = "1w3j0dzi19h1k94gnj1zxx4s1aji91wq4sjwkf813zs7q769mfsp";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer";
@ -26262,12 +26304,12 @@
ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "ranger";
version = "0.9.8.4";
version = "0.9.8.5";
src = fetchFromGitHub {
owner = "ralesi";
repo = "ranger.el";
rev = "cbde94a417d9d93fcee74de119aae867cbe772d7";
sha256 = "0v3y77z8l5lg1ppl4szp9k80wjjnmlyxqjmmakc5l2vkq98gzcpq";
rev = "584e4ae8cce1c54a44b40dd4c77fbb2f06d73ecb";
sha256 = "01rphv92g1r0cw5bwkbrh02s0na7fjrddxx1dckk2y7qr97s7l8j";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger";
@ -28423,12 +28465,12 @@
slime-company = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
melpaBuild {
pname = "slime-company";
version = "0.9.1";
version = "1.1";
src = fetchFromGitHub {
owner = "anwyn";
repo = "slime-company";
rev = "b4a770b1c1e9638f13e339e7debbdb3b25217e39";
sha256 = "0rdhd6kymbzhkc96dxy3nr21ajrkc7iy6zvq1va22r90f96jj9x4";
rev = "6c244690c80387a32b0cb984843e00c8b75ad6bb";
sha256 = "1hl1hqkc1pxga9k2k8k15d7dip7sfsmwf4wm4sh346m6nj606q8g";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/abe5036c6de996a723bc800e0f031314e1188660/recipes/slime-company";
@ -30456,12 +30498,12 @@
tern-context-coloring = callPackage ({ context-coloring, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }:
melpaBuild {
pname = "tern-context-coloring";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "jacksonrayhamilton";
repo = "tern-context-coloring";
rev = "42e2f0177e8d3017c07826361cc981b2883d34dc";
sha256 = "0jdm1s8pqs40xligbhmqgk4vaxkqyb2i5wkx1zgjazq8fhcql9jv";
rev = "3a8e979d6cc83aabcb3dda3f5f31a6422532efba";
sha256 = "1rq5aqmsd7jqvwypafad9gmfcwjqjah00j7cws46k5f0dirjaa1y";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/db2119d2c2d167d771ee02c2735b435d59991b93/recipes/tern-context-coloring";
@ -30495,22 +30537,22 @@
license = lib.licenses.free;
};
}) {};
terraform-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }:
terraform-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }:
melpaBuild {
pname = "terraform-mode";
version = "0.5";
version = "0.6";
src = fetchFromGitHub {
owner = "syohex";
repo = "emacs-terraform-mode";
rev = "3458515359c1f3c82b40e72317b7dd49c05ea873";
sha256 = "1k0v56v7mwpb5p228c0g252szpxvpqswrmjfpk75kh32v56wp5xi";
rev = "6286aa42132a7fcad49271d63be33deeeb8d4efc";
sha256 = "05hn8kskx9lcgn7bzgam99c629zlryir2pickwrqndacjrqpdykx";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/93e06adf34bc613edf95feaca64c69a0a2a4b567/recipes/terraform-mode";
sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn";
name = "terraform-mode";
};
packageRequires = [ cl-lib hcl-mode ];
packageRequires = [ emacs hcl-mode ];
meta = {
homepage = "https://melpa.org/#/terraform-mode";
license = lib.licenses.free;
@ -32480,8 +32522,8 @@
version = "0.9.1";
src = fetchhg {
url = "https://bitbucket.com/ArneBab/wisp";
rev = "a67adbf5fc75";
sha256 = "1av071s0s6x0idbklfnps8j7vgjqxapk9y23prk6jrdbbwhfzb8n";
rev = "ab6afca9ee2e";
sha256 = "19yy6z12pqaz9l0gj4hm73m7z2gcyivwymf6732vk8im77i8agyl";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/wisp-mode";
@ -32518,12 +32560,12 @@
with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "with-editor";
version = "2.5.8";
version = "2.5.9";
src = fetchFromGitHub {
owner = "magit";
repo = "with-editor";
rev = "ab73c028e8dbe088d7545406efc5c5c7b8fd503a";
sha256 = "1hf2py6dby3wnvzv027x0555532aapn20bkhb7x8k020c6yr59s9";
rev = "2248a63f6eb6e7720881b508639d9a00d2db9ea0";
sha256 = "0g5ch1a5myrmazxcbbak01q4k3x8yp3kbn73d2h26j2jmsqvdy1n";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor";
@ -32914,22 +32956,22 @@
license = lib.licenses.free;
};
}) {};
xterm-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
xterm-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild {
pname = "xterm-color";
version = "1.0";
version = "1.6";
src = fetchFromGitHub {
owner = "atomontage";
repo = "xterm-color";
rev = "380cc8c6c6969f8a262ad4ddc61117691db7f4d1";
sha256 = "1zdj4664gvwc4kyx7fx5232l3c5anm0xyrrnrw596q604q6xxj2x";
rev = "ed3d0f4ccb2b28ff034192c50f244a97197d3911";
sha256 = "0djh18lm3xn9h4fa5ra0jrlzdzwhvhcalipj73j5gmmfaif4ya9q";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b34a42f1bf5641871da8ce2b688325023262b643/recipes/xterm-color";
sha256 = "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj";
name = "xterm-color";
};
packageRequires = [];
packageRequires = [ cl-lib ];
meta = {
homepage = "https://melpa.org/#/xterm-color";
license = lib.licenses.free;

2
pkgs/applications/editors/neovim/default.nix
View File

@ -167,7 +167,7 @@ let
in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation {
name = "neovim-${neovim.version}-configured";
inherit (neovim) version;
inherit (neovim) version meta;
nativeBuildInputs = [ makeWrapper ];

22
pkgs/applications/networking/irc/irssi/otr/default.nix
View File

@ -1,35 +1,23 @@
{ stdenv, fetchurl, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
let
versionFix = fetchurl {
url = https://patch-diff.githubusercontent.com/raw/cryptodotis/irssi-otr/pull/60.patch;
sha256 = "18fk9nbzf3fvhvvvkrxv5l004hhimapqb6ra09m83268kbl4q3jy";
};
in
with stdenv.lib;
stdenv.mkDerivation rec {
name = "irssi-otr-${version}";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "cryptodotis";
repo = "irssi-otr";
rev = "4ad3b7b6c85be0154ab3694fe9831796db20c4fe";
sha256 = "1hm1whx1wzlx4fh4xf2y68rx9x6whi8bsbrhd6hqjhskg5msssrg";
rev = "v${version}";
sha256 = "0c5wb2lg9q0i1jdhpyb5vpvxaa2xx00gvp3gdk93ix9v68gq1ppp";
};
prePatch = ''
sed -i 's,/usr/include/irssi,${irssi}/include/irssi,' src/Makefile.am
sed -i "s,/usr/lib/irssi,$out/lib/irssi," configure.ac
sed -i "s,/usr/share/irssi,$out/share/irssi," help/Makefile.am
'';
patches = [ versionFix ];
preConfigure = "sh ./bootstrap";
buildInputs = [ libotr automake autoconf libtool glib pkgconfig irssi ];
NIX_CFLAGS_COMPILE="-I ${irssi}/include/irssi -I ${irssi}/include/irssi/src/core -I ${irssi}/include/irssi/src/";
meta = {
homepage = https://github.com/cryptodotis/irssi-otr;
license = stdenv.lib.licenses.gpl2Plus;

2
pkgs/development/compilers/glslang/default.nix
View File

@ -21,5 +21,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "Khronos reference front-end for GLSL and ESSL";
license = licenses.asl20;
platforms = platforms.linux;
};
}

3
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -42,7 +42,8 @@ self: super: {
Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2;
# Use the default version of mysql to build this package (which is actually mariadb).
mysql = super.mysql.override { mysql = pkgs.mysql.lib; };
# test phase requires networking
mysql = dontCheck (super.mysql.override { mysql = pkgs.mysql.lib; });
# Link the proper version.
zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };

1
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -5741,7 +5741,6 @@ dont-distribute-packages:
mysql-simple-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ]
mysql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ]
mysql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ]
mysql: [ i686-linux, x86_64-linux, x86_64-darwin ]
mystem: [ i686-linux, x86_64-linux, x86_64-darwin ]
myTestlll: [ i686-linux, x86_64-linux, x86_64-darwin ]
mywatch: [ i686-linux, x86_64-linux, x86_64-darwin ]

13
pkgs/development/libraries/libbrotli/default.nix
View File

@ -1,17 +1,18 @@
{stdenv, fetchFromGitHub, autoconf, automake, libtool, brotliUnstable}:
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, brotliUnstable }:
stdenv.mkDerivation rec {
name = "libbrotli-20160120";
version = "53d53e8";
name = "libbrotli-${version}";
version = "1.0";
src = fetchFromGitHub {
owner = "bagder";
repo = "libbrotli";
rev = "53d53e8d9c0d37398d37bac2e7a7aa20b0025e9e";
sha256 = "10r4nx6n1r54f5cjck5mmmsj7bkasnmmz7m84imhil45q73kzd4m";
rev = name;
sha256 = "0apd3hpy3vaa7brkv8v0xwz05zbd5xv86rcbkwns4x39klba3m3y";
};
buildInputs = [autoconf automake libtool];
nativeBuildInputs = [ autoconf automake libtool ];
preConfigure = ''
cp -r ${brotliUnstable.src}/* brotli/
chmod -R +700 brotli

4
pkgs/development/libraries/libvncserver/default.nix
View File

@ -1,7 +1,7 @@
{stdenv, fetchurl,
libtool, libjpeg, openssl, libX11, libXdamage, xproto, damageproto,
xextproto, libXext, fixesproto, libXfixes, xineramaproto, libXinerama,
libXrandr, randrproto, libXtst, zlib
libXrandr, randrproto, libXtst, zlib, libgcrypt
}:
assert stdenv.isLinux;
@ -19,7 +19,7 @@ let
buildInputs = [
libtool libjpeg openssl libX11 libXdamage xproto damageproto
xextproto libXext fixesproto libXfixes xineramaproto libXinerama
libXrandr randrproto libXtst zlib
libXrandr randrproto libXtst zlib libgcrypt
];
in
stdenv.mkDerivation {

3
pkgs/development/libraries/vulkan-loader/default.nix
View File

@ -63,7 +63,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "LunarG Vulkan loader";
homepage = http://www.lunarg.com;
homepage = "http://www.lunarg.com";
platforms = platforms.linux;
license = licenses.asl20;
};
}

4
pkgs/development/tools/spirv-tools/default.nix
View File

@ -37,6 +37,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
inherit (src.meta) homepage;
description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules.";
description = "The SPIR-V Tools project provides an API and commands for processing SPIR-V modules";
license = licenses.asl20;
platforms = platforms.linux;
};
}

468
pkgs/misc/vim-plugins/default.nix
View File

@ -145,11 +145,11 @@ rec {
};
Hoogle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "Hoogle-2015-12-24";
name = "Hoogle-2016-11-29";
src = fetchgit {
url = "git://github.com/Twinside/vim-hoogle";
rev = "a5db36f048ac16ab9774fc86f36cd4ae9a444932";
sha256 = "1855n6dsimbc0brfbmmkx1gszhmgfghm1h1mpi95mq9qzbwkgjri";
rev = "9f00214ece60b9514ef2911fb62e7d53c52d3b4c";
sha256 = "1yh732s9k3lhsdqz8qfqijvl0za7cl9mndbzqh4dg2g14f5f5qqw";
};
dependencies = [];
@ -167,22 +167,22 @@ rec {
};
Supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "Supertab-2016-01-03";
name = "Supertab-2016-11-27";
src = fetchgit {
url = "git://github.com/ervandew/supertab";
rev = "66511772a430a5eaad7f7d03dbb02e8f33c4a641";
sha256 = "1kxxgplsc40wyl7yj3dpcjjgysd41cd32ppcpnj5knphpjw7abp4";
rev = "cdaa5c27c5a7f8b08a43d0b2e65929512299e33a";
sha256 = "0hym28chljfglqdrxajbh92r35cppxl5wyxdrgqwpa0am9d2xdvg";
};
dependencies = [];
};
Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "Syntastic-2016-10-30";
name = "Syntastic-2016-12-23";
src = fetchgit {
url = "git://github.com/scrooloose/syntastic";
rev = "734fde7f0b84ff3f670ab5772ed1b8b0c8c16770";
sha256 = "18nw0zw8h537d189n0z244fllbyyb9fw47brnmsw82w90b771723";
rev = "78c0d21a9b0329766732ca2743a848af1c49e791";
sha256 = "1n744grp4ajn4zfra5kfg97sj8rjkqcw1sgx2jbj5qq8l3p5ghad";
};
dependencies = [];
@ -200,44 +200,44 @@ rec {
};
Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "Tagbar-2016-11-07";
name = "Tagbar-2017-01-03";
src = fetchgit {
url = "git://github.com/majutsushi/tagbar";
rev = "01f57ac5643b0365021ab891f78519d849867a5e";
sha256 = "0k0006r895m19kpwqy1ibiia5qm47v4h3mgrlr349wlzqibhmws1";
rev = "18b536ce43f1be88be380e5f3b7cd0fd930b4908";
sha256 = "0k4c5f3qvszn3a9ndkcl984w832vk2g4hfwl4nkvy9bwqg7q89ya";
};
dependencies = [];
};
The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "The_NERD_Commenter-2016-10-10";
name = "The_NERD_Commenter-2016-12-15";
src = fetchgit {
url = "git://github.com/scrooloose/nerdcommenter";
rev = "97cb982f1f0d0631b34b71b065e162916bee4036";
sha256 = "136nirs1zi0pjz06yyw2q72ypwmmj25fkl9fjaqgc5q472d77d0v";
rev = "18cfe815501c8264844223a944eb388285b48caa";
sha256 = "05dg5v1pal5ly8shc4rlnqip5zsdx9901h4336a2k81lss269wd4";
};
dependencies = [];
};
The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "The_NERD_tree-2016-10-21";
name = "The_NERD_tree-2017-01-02";
src = fetchgit {
url = "git://github.com/scrooloose/nerdtree";
rev = "eee431dbd44111c858c6d33ffd366cae1f17f8b3";
sha256 = "1fyz3fp2v77piydadcg47pbb7dds9b015kj1baqaxr4gn2gfwq7f";
rev = "281701021c5001332a862da80175bf585d24e2e8";
sha256 = "0fp2rfz6rmaj01w5kifqzdyi934j20pa8bpgw13ks1s0s4x7xkck";
};
dependencies = [];
};
UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "UltiSnips-2016-10-24";
name = "UltiSnips-2016-12-16";
src = fetchgit {
url = "git://github.com/SirVer/ultisnips";
rev = "71c39721de9cb2d67478e8b8c1a543e006fb67df";
sha256 = "13lm1fb007ny70pxsvc5wf9s0n90lvimya1n2nn2pyxsnwm416fw";
rev = "f974e0317f549c7cf54fa231ee0501206aed6882";
sha256 = "0kvpgdkfc70phj2zf6lcblxb25hliiaz2cwg61bq7ip06sbk0fq0";
};
dependencies = [];
@ -292,17 +292,6 @@ rec {
};
ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "ctrlp-py-matcher-2016-09-02";
src = fetchgit {
url = "git://github.com/FelikZ/ctrlp-py-matcher";
rev = "3624f3a085681f787f1f9b7a8a24d4bed395acf1";
sha256 = "1126gphnhfvba5xzvqj4s582k61xsvi5hn86zag42v14v5csgw9d";
};
dependencies = [];
};
ctrlp-cmatcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "ctrlp-cmatcher-2015-10-15";
src = fetchgit {
@ -318,6 +307,17 @@ rec {
'';
};
ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "ctrlp-py-matcher-2016-09-02";
src = fetchgit {
url = "git://github.com/FelikZ/ctrlp-py-matcher";
rev = "3624f3a085681f787f1f9b7a8a24d4bed395acf1";
sha256 = "1126gphnhfvba5xzvqj4s582k61xsvi5hn86zag42v14v5csgw9d";
};
dependencies = [];
};
ctrlp-z = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "ctrlp-z-2015-10-17";
src = fetchgit {
@ -341,11 +341,11 @@ rec {
};
fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "fugitive-2016-11-05";
name = "fugitive-2016-11-13";
src = fetchgit {
url = "git://github.com/tpope/vim-fugitive";
rev = "b3a8be6975dcc27b523b030bf5d35d9c737aef18";
sha256 = "1qizj0xmpaj32b9f8p2d76s5rsvm8cxv0rh5yiczlgfvflbi587r";
rev = "b754bc2031f21a532c083dd0d072ba373bbe3a37";
sha256 = "1sig8dl3m1dw5zjxdsp00n1cacmcwdvas3iz04zk88v6xsm8rj22";
};
dependencies = [];
@ -374,11 +374,11 @@ rec {
};
vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-autoformat-2016-11-02";
name = "vim-autoformat-2016-12-13";
src = fetchgit {
url = "git://github.com/Chiel92/vim-autoformat";
rev = "15ee797ad37093e9841b41c121c8d93cf1dedf93";
sha256 = "10alg9a8mhasqp26mg7xlran1x474ip3k03s2sjhlvizy6mv5rba";
rev = "3715e166a5aa006353ca5bfad2386767676fe848";
sha256 = "0ki41pdrl5y4fry3xqn4sdx48zvvd3gc59qzs1nssvn9zp0k9il5";
};
dependencies = [];
@ -396,11 +396,11 @@ rec {
};
deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "deoplete-nvim-2016-11-04";
name = "deoplete-nvim-2017-01-04";
src = fetchgit {
url = "git://github.com/Shougo/deoplete.nvim";
rev = "5fc5ed772de138439322d728b103a7cb225cbf82";
sha256 = "1nn9k9rk6m3x48mm6mlji374vkrgwz1rf3pp8smd1hj30dy0njfk";
rev = "90569837af21ad0438448582b34d8418b745ffeb";
sha256 = "1qkzvgvjg397zaj1i56ld9i0gf2w9y5x2if5gbmag56nhxcwfw32";
};
dependencies = [];
@ -440,11 +440,11 @@ rec {
};
clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "clighter8-2016-11-08";
name = "clighter8-2017-01-03";
src = fetchgit {
url = "git://github.com/bbchung/clighter8";
rev = "a264494b6dd3e7636fa31b8aee9b3a42a635a69f";
sha256 = "1dg22yfr0za7milqzm7xywa6j9dfs2kvkjlwa046jjkjaqzlfx48";
rev = "89d70129ab5437c749041094fa71da97c95bda3f";
sha256 = "147i6rhz6ri86k6p0sim72vpsc5f6y8dvwxn7am6vyi21avy4zrz";
};
dependencies = [];
preFixup = ''
@ -454,11 +454,11 @@ rec {
};
neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "neomake-2016-11-04";
name = "neomake-2017-01-04";
src = fetchgit {
url = "git://github.com/benekastah/neomake";
rev = "0c8795de4519600c204227fdf86c83ca499db783";
sha256 = "0vif3jxrxpq8imnhbkl82fb7vvfi4illxxm6drl6wd5wijfwq39k";
rev = "9794f6caef063ba1283bb728ac3befda477935f3";
sha256 = "11rpc98nv9viyv82j5y4l29jc62bmd2rddp90a6740p8dx5gvx5q";
};
dependencies = [];
@ -487,22 +487,22 @@ rec {
};
spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "spacevim-2016-10-25";
name = "spacevim-2016-12-02";
src = fetchgit {
url = "git://github.com/ctjhoa/spacevim";
rev = "51d936482ce0710f6211aefca45cd33ab59d8444";
sha256 = "156sc8ynj1mg75i7n3dpm5nqlwcw727m41jw32fm3pahr3yq3ydq";
rev = "9bb2a04b14964a7db1d4131e1af1ed8bd31e910b";
sha256 = "0hq6g8czi73hgpkpigi177kp49dslh8xny3j7wjl03bjxsq9fkmk";
};
dependencies = [];
};
ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "ctrlp-vim-2016-11-07";
name = "ctrlp-vim-2016-11-29";
src = fetchgit {
url = "git://github.com/ctrlpvim/ctrlp.vim";
rev = "88b61e77a285d10d0163bd383d3bb2909ea2ddca";
sha256 = "0zb5hcsbgvbsp5h0alkqyqbikzicl29mraw787p2chbps10n1qjw";
rev = "2868678a987834563bbc384763135462c2423eb8";
sha256 = "0s98nqj22i4x79mqspjkz6b6rpg8hf79iblv4md2ivzlj7ffccx3";
};
dependencies = [];
@ -519,16 +519,6 @@ rec {
};
dracula = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "dracula-2016-09-21";
src = fetchgit {
url = "git://github.com/dracula/vim";
rev = "926dfbab01128322f6326bdd10de2856b1fa3232";
sha256 = "1kqd367qa2dnz3qf10lyw7hacahylc94axc6f6f5nw4cklm1g8yv";
};
dependencies = [];
};
vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-jade-2016-10-31";
src = fetchgit {
@ -540,6 +530,17 @@ rec {
};
dracula = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "dracula-2016-09-21";
src = fetchgit {
url = "git://github.com/dracula/vim";
rev = "926dfbab01128322f6326bdd10de2856b1fa3232";
sha256 = "1kqd367qa2dnz3qf10lyw7hacahylc94axc6f6f5nw4cklm1g8yv";
};
dependencies = [];
};
neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "neco-ghc-2016-07-01";
src = fetchgit {
@ -574,22 +575,22 @@ rec {
};
elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "elm-vim-2016-10-02";
name = "elm-vim-2016-11-26";
src = fetchgit {
url = "git://github.com/elmcast/elm-vim";
rev = "7760aed9f258cf6a7d2c56d547dd3ea45f832025";
sha256 = "1f1z2929aka2shkwb8z2ky26cvw2cgx7wdcikw9mljpgc1s7nl5d";
rev = "16a9a380a514e23c02d4bd7374112aa2dac1f3a4";
sha256 = "1mjccw7yx8hrn4vriickzag9z5g3xzqd6qh6w3xkw0nfh8mx2sgn";
};
dependencies = [];
};
vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-localvimrc-2016-10-07";
name = "vim-localvimrc-2016-11-08";
src = fetchgit {
url = "git://github.com/embear/vim-localvimrc";
rev = "f0c9b8d0b6f0d4c83d9dba5137772bd6c97afb4e";
sha256 = "02dzh8gckbpdifh7nmfzwn6qs3swjm783ld4h7dl1ky6xq4f06mv";
rev = "9f6de2ddfea2a397bc3e5335779bc93a8260ff99";
sha256 = "0ks8x7zjqnbm06y3niidj9h0ccqky29b2vpdkvs1vwnli10bg6sh";
};
dependencies = [];
@ -618,11 +619,11 @@ rec {
};
vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-go-2016-10-23";
name = "vim-go-2017-01-01";
src = fetchgit {
url = "git://github.com/fatih/vim-go";
rev = "10c805b83f160eb9e7f9cbe00d26c1b6d06ba636";
sha256 = "0316kzmwb2p91rwz31ddr7r5bd52aa7jxzkb3vdhdb7f3bmcwx3q";
rev = "d7c628ff228c2e6a4d4d5808f198471a775cf8b5";
sha256 = "1375qz8id08d10p6i7ppvk3khq778996bx1n7qarz6vx6kb19zcn";
};
dependencies = [];
@ -651,22 +652,33 @@ rec {
};
psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "psc-ide-vim-2016-11-05";
name = "psc-ide-vim-2016-11-29";
src = fetchgit {
url = "git://github.com/frigoeu/psc-ide-vim";
rev = "bb7f0ef6620899cb6256e3ee5956d3b30769488b";
sha256 = "1x47phq0shap338as120vf0srl69fas11kggzsxjg1dxblg69iww";
rev = "640842ac8786098fc74fce4737734c97a7629591";
sha256 = "0mwqkgqlglcnv1k7k5lmibc7piwkd79j96vgv52ya31hg50vkrin";
};
dependencies = [];
};
vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-jsonnet-2016-10-11";
name = "vim-jsonnet-2016-12-16";
src = fetchgit {
url = "git://github.com/google/vim-jsonnet";
rev = "bf1997a5607912cc121fe617a6fef76d3d872aa4";
sha256 = "04vgbzknz7x6r8gwvlajjqd653fvv1x4szib00bnzw87vsagdiiy";
rev = "ff255a3ac45dcd8bcda04728a8140243adde9c57";
sha256 = "16ica7n8dcb3kq40dx3sd8lwvdrz7bzks1cranw2vxh4riv1i251";
};
dependencies = [];
};
vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-jsdoc-2016-10-30";
src = fetchgit {
url = "git://github.com/heavenshell/vim-jsdoc";
rev = "45c7c7cef440a29f7bf24436640413e3d5d578ff";
sha256 = "0kr4p01pyrz9w7yfh50gsz6n60qvnqxsr1055hvsyx36nzw6l3za";
};
dependencies = [];
@ -695,33 +707,33 @@ rec {
};
calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "calendar-vim-2016-11-06";
name = "calendar-vim-2016-12-06";
src = fetchgit {
url = "git://github.com/itchyny/calendar.vim";
rev = "ca4b4b2ed364831ba27d50f17b44d1e9506715ef";
sha256 = "1i2ywg0h3rb6f05k7ahng9bvjg7hxqdg1nzcijs5m6kxkn8kjj2k";
rev = "6cf60f08a42c8b22ea3ae191a89e1faa4fdd3dae";
sha256 = "172xgsmzwpy890bg813d89wz210lfdhckvispdl45l15armdy99y";
};
dependencies = [];
};
lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "lightline-vim-2016-11-06";
name = "lightline-vim-2016-12-03";
src = fetchgit {
url = "git://github.com/itchyny/lightline.vim";
rev = "836d4c84f76e7066bcfa4c6c60449714cf2b2c45";
sha256 = "0qdhpwr4iyifmk0l463s4k5nm8k744ycvxmxgz3s38vkn8q5y06w";
rev = "059888ab650fa192dd441e52bd9f41f08b247529";
sha256 = "1pa627jjmrhlfbd8yms8lvfgnm0gj9xkr29jkq122icfl6hv3fwx";
};
dependencies = [];
};
thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "thumbnail-vim-2016-09-06";
name = "thumbnail-vim-2016-12-25";
src = fetchgit {
url = "git://github.com/itchyny/thumbnail.vim";
rev = "d697fb7a73a53275390c20040faab87b54f12f84";
sha256 = "112hkblw30ym7bpv8454fylalv9kn0l3268gpkh9a5qdr2kf99b1";
rev = "f911ebd0dfe08dd83a55dd0d0e4804195079b13c";
sha256 = "1pa0c34v2mah97i41hg1vyppf44sfmvdpji30bq54yv7gza36plz";
};
dependencies = [];
@ -750,11 +762,11 @@ rec {
};
vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-orgmode-2016-11-03";
name = "vim-orgmode-2016-11-12";
src = fetchgit {
url = "git://github.com/jceb/vim-orgmode";
rev = "304fd3ced3b929a8507e460b99b0bf4e6a9b3c7d";
sha256 = "13r4mnqng5hsiarqdrr3vqa4frf6jlwlaxpl72czvpyrvd4mvc2m";
rev = "67a693c37bac75ba163d35b9972efd0c7e0deb71";
sha256 = "1rdcyfdyq4lbfh9ya63kf05aqcr9g6q7r4ngzn1fgy7pmqdpk7vf";
};
dependencies = [];
@ -783,11 +795,11 @@ rec {
};
auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "auto-pairs-2016-07-17";
name = "auto-pairs-2016-11-21";
src = fetchgit {
url = "git://github.com/jiangmiao/auto-pairs";
rev = "1b3a1efb078fdf74d4013308b63de57dfda0cc8e";
sha256 = "1g5gb9xvc9xw3rxg8p4w3qcsdl3xfpi5ax380916aq237kmrnzdk";
rev = "84518168107c34fb540ee4f8cde743ceaf682bae";
sha256 = "104mahfn956vb98psfml0b4x1yhwn8w6af3hkym3fdxy4ksh4fj4";
};
dependencies = [];
@ -838,11 +850,11 @@ rec {
};
fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "fzf-vim-2016-10-29";
name = "fzf-vim-2016-12-25";
src = fetchgit {
url = "git://github.com/junegunn/fzf.vim";
rev = "0bc9b231fbab6749f18f2f34cc21c649b9a7d3ed";
sha256 = "1gpy744qd7hch1ab7kfzz1njg74hasvh53w7kbm7ni5sw7pn5w64";
rev = "2066643243eddf2ed1f5d3a1a5485d6ff71851a4";
sha256 = "0svw41n4x1j7s9l7qh5s0mk2s5ibdfq4pzdiknvfb342na6xi2b5";
};
dependencies = [];
@ -871,11 +883,11 @@ rec {
};
vim-eighties = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-eighties-2015-11-02";
name = "vim-eighties-2016-12-15";
src = fetchgit {
url = "git://github.com/justincampbell/vim-eighties";
rev = "62a9719df45fddd0456bf47420fc4768f9c8f5a5";
sha256 = "1ada7f2lhdwjqmy5kxma69s215z4phi4khh8hsy5qd6k3a4bvyrs";
rev = "1a6ea42ead1e31524ec94cfefb6afc1d8dacd170";
sha256 = "1yh1kny28c7f5qm52y7xd5aj4mycksfb0x1zvcb37c73ycdxc1v2";
};
dependencies = [];
@ -893,33 +905,33 @@ rec {
};
vim-jinja = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-jinja-2016-05-20";
name = "vim-jinja-2016-11-16";
src = fetchgit {
url = "git://github.com/lepture/vim-jinja";
rev = "0bcc2993ef13bacd4bf1a0d91eb17652f7aedb86";
sha256 = "1wypg9rf7q65g6l3ajp75gdb4cd7spckzd4b7ccg8c47vd937dcj";
rev = "8d330a7aaf0763d080dc82204b4aaba6ac0605c6";
sha256 = "1n62ga02rcj7jjgzvwr46pckj59dc1zqahjgampjcwdd8vf4mg3q";
};
dependencies = [];
};
vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vimtex-2016-11-04";
name = "vimtex-2017-01-03";
src = fetchgit {
url = "git://github.com/lervag/vimtex";
rev = "fa1adca64aea62d512bbc9e0b0f4b88ac8667ed4";
sha256 = "0gnz4jh5gagnk06jndmxqmjhymbnpjz18wx5i071q7imkv0420s4";
rev = "4c76e8f74025c6c753167f23a6be0bcfc1e39af7";
sha256 = "1syl4wyffn59i43q6kcy3hz5kzwmp0wj4xmwsahg81fxq4wzdz3n";
};
dependencies = [];
};
vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-easymotion-2016-10-19";
name = "vim-easymotion-2016-12-25";
src = fetchgit {
url = "git://github.com/lokaltog/vim-easymotion";
rev = "11632455de8caa40f264501df8f0a3e249cf0595";
sha256 = "1lmmahpsghfqnri7wi2i9370q4dfzpdbafabi97vfxyyclxj4bz9";
rev = "af9786ee5780bf0cbafbd7b341c2b5234d18c1c0";
sha256 = "0f9xc6wz53msq03qivbmqfcfjncba0mrcl4x8vdkzr4chi0yxvbd";
};
dependencies = [];
@ -952,11 +964,11 @@ rec {
};
vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-startify-2016-10-31";
name = "vim-startify-2017-01-02";
src = fetchgit {
url = "git://github.com/mhinz/vim-startify";
rev = "9732427469c6933cbedeb7e662c70a2aaf4e63d2";
sha256 = "022ibyqq140130x8c2901sskh03q516ghnc25i41qv6b2hcsq1ad";
rev = "c26fcfcd17cfa64e051c8aa97f78894d91a21604";
sha256 = "0rcvh612qvcsbf0bagq44dk2hbarhcc2v9a8n7lc5f7rsgdhxp7w";
};
dependencies = [];
@ -1007,16 +1019,38 @@ rec {
};
haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "haskell-vim-2016-11-05";
name = "haskell-vim-2016-12-29";
src = fetchgit {
url = "git://github.com/neovimhaskell/haskell-vim";
rev = "cf2f339d2b551547d4f5a365db17f0f12b99a0c0";
sha256 = "1zdq7rc7bklz88df2cwgw7n43z0mn4fylx7gyfmi8sfm1bx5avnj";
rev = "434f5903556e2bea99d433d48adb681cb4967d27";
sha256 = "0lwclld3yqh4mf0bqqaxvqsfqsjq8q5pl27q1byqrr9x3ngjx5zz";
};
dependencies = [];
};
cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "cpsm-2016-09-21";
src = fetchgit {
url = "git://github.com/nixprime/cpsm";
rev = "565ab53a66fa52c46d80adf6981b07f4bdffcb1d";
sha256 = "125gcnqrg2276sp715q924cxwjxwsv3j4m0n1zj17w9srnpn4r1k";
};
dependencies = [];
buildInputs = [
python3
stdenv
cmake
boost
icu
];
buildPhase = ''
patchShebangs .
export PY3=ON
./install.sh
'';
};
shabadou-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "shabadou-vim-2016-07-19";
src = fetchgit {
@ -1029,11 +1063,11 @@ rec {
};
vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-watchdogs-2016-09-05";
name = "vim-watchdogs-2016-11-14";
src = fetchgit {
url = "git://github.com/osyo-manga/vim-watchdogs";
rev = "96ee0ce968da8da8ace48457665c7d5c942dd49d";
sha256 = "16dk0wsikqmcywgm04vwv76p2sc6jw0krq4cg02zdpgyb4xxgp3n";
rev = "455a61a34e6f2f82fda7e6de0fc14fc740a11764";
sha256 = "05mqphn2l3f0sa86xq5iw1gmm8l1x8ri26kiw6w40hvdc22xkak5";
};
dependencies = [];
@ -1051,11 +1085,11 @@ rec {
};
vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-racer-2016-10-18";
name = "vim-racer-2017-01-04";
src = fetchgit {
url = "git://github.com/racer-rust/vim-racer";
rev = "6c87080bdb145595e37c304fd8b570b349eda381";
sha256 = "1hjf8j7jnf2vb62w6zv3xm0hdhjmm0hxqq18symxfqpkii1kwx6c";
rev = "3bd56cc87518c1bf02b681d586447366ae8e815a";
sha256 = "0wq2iwgb7wpg62r68f9j5g3kycyap8sks735p9mcsq63rrqmw6l4";
};
dependencies = [];
@ -1073,55 +1107,55 @@ rec {
};
vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-grammarous-2016-10-07";
name = "vim-grammarous-2017-01-03";
src = fetchgit {
url = "git://github.com/rhysd/vim-grammarous";
rev = "81ff81d1ac5e2ea059600588165ba9b2ecb854eb";
sha256 = "1xpm1j64f5c62d7dnpkc9lfg6qh0nwjbnk3a5gqmz3iy4z1hsdwb";
rev = "33f9b3a0f8d6fb01e3c565948bd6185f5079d732";
sha256 = "0l4qbd5phqqxdz1g7xz20p2fql1x2ccsv6v7sgal8bvk6b5f8dk0";
};
dependencies = [];
};
rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "rust-vim-2016-10-28";
name = "rust-vim-2017-01-01";
src = fetchgit {
url = "git://github.com/rust-lang/rust.vim";
rev = "59e5e2f8b7df21eb438124b95c7295da9c53e1d7";
sha256 = "1zdx29l6lhini9562j75g3d41yvjf78pi8cady16i7644hw11r0m";
rev = "732b5fcb3652f81726d5f0f5b97c9027c01f057a";
sha256 = "0yrg0wlpc9nj5zf25vgr9zd1kwapds3f10njr0dw0wgxr7g204dz";
};
dependencies = [];
};
neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "neoformat-2016-11-05";
name = "neoformat-2016-12-24";
src = fetchgit {
url = "git://github.com/sbdchd/neoformat";
rev = "8a4d9783879e404bd0a9e185dfec2cd6cd529c31";
sha256 = "076cm2cg4kyps7n5d3kp2vjcwvkay20f1pl26yvdsjac14w6x9l9";
rev = "a0460e8ef4e48d8d1ee9c377546820a6164fee16";
sha256 = "0jlvvc1ijpkadjqix6gr17y8gnfc0rhjqzbg08biw8jpks4fh44p";
};
dependencies = [];
};
vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-polyglot-2016-09-11";
name = "vim-polyglot-2016-12-20";
src = fetchgit {
url = "git://github.com/sheerun/vim-polyglot";
rev = "74652b465d7eff97070001317a4ea5557717378d";
sha256 = "18bw8fdpq5riqfy656kw4a9hmrk8s967qx36lq0s16sbyqxm15ag";
rev = "e404a658b1647fad396a954776eda0bdabf8353c";
sha256 = "11q4k3yj1spxzhxjcwnild4njqmafznm179scvcw8lci8sm8w3hm";
};
dependencies = [];
};
neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "neocomplete-vim-2016-10-19";
name = "neocomplete-vim-2017-01-01";
src = fetchgit {
url = "git://github.com/shougo/neocomplete.vim";
rev = "4bf7526a1c8cca9f8614e8a09178f334eaca0481";
sha256 = "1qpxqvdiglisl8bnh1wli957lwr56mq96pm266qmwj6d38h8yby7";
rev = "7904f0ff33ce667dfb203e812b783bf443c983cf";
sha256 = "1gxvmzmlk8ga45vs8c24in92k6i9z3vxpmcpqpjjc40f4l8hqyds";
};
dependencies = [];
@ -1139,22 +1173,22 @@ rec {
};
neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "neosnippet-vim-2016-11-04";
name = "neosnippet-vim-2017-01-02";
src = fetchgit {
url = "git://github.com/shougo/neosnippet.vim";
rev = "22bf9611263fcc9fd2c4bd61031053624ff82714";
sha256 = "0f0j0spw8zkvrfhbdlk020y19fh4awhhqwc3ylnxday3q5avxa16";
rev = "65af2b9bcad50ba1543b38a8dd30df1aee2142ce";
sha256 = "107xb0pvqc4ivqpz5i7z8xfk26577y3jsxzvm86bizbxc2wi92m9";
};
dependencies = [];
};
unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "unite-vim-2016-11-04";
name = "unite-vim-2016-12-14";
src = fetchgit {
url = "git://github.com/shougo/unite.vim";
rev = "f3f6df24c04faf29ae4d716aa776f85e88e7ea38";
sha256 = "1yyw1blg82g6d8dbl6f4kgfka3d5lh0vgjmp310aysqdhnfag2az";
rev = "be09b0e5784c4c4c13aefae4f16313696c6f51de";
sha256 = "1nd09llf9v09acyizdmwgjkkdg1b14f8d02b5h3bgidv753dbx64";
};
dependencies = [];
@ -1180,32 +1214,32 @@ rec {
};
vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vimshell-vim-2016-10-20";
name = "vimshell-vim-2016-12-14";
src = fetchgit {
url = "git://github.com/shougo/vimshell.vim";
rev = "b42ba02a491d6a4b6daa3178a747e59e7b1800c7";
sha256 = "1vpxyfyc9p8h5pwmkdqfvvyxgddbzbmycnzpn9kbyxz89r8k94kj";
rev = "d0c5bef010237855b4de25863bc54895effe5d7a";
sha256 = "13szswi1n04w66c4h701y47xblrba8ysxjwvmnfxb0pyd1x3gzgz";
};
dependencies = [ "vimproc-vim" ];
};
gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "gundo-vim-2016-01-19";
name = "gundo-vim-2016-12-16";
src = fetchgit {
url = "git://github.com/sjl/gundo.vim";
rev = "e7fe41024ace9047eee610f23311d44fd9d917c0";
sha256 = "14mx617mxh7q6rhjfcnv080hpr965vhqzfwhlizpmzc16lsf7ni1";
rev = "b4f3624d01ffdfd7bdcd2e19128fffe768fe6262";
sha256 = "0a18z3yc2fmpaymzlyjkjblxxkjvn83yh64rvidr3nzg262applz";
};
dependencies = [];
};
vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-hardtime-2016-07-05";
name = "vim-hardtime-2016-12-19";
src = fetchgit {
url = "git://github.com/takac/vim-hardtime";
rev = "93ed99803df721648a9b93f0ccd4afe3d8d95a4e";
sha256 = "0as6kbdg2jqkxphxyv6ik6qxyp245hl52aqmx5gjd4vi3pryg0gl";
rev = "0551f0836d311fae408fb1dc73e0c09cdfa3661b";
sha256 = "1izyx3dnds1hdhjk16578cdda72mnhbsrdz2klm0dygfvfq9h7x4";
};
dependencies = [];
@ -1234,11 +1268,11 @@ rec {
};
vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-quickrun-2016-10-16";
name = "vim-quickrun-2016-12-14";
src = fetchgit {
url = "git://github.com/thinca/vim-quickrun";
rev = "c4c368c835b91c012b011dde613a914c0e167fd0";
sha256 = "0hk7y7gkcxkzgp102x2b3igx7pq194h6ixahmv8s9qv5ndv2km4s";
rev = "f968a467781f0f3c788768b95487d80efa6ceb28";
sha256 = "0kd6qi7zqahrgr3y773x3q885ww41ladgl10lx0r1x2yjr5y8nv4";
};
dependencies = [];
@ -1300,11 +1334,11 @@ rec {
};
youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "youcompleteme-2016-11-04";
name = "youcompleteme-2017-01-04";
src = fetchgit {
url = "git://github.com/valloric/youcompleteme";
rev = "4f2494e87ebd5a6e9b5dc10a436d4d943f137fe6";
sha256 = "03fl5ccql6v6da27wns0fiqcyhn0rmwx5vz7l3xqq1xg3x44m5n2";
rev = "3fde57b029f760baedeaf7c0c880326e32f5c4d9";
sha256 = "1bilzzv02ksqv6m44alp32s61scxqqj5cxx1klr70mhm81k2ksb9";
};
dependencies = [];
buildInputs = [
@ -1345,22 +1379,22 @@ rec {
};
vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-airline-themes-2016-10-26";
name = "vim-airline-themes-2016-12-09";
src = fetchgit {
url = "git://github.com/vim-airline/vim-airline-themes";
rev = "e03e9f62d25f9afb04c88ec6ca66cf2098242016";
sha256 = "0c6qnh7xjp7qiw5hdz4a3n9v4fk7vynm592aqs4cmhhgjfv1s845";
rev = "2a97d9ee410d7b9980a7741fc6e705d53eea23c2";
sha256 = "1crqpryfvamjqw8wqn6nlfqbflgwcfxqf4jk3j58rjxssl0vrfbc";
};
dependencies = [];
};
vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-pandoc-2016-11-05";
name = "vim-pandoc-2016-12-16";
src = fetchgit {
url = "git://github.com/vim-pandoc/vim-pandoc";
rev = "a92155e8d3a5d8d4e4636783bdebb72ab465b89a";
sha256 = "0f4mf40h9h55nishgml833mj1n99wpxbahzgmmx3avfvhxcr97hm";
rev = "56b0940954c98c9a089948e1cbbafd2e6e7369e7";
sha256 = "0yn4cc3i71vxickvwz4g94fc39pgg9phqdz7sc6kf6xran6p0jdy";
};
dependencies = [];
@ -1516,11 +1550,11 @@ rec {
};
deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "deoplete-go-2016-11-12";
name = "deoplete-go-2016-12-22";
src = fetchgit {
url = "git://github.com/zchee/deoplete-go";
rev = "807b5536e7cebd06d0ce7b7d54c021a82774aee2";
sha256 = "1ragxnlzpf17f1wdy512hkz6bd673gzl16f14v78873rcyxpiw53";
rev = "3762a44995559277ea6b0bbcd3242dc5250d438e";
sha256 = "16hdp7gq3mxddwbi4qbpqknc67yfr8xr52v198189jgnwajs3c6x";
};
dependencies = [];
buildInputs = [ python3 ];
@ -1533,22 +1567,22 @@ rec {
};
deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "deoplete-jedi-2016-10-22";
name = "deoplete-jedi-2016-12-01";
src = fetchgit {
url = "git://github.com/zchee/deoplete-jedi";
rev = "57e5b61578d4d0a27fa75fd5f8dc21d110d60989";
sha256 = "050ck7k37lbvw44z7hdk530cswcqywrdfvw5v1bs37mjnh3l9dnj";
rev = "13c69a4baefdcf3be4288d82b9a75405fff06838";
sha256 = "15w53k5mxrpj6qaybxgyvmbxizkk6r06hsmw9hff8aig4xd3dw74";
};
dependencies = [];
};
goyo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "goyo-2016-04-03";
name = "goyo-2017-01-03";
src = fetchgit {
url = "git://github.com/junegunn/goyo.vim";
rev = "8e8f1d45b61e1fce7f84ee061c38f9e033e86ff9";
sha256 = "120farhbfyzd7k1s1i68drwa5zzzm9yrcwzw45gwa2j7kqbv4hnx";
rev = "ebdd67fd6160b7f95ac8fe50b382694c9961d6b8";
sha256 = "08kx7dsa00amwgjdq1grhapjsa8mk2z11pwgn6xc342zkvrlf0fn";
};
dependencies = [];
@ -1632,11 +1666,11 @@ rec {
};
snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "snipmate-2016-09-01";
name = "snipmate-2016-11-14";
src = fetchgit {
url = "git://github.com/garbas/vim-snipmate";
rev = "31986191ac9923afcd53bf6425c9b6c35fdbb214";
sha256 = "1l48h5xmkx412bm29mvl6kz11n7xbkk37ph8v5vgdws380d0fiag";
rev = "2d70860ba49afc83cb5902acb99174e3cf08538d";
sha256 = "015h8narda721svapf17963r3r48cz63477pmb3fhy2rp8lvvif4";
};
dependencies = ["vim-addon-mw-utils" "tlib"];
@ -1807,11 +1841,11 @@ rec {
};
vim-addon-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-addon-manager-2016-02-07";
name = "vim-addon-manager-2016-12-20";
src = fetchgit {
url = "git://github.com/MarcWeber/vim-addon-manager";
rev = "872f9302cf0eb8e9cb6259ea4f329d2265f9e32d";
sha256 = "14aixpj9p8b568mdh4pl7bmpw1rsc4d7axqr09g1m0a8q6rxipc7";
rev = "20f75ea1cfa119c61656d71701875c06493180fd";
sha256 = "04q1rim08l1ccl7w2764nahhhampvkzzbwnjnnvpb1zgi71ixivy";
};
dependencies = [];
buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa;
@ -1928,22 +1962,22 @@ rec {
};
vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-airline-2016-11-04";
name = "vim-airline-2016-12-29";
src = fetchgit {
url = "git://github.com/vim-airline/vim-airline";
rev = "258430db82329c1298750af91391c1b21a5a5b58";
sha256 = "16m884mfrhmnn12nclmdngkcknkhy1kcn4dhpkk7fs5i89yik1rj";
rev = "a2431f2adb23a003abdfe5294861bbd69de52e52";
sha256 = "1qd5f133rg3pqdm889zg0hxhrmgzd71maz6jif4a4hjbghi61wjs";
};
dependencies = [];
};
vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-coffee-script-2016-09-19";
name = "vim-coffee-script-2016-12-27";
src = fetchgit {
url = "git://github.com/kchmck/vim-coffee-script";
rev = "b91dbe92ad794a85a03b089f384fa324ff4e0c3d";
sha256 = "0rkv0n9r3rczx1269i9nf4xs3q934n7iqnrykhnlqbl255s5agd4";
rev = "72f48c3f9bb6ba4f9ba1e6e4933c2c25686a1b62";
sha256 = "07qamx2jv5418ya1c1hca3qvnfvw78r15iakgh0kljajzdq3yy0b";
};
dependencies = [];
@ -1972,11 +2006,11 @@ rec {
};
vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-gitgutter-2016-10-27";
name = "vim-gitgutter-2016-12-23";
src = fetchgit {
url = "git://github.com/airblade/vim-gitgutter";
rev = "1742a8f568df549f4daeda90174b54d0c371501f";
sha256 = "1d4d4lpf43dd5fpn3cqb3lrfr4k6ilmanmk9cymwf9byri3s4xdv";
rev = "7b81a8a22607f073b76b106e2d5e63cc936b0d25";
sha256 = "19v2akrhhfb9zy7mvljjwvi7lqrnviw88gxh4xmpy82vghiwdrfs";
};
dependencies = [];
@ -2027,44 +2061,44 @@ rec {
};
vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-signature-2016-10-17";
name = "vim-signature-2016-11-20";
src = fetchgit {
url = "git://github.com/kshenoy/vim-signature";
rev = "f1f7108aacac5dc3a7e3b697c489f8271fa054b8";
sha256 = "0y9ls3m9l2f5jwkbfn26xhw1brp03c9ylmzxfnw28z2bfh5778iy";
rev = "7e13913188809c45e14988270213744d1c3bb485";
sha256 = "0lcmv8fxj50r1r51379sxdy0ra3s0i1cgyqi4wp2zmpz06c1c2nx";
};
dependencies = [];
};
vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-signify-2016-10-07";
name = "vim-signify-2016-12-31";
src = fetchgit {
url = "git://github.com/mhinz/vim-signify";
rev = "a7e3219de8f603aaec35b30027778aa417fcb691";
sha256 = "1dq369s2bavwkv59cklbjz2zr6vk5ahqs53x1pj0l1xx3rg9h3aq";
rev = "32d8797d887b0980514cdf7f11c9c1379d597e57";
sha256 = "1jhb6pljqbz8mlcc4zfjqzhyyp4yz5b6h7s0224m7vm4xvsphq8y";
};
dependencies = [];
};
vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-snippets-2016-11-05";
name = "vim-snippets-2016-12-27";
src = fetchgit {
url = "git://github.com/honza/vim-snippets";
rev = "93c3241c79886d027c802c93804e597f5b9d742f";
sha256 = "0m0k2czyhf9lwla4pyzf6jrb0h1xclcww1pqwnmbf1g10ns7n2zh";
rev = "e24d33f96a95332dde0edaa7e7e3e7a64244de56";
sha256 = "1clba2x05klqab5ifkg19cxm22ibx6ycdfdn71clglk96wli1h0f";
};
dependencies = [];
};
vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-webdevicons-2016-11-06";
name = "vim-webdevicons-2016-12-10";
src = fetchgit {
url = "git://github.com/ryanoasis/vim-devicons";
rev = "4fbf39a8984ed9a450b5cd078d65955de472bace";
sha256 = "0m549vm5qzk1hiixf4p740fkqw58y46pdimb5jhpm484sqyggvj5";
rev = "93387d7fba06f8ba7ee52dc00d08919f8a35341d";
sha256 = "1zxw0mbb5a54kc31qfwi1d9gylagsa9jnbsfghnsminx32ch8jcd";
};
dependencies = [];
@ -2082,11 +2116,11 @@ rec {
};
vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vimwiki-2016-05-18";
name = "vimwiki-2016-12-18";
src = fetchgit {
url = "git://github.com/vimwiki/vimwiki";
rev = "4831384ab9f1c40c9e433857d958c4d9a7beb8ec";
sha256 = "1wjbsd37h5fxkkia90h708mmqisdj0kxzm9k97jm2zq36zngmd86";
rev = "3a8743700581923c6fd2684510dad48a8b2b8c64";
sha256 = "19b27h0zsmi1xphzf1qhmry11gca4j1mh0mli12yvkr9v61rnj6b";
};
dependencies = [];
@ -2114,36 +2148,4 @@ rec {
};
vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "vim-jsdoc-2016-11-05";
src = fetchgit {
url = "git://github.com/heavenshell/vim-jsdoc";
rev = "45c7c7cef440a29f7bf24436640413e3d5d578ff";
sha256 = "0kr4p01pyrz9w7yfh50gsz6n60qvnqxsr1055hvsyx36nzw6l3za";
};
dependencies = [];
};
cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation
name = "cpsm-2016-09-21";
src = fetchgit {
url = "git://github.com/nixprime/cpsm";
rev = "565ab53a66fa52c46d80adf6981b07f4bdffcb1d";
sha256 = "125gcnqrg2276sp715q924cxwjxwsv3j4m0n1zj17w9srnpn4r1k";
};
dependencies = [];
buildInputs = [
python3
stdenv
cmake
boost
icu
];
buildPhase = ''
patchShebangs .
export PY3=ON
./install.sh
'';
};
}

4
pkgs/servers/sql/mysql/5.5.x.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "mysql-${version}";
version = "5.5.53";
version = "5.5.54";
src = fetchurl {
url = "mirror://mysql/MySQL-5.5/${name}.tar.gz";
sha256 = "1snnyz8s7dd3ypm73vbpw36pflz7wqh2bawdvp4riri44pa6va57";
sha256 = "1f0sg72vbhavj1cbay0gyyrrw0mjcf2k0nf30zmn2h68ik7wnfr7";
};
patches = if stdenv.isCygwin then [

4
pkgs/servers/sql/mysql/5.7.x.nix
View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "mysql-${version}";
version = "5.7.16";
version = "5.7.17";
src = fetchurl {
url = "mirror://mysql/MySQL-5.7/${name}.tar.gz";
sha256 = "198qhd9bdm0fnpp307mgby2aar92yzya0937kxi7bcpdfjcvada9";
sha256 = "0lcn9cm36n14g22bcppq5vf4nxbrl3khvlsp9hsixqdfb3l27gyf";
};
preConfigure = stdenv.lib.optional stdenv.isDarwin ''

4
pkgs/servers/xmpp/openfire/default.nix
View File

@ -23,5 +23,9 @@ stdenv.mkDerivation rec {
meta = {
description = "XMPP server in Java";
platforms = stdenv.lib.platforms.unix;
# Some security advisories seem to apply, and each next version wants to
# write into larger parts of installation directory; installation is just
# unpacking, though
broken = true;
};
}

4
pkgs/tools/X11/xdg-utils/default.nix
View File

@ -10,8 +10,8 @@ let
mimisrc = fetchFromGitHub {
owner = "march-linux";
repo = "mimi";
rev = "d85ea8256ed627e93b387cd42e4ab39bfab9504c";
sha256 = "1h9mb3glfvc6pa2f9g07xgmf8lrwxiyjxvl906xlysy4klybxvhg";
rev = "8e0070f17bcd3612ee83cb84e663e7c7fabcca3d";
sha256 = "15gw2nyrqmdsdin8gzxihpn77grhk9l97jp7s7pr7sl4n9ya2rpj";
};
in

4
pkgs/tools/package-management/nox/default.nix
View File

@ -2,12 +2,12 @@
pythonPackages.buildPythonApplication rec {
name = "nox-${version}";
version = "0.0.4";
version = "0.0.5";
namePrefix = "";
src = fetchurl {
url = "mirror://pypi/n/nix-nox/nix-nox-${version}.tar.gz";
sha256 = "11f6css8rnh7qz55z7i81cnb5h9ys98fqxq3fps3hsh64zlydj52";
sha256 = "1kwrkp7njxn2sqmmzy5d33d07gawbw2ab2bmfjz0y1r23z9iadf2";
};
buildInputs = [ pythonPackages.pbr git ];

4
pkgs/tools/security/kpcli/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, makeWrapper, perl, perlPackages }:
stdenv.mkDerivation rec {
version = "3.0";
version = "3.1";
name = "kpcli-${version}";
src = fetchurl {
url = "mirror://sourceforge/kpcli/${name}.pl";
sha256 = "1704b412f8h9cls85xcpqm9k4n5vga26r4xq9ghp4pr1hl27nywl";
sha256 = "06m276if13w6gd54wi8nqd1yvk2csbhdmm8pcw9aw3hdlc27gw7i";
};
buildInputs = [ makeWrapper perl ];

27
pkgs/tools/system/chase/default.nix Normal file
View File

@ -0,0 +1,27 @@
{ stdenv, fetchurl ,pkgconfig, libatomic_ops , boehmgc }:
stdenv.mkDerivation rec {
name = "chase-${version}";
version = "0.5.2";
buildInputs = [ pkgconfig libatomic_ops boehmgc ] ;
src = fetchurl {
url = "mirror://debian/pool/main/c/chase/chase_${version}.orig.tar.gz";
sha256 = "68d95c2d4dc45553b75790fcea4413b7204a2618dff148116ca9bdb0310d737f";
};
doCheck = true;
makeFlags = [ "-e" ];
makeFlagsArray="LIBS=-lgc";
meta = {
description = "Follow a symlink and print out its target file";
longDescription = ''
A commandline program that chases symbolic filesystems links to the original file
'';
homepage = "https://qa.debian.org/developer.php?login=rotty%40debian.org";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.polyrod ];
platforms = stdenv.lib.platforms.all;
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -4378,6 +4378,8 @@ in
which = callPackage ../tools/system/which { };
chase = callPackage ../tools/system/chase { };
wicd = callPackage ../tools/networking/wicd { };
wipe = callPackage ../tools/security/wipe { };
@ -12395,6 +12397,8 @@ in
go-ethereum = self.altcoins.go-ethereum;
ethabi = self.altcoins.ethabi;
stellar-core = self.altcoins.stellar-core;
aumix = callPackage ../applications/audio/aumix {
gtkGUI = false;
};

26
pkgs/top-level/python-packages.nix
View File

@ -4113,6 +4113,9 @@ in {
urwid
];
# Fails on python 3 due to a None value where a string is expected
doCheck = !isPy3k;
meta = {
description = "A Python library for building configuration shells";
homepage = "https://github.com/agrover/configshell-fb";
@ -8796,14 +8799,17 @@ in {
};
pudb = buildPythonPackage rec {
name = "pudb-2013.3.6";
name = "pudb-2016.2";
src = pkgs.fetchurl {
url = "mirror://pypi/p/pudb/${name}.tar.gz";
sha256 = "81b20a995803c4be513e6d36c8ec9a531d3ccb24670b2416abc20f3933ddb8be";
sha256 = "0njhi49d9fxbwh5p8yjx8m3jlfyzfm00b5aff6bz473pn7vxfn79";
};
propagatedBuildInputs = with self; [ self.pygments self.urwid ];
propagatedBuildInputs = with self; [ pygments urwid ];
# Tests fail on python 3 due to writes to the read-only home directory
doCheck = !isPy3k;
meta = {
description = "A full-screen, console-based Python debugger";
@ -15857,12 +15863,12 @@ in {
};
nose-cprof = buildPythonPackage rec {
name = "nose-cprof-0.1-0";
disabled = isPy3k;
name = "nose-cprof-${version}";
version = "0.1.4";
src = pkgs.fetchurl {
url = "mirror://pypi/n/nose-cprof/${name}.tar.gz";
sha256 = "d1edd5cb3139e897752294d2968bfb066abdd754743fa416e024e5c688893344";
sha256 = "0ayy5mbjly9aa9dkgpz0l06flspnxmnj6wxdl6zr59byrrr8fqhw";
};
meta = {
@ -24753,7 +24759,7 @@ in {
};
buildInputs = with self; [ pytest webob pkgs.imagemagick nose ];
propagatedBuildInputs = with self; [ sqlalchemy8 wand ];
propagatedBuildInputs = with self; [ sqlalchemy8 Wand ];
checkPhase = ''
cd tests
@ -25512,9 +25518,13 @@ in {
disabled = isPy26 || isPyPy;
installPhase = ''
# Move the tkinter module
mkdir -p $out/${py.sitePackages}
ls -Al lib/${py.libPrefix}/lib-dynload/ | grep tkinter
mv lib/${py.libPrefix}/lib-dynload/_tkinter* $out/${py.sitePackages}/
# Update the rpath to point to python without x11Support
old_rpath=$(patchelf --print-rpath $out/${py.sitePackages}/_tkinter*)
new_rpath=$(sed "s#${py}#${python}#g" <<< "$old_rpath" )
patchelf --set-rpath $new_rpath $out/${py.sitePackages}/_tkinter*
'';
inherit (py) meta;