Merge master into staging-next
This commit is contained in:
Frederik Rietdijk
commit
701375662b
3
.github/CODEOWNERS
vendored
3
.github/CODEOWNERS
vendored
@ -123,3 +123,6 @@
|
||||
|
||||
# Idris
|
||||
/pkgs/development/idris-modules @Infinisil
|
||||
|
||||
# Bazel
|
||||
/pkgs/development/tools/build-managers/bazel @mboes @Profpatsch
|
||||
|
||||
@ -4853,6 +4853,11 @@
|
||||
github = "umazalakain";
|
||||
name = "Unai Zalakain";
|
||||
};
|
||||
zaninime = {
|
||||
email = "francesco@zanini.me";
|
||||
github = "zaninime";
|
||||
name = "Francesco Zanini";
|
||||
};
|
||||
zarelit = {
|
||||
email = "david@zarel.net";
|
||||
github = "zarelit";
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<listitem>
|
||||
<para>
|
||||
The default Python 3 interpreter is now CPython 3.7 instead of CPython 3.6.
|
||||
<para />
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
|
||||
@ -269,7 +269,7 @@ in
|
||||
|
||||
};
|
||||
|
||||
config = mkIf (config.fonts.fontconfig.enable && cfg.enable) {
|
||||
config = mkIf (config.fonts.fontconfig.enable && config.fonts.fontconfig.penultimate.enable) {
|
||||
|
||||
fonts.fontconfig.confPackages = [ penultimateConf ];
|
||||
|
||||
|
||||
@ -77,7 +77,7 @@ in
|
||||
|
||||
systemd.packages = [ pkgs.gnupg ];
|
||||
|
||||
environment.extraInit = ''
|
||||
environment.interactiveShellInit = ''
|
||||
# Bind gpg-agent to this TTY if gpg commands are used.
|
||||
export GPG_TTY=$(tty)
|
||||
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, pkgconfig, git, doxygen, graphviz
|
||||
, boost, miniupnpc, openssl, unbound, cppzmq
|
||||
, zeromq, pcsclite, readline
|
||||
, zeromq, pcsclite, readline, libsodium
|
||||
}:
|
||||
|
||||
let
|
||||
version = "0.12.0.0";
|
||||
version = "0.12.6.0";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "aeon-${version}";
|
||||
@ -12,16 +12,16 @@ stdenv.mkDerivation {
|
||||
src = fetchFromGitHub {
|
||||
owner = "aeonix";
|
||||
repo = "aeon";
|
||||
rev = "v${version}";
|
||||
rev = "v${version}-aeon";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1schzlscslhqq7zcd68b1smqlaf7k789x1rwpplm7qi5iz9a8cfr";
|
||||
sha256 = "19r1snqwixccl27jwv6i0s86qck036pdlhyhl891bbiyvi55h14n";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig git doxygen graphviz ];
|
||||
|
||||
buildInputs = [
|
||||
boost miniupnpc openssl unbound
|
||||
cppzmq zeromq pcsclite readline
|
||||
cppzmq zeromq pcsclite readline libsodium
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "drumkv1-${version}";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
|
||||
sha256 = "1z9l43z91d01b9rzam2cj9qmmg6s5y65fjvb83ms4iaa1p0mnwrn";
|
||||
sha256 = "0a38vpyyppjdwifidrhgj4bnsx4jjx413657s59j0r4q8rg55jca";
|
||||
};
|
||||
|
||||
buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ];
|
||||
|
||||
210
pkgs/applications/editors/emacs-modes/elpa-generated.nix
generated
210
pkgs/applications/editors/emacs-modes/elpa-generated.nix
generated
@ -39,10 +39,10 @@
|
||||
elpaBuild {
|
||||
pname = "ada-mode";
|
||||
ename = "ada-mode";
|
||||
version = "5.3.1";
|
||||
version = "5.3.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ada-mode-5.3.1.tar";
|
||||
sha256 = "0srna7w3y2nq0y80a01bcx8mg6gvind7nzvsbk9bd7rrr05njrd9";
|
||||
url = "https://elpa.gnu.org/packages/ada-mode-5.3.2.tar";
|
||||
sha256 = "1ayp4y8q201fny2far9p2ziji968f2svr7apvfrlwnnpkk3w9lif";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs wisi ];
|
||||
meta = {
|
||||
@ -69,10 +69,10 @@
|
||||
elpaBuild {
|
||||
pname = "adaptive-wrap";
|
||||
ename = "adaptive-wrap";
|
||||
version = "0.5.2";
|
||||
version = "0.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/adaptive-wrap-0.5.2.el";
|
||||
sha256 = "1qcf1cabn4wb34cdmlyk3rv5dl1dcrxrbaw38kly1prs6y4l22aw";
|
||||
url = "https://elpa.gnu.org/packages/adaptive-wrap-0.7.el";
|
||||
sha256 = "10fb8gzvkbnrgzv28n1rczs03dvapr7rvi0kd73j6yf1zg2iz6qp";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -313,10 +313,10 @@
|
||||
elpaBuild {
|
||||
pname = "brief";
|
||||
ename = "brief";
|
||||
version = "5.85";
|
||||
version = "5.87";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/brief-5.85.el";
|
||||
sha256 = "10a41qidns28cka0y25rapla58fzjy9c8cw9v9bmrm4gkjqapsv4";
|
||||
url = "https://elpa.gnu.org/packages/brief-5.87.tar";
|
||||
sha256 = "02z8fzzf1zsk2r0cnssz3i2nd4qwsnya4i2r4qi4ndc1xjlsvgwc";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -478,10 +478,10 @@
|
||||
elpaBuild {
|
||||
pname = "company";
|
||||
ename = "company";
|
||||
version = "0.9.6";
|
||||
version = "0.9.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/company-0.9.6.tar";
|
||||
sha256 = "0w1jqhs87g0sqhv2iw6a5i8f4yjkrc65fb3h6vyv11sb8kfnhda7";
|
||||
url = "https://elpa.gnu.org/packages/company-0.9.7.tar";
|
||||
sha256 = "17p61yzbgymr46y6vbz7pfvydp5hfkqckbwficwkpz0nq8gcklhs";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -576,10 +576,10 @@
|
||||
elpaBuild {
|
||||
pname = "crisp";
|
||||
ename = "crisp";
|
||||
version = "1.3.4";
|
||||
version = "1.3.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/crisp-1.3.4.el";
|
||||
sha256 = "1xbnf7xlw499zsnr5ky2bghb2fzg3g7cf2ldmbb7c3b84raryn0i";
|
||||
url = "https://elpa.gnu.org/packages/crisp-1.3.6.el";
|
||||
sha256 = "0jf4668h0mzh8han2vbvpzz8m02b8rsbdrj0ddar30w5i6v2f8kz";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -670,10 +670,10 @@
|
||||
elpaBuild {
|
||||
pname = "debbugs";
|
||||
ename = "debbugs";
|
||||
version = "0.15";
|
||||
version = "0.16";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/debbugs-0.15.tar";
|
||||
sha256 = "1x7jw2ldgkknyxg7x9fhnqkary691icnysmi3xw0g2fjrvllzhqw";
|
||||
url = "https://elpa.gnu.org/packages/debbugs-0.16.tar";
|
||||
sha256 = "0y3bq803c7820h15g66d1648skxfhlfa2v6vincj6xk5ssp44s9p";
|
||||
};
|
||||
packageRequires = [ cl-lib soap-client ];
|
||||
meta = {
|
||||
@ -745,10 +745,10 @@
|
||||
elpaBuild {
|
||||
pname = "dired-du";
|
||||
ename = "dired-du";
|
||||
version = "0.5";
|
||||
version = "0.5.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/dired-du-0.5.tar";
|
||||
sha256 = "09yj37p2fa5f81fqrzwghjkyy2ydsf4rbkfwpn2yyvzd5nd97bpl";
|
||||
url = "https://elpa.gnu.org/packages/dired-du-0.5.1.tar";
|
||||
sha256 = "1091scnrjh0a4gja4z6jxic6ghy1yryv46qk9c76pmh50cpw6766";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -915,10 +915,10 @@
|
||||
elpaBuild {
|
||||
pname = "el-search";
|
||||
ename = "el-search";
|
||||
version = "1.7.9";
|
||||
version = "1.7.15";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/el-search-1.7.9.tar";
|
||||
sha256 = "06da4v03zis1mf09v61c1jzkp5x6drm61iakcbpy5hkdq8nvm3xc";
|
||||
url = "https://elpa.gnu.org/packages/el-search-1.7.15.tar";
|
||||
sha256 = "000z8vllz53vmfblsrxjm2nc4h9lcyxw8xxqfxxyl99zhfiikjai";
|
||||
};
|
||||
packageRequires = [ cl-print emacs stream ];
|
||||
meta = {
|
||||
@ -1017,10 +1017,10 @@
|
||||
elpaBuild {
|
||||
pname = "excorporate";
|
||||
ename = "excorporate";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/excorporate-0.8.0.tar";
|
||||
sha256 = "0sx04w7yp2byda0maifsmapqmq6w43r114a6gzqar0j82rsc0mfg";
|
||||
url = "https://elpa.gnu.org/packages/excorporate-0.8.1.tar";
|
||||
sha256 = "1k89472x80wsn14y16km5bgynmmd2kbdfhylb3cc17jvdn1xr53y";
|
||||
};
|
||||
packageRequires = [ emacs fsm nadvice soap-client url-http-ntlm ];
|
||||
meta = {
|
||||
@ -1032,10 +1032,10 @@
|
||||
elpaBuild {
|
||||
pname = "exwm";
|
||||
ename = "exwm";
|
||||
version = "0.19";
|
||||
version = "0.20";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/exwm-0.19.tar";
|
||||
sha256 = "11xd2w4h3zdwkdxypvmcz8s7q72cn76lfr9js77jbizyj6b04lr0";
|
||||
url = "https://elpa.gnu.org/packages/exwm-0.20.tar";
|
||||
sha256 = "0nhhzbkm0mkj7sd1dy2c19cmn56gyaj9nl8kgy86h4fp63hjaz04";
|
||||
};
|
||||
packageRequires = [ xelb ];
|
||||
meta = {
|
||||
@ -1088,6 +1088,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
fountain-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "fountain-mode";
|
||||
ename = "fountain-mode";
|
||||
version = "2.6.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/fountain-mode-2.6.1.el";
|
||||
sha256 = "0p0h28cmryhsgrp2ghk28i1xkfz4gvdwaa38galn4jksn9dh0dyb";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/fountain-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
frame-tabs = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "frame-tabs";
|
||||
@ -1182,10 +1197,10 @@
|
||||
elpaBuild {
|
||||
pname = "gnorb";
|
||||
ename = "gnorb";
|
||||
version = "1.5.5";
|
||||
version = "1.6.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/gnorb-1.5.5.tar";
|
||||
sha256 = "02l9snarsnzwp9w284wiylbd596g0f9bmahb1nybr14vh64ygh3r";
|
||||
url = "https://elpa.gnu.org/packages/gnorb-1.6.0.tar";
|
||||
sha256 = "0nssrnrf083mw7kllp0hkxdkklvildzmslcs1r3zf2hnl1ggfs8y";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
@ -1213,6 +1228,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
gnus-mock = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "gnus-mock";
|
||||
ename = "gnus-mock";
|
||||
version = "0.3.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/gnus-mock-0.3.0.tar";
|
||||
sha256 = "02z3f8njwv480fff57dbrf7nhmwbgm4apzicnzwmip5j4a6w5q0n";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/gnus-mock.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
heap = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "heap";
|
||||
@ -1249,10 +1279,10 @@
|
||||
elpaBuild {
|
||||
pname = "highlight-escape-sequences";
|
||||
ename = "highlight-escape-sequences";
|
||||
version = "0.3";
|
||||
version = "0.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/highlight-escape-sequences-0.3.el";
|
||||
sha256 = "0q54h0zdaflr2sk4mwgm2ix8cdq4rm4pz03ln430qxc1zm8pz6gy";
|
||||
url = "https://elpa.gnu.org/packages/highlight-escape-sequences-0.4.el";
|
||||
sha256 = "1z8r9rnppn7iy7xv4kprfsqxday16h7c471i7rkyi3rv3l0pfxd0";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -1594,10 +1624,10 @@
|
||||
elpaBuild {
|
||||
pname = "markchars";
|
||||
ename = "markchars";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/markchars-0.2.0.el";
|
||||
sha256 = "1wn9v9jzcyq5wxhw5839jsggfy97955ngspn2gn6jmvz6zdgy4hv";
|
||||
url = "https://elpa.gnu.org/packages/markchars-0.2.1.el";
|
||||
sha256 = "0dpq3brblcxjkcqv3xsmlsx5z9zbv94v0kg4j1sic3brz6hbl4lk";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -1774,10 +1804,10 @@
|
||||
elpaBuild {
|
||||
pname = "nadvice";
|
||||
ename = "nadvice";
|
||||
version = "0.2";
|
||||
version = "0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/nadvice-0.2.el";
|
||||
sha256 = "094slkgw4f7cd88r76d0rgpbqr7zzwy19ssndg8v3sm4p5ld6vwg";
|
||||
url = "https://elpa.gnu.org/packages/nadvice-0.3.el";
|
||||
sha256 = "0gi3csnxbs8h7iy0scsl35sic3gv90swa89hhdjwb7qvpirfdcgw";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -1800,7 +1830,12 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
names = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
|
||||
names = callPackage ({ cl-lib ? null
|
||||
, elpaBuild
|
||||
, emacs
|
||||
, fetchurl
|
||||
, lib
|
||||
, nadvice }:
|
||||
elpaBuild {
|
||||
pname = "names";
|
||||
ename = "names";
|
||||
@ -1809,7 +1844,7 @@
|
||||
url = "https://elpa.gnu.org/packages/names-20151201.0.tar";
|
||||
sha256 = "13smsf039x4yd7pzvllgn1vz8lhkwghnhip9y2bka38vk37w912d";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
packageRequires = [ cl-lib emacs nadvice ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/names.html";
|
||||
license = lib.licenses.free;
|
||||
@ -1823,10 +1858,10 @@
|
||||
elpaBuild {
|
||||
pname = "nhexl-mode";
|
||||
ename = "nhexl-mode";
|
||||
version = "0.9";
|
||||
version = "1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/nhexl-mode-0.9.el";
|
||||
sha256 = "1xdr0z5nlfqsyrmj3cwgfp6qlirhr46ggawr7pr2ipnp64wgnmkc";
|
||||
url = "https://elpa.gnu.org/packages/nhexl-mode-1.0.el";
|
||||
sha256 = "1bf0jfim41m08ac4p4zxjj6qqw7f86gwiwyvfjg68n2nzbzgz1i9";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -1958,10 +1993,10 @@
|
||||
elpaBuild {
|
||||
pname = "orgalist";
|
||||
ename = "orgalist";
|
||||
version = "1.8";
|
||||
version = "1.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/orgalist-1.8.el";
|
||||
sha256 = "1wqwnmn08i0qkxm8b2iclvf6cydcn68h1p3h7r1kig2bdn5b8948";
|
||||
url = "https://elpa.gnu.org/packages/orgalist-1.9.el";
|
||||
sha256 = "1rmmcyiiqkq54hn74nhzxzl4nvd902hv6gq341jwhrm7yiagffi6";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
@ -2397,10 +2432,10 @@
|
||||
elpaBuild {
|
||||
pname = "sml-mode";
|
||||
ename = "sml-mode";
|
||||
version = "6.8";
|
||||
version = "6.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/sml-mode-6.8.el";
|
||||
sha256 = "105fcrz5qp95f2n3fdm3awr6z58sbrjihjss6qnrg4lz2ggbc328";
|
||||
url = "https://elpa.gnu.org/packages/sml-mode-6.9.el";
|
||||
sha256 = "1bdg9ywpvj85hxqah9w1raxlcrhkyx67nw22jwd1bd5j0fhmgqij";
|
||||
};
|
||||
packageRequires = [ cl-lib emacs ];
|
||||
meta = {
|
||||
@ -2412,10 +2447,10 @@
|
||||
elpaBuild {
|
||||
pname = "soap-client";
|
||||
ename = "soap-client";
|
||||
version = "3.1.4";
|
||||
version = "3.1.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/soap-client-3.1.4.tar";
|
||||
sha256 = "0q59abh2dmp7z0bcn672n9c2cfhg1xvxv1h9m9pwn97jw0ylf4mc";
|
||||
url = "https://elpa.gnu.org/packages/soap-client-3.1.5.tar";
|
||||
sha256 = "0nnf075ywxmsfd6vmzk2yg3khx6sycl5l6qrgp5rqqmw0wzhxlh0";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
@ -2472,10 +2507,10 @@
|
||||
elpaBuild {
|
||||
pname = "sql-indent";
|
||||
ename = "sql-indent";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/sql-indent-1.2.tar";
|
||||
sha256 = "0rbkj46gkn1dh5avrhxzhkb01ajm9q3iqfp10lgp3f4w1m2bhab4";
|
||||
url = "https://elpa.gnu.org/packages/sql-indent-1.3.tar";
|
||||
sha256 = "0zira8my1q975bad2h76bz4yddjzf0dskvy6x865np86rmzd0c9w";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
@ -2483,6 +2518,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ssh-deploy = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "ssh-deploy";
|
||||
ename = "ssh-deploy";
|
||||
version = "2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ssh-deploy-2.0.tar";
|
||||
sha256 = "0mrgnandnqk25bx3x2a7hdw7pmjiq24w2lad7l2xqaqpwb8r6wgj";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/ssh-deploy.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "stream";
|
||||
@ -2747,6 +2797,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
visual-fill = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "visual-fill";
|
||||
ename = "visual-fill";
|
||||
version = "0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/visual-fill-0.1.el";
|
||||
sha256 = "1y4xqcr1am74y9jy7kdkjigvx7h3208si5lm4p6a0kzxa3xizhvx";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/visual-fill.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
vlf = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "vlf";
|
||||
@ -2901,10 +2966,10 @@
|
||||
elpaBuild {
|
||||
pname = "xclip";
|
||||
ename = "xclip";
|
||||
version = "1.4";
|
||||
version = "1.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/xclip-1.4.el";
|
||||
sha256 = "12rw790wzj10jcsqf292hc7qx18ybyay8jqji4shmrv16igrzl6p";
|
||||
url = "https://elpa.gnu.org/packages/xclip-1.5.el";
|
||||
sha256 = "1fyqyi0672igjn53xlaj8hzbymkw08pk6wj58ndbrnm410g0h0i9";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -2916,10 +2981,10 @@
|
||||
elpaBuild {
|
||||
pname = "xelb";
|
||||
ename = "xelb";
|
||||
version = "0.15";
|
||||
version = "0.16";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/xelb-0.15.tar";
|
||||
sha256 = "031rvgprsqhf344p9wsczr50vj2qcpwdmhxi80jdbrsm7wyxf3qz";
|
||||
url = "https://elpa.gnu.org/packages/xelb-0.16.tar";
|
||||
sha256 = "03wsr1jr7f7zfd80h864rd4makwh4widdnj1kjv2xyjwdgap9rl8";
|
||||
};
|
||||
packageRequires = [ cl-generic emacs ];
|
||||
meta = {
|
||||
@ -2975,6 +3040,21 @@
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
zones = callPackage ({ elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "zones";
|
||||
ename = "zones";
|
||||
version = "2018.11.13";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/zones-2018.11.13.el";
|
||||
sha256 = "0716m9s5qjp5w3gdlx0p53qrfylw6mhdmic88qmsndmhkijsrax4";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/zones.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
ztree = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "ztree";
|
||||
|
||||
@ -19,13 +19,13 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "emacs-libvterm-${version}";
|
||||
version = "unstable-2017-11-24";
|
||||
version = "unstable-2018-11-16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "akermu";
|
||||
repo = "emacs-libvterm";
|
||||
rev = "829ae86f60c3a54048804997edffa161c77a2f4b";
|
||||
sha256 = "1xb24kpvypvskh4vr3b45nl2m2vsczcr9rnsr2sjzf32mnapyjnp";
|
||||
rev = "8be9316156be75a685c0636258b2fec2daaf5ab5";
|
||||
sha256 = "059js4aa7xgqcpaicgy4gz683hppa1iyp1r98mnms5hd31a304k8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@ -36,6 +36,6 @@ in stdenv.mkDerivation rec {
|
||||
installPhase = ''
|
||||
install -d $out/share/emacs/site-lisp
|
||||
install ../*.el $out/share/emacs/site-lisp
|
||||
install ../*.so $out/share/emacs/site-lisp
|
||||
install ./*.so $out/share/emacs/site-lisp
|
||||
'';
|
||||
}
|
||||
|
||||
13340
pkgs/applications/editors/emacs-modes/melpa-generated.nix
generated
13340
pkgs/applications/editors/emacs-modes/melpa-generated.nix
generated
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -4,10 +4,10 @@
|
||||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "20180910";
|
||||
version = "20181119";
|
||||
src = fetchurl {
|
||||
url = "http://orgmode.org/elpa/org-20180910.tar";
|
||||
sha256 = "1j4n0a07bxjbdzx3dipxgi0h5r0yimwylp9cnzfm6m7nc7kas2sq";
|
||||
url = "http://orgmode.org/elpa/org-20181119.tar";
|
||||
sha256 = "0li6mx0kv70js3mlw7wxk1yi8kgc3nxnb87kdb7jy68xh4lsila7";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
@ -19,10 +19,10 @@
|
||||
elpaBuild {
|
||||
pname = "org-plus-contrib";
|
||||
ename = "org-plus-contrib";
|
||||
version = "20180910";
|
||||
version = "20181119";
|
||||
src = fetchurl {
|
||||
url = "http://orgmode.org/elpa/org-plus-contrib-20180910.tar";
|
||||
sha256 = "17inl07kjdjamlqbyxbp42kx1nkbhbhz7lzqfvkhk6s7z16qvksq";
|
||||
url = "http://orgmode.org/elpa/org-plus-contrib-20181119.tar";
|
||||
sha256 = "0dz0vn2xyidifrwrd604yknyq843i31jcc8qgsi6wib29rh7zzpa";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
{ fetchurl, stdenv, texinfo, emacs, bbdb }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
# Note: Remember is part of GNU Emacs 23.
|
||||
name = "remember-2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.gna.org/remember-el/${name}.tar.gz";
|
||||
sha256 = "04bp071xjbb6mbspjpwcza0krgx2827v6rfxbsdcpn0qcjgad9wm";
|
||||
};
|
||||
|
||||
# FIXME: It also has a (soft) dependency on Planner and Bibl-mode.
|
||||
buildInputs = [ emacs bbdb texinfo ];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i "Makefile.defs" \
|
||||
-e"s|^ *PREFIX *=.*$|PREFIX = $out|g ;
|
||||
s|^ *ELISPDIR *=.*$|ELISPDIR = $out/share/emacs/site-lisp|g ;
|
||||
s|^ *EMACS *=.*$|EMACS = emacs -L \"${bbdb}/share/emacs/site-lisp\"|g"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Remember, an Emacs mode for quickly remembering data";
|
||||
|
||||
longDescription = ''
|
||||
Remember is an Emacs mode for quickly remembering data. It uses
|
||||
whatever back-end is appropriate to record and correlate the
|
||||
data, but its main intention is to allow you to express as
|
||||
little structure as possible up front.
|
||||
|
||||
When you enter data, either by typing it into a buffer, or using
|
||||
the contents of the selected region, Remember will store that
|
||||
data -- unindexed, uninterpreted -- in a data pool. It will
|
||||
also try to remember as much context information as possible
|
||||
(any text properties that were set, where you copied it from,
|
||||
when, how, etc). Later, you can walk through your accumulated
|
||||
set of data (both organized, and unorganized) and easily begin
|
||||
moving things around, and making annotations that will express
|
||||
the full meaning of that data, as far as you know it.
|
||||
'';
|
||||
|
||||
homepage = http://gna.org/projects/remember-el/;
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
};
|
||||
}
|
||||
@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
|
||||
sed -ie 's#--no-xmllint#--no-xmllint --xsltproc-opts="--nonet"#g' Makefile
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
export version="v${version}"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://kakoune.org/;
|
||||
description = "A vim inspired text editor";
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
{ stdenv, fetchsvn
|
||||
, wrapGAppsHook, makeWrapper, gettext
|
||||
, python3Packages, gtk3, poppler_gi
|
||||
, gnome3, gsettings-desktop-schemas, shared-mime-info,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
name = "pdfshuffler-unstable-2017-02-26"; # no official release in 5 years
|
||||
|
||||
src = fetchsvn {
|
||||
url = "http://svn.gna.org/svn/pdfshuffler/trunk";
|
||||
rev = "20";
|
||||
sha256 = "1g20dy45xg5vda9y58d2b1gkczj44xgrfi59jx6hr62ynd3z0dfc";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook gettext makeWrapper ];
|
||||
|
||||
buildInputs = [
|
||||
gtk3 gsettings-desktop-schemas poppler_gi gnome3.adwaita-icon-theme
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pygobject3
|
||||
pycairo
|
||||
pypdf2
|
||||
];
|
||||
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
|
||||
'';
|
||||
|
||||
doCheck = false; # no tests
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://sourceforge.net/p/pdfshuffler/wiki/Home;
|
||||
description = "Merge or split pdf documents and rotate, crop and rearrange their pages";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ mic92 ];
|
||||
license = licenses.gpl3;
|
||||
};
|
||||
}
|
||||
@ -100,11 +100,11 @@ let
|
||||
|
||||
flash = stdenv.mkDerivation rec {
|
||||
name = "flashplayer-ppapi-${version}";
|
||||
version = "31.0.0.148";
|
||||
version = "31.0.0.153";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
|
||||
sha256 = "1kvmsdg0qsq3jdhrlqqxxy33bjz8nc5rjy59ly4hhnp994szcx0s";
|
||||
sha256 = "0c7vh1h9lzx09njf7w1acvj2v91girlzflqxzli8nxza7pd1zb2v";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@ -74,7 +74,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "flashplayer-${version}";
|
||||
version = "31.0.0.148";
|
||||
version = "31.0.0.153";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
|
||||
sha256 =
|
||||
if debug then
|
||||
if arch == "x86_64" then
|
||||
"0cwsj4gn5m7caj5cjqjpf180pfjgyss9zp6zf2r728xbjjw87mc7"
|
||||
"0d3ch1ksxra8hvbqnzj5fmbvlz6hq42b3rncx4vpjlwrcjd9ggy9"
|
||||
else
|
||||
"0yvj5k3dpzp3iydv4z6mw0kz64l7nfrwswb48jyyh519z81cj7vv"
|
||||
"1qldcashv1x64cvpbx1741hz32rmc0dp7i3ayhpbi15rvf95qx8f"
|
||||
else
|
||||
if arch == "x86_64" then
|
||||
"1apgikb8rsmgmfkk9mcffslkww9jj5wgi998imaqgr7ibyfl19bk"
|
||||
"114n3kvdyfmn2w6w6zbijx29fz10x3cbjyy3ci05n0y07lhq1grc"
|
||||
else
|
||||
"03yh0rvgdssjxj4dvfan0qp9z9qwyvxzdv00idk3mj0v9japhyn2";
|
||||
"0sxvjf3xylm4bmhianyfy54gzbm4gkq1i9q8gg4fn3nb3c0z7327";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@ -50,7 +50,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "flashplayer-standalone-${version}";
|
||||
version = "31.0.0.148";
|
||||
version = "31.0.0.153";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
@ -60,9 +60,9 @@ stdenv.mkDerivation rec {
|
||||
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_sa_linux.x86_64.tar.gz";
|
||||
sha256 =
|
||||
if debug then
|
||||
"08ysnbnsfs741w9bi0mfl62jhvj8fxh2in1kbp9xzzc40z3yqngn"
|
||||
"1k78nwrz5zbsj5jvn340n2y4dz1zxrcb7f7955d8dra15w0zax1k"
|
||||
else
|
||||
"0j7qw3iqswgc5df6zzm9jw0yf2mc7r29cp10b1y5p1ys0hrpm33d";
|
||||
"0ajg3p4c36xzvvjl2hpbzn2g3xwjgf2xy6x4478aq7fxfgb0vf6s";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cni-plugins-${version}";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containernetworking";
|
||||
repo = "plugins";
|
||||
rev = "v${version}";
|
||||
sha256 = "1saaszzxy4x3jkqd9ac6cphmzfim7x84h28c9i7az46px40blzm1";
|
||||
sha256 = "1sywllwnr6lc812sgkqjdd3y10r82shl88dlnwgnbgzs738q2vp2";
|
||||
};
|
||||
|
||||
buildInputs = [ go ];
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
let configFile = writeText "riot-config.json" conf; in
|
||||
stdenv.mkDerivation rec {
|
||||
name= "riot-web-${version}";
|
||||
version = "0.17.3";
|
||||
version = "0.17.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
|
||||
sha256 = "16grvk780k9sfqcj3ab0szcwxjq5ybdh34dpp7n26pckk8hzypaw";
|
||||
sha256 = "1y38fq0r9cxmazh9rjc5qy7fzwy81ad35k538d6rsfwz1y88ipdm";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "ipfs-cluster-${version}";
|
||||
version = "0.5.0";
|
||||
version = "0.7.0";
|
||||
rev = "v${version}";
|
||||
|
||||
goPackagePath = "github.com/ipfs/ipfs-cluster";
|
||||
@ -10,7 +10,7 @@ buildGoPackage rec {
|
||||
extraSrcPaths = [
|
||||
(fetchgx {
|
||||
inherit name src;
|
||||
sha256 = "0jwz3kd07i5fs0sxds80j8d338skhgxgxra377qxsk0cr2hhj2vm";
|
||||
sha256 = "19ljx4q9msrv5wwyd85l01l320lhwgma5z3b756ldgj9fs8p9ph6";
|
||||
})
|
||||
];
|
||||
|
||||
@ -18,7 +18,7 @@ buildGoPackage rec {
|
||||
owner = "ipfs";
|
||||
repo = "ipfs-cluster";
|
||||
inherit rev;
|
||||
sha256 = "132whjyplcifq8747hcdrgbc0amhp618dg049jq5nyslcxfgdypm";
|
||||
sha256 = "1zqy4zzi33z16fny1dnhqa8z7czrggvbxdxs750gxzbnd9vqzda1";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gx-go ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "ipfs-${version}";
|
||||
version = "0.4.17";
|
||||
version = "0.4.18";
|
||||
rev = "v${version}";
|
||||
|
||||
goPackagePath = "github.com/ipfs/go-ipfs";
|
||||
@ -10,7 +10,7 @@ buildGoPackage rec {
|
||||
extraSrcPaths = [
|
||||
(fetchgx {
|
||||
inherit name src;
|
||||
sha256 = "0grdgnr67r3qh0ppc3flrhcw8zlvx10mxypd8q2mhkil9w4dpcna";
|
||||
sha256 = "05d5m6c2i2kl4rvb0hddyqbidn76ljr2zryi8v2r9i8dbi0164gm";
|
||||
})
|
||||
];
|
||||
|
||||
@ -18,7 +18,7 @@ buildGoPackage rec {
|
||||
owner = "ipfs";
|
||||
repo = "go-ipfs";
|
||||
inherit rev;
|
||||
sha256 = "18skmchdqd54wfqhibscqvc360l5ig6vmxd73ivf3bcpj3zvgq7q";
|
||||
sha256 = "0h4j18qpycfmmlhb9khvhbk8c1zqajflvw8gk3l8j7wxrxh5j2s6";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "iprover-${version}";
|
||||
version = "2.5";
|
||||
version = "2018_Jul_24_11h";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.cs.man.ac.uk/~korovink/iprover/iprover-v${version}.tar.gz";
|
||||
sha256 = "1mbxjczp6nqw0p33glqmw973c268yzy4gxflk1lfiyiihrjdhinb";
|
||||
url = "http://www.cs.man.ac.uk/~korovink/iprover/iprover_${version}.tar.gz";
|
||||
sha256 = "1iqim11flzm56aaysasl5whajcv1gq31hkidaqfr8ww7kwl1h06p";
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml eprover zlib ];
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gromacs-2018.3";
|
||||
name = "gromacs-2018.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.3.tar.gz";
|
||||
sha256 = "14d219987h98mv5xgn2846snmslwax8z3cgp5b2njacp4j9a88s4";
|
||||
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.4.tar.gz";
|
||||
sha256 = "14d8mbck1lrmz97vvy322irk557wxh0zdd6n962lm69hqxcf8bkg";
|
||||
};
|
||||
|
||||
buildInputs = [cmake fftw]
|
||||
|
||||
30
pkgs/data/icons/zafiro-icons/default.nix
Normal file
30
pkgs/data/icons/zafiro-icons/default.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{ stdenv, fetchFromGitHub, gtk3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "zafiro-icons";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zayronxio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1rs3wazmvidlkig5q7x1n9nz7jhfq18wps3wsplax9zcdy0hv248";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gtk3 ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/icons/Zafiro
|
||||
cp -a * $out/share/icons/Zafiro
|
||||
gtk-update-icon-cache "$out"/share/icons/Zafiro
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Icon pack flat with light colors";
|
||||
homepage = https://github.com/zayronxio/Zafiro-icons;
|
||||
license = with licenses; [ gpl3 ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ romildo ];
|
||||
};
|
||||
}
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "closure-compiler-${version}";
|
||||
version = "20180910";
|
||||
version = "20181008";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
|
||||
sha256 = "12k4cp9f8g03k3zf2g70pn6ybx8gk0hfh81ypiyb5hkfij95bi9k";
|
||||
sha256 = "1zh6q7fgwjk2p4bivvpcwgn1657jc557zrgibwpyvbwm87mb57wv";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@ -51,46 +51,17 @@
|
||||
# that the default of ~/.elm isn't used.
|
||||
|
||||
let
|
||||
makeDotElm = ver: deps:
|
||||
let versionsDat = ./versions.dat;
|
||||
cmds = lib.mapAttrsToList (name: info: let
|
||||
pkg = stdenv.mkDerivation {
|
||||
|
||||
name = lib.replaceChars ["/"] ["-"] name + "-${info.version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/${name}/archive/${info.version}.tar.gz";
|
||||
meta.homepage = "https://github.com/${name}/";
|
||||
inherit (info) sha256;
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r * $out
|
||||
'';
|
||||
|
||||
};
|
||||
in ''
|
||||
mkdir -p .elm/${ver}/package/${name}
|
||||
cp -R ${pkg} .elm/${ver}/package/${name}/${info.version}
|
||||
'') deps;
|
||||
in (lib.concatStrings cmds) + ''
|
||||
mkdir -p .elm/${ver}/package;
|
||||
cp ${versionsDat} .elm/${ver}/package/versions.dat;
|
||||
chmod -R +w .elm
|
||||
'';
|
||||
|
||||
fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; };
|
||||
hsPkgs = haskell.packages.ghc822.override {
|
||||
overrides = self: super: with haskell.lib;
|
||||
let elmPkgs = {
|
||||
elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: {
|
||||
# sadly with parallelism most of the time breaks compilation
|
||||
enableParallelBuilding = false;
|
||||
preConfigure = ''
|
||||
export ELM_HOME=`pwd`/.elm
|
||||
'' + (makeDotElm "0.19.0" (import ./packages/elm-elm.nix));
|
||||
preConfigure = fetchElmDeps {
|
||||
elmPackages = (import ./packages/elm-elm.nix);
|
||||
versionsDat = ./versions.dat;
|
||||
};
|
||||
buildTools = drv.buildTools or [] ++ [ makeWrapper ];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
@ -111,6 +82,7 @@ let
|
||||
`pacakge/nix/build.sh`
|
||||
*/
|
||||
elm-format = self.callPackage ./packages/elm-format.nix {};
|
||||
inherit fetchElmDeps;
|
||||
};
|
||||
in elmPkgs // {
|
||||
inherit elmPkgs;
|
||||
|
||||
11
pkgs/development/compilers/elm/fetchElmDeps.nix
Normal file
11
pkgs/development/compilers/elm/fetchElmDeps.nix
Normal file
@ -0,0 +1,11 @@
|
||||
{stdenv, lib, fetchurl}:
|
||||
|
||||
{elmPackages, versionsDat}:
|
||||
|
||||
let
|
||||
makeDotElm = import ./makeDotElm.nix {inherit stdenv lib fetchurl versionsDat;};
|
||||
|
||||
in
|
||||
''
|
||||
export ELM_HOME=`pwd`/.elm
|
||||
'' + (makeDotElm "0.19.0" elmPackages)
|
||||
30
pkgs/development/compilers/elm/makeDotElm.nix
Normal file
30
pkgs/development/compilers/elm/makeDotElm.nix
Normal file
@ -0,0 +1,30 @@
|
||||
{stdenv, lib, fetchurl, versionsDat}:
|
||||
|
||||
ver: deps:
|
||||
let cmds = lib.mapAttrsToList (name: info: let
|
||||
pkg = stdenv.mkDerivation {
|
||||
name = lib.replaceChars ["/"] ["-"] name + "-${info.version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/${name}/archive/${info.version}.tar.gz";
|
||||
meta.homepage = "https://github.com/${name}/";
|
||||
inherit (info) sha256;
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
cp -r * $out
|
||||
'';
|
||||
|
||||
};
|
||||
in ''
|
||||
mkdir -p .elm/${ver}/package/${name}
|
||||
cp -R ${pkg} .elm/${ver}/package/${name}/${info.version}
|
||||
'') deps;
|
||||
in (lib.concatStrings cmds) + ''
|
||||
mkdir -p .elm/${ver}/package;
|
||||
cp ${versionsDat} .elm/${ver}/package/versions.dat;
|
||||
chmod -R +w .elm
|
||||
''
|
||||
52
pkgs/development/coq-modules/Cheerios/default.nix
Normal file
52
pkgs/development/coq-modules/Cheerios/default.nix
Normal file
@ -0,0 +1,52 @@
|
||||
{ stdenv, fetchFromGitHub, coq, StructTact }:
|
||||
|
||||
let params =
|
||||
{
|
||||
"8.6" = {
|
||||
version = "20181102";
|
||||
rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2";
|
||||
sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q";
|
||||
};
|
||||
|
||||
"8.7" = {
|
||||
version = "20181102";
|
||||
rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2";
|
||||
sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q";
|
||||
};
|
||||
|
||||
"8.8" = {
|
||||
version = "20181102";
|
||||
rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2";
|
||||
sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q";
|
||||
};
|
||||
|
||||
"8.9" = {
|
||||
version = "20181102";
|
||||
rev = "04da309304bdd28a1f7dacca9fdf8696204a4ff2";
|
||||
sha256 = "1xfa78p70c90favds1mv1vj5sr9bv0ad3dsgg05v3v72006g2f1q";
|
||||
};
|
||||
};
|
||||
param = params."${coq.coq-version}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "coq${coq.coq-version}-Cheerios-${param.version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uwplse";
|
||||
repo = "cheerios";
|
||||
inherit (param) rev sha256;
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
coq coq.ocaml coq.camlp5 coq.findlib StructTact
|
||||
];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildPhase = "make -j$NIX_BUILD_CORES";
|
||||
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
|
||||
|
||||
passthru = {
|
||||
compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ];
|
||||
};
|
||||
}
|
||||
58
pkgs/development/coq-modules/InfSeqExt/default.nix
Normal file
58
pkgs/development/coq-modules/InfSeqExt/default.nix
Normal file
@ -0,0 +1,58 @@
|
||||
{ stdenv, fetchFromGitHub, coq, mathcomp }:
|
||||
|
||||
let params =
|
||||
{
|
||||
"8.5" = {
|
||||
version = "20180918";
|
||||
rev = "243d6be45666da73a9da6c37d451327165275798";
|
||||
sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn";
|
||||
};
|
||||
|
||||
"8.6" = {
|
||||
version = "20180918";
|
||||
rev = "243d6be45666da73a9da6c37d451327165275798";
|
||||
sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn";
|
||||
};
|
||||
|
||||
"8.7" = {
|
||||
version = "20180918";
|
||||
rev = "243d6be45666da73a9da6c37d451327165275798";
|
||||
sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn";
|
||||
};
|
||||
|
||||
"8.8" = {
|
||||
version = "20180918";
|
||||
rev = "243d6be45666da73a9da6c37d451327165275798";
|
||||
sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn";
|
||||
};
|
||||
|
||||
"8.9" = {
|
||||
version = "20180918";
|
||||
rev = "243d6be45666da73a9da6c37d451327165275798";
|
||||
sha256 = "1nh2psb4pcppy1akk24ilb4p08m35cba357i4xyymmarmbwqpxmn";
|
||||
};
|
||||
};
|
||||
param = params."${coq.coq-version}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "coq${coq.coq-version}-InfSeqExt-${param.version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DistributedComponents";
|
||||
repo = "InfSeqExt";
|
||||
inherit (param) rev sha256;
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
coq coq.ocaml coq.camlp5 coq.findlib mathcomp
|
||||
];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildPhase = "make -j$NIX_BUILD_CORES";
|
||||
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
|
||||
|
||||
passthru = {
|
||||
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ];
|
||||
};
|
||||
}
|
||||
58
pkgs/development/coq-modules/StructTact/default.nix
Normal file
58
pkgs/development/coq-modules/StructTact/default.nix
Normal file
@ -0,0 +1,58 @@
|
||||
{ stdenv, fetchFromGitHub, coq, mathcomp }:
|
||||
|
||||
let params =
|
||||
{
|
||||
"8.5" = {
|
||||
version = "20181102";
|
||||
rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
|
||||
sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
|
||||
};
|
||||
|
||||
"8.6" = {
|
||||
version = "20181102";
|
||||
rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
|
||||
sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
|
||||
};
|
||||
|
||||
"8.7" = {
|
||||
version = "20181102";
|
||||
rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
|
||||
sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
|
||||
};
|
||||
|
||||
"8.8" = {
|
||||
version = "20181102";
|
||||
rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
|
||||
sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
|
||||
};
|
||||
|
||||
"8.9" = {
|
||||
version = "20181102";
|
||||
rev = "82a85b7ec07e71fa6b30cfc05f6a7bfb09ef2510";
|
||||
sha256 = "08zry20flgj7qq37xk32kzmg4fg6d4wi9m7pf9aph8fd3j2a0b5v";
|
||||
};
|
||||
};
|
||||
param = params."${coq.coq-version}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "coq${coq.coq-version}-StructTact-${param.version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uwplse";
|
||||
repo = "StructTact";
|
||||
inherit (param) rev sha256;
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
coq coq.ocaml coq.camlp5 coq.findlib
|
||||
];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildPhase = "make -j$NIX_BUILD_CORES";
|
||||
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
|
||||
|
||||
passthru = {
|
||||
compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" "8.9" ];
|
||||
};
|
||||
}
|
||||
52
pkgs/development/coq-modules/Verdi/default.nix
Normal file
52
pkgs/development/coq-modules/Verdi/default.nix
Normal file
@ -0,0 +1,52 @@
|
||||
{ stdenv, fetchFromGitHub, coq, mathcomp, StructTact, InfSeqExt, Cheerios }:
|
||||
|
||||
let params =
|
||||
{
|
||||
"8.6" = {
|
||||
version = "20181102";
|
||||
rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564";
|
||||
sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z";
|
||||
};
|
||||
|
||||
"8.7" = {
|
||||
version = "20181102";
|
||||
rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564";
|
||||
sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z";
|
||||
};
|
||||
|
||||
"8.8" = {
|
||||
version = "20181102";
|
||||
rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564";
|
||||
sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z";
|
||||
};
|
||||
|
||||
"8.9" = {
|
||||
version = "20181102";
|
||||
rev = "25b79cf1be5527ab8dc1b8314fcee93e76a2e564";
|
||||
sha256 = "1vw47c37k5vaa8vbr6ryqy8riagngwcrfmb3rai37yi9xhdqg55z";
|
||||
};
|
||||
};
|
||||
param = params."${coq.coq-version}";
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "coq${coq.coq-version}-verdi-${param.version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uwplse";
|
||||
repo = "verdi";
|
||||
inherit (param) rev sha256;
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
coq coq.ocaml coq.camlp5 coq.findlib mathcomp StructTact InfSeqExt Cheerios
|
||||
];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
buildPhase = "make -j$NIX_BUILD_CORES";
|
||||
installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
|
||||
|
||||
passthru = {
|
||||
compatibleCoqVersions = v: builtins.elem v [ "8.6" "8.7" "8.8" "8.9" ];
|
||||
};
|
||||
}
|
||||
@ -1183,4 +1183,11 @@ self: super: {
|
||||
# https://github.com/DanielG/cabal-helper/issues/59
|
||||
cabal-helper = doJailbreak super.cabal-helper;
|
||||
|
||||
# TODO(Profpatsch): factor out local nix store setup from
|
||||
# lib/tests/release.nix and use that for the tests of libnix
|
||||
# libnix = overrideCabal super.libnix (old: {
|
||||
# testToolDepends = old.testToolDepends or [] ++ [ pkgs.nix ];
|
||||
# });
|
||||
libnix = dontCheck super.libnix;
|
||||
|
||||
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super
|
||||
|
||||
@ -166283,7 +166283,7 @@ self: {
|
||||
librarySystemDepends = [ poker-eval ];
|
||||
description = "Binding to libpoker-eval";
|
||||
license = stdenv.lib.licenses.publicDomain;
|
||||
}) {inherit (pkgs) poker-eval;};
|
||||
}) {poker-eval = null;};
|
||||
|
||||
"pokitdok" = callPackage
|
||||
({ mkDerivation, aeson, base, base64-string, bytestring
|
||||
|
||||
@ -6,11 +6,11 @@
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "eccodes-${version}";
|
||||
version = "2.9.0";
|
||||
version = "2.9.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
|
||||
sha256 = "1mh9zkfb5dj3j8fk3gdhz2bp6z13nik5pmynpf5l6qy3lhgyn17z";
|
||||
sha256 = "18gjzhz7bkibc34a0djq1r4b2y3hpn7ym0zs0nj07yq58v4pdx08";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "google-gflags-${version}";
|
||||
version = "2.2.1";
|
||||
version = "2.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gflags";
|
||||
repo = "gflags";
|
||||
rev = "v${version}";
|
||||
sha256 = "12wkihc4f07qmhyqk3cjylj8v5xz2bjrq75p7aq1vvvj60fbp58k";
|
||||
sha256 = "147i3md3nxkjlrccqg4mq1kyzc7yrhvqv5902iibc7znkvzdvlp0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -4,13 +4,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opencollada-${version}";
|
||||
|
||||
version = "1.6.66";
|
||||
version = "1.6.67";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KhronosGroup";
|
||||
repo = "OpenCOLLADA";
|
||||
rev = "v${version}";
|
||||
sha256 = "0gplw4qa5faphl29ksj9lkzdsnkbgs018n8rz1khhwsqypchygyw";
|
||||
sha256 = "0x1h2ns0y05bdvn3i5s600jz6nb8qw8qqgg54njz7833bcy913mj";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
{stdenv, fetchurl}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "poker-eval-138.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.gna.org/pokersource/sources/${name}.tar.gz";
|
||||
sha256 = "0s6gvcdwdi6j7nrg6mmb5l971gclk0p99bcbfsynx1gnj159wrcj";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
sed -i -e 's#pkgincludedir = $(includedir)/@PACKAGE@#pkgincludedir = $(includedir)#g' Makefile.in
|
||||
sed -i -e 's#pkgincludedir = $(includedir)/@PACKAGE@#pkgincludedir = $(includedir)#g' include/Makefile.in
|
||||
sed -i -e 's#includedir=@includedir@/poker-eval#includedir=@includedir@/#g' poker-eval.pc.in
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://pokersource.sourceforge.net;
|
||||
description = "Poker hand evaluator";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = [stdenv.lib.maintainers.mtreskin];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@ -53,6 +53,7 @@ let
|
||||
./qtbase.patch
|
||||
./qtbase-darwin.patch
|
||||
./qtbase-revert-no-macos10.10.patch
|
||||
./qtbase-fixguicmake.patch
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
./qtbase-darwin-nseventtype.patch
|
||||
];
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
index 0bbc871..3673634 100644
|
||||
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
@@ -286,7 +286,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
|
||||
set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
|
||||
|
||||
- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
|
||||
+ set(imported_location \"${PLUGIN_LOCATION}\")
|
||||
_qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
|
||||
set_target_properties(Qt5::${Plugin} PROPERTIES
|
||||
\"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
|
||||
diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
|
||||
index 5baf0fd..3583745 100644
|
||||
--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
|
||||
+++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
|
||||
@@ -2,10 +2,10 @@
|
||||
add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
|
||||
|
||||
!!IF !isEmpty(CMAKE_RELEASE_TYPE)
|
||||
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
|
||||
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
|
||||
!!ENDIF
|
||||
!!IF !isEmpty(CMAKE_DEBUG_TYPE)
|
||||
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
|
||||
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
|
||||
!!ENDIF
|
||||
|
||||
list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, gfortran, openblas, cmake
|
||||
{ stdenv, fetchurl, gfortran, openblas, cmake, fixDarwinDylibNames
|
||||
, enableCuda ? false, cudatoolkit
|
||||
}:
|
||||
|
||||
@ -96,8 +96,11 @@ stdenv.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ openblas gfortran.cc.lib ] ++ stdenv.lib.optionals enableCuda [cudatoolkit];
|
||||
nativeBuildInputs = [ cmake ]
|
||||
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
|
||||
|
||||
buildInputs = [ openblas gfortran.cc.lib ]
|
||||
++ stdenv.lib.optional enableCuda cudatoolkit;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html;
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl, ocaml, findlib, ocamlbuild
|
||||
, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20181026" else "20140422"
|
||||
, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20181113" else "20140422"
|
||||
}@args:
|
||||
|
||||
let
|
||||
src = fetchurl (
|
||||
if version == "20140422" then { url = "http://cristal.inria.fr/~fpottier/menhir/menhir-20140422.tar.gz"; sha256 = "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d"; }
|
||||
else if version == "20170712" then { url = "http://gallium.inria.fr/~fpottier/menhir/menhir-20170712.tar.gz"; sha256 = "006hq3bwj81j67f2k9cgzj5wr4hai8j36925p5n3sd2j01ljsj6a"; }
|
||||
else if version == "20181026" then { url = "https://gitlab.inria.fr/fpottier/menhir/repository/20181026/archive.tar.gz"; sha256 = "1zhacw60996i9b88kbnfvrvjk3ps9p9n9syjk9np545jp8l0582g"; }
|
||||
else if version == "20181113" then { url = "https://gitlab.inria.fr/fpottier/menhir/repository/20181113/archive.tar.gz"; sha256 = "0hl611l0gyl7b2bm7m0sk7vjz14m0i7znrnjq3gw58pylj934dx4"; }
|
||||
else throw ("menhir: unknown version " ++ version)
|
||||
);
|
||||
in
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
{ stdenv
|
||||
, lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPyPy
|
||||
@ -15,13 +16,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cvxopt";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
|
||||
disabled = isPyPy; # hangs at [translation:info]
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "12e3cfda982576b0b9b597d297aaf3172efa765a20fbed6f3c066aa0c48ee817";
|
||||
sha256 = "19ipi6ljj9qv87lhgcsky1gy9543gcmqdbgzpk6v5ccv90nrcf00";
|
||||
};
|
||||
|
||||
# similar to Gsl, glpk, fftw there is also a dsdp interface
|
||||
@ -50,7 +51,7 @@ buildPythonPackage rec {
|
||||
${python.interpreter} -m unittest discover -s tests
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
homepage = http://cvxopt.org/;
|
||||
description = "Python Software for Convex Optimization";
|
||||
longDescription = ''
|
||||
@ -63,7 +64,8 @@ buildPythonPackage rec {
|
||||
standard library and on the strengths of Python as a high-level
|
||||
programming language.
|
||||
'';
|
||||
maintainers = with lib.maintainers; [ edwtjo ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
broken = stdenv.targetPlatform.isDarwin;
|
||||
license = licenses.gpl3Plus;
|
||||
};
|
||||
}
|
||||
|
||||
41
pkgs/development/python-modules/ipykernel/4.nix
Normal file
41
pkgs/development/python-modules/ipykernel/4.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, nose
|
||||
, isPy27
|
||||
, mock
|
||||
, ipython
|
||||
, jupyter_client
|
||||
, pexpect
|
||||
, traitlets
|
||||
, tornado
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ipykernel";
|
||||
version = "4.10.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "699103c8e64886e3ec7053f2a6aa83bb90426063526f63a818732ff385202bad";
|
||||
};
|
||||
|
||||
checkInputs = [ nose ] ++ lib.optional isPy27 mock;
|
||||
propagatedBuildInputs = [
|
||||
ipython
|
||||
jupyter_client
|
||||
pexpect
|
||||
traitlets
|
||||
tornado
|
||||
];
|
||||
|
||||
# Tests require backends.
|
||||
# I don't want to add all supported backends as propagatedBuildInputs
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "IPython Kernel for Jupyter";
|
||||
homepage = http://ipython.org/;
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
}
|
||||
@ -1,37 +1,31 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, nose
|
||||
, isPy27
|
||||
, mock
|
||||
, ipython
|
||||
, jupyter_client
|
||||
, pexpect
|
||||
, traitlets
|
||||
, tornado
|
||||
, pythonOlder
|
||||
, pytest
|
||||
, nose
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ipykernel";
|
||||
version = "4.8.2";
|
||||
version = "5.1.0";
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "c091449dd0fad7710ddd9c4a06e8b9e15277da306590bc07a3a1afa6b4453c8f";
|
||||
sha256 = "0fc0bf97920d454102168ec2008620066878848fcfca06c22b669696212e292f";
|
||||
};
|
||||
|
||||
buildInputs = [ nose ] ++ lib.optional isPy27 mock;
|
||||
propagatedBuildInputs = [
|
||||
ipython
|
||||
jupyter_client
|
||||
pexpect
|
||||
traitlets
|
||||
tornado
|
||||
];
|
||||
checkInputs = [ pytest nose ];
|
||||
propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ];
|
||||
|
||||
# Tests require backends.
|
||||
# I don't want to add all supported backends as propagatedBuildInputs
|
||||
doCheck = false;
|
||||
checkPhase = ''
|
||||
HOME=$(mktemp -d) pytest ipykernel
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "IPython Kernel for Jupyter";
|
||||
@ -39,4 +33,4 @@ buildPythonPackage rec {
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ fridh ];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@ -26,27 +26,17 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ipython";
|
||||
version = "5.7.0";
|
||||
version = "5.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0g1jm06qriq48m58311cs7askp83ipq3yq96hv4kg431nxzkmd4d";
|
||||
sha256 = "4bac649857611baaaf76bc82c173aa542f7486446c335fe1a6c05d0d491c8906";
|
||||
};
|
||||
|
||||
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
substituteInPlace setup.py --replace "'gnureadline'" " "
|
||||
'';
|
||||
|
||||
patches = [
|
||||
# improve cython support, needed by sage, accepted upstream
|
||||
# https://github.com/ipython/ipython/pull/11139
|
||||
(fetchpatch {
|
||||
name = "signature-use-inspect.patch";
|
||||
url = "https://github.com/ipython/ipython/commit/8d399b98d3ed5c765835594100c4d36fb2f739dc.patch";
|
||||
sha256 = "1r7v9clwwbskmj4y160vcj6g0vzqbvnj4y1bm2n4bskafapm42g0";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [ glibcLocales ];
|
||||
|
||||
checkInputs = [ nose pygments testpath ] ++ lib.optional isPy27 mock;
|
||||
|
||||
@ -12,22 +12,21 @@
|
||||
, jedi
|
||||
, decorator
|
||||
, pickleshare
|
||||
, simplegeneric
|
||||
, traitlets
|
||||
, prompt_toolkit
|
||||
, pexpect
|
||||
, appnope
|
||||
, typing
|
||||
, backcall
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ipython";
|
||||
version = "6.5.0";
|
||||
version = "7.1.1";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b0f2ef9eada4a68ef63ee10b6dde4f35c840035c50fd24265f8052c98947d5a4";
|
||||
sha256 = "b10a7ddd03657c761fc503495bc36471c8158e3fc948573fb9fe82a7029d8efd";
|
||||
};
|
||||
|
||||
prePatch = lib.optionalString stdenv.isDarwin ''
|
||||
@ -42,13 +41,12 @@ buildPythonPackage rec {
|
||||
jedi
|
||||
decorator
|
||||
pickleshare
|
||||
simplegeneric
|
||||
traitlets
|
||||
prompt_toolkit
|
||||
pygments
|
||||
pexpect
|
||||
backcall
|
||||
] ++ lib.optionals stdenv.isDarwin [appnope]
|
||||
++ lib.optionals (pythonOlder "3.5") [ typing ];
|
||||
] ++ lib.optionals stdenv.isDarwin [appnope];
|
||||
|
||||
LC_ALL="en_US.UTF-8";
|
||||
|
||||
@ -58,11 +56,6 @@ buildPythonPackage rec {
|
||||
nosetests
|
||||
'';
|
||||
|
||||
# IPython 6.0.0 and above does not support Python < 3.3.
|
||||
# The last IPython version to support older Python versions
|
||||
# is 5.3.x.
|
||||
disabled = pythonOlder "3.3";
|
||||
|
||||
meta = {
|
||||
description = "IPython: Productive Interactive Computing";
|
||||
homepage = http://ipython.org/;
|
||||
|
||||
38
pkgs/development/python-modules/jupyter_console/5.nix
Normal file
38
pkgs/development/python-modules/jupyter_console/5.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, nose
|
||||
, jupyter_client
|
||||
, ipython
|
||||
, ipykernel
|
||||
, prompt_toolkit
|
||||
, pygments
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyter_console";
|
||||
version = "5.2.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "545dedd3aaaa355148093c5609f0229aeb121b4852995c2accfa64fe3e0e55cd";
|
||||
};
|
||||
|
||||
checkInputs = [ nose ];
|
||||
propagatedBuildInputs = [
|
||||
jupyter_client
|
||||
ipython
|
||||
ipykernel
|
||||
prompt_toolkit
|
||||
pygments
|
||||
];
|
||||
|
||||
# ValueError: underlying buffer has been detached
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Jupyter terminal console";
|
||||
homepage = "http://jupyter.org/";
|
||||
license = lib.licenses.bsd3;
|
||||
};
|
||||
}
|
||||
@ -7,15 +7,17 @@
|
||||
, ipykernel
|
||||
, prompt_toolkit
|
||||
, pygments
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyter_console";
|
||||
version = "5.2.0";
|
||||
version = "6.0.0";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "545dedd3aaaa355148093c5609f0229aeb121b4852995c2accfa64fe3e0e55cd";
|
||||
sha256 = "308ce876354924fb6c540b41d5d6d08acfc946984bf0c97777c1ddcb42e0b2f5";
|
||||
};
|
||||
|
||||
checkInputs = [ nose ];
|
||||
@ -34,6 +36,5 @@ buildPythonPackage rec {
|
||||
description = "Jupyter terminal console";
|
||||
homepage = "http://jupyter.org/";
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@ -6,6 +6,8 @@
|
||||
, ipython
|
||||
, jinja2
|
||||
, python-oauth2
|
||||
, prometheus_client
|
||||
, async_generator
|
||||
, pamela
|
||||
, sqlalchemy
|
||||
, tornado
|
||||
@ -18,27 +20,27 @@
|
||||
let
|
||||
# js/css assets that setup.py tries to fetch via `npm install` when building
|
||||
# from source.
|
||||
bootstrap =
|
||||
bootstrap =
|
||||
fetchzip {
|
||||
url = "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz";
|
||||
sha256 = "0r7s54bbf68ri1na9bbabyf12mcpb6zk5ja2q6z82aw1fa4xi3yd";
|
||||
};
|
||||
font-awesome =
|
||||
font-awesome =
|
||||
fetchzip {
|
||||
url = "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz";
|
||||
sha256 = "1xnxbdlfdd60z5ix152m8r2kk9dkwlqwpypky1mm3dv64ajnzdbk";
|
||||
};
|
||||
jquery =
|
||||
jquery =
|
||||
fetchzip {
|
||||
url = "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz";
|
||||
sha256 = "1j6y18miwzafdj8kfpwbmbn9qvgnbnpc7l4arqrhqj33m04xrlgi";
|
||||
};
|
||||
moment =
|
||||
moment =
|
||||
fetchzip {
|
||||
url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz";
|
||||
sha256 = "1b4vyvs24v6y92pf2iqjm5aa7jg7khcpspn00girc7lpi917f9vw";
|
||||
url = "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz";
|
||||
sha256 = "12gb3p0rz5wyjwykv9g0pix7dd352lx1z7rzdjsf2brhwc4ffyip";
|
||||
};
|
||||
requirejs =
|
||||
requirejs =
|
||||
fetchzip {
|
||||
url = "https://registry.npmjs.org/requirejs/-/requirejs-2.3.4.tgz";
|
||||
sha256 = "0q6mkj0iv341kks06dya6lfs2kdw0n6vc7n4a7aa3ia530fk9vja";
|
||||
@ -48,11 +50,12 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterhub";
|
||||
version = "0.8.1";
|
||||
version = "0.9.4";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "100cf18d539802807a45450d38fefbb376cf1c810f3b1b31be31638829a5c69c";
|
||||
sha256 = "7848bbb299536641a59eb1977ec3c7c95d931bace4a2803d7e9b28b9256714da";
|
||||
};
|
||||
|
||||
# Most of this only applies when building from source (e.g. js/css assets are
|
||||
@ -103,14 +106,13 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
alembic ipython jinja2 pamela python-oauth2 requests sqlalchemy tornado
|
||||
traitlets
|
||||
traitlets prometheus_client async_generator
|
||||
];
|
||||
|
||||
# Disable tests because they take an excessive amount of time to complete.
|
||||
doCheck = false;
|
||||
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
description = "Serves multiple Jupyter notebook instances";
|
||||
homepage = http://jupyter.org/;
|
||||
|
||||
@ -1,19 +1,22 @@
|
||||
{ lib, buildPythonPackage, isPy3k, fetchPypi, ipython_genutils, jupyterlab_launcher, notebook }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, jupyterlab_server
|
||||
, notebook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab";
|
||||
version = "0.34.12";
|
||||
disabled = !isPy3k;
|
||||
version = "0.35.4";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "7d8378d19a0ae173e91a493db996c37828b410b7ee556da21a153486168ecf87";
|
||||
sha256 = "deba0b2803640fcad72c61366bff11d5945173015961586d5e3b2f629ffeb455";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ipython_genutils
|
||||
jupyterlab_launcher
|
||||
notebook
|
||||
];
|
||||
propagatedBuildInputs = [ jupyterlab_server notebook ];
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--set" "JUPYTERLAB_DIR" "$out/share/jupyter/lab"
|
||||
|
||||
@ -0,0 +1,38 @@
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, notebook
|
||||
, jsonschema
|
||||
, pythonOlder
|
||||
, requests
|
||||
, pytest
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jupyterlab_server";
|
||||
version = "0.2.0";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "72d916a73957a880cdb885def6d8664a6d1b2760ef5dca5ad665aa1e8d1bb783";
|
||||
};
|
||||
|
||||
checkInputs = [ requests pytest ];
|
||||
propagatedBuildInputs = [ notebook jsonschema ];
|
||||
|
||||
# test_listing test fails
|
||||
# this is a new package and not all tests pass
|
||||
doCheck = false;
|
||||
|
||||
checkPhase = ''
|
||||
pytest
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "JupyterLab Server";
|
||||
homepage = http://jupyter.org;
|
||||
license = licenses.bsdOriginal;
|
||||
maintainers = [ maintainers.costrouc ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
{ stdenv, buildPythonPackage, fetchPypi, six, attrs, twisted, pyopenssl, service-identity, autobahn, treq, mock }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.3.1";
|
||||
pname = "magic-wormhole-mailbox-server";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1q6zhbx8fcpk7rchclm7yqcxdsc1x97hki2ji61sa544r5xvxv55";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six attrs twisted pyopenssl service-identity autobahn ];
|
||||
checkInputs = [ treq mock ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Securely transfer data between computers";
|
||||
homepage = https://github.com/warner/magic-wormhole-mailbox-server;
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
@ -1,8 +1,6 @@
|
||||
{ lib
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonAtLeast
|
||||
, python
|
||||
, spake2
|
||||
, pynacl
|
||||
, six
|
||||
@ -14,49 +12,42 @@
|
||||
, tqdm
|
||||
, click
|
||||
, humanize
|
||||
, ipaddress
|
||||
, txtorcon
|
||||
, nettools
|
||||
, glibc
|
||||
, glibcLocales
|
||||
, mock
|
||||
, magic-wormhole-transit-relay
|
||||
, magic-wormhole-mailbox-server
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "magic-wormhole";
|
||||
version = "0.10.5";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9558ea1f3551e535deec3462cd5c8391cb32ebb12ecd8b40b36861dbee4917ee";
|
||||
sha256 = "01fr4bi6kc6fz9n3c4qq892inrc3nf6p2djy65yvm7xkvdxncydf";
|
||||
};
|
||||
|
||||
checkInputs = [ mock magic-wormhole-transit-relay ];
|
||||
buildInputs = [ nettools glibcLocales ];
|
||||
propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize ipaddress txtorcon ];
|
||||
buildInputs = [ glibcLocales ];
|
||||
propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize txtorcon ];
|
||||
checkInputs = [ mock magic-wormhole-transit-relay magic-wormhole-mailbox-server ];
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py
|
||||
sed -i -e "s|if (os.path.dirname(os.path.abspath(wormhole))|if not os.path.abspath(wormhole).startswith('/nix/store') and (os.path.dirname(os.path.abspath(wormhole))|" src/wormhole/test/test_cli.py
|
||||
|
||||
# magic-wormhole will attempt to find all available locales by running
|
||||
# 'locale -a'. If we're building on Linux, then this may result in us
|
||||
# running the system's locale binary instead of the one from Nix, so let's
|
||||
# ensure we patch this.
|
||||
sed -i -e 's|getProcessOutputAndValue("locale"|getProcessOutputAndValue("${glibc}/bin/locale"|' src/wormhole/test/test_cli.py
|
||||
'' + lib.optionalString (pythonAtLeast "3.3") ''
|
||||
sed -i -e 's|"ipaddress",||' setup.py
|
||||
'';
|
||||
|
||||
checkPhase = ''
|
||||
export PATH="$PATH:$out/bin"
|
||||
preCheck = ''
|
||||
export PATH=$out/bin:$PATH
|
||||
export LANG="en_US.UTF-8"
|
||||
export LC_ALL="en_US.UTF-8"
|
||||
${python.interpreter} -m wormhole.test.run_trial wormhole
|
||||
substituteInPlace src/wormhole/test/test_cli.py \
|
||||
--replace 'getProcessOutputAndValue("locale", ["-a"])' 'getProcessOutputAndValue("locale", ["-a"], env=os.environ)' \
|
||||
--replace 'if (os.path.dirname(os.path.abspath(wormhole))' 'if not os.path.abspath(wormhole).startswith("/nix/store") and (os.path.dirname(os.path.abspath(wormhole))' \
|
||||
--replace 'locale_env = dict(LC_ALL=locale, LANG=locale)' 'locale_env = dict(LC_ALL=locale, LANG=locale, LOCALE_ARCHIVE=os.getenv("LOCALE_ARCHIVE"))'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Securely transfer data between computers";
|
||||
homepage = https://github.com/warner/magic-wormhole;
|
||||
license = licenses.mit;
|
||||
|
||||
@ -17,15 +17,16 @@
|
||||
, pandocfilters
|
||||
, tornado
|
||||
, jupyter_client
|
||||
, defusedxml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nbconvert";
|
||||
version = "5.3.1";
|
||||
version = "5.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1f9dkvpx186xjm4xab0qbph588mncp4vqk3fmxrsnqs43mks9c8j";
|
||||
sha256 = "a8a2749f972592aa9250db975304af6b7337f32337e523a2c995cc9e12c07807";
|
||||
};
|
||||
|
||||
checkInputs = [ nose pytest glibcLocales ];
|
||||
@ -33,11 +34,14 @@ buildPythonPackage rec {
|
||||
propagatedBuildInputs = [
|
||||
entrypoints bleach mistune jinja2 pygments traitlets testpath
|
||||
jupyter_core nbformat ipykernel pandocfilters tornado jupyter_client
|
||||
defusedxml
|
||||
];
|
||||
|
||||
# disable preprocessor tests for ipython 7
|
||||
# see issue https://github.com/jupyter/nbconvert/issues/898
|
||||
checkPhase = ''
|
||||
mkdir tmp
|
||||
LC_ALL=en_US.UTF-8 HOME=`realpath tmp` py.test -v
|
||||
export LC_ALL=en_US.UTF-8
|
||||
HOME=$(mktemp -d) py.test -v --ignore="nbconvert/preprocessors/tests/test_execute.py"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@ -25,11 +25,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "notebook";
|
||||
version = "5.6.0";
|
||||
version = "5.7.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "e2c8e931cc19db4f8c63e6a396efbc13a228b2cb5b2919df011b946f28239a08";
|
||||
sha256 = "b85e4de3d54cf4f14fe1d0515a980ccb49ddd4cdd21250cc0d4fb6374d50b1a7";
|
||||
};
|
||||
|
||||
LC_ALL = "en_US.utf8";
|
||||
|
||||
@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with pythonPackages; [
|
||||
cli-helpers click configobj humanize prompt_toolkit_2 psycopg2
|
||||
cli-helpers click configobj humanize prompt_toolkit psycopg2
|
||||
pygments sqlparse pgspecial setproctitle keyring
|
||||
];
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "cfr-${version}";
|
||||
version = "0.132";
|
||||
version = "0_134";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.benf.org/other/cfr/cfr_${version}.jar";
|
||||
sha256 = "1fpmd5v3x91lw6jc7x997ic2kklj449fndyg14zvgxawhdkic2z1";
|
||||
sha256 = "185z1d03rgisn4p8qjilhlikdjb27xgh6vxkrlgmcm9c7kpms320";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "lazygit-${version}";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
|
||||
goPackagePath = "github.com/jesseduffield/lazygit";
|
||||
|
||||
@ -10,7 +10,7 @@ buildGoPackage rec {
|
||||
owner = "jesseduffield";
|
||||
repo = "lazygit";
|
||||
rev = "v${version}";
|
||||
sha256 = "0piljnwv778z7zc1pglkidiys1a3yv4d7z9wsrcj1nszlcn3ifyz";
|
||||
sha256 = "0xgda2b5p26ya15kq83502f8vh18kl05hl40k0lsfqx3m7pnidn1";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "objconv-${version}";
|
||||
version = "2.48";
|
||||
version = "2.51";
|
||||
|
||||
src = fetchurl {
|
||||
# Versioned archive of objconv sources maintained by orivej.
|
||||
url = "https://archive.org/download/objconv/${name}.zip";
|
||||
sha256 = "1y4bmy99dfhyqykkib50fiwsha2a62s9ya1qsv5mwj21w1l0snj7";
|
||||
sha256 = "0wp6ld9vk11f4nnkn56627zmlv9k5vafi99qa3yyn1pgcd61zcfs";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
18
pkgs/development/tools/misc/pkgconf/default.nix
Normal file
18
pkgs/development/tools/misc/pkgconf/default.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "pkgconf-1.5.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://distfiles.dereferenced.org/pkgconf/${name}.tar.xz";
|
||||
sha256 = "0r26qmij9lxpz183na3dxj6lamcma94cjhasy19fya44w2j68n4w";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Package compiler and linker metadata toolkit";
|
||||
homepage = https://git.dereferenced.org/pkgconf/pkgconf;
|
||||
platforms = platforms.all;
|
||||
license = licenses.isc;
|
||||
maintainers = with maintainers; [ zaninime ];
|
||||
};
|
||||
}
|
||||
@ -1,21 +1,29 @@
|
||||
{ stdenv, fetchzip, ocaml, transitional ? false }:
|
||||
{ stdenv, fetchzip, ocaml, legacy ? false }:
|
||||
|
||||
let
|
||||
let params =
|
||||
if legacy then {
|
||||
minor-version = "06";
|
||||
sha256 = "02zg6qjkzx58zmp79364s5jyqhh56nclcz1jzhh53hk37g9f96qf";
|
||||
} else {
|
||||
minor-version = "07";
|
||||
sha256 = "1c8v45553ccbqha2ypfranqlgw06rr5wjr2hlnrx5bf9jfq0h0dn";
|
||||
};
|
||||
metafile = ./META;
|
||||
opt = stdenv.lib.optionalString legacy;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
|
||||
name = "camlp5${if transitional then "_transitional" else ""}-7.06";
|
||||
name = "camlp5-7.${params.minor-version}";
|
||||
|
||||
src = fetchzip {
|
||||
url = https://github.com/camlp5/camlp5/archive/rel706.tar.gz;
|
||||
sha256 = "02zg6qjkzx58zmp79364s5jyqhh56nclcz1jzhh53hk37g9f96qf";
|
||||
url = "https://github.com/camlp5/camlp5/archive/rel7${params.minor-version}.tar.gz";
|
||||
inherit (params) sha256;
|
||||
};
|
||||
|
||||
buildInputs = [ ocaml ];
|
||||
|
||||
postPatch = ''
|
||||
postPatch = opt ''
|
||||
for p in compile/compile.sh config/Makefile.tpl test/Makefile test/check_ocaml_versions.sh
|
||||
do
|
||||
substituteInPlace $p --replace '/bin/rm' rm
|
||||
@ -24,12 +32,12 @@ stdenv.mkDerivation {
|
||||
|
||||
prefixKey = "-prefix ";
|
||||
|
||||
preConfigure = "configureFlagsArray=(" + (if transitional then "--transitional" else "--strict") +
|
||||
preConfigure = "configureFlagsArray=(--strict" +
|
||||
" --libdir $out/lib/ocaml/${ocaml.version}/site-lib)";
|
||||
|
||||
buildFlags = "world.opt";
|
||||
|
||||
postInstall = "cp ${metafile} $out/lib/ocaml/${ocaml.version}/site-lib/camlp5/META";
|
||||
postInstall = opt "cp ${metafile} $out/lib/ocaml/${ocaml.version}/site-lib/camlp5/META";
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
{stdenv, fetchsvn, SDL, libGLU_combined, openal, libvorbis, freealut, SDL_image, popt}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "blackshades-elite-svn-29";
|
||||
src = fetchsvn {
|
||||
url = svn://svn.gna.org/svn/blackshadeselite/trunk;
|
||||
rev = "29";
|
||||
sha256 = "1lkws5pqpgcgdlar11waikp6y41z678457n9jcik7nhn53cjjr1s";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = "-lSDL_image";
|
||||
NIX_CFLAGS_COMPILE = "-fpermissive";
|
||||
|
||||
buildInputs = [ SDL SDL_image libGLU_combined openal libvorbis freealut popt ];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i -e s,Data/,$out/opt/$name/Data/,g \
|
||||
-e s,Data:,$out/opt/$name/Data/,g \
|
||||
Source/*.cpp
|
||||
sed -i -e s/-march=pentium-m// Makefile
|
||||
sed -i -e '/include "Window.h"/a#include <cstring>' -e 's/strcmp/std::strcmp/' \
|
||||
Source/Window.cpp
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $out/opt/$name
|
||||
cp objs/blackshades $out/bin/blackshadeselite
|
||||
cp -R Data IF* Readme $out/opt/$name/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://home.gna.org/blackshadeselite/;
|
||||
description = "Fork of Black Shades";
|
||||
license = stdenv.lib.licenses.gpl2Plus; # Says its gna.org project page
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
}
|
||||
@ -35,8 +35,12 @@ in stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
# TODO(Profpatsch): mupdf support
|
||||
"--with-pdftops=pdftops"
|
||||
"--with-pdftops-path=${poppler_utils}/bin/pdftops"
|
||||
"--with-gs-path=${ghostscript}/bin/gs"
|
||||
"--with-pdftocairo-path=${poppler_utils}/bin/pdftocairo"
|
||||
"--with-ippfind-path=${cups}/bin/ippfind"
|
||||
"--enable-imagefilters"
|
||||
"--with-rcdir=no"
|
||||
"--with-shell=${stdenv.shell}"
|
||||
|
||||
@ -4,11 +4,11 @@
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec{
|
||||
name = "atari800-${version}";
|
||||
version = "3.1.0";
|
||||
version = "4.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/atari800/atari800/${version}/${name}.tar.gz";
|
||||
sha256 = "030yz5l1wyq9l0dmiimiiwpzrjr43whycd409xhhpnrdx76046wh";
|
||||
sha256 = "1dcynsf8i52y7zyg62bkbhl3rdd22ss95zs2s9jm4y5jvn4vks88";
|
||||
};
|
||||
|
||||
buildInputs = [ unzip zlib SDL readline libGLU_combined libX11 ];
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "acpid-2.0.30";
|
||||
name = "acpid-2.0.31";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/acpid2/${name}.tar.xz";
|
||||
sha256 = "1jzl7hiaspr5xkmsrbl69bib8cs3dp6bq5ix58fbskpnsdi7pdr8";
|
||||
sha256 = "1hrc0xm6q12knbgzhq0i8g2rfrkwcvh1asd7k9rs3nc5xmlwd7gw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://tedfelix.com/linux/acpid-netlink.html;
|
||||
homepage = https://sourceforge.net/projects/acpid2/;
|
||||
description = "A daemon for delivering ACPI events to userspace programs";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }:
|
||||
|
||||
let
|
||||
ver = "2018.3";
|
||||
ver = "2018.4";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "alfred-${ver}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
|
||||
sha256 = "06lbyac0w48jkxpji9pgkxnwcrwbzs2dwzfgw2vfr1lix6ivhrb2";
|
||||
sha256 = "0n6cw6inkzlgz8p6jcc83npqjmvhxp4qsh2dhbiv88ax3lh9arcd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl, kernel }:
|
||||
|
||||
let base = "batman-adv-2018.2"; in
|
||||
let base = "batman-adv-2018.4"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${base}-${kernel.version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz";
|
||||
sha256 = "1jdqlbn8mp9rycbnkgjsb98pb2c7jzw9mm30d3iga69ycwk5dqyq";
|
||||
sha256 = "0ka80l3ajfzi9plq50m79d2qpm1rlir4js5hy3g1mkj1gnyb801m";
|
||||
};
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "caddy-${version}";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
goPackagePath = "github.com/mholt/caddy";
|
||||
|
||||
@ -12,7 +12,7 @@ buildGoPackage rec {
|
||||
owner = "mholt";
|
||||
repo = "caddy";
|
||||
rev = "v${version}";
|
||||
sha256 = "0lvzvsblw4zpdfigaad4y577wfh7skx1ln5xhiz0k7vaqfj96ijy";
|
||||
sha256 = "0v35d3dy0f88wgk1vzznbx7p15vjjf7xm3qfi2c3192rsxgzvy0l";
|
||||
};
|
||||
|
||||
buildFlagsArray = ''
|
||||
|
||||
@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
|
||||
# Note: ATM only the libraries have been tested in nixpkgs.
|
||||
stdenv.mkDerivation rec {
|
||||
name = "knot-dns-${version}";
|
||||
version = "2.7.3";
|
||||
version = "2.7.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
|
||||
sha256 = "8717c0f34e441e96bc32bc93b48333ea9c094c5075f91575e40ac30fcf6692df";
|
||||
sha256 = "0x7xx6jh4x8ljnvj30zh3n1zw5jkhla62dv9i75v0rwgrpxy5sxc";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "out" "dev" ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jetty-${version}";
|
||||
version = "9.4.12.v20180830";
|
||||
version = "9.4.14.v20181114";
|
||||
src = fetchurl {
|
||||
url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
|
||||
name = "jetty-distribution-${version}.tar.gz";
|
||||
sha256 = "1z498cxvp1llp4ii8g52rhicypay1v2b6mmdmxrj3d82az6biiq3";
|
||||
sha256 = "1i83jfd17d9sl9pjc8r9i8mx3nr9x0m5s50fd4l5ppzn4drvssn6";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "check_ssl_cert-${version}";
|
||||
version = "1.76.0";
|
||||
version = "1.78.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matteocorti";
|
||||
repo = "check_ssl_cert";
|
||||
rev = "v${version}";
|
||||
sha256 = "0in52vcygscpf79938yfkf2yni49hbkvfkfhwpwyqr7qz9gd8c6j";
|
||||
sha256 = "0s03625xzb30f6dbn34zkp0wcajzlir7wzkgi9rmms76gk4jqq6h";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "alertmanager-${version}";
|
||||
version = "0.15.2";
|
||||
version = "0.15.3";
|
||||
rev = "v${version}";
|
||||
|
||||
goPackagePath = "github.com/prometheus/alertmanager";
|
||||
@ -11,7 +11,7 @@ buildGoPackage rec {
|
||||
inherit rev;
|
||||
owner = "prometheus";
|
||||
repo = "alertmanager";
|
||||
sha256 = "1r4j22jnxayicz9hn0pwm77cgzzywr5haq0hwz6sx5j2xwjmnwm7";
|
||||
sha256 = "037wwfadb9rp1592v8bkqcsy9ym4gbhkg3pz6a6fzirg65d29aia";
|
||||
};
|
||||
|
||||
# Tests exist, but seem to clash with the firewall.
|
||||
|
||||
@ -58,7 +58,8 @@ stdenv.mkDerivation rec {
|
||||
"bash_cv_sys_named_pipes=nomissing"
|
||||
"bash_cv_getcwd_malloc=yes"
|
||||
] ++ optionals stdenv.hostPlatform.isCygwin [
|
||||
"--without-libintl-prefix --without-libiconv-prefix"
|
||||
"--without-libintl-prefix"
|
||||
"--without-libiconv-prefix"
|
||||
"--with-installed-readline"
|
||||
"bash_cv_dev_stdin=present"
|
||||
"bash_cv_dev_fd=standard"
|
||||
|
||||
@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
checkInputs = [ python3Packages.pytest glibcLocales git ];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit_2 pygments ];
|
||||
propagatedBuildInputs = with python3Packages; [ ply prompt_toolkit pygments ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A Python-ish, BASHwards-compatible shell";
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "bacula-9.2.1";
|
||||
name = "bacula-9.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/bacula/${name}.tar.gz";
|
||||
sha256 = "1mv6axdlv246yww9g2ra76hir1km36cv8lk2gal8kv71i64vafmf";
|
||||
sha256 = "0bi2jwvgs2ppdvksx41z69b5r5qr39kasxcgyhd08d6i8z89j87h";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql sqlite zlib ncurses openssl readline ]
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "easysnap-${version}";
|
||||
version = "unstable-2018-10-28";
|
||||
version = "unstable-2018-11-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjau";
|
||||
repo = "easysnap";
|
||||
rev = "aa2768762da7730aa3eb90fdc2190a8359976edc";
|
||||
sha256 = "0csn7capsmlkin4cf1fgl766gvszvqfllqkiyz0g9bvbapxv7nba";
|
||||
rev = "dbf58c06a339cb040dbdcaf7e6ffec5af4add3c7";
|
||||
sha256 = "0rvikmj2k103ffgnvkway8n6ajq0vzwcxb4l5vhka1hqh8047lam";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "android-file-transfer-${version}";
|
||||
version = "3.6";
|
||||
version = "3.7";
|
||||
src = fetchFromGitHub {
|
||||
owner = "whoozle";
|
||||
repo = "android-file-transfer-linux";
|
||||
rev = "v${version}";
|
||||
sha256 = "0gaj1shmd62ks4cjdcmiqczlr93v8ivjcg0l6s8z73cz9pf8dxmz";
|
||||
sha256 = "0a388pqc0azgn0wy85wb1mjk3b5zb6vcr58l4warwfzhca400zn0";
|
||||
};
|
||||
buildInputs = [ cmake fuse readline pkgconfig qtbase ];
|
||||
buildPhase = ''
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
--- a/bins_edit 2005-08-25 14:34:39.000000000 -0400
|
||||
+++ b/bins_edit 2016-05-18 20:25:40.913460314 -0400
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
use Getopt::Long;
|
||||
use IO::File;
|
||||
-use UNIVERSAL qw(isa);
|
||||
+use Scalar::Util 'reftype';
|
||||
|
||||
# XML parsing & writing
|
||||
use XML::Grove;
|
||||
@@ -198,7 +198,7 @@
|
||||
my $fieldValue;
|
||||
foreach my $element
|
||||
(@{$document->at_path('/'.$fileType.'/description')->{Contents}}) {
|
||||
- if (isa($element, 'XML::Grove::Element') && $element->{Name} eq "field") {
|
||||
+ if (reftype($element) eq 'XML::Grove::Element' && $element->{Name} eq "field") {
|
||||
$fieldName = $element->{Attributes}{'name'};
|
||||
$fieldValue = "";
|
||||
if ($fieldName eq $field) {
|
||||
@ -1,11 +0,0 @@
|
||||
--- a/bins 2016-05-18 20:45:49.513330005 -0400
|
||||
+++ b/bins 2016-05-18 20:58:58.957830874 -0400
|
||||
@@ -1332,7 +1332,7 @@
|
||||
mkdir $destDir, 0755
|
||||
or die("\nCannot create $destDir: $?");
|
||||
}
|
||||
- system("cp", "-R", bsd_glob("$staticDir/*", GLOB_TILDE), "$destDir") == 0
|
||||
+ system("cp", "-Rf", bsd_glob("$staticDir/*", GLOB_TILDE), "$destDir") == 0
|
||||
or die("\nCannot copy $staticDir directory content to $destDir: $?");
|
||||
} else {
|
||||
beVerboseN(" Cannot find any static template directory.", 4);
|
||||
@ -1,50 +0,0 @@
|
||||
{ stdenv, fetchurl, makeWrapper, perl, perlPackages }:
|
||||
|
||||
let
|
||||
version = "1.1.29";
|
||||
|
||||
in
|
||||
|
||||
#note: bins-edit-gui does not work
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "bins-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.gna.org/bins/bins-${version}.tar.gz";
|
||||
sha256 = "0n4pcssyaic4xbk25aal0b3g0ibmi2f3gpv0gsnaq61sqipyjl94";
|
||||
};
|
||||
|
||||
buildInputs = with perlPackages; [ makeWrapper perl
|
||||
ImageSize ImageInfo PerlMagick
|
||||
URI HTMLParser HTMLTemplate HTMLClean
|
||||
XMLGrove XMLHandlerYAWriter
|
||||
TextIconv TextUnaccent
|
||||
DateTimeFormatDateParse ]; #TODO need Gtk (not Gtk2?) for bins-edit-gui
|
||||
|
||||
patches = [ ./bins_edit-isa.patch
|
||||
./hashref.patch
|
||||
./cp-dash-f.patch ];
|
||||
|
||||
installPhase = ''
|
||||
export DESTDIR=$out;
|
||||
export PREFIX=.;
|
||||
|
||||
echo | ./install.sh
|
||||
|
||||
for f in bins bins_edit bins-edit-gui; do
|
||||
substituteInPlace $out/bin/$f \
|
||||
--replace /usr/bin/perl ${perl}/bin/perl \
|
||||
--replace /etc/bins $out/etc/bins \
|
||||
--replace /usr/local/share $out/share;
|
||||
wrapProgram $out/bin/$f --set PERL5LIB "$PERL5LIB";
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Generates static HTML photo albums";
|
||||
homepage = http://bins.sautret.org;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
--- a/bins 2016-05-18 20:45:49.513330005 -0400
|
||||
+++ b/bins 2016-05-18 20:58:58.957830874 -0400
|
||||
@@ -3643,8 +3643,8 @@
|
||||
|
||||
my @descTable;
|
||||
foreach my $tagName (@mainFields) {
|
||||
- if (${%$hashref}{$tagName}) {
|
||||
- my $value=${%$hashref}{$tagName};
|
||||
+ if (${$hashref}{$tagName}) {
|
||||
+ my $value=${$hashref}{$tagName};
|
||||
$value =~ s/'/'/g ; # in case it's used in javascript code
|
||||
push @descTable, {DESC_FIELD_NAME => getFields($configHash)->{$tagName}->{'Name'},
|
||||
DESC_FIELD_VALUE => $value,
|
||||
@ -1,32 +0,0 @@
|
||||
{stdenv, fetchurl, perl, perlldap, makeWrapper, CryptSmbHash, DigestSHA1}:
|
||||
|
||||
let
|
||||
version = "0.9.11";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "smbldap-tools-${version}";
|
||||
src = fetchurl {
|
||||
url = "http://download.gna.org/smbldap-tools/sources/${version}/smbldap-tools-${version}.tar.gz";
|
||||
sha256 = "1xcxmpz74r82vjp731axyac3cyksfiarz9jk5g5m2bzfdixkq9mz";
|
||||
};
|
||||
|
||||
buildInputs = [ perl perlldap makeWrapper CryptSmbHash DigestSHA1 ];
|
||||
|
||||
preConfigure = ''
|
||||
export configureFlags="$configureFlags --with-perl-libdir=$out/lib/perl5/site_perl"
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
for i in $out/sbin/*; do
|
||||
wrapProgram $i \
|
||||
--prefix PERL5LIB : $PERL5LIB:$out/lib/perl5/site_perl
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = http://gna.org/projects/smbldap-tools/;
|
||||
description = "SAMBA LDAP tools";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "gx-${version}";
|
||||
version = "0.12.0";
|
||||
version = "0.14.1";
|
||||
rev = "refs/tags/v${version}";
|
||||
|
||||
goPackagePath = "github.com/whyrusleeping/gx";
|
||||
@ -11,7 +11,7 @@ buildGoPackage rec {
|
||||
src = fetchgit {
|
||||
inherit rev;
|
||||
url = "https://github.com/whyrusleeping/gx";
|
||||
sha256 = "0pvf0j14xnzy01fxilja8xbki0i0g7h7y20jzw74ds5a7ywsdx8r";
|
||||
sha256 = "0pfx2p59xdbmqzfbgaf8xvlnzh8m05hkg596glq5kvl8ib65i4ha";
|
||||
};
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
278
pkgs/tools/package-management/gx/deps.nix
generated
278
pkgs/tools/package-management/gx/deps.nix
generated
@ -1,20 +1,12 @@
|
||||
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/agl/ed25519";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/agl/ed25519";
|
||||
rev = "5312a61534124124185d41f09206b9fef1d88403";
|
||||
sha256 = "1v8mhkf1m3ga5262s75vabskxvsw5rpqvi5nwhxwiv7gfk6h823i";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/blang/semver";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/blang/semver";
|
||||
rev = "4a1e882c79dcf4ec00d2e29fac74b9c8938d5052";
|
||||
sha256 = "07rk2jzmppw1v06qvsn11l1mwkyg6y9y06jfik316zq8glfh8b3m";
|
||||
rev = "3c1074078d32d767e08ab2c8564867292da86926";
|
||||
sha256 = "1vqkjrag8nn5hvjz34cf9zsrgwd13ss63y6sp7y5jq39j7bcprdx";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -22,26 +14,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/btcsuite/btcd";
|
||||
rev = "9822ffad6802d3b902442b727a238230194d961f";
|
||||
sha256 = "0mk3qxpn29gsbkvk6rj6jzsw3fn2z51afq890wpk4qz029kvip2h";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/codegangsta/cli";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/codegangsta/cli";
|
||||
rev = "4b90d79a682b4bf685762c7452db20f2a676ecb2";
|
||||
sha256 = "0ls3lfmbfwirm9j95b6yrw41wgh72lfkp1cvs873zw04si4yvaqr";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/coreos/go-semver";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/coreos/go-semver";
|
||||
rev = "1817cd4bea52af76542157eeabd74b057d1a199e";
|
||||
sha256 = "0hfxcg87ag0zdfarbymfx2qmhcdzm8br39sxvhfc7n37rqdcsh9n";
|
||||
rev = "67e573d211ace594f1366b4ce9d39726c4b19bd0";
|
||||
sha256 = "04s92gsy71w1jirlr5lkk9y6r5cparbas7nmf6ywbp7kq7fn8ajn";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -49,8 +23,17 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gogo/protobuf";
|
||||
rev = "dda3e8acadcc9affc16faf33fbb229db78399245";
|
||||
sha256 = "1f1lm6bgwnrd985n1aagqw0bxfx37z71fwfcijiz9k258vj4wlga";
|
||||
rev = "07eab6a8298cf32fac45cceaac59424f98421bbc";
|
||||
sha256 = "1l2v9yq74qsiq3q7kii091rzx67jx6isz5szs27hyhsdwvy0y2p7";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gxed/hashland";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gxed/hashland";
|
||||
rev = "d9f6b97f8db22dd1e090fd0bbbe98f09cc7dd0a8";
|
||||
sha256 = "1q23y4lacsz46k9gmgfw4iwwydw36j2601rbidmmswl94grpc386";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -58,71 +41,26 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/ipfs/go-ipfs-api";
|
||||
rev = "2da86eb64d56571c123c02ae82140c7b4b95f72a";
|
||||
sha256 = "1ljlzjig0qv2mjzyk2piid12b4043584qskx6ikbz5i16cnbvqsq";
|
||||
rev = "b4fd7838d9771414868cb78fa8c4f97e47cad013";
|
||||
sha256 = "1kb0ja6bji9q1ly66hx3490mjmk3w56zpwl9c0pkfy6da9x4dkyr";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/ipfs/go-ipfs-util";
|
||||
goPackagePath = "github.com/ipfs/go-ipfs-files";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/ipfs/go-ipfs-util";
|
||||
rev = "f25fcc891281327394bb48000ef0970d11baff2b";
|
||||
sha256 = "1a79ggx0ma9ny39kjm0gzicrn541gyis4fn7kmkkfjjfaj8v5l3y";
|
||||
url = "https://github.com/ipfs/go-ipfs-files";
|
||||
rev = "90d206a6f3947f904673ebffd376a2dcbbd84942";
|
||||
sha256 = "0bq6lciqba362lqmszjf1x33qwdpfrfik6r680iqr5c4sybywzqv";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/ipfs/go-log";
|
||||
goPackagePath = "github.com/libp2p/go-flow-metrics";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/ipfs/go-log";
|
||||
rev = "48d644b006ba26f1793bffc46396e981801078e3";
|
||||
sha256 = "0q2bk2s2v626ikm2pjalq4qg4n53yyf1bb81jbljb23iijxrqsbr";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/jbenet/go-base58";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/jbenet/go-base58";
|
||||
rev = "6237cf65f3a6f7111cd8a42be3590df99a66bc7d";
|
||||
sha256 = "11yp7yg62bhw6jqdrlf2144bffk12jmb1nvqkm172pdhxfwrp3bf";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/jbenet/go-os-rename";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/jbenet/go-os-rename";
|
||||
rev = "3ac97f61ef67a6b87b95c1282f6c317ed0e693c2";
|
||||
sha256 = "0fmsmmh9h3l7swf5d56spy9jyrnrvw0vnxgh11mpvxmw5hv3lclr";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/jbenet/goprocess";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/jbenet/goprocess";
|
||||
rev = "b497e2f366b8624394fb2e89c10ab607bebdde0b";
|
||||
sha256 = "1lnvkzki7vnqn5c4m6bigk0k85haicmg27w903kwg30rdvblm82s";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kr/fs";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kr/fs";
|
||||
rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b";
|
||||
sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/libp2p/go-floodsub";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/libp2p/go-floodsub";
|
||||
rev = "a922092abea58f07c32eabe303ec817569578740";
|
||||
sha256 = "0wbi67jyfvrzfsb9lkrhjgg9k66yk5sww7nvihhc9rdnblygigs3";
|
||||
url = "https://github.com/libp2p/go-flow-metrics";
|
||||
rev = "7e5a55af485341567f98d6847a373eb5ddcdcd43";
|
||||
sha256 = "1p87iyk6q6f3g3xkncssx400qlld8f2z93qiz8m1f97grfyhjif1";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -130,35 +68,17 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/libp2p/go-libp2p-crypto";
|
||||
rev = "e89e1de117dd65c6129d99d1d853f48bc847cf17";
|
||||
sha256 = "1lb0qzspx99sqbdxbf9dczwcmmirl4h26q9x3v6ris253zmqcbyw";
|
||||
rev = "3120e9f9526fe05f2d3905961a5e0701b85579d9";
|
||||
sha256 = "05i8jcfmk51zln634x782jvjmmn5l11104ylzqfnjxgjibz9pyd7";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/libp2p/go-libp2p-host";
|
||||
goPackagePath = "github.com/libp2p/go-libp2p-metrics";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/libp2p/go-libp2p-host";
|
||||
rev = "c1fc482de113ce7e4cdc9453a1c1c0fe4164d985";
|
||||
sha256 = "1hiz5j64s248vml7i4gwjvz59g7l08zjfklhrbmk0cjxwhx9ypy0";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/libp2p/go-libp2p-interface-conn";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/libp2p/go-libp2p-interface-conn";
|
||||
rev = "95afdbf0c900237f3b9104f1f7cfd3d56175a241";
|
||||
sha256 = "0dv0jc08hfzb8gsi14c2ivancq7pxs8d482l4rw89mg04m2pgnaa";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/libp2p/go-libp2p-net";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/libp2p/go-libp2p-net";
|
||||
rev = "2680a9894c7aabada540f728a53d7c1a16a1a44a";
|
||||
sha256 = "1k44dz2dk7ahlfls6vk747jy8kbxmjhqyni8zw2wiz6sfm5hyw10";
|
||||
url = "https://github.com/libp2p/go-libp2p-metrics";
|
||||
rev = "2d5733beaa2a9fdd05ef696d7a734aa61549fb2a";
|
||||
sha256 = "1g59z1mn483npmzgdyxn5w7w1k94phi5lgqkw3lq8i1b2jdy5mci";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -166,17 +86,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/libp2p/go-libp2p-peer";
|
||||
rev = "166a39e33e7a2a47a4bf999264f254ecaa4fe232";
|
||||
sha256 = "0kgv1n2c8rfz92vk014sqm1bla7a99w18ydyphjjhc96fmlbrzgl";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/libp2p/go-libp2p-peerstore";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/libp2p/go-libp2p-peerstore";
|
||||
rev = "744a149e48eb42e032540507c8545d12cc3b7f6f";
|
||||
sha256 = "1bcmqkdlvvxdz9dbqrcfmvhx0wnnk94fb2yl9ys1nx7mnqgl64y8";
|
||||
rev = "d3df4bca884d7a9c2d350c8120240db3c2b0f2ee";
|
||||
sha256 = "0hn75dnr80f846jj38bpcjw5z73iw292ygcqsfbghvdrwl2pf5xm";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -184,26 +95,26 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/libp2p/go-libp2p-protocol";
|
||||
rev = "40488c03777c16bfcd65da2f675b192863cbc2dc";
|
||||
sha256 = "1mvhi8pdfyn3lb1j1y4iz2mggnf0dz7ccbmrbij739v6cpjfwwbb";
|
||||
rev = "b29f3d97e3a2fb8b29c5d04290e6cb5c5018004b";
|
||||
sha256 = "1xgjfnx9zcqglg9li29wdqywsp8hz22wx6phns9zscni2jsfidld";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/libp2p/go-libp2p-transport";
|
||||
goPackagePath = "github.com/minio/blake2b-simd";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/libp2p/go-libp2p-transport";
|
||||
rev = "5d3cb5861b59c26052a5fe184e45c381ec17e22d";
|
||||
sha256 = "1v63gavw98f6hs151mqk0bbdl46a9ci9m2pcx807wxdsmfphynar";
|
||||
url = "https://github.com/minio/blake2b-simd";
|
||||
rev = "3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4";
|
||||
sha256 = "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/libp2p/go-maddr-filter";
|
||||
goPackagePath = "github.com/minio/sha256-simd";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/libp2p/go-maddr-filter";
|
||||
rev = "90aacb5ee155f0d6f3fa8b34d775de842606c0b1";
|
||||
sha256 = "0ijs599hppj78dg2v7rcglqs82pysygq84yabpis5b99fjp9bay0";
|
||||
url = "https://github.com/minio/sha256-simd";
|
||||
rev = "51976451ce1942acbb55707a983ed232fa027110";
|
||||
sha256 = "0kaxvpidf6ygkkb06vi95pirll31jnmywhyalfjvf7djhim2wr8f";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -211,8 +122,17 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mitchellh/go-homedir";
|
||||
rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
|
||||
sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
|
||||
rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4";
|
||||
sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mr-tron/base58";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mr-tron/base58";
|
||||
rev = "c8897612421d88a51012eaa53bf7267686173ae5";
|
||||
sha256 = "10lr50ia7xccfdvg772f7nb2azn81djcpnckhblhwq6l6a1fpm48";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -220,8 +140,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/multiformats/go-multiaddr";
|
||||
rev = "33741da7b3f5773a599d4a03c333704fc560ef34";
|
||||
sha256 = "0idhv960k68jvh0frhh28dw46p527m2g67rjwjh6r5va5sd8qjcd";
|
||||
rev = "ec8630b6b7436b5d7f6c1c2366d3d7214d1b29e2";
|
||||
sha256 = "1npx4d3scj087a54m6my2xnd0wga8bkklswnbhzghwhhpsgmy800";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -229,8 +149,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/multiformats/go-multiaddr-net";
|
||||
rev = "a7b93d11855f04f56908e1385991eb6a400fcc43";
|
||||
sha256 = "1q0d8asxxhxhm774xn29n1x6zni6pmm78lvm3652ipyj026y243k";
|
||||
rev = "f0af4033635f1241179700537dacdc04f2803df8";
|
||||
sha256 = "0s90ix09mm6dc8319l48g3zhnjl1mkih168wsdh6fdf73801lhg5";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -238,26 +158,17 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/multiformats/go-multihash";
|
||||
rev = "a52a6a4768da72eba89ea7f59f70e9d42ddd3072";
|
||||
sha256 = "0r6fmzvg4vjwc5wzfqn7jjxndcw8n0galdx6f524yd9bcfdlph5b";
|
||||
rev = "a91e75d03bf4dba801af7b159c8b2aa7b5f47ea8";
|
||||
sha256 = "1xvj944qg17vmdgzhyn5qryqrksyxi1q188f91my52wfkz23qmmm";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/multiformats/go-multistream";
|
||||
goPackagePath = "github.com/sabhiram/go-gitignore";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/multiformats/go-multistream";
|
||||
rev = "b8f1996688ab586031517919b49b1967fca8d5d9";
|
||||
sha256 = "0y2hl78lmnd0rbryfmscgxa6kmjdfz00pz60ymhg8k4cifqai0x2";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/sabhiram/go-git-ignore";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/sabhiram/go-git-ignore";
|
||||
rev = "87c28ffedb6cb7ff29ae89e0440e9ddee0d95a9e";
|
||||
sha256 = "1qysvwjvbzq1wms09dm0sban58xq22bbkwpd7qnk28r99g6267rl";
|
||||
url = "https://github.com/sabhiram/go-gitignore";
|
||||
rev = "d3107576ba9425fc1c85f4b3569c4631b805a02e";
|
||||
sha256 = "1rdwyxgcsiwgmlqnc3k6h300mzlvjc3j21np4yh1h476wc8dvl0l";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -265,26 +176,17 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spaolacci/murmur3";
|
||||
rev = "0d12bf811670bf6a1a63828dfbd003eded177fce";
|
||||
sha256 = "0fv74n0cvgnxpfd04xyiry6ii1ag7mhwwk0kwplpvnbwi8y9yq1x";
|
||||
rev = "f09979ecbc725b9e6d41a297405f65e7e8804acc";
|
||||
sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/whyrusleeping/go-logging";
|
||||
goPackagePath = "github.com/urfave/cli";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/whyrusleeping/go-logging";
|
||||
rev = "0457bb6b88fc1973573aaf6b5145d8d3ae972390";
|
||||
sha256 = "1bl180mhg03hdqhyr5sfjcg16ns2ppal625g9ag5m10l2pvlwnqn";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/whyrusleeping/go-multipart-files";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/whyrusleeping/go-multipart-files";
|
||||
rev = "3be93d9f6b618f2b8564bfb1d22f1e744eabbae2";
|
||||
sha256 = "0lf58q5nrxp10v7mj4b0lz01jz8is1xysxwdwkhhs88qxha8vm2f";
|
||||
url = "https://github.com/urfave/cli";
|
||||
rev = "b67dcf995b6a7b7f14fad5fcb7cc5441b05e814b";
|
||||
sha256 = "0n5vq4nydlhb7w12jiwphvxqdy4jwpxc3zwlxyhf05lq1nxfb56h";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -296,22 +198,13 @@
|
||||
sha256 = "0cai0drvx4c8j686l908vpcsz3mw3vxi3ziz94b0f3c5ylpj07j7";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/whyrusleeping/mafmt";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/whyrusleeping/mafmt";
|
||||
rev = "15300f9d3a2d71db61951a8705d5ea8878764837";
|
||||
sha256 = "0fiwrj8pla9y8q0m4ifyrh8gacmrz278h2zihdbqbk2b17b002yr";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/whyrusleeping/progmeter";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/whyrusleeping/progmeter";
|
||||
rev = "974d8fe8cd87585865b1370184050e89d606e817";
|
||||
sha256 = "05njc5minpaxzwb6yg5zjr52ar4ar7qkiml45zsrp2ny92dyx07j";
|
||||
rev = "f3e57218a75b913eff88d49a52c1debf9684ea04";
|
||||
sha256 = "0xs8rz6yhpvj9512c5v3b8dwr2kivywnyyfxzdfbr6fy1xc8zskb";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -328,17 +221,8 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/whyrusleeping/tar-utils";
|
||||
rev = "beab27159606f5a7c978268dd1c3b12a0f1de8a7";
|
||||
sha256 = "07z4is00ridjp8c6cn68lkg1fz6ksj1q7f26g7ir7qx8mx10fj72";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/whyrusleeping/timecache";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/whyrusleeping/timecache";
|
||||
rev = "cfcb2f1abfee846c430233aef0b630a946e0a5a6";
|
||||
sha256 = "0nnra7ivq7cj34rj2ib8hgfdpik3smr1hy7x18svhfin8z1xsj2s";
|
||||
rev = "8c6c8ba81d5c71fd69c0f48dbde4b2fb422b6dfc";
|
||||
sha256 = "14jjdw3yics0k467xsyk388684wdpi0bbx8nqj0y4pqxa0s0in6s";
|
||||
};
|
||||
}
|
||||
{
|
||||
@ -346,17 +230,17 @@
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "a48ac81e47fd6f9ed1258f3b60ae9e75f93cb7ed";
|
||||
sha256 = "0zpgwc362rghm3fv0s964dqmw6krixzxww2qxhnik9hvf7srapjd";
|
||||
rev = "3d3f9f413869b949e48070b5bc593aa22cc2b8f2";
|
||||
sha256 = "0rbkcq48lkiw043sm8hciprqy2d77s4agpj6rwy2qgbqm8gvv3a6";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "leb.io/hashland";
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/tildeleb/hashland";
|
||||
rev = "e13accbe55f7fa03c73c74ace4cca4c425e47260";
|
||||
sha256 = "1ygfp7kjnm964w2bv61bsyxpw5y6vy6k4pra1lhd5r3nhlxgs31g";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "ec83556a53fe16b65c452a104ea9d1e86a671852";
|
||||
sha256 = "1ijlbyn5gs8g6z2pjlj5h77lg7wrljqxdls4xlcfqxmghxiyci2f";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
|
||||
buildGoPackage rec {
|
||||
name = "gx-go-${version}";
|
||||
version = "1.5.0";
|
||||
version = "1.9.0";
|
||||
rev = "refs/tags/v${version}";
|
||||
|
||||
goPackagePath = "github.com/whyrusleeping/gx-go";
|
||||
@ -13,10 +13,10 @@ buildGoPackage rec {
|
||||
src = fetchgit {
|
||||
inherit rev;
|
||||
url = "https://github.com/whyrusleeping/gx-go";
|
||||
sha256 = "0bg4h5lzs293qmlsr9n257vjpr5w6bxb4ampb25gsn3fgy3rvsis";
|
||||
sha256 = "0fdy4b3ymqw6hzvvjwq37mfrdmizc8lxm53axw93n3x6118na9jc";
|
||||
};
|
||||
|
||||
goDeps = ../deps.nix;
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
extraSrcs = [
|
||||
{
|
||||
|
||||
246
pkgs/tools/package-management/gx/go/deps.nix
generated
Normal file
246
pkgs/tools/package-management/gx/go/deps.nix
generated
Normal file
@ -0,0 +1,246 @@
|
||||
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/btcsuite/btcd";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/btcsuite/btcd";
|
||||
rev = "67e573d211ace594f1366b4ce9d39726c4b19bd0";
|
||||
sha256 = "04s92gsy71w1jirlr5lkk9y6r5cparbas7nmf6ywbp7kq7fn8ajn";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gogo/protobuf";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gogo/protobuf";
|
||||
rev = "07eab6a8298cf32fac45cceaac59424f98421bbc";
|
||||
sha256 = "1l2v9yq74qsiq3q7kii091rzx67jx6isz5szs27hyhsdwvy0y2p7";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gxed/hashland";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gxed/hashland";
|
||||
rev = "d9f6b97f8db22dd1e090fd0bbbe98f09cc7dd0a8";
|
||||
sha256 = "1q23y4lacsz46k9gmgfw4iwwydw36j2601rbidmmswl94grpc386";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/ipfs/go-ipfs-api";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/ipfs/go-ipfs-api";
|
||||
rev = "b4fd7838d9771414868cb78fa8c4f97e47cad013";
|
||||
sha256 = "1kb0ja6bji9q1ly66hx3490mjmk3w56zpwl9c0pkfy6da9x4dkyr";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/ipfs/go-ipfs-files";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/ipfs/go-ipfs-files";
|
||||
rev = "90d206a6f3947f904673ebffd376a2dcbbd84942";
|
||||
sha256 = "0bq6lciqba362lqmszjf1x33qwdpfrfik6r680iqr5c4sybywzqv";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kr/fs";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kr/fs";
|
||||
rev = "1455def202f6e05b95cc7bfc7e8ae67ae5141eba";
|
||||
sha256 = "11zg176x9hr9q7fsk95r6q0wf214gg4czy02slax4x56n79g6a7q";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/libp2p/go-flow-metrics";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/libp2p/go-flow-metrics";
|
||||
rev = "7e5a55af485341567f98d6847a373eb5ddcdcd43";
|
||||
sha256 = "1p87iyk6q6f3g3xkncssx400qlld8f2z93qiz8m1f97grfyhjif1";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/libp2p/go-libp2p-crypto";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/libp2p/go-libp2p-crypto";
|
||||
rev = "3120e9f9526fe05f2d3905961a5e0701b85579d9";
|
||||
sha256 = "05i8jcfmk51zln634x782jvjmmn5l11104ylzqfnjxgjibz9pyd7";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/libp2p/go-libp2p-metrics";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/libp2p/go-libp2p-metrics";
|
||||
rev = "2d5733beaa2a9fdd05ef696d7a734aa61549fb2a";
|
||||
sha256 = "1g59z1mn483npmzgdyxn5w7w1k94phi5lgqkw3lq8i1b2jdy5mci";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/libp2p/go-libp2p-peer";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/libp2p/go-libp2p-peer";
|
||||
rev = "d3df4bca884d7a9c2d350c8120240db3c2b0f2ee";
|
||||
sha256 = "0hn75dnr80f846jj38bpcjw5z73iw292ygcqsfbghvdrwl2pf5xm";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/libp2p/go-libp2p-protocol";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/libp2p/go-libp2p-protocol";
|
||||
rev = "b29f3d97e3a2fb8b29c5d04290e6cb5c5018004b";
|
||||
sha256 = "1xgjfnx9zcqglg9li29wdqywsp8hz22wx6phns9zscni2jsfidld";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/minio/blake2b-simd";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/minio/blake2b-simd";
|
||||
rev = "3f5f724cb5b182a5c278d6d3d55b40e7f8c2efb4";
|
||||
sha256 = "0b6jbnj62c0gmmfd4zdmh8xbg01p80f13yygir9xprqkzk6fikmd";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/minio/sha256-simd";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/minio/sha256-simd";
|
||||
rev = "51976451ce1942acbb55707a983ed232fa027110";
|
||||
sha256 = "0kaxvpidf6ygkkb06vi95pirll31jnmywhyalfjvf7djhim2wr8f";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mitchellh/go-homedir";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mitchellh/go-homedir";
|
||||
rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4";
|
||||
sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mr-tron/base58";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mr-tron/base58";
|
||||
rev = "c8897612421d88a51012eaa53bf7267686173ae5";
|
||||
sha256 = "10lr50ia7xccfdvg772f7nb2azn81djcpnckhblhwq6l6a1fpm48";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/multiformats/go-multiaddr";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/multiformats/go-multiaddr";
|
||||
rev = "ec8630b6b7436b5d7f6c1c2366d3d7214d1b29e2";
|
||||
sha256 = "1npx4d3scj087a54m6my2xnd0wga8bkklswnbhzghwhhpsgmy800";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/multiformats/go-multiaddr-net";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/multiformats/go-multiaddr-net";
|
||||
rev = "f0af4033635f1241179700537dacdc04f2803df8";
|
||||
sha256 = "0s90ix09mm6dc8319l48g3zhnjl1mkih168wsdh6fdf73801lhg5";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/multiformats/go-multihash";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/multiformats/go-multihash";
|
||||
rev = "a91e75d03bf4dba801af7b159c8b2aa7b5f47ea8";
|
||||
sha256 = "1xvj944qg17vmdgzhyn5qryqrksyxi1q188f91my52wfkz23qmmm";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/sabhiram/go-gitignore";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/sabhiram/go-gitignore";
|
||||
rev = "d3107576ba9425fc1c85f4b3569c4631b805a02e";
|
||||
sha256 = "1rdwyxgcsiwgmlqnc3k6h300mzlvjc3j21np4yh1h476wc8dvl0l";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/spaolacci/murmur3";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/spaolacci/murmur3";
|
||||
rev = "f09979ecbc725b9e6d41a297405f65e7e8804acc";
|
||||
sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/urfave/cli";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/urfave/cli";
|
||||
rev = "b67dcf995b6a7b7f14fad5fcb7cc5441b05e814b";
|
||||
sha256 = "0n5vq4nydlhb7w12jiwphvxqdy4jwpxc3zwlxyhf05lq1nxfb56h";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/whyrusleeping/gx";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/whyrusleeping/gx";
|
||||
rev = "733691bc18c0858a3d7e1a6e0a42df7d0bcac1de";
|
||||
sha256 = "0pfx2p59xdbmqzfbgaf8xvlnzh8m05hkg596glq5kvl8ib65i4ha";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/whyrusleeping/progmeter";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/whyrusleeping/progmeter";
|
||||
rev = "f3e57218a75b913eff88d49a52c1debf9684ea04";
|
||||
sha256 = "0xs8rz6yhpvj9512c5v3b8dwr2kivywnyyfxzdfbr6fy1xc8zskb";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/whyrusleeping/stump";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/whyrusleeping/stump";
|
||||
rev = "206f8f13aae1697a6fc1f4a55799faf955971fc5";
|
||||
sha256 = "1s40qdppjnk8gijk7x6kbviiqz62nz3h6gic2q9cwcmq8r5isw7n";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/whyrusleeping/tar-utils";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/whyrusleeping/tar-utils";
|
||||
rev = "8c6c8ba81d5c71fd69c0f48dbde4b2fb422b6dfc";
|
||||
sha256 = "14jjdw3yics0k467xsyk388684wdpi0bbx8nqj0y4pqxa0s0in6s";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/crypto";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/crypto";
|
||||
rev = "3d3f9f413869b949e48070b5bc593aa22cc2b8f2";
|
||||
sha256 = "0rbkcq48lkiw043sm8hciprqy2d77s4agpj6rwy2qgbqm8gvv3a6";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "ec83556a53fe16b65c452a104ea9d1e86a671852";
|
||||
sha256 = "1ijlbyn5gs8g6z2pjlj5h77lg7wrljqxdls4xlcfqxmghxiyci2f";
|
||||
};
|
||||
}
|
||||
]
|
||||
@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
|
||||
phases = [ "installPhase" "fixupPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp ${src} $out/bin/kpcli
|
||||
chmod +x $out/bin/kpcli
|
||||
mkdir -p $out/{bin,share}
|
||||
cp ${src} $out/share/kpcli.pl
|
||||
chmod +x $out/share/kpcli.pl
|
||||
|
||||
wrapProgram $out/bin/kpcli --set PERL5LIB \
|
||||
makeWrapper $out/share/kpcli.pl $out/bin/kpcli --set PERL5LIB \
|
||||
"${with perlPackages; stdenv.lib.makePerlPath ([
|
||||
CaptureTiny Clipboard Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu XMLParser
|
||||
] ++ stdenv.lib.optional stdenv.isDarwin MacPasteboard)}"
|
||||
|
||||
@ -38,12 +38,12 @@
|
||||
, mongoc ? null
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "5.8.0";
|
||||
version = "5.8.1";
|
||||
name = "collectd-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://collectd.org/files/${name}.tar.bz2";
|
||||
sha256 = "1j8mxgfq8039js2bscphd6cnriy35hk4jrxfjz5k6mghpdvg8vxh";
|
||||
sha256 = "1njk8hh56gb755xafsh7ahmqr9k2d4lam4ddj7s7fqz0gjigv5p7";
|
||||
};
|
||||
|
||||
# on 5.8.0: lvm2app.h:21:2: error: #warning "liblvm2app is deprecated, use D-Bus API instead." [-Werror=cpp]
|
||||
@ -65,13 +65,6 @@ stdenv.mkDerivation rec {
|
||||
darwin.apple_sdk.frameworks.ApplicationServices
|
||||
];
|
||||
|
||||
# Patch fixes broken build on 18.03
|
||||
# Should be included in the next release of this package
|
||||
patches = fetchpatch {
|
||||
name = "collectd_kafka_fix";
|
||||
url = "https://github.com/collectd/collectd/commit/6c2eb3ad28f08f7e774b6eaea5ae01b0857cf884.patch";
|
||||
sha256 = "14wsyj5xghij9lz7c61bzdyh45zg8pv5xn490cvbqiaci948zzv6";
|
||||
};
|
||||
configureFlags = [ "--localstatedir=/var" ];
|
||||
|
||||
# do not create directories in /var during installPhase
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "hwinfo-${version}";
|
||||
version = "21.60";
|
||||
version = "21.62";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "opensuse";
|
||||
repo = "hwinfo";
|
||||
rev = "${version}";
|
||||
sha256 = "1agjc14m1814x897wkx484qb8llr395xlzn428f86sxgshicwfy3";
|
||||
sha256 = "1mhvpvjdalxhvjkf8vhph414qfp14kwz24jk0mx2y4nijk958n0f";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
||||
@ -934,8 +934,6 @@ with pkgs;
|
||||
|
||||
bindfs = callPackage ../tools/filesystems/bindfs { };
|
||||
|
||||
bins = callPackage ../tools/graphics/bins { };
|
||||
|
||||
bitbucket-cli = python2Packages.bitbucket-cli;
|
||||
|
||||
bittornado = callPackage ../tools/networking/p2p/bittornado { };
|
||||
@ -3096,12 +3094,8 @@ with pkgs;
|
||||
stdenv = stdenv_32bit;
|
||||
};
|
||||
|
||||
gx = callPackage ../tools/package-management/gx {
|
||||
buildGoPackage = buildGo110Package;
|
||||
};
|
||||
gx-go = callPackage ../tools/package-management/gx/go {
|
||||
buildGoPackage = buildGo110Package;
|
||||
};
|
||||
gx = callPackage ../tools/package-management/gx { };
|
||||
gx-go = callPackage ../tools/package-management/gx/go { };
|
||||
|
||||
sbsigntool = callPackage ../tools/security/sbsigntool { };
|
||||
|
||||
@ -4762,8 +4756,6 @@ with pkgs;
|
||||
inherit (pythonPackages) pillow;
|
||||
};
|
||||
|
||||
pdfshuffler = callPackage ../applications/misc/pdfshuffler { };
|
||||
|
||||
briss = callPackage ../tools/graphics/briss { };
|
||||
|
||||
brickd = callPackage ../servers/brickd {
|
||||
@ -5415,10 +5407,6 @@ with pkgs;
|
||||
smarty3 = callPackage ../development/libraries/smarty3 { };
|
||||
smarty3-i18n = callPackage ../development/libraries/smarty3-i18n { };
|
||||
|
||||
smbldaptools = callPackage ../tools/networking/smbldaptools {
|
||||
inherit (perlPackages) perlldap CryptSmbHash DigestSHA1;
|
||||
};
|
||||
|
||||
smbnetfs = callPackage ../tools/filesystems/smbnetfs {};
|
||||
|
||||
smenu = callPackage ../tools/misc/smenu { };
|
||||
@ -8797,9 +8785,12 @@ with pkgs;
|
||||
|
||||
pmccabe = callPackage ../development/tools/misc/pmccabe { };
|
||||
|
||||
pkgconf = callPackage ../development/tools/misc/pkgconf {};
|
||||
|
||||
pkgconfig = callPackage ../development/tools/misc/pkgconfig {
|
||||
fetchurl = fetchurlBoot;
|
||||
};
|
||||
|
||||
pkgconfigUpstream = lowPrio (pkgconfig.override { vanilla = true; });
|
||||
|
||||
postiats-utilities = callPackage ../development/tools/postiats-utilities {};
|
||||
@ -11807,8 +11798,6 @@ with pkgs;
|
||||
|
||||
podofo = callPackage ../development/libraries/podofo { lua5 = lua5_1; };
|
||||
|
||||
poker-eval = callPackage ../development/libraries/poker-eval { };
|
||||
|
||||
polkit = callPackage ../development/libraries/polkit { };
|
||||
|
||||
polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { };
|
||||
@ -15678,6 +15667,8 @@ with pkgs;
|
||||
|
||||
xorg-rgb = callPackage ../data/misc/xorg-rgb {};
|
||||
|
||||
zafiro-icons = callPackage ../data/icons/zafiro-icons { };
|
||||
|
||||
zeal = libsForQt5.callPackage ../data/documentation/zeal { };
|
||||
|
||||
zilla-slab = callPackage ../data/fonts/zilla-slab { };
|
||||
@ -16546,8 +16537,6 @@ with pkgs;
|
||||
|
||||
rectMark = callPackage ../applications/editors/emacs-modes/rect-mark { };
|
||||
|
||||
remember = callPackage ../applications/editors/emacs-modes/remember { };
|
||||
|
||||
rudel = callPackage ../applications/editors/emacs-modes/rudel { };
|
||||
|
||||
s = callPackage ../applications/editors/emacs-modes/s { };
|
||||
@ -20194,8 +20183,6 @@ with pkgs;
|
||||
|
||||
blackshades = callPackage ../games/blackshades { };
|
||||
|
||||
blackshadeselite = callPackage ../games/blackshadeselite { };
|
||||
|
||||
blobby = callPackage ../games/blobby { };
|
||||
|
||||
boohu = callPackage ../games/boohu { };
|
||||
@ -21507,9 +21494,7 @@ with pkgs;
|
||||
java = if stdenv.isLinux then jre else jdk;
|
||||
};
|
||||
|
||||
iprover = callPackage ../applications/science/logic/iprover {
|
||||
inherit (ocaml-ng.ocamlPackages_4_02) ocaml;
|
||||
};
|
||||
iprover = callPackage ../applications/science/logic/iprover { };
|
||||
|
||||
jonprl = callPackage ../applications/science/logic/jonprl {
|
||||
smlnj = if stdenv.isDarwin
|
||||
|
||||
@ -14,6 +14,7 @@ let
|
||||
then callPackage ../development/coq-modules/bignums {}
|
||||
else null;
|
||||
category-theory = callPackage ../development/coq-modules/category-theory { };
|
||||
Cheerios = callPackage ../development/coq-modules/Cheerios {};
|
||||
CoLoR = callPackage ../development/coq-modules/CoLoR {};
|
||||
coq-ext-lib = callPackage ../development/coq-modules/coq-ext-lib {};
|
||||
coq-haskell = callPackage ../development/coq-modules/coq-haskell { };
|
||||
@ -26,6 +27,7 @@ let
|
||||
heq = callPackage ../development/coq-modules/heq {};
|
||||
HoTT = callPackage ../development/coq-modules/HoTT {};
|
||||
interval = callPackage ../development/coq-modules/interval {};
|
||||
InfSeqExt = callPackage ../development/coq-modules/InfSeqExt {};
|
||||
iris = callPackage ../development/coq-modules/iris {};
|
||||
math-classes = callPackage ../development/coq-modules/math-classes { };
|
||||
mathcomp = callPackage ../development/coq-modules/mathcomp { };
|
||||
@ -35,8 +37,10 @@ let
|
||||
QuickChick = callPackage ../development/coq-modules/QuickChick {};
|
||||
ssreflect = callPackage ../development/coq-modules/ssreflect { };
|
||||
stdpp = callPackage ../development/coq-modules/stdpp { };
|
||||
StructTact = callPackage ../development/coq-modules/StructTact {};
|
||||
tlc = callPackage ../development/coq-modules/tlc {};
|
||||
Velisarios = callPackage ../development/coq-modules/Velisarios {};
|
||||
Verdi = callPackage ../development/coq-modules/Verdi {};
|
||||
};
|
||||
|
||||
filterCoqPackages = coq:
|
||||
|
||||
@ -1039,7 +1039,9 @@ let
|
||||
enableX11 = config.unison.enableX11 or true;
|
||||
};
|
||||
|
||||
hol_light = callPackage ../applications/science/logic/hol_light { };
|
||||
hol_light = callPackage ../applications/science/logic/hol_light {
|
||||
camlp5 = callPackage ../development/tools/ocaml/camlp5 { legacy = true; };
|
||||
};
|
||||
|
||||
};
|
||||
in (ocamlPackages.janeStreet // ocamlPackages);
|
||||
|
||||
@ -196,7 +196,7 @@ in {
|
||||
|
||||
astropy = callPackage ../development/python-modules/astropy { };
|
||||
|
||||
astroquery = callPackage ../development/python-modules/astroquery { };
|
||||
astroquery = callPackage ../development/python-modules/astroquery { };
|
||||
|
||||
atom = callPackage ../development/python-modules/atom { };
|
||||
|
||||
@ -1796,10 +1796,15 @@ in {
|
||||
|
||||
jupyter = callPackage ../development/python-modules/jupyter { };
|
||||
|
||||
jupyter_console = callPackage ../development/python-modules/jupyter_console { };
|
||||
jupyter_console = if pythonOlder "3.5" then
|
||||
callPackage ../development/python-modules/jupyter_console/5.nix { }
|
||||
else
|
||||
callPackage ../development/python-modules/jupyter_console { };
|
||||
|
||||
jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { };
|
||||
|
||||
jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { };
|
||||
|
||||
jupyterlab = callPackage ../development/python-modules/jupyterlab {};
|
||||
|
||||
PyLTI = callPackage ../development/python-modules/pylti { };
|
||||
@ -2539,16 +2544,17 @@ in {
|
||||
|
||||
ipy = callPackage ../development/python-modules/IPy { };
|
||||
|
||||
ipykernel = callPackage ../development/python-modules/ipykernel { };
|
||||
ipykernel = if pythonOlder "3.4" then
|
||||
callPackage ../development/python-modules/ipykernel/4.nix { }
|
||||
else
|
||||
callPackage ../development/python-modules/ipykernel { };
|
||||
|
||||
ipyparallel = callPackage ../development/python-modules/ipyparallel { };
|
||||
|
||||
# Newer versions of IPython no longer support Python 2.7.
|
||||
ipython = if isPy27 then self.ipython_5 else self.ipython_6;
|
||||
|
||||
ipython_5 = callPackage ../development/python-modules/ipython/5.nix { };
|
||||
|
||||
ipython_6 = callPackage ../development/python-modules/ipython { };
|
||||
ipython = if pythonOlder "3.5" then
|
||||
callPackage ../development/python-modules/ipython/5.nix { }
|
||||
else
|
||||
callPackage ../development/python-modules/ipython { };
|
||||
|
||||
ipython_genutils = callPackage ../development/python-modules/ipython_genutils { };
|
||||
|
||||
@ -3262,11 +3268,9 @@ in {
|
||||
|
||||
prettytable = callPackage ../development/python-modules/prettytable { };
|
||||
|
||||
prompt_toolkit = self.prompt_toolkit_1;
|
||||
|
||||
prompt_toolkit_1 = callPackage ../development/python-modules/prompt_toolkit/1.nix { };
|
||||
|
||||
prompt_toolkit_2 = callPackage ../development/python-modules/prompt_toolkit { };
|
||||
prompt_toolkit = let
|
||||
filename = if isPy3k then ../development/python-modules/prompt_toolkit else ../development/python-modules/prompt_toolkit/1.nix;
|
||||
in callPackage filename { };
|
||||
|
||||
protobuf = callPackage ../development/python-modules/protobuf {
|
||||
disabled = isPyPy;
|
||||
@ -3281,7 +3285,7 @@ in {
|
||||
psycopg2 = callPackage ../development/python-modules/psycopg2 {};
|
||||
|
||||
ptpython = callPackage ../development/python-modules/ptpython {
|
||||
prompt_toolkit = self.prompt_toolkit_2;
|
||||
prompt_toolkit = self.prompt_toolkit;
|
||||
};
|
||||
|
||||
publicsuffix = callPackage ../development/python-modules/publicsuffix {};
|
||||
@ -3917,6 +3921,8 @@ in {
|
||||
|
||||
magic-wormhole = callPackage ../development/python-modules/magic-wormhole { };
|
||||
|
||||
magic-wormhole-mailbox-server = callPackage ../development/python-modules/magic-wormhole-mailbox-server { };
|
||||
|
||||
magic-wormhole-transit-relay = callPackage ../development/python-modules/magic-wormhole-transit-relay { };
|
||||
|
||||
wxPython = self.wxPython30;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user