Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-04-03 00:03:04 +00:00 committed by GitHub
commit 6da4ad9318
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 3524 additions and 2568 deletions

View File

@ -12759,11 +12759,6 @@
githubId = 220211;
name = "Renato Garcia";
};
rencire = {
github = "rencire";
githubId = 546296;
name = "Eric Ren";
};
renesat = {
name = "Ivan Smolyakov";
email = "smol.ivan97@gmail.com";

View File

@ -28,6 +28,12 @@ in
description = mdDoc "The host address the atuin server should listen on.";
};
maxHistoryLength = mkOption {
type = types.int;
default = 8192;
description = mdDoc "The max length of each history item the atuin server should store.";
};
port = mkOption {
type = types.port;
default = 8888;
@ -72,6 +78,7 @@ in
environment = {
ATUIN_HOST = cfg.host;
ATUIN_PORT = toString cfg.port;
ATUIN_MAX_HISTORY_LENGTH = toString cfg.maxHistoryLength;
ATUIN_OPEN_REGISTRATION = boolToString cfg.openRegistration;
ATUIN_DB_URI = "postgresql:///atuin";
ATUIN_PATH = cfg.path;

View File

@ -107,7 +107,7 @@ in {
];
services.grafana.settings.rendering = mkIf cfg.provisionGrafana {
url = "http://localhost:${toString cfg.settings.service.port}/render";
server_url = "http://localhost:${toString cfg.settings.service.port}/render";
callback_url = "http://localhost:${toString config.services.grafana.settings.server.http_port}";
};

View File

@ -265,10 +265,10 @@
elpaBuild {
pname = "auctex";
ename = "auctex";
version = "13.1.9";
version = "13.1.10";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-13.1.9.tar";
sha256 = "0dvf7ajfpi68823qv9vav3r1k04gc9bfq2ys3g1rhga2glxn7q9r";
url = "https://elpa.gnu.org/packages/auctex-13.1.10.tar";
sha256 = "0vxf3aw7j73d0cbfh8d5fp5gyi7vxq9vb7fqxmxxs24pvdnlym15";
};
packageRequires = [ emacs ];
meta = {
@ -306,6 +306,21 @@
license = lib.licenses.free;
};
}) {};
auto-header = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "auto-header";
ename = "auto-header";
version = "0.1.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auto-header-0.1.2.tar";
sha256 = "0rk7xq7bzgaxdyw7j3vjnishf2pyzs84xamq4blgbb93n0f4nlfj";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/auto-header.html";
license = lib.licenses.free;
};
}) {};
auto-overlays = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "auto-overlays";
@ -321,6 +336,21 @@
license = lib.licenses.free;
};
}) {};
autocrypt = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "autocrypt";
ename = "autocrypt";
version = "0.4.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/autocrypt-0.4.1.tar";
sha256 = "1r2b1nyw2ai58br3kh4r5rpy450njz7rcccbmcwxsyfgiz4wbqy8";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/autocrypt.html";
license = lib.licenses.free;
};
}) {};
avy = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "avy";
@ -366,6 +396,21 @@
license = lib.licenses.free;
};
}) {};
beframe = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "beframe";
ename = "beframe";
version = "0.2.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/beframe-0.2.0.tar";
sha256 = "1nj35r59zpa5hadw9axjassrixx91yqgiffpk9yfhjwnz2s93l15";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/beframe.html";
license = lib.licenses.free;
};
}) {};
bind-key = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "bind-key";
@ -772,10 +817,10 @@
elpaBuild {
pname = "compat";
ename = "compat";
version = "29.1.3.4";
version = "29.1.4.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/compat-29.1.3.4.tar";
sha256 = "16j7b18iwsdynb2w4x2hficz0g060r52lsg5ly9kb20zfrq2yvw0";
url = "https://elpa.gnu.org/packages/compat-29.1.4.1.tar";
sha256 = "1r8laxmdyrpz4nmzjrndd668bks4fgmbya04m0bfzwvhlrsca940";
};
packageRequires = [ emacs seq ];
meta = {
@ -787,10 +832,10 @@
elpaBuild {
pname = "consult";
ename = "consult";
version = "0.32";
version = "0.33";
src = fetchurl {
url = "https://elpa.gnu.org/packages/consult-0.32.tar";
sha256 = "1cbdy4ybc4l6wjqa41zqz66yh6kv2sfnkxaspzaghpjy99ykyagb";
url = "https://elpa.gnu.org/packages/consult-0.33.tar";
sha256 = "0v84v61hc5w9z71i11bglp4m2fvjpp4l9xp9j731aj6psdhahd8a";
};
packageRequires = [ compat emacs ];
meta = {
@ -832,10 +877,10 @@
elpaBuild {
pname = "corfu";
ename = "corfu";
version = "0.35";
version = "0.36";
src = fetchurl {
url = "https://elpa.gnu.org/packages/corfu-0.35.tar";
sha256 = "0h5l4q77i2agnr5rcy0121pvs4yx4q84n2yf7fysd859g4gsm2vs";
url = "https://elpa.gnu.org/packages/corfu-0.36.tar";
sha256 = "15ysg54rallbdx6la8q8yjdj9rag91wkga8agrwf0xh7pp3nij9d";
};
packageRequires = [ compat emacs ];
meta = {
@ -1083,6 +1128,21 @@
license = lib.licenses.free;
};
}) {};
denote-menu = callPackage ({ denote, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "denote-menu";
ename = "denote-menu";
version = "1.1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/denote-menu-1.1.1.tar";
sha256 = "12ry0rv45hv1vrwx9wih72s9h0f3r18xssnkzfa9ilp77kgbas5q";
};
packageRequires = [ denote emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/denote-menu.html";
license = lib.licenses.free;
};
}) {};
detached = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "detached";
@ -1402,10 +1462,10 @@
elpaBuild {
pname = "ef-themes";
ename = "ef-themes";
version = "0.10.0";
version = "0.11.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ef-themes-0.10.0.tar";
sha256 = "06af9hqal5j2wss9ndyfqnjk18fdwxmy1gsyrvkvd7bq2nsl6z3n";
url = "https://elpa.gnu.org/packages/ef-themes-0.11.0.tar";
sha256 = "06nkglshklsdr8xcdbrwbp402p260n6g3zk3mn9kv3ynf35wv2wv";
};
packageRequires = [ emacs ];
meta = {
@ -1427,10 +1487,10 @@
elpaBuild {
pname = "eglot";
ename = "eglot";
version = "1.11";
version = "1.13";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eglot-1.11.tar";
sha256 = "1ifnk4bznykj34s4yh0gq5nyzja7mlv60krxa47j842grpndq2hp";
url = "https://elpa.gnu.org/packages/eglot-1.13.tar";
sha256 = "1yg6ddldd2qnnhlhc2r5rq7rjc0pigqjgzpvnqqb33nssw1lkw82";
};
packageRequires = [
eldoc
@ -1567,6 +1627,7 @@
, fetchurl
, lib
, map
, persist
, plz
, svg-lib
, taxy
@ -1575,14 +1636,15 @@
elpaBuild {
pname = "ement";
ename = "ement";
version = "0.5.2";
version = "0.8.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ement-0.5.2.tar";
sha256 = "053gmhlyiy86q1qla4j5fy9kx11r986syn41q9022cs6iqpyf6hg";
url = "https://elpa.gnu.org/packages/ement-0.8.1.tar";
sha256 = "0h5xqi5szmfxrs6hl85vkd363mrkrzi1niph3v3aybisffxlfyxg";
};
packageRequires = [
emacs
map
persist
plz
svg-lib
taxy
@ -1659,16 +1721,16 @@
license = lib.licenses.free;
};
}) {};
erc = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
erc = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "erc";
ename = "erc";
version = "5.4.1";
version = "5.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/erc-5.4.1.tar";
sha256 = "0hghqwqrx11f8qa1zhyhjqp99w01l686azsmd24z9w0l93fz598a";
url = "https://elpa.gnu.org/packages/erc-5.5.tar";
sha256 = "02649ijnpyalk0k1yq1dcinj92awhbnkia2x9sdb9xjk80xw1gqp";
};
packageRequires = [ emacs ];
packageRequires = [ compat emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/erc.html";
license = lib.licenses.free;
@ -2367,10 +2429,10 @@
elpaBuild {
pname = "inspector";
ename = "inspector";
version = "0.20";
version = "0.28";
src = fetchurl {
url = "https://elpa.gnu.org/packages/inspector-0.20.tar";
sha256 = "1640zpxjylzcafr4957j7nxspqwmfwliac300lf7j5xsmchlwmgm";
url = "https://elpa.gnu.org/packages/inspector-0.28.tar";
sha256 = "0n7s9wai63p42ximiknmi8ryvnj71v6b1dnhafpapka8ymkkdwsb";
};
packageRequires = [ emacs ];
meta = {
@ -2548,6 +2610,36 @@
license = lib.licenses.free;
};
}) {};
jinx = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "jinx";
ename = "jinx";
version = "0.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/jinx-0.4.tar";
sha256 = "1jxgj419rc4aha133c6zggzgzvr2zdx6mi6x4ipydk3x2l19k5lr";
};
packageRequires = [ compat emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/jinx.html";
license = lib.licenses.free;
};
}) {};
jit-spell = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "jit-spell";
ename = "jit-spell";
version = "0.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/jit-spell-0.3.tar";
sha256 = "0q8wd9phd0zcjhc92j633vz82fr0ji8zc9vir7kcn1msrf6jspwz";
};
packageRequires = [ compat emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/jit-spell.html";
license = lib.licenses.free;
};
}) {};
js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "js2-mode";
@ -2582,10 +2674,10 @@
elpaBuild {
pname = "jsonrpc";
ename = "jsonrpc";
version = "1.0.16";
version = "1.0.17";
src = fetchurl {
url = "https://elpa.gnu.org/packages/jsonrpc-1.0.16.tar";
sha256 = "1fkbw20ghinj70dk2q58scqlrpr3fcqgvcbfh5jbg6mdf1m6svf9";
url = "https://elpa.gnu.org/packages/jsonrpc-1.0.17.tar";
sha256 = "0vfd1z78pyif3l6gapcq9vs6cjfxiyc420xzwn0krrb25jjzx1ab";
};
packageRequires = [ emacs ];
meta = {
@ -2612,10 +2704,10 @@
elpaBuild {
pname = "kind-icon";
ename = "kind-icon";
version = "0.1.9";
version = "0.2.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/kind-icon-0.1.9.tar";
sha256 = "0phssrcpmcidzlwy1577f3f02qwjs6hpavb416302y0n8kkhwvli";
url = "https://elpa.gnu.org/packages/kind-icon-0.2.0.tar";
sha256 = "1vgwbd99vx793iy04albkxl24c7vq598s7bg0raqwmgx84abww6r";
};
packageRequires = [ emacs svg-lib ];
meta = {
@ -3047,10 +3139,10 @@
elpaBuild {
pname = "modus-themes";
ename = "modus-themes";
version = "3.0.0";
version = "4.1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/modus-themes-3.0.0.tar";
sha256 = "1c3rls175nmc4n01hfzwqxv2nhyv8n6i8d4pv93k28z6c30n8lhs";
url = "https://elpa.gnu.org/packages/modus-themes-4.1.1.tar";
sha256 = "06lp7mpazby7iiwzw4naym983plg9r63ba9vmaszh3609d2gm0s9";
};
packageRequires = [ emacs ];
meta = {
@ -3397,6 +3489,21 @@
license = lib.licenses.free;
};
}) {};
openpgp = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "openpgp";
ename = "openpgp";
version = "1.0.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/openpgp-1.0.1.tar";
sha256 = "1cm6c8394869dw2a5ykb92crz7c4pdav82a8nslbi533knxn7wn6";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/openpgp.html";
license = lib.licenses.free;
};
}) {};
orderless = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "orderless";
@ -3416,10 +3523,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "9.6.1";
version = "9.6.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-9.6.1.tar";
sha256 = "1kcv6aippv17az0dgikmx0w4dq2140ki3d19nvn01v0lk4kxpgri";
url = "https://elpa.gnu.org/packages/org-9.6.2.tar";
sha256 = "0sgf2c6pl3ldyv47kpz0180frayxipv6z9zafmdd97bkbl82aarz";
};
packageRequires = [ emacs ];
meta = {
@ -3457,16 +3564,16 @@
license = lib.licenses.free;
};
}) {};
org-modern = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
org-modern = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "org-modern";
ename = "org-modern";
version = "0.8";
version = "0.9";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-modern-0.8.tar";
sha256 = "0j9ilivy6iyqmml4sxy88c99vpg3v00pglb62lpxc4sywia06dzf";
url = "https://elpa.gnu.org/packages/org-modern-0.9.tar";
sha256 = "1aq02w1mbqfx370d18a21w6jhnwad55v73yhlvqyghkh1xdi3h0j";
};
packageRequires = [ emacs ];
packageRequires = [ compat emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/org-modern.html";
license = lib.licenses.free;
@ -3731,10 +3838,10 @@
elpaBuild {
pname = "phps-mode";
ename = "phps-mode";
version = "0.4.39";
version = "0.4.44";
src = fetchurl {
url = "https://elpa.gnu.org/packages/phps-mode-0.4.39.tar";
sha256 = "0wixalji4c4hjqb41n1yvxfy3qfl2ipfsjawbgk9wdwb7jkhjr1i";
url = "https://elpa.gnu.org/packages/phps-mode-0.4.44.tar";
sha256 = "0xzhigj8dvhaqj87wk1z9lhbhjsk944ydp4h6pn4lqa9lgb0kfkl";
};
packageRequires = [ emacs ];
meta = {
@ -3761,10 +3868,10 @@
elpaBuild {
pname = "plz";
ename = "plz";
version = "0.3";
version = "0.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/plz-0.3.tar";
sha256 = "19fzln4b6pp3c2as7a8wija120qykkxs27jrn637vqsvhi648xcd";
url = "https://elpa.gnu.org/packages/plz-0.4.tar";
sha256 = "05139hmgh35qibb6i9qdyxalw66ghcpvpqbs4ai8x98s8c5vl509";
};
packageRequires = [ emacs ];
meta = {
@ -3821,10 +3928,10 @@
elpaBuild {
pname = "posframe";
ename = "posframe";
version = "1.3.3";
version = "1.4.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/posframe-1.3.3.tar";
sha256 = "07hgbhvhwj6zfhlg6znavwrj3gp7cv4c758chrhkvk33a3slhw6b";
url = "https://elpa.gnu.org/packages/posframe-1.4.1.tar";
sha256 = "02kw3d6760015q61sryw8k3zqdnzhcwwyfjfysbfs07cljkqpjnh";
};
packageRequires = [ emacs ];
meta = {
@ -3896,10 +4003,10 @@
elpaBuild {
pname = "pyim";
ename = "pyim";
version = "5.3.0";
version = "5.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/pyim-5.3.0.tar";
sha256 = "0q0h705k1yymp1pqyycmq1zqvzawzkl4q2ckvflbncgrqh306xmh";
url = "https://elpa.gnu.org/packages/pyim-5.3.1.tar";
sha256 = "0lkshw52xdrcbdrgmjb665bpyga61qlk29rrzrrj7s82n09bq9kv";
};
packageRequires = [ async emacs xr ];
meta = {
@ -4172,6 +4279,26 @@
license = lib.licenses.free;
};
}) {};
realgud-trepan-xpy = callPackage ({ elpaBuild
, emacs
, fetchurl
, lib
, load-relative
, realgud }:
elpaBuild {
pname = "realgud-trepan-xpy";
ename = "realgud-trepan-xpy";
version = "1.0.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/realgud-trepan-xpy-1.0.1.tar";
sha256 = "0qd9hcq7a9vn453rs4pf3p8wwh7fynxhim9j6sf97lm8pilif9yd";
};
packageRequires = [ emacs load-relative realgud ];
meta = {
homepage = "https://elpa.gnu.org/packages/realgud-trepan-xpy.html";
license = lib.licenses.free;
};
}) {};
rec-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "rec-mode";
@ -4206,10 +4333,10 @@
elpaBuild {
pname = "relint";
ename = "relint";
version = "1.21";
version = "1.22";
src = fetchurl {
url = "https://elpa.gnu.org/packages/relint-1.21.tar";
sha256 = "12453agy7y3ayqn32fi11ljlnk8ck3i1aljw5wzm0yyqp00m73x3";
url = "https://elpa.gnu.org/packages/relint-1.22.tar";
sha256 = "1525hk961q4af06c5a60m7ryp5g8yvfxjp5nmmgkci7vl3ing8zi";
};
packageRequires = [ emacs xr ];
meta = {
@ -4422,10 +4549,10 @@
elpaBuild {
pname = "shell-command-plus";
ename = "shell-command+";
version = "2.4.1";
version = "2.4.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/shell-command+-2.4.1.tar";
sha256 = "1pbv5g58647gq83vn5pg8c6kjhvjn3lj0wggz3iz3695yvl8aw4i";
url = "https://elpa.gnu.org/packages/shell-command+-2.4.2.tar";
sha256 = "1ldvil6hjs8c7wpdwx0jwaar867dil5qh6vy2k27i1alffr9nnqm";
};
packageRequires = [ emacs ];
meta = {
@ -4463,6 +4590,21 @@
license = lib.licenses.free;
};
}) {};
site-lisp = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "site-lisp";
ename = "site-lisp";
version = "0.1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/site-lisp-0.1.1.tar";
sha256 = "05fdh7hv3dwm8li4qsyrm9j6zdj43k82al1p5z9ir6xmy1r5b571";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/site-lisp.html";
license = lib.licenses.free;
};
}) {};
sketch-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "sketch-mode";
@ -4741,10 +4883,10 @@
elpaBuild {
pname = "substitute";
ename = "substitute";
version = "0.1.6";
version = "0.1.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/substitute-0.1.6.tar";
sha256 = "0hdg6gv878bpb6yrav345a8479w50q48nmibvk4p04im7b7r1238";
url = "https://elpa.gnu.org/packages/substitute-0.1.7.tar";
sha256 = "1mgpmc5ndsqv32zlsz96gnahg2x2329r0mxn45ajqsjf3b4pyxi6";
};
packageRequires = [ emacs ];
meta = {
@ -4786,10 +4928,10 @@
elpaBuild {
pname = "svg-lib";
ename = "svg-lib";
version = "0.2.5";
version = "0.2.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/svg-lib-0.2.5.tar";
sha256 = "022jp54w14sv0d71j0z76bnir9bgvysmcpcxpzpiiz77da6rg393";
url = "https://elpa.gnu.org/packages/svg-lib-0.2.6.tar";
sha256 = "121wnk9g1dbpkx2w7di5f5czvv17wf67sacqpfpn53185z6mwwf3";
};
packageRequires = [ emacs ];
meta = {
@ -4896,10 +5038,10 @@
elpaBuild {
pname = "taxy-magit-section";
ename = "taxy-magit-section";
version = "0.12.1";
version = "0.12.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/taxy-magit-section-0.12.1.tar";
sha256 = "0bs00y8pl51dji23zx5w64h6la0y109q0jv2q1nggizk6q5bsxmg";
url = "https://elpa.gnu.org/packages/taxy-magit-section-0.12.2.tar";
sha256 = "1pf83zz5ibhqqlqgcxig0dsl1rnkk5r6v16s5ngvbc37q40vkwn1";
};
packageRequires = [ emacs magit-section taxy ];
meta = {
@ -5035,10 +5177,10 @@
elpaBuild {
pname = "tramp";
ename = "tramp";
version = "2.6.0.1";
version = "2.6.0.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/tramp-2.6.0.1.tar";
sha256 = "1mxkl8v40wdcyvsyjayw9yj7ghn5zrnzgaapwh1prxs42scw85x8";
url = "https://elpa.gnu.org/packages/tramp-2.6.0.3.tar";
sha256 = "0hcm20qk62k9irqdfcb44js9jkff43fji07la33arnjqvswrqs6n";
};
packageRequires = [ emacs ];
meta = {
@ -5140,10 +5282,10 @@
elpaBuild {
pname = "triples";
ename = "triples";
version = "0.2.3";
version = "0.2.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/triples-0.2.3.tar";
sha256 = "1p6vijaab3a7h9lqlxxhyipwd9rkr15r3rm0iyxxanlcggi04a39";
url = "https://elpa.gnu.org/packages/triples-0.2.6.tar";
sha256 = "09vr8r78vpycpxglacbgy2fy01khmvhh42panilwz2n9nhjy6xzm";
};
packageRequires = [ emacs seq ];
meta = {
@ -5151,6 +5293,21 @@
license = lib.licenses.free;
};
}) {};
typo = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "typo";
ename = "typo";
version = "1.0.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/typo-1.0.1.tar";
sha256 = "11k1dca7kw1yviiw310slfj02a7x1w6m3qg7v71d2gcmdbp112ib";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/typo.html";
license = lib.licenses.free;
};
}) {};
undo-tree = callPackage ({ elpaBuild, emacs, fetchurl, lib, queue }:
elpaBuild {
pname = "undo-tree";
@ -5391,10 +5548,10 @@
elpaBuild {
pname = "vertico";
ename = "vertico";
version = "1.1";
version = "1.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vertico-1.1.tar";
sha256 = "0v5hpaysh7m7v2g77dyzy4hhnnv9v3wvpyfz6zi318sw96vmabhm";
url = "https://elpa.gnu.org/packages/vertico-1.2.tar";
sha256 = "1vf2nh2wrjj6ig5iq7kx1p85a1m494lxfvhlqrl5nhi2hjbgnqy3";
};
packageRequires = [ compat emacs ];
meta = {
@ -5411,10 +5568,10 @@
elpaBuild {
pname = "vertico-posframe";
ename = "vertico-posframe";
version = "0.7.1";
version = "0.7.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.1.tar";
sha256 = "18a65hnacavy375ry5qmfj454b10h2yg9p6wbx1wdx30fwpi247a";
url = "https://elpa.gnu.org/packages/vertico-posframe-0.7.2.tar";
sha256 = "1sbgg0syyk24phwzji40lyw5dmwxssgvwv2fs8mbmkhv0q44f9ny";
};
packageRequires = [ emacs posframe vertico ];
meta = {
@ -5749,10 +5906,10 @@
elpaBuild {
pname = "xref";
ename = "xref";
version = "1.6.2";
version = "1.6.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/xref-1.6.2.tar";
sha256 = "16vzjl2dv5nmb40xfw7mfrk8i64fac3cy4sf2d2hy832rwlg15q0";
url = "https://elpa.gnu.org/packages/xref-1.6.3.tar";
sha256 = "0ccfp47y769zrb5sza8skzy4nj4793lzd0jn5c83s3g916gp304l";
};
packageRequires = [ emacs ];
meta = {
@ -5760,6 +5917,21 @@
license = lib.licenses.free;
};
}) {};
xref-union = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "xref-union";
ename = "xref-union";
version = "0.1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/xref-union-0.1.1.tar";
sha256 = "1v95l4j3w3zrjmii3pz319s4jmqnfdx6np120zhc6ccgj1fawy2c";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/xref-union.html";
license = lib.licenses.free;
};
}) {};
yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "yasnippet";

View File

@ -49,10 +49,10 @@
elpaBuild {
pname = "annotate";
ename = "annotate";
version = "1.8.5";
version = "2.0.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/annotate-1.8.5.tar";
sha256 = "0f5h9ymcg4n0zn3yaq1s0h5sfrq3pbcswda9875yhlcprzbrgyq7";
url = "https://elpa.nongnu.org/nongnu/annotate-2.0.0.tar";
sha256 = "0lahs00abcwjzjqz8238bcmsb25l0r3rj6zycsw7xjkz913sin7y";
};
packageRequires = [];
meta = {
@ -261,10 +261,10 @@
elpaBuild {
pname = "buttercup";
ename = "buttercup";
version = "1.29";
version = "1.30";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/buttercup-1.29.tar";
sha256 = "0k9canfnxzhbk5m33z3bfxw7l2bvvhdiv9x357lf6gs8vg19158p";
url = "https://elpa.nongnu.org/nongnu/buttercup-1.30.tar";
sha256 = "152w8f6yy7jd6vawq4dh3fnmlxm2x3i99w9hd6kv4bs7c2y2dkj8";
};
packageRequires = [ emacs ];
meta = {
@ -330,10 +330,10 @@
elpaBuild {
pname = "cider";
ename = "cider";
version = "1.6.0";
version = "1.7.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/cider-1.6.0.tar";
sha256 = "038wzwi4y0240wb5i03v89x308c07nzflfv3804zyldr44yk9qky";
url = "https://elpa.nongnu.org/nongnu/cider-1.7.0.tar";
sha256 = "0x0acszamylmmly6h8s56lskd5l7lm8hdnf8rbvjd89v0j2anb0l";
};
packageRequires = [
clojure-mode
@ -605,10 +605,10 @@
elpaBuild {
pname = "eat";
ename = "eat";
version = "0.6";
version = "0.6.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/eat-0.6.tar";
sha256 = "14174hra9x3l98nrpg0x9g499lwhlxr8qg51zdrlyky0k4v0x3iw";
url = "https://elpa.nongnu.org/nongnu/eat-0.6.1.tar";
sha256 = "0gs7cg4liz2qy3x82z8f5hddixvsh5nqvc3xkzvqqvvrwqbhf6za";
};
packageRequires = [ emacs ];
meta = {
@ -670,10 +670,10 @@
elpaBuild {
pname = "elpher";
ename = "elpher";
version = "3.4.2";
version = "3.4.3";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/elpher-3.4.2.tar";
sha256 = "0q7a79jnlihjj936wi199pdxl0ydy04354y0mqpxms00r98hzr9d";
url = "https://elpa.nongnu.org/nongnu/elpher-3.4.3.tar";
sha256 = "0v785g0k3ik28k3iq9hf6h4d1avj50rzvqf9mbil4vcl1gb6jksm";
};
packageRequires = [ emacs ];
meta = {
@ -1375,10 +1375,10 @@
elpaBuild {
pname = "haml-mode";
ename = "haml-mode";
version = "3.1.10";
version = "3.2.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/haml-mode-3.1.10.tar";
sha256 = "1qkhm52xr8vh9zp728ass5kxjw7fj65j84m06db084qpavnwvysa";
url = "https://elpa.nongnu.org/nongnu/haml-mode-3.2.1.tar";
sha256 = "10pnpx4x5wjk4yq4kgynkhfv4xg8nzwmfwf1bappivrdii47hbiq";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -1747,10 +1747,10 @@
elpaBuild {
pname = "macrostep";
ename = "macrostep";
version = "0.9";
version = "0.9.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/macrostep-0.9.tar";
sha256 = "10crvq9xww4nvrswqq888y9ah3fl4prj0ha865aqbyrhhbpg18gd";
url = "https://elpa.nongnu.org/nongnu/macrostep-0.9.1.tar";
sha256 = "1n7x19748nv02zrxwy8b46jg9k4fzvqmwgvswq8x9ksghzsn7xyh";
};
packageRequires = [ cl-lib ];
meta = {
@ -2071,10 +2071,10 @@
elpaBuild {
pname = "org-journal";
ename = "org-journal";
version = "2.1.2";
version = "2.2.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/org-journal-2.1.2.tar";
sha256 = "1s5hadcps283c5a1sy8fp1ih064l0hl97frj93jw3fkx6jwbqf0v";
url = "https://elpa.nongnu.org/nongnu/org-journal-2.2.0.tar";
sha256 = "1pikz9aqdch11zsya8j3gx44wfl2y5r0kym093pl7w6bjx9bgija";
};
packageRequires = [ emacs org ];
meta = {
@ -2131,10 +2131,10 @@
elpaBuild {
pname = "org-tree-slide";
ename = "org-tree-slide";
version = "2.8.18";
version = "2.8.19";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/org-tree-slide-2.8.18.tar";
sha256 = "0xx8svbh6ks5112rac4chms0f8drhiwxnc3knrzaj8i1zb89l0n3";
url = "https://elpa.nongnu.org/nongnu/org-tree-slide-2.8.19.tar";
sha256 = "0sdffwbzmf7fn2k0x9z88s48nq5wg7s9fqgazbr179v9kic1s4gr";
};
packageRequires = [ emacs ];
meta = {
@ -2271,10 +2271,10 @@
elpaBuild {
pname = "php-mode";
ename = "php-mode";
version = "1.24.2";
version = "1.24.3";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/php-mode-1.24.2.tar";
sha256 = "1v84b7mjilr6z1zmjfvwp4mwc68mb298fcn03xcaivnd91gvmvs2";
url = "https://elpa.nongnu.org/nongnu/php-mode-1.24.3.tar";
sha256 = "0k44vkkm2njmvw3vfbc2c9v2hm8qy3bnarp328aim9761x61n9gy";
};
packageRequires = [ emacs ];
meta = {
@ -2364,10 +2364,10 @@
elpaBuild {
pname = "racket-mode";
ename = "racket-mode";
version = "1.0.20230209.92406";
version = "1.0.20230321.113335";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20230209.92406.tar";
sha256 = "1gs70pba6jjix6hnph6z2a2yjs9ka6xnhjl6qi8jcwyamkbpjiry";
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20230321.113335.tar";
sha256 = "0vr030zkgdjwn6kcrdiwsdwbk1x3sk60w60cfs60y7jmwaggqr65";
};
packageRequires = [ emacs ];
meta = {
@ -2679,6 +2679,21 @@
license = lib.licenses.free;
};
}) {};
sqlite3 = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "sqlite3";
ename = "sqlite3";
version = "0.17";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/sqlite3-0.17.tar";
sha256 = "04m53vn5cvcycv580q6zn5vw54ml7xmhs7bc88cwqj1z5vi3a85x";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/sqlite3.html";
license = lib.licenses.free;
};
}) {};
stylus-mode = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "stylus-mode";
@ -2713,10 +2728,10 @@
elpaBuild {
pname = "subed";
ename = "subed";
version = "1.0.29";
version = "1.2.1";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/subed-1.0.29.tar";
sha256 = "0q2sfdypj929y4fllk97rsb2bxm9a1izjy1f0z2viz5hz0hpqp26";
url = "https://elpa.nongnu.org/nongnu/subed-1.2.1.tar";
sha256 = "09a3ggnqsm4lxqhj0z9z3df6qzibvv9lpwqij2gpiifbb4lkvj4b";
};
packageRequires = [ emacs ];
meta = {
@ -3034,10 +3049,10 @@
elpaBuild {
pname = "web-mode";
ename = "web-mode";
version = "17.3.8";
version = "17.3.9";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.8.tar";
sha256 = "0g163mgf1kc2bfkh8b2s9jl5cmzgcni2g25hxmyxb4rz3v30z4ca";
url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.9.tar";
sha256 = "1c01ilqk5bblcgz5xn3x8yvhfwk5p6z79035qj26ivpd4qjivcps";
};
packageRequires = [ emacs ];
meta = {
@ -3182,10 +3197,10 @@
elpaBuild {
pname = "xah-fly-keys";
ename = "xah-fly-keys";
version = "22.9.20230207171612";
version = "23.8.20230331200914";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-22.9.20230207171612.tar";
sha256 = "0m633k8rx2k3gwbh3hndkmn3k804pg7j7xmqw6yf8j2a2ym4893b";
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-23.8.20230331200914.tar";
sha256 = "0zh7h04zy014ss36bzz820574jj2xnx7yb3rnl02m9vynrss2i3m";
};
packageRequires = [ emacs ];
meta = {
@ -3257,10 +3272,10 @@
elpaBuild {
pname = "zenburn-theme";
ename = "zenburn-theme";
version = "2.7.0";
version = "2.8.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/zenburn-theme-2.7.0.tar";
sha256 = "1x7gd5w0g47kcam88lm605b35y35iq3q5f991a84l050c8syrkpy";
url = "https://elpa.nongnu.org/nongnu/zenburn-theme-2.8.0.tar";
sha256 = "1jbkh09r6sxb0iv9cdxi6k33kz3hldc6hcvyqljf733rdxykpskv";
};
packageRequires = [];
meta = {

View File

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "drawio";
version = "20.8.16";
version = "21.1.2";
src = fetchurl {
url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm";
sha256 = "sha256-FBnyogqf5BHLRInjJzC2dENnAwFcWMHDvJ+F0I3ffVg=";
sha256 = "sha256-cyw8wfwaFbDxPJn3eqiuQyQebTf7x1wMH9c0zKIGq4c=";
};
nativeBuildInputs = [

View File

@ -3,27 +3,18 @@
stdenv.mkDerivation rec {
pname = "goxel";
version = "0.10.8";
version = "0.12.0";
src = fetchFromGitHub {
owner = "guillaumechereau";
repo = "goxel";
rev = "v${version}";
sha256 = "sha256-M9H9SV8xmU7Jw5rEdV0gfloIEBvWmWSuH+BCrowpf2M=";
hash = "sha256-taDe5xJU6ijikHaSMDYs/XE2O66X3J7jOKWzbj7hrN0=";
};
patches = [ ./disable-imgui_ini.patch ];
nativeBuildInputs = [ scons pkg-config wrapGAppsHook ];
buildInputs = [ glfw3 gtk3 libpng12 ];
env.NIX_CFLAGS_COMPILE = toString [
# Needed with GCC 12
"-Wno-error=format-truncation"
];
NIX_LDFLAGS = "-lpthread";
buildPhase = ''
make release
'';
@ -37,6 +28,6 @@ stdenv.mkDerivation rec {
homepage = "https://guillaumechereau.github.io/goxel/";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ tilpner ];
maintainers = with maintainers; [ tilpner fgaz ];
};
}

View File

@ -1,13 +0,0 @@
diff --git a/src/gui.cpp b/src/gui.cpp
index 9b7236c..a8a11b2 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -314,6 +314,8 @@ static void init_ImGui(const inputs_t *inputs)
ImGuiIO& io = ImGui::GetIO();
io.DeltaTime = 1.0f/60.0f;
+ io.IniFilename = NULL;
+
io.KeyMap[ImGuiKey_Tab] = KEY_TAB;
io.KeyMap[ImGuiKey_LeftArrow] = KEY_LEFT;
io.KeyMap[ImGuiKey_RightArrow] = KEY_RIGHT;

View File

@ -51,11 +51,11 @@ let
in
stdenv.mkDerivation rec {
pname = "opera";
version = "96.0.4693.31";
version = "97.0.4719.43";
src = fetchurl {
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
hash = "sha256-ygJmwwwYg5lc7rDMkc8YH7oThET+4reFqPTrojtFowQ=";
hash = "sha256-VZVR7oE2GJwVo1M2oHFWuzzyTphJARpeJX/tbAPvwEg=";
};
unpackPhase = "dpkg-deb -x $src .";

View File

@ -8,7 +8,6 @@
, runtimeShell
, writeText
, terraform-providers
, fetchpatch
, installShellFiles
}:
@ -38,13 +37,6 @@ let
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
# remove all plugins, they are part of the main binary now
for i in $out/bin/*; do
if [[ $(basename $i) != terraform ]]; then
rm "$i"
fi
done
# https://github.com/posener/complete/blob/9a4745ac49b29530e07dc2581745a218b646b7a3/cmd/install/bash.go#L8
installShellCompletion --bash --name terraform <(echo complete -C terraform terraform)
'';
@ -127,7 +119,7 @@ let
(orig: { passthru = orig.passthru // passthru; })
else
lib.appendToName "with-plugins" (stdenv.mkDerivation {
inherit (terraform) name meta;
inherit (terraform) meta pname version;
nativeBuildInputs = [ makeWrapper ];
# Expose the passthru set with the override functions

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "openasar";
version = "unstable-2023-01-13";
version = "unstable-2023-04-01";
src = fetchFromGitHub {
owner = "GooseMod";
repo = "OpenAsar";
rev = "40b27dd1b8dd48277207db1b165c220c3441484c";
hash = "sha256-tDJxcnbX0REu8DX+bQ7i4JzvLl6lRyB7+/dnAJI18Ss=";
rev = "ac0ad4d48a1a198c0a8a784da973b96684b336a7";
hash = "sha256-Ul2fXH4yjGe2oub1uVYY0mPJ4ou79TdokxvxvCAPXqs=";
};
postPatch = ''

View File

@ -0,0 +1,53 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Sun, 2 Apr 2023 01:24:51 +0200
Subject: [PATCH] Fix string formatting in tests
Hide the decimal point and digits after the decimal point when they are
not needed.
diff --git a/src/par/test/partition_gcd.ok b/src/par/test/partition_gcd.ok
index 6c40c14..b9a42f6 100644
--- a/src/par/test/partition_gcd.ok
+++ b/src/par/test/partition_gcd.ok
@@ -9,7 +9,7 @@
========================================
[INFO] Partitioning parameters****
[PARAM] Number of partitions = 2
-[PARAM] UBfactor = 1.0
+[PARAM] UBfactor = 1
[PARAM] Vertex dimensions = 1
[PARAM] Hyperedge dimensions = 1
========================================
@@ -118,7 +118,7 @@ After Hyperedge Reduction : num_vertices = 137, num_hyperedges = 251
[V-Refine] Level 2 :: 207, 301, 154.65254
[V-Refine] Level 3 :: 312, 370, 154.65254
[V-Refine] Level 4 :: 469, 451, 154.65254
-[INFO] V-cycle refinement 1 delta cost 0.0
+[INFO] V-cycle refinement 1 delta cost 0
=========================================
[STATUS] Running FC multilevel coarsening
=========================================
@@ -133,7 +133,7 @@ After Hyperedge Reduction : num_vertices = 137, num_hyperedges = 251
[V-Refine] Level 2 :: 207, 301, 154.65254
[V-Refine] Level 3 :: 312, 370, 154.65254
[V-Refine] Level 4 :: 469, 451, 154.65254
-[INFO] V-cycle refinement 2 delta cost 0.0
+[INFO] V-cycle refinement 2 delta cost 0
[Cutcost of partition : 154.65254]
[Vertex balance of block_0 : 0.59249 ( 327.17993 )
[Vertex balance of block_1 : 0.40751 ( 225.03609 )
diff --git a/src/pdn/test/design_width.ok b/src/pdn/test/design_width.ok
index 381dca1..a102974 100644
--- a/src/pdn/test/design_width.ok
+++ b/src/pdn/test/design_width.ok
@@ -9,5 +9,5 @@
[INFO ODB-0130] Created 54 pins.
[INFO ODB-0131] Created 406 components and 1816 component-terminals.
[INFO ODB-0133] Created 361 nets and 1004 connections.
-[ERROR PDN-0185] Insufficient width (14.04 um) to add straps on layer M8 in grid "Core" with total strap width 6.0 um and offset 10.0 um.
+[ERROR PDN-0185] Insufficient width (14.04 um) to add straps on layer M8 in grid "Core" with total strap width 6 um and offset 10 um.
PDN-0185
--
2.38.4

View File

@ -0,0 +1,41 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Sun, 2 Apr 2023 04:57:17 +0200
Subject: [PATCH] Ignore warning on stderr
The following warning is written to stderr, which causes the overall
test to fail:
```
sh: warning: setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
```
diff --git a/src/dst/test/cpp_tests.tcl b/src/dst/test/cpp_tests.tcl
index 9087c2c..63d0cb7 100644
--- a/src/dst/test/cpp_tests.tcl
+++ b/src/dst/test/cpp_tests.tcl
@@ -4,7 +4,7 @@ set test_dir [pwd]
set openroad_dir [file dirname [file dirname [file dirname $test_dir]]]
set tests_path [file join $openroad_dir "build" "src" "dst" "test" "cpp"]
-set tests_list [split [exec sh -c "find $tests_path -maxdepth 1 -name 'Test*'"] \n]
+set tests_list [split [exec -ignorestderr sh -c "find $tests_path -maxdepth 1 -name 'Test*'"] \n]
foreach test $tests_list {
set test_name [file tail $test]
diff --git a/src/odb/test/cpp_tests.tcl b/src/odb/test/cpp_tests.tcl
index 091d576..6811760 100644
--- a/src/odb/test/cpp_tests.tcl
+++ b/src/odb/test/cpp_tests.tcl
@@ -4,7 +4,7 @@ set test_dir [pwd]
set openroad_dir [file dirname [file dirname [file dirname $test_dir]]]
set tests_path [file join $openroad_dir "build" "src" "odb" "test" "cpp"]
-set tests_list [split [exec sh -c "find $tests_path -maxdepth 1 -name 'Test*' ! -name '*.cmake'"] \n]
+set tests_list [split [exec -ignorestderr sh -c "find $tests_path -maxdepth 1 -name 'Test*' ! -name '*.cmake'"] \n]
foreach test $tests_list {
set test_name [file tail $test]
--
2.38.4

View File

@ -9,13 +9,20 @@
, python3
, swig4
, boost17x
, cbc # for clp
, cimg
, clp # for or-tools
, eigen
, glpk
, gtest
, lcov
, lemon-graph
, libjpeg
, or-tools
, pcre
, pkg-config
, qtbase
, re2 # for or-tools
, readline
, spdlog
, tcl
@ -27,14 +34,14 @@
mkDerivation rec {
pname = "openroad";
version = "unstable-2022-07-19";
version = "unstable-2023-03-31";
src = fetchFromGitHub {
owner = "The-OpenROAD-Project";
repo = "OpenROAD";
rev = "2610b3953ef62651825d89fb96917cf5d20af0f1";
rev = "cd03c5cf8a8eb78c0e07fe33a56b8e9d64672efe";
fetchSubmodules = true;
sha256 = "sha256-BP0JSnxl1XyqHzDY4eITaGHevqd+rbjWZy/LAfDfELs=";
hash = "sha256-BWUvFCuWKWQpifErpak03J+A7ni0jZWIrCMhMdKIbD0=";
};
nativeBuildInputs = [
@ -43,19 +50,25 @@ mkDerivation rec {
doxygen
flex
git
pkg-config
swig4
];
buildInputs = [
boost17x
cbc
cimg
clp
eigen
glpk
lcov
lemon-graph
libjpeg
or-tools
pcre
python3
qtbase
re2
readline
spdlog
tcl
@ -65,6 +78,11 @@ mkDerivation rec {
zlib
];
patches = [
./0001-Fix-string-formatting-in-tests.patch
./0002-Ignore-warning-on-stderr.patch
];
postPatch = ''
patchShebangs --build etc/find_messages.py
'';
@ -74,18 +92,22 @@ mkDerivation rec {
"-DUSE_SYSTEM_BOOST=ON"
"-DUSE_CIMG_LIB=ON"
"-DOPENROAD_VERSION=${src.rev}"
# 2023-03-31: see discussion on fmt workaround in
# https://github.com/The-OpenROAD-Project/OpenROAD/pull/2696
"-DCMAKE_CXX_FLAGS=-DFMT_DEPRECATED_OSTREAM"
];
# Resynthesis needs access to the Yosys binaries.
qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ yosys ]}" ];
checkInputs = [ gtest ];
# Upstream uses vendored package versions for some dependencies, so regression testing is prudent
# to see if there are any breaking changes in unstable that should be vendored as well.
doCheck = false; # Disabled pending upstream release with fix for rcx log file creation.
doCheck = true;
checkPhase = ''
# Regression tests must be run from the project root not from within the CMake build directory.
cd ..
test/regression
../test/regression
'';
doInstallCheck = true;

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "podman-tui";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "containers";
repo = "podman-tui";
rev = "v${version}";
hash = "sha256-qw7ylukG7M31rUtoZqbcjWchcEB14uvb2k1cjIjy8qA=";
hash = "sha256-0iI417mwmwph4wjuusaWY0kGtVsQy7i+eZvE1tYiINY=";
};
vendorHash = null;

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "luau";
version = "0.569";
version = "0.570";
src = fetchFromGitHub {
owner = "Roblox";
repo = "luau";
rev = version;
hash = "sha256-SvHwFsyM3Oe4k2Flx1XhTSkHOIDe9PKjlyJ+OyHFcQE=";
hash = "sha256-22T/NweWrDNWmGKJIk/htHUSU2htwsJ+0tHw5AtfoOo=";
};
nativeBuildInputs = [ cmake ];

View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "google-api-python-client";
version = "2.79.0";
version = "2.83.0";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-V3wK6uHrPHVOrLkSLTadZ2Cf73WbxqT6Fsr+q08wAZs=";
hash = "sha256-0HUJ8bLSskJzY7RU25lvehXhdRpIz8ryhCcFBWDdUc8=";
};
propagatedBuildInputs = [

View File

@ -5,11 +5,11 @@
buildPythonPackage rec {
pname = "mmh3";
version = "3.0.0";
version = "3.1.0";
src = fetchPypi {
inherit pname version;
sha256 = "d1ec578c09a07d3518ec9be540b87546397fa3455de73c166fcce51eaa5c41c5";
sha256 = "sha256-mw8rKrSpFTM8nRCJVy4pCgIeu1uQC7f3EU3MwDmV1zI=";
};
pythonImportsCheck = [ "mmh3" ];

View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "pyatag";
version = "3.5.1";
version = "0.3.6.2";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "MatsNl";
repo = "pyatag";
rev = "refs/tags/${version}";
hash = "sha256-hyGos0LFVKv63jf1ODPFfk+R47oyHea+8MGvxeKpop8=";
hash = "sha256-yJEPDNjEv2lGrBQ78sl7nseVRemsG7hTdBGH5trciYU=";
};
propagatedBuildInputs = [

View File

@ -1,24 +1,40 @@
{ buildPythonPackage
{ lib
, buildPythonPackage
, fetchPypi
, lib
, pytest
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "pytest-instafail";
version = "0.4.2";
version = "0.5.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "10lpr6mjcinabqynj6v85bvb1xmapnhqmg50nys1r6hg7zgky9qr";
sha256 = "sha256-M6YG9+DI5kbcO/7g1eOkt7eO98NhaM+h89k698pwbJ4=";
};
nativeCheckInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "pytest_instafail" ];
meta = {
buildInputs = [
pytest
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"pytest_instafail"
];
meta = with lib; {
description = "pytest plugin that shows failures and errors instantly instead of waiting until the end of test session";
homepage = "https://github.com/pytest-dev/pytest-instafail";
license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.jacg ];
changelog = "https://github.com/pytest-dev/pytest-instafail/blob/v${version}/CHANGES.rst";
license = licenses.bsd3;
maintainers = with maintainers; [ jacg ];
};
}

View File

@ -40,7 +40,7 @@
buildPythonPackage rec {
pname = "sentry-sdk";
version = "1.17.0";
version = "1.18.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -49,7 +49,7 @@ buildPythonPackage rec {
owner = "getsentry";
repo = "sentry-python";
rev = "refs/tags/${version}";
hash = "sha256-BcoCYyCz4tkb75P/z+eGQolRB0qxrdvTH+wV90zN884=";
hash = "sha256-4HOJ6ouUU6RqtxYOsnoojT4aQ/h8YzcLHTO8lFZecZw=";
};
propagatedBuildInputs = [

View File

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-python-dateutil";
version = "2.8.19.8";
version = "2.8.19.10";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-MWxrEH0FW70GMktxNi5hBBAiIOaYiqSjiFUKo6itXQY=";
hash = "sha256-xkDy63G0uUqdO/2kwEJQ0pok5RuLrW4S/d7Az26W96M=";
};
# Modules doesn't have tests

View File

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-retry";
version = "0.9.9.2";
version = "0.9.9.3";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-VEgdUj/nvMXWujndTyBT5XUjoVoW4xK3yP6b5H/EVdU=";
hash = "sha256-G3oKBK3xLyEjfnaDNXSpqPdV+IiJwiatmdbjv6W248g=";
};
# Modules doesn't have tests

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "esbuild";
version = "0.17.14";
version = "0.17.15";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
hash = "sha256-4TC1d5FOZHUMuEMTcTOBLZZM+sFUswhyblI5HVWyvPA=";
hash = "sha256-AzkjVw3o+yP/l6jiMmgzaymb0el2/OcAl8WQYbuMprw=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

View File

@ -1,39 +1,50 @@
{ lib, stdenv, fetchFromGitHub, autoconf, runtimeShell, python3Packages, makeWrapper }:
{ lib
, stdenv
, fetchFromGitHub
, autoconf
, makeWrapper
, python3Packages
, runtimeShell
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (self: {
pname = "argbash";
version = "2.10.0";
src = fetchFromGitHub {
owner = "matejak";
repo = "argbash";
rev = version;
sha256 = "1xdhpbnc0xjv6ydcm122hhdjcl77jhiqnccjfqjp3cd1lfmzvg8v";
rev = self.version;
hash = "sha256-G739q6OhsXEldpIxiyOU51AmG4RChMqaN1t2wOy6sPU=";
};
sourceRoot = "source/resources";
postPatch = ''
chmod -R +w ..
patchShebangs ..
substituteInPlace Makefile \
patchShebangs .
substituteInPlace resources/Makefile \
--replace '/bin/bash' "${runtimeShell}"
'';
nativeBuildInputs = [ autoconf python3Packages.docutils makeWrapper ];
nativeBuildInputs = [
autoconf
makeWrapper
python3Packages.docutils
];
makeFlags = [ "PREFIX=$(out)" ];
makeFlags = [
"-C" "resources"
"PREFIX=$(out)"
];
postInstall = ''
wrapProgram $out/bin/argbash \
--prefix PATH : '${autoconf}/bin'
'';
meta = with lib; {
description = "Bash argument parsing code generator";
meta = {
homepage = "https://argbash.io/";
license = licenses.free; # custom license. See LICENSE in source repo.
maintainers = with maintainers; [ rencire ];
description = "Bash argument parsing code generator";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ AndersonTorres ];
platforms = lib.platforms.all;
};
}
})

View File

@ -10,7 +10,7 @@
stdenv.mkDerivation rec {
pname = "blackfire";
version = "2.14.0";
version = "2.14.2";
src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}");
@ -57,23 +57,23 @@ stdenv.mkDerivation rec {
sources = {
"x86_64-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
sha256 = "PrKJlxJhMX9ZgUGPIQFmAi7PMdcZKTuIuCUEunlYq+I=";
sha256 = "SnHxJWWCRI/ZwFlxVaghP7rBzSd1Redvgztk/z/UUyM=";
};
"i686-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
sha256 = "F1ners+2TVfhiIlmUSMRX7/nLVg5fEw5z6mW3kyHDnE=";
sha256 = "gXKuZCE81REOlO/TqTQmruaVbS847lnZRlKn2d1DLN0=";
};
"aarch64-linux" = fetchurl {
url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
sha256 = "ux/Yc03XCZkEfnsBuY9SqhnDIESbVzuyo0OF0Mbhc44=";
sha256 = "JKcKC96iRYl3ewgts1nAhD6gTJElsvyufI3Gnq0zKUk=";
};
"aarch64-darwin" = fetchurl {
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
sha256 = "JXQpLnRFZNxfwE+kpzYGTiB1/gsS/lzDEIwMT88oj5U=";
sha256 = "aYNibLHr3XYj4vTNF1ftew8oxfkckr0yehN2hDK+egc=";
};
"x86_64-darwin" = fetchurl {
url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
sha256 = "TdYMAy2lkwA+IYKriw9d+qXSv7+Pbi9ap/M5/3DnhPw=";
sha256 = "vZ0klc23JQDAwBGBUziIDx0mIm7KOCsBgoH1mrenazU=";
};
};

View File

@ -2,18 +2,18 @@
rustPlatform.buildRustPackage rec {
pname = "ferium";
version = "4.3.4";
version = "4.4.0";
src = fetchFromGitHub {
owner = "gorilla-devs";
repo = pname;
rev = "v${version}";
sha256 = "sha256-nUyIMTVRaJHVYeIp037uoZQhh04GmmW5ZjPiwAurB9A=";
sha256 = "sha256-eaYXWOoeqCtdpxIFQxu3wJfYg8ZkuGB32/b2yzVW/Mc=";
};
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
cargoHash = "sha256-pjUFMvIBl5uJahJBEoSVe6msVRWGlxazcwwxPEU0S3g=";
cargoHash = "sha256-5frotS85hwa24WRK6cVx1fmnolscKjRPkWoY6cnkbO8=";
# Disable the GUI file picker so that GTK/XDG dependencies aren't used
buildNoDefaultFeatures = true;

View File

@ -1,23 +1,28 @@
{ lib, python3Packages }:
{ lib
, python3Packages
}:
python3Packages.buildPythonApplication rec {
let
pname = "base16-shell-preview";
version = "1.0.0";
in
python3Packages.buildPythonApplication {
inherit pname version;
src = python3Packages.fetchPypi {
inherit version;
pname = "base16_shell_preview";
sha256 = "098f3z81g3acgcrisipz0nh17n9kx7ld6h8dg26qz3nx31pngsxd";
pname = "${lib.replaceStrings ["-"] ["_"] pname}";
hash = "sha256-retnbxjdjo+NeA1B0+jpM9kToAX/Rh0ze0yNF9AfDiU=";
};
# No tests
# If enabled, will attempt to run '__init__.py, and will fail with "/homeless-shelter" as HOME
# If enabled, it will attempt to run '__init__.py, failing by trying to write
# at "/homeless-shelter" as HOME
doCheck = false;
meta = with lib; {
description = "Browse and preview Base16 Shell themes in your terminal";
meta = {
homepage = "https://github.com/nvllsvm/base16-shell-preview";
license = licenses.mit;
maintainers = [ maintainers.rencire ];
description = "Browse and preview Base16 Shell themes in your terminal";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ AndersonTorres ];
};
}

View File

@ -1,14 +1,18 @@
{ lib, stdenv, fetchFromGitHub, kernel }:
{ lib
, stdenv
, fetchFromGitHub
, kernel
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (self: {
pname = "hid-nintendo";
version = "3.2";
src = fetchFromGitHub {
owner = "nicman23";
repo = "dkms-hid-nintendo";
rev = version;
sha256 = "1c262xarslicn9ildndl66sf97i5pzwzra54zh2rp11j7kkvvbyr";
rev = self.version;
hash = "sha256-2a+95zwyhJsF/KSo/Pm/JZ7ktDG02UZjsixSnVUXRrA=";
};
setSourceRoot = ''
@ -27,12 +31,12 @@ stdenv.mkDerivation rec {
installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ];
installTargets = [ "modules_install" ];
meta = with lib; {
description = "A Nintendo HID kernel module";
meta = {
homepage = "https://github.com/nicman23/dkms-hid-nintendo";
license = licenses.gpl2Plus;
maintainers = [ maintainers.rencire ];
platforms = platforms.linux;
broken = versionOlder kernel.version "4.14";
description = "A Nintendo HID kernel module";
license = lib.licenses.gpl2Plus;
maintainers = [ ];
platforms = lib.platforms.linux;
broken = lib.versionOlder kernel.version "4.14";
};
}
})

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "VictoriaMetrics";
version = "1.84.0";
version = "1.89.1";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-94QhjsCow1Ate/Bbia7KpWY3WgHk3oOarAY95Fq75hU=";
hash = "sha256-s5Fo0Bsy9cAoNLRMAYjNrSLJ0vX4HdbQ+T3cj6ebNPE=";
};
vendorSha256 = null;
vendorHash = null;
postPatch = ''
# main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package
@ -23,11 +23,17 @@ buildGoModule rec {
# Increase timeouts in tests to prevent failure on heavily loaded builders
substituteInPlace lib/storage/storage_test.go \
--replace "time.After(10 " "time.After(120 " \
--replace "time.After(30 " "time.After(120 "
--replace "time.NewTimer(30 " "time.NewTimer(120 " \
--replace "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)" \
'';
ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ];
preCheck = ''
# `lib/querytracer/tracer_test.go` expects `buildinfo.Version` to be unset
export ldflags=''${ldflags//=${version}/=}
'';
passthru.tests = { inherit (nixosTests) victoriametrics; };
meta = with lib; {
@ -36,5 +42,6 @@ buildGoModule rec {
license = licenses.asl20;
maintainers = with maintainers; [ yorickvp ivan ];
changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v${version}";
mainProgram = "victoria-metrics";
};
}

View File

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "atuin";
version = "13.0.1";
version = "14.0.0";
src = fetchFromGitHub {
owner = "ellie";
repo = pname;
rev = "v${version}";
hash = "sha256-yNn67lceg1XA72LDRRjCgSsKfEN/P5VUAnKO//ru0nc=";
hash = "sha256-P8PTEbTWI+vwWiPvjr4yTwO/JfPzfpUPO0ATi1ILhfk=";
};
cargoHash = "sha256-oIK2upvAapYU6WkoWjiwcmq57TDbDBTc+2OjsMdv23E=";
cargoHash = if stdenv.isLinux then "sha256-T3Y6WiU6UdLmZiXYekL5cIonqFisU94PpiVlB1sNr9U=" else "sha256-a81gKajbifhDqlKlpnA4FzVX+NktqOCRqlajuuYopCg=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "dotter";
version = "0.12.14";
version = "0.12.15";
src = fetchFromGitHub {
owner = "SuperCuber";
repo = "dotter";
rev = "v${version}";
hash = "sha256-GGbUpjAcihJLNNo0OtkRGQ2RcT/75vDABlHs7Atzo1s=";
hash = "sha256-quMEwg/B4ey6zoxDZO2ce3/s1FX5xxmJfyAlt4YvFqE=";
};
cargoHash = "sha256-uC0OwN73krM7QaQ4rtWV6IseKdZmiqrB8a6QGTs6fHE=";
cargoHash = "sha256-D8H95dE+th1mMzlLmd+fqU5VdlxdOSBHKSjvh21JhnE=";
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];

View File

@ -24,16 +24,16 @@ let
in
buildGoModule rec {
pname = "fzf";
version = "0.38.0";
version = "0.39.0";
src = fetchFromGitHub {
owner = "junegunn";
repo = pname;
rev = version;
hash = "sha256-XZ0S6cps3WIMqWUHivXPKSN2PiZsSEmETnu9sglwXKw=";
hash = "sha256-YEysMybjxWwvoX5wMphOZsXw1lV5XqPsp9+Q9V/8cAs=";
};
vendorHash = "sha256-MsMwBBualAwJzCrv/WNBJakv6LcKZYsDUqkNmivUMOQ=";
vendorHash = "sha256-yycwi7SLNmUnpsoP6QBXizVbibh/wEYZb1OqigLFJqs=";
outputs = [ "out" "man" ];

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "nuclei";
version = "2.9.0";
version = "2.9.1";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
hash = "sha256-158nIO3HvLjc9IuL0Yt92VPHgASKEQy/eTOByMehHC8=";
hash = "sha256-esnq1aQot5NHCQcmCbCnv+7OBqy92f1AhI52zvbmpvY=";
};
vendorHash = "sha256-k4Dq1GjRzdD4vkydMWFWVQZR/mwGjZCcy7Gr5QDejUs=";
vendorHash = "sha256-Ws5wTsz02S3WH16x3APld/eoGzla3E5bAQiNSzStL4o=";
modRoot = "./v2";
subPackages = [