ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 21:33:03 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar 2020-12-10 04:39:30 +01:00
commit 4f20afbc19
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
57 changed files with 8178 additions and 5361 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/STALE-BOT.md vendored
View File

@ -7,11 +7,12 @@
## Suggestions for PRs
1. If it is unfinished but you plan to finish it, please mark it as a draft.
2. If you don't expect to work on it any time soon, closing it with a short comment may encourage someone else to pick up your work.
3. To get things rolling again, rebase the PR against the target branch and address valid comments.
4. If you need a review to move forward, ask in [the Discourse thread for PRs that need help](https://discourse.nixos.org/t/prs-in-distress/3604).
5. If all you need is a merge, check the git history to find and [request reviews](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review) from people who usually merge related contributions.
1. GitHub sometimes doesn't notify people who commented / reviewed a PR previously, when you (force) push commits. If you have addressed the reviews you can [officially ask for a review](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review) from those who commented to you or anyone else.
2. If it is unfinished but you plan to finish it, please mark it as a draft.
3. If you don't expect to work on it any time soon, closing it with a short comment may encourage someone else to pick up your work.
4. To get things rolling again, rebase the PR against the target branch and address valid comments.
5. If you need a review to move forward, ask in [the Discourse thread for PRs that need help](https://discourse.nixos.org/t/prs-in-distress/3604).
6. If all you need is a merge, check the git history to find and [request reviews](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/requesting-a-pull-request-review) from people who usually merge related contributions.
## Suggestions for issues

6
maintainers/maintainer-list.nix
View File

@ -9906,6 +9906,12 @@
githubId = 8100652;
name = "David Mell";
};
ztzg = {
email = "dd@crosstwine.com";
github = "ztzg";
githubId = 393108;
name = "Damien Diederen";
};
zx2c4 = {
email = "Jason@zx2c4.com";
github = "zx2c4";

7
nixos/doc/manual/release-notes/rl-2103.xml
View File

@ -382,6 +382,13 @@
for more information.
</para>
</listitem>
<listitem>
<para>
The <package>zookeeper</package> package does not provide
<literal>zooInspector.sh</literal> anymore, as that "contrib" has
been dropped from upstream releases.
</para>
</listitem>
</itemizedlist>
</section>
</section>

5
nixos/modules/services/misc/zookeeper.nix
View File

@ -76,6 +76,7 @@ in {
default = ''
zookeeper.root.logger=INFO, CONSOLE
log4j.rootLogger=INFO, CONSOLE
log4j.logger.org.apache.zookeeper.audit.Log4jAuditLogger=INFO, CONSOLE
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern=[myid:%X{myid}] - %-5p [%t:%C{1}@%L] - %m%n
@ -128,11 +129,10 @@ in {
description = "Zookeeper Daemon";
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
environment = { ZOOCFGDIR = configDir; };
serviceConfig = {
ExecStart = ''
${pkgs.jre}/bin/java \
-cp "${cfg.package}/lib/*:${cfg.package}/${cfg.package.name}.jar:${configDir}" \
-cp "${cfg.package}/lib/*:${configDir}" \
${escapeShellArgs cfg.extraCmdLineOptions} \
-Dzookeeper.datadir.autocreate=false \
${optionalString cfg.preferIPv4 "-Djava.net.preferIPv4Stack=true"} \
@ -143,6 +143,7 @@ in {
};
preStart = ''
echo "${toString cfg.id}" > ${cfg.dataDir}/myid
mkdir -p ${cfg.dataDir}/version-2
'';
};

16
nixos/tests/zookeeper.nix
View File

@ -1,7 +1,12 @@
import ./make-test-python.nix ({ pkgs, ...} : {
import ./make-test-python.nix ({ pkgs, ...} :
let
perlEnv = pkgs.perl.withPackages (p: [p.NetZooKeeper]);
in {
name = "zookeeper";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ nequissimus ];
maintainers = [ nequissimus ztzg ];
};
nodes = {
@ -30,5 +35,12 @@ import ./make-test-python.nix ({ pkgs, ...} : {
server.wait_until_succeeds(
"${pkgs.zookeeper}/bin/zkCli.sh -server localhost:2181 get /foo | grep hello"
)
server.wait_until_succeeds(
"${perlEnv}/bin/perl -E 'use Net::ZooKeeper qw(:acls); $z=Net::ZooKeeper->new(q(localhost:2181)); $z->create(qw(/perl foo acl), ZOO_OPEN_ACL_UNSAFE) || die $z->get_error()'"
)
server.wait_until_succeeds(
"${perlEnv}/bin/perl -E 'use Net::ZooKeeper qw(:acls); $z=Net::ZooKeeper->new(q(localhost:2181)); $z->get(qw(/perl)) eq qw(foo) || die $z->get_error()'"
)
'';
})

6
pkgs/applications/audio/milkytracker/default.nix
View File

@ -19,6 +19,12 @@ stdenv.mkDerivation rec {
# Somehow this does not get set automatically
cmakeFlags = [ "-DSDL2MAIN_LIBRARY=${SDL2}/lib/libSDL2.so" ];
postInstall = ''
install -Dm644 $src/resources/milkytracker.desktop $out/share/applications/milkytracker.desktop
install -Dm644 $src/resources/pictures/carton.png $out/share/pixmaps/milkytracker.png
install -Dm644 $src/resources/milkytracker.appdata $out/share/appdata/milkytracker.appdata.xml
'';
meta = with stdenv.lib; {
description = "Music tracker application, similar to Fasttracker II";
homepage = "http://milkytracker.org";

12
pkgs/applications/editors/eclipse/default.nix
View File

@ -114,6 +114,18 @@ in rec {
};
};
### Eclipse IDE for RCP and RAP Developers
eclipse-rcp = buildEclipse {
name = "eclipse-rcp-${platform_major}.${platform_minor}";
description = "Eclipse IDE for RCP and RAP Developers";
src =
fetchurl {
url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-x86_64.tar.gz";
sha512 = "216g805fgpb7vwbgk36xkf467vijvaa3x0gk4d94pi92d9wdh5dph6wjjr4ka9rvg0pzxxr8y3sgbfqqzqpc82bgiz5qqr93sprh9bj";
};
};
### Environments
# Function that assembles a complete Eclipse environment from an

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

@ -193,10 +193,10 @@
elpaBuild {
pname = "ascii-art-to-unicode";
ename = "ascii-art-to-unicode";
version = "1.12";
version = "1.13";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.12.el";
sha256 = "1w9h2lyriafxj71r79774gh822cz8mry3gdfzyj6ym6v9mvqypna";
url = "https://elpa.gnu.org/packages/ascii-art-to-unicode-1.13.el";
sha256 = "1c0jva3amhl9c5xc5yzdpi58c8m1djym4ccj31z6wmakq7npy07p";
};
packageRequires = [];
meta = {
@ -223,10 +223,10 @@
elpaBuild {
pname = "auctex";
ename = "auctex";
version = "12.2.4";
version = "12.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-12.2.4.tar";
sha256 = "1yz2h692mr35zgqwlxdq8rzv8n0jixhpaqmbiki00hlysm4zh9py";
url = "https://elpa.gnu.org/packages/auctex-12.3.1.tar";
sha256 = "0kn48mmsvp1yp8fjcl4lriymhyskv5s70wscmf596xf56s7mqas4";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -294,7 +294,7 @@
license = lib.licenses.free;
};
}) {};
bbdb = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
bbdb = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "bbdb";
ename = "bbdb";
@ -303,7 +303,7 @@
url = "https://elpa.gnu.org/packages/bbdb-3.2.tar";
sha256 = "1p56dg0mja2b2figy7yhdx714zd5j6njzn0k07zjka3jc06izvjx";
};
packageRequires = [ emacs ];
packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/bbdb.html";
license = lib.licenses.free;
@ -328,10 +328,10 @@
elpaBuild {
pname = "bluetooth";
ename = "bluetooth";
version = "0.1.2";
version = "0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/bluetooth-0.1.2.el";
sha256 = "1vp2vpyq0ybjni35ics1mg1kiwgvc7x12dlmvygy78sqp52sfkcv";
url = "https://elpa.gnu.org/packages/bluetooth-0.2.el";
sha256 = "1dq04p6ms0zx4awlypp4crkz7dzal4xg8ac7p8fqacz196rczssp";
};
packageRequires = [ dash emacs ];
meta = {
@ -394,8 +394,8 @@
ename = "bug-hunter";
version = "1.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/bug-hunter-1.3.1.el";
sha256 = "0xplsnmj144r90vxxkmpdxlaq6gyx4ca6iklq60wd0w05fw9q02x";
url = "https://elpa.gnu.org/packages/bug-hunter-1.3.1.tar";
sha256 = "0cgwq8b6jglbg9ydvf80ijgbbccrks3yb9af46sdd6aqdmvdlx21";
};
packageRequires = [ cl-lib seq ];
meta = {
@ -542,10 +542,10 @@
elpaBuild {
pname = "compact-docstrings";
ename = "compact-docstrings";
version = "0.1";
version = "0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/compact-docstrings-0.1.el";
sha256 = "1qmxn1i07nnzfckl06lg3xpvccx2hjgpypgc9v4pdihjfdwnifm5";
url = "https://elpa.gnu.org/packages/compact-docstrings-0.2.el";
sha256 = "0qcxvcwpl263fs1zd6gmbqliwlpkw012p5ba6y05fpm9p10v600h";
};
packageRequires = [];
meta = {
@ -642,8 +642,8 @@
ename = "counsel";
version = "0.13.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/counsel-0.13.1.el";
sha256 = "1y3hr3j5bh5mbyh1cqzxx04181qpvj4xyv1gym2gxcjd30nfllli";
url = "https://elpa.gnu.org/packages/counsel-0.13.1.tar";
sha256 = "0m4dmhj33cxaapn9lf7bj1r680gi2wd7cw9xlssjklzvic29a6db";
};
packageRequires = [ emacs swiper ];
meta = {
@ -655,10 +655,10 @@
elpaBuild {
pname = "cpio-mode";
ename = "cpio-mode";
version = "0.16";
version = "0.17";
src = fetchurl {
url = "https://elpa.gnu.org/packages/cpio-mode-0.16.tar";
sha256 = "06xdifgx45aghfppz5dws3v6w37q84lwgxp1pc51p2jjflqbqy5q";
url = "https://elpa.gnu.org/packages/cpio-mode-0.17.tar";
sha256 = "144ajbxmz6amb2234a278c9sl4zg69ndswb8vk0mcq8y9s2abm1x";
};
packageRequires = [ emacs ];
meta = {
@ -685,10 +685,10 @@
elpaBuild {
pname = "csv-mode";
ename = "csv-mode";
version = "1.12";
version = "1.13";
src = fetchurl {
url = "https://elpa.gnu.org/packages/csv-mode-1.12.tar";
sha256 = "0bya12smlrzwv4cbcmch4kg1fazp4k0ndrh1z17ix9p8c14d0v1j";
url = "https://elpa.gnu.org/packages/csv-mode-1.13.tar";
sha256 = "0g9rj8sgdbzqnqqvhx3022zz665wqam2nlxsbhzz2393cz11y0d2";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -760,10 +760,10 @@
elpaBuild {
pname = "debbugs";
ename = "debbugs";
version = "0.25";
version = "0.27";
src = fetchurl {
url = "https://elpa.gnu.org/packages/debbugs-0.25.tar";
sha256 = "0h0pxav170yzfpjf4vb8simiw67x9dkcjx9m4ghdk6wia25y8jni";
url = "https://elpa.gnu.org/packages/debbugs-0.27.tar";
sha256 = "1zn9p9vmfv5ihrp8d06b6abs48q225v42cgwa01s39hld6zg6wbv";
};
packageRequires = [ emacs soap-client ];
meta = {
@ -895,10 +895,10 @@
elpaBuild {
pname = "djvu";
ename = "djvu";
version = "1.1";
version = "1.1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/djvu-1.1.el";
sha256 = "0njgyx09q225hliacsnjk8wallg5i6xkz6bj501pb05nwqfbvfk7";
url = "https://elpa.gnu.org/packages/djvu-1.1.1.el";
sha256 = "0z2qk1v4qkvcwl27ycqfb8vyszq5v6b8ci29b4la00yaki16p04i";
};
packageRequires = [];
meta = {
@ -955,10 +955,10 @@
elpaBuild {
pname = "ebdb";
ename = "ebdb";
version = "0.6.18";
version = "0.6.21";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ebdb-0.6.18.tar";
sha256 = "0znbv3c7wdgak1f1zb051vg4r29fksqh53k1j77jfmqcvwkpz2mw";
url = "https://elpa.gnu.org/packages/ebdb-0.6.21.tar";
sha256 = "0pp190wr6z98kggmw9ls486f9vxfimdjdbqsp263qiyi21ws98if";
};
packageRequires = [ cl-lib emacs seq ];
meta = {
@ -985,10 +985,10 @@
elpaBuild {
pname = "ebdb-i18n-chn";
ename = "ebdb-i18n-chn";
version = "1.3";
version = "1.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.3.el";
sha256 = "1w7xgagscyjxrw4xl8bz6wf7skvdvk5qdcp5p7kxl4r9nhjffj20";
url = "https://elpa.gnu.org/packages/ebdb-i18n-chn-1.3.1.el";
sha256 = "02drr89i4kzjm1rs22sj0nv9sj95dmqk40xvxd75qzfn8y33k9vl";
};
packageRequires = [ ebdb pyim ];
meta = {
@ -1015,10 +1015,10 @@
elpaBuild {
pname = "eev";
ename = "eev";
version = "20200224";
version = "20201013";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eev-20200224.tar";
sha256 = "1r1wh001ikg34axihffrhzl0n8r0w42s2hac2jys8sil1hqvx306";
url = "https://elpa.gnu.org/packages/eev-20201013.tar";
sha256 = "1frwlcqi8kjm13x3i6pw70kqcr306rikaanyfxyn6i5brm1ncxk8";
};
packageRequires = [ emacs ];
meta = {
@ -1070,10 +1070,10 @@
elpaBuild {
pname = "eldoc";
ename = "eldoc";
version = "1.8.0";
version = "1.11.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eldoc-1.8.0.el";
sha256 = "1zxy9x9a0yqwdi572jj04x9lyj3d87mpyfbn3092a5nqwc864k9w";
url = "https://elpa.gnu.org/packages/eldoc-1.11.0.el";
sha256 = "1py9l1vl7s90y5kfpglhy11jswam2gcrqap09h6wb5ldnyb8cgq2";
};
packageRequires = [ emacs ];
meta = {
@ -1115,10 +1115,10 @@
elpaBuild {
pname = "elisp-benchmarks";
ename = "elisp-benchmarks";
version = "1.7";
version = "1.9";
src = fetchurl {
url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.7.tar";
sha256 = "1ps28bvh87d98k84ygx374a1kbwvnqm4w8jpkgzic01as78hgkiz";
url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.9.tar";
sha256 = "14qmybmjlgkjns6vlbsf46f276ykydnbm0f6mij2w3b9qx7z2nb2";
};
packageRequires = [];
meta = {
@ -1126,16 +1126,16 @@
license = lib.licenses.free;
};
}) {};
emms = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
emms = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }:
elpaBuild {
pname = "emms";
ename = "emms";
version = "5.42";
version = "6.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/emms-5.42.tar";
sha256 = "1khx1fvllrs6w9kxk12mp1hj309c90mc7lkq1vvlqlr7vd6zmnpj";
url = "https://elpa.gnu.org/packages/emms-6.2.tar";
sha256 = "0d95sjrh9vpl41vz26y8clgji987z15lj4ky2kr9yrl0zpa8yv35";
};
packageRequires = [ cl-lib ];
packageRequires = [ cl-lib seq ];
meta = {
homepage = "https://elpa.gnu.org/packages/emms.html";
license = lib.licenses.free;
@ -1202,10 +1202,10 @@
elpaBuild {
pname = "excorporate";
ename = "excorporate";
version = "0.8.3";
version = "0.9.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/excorporate-0.8.3.tar";
sha256 = "04bsbiwgfbfd501qvwh0iwyk0xh442kjfj73b3876idwj3p8alr5";
url = "https://elpa.gnu.org/packages/excorporate-0.9.1.tar";
sha256 = "15rk0br7dmvni10f3mm94ylybl3jbf2ps1sypis6hxbazxxr443j";
};
packageRequires = [ emacs fsm nadvice soap-client url-http-ntlm ];
meta = {
@ -1363,6 +1363,21 @@
license = lib.licenses.free;
};
}) {};
gcmh = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "gcmh";
ename = "gcmh";
version = "0.2.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/gcmh-0.2.1.el";
sha256 = "0a51bkkfdj3x26yalvk7v35rxbl3m1wk6n0f33zhrhl6i5fsrfin";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/gcmh.html";
license = lib.licenses.free;
};
}) {};
ggtags = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "ggtags";
@ -1427,10 +1442,10 @@
elpaBuild {
pname = "gnorb";
ename = "gnorb";
version = "1.6.7";
version = "1.6.9";
src = fetchurl {
url = "https://elpa.gnu.org/packages/gnorb-1.6.7.tar";
sha256 = "17pz6i51z298rk7j3rraw1gxlssn88yi4bbpzyxv9cs7y1lfy8ld";
url = "https://elpa.gnu.org/packages/gnorb-1.6.9.tar";
sha256 = "027qqcxd3531f0j6frwlnw542lis4xgsx0ss1mdwb6hqc5f0vaxm";
};
packageRequires = [ cl-lib ];
meta = {
@ -1479,10 +1494,10 @@
elpaBuild {
pname = "gnugo";
ename = "gnugo";
version = "3.1.0";
version = "3.1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/gnugo-3.1.0.tar";
sha256 = "0xpjvs250gg71qwapdsb1hlc61gs0gpkjds01srf784fvyxx2gf1";
url = "https://elpa.gnu.org/packages/gnugo-3.1.1.tar";
sha256 = "035rgiz42q042h41l4cvf0hr8igy2vyn3s1hsl2pgh2dq2jjylv6";
};
packageRequires = [ ascii-art-to-unicode cl-lib xpm ];
meta = {
@ -1535,6 +1550,21 @@
license = lib.licenses.free;
};
}) {};
greenbar = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "greenbar";
ename = "greenbar";
version = "1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/greenbar-1.1.el";
sha256 = "01ixv3489zdx2b67zqad6h7g8cpnzpzrvvkqyx7csqyrfx0qy27n";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/greenbar.html";
license = lib.licenses.free;
};
}) {};
guess-language = callPackage ({ cl-lib ? null
, elpaBuild
, emacs
@ -1636,10 +1666,10 @@
elpaBuild {
pname = "hyperbole";
ename = "hyperbole";
version = "7.1.2";
version = "7.1.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/hyperbole-7.1.2.tar";
sha256 = "1bspmqnbniwr9385wh823dsr5fgch5qnlkf45s4vi0nvg8jdccp1";
url = "https://elpa.gnu.org/packages/hyperbole-7.1.3.tar";
sha256 = "0bizibn4qgxqp89fyik6p47s9hss1g932mg8k7pznn3kkhj5c8rh";
};
packageRequires = [ emacs ];
meta = {
@ -1707,6 +1737,26 @@
license = lib.licenses.free;
};
}) {};
ivy-posframe = callPackage ({ elpaBuild
, emacs
, fetchurl
, ivy
, lib
, posframe }:
elpaBuild {
pname = "ivy-posframe";
ename = "ivy-posframe";
version = "0.5.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ivy-posframe-0.5.3.el";
sha256 = "03ydfb155p5lak7nw4s79ab9zadwsjw1zggzwxgnlydsqdqbr6l6";
};
packageRequires = [ emacs ivy posframe ];
meta = {
homepage = "https://elpa.gnu.org/packages/ivy-posframe.html";
license = lib.licenses.free;
};
}) {};
javaimp = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "javaimp";
@ -1756,10 +1806,10 @@
elpaBuild {
pname = "json-mode";
ename = "json-mode";
version = "0.1";
version = "0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/json-mode-0.1.el";
sha256 = "025bwpx7nc1qhdyf2yaqjdr6x1qr6q45776yvy427xdh4nbk054l";
url = "https://elpa.gnu.org/packages/json-mode-0.2.el";
sha256 = "16ph6v9snvlmclg9shnyck86dqvlj4lf8205dhqx4l8vmhfy3d14";
};
packageRequires = [ emacs ];
meta = {
@ -1771,10 +1821,10 @@
elpaBuild {
pname = "jsonrpc";
ename = "jsonrpc";
version = "1.0.12";
version = "1.0.14";
src = fetchurl {
url = "https://elpa.gnu.org/packages/jsonrpc-1.0.12.el";
sha256 = "0cqp05awikbrn88ifld3vwnv6cxgmr83wlnsvxw8bqb96djz70ad";
url = "https://elpa.gnu.org/packages/jsonrpc-1.0.14.el";
sha256 = "069l0sqkambam4ikj9id36kdw1jdjna8v586d51m64hiz96rmvm6";
};
packageRequires = [ emacs ];
meta = {
@ -1831,10 +1881,10 @@
elpaBuild {
pname = "leaf";
ename = "leaf";
version = "4.2.5";
version = "4.3.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/leaf-4.2.5.tar";
sha256 = "0y78mp4c2gcwp7dc87wlx3r4hfmap14vvx8gkjc9nkf99qavpnkw";
url = "https://elpa.gnu.org/packages/leaf-4.3.2.tar";
sha256 = "190sfnnii9jnj8amjkdabd8w9k2xyalhg4h488a5gzjxdzz2s6zi";
};
packageRequires = [ emacs ];
meta = {
@ -1966,10 +2016,10 @@
elpaBuild {
pname = "markchars";
ename = "markchars";
version = "0.2.1";
version = "0.2.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/markchars-0.2.1.el";
sha256 = "0dpq3brblcxjkcqv3xsmlsx5z9zbv94v0kg4j1sic3brz6hbl4lk";
url = "https://elpa.gnu.org/packages/markchars-0.2.2.el";
sha256 = "09a471c2mcjm6ia37xqz0573sy8f68d5ljgnmhrj0v455g1g44lj";
};
packageRequires = [];
meta = {
@ -2071,10 +2121,10 @@
elpaBuild {
pname = "minimap";
ename = "minimap";
version = "1.3";
version = "1.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/minimap-1.3.el";
sha256 = "15azlmi6kk9pg1c4zrw952qsh9wq6ggqb4qqc84a7l67nhqb9bqp";
url = "https://elpa.gnu.org/packages/minimap-1.4.el";
sha256 = "09fm0ziy8cdzzw08l7l6p63dxz2a27p3laia2v51mvbva8177ls1";
};
packageRequires = [];
meta = {
@ -2101,10 +2151,10 @@
elpaBuild {
pname = "modus-operandi-theme";
ename = "modus-operandi-theme";
version = "0.11.0";
version = "0.12.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.11.0.el";
sha256 = "11sq105vpp8rmyayfb7h8gz099kfdr7nb8n4pg81iby4fllj1kgd";
url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.12.0.el";
sha256 = "1mllyysn701qfnglxs7n2f6mrzrz55v9hcwspvafc6fl2blr393y";
};
packageRequires = [ emacs ];
meta = {
@ -2116,10 +2166,10 @@
elpaBuild {
pname = "modus-vivendi-theme";
ename = "modus-vivendi-theme";
version = "0.11.0";
version = "0.12.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.11.0.el";
sha256 = "14ky9cxg9cpvhgg24ra0xla2dapqjlf948470q7v0m402x1r2iif";
url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.12.0.el";
sha256 = "01f6z5xjnmki1k9m83jwva42lxidb31pdpwm4wpxjzxqmb96picn";
};
packageRequires = [ emacs ];
meta = {
@ -2131,10 +2181,10 @@
elpaBuild {
pname = "multishell";
ename = "multishell";
version = "1.1.5";
version = "1.1.9";
src = fetchurl {
url = "https://elpa.gnu.org/packages/multishell-1.1.5.tar";
sha256 = "0g38p5biyxqkjdkmxlikvhkhkmafyy3ibd012q83skaf8fi4cv1y";
url = "https://elpa.gnu.org/packages/multishell-1.1.9.tar";
sha256 = "0gi5qmx27v7kaczr9b3sic69br3l7mcws3sdrs8c14iipcyl5qhb";
};
packageRequires = [ cl-lib ];
meta = {
@ -2301,16 +2351,16 @@
license = lib.licenses.free;
};
}) {};
oauth2 = callPackage ({ elpaBuild, fetchurl, lib }:
oauth2 = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, nadvice }:
elpaBuild {
pname = "oauth2";
ename = "oauth2";
version = "0.13";
version = "0.15";
src = fetchurl {
url = "https://elpa.gnu.org/packages/oauth2-0.13.el";
sha256 = "0y5nbdwxz2hfr09xgsqgyv60vgx0rsaisibcpkz00klvgg26w33r";
url = "https://elpa.gnu.org/packages/oauth2-0.15.el";
sha256 = "0ij17g6i8d4cyzc8v6sy2qglwhzd767331gavll6d507krdh3ca3";
};
packageRequires = [];
packageRequires = [ cl-lib nadvice ];
meta = {
homepage = "https://elpa.gnu.org/packages/oauth2.html";
license = lib.licenses.free;
@ -2380,10 +2430,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "9.3.6";
version = "9.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-9.3.6.tar";
sha256 = "0jwpgfzjvf1hd3mx582pw86hysdryaqzp69hk6azi9kmq4bzk87d";
url = "https://elpa.gnu.org/packages/org-9.4.tar";
sha256 = "1awkrh3y90q7c0as3327rqj0zylf5cpjzr1pyvbzymli16irhwb6";
};
packageRequires = [];
meta = {
@ -2395,10 +2445,10 @@
elpaBuild {
pname = "org-edna";
ename = "org-edna";
version = "1.1.1";
version = "1.1.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-edna-1.1.1.tar";
sha256 = "1hfkdjbjnhbwb27vgs43ywl4kn2lqc037f4xppp2v0s97850za8r";
url = "https://elpa.gnu.org/packages/org-edna-1.1.2.tar";
sha256 = "1a022ssqpxbkp03n2bij78srwjx7kacpsgj9a6wbm0yn946hgjpz";
};
packageRequires = [ emacs org seq ];
meta = {
@ -2406,14 +2456,29 @@
license = lib.licenses.free;
};
}) {};
org-translate = callPackage ({ elpaBuild, emacs, fetchurl, lib, org }:
elpaBuild {
pname = "org-translate";
ename = "org-translate";
version = "0.1.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-translate-0.1.2.el";
sha256 = "1087h6l5d8946dl4bg7g7is5pwc6004l4k9i2qcki4ahglvzdkz4";
};
packageRequires = [ emacs org ];
meta = {
homepage = "https://elpa.gnu.org/packages/org-translate.html";
license = lib.licenses.free;
};
}) {};
orgalist = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "orgalist";
ename = "orgalist";
version = "1.12";
version = "1.13";
src = fetchurl {
url = "https://elpa.gnu.org/packages/orgalist-1.12.el";
sha256 = "1hwm7j0hbv2pg9w885ky1c9qga3grcfq8v216jv2ivkw8xzavysd";
url = "https://elpa.gnu.org/packages/orgalist-1.13.el";
sha256 = "1wkxc5kcy1g4lx6pd78pa8znncjyl9zyhsvz7wpp56qmhq4hlav3";
};
packageRequires = [ emacs ];
meta = {
@ -2545,10 +2610,10 @@
elpaBuild {
pname = "phps-mode";
ename = "phps-mode";
version = "0.3.52";
version = "0.3.65";
src = fetchurl {
url = "https://elpa.gnu.org/packages/phps-mode-0.3.52.tar";
sha256 = "11783i4raw6z326bqin9g37ig2szbqsma1r0fsdckyn2q6w7nn92";
url = "https://elpa.gnu.org/packages/phps-mode-0.3.65.tar";
sha256 = "18pqxwfmciz9d2w808mvspkcifrja85y2qjwmb6pbdnkj9dr6yad";
};
packageRequires = [ emacs ];
meta = {
@ -2590,10 +2655,10 @@
elpaBuild {
pname = "posframe";
ename = "posframe";
version = "0.8.0";
version = "0.8.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/posframe-0.8.0.el";
sha256 = "1vzaiiw2pxa0zrc2bkaxljpr4035xrh3d8z3l5f0jvp72cnq49kp";
url = "https://elpa.gnu.org/packages/posframe-0.8.3.el";
sha256 = "05m56aw2yxik0pgcvyr5c92j2mwfksxgq1syzvik6161gy8hdd0g";
};
packageRequires = [ emacs ];
meta = {
@ -2605,10 +2670,10 @@
elpaBuild {
pname = "project";
ename = "project";
version = "0.5.1";
version = "0.5.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/project-0.5.1.el";
sha256 = "1i15hlrfipsfrdmgh6xzkr6aszgvik3y8j9363qkj654dl04pmz4";
url = "https://elpa.gnu.org/packages/project-0.5.2.el";
sha256 = "181hls4phhj8kgpfcky6h0mgzpl9xj616abvcvx8mrn4nmpyh655";
};
packageRequires = [ emacs xref ];
meta = {
@ -2650,10 +2715,10 @@
elpaBuild {
pname = "python";
ename = "python";
version = "0.26.1";
version = "0.27";
src = fetchurl {
url = "https://elpa.gnu.org/packages/python-0.26.1.el";
sha256 = "1dpw2w2nk6ggr8pz293qysjkiya3i7k25i447fbycjil59anzpb3";
url = "https://elpa.gnu.org/packages/python-0.27.el";
sha256 = "03k527p1jp47hmm7rmld3cn9dls1smyspvgii2xn95jfvrp9klvv";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -2896,6 +2961,21 @@
license = lib.licenses.free;
};
}) {};
rec-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "rec-mode";
ename = "rec-mode";
version = "1.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/rec-mode-1.6.tar";
sha256 = "1dhv3n2x0bpdisi9bj3qa0bhpjzhs57fga72s4fxh44gp92yl18q";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/rec-mode.html";
license = lib.licenses.free;
};
}) {};
register-list = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "register-list";
@ -2915,10 +2995,10 @@
elpaBuild {
pname = "relint";
ename = "relint";
version = "1.18";
version = "1.19";
src = fetchurl {
url = "https://elpa.gnu.org/packages/relint-1.18.tar";
sha256 = "0zfislsksrkn6qs0w26yaff5xr7xqy2x235dcdpz8s2v35b6dhci";
url = "https://elpa.gnu.org/packages/relint-1.19.tar";
sha256 = "14z3i01pq5ljhjf5yfcjw7hxljcrwjnizkrdc1qyh9b6h3ic1bbi";
};
packageRequires = [ emacs xr ];
meta = {
@ -2981,10 +3061,10 @@
elpaBuild {
pname = "rudel";
ename = "rudel";
version = "0.3.1";
version = "0.3.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/rudel-0.3.1.tar";
sha256 = "0glqa68g509p0s2vcc0i8kzlddnc9brd9jqhnm5rzxz4i050cvnz";
url = "https://elpa.gnu.org/packages/rudel-0.3.2.tar";
sha256 = "03hcvpp6ykavidwn5x48gs986w1i5icvh7ks6p74pdaagpgw4jmk";
};
packageRequires = [ cl-generic cl-lib cl-print emacs ];
meta = {
@ -3041,10 +3121,10 @@
elpaBuild {
pname = "seq";
ename = "seq";
version = "2.20";
version = "2.22";
src = fetchurl {
url = "https://elpa.gnu.org/packages/seq-2.20.tar";
sha256 = "0vrpx6nnyjb0gsypknzagimlhvcvi5y1rcdkpxyqr42415zr8d0n";
url = "https://elpa.gnu.org/packages/seq-2.22.tar";
sha256 = "0zlqcbabzj8crg36ird2l74dbg5k7w1zf5iwva0h2dyvwyf9grma";
};
packageRequires = [];
meta = {
@ -3067,6 +3147,21 @@
license = lib.licenses.free;
};
}) {};
shell-command-plus = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "shell-command-plus";
ename = "shell-command+";
version = "2.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/shell-command+-2.0.0.tar";
sha256 = "1l8lwami4rbp94sbb1k4dvv7z0dvf51s0992xragpn9b9jbx5qd6";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/shell-command+.html";
license = lib.licenses.free;
};
}) {};
shen-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "shen-mode";
@ -3097,14 +3192,29 @@
license = lib.licenses.free;
};
}) {};
slime-volleyball = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "slime-volleyball";
ename = "slime-volleyball";
version = "1.1.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/slime-volleyball-1.1.7.tar";
sha256 = "0dl1x0ghfwg4vv2asz3g4plghjxpzd56fyw09vsa3s3k9xsmy3yy";
};
packageRequires = [ cl-lib ];
meta = {
homepage = "https://elpa.gnu.org/packages/slime-volleyball.html";
license = lib.licenses.free;
};
}) {};
sm-c-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "sm-c-mode";
ename = "sm-c-mode";
version = "1.0";
version = "1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/sm-c-mode-1.0.el";
sha256 = "1lq65dhcvrh6ybla37lvni7wmbjb5nhm75ja9cl79148da1zrg91";
url = "https://elpa.gnu.org/packages/sm-c-mode-1.1.el";
sha256 = "1k46628dkmg4bvd5f68lv5kjcjbgm2pd8jc0zhq9n70jwf5z2ip8";
};
packageRequires = [];
meta = {
@ -3176,10 +3286,10 @@
elpaBuild {
pname = "soap-client";
ename = "soap-client";
version = "3.1.5";
version = "3.2.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/soap-client-3.1.5.tar";
sha256 = "0nnf075ywxmsfd6vmzk2yg3khx6sycl5l6qrgp5rqqmw0wzhxlh0";
url = "https://elpa.gnu.org/packages/soap-client-3.2.0.tar";
sha256 = "1s0bwnip22nj6kgjadd4zlj9j729hiyyjb66sr51i2mddnf9i95s";
};
packageRequires = [ cl-lib ];
meta = {
@ -3232,6 +3342,21 @@
license = lib.licenses.free;
};
}) {};
sql-beeline = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "sql-beeline";
ename = "sql-beeline";
version = "0.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/sql-beeline-0.1.el";
sha256 = "0z2wdvvq1zdw90253s5i57lx8b59rjf7g7isns4yz29lwav04j3r";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/sql-beeline.html";
license = lib.licenses.free;
};
}) {};
sql-indent = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "sql-indent";
@ -3251,10 +3376,10 @@
elpaBuild {
pname = "ssh-deploy";
ename = "ssh-deploy";
version = "3.1.11";
version = "3.1.12";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.11.tar";
sha256 = "1xd09kfn7lqw6jzfkrn0p5agdpcz1z9zbazqigylpqfcywr5snhk";
url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.12.tar";
sha256 = "0fz49l63jfw9zy459f07bq2irdb8ispnx8m2c3wxwiim9yw5xnjg";
};
packageRequires = [ emacs ];
meta = {
@ -3281,10 +3406,10 @@
elpaBuild {
pname = "svg";
ename = "svg";
version = "1.0";
version = "1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/svg-1.0.el";
sha256 = "1hh0x7sz2rqb7zdhcm2q9knr8nnwqrsbz1zfp29k8l1318li9f62";
url = "https://elpa.gnu.org/packages/svg-1.1.el";
sha256 = "0j69xsaj0d1pnxjfb5m0yf2vxbrcmr8i3g75km4dzbha46v4xxvg";
};
packageRequires = [ emacs ];
meta = {
@ -3313,8 +3438,8 @@
ename = "swiper";
version = "0.13.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/swiper-0.13.1.el";
sha256 = "06ild7kck0x5ry8bf0al24nh04q01q3jhj6jjl4xz8n2s6jnn70y";
url = "https://elpa.gnu.org/packages/swiper-0.13.1.tar";
sha256 = "0k39pa89y0bfvdfqg3nc5pjq5mwxwimc4ma3z28vaf14zd38x9m1";
};
packageRequires = [ emacs ivy ];
meta = {
@ -3420,10 +3545,10 @@
elpaBuild {
pname = "tramp";
ename = "tramp";
version = "2.4.4.1";
version = "2.4.4.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tramp-2.4.4.1.tar";
sha256 = "0jayd75yscaqvg6y0m6g2mgbjswyj5gqdij2az9g0j18vm5vbqy3";
url = "https://elpa.gnu.org/packages/tramp-2.4.4.4.tar";
sha256 = "1f2d02xz3kpy50186wcy688lx76dv0gmrbkj2qdvifcwhyc26sz8";
};
packageRequires = [ emacs ];
meta = {
@ -3480,10 +3605,10 @@
elpaBuild {
pname = "undo-tree";
ename = "undo-tree";
version = "0.7.4";
version = "0.7.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/undo-tree-0.7.4.el";
sha256 = "018ixl802f076sfyf4gkacpgrdpybin88jd8vq9zgyvc6x2dalfa";
url = "https://elpa.gnu.org/packages/undo-tree-0.7.5.el";
sha256 = "00admi87gqm0akhfqm4dcp9fw8ihpygy030955jswkha4zs7lw2p";
};
packageRequires = [];
meta = {
@ -3495,10 +3620,10 @@
elpaBuild {
pname = "uni-confusables";
ename = "uni-confusables";
version = "0.1";
version = "0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/uni-confusables-0.1.tar";
sha256 = "0s3scvzhd4bggk0qafcspf97cmcvdw3w8bbf5ark4p22knvg80zp";
url = "https://elpa.gnu.org/packages/uni-confusables-0.2.tar";
sha256 = "1lak9sr0h7hmc4qb7lzjqc1f88vjzbk8n76sspplfrizs3avg5ps";
};
packageRequires = [];
meta = {
@ -3560,6 +3685,21 @@
license = lib.licenses.free;
};
}) {};
valign = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "valign";
ename = "valign";
version = "3.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/valign-3.0.0.el";
sha256 = "16f889x6yc1af2bmbly2lww4sy1s864ll75xdxp28i5m57gj25w8";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/valign.html";
license = lib.licenses.free;
};
}) {};
vcard = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "vcard";
@ -3594,10 +3734,10 @@
elpaBuild {
pname = "vdiff";
ename = "vdiff";
version = "0.2.3";
version = "0.2.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vdiff-0.2.3.el";
sha256 = "197wszzhm2kbfvvlg3f0dzfs3lf4536yq5fd67k2rycj421fr9qz";
url = "https://elpa.gnu.org/packages/vdiff-0.2.4.tar";
sha256 = "1mgzfrzp6nbb4xv2zjqk4za2dv3r5645jasiwf45wzqq5wbrgq2c";
};
packageRequires = [ emacs hydra ];
meta = {
@ -3674,10 +3814,10 @@
elpaBuild {
pname = "vlf";
ename = "vlf";
version = "1.7.1";
version = "1.7.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vlf-1.7.1.tar";
sha256 = "0cnwxk20573iqkwk0c0h7pyjk0rkr8l2qd0xmyqj8mvdxjb8nnkz";
url = "https://elpa.gnu.org/packages/vlf-1.7.2.tar";
sha256 = "0hpri19z6b7dqmrj5ckp8sf0m0l72lkgahqzvfmwhgpgv2p81bny";
};
packageRequires = [];
meta = {
@ -3704,10 +3844,10 @@
elpaBuild {
pname = "wcheck-mode";
ename = "wcheck-mode";
version = "2019.6.17";
version = "2020.10.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/wcheck-mode-2019.6.17.el";
sha256 = "0579a3p9swq0j0fca9s885kzv69y9lhhnqa6m4pzdgrr6pfrirqv";
url = "https://elpa.gnu.org/packages/wcheck-mode-2020.10.4.el";
sha256 = "0pi6gvyw80phmx0qzc5wdk5czv4m9cq1hs3l4s7r8rr91g2cqi3m";
};
packageRequires = [];
meta = {
@ -3749,10 +3889,10 @@
elpaBuild {
pname = "webfeeder";
ename = "webfeeder";
version = "1.0.0";
version = "1.1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/webfeeder-1.0.0.tar";
sha256 = "06y5vxw9m6pmbrzb8v2i3w9dnhgqxz06vyx1knmgi9cczlrj4a64";
url = "https://elpa.gnu.org/packages/webfeeder-1.1.1.tar";
sha256 = "09caj12hfdfhlbcsmjyhw728w1f7yq13hdslh793yvfqv83ipvc4";
};
packageRequires = [ emacs ];
meta = {
@ -3779,10 +3919,10 @@
elpaBuild {
pname = "which-key";
ename = "which-key";
version = "3.3.0";
version = "3.3.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/which-key-3.3.0.tar";
sha256 = "0436hvqdn2jafgfwdr0m9mwz8k2swl661xnrkypyrwg66j9wi1qz";
url = "https://elpa.gnu.org/packages/which-key-3.3.2.tar";
sha256 = "01g5jcikhgxnri1rpbjq191220b4r3bimz2jzs1asc766w42q2gb";
};
packageRequires = [ emacs ];
meta = {
@ -3919,10 +4059,10 @@
elpaBuild {
pname = "xr";
ename = "xr";
version = "1.19";
version = "1.20";
src = fetchurl {
url = "https://elpa.gnu.org/packages/xr-1.19.tar";
sha256 = "1aa3iqh0r635jw8k89zh8y4am9d4hfrqpk9mrdh2b51invjn8llq";
url = "https://elpa.gnu.org/packages/xr-1.20.tar";
sha256 = "0i3vfsp110z60gabn9x9rv21fvm7nnr234mvmpp7gx4l4hpadvzy";
};
packageRequires = [ emacs ];
meta = {
@ -3934,10 +4074,10 @@
elpaBuild {
pname = "xref";
ename = "xref";
version = "1.0.2";
version = "1.0.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/xref-1.0.2.el";
sha256 = "156rfwdihb3vz31iszbmby16spqswyf69nhl3r2cp6jzkgwzc1d8";
url = "https://elpa.gnu.org/packages/xref-1.0.3.el";
sha256 = "1r531gl73y1br8g4n77gxbyj26yiaw7snjad21fgs5m80cka8fi3";
};
packageRequires = [ emacs ];
meta = {
@ -4008,4 +4148,4 @@
license = lib.licenses.free;
};
}) {};
}
}

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

@ -4,10 +4,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "20200817";
version = "20201207";
src = fetchurl {
url = "https://orgmode.org/elpa/org-20200817.tar";
sha256 = "159hch9zls3apxq11c5rjpmci1avyl7q3cgsrqxwgnzy8c61104d";
url = "https://orgmode.org/elpa/org-20201207.tar";
sha256 = "0hryicg3nbvc17ypwdcx08kl8samd979388hw7jwbp5sw3v95y0c";
};
packageRequires = [];
meta = {
@ -19,10 +19,10 @@
elpaBuild {
pname = "org-plus-contrib";
ename = "org-plus-contrib";
version = "20200817";
version = "20201207";
src = fetchurl {
url = "https://orgmode.org/elpa/org-plus-contrib-20200817.tar";
sha256 = "0n3fhcxjsk2w78p7djna4nlppa7ypjxzpq3r5dmzc8jpl71mipba";
url = "https://orgmode.org/elpa/org-plus-contrib-20201207.tar";
sha256 = "07xmnxrn63ini3c8hfrgv13b28dh91x2lpf875fhi5wz70w0a9s4";
};
packageRequires = [];
meta = {
@ -30,4 +30,4 @@
license = lib.licenses.free;
};
}) {};
}
}

12250
pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/misc/obsidian/default.nix
View File

@ -30,12 +30,12 @@ let
in stdenv.mkDerivation rec {
pname = "obsidian";
version = "0.9.17";
version = "0.9.20";
src = fetchurl {
url =
"https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz";
sha256 = "0spa5zsipd456dcsp7ww24ab5vk4vmwyvrdmraw3hcsbnj9vcnwa";
sha256 = "19yhmqaz5mynl879q38g338q4w8mwx75fnl25bhwrvy7yy3aa23l";
};
nativeBuildInputs = [ makeWrapper graphicsmagick ];

4
pkgs/applications/networking/browsers/chromium/plugins.nix
View File

@ -44,11 +44,11 @@ let
flash = stdenv.mkDerivation rec {
pname = "flashplayer-ppapi";
version = "32.0.0.453";
version = "32.0.0.465";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
sha256 = "1d0hxn6snvx15clhcwncw40z0mf5p1pw68wrp7w1l3jkkw4brsgj";
sha256 = "16qbc2s8dg2rwggphf8f5665iccc6lrvgz45bdwskg9pwg87hlj1";
stripRoot = false;
};

10
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
View File

@ -74,7 +74,7 @@ let
in
stdenv.mkDerivation rec {
pname = "flashplayer";
version = "32.0.0.453";
version = "32.0.0.465";
src = fetchurl {
url =
@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
sha256 =
if debug then
if arch == "x86_64" then
"0jjzx7jpaz2a4p5x5535v8286pakhfymrq6zi16skv4cfixc0q99"
"04p70zc4y7k1klsxa70ngl7g5q6pf2n4018r7d5n6wg2961mjk3y"
else
"1ikgxl33g503bm7v1209bmwppx0j40dnlm01hddx5i2qzv7dwh2v"
"1avslj2ssp9fcvygcc8f578gpj3bbbpvap4ssr7ag6xn6mh15adw"
else
if arch == "x86_64" then
"0dryf849xjr767zlpvg8wsy4fh4dl8gbca4l7a1yc47lgq1ffzsq"
"0dbccg7ijlr9wdjkh6chbw0q1qchycbi1a313hrrc613k3djw3x9"
else
"1y0xawsm9qsk0js6p6n5g5yy24kh2kn1kbmsla59g204l6xwsla1";
"1mhbkb2d6ky1xlgx55yip1l9kh5nq35jjbbm6hf6ckai146j3dr7";
};
nativeBuildInputs = [ unzip ];

6
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
View File

@ -50,7 +50,7 @@
stdenv.mkDerivation {
pname = "flashplayer-standalone";
version = "32.0.0.453";
version = "32.0.0.465";
src = fetchurl {
url =
@ -60,9 +60,9 @@ stdenv.mkDerivation {
"https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz";
sha256 =
if debug then
"1qnmr8y9rzb8f9j4pn0cr7nxrdfn1pqkwfrzq8rf3nw9np4lxyfv"
"1ija3z5bxg0ppx9r237cxs1cdrhk6pia2kcxbrm6y30kvzrd3nqs"
else
"0s0xcbha72y0wybnmalgsx7nv3b9jcwv7p3rakj6ij9l1wf73b7g";
"1hwnvwph7p3nfv2xf7kjw3zdpb546dsia0cmhzg81z016fi7lgw8";
};
nativeBuildInputs = [ unzip ];

4
pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix
View File

@ -44,11 +44,11 @@ let
flash = stdenv.mkDerivation rec {
pname = "flashplayer-ppapi";
version = "32.0.0.453";
version = "32.0.0.465";
src = fetchzip {
url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz";
sha256 = "1d0hxn6snvx15clhcwncw40z0mf5p1pw68wrp7w1l3jkkw4brsgj";
sha256 = "16qbc2s8dg2rwggphf8f5665iccc6lrvgz45bdwskg9pwg87hlj1";
stripRoot = false;
};

24
pkgs/applications/networking/cluster/k3s/default.nix
View File

@ -43,9 +43,9 @@ with lib;
# Those pieces of software we entirely ignore upstream's handling of, and just
# make sure they're in the path if desired.
let
k3sVersion = "1.19.2+k3s1"; # k3s git tag
k3sVersion = "1.19.4+k3s2"; # k3s git tag
traefikChartVersion = "1.81.0"; # taken from ./scripts/download at the above k3s tag
k3sRootVersion = "0.6.0-rc3"; # taken from ./scripts/download at the above k3s tag
k3sRootVersion = "0.7.1"; # taken from ./scripts/download at the above k3s tag
k3sCNIVersion = "0.8.6-k3s1"; # taken from ./scripts/version.sh at the above k3s tag
# bundled into the k3s binary
traefikChart = fetchurl {
@ -63,8 +63,8 @@ let
# k3s binary.
k3sRoot = fetchzip {
# Note: marked as apache 2.0 license
url = "https://github.com/rancher/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar";
sha256 = "0xj3dcqawpzyzmz545iwh151krzbs9csnzg3zfl74lkv2kxgidk6";
url = "https://github.com/k3s-io/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar";
sha256 = "1wjg54816plbdwgv0dibq6dzmcakcmx0wiqijvr4f3gsxgk59zwf";
stripRoot = false;
};
k3sPlugins = buildGoPackage rec {
@ -92,10 +92,10 @@ let
# Grab this separately from a build because it's used by both stages of the
# k3s build.
k3sRepo = fetchgit {
url = "https://github.com/rancher/k3s";
url = "https://github.com/k3s-io/k3s";
rev = "v${k3sVersion}";
leaveDotGit = true; # ./scripts/version.sh depends on git
sha256 = "1hbnarchs9w52w061bvfjvssdh7ycnxa04camjwkcx8vr0k804h4";
sha256 = "1qxjdgnq8mf54760f0vngcqa2y3b048pcmfsf1g593b2ij1kg1zi";
};
# Stage 1 of the k3s build:
# Let's talk about how k3s is structured.
@ -158,8 +158,8 @@ let
platforms = platforms.linux;
};
};
k3sBuild = buildGoPackage rec {
name = "k3s-build";
k3sBin = buildGoPackage rec {
name = "k3s-bin";
version = "${k3sVersion}";
goPackagePath = "github.com/rancher/k3s";
@ -169,7 +169,9 @@ let
patches = [ ./patches/0001-Use-rm-from-path-in-go-generate.patch ./patches/0002-Add-nixpkgs-patches.patch ];
nativeBuildInputs = [ git pkgconfig ];
buildInputs = [ k3sBuildStage1 k3sPlugins runc ];
# These dependencies are embedded as compressed files in k3s at runtime.
# Propagate them to avoid broken runtime references to libraries.
propagatedBuildInputs = [ k3sPlugins k3sBuildStage1 runc ];
# k3s appends a suffix to the final distribution binary for some arches
archSuffix =
@ -240,7 +242,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
k3sBuild
k3sBin
makeWrapper
] ++ k3sRuntimeDeps;
@ -254,7 +256,7 @@ stdenv.mkDerivation rec {
# execute, but that we didn't bundle with it.
installPhase = ''
mkdir -p "$out/bin"
makeWrapper ${k3sBuild}/bin/k3s "$out/bin/k3s" \
makeWrapper ${k3sBin}/bin/k3s "$out/bin/k3s" \
--prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \
--prefix PATH : "$out/bin"
'';

4
pkgs/applications/networking/cluster/node-problem-detector/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "node-problem-detector";
version = "0.8.3";
version = "0.8.4";
src = fetchFromGitHub {
owner = "kubernetes";
repo = pname;
rev = "v${version}";
sha256 = "1sga5l8bvqgm0j71yj3l1ykqvchxa7cg8pkfvjsrqlikgrfb54f3";
sha256 = "0iv3x29l803mch7pmnvxk1lf0mgirdhi2g17q1049d8z7w0m8dwk";
};
vendorSha256 = null;

4
pkgs/applications/networking/cluster/nomad/0.11.nix
View File

@ -2,6 +2,6 @@
callPackage ./generic.nix {
inherit buildGoPackage;
version = "0.11.6";
sha256 = "09ym9fd4fp2461ddhrb5nlz8l24iq4hsbqikzc21ainagq2g1azf";
version = "0.11.7";
sha256 = "sha256-wp1Je+I3iijD/pHHQtylMQhOiVhS6AT/y2/pUiLr0M4=";
}

7
pkgs/applications/networking/cluster/terraform/default.nix
View File

@ -42,6 +42,7 @@ let
description =
"Tool for building, changing, and versioning infrastructure";
homepage = "https://www.terraform.io/";
changelog = "https://github.com/hashicorp/terraform/blob/v${version}/CHANGELOG.md";
license = licenses.mpl20;
maintainers = with maintainers; [
Chili-Man
@ -165,9 +166,9 @@ in rec {
});
terraform_0_14 = pluggable (generic {
version = "0.14.0";
sha256 = "0pbglnvb6cx8zrz791lfa67dmjqfsyysbxm2083b1lhlmbybi9ax";
vendorSha256 = "1gxhdj98np482jm76aj6zbbmkn7vfk8b878hzz59iywgbdr1r4m1";
version = "0.14.2";
sha256 = "0j09bjdl1z836y3zdlgjcdah11wlnvsd5hmsagjsz9am04qlyfya";
vendorSha256 = "1iifjrnc79f4liyy4pgjbnarv2fx6vwlaqcv75crmyji40xv0w9s";
patches = [ ./provider-path.patch ];
passthru = { inherit plugins; };
});

4
pkgs/applications/networking/feedreaders/rawdog/default.nix
View File

@ -11,6 +11,10 @@ python2Packages.buildPythonApplication rec {
propagatedBuildInputs = with python2Packages; [ feedparser ];
# Requested by @SuperSandro20001
pythonImportsCheck = [ "feedparser" ];
doCheck = false;
namePrefix = "";
meta = with stdenv.lib; {

6
pkgs/applications/networking/flent/http-getter.nix
View File

@ -3,13 +3,13 @@
stdenv.mkDerivation {
pname = "http-getter";
version = "unstable-2018-06-06";
version = "unstable-2020-12-08";
src = fetchFromGitHub {
owner = "tohojo";
repo = "http-getter";
rev = "79bcccce721825a745f089d0c347bbaf2e6e12f4";
sha256 = "1zxk52s1h5qx62idil237zdpj8agrry0w1xwkfx05wvv9sw4ld35";
rev = "0b20f08133206aaf225946814ceb6b85ab37e136";
sha256 = "0plyqqwfm9bysichda0w3akbdxf6279wd4mx8mda0c4mxd4xy9nl";
};
buildInputs = [ cmake pkgconfig curl ];

38
pkgs/applications/networking/instant-messengers/qtox/default.nix
View File

@ -1,24 +1,19 @@
{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
, libtoxcore
, libpthreadstubs, libXdmcp, libXScrnSaver
{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, perl
, libtoxcore, libpthreadstubs, libXdmcp, libXScrnSaver
, qtbase, qtsvg, qttools, qttranslations
, ffmpeg_3, filter-audio, libexif, libsodium, libopus
, libvpx, openal, pcre, qrencode, sqlcipher
, AVFoundation ? null }:
, AVFoundation }:
let
version = "1.17.3";
rev = "v${version}";
in mkDerivation {
mkDerivation rec {
pname = "qtox";
inherit version;
version = "1.17.3";
src = fetchFromGitHub {
owner = "qTox";
repo = "qTox";
owner = "qTox";
repo = "qTox";
rev = "v${version}";
sha256 = "19xgw9bqirxbgvj5cdh20qxh61pkwk838lq1l78n6py1qrs7z5wp";
inherit rev;
};
buildInputs = [
@ -27,25 +22,24 @@ in mkDerivation {
qtbase qtsvg qttranslations
ffmpeg_3 filter-audio libexif libopus libsodium
libvpx openal pcre qrencode sqlcipher
] ++ lib.optionals stdenv.isDarwin [ AVFoundation] ;
] ++ stdenv.lib.optionals stdenv.isDarwin [ AVFoundation] ;
nativeBuildInputs = [ cmake pkgconfig qttools ];
enableParallelBuilding = true;
nativeBuildInputs = [ cmake pkg-config qttools ]
++ stdenv.lib.optionals stdenv.isDarwin [ perl ];
cmakeFlags = [
"-DGIT_DESCRIBE=${rev}"
"-DGIT_DESCRIBE=v${version}"
"-DENABLE_STATUSNOTIFIER=False"
"-DENABLE_GTK_SYSTRAY=False"
"-DENABLE_APPINDICATOR=False"
"-DTIMESTAMP=1"
];
meta = with lib; {
meta = with stdenv.lib; {
description = "Qt Tox client";
homepage = "https://tox.chat";
license = licenses.gpl3;
homepage = "https://tox.chat";
license = licenses.gpl3;
maintainers = with maintainers; [ akaWolf peterhoeg ];
platforms = platforms.all;
platforms = platforms.all;
};
}

2
pkgs/applications/radio/gqrx/default.nix
View File

@ -27,7 +27,7 @@ mkDerivation rec {
postInstall = ''
install -vD $src/gqrx.desktop -t "$out/share/applications/"
install -vD $src/resources/icons/gqrx.svg -t "$out/share/icons/"
install -vD $src/resources/icons/gqrx.svg -t "$out/share/pixmaps/"
'';
meta = with stdenv.lib; {

5
pkgs/desktops/plasma-5/plasma-workspace/default.nix
View File

@ -15,7 +15,7 @@
appstream-qt,
qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools,
qtwayland, qtx11extras,
qtwayland, qtx11extras, qqc2-desktop-style,
}:
let inherit (lib) getBin getLib; in
@ -34,7 +34,8 @@ mkDerivation {
libqalculate networkmanager-qt phonon plasma-framework prison solid
kholidays kquickcharts appstream-qt
qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras
qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland
qtx11extras qqc2-desktop-style
];
propagatedUserEnvPkgs = [ qtgraphicaleffects ];
outputs = [ "out" "dev" ];

46
pkgs/development/arduino/arduino-ci/default.nix Normal file
View File

@ -0,0 +1,46 @@
{ stdenv, fetchFromGitHub, makeWrapper, arduino-cli, ruby, python3, patchelf }:
let
runtimePath = stdenv.lib.makeBinPath [
arduino-cli
(python3.withPackages (ps: [ ps.pyserial ])) # required by esp32 core
patchelf # required by esp32 core
];
in
stdenv.mkDerivation rec {
pname = "arduino-ci";
version = "0.1.0";
src = fetchFromGitHub {
owner = "pololu";
repo = "arduino-ci";
rev = "v${version}";
sha256 = "sha256-uLCLupzJ446WcxXZtzJk1wnae+k1NTSy0cGHLqW7MZU=";
};
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
runHook preInstall
mkdir -p $out/bin
install $src/ci.rb $out/bin/arduino-ci
runHook postInstall
'';
fixupPhase = ''
substituteInPlace $out/bin/arduino-ci --replace "/usr/bin/env nix-shell" "${ruby}/bin/ruby"
wrapProgram $out/bin/arduino-ci --prefix PATH ":" "${runtimePath}"
'';
meta = with stdenv.lib; {
description = "CI for Arduino Libraries";
homepage = src.meta.homepage;
license = licenses.mit;
maintainers = with maintainers; [ ryantm ];
platforms = platforms.unix;
};
}

4
pkgs/development/compilers/kotlin/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, makeWrapper, jre, unzip }:
let
version = "1.4.20";
version = "1.4.21";
in stdenv.mkDerivation {
inherit version;
pname = "kotlin";
src = fetchurl {
url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
sha256 = "07q16yc7xfw5kzziwxyd7m4dc9msgqk9y2znqw3397kqssj97nqi";
sha256 = "1ixnwrvgs14f9160d9d69r7w2dfp5cdwiwpk1ky0ps8nly8hjwj6";
};
propagatedBuildInputs = [ jre ] ;

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

@ -8504,7 +8504,6 @@ broken-packages:
- pam
- pan-os-syslog
- panda
- pandoc-crossref
- pandoc-csv2table
- pandoc-filter-graphviz
- pandoc-filter-indent

8
pkgs/development/libraries/libmodplug/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, file }:
let
version = "0.8.9.0";
@ -6,6 +6,12 @@ in stdenv.mkDerivation rec {
pname = "libmodplug";
inherit version;
preConfigure = ''
substituteInPlace configure \
--replace ' -mmacosx-version-min=10.5' "" \
--replace /usr/bin/file ${file}/bin/file
'';
meta = with stdenv.lib; {
description = "MOD playing library";
homepage = "http://modplug-xmms.sourceforge.net/";

51
pkgs/development/libraries/zookeeper_mt/default.nix
View File

@ -1,21 +1,56 @@
{ stdenv, zookeeper, bash }:
{ stdenv
, fetchurl
, autoreconfHook
, jre
, openssl
, pkg-config
# We depend on ZooKeeper for the Jute compiler.
, zookeeper
}:
stdenv.mkDerivation rec {
name = "zookeeper_mt-${stdenv.lib.getVersion zookeeper}";
pname = "zookeeper_mt";
version = stdenv.lib.getVersion zookeeper;
src = zookeeper.src;
src = fetchurl {
url = "mirror://apache/zookeeper/${zookeeper.pname}-${version}/apache-${zookeeper.pname}-${version}.tar.gz";
sha512 = "16994067d460a1b6af6a71f3458c64ee32629e876a1ff6646d57be62f1a5adab57462af84074ecaded4186dd3fde035ee24cd9d578b8e5044073eb05f4ab9c3e";
};
setSourceRoot = "export sourceRoot=${zookeeper.name}/src/c";
sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-client/zookeeper-client-c";
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-Wno-error=format-overflow -Wno-error=stringop-truncation";
nativeBuildInputs = [
autoreconfHook
jre
];
buildInputs = [ zookeeper bash ];
buildInputs = [
openssl
pkg-config
zookeeper
];
# Generate the C marshallers/unmarshallers for the Jute-encoded
# definitions.
preConfigure = ''
mkdir generated
cd generated
java -cp ${zookeeper}/lib/${zookeeper.pname}-jute-${version}.jar \
org.apache.jute.compiler.generated.Rcc -l c \
../../../zookeeper-jute/src/main/resources/zookeeper.jute
cd ..
'';
configureFlags = [
# We're not going to start test servers in the sandbox anyway.
"--without-cppunit"
];
meta = with stdenv.lib; {
homepage = "http://zookeeper.apache.org";
homepage = "https://zookeeper.apache.org";
description = "Apache Zookeeper";
license = licenses.asl20;
maintainers = [ maintainers.commandodev ];
maintainers = with maintainers; [ commandodev ztzg ];
platforms = platforms.unix;
};
}

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

@ -9,11 +9,11 @@
buildPythonPackage rec {
pname = "blis";
version = "0.7.3";
version = "0.7.4";
src = fetchPypi {
inherit pname version;
sha256 = "19557b14763253ca3d4f6cfc9c9fe2eed3d65db14fa273ced8b0c17ce2bfda4a";
sha256 = "7daa615a97d4f28db0f332b710bfe1900b15d0c25841c6d727965e4fd91e09cf";
};
nativeBuildInputs = [

17
pkgs/development/python-modules/buildbot/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, makeWrapper, isPy3k,
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k,
python, twisted, jinja2, zope_interface, future, sqlalchemy,
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, treq,
txrequests, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial,
txrequests, pypugjs, boto3, moto, mock, python-lz4, setuptoolsTrial,
isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins,
parameterized, git, openssh, glibcLocales, nixosTests }:
@ -25,11 +25,11 @@ let
package = buildPythonPackage rec {
pname = "buildbot";
version = "2.8.4";
version = "2.9.2";
src = fetchPypi {
inherit pname version;
sha256 = "0i2sbxhsqyk2yr234il0zsyp1rf2v1l5hmzvw0yrgds6jpr19cqv";
sha256 = "019xfxjnyfi69d5sm3alvib24g8giqlvc102p8hqg8mfm7hc9z2v";
};
propagatedBuildInputs = [
@ -51,7 +51,7 @@ let
checkInputs = [
treq
txrequests
pyjade
pypugjs
boto3
moto
mock
@ -73,13 +73,6 @@ let
# This patch disables the test that tries to read /etc/os-release which
# is not accessible in sandboxed builds.
./skip_test_linux_distro.patch
# fix compatibility with the latest SQLAlchemy
(fetchpatch {
url = "https://github.com/buildbot/buildbot/commit/96f3cd1c5f5c82b733baecb133576366ecf544fc.patch";
sha256 = "0n1jm13h08j7ksbs8ixayn3wziq5hzyp3kscz9fpgxd8gl885y5n";
stripLen = 1;
})
];
postPatch = ''

7
pkgs/development/python-modules/buildbot/pkg.nix
View File

@ -6,7 +6,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "1p9qnrqx72y4jrhawgbpwisgily7zg4rh39hpky4x56d5afvjgqc";
sha256 = "01s58zi72drv4lwn6jg6i5mrpf3mpq74761z6iwx5hsdnqg1hxai";
};
postPatch = ''
@ -15,6 +15,11 @@ buildPythonPackage rec {
substituteInPlace buildbot_pkg.py --replace "os.listdir = listdir" ""
'';
# No tests
doCheck = false;
pythonImportsCheck = [ "buildbot_pkg" ];
disabled = !isPy3k;
meta = with lib; {

10
pkgs/development/python-modules/buildbot/plugins.nix
View File

@ -7,7 +7,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "1hi44jbnafp7iqncad01hwr087aqmdszvc2if0d9gw6bm159zf4s";
sha256 = "1z5sca2ksbr1j6p0kr8i9a61c46mdmbbd6hvc6407c3z5393mp30";
};
# Remove unneccessary circular dependency on buildbot
@ -34,7 +34,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "1vkh4kdlnm9z5r62b4vxx6qxc90g65gm1m4qxfc6xjk1265i1w6h";
sha256 = "1kz54zlc2yr9cjvw7rihcx7hfk245r6yh4mfyala38jby3hd68p0";
};
buildInputs = [ buildbot-pkg ];
@ -56,7 +56,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "0v94p1m9fb6m6ik5xyi7bs4jrsgvnyf3sl7f4w1qmb24xc47k2gj";
sha256 = "0ac0dzldxl4j9cb4kpmhjwf5m1zjjvcg0hx9kghallab0sk1198p";
};
buildInputs = [ buildbot-pkg ];
@ -78,7 +78,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "13bg289al6dmyrin3l6ih3sk7hm660m69kls3kpagg6j6nmpa5wz";
sha256 = "1m41l2d6yb4mbg1ybn7q6wmkfvwssmfb4inmpwyvy55bcvgyixcm";
};
buildInputs = [ buildbot-pkg ];
@ -100,7 +100,7 @@
src = fetchPypi {
inherit pname version;
sha256 = "11cr7m7m8ah8qqjcqj7qvjjak62cx1sq41cazd4i3r07dyhc3ypn";
sha256 = "1g58kr2zc7k94k0avly0vyyryg18gpsbick8mj5cz81s2pfmmyfq";
};
buildInputs = [ buildbot-pkg ];

2
pkgs/development/python-modules/buildbot/worker.nix
View File

@ -7,7 +7,7 @@ buildPythonPackage (rec {
src = fetchPypi {
inherit pname version;
sha256 = "1v1bcc2m4pz90rsh5pjb9m9agkvhqdk1viyf64gi1h85h191vkib";
sha256 = "1salrdirny1jpm53shb9dhzs1w7rbp5q7z2qpzrg1nmsh2kcd6ap";
};
propagatedBuildInputs = [ twisted future ];

24
pkgs/development/python-modules/feedparser/5.nix Normal file
View File

@ -0,0 +1,24 @@
{ stdenv
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "feedparser";
version = "5.2.1";
src = fetchPypi {
inherit pname version;
sha256 = "1ycva69bqssalhqg45rbrfipz3l6hmycszy26k0351fhq990c0xx";
};
# lots of networking failures
doCheck = false;
meta = with stdenv.lib; {
homepage = "https://github.com/kurtmckee/feedparser";
description = "Universal feed parser";
license = licenses.bsd2;
maintainers = with maintainers; [ domenkozar ];
};
}

29
pkgs/development/python-modules/pyjade/default.nix
View File

@ -1,29 +0,0 @@
{ stdenv, buildPythonPackage, fetchPypi, pyramid_mako, nose, django, jinja2
, tornado, pyramid, Mako, six }:
buildPythonPackage rec {
pname = "pyjade";
version = "4.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "1mycn5cc9cp4fb0i2vzgkkk6d0glnkbilggwb4i99i09vr0vg5cd";
};
buildInputs = [ pyramid_mako nose django jinja2 tornado pyramid Mako ];
propagatedBuildInputs = [ six ];
postPatch = ''
sed -i 's/1.4.99/1.99/' setup.py
'';
checkPhase = ''
nosetests pyjade
'';
# No tests distributed. https://github.com/syrusakbary/pyjade/issues/262
doCheck = false;
meta = with stdenv.lib; {
description = "Jade syntax template adapter for Django, Jinja2, Mako and Tornado templates";
homepage = "https://github.com/syrusakbary/pyjade";
license = licenses.mit;
maintainers = with maintainers; [ nand0p ];
};
}

26
pkgs/development/python-modules/pypugjs/default.nix Normal file
View File

@ -0,0 +1,26 @@
{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, six, chardet, nose
, django, jinja2, tornado, pyramid, pyramid_mako, Mako }:
buildPythonPackage rec {
pname = "pypugjs";
version = "5.9.8";
src = fetchPypi {
inherit pname version;
sha256 = "1iy8k56rbslxcylhamdik2bd6gqqirrix55mrdn29zz9gl6vg1xi";
};
propagatedBuildInputs = [ six chardet ];
checkInputs = [ nose django jinja2 tornado pyramid pyramid_mako Mako ];
checkPhase = ''
nosetests pypugjs
'';
meta = with stdenv.lib; {
description = "PugJS syntax template adapter for Django, Jinja2, Mako and Tornado templates";
homepage = "https://github.com/kakulukia/pypugjs";
license = licenses.mit;
maintainers = with maintainers; [ lopsided98 ];
};
}

55
pkgs/development/python-modules/soco/default.nix
View File

@ -1,29 +1,60 @@
{ lib, buildPythonPackage, fetchPypi, xmltodict, requests
, toml
# Test dependencies
, pytest, pytestcov, coveralls, pylint, flake8, graphviz, mock, sphinx
{ buildPythonPackage
, coveralls
, fetchFromGitHub
, flake8
, graphviz
, lib
, mock
, pytestCheckHook
, requests
, sphinx
, sphinx_rtd_theme
, toml
, xmltodict
}:
buildPythonPackage rec {
pname = "soco";
version = "0.20";
src = fetchPypi {
inherit pname version;
sha256 = "929d4fae20b32efc08bb9985798c592aa7268162885541513eddbff0a757418f";
# N.B. We fetch from GitHub because the PyPI tarball doesn't contain the
# required files to run the tests.
src = fetchFromGitHub {
owner = "SoCo";
repo = "SoCo";
rev = "v${version}";
sha256 = "0p87aw7wxgdjz0m0nqqcfvbn24hlbq1hh1zxdq2c0k2jcbmaj8zc";
};
propagatedBuildInputs = [ xmltodict requests toml ];
# N.B. These exist because:
# 1. Upstream's pinning isn't well maintained, leaving dependency versions no
# longer in nixpkgs.
# 2. There is no benefit for us to be running linting and coverage tests.
postPatch = ''
sed -i "/black/d" ./requirements-dev.txt
sed -i "/pylint/d" ./requirements-dev.txt
sed -i "/pytest-cov/d" ./requirements-dev.txt
'';
propagatedBuildInputs = [
requests
toml
xmltodict
];
checkInputs = [
pytest pytestcov coveralls pylint flake8 graphviz mock sphinx
pytestCheckHook
coveralls
flake8
graphviz
mock
sphinx
sphinx_rtd_theme
];
meta = {
meta = with lib; {
homepage = "http://python-soco.com/";
description = "A CLI and library to control Sonos speakers";
license = lib.licenses.mit;
license = licenses.mit;
maintainers = with maintainers; [ lovesegfault ];
};
}

7
pkgs/development/python-modules/transformers/default.nix
View File

@ -1,7 +1,7 @@
{ buildPythonPackage
, stdenv
, fetchFromGitHub
, boto3
, isPy39
, cookiecutter
, filelock
, regex
@ -18,13 +18,14 @@
buildPythonPackage rec {
pname = "transformers";
version = "4.0.0";
version = "4.0.1";
disabled = isPy39;
src = fetchFromGitHub {
owner = "huggingface";
repo = pname;
rev = "v${version}";
sha256 = "17djq32pq8d6vqip7i9pda0ldigmzckbbcd278llmpxdriqd4llg";
sha256 = "1h53a3n6fdrx3ns1h1ip273hzd9pkm9m1qh41si75csb8mi1dq3d";
};
propagatedBuildInputs = [

4
pkgs/development/tools/repository-managers/nexus/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "nexus";
version = "3.28.1-01";
version = "3.29.0-02";
src = fetchurl {
url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz";
sha256 = "0qba2qaz85hf0vgix3qyqdl8yzdb6qr91sgdmxv3fgjhyvnvqyy8";
sha256 = "0yxk3yy9vllxc9v4dn3fs8hh389lrw2g8gg24rx1w8bg05rrrr8z";
};
preferLocalBuild = true;

43
pkgs/misc/emulators/melonDS/default.nix
View File

@ -1,41 +1,42 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, gtk3, libpcap, wrapGAppsHook }:
{ stdenv
, fetchFromGitHub
, mkDerivation
, cmake
, pkgconfig
, SDL2
, qtbase
, libpcap
, libslirp
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
mkDerivation rec {
pname = "melonDS";
version = "0.8.3";
## When updating to the release after 0.8.3,
## - Uncomment:
## cmakeFlags = [ "-UUNIX_PORTABLE" ];
## - Remove the postInstall, since cmake should then take care of installing icons, .desktop file, and romlist.bin
## (see https://github.com/Arisotura/melonDS/pull/546)
version = "0.9";
src = fetchFromGitHub {
owner = "Arisotura";
repo = pname;
rev = version;
sha256 = "1lqmfwjpkdqfkns1aaxlp4yrg6i0r66mxfr4rrj7b5286k44hqwn";
sha256 = "0m45m1ch0az8l3d3grjbqvi5vvydbffxwka9w3k3qiia50m7fnph";
};
enableParallelBuilding = true;
nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ];
buildInputs = [ SDL2 gtk3 libpcap ];
buildInputs = [
SDL2
qtbase
libpcap
libslirp
];
postInstall = ''
install -Dm644 -t $out/share/melonDS/ ../romlist.bin
install -Dm644 -t $out/share/applications/ ../flatpak/*.desktop
for i in ../icon/melon_*.png; do
d="''${i##*_}"
d="$out/share/icons/hicolor/''${d%.png}/apps"
install -D $i "$d/net.kuribo64.melonds.png"
done
'';
cmakeFlags = [ "-UUNIX_PORTABLE" ];
meta = with stdenv.lib; {
homepage = "http://melonds.kuribo64.net/";
description = "Work in progress Nintendo DS emulator";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ artemist benley ];
maintainers = with maintainers; [ artemist benley shamilton ];
platforms = platforms.linux;
};
}

90
pkgs/misc/vim-plugins/generated.nix
View File

@ -437,12 +437,12 @@ let
coc-explorer = buildVimPluginFrom2Nix {
pname = "coc-explorer";
version = "2020-11-27";
version = "2020-12-09";
src = fetchFromGitHub {
owner = "weirongxu";
repo = "coc-explorer";
rev = "942152abc7907a0a82ce364bc50a4a463a6e925c";
sha256 = "15pzzv6s8vks6xdms3pz5mcd8qb0lv89wnnpbipsyxlkz393yj36";
rev = "b45ac3584ef1c091c9d8a2ced6a1b8b8e4edb611";
sha256 = "11k6pbvlvqsnvn75rh4pz5c4x6c9jmnwpnikaf1n7amw2w2i6j00";
};
meta.homepage = "https://github.com/weirongxu/coc-explorer/";
};
@ -786,12 +786,12 @@ let
defx-nvim = buildVimPluginFrom2Nix {
pname = "defx-nvim";
version = "2020-12-05";
version = "2020-12-09";
src = fetchFromGitHub {
owner = "Shougo";
repo = "defx.nvim";
rev = "0c5cff346fe81eda43e9ac4bb76b8f75b24d7b3e";
sha256 = "05y51mvbhmmw05ssjybr1grjg1fmhh38zvq011i2w27xya188kh7";
rev = "dc32bf1703caa8598131b72ae477680c3033e768";
sha256 = "0nl9nndxk21zpwxd17b574bwszqma2vnr8iynh6x6ly6gbphipnh";
};
meta.homepage = "https://github.com/Shougo/defx.nvim/";
};
@ -846,12 +846,12 @@ let
deol-nvim = buildVimPluginFrom2Nix {
pname = "deol-nvim";
version = "2020-12-08";
version = "2020-12-09";
src = fetchFromGitHub {
owner = "Shougo";
repo = "deol.nvim";
rev = "60b40060377b4fe87656889a183292fe3ead6b5a";
sha256 = "0xlnp1fmiqa84nvnra59jqw81hxjivr01nnagg4d4bmfqzbjxddh";
rev = "7a382825cc18ff0b00dd2e571b7f80bff020ea86";
sha256 = "1abb8k4ksc7wssba7pv721nqfnbcicy253mzgw1xfmzkvf3zcl8x";
};
meta.homepage = "https://github.com/Shougo/deol.nvim/";
};
@ -1908,12 +1908,12 @@ let
last256 = buildVimPluginFrom2Nix {
pname = "last256";
version = "2017-06-10";
version = "2020-12-09";
src = fetchFromGitHub {
owner = "sk1418";
repo = "last256";
rev = "d29320c1fe715b47edaa1be068201ea5a54ab0c0";
sha256 = "16njh0p1j166dnf92110vlrj7gmrbsfkbkd8k6s9gfqjzbgd25jv";
rev = "2a00be266db371846e8d666c993d3076c8986438";
sha256 = "07z01jqzyfqalahdp0kswyvc3mb8dldc3qv5wpbdm79hh6zyd3f1";
};
meta.homepage = "https://github.com/sk1418/last256/";
};
@ -2676,12 +2676,12 @@ let
nvim-dap = buildVimPluginFrom2Nix {
pname = "nvim-dap";
version = "2020-12-03";
version = "2020-12-08";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-dap";
rev = "ef830470c8b39a5bc4bc798315d2bff9dbdf3fe7";
sha256 = "19zq00fx3pvx46q5fvgzb4zs9gq74905zbg94crbyigvbvp7kc43";
rev = "6830ad2ce5f9b328b7becbf390fca330195efb96";
sha256 = "060899ajnck6v3fx2xprh8kf0g28wc12blxb13jd5ibgr7zdl5vn";
};
meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
};
@ -2712,12 +2712,12 @@ let
nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite";
version = "2020-12-07";
version = "2020-12-08";
src = fetchFromGitHub {
owner = "Iron-E";
repo = "nvim-highlite";
rev = "63ba9ddbfdad709d9cc0e800f10a87dfa8df7968";
sha256 = "0bq0gqh9swl7zp9hvsj65idimknncn5jilbzkifd5kpd1z36dyqp";
rev = "9dca0299b9275daee6c1a1b7520014b2327f79e0";
sha256 = "1mmas0fi6vyg68l0x6h4gaxv0bhpf9l4l16hl3ppg2lsqy544bs4";
};
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
};
@ -2736,12 +2736,12 @@ let
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2020-12-03";
version = "2020-12-09";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "76f11625481eddb7bcbf86b3e4f592a1aef35b37";
sha256 = "0ynkyyyzlmb4dmwd88gs47aqli2hq6j7y4905k0kpmsvfcfkpb36";
rev = "0d919bc5f9b358a7a8a20df18dbc0d3a018e4c73";
sha256 = "0w2qdsisb02h4jnbxxa2lpxc6x3v8ribz3ka4bidrcmlnd7jbmrs";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@ -2784,12 +2784,12 @@ let
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2020-12-08";
version = "2020-12-09";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "b090476aa4bab404b9cfedd5b142851719114950";
sha256 = "096j3hz0c5p9h9pln8x6yy2jwir5h9jbal0nhi8gixvwgl20jgbl";
rev = "76486942e79973095795e8699f95bb509e063d0d";
sha256 = "04qjyrkbrc1fcm5l1fra64z8qg8s30pr9ms05fgsprs2cacmg7wx";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@ -3024,12 +3024,12 @@ let
plenary-nvim = buildVimPluginFrom2Nix {
pname = "plenary-nvim";
version = "2020-11-17";
version = "2020-12-09";
src = fetchFromGitHub {
owner = "nvim-lua";
repo = "plenary.nvim";
rev = "7d555b5dad0376dd075e19f26e4e40705efe5dba";
sha256 = "0c2i6lp17lgsrivacix1jcis2bh12wsg0hgmssdhmq8vr43q14sk";
rev = "db44551d6c6db27b796eeb6d24615e176504c8da";
sha256 = "09zf57czrzwjmnsbny20wzsxqix1vn5sidblryml95g7q89dzx7x";
};
meta.homepage = "https://github.com/nvim-lua/plenary.nvim/";
};
@ -3709,12 +3709,12 @@ let
telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope-nvim";
version = "2020-12-07";
version = "2020-12-09";
src = fetchFromGitHub {
owner = "nvim-telescope";
repo = "telescope.nvim";
rev = "d1c15dc2657c4bdec50f9cc7ad76c4dc182e8cc9";
sha256 = "0qpswp3fwmf27452aixpz5xsryvzzvkj494rri7hhhbzjpvqc91w";
rev = "c276db06e2981416995450a4198cef4b87170f6f";
sha256 = "002n8zy19y8pya5rw7y18bwikd7rgb1229wlyv96mrifrr89hymh";
};
meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
};
@ -4202,12 +4202,12 @@ let
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
version = "2020-12-06";
version = "2020-12-09";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
rev = "2cea83eb88e0a6d1461a4f081016d6ca4f1c29c8";
sha256 = "1hi2hgnkwqw3yl64a3l5ddh1bl9kc21419bhx72v89yx5xvzzj5q";
rev = "f39208f1a074fb525270312a20c87521a50c74ef";
sha256 = "1prjrrg9r1vxkdxi2p5mbl9hypa6r8sa7yk7xw6bv5vsbwpl8nhj";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@ -5849,12 +5849,12 @@ let
vim-matchup = buildVimPluginFrom2Nix {
pname = "vim-matchup";
version = "2020-12-05";
version = "2020-12-09";
src = fetchFromGitHub {
owner = "andymass";
repo = "vim-matchup";
rev = "44c634b3306783d5a43c4ef918a4bca538adcf2f";
sha256 = "1gb03wng4bag53h6j6mnpslpp82mk5h03apn6fbkga4i1alab55l";
rev = "24407e21e0a977e67774f70e0065dd3fea8d7595";
sha256 = "03bmlvvfsyr5ccfjfrnl1r5wzkvarmdbm735abal02pifni05k1r";
};
meta.homepage = "https://github.com/andymass/vim-matchup/";
};
@ -6363,6 +6363,18 @@ let
meta.homepage = "https://github.com/sheerun/vim-polyglot/";
};
vim-pony = buildVimPluginFrom2Nix {
pname = "vim-pony";
version = "2018-07-27";
src = fetchFromGitHub {
owner = "jakwings";
repo = "vim-pony";
rev = "b26f01a869000b73b80dceabd725d91bfe175b75";
sha256 = "0if8g94m3xmpda80byfxs649w2is9ah1k8v3028nblan73zlc8x8";
};
meta.homepage = "https://github.com/jakwings/vim-pony/";
};
vim-poweryank = buildVimPluginFrom2Nix {
pname = "vim-poweryank";
version = "2017-08-13";
@ -7627,12 +7639,12 @@ let
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
version = "2020-12-07";
version = "2020-12-09";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
rev = "eb4c21f969f39f4c68cff6a42a45024427e633ac";
sha256 = "00f1yvmg1qnq8xsqmlalamg2lf0l7hm57p2nsxrxysm9csrvayjf";
rev = "b3f0bdac24434b3d41738c2b797018e8c6277f86";
sha256 = "11l4rcrkmcmibyrkan1lirak910dd50m3g6cdgwpi9k4r1lp67jf";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};

1
pkgs/misc/vim-plugins/vim-plugin-names
View File

@ -178,6 +178,7 @@ itchyny/vim-gitbranch
ivanov/vim-ipython
jackguo380/vim-lsp-cxx-highlight
jacoborus/tender.vim
jakwings/vim-pony
jaredgorski/SpaceCamp
jaxbot/semantic-highlight.vim
JazzCore/ctrlp-cmatcher

16
pkgs/misc/vscode-extensions/default.nix
View File

@ -199,12 +199,24 @@ let
extractNuGet = callPackage ./python/extract-nuget.nix { };
};
naumovs.color-highlight = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "color-highlight";
publisher = "naumovs";
version = "2.3.0";
sha256 = "1syzf43ws343z911fnhrlbzbx70gdn930q67yqkf6g0mj8lf2za2";
};
meta = {
license = stdenv.lib.licenses.mit;
};
};
redhat.vscode-yaml = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "vscode-yaml";
publisher = "redhat";
version = "0.5.3";
sha256 = "03swlsp906rqlrx6jf3ibh7pk36sm0zdr8jfy6sr3w5lqjg27gka";
version = "0.13.0";
sha256 = "046kdk73a5xbrwq16ff0l64271c6q6ygjvxaph58z29gyiszfkig";
};
meta = {
license = stdenv.lib.licenses.mit;

2
pkgs/os-specific/darwin/apple-sdk/frameworks.nix
View File

@ -6,7 +6,7 @@
with frameworks; with libs; {
AGL = { inherit Carbon OpenGL; };
AVFoundation = { inherit ApplicationServices CoreGraphics; };
AVFoundation = { inherit ApplicationServices CoreGraphics CoreMedia MediaToolbox; };
AVKit = {};
Accounts = {};
AddressBook = { inherit libobjc Carbon ContactsPersistence; };

3
pkgs/servers/matrix-synapse/default.nix
View File

@ -1,12 +1,14 @@
{ lib, stdenv, python3, openssl
, enableSystemd ? stdenv.isLinux, nixosTests
, enableRedis ? false
, callPackage
}:
with python3.pkgs;
let
plugins = python3.pkgs.callPackage ./plugins { };
tools = callPackage ./tools { };
in
buildPythonApplication rec {
pname = "matrix-synapse";
@ -68,6 +70,7 @@ buildPythonApplication rec {
passthru.tests = { inherit (nixosTests) matrix-synapse; };
passthru.plugins = plugins;
passthru.tools = tools;
passthru.python = python3;
meta = with stdenv.lib; {

4
pkgs/servers/matrix-synapse/tools/default.nix Normal file
View File

@ -0,0 +1,4 @@
{ callPackage }:
{
rust-synapse-compress-state = callPackage ./rust-synapse-compress-state.nix { };
}

22
pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix Normal file
View File

@ -0,0 +1,22 @@
{ lib, rustPlatform, fetchFromGitHub }:
rustPlatform.buildRustPackage rec {
pname = "rust-synapse-compress-state";
version = "0.1.0";
src = fetchFromGitHub {
owner = "matrix-org";
repo = pname;
rev = "v${version}";
sha256 = "15jvkpbq6pgdc91wnni8fj435yqlwqgx3bb0vqjgsdyxs5lzalfh";
};
cargoSha256 = "1zdf091s0wyribsqp8l6arkablchqxmdyg2xdc57hh06p4fjiw48";
meta = with lib; {
description = "A tool to compress some state in a Synapse instance's database";
homepage = "https://github.com/matrix-org/rust-synapse-compress-state";
license = licenses.asl20;
maintainers = with maintainers; [ hexa maralorn ];
};
}

7
pkgs/servers/sql/postgresql/ext/pg_hll.nix
View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "pg_hll";
version = "2.15";
version = "2.15.1";
buildInputs = [ postgresql ];
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
owner = "citusdata";
repo = "postgresql-hll";
rev = "refs/tags/v${version}";
sha256 = "19d50cvp3byjyr2dc5rjmyrlp97bb19mz0ykr3w4iyc6qi5d5qj2";
sha256 = "17lg05rw7299fvfhdzvznr692c21s5qar1wzzvgwfv7afv6xzr3y";
};
installPhase = ''
@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "HyperLogLog for PostgreSQL";
homepage = "https://www.citusdata.com/";
homepage = "https://github.com/citusdata/postgresql-hll";
changelog = "https://github.com/citusdata/postgresql-hll/blob/v${version}/CHANGELOG.md";
maintainers = with maintainers; [ thoughtpolice ];
platforms = postgresql.meta.platforms;
license = licenses.asl20;

34
pkgs/servers/zookeeper/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "zookeeper";
version = "3.4.13";
version = "3.6.2";
src = fetchurl {
url = "mirror://apache/zookeeper/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "0karf13zks3ba2rdmma2lyabvmasc04cjmgxp227f0nj8677kvbw";
url = "mirror://apache/zookeeper/${pname}-${version}/apache-${pname}-${version}-bin.tar.gz";
sha512 = "caff5111bb6876b7124760bc006e6fa2523efa54b99321a3c9cd8192ea0d5596abc7d70a054b1aac9b20a411407dae7611c7aba870c23bff28eb1643ba499199";
};
buildInputs = [ makeWrapper jre ];
@ -15,40 +15,28 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out
cp -R conf docs lib ${pname}-${version}.jar $out
cp -R conf docs lib $out
# Without this, zkCli.sh tries creating a log file in the Nix store.
substituteInPlace $out/conf/log4j.properties \
--replace 'INFO, RFAAUDIT' 'INFO, CONSOLE'
mkdir -p $out/bin
cp -R bin/{zkCli,zkCleanup,zkEnv,zkServer}.sh $out/bin
cp -R bin/{zkCli,zkCleanup,zkEnv,zkServer,zkSnapShotToolkit,zkTxnLogToolkit}.sh $out/bin
patchShebangs $out/bin
substituteInPlace $out/bin/zkServer.sh \
--replace /bin/echo ${coreutils}/bin/echo
for i in $out/bin/{zkCli,zkCleanup,zkServer}.sh; do
for i in $out/bin/{zkCli,zkCleanup,zkServer,zkSnapShotToolkit,zkTxnLogToolkit}.sh; do
wrapProgram $i \
--set JAVA_HOME "${jre}" \
--prefix PATH : "${bash}/bin"
done
chmod -x $out/bin/zkEnv.sh
mkdir -p $out/share/zooinspector
cp -r contrib/ZooInspector/{${pname}-${version}-ZooInspector.jar,icons,lib,config} $out/share/zooinspector
classpath="$out/${pname}-${version}.jar:$out/share/zooinspector/${pname}-${version}-ZooInspector.jar"
for jar in $out/lib/*.jar $out/share/zooinspector/lib/*.jar; do
classpath="$classpath:$jar"
done
cat << EOF > $out/bin/zooInspector.sh
#!${runtimeShell}
cd $out/share/zooinspector
exec ${jre}/bin/java -cp $classpath org.apache.zookeeper.inspector.ZooInspector
EOF
chmod +x $out/bin/zooInspector.sh
'';
meta = with stdenv.lib; {
homepage = "http://zookeeper.apache.org";
homepage = "https://zookeeper.apache.org";
description = "Apache Zookeeper";
license = licenses.asl20;
maintainers = with maintainers; [ nathan-gs cstrahan pradeepchhetri ];
maintainers = with maintainers; [ nathan-gs cstrahan pradeepchhetri ztzg ];
platforms = platforms.unix;
};
}

28
pkgs/tools/filesystems/zkfuse/default.nix
View File

@ -1,14 +1,30 @@
{ stdenv, lib, zookeeper, zookeeper_mt, fuse, autoreconfHook, log4cxx, boost }:
{ stdenv
, lib
, autoreconfHook
, gnused
, boost
, fuse
, log4cxx
, zookeeper
, zookeeper_mt
}:
stdenv.mkDerivation {
stdenv.mkDerivation rec {
pname = "zkfuse";
inherit (zookeeper) version src;
inherit (zookeeper_mt) version src;
sourceRoot = "${zookeeper.name}/src/contrib/zkfuse";
sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-contrib/zookeeper-contrib-zkfuse";
nativeBuildInputs = [ autoreconfHook ];
nativeBuildInputs = [ autoreconfHook gnused ];
buildInputs = [ zookeeper_mt log4cxx boost fuse ];
postPatch = ''
# Make the async API accessible, and use the proper include path.
sed -i src/zkadapter.h \
-e '/"zookeeper\.h"/i#define THREADED' \
-e 's,"zookeeper\.h",<zookeeper/zookeeper.h>,'
'';
installPhase = ''
mkdir -p $out/bin
cp -v src/zkfuse $out/bin
@ -16,7 +32,7 @@ stdenv.mkDerivation {
meta = with lib; {
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ];
maintainers = with maintainers; [ cstrahan ztzg ];
license = licenses.asl20;
};
}

6
pkgs/tools/misc/osm2pgsql/default.nix
View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "osm2pgsql";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "openstreetmap";
repo = pname;
rev = version;
sha256 = "1dsyhcifixmcw05qxjald02pml0zfdij81pgy9yh8p00v0rqq57x";
sha256 = "1if76vw9jkc9jn4v0vvgwnpscjckk2cap93a8iqah8mqzx233y8s";
};
nativeBuildInputs = [ cmake ];
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "OpenStreetMap data to PostgreSQL converter";
homepage = "https://github.com/openstreetmap/osm2pgsql";
homepage = "https://osm2pgsql.org";
license = licenses.gpl2;
platforms = with platforms; linux ++ darwin;
maintainers = with maintainers; [ jglukasik das-g ];

6
pkgs/tools/networking/swagger-codegen/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, jre, makeWrapper }:
stdenv.mkDerivation rec {
version = "2.3.1";
version = "2.4.17";
pname = "swagger-codegen";
jarfilename = "${pname}-cli-${version}.jar";
@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
];
src = fetchurl {
url = "https://oss.sonatype.org/content/repositories/releases/io/swagger/${pname}-cli/${version}/${jarfilename}";
sha256 = "171qr0zx7i6cykv54vqjf3mplrf7w4a1fpq47wsj861lbf8xm322";
url = "https://repo1.maven.org/maven2/io/swagger/${pname}-cli/${version}/${jarfilename}";
sha256 = "06xx42ayh4xqpr71lq1hj7kv1v6m9ld9jm1d15fhs935zqckv32a";
};
phases = [ "installPhase" ];

10
pkgs/tools/security/kbs2/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "kbs2";
version = "0.1.6";
version = "0.2.2";
src = fetchFromGitHub {
owner = "woodruffw";
repo = pname;
rev = "v${version}";
sha256 = "0n83d4zvy74rn38fqq84lm58l24c3r87m2di2sw4cdr1hkjg3nbl";
sha256 = "1qf17ga5k1shim6lk5lqp6my90gj6qldc36f6l4634kndiv2xflb";
};
cargoSha256 = "0kafyljn3b87k5m0wdii0gfa4wj1yfys8jqx79inj82m0w1khprk";
cargoSha256 = "03nilfc0wvzhvx48m0qj05dqb18ypgkpkmbfj5nb96nridizwg0r";
nativeBuildInputs = [ installShellFiles ]
++ stdenv.lib.optionals stdenv.isLinux [ python3 ];
@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec {
export HOME=$TMPDIR
'';
checkFlagsArray = [ "--skip=kbs2::config::tests::test_find_config_dir" ];
checkFlags = [ "--skip=kbs2::config::tests::test_find_config_dir" ]
++ stdenv.lib.optionals stdenv.isDarwin [ "--skip=test_ragelib_rewrap_keyfile" ];
postInstall = ''
mkdir -p $out/share/kbs2
@ -38,6 +39,7 @@ rustPlatform.buildRustPackage rec {
meta = with stdenv.lib; {
description = "A secret manager backed by age";
homepage = "https://github.com/woodruffw/kbs2";
changelog = "https://github.com/woodruffw/kbs2/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = [ maintainers.marsam ];
};

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

@ -874,6 +874,8 @@ in
arduino = arduino-core.override { withGui = true; };
arduino-ci = callPackage ../development/arduino/arduino-ci { };
arduino-cli = callPackage ../development/arduino/arduino-cli { };
arduino-core = callPackage ../development/arduino/arduino-core { };
@ -5236,6 +5238,8 @@ in
matrix-synapse-plugins = recurseIntoAttrs matrix-synapse.plugins;
matrix-synapse-tools = recurseIntoAttrs matrix-synapse.tools;
matrix-appservice-slack = callPackage ../servers/matrix-synapse/matrix-appservice-slack {};
matrix-appservice-discord = callPackage ../servers/matrix-appservice-discord { };
@ -9389,6 +9393,8 @@ in
stack = haskell.lib.justStaticExecutables haskellPackages.stack;
hlint = haskell.lib.justStaticExecutables haskellPackages.hlint;
krank = haskell.lib.justStaticExecutables haskellPackages.krank;
# We use a version built with an older compiler because of https://github.com/pikajude/stylish-cabal/issues/12.
stylish-cabal = haskell.lib.justStaticExecutables haskell.packages.ghc865.stylish-cabal;
@ -10348,7 +10354,10 @@ in
clisp = callPackage ../development/interpreters/clisp { };
clisp-tip = callPackage ../development/interpreters/clisp/hg.nix { };
clojure = callPackage ../development/interpreters/clojure { };
clojure = callPackage ../development/interpreters/clojure {
# set this to an LTS version of java
jdk = jdk11;
};
clojure-lsp = callPackage ../development/tools/misc/clojure-lsp { };
@ -22606,7 +22615,7 @@ in
melmatcheq.lv2 = callPackage ../applications/audio/melmatcheq.lv2 { };
melonDS = callPackage ../misc/emulators/melonDS { };
melonDS = libsForQt5.callPackage ../misc/emulators/melonDS { };
meme = callPackage ../applications/graphics/meme { };
@ -23606,7 +23615,9 @@ in
qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { };
qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { };
qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox {
inherit (darwin.apple_sdk.frameworks) AVFoundation;
};
qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };

25
pkgs/top-level/perl-packages.nix
View File

@ -15752,18 +15752,31 @@ let
NetZooKeeper = buildPerlPackage {
pname = "Net-ZooKeeper";
version = "0.41";
src = fetchurl {
url = "mirror://cpan/authors/id/M/MA/MAF/Net-ZooKeeper-0.41.tar.gz";
sha256 = "91c177f30f82302eaf3173356eef05c21bc82163df752acb469177bd14a72db9";
version = "0.42pre";
src = fetchFromGitHub {
owner = "mark-5";
repo = "p5-net-zookeeper";
rev = "66e1a360aff9c39af728c36092b540a4b6045f70";
sha256 = "0xl8lcv9gfv0nn8vrrxa4az359whqdhmzw4r51nn3add8pn3s9ip";
};
buildInputs = [ pkgs.zookeeper_mt ];
nativeBuildInputs = [ pkgs.gnused ];
# fix "error: format not a string literal and no format arguments [-Werror=format-security]"
hardeningDisable = [ "format" ];
NIX_CFLAGS_COMPILE = "-I${pkgs.zookeeper_mt}/include";
# Make the async API accessible
NIX_CFLAGS_COMPILE = "-DTHREADED";
NIX_CFLAGS_LINK = "-L${pkgs.zookeeper_mt.out}/lib -lzookeeper_mt";
# Most tests are skipped as no server is available in the sandbox.
# `t/35_log.t` seems to suffer from a race condition; remove it. See
# https://github.com/NixOS/nixpkgs/pull/104889#issuecomment-737144513
preCheck = ''
rm t/35_log.t
'' + stdenv.lib.optionalString stdenv.isDarwin ''
rm t/30_connect.t
rm t/45_class.t
'';
meta = {
maintainers = [ maintainers.limeytexan ];
maintainers = with maintainers; [ limeytexan ztzg ];
homepage = "https://github.com/mark-5/p5-net-zookeeper";
license = stdenv.lib.licenses.asl20;
};

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

@ -2070,7 +2070,10 @@ in {
feedgenerator = callPackage ../development/python-modules/feedgenerator { inherit (pkgs) glibcLocales; };
feedparser = callPackage ../development/python-modules/feedparser { };
feedparser = if isPy3k then
callPackage ../development/python-modules/feedparser { }
else
callPackage ../development/python-modules/feedparser/5.nix { };
fenics = callPackage ../development/libraries/science/math/fenics {
inherit (pkgs) pkg-config;
@ -5227,8 +5230,6 @@ in {
pyipp = callPackage ../development/python-modules/pyipp { };
pyjade = callPackage ../development/python-modules/pyjade { };
pyjet = callPackage ../development/python-modules/pyjet { };
pyjks = callPackage ../development/python-modules/pyjks { };
@ -5465,6 +5466,8 @@ in {
pypubsub = callPackage ../development/python-modules/pypubsub { };
pypugjs = callPackage ../development/python-modules/pypugjs { };
pyqrcode = callPackage ../development/python-modules/pyqrcode { };
pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; };