MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 07:46:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-07-02 12:01:08 +00:00 committed by GitHub
commit 03ea42ab93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 2053 additions and 1758 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -10788,6 +10788,12 @@
githubId = 347983;
name = "Udo Spallek";
};
ulrikstrid = {
email = "ulrik.strid@outlook.com";
github = "ulrikstrid";
githubId = 1607770;
name = "Ulrik Strid";
};
unode = {
email = "alves.rjc@gmail.com";
github = "unode";

1
nixos/modules/services/audio/slimserver.nix
View file

@ -63,6 +63,7 @@ in {
description = "Slimserver daemon user";
home = cfg.dataDir;
group = "slimserver";
isSystemUser = true;
};
groups.slimserver = {};
};

117
pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
View file

@ -640,10 +640,10 @@
elpaBuild {
pname = "consult";
ename = "consult";
version = "0.8";
version = "0.9";
src = fetchurl {
url = "https://elpa.gnu.org/packages/consult-0.8.tar";
sha256 = "0vkq8dsj6k3gsdhiyg6ccv49fqgjw6f0db4wjsvm5zbkadjvlm86";
url = "https://elpa.gnu.org/packages/consult-0.9.tar";
sha256 = "1n3bnvgj92fjd9dai9f95wvyfb20yhaw7b722lkqjg42i10jqzfn";
};
packageRequires = [ emacs ];
meta = {
@ -670,10 +670,10 @@
elpaBuild {
pname = "corfu";
ename = "corfu";
version = "0.8";
version = "0.9";
src = fetchurl {
url = "https://elpa.gnu.org/packages/corfu-0.8.tar";
sha256 = "1qrrky1g4k5vw56435dgkwnmnri7i51gkydd76as3l0ixm4pnp05";
url = "https://elpa.gnu.org/packages/corfu-0.9.tar";
sha256 = "0710bq07j6w6zm49ci1bbx580frdbc62b3hbxwzkwm5204nf78bf";
};
packageRequires = [ emacs ];
meta = {
@ -835,10 +835,10 @@
elpaBuild {
pname = "devdocs";
ename = "devdocs";
version = "0.1";
version = "0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/devdocs-0.1.tar";
sha256 = "1ps2jpp1ckq9839l63p6npqrf85b8zb5akwvjvv7fkm8nvspdkil";
url = "https://elpa.gnu.org/packages/devdocs-0.2.tar";
sha256 = "1npc7yra7pvf86ahmz1h7hnjxrz15ar1vjcalg4ilizypycpgrwj";
};
packageRequires = [ emacs ];
meta = {
@ -1015,10 +1015,10 @@
elpaBuild {
pname = "ebdb";
ename = "ebdb";
version = "0.6.23";
version = "0.6.24";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ebdb-0.6.23.tar";
sha256 = "0j3jvy9s606qjqcmcjzgck3dp8bhpgly2g00wnswzcgk4makdzld";
url = "https://elpa.gnu.org/packages/ebdb-0.6.24.tar";
sha256 = "0156rh6fkv2yp509h6i8qzh4gsda2mcmfrxl4r6ywn1z5ahijc3r";
};
packageRequires = [ cl-lib emacs seq ];
meta = {
@ -1075,10 +1075,10 @@
elpaBuild {
pname = "eev";
ename = "eev";
version = "20210607";
version = "20210618";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eev-20210607.tar";
sha256 = "0avd58m8630s4d3ys9g84csscdmf2y1swwwkgzjkrrq8q0j5yd3l";
url = "https://elpa.gnu.org/packages/eev-20210618.tar";
sha256 = "13sb9shpj9fhns8sl3dxdgnn8z4wf14mgi4s87k5x4nrr012sscf";
};
packageRequires = [ emacs ];
meta = {
@ -1198,10 +1198,10 @@
elpaBuild {
pname = "emms";
ename = "emms";
version = "7.2";
version = "7.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/emms-7.2.tar";
sha256 = "11vqqh9rnzibsfw7wx62rgzl8i8ldpf0hv1sj43nhl5c6dlc8d5z";
url = "https://elpa.gnu.org/packages/emms-7.5.tar";
sha256 = "0d7nsx2idzbp6d5im5rrsnwppbr2cimvxgx31bhwsm2aq3ya5v2j";
};
packageRequires = [ cl-lib nadvice seq ];
meta = {
@ -1867,10 +1867,10 @@
elpaBuild {
pname = "ivy-posframe";
ename = "ivy-posframe";
version = "0.6.0";
version = "0.6.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.0.tar";
sha256 = "07dzglrcdl54lkznyphw97xwd9bcwzdcgzkav0vqfk7f5cwh1wkf";
url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.1.tar";
sha256 = "1nay2sfbwm2fkp3f1y89innd9h6j3q70q9y4yddrwa69cxlj9m23";
};
packageRequires = [ emacs ivy posframe ];
meta = {
@ -2017,10 +2017,10 @@
elpaBuild {
pname = "leaf";
ename = "leaf";
version = "4.4.8";
version = "4.5.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/leaf-4.4.8.tar";
sha256 = "0h0ksmgrhn29ci6z8y54dbbzcqlvfs1ra0kmf226gz0dqzk45vb3";
url = "https://elpa.gnu.org/packages/leaf-4.5.2.tar";
sha256 = "0i90shhhkpdcwmfi8zv0008qgmg4g3cqd2yvpycfv9n2axvhag54";
};
packageRequires = [ emacs ];
meta = {
@ -2152,10 +2152,10 @@
elpaBuild {
pname = "marginalia";
ename = "marginalia";
version = "0.6";
version = "0.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/marginalia-0.6.tar";
sha256 = "05pwaz9643shxnv63l6r9m2c0qf1nc1hy6jiqw01bkvvgg8g4jag";
url = "https://elpa.gnu.org/packages/marginalia-0.7.tar";
sha256 = "1nz55nx6xp72nahs4g6asl5y5yrlnlnza58bjrlwwzmwsf7daz18";
};
packageRequires = [ emacs ];
meta = {
@ -2829,10 +2829,10 @@
elpaBuild {
pname = "posframe";
ename = "posframe";
version = "1.0.3";
version = "1.0.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/posframe-1.0.3.tar";
sha256 = "0c3lnrydsysv8j25brgc0cckf1hz54yhkginncmw81y1ia43rqmx";
url = "https://elpa.gnu.org/packages/posframe-1.0.4.tar";
sha256 = "0i2pw90gw9zb22gj8yyvcp3b2k1bxxhbjj0idvr5iz1vd9023bc6";
};
packageRequires = [ emacs ];
meta = {
@ -2889,10 +2889,10 @@
elpaBuild {
pname = "pyim";
ename = "pyim";
version = "3.7.9";
version = "3.8.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/pyim-3.7.9.tar";
sha256 = "00ff1izdwcy53dcwpdn18wwndnw2jsw4bhg8gkqaa60xm468xzkl";
url = "https://elpa.gnu.org/packages/pyim-3.8.2.tar";
sha256 = "05sgciqb0hzy07j8pvbg7h2vpa9z5z60m6pknxd3b1kpi45vaihw";
};
packageRequires = [ async emacs xr ];
meta = {
@ -3355,10 +3355,10 @@
elpaBuild {
pname = "setup";
ename = "setup";
version = "0.2.0";
version = "0.2.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/setup-0.2.0.tar";
sha256 = "1xhjkyksilw1vbx12a4yz4bpj0dhl3m02yi8d9nyd19z098cfa9y";
url = "https://elpa.gnu.org/packages/setup-0.2.1.tar";
sha256 = "15paand086g33w2vb6jkyxd3i2pmpp84f31y3j5v8w9ia68pjzms";
};
packageRequires = [ emacs ];
meta = {
@ -3595,10 +3595,10 @@
elpaBuild {
pname = "sql-indent";
ename = "sql-indent";
version = "1.5";
version = "1.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/sql-indent-1.5.tar";
sha256 = "07k5rn9hbxppnka7nq0a3a6zyqqa1hp8j6qrb344js6zyak0cb63";
url = "https://elpa.gnu.org/packages/sql-indent-1.6.tar";
sha256 = "000pimlg0k4mrv2wpqq8w8l51wpr1lzlaq6ai8iaximm2a92ap5b";
};
packageRequires = [ cl-lib ];
meta = {
@ -3610,10 +3610,10 @@
elpaBuild {
pname = "ssh-deploy";
ename = "ssh-deploy";
version = "3.1.12";
version = "3.1.13";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.12.tar";
sha256 = "0fz49l63jfw9zy459f07bq2irdb8ispnx8m2c3wxwiim9yw5xnjg";
url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.13.tar";
sha256 = "006jr8yc5qvxdfk0pn40604a2b7a1ah6l6hi6rhxm3p5b08d9i5w";
};
packageRequires = [ emacs ];
meta = {
@ -3779,10 +3779,10 @@
elpaBuild {
pname = "tramp";
ename = "tramp";
version = "2.5.0.5";
version = "2.5.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tramp-2.5.0.5.tar";
sha256 = "1dclxffynfacvwi2scpda35sxjb42603yyf2p0477qa9b0i4xha0";
url = "https://elpa.gnu.org/packages/tramp-2.5.1.tar";
sha256 = "1r7wifhzy2ipdlc4fqnx6549fnx45ggz57wh0cp7s6y25761si7q";
};
packageRequires = [ emacs ];
meta = {
@ -3824,10 +3824,10 @@
elpaBuild {
pname = "transient";
ename = "transient";
version = "0.3.4";
version = "0.3.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/transient-0.3.4.tar";
sha256 = "1m71w52cr8f9wm6lybfa003w408lkrl6q9whs53hpp3pl5phhfvb";
url = "https://elpa.gnu.org/packages/transient-0.3.5.tar";
sha256 = "15dlj21gn0zxywic9wdcp5zc8skm1s170bq7smgkpd3p3lxslf68";
};
packageRequires = [ emacs ];
meta = {
@ -3949,6 +3949,21 @@
license = lib.licenses.free;
};
}) {};
vc-hgcmd = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "vc-hgcmd";
ename = "vc-hgcmd";
version = "1.14";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vc-hgcmd-1.14.tar";
sha256 = "0pg6fg0znsmky3iwdpxn2sx5bbn72kw83s077000ilawi6zqwc2d";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/vc-hgcmd.html";
license = lib.licenses.free;
};
}) {};
vcard = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "vcard";
@ -4015,10 +4030,10 @@
elpaBuild {
pname = "vertico";
ename = "vertico";
version = "0.11";
version = "0.12";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vertico-0.11.tar";
sha256 = "0hzwddkac85i449173az8crlksj9ivrqf969r81kbr45ksgr1ij6";
url = "https://elpa.gnu.org/packages/vertico-0.12.tar";
sha256 = "14qlc438bysg23wfj04zpvpraqzzi4jlz3r11vc56vd0k2hfmvmn";
};
packageRequires = [ emacs ];
meta = {

12
pkgs/applications/editors/emacs/elisp-packages/org-generated.nix
View file

@ -4,10 +4,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "20210607";
version = "20210628";
src = fetchurl {
url = "https://orgmode.org/elpa/org-20210607.tar";
sha256 = "178z9bnzcdaymnwxf0kkw1yzlzkj5dmdjjwdklc9qb9iv6rckfji";
url = "https://orgmode.org/elpa/org-20210628.tar";
sha256 = "1sn2yyynndk8qf43ss8bayll33r4ina8xfx4ywzcs3m1lm6xy1zl";
};
packageRequires = [];
meta = {
@ -19,10 +19,10 @@
elpaBuild {
pname = "org-plus-contrib";
ename = "org-plus-contrib";
version = "20210607";
version = "20210628";
src = fetchurl {
url = "https://orgmode.org/elpa/org-plus-contrib-20210607.tar";
sha256 = "03liivgfcmp0lh6p57bh2gyn85n3sc4p91y374kq8kzc7fzrgzyr";
url = "https://orgmode.org/elpa/org-plus-contrib-20210628.tar";
sha256 = "0r4kxp1hbhkwvi7939fglng8db4h4n7vigy8pd2gia3a02xcw8l5";
};
packageRequires = [];
meta = {

3624
pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
View file

File diff suppressed because it is too large Load diff

4
pkgs/applications/misc/slides/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "slides";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "maaslalani";
repo = "slides";
rev = "v${version}";
sha256 = "00sml6b9q3df9dgl7fpsn6a3qkq6xklnbfvvblf91xdf4ssn7wrx";
sha256 = "15f4sn1zsqqhzxnmwb1igh8xhka6li31ygdqgbjvxzm93lkarxvs";
};
checkInputs = [

16
pkgs/development/ocaml-modules/alcotest/mirage.nix Normal file
View file

@ -0,0 +1,16 @@
{ lib, buildDunePackage, alcotest, lwt, logs, mirage-clock, duration }:
buildDunePackage {
pname = "alcotest-mirage";
inherit (alcotest) version src useDune2;
propagatedBuildInputs = [ alcotest lwt logs mirage-clock duration ];
doCheck = true;
meta = alcotest.meta // {
description = "Mirage implementation for Alcotest";
maintainers = with lib.maintainers; [ ulrikstrid anmonteiro ];
};
}

21
pkgs/development/ocaml-modules/routes/default.nix Normal file
View file

@ -0,0 +1,21 @@
{ lib, fetchurl, buildDunePackage }:
buildDunePackage rec {
pname = "routes";
version = "0.9.1";
useDune2 = true;
minimalOCamlVersion = "4.05";
src = fetchurl {
url = "https://github.com/anuragsoni/routes/releases/download/${version}/routes-${version}.tbz";
sha256 = "0h2c1p5w6237c1lmsl5c8q2dj5dq20gf2cmb12nbmlfn12sfmcrl";
};
meta = with lib; {
description = "Typed routing for OCaml applications";
license = licenses.bsd3;
homepage = "https://anuragsoni.github.io/routes";
maintainers = with maintainers; [ ulrikstrid anmonteiro ];
};
}

6
pkgs/tools/security/grype/default.nix
View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "grype";
version = "0.13.0";
version = "0.14.0";
src = fetchFromGitHub {
owner = "anchore";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nHSnDrvz0EwDnmYch/bDJOZkf1b1Vrf1960d637ZmBs=";
sha256 = "sha256-fYeZFNtftG46/QHdV5UhCNCdP7ErOgwWfEB4V14ei5k=";
};
vendorSha256 = "sha256-+1XJTr/WJIz/gvvl9KNp68OVEkjHk+KunAd4trd2T/Y=";
vendorSha256 = "sha256-mW3e4WFa9pKSpyTZYmPA2j8nZz+94G2PqdqI0BDo3wc=";
propagatedBuildInputs = [ docker ];

4
pkgs/top-level/ocaml-packages.nix
View file

@ -22,6 +22,8 @@ let
alcotest-lwt = callPackage ../development/ocaml-modules/alcotest/lwt.nix {};
alcotest-mirage = callPackage ../development/ocaml-modules/alcotest/mirage.nix {};
angstrom = callPackage ../development/ocaml-modules/angstrom { };
angstrom-async = callPackage ../development/ocaml-modules/angstrom-async { };
@ -1151,6 +1153,8 @@ let
rope = callPackage ../development/ocaml-modules/rope { };
routes = callPackage ../development/ocaml-modules/routes { };
rpclib = callPackage ../development/ocaml-modules/rpclib { };
rpclib-lwt = callPackage ../development/ocaml-modules/rpclib/lwt.nix { };