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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
John Ericson 2017-12-19 11:40:18 -05:00
commit 13acbeae0b
40 changed files with 1466 additions and 1043 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
doc/languages-frameworks/coq.xml
View File

@ -11,31 +11,53 @@
in the Coq derivation. in the Coq derivation.
</para> </para>
<para> <para>
Some libraries require OCaml and sometimes also Camlp5. The exact Some libraries require OCaml and sometimes also Camlp5 or findlib.
versions that were used to build Coq are saved in the The exact versions that were used to build Coq are saved in the
<literal>coq.ocaml</literal> and <literal>coq.camlp5</literal> <literal>coq.ocaml</literal> and <literal>coq.camlp5</literal>
attributes. and <literal>coq.findlib</literal> attributes.
</para>
<para>
Coq libraries may be compatible with some specific versions of Coq only.
The <liberal>compatibleCoqVersions</liberal> attribute is used to
precisely select those versions of Coq that are compatible with this
derivation.
</para> </para>
<para> <para>
Here is a simple package example. It is a pure Coq library, thus it Here is a simple package example. It is a pure Coq library, thus it
only depends on Coq. Its <literal>makefile</literal> has been depends on Coq. It builds on the Mathematical Components library, thus it
generated using <literal>coq_makefile</literal> so we only have to also takes <literal>mathcomp</literal> as <literal>buildInputs</literal>.
Its <literal>Makefile</literal> has been generated using
<literal>coq_makefile</literal> so we only have to
set the <literal>$COQLIB</literal> variable at install time. set the <literal>$COQLIB</literal> variable at install time.
</para> </para>
<programlisting> <programlisting>
{stdenv, fetchurl, coq}: { stdenv, fetchFromGitHub, coq, mathcomp }:
stdenv.mkDerivation {
src = fetchurl { stdenv.mkDerivation rec {
url = http://coq.inria.fr/pylons/contribs/files/Karatsuba/v8.4/Karatsuba.tar.gz; name = "coq${coq.coq-version}-multinomials-${version}";
sha256 = "0ymfpv4v49k4fm63nq6gcl1hbnnxrvjjp7yzc4973n49b853c5b1"; version = "1.0";
src = fetchFromGitHub {
owner = "math-comp";
repo = "multinomials";
rev = version;
sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m";
}; };
name = "coq-karatsuba";
buildInputs = [ coq ]; buildInputs = [ coq ];
propagatedBuildInputs = [ mathcomp ];
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
meta = {
description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials";
inherit (src.meta) homepage;
license = stdenv.lib.licenses.cecill-b;
inherit (coq.meta) platforms;
};
passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
};
} }
</programlisting> </programlisting>
</section> </section>

3
nixos/modules/services/x11/desktop-managers/xfce.nix
View File

@ -124,6 +124,9 @@ in
[ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ]; [ "/share/xfce4" "/share/themes" "/share/mime" "/share/desktop-directories" "/share/gtksourceview-2.0" ];
environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ]; environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.xfce.gvfs}/lib/gio/modules" ];
environment.variables.GDK_PIXBUF_MODULE_FILE = [
"$(echo ${pkgs.librsvg.out}/lib/gdk-pixbuf-*/*/loaders.cache)"
];
# Enable helpful DBus services. # Enable helpful DBus services.
services.udisks2.enable = true; services.udisks2.enable = true;

4
pkgs/applications/editors/atom/beta.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "atom-beta-${version}"; name = "atom-beta-${version}";
version = "1.23.0-beta0"; version = "1.24.0-beta1";
src = fetchurl { src = fetchurl {
url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
sha256 = "1vfc8jin07kivdmyw88vbzinbjsb6py9n2ggpvy4cccagnvxwj2y"; sha256 = "04cyxmk2h8qg9rzs8rm28xsahkkq9d8j14afmp5yx4p26qycdbg5";
name = "${name}.deb"; name = "${name}.deb";
}; };

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

@ -175,10 +175,10 @@
}) {}; }) {};
auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "auctex"; pname = "auctex";
version = "11.92.0"; version = "12.1.0";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-11.92.0.tar"; url = "https://elpa.gnu.org/packages/auctex-12.1.0.tar";
sha256 = "147xfb64jxpl4262xrn4cxm6h86ybgr3aa1qq6vs6isnqczh7491"; sha256 = "0iy5x61xqkxaph2hq64sg50l1c6yp6qhzppwadayxkdz00b46sas";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {
@ -959,10 +959,10 @@
gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "gnorb"; pname = "gnorb";
version = "1.3.4"; version = "1.4.2";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/gnorb-1.3.4.tar"; url = "https://elpa.gnu.org/packages/gnorb-1.4.2.tar";
sha256 = "0yw46bzv80awd2zirwqc28bl70q1x431lqan71lm6qwli0bha2w0"; sha256 = "1892j8gdbcny6b9psxa1lwxsb1gkj9z9z00rfc62kdw8bffmx38y";
}; };
packageRequires = [ cl-lib ]; packageRequires = [ cl-lib ];
meta = { meta = {
@ -1584,10 +1584,10 @@
}) {}; }) {};
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org"; pname = "org";
version = "20171205"; version = "20171218";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/org-20171205.tar"; url = "https://elpa.gnu.org/packages/org-20171218.tar";
sha256 = "0a1rm94ci47jf5579sxscily680ysmy3hnxjcs073n45nk76za04"; sha256 = "0x3i9wdcl1nqdfhfinrs8bnhpjivm7s0akz90rwkh96d08kx0kpa";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {
@ -1635,6 +1635,19 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
paced = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: elpaBuild {
pname = "paced";
version = "1.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/paced-1.0.tar";
sha256 = "0ld7cnlk6pn41hx2yfga5w7vfgg4ql6k25ffnf400nsn7y6wcapd";
};
packageRequires = [ async emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/paced.html";
license = lib.licenses.free;
};
}) {};
parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: parsec = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "parsec"; pname = "parsec";
@ -1922,10 +1935,10 @@
sml-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: sml-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild { elpaBuild {
pname = "sml-mode"; pname = "sml-mode";
version = "6.7"; version = "6.8";
src = fetchurl { src = fetchurl {
url = "https://elpa.gnu.org/packages/sml-mode-6.7.el"; url = "https://elpa.gnu.org/packages/sml-mode-6.8.el";
sha256 = "041dmxx7imiy99si9pscwjh5y4h02y3lirzhv1cfxqr3ghxngf9x"; sha256 = "105fcrz5qp95f2n3fdm3awr6z58sbrjihjss6qnrg4lz2ggbc328";
}; };
packageRequires = [ cl-lib emacs ]; packageRequires = [ cl-lib emacs ];
meta = { meta = {

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

File diff suppressed because it is too large Load Diff

24
pkgs/applications/editors/emacs-modes/melpa-packages.nix
View File

@ -36,6 +36,9 @@ self:
}); });
overrides = { overrides = {
# Expects bash to be at /bin/bash
ac-rtags = markBroken super.ac-rtags;
# upstream issue: mismatched filename # upstream issue: mismatched filename
ack-menu = markBroken super.ack-menu; ack-menu = markBroken super.ack-menu;
@ -53,6 +56,9 @@ self:
# upstream issue: missing package version # upstream issue: missing package version
cmake-mode = markBroken (dontConfigure super.cmake-mode); cmake-mode = markBroken (dontConfigure super.cmake-mode);
# Expects bash to be at /bin/bash
company-rtags = markBroken super.company-rtags;
# upstream issue: missing file header # upstream issue: missing file header
connection = markBroken super.connection; connection = markBroken super.connection;
@ -89,6 +95,9 @@ self:
# missing OCaml # missing OCaml
flycheck-ocaml = markBroken super.flycheck-ocaml; flycheck-ocaml = markBroken super.flycheck-ocaml;
# Expects bash to be at /bin/bash
flycheck-rtags = markBroken super.flycheck-rtags;
# upstream issue: missing file header # upstream issue: missing file header
fold-dwim = markBroken super.fold-dwim; fold-dwim = markBroken super.fold-dwim;
@ -98,6 +107,9 @@ self:
# upstream issue: mismatched filename # upstream issue: mismatched filename
helm-lobsters = markBroken super.helm-lobsters; helm-lobsters = markBroken super.helm-lobsters;
# Expects bash to be at /bin/bash
helm-rtags = markBroken super.helm-rtags;
# upstream issue: missing file header # upstream issue: missing file header
helm-words = markBroken super.helm-words; helm-words = markBroken super.helm-words;
@ -107,6 +119,9 @@ self:
# upstream issue: missing file header # upstream issue: missing file header
initsplit = markBroken super.initsplit; initsplit = markBroken super.initsplit;
# Expects bash to be at /bin/bash
ivy-rtags = markBroken super.ivy-rtags;
# upstream issue: missing file header # upstream issue: missing file header
jsfmt = markBroken super.jsfmt; jsfmt = markBroken super.jsfmt;
@ -138,6 +153,9 @@ self:
# missing OCaml # missing OCaml
ocp-indent = markBroken super.ocp-indent; ocp-indent = markBroken super.ocp-indent;
# upstream issue: missing dependency
org-readme = markBroken super.org-readme;
# upstream issue: missing file header # upstream issue: missing file header
perl-completion = markBroken super.perl-completion; perl-completion = markBroken super.perl-completion;
@ -172,6 +190,9 @@ self:
# upstream issue: missing file header # upstream issue: missing file header
stgit = markBroken super.stgit; stgit = markBroken super.stgit;
# upstream issue: missing file header
tawny-mode = markBroken super.tawny-mode;
# upstream issue: missing file header # upstream issue: missing file header
textmate = markBroken super.textmate; textmate = markBroken super.textmate;
@ -181,6 +202,9 @@ self:
# upstream issue: missing file header # upstream issue: missing file header
voca-builder = markBroken super.voca-builder; voca-builder = markBroken super.voca-builder;
# upstream issue: missing dependency
weechat-alert = markBroken super.weechat-alert;
# upstream issue: missing file header # upstream issue: missing file header
window-numbering = markBroken super.window-numbering; window-numbering = markBroken super.window-numbering;

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

@ -548,12 +548,12 @@
ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
melpaBuild { melpaBuild {
pname = "ac-php"; pname = "ac-php";
version = "2.0pre"; version = "2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xcwen"; owner = "xcwen";
repo = "ac-php"; repo = "ac-php";
rev = "67585f13841b70da298f2cfbf7d0343c4ceb41f1"; rev = "0bea9c7d800864b55d807c755254d03c796b1594";
sha256 = "09n833dcqv776vr5k5r0y7fgywhmminxshiy0l5l5xvm1yhxr77a"; sha256 = "0d1gc7w1jgf8wigikwr7x5w3524acqim2ivk0xkp81isp7dc4ll6";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php";
@ -569,12 +569,12 @@
ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }: ac-php-core = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope }:
melpaBuild { melpaBuild {
pname = "ac-php-core"; pname = "ac-php-core";
version = "2.0pre"; version = "2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xcwen"; owner = "xcwen";
repo = "ac-php"; repo = "ac-php";
rev = "67585f13841b70da298f2cfbf7d0343c4ceb41f1"; rev = "0bea9c7d800864b55d807c755254d03c796b1594";
sha256 = "09n833dcqv776vr5k5r0y7fgywhmminxshiy0l5l5xvm1yhxr77a"; sha256 = "0d1gc7w1jgf8wigikwr7x5w3524acqim2ivk0xkp81isp7dc4ll6";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core";
@ -905,12 +905,12 @@
add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: add-hooks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "add-hooks"; pname = "add-hooks";
version = "3.1.0"; version = "3.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nickmccurdy"; owner = "nickmccurdy";
repo = "add-hooks"; repo = "add-hooks";
rev = "edd4cb032a509b576d88f4cc0521ebfe66a9e6c7"; rev = "a1043b7cdb1ea98055a2c99f8d37584a553ca362";
sha256 = "1qg1ifkds84xv07ibz4sqp34ks60w4c7dvrq9dch4gvg040hal82"; sha256 = "1jv9fpcsm572zg0j1mbpbfkqgdlqapy89xhhj19pswkhjns1y2wl";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks"; url = "https://raw.githubusercontent.com/milkypostman/melpa/901f846aef46d512dc0a1770bab7f07c0ae330cd/recipes/add-hooks";
@ -1648,12 +1648,12 @@
anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: anything-tramp = callPackage ({ anything, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "anything-tramp"; pname = "anything-tramp";
version = "0.6.4"; version = "0.7.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "masasam"; owner = "masasam";
repo = "emacs-anything-tramp"; repo = "emacs-anything-tramp";
rev = "86b198afd03f2baffb1efe24c7a89e71100356ea"; rev = "7d25d7e7f5370a82811c307550de5e36d4a7c2a6";
sha256 = "1320zdv6q1cnnvl8s25ymjvd3kz2an98bicansq5bhf413n7fhgb"; sha256 = "09crbgndhpm7mz5x01k0j8wsxga4gxraz4vgmbyb4m5b54h8jbpz";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp"; url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/anything-tramp";
@ -4277,7 +4277,7 @@
circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: circadian = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "circadian"; pname = "circadian";
version = "0.3.0"; version = "0.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GuidoSchmidt"; owner = "GuidoSchmidt";
repo = "circadian.el"; repo = "circadian.el";
@ -4709,12 +4709,12 @@
cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "cmake-mode"; pname = "cmake-mode";
version = "3.10.0"; version = "3.10.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Kitware"; owner = "Kitware";
repo = "CMake"; repo = "CMake";
rev = "7746fdb2fe0177341aadeafec2ae73aa08ddfaf6"; rev = "166bf4c490b8f46eca057fc23c3f3c2e042e9cb3";
sha256 = "0byicha5rfcgx644hh9hvcy7z9q3kbkd0f4b33bcw8jd20pvgmk6"; sha256 = "1qgny1px7afgxi7hj12fg0zk55sy9mbk0w5sigamyzxp336nfxmz";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode";
@ -5234,12 +5234,12 @@
company-eshell-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: company-eshell-autosuggest = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "company-eshell-autosuggest"; pname = "company-eshell-autosuggest";
version = "1.2.0"; version = "1.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dieggsy"; owner = "dieggsy";
repo = "company-eshell-autosuggest"; repo = "company-eshell-autosuggest";
rev = "3fed7c38aca0d94185d6787e26a02f324f1d8870"; rev = "61d5999abcc6c24bf5285613a781ee7c7bc7b460";
sha256 = "17wxac9cj6564c70415vqb805kmk0pk35c1xgyma78gmr3ra8i80"; sha256 = "182yvi41s0cwz6c2vi3il8yk3c8j490rgjn13dihw2n7xg86gjp9";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b5beec83bd43b3f1f81feb3ef554ece846e327c2/recipes/company-eshell-autosuggest"; url = "https://raw.githubusercontent.com/milkypostman/melpa/b5beec83bd43b3f1f81feb3ef554ece846e327c2/recipes/company-eshell-autosuggest";
@ -5444,12 +5444,12 @@
company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "company-php"; pname = "company-php";
version = "2.0pre"; version = "2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xcwen"; owner = "xcwen";
repo = "ac-php"; repo = "ac-php";
rev = "67585f13841b70da298f2cfbf7d0343c4ceb41f1"; rev = "0bea9c7d800864b55d807c755254d03c796b1594";
sha256 = "09n833dcqv776vr5k5r0y7fgywhmminxshiy0l5l5xvm1yhxr77a"; sha256 = "0d1gc7w1jgf8wigikwr7x5w3524acqim2ivk0xkp81isp7dc4ll6";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php";
@ -5849,12 +5849,12 @@
copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: copy-as-format = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "copy-as-format"; pname = "copy-as-format";
version = "0.0.6"; version = "0.0.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "sshaw"; owner = "sshaw";
repo = "copy-as-format"; repo = "copy-as-format";
rev = "fba9fe57a310a71c5aac90a26434df4c08214833"; rev = "971957166fe64d914ec4be209b4f80efeeabbb19";
sha256 = "1qh3qxy8p23nz0zh8iavggjhp0mn10finq3zl3i0a3vkxxrvgh76"; sha256 = "0ynzy2sb75w24d2kwjpkb3vl98yyz0sbcj6nd31y2r2n2kkdna24";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format"; url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe8a2113d1c15701abe7a7e0a68e939c3d789b/recipes/copy-as-format";
@ -5870,12 +5870,12 @@
copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: copy-file-on-save = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild { melpaBuild {
pname = "copy-file-on-save"; pname = "copy-file-on-save";
version = "0.0.2"; version = "0.0.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "emacs-php"; owner = "emacs-php";
repo = "emacs-auto-deployment"; repo = "emacs-auto-deployment";
rev = "fe78b4c9fdc261ce22a771765702ebe4d9437c84"; rev = "aaa847b43af225ccb282aab2d9cddafe500d9f62";
sha256 = "0vf6qp7fxqvgd02vfsbmm38vc8n2wvrfwv4wnsr15gd8y8zldlgs"; sha256 = "0n2z91g7p9i724xqx2qq4s5xnxnf4vjccnvy1i706cddpjn02d6f";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save"; url = "https://raw.githubusercontent.com/milkypostman/melpa/eb13cb0dba1696cc51132cd1ff723fa17f892a7c/recipes/copy-file-on-save";
@ -6017,12 +6017,12 @@
counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: counsel-etags = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "counsel-etags"; pname = "counsel-etags";
version = "1.3.5"; version = "1.3.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "redguardtoo"; owner = "redguardtoo";
repo = "counsel-etags"; repo = "counsel-etags";
rev = "ec56d4650ad11cd0cf8c7e168d9d6a5dfd9cdae8"; rev = "80f291ce74d1612366b0a31fd7c46e83e16264c2";
sha256 = "0xmjsa5ic4hh9lrkblf6si7q7s6xcnvs83rnpj5an23jxg7r12ma"; sha256 = "0n59wrqmj32plx0fpf3nr5p7f29in4dsyygcnsbi74izw65dlbbc";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags"; url = "https://raw.githubusercontent.com/milkypostman/melpa/87528349a3ab305bfe98f30c5404913272817a38/recipes/counsel-etags";
@ -6161,22 +6161,22 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
cricbuzz = callPackage ({ dash, enlive, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: cricbuzz = callPackage ({ dash, enlive, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild { melpaBuild {
pname = "cricbuzz"; pname = "cricbuzz";
version = "0.2.10"; version = "0.3.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lepisma"; owner = "lepisma";
repo = "cricbuzz.el"; repo = "cricbuzz.el";
rev = "62c86b1aa6e0779c4f6d8fb9d31d75bf81994f69"; rev = "b1e11294bcf6dbdbb0c4b8714f1960dfef674913";
sha256 = "1k8n65scj3frafy1fk25j3kzpp0q8r98ydibryv48izndpck03h3"; sha256 = "1kg9f1sbrv3x8mdfpp6v0hj2zpxkn0ayaxflvxqk64i9g1mxsvkg";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz"; url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/cricbuzz";
sha256 = "18nmr7rpbylqgfx5q3ps38wx9q1ndj06msgyjyc8lqpipbsz0pip"; sha256 = "18nmr7rpbylqgfx5q3ps38wx9q1ndj06msgyjyc8lqpipbsz0pip";
name = "cricbuzz"; name = "cricbuzz";
}; };
packageRequires = [ dash enlive s ]; packageRequires = [ dash enlive f s ];
meta = { meta = {
homepage = "https://melpa.org/#/cricbuzz"; homepage = "https://melpa.org/#/cricbuzz";
license = lib.licenses.free; license = lib.licenses.free;
@ -8022,8 +8022,8 @@
version = "0.7"; version = "0.7";
src = fetchhg { src = fetchhg {
url = "https://bitbucket.com/harsman/dyalog-mode"; url = "https://bitbucket.com/harsman/dyalog-mode";
rev = "9e446540a794"; rev = "87db00b912be";
sha256 = "0gyip843fdqp6cwwaqcrnpngf5a3iqcbd9h7rl5lbvxpkqvm7shi"; sha256 = "0jg289fj4q83dwj7i0w5zq8bwqxzwzzmyhvdrk6cfw3q6rlwk5fp";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode";
@ -8228,12 +8228,12 @@
easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: easy-hugo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "easy-hugo"; pname = "easy-hugo";
version = "2.4.19"; version = "2.6.19";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "masasam"; owner = "masasam";
repo = "emacs-easy-hugo"; repo = "emacs-easy-hugo";
rev = "18f72a16972d105dcff2d9e723a50d2a3385d0a6"; rev = "16bebdbff275db41d673d0c04046198a35b8d97d";
sha256 = "0qpbb9hr9d0bvjphnbz9v82mdkjaiychy99agcc5i0wr5ylqh593"; sha256 = "082594g0g1c4dwr9z1dib1dyn3hhhc741qnzfmg5bxcyx8pz06c7";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo"; url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/easy-hugo";
@ -8249,12 +8249,12 @@
easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: easy-jekyll = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "easy-jekyll"; pname = "easy-jekyll";
version = "1.2.10"; version = "1.3.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "masasam"; owner = "masasam";
repo = "emacs-easy-jekyll"; repo = "emacs-easy-jekyll";
rev = "8060e6e37abf67bad262c3064cecead22e9a5e4f"; rev = "d894912cf65cf84244f27b1eb0186ad3344a661d";
sha256 = "12wwgv0kddkx8bs45c8xhxvjb7qzv7y2mskz5v0d3mip67c7iagz"; sha256 = "0sbyq2lcvkbxj9asm1yhpfqlvzx56r1g2qjymbari9j9lzhcdzsw";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll"; url = "https://raw.githubusercontent.com/milkypostman/melpa/c3f281145bad12c27bdbef32ccc07b6a5f13b577/recipes/easy-jekyll";
@ -8417,12 +8417,12 @@
ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
melpaBuild { melpaBuild {
pname = "ecukes"; pname = "ecukes";
version = "0.6.16"; version = "0.6.17";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ecukes"; owner = "ecukes";
repo = "ecukes"; repo = "ecukes";
rev = "c8092db08be5337ff3f3dd2857bfa94e360945d2"; rev = "3a77ba9f1064c2bca47b401974c009e65727c46e";
sha256 = "1dkinyigacb4yxqikd9za4inbh7yz7pl8bhrpihrxzabxirmvw55"; sha256 = "1isscwz4h3nx62lwfrj899lp2yc27zk1ndgr441d848495ccmshn";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes"; url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes";
@ -9097,12 +9097,12 @@
elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: elfeed-protocol = callPackage ({ cl-lib ? null, elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "elfeed-protocol"; pname = "elfeed-protocol";
version = "0.4.0"; version = "0.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "fasheng"; owner = "fasheng";
repo = "elfeed-protocol"; repo = "elfeed-protocol";
rev = "bc1913e4275b69ac69e93981bf575a2053ef1657"; rev = "97049eb980ce1cc2b871e4c7819133f1e4936a83";
sha256 = "04zn1lww8zcfi2anrkyfmgg55r40wfrj9qvpzh9xl9l2qcsbs4pk"; sha256 = "1d2i3jg5a2wd7mb4xfdy3wbx12yigqq4ykj3zbcamvx59siip591";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol"; url = "https://raw.githubusercontent.com/milkypostman/melpa/3f1eef8add7cd2cfefe6fad6d8e69d65696e9677/recipes/elfeed-protocol";
@ -10296,12 +10296,12 @@
erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: erlang = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "erlang"; pname = "erlang";
version = "20.1.7"; version = "20.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "erlang"; owner = "erlang";
repo = "otp"; repo = "otp";
rev = "2302ea8ca97b8a9075e9234d15430c47d3a115c8"; rev = "3a14bb468b1f3f1f5bef3c18291fe0498429a417";
sha256 = "0sbxl10d76bm7awxb9s07l9815jiwfg78bps07xj2ircxdr08pls"; sha256 = "1jj7ai35vvipvpvpqfvv1psvbjrky875g2lk42g40231vxcm7fww";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang"; url = "https://raw.githubusercontent.com/milkypostman/melpa/d9cd526f43981e0826af59cdc4bb702f644781d9/recipes/erlang";
@ -10799,12 +10799,12 @@
eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }: eterm-256color = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, xterm-color }:
melpaBuild { melpaBuild {
pname = "eterm-256color"; pname = "eterm-256color";
version = "0.3.10"; version = "0.3.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "dieggsy"; owner = "dieggsy";
repo = "eterm-256color"; repo = "eterm-256color";
rev = "bfcba21f45163361f54779c81bc1799f7a270857"; rev = "89b20de890bc890331abe2d5e27a7e3129cde7b8";
sha256 = "16f9fmg15khwca0fgm1sl85jarqlimc6mwrc7az8ga79153nlcb3"; sha256 = "1bh0wqz2wkp8i1g8r8wgqzny0f5igflca5hkwq9p8ql84jkwlm69";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color"; url = "https://raw.githubusercontent.com/milkypostman/melpa/e556383f7e18c0215111aa720d4653465e91eff6/recipes/eterm-256color";
@ -12058,12 +12058,12 @@
fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "fill-column-indicator"; pname = "fill-column-indicator";
version = "1.89"; version = "1.90";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "alpaker"; owner = "alpaker";
repo = "Fill-Column-Indicator"; repo = "Fill-Column-Indicator";
rev = "23ad25f2c2fddd32a1ea12a9e0f631e243e6a779"; rev = "f7b3f99b41ff017f50a21ad53eed16f8ef5ab7ee";
sha256 = "010kf8jsly74y7m6mmkn1h6y205kz23zphs50zgy2nag2p88rz9y"; sha256 = "0snjznxdwwfdgccdcvrnk467416r244r2r5qcm2sga8l0ha9gw9z";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator"; url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator";
@ -12121,12 +12121,12 @@
find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "find-file-in-project"; pname = "find-file-in-project";
version = "5.4.5"; version = "5.4.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "technomancy"; owner = "technomancy";
repo = "find-file-in-project"; repo = "find-file-in-project";
rev = "9e308e69883cb43e136a2e9d4f0db495b457b82d"; rev = "31ebfd65d254904ba3e5ec96507c0b01d7768940";
sha256 = "0bzbqm8wq8gbz0a18d35ksv0yf65giwcdxhrqzklsxgn9v7p73b8"; sha256 = "1xy7a6crng5x7k0x810ijrm882gm597ljwzi4cj2i93js625cw2b";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project";
@ -15430,6 +15430,27 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
go-dlv = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild {
pname = "go-dlv";
version = "0.1.0";
src = fetchFromGitHub {
owner = "benma";
repo = "go-dlv.el";
rev = "45a9e8a047c9995eb7c802268d96b3e527569f41";
sha256 = "0pph99fl3bwws9vr1r8fs411frd04rfdhl87fy2a75cqcpxlhsj4";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/go-dlv";
sha256 = "0lb5v9pmd6m8nvk4c9gcda5dmshrf5812gg1arq5p2g0nzg32mm8";
name = "go-dlv";
};
packageRequires = [ go-mode ];
meta = {
homepage = "https://melpa.org/#/go-dlv";
license = lib.licenses.free;
};
}) {};
go-eldoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }: go-eldoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "go-eldoc"; pname = "go-eldoc";
@ -15979,12 +16000,12 @@
grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "grandshell-theme"; pname = "grandshell-theme";
version = "1.1"; version = "1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "steckerhalter"; owner = "steckerhalter";
repo = "grandshell-theme"; repo = "grandshell-theme";
rev = "f9dbaa341fce72f9deaf69bfaa09282168ebaf9d"; rev = "7a6350d46790cf00f7a627e8a407b6032ddbd414";
sha256 = "03lr4gim7yynwx0n06dd1vy6hbizxwc8hcwzz1gbvla2509njga7"; sha256 = "13gm1dn6bf7h06ynwpxhjawza5ma4q21ag5affb7kygx9ygm88hy";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme"; url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme";
@ -16743,12 +16764,12 @@
hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: hasky-stack = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }:
melpaBuild { melpaBuild {
pname = "hasky-stack"; pname = "hasky-stack";
version = "0.6.0"; version = "0.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hasky-mode"; owner = "hasky-mode";
repo = "hasky-stack"; repo = "hasky-stack";
rev = "a3f890fb8570369898ee9718b128d4e7123a6585"; rev = "17b9facafcff8203012c037c5a589f290169fc33";
sha256 = "0bc5i4s7aclwrsh8yrhfwwlfbcs5hdbzm31glikd487asv30jq9c"; sha256 = "00k13sl2yjnqjjdqlmz8ril07xw5al2ysbsnpmz81sccqa1kbikr";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack"; url = "https://raw.githubusercontent.com/milkypostman/melpa/c3faf544872478c3bccf2fe7dc51d406031e4d80/recipes/hasky-stack";
@ -18276,12 +18297,12 @@
helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: helm-tramp = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "helm-tramp"; pname = "helm-tramp";
version = "0.6.4"; version = "0.7.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "masasam"; owner = "masasam";
repo = "emacs-helm-tramp"; repo = "emacs-helm-tramp";
rev = "d90be189d8c2b742c9621ff28b1196be683cdb4c"; rev = "29d863d5e2a46cd2576895bc72754ad835ba9b30";
sha256 = "1hi7zw4p3w8a14fqv6w2bc0anrjb6d4vglwhmaz50qr2w3plxq15"; sha256 = "0sba7jjbw406gvb0h4wfda0yhp760fv5hlm1f3hmm9xqw7hs6n2f";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp"; url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/helm-tramp";
@ -18381,12 +18402,12 @@
helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: helpful = callPackage ({ dash, elisp-refs, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
melpaBuild { melpaBuild {
pname = "helpful"; pname = "helpful";
version = "0.3"; version = "0.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Wilfred"; owner = "Wilfred";
repo = "helpful"; repo = "helpful";
rev = "51717041e5cec6f5ce695c32323efc8dd86fbe88"; rev = "dce09e9c338c8733254e10387ad0dc118a89bd82";
sha256 = "1zy7q3f12c159h4f1jf73ffchjfwmjb76wligpaih7ay7x6hh9mn"; sha256 = "1y7afppn5y8c568d3mynb5fcf75zarv0gzzj0g5xhs5wzqic4yaz";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful"; url = "https://raw.githubusercontent.com/milkypostman/melpa/889d34b654de13bd413d46071a5ff191cbf3d157/recipes/helpful";
@ -21276,12 +21297,12 @@
kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: kaolin-themes = callPackage ({ autothemer, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "kaolin-themes"; pname = "kaolin-themes";
version = "1.0.6"; version = "1.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ogdenwebb"; owner = "ogdenwebb";
repo = "emacs-kaolin-themes"; repo = "emacs-kaolin-themes";
rev = "acf37448ffe25464e39730939091c70be305f811"; rev = "f9e5b87ea26cc86b926586fac91a5a8c66ffc783";
sha256 = "1b28mf5z594dxv3a5073syqdgl5hc63xcy8irqjj7x94xjpb9qis"; sha256 = "15141id9zgasa423azpg84dswd924l0ji7a1q44nq5bvjpjdm9g8";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes"; url = "https://raw.githubusercontent.com/milkypostman/melpa/043a4e3bd5301ef8f4df2cbda0b3f4111eb399e4/recipes/kaolin-themes";
@ -24235,12 +24256,12 @@
mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "mowedline"; pname = "mowedline";
version = "3.2.1"; version = "3.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "retroj"; owner = "retroj";
repo = "mowedline"; repo = "mowedline";
rev = "7a572c0d87098336777efde5abdeaf2bcd11b95e"; rev = "c17501b48ded8261d815ab60bf14cddf7040be72";
sha256 = "1vky6sa1667pc4db8j2a4f26kwwc2ql40qhvpvp81a6wikyzf2py"; sha256 = "1k3b018xq2qqq30v0ik13imy9c84241kyavj5ascxhywx956v18g";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline"; url = "https://raw.githubusercontent.com/milkypostman/melpa/86f7df6b8df3398ef476c0ed31722b03f16b2fec/recipes/mowedline";
@ -25177,11 +25198,11 @@
}) {}; }) {};
notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
pname = "notmuch"; pname = "notmuch";
version = "0.25.2"; version = "0.25.3";
src = fetchgit { src = fetchgit {
url = "git://git.notmuchmail.org/git/notmuch"; url = "git://git.notmuchmail.org/git/notmuch";
rev = "83f266136369452b859393429b8530efac2e09fb"; rev = "ae55a86639f86ad1b547e961f71b1bde2180752d";
sha256 = "0idim2yslpjzbzy5hh9qhw1gy0h9p92rs0jrr8d2l9y8nsnh6zzr"; sha256 = "0kq2j23381qr50zkvx68yciq1xag20fzidgy5jd69bd7z6gziq90";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch";
@ -26677,12 +26698,12 @@
org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "org-random-todo"; pname = "org-random-todo";
version = "0.5"; version = "0.5.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "unhammer"; owner = "unhammer";
repo = "org-random-todo"; repo = "org-random-todo";
rev = "14a065e1d376838f16a6ba32ed8710304542a4e6"; rev = "60364c18725d2f3898a9099e7e546ae406dd6578";
sha256 = "07qkn59613l32j6b06ckmccl9s2rfwwivmak5v86z0fafzhxk6ir"; sha256 = "0k86hqmqilvkam886mb85v991ivwnglallwj4l9ghszl7awy207m";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo"; url = "https://raw.githubusercontent.com/milkypostman/melpa/80fad6244ea3e5bdf7f448c9f62374fae45bae78/recipes/org-random-todo";
@ -27042,22 +27063,22 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }: org2blog = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, metaweblog, org, xml-rpc }:
melpaBuild { melpaBuild {
pname = "org2blog"; pname = "org2blog";
version = "1.0.0"; version = "1.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "punchagan"; owner = "punchagan";
repo = "org2blog"; repo = "org2blog";
rev = "e266ff4296661de520b73e6e18f201fb6378ba05"; rev = "bd2028b6a79daa63fc5481deaed63c4efc681be0";
sha256 = "030fwgwn2xsi6nnnn4k32479hhmbr4n819yarr3n367b29al2461"; sha256 = "1qpw5bs5qjlpw3hphbf2jg0h8bdrcgrb8xavdsx8viwjl013d4ps";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog"; url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/org2blog";
sha256 = "1xa03k9z8fq74w0w3vfkigz24i6c8s4vib077l16vqik7wg4yh40"; sha256 = "1xa03k9z8fq74w0w3vfkigz24i6c8s4vib077l16vqik7wg4yh40";
name = "org2blog"; name = "org2blog";
}; };
packageRequires = [ metaweblog org xml-rpc ]; packageRequires = [ htmlize metaweblog org xml-rpc ];
meta = { meta = {
homepage = "https://melpa.org/#/org2blog"; homepage = "https://melpa.org/#/org2blog";
license = lib.licenses.free; license = lib.licenses.free;
@ -30119,22 +30140,22 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, pyim-basedict }: pyim = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pyim-basedict }:
melpaBuild { melpaBuild {
pname = "pyim"; pname = "pyim";
version = "1.6.4"; version = "1.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tumashu"; owner = "tumashu";
repo = "pyim"; repo = "pyim";
rev = "d44db4cb74c1c0cf6f814ff14d0be8e733f8404a"; rev = "3b1c5fbdf3b910f96771935785e28cf33d8d54cc";
sha256 = "02b2aknx127xvl8amf74krvd7z33kyr049iw5h0665zkzsli4g8w"; sha256 = "1ijfsnjvyys941kgcq00d5dgnkbzj14gb7c9pks0x11bsdl0vr6p";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim"; url = "https://raw.githubusercontent.com/milkypostman/melpa/151a0af91a58e27f724854d85d5dd9668229fe8d/recipes/pyim";
sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j"; sha256 = "1ly4xhfr3irlrwvv20j3kyz98g7barridi9n8jppc0brh2dlv98j";
name = "pyim"; name = "pyim";
}; };
packageRequires = [ async cl-lib emacs popup pos-tip pyim-basedict ]; packageRequires = [ async cl-lib emacs popup pyim-basedict ];
meta = { meta = {
homepage = "https://melpa.org/#/pyim"; homepage = "https://melpa.org/#/pyim";
license = lib.licenses.free; license = lib.licenses.free;
@ -30770,22 +30791,28 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
realgud = callPackage ({ fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }: realgud = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, load-relative, loc-changes, melpaBuild, test-simple }:
melpaBuild { melpaBuild {
pname = "realgud"; pname = "realgud";
version = "1.4.3"; version = "1.4.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rocky"; owner = "rocky";
repo = "emacs-dbgr"; repo = "emacs-dbgr";
rev = "6dc971269f6f9435e5159c2cfe66fc5e4b296df2"; rev = "3804711863630affe79614a1527bc12c0955ec7c";
sha256 = "1pl758xp2gfy8h313ggpmqv7sjb8h6qdrqj68ypxch70k9vq76z8"; sha256 = "0fi48xh6rc7z146rafkabqhg6wy3zv85apn1bciw9pysazblq8pb";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud"; url = "https://raw.githubusercontent.com/milkypostman/melpa/7ca56f05df6c8430a5cbdc55caac58ba79ed6ce5/recipes/realgud";
sha256 = "0qmvd35ng1aqclwj3pskn58c0fi98kvx9666wp3smgj3n88vgy15"; sha256 = "0qmvd35ng1aqclwj3pskn58c0fi98kvx9666wp3smgj3n88vgy15";
name = "realgud"; name = "realgud";
}; };
packageRequires = [ load-relative loc-changes test-simple ]; packageRequires = [
cl-lib
emacs
load-relative
loc-changes
test-simple
];
meta = { meta = {
homepage = "https://melpa.org/#/realgud"; homepage = "https://melpa.org/#/realgud";
license = lib.licenses.free; license = lib.licenses.free;
@ -32388,12 +32415,12 @@
shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "shackle"; pname = "shackle";
version = "1.0.0"; version = "1.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wasamasa"; owner = "wasamasa";
repo = "shackle"; repo = "shackle";
rev = "55df581cdb3cfaf9ebf9c54d8849f8f5775cf74b"; rev = "4189c1c773aab533969b587f7801ffbcd1d7d613";
sha256 = "1s59v6fnyzvgnbjcd1gpll4xp8316dqmdpi77382w0vjfcrsvbih"; sha256 = "1gh30sryh884mpwxpkf0ngkcvixjrxxf4bgq4nqm9n969sr5bhsq";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle"; url = "https://raw.githubusercontent.com/milkypostman/melpa/806e7d00f763f3fc4e3b8ebd483070ac6c5d0f21/recipes/shackle";
@ -33585,12 +33612,12 @@
solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: solaire-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "solaire-mode"; pname = "solaire-mode";
version = "1.0.2"; version = "1.0.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hlissner"; owner = "hlissner";
repo = "emacs-solaire-mode"; repo = "emacs-solaire-mode";
rev = "0f467e5f309e5a36280e06b40c0e6bbe90e06358"; rev = "dd93cfd6c02e4575e6c7048ecf9dac8c09864bf2";
sha256 = "1jka6213sw3rqan6s31s1ndyd0h2gwxvl0rcfm4jqc68mfyikzma"; sha256 = "1afbkz93xa6f0453n7n1mrm0ng5jrdi06mh0s105gkzcfxqjc0gd";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode"; url = "https://raw.githubusercontent.com/milkypostman/melpa/52c69070eef3003eb53e1436c538779c74670ce6/recipes/solaire-mode";
@ -34110,12 +34137,12 @@
ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "ssh-deploy"; pname = "ssh-deploy";
version = "1.3"; version = "1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cjohansson"; owner = "cjohansson";
repo = "emacs-ssh-deploy"; repo = "emacs-ssh-deploy";
rev = "5cd1f8080fefb64e6eaa1098cc191db6abb97e23"; rev = "ab4b80e206163b09a021f7de157e8bd4ae66358b";
sha256 = "0pn9wf4svka3rxzy09jarjp3ycz2bvm39898qaikjf0dwaydlqlw"; sha256 = "1c8hk7xwwlgkdw5xjcznpmajv904v2vs8mrcnmlay99r2qj3p2yx";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy"; url = "https://raw.githubusercontent.com/milkypostman/melpa/855ea20024b606314f8590129259747cac0bcc97/recipes/ssh-deploy";
@ -35512,6 +35539,27 @@
license = lib.licenses.free; license = lib.licenses.free;
}; };
}) {}; }) {};
tidal = callPackage ({ emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
melpaBuild {
pname = "tidal";
version = "0.9.6";
src = fetchFromGitHub {
owner = "tidalcycles";
repo = "Tidal";
rev = "b96bc7842e15f6b8973df8966307db7a1c4b7406";
sha256 = "0g02k411xbwqv66qi2pw7r0slkvgfgvr7q41kf1czqnrmg5k4wzg";
};
recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/16a26659a16199b5bb066be6e5c4a40419bda018/recipes/tidal";
sha256 = "0im0qbavpykacrwww3y0mlbhf5yfx8afcyvsq5pmjjp0aw245w6a";
name = "tidal";
};
packageRequires = [ emacs haskell-mode ];
meta = {
homepage = "https://melpa.org/#/tidal";
license = lib.licenses.free;
};
}) {};
tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }: tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s, typescript-mode }:
melpaBuild { melpaBuild {
pname = "tide"; pname = "tide";
@ -35724,12 +35772,12 @@
treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }: treemacs = callPackage ({ ace-window, cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, pfuture, s }:
melpaBuild { melpaBuild {
pname = "treemacs"; pname = "treemacs";
version = "1.13.3"; version = "1.14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Alexander-Miller"; owner = "Alexander-Miller";
repo = "treemacs"; repo = "treemacs";
rev = "9e12a68018e23ee10e8db48789f7358ed5375390"; rev = "f62a946f0fc5db79d37fb748ab49334c4e3cbbfd";
sha256 = "09bf60j5r7hv326lgpfndnz9yf5bzw02a2nvr01zx93g5bh99zcp"; sha256 = "12i2q692zczlq62aij2pih4m7bm36dii4y2jq6dxcwb54i96kdr0";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs"; url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs";
@ -35745,12 +35793,12 @@
treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }: treemacs-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, treemacs }:
melpaBuild { melpaBuild {
pname = "treemacs-evil"; pname = "treemacs-evil";
version = "1.13.3"; version = "1.14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Alexander-Miller"; owner = "Alexander-Miller";
repo = "treemacs"; repo = "treemacs";
rev = "9e12a68018e23ee10e8db48789f7358ed5375390"; rev = "f62a946f0fc5db79d37fb748ab49334c4e3cbbfd";
sha256 = "09bf60j5r7hv326lgpfndnz9yf5bzw02a2nvr01zx93g5bh99zcp"; sha256 = "12i2q692zczlq62aij2pih4m7bm36dii4y2jq6dxcwb54i96kdr0";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil"; url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-evil";
@ -35766,12 +35814,12 @@
treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }: treemacs-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, treemacs }:
melpaBuild { melpaBuild {
pname = "treemacs-projectile"; pname = "treemacs-projectile";
version = "1.13.3"; version = "1.14";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Alexander-Miller"; owner = "Alexander-Miller";
repo = "treemacs"; repo = "treemacs";
rev = "9e12a68018e23ee10e8db48789f7358ed5375390"; rev = "f62a946f0fc5db79d37fb748ab49334c4e3cbbfd";
sha256 = "09bf60j5r7hv326lgpfndnz9yf5bzw02a2nvr01zx93g5bh99zcp"; sha256 = "12i2q692zczlq62aij2pih4m7bm36dii4y2jq6dxcwb54i96kdr0";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile"; url = "https://raw.githubusercontent.com/milkypostman/melpa/7a680ee3b4a0ab286ac04d84b3fba7606b40c65b/recipes/treemacs-projectile";
@ -38270,12 +38318,12 @@
yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: yang-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
melpaBuild { melpaBuild {
pname = "yang-mode"; pname = "yang-mode";
version = "0.9.4"; version = "0.9.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mbj4668"; owner = "mbj4668";
repo = "yang-mode"; repo = "yang-mode";
rev = "bcf698acbdb4df91f587942348739b407a8b0807"; rev = "0d5d5df86dbb6cbb2de3c0f2d0d5f8c8f29d0695";
sha256 = "1rrmailvhxvivmdjamm2vvciym484cw0lqn1hgdw1lz999g5a5vs"; sha256 = "0ca55vjv9lz7w8mk2z731bia9vialrd4kv0igi09xs1mm0r2x5nv";
}; };
recipeFile = fetchurl { recipeFile = fetchurl {
url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode"; url = "https://raw.githubusercontent.com/milkypostman/melpa/bb42ab9b5f118baaf6766c478046552b686981a1/recipes/yang-mode";

21
pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
View File

@ -38,6 +38,9 @@ self:
# upstream issue: mismatched filename # upstream issue: mismatched filename
ack-menu = markBroken super.ack-menu; ack-menu = markBroken super.ack-menu;
# Expects bash to be at /bin/bash
ac-rtags = markBroken super.ac-rtags;
airline-themes = super.airline-themes.override { airline-themes = super.airline-themes.override {
inherit (self.melpaPackages) powerline; inherit (self.melpaPackages) powerline;
}; };
@ -52,6 +55,9 @@ self:
# upstream issue: missing package version # upstream issue: missing package version
cmake-mode = markBroken (dontConfigure super.cmake-mode); cmake-mode = markBroken (dontConfigure super.cmake-mode);
# Expects bash to be at /bin/bash
company-rtags = markBroken super.company-rtags;
# upstream issue: missing file header # upstream issue: missing file header
connection = markBroken super.connection; connection = markBroken super.connection;
@ -79,6 +85,9 @@ self:
inherit (self.melpaPackages) ess popup; inherit (self.melpaPackages) ess popup;
}; };
# upstream issue: doesn't build
eterm-256color = markBroken super.emacs-256color;
# upstream issue: missing dependency highlight # upstream issue: missing dependency highlight
evil-search-highlight-persist = markBroken super.evil-search-highlight-persist; evil-search-highlight-persist = markBroken super.evil-search-highlight-persist;
@ -88,6 +97,9 @@ self:
# missing OCaml # missing OCaml
flycheck-ocaml = markBroken super.flycheck-ocaml; flycheck-ocaml = markBroken super.flycheck-ocaml;
# Expects bash to be at /bin/bash
flycheck-rtags = markBroken super.flycheck-rtags;
# upstream issue: missing file header # upstream issue: missing file header
fold-dwim = markBroken super.fold-dwim; fold-dwim = markBroken super.fold-dwim;
@ -97,12 +109,18 @@ self:
# upstream issue: mismatched filename # upstream issue: mismatched filename
helm-lobsters = markBroken super.helm-lobsters; helm-lobsters = markBroken super.helm-lobsters;
# Expects bash to be at /bin/bash
helm-rtags = markBroken super.helm-rtags;
# upstream issue: missing file header # upstream issue: missing file header
ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen; ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
# upstream issue: missing file header # upstream issue: missing file header
initsplit = markBroken super.initsplit; initsplit = markBroken super.initsplit;
# Expects bash to be at /bin/bash
ivy-rtags = markBroken super.ivy-rtags;
# upstream issue: missing file header # upstream issue: missing file header
jsfmt = markBroken super.jsfmt; jsfmt = markBroken super.jsfmt;
@ -149,6 +167,9 @@ self:
# upstream issue: missing file header # upstream issue: missing file header
stgit = markBroken super.stgit; stgit = markBroken super.stgit;
# upstream issue: missing file header
tawny-mode = markBroken super.tawny-mode;
# upstream issue: missing file header # upstream issue: missing file header
textmate = markBroken super.textmate; textmate = markBroken super.textmate;

12
pkgs/applications/editors/emacs-modes/org-generated.nix
View File

@ -1,10 +1,10 @@
{ callPackage }: { { callPackage }: {
org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org"; pname = "org";
version = "20171205"; version = "20171218";
src = fetchurl { src = fetchurl {
url = "http://orgmode.org/elpa/org-20171205.tar"; url = "http://orgmode.org/elpa/org-20171218.tar";
sha256 = "0n8v5x50p8p52wwszzhf5y39ll2aaackvi64ldchnj06lqy3ni88"; sha256 = "01w09hl1l03bxa31af6k433h6i2cwaxwd1v6n87zjnbwwlli2la6";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {
@ -14,10 +14,10 @@
}) {}; }) {};
org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
pname = "org-plus-contrib"; pname = "org-plus-contrib";
version = "20171205"; version = "20171218";
src = fetchurl { src = fetchurl {
url = "http://orgmode.org/elpa/org-plus-contrib-20171205.tar"; url = "http://orgmode.org/elpa/org-plus-contrib-20171218.tar";
sha256 = "1y61csa284gy8l0fj0mv67mkm4fsi4lz401987qp6a6z260df4n5"; sha256 = "1dndmv99sjl2nknlj76235yygdpwgq61gp3mqgsihjyr9irsp58d";
}; };
packageRequires = []; packageRequires = [];
meta = { meta = {

87
pkgs/applications/networking/instant-messengers/signal-desktop/beta.nix Normal file
View File

@ -0,0 +1,87 @@
{ stdenv, lib, fetchurl, dpkg, gnome2, atk, cairo, gdk_pixbuf, glib, freetype,
fontconfig, dbus, libX11, xlibs, libXi, libXcursor, libXdamage, libXrandr,
libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss,
nspr, alsaLib, cups, expat, udev
}:
let
rpath = lib.makeLibraryPath [
alsaLib
atk
cairo
cups
dbus
expat
fontconfig
freetype
gdk_pixbuf
glib
gnome2.GConf
gnome2.gtk
gnome2.pango
libX11
libXScrnSaver
libXcomposite
libXcursor
libXdamage
libXext
libXfixes
libXi
libXrandr
libXrender
libXtst
nspr
nss
stdenv.cc.cc
udev
xlibs.libxcb
];
in
stdenv.mkDerivation rec {
name = "signal-desktop-${version}";
version = "1.1.0-beta.5";
src =
if stdenv.system == "x86_64-linux" then
fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop-beta_${version}_amd64.deb";
sha256 = "1kllym2iazp9i5afrh0vmsqqlh5b8i6f929p5yhl8bl4zd17zwpx";
}
else
throw "Signal for Desktop is not currently supported on ${stdenv.system}";
phases = [ "unpackPhase" "installPhase" ];
nativeBuildInputs = [ dpkg ];
unpackPhase = "dpkg-deb -x $src .";
installPhase = ''
mkdir -p $out
cp -R opt $out
cp -R usr/share $out/share
chmod -R g-w $out
# Patch signal
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${rpath}:$out/opt/Signal Beta" \
"$out/opt/Signal Beta/signal-desktop-beta"
# Symlink to bin
mkdir -p $out/bin
ln -s "$out/opt/Signal Beta/signal-desktop-beta" $out/bin/signal-desktop-beta
# Fix the desktop link
substituteInPlace $out/share/applications/signal-desktop-beta.desktop \
--replace "/opt/Signal Beta/signal-desktop-beta" $out/bin/signal-desktop-beta
'';
meta = {
description = "Signal Private Messenger for the Desktop (Beta version)";
homepage = https://signal.org/;
license = lib.licenses.gpl3;
maintainers = with lib.maintainers; [ ixmatus benley ];
platforms = [
"x86_64-linux"
];
};
}

7
pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
View File

@ -2,11 +2,11 @@
, sqlite, libsoup, libnice, gnutls}: , sqlite, libsoup, libnice, gnutls}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "telepathy-gabble-0.18.2"; name = "telepathy-gabble-0.18.3";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz"; url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz";
sha256 = "00ag32ccbj0hmy41rb0fg9gp40m7zbq45r4yijnyslk2mpkvg7c9"; sha256 = "1hl9k6jwn2afwwv7br16wfw5szdhwxqziba47xd8vjwvgrh19iwf";
}; };
nativeBuildInputs = [ pkgconfig libxslt ]; nativeBuildInputs = [ pkgconfig libxslt ];
@ -19,8 +19,9 @@ stdenv.mkDerivation rec {
doCheck = true; doCheck = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://telepathy.freedesktop.org; homepage = https://telepathy.freedesktop.org/components/telepathy-gabble/;
description = "Jabber/XMPP connection manager for the Telepathy framework"; description = "Jabber/XMPP connection manager for the Telepathy framework";
license = licenses.lgpl21Plus;
platforms = stdenv.lib.platforms.gnu; platforms = stdenv.lib.platforms.gnu;
}; };
} }

23
pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
View File

@ -3,18 +3,20 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
project = "telepathy-logger"; project = "telepathy-logger";
name = "${project}-0.8.0"; name = "${project}-0.8.2";
src = fetchurl { src = fetchurl {
url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2"; url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2";
sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl"; sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl";
}; };
NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; nativeBuildInputs = [
makeWrapper pkgconfig intltool libxslt gobjectIntrospection
nativeBuildInputs = [ makeWrapper pkgconfig ]; ];
buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib intltool libxslt buildInputs = [
gobjectIntrospection dbus_libs telepathy_glib.python (stdenv.lib.getLib gnome3.dconf) ]; dbus_glib libxml2 sqlite telepathy_glib
dbus_libs telepathy_glib.python
];
configureFlags = "--enable-call"; configureFlags = "--enable-call";
@ -24,10 +26,11 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
''; '';
meta = { meta = with stdenv.lib; {
description = "Logger service for Telepathy framework"; description = "Logger service for Telepathy framework";
homepage = http://telepathy.freedesktop.org/wiki/Logger ; homepage = https://telepathy.freedesktop.org/components/telepathy-logger/;
maintainers = [ ]; license = licenses.lgpl21;
platforms = stdenv.lib.platforms.gnu; # Arbitrary choice maintainers = with maintainers; [ jtojnar ];
platforms = platforms.gnu; # Arbitrary choice
}; };
} }

14
pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
View File

@ -1,18 +1,17 @@
{ stdenv, fetchurl, pkgconfig, gnome3, telepathy_glib, libxslt, makeWrapper, upower }: { stdenv, fetchurl, pkgconfig, gnome3, telepathy_glib, libxslt, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${pname}-5.16.3"; name = "${pname}-5.16.4";
pname = "telepathy-mission-control"; pname = "telepathy-mission-control";
src = fetchurl { src = fetchurl {
url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
sha256 = "0zcbx69k0d3p2pjh3g7sa3q2zkd5xchxkqsmlfn3fwxaz0pmsmvi"; sha256 = "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp";
}; };
buildInputs = [ telepathy_glib telepathy_glib.python makeWrapper /*upower*/ ]; # ToDo: optional stuff missing buildInputs = [ telepathy_glib telepathy_glib.python ]; # ToDo: optional stuff missing
# 5.16.3 won't build with upower-0.99. Arch and Debian choose to disable it
nativeBuildInputs = [ pkgconfig libxslt ]; nativeBuildInputs = [ pkgconfig libxslt makeWrapper ];
doCheck = true; doCheck = true;
@ -24,8 +23,9 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "An account manager and channel dispatcher for the Telepathy framework"; description = "An account manager and channel dispatcher for the Telepathy framework";
homepage = http://telepathy.freedesktop.org/wiki/; homepage = https://telepathy.freedesktop.org/components/telepathy-mission-control/;
license = licenses.lgpl21; license = licenses.lgpl21;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

13
pkgs/applications/networking/irc/weechat/default.nix
View File

@ -29,23 +29,14 @@ let
weechat = weechat =
assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.9.1"; version = "2.0";
name = "weechat-${version}"; name = "weechat-${version}";
src = fetchurl { src = fetchurl {
url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
sha256 = "1kgi079bq4n0wb7hc7mz8p7ay1b2m0a4wpvb92sfsxrnh10qr5m1"; sha256 = "0jd1l67k2k44xmfv0a71im3j4v0gss3a6bd5s84nj3f7lqnfmqdn";
}; };
patches = [
# TODO: Remove this patch when weechat is updated to a release that
# incorporates weechat/weechat#971
(fetchpatch {
url = https://github.com/lheckemann/weechat/commit/45a4f0565cc745b9c6e943f20199015185696df0.patch;
sha256 = "0x7vv7g0k3b2hj444x2cinyv1mq5bkr6m18grfnyy6swbymzc9bj";
})
];
outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;
enableParallelBuilding = true; enableParallelBuilding = true;

3
pkgs/applications/science/logic/coq/default.nix
View File

@ -9,7 +9,7 @@
, ocamlPackages, ncurses , ocamlPackages, ncurses
, buildIde ? true , buildIde ? true
, csdp ? null , csdp ? null
, version ? "8.6.1" , version ? "8.7.1"
}: }:
let let
@ -19,7 +19,6 @@ let
"8.5pl3" = "15c3rdk59nifzihsp97z4vjxis5xmsnrvpb86qiazj143z2fmdgw"; "8.5pl3" = "15c3rdk59nifzihsp97z4vjxis5xmsnrvpb86qiazj143z2fmdgw";
"8.6" = "148mb48zpdax56c0blfi7v67lx014lnmrvxxasi28hsibyz2lvg4"; "8.6" = "148mb48zpdax56c0blfi7v67lx014lnmrvxxasi28hsibyz2lvg4";
"8.6.1" = "0llrxcxwy5j87vbbjnisw42rfw1n1pm5602ssx64xaxx3k176g6l"; "8.6.1" = "0llrxcxwy5j87vbbjnisw42rfw1n1pm5602ssx64xaxx3k176g6l";
"8.7+beta2" = "1r274m44z774xigvj43g211ms9z9bwgyp1g43rvq4fswb3gzxc4b";
"8.7.0" = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m"; "8.7.0" = "1h18b7xpnx3ix9vsi5fx4zdcbxy7bhra7gd5c5yzxmk53cgf1p9m";
"8.7.1" = "0gjn59jkbxwrihk8fx9d823wjyjh5m9gvj9l31nv6z6bcqhgdqi8"; "8.7.1" = "0gjn59jkbxwrihk8fx9d823wjyjh5m9gvj9l31nv6z6bcqhgdqi8";
}."${version}"; }."${version}";

22
pkgs/applications/virtualization/qemu/default.nix
View File

@ -24,10 +24,11 @@ let
+ optionalString pulseSupport "pa," + optionalString pulseSupport "pa,"
+ optionalString sdlSupport "sdl,"; + optionalString sdlSupport "sdl,";
hostCpuTargets = if stdenv.isi686 || stdenv.isx86_64 then "i386-softmmu,x86_64-softmmu" hostCpuTargets = if stdenv.isx86_64 then "i386-softmmu,x86_64-softmmu"
else if stdenv.isArm then "arm-softmmu" else if stdenv.isi686 then "i386-softmmu"
else if stdenv.isAarch64 then "aarch64-softmmu" else if stdenv.isArm then "arm-softmmu"
else throw "Don't know how to build a 'hostCpuOnly = true' QEMU"; else if stdenv.isAarch64 then "aarch64-softmmu"
else throw "Don't know how to build a 'hostCpuOnly = true' QEMU";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -92,14 +93,13 @@ stdenv.mkDerivation rec {
done done
''; '';
# Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
postInstall = postInstall =
'' if stdenv.isx86_64 then ''makeWrapper $out/bin/qemu-system-x86_64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
# Add a ‘qemu-kvm’ wrapper for compatibility/convenience. else if stdenv.isi686 then ''makeWrapper $out/bin/qemu-system-i386 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
p="$out/bin/qemu-system-${if stdenv.system == "x86_64-linux" then "x86_64" else "i386"}" else if stdenv.isArm then ''makeWrapper $out/bin/qemu-system-arm $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
if [ -e "$p" ]; then else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
makeWrapper "$p" $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)" else "";
fi
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.qemu.org/; homepage = http://www.qemu.org/;

37
pkgs/data/icons/elementary-xfce-icon-theme/default.nix Normal file
View File

@ -0,0 +1,37 @@
{ stdenv, fetchFromGitHub, gtk3, hicolor_icon_theme }:
stdenv.mkDerivation rec {
name = "elementary-xfce-icon-theme-${version}";
version = "2017-11-28";
src = fetchFromGitHub {
owner = "shimmerproject";
repo = "elementary-xfce";
rev = "b5cc6f044ed24e388ed2fffed1d02f43ce76f5e6";
sha256 = "15n28f2pw8b0y5pi8ydahg31v6hhh7zvpvymi8jaafdc9bn18z3y";
};
# fallback icon theme
propagatedBuildInputs = [ hicolor_icon_theme ];
dontBuild = true;
installPhase = ''
install -dm 755 $out/share/icons
cp -dr --no-preserve='ownership' elementary-xfce{,-dark,-darker,-darkest} $out/share/icons/
'';
postInstall = ''
for icons in "$out"/share/icons/*; do
"${gtk3.out}/bin/gtk-update-icon-cache" "$icons"
done
'';
meta = with stdenv.lib; {
description = "Elementary icons for Xfce and other Gtk+ desktops like Gnome3";
homepage = https://github.com/shimmerproject/elementary-xfce;
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = with maintainers; [ davidak ];
};
}

43
pkgs/desktops/gnome-3/core/evince/default.nix
View File

@ -1,47 +1,38 @@
{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2 { fetchurl, stdenv, pkgconfig, intltool, libxml2
, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3 , glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3
, poppler, ghostscriptX, djvulibre, libspectre, libsecret , wrapGAppsHook , poppler, ghostscriptX, djvulibre, libspectre, libsecret, wrapGAppsHook
, librsvg, gobjectIntrospection , librsvg, gobjectIntrospection, yelp_tools
, recentListSize ? null # 5 is not enough, allow passing a different number , recentListSize ? null # 5 is not enough, allow passing a different number
, supportXPS ? false # Open XML Paper Specification via libgxps , supportXPS ? false # Open XML Paper Specification via libgxps
, fetchpatch, autoreconfHook , autoreconfHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit (import ./src.nix fetchurl) name src; inherit (import ./src.nix fetchurl) name src;
# missing help for now; fixing the autogen phase seemed too difficult nativeBuildInputs = [
postPatch = "sed '/@YELP_HELP_RULES@/d' -i help/Makefile.am"; pkgconfig gobjectIntrospection intltool itstool wrapGAppsHook yelp_tools autoreconfHook
];
nativeBuildInputs = [ pkgconfig wrapGAppsHook autoreconfHook/*for patches*/ ];
buildInputs = [ buildInputs = [
intltool perl perlXMLParser libxml2 glib gtk3 pango atk gdk_pixbuf libxml2
glib gtk3 pango atk gdk_pixbuf gobjectIntrospection
itstool gnome3.adwaita-icon-theme
gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas
poppler ghostscriptX djvulibre libspectre poppler ghostscriptX djvulibre libspectre
libsecret librsvg gnome3.adwaita-icon-theme gnome3.dconf libsecret librsvg gnome3.adwaita-icon-theme
] ++ stdenv.lib.optional supportXPS gnome3.libgxps; ] ++ stdenv.lib.optional supportXPS gnome3.libgxps;
configureFlags = [ configureFlags = [
"--disable-nautilus" # Do not use nautilus "--disable-nautilus" # Do not build nautilus plugin
"--enable-introspection" "--enable-introspection"
(if supportXPS then "--enable-xps" else "--disable-xps") (if supportXPS then "--enable-xps" else "--disable-xps")
]; ];
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
preConfigure = with stdenv.lib; preConfigure = stdenv.lib.optionalString (recentListSize != null) ''
optionalString doCheck '' sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c
for file in test/*.py; do sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c
echo "patching $file" '';
sed '1s,/usr,${python},' -i "$file"
done
'' + optionalString (recentListSize != null) ''
sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c
sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c
'';
preFixup = '' preFixup = ''
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share") gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared_mime_info}/share")
@ -49,10 +40,8 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = false; # would need pythonPackages.dogTail, which is missing
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://www.gnome.org/projects/evince/; homepage = https://wiki.gnome.org/Apps/Evince;
description = "GNOME's document viewer"; description = "GNOME's document viewer";
longDescription = '' longDescription = ''
@ -64,6 +53,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus; license = stdenv.lib.licenses.gpl2Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.vcunat ]; maintainers = gnome3.maintainers ++ [ maintainers.vcunat ];
}; };
} }

16
pkgs/desktops/xfce/core/xfdesktop.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
, libwnck, xfconf, libglade, xfce4panel, thunar, exo, garcon, libnotify , libwnck, xfconf, libglade, xfce4panel, thunar, exo, garcon, libnotify
, hicolor_icon_theme }: , hicolor_icon_theme }:
let let
@ -14,10 +14,15 @@ stdenv.mkDerivation rec {
sha256 = "a8a8d93744d842ca6ac1f9bd2c8789ee178937bca7e170e5239cbdbef30520ac"; sha256 = "a8a8d93744d842ca6ac1f9bd2c8789ee178937bca7e170e5239cbdbef30520ac";
}; };
buildInputs = buildInputs = [
[ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf
libglade xfce4panel thunar exo garcon libnotify hicolor_icon_theme libglade xfce4panel thunar exo garcon libnotify hicolor_icon_theme
]; ];
patches = [(fetchpatch {
url = https://git.xfce.org/xfce/xfdesktop/patch?id=157f5b55cfc3629d595ef38984278de5915aac27;
sha256 = "0ki7hnyfpz7bdmsxqnm9qvyk040iyv1fawnhzfbyyzrh4nc5jd3x";
})];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -29,4 +34,3 @@ stdenv.mkDerivation rec {
maintainers = [ maintainers.eelco ]; maintainers = [ maintainers.eelco ];
}; };
} }

12
pkgs/development/coq-modules/CoLoR/default.nix
View File

@ -1,8 +1,4 @@
{ stdenv, fetchurl, coq, coqPackages }: { stdenv, fetchurl, coq, bignums }:
if !stdenv.lib.versionAtLeast coq.coq-version "8.6"
then throw "CoLoR is not available for Coq ${coq.coq-version}"
else
stdenv.mkDerivation { stdenv.mkDerivation {
name = "coq${coq.coq-version}-CoLoR-1.4.0"; name = "coq${coq.coq-version}-CoLoR-1.4.0";
@ -12,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "1jsp9adsh7w59y41ihbwchryjhjpajgs9bhf8rnb4b3hzccqxgag"; sha256 = "1jsp9adsh7w59y41ihbwchryjhjpajgs9bhf8rnb4b3hzccqxgag";
}; };
buildInputs = [ coq coqPackages.bignums ]; buildInputs = [ coq bignums ];
enableParallelBuilding = false; enableParallelBuilding = false;
installPhase = '' installPhase = ''
@ -25,4 +21,8 @@ stdenv.mkDerivation {
maintainers = with maintainers; [ jwiegley ]; maintainers = with maintainers; [ jwiegley ];
platforms = coq.meta.platforms; platforms = coq.meta.platforms;
}; };
passthru = {
compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
};
} }

8
pkgs/development/coq-modules/HoTT/default.nix
View File

@ -1,8 +1,6 @@
{ stdenv, fetchFromGitHub, autoconf, automake, coq }: { stdenv, fetchFromGitHub, autoconf, automake, coq }:
if !stdenv.lib.versionAtLeast coq.coq-version "8.6" stdenv.mkDerivation rec {
then throw "This version of HoTT requires Coq 8.6"
else stdenv.mkDerivation rec {
name = "coq${coq.coq-version}-HoTT-${version}"; name = "coq${coq.coq-version}-HoTT-${version}";
version = "20170921"; version = "20170921";
@ -56,4 +54,8 @@ else stdenv.mkDerivation rec {
maintainers = with maintainers; [ siddharthist ]; maintainers = with maintainers; [ siddharthist ];
platforms = coq.meta.platforms; platforms = coq.meta.platforms;
}; };
passthru = {
compatibleCoqVersions = v: v == "8.6";
};
} }

4
pkgs/development/coq-modules/category-theory/default.nix
View File

@ -42,4 +42,8 @@ stdenv.mkDerivation rec {
platforms = coq.meta.platforms; platforms = coq.meta.platforms;
}; };
passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ];
};
} }

4
pkgs/development/coq-modules/equations/default.nix
View File

@ -42,4 +42,8 @@ stdenv.mkDerivation rec {
platforms = coq.meta.platforms; platforms = coq.meta.platforms;
}; };
passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" ];
};
} }

4
pkgs/development/coq-modules/fiat/HEAD.nix
View File

@ -30,7 +30,9 @@ stdenv.mkDerivation rec {
description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications"; description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications";
maintainers = with maintainers; [ jwiegley ]; maintainers = with maintainers; [ jwiegley ];
platforms = coq.meta.platforms; platforms = coq.meta.platforms;
broken = stdenv.lib.versionAtLeast coq.coq-version "8.6";
}; };
passthru = {
compatibleCoqVersions = v: v == "8.5";
};
} }

13
pkgs/development/coq-modules/math-classes/default.nix
View File

@ -1,8 +1,4 @@
{ stdenv, fetchFromGitHub, coq, coqPackages }: { stdenv, fetchFromGitHub, coq, bignums }:
if ! stdenv.lib.versionAtLeast coq.coq-version "8.6" then
throw "Math-Classes requires Coq 8.6 or later."
else
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0wgnczacvkb2pc3vjbni9bwjijfyd5jcdnyyjg8185hkf9zzabgi"; sha256 = "0wgnczacvkb2pc3vjbni9bwjijfyd5jcdnyyjg8185hkf9zzabgi";
}; };
buildInputs = [ coq coqPackages.bignums ]; buildInputs = [ coq bignums ];
enableParallelBuilding = true; enableParallelBuilding = true;
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/"; installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
@ -26,4 +22,9 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ siddharthist jwiegley ]; maintainers = with maintainers; [ siddharthist jwiegley ];
platforms = coq.meta.platforms; platforms = coq.meta.platforms;
}; };
passthru = {
compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
};
} }

9
pkgs/development/coq-modules/metalib/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, coq, ocamlPackages, haskellPackages, which, ott { stdenv, fetchgit, coq, haskellPackages, which, ott
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -29,8 +29,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.mit; license = stdenv.lib.licenses.mit;
}; };
buildInputs = [ coq.ocaml coq.camlp5 which coq lngen ott ] buildInputs = [ coq.ocaml coq.camlp5 which coq lngen ott coq.findlib ];
++ (with ocamlPackages; [ findlib ]);
propagatedBuildInputs = [ coq ]; propagatedBuildInputs = [ coq ];
enableParallelBuilding = true; enableParallelBuilding = true;
@ -50,4 +49,8 @@ stdenv.mkDerivation rec {
platforms = coq.meta.platforms; platforms = coq.meta.platforms;
}; };
passthru = {
compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
};
} }

28
pkgs/development/coq-modules/multinomials/default.nix Normal file
View File

@ -0,0 +1,28 @@
{ stdenv, fetchFromGitHub, coq, mathcomp }:
stdenv.mkDerivation rec {
name = "coq${coq.coq-version}-multinomials-${version}";
version = "1.0";
src = fetchFromGitHub {
owner = "math-comp";
repo = "multinomials";
rev = version;
sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m";
};
buildInputs = [ coq ];
propagatedBuildInputs = [ mathcomp ];
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
meta = {
description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials";
inherit (src.meta) homepage;
license = stdenv.lib.licenses.cecill-b;
inherit (coq.meta) platforms;
};
passthru = {
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
};
}

54
pkgs/development/libraries/telepathy/qt/default.nix
View File

@ -4,51 +4,37 @@
let let
inherit (python2Packages) python dbus-python; inherit (python2Packages) python dbus-python;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "telepathy-qt-0.9.6.1"; name = "telepathy-qt-0.9.7";
src = fetchurl { src = fetchurl {
url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz"; url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
sha256 = "1y51c6rxk5qvmab98c8rnmrlyk27hnl248casvbq3cd93sav8vj9"; sha256 = "0krxd4hhfx6r0ja19wh3848j7gn1rv8jrnakgmkbmi7bww5x7fi1";
}; };
patches = let
mkUrl = hash: "http://cgit.freedesktop.org/telepathy/telepathy-qt/patch/?id=" + hash;
in [
(fetchpatch {
name = "gst-1.6.patch";
url = mkUrl "ec4a3d62b68a57254515f01fc5ea3325ffb1dbfb";
sha256 = "1rh7n3xyrwpvpa3haqi35qn4mfz4396ha43w4zsqpmcyda9y65v2";
})
(fetchpatch {
name = "parallel-make-1.patch";
url = mkUrl "1e1f53e9d91684918c34ec50392f86287e001a1e";
sha256 = "1f9nk0bi90armb9zay53c7cz70zcwqqwli7sb9wgw76rmwqhl8qw";
})
(fetchpatch {
name = "parallel-make-2.patch";
url = mkUrl "7389dc990c67d4269f3a79c924c054e87f2e4ac5";
sha256 = "0mvdvyy76kpaxacljidf06wd43fr2qripr4mwsakjs3hxb1pkk57";
})
];
nativeBuildInputs = [ cmake pkgconfig python ]; nativeBuildInputs = [ cmake pkgconfig python ];
propagatedBuildInputs = [ qtbase dbus_glib telepathy_farstream telepathy_glib dbus-python ]; propagatedBuildInputs = [ qtbase telepathy_farstream telepathy_glib ];
buildInputs = [ dbus_glib ];
checkInputs = [ dbus_daemon dbus-python ];
buildInputs = stdenv.lib.optional doCheck dbus_daemon; patches = [
# https://github.com/TelepathyIM/telepathy-qt/issues/25
(fetchpatch {
url = https://github.com/TelepathyIM/telepathy-qt/commit/d654dc70dbec7097e96e6d96ca74ab1b5b00ef8c.patch;
sha256 = "1jzd9b9rqh3c8xlq8dr7c0r8aabzf5ywv2gpkk6phh3xwngzrfbh";
})
];
cmakeFlags = "-DDESIRED_QT_VERSION=${builtins.substring 0 1 qtbase.version}"; # No point in building tests if they are not run
# On 0.9.7, they do not even build with QT4
# should be removable after the next update cmakeFlags = stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF";
NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
preBuild = ''
NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
'';
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = false; # giving up for now doCheck = false; # giving up for now
meta = { meta = with stdenv.lib; {
platforms = stdenv.lib.platforms.linux; description = "Telepathy Qt bindings";
homepage = https://telepathy.freedesktop.org/components/telepathy-qt/;
license = licenses.lgpl21;
platforms = platforms.linux;
}; };
} }

31
pkgs/development/python-modules/django-hijack-admin/default.nix Normal file
View File

@ -0,0 +1,31 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, python,
django_hijack, django_nose }:
buildPythonPackage rec {
pname = "django-hijack-admin";
version = "2.1.5";
name = "${pname}-${version}";
# the pypi packages don't include everything required for the tests
src = fetchFromGitHub {
owner = "arteria";
repo = "django-hijack-admin";
rev = "v${version}";
sha256 = "02j75blvkjiz5mv5wc4jxl27rgmjsrl6l67a3p8342jwazzsm6jg";
};
checkInputs = [ django_nose ];
propagatedBuildInputs = [ django_hijack ];
checkPhase = ''
runHook preCheck
${python.interpreter} runtests.py hijack_admin
runHook postCheck
'';
meta = with stdenv.lib; {
description = "Admin integration for django-hijack";
homepage = https://github.com/arteria/django-hijack;
license = licenses.mit;
maintainers = with maintainers; [ lsix ];
};
}

4
pkgs/development/python-modules/django-hijack/default.nix
View File

@ -3,7 +3,7 @@
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-hijack"; pname = "django-hijack";
version = "2.1.4"; version = "2.1.5";
name = pname + "-" + version; name = pname + "-" + version;
# the pypi packages don't include everything required for the tests # the pypi packages don't include everything required for the tests
@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "arteria"; owner = "arteria";
repo = "django-hijack"; repo = "django-hijack";
rev = "v${version}"; rev = "v${version}";
sha256 = "1wbm6l8mzpkj4wsj4fyfamzpzi3day2v1cva5j89v4dn4403jq21"; sha256 = "1paiyxhc034336xcd9yzf3azpsapsv26j7w2baxiby71z2hhg0sj";
}; };
checkInputs = [ django_nose ]; checkInputs = [ django_nose ];

4
pkgs/development/python-modules/django/1_11.nix
View File

@ -7,13 +7,13 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "Django"; pname = "Django";
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "1.11.7"; version = "1.11.8";
disabled = pythonOlder "2.7"; disabled = pythonOlder "2.7";
src = fetchurl { src = fetchurl {
url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz"; url = "http://www.djangoproject.com/m/releases/1.11/${name}.tar.gz";
sha256 = "16ab3p6jj1da94wkz2b5fb128ycy4826bbsnbabcd3qdaf9f6649"; sha256 = "04gphaarwj1yrhhpi9im6gsg77i2vv0iwyjc0pmxba53nndyglzy";
}; };
patches = stdenv.lib.optionals withGdal [ patches = stdenv.lib.optionals withGdal [

22
pkgs/development/python-modules/gurobipy/darwin.nix
View File

@ -1,26 +1,24 @@
{ stdenv, fetchurl, python, xar, cpio, cctools, insert_dylib }: { fetchurl, python, xar, cpio, cctools, insert_dylib }:
assert python.pkgs.isPy27 && python.ucsEncoding == 2; assert python.pkgs.isPy27 && python.ucsEncoding == 2;
stdenv.mkDerivation python.pkgs.buildPythonPackage
{ name = "gurobipy-7.0.2"; { name = "gurobipy-7.0.2";
src = fetchurl src = fetchurl
{ url = "http://packages.gurobi.com/7.0/gurobi7.0.2_mac64.pkg"; { url = "http://packages.gurobi.com/7.0/gurobi7.0.2_mac64.pkg";
sha256 = "14dpxas6gx02kfb28i0fh68p1z4sbjmwg8hp8h5ch6c701h260mg"; sha256 = "14dpxas6gx02kfb28i0fh68p1z4sbjmwg8hp8h5ch6c701h260mg";
}; };
buildInputs = [ xar cpio cctools insert_dylib ]; buildInputs = [ xar cpio cctools insert_dylib ];
buildCommand = unpackPhase =
'' ''
# Unpack
xar -xf $src xar -xf $src
zcat gurobi*mac64tar.pkg/Payload | cpio -i zcat gurobi*mac64tar.pkg/Payload | cpio -i
tar xf gurobi*_mac64.tar.gz tar xf gurobi*_mac64.tar.gz
sourceRoot=$(echo gurobi*/*64)
# Install runHook postUnpack
cd gurobi*/mac64 '';
mkdir -p $out/lib/python2.7/site-packages patches = [ ./no-darwin-fixup.patch ];
mv lib/python2.7/gurobipy $out/lib/python2.7/site-packages postInstall = "mv lib/lib*.so $out/lib";
mv lib/lib*.so $out/lib postFixup =
''
# Fixup
install_name_tool -change \ install_name_tool -change \
/System/Library/Frameworks/Python.framework/Versions/2.7/Python \ /System/Library/Frameworks/Python.framework/Versions/2.7/Python \
${python}/lib/libpython2.7.dylib \ ${python}/lib/libpython2.7.dylib \

21
pkgs/development/python-modules/gurobipy/linux.nix
View File

@ -1,30 +1,19 @@
{ stdenv, fetchurl, python }: { fetchurl, python }:
assert python.pkgs.isPy27; assert python.pkgs.isPy27;
let utf = let utf =
if python.ucsEncoding == 2 then "16" if python.ucsEncoding == 2 then "16"
else if python.ucsEncoding == 4 then "32" else if python.ucsEncoding == 4 then "32"
else throw "Unsupported python UCS encoding UCS${toString python.ucsEncoding}"; else throw "Unsupported python UCS encoding UCS${toString python.ucsEncoding}";
in stdenv.mkDerivation in python.pkgs.buildPythonPackage
{ name = "gurobipy-7.0.2"; { name = "gurobipy-7.0.2";
src = fetchurl src = fetchurl
{ url = "http://packages.gurobi.com/7.0/gurobi7.0.2_linux64.tar.gz"; { url = "http://packages.gurobi.com/7.0/gurobi7.0.2_linux64.tar.gz";
sha256 = "1lgdj4cncjvnnw8dppiax7q2j8121pxyg9iryj8v26mrk778dnmn"; sha256 = "1lgdj4cncjvnnw8dppiax7q2j8121pxyg9iryj8v26mrk778dnmn";
}; };
buildCommand = setSourceRoot = "sourceRoot=$(echo gurobi*/*64)";
postInstall = "mv lib/libaes*.so* lib/libgurobi*.so* $out/lib";
postFixup =
'' ''
# Unpack
tar xf $src
# Install
cd gurobi*/linux64
mkdir -p $out/lib/python2.7/site-packages
mv lib/python2.7_utf${utf}/gurobipy \
$out/lib/python2.7/site-packages
mv lib/python2.7_utf${utf}/gurobipy.so \
$out/lib/python2.7/site-packages/gurobipy
mv lib/libaes*.so* lib/libgurobi*.so* $out/lib
# Fixup
patchelf --set-rpath $out/lib \ patchelf --set-rpath $out/lib \
$out/lib/python2.7/site-packages/gurobipy/gurobipy.so $out/lib/python2.7/site-packages/gurobipy/gurobipy.so
patchelf --add-needed libaes70.so \ patchelf --add-needed libaes70.so \

20
pkgs/development/python-modules/gurobipy/no-darwin-fixup.patch Normal file
View File

@ -0,0 +1,20 @@
diff -Naur a/setup.py b/setup.py
--- a/setup.py 2017-12-18 12:48:02.000000000 -0500
+++ b/setup.py 2017-12-18 12:48:43.000000000 -0500
@@ -54,16 +54,3 @@
package_dir={'gurobipy' : srcpath },
package_data = {'gurobipy' : [srcfile] }
)
-
-if sys.platform == 'darwin':
- from distutils.sysconfig import get_python_lib
- import subprocess
- import os.path
- sitelib = get_python_lib() + '/gurobipy/gurobipy.so'
- subprocess.call(('install_name_tool', '-change', 'libgurobi70.so', '/Library/gurobi702/mac64/lib/libgurobi70.so', sitelib)) # version for change
- default = '/System/Library/Frameworks/Python.framework/Versions/2.7/Python'
- modified = sys.prefix + '/Python'
- if default != modified:
- if not os.path.isfile(modified):
- modified = sys.prefix + '/lib/libpython2.7.dylib' # For Anaconda
- subprocess.call(('install_name_tool', '-change', default, modified, sitelib))

21
pkgs/development/tools/electron/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }: { stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }:
let let
version = "1.8.1"; version = "1.7.9";
name = "electron-${version}"; name = "electron-${version}";
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -9,7 +9,7 @@ let
homepage = https://github.com/electron/electron; homepage = https://github.com/electron/electron;
license = licenses.mit; license = licenses.mit;
maintainers = [ maintainers.travisbhartwell ]; maintainers = [ maintainers.travisbhartwell ];
platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" ];
}; };
linux = { linux = {
@ -18,23 +18,15 @@ let
src = { src = {
i686-linux = fetchurl { i686-linux = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip"; url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip";
sha256 = "0djqlcs4m9n9354idaqcs4cwskq2m3sf9mzvxpp4wy0a93pk78bw"; sha256 = "0m87n7hqimg93z3m8pa1ggs69f3h5mjrsrrl7x80hxmp3w142krc";
name = "${name}.zip";
}; };
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip"; url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
sha256 = "0as7bgs050wsc9ywzr7f4i2c9dp1ynddcmiblm2b0hdcvw61k9q2"; sha256 = "17ii0x6326mwjd0x5dj2693r67y0jra88hkqcpddcq08vf1knr2f";
name = "${name}.zip";
}; };
armv7l-linux = fetchurl { armv7l-linux = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip"; url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip";
sha256 = "19x9c12kdr3rj39x4kshv3zi132dpnki7vaqrhadsn23q85n56ig"; sha256 = "17jkma50d6az8dbyrym8z2lsw2n0r6jhdlm8pb5c928bzgshryqm";
name = "${name}.zip";
};
aarch64-linux = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip";
sha256 = "12w1ajj94rqwh4906dzswh3vhs3micn80jvd015qxwss3n4n1lsz";
name = "${name}.zip";
}; };
}.${stdenv.system}; }.${stdenv.system};
@ -62,8 +54,7 @@ let
src = fetchurl { src = fetchurl {
url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip"; url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
sha256 = "0r0zbiqblwkcrljkljkj7zvfwr078bfgd38lhb1ivbj73fri17ir"; sha256 = "1s8kslp101xyaffb3rf8p5cw3p6zij2mn19fa68ykx4naykkwaly";
name = "${name}.zip";
}; };
buildInputs = [ unzip ]; buildInputs = [ unzip ];

4
pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
View File

@ -3,9 +3,9 @@
with stdenv.lib; with stdenv.lib;
let let
version = "4.14.6"; version = "4.14.7";
revision = "a"; revision = "a";
sha256 = "1hg44q4vzhnfcd9yj2p9ca89gz7dz0v210scz504fzy4q0rljiz8"; sha256 = "1nh8s4ylzi7bkm80pqr3zia9xxky2r9zvxkrz2xbq9mg30a6532x";
# modVersion needs to be x.y.z, will automatically add .0 if needed # modVersion needs to be x.y.z, will automatically add .0 if needed
modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

21
pkgs/tools/misc/bmap-tools/default.nix Normal file
View File

@ -0,0 +1,21 @@
{ stdenv, fetchFromGitHub, python2Packages }:
python2Packages.buildPythonApplication rec {
name = "bmap-tools-${version}";
version = "3.4";
src = fetchFromGitHub {
owner = "intel";
repo = "bmap-tools";
rev = "v${version}";
sha256 = "0p0pdwvyf9b4czi1pnhclm1ih8kw78nk2sj4if5hwi7s5423wk5q";
};
meta = with stdenv.lib; {
description = "bmap-related tools";
homepage = https://github.com/intel/bmap-tools;
license = licenses.gpl2;
maintainers = [ maintainers.dezgeg ];
platforms = platforms.linux;
};
}

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

@ -578,6 +578,8 @@ with pkgs;
bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { }; bcachefs-tools = callPackage ../tools/filesystems/bcachefs-tools { };
bmap-tools = callPackage ../tools/misc/bmap-tools { };
bonnie = callPackage ../tools/filesystems/bonnie { }; bonnie = callPackage ../tools/filesystems/bonnie { };
bonfire = callPackage ../tools/misc/bonfire { }; bonfire = callPackage ../tools/misc/bonfire { };
@ -1056,6 +1058,8 @@ with pkgs;
elementary-icon-theme = callPackage ../data/icons/elementary-icon-theme { }; elementary-icon-theme = callPackage ../data/icons/elementary-icon-theme { };
elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { };
elm-github-install = callPackage ../tools/package-management/elm-github-install { }; elm-github-install = callPackage ../tools/package-management/elm-github-install { };
emby = callPackage ../servers/emby { }; emby = callPackage ../servers/emby { };
@ -4467,6 +4471,8 @@ with pkgs;
signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { }; signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { };
signal-desktop-beta = callPackage ../applications/networking/instant-messengers/signal-desktop/beta.nix { };
# aka., pgp-tools # aka., pgp-tools
signing-party = callPackage ../tools/security/signing-party { }; signing-party = callPackage ../tools/security/signing-party { };
@ -18884,57 +18890,12 @@ with pkgs;
boogie = dotnetPackages.Boogie; boogie = dotnetPackages.Boogie;
coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { inherit (callPackage ./coq-packages.nix {})
make = pkgs.gnumake3; mkCoqPackages
inherit (ocamlPackages_3_12_1) ocaml findlib; coq_8_3 coq_8_4 coq_8_5 coq_8_6 coq_8_7
camlp5 = ocamlPackages_3_12_1.camlp5_transitional; coqPackages_8_5 coqPackages_8_6 coqPackages_8_7
lablgtk = ocamlPackages_3_12_1.lablgtk_2_14; coqPackages coq
}; ;
coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix {
inherit (ocamlPackages_4_02) ocaml findlib lablgtk;
camlp5 = ocamlPackages_4_02.camlp5_transitional;
};
coq_8_5 = callPackage ../applications/science/logic/coq {
version = "8.5pl3";
};
coq_8_6 = callPackage ../applications/science/logic/coq {};
coq_8_7 = callPackage ../applications/science/logic/coq {
version = "8.7.1";
};
mkCoqPackages = self: coq: let callPackage = newScope self; in rec {
inherit callPackage coq;
coqPackages = self;
autosubst = callPackage ../development/coq-modules/autosubst {};
bignums = if stdenv.lib.versionAtLeast coq.coq-version "8.6"
then callPackage ../development/coq-modules/bignums {}
else null;
coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {};
coquelicot = callPackage ../development/coq-modules/coquelicot {};
dpdgraph = callPackage ../development/coq-modules/dpdgraph {};
flocq = callPackage ../development/coq-modules/flocq {};
heq = callPackage ../development/coq-modules/heq {};
HoTT = callPackage ../development/coq-modules/HoTT {};
interval = callPackage ../development/coq-modules/interval {};
mathcomp = callPackage ../development/coq-modules/mathcomp { };
metalib = callPackage ../development/coq-modules/metalib { };
paco = callPackage ../development/coq-modules/paco {};
ssreflect = callPackage ../development/coq-modules/ssreflect { };
QuickChick = callPackage ../development/coq-modules/QuickChick {};
CoLoR = callPackage ../development/coq-modules/CoLoR {};
math-classes = callPackage ../development/coq-modules/math-classes { };
fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};
equations = callPackage ../development/coq-modules/equations { };
coq-haskell = callPackage ../development/coq-modules/coq-haskell { };
category-theory = callPackage ../development/coq-modules/category-theory { };
};
coqPackages_8_5 = mkCoqPackages coqPackages_8_5 coq_8_5;
coqPackages_8_6 = mkCoqPackages coqPackages_8_6 coq_8_6;
coqPackages_8_7 = mkCoqPackages coqPackages_8_7 coq_8_7;
coqPackages = coqPackages_8_6;
coq = coqPackages.coq;
coq2html = callPackage ../applications/science/logic/coq2html { coq2html = callPackage ../applications/science/logic/coq2html {
make = pkgs.gnumake3; make = pkgs.gnumake3;

75
pkgs/top-level/coq-packages.nix Normal file
View File

@ -0,0 +1,75 @@
{ lib, callPackage, newScope
, gnumake3
, ocamlPackages_3_12_1
, ocamlPackages_4_02
}:
let
mkCoqPackages' = self: coq:
let callPackage = newScope self ; in rec {
inherit callPackage coq;
coqPackages = self;
autosubst = callPackage ../development/coq-modules/autosubst {};
bignums = if lib.versionAtLeast coq.coq-version "8.6"
then callPackage ../development/coq-modules/bignums {}
else null;
category-theory = callPackage ../development/coq-modules/category-theory { };
CoLoR = callPackage ../development/coq-modules/CoLoR {};
coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {};
coq-haskell = callPackage ../development/coq-modules/coq-haskell { };
coquelicot = callPackage ../development/coq-modules/coquelicot {};
dpdgraph = callPackage ../development/coq-modules/dpdgraph {};
equations = callPackage ../development/coq-modules/equations { };
fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {};
flocq = callPackage ../development/coq-modules/flocq {};
heq = callPackage ../development/coq-modules/heq {};
HoTT = callPackage ../development/coq-modules/HoTT {};
interval = callPackage ../development/coq-modules/interval {};
math-classes = callPackage ../development/coq-modules/math-classes { };
mathcomp = callPackage ../development/coq-modules/mathcomp { };
metalib = callPackage ../development/coq-modules/metalib { };
multinomials = callPackage ../development/coq-modules/multinomials {};
paco = callPackage ../development/coq-modules/paco {};
QuickChick = callPackage ../development/coq-modules/QuickChick {};
ssreflect = callPackage ../development/coq-modules/ssreflect { };
};
filterCoqPackages = coq:
lib.filterAttrs
(_: p:
let pred = p.compatibleCoqVersions or (_: true);
in pred coq.coq-version
);
in rec {
mkCoqPackages = coq:
let self = mkCoqPackages' self coq; in
filterCoqPackages coq self;
coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix {
make = gnumake3;
inherit (ocamlPackages_3_12_1) ocaml findlib;
camlp5 = ocamlPackages_3_12_1.camlp5_transitional;
lablgtk = ocamlPackages_3_12_1.lablgtk_2_14;
};
coq_8_4 = callPackage ../applications/science/logic/coq/8.4.nix {
inherit (ocamlPackages_4_02) ocaml findlib lablgtk;
camlp5 = ocamlPackages_4_02.camlp5_transitional;
};
coq_8_5 = callPackage ../applications/science/logic/coq {
version = "8.5pl3";
};
coq_8_6 = callPackage ../applications/science/logic/coq {
version = "8.6.1";
};
coq_8_7 = callPackage ../applications/science/logic/coq {};
coqPackages_8_5 = mkCoqPackages coq_8_5;
coqPackages_8_6 = mkCoqPackages coq_8_6;
coqPackages_8_7 = mkCoqPackages coq_8_7;
coqPackages = coqPackages_8_6;
coq = coqPackages.coq;
}

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

@ -7612,6 +7612,8 @@ in {
# See the Nixpkgs manual for examples on how to override the package set. # See the Nixpkgs manual for examples on how to override the package set.
django_hijack = callPackage ../development/python-modules/django-hijack { }; django_hijack = callPackage ../development/python-modules/django-hijack { };
django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { };
django_nose = buildPythonPackage rec { django_nose = buildPythonPackage rec {
name = "django-nose-${version}"; name = "django-nose-${version}";
version = "1.4.4"; version = "1.4.4";