Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-11-13 06:01:46 +00:00 committed by GitHub
commit 22f9a62070
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 3278 additions and 2742 deletions

View File

@ -34,14 +34,16 @@ let
"/share/unimaps"
];
};
setVconsole = !config.boot.isContainer;
in
{
###### interface
options.console = {
enable = mkEnableOption (lib.mdDoc "virtual console") // {
default = true;
};
font = mkOption {
type = with types; either str path;
default = "Lat2-Terminus16";
@ -125,11 +127,17 @@ in
'');
}
(mkIf (!setVconsole) {
systemd.services.systemd-vconsole-setup.enable = false;
(mkIf (!cfg.enable) {
systemd.services = {
"serial-getty@ttyS0".enable = false;
"serial-getty@hvc0".enable = false;
"getty@tty1".enable = false;
"autovt@".enable = false;
systemd-vconsole-setup.enable = false;
};
})
(mkIf setVconsole (mkMerge [
(mkIf cfg.enable (mkMerge [
{ environment.systemPackages = [ pkgs.kbd ];
# Let systemd-vconsole-setup.service do the work of setting up the

View File

@ -7,8 +7,11 @@ with lib;
config = mkIf config.boot.isContainer {
# Disable some features that are not useful in a container.
boot.kernel.enable = false;
console.enable = mkDefault false;
nix.optimise.automatic = mkDefault false; # the store is host managed
powerManagement.enable = mkDefault false;
documentation.nixos.enable = mkDefault false;

View File

@ -0,0 +1,76 @@
{ lib
, stdenv
, fetchFromGitHub
, bash
, emacs
, python3
}:
stdenv.mkDerivation (finalAttrs: {
pname = "cask";
version = "0.8.8";
src = fetchFromGitHub {
owner = "cask";
repo = "cask";
rev = "v${finalAttrs.version}";
hash = "sha256-TlReq5sLVJj+pXmJSnepKQkNEWVhnh30iq4egM1HJMU=";
};
doCheck = true;
nativeBuildInputs = [ emacs ];
buildInputs = [
bash
python3
]
++ (with emacs.pkgs; [
ansi
dash
ecukes
el-mock
ert-async
ert-runner
f
git
noflet
package-build
s
servant
shell-split-string
]);
strictDeps = true;
buildPhase = ''
runHook preBuild
emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
install -Dm444 -t $out/share/emacs/site-lisp/cask *.el *.elc
install -Dm555 -t $out/share/emacs/site-lisp/cask/bin bin/cask
ln -s $out/share/emacs/site-lisp/cask/bin/cask $out/bin/cask
runHook postInstall
'';
meta = with lib; {
description = "Project management for Emacs";
longDescription = ''
Cask is a project management tool for Emacs that helps automate the
package development cycle; development, dependencies, testing, building,
packaging and more.
'';
homepage = "https://cask.readthedocs.io/en/latest/index.html";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres ];
inherit (emacs.meta) platforms;
};
})

View File

@ -39,10 +39,10 @@
elpaBuild {
pname = "ada-mode";
ename = "ada-mode";
version = "7.2.1";
version = "7.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ada-mode-7.2.1.tar";
sha256 = "1x9gkyi23xsq8zn0n8vb1xgkh85maj2cj95ravhkakb2cd9dmbjv";
url = "https://elpa.gnu.org/packages/ada-mode-7.3.1.tar";
sha256 = "09ji22823w59nnqcjr5524ylxs93c5javsxcvmgbiqlvx9gfrdkk";
};
packageRequires = [ emacs uniquify-files wisi ];
meta = {
@ -249,10 +249,10 @@
elpaBuild {
pname = "auctex";
ename = "auctex";
version = "13.1.4";
version = "13.1.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-13.1.4.tar";
sha256 = "1r9qysnfdbiblq3c95rgsh7vgy3k4qabnj0vicqhdkca0cl2b2bj";
url = "https://elpa.gnu.org/packages/auctex-13.1.5.tar";
sha256 = "00g6js6089637w8alch4dvk140chjkyirsa8inh9ai6a6kkfvc3p";
};
packageRequires = [ emacs ];
meta = {
@ -350,6 +350,21 @@
license = lib.licenses.free;
};
}) {};
bind-key = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "bind-key";
ename = "bind-key";
version = "2.4.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/bind-key-2.4.1.tar";
sha256 = "0jrbm2l6h4r7qjcdcsfczbijmbf3njzzzrymv08zanchmy7lvsv2";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/bind-key.html";
license = lib.licenses.free;
};
}) {};
blist = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "blist";
@ -493,10 +508,10 @@
elpaBuild {
pname = "cape";
ename = "cape";
version = "0.9";
version = "0.10";
src = fetchurl {
url = "https://elpa.gnu.org/packages/cape-0.9.tar";
sha256 = "0bjzm1jf3554q83mbmyj584v29cgb0s5wpj74y4p9iyy40g739rw";
url = "https://elpa.gnu.org/packages/cape-0.10.tar";
sha256 = "1ykr01wb0mgs1z181fk9m65lcrv60as5qzbnd0cnndva7p3078lc";
};
packageRequires = [ emacs ];
meta = {
@ -594,21 +609,6 @@
license = lib.licenses.free;
};
}) {};
cl-print = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "cl-print";
ename = "cl-print";
version = "1.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/cl-print-1.0.el";
sha256 = "0ib8j7rv5f4c4xg3kban58jm6cam756i3xz6j8100846g3jn9zcc";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/cl-print.html";
license = lib.licenses.free;
};
}) {};
clipboard-collector = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "clipboard-collector";
@ -654,21 +654,6 @@
license = lib.licenses.free;
};
}) {};
coffee-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "coffee-mode";
ename = "coffee-mode";
version = "0.4.1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/coffee-mode-0.4.1.1.el";
sha256 = "1jffd8rqmc3l597db26rggis6apf91glyzm1qvpf5g3iz55g6slz";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/coffee-mode.html";
license = lib.licenses.free;
};
}) {};
comint-mime = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "comint-mime";
@ -786,10 +771,10 @@
elpaBuild {
pname = "consult";
ename = "consult";
version = "0.19";
version = "0.20";
src = fetchurl {
url = "https://elpa.gnu.org/packages/consult-0.19.tar";
sha256 = "11dac6cl40xyg05wzxanxsc74f1kgnnkqlgf5gqlkq24gwmlgvyk";
url = "https://elpa.gnu.org/packages/consult-0.20.tar";
sha256 = "134yyjap69lm3j99q7719b3pgc71y0nl30v9gy0cycf7dp7p1ssx";
};
packageRequires = [ compat emacs ];
meta = {
@ -801,10 +786,10 @@
elpaBuild {
pname = "consult-recoll";
ename = "consult-recoll";
version = "0.7";
version = "0.8";
src = fetchurl {
url = "https://elpa.gnu.org/packages/consult-recoll-0.7.tar";
sha256 = "12a1qhp7yz6r5pblm68wp1zis0xnvsn2rm12rz9fircq8p3ff3j7";
url = "https://elpa.gnu.org/packages/consult-recoll-0.8.tar";
sha256 = "02vg1rr2fkcqrrivqgggdjdq0ywvlyzazwq1xd02yah3j4sbv4ag";
};
packageRequires = [ consult emacs ];
meta = {
@ -831,10 +816,10 @@
elpaBuild {
pname = "corfu";
ename = "corfu";
version = "0.27";
version = "0.28";
src = fetchurl {
url = "https://elpa.gnu.org/packages/corfu-0.27.tar";
sha256 = "1i8nl94aaa5p4bp0idsmph3z61lccg9a7plbsnpicy0klsaj69r2";
url = "https://elpa.gnu.org/packages/corfu-0.28.tar";
sha256 = "0gayzzxac42nxj1612isc4f5xishrr0bnvycpcfmkm5pf41kq50f";
};
packageRequires = [ emacs ];
meta = {
@ -906,10 +891,10 @@
elpaBuild {
pname = "crdt";
ename = "crdt";
version = "0.3.3";
version = "0.3.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/crdt-0.3.3.tar";
sha256 = "12xdqdp4zwd163wc19cjakabgjyzm4l4xg4bns6q1p60zgynbkx8";
url = "https://elpa.gnu.org/packages/crdt-0.3.4.tar";
sha256 = "1wha43mrllnpc2i7p91dns8iwaxf60mp20h234c07m9jcjvcxrmc";
};
packageRequires = [];
meta = {
@ -1041,10 +1026,10 @@
elpaBuild {
pname = "debbugs";
ename = "debbugs";
version = "0.33";
version = "0.34";
src = fetchurl {
url = "https://elpa.gnu.org/packages/debbugs-0.33.tar";
sha256 = "1s4p3jf9yrm8pn5pljpkrw05n2p9v6fpl141rh1df7f7l0w80qbk";
url = "https://elpa.gnu.org/packages/debbugs-0.34.tar";
sha256 = "06nxia4myhysiw12vsflgllrp9nyhmjnybrrcl1vyf4pw0fc6yrx";
};
packageRequires = [ emacs soap-client ];
meta = {
@ -1071,10 +1056,10 @@
elpaBuild {
pname = "denote";
ename = "denote";
version = "1.0.0";
version = "1.1.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/denote-1.0.0.tar";
sha256 = "1gywi22x12p7hkliwy84i7pvyis5ja22fybz5shkdmkcl12mx631";
url = "https://elpa.gnu.org/packages/denote-1.1.0.tar";
sha256 = "06fmxszw8y8r2sm1j45wx14zb22jg5k5l73k1znhx4gl4v3bl968";
};
packageRequires = [ emacs ];
meta = {
@ -1086,10 +1071,10 @@
elpaBuild {
pname = "detached";
ename = "detached";
version = "0.9.1";
version = "0.9.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/detached-0.9.1.tar";
sha256 = "1hzvqb18bpdpmnk469cmkayvddm37knd3mjj7m6zv3qsjw17n6f1";
url = "https://elpa.gnu.org/packages/detached-0.9.2.tar";
sha256 = "00rbdcl56gqjqrlbmf5mfgakzl086bgs5xb15ic3jlm676j64gqh";
};
packageRequires = [ emacs ];
meta = {
@ -1251,10 +1236,10 @@
elpaBuild {
pname = "doc-toc";
ename = "doc-toc";
version = "1.0";
version = "1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/doc-toc-1.0.tar";
sha256 = "07yan1jmp6q87rhm8bmglswnhzlh5r9j35x5sqm5yfx0pcp16kpj";
url = "https://elpa.gnu.org/packages/doc-toc-1.1.tar";
sha256 = "145k0w84nda1gq5g8zd9510kxhqqqk72ladi3av6hpydvym6bszz";
};
packageRequires = [ emacs ];
meta = {
@ -1277,21 +1262,6 @@
license = lib.licenses.free;
};
}) {};
dtache = callPackage ({ detached, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "dtache";
ename = "dtache";
version = "0.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/dtache-0.7.tar";
sha256 = "0cws662f53f2j1viicrwijmniiqxz1n4mh6kwck25pl954xa61gf";
};
packageRequires = [ detached emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/dtache.html";
license = lib.licenses.free;
};
}) {};
dts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "dts-mode";
@ -1341,10 +1311,10 @@
elpaBuild {
pname = "ebdb";
ename = "ebdb";
version = "0.8.14";
version = "0.8.16";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ebdb-0.8.14.tar";
sha256 = "0h7yva7p4b4lapi7pwcibf75nqmazjf3r67ibnkc8l9salfhml25";
url = "https://elpa.gnu.org/packages/ebdb-0.8.16.tar";
sha256 = "0qldw0a346xbkq289mynvfz38n4yh2rfbvgs5f7ixfc014y3j3gw";
};
packageRequires = [ emacs seq ];
meta = {
@ -1386,10 +1356,10 @@
elpaBuild {
pname = "ediprolog";
ename = "ediprolog";
version = "2.1";
version = "2.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ediprolog-2.1.el";
sha256 = "1piimsmzpirw8plrpy79xbpnvynzzhcxi31g6lg6is8gridiv3md";
url = "https://elpa.gnu.org/packages/ediprolog-2.2.tar";
sha256 = "021jm5zdxrjg7xcja18vgc2v52rk17xi1k7xxw8q802nmixhy0js";
};
packageRequires = [];
meta = {
@ -1401,10 +1371,10 @@
elpaBuild {
pname = "eev";
ename = "eev";
version = "20220926";
version = "20221108";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eev-20220926.tar";
sha256 = "0kc30y44wl691jchafljp938kbwilawdfxm0bp6nsniv1bm95rpy";
url = "https://elpa.gnu.org/packages/eev-20221108.tar";
sha256 = "0va6jb57pyv21zvjaq99yi1275rl2bna7ci5zicqshiq2naxdqzr";
};
packageRequires = [ emacs ];
meta = {
@ -1416,10 +1386,10 @@
elpaBuild {
pname = "ef-themes";
ename = "ef-themes";
version = "0.6.0";
version = "0.9.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ef-themes-0.6.0.tar";
sha256 = "00xq5ymsq8lq2jc541lw64i9pp0a0757wj3nasmfsa27wfpivzhb";
url = "https://elpa.gnu.org/packages/ef-themes-0.9.0.tar";
sha256 = "1yhnpnnz3v4v54ha4sibdzp2af6jq5p55jm0g6k0viqv2qpjmh3l";
};
packageRequires = [ emacs ];
meta = {
@ -1435,16 +1405,17 @@
, jsonrpc
, lib
, project
, seq
, xref }:
elpaBuild {
pname = "eglot";
ename = "eglot";
version = "1.8";
version = "1.9";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eglot-1.8.tar";
sha256 = "1n04jnf3wwpxafrzfd02l53wf90brjc8p835f84k0n0rjxin99k5";
url = "https://elpa.gnu.org/packages/eglot-1.9.tar";
sha256 = "1v6pyk3c680xmsv6lrq5xcj9x771z87i3b92in87zg841mw3b6as";
};
packageRequires = [ eldoc emacs flymake jsonrpc project xref ];
packageRequires = [ eldoc emacs flymake jsonrpc project seq xref ];
meta = {
homepage = "https://elpa.gnu.org/packages/eglot.html";
license = lib.licenses.free;
@ -1578,10 +1549,10 @@
elpaBuild {
pname = "ement";
ename = "ement";
version = "0.3";
version = "0.4.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ement-0.3.tar";
sha256 = "08k1qfcymsnaz0mzq33l3i0fj9kjf5y0pdpn7k0skhhlsw90h078";
url = "https://elpa.gnu.org/packages/ement-0.4.1.tar";
sha256 = "0hf1gdz5kgvy64652h33iph3lrnmiv98lhar421m0grbh326xn95";
};
packageRequires = [
emacs
@ -1606,10 +1577,10 @@
elpaBuild {
pname = "emms";
ename = "emms";
version = "11";
version = "12";
src = fetchurl {
url = "https://elpa.gnu.org/packages/emms-11.tar";
sha256 = "000lqhsafyh1n293ksnlyavxv1pzl5pazds4sgxjcqd45lyn55ii";
url = "https://elpa.gnu.org/packages/emms-12.tar";
sha256 = "048ijrpw6s4k7zr78fzc3ksjjri6mnyp6c47h5lp5nw5gvm4np7a";
};
packageRequires = [ cl-lib nadvice seq ];
meta = {
@ -1746,10 +1717,10 @@
elpaBuild {
pname = "exwm";
ename = "exwm";
version = "0.26";
version = "0.27";
src = fetchurl {
url = "https://elpa.gnu.org/packages/exwm-0.26.tar";
sha256 = "03pg0r8a5vb1wc5grmjgzql74p47fniv47x39gdll5s3cq0haf6q";
url = "https://elpa.gnu.org/packages/exwm-0.27.tar";
sha256 = "094k33clmxhnab0wniyrs48sdz28kna2g6fmkhsd7n20nmhhc4sn";
};
packageRequires = [ xelb ];
meta = {
@ -1836,10 +1807,10 @@
elpaBuild {
pname = "fontaine";
ename = "fontaine";
version = "0.4.0";
version = "0.4.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/fontaine-0.4.0.tar";
sha256 = "1phbni32zgwml5mwldbqmqmkbhbdj4vf4bs98wj0my6d902x6lbw";
url = "https://elpa.gnu.org/packages/fontaine-0.4.1.tar";
sha256 = "0szj9ys7bkj6cwg2bmb7sniyzjzdy3f7qm9r90grrgs5iir3k2qa";
};
packageRequires = [ emacs ];
meta = {
@ -2144,6 +2115,21 @@
license = lib.licenses.free;
};
}) {};
hcel = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "hcel";
ename = "hcel";
version = "1.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/hcel-1.0.0.tar";
sha256 = "1j6snbyi710qnxr68mbmj1v2i6gqf6znd872fkjkyj85pg3iibia";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/hcel.html";
license = lib.licenses.free;
};
}) {};
heap = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "heap";
@ -2163,10 +2149,10 @@
elpaBuild {
pname = "hiddenquote";
ename = "hiddenquote";
version = "1.1";
version = "1.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/hiddenquote-1.1.tar";
sha256 = "1j692ka84z6k9c3bhcn28irym5fga4d1wvhmvzvixdbfwn58ivw5";
url = "https://elpa.gnu.org/packages/hiddenquote-1.2.tar";
sha256 = "1ssfy1ha5a1pakihmkifry200k7z1mxcgl4w9pwvp7wmzbkv2zql";
};
packageRequires = [ emacs ];
meta = {
@ -2221,16 +2207,16 @@
license = lib.licenses.free;
};
}) {};
hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, lv }:
elpaBuild {
pname = "hydra";
ename = "hydra";
version = "0.14.0";
version = "0.15.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/hydra-0.14.0.tar";
sha256 = "1r2vl2cpzqzayfzc0bijigxc7c0mkgcv96g4p65gnw99jk8d78kb";
url = "https://elpa.gnu.org/packages/hydra-0.15.0.tar";
sha256 = "1mppx20920kfq97wd7mkrn4bcmm46k5m8wqm49asd54w701iq3n1";
};
packageRequires = [ cl-lib ];
packageRequires = [ cl-lib lv ];
meta = {
homepage = "https://elpa.gnu.org/packages/hydra.html";
license = lib.licenses.free;
@ -2695,10 +2681,10 @@
elpaBuild {
pname = "logos";
ename = "logos";
version = "0.5.1";
version = "1.0.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/logos-0.5.1.tar";
sha256 = "0154fxl20crl0ay064cbhgsjnj70nq5jz778hzjjy3mnkwzsmbh3";
url = "https://elpa.gnu.org/packages/logos-1.0.1.tar";
sha256 = "1kmfsgapinx6p8zyxd2s81j703iiril9c907r576z5k498pfifb6";
};
packageRequires = [ emacs ];
meta = {
@ -2706,14 +2692,29 @@
license = lib.licenses.free;
};
}) {};
lv = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "lv";
ename = "lv";
version = "0.15.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/lv-0.15.0.tar";
sha256 = "1xnyk8bvr0bdz68qc1sga3w9lwdga5qpp3m7290z1vyv0mznh4gm";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/lv.html";
license = lib.licenses.free;
};
}) {};
map = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "map";
ename = "map";
version = "3.2.1";
version = "3.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/map-3.2.1.tar";
sha256 = "1zj0y3nvkrd2v43za214xr3h9z6wyp7r5s6nf5g1pj272yb871d1";
url = "https://elpa.gnu.org/packages/map-3.3.1.tar";
sha256 = "1gvywhdfg27nx6pyq7yfwq9x6j96jama59i5s9rp41pvg2dlmvm0";
};
packageRequires = [ emacs ];
meta = {
@ -2725,10 +2726,10 @@
elpaBuild {
pname = "marginalia";
ename = "marginalia";
version = "0.14";
version = "0.15";
src = fetchurl {
url = "https://elpa.gnu.org/packages/marginalia-0.14.tar";
sha256 = "0y1mz9688h56knyly7by3gl6v37q437c3lp5bsx6jajysb8v69xw";
url = "https://elpa.gnu.org/packages/marginalia-0.15.tar";
sha256 = "0sadz4c44pld9aqn49a7l80lqgv2ncv7aw401d740n2ja2grg6vb";
};
packageRequires = [ emacs ];
meta = {
@ -2886,48 +2887,29 @@
license = lib.licenses.free;
};
}) {};
mmm-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
mmm-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "mmm-mode";
ename = "mmm-mode";
version = "0.5.8";
version = "0.5.9";
src = fetchurl {
url = "https://elpa.gnu.org/packages/mmm-mode-0.5.8.tar";
sha256 = "05ckf4zapdpvnd3sqpw6kxaa567zh536a36m9qzx3sqyjbyn5fb4";
url = "https://elpa.gnu.org/packages/mmm-mode-0.5.9.tar";
sha256 = "12fss1ccb66xc87m5wpr3vg7bfrzz5m0q6s7pa0avvhsm2f8r2yh";
};
packageRequires = [ cl-lib ];
packageRequires = [ cl-lib emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/mmm-mode.html";
license = lib.licenses.free;
};
}) {};
modus-operandi-theme = callPackage ({ elpaBuild
, emacs
, fetchurl
, lib
, modus-themes }:
elpaBuild {
pname = "modus-operandi-theme";
ename = "modus-operandi-theme";
version = "0.13.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.13.2.tar";
sha256 = "1sw18ijp9rhaf8y8x8z5rmxy23pxd3gaicgmp2zndcfmm54gwsic";
};
packageRequires = [ emacs modus-themes ];
meta = {
homepage = "https://elpa.gnu.org/packages/modus-operandi-theme.html";
license = lib.licenses.free;
};
}) {};
modus-themes = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "modus-themes";
ename = "modus-themes";
version = "2.7.1";
version = "3.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/modus-themes-2.7.1.tar";
sha256 = "1ms5nig05z26342723jln50m7xq055knr2570x40lkg2m9s1ikx1";
url = "https://elpa.gnu.org/packages/modus-themes-3.0.0.tar";
sha256 = "1c3rls175nmc4n01hfzwqxv2nhyv8n6i8d4pv93k28z6c30n8lhs";
};
packageRequires = [ emacs ];
meta = {
@ -2935,25 +2917,6 @@
license = lib.licenses.free;
};
}) {};
modus-vivendi-theme = callPackage ({ elpaBuild
, emacs
, fetchurl
, lib
, modus-themes }:
elpaBuild {
pname = "modus-vivendi-theme";
ename = "modus-vivendi-theme";
version = "0.13.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.13.2.tar";
sha256 = "1qn3kzxwf81zc7gprd9wblhb8b8akdkxwajpgk036y8i4cmvmspn";
};
packageRequires = [ emacs modus-themes ];
meta = {
homepage = "https://elpa.gnu.org/packages/modus-vivendi-theme.html";
license = lib.licenses.free;
};
}) {};
multi-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "multi-mode";
@ -3083,10 +3046,10 @@
elpaBuild {
pname = "nano-modeline";
ename = "nano-modeline";
version = "0.7.1";
version = "0.7.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/nano-modeline-0.7.1.tar";
sha256 = "18a4mp27z6pj87yhp81x5a79g0kv6mzzd0axq2p31003r675l0hx";
url = "https://elpa.gnu.org/packages/nano-modeline-0.7.2.tar";
sha256 = "14405gj7fh14incbpsg75fwzxfzazqp9lfk60i4w731kfwhlc727";
};
packageRequires = [ emacs ];
meta = {
@ -3098,10 +3061,10 @@
elpaBuild {
pname = "nano-theme";
ename = "nano-theme";
version = "0.3.1";
version = "0.3.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/nano-theme-0.3.1.tar";
sha256 = "003jhzh52iqrqlxh1gpv3y2wjlxx4ng3al5zcpm5q42kix8cjpd1";
url = "https://elpa.gnu.org/packages/nano-theme-0.3.3.tar";
sha256 = "0agdvl85ljiawa06x02zj78crq1y1vg0sr7dqxcl36zx8vhzc08v";
};
packageRequires = [ emacs ];
meta = {
@ -3177,10 +3140,10 @@
elpaBuild {
pname = "notmuch-indicator";
ename = "notmuch-indicator";
version = "0.1.1";
version = "0.2.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/notmuch-indicator-0.1.1.tar";
sha256 = "1fdl8xm48id1a85gf3gr8d8m3sz61xrras9f598pvrksm3j162b6";
url = "https://elpa.gnu.org/packages/notmuch-indicator-0.2.2.tar";
sha256 = "1jca5zm8vd91ivk5c6n2210ybp1i8rb8cpi1dymbxkcjxc61fzgp";
};
packageRequires = [ emacs ];
meta = {
@ -3357,10 +3320,10 @@
elpaBuild {
pname = "org-modern";
ename = "org-modern";
version = "0.4";
version = "0.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-modern-0.4.tar";
sha256 = "0xn2vmlz43p9b1gscijwzhaxa44dsshlw31llhffqpxlw2amm1lf";
url = "https://elpa.gnu.org/packages/org-modern-0.5.tar";
sha256 = "0fd5inaq094xhlv4cnd7p47hishlxlhjb17srk4cm1jdgaar3pnp";
};
packageRequires = [ emacs ];
meta = {
@ -3417,10 +3380,10 @@
elpaBuild {
pname = "org-transclusion";
ename = "org-transclusion";
version = "1.3.0";
version = "1.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-transclusion-1.3.0.tar";
sha256 = "1fgxpx5cikp03xzki55b7davx8m6zmrmrd0jzd69mv9gyw3bywg7";
url = "https://elpa.gnu.org/packages/org-transclusion-1.3.1.tar";
sha256 = "1v7i2i28500p4gvikcpp931qpks9zmvfpf6lfzrqdqppx2ix295q";
};
packageRequires = [ emacs org ];
meta = {
@ -3627,10 +3590,10 @@
elpaBuild {
pname = "phps-mode";
ename = "phps-mode";
version = "0.4.25";
version = "0.4.30";
src = fetchurl {
url = "https://elpa.gnu.org/packages/phps-mode-0.4.25.tar";
sha256 = "1sqwh7lkpgwc8m7vrbzjk8vc2p3b9gq6smyz6zx8pq4pf1rqkzrd";
url = "https://elpa.gnu.org/packages/phps-mode-0.4.30.tar";
sha256 = "0gwdcfvp3564zmiaw1p0vfyw46n6kn14nh8qx0jwzwygy22v1jdq";
};
packageRequires = [ emacs ];
meta = {
@ -3687,10 +3650,10 @@
elpaBuild {
pname = "posframe";
ename = "posframe";
version = "1.1.7";
version = "1.1.8";
src = fetchurl {
url = "https://elpa.gnu.org/packages/posframe-1.1.7.tar";
sha256 = "13i2wxx079gfq0vbq0iwmsig5b7x4aspd1q02yqc79846f1dsx4w";
url = "https://elpa.gnu.org/packages/posframe-1.1.8.tar";
sha256 = "0560f05c2rh6jkdba4yq9qbazfz6qbdrymqm5zcihvz7cy019dzm";
};
packageRequires = [ emacs ];
meta = {
@ -3702,10 +3665,10 @@
elpaBuild {
pname = "project";
ename = "project";
version = "0.8.1";
version = "0.8.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/project-0.8.1.tar";
sha256 = "0q2js8qihlhchpx2mx0f992ygslsqri2q4iv8kcl4fx31lpp7c1k";
url = "https://elpa.gnu.org/packages/project-0.8.2.tar";
sha256 = "1l5yxw6xqml176vskd5fz2y2dbjh8925g3kyimda4gdprz4y7aci";
};
packageRequires = [ emacs xref ];
meta = {
@ -3762,10 +3725,10 @@
elpaBuild {
pname = "pyim";
ename = "pyim";
version = "5.2.5";
version = "5.2.8";
src = fetchurl {
url = "https://elpa.gnu.org/packages/pyim-5.2.5.tar";
sha256 = "00f23pl53rdy9iwp4gj2656wik7c6vnmhsglg7z4pz3ippz3f4hq";
url = "https://elpa.gnu.org/packages/pyim-5.2.8.tar";
sha256 = "1klarzr5lfga09ysq3c7gkgmzl6r08gpl4519x5damxd82x4r3y2";
};
packageRequires = [ async emacs xr ];
meta = {
@ -3867,10 +3830,10 @@
elpaBuild {
pname = "rcirc-color";
ename = "rcirc-color";
version = "0.4.2";
version = "0.4.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/rcirc-color-0.4.2.tar";
sha256 = "0pa9p018kwsy44cmkli7x6cz1abxkyi26ac7w3vh99qp7x97dia3";
url = "https://elpa.gnu.org/packages/rcirc-color-0.4.4.tar";
sha256 = "1jwx9fd3m7zl6c7q91v185iy7b8q1bncvif80xi6hbi2srz9rlfg";
};
packageRequires = [ emacs ];
meta = {
@ -4702,10 +4665,10 @@
elpaBuild {
pname = "taxy-magit-section";
ename = "taxy-magit-section";
version = "0.11";
version = "0.12.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/taxy-magit-section-0.11.tar";
sha256 = "058z95c0z2hxplr5pfgph1cdq68zcrkmwx1wqyd5fy4a5h43yknq";
url = "https://elpa.gnu.org/packages/taxy-magit-section-0.12.1.tar";
sha256 = "0bs00y8pl51dji23zx5w64h6la0y109q0jv2q1nggizk6q5bsxmg";
};
packageRequires = [ emacs magit-section taxy ];
meta = {
@ -4732,10 +4695,10 @@
elpaBuild {
pname = "tempel";
ename = "tempel";
version = "0.4";
version = "0.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tempel-0.4.tar";
sha256 = "002ng6x1qlhnk7vvpwjl8wkm869k0ihpbdgbnhqjsnpzln1gib0w";
url = "https://elpa.gnu.org/packages/tempel-0.5.tar";
sha256 = "0gx48p2kkwizxf30h8jq658ksp00ibf5azjxvcs1nj8hz2g3agjx";
};
packageRequires = [ emacs ];
meta = {
@ -4942,6 +4905,21 @@
license = lib.licenses.free;
};
}) {};
triples = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }:
elpaBuild {
pname = "triples";
ename = "triples";
version = "0.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/triples-0.1.tar";
sha256 = "1b1qrrg60wx4ikl9nd8gmawj0pc0yysxq901l29336gwpbwj81y7";
};
packageRequires = [ emacs seq ];
meta = {
homepage = "https://elpa.gnu.org/packages/triples.html";
license = lib.licenses.free;
};
}) {};
undo-tree = callPackage ({ elpaBuild, emacs, fetchurl, lib, queue }:
elpaBuild {
pname = "undo-tree";
@ -5006,6 +4984,21 @@
license = lib.licenses.free;
};
}) {};
url-scgi = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "url-scgi";
ename = "url-scgi";
version = "0.8";
src = fetchurl {
url = "https://elpa.gnu.org/packages/url-scgi-0.8.tar";
sha256 = "1837vyamwk5mp2nf3k477hyr5pq1xy6p7br7kl6h2k8jmxqy3mlj";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/url-scgi.html";
license = lib.licenses.free;
};
}) {};
validate = callPackage ({ cl-lib ? null
, elpaBuild
, emacs
@ -5152,10 +5145,10 @@
elpaBuild {
pname = "vertico";
ename = "vertico";
version = "0.27";
version = "0.28";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vertico-0.27.tar";
sha256 = "0yf02xwv0zx2pwb7c97k7qbbvmkripb1pb4mn16rvs07a9r217hz";
url = "https://elpa.gnu.org/packages/vertico-0.28.tar";
sha256 = "0rkvfya674hy8g37hy40knwwppbygmx005cg04136kdlkmywb0l1";
};
packageRequires = [ emacs ];
meta = {
@ -5385,10 +5378,10 @@
elpaBuild {
pname = "wisi";
ename = "wisi";
version = "3.1.8";
version = "4.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/wisi-3.1.8.tar";
sha256 = "1k4vfxjas79yv5xfnmjygf185zkypx65gpqlmxpvfgcmvl7dgbdy";
url = "https://elpa.gnu.org/packages/wisi-4.0.0.tar";
sha256 = "1w082nqzvzljm8m8gxja7va88g0lz264d4ir24ydak22rfr688bv";
};
packageRequires = [ emacs seq ];
meta = {

View File

@ -1,4 +1,6 @@
{ lib, pkgs }: self: with self; with lib.licenses; {
{ lib, pkgs }:
self: with self; {
elisp-ffi = let
rev = "da37c516a0e59bdce63fb2dc006a231dee62a1d9";
@ -38,7 +40,7 @@
driving a subprocess to do the heavy lifting, passing result
values on to Emacs.
'';
license = publicDomain;
license = lib.licenses.publicDomain;
};
};
@ -60,7 +62,7 @@
meta = {
description = "An extension of haskell-mode that provides completion of symbols and documentation browsing";
license = bsd3;
license = lib.licenses.bsd3;
};
};
@ -143,63 +145,11 @@
meta = {
description = "A chat client and API wrapper for Matrix.org";
license = gpl3Plus;
license = lib.licenses.gpl3Plus;
};
};
agda2-mode = callPackage ./agda2-mode { };
agda-input = callPackage ./agda-input{ };
bqn-mode = callPackage ./bqn-mode { };
llvm-mode = callPackage ./llvm-mode { };
ott-mode = callPackage ./ott-mode { };
urweb-mode = callPackage ./urweb-mode { };
voicemacs = callPackage ./voicemacs { };
# Packages made the classical callPackage way
ebuild-mode = callPackage ./ebuild-mode { };
evil-markdown = callPackage ./evil-markdown { };
emacspeak = callPackage ./emacspeak { };
ement = callPackage ./ement { };
ess-R-object-popup = callPackage ./ess-R-object-popup { };
font-lock-plus = callPackage ./font-lock-plus { };
git-undo = callPackage ./git-undo { };
header-file-mode = callPackage ./header-file-mode { };
helm-words = callPackage ./helm-words { };
idris2-mode = callPackage ./idris2-mode { };
isearch-plus = callPackage ./isearch-plus { };
isearch-prop = callPackage ./isearch-prop { };
jam-mode = callPackage ./jam-mode { };
nano-theme = callPackage ./nano-theme { };
perl-completion = callPackage ./perl-completion { };
control-lock = callPackage ./control-lock { };
pod-mode = callPackage ./pod-mode { };
power-mode = callPackage ./power-mode { };
prisma-mode = let
rev = "5283ca7403bcb21ca0cac8ecb063600752dfd9d4";
in melpaBuild {
@ -225,17 +175,70 @@
meta = {
description = "Major mode for Prisma Schema Language";
license = gpl2Only;
license = lib.licenses.gpl2Only;
};
};
agda-input = callPackage ./agda-input { };
agda2-mode = callPackage ./agda2-mode { };
bqn-mode = callPackage ./bqn-mode { };
cask = callPackage ./cask { };
control-lock = callPackage ./control-lock { };
ebuild-mode = callPackage ./ebuild-mode { };
emacspeak = callPackage ./emacspeak { };
ement = callPackage ./ement { };
ess-R-object-popup = callPackage ./ess-R-object-popup { };
evil-markdown = callPackage ./evil-markdown { };
font-lock-plus = callPackage ./font-lock-plus { };
git-undo = callPackage ./git-undo { };
header-file-mode = callPackage ./header-file-mode { };
helm-words = callPackage ./helm-words { };
idris2-mode = callPackage ./idris2-mode { };
isearch-plus = callPackage ./isearch-plus { };
isearch-prop = callPackage ./isearch-prop { };
jam-mode = callPackage ./jam-mode { };
llvm-mode = callPackage ./llvm-mode { };
nano-theme = callPackage ./nano-theme { };
ott-mode = callPackage ./ott-mode { };
perl-completion = callPackage ./perl-completion { };
pod-mode = callPackage ./pod-mode { };
power-mode = callPackage ./power-mode { };
structured-haskell-mode = self.shm;
sv-kalender = callPackage ./sv-kalender { };
tree-sitter-langs = callPackage ./tree-sitter-langs { final = self; };
tsc = callPackage ./tsc { };
urweb-mode = callPackage ./urweb-mode { };
voicemacs = callPackage ./voicemacs { };
yes-no = callPackage ./yes-no { };
youtube-dl = callPackage ./youtube-dl { };

View File

@ -49,10 +49,10 @@
elpaBuild {
pname = "annotate";
ename = "annotate";
version = "1.8.0";
version = "1.8.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/annotate-1.8.0.tar";
sha256 = "169cav480g2fm3z7d5dixrng2h8fv39sa9n066b79cb573p4bbcp";
url = "https://elpa.nongnu.org/nongnu/annotate-1.8.1.tar";
sha256 = "00rpaki0vf6aiwa4by1v3hba79jmx1g7c283q1gibp4ka7grxzc2";
};
packageRequires = [];
meta = {
@ -214,10 +214,10 @@
elpaBuild {
pname = "buttercup";
ename = "buttercup";
version = "1.26";
version = "1.28";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/buttercup-1.26.tar";
sha256 = "1ddzk6h4cxrl7mn8vr2qp4xjj2al3h5s3kwqxpdwd3zn6wqgyqm4";
url = "https://elpa.nongnu.org/nongnu/buttercup-1.28.tar";
sha256 = "0gli1cxqiqg4adln7svplcc6rk718q4gn6idwxbzx8mgcwhmw75f";
};
packageRequires = [ emacs ];
meta = {
@ -344,10 +344,10 @@
elpaBuild {
pname = "corfu-terminal";
ename = "corfu-terminal";
version = "0.4";
version = "0.5";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/corfu-terminal-0.4.tar";
sha256 = "1rmfj2lzdab2s49k9ja79i7xcw74r9cr5kv7rgrisqxwgcnvsi95";
url = "https://elpa.nongnu.org/nongnu/corfu-terminal-0.5.tar";
sha256 = "1m53d4vi7cl91d8k550735r3ns4lm9vz3gvb0b7skib8jw3x5xqr";
};
packageRequires = [ corfu emacs popon ];
meta = {
@ -533,10 +533,10 @@
elpaBuild {
pname = "editorconfig";
ename = "editorconfig";
version = "0.8.2";
version = "0.9.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/editorconfig-0.8.2.tar";
sha256 = "1ff8hwyzb249lf78j023sbibgfmimmk6mxkjmcnqqnk1jafprk02";
url = "https://elpa.nongnu.org/nongnu/editorconfig-0.9.1.tar";
sha256 = "0i271313bsk3hlkc3bzjv79i20y6ffk7gwn26rnhljwpi828wfsw";
};
packageRequires = [ cl-lib emacs nadvice ];
meta = {
@ -711,10 +711,10 @@
elpaBuild {
pname = "evil-nerd-commenter";
ename = "evil-nerd-commenter";
version = "3.5.7";
version = "3.5.8";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.5.7.tar";
sha256 = "1lar8hy9n29gv4cijalyy2ba23y0kyh9ycnsi5dzjs68pk3y4hca";
url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.5.8.tar";
sha256 = "0hrzwca24dy4g9h7v5csqpwvsfj1ns4gqlnlf1q5i0jqvhvklnj5";
};
packageRequires = [ emacs ];
meta = {
@ -777,10 +777,10 @@
elpaBuild {
pname = "flymake-popon";
ename = "flymake-popon";
version = "0.3";
version = "0.5";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/flymake-popon-0.3.tar";
sha256 = "1cmimdkav8cdl7x6qplm4pvj2ifyb3lk8h2q624vh7cxxlh8yq0l";
url = "https://elpa.nongnu.org/nongnu/flymake-popon-0.5.tar";
sha256 = "1q1adxsrx8sjw6pffwxvk0yrgbz0rbrzi1g7g7zq5952vnz4dnn0";
};
packageRequires = [ emacs flymake popon posframe ];
meta = {
@ -792,10 +792,10 @@
elpaBuild {
pname = "focus";
ename = "focus";
version = "1.0.0";
version = "1.0.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/focus-1.0.0.tar";
sha256 = "0gicqiw7npcf18rfb99hm1s054m9l4izzcqzij2kpnc544aqgf9y";
url = "https://elpa.nongnu.org/nongnu/focus-1.0.1.tar";
sha256 = "1kiyvbdbjhjfkl5cq6q78lfgbir7iayswwm2qnj4df95nbm8shsz";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -833,21 +833,16 @@
license = lib.licenses.free;
};
}) {};
geiser = callPackage ({ elpaBuild
, emacs
, fetchurl
, lib
, project
, transient }:
geiser = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }:
elpaBuild {
pname = "geiser";
ename = "geiser";
version = "0.26.1";
version = "0.28";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-0.26.1.tar";
sha256 = "1fq68gvyyrplxw8i0yma4q0yqmrzp00v1v7izlc5r7h58wryy39a";
url = "https://elpa.nongnu.org/nongnu/geiser-0.28.tar";
sha256 = "0qp732j16cdmkpqv4vjplh9kcdbb1s4gfwff2d7k1sg4wqi8sa95";
};
packageRequires = [ emacs project transient ];
packageRequires = [ emacs project ];
meta = {
homepage = "https://elpa.gnu.org/packages/geiser.html";
license = lib.licenses.free;
@ -928,16 +923,21 @@
license = lib.licenses.free;
};
}) {};
geiser-guile = callPackage ({ elpaBuild, emacs, fetchurl, geiser, lib }:
geiser-guile = callPackage ({ elpaBuild
, emacs
, fetchurl
, geiser
, lib
, transient }:
elpaBuild {
pname = "geiser-guile";
ename = "geiser-guile";
version = "0.26.1";
version = "0.28.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.26.1.tar";
sha256 = "1ay7v2qsl0kr9zvf6j1sss3gxniwrqp8xgxhxf7nhlkmkgcfp1wk";
url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.0.tar";
sha256 = "0nw77psyvl9lackyq5l60k84f1dyddn8y2sxm5b1z71gjkp481zi";
};
packageRequires = [ emacs geiser ];
packageRequires = [ emacs geiser transient ];
meta = {
homepage = "https://elpa.gnu.org/packages/geiser-guile.html";
license = lib.licenses.free;
@ -1178,10 +1178,10 @@
elpaBuild {
pname = "haskell-mode";
ename = "haskell-mode";
version = "4.7.1";
version = "17.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/haskell-mode-4.7.1.tar";
sha256 = "07x7440xi8dkv1zpzwi7p96jy3zd6pdv1mhs066l8bp325516wyb";
url = "https://elpa.nongnu.org/nongnu/haskell-mode-17.2.tar";
sha256 = "1crq9065jy3941z9wh09n82x7bbbmxgcn9ylfj9xgn1rcvgb0cmg";
};
packageRequires = [];
meta = {
@ -1208,10 +1208,10 @@
elpaBuild {
pname = "helm";
ename = "helm";
version = "3.8.8";
version = "3.8.9";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/helm-3.8.8.tar";
sha256 = "1qsiw8gswjwfp79n7g103db7xsmk36lq6ln558ipn4cw0fpnq1sc";
url = "https://elpa.nongnu.org/nongnu/helm-3.8.9.tar";
sha256 = "0hikp6g5g7cy290qxd768vxy91gxj92cwrrzp8kicxy3qck1q39v";
};
packageRequires = [ helm-core popup ];
meta = {
@ -1223,10 +1223,10 @@
elpaBuild {
pname = "helm-core";
ename = "helm-core";
version = "3.8.8";
version = "3.8.9";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.8.tar";
sha256 = "0wg21425ki8n8d954lkmlyci6awwwv53jg4gn5z495vh27qiv3qn";
url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.9.tar";
sha256 = "03fzcc84gjslgsssbpjhdgnj7dn0pdfb5b2x79ss9vfvxamf2k94";
};
packageRequires = [ async emacs ];
meta = {
@ -1582,16 +1582,17 @@
, fetchurl
, lib
, seq
, url-scgi
, xml-rpc }:
elpaBuild {
pname = "mentor";
ename = "mentor";
version = "0.4";
version = "0.5";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/mentor-0.4.tar";
sha256 = "1n51yabm4npx62fpfn8rhky09x4y779ismdxa026fycy7va7ynzz";
url = "https://elpa.nongnu.org/nongnu/mentor-0.5.tar";
sha256 = "1kkzm881fxhc5hb83x0j12lv22b72nzw45qrypbl1jf2siispz9l";
};
packageRequires = [ async emacs seq xml-rpc ];
packageRequires = [ async emacs seq url-scgi xml-rpc ];
meta = {
homepage = "https://elpa.gnu.org/packages/mentor.html";
license = lib.licenses.free;
@ -1798,10 +1799,10 @@
elpaBuild {
pname = "org-mime";
ename = "org-mime";
version = "0.3.1";
version = "0.3.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/org-mime-0.3.1.tar";
sha256 = "0dm7addyc98kh1lm4d8x7nvnkh6bwkw300ms2zlwm1ii91jzfkkg";
url = "https://elpa.nongnu.org/nongnu/org-mime-0.3.2.tar";
sha256 = "12crmbrjxac1ml2x1jh3wbpgh0fddhnl3gdmb5r9dlpkay1c5dxs";
};
packageRequires = [ emacs ];
meta = {
@ -1929,6 +1930,21 @@
license = lib.licenses.free;
};
}) {};
pcre2el = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "pcre2el";
ename = "pcre2el";
version = "1.11";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/pcre2el-1.11.tar";
sha256 = "147da1iqlgsjsnfffk4iwfjsrv98xz5s4wjdys9r98n0j723js7r";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/pcre2el.html";
license = lib.licenses.free;
};
}) {};
pdf-tools = callPackage ({ elpaBuild
, emacs
, fetchurl
@ -1968,10 +1984,10 @@
elpaBuild {
pname = "popon";
ename = "popon";
version = "0.9";
version = "0.11";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/popon-0.9.tar";
sha256 = "1vnrdjg63fcpgzzc45l9cx67yb2lnk5prfp5js4dpdhz93d14qck";
url = "https://elpa.nongnu.org/nongnu/popon-0.11.tar";
sha256 = "03xxh9w215kmlw6vr3cjs9afkj6vrcip7k954sssx77bs1bpnqhz";
};
packageRequires = [ emacs ];
meta = {
@ -1998,10 +2014,10 @@
elpaBuild {
pname = "projectile";
ename = "projectile";
version = "2.5.0";
version = "2.6.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/projectile-2.5.0.tar";
sha256 = "09gsm6xbqj3357vlshs1w7ygfm004gpgs0pqrvwl6xmccxpqzmi0";
url = "https://elpa.nongnu.org/nongnu/projectile-2.6.0.tar";
sha256 = "0r0ylllx7vr903sjci1i6yf4xzn7k4azaw9l3azvc3mzrrjagvvj";
};
packageRequires = [ emacs ];
meta = {
@ -2099,6 +2115,21 @@
license = lib.licenses.free;
};
}) {};
rfc-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "rfc-mode";
ename = "rfc-mode";
version = "1.3.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/rfc-mode-1.3.0.tar";
sha256 = "1wdqp03rrx7ar21nvbnrb7518c3vgf41z00bav00pw8cdx5c4m10";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/rfc-mode.html";
license = lib.licenses.free;
};
}) {};
rubocop = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "rubocop";
@ -2257,10 +2288,10 @@
elpaBuild {
pname = "smartparens";
ename = "smartparens";
version = "4.7.1";
version = "1.11.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/smartparens-4.7.1.tar";
sha256 = "0si9wb7j760c4vdv7p049bgppppw5crrh50038bsh8sghq2gdld8";
url = "https://elpa.nongnu.org/nongnu/smartparens-1.11.0.tar";
sha256 = "1179wicy5nrjk2iq73rxkx6c44k9ybs1vz6llw0qbwc5l10diyvr";
};
packageRequires = [];
meta = {
@ -2347,10 +2378,10 @@
elpaBuild {
pname = "subed";
ename = "subed";
version = "1.0.10";
version = "1.0.19";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/subed-1.0.10.tar";
sha256 = "08vw9sv2g76yj8sfnx53dd28zkj4s0842i7qi92jam993v9s8h0z";
url = "https://elpa.nongnu.org/nongnu/subed-1.0.19.tar";
sha256 = "1wgicb0lvnghhr3a1xndkaxhs1c9gc1ac5xwvxcsc9zpgzrlmcda";
};
packageRequires = [ emacs ];
meta = {
@ -2362,10 +2393,10 @@
elpaBuild {
pname = "sweeprolog";
ename = "sweeprolog";
version = "0.4.5";
version = "0.8.6";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.4.5.tar";
sha256 = "17dbrn2yvc6ib4dig410kbmvpwp4iz6q9hx6g0mk3vxqjrmgwyls";
url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.8.6.tar";
sha256 = "108hjh276xgl0xhn2f7h43725xi49zh6j2xrcc17xw2i0phhhswf";
};
packageRequires = [ emacs ];
meta = {
@ -2392,10 +2423,10 @@
elpaBuild {
pname = "swsw";
ename = "swsw";
version = "2.2";
version = "2.3";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/swsw-2.2.tar";
sha256 = "0bxcpk5329g4xdfnx8n70q53v4aansxfcs3fdpzssayyyv4fk72m";
url = "https://elpa.nongnu.org/nongnu/swsw-2.3.tar";
sha256 = "0qwdv174bh9k1bpd5szzmhk7hw89xf7rz2i2hzdrmlpvcs3ps653";
};
packageRequires = [ emacs ];
meta = {
@ -2623,10 +2654,10 @@
elpaBuild {
pname = "vcomplete";
ename = "vcomplete";
version = "1.2.1";
version = "2.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/vcomplete-1.2.1.tar";
sha256 = "1fcchgv4kdmhzgincfy1jm625lwj3qrjskd0cswag5z15by6b5xf";
url = "https://elpa.nongnu.org/nongnu/vcomplete-2.0.tar";
sha256 = "0fh5rfvhjmpfdhp4k4b1y57zlsixiabhzca9329id48p8jm4rqyp";
};
packageRequires = [ emacs ];
meta = {
@ -2653,10 +2684,10 @@
elpaBuild {
pname = "web-mode";
ename = "web-mode";
version = "17.3.1";
version = "17.3.3";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.1.tar";
sha256 = "0xlpxk9qscxip93lqyl1l5bzv6nxgq5yb8r05s4jslcipbbfil1d";
url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.3.tar";
sha256 = "1ci28dfg6k4hwiqz85v9c24n7s52z29ghfyfjg971lq4mfqbx4yy";
};
packageRequires = [ emacs ];
meta = {
@ -2751,10 +2782,10 @@
elpaBuild {
pname = "xah-fly-keys";
ename = "xah-fly-keys";
version = "18.1.20220921110635";
version = "22.0.20221031102959";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-18.1.20220921110635.tar";
sha256 = "0nnd7jq1k62cgjb5y45jg6b76gvzyqh11kha7has4zipd52psvnj";
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.0.20221031102959.tar";
sha256 = "08i6y3ry0sp597vz0zl7c50lnp04fszydw6m1093sb5nlifbhrb8";
};
packageRequires = [ emacs ];
meta = {
@ -2766,10 +2797,10 @@
elpaBuild {
pname = "xml-rpc";
ename = "xml-rpc";
version = "1.6.15";
version = "1.6.16";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/xml-rpc-1.6.15.tar";
sha256 = "0z87rn7zbd8335iqfvk16zpvby66l0izzw438pxdr7kf60i5vgwl";
url = "https://elpa.nongnu.org/nongnu/xml-rpc-1.6.16.tar";
sha256 = "0gglrrnicbsf1lrk4pwmif5658yrhx80ixgi5hm85p8yxarn3ynm";
};
packageRequires = [];
meta = {

View File

@ -23,14 +23,20 @@ commit_change() {
git commit -m "${MESSAGE}: updated $(date --iso) (from overlay)" -- "${FILENAME}"
}
test_packageset(){
local PKGSET="$1"
nix-instantiate --show-trace ../../../../../ -A "emacs.pkgs.$PKGSET"
}
download_change "elpa/elpa-generated.nix"
download_change "melpa/recipes-archive-melpa.json"
download_change "nongnu/nongnu-generated.nix"
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.nongnuPackages
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.elpaPackages
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaStablePackages
nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaPackages
test_packageset "nongnuPackages"
test_packageset "elpaPackages"
test_packageset "melpaStablePackages"
test_packageset "melpaPackages"
commit_change "elpa-packages" "elpa-generated.nix"
commit_change "melpa-packages" "recipes-archive-melpa.json"

View File

@ -169,7 +169,7 @@ stdenv.mkDerivation rec {
meta = with lib; {
homepage = "https://dolphin-emu.org";
description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8";
mainProgram = "Dolphin";
mainProgram = if stdenv.hostPlatform.isDarwin then "Dolphin" else "dolphin-emu";
branch = "master";
license = licenses.gpl2Plus;
platforms = platforms.unix;

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "felix";
version = "2.0.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "kyoheiu";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ennEFhnAxsEtZ1LEyr9xeeR4v5IG1Vm2gs4A09IyciE=";
sha256 = "sha256-HD6KsPI4ZeJxQ+jbv5bWzTGQBHa9wGzhZBLQedcL5WI=";
};
cargoSha256 = "sha256-unSeb8LHgJ0TspbBLhGGU6Pqy1kLMEzgIIblLUyRQWw=";
cargoSha256 = "sha256-Q24dyCJBy27B3aI7ZEQnjTgLIB7XhltYeGBpmfy0DwE=";
checkInputs = [ zoxide ];

View File

@ -8,10 +8,12 @@
, glib
, gobject-introspection
, gsettings-desktop-schemas
, gtk-layer-shell
, gtk3
, json-glib
, libgee
, libhandy
, libpulseaudio
, libxml2
, meson
, ninja
@ -25,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "swaysettings";
version = "0.3.0";
version = "0.4.0";
src = fetchFromGitHub {
owner = "ErikReider";
repo = "SwaySettings";
rev = "v${version}";
hash = "sha256-2bbB+37t6chbdnOSpIolAsy7aD9i1UizWqkcF8Frfsk=";
hash = "sha256-dn3n5DOAsw0FeXBkh19A2qB/5O+RyA2/Fj5PVtMOyL0=";
};
nativeBuildInputs = [
@ -52,10 +54,12 @@ stdenv.mkDerivation rec {
glib
gobject-introspection
gsettings-desktop-schemas
gtk-layer-shell
gtk3
json-glib
libgee
libhandy
libpulseaudio
libxml2
pantheon.granite
];

View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "tofi";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "philj56";
repo = pname;
rev = "v${version}";
sha256 = "sha256-wF9gj1VNu+ik/dq5Q0l6rNfqU9kQXyLiAQvbU1OoHdg=";
sha256 = "sha256-KLHZrfoQ6x3EeKWo/TMp30rEIqdq16i8YLr4zFHbnSc=";
};
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols ];

View File

@ -85,6 +85,7 @@ let
ncloud = removed "ncloud" "2022/08";
opc = archived "opc" "2022/05";
oraclepaas = archived "oraclepaas" "2022/05";
panos = removed "panos" "2022/05";
template = archived "template" "2022/05";
};

View File

@ -741,13 +741,13 @@
"version": "3.3.0"
},
"minio": {
"hash": "sha256-fSZf5lLs3INa742AL3ayuvHr5vsr2/i4yjSvNrCzBT0=",
"hash": "sha256-9UZbFTMH6QOcNyBkqnGA3dSDl8Tmhe6oggwJC0yJTAw=",
"owner": "aminueza",
"provider-source-address": "registry.terraform.io/aminueza/minio",
"repo": "terraform-provider-minio",
"rev": "v1.8.0",
"vendorHash": "sha256-LcU7Pord10j4Eyxx2xIVcQXiZQT9kSTz8iBJCe8/E7s=",
"version": "1.8.0"
"rev": "v1.9.0",
"vendorHash": "sha256-586ekznHNm442LjQ33azbswrOOZ1Z5KNuJEXMrwQ1SM=",
"version": "1.9.0"
},
"mongodbatlas": {
"hash": "sha256-xyKBhIsTawksKruRPXBJ3pEo+ssK7Gol3xCCdNPOes8=",
@ -912,15 +912,6 @@
"vendorHash": null,
"version": "2.6.4"
},
"panos": {
"hash": "sha256-mscWNK113W7CVKI+qPGYX3irQI3YhkLdXox4pddOdF0=",
"owner": "PaloAltoNetworks",
"provider-source-address": "registry.terraform.io/PaloAltoNetworks/panos",
"repo": "terraform-provider-panos",
"rev": "v1.10.3",
"vendorHash": null,
"version": "1.10.3"
},
"pass": {
"hash": "sha256-hFgNWw6ZmATo0bFZvJL9z/lJF506KsBewigGoFj67sM=",
"owner": "camptocamp",

View File

@ -19,21 +19,21 @@
, unzip
}:
let
version = "0.58.18";
version = "0.61.3";
src = fetchFromSourcehut {
owner = "~sircmpwn";
repo = "meta.sr.ht";
rev = version;
sha256 = "sha256-OjbQHAzG2nZwpJUIvhKaCJWZbhZDC2R6C+SkbKUpk8o=";
hash = "sha256-wMcpdRSRvxYEV163mdTGOemk62gljua89SOtwe6qGXU=";
};
metasrht-api = buildGoModule ({
inherit src version;
pname = "metasrht-api";
modRoot = "api";
vendorSha256 = "sha256-kiEuEYZFbwJ6SbKFtxH4SiRaZmqYriRHPoHdTX28+d0=";
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; });
vendorHash = "sha256-ZoDRGmGe9o5pn89gJ60wjSp5Cc0yxRfvdhNnbwAhmSI=";
} // import ./fix-gqlgen-trimpath.nix { inherit unzip; gqlgenVersion = "0.17.20"; });
in
buildPythonPackage rec {

View File

@ -5,9 +5,9 @@
mkXfceDerivation {
category = "xfce";
pname = "xfce4-settings";
version = "4.16.3";
version = "4.16.4";
sha256 = "sha256-Jd1PJrIqzsutParZu8rNMuzHnycjr3eeZGXWIG3PqZY=";
sha256 = "sha256-w/wnLa3NuOV/2LlDPMCEG3z+k3pW+MPHtqx5L5NdOJs=";
postPatch = ''
for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zuo";
version = "unstable-2022-07-25";
version = "unstable-2022-11-12";
src = fetchFromGitHub {
owner = "racket";
repo = "zuo";
rev = "18778d759e7af1d9c4b6ce7649a3aa4a49a2aa7f";
sha256 = "sha256-Y5+C1UdaeweYaGqomC1dFmTF8qGDquuP42Bn6QbZ9nk=";
rev = "244cb2a15ce8e48cde9bd7080526840d296c5b5c";
hash = "sha256-4+YL6rHv+gyBx+Gj66fmAN4qbdkCuWVx1HUs3l0tUUw=";
};
doCheck = true;

View File

@ -414,7 +414,7 @@ final: prev: {
src = fetchurl {
url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
sha512 = "sha512-9Aeg4qiKlv9Wsjz4NO8k2CzRzlvS3A4FYVJ5+28sBBZ0eEwbiVOE/Jj7v6rZC1tFW2s4GSICQOAyuOjc6WsNew==";
sha512 = "sha512-TAnObUMGCM9NLt9nsRs1WWYQGPKsJOK8bN/7gSAnBcYIxMCFFDe+XtFYJbyTzsJZ/i+0rH4zg8au3m7HX354LA==";
};
postInstall = with pkgs; ''
wrapProgram "$out/bin/prisma" \

View File

@ -1,56 +0,0 @@
{ lib, stdenv, python3, emacs, bash }:
stdenv.mkDerivation rec {
pname = "cask";
inherit (emacs.pkgs.melpaStablePackages.cask) src version;
doCheck = true;
nativeBuildInputs = [ emacs ];
buildInputs = with emacs.pkgs; [
s f dash ansi ecukes servant ert-runner el-mock
noflet ert-async shell-split-string git package-build
] ++ [
python3
bash
];
strictDeps = true;
buildPhase = ''
runHook preBuild
emacs --batch -L . -f batch-byte-compile cask.el cask-cli.el
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
dir=$out/share/emacs/site-lisp/cask
install -Dm444 -t $dir *.el *.elc
install -Dm555 -t $dir/bin bin/cask
touch $out/.no-upgrade
ln -s $dir/bin/cask $out/bin/cask
runHook postInstall
'';
meta = with lib; {
description = "Project management for Emacs";
longDescription = ''
Cask is a project management tool for Emacs that helps automate the
package development cycle; development, dependencies, testing, building,
packaging and more.
Cask can also be used to manage dependencies for your local Emacs configuration.
'';
homepage = "https://cask.readthedocs.io/en/latest/index.html";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ flexw ];
platforms = platforms.all;
};
}

View File

@ -12,15 +12,15 @@
, withHTML ? true
}:
stdenv.mkDerivation rec {
pname = "CastXML";
version = "0.4.6";
stdenv.mkDerivation (finalAttrs: {
pname = "castxml";
version = "0.4.7";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha256-EXi5dPhzxqHLNH1Ty8iz81uJxRX1+pFtwWSwbXeolL0=";
owner = "CastXML";
repo = "CastXML";
rev = "v${finalAttrs.version}";
hash = "sha256-h2sLwhlz8AHyBK6Bbci17dvLkQ/9WEClz4lwM3GVVK8=";
};
nativeBuildInputs = [
@ -65,4 +65,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.unix;
};
}
})

View File

@ -13,19 +13,19 @@
# function correctly.
rustPlatform.buildRustPackage rec {
pname = "prisma-engines";
version = "4.5.0";
version = "4.6.0";
src = fetchFromGitHub {
owner = "prisma";
repo = "prisma-engines";
rev = version;
sha256 = "sha256-/5X1t9ZVGoZRFNTfsv663QWIBE1eME/KiPuyc+L4D10=";
sha256 = "sha256-tgU/QI6YwWeFPXh6VVPV3iLUGVwoxdG7YQwHBVobXH8=";
};
# Use system openssl.
OPENSSL_NO_VENDOR = 1;
cargoSha256 = "sha256-tKdLTa/Tl98hDGtOPMxluIUgLoWkyOhnmGuxvq4AhfU=";
cargoSha256 = "sha256-LeE9biQDQ+aj0kKBrkIy3aGt5rgOu6O7w7xI/CjBUMA=";
nativeBuildInputs = [ pkg-config ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "hcloud";
version = "1.30.3";
version = "1.30.4";
src = fetchFromGitHub {
owner = "hetznercloud";
repo = "cli";
rev = "v${version}";
sha256 = "sha256-iF30gh14v2OHwT2W7gb4DaZu1h9RYJjw6rkHaPZp9NU=";
sha256 = "sha256-282DJegj4lf7oynkdjNC6/PVvQaFbIqOJViua83KTdg=";
};
vendorSha256 = "sha256-DoCiyaEPh+QyKgC3PJ5oivJTlcKzscaphXET9et8T1g=";
vendorSha256 = "sha256-Y2HlY8u2ZFtkAyYG7jqm+DMOFsWSQ6TxI7dm2woGA/Y=";
ldflags = [
"-s" "-w"

View File

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.0.113";
version = "0.0.115";
src = fetchFromGitHub {
owner = "charliermarsh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-ZP3kIr8W/b2+BXzl7CBzqZz2vBsR/i0LUT6Pc2QT21Y=";
sha256 = "sha256-eb5k6gW70Z4bVrJhrDtI6G1Hk5C98gdqZP6rkgiI6uQ=";
};
cargoSha256 = "sha256-vPvSdET+T8DsYdBz9Y1TLDShJ+iC3cLu1TmUsslcpi4=";
cargoSha256 = "sha256-s2ufpiCqQG5JoLsEscIusY/4B7SieABIK164Up0H74I=";
buildInputs = lib.optionals stdenv.isDarwin [
CoreServices

View File

@ -4,13 +4,13 @@ let
in
stdenv.mkDerivation rec {
pname = "sumneko-lua-language-server";
version = "3.6.1";
version = "3.6.2";
src = fetchFromGitHub {
owner = "sumneko";
repo = "lua-language-server";
rev = version;
sha256 = "sha256-jlx2Tn5NuHq7OFHPHOknZfLAbQanWLMTsw7wO1SJOkk=";
sha256 = "sha256-JmoZSrKISOYyj9mIiZ4MGFuSshPHnxgIZmbP/5SordU=";
fetchSubmodules = true;
};

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeWrapper, dpkg, jre_headless, nixosTests }:
{ lib, stdenv, fetchurl, makeWrapper, dpkg, jre_headless, openssl, nixosTests }:
let
pname = "jitsi-videobridge2";
@ -28,9 +28,11 @@ stdenv.mkDerivation {
mv usr/share/jitsi-videobridge/* $out/share/jitsi-videobridge/
ln -s $out/share/jitsi-videobridge/jvb.sh $out/bin/jitsi-videobridge
# work around https://github.com/jitsi/jitsi-videobridge/issues/1547
# - work around https://github.com/jitsi/jitsi-videobridge/issues/1547
# - make libcrypto.so available at runtime for hardware AES
wrapProgram $out/bin/jitsi-videobridge \
--set VIDEOBRIDGE_GC_TYPE G1GC
--set VIDEOBRIDGE_GC_TYPE G1GC \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ openssl ]}
runHook postInstall
'';

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "pocketbase";
version = "0.7.9";
version = "0.7.10";
src = fetchFromGitHub {
owner = "pocketbase";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3dsgBWpYuNIVLTdxbaanMVnXYpw5f1ct9ksIrJqpURw=";
sha256 = "sha256-KQMCWriPJ3fUXjG+uAqOMbR8dZDrlxQ3iDqyYHhC6hI=";
};
vendorSha256 = "sha256-i3CRba2HA7dOEh4PU1rNZUl05pZqIm946lIjP7ZcFEc=";

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zsh-vi-mode";
version = "0.8.5";
version = "0.9.0";
src = fetchFromGitHub {
owner = "jeffreytse";
repo = pname;
rev = "v${version}";
sha256 = "EOYqHh0rcgoi26eopm6FTl81ehak5kXMmzNcnJDH8/E=";
sha256 = "sha256-KQ7UKudrpqUwI6gMluDTVN0qKpB15PI5P1YHHCBIlpg=";
};
strictDeps = true;

View File

@ -0,0 +1,37 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "easeprobe";
version = "1.9.0";
src = fetchFromGitHub {
owner = "megaease";
repo = pname;
rev = "v${version}";
sha256 = "sha256-iw24TuK5nbHabzRdaJ8X/MzRPNP35M8RjhKnZZXjVfA=";
};
vendorSha256 = "sha256-bfqP57YS2KD6CuFytJyWYCFl0Cx/JJgc1CeW13yBUoo=";
subPackages = [ "cmd/easeprobe" ];
CGO_ENABLED = 0;
ldflags = [
"-s"
"-w"
"-extldflags -static"
"-X github.com/megaease/easeprobe/global.Ver=${version}"
"-X github.com/megaease/easeprobe/pkg/version.REPO=megaease/easeprobe"
];
meta = with lib; {
description = "A simple, standalone, and lightweight tool that can do health/status checking, written in Go";
homepage = "https://github.com/megaease/easeprobe";
license = licenses.asl20;
maintainers = with maintainers; [ dit7ya ];
};
}

View File

@ -19,13 +19,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "osm2pgsql";
version = "1.7.1";
version = "1.7.2";
src = fetchFromGitHub {
owner = "openstreetmap";
repo = "osm2pgsql";
rev = finalAttrs.version;
hash = "sha256-+//cAoN8m66SboEYP5Dhtm0q0+oyvEr5o584e4JQ9xM=";
hash = "sha256-KJkqzvsm0IMaqeKnIbLGeOSJrsLvW+z7lCg6NbuU13g=";
};
postPatch = ''

View File

@ -0,0 +1,30 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "tailspin";
version = "0.1";
src = fetchFromGitHub {
owner = "bensadeh";
repo = pname;
rev = version;
sha256 = "sha256-ReWgbAmEGpNOv6QArNT+eWaty88tChhH1nhH0vZe2/E=";
};
vendorSha256 = "sha256-rZJO/TSGrYwrtIKQpKhZZqnXY6IHNyjS26vBDv/iQ34=";
CGO_ENABLED = 0;
subPackages = [ "." ];
meta = with lib; {
description = "A log file highlighter and a drop-in replacement for `tail -f`";
homepage = "https://github.com/bensadeh/tailspin";
license = licenses.mit;
maintainers = with maintainers; [ dit7ya ];
mainProgram = "spin";
};
}

View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
version = "10.1.1";
version = "10.1.2";
src = fetchFromGitHub {
owner = "topgrade-rs";
repo = "topgrade";
rev = "v${version}";
sha256 = "sha256-dcMTjJTcGjE+2sVuNlb3S/MECLMM9mPh27z8Kr+wBEI=";
sha256 = "sha256-/xabrMFcP8O2haGzqJ64u/O2snk9dJ9Sm17c3kr3nsY=";
};
cargoSha256 = "sha256-UGR0k1bmhRFSKUCpA/DlI0XfMy/JTVWe8nIoiD5QVqc=";
cargoSha256 = "sha256-mWV8h2l7kJnTfTyF74BqR/qaVpswUqI971IDiBZF3XE=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -8,16 +8,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "rathole";
version = "0.4.4";
version = "0.4.5";
src = fetchFromGitHub {
owner = "rapiz1";
repo = pname;
rev = "v${version}";
sha256 = "sha256-qhkgXS+Rku9OcFgFbHfELcjQmIHNvi3sC4bh5LKYzJQ=";
sha256 = "sha256-mebrhBmRPN+AydxKhe2g7ehe9r9rDqt5dXO8rRUIlJg=";
};
cargoSha256 = "sha256-3WY+VIRycqFmkVA+NdbU4glEkZecRM5eKI/reyNWVao=";
cargoSha256 = "sha256-uECM5j/xgrzPvrarDl6wxaD3Cn3Ut3aMM9OBvsc7ZqE=";
nativeBuildInputs = [ pkg-config ];

View File

@ -173,6 +173,7 @@ mapAliases ({
calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement"; # Added 2021-01-13
callPackage_i686 = pkgsi686Linux.callPackage;
cantarell_fonts = throw "'cantarell_fonts' has been renamed to/replaced by 'cantarell-fonts'"; # Converted to throw 2022-02-22
cask = emacs.pkgs.cask; # Added 2022-11-12
cargo-download = throw "cargo-download has been removed from nixpkgs as it is unmaintained, use cargo-clone instead"; # Added 2022-10-11
cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead"; # Added 2020-08-20
casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken";

View File

@ -6325,6 +6325,8 @@ with pkgs;
conform = callPackage ../applications/version-management/git-and-tools/conform { };
easeprobe = callPackage ../tools/misc/easeprobe { };
emscripten = callPackage ../development/compilers/emscripten {
llvmPackages = llvmPackages_14;
};
@ -16570,8 +16572,6 @@ with pkgs;
cadre = callPackage ../development/tools/cadre { };
cask = callPackage ../development/tools/cask { };
cbrowser = callPackage ../development/tools/misc/cbrowser { };
cc-tool = callPackage ../development/embedded/cc-tool { };
@ -24513,6 +24513,8 @@ with pkgs;
tailscale = callPackage ../servers/tailscale { };
tailspin = callPackage ../tools/misc/tailspin { };
thanos = callPackage ../servers/monitoring/thanos { };
trafficserver = callPackage ../servers/http/trafficserver { };