Merge master into staging-next
This commit is contained in:
@@ -254,7 +254,7 @@ In a pull request updating e.g. the standard library, you should write the follo
|
||||
```
|
||||
|
||||
This will build all reverse dependencies of the standard library,
|
||||
for example `agdaPackages.agda-categories`, or `agdaPackages.generic`.
|
||||
for example `agdaPackages.agda-categories`.
|
||||
|
||||
In some cases it is useful to build _all_ Agda packages.
|
||||
This can be done with the following Github comment:
|
||||
|
||||
@@ -248,35 +248,42 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
users.groups.${name} = { };
|
||||
users.users.${name} = {
|
||||
description = "HedgeDoc service user";
|
||||
group = name;
|
||||
isSystemUser = true;
|
||||
users = {
|
||||
groups.${name} = { };
|
||||
users = {
|
||||
nginx = lib.mkIf cfg.configureNginx {
|
||||
extraGroups = [ "hedgedoc" ];
|
||||
};
|
||||
${name} = {
|
||||
description = "HedgeDoc service user";
|
||||
group = name;
|
||||
isSystemUser = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services = {
|
||||
hedgedoc.settings = {
|
||||
defaultNotePath = lib.mkDefault "${cfg.package}/share/hedgedoc/public/default.md";
|
||||
docsPath = lib.mkDefault "${cfg.package}/share/hedgedoc/public/docs";
|
||||
path = lib.mkIf cfg.configureNginx "/run/hedgedoc/hedgedoc.sock";
|
||||
viewPath = lib.mkDefault "${cfg.package}/share/hedgedoc/public/views";
|
||||
};
|
||||
|
||||
nginx = lib.mkIf cfg.configureNginx {
|
||||
enable = true;
|
||||
upstreams.hedgedoc.servers."unix:${config.services.hedgedoc.settings.path}" = { };
|
||||
upstreams.hedgedoc.servers."unix:${cfg.settings.path}" = { };
|
||||
virtualHosts."${cfg.settings.domain}" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations = {
|
||||
"/" = {
|
||||
proxyPass = "http://hedgedoc";
|
||||
recommendedProxySettings = true;
|
||||
recommendedProxySettings = lib.mkDefault true;
|
||||
};
|
||||
"/socket.io/" = {
|
||||
proxyPass = "http://hedgedoc";
|
||||
proxyWebsockets = true;
|
||||
recommendedProxySettings = true;
|
||||
recommendedProxySettings = lib.mkDefault true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -527,10 +527,10 @@
|
||||
elpaBuild {
|
||||
pname = "auth-source-xoauth2-plugin";
|
||||
ename = "auth-source-xoauth2-plugin";
|
||||
version = "0.2.1";
|
||||
version = "0.3.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/auth-source-xoauth2-plugin-0.2.1.tar";
|
||||
sha256 = "020sf13hiyx6g32vixdf65bdcf9sdkh12rixcln6zgm23pw5rdgl";
|
||||
url = "https://elpa.gnu.org/packages/auth-source-xoauth2-plugin-0.3.1.tar";
|
||||
sha256 = "1qqyl5qz3ldp28qm1vwbq4q7csb4wy6b3w3z72fhasvkcpb266iw";
|
||||
};
|
||||
packageRequires = [ oauth2 ];
|
||||
meta = {
|
||||
@@ -972,10 +972,10 @@
|
||||
elpaBuild {
|
||||
pname = "bufferlo";
|
||||
ename = "bufferlo";
|
||||
version = "1.1";
|
||||
version = "1.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/bufferlo-1.1.tar";
|
||||
sha256 = "0g72k2y5nfqa6j3y0c4z0x3crn8ynlkgvwysxhgh9vypq7cqldj0";
|
||||
url = "https://elpa.gnu.org/packages/bufferlo-1.2.tar";
|
||||
sha256 = "0144bvgi63cvh7fcqdiz3zy0nncj8jslxd3x9jaw7m4pwadvaqvq";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -984,6 +984,28 @@
|
||||
};
|
||||
}
|
||||
) { };
|
||||
buframe = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
timeout,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "buframe";
|
||||
ename = "buframe";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/buframe-0.2.tar";
|
||||
sha256 = "0bnj4xvwmda62j9i7a9pnd0x20wa6g3il8cl55df26qpgqmjjpkq";
|
||||
};
|
||||
packageRequires = [ timeout ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/buframe.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
) { };
|
||||
bug-hunter = callPackage (
|
||||
{
|
||||
cl-lib ? null,
|
||||
@@ -1505,10 +1527,10 @@
|
||||
elpaBuild {
|
||||
pname = "consult";
|
||||
ename = "consult";
|
||||
version = "2.7";
|
||||
version = "2.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/consult-2.7.tar";
|
||||
sha256 = "1r4rjq537j1yr73apr8ga86kzs5h0xk4s0xf9983pq9spgd0wrpi";
|
||||
url = "https://elpa.gnu.org/packages/consult-2.8.tar";
|
||||
sha256 = "01vvv5q1rlbi7db0hya8dilr6ywq0skf43mc49jka3c3gj3a924v";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -1965,10 +1987,10 @@
|
||||
elpaBuild {
|
||||
pname = "debbugs";
|
||||
ename = "debbugs";
|
||||
version = "0.44";
|
||||
version = "0.45";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/debbugs-0.44.tar";
|
||||
sha256 = "02kb24rscbhs4w6xknf5d6l1cicy99b0004hr20pkki6faapzpx2";
|
||||
url = "https://elpa.gnu.org/packages/debbugs-0.45.tar";
|
||||
sha256 = "1rbj3ms2hkg0ra30y0bwzmdlcq58p15vzhin28a1rw2rmbwx5irc";
|
||||
};
|
||||
packageRequires = [ soap-client ];
|
||||
meta = {
|
||||
@@ -2251,10 +2273,10 @@
|
||||
elpaBuild {
|
||||
pname = "dicom";
|
||||
ename = "dicom";
|
||||
version = "0.6";
|
||||
version = "1.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/dicom-0.6.tar";
|
||||
sha256 = "0z548wa0hxj6z6vh7pwps4gsgrgh6p3g57j703777d5g75jb3j3m";
|
||||
url = "https://elpa.gnu.org/packages/dicom-1.0.tar";
|
||||
sha256 = "05v20pac5xgcmcqn6hw0f3n8dlz3nr178044y2xry6zz0psc3vx0";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -2597,10 +2619,10 @@
|
||||
elpaBuild {
|
||||
pname = "doric-themes";
|
||||
ename = "doric-themes";
|
||||
version = "0.3.0";
|
||||
version = "0.4.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/doric-themes-0.3.0.tar";
|
||||
sha256 = "1i2wrg3j2gpwyb3y1fb8wwmzl0hk5dw8i1160vcffpwmbf3mppza";
|
||||
url = "https://elpa.gnu.org/packages/doric-themes-0.4.0.tar";
|
||||
sha256 = "0dh5gib95fqfqdlk493y8dpdln2bqs2v5gg4gghy4rhgg79six5j";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2799,10 +2821,10 @@
|
||||
elpaBuild {
|
||||
pname = "eev";
|
||||
ename = "eev";
|
||||
version = "20250607";
|
||||
version = "20250914";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/eev-20250607.tar";
|
||||
sha256 = "0rrm6mldhmf0ijjr8nri9a6sasxknd8wivq2fkni60c47m65m2md";
|
||||
url = "https://elpa.gnu.org/packages/eev-20250914.tar";
|
||||
sha256 = "1bn7nv42pkd910s47if2jzrzfd10s2nbhid3adh96p9bpy46k639";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2820,10 +2842,10 @@
|
||||
elpaBuild {
|
||||
pname = "ef-themes";
|
||||
ename = "ef-themes";
|
||||
version = "1.10.0";
|
||||
version = "1.11.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ef-themes-1.10.0.tar";
|
||||
sha256 = "1mpaw1icvalq1ydxby9zfbjdgkk9wvld31xjrbr684ps5ix8f1f2";
|
||||
url = "https://elpa.gnu.org/packages/ef-themes-1.11.0.tar";
|
||||
sha256 = "086d2fmgzgnjil97zjn2i0ii81dq9l8rr859j0kyaxiy83r27rqb";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2881,10 +2903,10 @@
|
||||
elpaBuild {
|
||||
pname = "el-job";
|
||||
ename = "el-job";
|
||||
version = "2.4.8";
|
||||
version = "2.5.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/el-job-2.4.8.tar";
|
||||
sha256 = "1g7kmsxq2hdsfl2glm9yaqhqx87kl4amg5wi3872kjlbrwfd78kk";
|
||||
url = "https://elpa.gnu.org/packages/el-job-2.5.3.tar";
|
||||
sha256 = "0wigrrn5qw0dknlr9jwgq89jvhbmpyxvxsyh4lb9lm0vpd1vdfyg";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -3025,10 +3047,10 @@
|
||||
elpaBuild {
|
||||
pname = "ellama";
|
||||
ename = "ellama";
|
||||
version = "1.8.2";
|
||||
version = "1.8.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ellama-1.8.2.tar";
|
||||
sha256 = "0gkkm3hfxwn2x12vbbrp3nydkzs91abd90cf8qmwaxgdl6fvlg4d";
|
||||
url = "https://elpa.gnu.org/packages/ellama-1.8.6.tar";
|
||||
sha256 = "03ckmz16r1xinb7h7gcf5h030b4axv44l9wanw9d6qwydgy6hl6r";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -3459,10 +3481,10 @@
|
||||
elpaBuild {
|
||||
pname = "filechooser";
|
||||
ename = "filechooser";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/filechooser-0.2.3.tar";
|
||||
sha256 = "17dqms6knc0l47m02581jlm7ikcs662nmxdnsklipnnn0gfjmkmm";
|
||||
url = "https://elpa.gnu.org/packages/filechooser-0.2.4.tar";
|
||||
sha256 = "0bw1yvypm2vk6bh81h88505fd1538rrga9y40gmy7w144spfi6sb";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -3937,10 +3959,10 @@
|
||||
elpaBuild {
|
||||
pname = "gnu-elpa-keyring-update";
|
||||
ename = "gnu-elpa-keyring-update";
|
||||
version = "2022.12.1";
|
||||
version = "2025.10.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update-2022.12.1.tar";
|
||||
sha256 = "0yb81ly7y5262fpa0n96yngqmz1rgfwrpm0a6vqghdpr5x0c8z6n";
|
||||
url = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update-2025.10.1.tar";
|
||||
sha256 = "0p3125llm6hiasxx1rxl5anwfa317w2m8ybj9zl8133m5sjzzvsf";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -5219,10 +5241,10 @@
|
||||
elpaBuild {
|
||||
pname = "llm";
|
||||
ename = "llm";
|
||||
version = "0.27.1";
|
||||
version = "0.27.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/llm-0.27.1.tar";
|
||||
sha256 = "0qdzkjm9cihhcj5ains8m952hwkjfy4glr6yzrs5dws3bl3yqqbh";
|
||||
url = "https://elpa.gnu.org/packages/llm-0.27.2.tar";
|
||||
sha256 = "0wkz4l2ica2wrmb30yylqdbdp1q2xflarcdl0z399lh315jdbypg";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -5457,10 +5479,10 @@
|
||||
elpaBuild {
|
||||
pname = "marginalia";
|
||||
ename = "marginalia";
|
||||
version = "2.2";
|
||||
version = "2.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/marginalia-2.2.tar";
|
||||
sha256 = "16h0zdzjip10ryalanygfkz4i2bf21vr6f4348l5cgx0mnx10cvx";
|
||||
url = "https://elpa.gnu.org/packages/marginalia-2.3.tar";
|
||||
sha256 = "0k2ndssravhd94b63fyiv2h7rvny2fik988w1dnpdy6q9vj2vdgw";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -5542,10 +5564,10 @@
|
||||
elpaBuild {
|
||||
pname = "mathsheet";
|
||||
ename = "mathsheet";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/mathsheet-1.2.tar";
|
||||
sha256 = "1wx67cnpxlqnpr3bsdnw4ccsg2fgjazcdbddbkr6r69pdbrp6m3g";
|
||||
url = "https://elpa.gnu.org/packages/mathsheet-1.3.tar";
|
||||
sha256 = "1gyn47fzpa866i5xmdj6yq934xr9dsaq8za2r5z7hda660rh4wqi";
|
||||
};
|
||||
packageRequires = [ peg ];
|
||||
meta = {
|
||||
@@ -5563,10 +5585,10 @@
|
||||
elpaBuild {
|
||||
pname = "matlab-mode";
|
||||
ename = "matlab-mode";
|
||||
version = "6.3";
|
||||
version = "7.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/matlab-mode-6.3.tar";
|
||||
sha256 = "0m3h60629p9rv8k2fk23iwfdgzsdmlk78y1j83xz5m53z7vl3a7m";
|
||||
url = "https://elpa.gnu.org/packages/matlab-mode-7.1.1.tar";
|
||||
sha256 = "0axqvarxnvn02pcqmqf9sf6kg0xfz5a8wfzjw8if6xsbk45krlcz";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -6197,24 +6219,19 @@
|
||||
) { };
|
||||
oauth2 = callPackage (
|
||||
{
|
||||
cl-lib ? null,
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
nadvice,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "oauth2";
|
||||
ename = "oauth2";
|
||||
version = "0.17";
|
||||
version = "0.18.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/oauth2-0.17.tar";
|
||||
sha256 = "0ah0h3k6hiqm977414kyg96r6rrvnwvik3hz3ra3r0mxx7lksqha";
|
||||
url = "https://elpa.gnu.org/packages/oauth2-0.18.3.tar";
|
||||
sha256 = "1xn9jkf55b9sc6fidzn6p1falvvgvpc08iz53fvmmp7fandgwbxi";
|
||||
};
|
||||
packageRequires = [
|
||||
cl-lib
|
||||
nadvice
|
||||
];
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/oauth2.html";
|
||||
license = lib.licenses.free;
|
||||
@@ -6863,6 +6880,7 @@
|
||||
) { };
|
||||
persist = callPackage (
|
||||
{
|
||||
compat,
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
@@ -6870,12 +6888,12 @@
|
||||
elpaBuild {
|
||||
pname = "persist";
|
||||
ename = "persist";
|
||||
version = "0.6.1";
|
||||
version = "0.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/persist-0.6.1.tar";
|
||||
sha256 = "1a7lls81q247mbkcnifmsva16cfjjma6yihxmj5zrj8ac774z9j3";
|
||||
url = "https://elpa.gnu.org/packages/persist-0.7.tar";
|
||||
sha256 = "0g38vf4a4f4b8cp35qc7pwzj1qwrnw6dd6mc83mrjs35fx43lpjn";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/persist.html";
|
||||
license = lib.licenses.free;
|
||||
@@ -7169,10 +7187,10 @@
|
||||
elpaBuild {
|
||||
pname = "preview-auto";
|
||||
ename = "preview-auto";
|
||||
version = "0.4";
|
||||
version = "0.4.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/preview-auto-0.4.tar";
|
||||
sha256 = "0jsahj6ylrs4hlr57i0ibkj9bhc3jbg84k3pk8g5rg27xiwncczy";
|
||||
url = "https://elpa.gnu.org/packages/preview-auto-0.4.1.tar";
|
||||
sha256 = "0wdjka1wixhlzi1sksswa2jnialpna0gj770z0gl6faxdi310p9l";
|
||||
};
|
||||
packageRequires = [ auctex ];
|
||||
meta = {
|
||||
@@ -7480,10 +7498,10 @@
|
||||
elpaBuild {
|
||||
pname = "rcirc-mentions";
|
||||
ename = "rcirc-mentions";
|
||||
version = "1.0.3";
|
||||
version = "1.0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/rcirc-mentions-1.0.3.tar";
|
||||
sha256 = "1dk651cm30kigbg8ns26k5fmr42ha9w6yx27j1iiwrxyifsxyb12";
|
||||
url = "https://elpa.gnu.org/packages/rcirc-mentions-1.0.5.tar";
|
||||
sha256 = "1qf3zsqjryqsx31y1dmmqdvny5w4f4z96mxb2ibj39ah9j2vgixb";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -8062,10 +8080,10 @@
|
||||
elpaBuild {
|
||||
pname = "setup";
|
||||
ename = "setup";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/setup-1.4.0.tar";
|
||||
sha256 = "0id7j8xvbkbpfiv7m55dl64y27dpiczljagldf4p9q6qwlhf42f7";
|
||||
url = "https://elpa.gnu.org/packages/setup-1.5.0.tar";
|
||||
sha256 = "184g3kd9caxyhwq41w94spkjs1j45vblg4sqfb5h5pqb5h9p95n5";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -8104,10 +8122,10 @@
|
||||
elpaBuild {
|
||||
pname = "shell-command-plus";
|
||||
ename = "shell-command+";
|
||||
version = "2.4.2";
|
||||
version = "2.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/shell-command+-2.4.2.tar";
|
||||
sha256 = "1kjj8n3nws7dl7k3ksnfx0s0kwvqb9wzy9k42xs5s51k7xrp1l18";
|
||||
url = "https://elpa.gnu.org/packages/shell-command+-2.5.0.tar";
|
||||
sha256 = "0svmrar0blgq3ffg9sll6b5vnqi1nw7snkbl04x2s9qln2i88dzx";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -8146,10 +8164,10 @@
|
||||
elpaBuild {
|
||||
pname = "show-font";
|
||||
ename = "show-font";
|
||||
version = "0.3.1";
|
||||
version = "1.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/show-font-0.3.1.tar";
|
||||
sha256 = "1ahlv8khf5vcmxvprz6swk3sw3i1rbbv45jp1c46mkhdg6bkmc7m";
|
||||
url = "https://elpa.gnu.org/packages/show-font-1.0.0.tar";
|
||||
sha256 = "1caga09ypj6vb4vziw6slvhkjbzj6a3vss9lbgbigzb4m6q8caqf";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -8188,10 +8206,10 @@
|
||||
elpaBuild {
|
||||
pname = "site-lisp";
|
||||
ename = "site-lisp";
|
||||
version = "0.1.2";
|
||||
version = "0.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/site-lisp-0.1.2.tar";
|
||||
sha256 = "1w27nd061y7a5qhdmij2056751wx9nwv89qx3hxcl473iz03b09l";
|
||||
url = "https://elpa.gnu.org/packages/site-lisp-0.2.0.tar";
|
||||
sha256 = "17wwn1wjkq4vjzhgzq5pyn5x6bzai6nwmxcsp9d375b88qwp973n";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -8812,10 +8830,10 @@
|
||||
elpaBuild {
|
||||
pname = "system-packages";
|
||||
ename = "system-packages";
|
||||
version = "1.0.13";
|
||||
version = "1.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/system-packages-1.0.13.tar";
|
||||
sha256 = "0xlbq44c7f2assp36g5z9hn5gldq76wzpcinp782whqzpgz2k4sy";
|
||||
url = "https://elpa.gnu.org/packages/system-packages-1.1.1.tar";
|
||||
sha256 = "0ndnx94ilxha7mby47n29qvr0lrypmsa7d1mxdwd66jd150sar5r";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -8946,10 +8964,10 @@
|
||||
elpaBuild {
|
||||
pname = "tempel";
|
||||
ename = "tempel";
|
||||
version = "1.5";
|
||||
version = "1.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tempel-1.5.tar";
|
||||
sha256 = "14q5sn2xvxpy96qyk3w6r8y39ysz3xkxklly00zarfvkcdcdbw1x";
|
||||
url = "https://elpa.gnu.org/packages/tempel-1.6.tar";
|
||||
sha256 = "1h5k3cc5kl4g11chrfjgnhr1vg29fj3qz706rimilki367n2sra5";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -8958,6 +8976,27 @@
|
||||
};
|
||||
}
|
||||
) { };
|
||||
termint = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "termint";
|
||||
ename = "termint";
|
||||
version = "0.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/termint-0.1.1.tar";
|
||||
sha256 = "1d6hg6bs105a8dzr0v2by0mb9c7v87jwqi4dxxzm6287448x7qqa";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/termint.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
) { };
|
||||
test-simple = callPackage (
|
||||
{
|
||||
cl-lib ? null,
|
||||
@@ -9043,6 +9082,27 @@
|
||||
};
|
||||
}
|
||||
) { };
|
||||
timeout = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "timeout";
|
||||
ename = "timeout";
|
||||
version = "2.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/timeout-2.1.tar";
|
||||
sha256 = "1mm4yp1spw512dnav1p3wnxqrsyls918i14azg03by4v32r9945p";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/timeout.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
) { };
|
||||
timerfunctions = callPackage (
|
||||
{
|
||||
cl-lib ? null,
|
||||
@@ -9095,10 +9155,10 @@
|
||||
elpaBuild {
|
||||
pname = "tmr";
|
||||
ename = "tmr";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tmr-1.1.0.tar";
|
||||
sha256 = "1bvysr05007qgzy2z6rxhhxpaq4b648icfmnj6qf8ydn8b5ih5kw";
|
||||
url = "https://elpa.gnu.org/packages/tmr-1.2.0.tar";
|
||||
sha256 = "0ywy3wz6km4smp7igzn44fwincc79nwzm0a55jv7hyz6bv78n8xr";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -9184,10 +9244,10 @@
|
||||
elpaBuild {
|
||||
pname = "tramp";
|
||||
ename = "tramp";
|
||||
version = "2.8.0.1";
|
||||
version = "2.8.0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.8.0.1.tar";
|
||||
sha256 = "1g7srsdyqldqx0hn8yv5x94dawfbqdbkbsi1l9ax06g3kn360sd7";
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.8.0.3.tar";
|
||||
sha256 = "1qszpb4qywpnx5x7ynx8srq6m6aiygdimffghihxcviv1r1mxs53";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -9270,10 +9330,10 @@
|
||||
elpaBuild {
|
||||
pname = "transient";
|
||||
ename = "transient";
|
||||
version = "0.9.4";
|
||||
version = "0.10.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/transient-0.9.4.tar";
|
||||
sha256 = "191d04n8y9brkfsbp205h29wmrlzk7adsff4jrhq9y4ml78az7n9";
|
||||
url = "https://elpa.gnu.org/packages/transient-0.10.1.tar";
|
||||
sha256 = "1qxml619jpjp2an4iiq7c2n0vy0xam73rjl6076lialfwsa05hqd";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -9364,10 +9424,10 @@
|
||||
elpaBuild {
|
||||
pname = "triples";
|
||||
ename = "triples";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/triples-0.6.0.tar";
|
||||
sha256 = "12qf91ldgkwgkwj3a5g68qy4sbmrqmxq4qcgcnygj570ipjv49q8";
|
||||
url = "https://elpa.gnu.org/packages/triples-0.6.1.tar";
|
||||
sha256 = "0rziyr9gwab140afs0hhwqbi6kvp2ypv7clp0y9yckmpj1b0bzrv";
|
||||
};
|
||||
packageRequires = [ seq ];
|
||||
meta = {
|
||||
@@ -9622,6 +9682,7 @@
|
||||
) { };
|
||||
vc-backup = callPackage (
|
||||
{
|
||||
compat,
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
@@ -9629,12 +9690,12 @@
|
||||
elpaBuild {
|
||||
pname = "vc-backup";
|
||||
ename = "vc-backup";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/vc-backup-1.1.0.tar";
|
||||
sha256 = "0a45bbrvk4s9cj3ih3hb6vqjv4hkwnz7m9a4mr45m6cb0sl9b8a3";
|
||||
url = "https://elpa.gnu.org/packages/vc-backup-1.1.1.tar";
|
||||
sha256 = "0lalz700s7cppayjyv7bvmgzcfl9hk1w84i2q00k1ns84h4qzji1";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/vc-backup.html";
|
||||
license = lib.licenses.free;
|
||||
@@ -9693,10 +9754,10 @@
|
||||
elpaBuild {
|
||||
pname = "vc-jj";
|
||||
ename = "vc-jj";
|
||||
version = "0.3";
|
||||
version = "0.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/vc-jj-0.3.tar";
|
||||
sha256 = "1pikbl7i7cqwdqq01bm1rlcd1d9736bqa42g6dz2zxlavi7cbq6n";
|
||||
url = "https://elpa.gnu.org/packages/vc-jj-0.4.tar";
|
||||
sha256 = "1wws05yybiwxnx1qyapnw87k74glv8izkk2zlzn21hvqscbknz1y";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -9826,10 +9887,10 @@
|
||||
elpaBuild {
|
||||
pname = "vertico";
|
||||
ename = "vertico";
|
||||
version = "2.4";
|
||||
version = "2.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/vertico-2.4.tar";
|
||||
sha256 = "1jxsxkmy80iba77iamrx4ybwg2phmxvsb5ab008iwz6rymjv60jv";
|
||||
url = "https://elpa.gnu.org/packages/vertico-2.5.tar";
|
||||
sha256 = "06yj03x61406zfs75q4blh9fav284psnigsy3g5wpqrv3p79b89s";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -9849,10 +9910,10 @@
|
||||
elpaBuild {
|
||||
pname = "vertico-posframe";
|
||||
ename = "vertico-posframe";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/vertico-posframe-0.8.0.tar";
|
||||
sha256 = "0iqy8m1cf819x7ln5sp8b3sh4dk291k9sril35hxsxkiyjal1rqk";
|
||||
url = "https://elpa.gnu.org/packages/vertico-posframe-0.9.0.tar";
|
||||
sha256 = "16vnacmz52d1rwdmddsr1rm1zki1p3bw10ngpw39a3dszbwqkl3m";
|
||||
};
|
||||
packageRequires = [
|
||||
posframe
|
||||
|
||||
@@ -1629,6 +1629,8 @@ let
|
||||
|
||||
preview-dvisvgm = mkHome super.preview-dvisvgm;
|
||||
|
||||
procress = mkHome super.procress;
|
||||
|
||||
# https://github.com/micdahl/projectile-trailblazer/issues/4
|
||||
projectile-trailblazer = addPackageRequires super.projectile-trailblazer [ self.projectile-rails ];
|
||||
|
||||
|
||||
@@ -54,10 +54,10 @@
|
||||
elpaBuild {
|
||||
pname = "aidermacs";
|
||||
ename = "aidermacs";
|
||||
version = "1.5.0.20250818.124701";
|
||||
version = "1.5.0.20250927.10200";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/aidermacs-1.5.0.20250818.124701.tar";
|
||||
sha256 = "0y32fj69y0vvk3gcf7lrpwcmqk7y55gxrpl59l1wc9rwq42rsv90";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/aidermacs-1.5.0.20250927.10200.tar";
|
||||
sha256 = "1sf2h2d7g1jf60vm6s5j6la27q43ckpz7b3pnyxka9rpy51ffnfr";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -572,10 +572,10 @@
|
||||
elpaBuild {
|
||||
pname = "cider";
|
||||
ename = "cider";
|
||||
version = "1.20.0snapshot0.20250806.194437";
|
||||
version = "1.20.0snapshot0.20250902.153000";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/cider-1.20.0snapshot0.20250806.194437.tar";
|
||||
sha256 = "1z7v7f8pal8z4pgr6qzmh1g8ir1rdwshx2hifzngkp33lqmvd15x";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/cider-1.20.0snapshot0.20250902.153000.tar";
|
||||
sha256 = "04rgbpa53mzpbfhaj8y4yczv189i9v571xbq60lvxj3sy7lvbjkm";
|
||||
};
|
||||
packageRequires = [
|
||||
clojure-mode
|
||||
@@ -622,10 +622,10 @@
|
||||
elpaBuild {
|
||||
pname = "clojure-ts-mode";
|
||||
ename = "clojure-ts-mode";
|
||||
version = "0.6.0snapshot0.20250815.44110";
|
||||
version = "0.6.0snapshot0.20251003.205157";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.6.0snapshot0.20250815.44110.tar";
|
||||
sha256 = "1nn9bg4lpv5vxwvmxhlfbkk4zdg8sk52lk6mhpx5679jbgc8kx7q";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.6.0snapshot0.20251003.205157.tar";
|
||||
sha256 = "0cx9w4nj9v373yhz1ydrqh747xqjfsjjn08fd1s4byrkw6ll7d83";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -655,6 +655,27 @@
|
||||
};
|
||||
}
|
||||
) { };
|
||||
cond-let = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "cond-let";
|
||||
ename = "cond-let";
|
||||
version = "0.1.1.0.20250903.164604";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/cond-let-0.1.1.0.20250903.164604.tar";
|
||||
sha256 = "1h6hb7wwwvcvxzykyh68a4ayjdrmc0dav8fb3s5y9wp3b9r8wvjx";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
homepage = "https://elpa.nongnu.org/nongnu-devel/cond-let.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
) { };
|
||||
consult-flycheck = callPackage (
|
||||
{
|
||||
consult,
|
||||
@@ -666,10 +687,10 @@
|
||||
elpaBuild {
|
||||
pname = "consult-flycheck";
|
||||
ename = "consult-flycheck";
|
||||
version = "1.0.0.20250804.224423";
|
||||
version = "1.0.0.20250923.111441";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck-1.0.0.20250804.224423.tar";
|
||||
sha256 = "1xjin3rf75l8id6yc5h4whqwsaarvmhy5fjm7adl4xikq6i2cbm4";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck-1.0.0.20250923.111441.tar";
|
||||
sha256 = "1lky8vw8x641qnjf8ah1mlchirf3nfyqs5gskqh91q9iq0y48yxj";
|
||||
};
|
||||
packageRequires = [
|
||||
consult
|
||||
@@ -781,10 +802,10 @@
|
||||
elpaBuild {
|
||||
pname = "cycle-at-point";
|
||||
ename = "cycle-at-point";
|
||||
version = "0.2.0.20250611.32851";
|
||||
version = "0.2.0.20250913.225149";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/cycle-at-point-0.2.0.20250611.32851.tar";
|
||||
sha256 = "17pw2g8nh1byp42qb06568lrir0b6msbqhvkw45dwp89dd7nkrc4";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/cycle-at-point-0.2.0.20250913.225149.tar";
|
||||
sha256 = "12x1dfcqhx9gf6ll51a4na4vwnvq1m95lkzg22jwdhhxfbp7h7l3";
|
||||
};
|
||||
packageRequires = [ recomplete ];
|
||||
meta = {
|
||||
@@ -930,10 +951,10 @@
|
||||
elpaBuild {
|
||||
pname = "diff-ansi";
|
||||
ename = "diff-ansi";
|
||||
version = "0.2.0.20250611.51010";
|
||||
version = "0.2.0.20250913.225150";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/diff-ansi-0.2.0.20250611.51010.tar";
|
||||
sha256 = "1i7x02ccvsbaayvzv9sbi09a6vfzpqhnaqkzcqjbkff538v6kcy1";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/diff-ansi-0.2.0.20250913.225150.tar";
|
||||
sha256 = "0i6147bhn1wl46d13wni1frbkg2zxccb46yp2wgs6vxgsvn8fikl";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -973,10 +994,10 @@
|
||||
elpaBuild {
|
||||
pname = "doc-show-inline";
|
||||
ename = "doc-show-inline";
|
||||
version = "0.1.0.20250209.60743";
|
||||
version = "0.1.0.20250913.225149";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/doc-show-inline-0.1.0.20250209.60743.tar";
|
||||
sha256 = "172shyhapbfllc2pv5wrbp58qxfp10gmz49ny5av4yf3ayqd6cm5";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/doc-show-inline-0.1.0.20250913.225149.tar";
|
||||
sha256 = "0rfpjmgkd76k2q9bxpv0q9vipzvrydyxvpd9ia8b9bwzaszdw8x2";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -1122,10 +1143,10 @@
|
||||
elpaBuild {
|
||||
pname = "editorconfig";
|
||||
ename = "editorconfig";
|
||||
version = "0.11.0.0.20250808.184702";
|
||||
version = "0.11.0.0.20250905.2405";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/editorconfig-0.11.0.0.20250808.184702.tar";
|
||||
sha256 = "1j2zspg9i7r0rnjy79c7032cd3nxir9r1j7img0bwwc1sv7az32y";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/editorconfig-0.11.0.0.20250905.2405.tar";
|
||||
sha256 = "06gwq2fr79l1abcxg2fqyqrkadg35fn6zm30bv6d8nvz7f1msfzq";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -1206,10 +1227,10 @@
|
||||
elpaBuild {
|
||||
pname = "elpher";
|
||||
ename = "elpher";
|
||||
version = "3.6.5.0.20250306.150410";
|
||||
version = "3.6.6.0.20250929.142203";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/elpher-3.6.5.0.20250306.150410.tar";
|
||||
sha256 = "1ah1vsbigz7ip7iz7f53w0bnmwf7dhfzyn1dx1dkfp4lkpr8gc7g";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/elpher-3.6.6.0.20250929.142203.tar";
|
||||
sha256 = "03p5z3r79303vxxs0q5cxhfmnjc18yr76pnfrsga11my6c9j7lza";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -1227,10 +1248,10 @@
|
||||
elpaBuild {
|
||||
pname = "emacsql";
|
||||
ename = "emacsql";
|
||||
version = "4.3.1.0.20250811.210334";
|
||||
version = "4.3.2.0.20250901.154446";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/emacsql-4.3.1.0.20250811.210334.tar";
|
||||
sha256 = "1c76h1l5d2yjyy4xxk65scmivfp5qshngjy653fcqh8zhn4as6vx";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/emacsql-4.3.2.0.20250901.154446.tar";
|
||||
sha256 = "1jj49nx5id54xxxzr3nr1xgzymwxa5mrdlf4a4n07bp4xn2jgwhi";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -1272,10 +1293,10 @@
|
||||
elpaBuild {
|
||||
pname = "evil";
|
||||
ename = "evil";
|
||||
version = "1.15.0.0.20250812.102316";
|
||||
version = "1.15.0.0.20250929.165020";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20250812.102316.tar";
|
||||
sha256 = "05wx37b8vnjxx4swcpzmi0lf3g2b82dswd9j49xcphmqc0br4a6x";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20250929.165020.tar";
|
||||
sha256 = "0qq60l5wy38izbixv4ymga32wvvl0fmxy2lc56s55fcg0safiwmc";
|
||||
};
|
||||
packageRequires = [
|
||||
cl-lib
|
||||
@@ -1633,10 +1654,10 @@
|
||||
elpaBuild {
|
||||
pname = "exec-path-from-shell";
|
||||
ename = "exec-path-from-shell";
|
||||
version = "2.2.0.20241107.71915";
|
||||
version = "2.2.0.20250922.141302";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/exec-path-from-shell-2.2.0.20241107.71915.tar";
|
||||
sha256 = "17wyy2agi9j7vny0wdi5mxp1nz7zpzi6ayx55ls1cdxwd7v2jyvf";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/exec-path-from-shell-2.2.0.20250922.141302.tar";
|
||||
sha256 = "1g70dg5ssw3k4jxcqqpi76qlckcl5n5rn7x812bm6xs9xp6izg1z";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -1815,10 +1836,10 @@
|
||||
elpaBuild {
|
||||
pname = "flymake-pyrefly";
|
||||
ename = "flymake-pyrefly";
|
||||
version = "0.1.6.0.20250805.190746";
|
||||
version = "0.1.8.0.20251007.82059";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/flymake-pyrefly-0.1.6.0.20250805.190746.tar";
|
||||
sha256 = "10r5f7zqnwwcp5ds9bh6d3hlfkp0wa614iknw7dgzhbg83v2c6r8";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/flymake-pyrefly-0.1.8.0.20251007.82059.tar";
|
||||
sha256 = "08120i69qmf25s84kdpxq9rp25v9ivyly1gg7pi5fsaiprf84pk4";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -1924,10 +1945,10 @@
|
||||
elpaBuild {
|
||||
pname = "geiser";
|
||||
ename = "geiser";
|
||||
version = "0.32.0.20250810.134607";
|
||||
version = "0.32.0.20250922.234403";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/geiser-0.32.0.20250810.134607.tar";
|
||||
sha256 = "0gwwdnpfhn37xk8dmw3izxr4w0ky37yv7va64m90ibzblrbgvfcf";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/geiser-0.32.0.20250922.234403.tar";
|
||||
sha256 = "0r0nxkba7hj2hh90d7j471p3v26q91v0jfq3p7xddbc64zb27hbc";
|
||||
};
|
||||
packageRequires = [ project ];
|
||||
meta = {
|
||||
@@ -2200,10 +2221,10 @@
|
||||
elpaBuild {
|
||||
pname = "git-modes";
|
||||
ename = "git-modes";
|
||||
version = "1.4.5.0.20250531.221751";
|
||||
version = "1.4.6.0.20250901.160839";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/git-modes-1.4.5.0.20250531.221751.tar";
|
||||
sha256 = "16h7v25rrd818lcnrdh7x6nq4v4q2qb9iisfh4vaya28jysj5wda";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/git-modes-1.4.6.0.20250901.160839.tar";
|
||||
sha256 = "146x7r2dhj4smanpwlbvdwg4229kshcd4lshlpzzmqn1xk6z8yga";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -2225,10 +2246,10 @@
|
||||
elpaBuild {
|
||||
pname = "gnosis";
|
||||
ename = "gnosis";
|
||||
version = "0.5.5.0.20250815.134629";
|
||||
version = "0.5.5.0.20251001.70740";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/gnosis-0.5.5.0.20250815.134629.tar";
|
||||
sha256 = "0ricm6spfgybd5z6k6si868rb00s34ci9cmbdlh439q6n1w0i3j3";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/gnosis-0.5.5.0.20251001.70740.tar";
|
||||
sha256 = "05x98zgr6lxaxxsy76yxb15h5mwihp5xk2ppsrl9csc26sv3z2d6";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -2401,10 +2422,10 @@
|
||||
elpaBuild {
|
||||
pname = "gptel";
|
||||
ename = "gptel";
|
||||
version = "0.9.8.5.0.20250823.231025";
|
||||
version = "0.9.9.0.20251006.195737";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.8.5.0.20250823.231025.tar";
|
||||
sha256 = "0lrydk1lby15iz4z9h1w23mhi4h6vfm6xdcan72qphg9d33xc33y";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.9.0.20251006.195737.tar";
|
||||
sha256 = "0sfwlcg103zgm1f12slc2q2lygxcp92bvb7iddn79609hh1gg9ww";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -2532,10 +2553,10 @@
|
||||
elpaBuild {
|
||||
pname = "haskell-mode";
|
||||
ename = "haskell-mode";
|
||||
version = "17.5.0.20250812.135807";
|
||||
version = "17.5.0.20250930.172812";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20250812.135807.tar";
|
||||
sha256 = "17nbn2dl75v3bvzk4c1yag27ji2mrlhfpc3js0kldcz999sxn52w";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20250930.172812.tar";
|
||||
sha256 = "0wjqyxnjvdxzfaipax3bbm8yjrmxkq54zhm78mr13gx3p1awz0id";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2575,10 +2596,10 @@
|
||||
elpaBuild {
|
||||
pname = "haskell-ts-mode";
|
||||
ename = "haskell-ts-mode";
|
||||
version = "1.3.2.0.20250629.84650";
|
||||
version = "1.3.4.0.20250922.153032";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.3.2.0.20250629.84650.tar";
|
||||
sha256 = "09n25ag4pjxyx5k6ffwpny6cdgblrg9v9kw64v6ili4zni0bvf6k";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/haskell-ts-mode-1.3.4.0.20250922.153032.tar";
|
||||
sha256 = "0glcsp3kvnmqxcydj154shwgyamial6y987z1i0y5jz9rgn9zz7w";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2598,10 +2619,10 @@
|
||||
elpaBuild {
|
||||
pname = "helm";
|
||||
ename = "helm";
|
||||
version = "4.0.5.0.20250823.30001";
|
||||
version = "4.0.6.0.20251005.61450";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.5.0.20250823.30001.tar";
|
||||
sha256 = "180qb00slqj3iswdns8lhb6fj04qrypfxskzsdlmrbywn7g7gprz";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.6.0.20251005.61450.tar";
|
||||
sha256 = "1m1qx22gcz5vgnji8qys1vkmsck9rz830fpc2kany6nzr7z2v8mm";
|
||||
};
|
||||
packageRequires = [
|
||||
helm-core
|
||||
@@ -2623,10 +2644,10 @@
|
||||
elpaBuild {
|
||||
pname = "helm-core";
|
||||
ename = "helm-core";
|
||||
version = "4.0.5.0.20250823.30001";
|
||||
version = "4.0.6.0.20251005.61450";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.5.0.20250823.30001.tar";
|
||||
sha256 = "183z699pn0bdy4qfygnfmi0qaik5pmly8cl16b5zm39qabph4nrs";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.6.0.20251005.61450.tar";
|
||||
sha256 = "0cv2lqibs6as1b8zfqwz9wlg4cfxbljd7mld1qa51p7nmxm3rzjw";
|
||||
};
|
||||
packageRequires = [ async ];
|
||||
meta = {
|
||||
@@ -2686,10 +2707,10 @@
|
||||
elpaBuild {
|
||||
pname = "hl-block-mode";
|
||||
ename = "hl-block-mode";
|
||||
version = "0.2.0.20250113.124218";
|
||||
version = "0.2.0.20250913.225150";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/hl-block-mode-0.2.0.20250113.124218.tar";
|
||||
sha256 = "00xs4cdcwyggccvlsv7l0q58hv4qhbyv0fyl3js8hqs9091qyv70";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/hl-block-mode-0.2.0.20250913.225150.tar";
|
||||
sha256 = "1zwgalb0s1jprfyfldxin9a4gqwjngqf46k24gnxxpw7039gszyw";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2811,10 +2832,10 @@
|
||||
elpaBuild {
|
||||
pname = "idle-highlight-mode";
|
||||
ename = "idle-highlight-mode";
|
||||
version = "1.1.4.0.20240421.64727";
|
||||
version = "1.1.4.0.20250922.133045";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/idle-highlight-mode-1.1.4.0.20240421.64727.tar";
|
||||
sha256 = "0wdzvy6zhxsr4i7s0169s8pl0bd3sms2xjqlvppkyqfmvwiggqkm";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/idle-highlight-mode-1.1.4.0.20250922.133045.tar";
|
||||
sha256 = "004axcdjrp10pflhx1s58ygjic0kcq17l2dg01sj6r8lck89gin9";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2834,10 +2855,10 @@
|
||||
elpaBuild {
|
||||
pname = "idris-mode";
|
||||
ename = "idris-mode";
|
||||
version = "1.1.0.0.20250825.75833";
|
||||
version = "1.1.0.0.20251006.81904";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/idris-mode-1.1.0.0.20250825.75833.tar";
|
||||
sha256 = "0ifxj3na8i0xhrkkh5j5xlassjxjv9snaybkaqd8ah5khj4y8cq9";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/idris-mode-1.1.0.0.20251006.81904.tar";
|
||||
sha256 = "0yga8jfw275c6vkr1dz23d9bm5jshqidzg0fhakpxrl2aiyd8qkh";
|
||||
};
|
||||
packageRequires = [
|
||||
cl-lib
|
||||
@@ -2969,10 +2990,10 @@
|
||||
elpaBuild {
|
||||
pname = "j-mode";
|
||||
ename = "j-mode";
|
||||
version = "2.0.1.0.20240920.120622";
|
||||
version = "2.0.2.0.20251003.80527";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/j-mode-2.0.1.0.20240920.120622.tar";
|
||||
sha256 = "1v0qffz9qd943fmxny0ik5vrgrfskmf6rv9mgxp7xz6wz3v38ypd";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/j-mode-2.0.2.0.20251003.80527.tar";
|
||||
sha256 = "1nzfxdx2ngkndrig2bbqh5y3459gslh9s00r4p9kwwvc5m0wrj47";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -3054,10 +3075,10 @@
|
||||
elpaBuild {
|
||||
pname = "keycast";
|
||||
ename = "keycast";
|
||||
version = "1.4.4.0.20250531.221920";
|
||||
version = "1.4.5.0.20250901.161025";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/keycast-1.4.4.0.20250531.221920.tar";
|
||||
sha256 = "03v4xsg22b86wbbf2cb9cgrid4c1mh5hrj6v7vmwg2f14rdqhl7q";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/keycast-1.4.5.0.20250901.161025.tar";
|
||||
sha256 = "0dj814wrkb24hr5dfghviqnl9c1pnwzw600dx4d00gfy93mpfsq2";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -3097,10 +3118,10 @@
|
||||
elpaBuild {
|
||||
pname = "llama";
|
||||
ename = "llama";
|
||||
version = "1.0.0.0.20250812.133610";
|
||||
version = "1.0.1.0.20250901.154405";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/llama-1.0.0.0.20250812.133610.tar";
|
||||
sha256 = "0ybk2b9nq9sm88376j3ighbzhkklvlga78zl4rim8llafk8yjsi9";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/llama-1.0.1.0.20250901.154405.tar";
|
||||
sha256 = "1qksx33xaavzqd8ywiyb412bi6ykqlyxxk28k4zgkak6sxwrn2jd";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -3150,10 +3171,10 @@
|
||||
elpaBuild {
|
||||
pname = "loopy";
|
||||
ename = "loopy";
|
||||
version = "0.14.0.0.20250810.194832";
|
||||
version = "0.14.0.0.20251008.15638";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/loopy-0.14.0.0.20250810.194832.tar";
|
||||
sha256 = "0s07913f6y63vwrm4zpb4k1wx6sl75vpmfawczyzxgldkjjslnpq";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/loopy-0.14.0.0.20251008.15638.tar";
|
||||
sha256 = "1jmlrbac8psymd17v6hhks7ldqzik99g32cqc756gp5gj9ixdxyf";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -3264,6 +3285,7 @@
|
||||
magit = callPackage (
|
||||
{
|
||||
compat,
|
||||
cond-let,
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
@@ -3276,13 +3298,14 @@
|
||||
elpaBuild {
|
||||
pname = "magit";
|
||||
ename = "magit";
|
||||
version = "4.3.8.0.20250704.230026";
|
||||
version = "4.4.2.0.20251006.184033";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/magit-4.3.8.0.20250704.230026.tar";
|
||||
sha256 = "0bardjnsk52yjz5yd10yv1grzr6rsgzc30v7azmp64hki175xakl";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/magit-4.4.2.0.20251006.184033.tar";
|
||||
sha256 = "1jl4wnxca90vfr42v5wl66arrh8c8ybxcr18lgq4af32shcpz758";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
cond-let
|
||||
llama
|
||||
magit-section
|
||||
seq
|
||||
@@ -3298,6 +3321,7 @@
|
||||
magit-section = callPackage (
|
||||
{
|
||||
compat,
|
||||
cond-let,
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
@@ -3307,13 +3331,14 @@
|
||||
elpaBuild {
|
||||
pname = "magit-section";
|
||||
ename = "magit-section";
|
||||
version = "4.3.8.0.20250704.230026";
|
||||
version = "4.4.2.0.20251006.184033";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.3.8.0.20250704.230026.tar";
|
||||
sha256 = "057npc4k3yxccjd2qwl7fr3zcms1q9n02nmjym1ysak3q16kkynm";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.4.2.0.20251006.184033.tar";
|
||||
sha256 = "1lb6lm7fq0svjrfk6h7x45rhbwfspri46rfsnz2rv54l7jxzb7dh";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
cond-let
|
||||
llama
|
||||
seq
|
||||
];
|
||||
@@ -3355,10 +3380,10 @@
|
||||
elpaBuild {
|
||||
pname = "mastodon";
|
||||
ename = "mastodon";
|
||||
version = "2.0.2.0.20250801.103236";
|
||||
version = "2.0.3.0.20251006.174033";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/mastodon-2.0.2.0.20250801.103236.tar";
|
||||
sha256 = "0wgx53vlg2ifajmr298a3hrz8fy08sgdx909jfbm44kbf4myhm2m";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/mastodon-2.0.3.0.20251006.174033.tar";
|
||||
sha256 = "1b0wxpzgi5g5n8n3kxsxshfpx7nb8xywc0a2qk8qjarii2dlm6wc";
|
||||
};
|
||||
packageRequires = [
|
||||
persist
|
||||
@@ -3430,10 +3455,10 @@
|
||||
elpaBuild {
|
||||
pname = "meow";
|
||||
ename = "meow";
|
||||
version = "1.5.0.0.20250803.54141";
|
||||
version = "1.5.0.0.20250914.165407";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/meow-1.5.0.0.20250803.54141.tar";
|
||||
sha256 = "1yjr5bc90f93vwwnb1gj8ni1i0h8mh5sl51vafyh24dnd49rw9c3";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/meow-1.5.0.0.20250914.165407.tar";
|
||||
sha256 = "02wq0az10vqa7m55mga89aipjfqdwbw83rrf0xdyzc1f1r8841bm";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -3536,10 +3561,10 @@
|
||||
elpaBuild {
|
||||
pname = "multiple-cursors";
|
||||
ename = "multiple-cursors";
|
||||
version = "1.5.0.0.20250210.181349";
|
||||
version = "1.5.0.0.20251006.133827";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/multiple-cursors-1.5.0.0.20250210.181349.tar";
|
||||
sha256 = "072vlw8cb1f1mbzlx68lg8yrmyc7ca2f2iyxmvjy5nn3lx7v6lkd";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/multiple-cursors-1.5.0.0.20251006.133827.tar";
|
||||
sha256 = "0lm29y8vhb1l9aprinpwngwhkh6h0vvihg3hfnf3nr1sh7lcmqzc";
|
||||
};
|
||||
packageRequires = [ cl-lib ];
|
||||
meta = {
|
||||
@@ -3805,10 +3830,10 @@
|
||||
elpaBuild {
|
||||
pname = "org-superstar";
|
||||
ename = "org-superstar";
|
||||
version = "1.5.1.0.20230116.151025";
|
||||
version = "1.7.0.0.20250914.130856";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/org-superstar-1.5.1.0.20230116.151025.tar";
|
||||
sha256 = "02f3lzb8k51rhf13a2warvhg8ib11wagw1zrfaknni7ssiwdj3x6";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/org-superstar-1.7.0.0.20250914.130856.tar";
|
||||
sha256 = "0j2yxmsikpv75asbn8n15fkp1r79ca59in3gfipwnsh1yb5bmc4z";
|
||||
};
|
||||
packageRequires = [ org ];
|
||||
meta = {
|
||||
@@ -3876,10 +3901,10 @@
|
||||
elpaBuild {
|
||||
pname = "orgit";
|
||||
ename = "orgit";
|
||||
version = "2.0.3.0.20250823.203621";
|
||||
version = "2.0.5.0.20250901.181058";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/orgit-2.0.3.0.20250823.203621.tar";
|
||||
sha256 = "0zdblah0hz8lcmvgq035djl79np57bb01ynm2kksflnpz6bsmhsk";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/orgit-2.0.5.0.20250901.181058.tar";
|
||||
sha256 = "1cisgrfca4ry2fayl55swp2h9nr3nxngjyvfdm79z6lv5rciinr1";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -3923,10 +3948,10 @@
|
||||
elpaBuild {
|
||||
pname = "package-lint";
|
||||
ename = "package-lint";
|
||||
version = "0.26.0.20250819.130417";
|
||||
version = "0.26.0.20250828.150659";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.26.0.20250819.130417.tar";
|
||||
sha256 = "0fsjd3sry469xrpkfabid2bh7f3p50ddhwj6c9vabg9fad3yykyd";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.26.0.20250828.150659.tar";
|
||||
sha256 = "0lm66fw4qf5i2jndfpbpglgh8k9hs15fq08vxwmf19sg2mgi8c8l";
|
||||
};
|
||||
packageRequires = [ let-alist ];
|
||||
meta = {
|
||||
@@ -4124,10 +4149,10 @@
|
||||
elpaBuild {
|
||||
pname = "pg";
|
||||
ename = "pg";
|
||||
version = "0.58.0.20250823.202123";
|
||||
version = "0.60.0.20250928.144633";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/pg-0.58.0.20250823.202123.tar";
|
||||
sha256 = "0ddi6025ydm9dzacnnkiry72pc3lwdjb0gljslar15cl9ks2bi0x";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/pg-0.60.0.20250928.144633.tar";
|
||||
sha256 = "0899g9r151ymhimlv40pnb4mx5kqyizbwa1ml6pnqk3as6lld0bj";
|
||||
};
|
||||
packageRequires = [ peg ];
|
||||
meta = {
|
||||
@@ -4145,10 +4170,10 @@
|
||||
elpaBuild {
|
||||
pname = "php-mode";
|
||||
ename = "php-mode";
|
||||
version = "1.26.1.0.20250602.130847";
|
||||
version = "1.26.1.0.20250928.131854";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20250602.130847.tar";
|
||||
sha256 = "0bhwg683jk5sjlq9kvp0318cgp1w7yvi7cfl5svr5qd3d44j7mgk";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20250928.131854.tar";
|
||||
sha256 = "10px7l5j7z0zxzviccng3snp5j8ha7k1vzapmd0dvagjwn6l6dcp";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -4229,10 +4254,10 @@
|
||||
elpaBuild {
|
||||
pname = "proof-general";
|
||||
ename = "proof-general";
|
||||
version = "4.6snapshot0.20250811.112700";
|
||||
version = "4.6snapshot0.20250915.103850";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20250811.112700.tar";
|
||||
sha256 = "1gwdwq8lb22b03fq8a046dqyy4kgdbaf7lhiah64pndhl8649xhq";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20250915.103850.tar";
|
||||
sha256 = "0kanqrxdv0ayf5q6i3wj5xbc2nb7abhvw3sssn2nhn9kzy2yip1m";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -4273,10 +4298,10 @@
|
||||
elpaBuild {
|
||||
pname = "racket-mode";
|
||||
ename = "racket-mode";
|
||||
version = "1.0.20250711.83643";
|
||||
version = "1.0.20250830.122523";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20250711.83643.tar";
|
||||
sha256 = "0fz97vmiwlqbgvbzp0zaa5jy5pbpdbhzg16db1rg01f101x5368h";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20250830.122523.tar";
|
||||
sha256 = "01nqdsblxn2l7c2yv91d7phdpfasz6k4ifsk05647ccjqbvqsr45";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -4336,10 +4361,10 @@
|
||||
elpaBuild {
|
||||
pname = "raku-mode";
|
||||
ename = "raku-mode";
|
||||
version = "0.2.1.0.20240429.100744";
|
||||
version = "0.2.1.0.20250930.115108";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/raku-mode-0.2.1.0.20240429.100744.tar";
|
||||
sha256 = "0nz5gp98m5cl6l0agk2chz7llqldzkl7swkcmka5i4r1m7qx39rr";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/raku-mode-0.2.1.0.20250930.115108.tar";
|
||||
sha256 = "1qvsib5w75n31ya153ixiyfklwqxgmrvv2a7zfqqn5ivzlc14ynk";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -4357,10 +4382,10 @@
|
||||
elpaBuild {
|
||||
pname = "recomplete";
|
||||
ename = "recomplete";
|
||||
version = "0.2.0.20250528.3825";
|
||||
version = "0.2.0.20250913.225149";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/recomplete-0.2.0.20250528.3825.tar";
|
||||
sha256 = "1cip3dy8klcy1hsw2w3wx9lhzpf6inya430japh798drn0k3vi7j";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/recomplete-0.2.0.20250913.225149.tar";
|
||||
sha256 = "0ghkkigd0kh4kwf8wlviaxcmbzvgdbz67vd8qhlm978b48pqpbb5";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -4531,10 +4556,10 @@
|
||||
elpaBuild {
|
||||
pname = "scad-mode";
|
||||
ename = "scad-mode";
|
||||
version = "97.0.0.20250728.23846";
|
||||
version = "97.0.0.20251007.170238";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/scad-mode-97.0.0.20250728.23846.tar";
|
||||
sha256 = "1jvhzhvs0zfx3ygzrm9ixw10wmdv0fy9s3g236kbdrlkc94lddrc";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/scad-mode-97.0.0.20251007.170238.tar";
|
||||
sha256 = "1r0bnwg0li1caq8q29hz9f25y8mpkq5iqx5gnd86il58wwx13r96";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -4573,10 +4598,10 @@
|
||||
elpaBuild {
|
||||
pname = "scroll-on-drag";
|
||||
ename = "scroll-on-drag";
|
||||
version = "0.1.0.20240421.80350";
|
||||
version = "0.1.0.20250913.225149";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/scroll-on-drag-0.1.0.20240421.80350.tar";
|
||||
sha256 = "0yvz2349ii06r69q2a40qw7grxviqfj9bpm36pjb7wzc46bywl23";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/scroll-on-drag-0.1.0.20250913.225149.tar";
|
||||
sha256 = "1igxyz906bgbrx1g0jc4xv43jfhfb0lwilg0nw05mbd1qajv8q1d";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -4594,10 +4619,10 @@
|
||||
elpaBuild {
|
||||
pname = "scroll-on-jump";
|
||||
ename = "scroll-on-jump";
|
||||
version = "0.2.0.20250712.131709";
|
||||
version = "0.2.0.20250913.225149";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/scroll-on-jump-0.2.0.20250712.131709.tar";
|
||||
sha256 = "1x38322dlcfjyj1jy1gmyvc6wwp6idnc802mjc3a4g3yzqjb64iq";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/scroll-on-jump-0.2.0.20250913.225149.tar";
|
||||
sha256 = "057pc5rfd6ighm87jsgbivlgs52vhczp6c1bz6rjrhfqrajhdw6c";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -4658,10 +4683,10 @@
|
||||
elpaBuild {
|
||||
pname = "slime";
|
||||
ename = "slime";
|
||||
version = "2.31snapshot0.20250817.234725";
|
||||
version = "2.31snapshot0.20250918.225852";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/slime-2.31snapshot0.20250817.234725.tar";
|
||||
sha256 = "12jaqyly9y0yvamvm26qgzcx3pqrais581dd50jc4vkfs2s2x0ig";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/slime-2.31snapshot0.20250918.225852.tar";
|
||||
sha256 = "0bpn15a6a8fvr3ycjngqkg5wqkcv95fbkf8s3zr72xv8ys5zlk61";
|
||||
};
|
||||
packageRequires = [ macrostep ];
|
||||
meta = {
|
||||
@@ -4679,10 +4704,10 @@
|
||||
elpaBuild {
|
||||
pname = "sly";
|
||||
ename = "sly";
|
||||
version = "1.0.43.0.20250522.230625";
|
||||
version = "1.0.43.0.20250930.91309";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/sly-1.0.43.0.20250522.230625.tar";
|
||||
sha256 = "13y1h93bf4bmz0mwrwhk6nd4skvcpjw9x0jl1ga2xx1ja6wf81s5";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/sly-1.0.43.0.20250930.91309.tar";
|
||||
sha256 = "0fg0prfy7jp0g5cs0czv8a6i4n29lbz8961h7ybpdn8i5s2mpasd";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -4722,10 +4747,10 @@
|
||||
elpaBuild {
|
||||
pname = "solarized-theme";
|
||||
ename = "solarized-theme";
|
||||
version = "2.0.4.0.20250222.142943";
|
||||
version = "2.0.4.0.20250913.45124";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/solarized-theme-2.0.4.0.20250222.142943.tar";
|
||||
sha256 = "0m8wxvm9a501w4pfc1an4i99h0wv6hpfk1yizh8yjw0y3y8fz606";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/solarized-theme-2.0.4.0.20250913.45124.tar";
|
||||
sha256 = "0cjsz6a14d0zz4r93653d5imvgwpl9xchvr5snbkr8s359fs5icx";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -4764,10 +4789,10 @@
|
||||
elpaBuild {
|
||||
pname = "spell-fu";
|
||||
ename = "spell-fu";
|
||||
version = "0.3.0.20250712.131907";
|
||||
version = "0.3.0.20250913.225149";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/spell-fu-0.3.0.20250712.131907.tar";
|
||||
sha256 = "1v9ahhwapqg4a7v82ipx2rcfk9ibrbrsapqk3b3md552j4fdrwzp";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/spell-fu-0.3.0.20250913.225149.tar";
|
||||
sha256 = "03c7ivc3wmcbwhwyca52naxjwlbsnzzwws8x4cfpydngfrbrfgrb";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -4797,6 +4822,27 @@
|
||||
};
|
||||
}
|
||||
) { };
|
||||
standard-keys-mode = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "standard-keys-mode";
|
||||
ename = "standard-keys-mode";
|
||||
version = "1.0.0.0.20250905.172556";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/standard-keys-mode-1.0.0.0.20250905.172556.tar";
|
||||
sha256 = "1vxzb1a5qmafs3n9a74fkyb888qk3q1zfm61ywjjsfs7bj4z87fg";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
homepage = "https://elpa.nongnu.org/nongnu-devel/standard-keys-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
) { };
|
||||
stylus-mode = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
@@ -4887,17 +4933,16 @@
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
seq,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "swift-mode";
|
||||
ename = "swift-mode";
|
||||
version = "9.4.0.0.20250615.100102";
|
||||
version = "9.4.0.0.20250922.71205";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/swift-mode-9.4.0.0.20250615.100102.tar";
|
||||
sha256 = "13b7vbkhb8zw4x3inpfpdhaakgvp6msm1p377dmhpjddz3ngf3l5";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/swift-mode-9.4.0.0.20250922.71205.tar";
|
||||
sha256 = "1ydsnrdschridpm72228v690024l95bl97hp1l8x5qyxhyg147js";
|
||||
};
|
||||
packageRequires = [ seq ];
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
homepage = "https://elpa.nongnu.org/nongnu-devel/swift-mode.html";
|
||||
license = lib.licenses.free;
|
||||
@@ -5154,10 +5199,10 @@
|
||||
elpaBuild {
|
||||
pname = "treesit-fold";
|
||||
ename = "treesit-fold";
|
||||
version = "0.2.1.0.20250816.45809";
|
||||
version = "0.2.1.0.20250911.3703";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/treesit-fold-0.2.1.0.20250816.45809.tar";
|
||||
sha256 = "03j1lcrsx14qm4m7k6h56aka7r94gzp7c97jpm404fwnn9zdrib8";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/treesit-fold-0.2.1.0.20250911.3703.tar";
|
||||
sha256 = "06wjzpgd0525xb8xq968p78y319hy4jxk97kxjdy3cbcf368s58w";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -5197,10 +5242,10 @@
|
||||
elpaBuild {
|
||||
pname = "tuareg";
|
||||
ename = "tuareg";
|
||||
version = "3.0.2snapshot0.20250227.215734";
|
||||
version = "3.0.2snapshot0.20250910.140516";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/tuareg-3.0.2snapshot0.20250227.215734.tar";
|
||||
sha256 = "1ngkjn7dr2k61w5vv8qjgjj8wwc9674px7w1hc8539f7nplf7i71";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/tuareg-3.0.2snapshot0.20250910.140516.tar";
|
||||
sha256 = "0m9xid4s6qqdw8vlpgzsf2lc877shf7dvfxk8b9bhiva56dhrqfw";
|
||||
};
|
||||
packageRequires = [ caml ];
|
||||
meta = {
|
||||
@@ -5239,10 +5284,10 @@
|
||||
elpaBuild {
|
||||
pname = "typst-ts-mode";
|
||||
ename = "typst-ts-mode";
|
||||
version = "0.12.2.0.20250807.11325";
|
||||
version = "0.12.2.0.20250906.143855";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/typst-ts-mode-0.12.2.0.20250807.11325.tar";
|
||||
sha256 = "1j28vzijhn7aqr3h8pjslixbz38j97zgvx3f86myi2ag5l8k615g";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/typst-ts-mode-0.12.2.0.20250906.143855.tar";
|
||||
sha256 = "1qi73s1r6ld6l31xf3sa9ml52zlcpwp2wr5m2w76i1bcwylgnaad";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -5302,10 +5347,10 @@
|
||||
elpaBuild {
|
||||
pname = "undo-fu-session";
|
||||
ename = "undo-fu-session";
|
||||
version = "0.7.0.20250611.33234";
|
||||
version = "0.7.0.20250918.1702";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/undo-fu-session-0.7.0.20250611.33234.tar";
|
||||
sha256 = "0nzm5y4diim3di2kyaxamgbibni0vrd59d92f3fi7wyxcwb0v8dw";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/undo-fu-session-0.7.0.20250918.1702.tar";
|
||||
sha256 = "19ir40rg2zrmr2f1dfkxk304vhg1rv9bg8g5a0pn5j2qlgwcn5kb";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -5365,10 +5410,10 @@
|
||||
elpaBuild {
|
||||
pname = "visual-fill-column";
|
||||
ename = "visual-fill-column";
|
||||
version = "2.6.3.0.20250505.230743";
|
||||
version = "2.7.0.0.20250925.121619";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/visual-fill-column-2.6.3.0.20250505.230743.tar";
|
||||
sha256 = "1cl39911k73cz5qbllyy82jw7hhbd6dly3s4p0kfnmav461b3qcp";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/visual-fill-column-2.7.0.0.20250925.121619.tar";
|
||||
sha256 = "0ymr57mwd6k9xia62dqwjxmywlhc5y7vnfc5ag8z9j232znshllp";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -5388,10 +5433,10 @@
|
||||
elpaBuild {
|
||||
pname = "vm";
|
||||
ename = "vm";
|
||||
version = "8.3.0snapshot0.20250629.80737";
|
||||
version = "8.3.0snapshot0.20250922.112745";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20250629.80737.tar";
|
||||
sha256 = "0vv7chilnsrig15asv0iy916vmvksbyhxasvlldykq9z3w4r6abi";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.0snapshot0.20250922.112745.tar";
|
||||
sha256 = "1p1jyqwb1m0rxkpyr69yzkjjfv4yj1x3gfk8h5xizjcqisxckpaa";
|
||||
};
|
||||
packageRequires = [
|
||||
cl-lib
|
||||
@@ -5412,10 +5457,10 @@
|
||||
elpaBuild {
|
||||
pname = "web-mode";
|
||||
ename = "web-mode";
|
||||
version = "17.3.21.0.20250714.65721";
|
||||
version = "17.3.22.0.20250827.131545";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/web-mode-17.3.21.0.20250714.65721.tar";
|
||||
sha256 = "0v4jcv0lcm4gds8m086f79wpbd0d64i0y1cf8z5rvrx8psf93wpc";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/web-mode-17.3.22.0.20250827.131545.tar";
|
||||
sha256 = "1qlkdzcm8y3aa3wsh53da7360gavfz3rsvin022581sq05bwys5z";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -5523,10 +5568,10 @@
|
||||
elpaBuild {
|
||||
pname = "with-editor";
|
||||
ename = "with-editor";
|
||||
version = "3.4.5.0.20250811.205345";
|
||||
version = "3.4.6.0.20250901.161817";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.5.0.20250811.205345.tar";
|
||||
sha256 = "0y4gm4dw0nwcq7m2n68ysk4sqrr2bbn4m8skgl6m66iag9av58j0";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.6.0.20250901.161817.tar";
|
||||
sha256 = "1387wiakkxw2vpdp07sj1d3dy8vbk1113jmmp980swpd1gm4hfmy";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -5633,10 +5678,10 @@
|
||||
elpaBuild {
|
||||
pname = "xah-fly-keys";
|
||||
ename = "xah-fly-keys";
|
||||
version = "28.4.20250825201039.0.20250825.201812";
|
||||
version = "28.7.20250917123258.0.20250917.123752";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-28.4.20250825201039.0.20250825.201812.tar";
|
||||
sha256 = "12z8ygjsyw1faa3b2j9s0fsnkil5rzik35k3k4dwyvzvdrmm8m5n";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-28.7.20250917123258.0.20250917.123752.tar";
|
||||
sha256 = "03hx3z023xv467zwmgz9g2k0ps2vvd95fs1n6f8msdv5f2sxysx9";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -5762,10 +5807,10 @@
|
||||
elpaBuild {
|
||||
pname = "zig-mode";
|
||||
ename = "zig-mode";
|
||||
version = "0.0.8.0.20250812.82048";
|
||||
version = "0.0.8.0.20250915.80705";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/zig-mode-0.0.8.0.20250812.82048.tar";
|
||||
sha256 = "0wdcd7v40zgzh5zh5y17vzkwh028grzq93w65hhr42qq2g85rqy8";
|
||||
url = "https://elpa.nongnu.org/nongnu-devel/zig-mode-0.0.8.0.20250915.80705.tar";
|
||||
sha256 = "0dz5gaja4zkq2vdamq2msqyxp8j59m131cm8mgjwz4jikcxg600b";
|
||||
};
|
||||
packageRequires = [ reformatter ];
|
||||
meta = {
|
||||
|
||||
@@ -678,6 +678,27 @@
|
||||
};
|
||||
}
|
||||
) { };
|
||||
cond-let = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "cond-let";
|
||||
ename = "cond-let";
|
||||
version = "0.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/cond-let-0.1.1.tar";
|
||||
sha256 = "1s1gzmn2xa76hbk0q60gznsj0p8kfn1b4fzijdkqdrvindmc4ymw";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
homepage = "https://elpa.nongnu.org/nongnu/cond-let.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
) { };
|
||||
consult-flycheck = callPackage (
|
||||
{
|
||||
consult,
|
||||
@@ -1230,10 +1251,10 @@
|
||||
elpaBuild {
|
||||
pname = "elpher";
|
||||
ename = "elpher";
|
||||
version = "3.6.5";
|
||||
version = "3.6.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/elpher-3.6.5.tar";
|
||||
sha256 = "0ab6m1c32j3rp577v8qb4k542fjgpvvkcgjvzfcc56fwb9d6xfy0";
|
||||
url = "https://elpa.nongnu.org/nongnu/elpher-3.6.6.tar";
|
||||
sha256 = "0wb1d5cm2gsjarqb9z06hx7nry37la6g5s44bb8q7j2xfd11h764";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -1251,10 +1272,10 @@
|
||||
elpaBuild {
|
||||
pname = "emacsql";
|
||||
ename = "emacsql";
|
||||
version = "4.3.1";
|
||||
version = "4.3.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/emacsql-4.3.1.tar";
|
||||
sha256 = "0lqawas0zdrri1csy6vh25wffsxipwc642xzgxwrgxb4v3ga32zn";
|
||||
url = "https://elpa.nongnu.org/nongnu/emacsql-4.3.2.tar";
|
||||
sha256 = "0yl5j35r3s3z4pnxpk6hx2a8piw110rgc67zz3nmkp8ppzkz9h86";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -1833,10 +1854,10 @@
|
||||
elpaBuild {
|
||||
pname = "flymake-pyrefly";
|
||||
ename = "flymake-pyrefly";
|
||||
version = "0.1.6";
|
||||
version = "0.1.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/flymake-pyrefly-0.1.6.tar";
|
||||
sha256 = "06z8hkivi2k24yk8bqkgcm52al5jfz82kwjhzbc3j0aaickmacnm";
|
||||
url = "https://elpa.nongnu.org/nongnu/flymake-pyrefly-0.1.8.tar";
|
||||
sha256 = "19h8lmwk4p3lq985d0sqv1b9s6g04dazl31bc0n0y90ksl6ab5f5";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2217,10 +2238,10 @@
|
||||
elpaBuild {
|
||||
pname = "git-modes";
|
||||
ename = "git-modes";
|
||||
version = "1.4.5";
|
||||
version = "1.4.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.5.tar";
|
||||
sha256 = "0m4z6hvm6zf90lbdhkny8fcj4k1y9bqwcxj4ikv51xhz03604l4d";
|
||||
url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.6.tar";
|
||||
sha256 = "0hxvdm8578pl5f7fb2xi46a9arfr97cyybizk6yi17p82nz6s9g7";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -2418,10 +2439,10 @@
|
||||
elpaBuild {
|
||||
pname = "gptel";
|
||||
ename = "gptel";
|
||||
version = "0.9.8.5";
|
||||
version = "0.9.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/gptel-0.9.8.5.tar";
|
||||
sha256 = "1zxmbp6b0ldycniciz592v28j3by7niz7m60rilpr97hzl5v56nl";
|
||||
url = "https://elpa.nongnu.org/nongnu/gptel-0.9.9.tar";
|
||||
sha256 = "1vnnizqb60sipim7fllv5hvwd9xjsp08wyn1gnhn8j91yv90hlqb";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -2591,10 +2612,10 @@
|
||||
elpaBuild {
|
||||
pname = "haskell-ts-mode";
|
||||
ename = "haskell-ts-mode";
|
||||
version = "1.3.2";
|
||||
version = "1.3.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/haskell-ts-mode-1.3.2.tar";
|
||||
sha256 = "0hc34lr24gjviqmlghaidv71mjmvvv4mpzb87z5a0mqkz9y0a2ds";
|
||||
url = "https://elpa.nongnu.org/nongnu/haskell-ts-mode-1.3.4.tar";
|
||||
sha256 = "1z0bl88w9gf53cfmnfq0iqq2hqm2bmy6wl8fwydvayn77lr5x72h";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -2614,10 +2635,10 @@
|
||||
elpaBuild {
|
||||
pname = "helm";
|
||||
ename = "helm";
|
||||
version = "4.0.5";
|
||||
version = "4.0.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-4.0.5.tar";
|
||||
sha256 = "1dbkpyq42f4gl9mc4aqjwdddmn800pga8dpvzky3qpns0q7i1d6g";
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-4.0.6.tar";
|
||||
sha256 = "1nnkhffns1yj24slfln5rywqdw514jfklys3g5kmrl90i9apd5cp";
|
||||
};
|
||||
packageRequires = [
|
||||
helm-core
|
||||
@@ -2639,10 +2660,10 @@
|
||||
elpaBuild {
|
||||
pname = "helm-core";
|
||||
ename = "helm-core";
|
||||
version = "4.0.5";
|
||||
version = "4.0.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-core-4.0.5.tar";
|
||||
sha256 = "0l0z0lq78fha77g1a7iz4zlmidw0c3ri6b4kwrc3jm8cn218q87v";
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-core-4.0.6.tar";
|
||||
sha256 = "0b39k4wwl3sjw5c19g36a0lsxiascrqw23cf3hgksrpzp3amipbz";
|
||||
};
|
||||
packageRequires = [ async ];
|
||||
meta = {
|
||||
@@ -2985,10 +3006,10 @@
|
||||
elpaBuild {
|
||||
pname = "j-mode";
|
||||
ename = "j-mode";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/j-mode-2.0.1.tar";
|
||||
sha256 = "0kk29s3xqad72jxvzzbl4b4z8b4l7xx1vyfcbsj8ns8hv8cip3l3";
|
||||
url = "https://elpa.nongnu.org/nongnu/j-mode-2.0.2.tar";
|
||||
sha256 = "109fy5r3hfz15qdsrmdr6iik4w1kzn2pz7077xrd4mbi7gw5ggdx";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -3070,10 +3091,10 @@
|
||||
elpaBuild {
|
||||
pname = "keycast";
|
||||
ename = "keycast";
|
||||
version = "1.4.4";
|
||||
version = "1.4.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/keycast-1.4.4.tar";
|
||||
sha256 = "05i3n7kd5aj0rwxva21ri108w1hjsmgjgv5004r3ngim73h1qlw3";
|
||||
url = "https://elpa.nongnu.org/nongnu/keycast-1.4.5.tar";
|
||||
sha256 = "0c847ailkfa46f6p4d9j6fg485cj8pwd208ynxz5sx5my4gqfnbw";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -3113,10 +3134,10 @@
|
||||
elpaBuild {
|
||||
pname = "llama";
|
||||
ename = "llama";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/llama-1.0.0.tar";
|
||||
sha256 = "1awxli95p2wwddij7nyjlivcknnxz5j19i65zr9l8awj199scnlx";
|
||||
url = "https://elpa.nongnu.org/nongnu/llama-1.0.1.tar";
|
||||
sha256 = "1aldq3waibplzc2m1qfhf58rmi6h3wfgghmdk6q5ixx2y1gml1vq";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -3280,6 +3301,7 @@
|
||||
magit = callPackage (
|
||||
{
|
||||
compat,
|
||||
cond-let,
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
@@ -3292,13 +3314,14 @@
|
||||
elpaBuild {
|
||||
pname = "magit";
|
||||
ename = "magit";
|
||||
version = "4.3.8";
|
||||
version = "4.4.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/magit-4.3.8.tar";
|
||||
sha256 = "03m2b155xanm9mjj886na7j9bky7a4f2lay4mm6i0r60adsz26nm";
|
||||
url = "https://elpa.nongnu.org/nongnu/magit-4.4.2.tar";
|
||||
sha256 = "0l0fvf4gx4xj7474h5k00p4aa33y7z7x9lgy41vxi47vbifki2yk";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
cond-let
|
||||
llama
|
||||
magit-section
|
||||
seq
|
||||
@@ -3314,6 +3337,7 @@
|
||||
magit-section = callPackage (
|
||||
{
|
||||
compat,
|
||||
cond-let,
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
@@ -3323,13 +3347,14 @@
|
||||
elpaBuild {
|
||||
pname = "magit-section";
|
||||
ename = "magit-section";
|
||||
version = "4.3.8";
|
||||
version = "4.4.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/magit-section-4.3.8.tar";
|
||||
sha256 = "0h2l769ailf48an78cbrnmxsnpzhaklw23lq2lby3n2wm5d1gmn3";
|
||||
url = "https://elpa.nongnu.org/nongnu/magit-section-4.4.2.tar";
|
||||
sha256 = "00324rd8r0pcdpgls1m0awjbms68fglsi045b8zrk6q6ahz1v08x";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
cond-let
|
||||
llama
|
||||
seq
|
||||
];
|
||||
@@ -3371,10 +3396,10 @@
|
||||
elpaBuild {
|
||||
pname = "mastodon";
|
||||
ename = "mastodon";
|
||||
version = "2.0.2";
|
||||
version = "2.0.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/mastodon-2.0.2.tar";
|
||||
sha256 = "146ds0wzw7l1irn5had926y5irqa1j5cld5s0pfmvyh18zjzn9bg";
|
||||
url = "https://elpa.nongnu.org/nongnu/mastodon-2.0.3.tar";
|
||||
sha256 = "07snrvsbwvzky8b8whwy3qwwdzj84bfr23c2m11b5sskkgjykvy0";
|
||||
};
|
||||
packageRequires = [
|
||||
persist
|
||||
@@ -3828,10 +3853,10 @@
|
||||
elpaBuild {
|
||||
pname = "org-superstar";
|
||||
ename = "org-superstar";
|
||||
version = "1.5.1";
|
||||
version = "1.7.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/org-superstar-1.5.1.tar";
|
||||
sha256 = "1v6v7a0frgxlywfq6g4mdl6sz448k2ql7j4j4f1wrll33mr7gx8g";
|
||||
url = "https://elpa.nongnu.org/nongnu/org-superstar-1.7.0.tar";
|
||||
sha256 = "1c52kpsj52zswjyv35b6pdd41y4a8hkm1rww3zmrdm80h05sifz0";
|
||||
};
|
||||
packageRequires = [ org ];
|
||||
meta = {
|
||||
@@ -3899,10 +3924,10 @@
|
||||
elpaBuild {
|
||||
pname = "orgit";
|
||||
ename = "orgit";
|
||||
version = "2.0.3";
|
||||
version = "2.0.5";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/orgit-2.0.3.tar";
|
||||
sha256 = "0iy12sl2qwgh30c5ycxgc38yv8kx6cjcj9x3akq88y5zwqqswvm9";
|
||||
url = "https://elpa.nongnu.org/nongnu/orgit-2.0.5.tar";
|
||||
sha256 = "0k24rg1pfajqnagd2yljsccs66si56d7s4aybq9jd086f4wx3fcq";
|
||||
};
|
||||
packageRequires = [
|
||||
compat
|
||||
@@ -4147,10 +4172,10 @@
|
||||
elpaBuild {
|
||||
pname = "pg";
|
||||
ename = "pg";
|
||||
version = "0.58";
|
||||
version = "0.60";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/pg-0.58.tar";
|
||||
sha256 = "1h5arpkm9gchn3igv6zzrip0pc9qb0ib0gfsj59svarxa3nvmssn";
|
||||
url = "https://elpa.nongnu.org/nongnu/pg-0.60.tar";
|
||||
sha256 = "06jlr38jbxnmmgqqic1n6d22sx0kfszv9awh3597lsvx044ix48j";
|
||||
};
|
||||
packageRequires = [ peg ];
|
||||
meta = {
|
||||
@@ -4296,10 +4321,10 @@
|
||||
elpaBuild {
|
||||
pname = "racket-mode";
|
||||
ename = "racket-mode";
|
||||
version = "1.0.20250711.83643";
|
||||
version = "1.0.20250830.122523";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20250711.83643.tar";
|
||||
sha256 = "0qcsk00f0wfcz2h2kqckhb7yw66gw1cpcygmjri5bhnis1irzkki";
|
||||
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20250830.122523.tar";
|
||||
sha256 = "0bxinraaj2cnhd6x1sgps36k5vir57l4jn0x5rlndv4lsb2bp18c";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -4815,6 +4840,28 @@
|
||||
};
|
||||
}
|
||||
) { };
|
||||
standard-keys-mode = callPackage (
|
||||
{
|
||||
compat,
|
||||
elpaBuild,
|
||||
fetchurl,
|
||||
lib,
|
||||
}:
|
||||
elpaBuild {
|
||||
pname = "standard-keys-mode";
|
||||
ename = "standard-keys-mode";
|
||||
version = "1.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/standard-keys-mode-1.0.0.tar";
|
||||
sha256 = "1c673y9xaw3i09ihhx7qbixm7rvyynxkv304wafrv7aflrzqranj";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
homepage = "https://elpa.nongnu.org/nongnu/standard-keys-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}
|
||||
) { };
|
||||
stylus-mode = callPackage (
|
||||
{
|
||||
elpaBuild,
|
||||
@@ -5405,10 +5452,10 @@
|
||||
elpaBuild {
|
||||
pname = "visual-fill-column";
|
||||
ename = "visual-fill-column";
|
||||
version = "2.6.3";
|
||||
version = "2.7.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.6.3.tar";
|
||||
sha256 = "0agxixxlv3lnsng8jk7y6x1kzzvx3sw5m3mhl8gr4i1didgxc37n";
|
||||
url = "https://elpa.nongnu.org/nongnu/visual-fill-column-2.7.0.tar";
|
||||
sha256 = "1xv42kzmizhr7k35xw08zib71anrif3gsbzc566gvl7yqpjd30zm";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -5426,10 +5473,10 @@
|
||||
elpaBuild {
|
||||
pname = "web-mode";
|
||||
ename = "web-mode";
|
||||
version = "17.3.21";
|
||||
version = "17.3.22";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.21.tar";
|
||||
sha256 = "0yqaszrkllfgp0ph7rvjhz35wqzi4bas0qw70d49vaxq4z7bikzg";
|
||||
url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.22.tar";
|
||||
sha256 = "0218wkngd59k73860zi458qabv4cbnc2150fcj7sn1i4im7f3crf";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
@@ -5537,10 +5584,10 @@
|
||||
elpaBuild {
|
||||
pname = "with-editor";
|
||||
ename = "with-editor";
|
||||
version = "3.4.5";
|
||||
version = "3.4.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/with-editor-3.4.5.tar";
|
||||
sha256 = "1bwrn24kqc612ddjl9rpvwkdb1igsqrlmmf1fnad1zza8d09s5iz";
|
||||
url = "https://elpa.nongnu.org/nongnu/with-editor-3.4.6.tar";
|
||||
sha256 = "1l3sdfd6k6baw87jgz25f7rlgwgi15f2nj51cfgjy6kkgf5ag48s";
|
||||
};
|
||||
packageRequires = [ compat ];
|
||||
meta = {
|
||||
@@ -5647,10 +5694,10 @@
|
||||
elpaBuild {
|
||||
pname = "xah-fly-keys";
|
||||
ename = "xah-fly-keys";
|
||||
version = "28.4.20250825201039";
|
||||
version = "28.7.20250917123258";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-28.4.20250825201039.tar";
|
||||
sha256 = "19vdcmimk3f8g14bjmk0wvlm0jq50r36gnc39ilxlbm84ybyrpl6";
|
||||
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-28.7.20250917123258.tar";
|
||||
sha256 = "1d4r112via671f2x0db1ssxsbhi1w24zklgik3wgz619ng7al2ry";
|
||||
};
|
||||
packageRequires = [ ];
|
||||
meta = {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -13,19 +13,19 @@ let
|
||||
vsix = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
name = "gitlens-${finalAttrs.version}.zip";
|
||||
pname = "gitlens-vsix";
|
||||
version = "17.5.1";
|
||||
version = "17.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gitkraken";
|
||||
repo = "vscode-gitlens";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-DGV4liUpJNM6ktMy3jQ1iEQ7H5mPM17f0uqA8QYHoLc=";
|
||||
hash = "sha256-D0huUzjvyJTLxGgtTl1ZUQVwJx2uwO/uWGvcGfT8MyA=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-Lx8YRG3B3t83t85PqDMevIm7M0ks2IsluwL1I5zThdA=";
|
||||
hash = "sha256-ZJAXjG1OF3Ey0LKJ4zadoRmbJg+qX2wAZCV4Ozrbyyg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -8,8 +8,8 @@ makeScopeWithSplicing' {
|
||||
extra = self: {
|
||||
mkLinphoneDerivation = self.mk-linphone-derivation;
|
||||
|
||||
linphoneSdkVersion = "5.4.43";
|
||||
linphoneSdkHash = "sha256-lv2phU2qF51OIejzjgaBUo9NIdDv4bbK+bpY37Gnr8U=";
|
||||
linphoneSdkVersion = "5.4.48";
|
||||
linphoneSdkHash = "sha256-sOkq73YWbhpKJOk1dVc4tkg2+RuGyRK8/t4ckMIVVG8=";
|
||||
};
|
||||
f =
|
||||
self:
|
||||
|
||||
+2
-2
@@ -39,7 +39,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "linphone-desktop";
|
||||
version = "5.3.0";
|
||||
version = "5.3.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.linphone.org";
|
||||
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
group = "BC";
|
||||
repo = "linphone-desktop";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-SxYI2ZOtA49K2XPoTRPAIziAwC8SRrHMC3NISBFyuH0=";
|
||||
hash = "sha256-TO9JNsOnx4sTJEkai0nDKNyZWcLuGoWfuKLBM79tQvs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "airwindows";
|
||||
version = "0-unstable-2025-09-20";
|
||||
version = "0-unstable-2025-10-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "airwindows";
|
||||
repo = "airwindows";
|
||||
rev = "3381f94bfef51551e3b060f45057ab613129fb35";
|
||||
hash = "sha256-6CUAAxuqfEMb4zhrkBLHccFfaSHhP/PTiBFJAZmFMnE=";
|
||||
rev = "5889ed48beefd556adca76ed3e4b1b4982531dbd";
|
||||
hash = "sha256-zpuzKpuYGe0xpUrBeWpaCYEBy9mGOX5R3LAeiWPCQ3s=";
|
||||
};
|
||||
|
||||
# we patch helpers because honestly im spooked out by where those variables
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "bulletty";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CrociDB";
|
||||
repo = "bulletty";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ceXHrsxUSDx4orlHTOdynYKDID/uvp8NxVMei1EqDA8=";
|
||||
hash = "sha256-MVXz3ozAL26EYWAsarFbRR0cmAtaRpxcQROsLye56yE=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-vhZaklpNIGSMRSjD+WINphMVsAcepUJfw9WBnaxoK4c=";
|
||||
cargoHash = "sha256-Q9h9VUTeFvP6pkQKj7y2pKVpoeg1hyoAbXMhAaO5zh8=";
|
||||
|
||||
# perl is required for bulletty package build for openssl
|
||||
nativeBuildInputs = with pkgs; [
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-license";
|
||||
version = "0.6.1";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-qwyWj0vPWQOZYib2ZZutX25a4wwnG1kFAiRCWqGyVms=";
|
||||
hash = "sha256-bOBrjChkQM6POZZn53JmJcIn1x+ygF5mthZihMskxIk=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6UMmYbLgMg+wLDsL63f5OvWbtHtDXo0mByz6OZp1lsw=";
|
||||
cargoHash = "sha256-VQ8320yxMo102UZ9iO9n7ujq7d6wUuqOnQB02hxHZas=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cargo subcommand to see license of dependencies";
|
||||
|
||||
@@ -94,6 +94,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
mainProgram = "cinny";
|
||||
# Waiting for update to Tauri v2, webkitgtk_4_0 is deprecated
|
||||
# See https://github.com/cinnyapp/cinny-desktop/issues/398 and https://github.com/NixOS/nixpkgs/pull/450065
|
||||
broken = true;
|
||||
broken = stdenv.hostPlatform.isLinux;
|
||||
};
|
||||
})
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clipman";
|
||||
version = "1.6.4";
|
||||
version = "1.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chmouel";
|
||||
repo = "clipman";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-kuW74iUVLfIUWf3gaKM7IuMU1nfpU9SbSsfeZDbYGhY=";
|
||||
sha256 = "sha256-fAiXivLXpxezvMUKv0HfDvzSN60G4RFfgi6/fO0C1p8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-I1RWyjyOfppGi+Z5nvAei5zEvl0eQctcH8NP0MYSTbg=";
|
||||
vendorHash = "sha256-QD/ucnIqPHgKaYRmBO4fwDVqC7kKlYmBaZp3XBWudy0=";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
||||
@@ -36,6 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# Don't leak kernel version into the build output for reproducibility
|
||||
(lib.cmakeFeature "CMAKE_SYSTEM_VERSION" "")
|
||||
(lib.cmakeBool "ENABLE_MPI" mpiSupport)
|
||||
];
|
||||
|
||||
|
||||
@@ -19,13 +19,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "cosmic-reader";
|
||||
version = "0-unstable-2025-10-02";
|
||||
version = "0-unstable-2025-10-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-reader";
|
||||
rev = "2fa9595999cb654b5e6bb688035ea9ec0717b8db";
|
||||
hash = "sha256-7/nes4zMcvTtGWFABikcA1NM+LxWrin0POE76BbYgKE=";
|
||||
rev = "8d02b136b0b558de09a2de0c99511a8bf0bb99cd";
|
||||
hash = "sha256-ldmrn2R6gZ+heXARqsMShWCDazH8MGA9Rm2M65T1aqI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4ofAtZN3FpYwNahinldALbdEJA5lDwa+CUsVIISnSTc=";
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
cmake,
|
||||
icu74,
|
||||
icu,
|
||||
pkg-config,
|
||||
testers,
|
||||
validatePkgConfig,
|
||||
@@ -22,9 +22,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-baM6EX9D0yfrKxuPXyUUV9RqdrVLyygeG6x57xN8lc4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = lib.optionals enableUnicodeHelp [ icu74.dev ];
|
||||
propagatedBuildInputs = lib.optionals enableUnicodeHelp [ icu.dev ];
|
||||
cmakeFlags = [
|
||||
"-DCXXOPTS_BUILD_EXAMPLES=OFF"
|
||||
"-DCXXOPTS_CXX_STANDARD=17"
|
||||
]
|
||||
++ lib.optional enableUnicodeHelp "-DCXXOPTS_USE_UNICODE_HELP=TRUE";
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "egctl";
|
||||
version = "1.5.1";
|
||||
version = "1.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "envoyproxy";
|
||||
repo = "gateway";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-glOnAnNuefdTq4BOd1NKpsadrWEqVOOc18jPx7lEwEQ=";
|
||||
hash = "sha256-j0X9v6jDvwf/roMkL/abbVKOEeCKtlpWEZ+U5TlBjxw=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-SNXnEutsDQwoGKiJN3uXxVrCl4gFcd62ZuX8GPyGliI=";
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "flood";
|
||||
version = "4.9.5";
|
||||
version = "4.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jesec";
|
||||
repo = "flood";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-UXapL26PsSJvWX4Vjj/JJC/FsUBLuGEoqv2dSRSQqNg=";
|
||||
hash = "sha256-+mVfaCxSHGy4r3ULO2bnV5X2xG7LJT27Bce0y55i6DA=";
|
||||
};
|
||||
|
||||
npmConfigHook = pnpm_9.configHook;
|
||||
@@ -24,7 +24,7 @@ buildNpmPackage rec {
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit pname version src;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-xoCRZUJkdR4X5hszM5gaOyWXLNCbzG5CzF+6OXGEy1k=";
|
||||
hash = "sha256-MnsUTXcLMT0Q2bQ/rRD4FfJx8XP9TLiv1oTHIgnMZCQ=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gat";
|
||||
version = "0.25.3";
|
||||
version = "0.25.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "koki-develop";
|
||||
repo = "gat";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-LQr3iC4yXrs8Bdfznu2fR2jjeQh/ZAwlo6zoMwvjlL4=";
|
||||
hash = "sha256-DRTSI6fCakVjAzGGlisvTkDiIQKXlv3XQ3SfB2UjiC8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-287u3zjlEOuc45stq7k1v5IINRUASw83sw6Dmqv9aUs=";
|
||||
|
||||
@@ -27,6 +27,12 @@ stdenv.mkDerivation rec {
|
||||
xorg.libX11
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
'cmake_minimum_required(VERSION 2.8)' \
|
||||
'cmake_minimum_required(VERSION 3.10)'
|
||||
'';
|
||||
|
||||
configureScript = ''
|
||||
cmake
|
||||
'';
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
glib,
|
||||
sqlite,
|
||||
pkg-config,
|
||||
fetchpatch,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -20,6 +21,20 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1miwbqzkhg0v3zysrwh60pj9sv6ci4lzq2vq2hhc6pc6hdyh8xyr";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/glyr/files/glyr-1.0.10-curl.patch?id=51addb56510c82d88ebac65d9ca4c8ca8e005693";
|
||||
hash = "sha256-mRB0R04CWD+DFkjo5wfvFveUb98+gDAgxWTnrV0K1vk=";
|
||||
})
|
||||
];
|
||||
|
||||
# Compile with cmake >= 4.0
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
"CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" \
|
||||
"CMAKE_MINIMUM_REQUIRED(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
|
||||
@@ -28,12 +28,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gpu-screen-recorder";
|
||||
version = "5.7.4";
|
||||
version = "5.8.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://repo.dec05eba.com/${pname}";
|
||||
tag = version;
|
||||
hash = "sha256-X1yvVmjKYUnwdsRC0kY+R1kEuUq6SB1bKhpHWnBvIho=";
|
||||
hash = "sha256-H9aJ0JglYckd/+6E7dfRzoAUpsTBX8XmI2TR1907sPI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
{
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
lib,
|
||||
nix-update-script,
|
||||
rustPlatform,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "hledger-fmt";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mondeja";
|
||||
repo = "hledger-fmt";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5dPKSUJLxQ5WXZefuwr3wLhr3MNzy+dzpJkgKFU0/SE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
cargoHash = "sha256-yErH9AyfBZF0PByqViVhXHB/FAc0awz4bOyAHtcHe0s=";
|
||||
|
||||
# Tests try to invoke the binary from "target/debug/hledger-fmt"
|
||||
# https://github.com/mondeja/hledger-fmt/blob/783abdb32eefb20195c7e9562858552935bb9c8e/src/cli/tests.rs#L5
|
||||
postPatch = ''
|
||||
substituteInPlace src/cli/tests.rs --replace-fail \
|
||||
'target/debug' "target/${stdenv.hostPlatform.rust.rustcTargetSpec}/$cargoCheckType"
|
||||
'';
|
||||
|
||||
buildFeatures = [
|
||||
"manpages"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installManPage --name hledger-fmt.1 \
|
||||
"target/${stdenv.hostPlatform.rust.rustcTargetSpec}/assets/example.1"
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Opinionated hledger's journal files formatter";
|
||||
homepage = "https://github.com/mondeja/hledger-fmt";
|
||||
changelog = "https://github.com/mondeja/hledger-fmt/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dwoffinden ];
|
||||
mainProgram = "hledger-fmt";
|
||||
};
|
||||
})
|
||||
@@ -29,13 +29,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "homepage-dashboard";
|
||||
version = "1.4.6";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gethomepage";
|
||||
repo = "homepage";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ug7cT/HMiOQF6CX6EEFlvgttXFZdRctSTqPAAkun2KU=";
|
||||
hash = "sha256-pbfelNsLHViqw4ef50pSoKbZ70VH6idG+cmH0URNxko=";
|
||||
};
|
||||
|
||||
# This patch ensures that the cache implementation respects the env
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
patches
|
||||
;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-IYmAl4eHR0jVpQJfxQRlOBTIbrrjS+dnJpUsl8ee6y4=";
|
||||
hash = "sha256-pwh0GzziXgDJOYyUK+u6jXgD1uVUzf/Mpx2thaiXLKM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
diff --git c/package.json i/package.json
|
||||
index 536d73bf..565de99e 100644
|
||||
--- c/package.json
|
||||
+++ i/package.json
|
||||
@@ -73,6 +73,9 @@
|
||||
"pnpm": {
|
||||
diff --git a/package.json b/package.json
|
||||
index 28b86649..16f71f77 100644
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -74,6 +74,9 @@
|
||||
"onlyBuiltDependencies": [
|
||||
"osx-temperature-sensor",
|
||||
"sharp"
|
||||
- ]
|
||||
+ ],
|
||||
@@ -13,14 +13,14 @@ index 536d73bf..565de99e 100644
|
||||
+ }
|
||||
}
|
||||
}
|
||||
diff --git c/patches/next.patch i/patches/next.patch
|
||||
diff --git a/patches/next.patch b/patches/next.patch
|
||||
new file mode 100644
|
||||
index 00000000..52266e70
|
||||
index 00000000..39b17f16
|
||||
--- /dev/null
|
||||
+++ i/patches/next.patch
|
||||
+++ b/patches/next.patch
|
||||
@@ -0,0 +1,13 @@
|
||||
+diff --git a/dist/server/lib/incremental-cache/file-system-cache.js b/dist/server/lib/incremental-cache/file-system-cache.js
|
||||
+index 0b6b2b30f29fbe60eec331c83f81b712c61f18b7..36572d52414927b2b092182c19940ec23cfec313 100644
|
||||
+index cc2cc2506668435d817eaa9f0aa32b568b6aa331..26f0321efcadb4f4255dbd660825759721e799eb 100644
|
||||
+--- a/dist/server/lib/incremental-cache/file-system-cache.js
|
||||
++++ b/dist/server/lib/incremental-cache/file-system-cache.js
|
||||
+@@ -24,7 +24,7 @@ class FileSystemCache {
|
||||
@@ -32,17 +32,17 @@ index 00000000..52266e70
|
||||
+ this.revalidatedTags = ctx.revalidatedTags;
|
||||
+ if (ctx.maxMemoryCacheSize) {
|
||||
+ if (!FileSystemCache.memoryCache) {
|
||||
diff --git c/pnpm-lock.yaml i/pnpm-lock.yaml
|
||||
index c7887131..55604102 100644
|
||||
--- c/pnpm-lock.yaml
|
||||
+++ i/pnpm-lock.yaml
|
||||
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
|
||||
index 113bacff..5dde94f0 100644
|
||||
--- a/pnpm-lock.yaml
|
||||
+++ b/pnpm-lock.yaml
|
||||
@@ -4,6 +4,11 @@ settings:
|
||||
autoInstallPeers: true
|
||||
excludeLinksFromLockfile: false
|
||||
|
||||
+patchedDependencies:
|
||||
+ next:
|
||||
+ hash: ec4324097eadbe8364e1a29668eeea85c2b267b7028a2be86a59a926fbd46666
|
||||
+ hash: 9fc5fd5a09692f0ba1ffb8a979978da9595ed6c3f9bcb0a01205f20fdc39b68c
|
||||
+ path: patches/next.patch
|
||||
+
|
||||
importers:
|
||||
@@ -51,39 +51,39 @@ index c7887131..55604102 100644
|
||||
@@ -52,10 +57,10 @@ importers:
|
||||
version: 1.2.2
|
||||
next:
|
||||
specifier: ^15.4.5
|
||||
- version: 15.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
|
||||
+ version: 15.4.5(patch_hash=ec4324097eadbe8364e1a29668eeea85c2b267b7028a2be86a59a926fbd46666)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
|
||||
specifier: ^15.5.2
|
||||
- version: 15.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
|
||||
+ version: 15.5.2(patch_hash=9fc5fd5a09692f0ba1ffb8a979978da9595ed6c3f9bcb0a01205f20fdc39b68c)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
|
||||
next-i18next:
|
||||
specifier: ^12.1.0
|
||||
- version: 12.1.0(next@15.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
|
||||
+ version: 12.1.0(next@15.4.5(patch_hash=ec4324097eadbe8364e1a29668eeea85c2b267b7028a2be86a59a926fbd46666)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
|
||||
- version: 12.1.0(next@15.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
|
||||
+ version: 12.1.0(next@15.5.2(patch_hash=9fc5fd5a09692f0ba1ffb8a979978da9595ed6c3f9bcb0a01205f20fdc39b68c)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
|
||||
ping:
|
||||
specifier: ^0.4.4
|
||||
version: 0.4.4
|
||||
@@ -5060,7 +5065,7 @@ snapshots:
|
||||
@@ -5162,7 +5167,7 @@ snapshots:
|
||||
|
||||
natural-compare@1.4.0: {}
|
||||
net@1.0.2: {}
|
||||
|
||||
- next-i18next@12.1.0(next@15.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
|
||||
+ next-i18next@12.1.0(next@15.4.5(patch_hash=ec4324097eadbe8364e1a29668eeea85c2b267b7028a2be86a59a926fbd46666)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
|
||||
- next-i18next@12.1.0(next@15.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
|
||||
+ next-i18next@12.1.0(next@15.5.2(patch_hash=9fc5fd5a09692f0ba1ffb8a979978da9595ed6c3f9bcb0a01205f20fdc39b68c)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
|
||||
dependencies:
|
||||
'@babel/runtime': 7.26.9
|
||||
'@types/hoist-non-react-statics': 3.3.6
|
||||
@@ -5068,14 +5073,14 @@ snapshots:
|
||||
@@ -5170,14 +5175,14 @@ snapshots:
|
||||
hoist-non-react-statics: 3.3.2
|
||||
i18next: 21.10.0
|
||||
i18next-fs-backend: 1.2.0
|
||||
- next: 15.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
|
||||
+ next: 15.4.5(patch_hash=ec4324097eadbe8364e1a29668eeea85c2b267b7028a2be86a59a926fbd46666)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
|
||||
- next: 15.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
|
||||
+ next: 15.5.2(patch_hash=9fc5fd5a09692f0ba1ffb8a979978da9595ed6c3f9bcb0a01205f20fdc39b68c)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
|
||||
react: 18.3.1
|
||||
react-i18next: 11.18.6(i18next@21.10.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
|
||||
transitivePeerDependencies:
|
||||
- react-dom
|
||||
- react-native
|
||||
|
||||
- next@15.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
|
||||
+ next@15.4.5(patch_hash=ec4324097eadbe8364e1a29668eeea85c2b267b7028a2be86a59a926fbd46666)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
|
||||
- next@15.5.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
|
||||
+ next@15.5.2(patch_hash=9fc5fd5a09692f0ba1ffb8a979978da9595ed6c3f9bcb0a01205f20fdc39b68c)(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
|
||||
dependencies:
|
||||
'@next/env': 15.4.5
|
||||
'@next/env': 15.5.2
|
||||
'@swc/helpers': 0.5.15
|
||||
|
||||
@@ -23,7 +23,7 @@ generate_patch() {
|
||||
pnpm patch-commit node_modules/.pnpm_patches/next*
|
||||
|
||||
git add -A .
|
||||
git diff -p --staged > ../prerender_cache_path.patch
|
||||
git diff -p --staged --no-ext-diff > ../prerender_cache_path.patch
|
||||
|
||||
popd
|
||||
rm -rf src
|
||||
|
||||
@@ -13,15 +13,14 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "ivan";
|
||||
version = "059";
|
||||
version = "059-unstable-2025-02-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Attnam";
|
||||
repo = "ivan";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5Ijy28LLx1TGnZE6ZNQXPYfvW2KprF+91fKx2MzLEms=";
|
||||
rev = "0000b8621bb767b594802e663686d3a1da2c5060";
|
||||
hash = "sha256-vqrQozsNrqW4oqoJ4V5E15AsMEuHq+pyZz7EtiA5euE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -13,16 +13,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jellyfin-tui";
|
||||
version = "1.2.5";
|
||||
version = "1.2.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dhonus";
|
||||
repo = "jellyfin-tui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-BrIXKMRKsBcLKIe2cFU8IULn060hcAYITgFF9zEEnn4=";
|
||||
hash = "sha256-UwWL5YCBUHG6+r41E0mMaNKl+o2/YxhMCIFaQVR8X7A=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-49UuHH6Ql/ORkp3626O3JW89W5dxX2Y1Jn8euTTKpr8=";
|
||||
cargoHash = "sha256-+oqC83gObCulyGbAx0EXPqnpyFBA4vtJSW6/MNide+U=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
From f3f792cc05080a4bcc3c2886c0c7cee9294c4a05 Mon Sep 17 00:00:00 2001
|
||||
From: Jordan Moore <lockbox@struct.foo>
|
||||
Date: Mon, 2 Jun 2025 16:58:31 -0400
|
||||
Subject: [PATCH] fix: build with modern cmake
|
||||
|
||||
---
|
||||
CMakeLists.txt | 19 +------------------
|
||||
kstool/CMakeLists.txt | 2 +-
|
||||
llvm/CMakeLists.txt | 15 +--------------
|
||||
3 files changed, 3 insertions(+), 33 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 938d4983..9ce08362 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,7 +1,7 @@
|
||||
# Keystone Assembler Engine (www.keystone-engine.org)
|
||||
# By Nguyen Anh Quynh, 2016
|
||||
|
||||
-cmake_minimum_required(VERSION 2.8.7)
|
||||
+cmake_minimum_required(VERSION 3.10.0)
|
||||
project(keystone)
|
||||
|
||||
set(KEYSTONE_VERSION_MAJOR 0)
|
||||
@@ -15,23 +15,6 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
|
||||
set(CMAKE_BUILD_TYPE "Debug")
|
||||
endif()
|
||||
|
||||
-if (POLICY CMP0022)
|
||||
- cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required
|
||||
-endif()
|
||||
-
|
||||
-if (POLICY CMP0051)
|
||||
- # CMake 3.1 and higher include generator expressions of the form
|
||||
- # $<TARGETLIB:obj> in the SOURCES property. These need to be
|
||||
- # stripped everywhere that access the SOURCES property, so we just
|
||||
- # defer to the OLD behavior of not including generator expressions
|
||||
- # in the output for now.
|
||||
- cmake_policy(SET CMP0051 OLD)
|
||||
-endif()
|
||||
-
|
||||
-if (POLICY CMP0063)
|
||||
- set(CMAKE_POLICY_DEFAULT_CMP0063 NEW) # automatic when 3.3.2 is required
|
||||
-endif()
|
||||
-
|
||||
if (CMAKE_VERSION VERSION_LESS 3.1.20141117)
|
||||
set(cmake_3_2_USES_TERMINAL)
|
||||
else()
|
||||
diff --git a/kstool/CMakeLists.txt b/kstool/CMakeLists.txt
|
||||
index d28da481..25113821 100644
|
||||
--- a/kstool/CMakeLists.txt
|
||||
+++ b/kstool/CMakeLists.txt
|
||||
@@ -1,7 +1,7 @@
|
||||
# Kstool for Keystone assembler engine.
|
||||
# By Nguyen Anh Quynh, 2016
|
||||
|
||||
-cmake_minimum_required(VERSION 2.8)
|
||||
+cmake_minimum_required(VERSION 3.10.0)
|
||||
|
||||
project(kstool)
|
||||
|
||||
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
|
||||
index d926b082..518613a5 100644
|
||||
--- a/llvm/CMakeLists.txt
|
||||
+++ b/llvm/CMakeLists.txt
|
||||
@@ -1,6 +1,6 @@
|
||||
# See docs/CMake.html for instructions about how to build LLVM with CMake.
|
||||
|
||||
-cmake_minimum_required(VERSION 2.8.7)
|
||||
+cmake_minimum_required(VERSION 3.10.0)
|
||||
|
||||
set(LLVM_INSTALL_TOOLCHAIN_ONLY ON)
|
||||
|
||||
@@ -9,19 +9,6 @@ if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
|
||||
set(CMAKE_BUILD_TYPE "Debug")
|
||||
endif()
|
||||
|
||||
-if(POLICY CMP0022)
|
||||
- cmake_policy(SET CMP0022 NEW) # automatic when 2.8.12 is required
|
||||
-endif()
|
||||
-
|
||||
-if (POLICY CMP0051)
|
||||
- # CMake 3.1 and higher include generator expressions of the form
|
||||
- # $<TARGETLIB:obj> in the SOURCES property. These need to be
|
||||
- # stripped everywhere that access the SOURCES property, so we just
|
||||
- # defer to the OLD behavior of not including generator expressions
|
||||
- # in the output for now.
|
||||
- cmake_policy(SET CMP0051 OLD)
|
||||
-endif()
|
||||
-
|
||||
if(CMAKE_VERSION VERSION_LESS 3.1.20141117)
|
||||
set(cmake_3_2_USES_TERMINAL)
|
||||
else()
|
||||
@@ -0,0 +1,23 @@
|
||||
From 41197bc85d6b95de3345f5a09d321469c2bba58e Mon Sep 17 00:00:00 2001
|
||||
From: Jordan Moore <lockbox@struct.foo>
|
||||
Date: Mon, 2 Jun 2025 16:36:27 -0400
|
||||
Subject: [PATCH] fix: cstdint explicitly included when used
|
||||
|
||||
* fixes error in gcc15 where this header is no longer
|
||||
implicitly included
|
||||
---
|
||||
llvm/include/llvm/ADT/STLExtras.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/llvm/include/llvm/ADT/STLExtras.h b/llvm/include/llvm/ADT/STLExtras.h
|
||||
index 3346de9382c42274fc9e5fb4ba6334852c7c06fc..a2adf8533e23c782147d34ca97c222b32adcc61d 100644
|
||||
--- a/llvm/include/llvm/ADT/STLExtras.h
|
||||
+++ b/llvm/include/llvm/ADT/STLExtras.h
|
||||
@@ -21,6 +21,7 @@
|
||||
#include <algorithm> // for std::all_of
|
||||
#include <cassert>
|
||||
#include <cstddef> // for std::size_t
|
||||
+#include <cstdint>
|
||||
#include <cstdlib> // for qsort
|
||||
#include <functional>
|
||||
#include <iterator>
|
||||
@@ -19,6 +19,12 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "020d1l1aqb82g36l8lyfn2j8c660mm6sh1nl4haiykwgdl9xnxfa";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Patches from https://github.com/keystone-engine/keystone/pull/593
|
||||
./gcc15.patch
|
||||
./cmake-3.10.patch
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
"-DCMAKE_INSTALL_LIBDIR=lib"
|
||||
|
||||
@@ -15,7 +15,7 @@ in
|
||||
inherit useVSCodeRipgrep;
|
||||
commandLineArgs = extraCommandLineArgs;
|
||||
|
||||
version = "0.3.0";
|
||||
version = "0.3.9";
|
||||
pname = "kiro";
|
||||
|
||||
# You can find the current VSCode version in the About dialog:
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"x86_64-linux": {
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/202509300138--distro-linux-x64-tar-gz/202509300138-distro-linux-x64.tar.gz",
|
||||
"hash": "sha256-+aXPnVpK5WCzLG/6xo/UFw9akwlitPKBaP8w83KTh2E="
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/202510022241--distro-linux-x64-tar-gz/202510022241-distro-linux-x64.tar.gz",
|
||||
"hash": "sha256-1XdGN4Pp8EwDqQNQxfPT6mpV8uZLDqtCS/m3EUtGkeI="
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/202509300138-Kiro-dmg-darwin-x64.dmg",
|
||||
"hash": "sha256-uB22ldI92ql6FQvTMG5+MJcNfiZZLzRrqJPYIi8KHQQ="
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/202510022241-Kiro-dmg-darwin-x64.dmg",
|
||||
"hash": "sha256-VsXbpChRMyJBb1JTJivY5Tr+bi2Aita97f3RduaU8xE="
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/202509300138-Kiro-dmg-darwin-arm64.dmg",
|
||||
"hash": "sha256-VqWVIwnV1gxbf9ksE1YiW84hPK8d4zh1CavWNNLfBRc="
|
||||
"url": "https://prod.download.desktop.kiro.dev/releases/202510022241-Kiro-dmg-darwin-arm64.dmg",
|
||||
"hash": "sha256-nUXtIb3WxJrr1Q4XpGXbP9k9r4vBboZq5YWBUNFgIIk="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mympd";
|
||||
version = "22.1.0";
|
||||
version = "22.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcorporation";
|
||||
repo = "myMPD";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-/PJdyrdJnVm6qYW7O6l2qsv5QlRa37FGZPTGGv4RIgs=";
|
||||
sha256 = "sha256-EMKr4haye49P4M8/tAAA/IfWP4LqDB6Bp9QQHzYQ3pc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -19,6 +19,12 @@ buildGoModule rec {
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace main.go \
|
||||
--replace-fail 'os.Getenv("NAKAMA_TELEMETRY") != "0"' \
|
||||
'os.Getenv("NAKAMA_TELEMETRY") == "1"'
|
||||
'';
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "newsraft";
|
||||
version = "0.32";
|
||||
version = "0.34";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "newsraft";
|
||||
repo = "newsraft";
|
||||
rev = "newsraft-${finalAttrs.version}";
|
||||
hash = "sha256-myirXmhxOgEWdk+W5AO1AW8aTq4q6Sn2fbqdCQQKssk=";
|
||||
hash = "sha256-o02NAIkT98GJAcAlj04L6sVYcx/x+JOefxkK8llEqYM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
}:
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "nezha-agent";
|
||||
version = "1.13.1";
|
||||
version = "1.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nezhahq";
|
||||
repo = "agent";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-csV03eYbXchIJb/ZNAaCKt2SCcO7ugpt9jspvYDiJm0=";
|
||||
hash = "sha256-1p/YEAIa0+9FC+TuNHdv7WSXzDJBS7zgrocNJZ0Tuk0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5g2AgkqaelCD10dxwcEmBLYy5nrd4IALiss0dTrTTno=";
|
||||
vendorHash = "sha256-A0oVUyCflbEY3vBbJwy7cF2m1x9vHCY2jAOsrm3659E=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
sphinx,
|
||||
krb5,
|
||||
xfsprogs,
|
||||
btrfs-progs,
|
||||
jemalloc,
|
||||
libcap,
|
||||
ntirpc,
|
||||
@@ -77,6 +78,7 @@ stdenv.mkDerivation rec {
|
||||
acl
|
||||
krb5
|
||||
xfsprogs
|
||||
btrfs-progs
|
||||
jemalloc
|
||||
dbus.lib
|
||||
libcap
|
||||
@@ -87,7 +89,11 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional useCeph ceph;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/tools/mount.9P --replace "/bin/mount" "/usr/bin/env mount"
|
||||
substituteInPlace src/CMakeLists.txt --replace-fail \
|
||||
"cmake_minimum_required(VERSION 2.6.3)" \
|
||||
"cmake_minimum_required(VERSION 3.10)"
|
||||
|
||||
substituteInPlace src/tools/mount.9P --replace-fail "/bin/mount" "/usr/bin/env mount"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
@@ -101,7 +107,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm755 $src/src/tools/mount.9P $tools/bin/mount.9P
|
||||
install -Dm755 ../tools/mount.9P $tools/bin/mount.9P
|
||||
''
|
||||
+ lib.optionalString useDbus ''
|
||||
# Policy for D-Bus statistics interface
|
||||
|
||||
@@ -25,8 +25,12 @@ stdenv.mkDerivation rec {
|
||||
"dev"
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace ntirpc/netconfig.h --replace "/etc/netconfig" "$out/etc/netconfig"
|
||||
sed '1i#include <assert.h>' -i src/work_pool.c
|
||||
substituteInPlace CMakeLists.txt --replace-fail \
|
||||
"cmake_minimum_required(VERSION 2.6.3)" \
|
||||
"cmake_minimum_required(VERSION 3.10)"
|
||||
|
||||
substituteInPlace ntirpc/netconfig.h --replace-fail \
|
||||
"/etc/netconfig" "$out/etc/netconfig"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -1,55 +1,68 @@
|
||||
{
|
||||
callPackage,
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
jre_headless,
|
||||
fetchFromGitHub,
|
||||
maven,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
let
|
||||
jre = jre_headless;
|
||||
this = stdenv.mkDerivation (finalAttrs: {
|
||||
version = "7.15.0";
|
||||
version = "7.15.0";
|
||||
mainProgram = "openapi-generator-cli";
|
||||
this = maven.buildMavenPackage {
|
||||
inherit version;
|
||||
|
||||
pname = "openapi-generator-cli";
|
||||
|
||||
jarfilename = "openapi-generator-cli-${finalAttrs.version}.jar";
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenAPITools";
|
||||
repo = "openapi-generator";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-IgjlMOHMASijIt5nMqOZcUpxecbWljHh9rA1YUwUmwM=";
|
||||
};
|
||||
|
||||
mvnHash = "sha256-woHPf7vPja70cNj6Glqr0OGAR8CV8qWiRu0hkmCcCrA=";
|
||||
mvnParameters = "-Duser.home=$TMPDIR";
|
||||
doCheck = false;
|
||||
|
||||
# Otherwise, Gradle fails with `java.net.SocketException: Operation not permitted`
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/org/openapitools/openapi-generator-cli/${finalAttrs.version}/${finalAttrs.jarfilename}";
|
||||
sha256 = "sha256-TaGnzbeMOkOx6rBkiJETXow1R9Lu26Ddadrzd/hl82Y=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D "$src" "$out/share/java/${finalAttrs.jarfilename}"
|
||||
mkdir -p $out/bin $out/share/java
|
||||
jarfilename=$out/share/java/openapi-generator-cli.jar
|
||||
install -Dm644 modules/openapi-generator-cli/target/openapi-generator-cli.jar $jarfilename
|
||||
|
||||
makeWrapper ${jre}/bin/java $out/bin/${finalAttrs.pname} \
|
||||
--add-flags "-jar $out/share/java/${finalAttrs.jarfilename}"
|
||||
makeWrapper ${jre}/bin/java $out/bin/${mainProgram} \
|
||||
--add-flags "-jar $jarfilename"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec";
|
||||
homepage = "https://github.com/OpenAPITools/openapi-generator";
|
||||
changelog = "https://github.com/OpenAPITools/openapi-generator/releases/tag/v${finalAttrs.version}";
|
||||
sourceProvenance = with sourceTypes; [ binaryBytecode ];
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ shou ];
|
||||
mainProgram = "openapi-generator-cli";
|
||||
};
|
||||
|
||||
passthru.tests.example = callPackage ./example.nix {
|
||||
openapi-generator-cli = this;
|
||||
};
|
||||
});
|
||||
|
||||
meta = {
|
||||
description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec";
|
||||
homepage = "https://github.com/OpenAPITools/openapi-generator";
|
||||
changelog = "https://github.com/OpenAPITools/openapi-generator/releases/tag/v${version}";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [
|
||||
booxter
|
||||
shou
|
||||
];
|
||||
inherit mainProgram;
|
||||
};
|
||||
};
|
||||
in
|
||||
this
|
||||
|
||||
@@ -5,35 +5,35 @@
|
||||
fetchzip,
|
||||
|
||||
nodejs,
|
||||
pnpm_10,
|
||||
pnpm_9,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "openlist-frontend";
|
||||
version = "4.1.0";
|
||||
version = "4.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenListTeam";
|
||||
repo = "OpenList-Frontend";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-E1kdoTLL9SloSJBYB277BVYwgKp8rmFYmCj9yb6Otuw=";
|
||||
hash = "sha256-crQm74JxVhEDbFQKWJzE6T6qKVMaQbJilI9hoGIxUYU=";
|
||||
};
|
||||
|
||||
i18n = fetchzip {
|
||||
url = "https://github.com/OpenListTeam/OpenList-Frontend/releases/download/v${finalAttrs.version}/i18n.tar.gz";
|
||||
hash = "sha256-/g6TXeCo+tkqE5xF2foghATErGEWUZuxtg70uDA5UFA=";
|
||||
hash = "sha256-4v+hNQl7tSm331CPpqYGMIJXEeOSB0QyQNeQCL5zeFg=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpm_10.configHook
|
||||
pnpm_9.configHook
|
||||
];
|
||||
|
||||
pnpmDeps = pnpm_10.fetchDeps {
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-lWrh7jRx8DkwPZkk5Eh9YndfLsPIwCOUeLdieonZBgI=";
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-8wP57qIUGGccLX4oKkqQmibAoAHwnORhBFp80d+ltA4=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "openlist";
|
||||
version = "4.1.0";
|
||||
version = "4.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenListTeam";
|
||||
repo = "OpenList";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-505rEnqIwn1EGhzqhcVWYgYqyPsV/obJzaHaK9W2tVA=";
|
||||
hash = "sha256-CNnDPA/zByhR6GOmzxOZRc8F/QqGIxTGSIKXOCwlwwg=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
@@ -33,7 +33,7 @@ buildGoModule (finalAttrs: {
|
||||
frontend = callPackage ./frontend.nix { };
|
||||
|
||||
proxyVendor = true;
|
||||
vendorHash = "sha256-J8ssJbILb3Gf6Br/PYkRAn4Haduf82iCYCfSAEi3nO4=";
|
||||
vendorHash = "sha256-MHqQ/2FrqxufSa9OG3MWkm401qeIszK9rpgDR0jdCo4=";
|
||||
|
||||
buildInputs = [ fuse ];
|
||||
|
||||
@@ -64,6 +64,12 @@ buildGoModule (finalAttrs: {
|
||||
"TestWebsocketAll"
|
||||
"TestWebsocketCaller"
|
||||
"TestDownloadOrder"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
|
||||
# --- FAIL: TestTask_Cancel (0.01s)
|
||||
# task_test.go:48: task is running
|
||||
# task_test.go:61: task status not canceled: canceling
|
||||
"TestTask_Cancel"
|
||||
];
|
||||
in
|
||||
[ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
|
||||
|
||||
@@ -56,5 +56,7 @@ stdenv.mkDerivation rec {
|
||||
license = lib.licenses.agpl3Plus;
|
||||
maintainers = [ ];
|
||||
platforms = lib.platforms.linux;
|
||||
# fails to compile; out of date
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,16 +2,21 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
fetchpatch2,
|
||||
cmake,
|
||||
gtk3,
|
||||
wxGTK32,
|
||||
ninja,
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
cfitsio,
|
||||
curl,
|
||||
eigen_3_4_0,
|
||||
gettext,
|
||||
glib,
|
||||
indi-full,
|
||||
gtest,
|
||||
gtk3,
|
||||
libnova,
|
||||
wrapGAppsHook3,
|
||||
libusb1,
|
||||
wxGTK32,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -25,24 +30,42 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-GnT/tyk975caqESBSu4mdX5IWGi5O+RljLSd+CwoGWo=";
|
||||
};
|
||||
|
||||
# fixes build error because of missing include
|
||||
# is in masster, should be removed with next release
|
||||
patches = [
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/OpenPHDGuiding/phd2/commit/0927de6c8943fae7161457008b989bf72a05c638.patch?full_index=1";
|
||||
hash = "sha256-yo5YdZ4B7jx6p4TqFZc7RJsutsWzeNBUfinFAd8es7E=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk3
|
||||
wxGTK32
|
||||
cfitsio
|
||||
curl
|
||||
eigen_3_4_0
|
||||
gettext
|
||||
glib
|
||||
indi-full
|
||||
gtest
|
||||
gtk3
|
||||
libnova
|
||||
libusb1
|
||||
wxGTK32
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_CXX_STANDARD=17" # needed for gtest
|
||||
"-DOPENSOURCE_ONLY=1"
|
||||
"-DUSE_SYSTEM_CFITSIO=ON"
|
||||
"-DUSE_SYSTEM_LIBUSB=ON"
|
||||
"-DUSE_SYSTEM_EIGEN3=ON"
|
||||
"-DUSE_SYSTEM_GTEST=ON"
|
||||
];
|
||||
|
||||
# Fix broken wrapped name scheme by moving wrapped binary to where wrapper expects it
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
|
||||
let
|
||||
pname = "plexamp";
|
||||
version = "4.12.4";
|
||||
version = "4.13.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
|
||||
name = "${pname}-${version}.AppImage";
|
||||
hash = "sha512-LtYqC4pqX7hA+clUj9UVrp0YWebELULM23SsYlKnVDcYbZn8LJldiOOebS0+SU4RqK1a8Z3Kh4fPJ/HfijP0qw==";
|
||||
hash = "sha512-3Blgl3t21hH6lgDe5u3vy3I/3k9b4VM1CvoZg2oashkGXSDwV8q7MATN9YjsBgWysNXwdm7nQ/yrFQ7DiRfdYg==";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 {
|
||||
@@ -38,7 +38,7 @@ appimageTools.wrapType2 {
|
||||
meta = with lib; {
|
||||
description = "Beautiful Plex music player for audiophiles, curators, and hipsters";
|
||||
homepage = "https://plexamp.com/";
|
||||
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/81";
|
||||
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/82";
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [
|
||||
killercup
|
||||
+4
-4
@@ -11,8 +11,8 @@ cleanup() {
|
||||
trap cleanup EXIT
|
||||
|
||||
ROOT="$(dirname "$(readlink -f "$0")")"
|
||||
if [ ! -f "$ROOT/default.nix" ]; then
|
||||
echo "ERROR: cannot find default.nix in $ROOT"
|
||||
if [ ! -f "$ROOT/package.nix" ]; then
|
||||
echo "ERROR: cannot find package.nix in $ROOT"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -30,8 +30,8 @@ curl "$VERSION_URL" -o "$VERSION_FILE"
|
||||
VERSION="$(yq -r .version "$VERSION_FILE")"
|
||||
SHA512="$(yq -r .sha512 "$VERSION_FILE")"
|
||||
|
||||
DEFAULT_NIX="$ROOT/default.nix"
|
||||
WORKING_NIX="$TMPDIR/default.nix"
|
||||
DEFAULT_NIX="$ROOT/package.nix"
|
||||
WORKING_NIX="$TMPDIR/package.nix"
|
||||
cp "$DEFAULT_NIX" "$WORKING_NIX"
|
||||
|
||||
sed -i "s@version = .*;@version = \"$VERSION\";@g" "$WORKING_NIX"
|
||||
@@ -41,13 +41,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pocl";
|
||||
version = "7.0-unstable-2025-09-30";
|
||||
version = "7.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pocl";
|
||||
repo = "pocl";
|
||||
rev = "f24d07da32bdd639538d3016cad2ab920cd16ce3";
|
||||
hash = "sha256-D7sMZ2B7Ex840ZhM07nrdnlek0HhI5GkvUNA4k5hsPk=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-bS6vTIjLO7YLs7qYLKW0cYYbEJ/hRS/+IjjAKbkj8ac=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
@@ -56,24 +56,27 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"static_cast<size_t>(Dev.getInfo<CL_DEVICE_GLOBAL_MEM_SIZE>())"
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
# avoid the runtime linker pulling in a different llvm e.g. from graphics drivers
|
||||
(lib.cmakeBool "STATIC_LLVM" true)
|
||||
(lib.cmakeBool "ENABLE_POCL_BUILDING" false)
|
||||
(lib.cmakeBool "POCL_ICD_ABSOLUTE_PATH" true)
|
||||
(lib.cmakeBool "ENABLE_ICD" true)
|
||||
(lib.cmakeBool "ENABLE_REMOTE_CLIENT" true)
|
||||
(lib.cmakeBool "ENABLE_REMOTE_SERVER" true)
|
||||
(lib.cmakeFeature "CLANG" "${clangWrapped}/bin/clang")
|
||||
(lib.cmakeFeature "CLANGXX" "${clangWrapped}/bin/clang++")
|
||||
]
|
||||
# Only x86_64 supports "distro" which allows runtime detection of SSE/AVX
|
||||
++ lib.optionals stdenv.hostPlatform.isx86_64 [
|
||||
(lib.cmakeFeature "KERNELLIB_HOST_CPU_VARIANTS" "distro")
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isx86_64) [
|
||||
(lib.cmakeFeature "LLC_HOST_CPU" "generic")
|
||||
];
|
||||
cmakeFlags =
|
||||
(lib.mapAttrsToList lib.cmakeBool {
|
||||
# avoid the runtime linker pulling in a different llvm e.g. from graphics drivers
|
||||
"STATIC_LLVM" = true;
|
||||
"ENABLE_POCL_BUILDING" = false;
|
||||
"POCL_ICD_ABSOLUTE_PATH" = true;
|
||||
"ENABLE_ICD" = true;
|
||||
"ENABLE_REMOTE_CLIENT" = true;
|
||||
"ENABLE_REMOTE_SERVER" = true;
|
||||
})
|
||||
++ (lib.mapAttrsToList lib.cmakeFeature {
|
||||
"CLANG" = "${clangWrapped}/bin/clang";
|
||||
"CLANGXX" = "${clangWrapped}/bin/clang++";
|
||||
})
|
||||
# Only x86_64 supports "distro" which allows runtime detection of SSE/AVX
|
||||
++ lib.optionals stdenv.hostPlatform.isx86_64 [
|
||||
(lib.cmakeFeature "KERNELLIB_HOST_CPU_VARIANTS" "distro")
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isx86_64) [
|
||||
(lib.cmakeFeature "LLC_HOST_CPU" "generic")
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
# nixpkgs-update: no auto update
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pvs-studio";
|
||||
version = "7.36.91321.455";
|
||||
version = "7.38.97034.608";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -24,14 +24,14 @@ stdenv.mkDerivation rec {
|
||||
in
|
||||
fetchzip {
|
||||
url = selectSystem {
|
||||
aarch64-darwin = "https://web.archive.org/web/20250411093324/https://files.pvs-studio.com/pvs-studio-${version}-macos-arm64.tgz";
|
||||
x86_64-darwin = "https://web.archive.org/web/20250411092440/https://files.pvs-studio.com/pvs-studio-${version}-macos-x86_64.tgz";
|
||||
x86_64-linux = "https://web.archive.org/web/20250411091929/https://files.pvs-studio.com/pvs-studio-${version}-x86_64.tgz";
|
||||
aarch64-darwin = "https://web.archive.org/web/20251002123729/https://files.pvs-studio.com/pvs-studio-${version}-macos-arm64.zip";
|
||||
x86_64-darwin = "https://web.archive.org/web/20251002121955/https://files.pvs-studio.com/pvs-studio-${version}-macos-x86_64.zip";
|
||||
x86_64-linux = "https://web.archive.org/web/20251002124032/https://files.pvs-studio.com/pvs-studio-${version}-x86_64.tgz";
|
||||
};
|
||||
hash = selectSystem {
|
||||
aarch64-darwin = "sha256-KEDKsWXg+CRwsEi7hNKlC3CWldBtvf9Jw79vuLMKSOE=";
|
||||
x86_64-darwin = "sha256-Esf+pohienMAkWs1q5fYZ+0RzzK/WxOGljRXYJ0AtFI=";
|
||||
x86_64-linux = "sha256-Be4IGFA+307zuMnhXBZko6T27TYeBZHX/zxaXBWVPHo=";
|
||||
aarch64-darwin = "sha256-nZwG2qFnpWnJBVmfdIqT/y3gVs66NUKy4BifFCgA3aE=";
|
||||
x86_64-darwin = "sha256-Q48i518jNQYTGGW7ihcyk7/DauHH1/fWniEvdsp7rSU=";
|
||||
x86_64-linux = "sha256-Dw9PasnbUbBsVCPZoUHHcRIBzq1XqFzThaVY6NB3qFE=";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -77,6 +77,6 @@ stdenv.mkDerivation rec {
|
||||
"x86_64-linux"
|
||||
];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ sikmir ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "release-plz";
|
||||
version = "0.3.147";
|
||||
version = "0.3.148";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MarcoIeni";
|
||||
repo = "release-plz";
|
||||
rev = "release-plz-v${version}";
|
||||
hash = "sha256-obqPPVUh5m24A3L8WlJxDK2Nbgb57tATNQ5k8JH/dN4=";
|
||||
hash = "sha256-XvmgpsCxbXc+NvzKZBXmhcIM+SKCTPkQldObUuXHVus=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-t42CsSk6i9ABJOnzqAt5cQS4VS73yjFTzhfK8YVpMZ8=";
|
||||
cargoHash = "sha256-NYViI5tpOgWdaKmOrNlXIGL/d6ZhoOSeQShdPdB3eXE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -8,17 +8,17 @@
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
pname = "sccache";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mozilla";
|
||||
repo = "sccache";
|
||||
rev = "v${finalAttrs.version}";
|
||||
sha256 = "sha256-VEDMeRFQKNPS3V6/DhMWxHR7YWsCzAXTzp0lO+COl08=";
|
||||
sha256 = "sha256-x+TeFJa15eLmdUAAL4GH+bz6LWJZ/8Z0C1NcJ04MWc8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-1kfKBN4uRbU5LjbC0cLgMqoGnOSEAdC0S7EzXlfaDPo=";
|
||||
cargoHash = "sha256-FyzeSiewKZhw1iIT6831W/FAx9IrG+Kswi5QWkQ0zQk=";
|
||||
|
||||
buildFeatures = lib.optionals distributed [
|
||||
"dist-client"
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "sketchybar-app-font";
|
||||
version = "2.0.46";
|
||||
version = "2.0.47";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kvndrsslr";
|
||||
repo = "sketchybar-app-font";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-s4R0kxLbaWrjoLacnfZcLdtcRD0rC1na2JOV3B+p6T8=";
|
||||
hash = "sha256-5lHQ8LQB7/12E6VFB/PUhfbf2NRRsSHi0CzKm9K/8C4=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
curl,
|
||||
dbus,
|
||||
ffmpeg,
|
||||
fmt,
|
||||
libwebp,
|
||||
mpv,
|
||||
SDL2,
|
||||
tinyxml-2,
|
||||
tweeny,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "switchfin";
|
||||
version = "0.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dragonflylee";
|
||||
repo = "switchfin";
|
||||
rev = version;
|
||||
hash = "sha256-vmf7urq3lnfvmdZUJ+G5zn4ZpNA2N4jlLo8D5ZG3tUQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
dbus
|
||||
ffmpeg
|
||||
fmt
|
||||
libwebp
|
||||
mpv
|
||||
SDL2
|
||||
tinyxml-2
|
||||
tweeny
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL=ON"
|
||||
|
||||
"-DPLATFORM_DESKTOP=ON"
|
||||
"-DUSE_EGL=ON"
|
||||
"-DUSE_SDL2=ON"
|
||||
|
||||
"-DUSE_SYSTEM_CURL=ON"
|
||||
"-DUSE_SYSTEM_FMT=ON"
|
||||
"-DUSE_SYSTEM_SDL2=ON"
|
||||
"-DUSE_SYSTEM_TINYXML2=ON"
|
||||
"-DUSE_SYSTEM_TWEENY=ON"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Third-party native Jellyfin client for PC/PS4/PSVita/Nintendo Switch";
|
||||
homepage = "https://github.com/dragonflylee/switchfin";
|
||||
changelog = "https://github.com/dragonflylee/switchfin/blob/${src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.k900 ];
|
||||
mainProgram = "switchfin";
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
@@ -1,120 +0,0 @@
|
||||
# this patch both fixes some include paths as well as removes glibc
|
||||
# gates around defines that musl-libc also depends on.
|
||||
diff -u sysklogd-1.5.1.orig/klogd.c sysklogd-1.5.1/klogd.c
|
||||
--- sysklogd-1.5.1.orig/klogd.c 2014-10-04 15:47:18.000000000 -0400
|
||||
+++ sysklogd-1.5.1/klogd.c 2021-01-18 23:09:23.000000000 -0500
|
||||
@@ -260,11 +260,8 @@
|
||||
#include <unistd.h>
|
||||
#include <signal.h>
|
||||
#include <errno.h>
|
||||
-#include <sys/fcntl.h>
|
||||
+#include <fcntl.h>
|
||||
#include <sys/stat.h>
|
||||
-#if !defined(__GLIBC__)
|
||||
-#include <linux/time.h>
|
||||
-#endif /* __GLIBC__ */
|
||||
#include <stdarg.h>
|
||||
#include <paths.h>
|
||||
#include <stdlib.h>
|
||||
@@ -277,13 +274,8 @@
|
||||
|
||||
#define __LIBRARY__
|
||||
#include <linux/unistd.h>
|
||||
-#if !defined(__GLIBC__)
|
||||
-# define __NR_ksyslog __NR_syslog
|
||||
-_syscall3(int,ksyslog,int, type, char *, buf, int, len);
|
||||
-#else
|
||||
#include <sys/klog.h>
|
||||
#define ksyslog klogctl
|
||||
-#endif
|
||||
|
||||
#define LOG_BUFFER_SIZE 4096
|
||||
#define LOG_LINE_LENGTH 1000
|
||||
diff -u sysklogd-1.5.1.orig/ksym_mod.c sysklogd-1.5.1/ksym_mod.c
|
||||
--- sysklogd-1.5.1.orig/ksym_mod.c 2014-10-04 15:47:18.000000000 -0400
|
||||
+++ sysklogd-1.5.1/ksym_mod.c 2021-01-18 23:09:57.000000000 -0500
|
||||
@@ -113,12 +113,9 @@
|
||||
#include <unistd.h>
|
||||
#include <signal.h>
|
||||
#include <errno.h>
|
||||
-#include <sys/fcntl.h>
|
||||
+#include <fcntl.h>
|
||||
#include <sys/stat.h>
|
||||
#include "module.h"
|
||||
-#if !defined(__GLIBC__)
|
||||
-#include <linux/time.h>
|
||||
-#endif /* __GLIBC__ */
|
||||
#include <stdarg.h>
|
||||
#include <paths.h>
|
||||
#include <linux/version.h>
|
||||
diff -u sysklogd-1.5.1.orig/pidfile.c sysklogd-1.5.1/pidfile.c
|
||||
--- sysklogd-1.5.1.orig/pidfile.c 2014-10-04 15:47:18.000000000 -0400
|
||||
+++ sysklogd-1.5.1/pidfile.c 2021-01-18 23:23:55.000000000 -0500
|
||||
@@ -25,6 +25,7 @@
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
+#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/file.h>
|
||||
diff -u sysklogd-1.5.1.orig/syslog.c sysklogd-1.5.1/syslog.c
|
||||
--- sysklogd-1.5.1.orig/syslog.c 2014-10-04 15:47:18.000000000 -0400
|
||||
+++ sysklogd-1.5.1/syslog.c 2021-01-18 23:11:45.000000000 -0500
|
||||
@@ -55,7 +55,6 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/file.h>
|
||||
-#include <sys/signal.h>
|
||||
#include <sys/syslog.h>
|
||||
#if 0
|
||||
#include "syslog.h"
|
||||
@@ -64,6 +63,8 @@
|
||||
|
||||
#include <sys/uio.h>
|
||||
#include <sys/wait.h>
|
||||
+#include <signal.h>
|
||||
+#include <fcntl.h>
|
||||
#include <netdb.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
diff -u sysklogd-1.5.1.orig/syslogd.c sysklogd-1.5.1/syslogd.c
|
||||
--- sysklogd-1.5.1.orig/syslogd.c 2014-10-04 15:47:18.000000000 -0400
|
||||
+++ sysklogd-1.5.1/syslogd.c 2021-01-18 23:13:25.000000000 -0500
|
||||
@@ -519,9 +519,9 @@
|
||||
#include <time.h>
|
||||
|
||||
#define SYSLOG_NAMES
|
||||
+#include <errno.h>
|
||||
#include <sys/syslog.h>
|
||||
#include <sys/param.h>
|
||||
-#include <sys/errno.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/wait.h>
|
||||
@@ -818,9 +818,7 @@
|
||||
void init();
|
||||
void cfline(char *line, register struct filed *f);
|
||||
int decode(char *name, struct code *codetab);
|
||||
-#if defined(__GLIBC__)
|
||||
#define dprintf mydprintf
|
||||
-#endif /* __GLIBC__ */
|
||||
static void dprintf(char *, ...);
|
||||
static void allocate_log(void);
|
||||
void sighup_handler();
|
||||
@@ -840,15 +838,9 @@
|
||||
register char *p;
|
||||
#ifndef TESTING
|
||||
ssize_t msglen;
|
||||
-#endif
|
||||
-#if !defined(__GLIBC__)
|
||||
- int len, num_fds;
|
||||
-#else /* __GLIBC__ */
|
||||
-#ifndef TESTING
|
||||
socklen_t len;
|
||||
#endif
|
||||
int num_fds;
|
||||
-#endif /* __GLIBC__ */
|
||||
/*
|
||||
* It took me quite some time to figure out how this is
|
||||
* supposed to work so I guess I should better write it down.
|
||||
@@ -1,52 +1,37 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchFromGitHub,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sysklogd";
|
||||
version = "1.5.1";
|
||||
version = "2.7.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${version}.tar.gz";
|
||||
sha256 = "00f2wy6f0qng7qzga4iicyzl9j8b7mp6mrpfky5jxj93ms2w2rji";
|
||||
src = fetchFromGitHub {
|
||||
owner = "troglobit";
|
||||
repo = "sysklogd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HwzqWZox5qc/TvCafx4XjA4njQhcHBS0gZthqPzONHk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./systemd.patch
|
||||
./union-wait.patch
|
||||
./fix-includes-for-musl.patch
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = "-DSYSV";
|
||||
|
||||
installFlags = [
|
||||
"BINDIR=$(out)/sbin"
|
||||
"MANDIR=$(out)/share/man"
|
||||
"INSTALL=install"
|
||||
configureFlags = [
|
||||
"--sysconfdir=/etc"
|
||||
"--localstatedir=/var"
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"CC=${stdenv.cc.targetPrefix}cc"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Disable stripping during installation, stripping will be done anyway.
|
||||
# Fixes cross-compilation.
|
||||
substituteInPlace Makefile \
|
||||
--replace "-m 500 -s" "-m 500"
|
||||
'';
|
||||
|
||||
preConfigure = ''
|
||||
sed -e 's@-o \''${MAN_USER} -g \''${MAN_GROUP} -m \''${MAN_PERMS} @@' -i Makefile
|
||||
'';
|
||||
|
||||
preInstall = "mkdir -p $out/share/man/man5/ $out/share/man/man8/ $out/sbin";
|
||||
|
||||
meta = with lib; {
|
||||
description = "System logging daemon";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
meta = {
|
||||
description = "BSD syslog daemon with syslog()/syslogp() API replacement for Linux, RFC3164 + RFC5424";
|
||||
homepage = "https://github.com/troglobit/sysklogd";
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ aanderse ];
|
||||
platforms = lib.subtractLists lib.platforms.darwin lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,845 +0,0 @@
|
||||
Based on http://ftp.free.org/mirrors/rsync.frugalware.org/frugalware-testing/source/apps-extra/sysklogd/sysklogd-1.5-systemd.diff
|
||||
|
||||
diff -ruN -x '*~' sysklogd-1.5-old/Makefile sysklogd-1.5/Makefile
|
||||
--- sysklogd-1.5-old/Makefile 2007-05-30 17:28:48.000000000 +0200
|
||||
+++ sysklogd-1.5/Makefile 2013-05-09 16:01:14.428638113 +0200
|
||||
@@ -20,7 +20,7 @@
|
||||
CC= gcc
|
||||
#SKFLAGS= -g -DSYSV -Wall
|
||||
#LDFLAGS= -g
|
||||
-SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
|
||||
+SKFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce -I.
|
||||
# -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
|
||||
# -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
|
||||
# $(shell getconf LFS_SKFLAGS)
|
||||
@@ -79,8 +79,8 @@
|
||||
|
||||
install: install_man install_exec
|
||||
|
||||
-syslogd: syslogd.o pidfile.o
|
||||
- ${CC} ${LDFLAGS} -o syslogd syslogd.o pidfile.o ${LIBS}
|
||||
+syslogd: syslogd.o pidfile.o sd-daemon.o
|
||||
+ ${CC} ${LDFLAGS} -o syslogd syslogd.o pidfile.o sd-daemon.o ${LIBS}
|
||||
|
||||
klogd: klogd.o syslog.o pidfile.o ksym.o ksym_mod.o
|
||||
${CC} ${LDFLAGS} -o klogd klogd.o syslog.o pidfile.o ksym.o \
|
||||
@@ -101,6 +101,9 @@
|
||||
syslog.o: syslog.c
|
||||
${CC} ${SKFLAGS} ${SYSLOG_FLAGS} -c syslog.c
|
||||
|
||||
+sd-daemon.o: sd-daemon.c sd-daemon.h
|
||||
+ ${CC} ${SKFLAGS} ${SYSLOG_FLAGS} -c sd-daemon.c
|
||||
+
|
||||
klogd.o: klogd.c klogd.h version.h
|
||||
${CC} ${SKFLAGS} ${KLOGD_FLAGS} $(DEB) -c klogd.c
|
||||
|
||||
diff -ruN -x '*~' sysklogd-1.5-old/sd-daemon.c sysklogd-1.5/sd-daemon.c
|
||||
--- sysklogd-1.5-old/sd-daemon.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ sysklogd-1.5/sd-daemon.c 2013-05-09 16:01:14.429638107 +0200
|
||||
@@ -0,0 +1,436 @@
|
||||
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
||||
+
|
||||
+/***
|
||||
+ Copyright 2010 Lennart Poettering
|
||||
+
|
||||
+ Permission is hereby granted, free of charge, to any person
|
||||
+ obtaining a copy of this software and associated documentation files
|
||||
+ (the "Software"), to deal in the Software without restriction,
|
||||
+ including without limitation the rights to use, copy, modify, merge,
|
||||
+ publish, distribute, sublicense, and/or sell copies of the Software,
|
||||
+ and to permit persons to whom the Software is furnished to do so,
|
||||
+ subject to the following conditions:
|
||||
+
|
||||
+ The above copyright notice and this permission notice shall be
|
||||
+ included in all copies or substantial portions of the Software.
|
||||
+
|
||||
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
||||
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
||||
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
+ SOFTWARE.
|
||||
+***/
|
||||
+
|
||||
+#ifndef _GNU_SOURCE
|
||||
+#define _GNU_SOURCE
|
||||
+#endif
|
||||
+
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/stat.h>
|
||||
+#include <sys/socket.h>
|
||||
+#include <sys/un.h>
|
||||
+#include <netinet/in.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <fcntl.h>
|
||||
+#include <errno.h>
|
||||
+#include <unistd.h>
|
||||
+#include <string.h>
|
||||
+#include <stdarg.h>
|
||||
+#include <stdio.h>
|
||||
+#include <stddef.h>
|
||||
+
|
||||
+#include "sd-daemon.h"
|
||||
+
|
||||
+int sd_listen_fds(int unset_environment) {
|
||||
+
|
||||
+#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
|
||||
+ return 0;
|
||||
+#else
|
||||
+ int r, fd;
|
||||
+ const char *e;
|
||||
+ char *p = NULL;
|
||||
+ unsigned long l;
|
||||
+
|
||||
+ if (!(e = getenv("LISTEN_PID"))) {
|
||||
+ r = 0;
|
||||
+ goto finish;
|
||||
+ }
|
||||
+
|
||||
+ errno = 0;
|
||||
+ l = strtoul(e, &p, 10);
|
||||
+
|
||||
+ if (errno != 0) {
|
||||
+ r = -errno;
|
||||
+ goto finish;
|
||||
+ }
|
||||
+
|
||||
+ if (!p || *p || l <= 0) {
|
||||
+ r = -EINVAL;
|
||||
+ goto finish;
|
||||
+ }
|
||||
+
|
||||
+ /* Is this for us? */
|
||||
+ if (getpid() != (pid_t) l) {
|
||||
+ r = 0;
|
||||
+ goto finish;
|
||||
+ }
|
||||
+
|
||||
+ if (!(e = getenv("LISTEN_FDS"))) {
|
||||
+ r = 0;
|
||||
+ goto finish;
|
||||
+ }
|
||||
+
|
||||
+ errno = 0;
|
||||
+ l = strtoul(e, &p, 10);
|
||||
+
|
||||
+ if (errno != 0) {
|
||||
+ r = -errno;
|
||||
+ goto finish;
|
||||
+ }
|
||||
+
|
||||
+ if (!p || *p) {
|
||||
+ r = -EINVAL;
|
||||
+ goto finish;
|
||||
+ }
|
||||
+
|
||||
+ for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + (int) l; fd ++) {
|
||||
+ int flags;
|
||||
+
|
||||
+ if ((flags = fcntl(fd, F_GETFD)) < 0) {
|
||||
+ r = -errno;
|
||||
+ goto finish;
|
||||
+ }
|
||||
+
|
||||
+ if (flags & FD_CLOEXEC)
|
||||
+ continue;
|
||||
+
|
||||
+ if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) < 0) {
|
||||
+ r = -errno;
|
||||
+ goto finish;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ r = (int) l;
|
||||
+
|
||||
+finish:
|
||||
+ if (unset_environment) {
|
||||
+ unsetenv("LISTEN_PID");
|
||||
+ unsetenv("LISTEN_FDS");
|
||||
+ }
|
||||
+
|
||||
+ return r;
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
+int sd_is_fifo(int fd, const char *path) {
|
||||
+ struct stat st_fd;
|
||||
+
|
||||
+ if (fd < 0)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ memset(&st_fd, 0, sizeof(st_fd));
|
||||
+ if (fstat(fd, &st_fd) < 0)
|
||||
+ return -errno;
|
||||
+
|
||||
+ if (!S_ISFIFO(st_fd.st_mode))
|
||||
+ return 0;
|
||||
+
|
||||
+ if (path) {
|
||||
+ struct stat st_path;
|
||||
+
|
||||
+ memset(&st_path, 0, sizeof(st_path));
|
||||
+ if (stat(path, &st_path) < 0) {
|
||||
+
|
||||
+ if (errno == ENOENT || errno == ENOTDIR)
|
||||
+ return 0;
|
||||
+
|
||||
+ return -errno;
|
||||
+ }
|
||||
+
|
||||
+ return
|
||||
+ st_path.st_dev == st_fd.st_dev &&
|
||||
+ st_path.st_ino == st_fd.st_ino;
|
||||
+ }
|
||||
+
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
+static int sd_is_socket_internal(int fd, int type, int listening) {
|
||||
+ struct stat st_fd;
|
||||
+
|
||||
+ if (fd < 0 || type < 0)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ if (fstat(fd, &st_fd) < 0)
|
||||
+ return -errno;
|
||||
+
|
||||
+ if (!S_ISSOCK(st_fd.st_mode))
|
||||
+ return 0;
|
||||
+
|
||||
+ if (type != 0) {
|
||||
+ int other_type = 0;
|
||||
+ socklen_t l = sizeof(other_type);
|
||||
+
|
||||
+ if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &other_type, &l) < 0)
|
||||
+ return -errno;
|
||||
+
|
||||
+ if (l != sizeof(other_type))
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ if (other_type != type)
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ if (listening >= 0) {
|
||||
+ int accepting = 0;
|
||||
+ socklen_t l = sizeof(accepting);
|
||||
+
|
||||
+ if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, &accepting, &l) < 0)
|
||||
+ return -errno;
|
||||
+
|
||||
+ if (l != sizeof(accepting))
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ if (!accepting != !listening)
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
+union sockaddr_union {
|
||||
+ struct sockaddr sa;
|
||||
+ struct sockaddr_in in4;
|
||||
+ struct sockaddr_in6 in6;
|
||||
+ struct sockaddr_un un;
|
||||
+ struct sockaddr_storage storage;
|
||||
+};
|
||||
+
|
||||
+int sd_is_socket(int fd, int family, int type, int listening) {
|
||||
+ int r;
|
||||
+
|
||||
+ if (family < 0)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)
|
||||
+ return r;
|
||||
+
|
||||
+ if (family > 0) {
|
||||
+ union sockaddr_union sockaddr;
|
||||
+ socklen_t l;
|
||||
+
|
||||
+ memset(&sockaddr, 0, sizeof(sockaddr));
|
||||
+ l = sizeof(sockaddr);
|
||||
+
|
||||
+ if (getsockname(fd, &sockaddr.sa, &l) < 0)
|
||||
+ return -errno;
|
||||
+
|
||||
+ if (l < sizeof(sa_family_t))
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ return sockaddr.sa.sa_family == family;
|
||||
+ }
|
||||
+
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
+int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) {
|
||||
+ union sockaddr_union sockaddr;
|
||||
+ socklen_t l;
|
||||
+ int r;
|
||||
+
|
||||
+ if (family != 0 && family != AF_INET && family != AF_INET6)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)
|
||||
+ return r;
|
||||
+
|
||||
+ memset(&sockaddr, 0, sizeof(sockaddr));
|
||||
+ l = sizeof(sockaddr);
|
||||
+
|
||||
+ if (getsockname(fd, &sockaddr.sa, &l) < 0)
|
||||
+ return -errno;
|
||||
+
|
||||
+ if (l < sizeof(sa_family_t))
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ if (sockaddr.sa.sa_family != AF_INET &&
|
||||
+ sockaddr.sa.sa_family != AF_INET6)
|
||||
+ return 0;
|
||||
+
|
||||
+ if (family > 0)
|
||||
+ if (sockaddr.sa.sa_family != family)
|
||||
+ return 0;
|
||||
+
|
||||
+ if (port > 0) {
|
||||
+ if (sockaddr.sa.sa_family == AF_INET) {
|
||||
+ if (l < sizeof(struct sockaddr_in))
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ return htons(port) == sockaddr.in4.sin_port;
|
||||
+ } else {
|
||||
+ if (l < sizeof(struct sockaddr_in6))
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ return htons(port) == sockaddr.in6.sin6_port;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
+int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) {
|
||||
+ union sockaddr_union sockaddr;
|
||||
+ socklen_t l;
|
||||
+ int r;
|
||||
+
|
||||
+ if ((r = sd_is_socket_internal(fd, type, listening)) <= 0)
|
||||
+ return r;
|
||||
+
|
||||
+ memset(&sockaddr, 0, sizeof(sockaddr));
|
||||
+ l = sizeof(sockaddr);
|
||||
+
|
||||
+ if (getsockname(fd, &sockaddr.sa, &l) < 0)
|
||||
+ return -errno;
|
||||
+
|
||||
+ if (l < sizeof(sa_family_t))
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ if (sockaddr.sa.sa_family != AF_UNIX)
|
||||
+ return 0;
|
||||
+
|
||||
+ if (path) {
|
||||
+ if (length <= 0)
|
||||
+ length = strlen(path);
|
||||
+
|
||||
+ if (length <= 0)
|
||||
+ /* Unnamed socket */
|
||||
+ return l == offsetof(struct sockaddr_un, sun_path);
|
||||
+
|
||||
+ if (path[0])
|
||||
+ /* Normal path socket */
|
||||
+ return
|
||||
+ (l >= offsetof(struct sockaddr_un, sun_path) + length + 1) &&
|
||||
+ memcmp(path, sockaddr.un.sun_path, length+1) == 0;
|
||||
+ else
|
||||
+ /* Abstract namespace socket */
|
||||
+ return
|
||||
+ (l == offsetof(struct sockaddr_un, sun_path) + length) &&
|
||||
+ memcmp(path, sockaddr.un.sun_path, length) == 0;
|
||||
+ }
|
||||
+
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
+int sd_notify(int unset_environment, const char *state) {
|
||||
+#if defined(DISABLE_SYSTEMD) || !defined(__linux__) || !defined(SOCK_CLOEXEC)
|
||||
+ return 0;
|
||||
+#else
|
||||
+ int fd = -1, r;
|
||||
+ struct msghdr msghdr;
|
||||
+ struct iovec iovec;
|
||||
+ union sockaddr_union sockaddr;
|
||||
+ const char *e;
|
||||
+
|
||||
+ if (!state) {
|
||||
+ r = -EINVAL;
|
||||
+ goto finish;
|
||||
+ }
|
||||
+
|
||||
+ if (!(e = getenv("NOTIFY_SOCKET")))
|
||||
+ return 0;
|
||||
+
|
||||
+ /* Must be an abstract socket, or an absolute path */
|
||||
+ if ((e[0] != '@' && e[0] != '/') || e[1] == 0) {
|
||||
+ r = -EINVAL;
|
||||
+ goto finish;
|
||||
+ }
|
||||
+
|
||||
+ if ((fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0)) < 0) {
|
||||
+ r = -errno;
|
||||
+ goto finish;
|
||||
+ }
|
||||
+
|
||||
+ memset(&sockaddr, 0, sizeof(sockaddr));
|
||||
+ sockaddr.sa.sa_family = AF_UNIX;
|
||||
+ strncpy(sockaddr.un.sun_path, e, sizeof(sockaddr.un.sun_path));
|
||||
+
|
||||
+ if (sockaddr.un.sun_path[0] == '@')
|
||||
+ sockaddr.un.sun_path[0] = 0;
|
||||
+
|
||||
+ memset(&iovec, 0, sizeof(iovec));
|
||||
+ iovec.iov_base = (char*) state;
|
||||
+ iovec.iov_len = strlen(state);
|
||||
+
|
||||
+ memset(&msghdr, 0, sizeof(msghdr));
|
||||
+ msghdr.msg_name = &sockaddr;
|
||||
+ msghdr.msg_namelen = offsetof(struct sockaddr_un, sun_path) + strlen(e);
|
||||
+
|
||||
+ if (msghdr.msg_namelen > sizeof(struct sockaddr_un))
|
||||
+ msghdr.msg_namelen = sizeof(struct sockaddr_un);
|
||||
+
|
||||
+ msghdr.msg_iov = &iovec;
|
||||
+ msghdr.msg_iovlen = 1;
|
||||
+
|
||||
+ if (sendmsg(fd, &msghdr, MSG_NOSIGNAL) < 0) {
|
||||
+ r = -errno;
|
||||
+ goto finish;
|
||||
+ }
|
||||
+
|
||||
+ r = 1;
|
||||
+
|
||||
+finish:
|
||||
+ if (unset_environment)
|
||||
+ unsetenv("NOTIFY_SOCKET");
|
||||
+
|
||||
+ if (fd >= 0)
|
||||
+ close(fd);
|
||||
+
|
||||
+ return r;
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
+int sd_notifyf(int unset_environment, const char *format, ...) {
|
||||
+#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
|
||||
+ return 0;
|
||||
+#else
|
||||
+ va_list ap;
|
||||
+ char *p = NULL;
|
||||
+ int r;
|
||||
+
|
||||
+ va_start(ap, format);
|
||||
+ r = vasprintf(&p, format, ap);
|
||||
+ va_end(ap);
|
||||
+
|
||||
+ if (r < 0 || !p)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ r = sd_notify(unset_environment, p);
|
||||
+ free(p);
|
||||
+
|
||||
+ return r;
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
+int sd_booted(void) {
|
||||
+#if defined(DISABLE_SYSTEMD) || !defined(__linux__)
|
||||
+ return 0;
|
||||
+#else
|
||||
+
|
||||
+ struct stat a, b;
|
||||
+
|
||||
+ /* We simply test whether the systemd cgroup hierarchy is
|
||||
+ * mounted */
|
||||
+
|
||||
+ if (lstat("/sys/fs/cgroup", &a) < 0)
|
||||
+ return 0;
|
||||
+
|
||||
+ if (lstat("/sys/fs/cgroup/systemd", &b) < 0)
|
||||
+ return 0;
|
||||
+
|
||||
+ return a.st_dev != b.st_dev;
|
||||
+#endif
|
||||
+}
|
||||
diff -ruN -x '*~' sysklogd-1.5-old/sd-daemon.h sysklogd-1.5/sd-daemon.h
|
||||
--- sysklogd-1.5-old/sd-daemon.h 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ sysklogd-1.5/sd-daemon.h 2013-05-09 16:01:14.429638107 +0200
|
||||
@@ -0,0 +1,265 @@
|
||||
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
||||
+
|
||||
+#ifndef foosddaemonhfoo
|
||||
+#define foosddaemonhfoo
|
||||
+
|
||||
+/***
|
||||
+ Copyright 2010 Lennart Poettering
|
||||
+
|
||||
+ Permission is hereby granted, free of charge, to any person
|
||||
+ obtaining a copy of this software and associated documentation files
|
||||
+ (the "Software"), to deal in the Software without restriction,
|
||||
+ including without limitation the rights to use, copy, modify, merge,
|
||||
+ publish, distribute, sublicense, and/or sell copies of the Software,
|
||||
+ and to permit persons to whom the Software is furnished to do so,
|
||||
+ subject to the following conditions:
|
||||
+
|
||||
+ The above copyright notice and this permission notice shall be
|
||||
+ included in all copies or substantial portions of the Software.
|
||||
+
|
||||
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
||||
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
||||
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
+ SOFTWARE.
|
||||
+***/
|
||||
+
|
||||
+#include <sys/types.h>
|
||||
+#include <inttypes.h>
|
||||
+
|
||||
+#ifdef __cplusplus
|
||||
+extern "C" {
|
||||
+#endif
|
||||
+
|
||||
+/*
|
||||
+ Reference implementation of a few systemd related interfaces for
|
||||
+ writing daemons. These interfaces are trivial to implement. To
|
||||
+ simplify porting we provide this reference implementation.
|
||||
+ Applications are welcome to reimplement the algorithms described
|
||||
+ here if they do not want to include these two source files.
|
||||
+
|
||||
+ The following functionality is provided:
|
||||
+
|
||||
+ - Support for logging with log levels on stderr
|
||||
+ - File descriptor passing for socket-based activation
|
||||
+ - Daemon startup and status notification
|
||||
+ - Detection of systemd boots
|
||||
+
|
||||
+ You may compile this with -DDISABLE_SYSTEMD to disable systemd
|
||||
+ support. This makes all those calls NOPs that are directly related to
|
||||
+ systemd (i.e. only sd_is_xxx() will stay useful).
|
||||
+
|
||||
+ Since this is drop-in code we don't want any of our symbols to be
|
||||
+ exported in any case. Hence we declare hidden visibility for all of
|
||||
+ them.
|
||||
+
|
||||
+ You may find an up-to-date version of these source files online:
|
||||
+
|
||||
+ http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.h
|
||||
+ http://cgit.freedesktop.org/systemd/plain/src/sd-daemon.c
|
||||
+
|
||||
+ This should compile on non-Linux systems, too, but with the
|
||||
+ exception of the sd_is_xxx() calls all functions will become NOPs.
|
||||
+
|
||||
+ See sd-daemon(7) for more information.
|
||||
+*/
|
||||
+
|
||||
+#ifndef _sd_printf_attr_
|
||||
+#if __GNUC__ >= 4
|
||||
+#define _sd_printf_attr_(a,b) __attribute__ ((format (printf, a, b)))
|
||||
+#else
|
||||
+#define _sd_printf_attr_(a,b)
|
||||
+#endif
|
||||
+#endif
|
||||
+
|
||||
+#ifndef _sd_hidden_
|
||||
+#if (__GNUC__ >= 4) && !defined(SD_EXPORT_SYMBOLS)
|
||||
+#define _sd_hidden_ __attribute__ ((visibility("hidden")))
|
||||
+#else
|
||||
+#define _sd_hidden_
|
||||
+#endif
|
||||
+#endif
|
||||
+
|
||||
+/*
|
||||
+ Log levels for usage on stderr:
|
||||
+
|
||||
+ fprintf(stderr, SD_NOTICE "Hello World!\n");
|
||||
+
|
||||
+ This is similar to printk() usage in the kernel.
|
||||
+*/
|
||||
+#define SD_EMERG "<0>" /* system is unusable */
|
||||
+#define SD_ALERT "<1>" /* action must be taken immediately */
|
||||
+#define SD_CRIT "<2>" /* critical conditions */
|
||||
+#define SD_ERR "<3>" /* error conditions */
|
||||
+#define SD_WARNING "<4>" /* warning conditions */
|
||||
+#define SD_NOTICE "<5>" /* normal but significant condition */
|
||||
+#define SD_INFO "<6>" /* informational */
|
||||
+#define SD_DEBUG "<7>" /* debug-level messages */
|
||||
+
|
||||
+/* The first passed file descriptor is fd 3 */
|
||||
+#define SD_LISTEN_FDS_START 3
|
||||
+
|
||||
+/*
|
||||
+ Returns how many file descriptors have been passed, or a negative
|
||||
+ errno code on failure. Optionally, removes the $LISTEN_FDS and
|
||||
+ $LISTEN_PID file descriptors from the environment (recommended, but
|
||||
+ problematic in threaded environments). If r is the return value of
|
||||
+ this function you'll find the file descriptors passed as fds
|
||||
+ SD_LISTEN_FDS_START to SD_LISTEN_FDS_START+r-1. Returns a negative
|
||||
+ errno style error code on failure. This function call ensures that
|
||||
+ the FD_CLOEXEC flag is set for the passed file descriptors, to make
|
||||
+ sure they are not passed on to child processes. If FD_CLOEXEC shall
|
||||
+ not be set, the caller needs to unset it after this call for all file
|
||||
+ descriptors that are used.
|
||||
+
|
||||
+ See sd_listen_fds(3) for more information.
|
||||
+*/
|
||||
+int sd_listen_fds(int unset_environment) _sd_hidden_;
|
||||
+
|
||||
+/*
|
||||
+ Helper call for identifying a passed file descriptor. Returns 1 if
|
||||
+ the file descriptor is a FIFO in the file system stored under the
|
||||
+ specified path, 0 otherwise. If path is NULL a path name check will
|
||||
+ not be done and the call only verifies if the file descriptor
|
||||
+ refers to a FIFO. Returns a negative errno style error code on
|
||||
+ failure.
|
||||
+
|
||||
+ See sd_is_fifo(3) for more information.
|
||||
+*/
|
||||
+int sd_is_fifo(int fd, const char *path) _sd_hidden_;
|
||||
+
|
||||
+/*
|
||||
+ Helper call for identifying a passed file descriptor. Returns 1 if
|
||||
+ the file descriptor is a socket of the specified family (AF_INET,
|
||||
+ ...) and type (SOCK_DGRAM, SOCK_STREAM, ...), 0 otherwise. If
|
||||
+ family is 0 a socket family check will not be done. If type is 0 a
|
||||
+ socket type check will not be done and the call only verifies if
|
||||
+ the file descriptor refers to a socket. If listening is > 0 it is
|
||||
+ verified that the socket is in listening mode. (i.e. listen() has
|
||||
+ been called) If listening is == 0 it is verified that the socket is
|
||||
+ not in listening mode. If listening is < 0 no listening mode check
|
||||
+ is done. Returns a negative errno style error code on failure.
|
||||
+
|
||||
+ See sd_is_socket(3) for more information.
|
||||
+*/
|
||||
+int sd_is_socket(int fd, int family, int type, int listening) _sd_hidden_;
|
||||
+
|
||||
+/*
|
||||
+ Helper call for identifying a passed file descriptor. Returns 1 if
|
||||
+ the file descriptor is an Internet socket, of the specified family
|
||||
+ (either AF_INET or AF_INET6) and the specified type (SOCK_DGRAM,
|
||||
+ SOCK_STREAM, ...), 0 otherwise. If version is 0 a protocol version
|
||||
+ check is not done. If type is 0 a socket type check will not be
|
||||
+ done. If port is 0 a socket port check will not be done. The
|
||||
+ listening flag is used the same way as in sd_is_socket(). Returns a
|
||||
+ negative errno style error code on failure.
|
||||
+
|
||||
+ See sd_is_socket_inet(3) for more information.
|
||||
+*/
|
||||
+int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port) _sd_hidden_;
|
||||
+
|
||||
+/*
|
||||
+ Helper call for identifying a passed file descriptor. Returns 1 if
|
||||
+ the file descriptor is an AF_UNIX socket of the specified type
|
||||
+ (SOCK_DGRAM, SOCK_STREAM, ...) and path, 0 otherwise. If type is 0
|
||||
+ a socket type check will not be done. If path is NULL a socket path
|
||||
+ check will not be done. For normal AF_UNIX sockets set length to
|
||||
+ 0. For abstract namespace sockets set length to the length of the
|
||||
+ socket name (including the initial 0 byte), and pass the full
|
||||
+ socket path in path (including the initial 0 byte). The listening
|
||||
+ flag is used the same way as in sd_is_socket(). Returns a negative
|
||||
+ errno style error code on failure.
|
||||
+
|
||||
+ See sd_is_socket_unix(3) for more information.
|
||||
+*/
|
||||
+int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length) _sd_hidden_;
|
||||
+
|
||||
+/*
|
||||
+ Informs systemd about changed daemon state. This takes a number of
|
||||
+ newline separated environment-style variable assignments in a
|
||||
+ string. The following variables are known:
|
||||
+
|
||||
+ READY=1 Tells systemd that daemon startup is finished (only
|
||||
+ relevant for services of Type=notify). The passed
|
||||
+ argument is a boolean "1" or "0". Since there is
|
||||
+ little value in signalling non-readiness the only
|
||||
+ value daemons should send is "READY=1".
|
||||
+
|
||||
+ STATUS=... Passes a single-line status string back to systemd
|
||||
+ that describes the daemon state. This is free-from
|
||||
+ and can be used for various purposes: general state
|
||||
+ feedback, fsck-like programs could pass completion
|
||||
+ percentages and failing programs could pass a human
|
||||
+ readable error message. Example: "STATUS=Completed
|
||||
+ 66% of file system check..."
|
||||
+
|
||||
+ ERRNO=... If a daemon fails, the errno-style error code,
|
||||
+ formatted as string. Example: "ERRNO=2" for ENOENT.
|
||||
+
|
||||
+ BUSERROR=... If a daemon fails, the D-Bus error-style error
|
||||
+ code. Example: "BUSERROR=org.freedesktop.DBus.Error.TimedOut"
|
||||
+
|
||||
+ MAINPID=... The main pid of a daemon, in case systemd did not
|
||||
+ fork off the process itself. Example: "MAINPID=4711"
|
||||
+
|
||||
+ Daemons can choose to send additional variables. However, it is
|
||||
+ recommened to prefix variable names not listed above with X_.
|
||||
+
|
||||
+ Returns a negative errno-style error code on failure. Returns > 0
|
||||
+ if systemd could be notified, 0 if it couldn't possibly because
|
||||
+ systemd is not running.
|
||||
+
|
||||
+ Example: When a daemon finished starting up, it could issue this
|
||||
+ call to notify systemd about it:
|
||||
+
|
||||
+ sd_notify(0, "READY=1");
|
||||
+
|
||||
+ See sd_notifyf() for more complete examples.
|
||||
+
|
||||
+ See sd_notify(3) for more information.
|
||||
+*/
|
||||
+int sd_notify(int unset_environment, const char *state) _sd_hidden_;
|
||||
+
|
||||
+/*
|
||||
+ Similar to sd_notify() but takes a format string.
|
||||
+
|
||||
+ Example 1: A daemon could send the following after initialization:
|
||||
+
|
||||
+ sd_notifyf(0, "READY=1\n"
|
||||
+ "STATUS=Processing requests...\n"
|
||||
+ "MAINPID=%lu",
|
||||
+ (unsigned long) getpid());
|
||||
+
|
||||
+ Example 2: A daemon could send the following shortly before
|
||||
+ exiting, on failure:
|
||||
+
|
||||
+ sd_notifyf(0, "STATUS=Failed to start up: %s\n"
|
||||
+ "ERRNO=%i",
|
||||
+ strerror(errno),
|
||||
+ errno);
|
||||
+
|
||||
+ See sd_notifyf(3) for more information.
|
||||
+*/
|
||||
+int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_attr_(2,3) _sd_hidden_;
|
||||
+
|
||||
+/*
|
||||
+ Returns > 0 if the system was booted with systemd. Returns < 0 on
|
||||
+ error. Returns 0 if the system was not booted with systemd. Note
|
||||
+ that all of the functions above handle non-systemd boots just
|
||||
+ fine. You should NOT protect them with a call to this function. Also
|
||||
+ note that this function checks whether the system, not the user
|
||||
+ session is controlled by systemd. However the functions above work
|
||||
+ for both user and system services.
|
||||
+
|
||||
+ See sd_booted(3) for more information.
|
||||
+*/
|
||||
+int sd_booted(void) _sd_hidden_;
|
||||
+
|
||||
+#ifdef __cplusplus
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+#endif
|
||||
diff -ruN -x '*~' sysklogd-1.5-old/syslogd.c sysklogd-1.5/syslogd.c
|
||||
--- sysklogd-1.5-old/syslogd.c 2007-07-04 21:04:01.000000000 +0200
|
||||
+++ sysklogd-1.5/syslogd.c 2013-05-09 16:04:32.106602589 +0200
|
||||
@@ -551,6 +551,7 @@
|
||||
|
||||
#if defined(__linux__)
|
||||
#include <paths.h>
|
||||
+#include <sd-daemon.h>
|
||||
#endif
|
||||
|
||||
#ifndef UTMP_FILE
|
||||
@@ -965,8 +966,11 @@
|
||||
}
|
||||
signal (SIGTERM, SIG_DFL);
|
||||
num_fds = getdtablesize();
|
||||
- for (i= 0; i < num_fds; i++)
|
||||
- (void) close(i);
|
||||
+#if defined(__linux__)
|
||||
+ if (sd_listen_fds(0) <= 0)
|
||||
+#endif
|
||||
+ for (i = 0; i < num_fds; i++)
|
||||
+ (void) close(i);
|
||||
untty();
|
||||
}
|
||||
else
|
||||
@@ -1253,6 +1257,60 @@
|
||||
if (path[0] == '\0')
|
||||
return -1;
|
||||
|
||||
+#if defined(__linux__)
|
||||
+ if (strcmp(path, _PATH_LOG) == 0) {
|
||||
+ int r;
|
||||
+
|
||||
+ /* Check whether an FD was passed in from systemd. If
|
||||
+ * so, it's the /dev/log socket, so use it. */
|
||||
+
|
||||
+ r = sd_listen_fds(0);
|
||||
+ if (r < 0) {
|
||||
+ logerror("Failed to acquire systemd socket");
|
||||
+#ifndef SYSV
|
||||
+ dienow();
|
||||
+#else
|
||||
+ return -1;
|
||||
+#endif
|
||||
+ }
|
||||
+
|
||||
+
|
||||
+ if (r > 1) {
|
||||
+ logerror("Wrong number of systemd sockets passed");
|
||||
+#ifndef SYSV
|
||||
+ dienow();
|
||||
+#else
|
||||
+ return -1;
|
||||
+#endif
|
||||
+ }
|
||||
+
|
||||
+ if (r == 1) {
|
||||
+ fd = SD_LISTEN_FDS_START;
|
||||
+ r = sd_is_socket_unix(fd, SOCK_DGRAM, -1, "/run/systemd/journal/syslog", 0);
|
||||
+ if (r < 0) {
|
||||
+ logerror("Failed to verify systemd socket type");
|
||||
+#ifndef SYSV
|
||||
+ dienow();
|
||||
+#else
|
||||
+ return -1;
|
||||
+#endif
|
||||
+ }
|
||||
+
|
||||
+ if (!r) {
|
||||
+ logerror("Passed systemd socket of wrong type");
|
||||
+#ifndef SYSV
|
||||
+ dienow();
|
||||
+#else
|
||||
+ return -1;
|
||||
+#endif
|
||||
+ }
|
||||
+
|
||||
+ dprintf("Using systemd socket (%d).\n", fd);
|
||||
+ return fd;
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
(void) unlink(path);
|
||||
|
||||
memset(&sunx, 0, sizeof(sunx));
|
||||
@@ -2254,9 +2312,11 @@
|
||||
if (InetInuse) close(inetm);
|
||||
|
||||
/* Clean-up files. */
|
||||
- for (i = 0; i < nfunix; i++)
|
||||
- if (funixn[i] && funix[i] != -1)
|
||||
- (void)unlink(funixn[i]);
|
||||
+ i = 0;
|
||||
+#if defined(__linux__)
|
||||
+ if (sd_listen_fds(0) > 0)
|
||||
+ i = 1;
|
||||
+#endif
|
||||
#ifndef TESTING
|
||||
(void) remove_pid(PidFile);
|
||||
#endif
|
||||
@@ -1,11 +0,0 @@
|
||||
--- sysklogd-1.5-old/syslogd.c 2016-08-30 22:50:59.812926945 +0100
|
||||
+++ sysklogd-1.5/syslogd.c 2016-08-30 22:51:12.008842890 +0100
|
||||
@@ -2094,7 +2094,7 @@
|
||||
(void) signal(SIGCHLD, reapchild); /* reset signal handler -ASP */
|
||||
wait ((int *)0);
|
||||
#else
|
||||
- union wait status;
|
||||
+ int status;
|
||||
|
||||
while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0)
|
||||
;
|
||||
@@ -19,6 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
# the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR
|
||||
# correctly (setting it to an absolute path causes include files to go to
|
||||
# $out/$out/include, because the absolute path is interpreted with root at
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "tootik";
|
||||
version = "0.18.0";
|
||||
version = "0.19.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dimkr";
|
||||
repo = "tootik";
|
||||
tag = version;
|
||||
hash = "sha256-j+1oMfeuE4gZjhWsDORsDhF+EUcNeCv0EDz6Q7DNPzQ=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-xbYmIH3dsZg2mL4coUwIAyQA5EhnTUOXs6Vu6ThfwUg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dQcmpYaSWvgF3B/rMs36+Snxh24JTPmkKGamkzcqqeM=";
|
||||
vendorHash = "sha256-hVhAtKW6O2wpmQS4l/O8ltt+aHxW6nDVpegOIip545c=";
|
||||
|
||||
nativeBuildInputs = [ openssl ];
|
||||
|
||||
@@ -31,6 +31,8 @@ buildGoModule rec {
|
||||
|
||||
doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = {
|
||||
description = "Federated nanoblogging service with a Gemini frontend";
|
||||
homepage = "https://github.com/dimkr/tootik";
|
||||
|
||||
@@ -10,13 +10,13 @@ let
|
||||
in
|
||||
buildGoModule {
|
||||
pname = "typescript-go";
|
||||
version = "0-unstable-2025-10-03";
|
||||
version = "0-unstable-2025-10-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "typescript-go";
|
||||
rev = "e729a0a55aa898cd3ce424a5c97e07f5dc98580f";
|
||||
hash = "sha256-ZIluvlQNC21EZA4le+lyeynaJj4D0JYxI9njgw7Uuyc=";
|
||||
rev = "a05e479428cb43c6228f78dc04f8326bbd91317b";
|
||||
hash = "sha256-ypn+DCfSfASgigjer0n65qGx0DGZzflTyinITgGbdeU=";
|
||||
fetchSubmodules = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -11,10 +11,12 @@
|
||||
stdenv,
|
||||
}:
|
||||
let
|
||||
pname = "vrcx";
|
||||
version = "2025.09.10";
|
||||
dotnet = dotnetCorePackages.dotnet_9;
|
||||
electron = electron_37;
|
||||
in
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "vrcx";
|
||||
version = "2025.09.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vrcx-team";
|
||||
@@ -23,29 +25,6 @@ let
|
||||
hash = "sha256-7axYnsImG+VllQE1rhr8NmuMCm5t3bgNYGIIn9j2wMk=";
|
||||
};
|
||||
|
||||
backend = buildDotnetModule {
|
||||
inherit version src;
|
||||
pname = "${pname}-backend";
|
||||
|
||||
dotnet-sdk = dotnet.sdk;
|
||||
dotnet-runtime = dotnet.runtime;
|
||||
projectFile = "Dotnet/VRCX-Electron.csproj";
|
||||
|
||||
nugetDeps = ./deps.json;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/build/Electron
|
||||
cp -r build/Electron/* $out/build/Electron/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
in
|
||||
buildNpmPackage {
|
||||
inherit pname version src;
|
||||
|
||||
npmDepsHash = "sha256-VFYWXPhZrg3q2PW4kWfVr5/DY8W6Uf1mvnwfB4mVBrs=";
|
||||
npmFlags = [ "--ignore-scripts" ];
|
||||
makeCacheWritable = true;
|
||||
@@ -76,7 +55,7 @@ buildNpmPackage {
|
||||
mkdir -p "$out/share/vrcx"
|
||||
cp -r build/*-unpacked/resources "$out/share/vrcx/"
|
||||
mkdir -p "$out/share/vrcx/resources/app.asar.unpacked/build/Electron"
|
||||
cp -r ${backend}/build/Electron/* "$out/share/vrcx/resources/app.asar.unpacked/build/Electron/"
|
||||
cp -r ${finalAttrs.passthru.backend}/build/Electron/* "$out/share/vrcx/resources/app.asar.unpacked/build/Electron/"
|
||||
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/vrcx" \
|
||||
--add-flags "--ozone-platform-hint=auto" \
|
||||
@@ -107,7 +86,25 @@ buildNpmPackage {
|
||||
];
|
||||
|
||||
passthru = {
|
||||
inherit backend;
|
||||
backend = buildDotnetModule {
|
||||
pname = "${finalAttrs.pname}-backend";
|
||||
inherit (finalAttrs) version src;
|
||||
|
||||
dotnet-sdk = dotnet.sdk;
|
||||
dotnet-runtime = dotnet.runtime;
|
||||
projectFile = "Dotnet/VRCX-Electron.csproj";
|
||||
|
||||
nugetDeps = ./deps.json;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/build/Electron
|
||||
cp -r build/Electron/* $out/build/Electron/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
@@ -126,4 +123,4 @@ buildNpmPackage {
|
||||
platforms = lib.platforms.linux;
|
||||
broken = !stdenv.hostPlatform.isx86_64;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
runCommand,
|
||||
vscode-js-debug,
|
||||
nix-update-script,
|
||||
clang_20,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "vscode-js-debug";
|
||||
version = "1.104.0";
|
||||
@@ -30,7 +30,10 @@ buildNpmPackage rec {
|
||||
pkg-config
|
||||
node-gyp
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
xcbuild
|
||||
clang_20
|
||||
]; # clang_21 breaks it
|
||||
|
||||
buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ];
|
||||
|
||||
|
||||
@@ -1,34 +1,30 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
protobuf,
|
||||
glib,
|
||||
vips,
|
||||
gobject-introspection,
|
||||
wrapGAppsHook4,
|
||||
gtk4,
|
||||
gtk4-layer-shell,
|
||||
gdk-pixbuf,
|
||||
graphene,
|
||||
cairo,
|
||||
pango,
|
||||
poppler,
|
||||
nix-update-script,
|
||||
libqalculate,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "walker";
|
||||
version = "2.2.0";
|
||||
version = "0.13.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abenz1267";
|
||||
repo = "walker";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cSRd4ncUWjB59nRqY0X0eXioOIL7q7PwgOQggE54lTI=";
|
||||
hash = "sha256-LslpfHXj31Lvq+26ZDzCTaGBbxmp7yXlgKT+uwUEEts=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Nm7KxZBvQOk4gOJCtMyMVASepJDrVmogHqv6Tc1r33Q=";
|
||||
vendorHash = "sha256-N7lNxO/l3E1BlSSbSiQjrDPy2sWwk4G4JYlUArmMJxs=";
|
||||
subPackages = [ "cmd/walker.go" ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
@@ -36,26 +32,21 @@ rustPlatform.buildRustPackage rec {
|
||||
pkg-config
|
||||
gobject-introspection
|
||||
wrapGAppsHook4
|
||||
protobuf
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk4
|
||||
vips
|
||||
gtk4-layer-shell
|
||||
gdk-pixbuf
|
||||
graphene
|
||||
cairo
|
||||
pango
|
||||
poppler
|
||||
libqalculate
|
||||
];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Wayland-native application runner";
|
||||
homepage = "https://github.com/abenz1267/walker";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ donovanglover ];
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ donovanglover ];
|
||||
mainProgram = "walker";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -37,6 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"lib"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -55,27 +56,24 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
# error: linker `rust-lld` not found
|
||||
!isAarch64;
|
||||
|
||||
# prevent $out from being propagated to $dev:
|
||||
# the library and header files are not dependent on the binaries
|
||||
propagatedBuildOutputs = [ ];
|
||||
|
||||
postInstall =
|
||||
let
|
||||
inherit (stdenv.hostPlatform.rust) cargoShortTarget;
|
||||
in
|
||||
''
|
||||
moveToOutput lib $dev
|
||||
${lib.optionalString (!enableShared) "rm -f $dev/lib/*.so{,.*}"}
|
||||
${lib.optionalString (!enableStatic) "rm -f $dev/lib/*.a"}
|
||||
moveToOutput lib $lib
|
||||
${lib.optionalString (!enableShared) "rm -f $lib/lib/*.so{,.*}"}
|
||||
${lib.optionalString (!enableStatic) "rm -f $lib/lib/*.a"}
|
||||
|
||||
# copy the build.rs generated c-api headers
|
||||
# https://github.com/rust-lang/cargo/issues/9661
|
||||
mkdir $dev
|
||||
cp -r target/${cargoShortTarget}/release/build/wasmtime-c-api-impl-*/out/include $dev/include
|
||||
''
|
||||
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
install_name_tool -id \
|
||||
$dev/lib/libwasmtime.dylib \
|
||||
$dev/lib/libwasmtime.dylib
|
||||
$lib/lib/libwasmtime.dylib \
|
||||
$lib/lib/libwasmtime.dylib
|
||||
''
|
||||
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd wasmtime \
|
||||
|
||||
@@ -7,11 +7,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "wireless-regdb";
|
||||
version = "2025.07.10";
|
||||
version = "2025.10.07";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-qDQLzc0bXbbHkUmHnRIrFw87sHU4FxjU9Cmtgxpvoo0=";
|
||||
hash = "sha256-1MhypEFUYEyGn1hR99IdgY1JKDXTcK9/WN6IR5c4AcM=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@@ -1,28 +1,28 @@
|
||||
diff --git a/src-script/pack-apack-win-linux.js b/src-script/pack-apack-win-linux.js
|
||||
index 0120f9f9..41fcf99c 100644
|
||||
index 7eaaedc1..35b41431 100644
|
||||
--- a/src-script/pack-apack-win-linux.js
|
||||
+++ b/src-script/pack-apack-win-linux.js
|
||||
@@ -6,12 +6,12 @@ exports.default = async function (context) {
|
||||
@@ -6,13 +6,13 @@ exports.default = async function (context) {
|
||||
context.electronPlatformName === 'win32' ||
|
||||
context.electronPlatformName === 'linux'
|
||||
) {
|
||||
- return scriptUtil.executeCmd({}, 'npx', [
|
||||
- await scriptUtil.executeCmd({}, 'npx', [
|
||||
- 'copyfiles',
|
||||
- '-V',
|
||||
- '-f',
|
||||
- path.resolve(context.outDir, '../apack.json'),
|
||||
- context.appOutDir
|
||||
+ return scriptUtil.executeCmd({}, 'install', [
|
||||
+ await scriptUtil.executeCmd({}, 'install', [
|
||||
+ '-m466',
|
||||
+ '-v',
|
||||
+ '-Dt',
|
||||
+ context.appOutDir,
|
||||
+ path.resolve(context.outDir, '../apack.json')
|
||||
path.resolve(context.outDir, '../apack.json'),
|
||||
path.resolve(context.outDir, '../src/assets/zap.png'),
|
||||
- context.appOutDir
|
||||
])
|
||||
console.log('Files copied successfully.')
|
||||
}
|
||||
}
|
||||
diff --git a/src-script/script-util.js b/src-script/script-util.js
|
||||
index 1897c2b8..9faa5f20 100644
|
||||
index 1897c2b8..ed6bba12 100644
|
||||
--- a/src-script/script-util.js
|
||||
+++ b/src-script/script-util.js
|
||||
@@ -181,11 +181,9 @@ async function rebuildBackendIfNeeded() {
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "zap-chip";
|
||||
version = "2025.02.26";
|
||||
version = "2025.07.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "project-chip";
|
||||
repo = "zap";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oYw1CxeCr4dUpw7hhXjtB+QwTfBI7rG9jgfxWKZYsSc=";
|
||||
hash = "sha256-MGu4qr+iXqI+GTpThI8yCcjt0KAcEwgJJa7wSnbryco=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-dcnJfxgF1S2gyR+wPnBD4AFzix5Sdq2ZqDlXvWAFb8s=";
|
||||
npmDepsHash = "sha256-2AWqqMm91Ql9JA5oqon7H1YUuzJG+Z9c3LpsbQ9HE90=";
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
|
||||
env.CYPRESS_INSTALL_BINARY = "0";
|
||||
@@ -84,6 +84,7 @@ buildNpmPackage rec {
|
||||
meta = {
|
||||
description = "Generic generation engine and user interface for applications and libraries based on Zigbee Cluster Library (ZCL)";
|
||||
changelog = "https://github.com/project-chip/zap/releases/tag/v${version}";
|
||||
homepage = "https://github.com/project-chip/zap";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ symphorien ];
|
||||
mainProgram = "zap" + lib.optionalString (!withGui) "-cli";
|
||||
|
||||
@@ -97,8 +97,6 @@ let
|
||||
|
||||
derive = callPackage ./derive.nix { };
|
||||
|
||||
descncrunch = callPackage ./descncrunch.nix { };
|
||||
|
||||
dict = callPackage ./dict.nix { };
|
||||
|
||||
dom = callPackage ./dom.nix { };
|
||||
@@ -227,6 +225,7 @@ let
|
||||
// builtins_
|
||||
// pkgs.lib.optionalAttrs config.allowAliases {
|
||||
# removed packages
|
||||
descncrunch = throw "descncrunch has been removed because it has been marked as broken since 2018."; # Added 2025-10-11
|
||||
protobuf = throw "idrisPackages.protobuf has been removed: abandoned by upstream"; # Added 2022-02-06
|
||||
sdl = throw "'idrisPackages.sdl' has been removed, as it was broken and unmaintained"; # added 2024-05-09
|
||||
};
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
{
|
||||
build-idris-package,
|
||||
fetchFromGitHub,
|
||||
pruviloj,
|
||||
lib,
|
||||
}:
|
||||
build-idris-package {
|
||||
pname = "descncrunch";
|
||||
version = "2017-11-15";
|
||||
|
||||
idrisDeps = [ pruviloj ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ahmadsalim";
|
||||
repo = "desc-n-crunch";
|
||||
rev = "261d9718504b8f0572c4fe7ae407a0231779bcab";
|
||||
sha256 = "09fh334aga1z1hbw79507rdv7qsh0mqzb89lvpznn7vzi9zkl8fx";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Descriptions, levitation, and reflecting the elaborator";
|
||||
homepage = "https://github.com/ahmadsalim/desc-n-crunch";
|
||||
license = lib.licenses.gpl3;
|
||||
maintainers = [ lib.maintainers.brainrape ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
@@ -1,92 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
babashka,
|
||||
cacert,
|
||||
clojure,
|
||||
git,
|
||||
jdk,
|
||||
obb,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
runCommand,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "obb";
|
||||
version = "0.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "babashka";
|
||||
repo = "obb";
|
||||
rev = "v${version}";
|
||||
sha256 = "1Gxh4IMtytQCuPS+BWOc5AgjEBxa43ebYfDsxLSPeY0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = [
|
||||
babashka
|
||||
cacert
|
||||
git
|
||||
jdk
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
mkdir -p .m2
|
||||
substituteInPlace deps.edn --replace ':paths' ':mvn/local-repo "./.m2" :paths'
|
||||
substituteInPlace bb.edn --replace ':paths' ':mvn/local-repo "./.m2" :paths'
|
||||
echo deps.edn
|
||||
|
||||
runHook postConfigure
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
export DEPS_CLJ_TOOLS_DIR=${clojure}
|
||||
export DEPS_CLJ_TOOLS_VERSION=${clojure.version}
|
||||
mkdir -p .gitlibs
|
||||
mkdir -p .cpcache
|
||||
export GITLIBS=.gitlibs
|
||||
export CLJ_CACHE=.cpcache
|
||||
|
||||
bb build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
ln -s /usr/bin/osascript $out/bin/osascript
|
||||
|
||||
install -Dm755 "out/bin/obb" "$out/bin/obb"
|
||||
wrapProgram $out/bin/obb --prefix PATH : $out/bin
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.tests = {
|
||||
simple = runCommand "obb-test" { } ''
|
||||
[ $(${obb}/bin/obb -e '(+ 1 2)') = '3' ]
|
||||
touch $out
|
||||
'';
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Ad-hoc ClojureScript scripting of Mac applications via Apple's Open Scripting Architecture";
|
||||
homepage = "https://github.com/babashka/obb";
|
||||
license = licenses.epl10;
|
||||
maintainers = with maintainers; [
|
||||
willcohen
|
||||
];
|
||||
platforms = platforms.darwin;
|
||||
|
||||
# https://hydra.nixos.org/job/nixpkgs/trunk/obb.aarch64-darwin/all
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
fetchFromGitHub,
|
||||
standard-library,
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "generic";
|
||||
version = "0.1.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "effectfully";
|
||||
repo = "Generic";
|
||||
rev = "v${version}";
|
||||
sha256 = "05igsd2gaj6h9bkqwp8llhvn4qvc5gmi03x4fnz096ba8m6x8s3n";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
standard-library
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
echo "module Everything where" > Everything.agda
|
||||
find src -name '*.agda' | sed -e 's/src\///;s/\//./g;s/\.agda$//;s/^/import /' >> Everything.agda
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
# Remove if a version compatible with agda 2.6.2 is made
|
||||
broken = true;
|
||||
description = "Library for doing generic programming in Agda";
|
||||
homepage = src.meta.homepage;
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [
|
||||
alexarice
|
||||
turion
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiontfy";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tr4nt0r";
|
||||
repo = "aiontfy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-k68NNs2qckWNRId8f9anTBKAxaYo9UL10NaQ3T4BTMc=";
|
||||
hash = "sha256-43sl9jCJErROEOIllUFizG6IIBpFWCQTRyJP+0u1z+M=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "beaupy";
|
||||
version = "3.10.1";
|
||||
version = "3.10.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "petereon";
|
||||
repo = "beaupy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tN78OV0Ks1MIdqVh8yisTgK4dOaKqYlZxvIoCa44eAI=";
|
||||
hash = "sha256-0m0qc/ei8BuU7vHK/4mY7YQvHVTfwsaPH4Kko9wCKvM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -36,14 +36,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "euporie";
|
||||
version = "2.8.13";
|
||||
version = "2.8.14";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joouha";
|
||||
repo = "euporie";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-T+Zec5vb+y5qf7Xvv+QtVG+olnv2C0933tCJbEQAJuU=";
|
||||
hash = "sha256-Fl1TWg2zW9N+6Q+kNxBz+Vq9K09A0rWcUAkmD5wJ1J8=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hcloud";
|
||||
version = "2.7.0";
|
||||
version = "2.8.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2CND7VTwzPFHXiSYTL06BKxIMLVovzcH+FVAJD9hQ0s=";
|
||||
hash = "sha256-5ehqw5qERzR5+RCetWgu9npjdMFDHRWMO/dEMqCIPSs=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
aiohttp,
|
||||
alive-progress,
|
||||
appdirs,
|
||||
appnope,
|
||||
black,
|
||||
@@ -10,6 +11,7 @@
|
||||
coloredlogs,
|
||||
coverage,
|
||||
cryptography,
|
||||
debugpy,
|
||||
diskcache,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
@@ -40,6 +42,7 @@
|
||||
psutil,
|
||||
ptpython,
|
||||
pyelftools,
|
||||
pyfakefs,
|
||||
pygments,
|
||||
pykwalify,
|
||||
pylint,
|
||||
@@ -47,6 +50,7 @@
|
||||
pyserial,
|
||||
python,
|
||||
python-daemon,
|
||||
python-path,
|
||||
pythonOlder,
|
||||
pyyaml,
|
||||
requests,
|
||||
@@ -57,6 +61,7 @@
|
||||
sphinx-design,
|
||||
stdenv,
|
||||
stringcase,
|
||||
tabulate,
|
||||
toml,
|
||||
tornado,
|
||||
types-protobuf,
|
||||
@@ -72,14 +77,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "home-assistant-chip-wheels";
|
||||
version = "2025.4.0";
|
||||
version = "2025.7.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-assistant-libs";
|
||||
repo = "chip-wheels";
|
||||
tag = version;
|
||||
fetchSubmodules = false;
|
||||
leaveDotGit = true;
|
||||
hash = "sha256-20dqVXHPgSxBveTxlbHEjTtp9NI1oVCVpBTDbjDI2QA=";
|
||||
hash = "sha256-SfhsM2RPghFPx0qtoHsXVymwmOWFiEGAyLx6FeB++dg=";
|
||||
postFetch = ''
|
||||
cd $out
|
||||
# Download connectedhomeip.
|
||||
@@ -115,6 +120,7 @@ stdenv.mkDerivation rec {
|
||||
click
|
||||
jinja2
|
||||
lark
|
||||
python-path
|
||||
setuptools
|
||||
stringcase
|
||||
build
|
||||
@@ -140,6 +146,14 @@ stdenv.mkDerivation rec {
|
||||
extraPrefix = "connectedhomeip/third_party/pigweed/repo/";
|
||||
hash = "sha256-6ss3j8j69w7EMio9mFP/EL2oPqQ2sLh67eWsJjHdDa8=";
|
||||
})
|
||||
# fix `ModuleNotFoundError: No module named 'matter'`
|
||||
# https://github.com/project-chip/connectedhomeip/pull/39826
|
||||
(fetchpatch {
|
||||
url = "https://github.com/project-chip/connectedhomeip/commit/78c6a7e15658f66658eb9f780e1a0c0c176a67d7.patch";
|
||||
stripLen = 1;
|
||||
extraPrefix = "connectedhomeip/";
|
||||
hash = "sha256-s5t9DvmZVpnVelrN9+Ekn0OJl/VouXUGKCgu/PTLHBI=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@@ -155,7 +169,7 @@ stdenv.mkDerivation rec {
|
||||
# unpin dependencies
|
||||
# there are many files to modify, in different formats
|
||||
sed -i 's/==.*$//' third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/virtualenv_setup/python_base_requirements.txt
|
||||
sed -i 's/==[^;]*//' scripts/setup/constraints.txt
|
||||
sed -i 's/==[^;]*//' scripts/setup/constraints.txt scripts/tests/requirements.txt
|
||||
sed -i 's/\(^ \+[a-zA-Z0-9-]*\)[=~><]=[^;]*/\1/' third_party/pigweed/repo/pw_protobuf_compiler/py/setup.cfg third_party/pigweed/repo/pw_protobuf/py/setup.cfg third_party/pigweed/repo/pw_protobuf_compiler/py/setup.cfg
|
||||
# remove a few dependencies not packaged in nixpkgs and which are apparently
|
||||
# not needed to build the python bindings of chip
|
||||
@@ -166,6 +180,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# some code is generated by a templating tool (zap-cli)
|
||||
scripts/codepregen.py ./zzz_pregenerated/
|
||||
|
||||
# `pip._internal.exceptions.InstallationError: ''${PW_PROJECT_ROOT}/scripts/py_matter_idl is not a valid editable requirement`
|
||||
substituteInPlace scripts/tests/requirements.txt \
|
||||
--replace-fail '-e ''${PW_PROJECT_ROOT}/scripts/py_matter_idl' "" \
|
||||
--replace-fail '-e ''${PW_PROJECT_ROOT}/scripts/py_matter_yamltests' ""
|
||||
'';
|
||||
|
||||
# the python parts of the build system work as follows
|
||||
@@ -188,6 +207,7 @@ stdenv.mkDerivation rec {
|
||||
let
|
||||
dependencies = [
|
||||
aiohttp
|
||||
alive-progress
|
||||
appdirs
|
||||
appnope
|
||||
black
|
||||
@@ -197,6 +217,7 @@ stdenv.mkDerivation rec {
|
||||
coverage
|
||||
click
|
||||
cryptography
|
||||
debugpy
|
||||
diskcache
|
||||
googleapis-common-protos
|
||||
google-cloud-storage
|
||||
@@ -217,13 +238,15 @@ stdenv.mkDerivation rec {
|
||||
protobuf
|
||||
psutil
|
||||
ptpython
|
||||
pyfakefs
|
||||
pyelftools
|
||||
pygments
|
||||
pykwalify
|
||||
(pylint.overridePythonAttrs { doCheck = pythonOlder "3.13"; })
|
||||
pylint
|
||||
pyperclip
|
||||
pyserial
|
||||
python-daemon
|
||||
python-path
|
||||
pyyaml
|
||||
requests
|
||||
setuptools
|
||||
@@ -232,6 +255,7 @@ stdenv.mkDerivation rec {
|
||||
sphinx-argparse
|
||||
sphinx-design
|
||||
stringcase
|
||||
tabulate
|
||||
toml
|
||||
tornado
|
||||
types-protobuf
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mpltoolbox";
|
||||
version = "25.05.0";
|
||||
version = "25.10.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scipp";
|
||||
repo = "mpltoolbox";
|
||||
tag = version;
|
||||
hash = "sha256-XDfCzkn/Mr0Rca+Ku/mDSneqSfMHS9i/XUP8vVLSKMQ=";
|
||||
hash = "sha256-hHx2pstLnmvgDea2f+Wyhl+U8gijlhkARsqZ31pgjCU=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "nhc";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vandeurenglenn";
|
||||
repo = "nhc";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-eEzubHmnaj1Z7XKlpQff4VLlNNllnBh7pDmNT5Yfw+E=";
|
||||
hash = "sha256-zA9aIVP7H4v+W4IBGEWqyzKPriDNYJTyXiKFvQCt33c=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pystiebeleltron";
|
||||
version = "0.2.3";
|
||||
version = "0.2.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ThyMYthOS";
|
||||
repo = "python-stiebel-eltron";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vJo9fjtbGuWJ1JcK6u0Cnol1Ev3eobD14YjH+S256og=";
|
||||
hash = "sha256-36KEE1GvdXUjF6V3V5d+0hvUb4/cVKNfTI6xyc4/aLM=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
{
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
lib,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-path";
|
||||
version = "0.1.3";
|
||||
pyproject = true;
|
||||
|
||||
# no tags on GitHub
|
||||
src = fetchPypi {
|
||||
pname = "python_path";
|
||||
inherit version;
|
||||
hash = "sha256-ti2arB2k2u4/A27QiFMs+LaGZtOqEDVn3CK2U5MWyLM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonImportsCheck = [ "python_path" ];
|
||||
|
||||
# upstream has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Clean way to import scripts on other folders via a context manager";
|
||||
homepage = "https://github.com/cgarciae/python_path";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.dotlambda ];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
From 8479bb8809a318f49ae5b881b65890db40b0e693 Mon Sep 17 00:00:00 2001
|
||||
From: loner <2788892716@qq.com>
|
||||
Date: Thu, 9 Oct 2025 10:18:44 +0800
|
||||
Subject: [PATCH] Remove deprecated setup_requires from setup.cfg
|
||||
|
||||
---
|
||||
setup.cfg | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/setup.cfg b/setup.cfg
|
||||
index 78468c0..7a875bb 100644
|
||||
--- a/setup.cfg
|
||||
+++ b/setup.cfg
|
||||
@@ -27,8 +27,6 @@ classifiers =
|
||||
keywords = toml, parser, serilization, deserialization, serdes
|
||||
|
||||
[options]
|
||||
-setup_requires =
|
||||
- pybind11~=2.10
|
||||
zip_safe = false
|
||||
packages = find:
|
||||
package_dir = =src
|
||||
--
|
||||
2.51.0
|
||||
@@ -25,6 +25,9 @@ buildPythonPackage rec {
|
||||
hash = "sha256-P41jEs1ShpiuSenreE4ykesY2wgBaR7TUKuv3tcD5J0=";
|
||||
};
|
||||
|
||||
# The latest setuptools has deprecated `setup_requires` and will attempt to automatically invoke `pip` to install dependencies during the build.
|
||||
patches = [ ./0001-remove-setup_requires.patch ];
|
||||
|
||||
buildInputs = [ pybind11 ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytransportnswv2";
|
||||
version = "2.0.3";
|
||||
version = "2.0.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "PyTransportNSWv2";
|
||||
inherit version;
|
||||
hash = "sha256-t6SOOGn4U8R/EELUhOsH7D0qOXjK3Nug+RhuJBMZxkM=";
|
||||
hash = "sha256-TuLcOjP8ij9+FsaGqeukPFQDS2QRRxFMsXPfrqaq+ec=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "samplerate";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tuxu";
|
||||
repo = "python-samplerate";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-/9NFJcn8R0DFjVhFAIYOtzZM90hjVIfsVXFlS0nHNhA=";
|
||||
hash = "sha256-aSlnPwFNZRffDsLqhYD1Pd5JOwvv9GcWyseZmeyrvt0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -66,7 +66,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python bindings for libsamplerate based on CFFI and NumPy";
|
||||
homepage = "https://github.com/tuxu/python-samplerate";
|
||||
changelog = "https://github.com/tuxu/python-samplerate/releases/tag/${version}";
|
||||
changelog = "https://github.com/tuxu/python-samplerate/releases/tag/${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.0.1470";
|
||||
version = "3.0.1474";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
tag = version;
|
||||
hash = "sha256-j6DD4JZ2hzKZM1hr0jiwK9bqWgKhAsWi7vFG/CYTRGg=";
|
||||
hash = "sha256-Q+47SPhW8Ylw8Pf9IjTZntXrYYZqfKkmLx85kr8QCtg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "terminaltexteffects";
|
||||
version = "0.12.0";
|
||||
version = "0.12.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
# no tests on pypi, no tags on github
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-hL+n7vxNA+3jual5TSaiJN80hRU0+ZPfaiN/23RFQu8=";
|
||||
hash = "sha256-0rBLOPm8A/xDSskyyr/UNEs19Yp+/ZNwpiorsaFi/bg=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-docutils";
|
||||
version = "0.22.2.20250924";
|
||||
version = "0.22.2.20251006";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "types_docutils";
|
||||
inherit version;
|
||||
hash = "sha256-oT+0EmdsFk7ex8Lyb+Uqt7C3yGgWjazEKY9qgGkpjz0=";
|
||||
hash = "sha256-w2wEWRBu2jnpCOkUe8/529iFNZdc3jmUM8QopRe547I=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -19,7 +19,7 @@ version="$1"
|
||||
set -euo pipefail
|
||||
|
||||
if [ -z "$version" ]; then
|
||||
version="$(wget -q -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/woodpecker-ci/woodpecker/releases?per_page=1" | jq -r '.[0].tag_name')"
|
||||
version="$(wget -q -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/woodpecker-ci/woodpecker/releases?per_page=10" | jq -r '[.[] | select(.prerelease == false)][0].tag_name')"
|
||||
fi
|
||||
|
||||
# strip leading "v"
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "sankey-chart";
|
||||
version = "3.9.4";
|
||||
version = "3.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MindFreeze";
|
||||
repo = "ha-sankey-chart";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5G/ji9vt4QIs+zyfdBZwgHTjCDTyX68N0lqfIMVMTN0=";
|
||||
hash = "sha256-bGW3nM0YcC/+8xOD+I1zbiOEmrdyGjSZmjViWOBg7xo=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-jlnGmdwQu1AZTDVrH7njgq5/UorDceUhJtFqzo/xLfc=";
|
||||
npmDepsHash = "sha256-381lIUJq5ZKc+h8roSnwBOLd/K1sPLHqhVnq7j6IjD8=";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
postgresqlBuildExtension (finalAttrs: {
|
||||
pname = "pgtap";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "theory";
|
||||
repo = "pgtap";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YgvfLGF7pLVcCKD66NnWAydDxtoYHH1DpLiYTEKHJ0E=";
|
||||
hash = "sha256-SKac6JJmH/z7G1GmQYATMNfywsDIHjNdskzn2MT3kBg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
newScope,
|
||||
Agda,
|
||||
@@ -44,13 +45,14 @@ let
|
||||
|
||||
functional-linear-algebra = callPackage ../development/libraries/agda/functional-linear-algebra { };
|
||||
|
||||
generic = callPackage ../development/libraries/agda/generic { };
|
||||
|
||||
agdarsec = callPackage ../development/libraries/agda/agdarsec { };
|
||||
|
||||
_1lab = callPackage ../development/libraries/agda/1lab { };
|
||||
|
||||
generics = callPackage ../development/libraries/agda/generics { };
|
||||
}
|
||||
// lib.optionalAttrs config.allowAliases {
|
||||
generic = throw "agdaPackages.generic has been removed because it is unmaintained upstream and has been marked as broken since 2021. Consider using agdaPackages.generics instead."; # Added 2025-10-11
|
||||
};
|
||||
in
|
||||
mkAgdaPackages Agda
|
||||
|
||||
@@ -1972,6 +1972,7 @@ mapAliases {
|
||||
o = orbiton; # Added 2023-04-09
|
||||
oathToolkit = oath-toolkit; # Added 2022-04-04
|
||||
oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17
|
||||
obb = throw "obb has been removed because it has been marked as broken since 2023."; # Added 2025-10-11
|
||||
obliv-c = throw "obliv-c has been removed from Nixpkgs, as it has been unmaintained upstream for 4 years and does not build with supported GCC versions"; # Added 2025-08-18
|
||||
ocis-bin = throw "ocis-bin has been renamed to ocis_5-bin'. Future major.minor versions will be made available as separate packages"; # Added 2025-03-30
|
||||
oclgrind = throw "oclgrind has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
|
||||
|
||||
@@ -5867,8 +5867,6 @@ with pkgs;
|
||||
|
||||
### End of CuboCore
|
||||
|
||||
obb = callPackage ../development/interpreters/clojure/obb.nix { };
|
||||
|
||||
octave = callPackage ../development/interpreters/octave { };
|
||||
|
||||
octaveFull = octave.override {
|
||||
@@ -12223,8 +12221,6 @@ with pkgs;
|
||||
|
||||
pineapple-pictures = qt6Packages.callPackage ../applications/graphics/pineapple-pictures { };
|
||||
|
||||
plexamp = callPackage ../applications/audio/plexamp { };
|
||||
|
||||
plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { };
|
||||
|
||||
plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { });
|
||||
|
||||
@@ -15064,6 +15064,8 @@ self: super: with self; {
|
||||
|
||||
python-pam = callPackage ../development/python-modules/python-pam { inherit (pkgs) pam; };
|
||||
|
||||
python-path = callPackage ../development/python-modules/python-path { };
|
||||
|
||||
python-periphery = callPackage ../development/python-modules/python-periphery { };
|
||||
|
||||
python-picnic-api2 = callPackage ../development/python-modules/python-picnic-api2 { };
|
||||
|
||||
Reference in New Issue
Block a user