nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-28 18:03:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into staging-next

Browse Source
This commit is contained in:
Vladimír Čunát 2024-05-31 07:30:41 +02:00
commit 5804775d03
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
230 changed files with 4871 additions and 2564 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/hooks/waf.section.md
View File

@ -20,10 +20,6 @@ If `wafPath` doesn't exist, then `wafHook` will copy the `waf` provided from Nix
Controls the flags passed to waf tool during build and install phases. For settings specific to build or install phases, use `wafBuildFlags` or `wafInstallFlags` respectively.
#### `dontAddWafCrossFlags` {#dont-add-waf-cross-flags}
When set to `true`, don't add cross compilation flags during configure phase.
#### `dontUseWafConfigure` {#dont-use-waf-configure}
When set to true, don't use the predefined `wafConfigurePhase`.

2
pkgs/applications/blockchains/polkadot/default.nix
View File

@ -82,8 +82,6 @@ rustPlatform.buildRustPackage rec {
# available for `rustc-wasm32`
WASM_BUILD_STD = 0;
# NOTE: we need to force lld otherwise rust-lld is not found for wasm32 target
CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "lld";
OPENSSL_NO_VENDOR = 1;
PROTOC = "${protobuf}/bin/protoc";
ROCKSDB_LIB_DIR = "${rocksdb}/lib";

3
pkgs/applications/display-managers/lemurs/default.nix
View File

@ -19,9 +19,6 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-uuHPJe+1VsnLRGbHtgTMrib6Tk359cwTDVfvtHnDToo=";
# Fixes a lock issue
preConfigure = "cargo update --offline";
buildInputs = [
linux-pam
];

2
pkgs/applications/editors/ed/generic.nix
View File

@ -13,12 +13,14 @@
, stdenv
, fetchurl
, lzip
, runtimeShellPackage
}:
stdenv.mkDerivation {
inherit pname version src patches;
nativeBuildInputs = [ lzip ];
buildInputs = [ runtimeShellPackage ];
configureFlags = [
"CC=${stdenv.cc.targetPrefix}cc"

494
pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
View File

@ -345,10 +345,10 @@
elpaBuild {
pname = "auctex";
ename = "auctex";
version = "14.0.4.0.20240427.91120";
version = "14.0.5.0.20240519.95252";
src = fetchurl {
url = "https://elpa.gnu.org/devel/auctex-14.0.4.0.20240427.91120.tar";
sha256 = "1qp2vgmna7fi66qdi4flgvl0l4cpz516klkx2rcd6wixvhyc53rx";
url = "https://elpa.gnu.org/devel/auctex-14.0.5.0.20240519.95252.tar";
sha256 = "0nb8djks4lpbkmsm4v8v6rnhh1wplcnarfc80fi7mglw26cls1lq";
};
packageRequires = [ emacs ];
meta = {
@ -490,10 +490,10 @@
elpaBuild {
pname = "beframe";
ename = "beframe";
version = "1.0.1.0.20240224.51508";
version = "1.1.1.0.20240522.34215";
src = fetchurl {
url = "https://elpa.gnu.org/devel/beframe-1.0.1.0.20240224.51508.tar";
sha256 = "105axrl2m6x5gc523ai9lna89jf44n2na337brxqn1jflnnpdh43";
url = "https://elpa.gnu.org/devel/beframe-1.1.1.0.20240522.34215.tar";
sha256 = "1ws11ynbcgi37sbh6p3nilq9ca26694qzqvd1h4dk0lb815b66l4";
};
packageRequires = [ emacs ];
meta = {
@ -593,10 +593,10 @@
elpaBuild {
pname = "boxy";
ename = "boxy";
version = "1.1.4.0.20240326.215209";
version = "1.1.4.0.20240505.204058";
src = fetchurl {
url = "https://elpa.gnu.org/devel/boxy-1.1.4.0.20240326.215209.tar";
sha256 = "077q9xxrsd98r4h9xj4djgiwfw34bjx3w0mhnbip2p57xknjjr46";
url = "https://elpa.gnu.org/devel/boxy-1.1.4.0.20240505.204058.tar";
sha256 = "18sgxarymy65vjzb94jjd0npxfd7920xlw49py5lc2y8d508p3rf";
};
packageRequires = [ emacs ];
meta = {
@ -613,10 +613,10 @@
elpaBuild {
pname = "boxy-headings";
ename = "boxy-headings";
version = "2.1.5.0.20240326.215829";
version = "2.1.6.0.20240505.204122";
src = fetchurl {
url = "https://elpa.gnu.org/devel/boxy-headings-2.1.5.0.20240326.215829.tar";
sha256 = "0zh5g1k2nql8jyg9ws0spsbhzwfa28f6qxs9krihp5qgz8kihn2p";
url = "https://elpa.gnu.org/devel/boxy-headings-2.1.6.0.20240505.204122.tar";
sha256 = "1m3k25j5z7q1gz2bbmyjkh79rq2b4350zz6csb2l0l8s4g1yddph";
};
packageRequires = [ boxy emacs org ];
meta = {
@ -700,10 +700,10 @@
elpaBuild {
pname = "bufferlo";
ename = "bufferlo";
version = "0.6.0.20240105.200601";
version = "0.8.0.20240516.162426";
src = fetchurl {
url = "https://elpa.gnu.org/devel/bufferlo-0.6.0.20240105.200601.tar";
sha256 = "02iqarvq8b2siivbv878f2yzkm5law15idnbi5wv72v5pc2hxrjk";
url = "https://elpa.gnu.org/devel/bufferlo-0.8.0.20240516.162426.tar";
sha256 = "1w4vw1f5qmgv9207wpgmw5ahq4kans5dh775l213vzh32s6cdxx1";
};
packageRequires = [ emacs ];
meta = {
@ -767,10 +767,10 @@
elpaBuild {
pname = "cape";
ename = "cape";
version = "1.5.0.20240411.220758";
version = "1.5.0.20240517.221612";
src = fetchurl {
url = "https://elpa.gnu.org/devel/cape-1.5.0.20240411.220758.tar";
sha256 = "0mbw0azs2a33ywq1iqqvm2r5pyhpl1qfjkzmqv473n7qm658gkfg";
url = "https://elpa.gnu.org/devel/cape-1.5.0.20240517.221612.tar";
sha256 = "1gxk070lf204hp62zlxqkc0h8k7ml6sywms1m8kadbl650dl8fdc";
};
packageRequires = [ compat emacs ];
meta = {
@ -927,6 +927,25 @@
license = lib.licenses.free;
};
}) {};
colorful-mode = callPackage ({ compat
, elpaBuild
, emacs
, fetchurl
, lib }:
elpaBuild {
pname = "colorful-mode";
ename = "colorful-mode";
version = "1.0.0.0.20240427.103837";
src = fetchurl {
url = "https://elpa.gnu.org/devel/colorful-mode-1.0.0.0.20240427.103837.tar";
sha256 = "1ggasm3b678rnh96l4bynlbqciwsznsrljhxsi9ifak4xb3zlg8s";
};
packageRequires = [ compat emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/colorful-mode.html";
license = lib.licenses.free;
};
}) {};
comint-mime = callPackage ({ elpaBuild
, emacs
, fetchurl
@ -969,10 +988,10 @@
elpaBuild {
pname = "company";
ename = "company";
version = "0.10.2.0.20240311.194338";
version = "0.10.2.0.20240514.232026";
src = fetchurl {
url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240311.194338.tar";
sha256 = "1bmf7xa7pwfmwqrdz3sjnbbaqr472n6f2n8mz5qrzc4y09xl8i0r";
url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240514.232026.tar";
sha256 = "10sh1pi3wb38r5v6vka0g3dxsmp3yr6p2iqrr3icqrx8mbz2mhvz";
};
packageRequires = [ emacs ];
meta = {
@ -1045,10 +1064,10 @@
elpaBuild {
pname = "compat";
ename = "compat";
version = "29.1.4.5.0.20240401.110429";
version = "29.1.4.5.0.20240520.101243";
src = fetchurl {
url = "https://elpa.gnu.org/devel/compat-29.1.4.5.0.20240401.110429.tar";
sha256 = "1mbkvl2fcdcnc8jriwn61z0aim0llg7rgb9rh12rq8djrinw1r5d";
url = "https://elpa.gnu.org/devel/compat-29.1.4.5.0.20240520.101243.tar";
sha256 = "0ik2qlvkd414fs2zpks7bfdylcwpchx0mw2d5932156k3bchm0ib";
};
packageRequires = [ emacs seq ];
meta = {
@ -1060,10 +1079,10 @@
elpaBuild {
pname = "consult";
ename = "consult";
version = "1.5.0.20240420.92954";
version = "1.6.0.20240517.91901";
src = fetchurl {
url = "https://elpa.gnu.org/devel/consult-1.5.0.20240420.92954.tar";
sha256 = "1cg72m5aqvh7apdv3j4fhm232168vi0iddx3n9w42jwmhsxxq7fr";
url = "https://elpa.gnu.org/devel/consult-1.6.0.20240517.91901.tar";
sha256 = "0nyx7dncdqv40cfwzy2hfi4f23mph6q41yz5d04r0mzachpbh5zg";
};
packageRequires = [ compat emacs ];
meta = {
@ -1071,6 +1090,26 @@
license = lib.licenses.free;
};
}) {};
consult-denote = callPackage ({ consult
, denote
, elpaBuild
, emacs
, fetchurl
, lib }:
elpaBuild {
pname = "consult-denote";
ename = "consult-denote";
version = "0.0.0.0.20240521.82207";
src = fetchurl {
url = "https://elpa.gnu.org/devel/consult-denote-0.0.0.0.20240521.82207.tar";
sha256 = "1yj93195gzjgwfms6k2chwbhq3w14vpab7r9dq24gjxcgb3f63w3";
};
packageRequires = [ consult denote emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/consult-denote.html";
license = lib.licenses.free;
};
}) {};
consult-hoogle = callPackage ({ elpaBuild
, emacs
, fetchurl
@ -1131,10 +1170,10 @@
elpaBuild {
pname = "corfu";
ename = "corfu";
version = "1.3.0.20240413.92757";
version = "1.3.0.20240514.120535";
src = fetchurl {
url = "https://elpa.gnu.org/devel/corfu-1.3.0.20240413.92757.tar";
sha256 = "0qf5nvg70sb313mv1m1mycipf182lz8c0y2rsacniqzykvqhbv74";
url = "https://elpa.gnu.org/devel/corfu-1.3.0.20240514.120535.tar";
sha256 = "0nqq690pnjx7dlab6ba1y1n8m6bhbwm1yl7iqzv8php9j4bxyd20";
};
packageRequires = [ compat emacs ];
meta = {
@ -1166,10 +1205,10 @@
elpaBuild {
pname = "counsel";
ename = "counsel";
version = "0.14.2.0.20240413.191055";
version = "0.14.2.0.20240520.132838";
src = fetchurl {
url = "https://elpa.gnu.org/devel/counsel-0.14.2.0.20240413.191055.tar";
sha256 = "14iphwfpmbmg44f1gx54y3ks920z3p86mfvg99h86yy817wb73pl";
url = "https://elpa.gnu.org/devel/counsel-0.14.2.0.20240520.132838.tar";
sha256 = "1xpvkyljahcjf84f4b40ivax1i06vyyyhlj3v7x0g90qjl6ba2cr";
};
packageRequires = [ emacs ivy swiper ];
meta = {
@ -1315,10 +1354,10 @@
elpaBuild {
pname = "dape";
ename = "dape";
version = "0.10.0.0.20240427.142238";
version = "0.11.1.0.20240518.161137";
src = fetchurl {
url = "https://elpa.gnu.org/devel/dape-0.10.0.0.20240427.142238.tar";
sha256 = "0d2mn565l5ag023z1yqg5nj0fj0iraf5yifh54pyl6cnz7ipmcj3";
url = "https://elpa.gnu.org/devel/dape-0.11.1.0.20240518.161137.tar";
sha256 = "1v359ilhbpsvyvr7x1c9lj2hadsblp2lxd7vwsqx87bf1ls2cpzi";
};
packageRequires = [ emacs jsonrpc ];
meta = {
@ -1345,10 +1384,10 @@
elpaBuild {
pname = "dash";
ename = "dash";
version = "2.19.1.0.20240405.94636";
version = "2.19.1.0.20240510.132708";
src = fetchurl {
url = "https://elpa.gnu.org/devel/dash-2.19.1.0.20240405.94636.tar";
sha256 = "0s1wqxjv1xdhd251zpk52wlglcc5apbhdhld30vmb7c9bq9288xw";
url = "https://elpa.gnu.org/devel/dash-2.19.1.0.20240510.132708.tar";
sha256 = "1m16w781gzsjim087jj8n42kn1lrvkplsigbsx0l7fd6hqagyl2k";
};
packageRequires = [ emacs ];
meta = {
@ -1408,10 +1447,10 @@
elpaBuild {
pname = "denote";
ename = "denote";
version = "2.3.5.0.20240427.91057";
version = "2.3.5.0.20240520.93621";
src = fetchurl {
url = "https://elpa.gnu.org/devel/denote-2.3.5.0.20240427.91057.tar";
sha256 = "0xa0jxd6fbd2ayhaaxn1rnimi35pipgidx9l6v19swal0yk08kf4";
url = "https://elpa.gnu.org/devel/denote-2.3.5.0.20240520.93621.tar";
sha256 = "12mxsadpikjp3315cd20cp59r9f3g9jznkljp2yc3bkkjfrbjz5v";
};
packageRequires = [ emacs ];
meta = {
@ -1460,10 +1499,10 @@
elpaBuild {
pname = "devdocs";
ename = "devdocs";
version = "0.6.1.0.20240329.73808";
version = "0.6.1.0.20240428.71147";
src = fetchurl {
url = "https://elpa.gnu.org/devel/devdocs-0.6.1.0.20240329.73808.tar";
sha256 = "1q4n5r5ki8f7qksr18w273l7qw8c38snn6d842kxwp9zg2417i8x";
url = "https://elpa.gnu.org/devel/devdocs-0.6.1.0.20240428.71147.tar";
sha256 = "0pvv4rvr14rc51gxb20zbyh42ijpq37dsmlzdsk8ypbfbgz3jw1s";
};
packageRequires = [ emacs ];
meta = {
@ -1518,10 +1557,10 @@
elpaBuild {
pname = "diff-hl";
ename = "diff-hl";
version = "1.9.2.0.20240401.235744";
version = "1.9.2.0.20240505.211034";
src = fetchurl {
url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20240401.235744.tar";
sha256 = "1ilmi9a5g2h3xw49kiavr6pwp091i6j3qd7yxyixvw15ygvc6mi8";
url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20240505.211034.tar";
sha256 = "0mbxas2mx0pyvs3ccpp6ss2q8j7n5mva1ngg004fdhp8br8qknhn";
};
packageRequires = [ cl-lib emacs ];
meta = {
@ -1621,10 +1660,10 @@
elpaBuild {
pname = "dired-preview";
ename = "dired-preview";
version = "0.1.1.0.20240425.180328";
version = "0.2.0.0.20240507.55800";
src = fetchurl {
url = "https://elpa.gnu.org/devel/dired-preview-0.1.1.0.20240425.180328.tar";
sha256 = "1wn8k1wr126nw22sczjrhkxwsjnbhr08ym01sy8d4422wif0l4as";
url = "https://elpa.gnu.org/devel/dired-preview-0.2.0.0.20240507.55800.tar";
sha256 = "1m7zgmjhw86yrhj5chci73rbgky3ybzni5j6xvwpxqxl6g41ph04";
};
packageRequires = [ emacs ];
meta = {
@ -1732,10 +1771,10 @@
elpaBuild {
pname = "drepl";
ename = "drepl";
version = "0.2.0.20240421.84519";
version = "0.3.0.20240511.124331";
src = fetchurl {
url = "https://elpa.gnu.org/devel/drepl-0.2.0.20240421.84519.tar";
sha256 = "1kxxj0dd9yj168gaq89hm1sqajv8p8y7mgpqrxsqbz2hg6p568af";
url = "https://elpa.gnu.org/devel/drepl-0.3.0.20240511.124331.tar";
sha256 = "0xfmna8a8nh48ir9nl5gv4y03kqsvrzars74lza5k0cdsslga4gr";
};
packageRequires = [ comint-mime emacs ];
meta = {
@ -1866,10 +1905,10 @@
elpaBuild {
pname = "eev";
ename = "eev";
version = "20240309.0.20240325.4057";
version = "20240513.0.20240517.104050";
src = fetchurl {
url = "https://elpa.gnu.org/devel/eev-20240309.0.20240325.4057.tar";
sha256 = "0h6b69ykrdkzhqkv8b0qjanpfkcw4408kcxlv672h3i660w9jj0j";
url = "https://elpa.gnu.org/devel/eev-20240513.0.20240517.104050.tar";
sha256 = "03bdj2f3y5xj33vq7mgxb8s0n05b5qnrsbak2xqjv2bgfky08dmq";
};
packageRequires = [ emacs ];
meta = {
@ -1884,10 +1923,10 @@
elpaBuild {
pname = "ef-themes";
ename = "ef-themes";
version = "1.6.1.0.20240427.83621";
version = "1.7.0.0.20240510.44643";
src = fetchurl {
url = "https://elpa.gnu.org/devel/ef-themes-1.6.1.0.20240427.83621.tar";
sha256 = "1pjq8yblcmk4mp83bqcnb154rq8dbn8qn6q394wzzwnn6kv08ay2";
url = "https://elpa.gnu.org/devel/ef-themes-1.7.0.0.20240510.44643.tar";
sha256 = "0iygfxy4h74nd2glx7kb4faw4b0f2gpfakdwi1icfkkn021kr781";
};
packageRequires = [ emacs ];
meta = {
@ -1895,7 +1934,8 @@
license = lib.licenses.free;
};
}) {};
eglot = callPackage ({ eldoc
eglot = callPackage ({ compat
, eldoc
, elpaBuild
, emacs
, external-completion
@ -1905,16 +1945,18 @@
, lib
, project
, seq
, track-changes
, xref }:
elpaBuild {
pname = "eglot";
ename = "eglot";
version = "1.17.0.20240423.182809";
version = "1.17.0.20240518.213720";
src = fetchurl {
url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240423.182809.tar";
sha256 = "129ibvdqcv7jablim041x55vm4awyvcjk295nrrffryzbb75fgi9";
url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240518.213720.tar";
sha256 = "10hpsip9ai41pxh5a32dwh9z90h2lrjvd3jh666zl3m11g906iwh";
};
packageRequires = [
compat
eldoc
emacs
external-completion
@ -1922,6 +1964,7 @@
jsonrpc
project
seq
track-changes
xref
];
meta = {
@ -1987,10 +2030,10 @@
elpaBuild {
pname = "elisp-benchmarks";
ename = "elisp-benchmarks";
version = "1.14.0.20240404.94558";
version = "1.16.0.20240518.180006";
src = fetchurl {
url = "https://elpa.gnu.org/devel/elisp-benchmarks-1.14.0.20240404.94558.tar";
sha256 = "1lfpwwm9114x7431pc12kppb0mgia1zd4b5pnfpvqyk3159xx40v";
url = "https://elpa.gnu.org/devel/elisp-benchmarks-1.16.0.20240518.180006.tar";
sha256 = "1pc3qs0j8hh68lbh4lqyf2xkahiylpqaaac3cpvard0wdp9b4wsr";
};
packageRequires = [];
meta = {
@ -2002,10 +2045,10 @@
elpaBuild {
pname = "ellama";
ename = "ellama";
version = "0.9.1.0.20240415.73018";
version = "0.9.4.0.20240517.145740";
src = fetchurl {
url = "https://elpa.gnu.org/devel/ellama-0.9.1.0.20240415.73018.tar";
sha256 = "1fcw0ll24bj32mjjb952in5shnyxz63gdkg80njy89s2bknw1ra1";
url = "https://elpa.gnu.org/devel/ellama-0.9.4.0.20240517.145740.tar";
sha256 = "0qb849ij6v7d8kk9mkx7nbk24d1dh32kydjddxykyn64xixw79kc";
};
packageRequires = [ emacs llm spinner ];
meta = {
@ -2110,10 +2153,10 @@
elpaBuild {
pname = "emms";
ename = "emms";
version = "19.0.20240414.193332";
version = "19.0.20240512.173549";
src = fetchurl {
url = "https://elpa.gnu.org/devel/emms-19.0.20240414.193332.tar";
sha256 = "03jxpxgrlr1amxix4skfyag5pl6xvls011rcjjx1ka5sjdvnygvp";
url = "https://elpa.gnu.org/devel/emms-19.0.20240512.173549.tar";
sha256 = "13y0g21giswhhysm5252q1rb066a3sap4z51j4cprmwhj282zglj";
};
packageRequires = [ cl-lib nadvice seq ];
meta = {
@ -2179,10 +2222,10 @@
elpaBuild {
pname = "erc";
ename = "erc";
version = "5.6snapshot0.20240419.135452";
version = "5.6snapshot0.20240518.154805";
src = fetchurl {
url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20240419.135452.tar";
sha256 = "1yx1k6r6fg77r6h7bvi1v205mnxmw8qjqr96k4dh73a7ik972vmh";
url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20240518.154805.tar";
sha256 = "0hscaz2nn08zv54gr2xfcg4pf66hycjsz31v603mbqyzgx6538hl";
};
packageRequires = [ compat emacs ];
meta = {
@ -2214,10 +2257,10 @@
elpaBuild {
pname = "ess";
ename = "ess";
version = "24.1.1.0.20240426.115232";
version = "24.1.1.0.20240516.81354";
src = fetchurl {
url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20240426.115232.tar";
sha256 = "1rskraim68fibf568f07r62h14ni45wvzifn21qyfcvv8slb63jd";
url = "https://elpa.gnu.org/devel/ess-24.1.1.0.20240516.81354.tar";
sha256 = "0r4kk65sd8kzdm11c7dz1m4qicjv6zg36r7gdg2mzpl0ym33g8aj";
};
packageRequires = [ emacs ];
meta = {
@ -2311,10 +2354,10 @@
elpaBuild {
pname = "exwm";
ename = "exwm";
version = "0.28.0.20240403.140839";
version = "0.28.0.20240517.92828";
src = fetchurl {
url = "https://elpa.gnu.org/devel/exwm-0.28.0.20240403.140839.tar";
sha256 = "1hyf2m1inifvxzv6y2wmrfylp9vrb130nj1pvpy169miw2n50vzm";
url = "https://elpa.gnu.org/devel/exwm-0.28.0.20240517.92828.tar";
sha256 = "0d65091s706ajfqi9kp3m6k9hvlwhab6f484fs5v14c9rvspy1pa";
};
packageRequires = [ emacs xelb ];
meta = {
@ -2432,10 +2475,10 @@
elpaBuild {
pname = "flymake";
ename = "flymake";
version = "1.3.7.0.20240422.65418";
version = "1.3.7.0.20240503.61639";
src = fetchurl {
url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20240422.65418.tar";
sha256 = "0gq3x3ssvsccwjajd3w835dd1zvlakj7gxdn6b1fqj46rkyi60vw";
url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20240503.61639.tar";
sha256 = "0qrdjynam3nvhm5qwjks308r28f8wlgsfdmdw4d7sb4xqyr2mzrz";
};
packageRequires = [ eldoc emacs project ];
meta = {
@ -2855,10 +2898,10 @@
elpaBuild {
pname = "gtags-mode";
ename = "gtags-mode";
version = "1.5.0.20240425.21931";
version = "1.6.0.20240511.23214";
src = fetchurl {
url = "https://elpa.gnu.org/devel/gtags-mode-1.5.0.20240425.21931.tar";
sha256 = "13gdalm2n75yifpfy2wsbf47l6q4rklvd4akszn423nmcl9bnb8x";
url = "https://elpa.gnu.org/devel/gtags-mode-1.6.0.20240511.23214.tar";
sha256 = "0wi1pfvx7wrd8jfnhlim2zp4k2n96c6prl42f8asbvq1rgi5qh1p";
};
packageRequires = [ emacs ];
meta = {
@ -3008,10 +3051,10 @@
elpaBuild {
pname = "hyperbole";
ename = "hyperbole";
version = "9.0.2pre0.20240420.120926";
version = "9.0.2pre0.20240519.180059";
src = fetchurl {
url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20240420.120926.tar";
sha256 = "1mr05p3lhz1xnivl8mqhzdw9qrh0klasjisl75gn14n7l233nir7";
url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20240519.180059.tar";
sha256 = "0i5h57a2ng28ijwds7ddy5ay8dkkgg817p35ig51mjrk7ljz6w2n";
};
packageRequires = [ emacs ];
meta = {
@ -3019,6 +3062,23 @@
license = lib.licenses.free;
};
}) {};
idlwave = callPackage ({ elpaBuild
, fetchurl
, lib }:
elpaBuild {
pname = "idlwave";
ename = "idlwave";
version = "6.5.0.0.20240430.163614";
src = fetchurl {
url = "https://elpa.gnu.org/devel/idlwave-6.5.0.0.20240430.163614.tar";
sha256 = "165lbvhrvrd1szvqns6pd7wmr9zxszzvq3lqz11qg20didi6sngr";
};
packageRequires = [];
meta = {
homepage = "https://elpa.gnu.org/packages/idlwave.html";
license = lib.licenses.free;
};
}) {};
ilist = callPackage ({ elpaBuild, fetchurl, lib }:
elpaBuild {
pname = "ilist";
@ -3107,10 +3167,10 @@
elpaBuild {
pname = "ivy";
ename = "ivy";
version = "0.14.2.0.20240405.203954";
version = "0.14.2.0.20240519.163855";
src = fetchurl {
url = "https://elpa.gnu.org/devel/ivy-0.14.2.0.20240405.203954.tar";
sha256 = "02mkfciafhdc9b41s0kv07l9z77zyq7a2j1ljdiwbmcbkdis028p";
url = "https://elpa.gnu.org/devel/ivy-0.14.2.0.20240519.163855.tar";
sha256 = "1r1b5znx1dzwpz903sm85sm2yp03yp4mvds782j8lngl46r5ibsr";
};
packageRequires = [ emacs ];
meta = {
@ -3270,10 +3330,10 @@
elpaBuild {
pname = "jinx";
ename = "jinx";
version = "1.6.0.20240415.42305";
version = "1.7.0.20240515.101640";
src = fetchurl {
url = "https://elpa.gnu.org/devel/jinx-1.6.0.20240415.42305.tar";
sha256 = "12jvkb9nis5kin7ii7aan7b2d8cd5q1f9qpp6g506m18gdi12f48";
url = "https://elpa.gnu.org/devel/jinx-1.7.0.20240515.101640.tar";
sha256 = "1ghp16kmplj9kj92867xsv3bnl6f0w95xl8hgjxbck4krj8k6is5";
};
packageRequires = [ compat emacs ];
meta = {
@ -3566,16 +3626,16 @@
license = lib.licenses.free;
};
}) {};
llm = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
llm = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }:
elpaBuild {
pname = "llm";
ename = "llm";
version = "0.12.3.0.20240331.11827";
version = "0.15.0.0.20240518.145931";
src = fetchurl {
url = "https://elpa.gnu.org/devel/llm-0.12.3.0.20240331.11827.tar";
sha256 = "0nc9p0cjxzmfrxrir45lj6yyqwpaw30rdgbhw5dl83shnps4fi58";
url = "https://elpa.gnu.org/devel/llm-0.15.0.0.20240518.145931.tar";
sha256 = "0dzvgq7lvlg62rzv9p62r5m0gm5glwd37mnw3sf6w5h3jfnkpzv0";
};
packageRequires = [ emacs ];
packageRequires = [ emacs plz ];
meta = {
homepage = "https://elpa.gnu.org/packages/llm.html";
license = lib.licenses.free;
@ -3798,10 +3858,10 @@
elpaBuild {
pname = "mct";
ename = "mct";
version = "1.0.0.0.20240320.41315";
version = "1.0.0.0.20240429.72524";
src = fetchurl {
url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20240320.41315.tar";
sha256 = "02rifid9g3q6a92xp1xpkmmm00awhxfk573lbapcl473sjy5dwfp";
url = "https://elpa.gnu.org/devel/mct-1.0.0.0.20240429.72524.tar";
sha256 = "07nb0y0ld6x2j5g1a0sjm5ihck41xkk55p5hm5279ddjklcp8p6a";
};
packageRequires = [ emacs ];
meta = {
@ -3947,10 +4007,10 @@
elpaBuild {
pname = "modus-themes";
ename = "modus-themes";
version = "4.4.0.0.20240427.84336";
version = "4.4.0.0.20240505.33119";
src = fetchurl {
url = "https://elpa.gnu.org/devel/modus-themes-4.4.0.0.20240427.84336.tar";
sha256 = "003kzj9s22qyzvavzh9q0x5dh6jg3n8ykvbihkx5hw16ar7cxmgg";
url = "https://elpa.gnu.org/devel/modus-themes-4.4.0.0.20240505.33119.tar";
sha256 = "1y637n8cll4932hyi16gnzpjqypwgwxbyq8mfhgjbz26663nksxs";
};
packageRequires = [ emacs ];
meta = {
@ -4116,10 +4176,10 @@
elpaBuild {
pname = "nano-modeline";
ename = "nano-modeline";
version = "1.0.1.0.20240318.92455";
version = "1.1.0.0.20240429.102433";
src = fetchurl {
url = "https://elpa.gnu.org/devel/nano-modeline-1.0.1.0.20240318.92455.tar";
sha256 = "14n5gmbpnbcrj2h2c12s35pdb93r1hflklpnv0bh5gpla154f6ln";
url = "https://elpa.gnu.org/devel/nano-modeline-1.1.0.0.20240429.102433.tar";
sha256 = "0jlaqkrqn2x4fhlz57c94586xjqi1sb89p6py4j5r00669djwhrf";
};
packageRequires = [ emacs ];
meta = {
@ -4220,10 +4280,10 @@
elpaBuild {
pname = "notmuch-indicator";
ename = "notmuch-indicator";
version = "1.1.0.0.20240117.25556";
version = "1.2.0.0.20240511.94138";
src = fetchurl {
url = "https://elpa.gnu.org/devel/notmuch-indicator-1.1.0.0.20240117.25556.tar";
sha256 = "003pq429x6yjqv4hw7ryigqmpzrk5frwmlk1ar35z9n83xsnl128";
url = "https://elpa.gnu.org/devel/notmuch-indicator-1.2.0.0.20240511.94138.tar";
sha256 = "0f1bq1mbjiy1akqml3fb85xz5923j3w2dz4p6yij3kfb5cks42d1";
};
packageRequires = [ emacs ];
meta = {
@ -4393,10 +4453,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "9.7pre0.20240426.150943";
version = "9.7pre0.20240521.135840";
src = fetchurl {
url = "https://elpa.gnu.org/devel/org-9.7pre0.20240426.150943.tar";
sha256 = "0n7d6zrwvrism7blfdri19mvrhcc71cga7qwbvpnq0a9mamv1ypy";
url = "https://elpa.gnu.org/devel/org-9.7pre0.20240521.135840.tar";
sha256 = "06j7kjbpd390i0kqvvnlkpdzqkwiicbdgjymif338l0qx2kl4sg5";
};
packageRequires = [ emacs ];
meta = {
@ -4412,10 +4472,10 @@
elpaBuild {
pname = "org-contacts";
ename = "org-contacts";
version = "1.1.0.20240410.112834";
version = "1.1.0.20240521.114436";
src = fetchurl {
url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20240410.112834.tar";
sha256 = "0mns2fkzn1yc968k2nc4y5gys1m7dbcj67mdb8vfj54iwdkw316z";
url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20240521.114436.tar";
sha256 = "0srbl81ngk24c9kf991ps2j53kpqriwgs8ld4lfcqmxzclr5y8iv";
};
packageRequires = [ emacs org ];
meta = {
@ -4470,10 +4530,10 @@
elpaBuild {
pname = "org-modern";
ename = "org-modern";
version = "1.2.0.20240327.153104";
version = "1.2.0.20240515.193202";
src = fetchurl {
url = "https://elpa.gnu.org/devel/org-modern-1.2.0.20240327.153104.tar";
sha256 = "0gkkcvjbjyr5h8idafc0lppjwdr84y860800ns7z894i89iy01li";
url = "https://elpa.gnu.org/devel/org-modern-1.2.0.20240515.193202.tar";
sha256 = "05mbgm95rlcv5liswlckd26izz5p3a6mkcfnz60widnilfmza9k6";
};
packageRequires = [ compat emacs ];
meta = {
@ -4508,10 +4568,10 @@
elpaBuild {
pname = "org-real";
ename = "org-real";
version = "1.0.8.0.20240328.105118";
version = "1.0.9.0.20240505.204156";
src = fetchurl {
url = "https://elpa.gnu.org/devel/org-real-1.0.8.0.20240328.105118.tar";
sha256 = "018bhg886mhv5wzvahvi36bpmh6lpgfahs2dxcrhlb5jqaf8kj50";
url = "https://elpa.gnu.org/devel/org-real-1.0.9.0.20240505.204156.tar";
sha256 = "05z8kycyqcfj0w18mnqys54wnlwa9yijlb5c0h86fqbhr7shbjmp";
};
packageRequires = [ boxy emacs org ];
meta = {
@ -4546,10 +4606,10 @@
elpaBuild {
pname = "org-transclusion";
ename = "org-transclusion";
version = "1.3.2.0.20240420.151651";
version = "1.4.0.0.20240520.170949";
src = fetchurl {
url = "https://elpa.gnu.org/devel/org-transclusion-1.3.2.0.20240420.151651.tar";
sha256 = "0izvaxis7yc2zfxff3dzsc27r8s4kl65x97rjxhz0cp3iqfsb91x";
url = "https://elpa.gnu.org/devel/org-transclusion-1.4.0.0.20240520.170949.tar";
sha256 = "15i8my50y1m44rhk06rfs6bwlc3mavb73bjysg3wp1j132m2dcrl";
};
packageRequires = [ emacs org ];
meta = {
@ -4834,6 +4894,44 @@
license = lib.licenses.free;
};
}) {};
plz-event-source = callPackage ({ elpaBuild
, emacs
, fetchurl
, lib
, plz }:
elpaBuild {
pname = "plz-event-source";
ename = "plz-event-source";
version = "0.1pre0.20240501.111443";
src = fetchurl {
url = "https://elpa.gnu.org/devel/plz-event-source-0.1pre0.20240501.111443.tar";
sha256 = "1bygbgzvyc6k8bqrnl5gwdbjmlrdh25fmf7n0rllfz4b055cdj6a";
};
packageRequires = [ emacs plz ];
meta = {
homepage = "https://elpa.gnu.org/packages/plz-event-source.html";
license = lib.licenses.free;
};
}) {};
plz-media-type = callPackage ({ elpaBuild
, emacs
, fetchurl
, lib
, plz }:
elpaBuild {
pname = "plz-media-type";
ename = "plz-media-type";
version = "0.1pre0.20240501.111146";
src = fetchurl {
url = "https://elpa.gnu.org/devel/plz-media-type-0.1pre0.20240501.111146.tar";
sha256 = "0l2zgxgi48rvzs79qq2bjmp7bg2qhd3709rpyzfkv77gigcjwqj6";
};
packageRequires = [ emacs plz ];
meta = {
homepage = "https://elpa.gnu.org/packages/plz-media-type.html";
license = lib.licenses.free;
};
}) {};
plz-see = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }:
elpaBuild {
pname = "plz-see";
@ -4936,10 +5034,10 @@
elpaBuild {
pname = "posframe";
ename = "posframe";
version = "1.4.3.0.20240426.60433";
version = "1.4.3.0.20240507.14806";
src = fetchurl {
url = "https://elpa.gnu.org/devel/posframe-1.4.3.0.20240426.60433.tar";
sha256 = "1j5l16z765wz5qs1x49vpkmj1cbxbsa69wlrf19r4qc7b6gijzm5";
url = "https://elpa.gnu.org/devel/posframe-1.4.3.0.20240507.14806.tar";
sha256 = "08jhv15hwrdjgdzl6d8xwdmx46afwlpd6yz3h5k7y7lhbnlc5jkp";
};
packageRequires = [ emacs ];
meta = {
@ -4987,10 +5085,10 @@
elpaBuild {
pname = "project";
ename = "project";
version = "0.10.0.0.20240415.22959";
version = "0.10.0.0.20240512.175655";
src = fetchurl {
url = "https://elpa.gnu.org/devel/project-0.10.0.0.20240415.22959.tar";
sha256 = "0clz75455r6pzjcj9jbpqgi201plmm4094nz7s19xmq1ifll9pzy";
url = "https://elpa.gnu.org/devel/project-0.10.0.0.20240512.175655.tar";
sha256 = "1228kpfyj3zd1bz8xjv257mhhxgvrj8d67saxgfxix3y62fhb2wc";
};
packageRequires = [ emacs xref ];
meta = {
@ -5032,10 +5130,10 @@
elpaBuild {
pname = "pulsar";
ename = "pulsar";
version = "1.0.1.0.20240117.25720";
version = "1.0.1.0.20240429.64508";
src = fetchurl {
url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20240117.25720.tar";
sha256 = "09qq4cribybn86s6dz77rbmazzl3c88305brkiza2pn2cg10g8xw";
url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20240429.64508.tar";
sha256 = "1ak3vphfw0rsm4rrqyg72zjjwm68ypwxbbif8fz31rnsp0n66f8n";
};
packageRequires = [ emacs ];
meta = {
@ -5047,10 +5145,10 @@
elpaBuild {
pname = "pyim";
ename = "pyim";
version = "5.3.3.0.20240407.80210";
version = "5.3.4.0.20240508.25615";
src = fetchurl {
url = "https://elpa.gnu.org/devel/pyim-5.3.3.0.20240407.80210.tar";
sha256 = "1vk0q0wczr9yiwm89kljdlsil7plr2z0cr5sw48fxy4dzgjdjkfb";
url = "https://elpa.gnu.org/devel/pyim-5.3.4.0.20240508.25615.tar";
sha256 = "0p079girx795fvqswdjh8l5mwdyndanfcsvb1qvj2klq063y1vv5";
};
packageRequires = [ async emacs xr ];
meta = {
@ -5079,10 +5177,10 @@
elpaBuild {
pname = "python";
ename = "python";
version = "0.28.0.20240427.62346";
version = "0.28.0.20240518.202234";
src = fetchurl {
url = "https://elpa.gnu.org/devel/python-0.28.0.20240427.62346.tar";
sha256 = "1knzsgi2g40b9ba5s81653h913mlsh71y83b8qc71v9l16lgy1fg";
url = "https://elpa.gnu.org/devel/python-0.28.0.20240518.202234.tar";
sha256 = "0nk9rdr62c9j27gbjz3z6ri35aw026pmj6lhqvn6j9ci8ijif3yf";
};
packageRequires = [ compat emacs seq ];
meta = {
@ -5409,10 +5507,10 @@
elpaBuild {
pname = "relint";
ename = "relint";
version = "1.24.0.20240401.74454";
version = "1.24.0.20240510.91500";
src = fetchurl {
url = "https://elpa.gnu.org/devel/relint-1.24.0.20240401.74454.tar";
sha256 = "07q0571ks81al09xl1ms52rznp6y7scvlnh2ax1nj67f3jmikzcd";
url = "https://elpa.gnu.org/devel/relint-1.24.0.20240510.91500.tar";
sha256 = "171dnhya0ij5lapn9h2d8ssxx163lwgasvfssd07739171h07389";
};
packageRequires = [ emacs xr ];
meta = {
@ -5895,10 +5993,10 @@
elpaBuild {
pname = "spacious-padding";
ename = "spacious-padding";
version = "0.4.1.0.20240311.74539";
version = "0.5.0.0.20240429.82953";
src = fetchurl {
url = "https://elpa.gnu.org/devel/spacious-padding-0.4.1.0.20240311.74539.tar";
sha256 = "1xgnplcvp73fpyi9rx5wbn0hjbcv65vlrb7dqkgjc0chaivp4dgm";
url = "https://elpa.gnu.org/devel/spacious-padding-0.5.0.0.20240429.82953.tar";
sha256 = "0k5w5d9prlasvv6074nxl8782mbhhvccpkc1zjrp228frkbgfpmi";
};
packageRequires = [ emacs ];
meta = {
@ -5993,10 +6091,10 @@
elpaBuild {
pname = "srht";
ename = "srht";
version = "0.4.0.20231117.115741";
version = "0.4.0.20240506.104337";
src = fetchurl {
url = "https://elpa.gnu.org/devel/srht-0.4.0.20231117.115741.tar";
sha256 = "03wyfx0zhgfpbhwyxrbd6mj0465m82910l77r12gsg1vbk78l4l0";
url = "https://elpa.gnu.org/devel/srht-0.4.0.20240506.104337.tar";
sha256 = "1fs6av8l3v4vvzxxhd20rzwrwh8dkk1d1x21jkjx8nczj2jydwb0";
};
packageRequires = [ emacs plz transient ];
meta = {
@ -6029,10 +6127,10 @@
elpaBuild {
pname = "standard-themes";
ename = "standard-themes";
version = "2.0.1.0.20240427.84421";
version = "2.0.1.0.20240520.83250";
src = fetchurl {
url = "https://elpa.gnu.org/devel/standard-themes-2.0.1.0.20240427.84421.tar";
sha256 = "09vmyjm148r1ajxlsrdqrgi988a2px5dn5z9k0l3lg88a38rxgz6";
url = "https://elpa.gnu.org/devel/standard-themes-2.0.1.0.20240520.83250.tar";
sha256 = "08lb47hilg5dniqxlxp773s16m0shqmglcrf1qdm48ddg05911gx";
};
packageRequires = [ emacs ];
meta = {
@ -6062,10 +6160,10 @@
elpaBuild {
pname = "substitute";
ename = "substitute";
version = "0.2.1.0.20240117.30048";
version = "0.3.1.0.20240522.34122";
src = fetchurl {
url = "https://elpa.gnu.org/devel/substitute-0.2.1.0.20240117.30048.tar";
sha256 = "1vkjg3w12r7j3dl5jx5wha412lknns37535vjd4x6xgk2rs3yvh0";
url = "https://elpa.gnu.org/devel/substitute-0.3.1.0.20240522.34122.tar";
sha256 = "02n78x82sl7i0xzpp1468i1bwm9kic2ycc9vvhymxalpiylc3iqq";
};
packageRequires = [ emacs ];
meta = {
@ -6126,10 +6224,10 @@
elpaBuild {
pname = "svg-tag-mode";
ename = "svg-tag-mode";
version = "0.3.2.0.20240122.120925";
version = "0.3.2.0.20240429.105240";
src = fetchurl {
url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20240122.120925.tar";
sha256 = "17qixxhy889l2v17pw3b2qrk2g6x4a7yfh0bzxfhlizq10sy24hz";
url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20240429.105240.tar";
sha256 = "0isp9zcyx9dqb0nah1b990nikwiaxm5lvqlbya9v1rcb3fbvf9hc";
};
packageRequires = [ emacs svg-lib ];
meta = {
@ -6145,10 +6243,10 @@
elpaBuild {
pname = "swiper";
ename = "swiper";
version = "0.14.2.0.20240405.204232";
version = "0.14.2.0.20240520.120545";
src = fetchurl {
url = "https://elpa.gnu.org/devel/swiper-0.14.2.0.20240405.204232.tar";
sha256 = "1b5dn8v6rm6m7b2agdxf50jkmrfx6ac8fnwyqabr3zzcshpl6ixm";
url = "https://elpa.gnu.org/devel/swiper-0.14.2.0.20240520.120545.tar";
sha256 = "1wcxf1d3kn19yq3gk4d4fqs7p61i1rm316glzlcksny6rp2f1sma";
};
packageRequires = [ emacs ivy ];
meta = {
@ -6449,10 +6547,10 @@
elpaBuild {
pname = "track-changes";
ename = "track-changes";
version = "1.1.0.20240419.221900";
version = "1.2.0.20240505.172329";
src = fetchurl {
url = "https://elpa.gnu.org/devel/track-changes-1.1.0.20240419.221900.tar";
sha256 = "16xvkp3fq89jbf87phk6yl9cbfmmgb8r376hh08kwrsmbpaz6bd2";
url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20240505.172329.tar";
sha256 = "1mvgwrrqfa3yix9lrsx4mb6zqaydjjqc69nh9lyrcgi54819jlvh";
};
packageRequires = [ emacs ];
meta = {
@ -6537,10 +6635,10 @@
elpaBuild {
pname = "transient";
ename = "transient";
version = "0.6.0.0.20240414.135949";
version = "0.6.0.0.20240509.184906";
src = fetchurl {
url = "https://elpa.gnu.org/devel/transient-0.6.0.0.20240414.135949.tar";
sha256 = "1rf1zszrfd02n4ky8n72sqzwb3zk16j92plflfc2wdrzaw9k2mmr";
url = "https://elpa.gnu.org/devel/transient-0.6.0.0.20240509.184906.tar";
sha256 = "1axy5ccwd4n63saaf10af182r2k3j8x4vbyhxa81rdv73ndr652g";
};
packageRequires = [ compat emacs seq ];
meta = {
@ -6715,10 +6813,10 @@
elpaBuild {
pname = "urgrep";
ename = "urgrep";
version = "0.4.2snapshot0.20240310.204507";
version = "0.5.1snapshot0.20240511.180511";
src = fetchurl {
url = "https://elpa.gnu.org/devel/urgrep-0.4.2snapshot0.20240310.204507.tar";
sha256 = "173ql2ng8blfw4y7nbfgjmzpgvw0xabb1sk2c1mis6k36ali851w";
url = "https://elpa.gnu.org/devel/urgrep-0.5.1snapshot0.20240511.180511.tar";
sha256 = "03dpbsmx11r14mi6vlh4phknmxlayxng2rfphv8q7wn4cvgv18q2";
};
packageRequires = [ compat emacs project ];
meta = {
@ -6786,10 +6884,10 @@
elpaBuild {
pname = "use-package";
ename = "use-package";
version = "2.4.5.0.20240330.124921";
version = "2.4.5.0.20240518.103045";
src = fetchurl {
url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20240330.124921.tar";
sha256 = "0jc1389g63bsy2w2fkw332vpwqrm5xci8skqf7mkg39y8nj2j0fw";
url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20240518.103045.tar";
sha256 = "0zh4vb5h2733glbj3izflw0laxvf2y34cm924jpgyrjkz66ld6wc";
};
packageRequires = [ bind-key emacs ];
meta = {
@ -6950,10 +7048,10 @@
elpaBuild {
pname = "vertico";
ename = "vertico";
version = "1.8.0.20240424.195903";
version = "1.8.0.20240511.204721";
src = fetchurl {
url = "https://elpa.gnu.org/devel/vertico-1.8.0.20240424.195903.tar";
sha256 = "0yhk9cp3qlan2vci31an1d3c4mqz2ckbs7xhs12qk6vich66yshk";
url = "https://elpa.gnu.org/devel/vertico-1.8.0.20240511.204721.tar";
sha256 = "0gd68x98dghqa7da0ybah2w27bxipal262n9d6rpdhxb361cmpca";
};
packageRequires = [ compat emacs ];
meta = {
@ -7155,10 +7253,10 @@
elpaBuild {
pname = "which-key";
ename = "which-key";
version = "3.6.0.0.20240423.92028";
version = "3.6.0.0.20240501.85118";
src = fetchurl {
url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20240423.92028.tar";
sha256 = "0bx47186nrsfbjcfci7qfx3s874q4wvys6imkr4k0i9mmfnchvaa";
url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20240501.85118.tar";
sha256 = "080i7b37fzvf020q4dqxy0dr8na0qqaymv8bd048yrw70wcrlz0w";
};
packageRequires = [ emacs ];
meta = {
@ -7184,6 +7282,24 @@
license = lib.licenses.free;
};
}) {};
window-tool-bar = callPackage ({ elpaBuild
, emacs
, fetchurl
, lib }:
elpaBuild {
pname = "window-tool-bar";
ename = "window-tool-bar";
version = "0.2.0.20240519.64147";
src = fetchurl {
url = "https://elpa.gnu.org/devel/window-tool-bar-0.2.0.20240519.64147.tar";
sha256 = "1z5fdlrrjdx0lhfwzahnlqxg75fy9abrj3izc8mfwy5j1bkrym6m";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/window-tool-bar.html";
license = lib.licenses.free;
};
}) {};
windower = callPackage ({ elpaBuild
, emacs
, fetchurl
@ -7275,10 +7391,10 @@
elpaBuild {
pname = "wrap-search";
ename = "wrap-search";
version = "4.14.11.0.20240427.191832";
version = "4.16.13.0.20240517.214404";
src = fetchurl {
url = "https://elpa.gnu.org/devel/wrap-search-4.14.11.0.20240427.191832.tar";
sha256 = "0286jkxhzn6x2jbvwlrknni3fdf9h2a2mi96kkasy91bph3snx2a";
url = "https://elpa.gnu.org/devel/wrap-search-4.16.13.0.20240517.214404.tar";
sha256 = "14rk7gyab0m19z0rhrpqcfdqrdrbz9v5zw36rkn5qxzrpv6cw7hq";
};
packageRequires = [];
meta = {
@ -7365,10 +7481,10 @@
elpaBuild {
pname = "xref";
ename = "xref";
version = "1.6.3.0.20240328.32323";
version = "1.6.3.0.20240518.3950";
src = fetchurl {
url = "https://elpa.gnu.org/devel/xref-1.6.3.0.20240328.32323.tar";
sha256 = "04rxbfzvz4z3q04r3817vrkx7w6kspdmpyl30h9v37vmwyxw722j";
url = "https://elpa.gnu.org/devel/xref-1.6.3.0.20240518.3950.tar";
sha256 = "0k60vvhpw5bzbs3qv28sip7dl2p44m8bczx54ff32klgfwpk06zk";
};
packageRequires = [ emacs ];
meta = {

210
pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
View File

@ -295,10 +295,10 @@
elpaBuild {
pname = "auctex";
ename = "auctex";
version = "14.0.4";
version = "14.0.5";
src = fetchurl {
url = "https://elpa.gnu.org/packages/auctex-14.0.4.tar";
sha256 = "14rfv7xlwdqp42dilmpg11d58q8pzw15fv01hq80iv9kyzsfvxd7";
url = "https://elpa.gnu.org/packages/auctex-14.0.5.tar";
sha256 = "0sycj6ad5jazmsxq37hsnvbywkpj66lrw3d3mxqr1wqkb67cdd3k";
};
packageRequires = [ emacs ];
meta = {
@ -430,10 +430,10 @@
elpaBuild {
pname = "beframe";
ename = "beframe";
version = "1.0.1";
version = "1.1.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/beframe-1.0.1.tar";
sha256 = "1p8zglpdcss0p307i4h2zpqbsiipmgmk0a2fx6j9w3lx0zgaf2xj";
url = "https://elpa.gnu.org/packages/beframe-1.1.1.tar";
sha256 = "0xx2zvgjilivi6nnr2x9bwwcifinj66j6r07wxjawqkrsknyypas";
};
packageRequires = [ emacs ];
meta = {
@ -535,10 +535,10 @@
elpaBuild {
pname = "boxy-headings";
ename = "boxy-headings";
version = "2.1.5";
version = "2.1.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/boxy-headings-2.1.5.tar";
sha256 = "0w3cy2r8iqsb79r33lllj08v719hq0xniq5pbr9sl8kn2raxcjhr";
url = "https://elpa.gnu.org/packages/boxy-headings-2.1.6.tar";
sha256 = "0wnks9a4agvqjivp9myl8zcdq6rj7hh5ig73f8qv5imar0i76izc";
};
packageRequires = [ boxy emacs org ];
meta = {
@ -614,10 +614,10 @@
elpaBuild {
pname = "bufferlo";
ename = "bufferlo";
version = "0.6";
version = "0.8";
src = fetchurl {
url = "https://elpa.gnu.org/packages/bufferlo-0.6.tar";
sha256 = "0gvg1mag8ngjmjl4d6zr99k7mq368l1m6dxy9mk6icgxm3sqr1yk";
url = "https://elpa.gnu.org/packages/bufferlo-0.8.tar";
sha256 = "0ypd611xmjsir24nv8gr19pq7f1n0gbgq9yzvfy3m6k97gpw2jzq";
};
packageRequires = [ emacs ];
meta = {
@ -820,6 +820,21 @@
license = lib.licenses.free;
};
}) {};
colorful-mode = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "colorful-mode";
ename = "colorful-mode";
version = "1.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/colorful-mode-1.0.0.tar";
sha256 = "1gmbrb5z3rmw0fjrdymfbcx74szcy963dx53ksykvfd9355azj3x";
};
packageRequires = [ compat emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/colorful-mode.html";
license = lib.licenses.free;
};
}) {};
comint-mime = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "comint-mime";
@ -937,10 +952,10 @@
elpaBuild {
pname = "consult";
ename = "consult";
version = "1.5";
version = "1.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/consult-1.5.tar";
sha256 = "1gx4cjrcaq5dn3rrd2dm30jz07zrnddf0y33qi0dmiqlsyg7l9qw";
url = "https://elpa.gnu.org/packages/consult-1.6.tar";
sha256 = "00wsv6dvlyf7ygi586pdyhgp7f5ic2qqyqjz3g2g8hmgya5javdb";
};
packageRequires = [ compat emacs ];
meta = {
@ -948,6 +963,26 @@
license = lib.licenses.free;
};
}) {};
consult-denote = callPackage ({ consult
, denote
, elpaBuild
, emacs
, fetchurl
, lib }:
elpaBuild {
pname = "consult-denote";
ename = "consult-denote";
version = "0.0.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/consult-denote-0.0.0.tar";
sha256 = "191qf8knrmimam98jv8kgrl6mfrnwpdmw160s5qw6wcik7j4z6kv";
};
packageRequires = [ consult denote emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/consult-denote.html";
license = lib.licenses.free;
};
}) {};
consult-hoogle = callPackage ({ elpaBuild
, emacs
, fetchurl
@ -1166,10 +1201,10 @@
elpaBuild {
pname = "dape";
ename = "dape";
version = "0.10.0";
version = "0.11.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/dape-0.10.0.tar";
sha256 = "1x6mbis4vmghp3vf4pxyzdp68nnrraw9ayx3gzbp1bvcmr62qdig";
url = "https://elpa.gnu.org/packages/dape-0.11.1.tar";
sha256 = "0i04wwklypzxh78gwd9zjxjm3lwi2sn7qpqnlgd6n8hhcigyzhp0";
};
packageRequires = [ emacs jsonrpc ];
meta = {
@ -1442,10 +1477,10 @@
elpaBuild {
pname = "dired-preview";
ename = "dired-preview";
version = "0.1.1";
version = "0.2.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/dired-preview-0.1.1.tar";
sha256 = "08c9bvsdb7w9ggav9yrpz12nf9zlq4h1zq8ssdf9pwrx2nzy06p7";
url = "https://elpa.gnu.org/packages/dired-preview-0.2.0.tar";
sha256 = "15l01javijjjjc9bycljgshg9jv3clmfnsisy7f3caqxq78sb61l";
};
packageRequires = [ emacs ];
meta = {
@ -1547,10 +1582,10 @@
elpaBuild {
pname = "drepl";
ename = "drepl";
version = "0.2";
version = "0.3";
src = fetchurl {
url = "https://elpa.gnu.org/packages/drepl-0.2.tar";
sha256 = "1vf61d6iihpnr3h4cyxksd64qj8rw2a9ihjm3krvjmigxr2r6awx";
url = "https://elpa.gnu.org/packages/drepl-0.3.tar";
sha256 = "0dy8xvx5nwibiyhddm6nhcw384vhkhsbbxcs4hah0yxwajfm8yds";
};
packageRequires = [ comint-mime emacs ];
meta = {
@ -1667,10 +1702,10 @@
elpaBuild {
pname = "eev";
ename = "eev";
version = "20240309";
version = "20240513";
src = fetchurl {
url = "https://elpa.gnu.org/packages/eev-20240309.tar";
sha256 = "0nn6jdc37n2nx3i97ljl5a37dwxv5qx12ar15yr702hbsgaxyfa5";
url = "https://elpa.gnu.org/packages/eev-20240513.tar";
sha256 = "133blp5696f2adxqny5kyylr6s3n3vixs0ak1n3i58sqb0krp2pj";
};
packageRequires = [ emacs ];
meta = {
@ -1682,10 +1717,10 @@
elpaBuild {
pname = "ef-themes";
ename = "ef-themes";
version = "1.6.1";
version = "1.7.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ef-themes-1.6.1.tar";
sha256 = "0wkiqjnqnxwzskpxam44qxxz13fbpgnf17c1qrin8ad8i9b49bvq";
url = "https://elpa.gnu.org/packages/ef-themes-1.7.0.tar";
sha256 = "0d6rpwk1z9sc1yzfc4d4icb43pqwvdfvqap1m4r4aajvc5kasq1v";
};
packageRequires = [ emacs ];
meta = {
@ -1781,10 +1816,10 @@
elpaBuild {
pname = "elisp-benchmarks";
ename = "elisp-benchmarks";
version = "1.14";
version = "1.16";
src = fetchurl {
url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.14.tar";
sha256 = "050wja4axngnxggfxhg4b4lcbf1q674zr933r9qkc3ww731f42qa";
url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.16.tar";
sha256 = "0v5db89z6hirvixgjwyz3a9dkx6xf486hy51sprvslki706m08p2";
};
packageRequires = [];
meta = {
@ -1796,10 +1831,10 @@
elpaBuild {
pname = "ellama";
ename = "ellama";
version = "0.9.1";
version = "0.9.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/ellama-0.9.1.tar";
sha256 = "1kyylhavqa2wsgjgqybg25aiz0fyw4njpady2k2xhry5jw9i78vs";
url = "https://elpa.gnu.org/packages/ellama-0.9.4.tar";
sha256 = "12l8k7dwcdgndy0zbdgkhx94y46fkzwjrbwlgj9922zbk38nnz46";
};
packageRequires = [ emacs llm spinner ];
meta = {
@ -2592,10 +2627,10 @@
elpaBuild {
pname = "gtags-mode";
ename = "gtags-mode";
version = "1.5";
version = "1.6";
src = fetchurl {
url = "https://elpa.gnu.org/packages/gtags-mode-1.5.tar";
sha256 = "15jmynzm2xrvb410vka3jzzdcxbsm3vkihz27yzym708jb0bd8ji";
url = "https://elpa.gnu.org/packages/gtags-mode-1.6.tar";
sha256 = "1r3ih44kzkrx9bmfl8ri2yv90b7g4nhb0vvdnz1ba3f44x15ppjx";
};
packageRequires = [ emacs ];
meta = {
@ -2964,10 +2999,10 @@
elpaBuild {
pname = "jinx";
ename = "jinx";
version = "1.6";
version = "1.7";
src = fetchurl {
url = "https://elpa.gnu.org/packages/jinx-1.6.tar";
sha256 = "0jy2g587930d4jqi4asrci3411bby9j6wrxczyskacvjs41vqyip";
url = "https://elpa.gnu.org/packages/jinx-1.7.tar";
sha256 = "13snfsrwdbn23fdwpk42xp24x8bskl8sgsbq51nr896smjp2x3b4";
};
packageRequires = [ compat emacs ];
meta = {
@ -3246,16 +3281,16 @@
license = lib.licenses.free;
};
}) {};
llm = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
llm = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }:
elpaBuild {
pname = "llm";
ename = "llm";
version = "0.12.3";
version = "0.15.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/llm-0.12.3.tar";
sha256 = "19c3i8jfhvc0zqha2mlynk16ws4wgc1hdjrp7gp290bacvr560vg";
url = "https://elpa.gnu.org/packages/llm-0.15.0.tar";
sha256 = "1y3gs8zsng87wmlkx5az396hci4xyn0ww7cbaavisqbrxam51qvj";
};
packageRequires = [ emacs ];
packageRequires = [ emacs plz ];
meta = {
homepage = "https://elpa.gnu.org/packages/llm.html";
license = lib.licenses.free;
@ -3745,10 +3780,10 @@
elpaBuild {
pname = "nano-modeline";
ename = "nano-modeline";
version = "1.0.1";
version = "1.1.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/nano-modeline-1.0.1.tar";
sha256 = "0frvg9zy9i8qqb6il0csxmgxsd373n696kwz1xqq28jikvhzkwyy";
url = "https://elpa.gnu.org/packages/nano-modeline-1.1.0.tar";
sha256 = "1x4b4j82vzbi1mhbs9bwgw41hcagnfk56kswjk928i179pnkr0cx";
};
packageRequires = [ emacs ];
meta = {
@ -3839,10 +3874,10 @@
elpaBuild {
pname = "notmuch-indicator";
ename = "notmuch-indicator";
version = "1.1.0";
version = "1.2.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/notmuch-indicator-1.1.0.tar";
sha256 = "1g30hzb238w9cnxqw8w7gw5l8sl4rx122napmm9rx974hdk3zk9k";
url = "https://elpa.gnu.org/packages/notmuch-indicator-1.2.0.tar";
sha256 = "1n525slxs0l5nbila1sy62fz384yz7f54nrq1ixdlq0j3czgh9kz";
};
packageRequires = [ emacs ];
meta = {
@ -4004,10 +4039,10 @@
elpaBuild {
pname = "org";
ename = "org";
version = "9.6.28";
version = "9.6.30";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-9.6.28.tar";
sha256 = "1slh28vjwhb65q0630p1syv6ampdsqgrdmisyj4f328g3j2brpkw";
url = "https://elpa.gnu.org/packages/org-9.6.30.tar";
sha256 = "0h2p7gjiys5ch68y35l6bpw9pp852vprmfzi0dk86z1wkilhycip";
};
packageRequires = [ emacs ];
meta = {
@ -4094,10 +4129,10 @@
elpaBuild {
pname = "org-real";
ename = "org-real";
version = "1.0.8";
version = "1.0.9";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-real-1.0.8.tar";
sha256 = "03g12czy833yzj7idkharsbl2zd1ajnsf7ay8qxqljwqrz8m91gw";
url = "https://elpa.gnu.org/packages/org-real-1.0.9.tar";
sha256 = "0g19pgg7rqijb6q1vpifvpzl2gyc13a42q1n23x3kawl2srhcjp2";
};
packageRequires = [ boxy emacs org ];
meta = {
@ -4124,10 +4159,10 @@
elpaBuild {
pname = "org-transclusion";
ename = "org-transclusion";
version = "1.3.2";
version = "1.4.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/org-transclusion-1.3.2.tar";
sha256 = "14w9n10s6nh3nylkx3xzbqjb9pp4dja85agh0h2bzlbkaq4j7vij";
url = "https://elpa.gnu.org/packages/org-transclusion-1.4.0.tar";
sha256 = "0ci6xja3jkj1a9f76sf3780gcjrdpbds2y2bwba3b55fjmr1fscl";
};
packageRequires = [ emacs org ];
meta = {
@ -4544,10 +4579,10 @@
elpaBuild {
pname = "pyim";
ename = "pyim";
version = "5.3.3";
version = "5.3.4";
src = fetchurl {
url = "https://elpa.gnu.org/packages/pyim-5.3.3.tar";
sha256 = "03khpd3skv7ijmnn721dvila8x6pvg9pl4p7djyz8m59xgvv55dp";
url = "https://elpa.gnu.org/packages/pyim-5.3.4.tar";
sha256 = "0axi8vizr2pdswdnnkr409k926h9k7w3c18nbmb9j3pfc32inkjs";
};
packageRequires = [ async emacs xr ];
meta = {
@ -5314,10 +5349,10 @@
elpaBuild {
pname = "spacious-padding";
ename = "spacious-padding";
version = "0.4.1";
version = "0.5.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/spacious-padding-0.4.1.tar";
sha256 = "0w9f19sxpbaagwxfnsg3qmk95v8vnkfcyd3l6i9ns9ww26sb2fgl";
url = "https://elpa.gnu.org/packages/spacious-padding-0.5.0.tar";
sha256 = "0x5bsyd6b1d3bzrsrpf9nvw7xj5ch114m2dilq64bg8y2db3452z";
};
packageRequires = [ emacs ];
meta = {
@ -5449,10 +5484,10 @@
elpaBuild {
pname = "substitute";
ename = "substitute";
version = "0.2.1";
version = "0.3.1";
src = fetchurl {
url = "https://elpa.gnu.org/packages/substitute-0.2.1.tar";
sha256 = "09cqxfp9az6cckh0bq1155g6xh9rjn0ppjyc6879ihx6ba61li53";
url = "https://elpa.gnu.org/packages/substitute-0.3.1.tar";
sha256 = "0038kkn6v2w3asg9abwary2cacr9wbw90wdvq7q9wyk1818cygff";
};
packageRequires = [ emacs ];
meta = {
@ -5788,10 +5823,10 @@
elpaBuild {
pname = "track-changes";
ename = "track-changes";
version = "1.1";
version = "1.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/track-changes-1.1.tar";
sha256 = "04srqkpyc6l3s95jyf2p5pqqf1z67i7k89334r6ybqj1l91h2prn";
url = "https://elpa.gnu.org/packages/track-changes-1.2.tar";
sha256 = "0al6a1xjs6p2pn6z976pnmfqz2x5xcz99b5gkdzz90ywbn7018m4";
};
packageRequires = [ emacs ];
meta = {
@ -6013,10 +6048,10 @@
elpaBuild {
pname = "urgrep";
ename = "urgrep";
version = "0.4.1";
version = "0.5.0";
src = fetchurl {
url = "https://elpa.gnu.org/packages/urgrep-0.4.1.tar";
sha256 = "046096vk8d5xy33icv4s0s101lrx3xan9ppvh77rqxd95gglhgap";
url = "https://elpa.gnu.org/packages/urgrep-0.5.0.tar";
sha256 = "14vga04hf03hj1ilcpl3qblmb7mhl9j0qwkq2whbc50p98avkhqi";
};
packageRequires = [ compat emacs project ];
meta = {
@ -6449,6 +6484,21 @@
license = lib.licenses.free;
};
}) {};
window-tool-bar = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "window-tool-bar";
ename = "window-tool-bar";
version = "0.2";
src = fetchurl {
url = "https://elpa.gnu.org/packages/window-tool-bar-0.2.tar";
sha256 = "191v21rrw1j560512mjn1s1avhirk1awy746xajjra8lb1ywnxw7";
};
packageRequires = [ emacs ];
meta = {
homepage = "https://elpa.gnu.org/packages/window-tool-bar.html";
license = lib.licenses.free;
};
}) {};
windower = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "windower";
@ -6533,10 +6583,10 @@
elpaBuild {
pname = "wrap-search";
ename = "wrap-search";
version = "4.14.11";
version = "4.16.13";
src = fetchurl {
url = "https://elpa.gnu.org/packages/wrap-search-4.14.11.tar";
sha256 = "07x6fcig69d3hmcmvpj75h605j8sfjwmd4z1yd4rb6np60dh42ff";
url = "https://elpa.gnu.org/packages/wrap-search-4.16.13.tar";
sha256 = "0h5wlvmxq1rcmkhmaan3118w5480xx1gblg73lsfhxnj2xkmhrbi";
};
packageRequires = [];
meta = {

59
pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
View File

@ -64,10 +64,10 @@
elpaBuild {
pname = "annotate";
ename = "annotate";
version = "2.2.1";
version = "2.2.2";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/annotate-2.2.1.tar";
sha256 = "04k42bc3jbna3jipcpsj31lhcj1cqabak4pmllz9c0jf1z74hx94";
url = "https://elpa.nongnu.org/nongnu/annotate-2.2.2.tar";
sha256 = "0hrb7kjzhgy46hxaa77rv5ilsdsv6zxpawnkx4viw5jq0v5s4fl6";
};
packageRequires = [];
meta = {
@ -736,10 +736,10 @@
elpaBuild {
pname = "editorconfig";
ename = "editorconfig";
version = "0.10.1";
version = "0.11.0";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/editorconfig-0.10.1.tar";
sha256 = "1xv2yfs8v2bcf9nvbchdw8lxryfnhy3zh0n6vnxyxnbx2590qa9s";
url = "https://elpa.nongnu.org/nongnu/editorconfig-0.11.0.tar";
sha256 = "0adzm6fhx5vgg20qy9f7cqpnx938mp1ls91y5cw71pjm9ihs2cyv";
};
packageRequires = [ emacs nadvice ];
meta = {
@ -1525,6 +1525,21 @@
license = lib.licenses.free;
};
}) {};
gptel = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib, transient }:
elpaBuild {
pname = "gptel";
ename = "gptel";
version = "0.8.6";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/gptel-0.8.6.tar";
sha256 = "1ds0i32bdmdi5w68cjxm9xlg0m9n29yr4hl6sqi8gn3kgswfx1sb";
};
packageRequires = [ compat emacs transient ];
meta = {
homepage = "https://elpa.gnu.org/packages/gptel.html";
license = lib.licenses.free;
};
}) {};
graphql-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
elpaBuild {
pname = "graphql-mode";
@ -1989,16 +2004,20 @@
license = lib.licenses.free;
};
}) {};
macrostep = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
macrostep = callPackage ({ cl-lib ? null
, compat
, elpaBuild
, fetchurl
, lib }:
elpaBuild {
pname = "macrostep";
ename = "macrostep";
version = "0.9.2";
version = "0.9.4";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/macrostep-0.9.2.tar";
sha256 = "0ij216575987fi4l4305h5xnvic21lizybkyq5mx67zvhcq75yfs";
url = "https://elpa.nongnu.org/nongnu/macrostep-0.9.4.tar";
sha256 = "01n3qhxfjd9vg93ddrhnm275v24ih5qczkphc232m0csswxghpdk";
};
packageRequires = [ cl-lib ];
packageRequires = [ cl-lib compat ];
meta = {
homepage = "https://elpa.gnu.org/packages/macrostep.html";
license = lib.licenses.free;
@ -2073,10 +2092,10 @@
elpaBuild {
pname = "mastodon";
ename = "mastodon";
version = "1.0.12";
version = "1.0.21";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.12.tar";
sha256 = "1kmzlz9sb7vkyw84kmpg39zj2hhyrvpb0g6h54ikrxccbn8g22s2";
url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.21.tar";
sha256 = "1qlpkg28q4iyvjjzv8b40b8q7ni7rc94lj5akgzxbzw4avpp1217";
};
packageRequires = [ emacs persist request ];
meta = {
@ -2696,10 +2715,10 @@
elpaBuild {
pname = "racket-mode";
ename = "racket-mode";
version = "1.0.20240419.71343";
version = "1.0.20240514.112412";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240419.71343.tar";
sha256 = "152cm66y4pk5ggr7rbj9pzf2w0c6adkh1dd3cjwmq96mpxydx2na";
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240514.112412.tar";
sha256 = "1ysjq9jvkm8qibj0z6j4q90sx19xyz9z9qzdlci9mw872r21ak9h";
};
packageRequires = [ emacs ];
meta = {
@ -3570,10 +3589,10 @@
elpaBuild {
pname = "xah-fly-keys";
ename = "xah-fly-keys";
version = "25.1.20240423172921";
version = "25.6.20240521220424";
src = fetchurl {
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.1.20240423172921.tar";
sha256 = "00h6bmfl4mpx44j1phvijffzlqm1xs2gfprmpwbghc29p5lbd2pj";
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.6.20240521220424.tar";
sha256 = "029hy3qmf6nvibbq9w2b964gzbw99lja595h4g1y5zzyrgzqrhrn";
};
packageRequires = [ emacs ];
meta = {

2915
pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
View File

File diff suppressed because it is too large Load Diff

9
pkgs/applications/editors/emacs/elisp-packages/update-from-overlay.flake.sh Executable file
View File

@ -0,0 +1,9 @@
#!/usr/bin/env nix
#! nix shell nixpkgs#bash nixpkgs#curl nixpkgs#nix nixpkgs#coreutils --command bash
set -xeuo pipefail
# Since flakes are not stable yet, we can't suppose everyone is using them.
# Therefore, the original ./update-from-overlay should not be modified.
# So, let's create a wrapper!
source ./update-from-overlay

4
pkgs/applications/editors/vim/common.nix
View File

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub }:
rec {
version = "9.1.0377";
version = "9.1.0412";
outputs = [ "out" "xxd" ];
@ -8,7 +8,7 @@ rec {
owner = "vim";
repo = "vim";
rev = "v${version}";
hash = "sha256-cfN/QbnpWIQmLtpXWPc1JnaaX+J10ietObN/B9lE1F0=";
hash = "sha256-uLdXFZ8eW+iMXrvkaEkArZmRfAiyORaEZxFFPt0TrdI=";
};
enableParallelBuilding = true;

1
pkgs/applications/misc/pagefind/default.nix
View File

@ -96,7 +96,6 @@ rustPlatform.buildRustPackage rec {
echo entering pagefind_web...
(
cd pagefind_web
export RUSTFLAGS="-C linker=lld"
bash ./local_build.sh
)

5
pkgs/applications/misc/slippy/default.nix
View File

@ -53,11 +53,6 @@ rustPlatform.buildRustPackage rec {
darwin.apple_sdk.frameworks.Security
];
# Cargo.lock is outdated
postConfigure = ''
cargo metadata --offline
'';
meta = with lib; {
description = "Markdown slideshows in Rust";
homepage = "https://github.com/axodotdev/slippy";

39
pkgs/applications/networking/browsers/firefox/bindgen-0.64-clang-18.patch Normal file
View File

@ -0,0 +1,39 @@
From 043ab6ab28df63fd1b3459df5c52fd8c87c0ba21 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Tue, 28 Nov 2023 11:21:18 -0800
Subject: [PATCH] Handle CXCursor_LinkageSpec in Clang 18+
(cherry picked from commit 86f3dbe846020e2ba573d6eb38d1434d0cbcbb40)
---
third_party/rust/bindgen/.cargo-checksum.json | 2 +-
third_party/rust/bindgen/ir/item.rs | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/third_party/rust/bindgen/.cargo-checksum.json b/third_party/rust/bindgen/.cargo-checksum.json
index 2242180..88718bd 100644
--- a/third_party/rust/bindgen/.cargo-checksum.json
+++ b/third_party/rust/bindgen/.cargo-checksum.json
@@ -1 +1 @@
-{"files":{"Cargo.toml":"ae6de5b309f8bf07c259436b1113ccf405b2d7dd862e1b289bfef47a550956d1","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","build.rs":"4a9c4ac3759572e17de312a9d3f4ced3b6fd3c71811729e5a8d06bfbd1ac8f82","callbacks.rs":"9cbda648159897f93a07dbe90a1ee9ba92e2b020a02bc9725b87db4d025df3b6","clang.rs":"a38d153516c6685b46723010793b2f4e8b16468f3cd3296781dea6e485cd66da","codegen/bitfield_unit.rs":"fddeaeab5859f4e82081865595b7705f5c0774d997df95fa5c655b81b9cae125","codegen/bitfield_unit_tests.rs":"9df86490de5e9d66ccea583dcb686dd440375dc1a3c3cf89a89d5de3883bf28a","codegen/dyngen.rs":"7d727a737c616f7f2d3a07d825be8baad9078b3f35ad96277904559b4534ffcc","codegen/error.rs":"5e308b8c54b68511fc8ea2ad15ddac510172c4ff460a80a265336440b0c9653d","codegen/helpers.rs":"5f24007a09e50db7bd2b49b07100cfed649c7b22232558e28c99c759d5d14152","codegen/impl_debug.rs":"71d8e28873ba2de466f2637a824746963702f0511728037d72ee5670c51194cb","codegen/impl_partialeq.rs":"f4599e32c66179ae515a6518a3e94b686689cf59f7dd9ab618c3fb69f17d2c77","codegen/mod.rs":"25ef86b9dd894b40724d78b99e2743654f09bb427a23ccf5940a620c6408688e","codegen/postprocessing/merge_extern_blocks.rs":"be5c5ff6d3d3d4e940814c4dc77f8d687aa6b053dcfbd2185c09616ba9022bf2","codegen/postprocessing/mod.rs":"d1e8c2864d5194a4cb2f6731c0ef582a55b363df9c4f888c26942ff37f728e1c","codegen/postprocessing/sort_semantically.rs":"3071dd509f2e5d3dfd99cafa6ee19bbacb9fec1c61a0b3f6e284a75c1f2c3db6","codegen/serialize.rs":"b1d8fff0bd9717ee7ca883fd3f376cf7b93adb65dc5bb89ede467b087e985a5f","codegen/struct_layout.rs":"7dfc814d3c914a0c53d8ed031baf543dab1def5959e8ab85220cad69a506383a","deps.rs":"5ee2332fdb10325f3b0a0c6d9ba94e13eb631ef39e955fa958afc3625bdb5448","extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","features.rs":"af20bd617cce27f6716ab3d61a1c8ddfaa46227f4a0d435b08a19d5f277cf8ba","ir/analysis/derive.rs":"ec514585eb40f0e3306bf3302aec0152a2e95e8dce13a67c36b5f00c0cbb76ef","ir/analysis/has_destructor.rs":"7a82f01e7e0595a31b56f7c398fa3019b3fe9100a2a73b56768f7e6943dcc3ce","ir/analysis/has_float.rs":"58ea1e38a59ef208400fd65d426cb5b288949df2d383b3a194fa01b99d2a87fa","ir/analysis/has_type_param_in_array.rs":"d1b9eb119dc14f662eb9bd1394c859f485479e4912589709cdd33f6752094e22","ir/analysis/has_vtable.rs":"368cf30fbe3fab7190fab48718b948caac5da8c9e797b709488716b919315636","ir/analysis/mod.rs":"0c10d8eeb26d7e6f4ce18e9dfb74ea1f9deff5cd350298aca3dc1041b17c20c4","ir/analysis/sizedness.rs":"944443d6aab35d2dd80e4f5e59176ac1e1c463ba2f0eb25d33f1d95dfac1a6d0","ir/analysis/template_params.rs":"d3cc41041b1c45e0b5be2c9f3f1cc0c2341481b9ff51589cba2428df4e6a1ea9","ir/annotations.rs":"f79de09803a3f3ccb33e366a10a707da98cd00a56ba18312ea927d6c977220a4","ir/comment.rs":"5dcfab0095d967daad9b2927093fce3786b1a2146171580afbf526ba56855e36","ir/comp.rs":"b7b28b96e4206b3215881d814661c63c5dd182f34b1163d54bcedbe85998cb06","ir/context.rs":"a7608f7d3dd607647f2af5f45fc7c09483d2a694f91265bba353a71652e2d419","ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","ir/dot.rs":"2d79d698e6ac59ce032840e62ff11103abed1d5e9e700cf383b492333eeebe1f","ir/enum_ty.rs":"0b612e0b57112068455eee519f894016d0a8f425d6a67b98c56b858f57d99f4a","ir/function.rs":"60407267473d785ea33ac854a70c8ca34749bc868024270992deca68a951f74c","ir/int.rs":"68a86182743ec338d58e42203364dc7c8970cb7ec3550433ca92f0c9489b4442","ir/item.rs":"880c982df0843cbdff38b9f9c3829a2d863a224e4de2260c41c3ac69e9148ad4","ir/item_kind.rs":"7666a1ff1b8260978b790a08b4139ab56b5c65714a5652bbcec7faa7443adc36","ir/layout.rs":"61a0e4250ceab889606973f930f4d692837a13a69ae2579738ff09843fed3d65","ir/mod.rs":"713cd537434567003197a123cbae679602c715e976d22f7b23dafd0826ea4c70","ir/module.rs":"7cae5561bcf84a5c3b1ee8f1c3336a33b7f44f0d5ffe885fb108289983fe763e","ir/objc.rs":"4eecdb754542d78acea27d2f547d18d49164047e6efaff8a8d283d6c2dc9875b","ir/template.rs":"4f0e3736558aa8ec359cd9749dc48f87bfff494dd195a67b39cfee7d8a7542ef","ir/traversal.rs":"0c37a0898801ad39bffc8dddd1ee8baa61bb7cf4f3fdc25c8fdd56b6c96ada65","ir/ty.rs":"ba0d7b16a1080caf4960cc7dea0d0800365da0dd5c6e735d508ec448e87b1d40","ir/var.rs":"ced3496cf0683fef91ce94aa09b0ee37255db8425ea8634d52bd73b1b5c160f6","lib.rs":"0bed6f10b2dd25753a40e6e7fa11239f08c05be414ad264c6d7e2f7a8b71f1b2","log_stubs.rs":"9f974e041e35c8c7e29985d27ae5cd0858d68f8676d1dc005c6388d7d011707f","parse.rs":"ccb2c506f08123708ae673b8216404fb22b4c951330662f9b7140b412b063260","regex_set.rs":"7dcc1ad52194f057ea00e8ebc9c23c465ffa6761eed6ba41560d2d02e03c43a6","time.rs":"8efe317e7c6b5ba8e0865ce7b49ca775ee8a02590f4241ef62f647fa3c22b68e"},"package":"c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"}
\ No newline at end of file
+{"files":{"Cargo.toml":"ae6de5b309f8bf07c259436b1113ccf405b2d7dd862e1b289bfef47a550956d1","LICENSE":"c23953d9deb0a3312dbeaf6c128a657f3591acee45067612fa68405eaa4525db","build.rs":"4a9c4ac3759572e17de312a9d3f4ced3b6fd3c71811729e5a8d06bfbd1ac8f82","callbacks.rs":"9cbda648159897f93a07dbe90a1ee9ba92e2b020a02bc9725b87db4d025df3b6","clang.rs":"a38d153516c6685b46723010793b2f4e8b16468f3cd3296781dea6e485cd66da","codegen/bitfield_unit.rs":"fddeaeab5859f4e82081865595b7705f5c0774d997df95fa5c655b81b9cae125","codegen/bitfield_unit_tests.rs":"9df86490de5e9d66ccea583dcb686dd440375dc1a3c3cf89a89d5de3883bf28a","codegen/dyngen.rs":"7d727a737c616f7f2d3a07d825be8baad9078b3f35ad96277904559b4534ffcc","codegen/error.rs":"5e308b8c54b68511fc8ea2ad15ddac510172c4ff460a80a265336440b0c9653d","codegen/helpers.rs":"5f24007a09e50db7bd2b49b07100cfed649c7b22232558e28c99c759d5d14152","codegen/impl_debug.rs":"71d8e28873ba2de466f2637a824746963702f0511728037d72ee5670c51194cb","codegen/impl_partialeq.rs":"f4599e32c66179ae515a6518a3e94b686689cf59f7dd9ab618c3fb69f17d2c77","codegen/mod.rs":"25ef86b9dd894b40724d78b99e2743654f09bb427a23ccf5940a620c6408688e","codegen/postprocessing/merge_extern_blocks.rs":"be5c5ff6d3d3d4e940814c4dc77f8d687aa6b053dcfbd2185c09616ba9022bf2","codegen/postprocessing/mod.rs":"d1e8c2864d5194a4cb2f6731c0ef582a55b363df9c4f888c26942ff37f728e1c","codegen/postprocessing/sort_semantically.rs":"3071dd509f2e5d3dfd99cafa6ee19bbacb9fec1c61a0b3f6e284a75c1f2c3db6","codegen/serialize.rs":"b1d8fff0bd9717ee7ca883fd3f376cf7b93adb65dc5bb89ede467b087e985a5f","codegen/struct_layout.rs":"7dfc814d3c914a0c53d8ed031baf543dab1def5959e8ab85220cad69a506383a","deps.rs":"5ee2332fdb10325f3b0a0c6d9ba94e13eb631ef39e955fa958afc3625bdb5448","extra_assertions.rs":"494534bd4f18b80d89b180c8a93733e6617edcf7deac413e9a73fd6e7bc9ced7","features.rs":"af20bd617cce27f6716ab3d61a1c8ddfaa46227f4a0d435b08a19d5f277cf8ba","ir/analysis/derive.rs":"ec514585eb40f0e3306bf3302aec0152a2e95e8dce13a67c36b5f00c0cbb76ef","ir/analysis/has_destructor.rs":"7a82f01e7e0595a31b56f7c398fa3019b3fe9100a2a73b56768f7e6943dcc3ce","ir/analysis/has_float.rs":"58ea1e38a59ef208400fd65d426cb5b288949df2d383b3a194fa01b99d2a87fa","ir/analysis/has_type_param_in_array.rs":"d1b9eb119dc14f662eb9bd1394c859f485479e4912589709cdd33f6752094e22","ir/analysis/has_vtable.rs":"368cf30fbe3fab7190fab48718b948caac5da8c9e797b709488716b919315636","ir/analysis/mod.rs":"0c10d8eeb26d7e6f4ce18e9dfb74ea1f9deff5cd350298aca3dc1041b17c20c4","ir/analysis/sizedness.rs":"944443d6aab35d2dd80e4f5e59176ac1e1c463ba2f0eb25d33f1d95dfac1a6d0","ir/analysis/template_params.rs":"d3cc41041b1c45e0b5be2c9f3f1cc0c2341481b9ff51589cba2428df4e6a1ea9","ir/annotations.rs":"f79de09803a3f3ccb33e366a10a707da98cd00a56ba18312ea927d6c977220a4","ir/comment.rs":"5dcfab0095d967daad9b2927093fce3786b1a2146171580afbf526ba56855e36","ir/comp.rs":"b7b28b96e4206b3215881d814661c63c5dd182f34b1163d54bcedbe85998cb06","ir/context.rs":"a7608f7d3dd607647f2af5f45fc7c09483d2a694f91265bba353a71652e2d419","ir/derive.rs":"e5581852eec87918901a129284b4965aefc8a19394187a8095779a084f28fabe","ir/dot.rs":"2d79d698e6ac59ce032840e62ff11103abed1d5e9e700cf383b492333eeebe1f","ir/enum_ty.rs":"0b612e0b57112068455eee519f894016d0a8f425d6a67b98c56b858f57d99f4a","ir/function.rs":"60407267473d785ea33ac854a70c8ca34749bc868024270992deca68a951f74c","ir/int.rs":"68a86182743ec338d58e42203364dc7c8970cb7ec3550433ca92f0c9489b4442","ir/item.rs":"f215cc40c013cdd6151149dd92b73e13a635a1056f5724174c0f0ff7da9286f8","ir/item_kind.rs":"7666a1ff1b8260978b790a08b4139ab56b5c65714a5652bbcec7faa7443adc36","ir/layout.rs":"61a0e4250ceab889606973f930f4d692837a13a69ae2579738ff09843fed3d65","ir/mod.rs":"713cd537434567003197a123cbae679602c715e976d22f7b23dafd0826ea4c70","ir/module.rs":"7cae5561bcf84a5c3b1ee8f1c3336a33b7f44f0d5ffe885fb108289983fe763e","ir/objc.rs":"4eecdb754542d78acea27d2f547d18d49164047e6efaff8a8d283d6c2dc9875b","ir/template.rs":"4f0e3736558aa8ec359cd9749dc48f87bfff494dd195a67b39cfee7d8a7542ef","ir/traversal.rs":"0c37a0898801ad39bffc8dddd1ee8baa61bb7cf4f3fdc25c8fdd56b6c96ada65","ir/ty.rs":"ba0d7b16a1080caf4960cc7dea0d0800365da0dd5c6e735d508ec448e87b1d40","ir/var.rs":"ced3496cf0683fef91ce94aa09b0ee37255db8425ea8634d52bd73b1b5c160f6","lib.rs":"0bed6f10b2dd25753a40e6e7fa11239f08c05be414ad264c6d7e2f7a8b71f1b2","log_stubs.rs":"9f974e041e35c8c7e29985d27ae5cd0858d68f8676d1dc005c6388d7d011707f","parse.rs":"ccb2c506f08123708ae673b8216404fb22b4c951330662f9b7140b412b063260","regex_set.rs":"7dcc1ad52194f057ea00e8ebc9c23c465ffa6761eed6ba41560d2d02e03c43a6","time.rs":"8efe317e7c6b5ba8e0865ce7b49ca775ee8a02590f4241ef62f647fa3c22b68e"},"package":"c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4"}
\ No newline at end of file
diff --git a/third_party/rust/bindgen/ir/item.rs b/third_party/rust/bindgen/ir/item.rs
index 40f6f7d..d443bda 100644
--- a/third_party/rust/bindgen/ir/item.rs
+++ b/third_party/rust/bindgen/ir/item.rs
@@ -1427,8 +1427,9 @@ impl Item {
}
}
- // Guess how does clang treat extern "C" blocks?
- if cursor.kind() == CXCursor_UnexposedDecl {
+ // On Clang 18+, extern "C" is reported accurately as a LinkageSpec.
+ // Older LLVM treat it as UnexposedDecl.
+ if cursor.kind() == CXCursor_LinkageSpec || cursor.kind() == CXCursor_UnexposedDecl {
Err(ParseError::Recurse)
} else {
// We allowlist cursors here known to be unhandled, to prevent being
--
2.44.0

13
pkgs/applications/networking/browsers/firefox/common.nix
View File

@ -254,9 +254,22 @@ buildStdenv.mkDerivation {
hash = "sha256-cWOyvjIPUU1tavPRqg61xJ53XE4EJTdsFzadfVxyTyM=";
})
]
++ lib.optionals (lib.versionOlder version "122") [
./bindgen-0.64-clang-18.patch
]
++ lib.optionals (lib.versionAtLeast version "122" && lib.versionOlder version "123") [
./122.0-libvpx-mozbz1875201.patch
]
++ lib.optionals (lib.versionOlder version "123") [
(fetchpatch {
name = "clang-18.patch";
url = "https://hg.mozilla.org/mozilla-central/raw-rev/ba6abbd36b496501cea141e17b61af674a18e279";
hash = "sha256-2IpdSyye3VT4VB95WurnyRFtdN1lfVtYpgEiUVhfNjw=";
})
]
++ lib.optionals (lib.versionOlder version "125") [
./rust-1.78.patch
]
++ extraPatches;
postPatch = ''

77
pkgs/applications/networking/browsers/firefox/rust-1.78.patch Normal file
View File

@ -0,0 +1,77 @@
From 9dd8048e28b65da0b904dfbace482f70ae768fd8 Mon Sep 17 00:00:00 2001
From: Jeff Muizelaar <jmuizelaar@mozilla.com>
Date: Tue, 5 Mar 2024 04:12:28 +0100
Subject: [PATCH] Bug 1882291. Switch to stdarch_arm_neon_intrinsics feature on
rust >=1.78. r=glandium
We only need this on ARM32 because the ARM64 intrinsics are stable.
stdarch_arm_neon_intrinsics was split out from stdsimd here:
https://github.com/rust-lang/stdarch/pull/1486
Differential Revision: https://phabricator.services.mozilla.com/D203039
---
Cargo.lock | 1 +
gfx/qcms/Cargo.toml | 3 +++
gfx/qcms/build.rs | 7 +++++++
gfx/qcms/src/lib.rs | 6 ++++--
4 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 gfx/qcms/build.rs
diff --git a/Cargo.lock b/Cargo.lock
index aba397832e..8f0a879a87 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4276,6 +4276,7 @@ name = "qcms"
version = "0.2.0"
dependencies = [
"libc",
+ "version_check",
]
[[package]]
diff --git a/gfx/qcms/Cargo.toml b/gfx/qcms/Cargo.toml
index e976054a7b..f50d6623a1 100644
--- a/gfx/qcms/Cargo.toml
+++ b/gfx/qcms/Cargo.toml
@@ -20,3 +20,6 @@ cmyk = []
[dependencies]
libc = {version = "0.2", optional = true }
+
+[build-dependencies]
+version_check = "0.9"
diff --git a/gfx/qcms/build.rs b/gfx/qcms/build.rs
new file mode 100644
index 0000000000..6810a8828e
--- /dev/null
+++ b/gfx/qcms/build.rs
@@ -0,0 +1,7 @@
+extern crate version_check as rustc;
+
+fn main() {
+ if rustc::is_min_version("1.78.0").unwrap_or(false) {
+ println!("cargo:rustc-cfg=stdsimd_split");
+ }
+}
diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs
index c311964ee3..fc496816a8 100644
--- a/gfx/qcms/src/lib.rs
+++ b/gfx/qcms/src/lib.rs
@@ -7,9 +7,11 @@
#![allow(non_upper_case_globals)]
// These are needed for the neon SIMD code and can be removed once the MSRV supports the
// instrinsics we use
-#![cfg_attr(feature = "neon", feature(stdsimd))]
+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_neon_intrinsics))]
+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_feature_detection))]
+#![cfg_attr(all(not(stdsimd_split), target_arch = "arm", feature = "neon"), feature(stdsimd))]
#![cfg_attr(
- feature = "neon",
+ all(target_arch = "arm", feature = "neon"),
feature(arm_target_feature, raw_ref_op)
)]
--
2.44.0

5
pkgs/applications/networking/irc/tiny/default.nix
View File

@ -23,11 +23,6 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-AhQCfLCoJU7o8s+XL3hDOPmZi9QjOxXSA9uglA1KSuY=";
# Cargo.lock is outdated
preConfigure = ''
cargo metadata --offline
'';
nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
buildInputs = lib.optionals dbusSupport [ dbus ]
++ lib.optionals useOpenSSL [ openssl ]

5
pkgs/applications/networking/sync/celeste/default.nix
View File

@ -47,11 +47,6 @@ rustPlatform.buildRustPackage rec {
sed -i "#/bin/celeste#d" justfile
'';
# Cargo.lock is outdated
preConfigure = ''
cargo update --offline
'';
RUSTC_BOOTSTRAP = 1;
nativeBuildInputs = [

3
pkgs/applications/networking/sync/rsync/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, updateAutotoolsGnuConfigScriptsHook
, perl
, libiconv
, zlib
@ -28,7 +29,7 @@ stdenv.mkDerivation rec {
hash = "sha256-c5nppnCMMtZ4pypjIZ6W8jvgviM25Q/RNISY0HBB35A=";
};
nativeBuildInputs = [ perl ];
nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook perl ];
buildInputs = [ libiconv zlib popt ]
++ lib.optional enableACLs acl

5
pkgs/applications/version-management/git/default.nix
View File

@ -29,7 +29,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
version = "2.44.1";
version = "2.45.1";
svn = subversionClient.override { perlBindings = perlSupport; };
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
in
@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
hash = "sha256-e2CmJMD3AJoWuFYlBiGq/c3YXrjUS7AgYXtlJbhyYeQ=";
hash = "sha256-5k00Co5ieuIs+4vMZRzKC0l88en99SNzVUT/SnMvEr8=";
};
outputs = [ "out" ] ++ lib.optional withManual "doc";
@ -374,6 +374,7 @@ stdenv.mkDerivation (finalAttrs: {
});
buildbot-integration = nixosTests.buildbot;
} // tests.fetchgit;
updateScript = ./update.sh;
};
meta = {

16
pkgs/applications/virtualization/qemu/default.nix
View File

@ -55,11 +55,11 @@ stdenv.mkDerivation (finalAttrs: {
+ lib.optionalString hostCpuOnly "-host-cpu-only"
+ lib.optionalString nixosTestRunner "-for-vm-tests"
+ lib.optionalString toolsOnly "-utils";
version = "8.2.4";
version = "9.0.0";
src = fetchurl {
url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz";
hash = "sha256-7PVTf+q5JkG5nXSC9VHyGV06W9NKzvnVK/v/NTpgc5c=";
hash = "sha256-MnCKxmww2MiSYz6paMdxwcdtWX1w3erSGg0izPOG2mk=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ]
@ -124,11 +124,9 @@ stdenv.mkDerivation (finalAttrs: {
# Cocoa clipboard support only works on macOS 10.14+
./revert-ui-cocoa-add-clipboard-support.patch
# Standard about panel requires AppKit and macOS 10.13+
(fetchpatch {
url = "https://gitlab.com/qemu-project/qemu/-/commit/99eb313ddbbcf73c1adcdadceba1423b691c6d05.diff";
sha256 = "sha256-gTRf9XENAfbFB3asYCXnw4OV4Af6VE1W56K2xpYDhgM=";
revert = true;
})
./revert-ui-cocoa-use-the-standard-about-panel.patch
# Safe area insets require macOS 11+
./remove-ui-cocoa-use-safe-area-insets.patch
# Workaround for upstream issue with nested virtualisation: https://gitlab.com/qemu-project/qemu/-/issues/1008
(fetchpatch {
url = "https://gitlab.com/qemu-project/qemu/-/commit/3e4546d5bd38a1e98d4bd2de48631abf0398a3a2.diff";
@ -239,6 +237,10 @@ stdenv.mkDerivation (finalAttrs: {
# get-fsinfo attempts to access block devices, disallowed by sandbox
sed -i -e '/\/qga\/get-fsinfo/d' -e '/\/qga\/blacklist/d' \
../tests/unit/test-qga.c
# xattrs are not allowed in the sandbox
substituteInPlace ../tests/qtest/virtio-9p-test.c \
--replace-fail mapped-xattr mapped-file
'' + lib.optionalString stdenv.isDarwin ''
# skip test that stalls on darwin, perhaps due to subtle differences
# in fifo behaviour

14
pkgs/applications/virtualization/qemu/remove-ui-cocoa-use-safe-area-insets.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 25e0db9dd0..7ce889d798 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -539,9 +539,6 @@ - (NSSize)fixAspectRatio:(NSSize)max
- (NSSize) screenSafeAreaSize
{
NSSize size = [[[self window] screen] frame].size;
- NSEdgeInsets insets = [[[self window] screen] safeAreaInsets];
- size.width -= insets.left + insets.right;
- size.height -= insets.top + insets.bottom;
return size;
}

10
pkgs/applications/virtualization/qemu/revert-ui-cocoa-add-clipboard-support.patch
View File

@ -47,7 +47,7 @@ index 660d3e0935..0e6760c360 100644
-static QemuClipboardInfo *cbinfo;
-static QemuEvent cbevent;
-
// Utility functions to run specified code block with iothread lock held
// Utility functions to run specified code block with the BQL held
typedef void (^CodeBlock)(void);
typedef bool (^BoolCodeBlock)(void);
@@ -1799,107 +1794,6 @@ static void addRemovableDevicesMenuItems(void)
@ -65,7 +65,7 @@ index 660d3e0935..0e6760c360 100644
- return;
- }
-
- with_iothread_lock(^{
- with_bql(^{
- QemuClipboardInfo *info = qemu_clipboard_info_ref(cbinfo);
- qemu_event_reset(&cbevent);
- qemu_clipboard_request(info, QEMU_CLIPBOARD_TYPE_TEXT);
@ -73,9 +73,9 @@ index 660d3e0935..0e6760c360 100644
- while (info == cbinfo &&
- info->types[QEMU_CLIPBOARD_TYPE_TEXT].available &&
- info->types[QEMU_CLIPBOARD_TYPE_TEXT].data == NULL) {
- qemu_mutex_unlock_iothread();
- bql_unlock();
- qemu_event_wait(&cbevent);
- qemu_mutex_lock_iothread();
- bql_lock();
- }
-
- if (info == cbinfo) {
@ -186,9 +186,9 @@ index 660d3e0935..0e6760c360 100644
}
@@ -2071,12 +1952,6 @@ static void cocoa_display_init(DisplayState *ds, DisplayOptions *opts)
// register vga output callbacks
register_displaychangelistener(&dcl);
[cocoaView updateUIInfo];
-
- qemu_event_init(&cbevent, false);
- cbowner = [[QemuCocoaPasteboardTypeOwner alloc] init];

145
pkgs/applications/virtualization/qemu/revert-ui-cocoa-use-the-standard-about-panel.patch Normal file
View File

@ -0,0 +1,145 @@
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 25e0db9dd0..4af0712036 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -93,6 +93,7 @@ static void cocoa_switch(DisplayChangeListener *dcl,
static void cocoa_refresh(DisplayChangeListener *dcl);
+static NSWindow *about_window;
static const DisplayChangeListenerOps dcl_ops = {
.dpy_name = "cocoa",
.dpy_gfx_update = cocoa_update,
@@ -1180,6 +1181,7 @@ - (void)changeDeviceMedia:(id)sender;
- (BOOL)verifyQuit;
- (void)openDocumentation:(NSString *)filename;
- (IBAction) do_about_menu_item: (id) sender;
+- (void)make_about_window;
- (void)adjustSpeed:(id)sender;
@end
@@ -1227,6 +1229,8 @@ - (id) init
[pauseLabel setFont: [NSFont fontWithName: @"Helvetica" size: 90]];
[pauseLabel setTextColor: [NSColor blackColor]];
[pauseLabel sizeToFit];
+
+ [self make_about_window];
}
return self;
}
@@ -1549,29 +1553,92 @@ - (BOOL)verifyQuit
/* The action method for the About menu item */
- (IBAction) do_about_menu_item: (id) sender
{
- NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
- char *icon_path_c = get_relocated_path(CONFIG_QEMU_ICONDIR "/hicolor/512x512/apps/qemu.png");
- NSString *icon_path = [NSString stringWithUTF8String:icon_path_c];
- g_free(icon_path_c);
- NSImage *icon = [[NSImage alloc] initWithContentsOfFile:icon_path];
- NSString *version = @"QEMU emulator version " QEMU_FULL_VERSION;
- NSString *copyright = @QEMU_COPYRIGHT;
- NSDictionary *options;
- if (icon) {
- options = @{
- NSAboutPanelOptionApplicationIcon : icon,
- NSAboutPanelOptionApplicationVersion : version,
- @"Copyright" : copyright,
- };
- [icon release];
- } else {
- options = @{
- NSAboutPanelOptionApplicationVersion : version,
- @"Copyright" : copyright,
- };
- }
- [NSApp orderFrontStandardAboutPanelWithOptions:options];
- [pool release];
+ [about_window makeKeyAndOrderFront: nil];
+}
+
+/* Create and display the about dialog */
+- (void)make_about_window
+{
+ /* Make the window */
+ int x = 0, y = 0, about_width = 400, about_height = 200;
+ NSRect window_rect = NSMakeRect(x, y, about_width, about_height);
+ about_window = [[NSWindow alloc] initWithContentRect:window_rect
+ styleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable |
+ NSWindowStyleMaskMiniaturizable
+ backing:NSBackingStoreBuffered
+ defer:NO];
+ [about_window setTitle: @"About"];
+ [about_window setReleasedWhenClosed: NO];
+ [about_window center];
+ NSView *superView = [about_window contentView];
+
+ /* Create the dimensions of the picture */
+ int picture_width = 80, picture_height = 80;
+ x = (about_width - picture_width)/2;
+ y = about_height - picture_height - 10;
+ NSRect picture_rect = NSMakeRect(x, y, picture_width, picture_height);
+
+ /* Make the picture of QEMU */
+ NSImageView *picture_view = [[NSImageView alloc] initWithFrame:
+ picture_rect];
+ char *qemu_image_path_c = get_relocated_path(CONFIG_QEMU_ICONDIR "/hicolor/512x512/apps/qemu.png");
+ NSString *qemu_image_path = [NSString stringWithUTF8String:qemu_image_path_c];
+ g_free(qemu_image_path_c);
+ NSImage *qemu_image = [[NSImage alloc] initWithContentsOfFile:qemu_image_path];
+ [picture_view setImage: qemu_image];
+ [picture_view setImageScaling: NSImageScaleProportionallyUpOrDown];
+ [superView addSubview: picture_view];
+
+ /* Make the name label */
+ NSBundle *bundle = [NSBundle mainBundle];
+ if (bundle) {
+ x = 0;
+ y = y - 25;
+ int name_width = about_width, name_height = 20;
+ NSRect name_rect = NSMakeRect(x, y, name_width, name_height);
+ NSTextField *name_label = [[NSTextField alloc] initWithFrame: name_rect];
+ [name_label setEditable: NO];
+ [name_label setBezeled: NO];
+ [name_label setDrawsBackground: NO];
+ [name_label setAlignment: NSTextAlignmentCenter];
+ NSString *qemu_name = [[bundle executablePath] lastPathComponent];
+ [name_label setStringValue: qemu_name];
+ [superView addSubview: name_label];
+ }
+
+ /* Set the version label's attributes */
+ x = 0;
+ y = 50;
+ int version_width = about_width, version_height = 20;
+ NSRect version_rect = NSMakeRect(x, y, version_width, version_height);
+ NSTextField *version_label = [[NSTextField alloc] initWithFrame:
+ version_rect];
+ [version_label setEditable: NO];
+ [version_label setBezeled: NO];
+ [version_label setAlignment: NSTextAlignmentCenter];
+ [version_label setDrawsBackground: NO];
+
+ /* Create the version string*/
+ NSString *version_string;
+ version_string = [[NSString alloc] initWithFormat:
+ @"QEMU emulator version %s", QEMU_FULL_VERSION];
+ [version_label setStringValue: version_string];
+ [superView addSubview: version_label];
+
+ /* Make copyright label */
+ x = 0;
+ y = 35;
+ int copyright_width = about_width, copyright_height = 20;
+ NSRect copyright_rect = NSMakeRect(x, y, copyright_width, copyright_height);
+ NSTextField *copyright_label = [[NSTextField alloc] initWithFrame:
+ copyright_rect];
+ [copyright_label setEditable: NO];
+ [copyright_label setBezeled: NO];
+ [copyright_label setDrawsBackground: NO];
+ [copyright_label setAlignment: NSTextAlignmentCenter];
+ [copyright_label setStringValue: [NSString stringWithFormat: @"%s",
+ QEMU_COPYRIGHT]];
+ [superView addSubview: copyright_label];
}
/* Used by the Speed menu items */

2
pkgs/build-support/deterministic-uname/default.nix
View File

@ -30,6 +30,8 @@ substituteAll {
then "GNU/Linux"
else if stdenv.buildPlatform.isDarwin
then "Darwin" # darwin isn't in host-os.m4 so where does this come from?
else if stdenv.buildPlatform.isFreeBSD
then "FreeBSD"
else "unknown";
# in os-specific/linux module packages

2
pkgs/build-support/deterministic-uname/deterministic-uname.sh
View File

@ -131,6 +131,8 @@ fi
# Darwin *nodename* 22.1.0 Darwin Kernel Version 22.1.0: Sun Oct 9 20:14:30 PDT 2022; root:xnu-8792.41.9~2/RELEASE_ARM64_T8103 arm64 arm Darwin
# NixOS:
# Linux *nodename* 6.0.13 #1-NixOS SMP PREEMPT_DYNAMIC Wed Dec 14 10:41:06 UTC 2022 x86_64 GNU/Linux
# FreeBSD:
# FreeBSD *nodename* 14.0-RELEASE FreeBSD 14.0-RELEASE #0 releng/14.0-n265380-f9716eee8ab4: Fri Nov 10 05:57:23 UTC 2023 root@releng1.nyi.freebsd.org:/usr/obj/usr/src/amd64.amd64/sys/GENERIC amd64 amd64 AMD Ryzen 9 5950X 16-Core Processor FreeBSD
output=()
if [[ "$all" = "1" ]]; then
output+=("$KERNEL_NAME_VAL" "$NODENAME_VAL" "$KERNEL_RELEASE_VAL" "$KERNEL_VERSION_VAL" "$MACHINE_VAL")

2
pkgs/build-support/rust/hooks/cargo-build-hook.sh
View File

@ -39,7 +39,7 @@ cargoBuildHook() {
set -x
@setEnv@ cargo build -j $NIX_BUILD_CORES \
--target @rustHostPlatformSpec@ \
--frozen \
--offline \
${cargoBuildProfileFlag} \
${cargoBuildNoDefaultFeaturesFlag} \
${cargoBuildFeaturesFlag} \

2
pkgs/build-support/rust/hooks/cargo-check-hook.sh
View File

@ -29,7 +29,7 @@ cargoCheckHook() {
fi
argstr="${cargoCheckProfileFlag} ${cargoCheckNoDefaultFeaturesFlag} ${cargoCheckFeaturesFlag}
--target @rustHostPlatformSpec@ --frozen ${cargoTestFlags}"
--target @rustHostPlatformSpec@ --offline ${cargoTestFlags}"
(
set -x

2
pkgs/build-support/rust/hooks/cargo-nextest-hook.sh
View File

@ -29,7 +29,7 @@ cargoNextestHook() {
fi
argstr="${cargoCheckProfileFlag} ${cargoCheckNoDefaultFeaturesFlag} ${cargoCheckFeaturesFlag}
--target @rustHostPlatformSpec@ --frozen ${cargoTestFlags}"
--target @rustHostPlatformSpec@ --offline ${cargoTestFlags}"
(
set -x

2
pkgs/build-support/rust/hooks/maturin-build-hook.sh
View File

@ -11,7 +11,7 @@ maturinBuildHook() {
set -x
@setEnv@ maturin build \
--jobs=$NIX_BUILD_CORES \
--frozen \
--offline \
--target @rustTargetPlatformSpec@ \
--manylinux off \
--strip \

14
pkgs/build-support/setup-hooks/strip.sh
View File

@ -74,13 +74,17 @@ stripDirs() {
echo "stripping (with command $cmd and flags $stripFlags) in $paths"
local striperr
striperr="$(mktemp --tmpdir="$TMPDIR" 'striperr.XXXXXX')"
# Do not strip lib/debug. This is a directory used by setup-hooks/separate-debug-info.sh.
find $paths -type f "${excludeFlags[@]}" -a '!' -path "$prefix/lib/debug/*" -print0 |
# Make sure we process files under symlinks only once. Otherwise
# 'strip` can corrupt files when writes to them in parallel:
# Make sure we process files only once. `strip`ping the same file through different
# links in parallel can corrupt it:
# https://github.com/NixOS/nixpkgs/issues/246147#issuecomment-1657072039
xargs -r -0 -n1 -- realpath -z | sort -u -z |
# Do not strip lib/debug. This is a directory used by setup-hooks/separate-debug-info.sh.
# Print out each file's device and inode (which will be the same if two files are hardlinked
# or are the same file found through different symlinks), followed by its path...
find $paths -type f "${excludeFlags[@]}" -a '!' -path "$prefix/lib/debug/*" -printf '%D-%i,%p\0' |
# ... sort/uniq by device/inode, then cut them out and keep the path, ...
sort -t, -k1,1 -u -z | cut -d, -f2- -z |
# and finally strip each unique path in parallel.
xargs -r -0 -n1 -P "$NIX_BUILD_CORES" -- $cmd $stripFlags 2>"$striperr" || exit_code=$?
# xargs exits with status code 123 if some but not all of the
# processes fail. We don't care if some of the files couldn't

2
pkgs/build-support/src-only/default.nix
View File

@ -13,7 +13,7 @@ let
in
stdenv.mkDerivation (args // {
name = "${name}-source";
installPhase = "cp -r . $out";
installPhase = "cp -pr --reflink=auto -- . $out";
outputs = [ "out" ];
separateDebugInfo = false;
dontUnpack = false;

5
pkgs/by-name/bo/boehmgc/package.nix
View File

@ -50,8 +50,9 @@ stdenv.mkDerivation (finalAttrs: {
"CFLAGS_EXTRA=-DNO_SOFT_VDB"
];
# `gctest` fails under emulation on aarch64-darwin
doCheck = !(stdenv.isDarwin && stdenv.isx86_64);
# `gctest` fails under x86_64 emulation on aarch64-darwin
# and also on aarch64-linux (qemu-user)
doCheck = !((stdenv.isDarwin && stdenv.isx86_64) || (stdenv.isLinux && stdenv.isAarch64));
enableParallelBuilding = true;

5
pkgs/by-name/bu/bunbun/package.nix
View File

@ -24,11 +24,6 @@ rustPlatform.buildRustPackage rec {
darwin.apple_sdk.frameworks.SystemConfiguration
];
# Cargo.lock is outdated
preConfigure = ''
cargo update --offline
'';
meta = with lib; {
description = "A simple and adorable sysinfo utility written in Rust";
homepage = "https://github.com/devraza/bunbun";

41
pkgs/by-name/cm/cmake/007-darwin-bsd-ps-abspath.diff Normal file
View File

@ -0,0 +1,41 @@
diff -ur a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c
--- a/Source/kwsys/ProcessUNIX.c 2024-04-11 07:12:19.000000000 -0700
+++ b/Source/kwsys/ProcessUNIX.c 2024-05-15 10:41:00.286160616 -0700
@@ -2501,20 +2501,20 @@
have two integers to store: the pid and then the ppid. */
#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \
defined(__OpenBSD__) || defined(__GLIBC__) || defined(__GNU__)
-# define KWSYSPE_PS_COMMAND "ps axo pid,ppid"
+# define KWSYSPE_PS_COMMAND "@ps@ axo pid,ppid"
# define KWSYSPE_PS_FORMAT "%d %d\n"
#elif defined(__sun) && (defined(__SVR4) || defined(__svr4__)) /* Solaris */
-# define KWSYSPE_PS_COMMAND "ps -e -o pid,ppid"
+# define KWSYSPE_PS_COMMAND "@ps@ -e -o pid,ppid"
# define KWSYSPE_PS_FORMAT "%d %d\n"
#elif defined(__hpux) || defined(__sun__) || defined(__sgi) || \
defined(_AIX) || defined(__sparc)
-# define KWSYSPE_PS_COMMAND "ps -ef"
+# define KWSYSPE_PS_COMMAND "@ps@ -ef"
# define KWSYSPE_PS_FORMAT "%*s %d %d %*[^\n]\n"
#elif defined(__QNX__)
-# define KWSYSPE_PS_COMMAND "ps -Af"
+# define KWSYSPE_PS_COMMAND "@ps@ -Af"
# define KWSYSPE_PS_FORMAT "%*d %d %d %*[^\n]\n"
#elif defined(__CYGWIN__)
-# define KWSYSPE_PS_COMMAND "ps aux"
+# define KWSYSPE_PS_COMMAND "@ps@ aux"
# define KWSYSPE_PS_FORMAT "%d %d %*[^\n]\n"
#endif
diff -ur a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
--- a/Source/kwsys/SystemInformation.cxx 2024-04-11 07:12:19.000000000 -0700
+++ b/Source/kwsys/SystemInformation.cxx 2024-05-15 10:40:00.901059278 -0700
@@ -3884,7 +3884,7 @@
long long memUsed = 0;
pid_t pid = getpid();
std::ostringstream oss;
- oss << "ps -o rss= -p " << pid;
+ oss << "@ps@ -o rss= -p " << pid;
FILE* file = popen(oss.str().c_str(), "r");
if (file == nullptr) {
return -1;

15
pkgs/by-name/cm/cmake/package.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, substituteAll
, buildPackages
, bzip2
, curlMinimal
@ -47,11 +48,11 @@ stdenv.mkDerivation (finalAttrs: {
+ lib.optionalString isMinimalBuild "-minimal"
+ lib.optionalString cursesUI "-cursesUI"
+ lib.optionalString qt5UI "-qt5UI";
version = "3.29.2";
version = "3.29.3";
src = fetchurl {
url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz";
hash = "sha256-NttLaSaqt0G6bksuotmckZMiITIwi03IJNQSPLcwNS4=";
hash = "sha256-JSruFEjUnKoElU/V4n0YndUVcFVzE+eygWNnFqI4vMs=";
};
patches = [
@ -66,7 +67,13 @@ stdenv.mkDerivation (finalAttrs: {
# Derived from https://github.com/curl/curl/commit/31f631a142d855f069242f3e0c643beec25d1b51
++ lib.optional (stdenv.isDarwin && isMinimalBuild) ./005-remove-systemconfiguration-dep.diff
# On Darwin, always set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG.
++ lib.optional stdenv.isDarwin ./006-darwin-always-set-runtime-c-flag.diff;
++ lib.optional stdenv.isDarwin ./006-darwin-always-set-runtime-c-flag.diff
# On platforms where ps is not part of stdenv, patch the invocation of ps to use an absolute path.
++ lib.optional (stdenv.isDarwin || stdenv.isFreeBSD) (
substituteAll {
src = ./007-darwin-bsd-ps-abspath.diff;
ps = lib.getExe ps;
});
outputs = [ "out" ] ++ lib.optionals buildDocs [ "man" "info" ];
separateDebugInfo = true;
@ -101,8 +108,6 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optional stdenv.isDarwin CoreServices
++ lib.optional (stdenv.isDarwin && !isMinimalBuild) SystemConfiguration;
propagatedBuildInputs = lib.optional stdenv.isDarwin ps;
preConfigure = ''
fixCmakeFiles .
substituteInPlace Modules/Platform/UnixPaths.cmake \

5
pkgs/by-name/es/esbuild-config/package.nix
View File

@ -16,11 +16,6 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-Z7uYOjMNxsEmsEXDOIr1zIq4nCgHvHIqpRnRH037b8g=";
# Cargo.lock is outdated
postConfigure = ''
cargo metadata --offline
'';
meta = with lib; {
description = "Config files for esbuild";
homepage = "https://github.com/bpierre/esbuild-config";

4
pkgs/by-name/ja/jasper/package.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "jasper";
version = "4.2.3";
version = "4.2.4";
src = fetchFromGitHub {
owner = "jasper-software";
repo = "jasper";
rev = "version-${finalAttrs.version}";
hash = "sha256-Hmmoe1lzUR1DBwgg30KGfsIDzSNe5shghaieEXX/am4=";
hash = "sha256-YliWVuNEtq/Rgra+WnorSOFoAYwYmPmPRv0r734FJ1c=";
};
outputs = [ "out" "dev" "doc" "lib" "man" ];

12
pkgs/by-name/li/libcamera/package.nix
View File

@ -9,7 +9,6 @@
, libdrm
, libevent
, libyaml
, lttng-ust
, gst_all_1
, gtest
, graphviz
@ -17,6 +16,8 @@
, python3
, python3Packages
, systemd # for libudev
, withTracing ? lib.meta.availableOn stdenv.hostPlatform lttng-ust
, lttng-ust # withTracing
, withQcam ? false
, qt5 # withQcam
, libtiff # withQcam
@ -67,14 +68,12 @@ stdenv.mkDerivation rec {
# hotplugging
systemd
# lttng tracing
lttng-ust
# yamlparser
libyaml
gtest
] ++ lib.optionals withQcam [ libtiff qt5.qtbase qt5.qttools ];
] ++ lib.optionals withTracing [ lttng-ust ]
++ lib.optionals withQcam [ libtiff qt5.qtbase qt5.qttools ];
nativeBuildInputs = [
meson
@ -92,7 +91,8 @@ stdenv.mkDerivation rec {
mesonFlags = [
"-Dv4l2=true"
"-Dqcam=${if withQcam then "enabled" else "disabled"}"
(lib.mesonEnable "tracing" withTracing)
(lib.mesonEnable "qcam" withQcam)
"-Dlc-compliance=disabled" # tries unconditionally to download gtest when enabled
# Avoid blanket -Werror to evade build failures on less
# tested compilers.

72
pkgs/by-name/li/libiconv-darwin/0001-Support-static-module-loading.patch Normal file
View File

@ -0,0 +1,72 @@
From a3e945c630180e9aa182603207238302e58fe8fe Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sat, 25 May 2024 19:03:58 -0400
Subject: [PATCH 1/2] Support static module loading
---
citrus/citrus_module.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/citrus/citrus_module.c b/citrus/citrus_module.c
index 5103d30..c22c9da 100644
--- a/citrus/citrus_module.c
+++ b/citrus/citrus_module.c
@@ -324,22 +324,36 @@ out:
return (path[0] ? path : NULL);
}
+#if defined(ENABLE_STATIC)
+#include "static-modules.h"
+#endif
+
void *
_citrus_find_getops(_citrus_module_t handle, const char *modname,
const char *ifname)
{
char name[PATH_MAX];
void *p;
-
+#if defined(ENABLE_STATIC)
+ const struct getops_pair* res = lookup_getops(modname, strlen(modname));
+ p = res ? res->opsfn : NULL;
+#else
snprintf(name, sizeof(name), "_citrus_%s_%s_getops",
modname, ifname);
p = dlsym((void *)handle, name);
+#endif
return (p);
}
int
_citrus_load_module(_citrus_module_t *rhandle, const char *encname)
{
+#if defined(ENABLE_STATIC)
+ if (is_known_encoding(encname, strnlen(encname, MAX_WORD_LENGTH)) > MAX_HASH_VALUE) {
+ return (EINVAL);
+ }
+ *rhandle = (_citrus_module_t)encodings;
+#else
const char *p;
char path[PATH_MAX];
void *handle;
@@ -368,14 +382,15 @@ _citrus_load_module(_citrus_module_t *rhandle, const char *encname)
}
*rhandle = (_citrus_module_t)handle;
-
+#endif
return (0);
}
void
_citrus_unload_module(_citrus_module_t handle)
{
-
+#if !defined(ENABLE_STATIC)
if (handle)
dlclose((void *)handle);
+#endif
}
--
2.44.1

43
pkgs/by-name/li/libiconv-darwin/0002-Fix-ISO-2022-out-of-bounds-write-with-encoded-charac.patch Normal file
View File

@ -0,0 +1,43 @@
From 6a2c81d23558d19a68d5494f8f8618bd55c89405 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Mon, 27 May 2024 13:43:43 -0400
Subject: [PATCH 2/2] Fix ISO-2022 out-of-bounds write with encoded characters
---
libiconv_modules/ISO2022/citrus_iso2022.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libiconv_modules/ISO2022/citrus_iso2022.c b/libiconv_modules/ISO2022/citrus_iso2022.c
index 46da1d6..c2eeaa8 100644
--- a/libiconv_modules/ISO2022/citrus_iso2022.c
+++ b/libiconv_modules/ISO2022/citrus_iso2022.c
@@ -1031,7 +1031,7 @@ _ISO2022_sputwchar(_ISO2022EncodingInfo * __restrict ei, wchar_t wc,
{
_ISO2022Charset cs;
char *p;
- char tmp[MB_LEN_MAX];
+ char tmp[MB_LEN_MAX + 4];
size_t len;
int bit8, i = 0, target;
unsigned char mask;
@@ -1196,7 +1196,7 @@ _citrus_ISO2022_put_state_reset(_ISO2022EncodingInfo * __restrict ei,
size_t * __restrict nresult)
{
char *result;
- char buf[MB_LEN_MAX];
+ char buf[MB_LEN_MAX + 4];
size_t len;
int ret;
@@ -1225,7 +1225,7 @@ _citrus_ISO2022_wcrtomb_priv(_ISO2022EncodingInfo * __restrict ei,
_ISO2022State * __restrict psenc, size_t * __restrict nresult)
{
char *result;
- char buf[MB_LEN_MAX];
+ char buf[MB_LEN_MAX + 4];
size_t len;
int ret;
--
2.44.1

82
pkgs/by-name/li/libiconv-darwin/meson.build
View File

@ -19,6 +19,19 @@ i18nmoduledir = prefix_libdir / 'i18n'
esdbdir = prefix_datadir / 'i18n/esdb'
csmapperdir = prefix_datadir / 'i18n/csmapper'
is_static = get_option('default_library') == 'static'
static_suffix = is_static ? '_static' : ''
# Generators
if is_static
gperf_bin = find_program('gperf', required : true)
gperf = generator(
gperf_bin,
arguments : ['@INPUT@', '--output-file=@OUTPUT@'],
output : '@BASENAME@.h'
)
endif
# Libraries
libcharset = library(
@ -37,15 +50,16 @@ install_headers(
)
libiconv = library(
'iconv',
'iconv' + static_suffix,
build_rpath : fs.parent(libcharset.full_path()),
c_args : [
f'-D_PATH_I18NMODULE="@i18nmoduledir@"',
f'-D_PATH_ESDB="@esdbdir@"',
f'-D_PATH_CSMAPPER="@csmapperdir@"'
f'-D_PATH_CSMAPPER="@csmapperdir@"',
is_static ? '-DENABLE_STATIC=1' : [ ]
],
darwin_versions : '7',
install : true,
install : not is_static,
include_directories : ['citrus', 'libcharset'],
link_args : ['-Wl,-reexport_library', fs.name(libcharset.full_path())],
link_depends : [libcharset],
@ -84,6 +98,7 @@ libiconv = library(
'citrus/iconvctl.c',
'citrus/iconvlist.c',
'citrus/iconv.c',
is_static ? gperf.process('static-modules.gperf') : [ ]
],
soversion : '2'
)
@ -99,19 +114,6 @@ install_man(
)
# Binaries
executable(
'iconv',
install : true,
include_directories : ['citrus', 'libcharset'],
link_with : [libiconv],
sources : [
'iconv/iconv.c'
]
)
install_man('iconv/iconv.1')
# Data
## csmapper
csmapper_modules = [
@ -216,6 +218,7 @@ libiconv_modules = [
'mapper_zone'
]
modules = [ ]
foreach module : libiconv_modules
module_source = module.to_lower()
module_path = 'libiconv_modules' / module
@ -230,14 +233,19 @@ foreach module : libiconv_modules
# See: https://github.com/apple-oss-distributions/libiconv/blob/81be60a93521c931a01aab9c747dd2b078bc0679/libiconv.xcodeproj/project.pbxproj#L2549-L2556
# See also: https://cgit.freebsd.org/src/tree/lib/libiconv_modules/mapper_parallel/Makefile?id=9241ebc796c11cf133c550f188f324bd2c12d89a
if module == 'mapper_parallel'
# Skip including mapper_parallel since it’s the same as mapper_serial, which would result in duplicate symbols.
if is_static
continue
endif
module_source = 'mapper_serial'
module_path = 'libiconv_modules/mapper_serial'
endif
library(
modules += library(
module,
darwin_versions : '1',
install : true,
install : not is_static,
install_dir : i18nmoduledir,
include_directories : [module_path, 'citrus', 'libcharset'] + extra_headers,
link_with : [libiconv],
@ -249,6 +257,38 @@ foreach module : libiconv_modules
endforeach
# Bundle the modules into libiconv.a
if is_static
objects = [libiconv.extract_all_objects(recursive : true)]
foreach module : modules
objects += module.extract_all_objects(recursive : true)
endforeach
libiconv = static_library(
'iconv',
install : true,
objects : objects
)
endif
# Binaries
executable(
'iconv',
install : true,
include_directories : ['citrus', 'libcharset'],
link_with : [
libiconv,
# Darwin’s system `iconv` relies on the reexported symbols from libiconv
is_static ? libcharset : [ ]
],
sources : [
'iconv/iconv.c'
]
)
install_man('iconv/iconv.1')
# Tests
if get_option('tests') == true
## Only required for running the tests
@ -259,7 +299,11 @@ if get_option('tests') == true
suite,
dependencies : [atf],
include_directories : ['citrus', 'libcharset'],
link_with : [libiconv],
link_with : [
libiconv,
# Make sure the libcharset reexport is working by relying on libiconv to provide its symbols.
is_static ? libcharset : [ ]
],
sources : [test_src]
)

34
pkgs/by-name/li/libiconv-darwin/nixpkgs_test.c
View File

@ -73,10 +73,44 @@ ATF_TC_BODY(test_cp932_cp932, tc)
ATF_CHECK_STREQ(expected, output);
}
ATF_TC(test_iso2022_crash);
ATF_TC_HEAD(test_iso2022_crash, tc)
{
atf_tc_set_md_var(tc, "descr", "regression test for converting to ISO-2022 with escape sequences");
}
ATF_TC_BODY(test_iso2022_crash, tc)
{
char expected[] = "";
size_t expected_length = sizeof(expected) - 1;
char input[] = "\x41\x41\x41\x41\x41\xe5\x8a\x84";
size_t input_length = sizeof(input) - 1;
size_t output_available = sizeof(expected) - 1 ;
char output[sizeof(expected)] = { 0 };
iconv_t cd = iconv_open("ISO-2022-CN-EXT", "UTF-8");
ATF_REQUIRE((size_t)cd != -1);
char* input_buf = input;
char* output_buf = output;
size_t res = iconv(cd, &input_buf, &input_length, &output_buf, &output_available);
iconv_close(cd);
ATF_CHECK(res == -1);
size_t output_length = sizeof(output) - output_available - 1;
ATF_CHECK_INTEQ(expected_length, output_length);
ATF_CHECK_STREQ(expected, output);
}
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, test_cp932_eucjp);
ATF_TP_ADD_TC(tp, test_cp932_cp932);
ATF_TP_ADD_TC(tp, test_iso2022_crash);
return atf_no_error();
}

35
pkgs/by-name/li/libiconv-darwin/package.nix
View File

@ -3,6 +3,7 @@
stdenv,
fetchFromGitHub,
atf,
gperf,
libiconvReal,
meson,
ninja,
@ -10,6 +11,9 @@
gitUpdater,
}:
let
inherit (stdenv) hostPlatform;
in
stdenv.mkDerivation (finalAttrs: {
pname = "libiconv";
version = "99";
@ -19,6 +23,9 @@ stdenv.mkDerivation (finalAttrs: {
"dev"
];
# Propagate `out` only when there are dylibs to link (i.e., don’t propagate when doing a static build).
propagatedBuildOutputs = lib.optionalString (!hostPlatform.isStatic) "out";
src = fetchFromGitHub {
owner = "apple-oss-distributions";
repo = "libiconv";
@ -26,7 +33,13 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-TGt6rsU52ztfW2rCqwnhMAExLbexI/59IoDOGY+XGu0=";
};
inherit (libiconvReal) setupHooks;
setupHooks =
libiconvReal.setupHooks
++ lib.optionals hostPlatform.isStatic [ ./static-setup-hook.sh ];
patches = lib.optionals hostPlatform.isStatic [ ./0001-Support-static-module-loading.patch ] ++ [
./0002-Fix-ISO-2022-out-of-bounds-write-with-encoded-charac.patch
];
postPatch =
''
@ -41,22 +54,34 @@ stdenv.mkDerivation (finalAttrs: {
header
cp ${./nixpkgs_test.c} tests/libiconv/nixpkgs_test.c
''
+ lib.optionalString hostPlatform.isStatic ''
cp ${./static-modules.gperf} static-modules.gperf
'';
strictDeps = true;
nativeBuildInputs = [
nativeBuildInputs =
[
meson
ninja
];
]
# Dynamic builds use `dlopen` to load modules, but static builds have to link them all.
# `gperf` is used to generate a lookup table from module to ops functions.
++ lib.optionals hostPlatform.isStatic [ gperf ];
mesonBuildType = "release";
mesonFlags = [ (lib.mesonBool "tests" finalAttrs.doInstallCheck) ];
postInstall = lib.optionalString stdenv.isDarwin ''
postInstall =
lib.optionalString (stdenv.isDarwin && !hostPlatform.isStatic) ''
${stdenv.cc.targetPrefix}install_name_tool "$out/lib/libiconv.2.dylib" \
-change '@rpath/libcharset.1.dylib' "$out/lib/libcharset.1.dylib"
''
# Move the static library to the `dev` output
+ lib.optionalString hostPlatform.isStatic ''
moveToOutput lib "$dev"
'';
# Tests have to be run in `installCheckPhase` because libiconv expects to `dlopen`
@ -64,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeInstallCheckInputs = [ pkg-config ];
installCheckInputs = [ atf ];
doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
doInstallCheck = stdenv.buildPlatform.canExecute hostPlatform;
# Can’t use `mesonCheckPhase` because it runs the wrong hooks for `installCheckPhase`.
installCheckPhase = ''

73
pkgs/by-name/li/libiconv-darwin/static-modules.gperf Normal file
View File

@ -0,0 +1,73 @@
%language=ANSI-C
%compare-strncmp
%pic
%readonly-tables
%{
#include "citrus_namespace.h"
#include "citrus_types.h"
#include "citrus_module.h"
#include "citrus_hash.h"
#include "citrus_iconv.h"
#include "citrus_mapper.h"
#include "citrus_stdenc.h"
extern _CITRUS_STDENC_GETOPS_FUNC(BIG5);
extern _CITRUS_STDENC_GETOPS_FUNC(DECHanyu);
extern _CITRUS_STDENC_GETOPS_FUNC(DECKanji);
extern _CITRUS_STDENC_GETOPS_FUNC(EUC);
extern _CITRUS_STDENC_GETOPS_FUNC(EUCTW);
extern _CITRUS_STDENC_GETOPS_FUNC(GBK2K);
extern _CITRUS_STDENC_GETOPS_FUNC(HZ);
extern _CITRUS_STDENC_GETOPS_FUNC(ISO2022);
extern _CITRUS_STDENC_GETOPS_FUNC(JOHAB);
extern _CITRUS_STDENC_GETOPS_FUNC(MSKanji);
extern _CITRUS_STDENC_GETOPS_FUNC(UES);
extern _CITRUS_STDENC_GETOPS_FUNC(UTF1632);
extern _CITRUS_STDENC_GETOPS_FUNC(UTF7);
extern _CITRUS_STDENC_GETOPS_FUNC(UTF8);
extern _CITRUS_STDENC_GETOPS_FUNC(UTF8MAC);
extern _CITRUS_STDENC_GETOPS_FUNC(VIQR);
extern _CITRUS_STDENC_GETOPS_FUNC(ZW);
extern _CITRUS_ICONV_GETOPS_FUNC(iconv_none);
extern _CITRUS_ICONV_GETOPS_FUNC(iconv_std);
extern _CITRUS_MAPPER_GETOPS_FUNC(mapper_646);
extern _CITRUS_MAPPER_GETOPS_FUNC(mapper_none);
extern _CITRUS_MAPPER_GETOPS_FUNC(mapper_parallel);
extern _CITRUS_MAPPER_GETOPS_FUNC(mapper_serial);
extern _CITRUS_MAPPER_GETOPS_FUNC(mapper_std);
extern _CITRUS_MAPPER_GETOPS_FUNC(mapper_zone);
%}
%define lookup-function-name lookup_getops
%define hash-function-name is_known_encoding
%define string-pool-name encodings
%struct-type
struct getops_pair { int name; void* opsfn; };
%%
BIG5, _citrus_BIG5_stdenc_getops
DECHanyu, _citrus_DECHanyu_stdenc_getops
DECKanji, _citrus_DECKanji_stdenc_getops
EUC, _citrus_EUC_stdenc_getops
EUCTW, _citrus_EUCTW_stdenc_getops
GBK2K, _citrus_GBK2K_stdenc_getops
HZ, _citrus_HZ_stdenc_getops
ISO2022, _citrus_ISO2022_stdenc_getops
JOHAB, _citrus_JOHAB_stdenc_getops
MSKanji, _citrus_MSKanji_stdenc_getops
UES, _citrus_UES_stdenc_getops
UTF1632, _citrus_UTF1632_stdenc_getops
UTF7, _citrus_UTF7_stdenc_getops
UTF8, _citrus_UTF8_stdenc_getops
UTF8MAC, _citrus_UTF8MAC_stdenc_getops
VIQR, _citrus_VIQR_stdenc_getops
ZW, _citrus_ZW_stdenc_getops
iconv_none, _citrus_iconv_none_iconv_getops
iconv_std, _citrus_iconv_std_iconv_getops
mapper_646, _citrus_mapper_646_mapper_getops
mapper_none, _citrus_mapper_none_mapper_getops
mapper_serial, _citrus_mapper_serial_mapper_getops
mapper_parallel, _citrus_mapper_parallel_mapper_getops
mapper_std, _citrus_mapper_std_mapper_getops
mapper_zone, _citrus_mapper_zone_mapper_getops

5
pkgs/by-name/li/libiconv-darwin/static-setup-hook.sh Normal file
View File

@ -0,0 +1,5 @@
# Darwin’s dynamic libiconv reexports libcharset, so reproduce that in static builds.
if [ -z "${dontAddExtraLibs-}" ]; then
getHostRole
export NIX_LDFLAGS${role_post}+=" -lcharset"
fi

190
pkgs/by-name/me/meson/007-Allow-building-via-ninja-12.patch Normal file
View File

@ -0,0 +1,190 @@
From 8e46d3e37f81bf13f3f62a14fb603feb2e37229d Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Fri, 10 May 2024 23:25:58 +0530
Subject: [PATCH] Fix builds with Ninja 12 and remove a 5 year old workaround.
Co-authored-by: Jussi Pakkanen <jpakkane@gmail.com>
Co-authored-by: Masum Reza <masumrezarock100@gmail.com>
---
run_project_tests.py | 3 +--
run_tests.py | 35 ++++++++++------------------------
unittests/baseplatformtests.py | 34 +++++++++++++++++++++++++++------
3 files changed, 39 insertions(+), 33 deletions(-)
diff --git a/run_project_tests.py b/run_project_tests.py
index a14741364..222e12f74 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -45,7 +45,7 @@ from mesonbuild.coredata import backendlist, version as meson_version
from mesonbuild.modules.python import PythonExternalProgram
from run_tests import (
get_fake_options, run_configure, get_meson_script, get_backend_commands,
- get_backend_args_for_dir, Backend, ensure_backend_detects_changes,
+ get_backend_args_for_dir, Backend,
guess_backend, handle_meson_skip_test,
)
@@ -720,7 +720,6 @@ def _run_test(test: TestDef,
# Touch the meson.build file to force a regenerate
def force_regenerate() -> None:
- ensure_backend_detects_changes(backend)
os.utime(str(test.path / 'meson.build'))
# just test building
diff --git a/run_tests.py b/run_tests.py
index 207653219..0c51f3d69 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -39,29 +39,27 @@ from mesonbuild.mesonlib import OptionKey, setup_vsenv
if T.TYPE_CHECKING:
from mesonbuild.coredata import SharedCMDOptions
-NINJA_1_9_OR_NEWER = False
+NINJA_1_12_OR_NEWER = False
NINJA_CMD = None
# If we're on CI, detecting ninja for every subprocess unit test that we run is slow
# Optimize this by respecting $NINJA and skipping detection, then exporting it on
# first run.
try:
- NINJA_1_9_OR_NEWER = bool(int(os.environ['NINJA_1_9_OR_NEWER']))
+ NINJA_1_12_OR_NEWER = bool(int(os.environ['NINJA_1_12_OR_NEWER']))
NINJA_CMD = [os.environ['NINJA']]
except (KeyError, ValueError):
- # Look for 1.9 to see if https://github.com/ninja-build/ninja/issues/1219
- # is fixed
- NINJA_CMD = detect_ninja('1.9')
+ # Look for 1.12, which removes -w dupbuild=err
+ NINJA_CMD = detect_ninja('1.12')
if NINJA_CMD is not None:
- NINJA_1_9_OR_NEWER = True
+ NINJA_1_12_OR_NEWER = True
else:
- mlog.warning('Found ninja <1.9, tests will run slower', once=True)
NINJA_CMD = detect_ninja()
if NINJA_CMD is not None:
- os.environ['NINJA_1_9_OR_NEWER'] = str(int(NINJA_1_9_OR_NEWER))
+ os.environ['NINJA_1_12_OR_NEWER'] = str(int(NINJA_1_12_OR_NEWER))
os.environ['NINJA'] = NINJA_CMD[0]
else:
- raise RuntimeError('Could not find Ninja v1.7 or newer')
+ raise RuntimeError('Could not find Ninja.')
# Emulate running meson with -X utf8 by making sure all open() calls have a
# sane encoding. This should be a python default, but PEP 540 considered it not
@@ -271,7 +269,9 @@ def get_backend_commands(backend: Backend, debug: bool = False) -> \
test_cmd = cmd + ['-target', 'RUN_TESTS']
elif backend is Backend.ninja:
global NINJA_CMD
- cmd = NINJA_CMD + ['-w', 'dupbuild=err', '-d', 'explain']
+ cmd = NINJA_CMD + ['-d', 'explain']
+ if not NINJA_1_12_OR_NEWER:
+ cmd += ['-w', 'dupbuild=err']
if debug:
cmd += ['-v']
clean_cmd = cmd + ['clean']
@@ -282,21 +282,6 @@ def get_backend_commands(backend: Backend, debug: bool = False) -> \
raise AssertionError(f'Unknown backend: {backend!r}')
return cmd, clean_cmd, test_cmd, install_cmd, uninstall_cmd
-def ensure_backend_detects_changes(backend: Backend) -> None:
- global NINJA_1_9_OR_NEWER
- if backend is not Backend.ninja:
- return
- need_workaround = False
- # We're using ninja >= 1.9 which has QuLogic's patch for sub-1s resolution
- # timestamps
- if not NINJA_1_9_OR_NEWER:
- mlog.warning('Don\'t have ninja >= 1.9, enabling timestamp resolution workaround', once=True)
- need_workaround = True
- # Increase the difference between build.ninja's timestamp and the timestamp
- # of whatever you changed: https://github.com/ninja-build/ninja/issues/371
- if need_workaround:
- time.sleep(1)
-
def run_mtest_inprocess(commandlist: T.List[str]) -> T.Tuple[int, str, str]:
out = StringIO()
with mock.patch.object(sys, 'stdout', out), mock.patch.object(sys, 'stderr', out):
diff --git a/unittests/baseplatformtests.py b/unittests/baseplatformtests.py
index 6125ed933..226b2e11e 100644
--- a/unittests/baseplatformtests.py
+++ b/unittests/baseplatformtests.py
@@ -1,6 +1,8 @@
# SPDX-License-Identifier: Apache-2.0
# Copyright 2016-2021 The Meson development team
+# Copyright © 2024 Intel Corporation
+from __future__ import annotations
from pathlib import PurePath
from unittest import mock, TestCase, SkipTest
import json
@@ -9,6 +11,7 @@ import os
import re
import subprocess
import sys
+import shutil
import tempfile
import typing as T
@@ -28,7 +31,7 @@ import mesonbuild.modules.pkgconfig
from run_tests import (
- Backend, ensure_backend_detects_changes, get_backend_commands,
+ Backend, get_backend_commands,
get_builddir_target_args, get_meson_script, run_configure_inprocess,
run_mtest_inprocess, handle_meson_skip_test,
)
@@ -286,11 +289,11 @@ class BasePlatformTests(TestCase):
'''
return self.build(target=target, override_envvars=override_envvars)
- def setconf(self, arg, will_build=True):
- if not isinstance(arg, list):
+ def setconf(self, arg: T.Sequence[str], will_build: bool = True) -> None:
+ if isinstance(arg, str):
arg = [arg]
- if will_build:
- ensure_backend_detects_changes(self.backend)
+ else:
+ arg = list(arg)
self._run(self.mconf_command + arg + [self.builddir])
def getconf(self, optname: str):
@@ -304,7 +307,6 @@ class BasePlatformTests(TestCase):
windows_proof_rmtree(self.builddir)
def utime(self, f):
- ensure_backend_detects_changes(self.backend)
os.utime(f)
def get_compdb(self):
@@ -492,3 +494,23 @@ class BasePlatformTests(TestCase):
def assertLength(self, val, length):
assert len(val) == length, f'{val} is not length {length}'
+
+ def copy_srcdir(self, srcdir: str) -> str:
+ """Copies a source tree and returns that copy.
+
+ ensures that the copied tree is deleted after running.
+
+ :param srcdir: The locaiton of the source tree to copy
+ :return: The location of the copy
+ """
+ dest = tempfile.mkdtemp()
+ self.addCleanup(windows_proof_rmtree, dest)
+
+ # shutil.copytree expects the destinatin directory to not exist, Once
+ # python 3.8 is required the `dirs_exist_ok` parameter negates the need
+ # for this
+ dest = os.path.join(dest, 'subdir')
+
+ shutil.copytree(srcdir, dest)
+
+ return dest
\ No newline at end of file
--
2.44.0

15
pkgs/by-name/me/meson/007-freebsd-pkgconfig-path.patch Normal file
View File

@ -0,0 +1,15 @@
diff -ur a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
--- a/mesonbuild/modules/pkgconfig.py 2024-05-17 17:52:30.880877000 -0700
+++ b/mesonbuild/modules/pkgconfig.py 2024-05-17 17:53:10.901068000 -0700
@@ -693,10 +693,7 @@
pcfile = filebase + '.pc'
pkgroot = pkgroot_name = kwargs['install_dir'] or default_install_dir
if pkgroot is None:
- if mesonlib.is_freebsd():
- pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(mesonlib.OptionKey('prefix'))), 'libdata', 'pkgconfig')
- pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig')
- elif mesonlib.is_haiku():
+ if mesonlib.is_haiku():
pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(mesonlib.OptionKey('prefix'))), 'develop', 'lib', 'pkgconfig')
pkgroot_name = os.path.join('{prefix}', 'develop', 'lib', 'pkgconfig')
else:

14
pkgs/by-name/me/meson/package.nix
View File

@ -66,9 +66,16 @@ python3.pkgs.buildPythonApplication rec {
# Nixpkgs cctools does not have bitcode support.
./006-disable-bitcode.patch
# This edge case is explicitly part of meson but is wrong for nix
./007-freebsd-pkgconfig-path.patch
# Fix cross-compilation of proc-macro (and mesa)
# https://github.com/mesonbuild/meson/issues/12973
./0001-Revert-rust-recursively-pull-proc-macro-dependencies.patch
# Fix compilation of Meson using Ninja 1.12
# FIXME: remove in the next point release
./007-Allow-building-via-ninja-12.patch
];
buildInputs = lib.optionals (python3.pythonOlder "3.9") [
@ -106,7 +113,7 @@ python3.pkgs.buildPythonApplication rec {
''
]
# Remove problematic tests
++ (builtins.map (f: ''rm -vr "${f}";'') [
++ (builtins.map (f: ''rm -vr "${f}";'') ([
# requires git, creating cyclic dependency
''test cases/common/66 vcstag''
# requires glib, creating cyclic dependency
@ -116,7 +123,10 @@ python3.pkgs.buildPythonApplication rec {
''test cases/linuxlike/14 static dynamic linkage''
# Nixpkgs cctools does not have bitcode support.
''test cases/osx/7 bitcode''
])
] ++ lib.optionals stdenv.isFreeBSD [
# pch doesn't work quite right on FreeBSD, I think
''test cases/common/13 pch''
]))
++ [
''HOME="$TMPDIR" python ./run_project_tests.py''
"runHook postCheck"

2
pkgs/by-name/me/meson/setup-hook.sh
View File

@ -56,7 +56,7 @@ mesonCheckPhase() {
local flagsArray=($mesonCheckFlags "${mesonCheckFlagsArray[@]}")
echoCmd 'mesonCheckPhase flags' "${flagsArray[@]}"
meson test --no-rebuild "${flagsArray[@]}"
meson test --no-rebuild --print-errorlogs "${flagsArray[@]}"
runHook postCheck
}

31
pkgs/development/tools/build-managers/ninja/default.nix → pkgs/by-name/ni/ninja/package.nix
View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, asciidoc
, docbook_xml_dtd_45
, docbook_xsl
@ -11,17 +10,18 @@
, re2c
, buildPackages
, buildDocs ? true
, nix-update-script
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "ninja";
version = "1.11.1";
version = "1.12.1";
src = fetchFromGitHub {
owner = "ninja-build";
repo = "ninja";
rev = "v${version}";
hash = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI=";
rev = "v${finalAttrs.version}";
hash = "sha256-RT5u+TDvWxG5EVQEYj931EZyrHUSAqK73OKDAascAwA=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];
@ -38,15 +38,6 @@ stdenv.mkDerivation rec {
libxslt.bin
];
patches = lib.optionals stdenv.is32bit [
# Otherwise ninja may fail on some files in a larger FS.
(fetchpatch {
name = "stat64.patch";
url = "https://github.com/ninja-build/ninja/commit/7bba11ae704efc84cac5fde5e9be53f653f237d1.diff";
hash = "sha256-tINS57xLh1lwnYFWCQs5OudfgtIShaOh5zbmv7w5BnQ=";
})
];
postPatch = ''
# write rebuild args to file after bootstrap
substituteInPlace configure.py --replace "subprocess.check_call(rebuild_args)" "open('rebuild_args','w').write(rebuild_args[0])"
@ -91,7 +82,9 @@ stdenv.mkDerivation rec {
setupHook = ./setup-hook.sh;
meta = with lib; {
passthru.updateScript = nix-update-script {};
meta = {
description = "Small build system with a focus on speed";
mainProgram = "ninja";
longDescription = ''
@ -101,8 +94,8 @@ stdenv.mkDerivation rec {
to run builds as fast as possible.
'';
homepage = "https://ninja-build.org/";
license = licenses.asl20;
platforms = platforms.unix;
maintainers = with maintainers; [ thoughtpolice bjornfor orivej ];
license = lib.licenses.asl20;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ thoughtpolice bjornfor orivej ];
};
}
})

0
pkgs/development/tools/build-managers/ninja/setup-hook.sh → pkgs/by-name/ni/ninja/setup-hook.sh
View File

2
pkgs/by-name/re/rerun/package.nix
View File

@ -78,8 +78,6 @@ rustPlatform.buildRustPackage rec {
]
++ lib.optionals stdenv.isLinux [ (lib.getLib wayland) ];
env.CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "lld";
addDlopenRunpaths = map (p: "${lib.getLib p}/lib") (
lib.optionals stdenv.hostPlatform.isLinux [
libxkbcommon

2
pkgs/by-name/su/surrealist/package.nix
View File

@ -83,7 +83,7 @@ in stdenv.mkDerivation (finalAttrs: {
];
postBuild = ''
CC=clang CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER=lld cargo build \
CC=clang cargo build \
--target wasm32-unknown-unknown \
--release

6
pkgs/by-name/sy/symfony-cli/package.nix
View File

@ -10,14 +10,14 @@
buildGoModule rec {
pname = "symfony-cli";
version = "5.8.17";
vendorHash = "sha256-ARTKJVHgN1Y3xOUc3P2Ch7e8gN9BZbhBEZ1DiM7nEWs=";
version = "5.8.19";
vendorHash = "sha256-oo4lLJTF44hBb8QaIMONj+2WRdDSlhImZaC/nniWAhs=";
src = fetchFromGitHub {
owner = "symfony-cli";
repo = "symfony-cli";
rev = "v${version}";
hash = "sha256-UmGyIZk5s5A8ModafWMZqeJHdZ4fa+hAHi62pdlfJ8I=";
hash = "sha256-TOtz/IPeNmWqDRtenWm+58NWxeIq1gihHnpawOa66YE=";
leaveDotGit = true;
postFetch = ''
git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE

2
pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix
View File

@ -63,7 +63,7 @@ let
];
buildPhase = ''
HOME=$(mktemp -d) RUSTFLAGS="-C linker=lld" wasm-pack build --target web --release
HOME=$(mktemp -d) wasm-pack build --target web --release
'';
installPhase = ''

2
pkgs/by-name/wa/waf/hook.nix
View File

@ -13,8 +13,6 @@ makeSetupHook {
# waf is not inserted into propagatedBuildInputs, rather it is inserted
# directly
inherit waf;
wafCrossFlags = lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system)
''--cross-compile "--cross-execute=${stdenv.targetPlatform.emulator pkgs}"'';
};
meta = {

4
pkgs/by-name/wa/waf/setup-hook.sh
View File

@ -22,10 +22,6 @@ wafConfigurePhase() {
${wafConfigureTargets:-configure}
)
if [ -z "${dontAddWafCrossFlags:-}" ]; then
flagsArray+=(@wafCrossFlags@)
fi
echoCmd 'waf configure flags' "${flagsArray[@]}"
python "$wafPath" "${flagsArray[@]}"

60
pkgs/development/compilers/gcc/patches/13/ICE-PR110280.patch
View File

@ -1,60 +0,0 @@
From f4029de35fb1b293a4fd586574b1b4b73ddf7880 Mon Sep 17 00:00:00 2001
From: Prathamesh Kulkarni <prathamesh.kulkarni@linaro.org>
Date: Wed, 26 Jul 2023 22:36:26 +0530
Subject: [PATCH] [aarch64/match.pd] Fix ICE observed in PR110280.
gcc/ChangeLog:
PR tree-optimization/110280
* match.pd (vec_perm_expr(v, v, mask) -> v): Explicitly build vector
using build_vector_from_val with the element of input operand, and
mask's type if operand and mask's types don't match.
gcc/testsuite/ChangeLog:
PR tree-optimization/110280
* gcc.target/aarch64/sve/pr110280.c: New test.
(cherry picked from commit 85d8e0d8d5342ec8b4e6a54e22741c30b33c6f04)
---
gcc/match.pd | 9 ++++++++-
gcc/testsuite/gcc.target/aarch64/sve/pr110280.c | 12 ++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/gcc.target/aarch64/sve/pr110280.c
diff --git a/gcc/match.pd b/gcc/match.pd
index 9118244825054..c3bb4fbc0a7a2 100644
--- a/gcc/match.pd
+++ b/gcc/match.pd
@@ -8292,7 +8292,14 @@ and,
(simplify
(vec_perm vec_same_elem_p@0 @0 @1)
- @0)
+ (if (types_match (type, TREE_TYPE (@0)))
+ @0
+ (with
+ {
+ tree elem = uniform_vector_p (@0);
+ }
+ (if (elem)
+ { build_vector_from_val (type, elem); }))))
/* Push VEC_PERM earlier if that may help FMA perception (PR101895). */
(simplify
diff --git a/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c b/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c
new file mode 100644
index 0000000000000..d3279f383629f
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/sve/pr110280.c
@@ -0,0 +1,12 @@
+/* { dg-do compile } */
+/* { dg-options "-O3 -fdump-tree-optimized" } */
+
+#include "arm_sve.h"
+
+svuint32_t l()
+{
+ _Alignas(16) const unsigned int lanes[4] = {0, 0, 0, 0};
+ return svld1rq_u32(svptrue_b8(), lanes);
+}
+
+/* { dg-final { scan-tree-dump-not "VEC_PERM_EXPR" "optimized" } } */

5
pkgs/development/compilers/gcc/patches/default.nix
View File

@ -77,7 +77,6 @@ in
++ optional langFortran (if atLeast12 then ./gcc-12-gfortran-driving.patch else ./gfortran-driving.patch)
++ optional atLeast7 ./ppc-musl.patch
++ optional is12 ./12/lambda-ICE-PR109241.patch # backport ICE fix on ccache code
++ optional is13 ./13/ICE-PR110280.patch # backport ICE fix on const_unop
++ optional (atLeast9 && langD) ./libphobos.patch
@ -153,8 +152,8 @@ in
}) ];
"13" = [ (fetchpatch {
name = "gcc-13-darwin-aarch64-support.patch";
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/3c5cbc8e9cf444a1967786af48e430588e1eb481/gcc/gcc-13.2.0.diff";
sha256 = "sha256-Y5r3U3dwAFG6+b0TNCFd18PNxYu2+W/5zDbZ5cHvv+U=";
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/bda0faddfbfb392e7b9c9101056b2c5ab2500508/gcc/gcc-13.3.0.diff";
sha256 = "sha256-RBTCBXIveGwuQGJLzMW/UexpUZdDgdXprp/G2NHkmQo=";
}) ];
"12" = [ (fetchurl {
name = "gcc-12-darwin-aarch64-support.patch";

4
pkgs/development/compilers/gcc/versions.nix
View File

@ -1,7 +1,7 @@
let
majorMinorToVersionMap = {
"14" = "14.1.0";
"13" = "13.2.0";
"13" = "13.3.0";
"12" = "12.3.0";
"11" = "11.4.0";
"10" = "10.5.0";
@ -21,7 +21,7 @@ let
# NOTE: there is no need to remove hashes of obsolete minor
# versions when adding a new minor version.
"14.1.0" = "sha256-4oPGVJh6/j3p2AgLwL15U0tcoNaBpzoR/ytdN2dCaEA=";
"13.2.0" = "sha256-4nXnZEKmBnNBon8Exca4PYYTFEAEwEE1KIY9xrXHQ9o=";
"13.3.0" = "sha256-CEXpYhyVQ6E/SE6UWEpJ/8ASmXDpkUYkI1/B0GGgwIM=";
"12.3.0" = "sha256-lJpdT5nnhkIak7Uysi/6tVeN5zITaZdbka7Jet/ajDs=";
"11.4.0" = "sha256-Py2yIrAH6KSiPNW6VnJu8I6LHx6yBV7nLBQCzqc6jdk=";
"10.5.0" = "sha256-JRCVQ/30bzl8NHtdi3osflaUpaUczkucbh6opxyjB8E=";

11
pkgs/development/compilers/llvm/16/compiler-rt/asan-offset.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/lib/asan/CMakeLists.txt 2022-06-22 16:46:24.000000000 +0000
+++ b/lib/asan/CMakeLists.txt
@@ -46,7 +46,7 @@ set(ASAN_STATIC_SOURCES
asan_rtl_static.cpp
)
-if (NOT WIN32 AND NOT APPLE)
+if (LINUX)
list(APPEND ASAN_STATIC_SOURCES
asan_rtl_x86_64.S
)

21
pkgs/development/compilers/llvm/16/compiler-rt/freebsd-i386.patch Normal file
View File

@ -0,0 +1,21 @@
--- a/lib/builtins/fp_lib.h 1969-12-31 16:00:01.000000000 -0800
+++ b/lib/builtins/fp_lib.h 2023-12-21 23:39:36.066927293 -0800
@@ -26,18 +26,6 @@
#include <stdbool.h>
#include <stdint.h>
-// x86_64 FreeBSD prior v9.3 define fixed-width types incorrectly in
-// 32-bit mode.
-#if defined(__FreeBSD__) && defined(__i386__)
-#include <sys/param.h>
-#if __FreeBSD_version < 903000 // v9.3
-#define uint64_t unsigned long long
-#define int64_t long long
-#undef UINT64_C
-#define UINT64_C(c) (c##ULL)
-#endif
-#endif
-
#if defined SINGLE_PRECISION
typedef uint16_t half_rep_t;

8
pkgs/development/compilers/llvm/common/compiler-rt/default.nix
View File

@ -139,11 +139,17 @@ stdenv.mkDerivation ({
'') + ''
substituteInPlace lib/builtins/int_util.c \
--replace "#include <stdlib.h>" ""
'' + (if stdenv.hostPlatform.isFreeBSD then
# As per above, but in FreeBSD assert is a macro and simply allowing it to be implicitly declared causes Issues!!!!!
''
substituteInPlace lib/builtins/clear_cache.c lib/builtins/cpu_model.c \
--replace "#include <assert.h>" "#define assert(e) ((e)?(void)0:__assert(__FUNCTION__,__FILE__,__LINE__,#e))"
'' else ''
substituteInPlace lib/builtins/clear_cache.c \
--replace "#include <assert.h>" ""
substituteInPlace lib/builtins/cpu_model${lib.optionalString (lib.versionAtLeast version "18") "/x86"}.c \
--replace "#include <assert.h>" ""
'');
''));
# Hack around weird upsream RPATH bug
postInstall = lib.optionalString (stdenv.hostPlatform.isDarwin) ''

6
pkgs/development/compilers/llvm/common/libcxx/default.nix
View File

@ -13,12 +13,16 @@
, python3
, fixDarwinDylibNames
, version
, cxxabi ? if stdenv.hostPlatform.isFreeBSD then libcxxrt else null
, cxxabi ? null
, libcxxrt
, libunwind
, enableShared ? !stdenv.hostPlatform.isStatic
}:
# note: our setup using libcxxabi instead of libcxxrt on FreeBSD diverges from
# normal FreeBSD. This may cause issues with binary patching down the line.
# If this becomes an issue, try adding as symlink libcxxrt.so -> libc++abi.so
# external cxxabi is not supported on Darwin as the build will not link libcxx
# properly and not re-export the cxxabi symbols into libcxx
# https://github.com/NixOS/nixpkgs/issues/166205

94
pkgs/development/compilers/llvm/common/llvm/default.nix
View File

@ -39,6 +39,7 @@
# broken for the armv7l builder
&& !stdenv.hostPlatform.isAarch
, enablePolly ? lib.versionAtLeast release_version "14"
, enableTerminfo ? true
}:
let
@ -124,42 +125,25 @@ stdenv.mkDerivation (rec {
substituteInPlace cmake/modules/AddLLVM.cmake \
--replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \
--replace 'set(_install_rpath "@loader_path/../''${CMAKE_INSTALL_LIBDIR}''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' ""
'' + (optionalString (lib.versionAtLeast release_version "15") (''
'' +
# As of LLVM 15, marked as XFAIL on arm64 macOS but lit doesn't seem to pick
# this up: https://github.com/llvm/llvm-project/blob/c344d97a125b18f8fed0a64aace73c49a870e079/llvm/test/MC/ELF/cfi-version.ll#L7
(optionalString (lib.versionAtLeast release_version "15") (''
rm test/MC/ELF/cfi-version.ll
'' +
# This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`)
# and thus fails under the sandbox:
'' + (if lib.versionAtLeast release_version "16" then ''
(if lib.versionAtLeast release_version "16" then ''
substituteInPlace unittests/TargetParser/Host.cpp \
--replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }"
'' else ''
substituteInPlace unittests/Support/Host.cpp \
--replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }"
'') + optionalString (lib.versionAtLeast release_version "16") ''
'') +
# This test tries to call the intrinsics `@llvm.roundeven.f32` and
# `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf`
# and `roundeven` on macOS.
#
# However these functions are glibc specific so the test fails:
# - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html
# - https://www.gnu.org/software/gnulib/manual/html_node/roundeven.html
#
substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \
--replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \
--replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" ""
'' + optionalString (!stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "18") ''
# fails when run in sandbox
substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \
--replace "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure"
''))) + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "15") (optionalString (lib.versionOlder release_version "16") ''
# This test tries to call the intrinsics `@llvm.roundeven.f32` and
# `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf`
# and `roundeven` on x86_64 macOS.
# and `roundeven` on macOS and FreeBSD.
#
# However these functions are glibc specific so the test fails:
# - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html
@ -167,16 +151,28 @@ stdenv.mkDerivation (rec {
#
# TODO(@rrbutani): this seems to run fine on `aarch64-darwin`, why does it
# pass there?
optionalString (lib.versionAtLeast release_version "16") ''
substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \
--replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \
--replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" ""
'' +
# fails when run in sandbox
optionalString (!stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "18") ''
substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \
--replace "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure"
''))) +
# dup of above patch with different conditions
optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86 && lib.versionAtLeast release_version "15") (optionalString (lib.versionOlder release_version "16") ''
substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \
--replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \
--replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" ""
'' + ((optionalString (lib.versionAtLeast release_version "18") ''
'' +
# fails when run in sandbox
((optionalString (lib.versionAtLeast release_version "18") ''
substituteInPlace unittests/Support/VirtualFileSystemTest.cpp \
--replace "PhysicalFileSystemWorkingDirFailure" "DISABLED_PhysicalFileSystemWorkingDirFailure"
'') + ''
'') +
# This test fails on darwin x86_64 because `sw_vers` reports a different
# macOS version than what LLVM finds by reading
# `/System/Library/CoreServices/SystemVersion.plist` (which is passed into
@ -205,19 +201,20 @@ stdenv.mkDerivation (rec {
# not clear to me when/where/for what this even gets used in LLVM.
#
# TODO(@rrbutani): fix/follow-up
'' + (if lib.versionAtLeast release_version "16" then ''
(if lib.versionAtLeast release_version "16" then ''
substituteInPlace unittests/TargetParser/Host.cpp \
--replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion"
'' else ''
substituteInPlace unittests/Support/Host.cpp \
--replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion"
'') + ''
'') +
# This test fails with a `dysmutil` crash; have not yet dug into what's
# going on here (TODO(@rrbutani)).
''
rm test/tools/dsymutil/ARM/obfuscated.test
'')) + ''
'')) +
# FileSystem permissions tests fail with various special bits
''
substituteInPlace unittests/Support/CMakeLists.txt \
--replace "Path.cpp" ""
rm unittests/Support/Path.cpp
@ -229,22 +226,24 @@ stdenv.mkDerivation (rec {
'' + lib.optionalString (lib.versionOlder release_version "13") ''
# TODO: Fix failing tests:
rm test/DebugInfo/X86/vla-multi.ll
'' + lib.optionalString (lib.versionAtLeast release_version "16") (''
'' +
# Fails in the presence of anti-virus software or other intrusion-detection software that
# modifies the atime when run. See #284056.
lib.optionalString (lib.versionAtLeast release_version "16") (''
rm test/tools/llvm-objcopy/ELF/strip-preserve-atime.test
'' + lib.optionalString (lib.versionOlder release_version "17") ''
'') + lib.optionalString (lib.versionAtLeast release_version "15" && lib.versionOlder release_version "17") ''
'') +
# timing-based tests are trouble
lib.optionalString (lib.versionAtLeast release_version "15" && lib.versionOlder release_version "17") ''
rm utils/lit/tests/googletest-timeout.py
'' + optionalString stdenv.hostPlatform.isMusl ''
'' +
# valgrind unhappy with musl or glibc, but fails w/musl only
optionalString stdenv.hostPlatform.isMusl ''
patch -p1 -i ${./TLI-musl.patch}
substituteInPlace unittests/Support/CMakeLists.txt \
--replace "add_subdirectory(DynamicLibrary)" ""
rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
# valgrind unhappy with musl or glibc, but fails w/musl only
rm test/CodeGen/AArch64/wineh4.mir
'' + optionalString stdenv.hostPlatform.isAarch32 ''
# skip failing X86 test cases on 32-bit ARM
@ -254,18 +253,28 @@ stdenv.mkDerivation (rec {
rm test/tools/dsymutil/X86/op-convert.test
rm test/tools/gold/X86/split-dwarf.ll
rm test/tools/llvm-objcopy/MachO/universal-object.test
'' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") ''
'' +
# Seems to require certain floating point hardware (NEON?)
optionalString (stdenv.hostPlatform.system == "armv6l-linux") ''
rm test/ExecutionEngine/frem.ll
'' +
# 1. TODO: Why does this test fail on FreeBSD?
# It seems to reference /usr/local/lib/libfile.a, which is clearly a problem.
# 2. This test fails for the same reason it fails on MacOS, but the fix is
# not trivial to apply.
optionalString stdenv.isFreeBSD ''
rm test/tools/llvm-libtool-darwin/L-and-l.test
rm test/ExecutionEngine/Interpreter/intrinsics.ll
'' + ''
patchShebangs test/BugPoint/compile-custom.ll.py
'' + (lib.optionalString (lib.versionOlder release_version "13") ''
'' +
# Tweak tests to ignore namespace part of type to support
# gcc-12: https://gcc.gnu.org/PR103598.
# The change below mangles strings like:
# CHECK-NEXT: Starting llvm::Function pass manager run.
# to:
# CHECK-NEXT: Starting {{.*}}Function pass manager run.
(lib.optionalString (lib.versionOlder release_version "13") (''
for f in \
test/Other/new-pass-manager.ll \
test/Other/new-pm-O0-defaults.ll \
@ -286,18 +295,19 @@ stdenv.mkDerivation (rec {
--replace 'Starting llvm::' 'Starting {{.*}}' \
--replace 'Finished llvm::' 'Finished {{.*}}'
done
'' +
# gcc-13 fix
''
sed -i '/#include <string>/i#include <cstdint>' \
include/llvm/DebugInfo/Symbolize/DIPrinter.h
'');
''));
preConfigure = if lib.versionAtLeast release_version "15" then ''
# Workaround for configure flags that need to have spaces
preConfigure = if lib.versionAtLeast release_version "15" then ''
cmakeFlagsArray+=(
-DLLVM_LIT_ARGS="-svj''${NIX_BUILD_CORES} --no-progress-bar"
)
'' else ''
# Workaround for configure flags that need to have spaces
cmakeFlagsArray+=(
-DLLVM_LIT_ARGS='-svj''${NIX_BUILD_CORES} --no-progress-bar'
)
@ -332,9 +342,13 @@ stdenv.mkDerivation (rec {
"-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}"
"-DLLVM_ENABLE_DUMP=ON"
(lib.cmakeBool "LLVM_ENABLE_TERMINFO" enableTerminfo)
] ++ optionals (!doCheck) [
"-DLLVM_INCLUDE_TESTS=OFF"
] ++ optionals stdenv.hostPlatform.isStatic [
# Disables building of shared libs, -fPIC is still injected by cc-wrapper
"-DLLVM_ENABLE_PIC=OFF"
"-DCMAKE_SKIP_INSTALL_RPATH=ON"
"-DLLVM_BUILD_STATIC=ON"
# libxml2 needs to be disabled because the LLVM build system ignores its .la
# file and doesn't link zlib as well.

59
pkgs/development/compilers/rust/1_77.nix
View File

@ -1,59 +0,0 @@
# New rust versions should first go to staging.
# Things to check after updating:
# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin:
# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github
# This testing can be also done by other volunteers as part of the pull
# request review, in case platforms cannot be covered.
# 2. The LLVM version used for building should match with rust upstream.
# Check the version number in the src/llvm-project git submodule in:
# https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules
# 3. Firefox and Thunderbird should still build on x86_64-linux.
{ stdenv, lib
, newScope, callPackage
, CoreFoundation, Security, SystemConfiguration
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost, pkgsTargetTarget
, makeRustPlatform
, wrapRustcWith
, llvmPackages_17, llvm_17
} @ args:
import ./default.nix {
rustcVersion = "1.77.2";
rustcSha256 = "xhRX749ZZjj928dxZ3iy9rmf8SUTo7DxOZTDvFIWOMM=";
llvmSharedForBuild = pkgsBuildBuild.llvmPackages_17.libllvm.override { enableSharedLibraries = true; };
llvmSharedForHost = pkgsBuildHost.llvmPackages_17.libllvm.override { enableSharedLibraries = true; };
llvmSharedForTarget = pkgsBuildTarget.llvmPackages_17.libllvm.override { enableSharedLibraries = true; };
# For use at runtime
llvmShared = llvm_17.override { enableSharedLibraries = true; };
# Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox
llvmPackages = llvmPackages_17;
# Note: the version MUST be one version prior to the version we're
# building
bootstrapVersion = "1.76.0";
# fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
bootstrapHashes = {
i686-unknown-linux-gnu = "4c3eefc9341b8809235e6c4fbcbc19ab52a5cbe771292c400df068c12984fa3e";
x86_64-unknown-linux-gnu = "9d589d2036b503cc45ecc94992d616fb3deec074deb36cacc2f5c212408f7399";
x86_64-unknown-linux-musl = "aa8568f4d262468aaf4f622bd421c5435b24454d8fbcdae48da1162962205384";
arm-unknown-linux-gnueabihf = "7d1da067362fc64bcad198d90a61e024d5712aed76e17b28e1cd7e8ba263cc6f";
armv7-unknown-linux-gnueabihf = "c03346d56d4a860cd3a8d2d2a7ea75c510b68204e3ad97b3770076595261c913";
aarch64-unknown-linux-gnu = "2e8313421e8fb673efdf356cdfdd4bc16516f2610d4f6faa01327983104c05a0";
aarch64-unknown-linux-musl = "a1d1c8ccb8ea00cfa2b79d80411b8eb22b2bef5214f86536825361e98d7c617a";
x86_64-apple-darwin = "7bdbe085695df8e46389115e99eda7beed37a9494f6b961b45554c658e53b8e7";
aarch64-apple-darwin = "17496f15c3cb6ff73d5c36f5b54cc110f1ac31fa09521a7991c0d7ddd890dceb";
powerpc64le-unknown-linux-gnu = "44b3494675284d26b04747a824dc974e32fd8fd46fc0aa06a7c8ebe851332d2c";
riscv64gc-unknown-linux-gnu = "4a9db321874fc441235b71eb8aa295fc50251305e461540b25b4eef89fb56255";
};
selectRustPackage = pkgs: pkgs.rust_1_77;
rustcPatches = [ ];
}
(builtins.removeAttrs args [ "llvmPackages_17" "llvm_17"])

59
pkgs/development/compilers/rust/1_78.nix Normal file
View File

@ -0,0 +1,59 @@
# New rust versions should first go to staging.
# Things to check after updating:
# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin:
# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github
# This testing can be also done by other volunteers as part of the pull
# request review, in case platforms cannot be covered.
# 2. The LLVM version used for building should match with rust upstream.
# Check the version number in the src/llvm-project git submodule in:
# https://github.com/rust-lang/rust/blob/<version-tag>/.gitmodules
# 3. Firefox and Thunderbird should still build on x86_64-linux.
{ stdenv, lib
, newScope, callPackage
, CoreFoundation, Security, SystemConfiguration
, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost, pkgsTargetTarget
, makeRustPlatform
, wrapRustcWith
, llvmPackages_18, llvm_18
} @ args:
import ./default.nix {
rustcVersion = "1.78.0";
rustcSha256 = "/1RII6XLJ/JzgShXfx5+AO6PTIPyo0h4GuT8NV6R1ak=";
llvmSharedForBuild = pkgsBuildBuild.llvmPackages_18.libllvm.override { enableSharedLibraries = true; };
llvmSharedForHost = pkgsBuildHost.llvmPackages_18.libllvm.override { enableSharedLibraries = true; };
llvmSharedForTarget = pkgsBuildTarget.llvmPackages_18.libllvm.override { enableSharedLibraries = true; };
# For use at runtime
llvmShared = llvm_18.override { enableSharedLibraries = true; };
# Expose llvmPackages used for rustc from rustc via passthru for LTO in Firefox
llvmPackages = llvmPackages_18;
# Note: the version MUST be one version prior to the version we're
# building
bootstrapVersion = "1.77.2";
# fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
bootstrapHashes = {
i686-unknown-linux-gnu = "168e653fbc30b3a80801bc7735a79ff644651618434234959925f669bf77d1a2";
x86_64-unknown-linux-gnu = "b7d12b1b162c36c1fd5234b4b16856aa7eafca91d17c49787f6487cb26f4062d";
x86_64-unknown-linux-musl = "2e08fe23c4837a780a40ebfac601760cd6297581d21eae2f88cb59060243a375";
arm-unknown-linux-gnueabihf = "9f14a31dbef0153c0a7463a79cf8f9e8295b355354de41aa054953027beb70d7";
armv7-unknown-linux-gnueabihf = "b37649399081228244b3ff3acc6047f6c138e602c721cd500efe43715d043c5e";
aarch64-unknown-linux-gnu = "297c6201edd42e580f242fcd75b521b0392f6f3be02cf03ca76690fece4a74da";
aarch64-unknown-linux-musl = "fdd9c485f93c73a085c113b4f0fbad0989f79153079d394ec4bbac2b3804f71b";
x86_64-apple-darwin = "16bbbfcf0c982b35271d8904977d80fda1bb7caa7f898abceed3569a867d9cea";
aarch64-apple-darwin = "415bb2bc198feb0f2d8329e33c57d0890bbd57977d1ae48b17f6c7e1f632eaa7";
powerpc64le-unknown-linux-gnu = "79582acb339bd2d79fef095b977049049ffa04616011f1af1793fb8e98194b19";
riscv64gc-unknown-linux-gnu = "300fe4861e2d1f6e4c4f5e36ae7997beca8a979343a7f661237ab78a37a54648";
};
selectRustPackage = pkgs: pkgs.rust_1_78;
rustcPatches = [ ];
}
(builtins.removeAttrs args [ "llvmPackages_18" "llvm_18"])

5
pkgs/development/compilers/rust/cargo-auditable.nix
View File

@ -22,11 +22,6 @@ let
cargoHash = "sha256-4o3ctun/8VcBRuj+j0Yaawdkyn6Z6LPp+FTyhPxQWU8=";
# Cargo.lock is outdated
preConfigure = ''
cargo update --offline
'';
meta = with lib; {
description = "A tool to make production Rust binaries auditable";
mainProgram = "cargo-auditable";

6
pkgs/development/compilers/rust/rustc.nix
View File

@ -192,6 +192,12 @@ in stdenv.mkDerivation (finalAttrs: {
postPatch = ''
patchShebangs src/etc
# rust-lld is the name rustup uses for its bundled lld, so that it
# doesn't conflict with any system lld. This is not an
# appropriate default for Nixpkgs, where there is no rust-lld.
substituteInPlace compiler/rustc_target/src/spec/*/*.rs \
--replace-quiet '"rust-lld"' '"lld"'
${optionalString (!withBundledLLVM) "rm -rf src/llvm"}
# Useful debugging parameter

8
pkgs/development/interpreters/emilua/default.nix
View File

@ -98,13 +98,11 @@ stdenv.mkDerivation rec {
doCheck = true;
mesonCheckFlags = [
# Skipped test: libpsx
# Known issue with no-new-privs disabled in the Nix build environment.
checkPhase = ''
runHook preCheck
meson test --print-errorlogs --no-suite libpsx
runHook postCheck
'';
"--no-suite" "libpsx"
];
meta = with lib; {
description = "Lua execution engine";

11
pkgs/development/interpreters/luajit/2.0.nix
View File

@ -1,18 +1,19 @@
{ self, callPackage, fetchFromGitHub, lib, passthruFun }:
callPackage ./default.nix rec {
callPackage ./default.nix {
# The patch version is the timestamp of the git commit,
# obtain via `cat $(nix-build -A luajit_2_0.src)/.relver`
version = "2.0.1693340858";
version = "2.0.1713483859";
src = fetchFromGitHub {
owner = "LuaJIT";
repo = "LuaJIT";
rev = "c6ee7e19d107b4f9a140bb2ccf99162e26318c69";
hash = "sha256-3/7ASZRniytw5RkOy0F9arHkZevq6dxmya+Ba3A5IIA=";
rev = "9b5e837ac2dfdc0638830c048a47ca9378c504d3";
hash = "sha256-GflF/sELSNanc9G4WMzoOadUBOFSs6OwqhAXa4sudWA=";
};
extraMeta = { # this isn't precise but it at least stops the useless Hydra build
extraMeta = {
# this isn't precise but it at least stops the useless Hydra build
platforms = with lib; filter (p: !hasPrefix "aarch64-" p)
(platforms.linux ++ platforms.darwin);
};

8
pkgs/development/interpreters/luajit/2.1.nix
View File

@ -1,15 +1,15 @@
{ self, callPackage, fetchFromGitHub, passthruFun }:
callPackage ./default.nix rec {
callPackage ./default.nix {
# The patch version is the timestamp of the git commit,
# obtain via `cat $(nix-build -A luajit_2_1.src)/.relver`
version = "2.1.1693350652";
version = "2.1.1713773202";
src = fetchFromGitHub {
owner = "LuaJIT";
repo = "LuaJIT";
rev = "41fb94defa8f830ce69a8122b03f6ac3216d392a";
hash = "sha256-iY80CA97RqJ9gF1Kl7ms/lC6m6KScjxWmljh5Gy7Brg=";
rev = "5790d253972c9d78a0c2aece527eda5b134bbbf7";
hash = "sha256-WG8AWDI182/9O7NrZlQ6ZH/esyYE2pWXMuSzWUuntSA=";
};
inherit self passthruFun;

22
pkgs/development/interpreters/python/cpython/default.nix
View File

@ -121,6 +121,9 @@ let
versionOlder
;
# mixes libc and libxcrypt headers and libs and causes segfaults on importing crypt
libxcrypt = if stdenv.hostPlatform.isFreeBSD then null else inputs.libxcrypt;
buildPackages = pkgsBuildHost;
inherit (passthru) pythonOnBuildForHost;
@ -261,6 +264,7 @@ let
multiarch =
if isDarwin then "darwin"
else if isFreeBSD then ""
else if isWindows then ""
else "${multiarchCpu}-${machdep}-${pythonAbiName}";
@ -445,7 +449,11 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
"LDFLAGS=-static"
];
preConfigure = optionalString (pythonOlder "3.12") ''
preConfigure = ''
# Attempt to purify some of the host info collection
sed -E -i -e 's/uname -r/echo/g' -e 's/uname -n/echo nixpkgs/g' config.guess
sed -E -i -e 's/uname -r/echo/g' -e 's/uname -n/echo nixpkgs/g' configure
'' + optionalString (pythonOlder "3.12") ''
# Improve purity
for path in /usr /sw /opt /pkg; do
substituteInPlace ./setup.py --replace-warn $path /no-such-path
@ -453,6 +461,8 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
'' + optionalString stdenv.isDarwin ''
# Override the auto-detection in setup.py, which assumes a universal build
export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.isAarch64 then "uint128" else "x64"}
# Ensure that modern platform features are enabled on Darwin in spite of having no version suffix.
sed -E -i -e 's|Darwin/\[12\]\[0-9\]\.\*|Darwin/*|' configure
'' + optionalString (stdenv.isDarwin && x11Support && pythonAtLeast "3.11") ''
export TCLTK_LIBS="-L${tcl}/lib -L${tk}/lib -l${tcl.libPrefix} -l${tk.libPrefix}"
export TCLTK_CFLAGS="-I${tcl}/include -I${tk}/include"
@ -476,10 +486,10 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
postInstall = let
# References *not* to nuke from (sys)config files
keep-references = concatMapStringsSep " " (val: "-e ${val}") ([
(placeholder "out") libxcrypt
] ++ optionals tzdataSupport [
tzdata
]);
(placeholder "out")
] ++ lib.optional (libxcrypt != null) libxcrypt
++ lib.optional tzdataSupport tzdata
);
in lib.optionalString enableFramework ''
for dir in include lib share; do
ln -s $out/Library/Frameworks/Python.framework/Versions/Current/$dir $out/$dir
@ -661,7 +671,7 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
'';
license = licenses.psfl;
pkgConfigModules = [ "python3" ];
platforms = platforms.linux ++ platforms.darwin ++ platforms.windows;
platforms = platforms.linux ++ platforms.darwin ++ platforms.windows ++ platforms.freebsd;
mainProgram = executable;
};
})

4
pkgs/development/interpreters/ruby/rubygems/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "rubygems";
version = "3.5.9";
version = "3.5.11";
src = fetchurl {
url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
hash = "sha256-KyA2Qhkea7ns4ZB19iJ1qIUmMZsSRoTEZmdBXcpDY/E=";
hash = "sha256-RSG1L4Q2IKn8XKdBRSa3RjsJiVZMOugLJraPvRMEyBg=";
};
patches = [

4
pkgs/development/libraries/SDL2/default.nix
View File

@ -58,13 +58,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "SDL2";
version = "2.30.2";
version = "2.30.3";
src = fetchFromGitHub {
owner = "libsdl-org";
repo = "SDL";
rev = "release-${finalAttrs.version}";
hash = "sha256-yYYtsF6+IKynXpfay0rUmCQPdL8vp6dlmon8N7UG89A=";
hash = "sha256-ycY/AkWulV3vAu/+vKw+j/b6jTZWjqKjIgjRwqNHFl8=";
};
dontDisableStatic = if withStatic then 1 else 0;
outputs = [ "out" "dev" ];

1
pkgs/development/libraries/aubio/default.nix
View File

@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
buildInputs = [ alsa-lib fftw libjack2 libsamplerate libsndfile ];
strictDeps = true;
dontAddWafCrossFlags = true;
wafFlags = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--disable-tests";
postPatch = ''

4
pkgs/development/libraries/audio/libopenmpt/default.nix
View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "libopenmpt";
version = "0.7.6";
version = "0.7.7";
outputs = [ "out" "dev" "bin" ];
src = fetchurl {
url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz";
hash = "sha256-Fi1yowa7LhFMJPolJn0NCgrBbzn9laXA38daZm7l5PU=";
hash = "sha256-WMaiiXISaCim9ljghK7nqo+L/bdaC9DjRcf/Km2e8Iw=";
};
enableParallelBuilding = true;

4
pkgs/development/libraries/c-ares/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, writeTextDir
{ lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook
, withCMake ? true, cmake
# sensitive downstream packages
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" ];
nativeBuildInputs = lib.optionals withCMake [ cmake ];
nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ] ++ lib.optionals withCMake [ cmake ];
cmakeFlags = [] ++ lib.optionals stdenv.hostPlatform.isStatic [
"-DCARES_SHARED=OFF"

2
pkgs/development/libraries/expat/default.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, updateAutotoolsGnuConfigScriptsHook
# for passthru.tests
, python3
, perlPackages
@ -29,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
};
strictDeps = true;
nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
outputs = [ "out" "dev" ]; # TODO: fix referrers
outputBin = "dev";

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

@ -90,12 +90,10 @@ stdenv.mkDerivation (finalAttrs: {
# occur inconsistently
doCheck = false;
mesonCheckFlags = [
# Prevents e-d-s add-contacts-stress-test from timing out
checkPhase = ''
runHook preCheck
meson test --timeout-multiplier 4
runHook postCheck
'';
"--timeout-multiplier" "4"
];
postPatch = lib.optionalString telepathySupport ''
patchShebangs tests/tools/manager-file.py

4
pkgs/development/libraries/gdbm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl }:
{ stdenv, lib, fetchurl, updateAutotoolsGnuConfigScriptsHook }:
stdenv.mkDerivation rec {
pname = "gdbm";
@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-dLEIHSH/8TrkvXwW5dblBKTCb3zeHcoNljpIQXS7ys0=";
};
nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
doCheck = true; # not cross;
# Linking static stubs on cygwin requires correct ordering.

11
pkgs/development/libraries/gdk-pixbuf/default.nix
View File

@ -21,12 +21,11 @@
, buildPackages
, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
, gobject-introspection
, fetchpatch
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gdk-pixbuf";
version = "2.42.11";
version = "2.42.12";
outputs = [ "out" "dev" "man" ]
++ lib.optional withIntrospection "devdoc"
@ -36,18 +35,12 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs) pname version;
in fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
hash = "sha256-Sdy0AjiHCGR+jDIdVrb7MPIeUeUV0MWpQiaNIwUqLwA=";
hash = "sha256-uVBbNEW5p+SM7TR2DDvLc+lm3zrJTJWhSMtmmrdI48c=";
};
patches = [
# Move installed tests to a separate output
./installed-tests-path.patch
# Remove post 2.42.11
(fetchpatch {
name = "fix-meson.build-typo.patch";
url = "https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/238893d8cd6f9c2616a05ab521a29651a17a38c2.patch";
hash = "sha256-6IhdNH6hhygSXD7EJo/hoBLFeb2lJlBIHNBPTkA3Do0=";
})
];
# gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work

7
pkgs/development/libraries/gettext/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, libiconv, xz, bash
{ stdenv, lib, fetchurl, libiconv, bash, updateAutotoolsGnuConfigScriptsHook
}:
# Note: this package is used for bootstrapping fetchurl, and thus
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
LDFLAGS = lib.optionalString stdenv.isSunOS "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec";
configureFlags = [
"--disable-csharp" "--with-xz"
"--disable-csharp"
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# On cross building, gettext supposes that the wchar.h from libc
# does not fulfill gettext needs, so it tries to work with its
@ -51,8 +51,7 @@ stdenv.mkDerivation rec {
strictDeps = true;
nativeBuildInputs = [
xz
xz.bin
updateAutotoolsGnuConfigScriptsHook
];
buildInputs = lib.optionals (!stdenv.hostPlatform.isMinGW) [
bash

18
pkgs/development/libraries/glib/default.nix
View File

@ -2,6 +2,7 @@
, lib
, stdenv
, fetchurl
, fetchpatch
, gettext
, meson
, ninja
@ -73,6 +74,15 @@ stdenv.mkDerivation (finalAttrs: {
./quark_init_on_demand.patch
./gobject_init_on_demand.patch
] ++ [
# Fix double-free & segfault issues on menu and dbus connection action group export failures
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4073
# Remove when version > 2.80.2
(fetchpatch {
name = "GLib-Fix-memory-problems-on-gmenuexporter-and-gactiongroupexporter-error-paths.patch";
url = "https://gitlab.gnome.org/GNOME/glib/-/commit/b9490a499a004618c883f180b1081a166ff1a86b.patch";
hash = "sha256-c6uZ9NEhg26/2RdgjQ4s5ErCDm5HH6T/tfJXTwh/H6o=";
})
# This patch lets GLib's GDesktopAppInfo API watch and notice changes
# to the Nix user and system profiles. That way, the list of available
# applications shown by the desktop environment is immediately updated
@ -269,14 +279,6 @@ stdenv.mkDerivation (finalAttrs: {
ln -s $PWD/glib/libglib-${librarySuffix} $out/lib/libglib-${librarySuffix}
'';
checkPhase = ''
runHook preCheck
meson test --print-errorlogs
runHook postCheck
'';
postCheck = ''
rm $out/lib/libgobject-${librarySuffix}
rm $out/lib/libgio-${librarySuffix}

4
pkgs/development/libraries/gstreamer/bad/default.nix
View File

@ -112,13 +112,13 @@
stdenv.mkDerivation rec {
pname = "gst-plugins-bad";
version = "1.24.2";
version = "1.24.3";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-RI4yeHvIK1hsbLL4HJqO9AT+pPd/JVZv4G5Zej9ZE2s=";
hash = "sha256-6Q8mx9ycdvSqWZt1jP1tjBDWoLnLJluiw8m984iFWPg=";
};
patches = [

4
pkgs/development/libraries/gstreamer/base/default.nix
View File

@ -46,7 +46,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gst-plugins-base";
version = "1.24.2";
version = "1.24.3";
outputs = [ "out" "dev" ];
@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs) pname version;
in fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-KC8cyAZcm2Lragog+56DKPjlKW3yRYtyNtqnKcQa52k=";
hash = "sha256-8QlDl+qnky8G5X67sHWqM6osduS3VjChawLI1K9Ggy4=";
};
strictDeps = true;

4
pkgs/development/libraries/gstreamer/core/default.nix
View File

@ -25,7 +25,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "gstreamer";
version = "1.24.2";
version = "1.24.3";
outputs = [
"bin"
@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs) pname version;
in fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-nK/dI70YDxaBxWzTpoeahJfM8k2m9CKmtvNW+gdKhIE=";
hash = "sha256-EiXvSjKfrhytxexyfaskmtVn6AcoeUk1Yc65HtNKpBQ=";
};
depsBuildBuild = [

4
pkgs/development/libraries/gstreamer/devtools/default.nix
View File

@ -17,11 +17,11 @@
stdenv.mkDerivation rec {
pname = "gst-devtools";
version = "1.24.2";
version = "1.24.3";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-/dfDDBqhuweADdmKUeVSEQZWGYNeSIn1yS/oI7hs2PQ=";
hash = "sha256-uREUov2Vj0Ks9EEYbofivsk1OO81qfgkgREZc2D/sjc=";
};
outputs = [

4
pkgs/development/libraries/gstreamer/ges/default.nix
View File

@ -18,7 +18,7 @@
stdenv.mkDerivation rec {
pname = "gst-editing-services";
version = "1.24.2";
version = "1.24.3";
outputs = [
"out"
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-cgF3jqXZN0QMU9dDndEqpaxoQGiK8fBJmFInUHS5kHM=";
hash = "sha256-z3QyFWiLATkFzSyff+3aIeLTTIRDQJkMbqJdEKA3KT8=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/gstreamer/good/default.nix
View File

@ -58,13 +58,13 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch32);
stdenv.mkDerivation rec {
pname = "gst-plugins-good";
version = "1.24.2";
version = "1.24.3";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-bjR8ctS4sohtiQ/+n2dnqe2wLyAViOjDpXLc0I2YUr0=";
hash = "sha256-FQ+RTmHcBWALaLiMoQPHzCJxMBWOOJ6p6hWfQFCi67A=";
};
patches = [

4
pkgs/development/libraries/gstreamer/libav/default.nix
View File

@ -18,11 +18,11 @@
stdenv.mkDerivation rec {
pname = "gst-libav";
version = "1.24.2";
version = "1.24.3";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-lig4ZI4Uzop4Miqxb4TH2E2Gpte+u2V0rAXeqEp8fJs=";
hash = "sha256-2cWxUkaKRcH6g1FBBCIJCnGScHrXTS4aQ2f1JU4YjZE=";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/gstreamer/rtsp-server/default.nix
View File

@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "gst-rtsp-server";
version = "1.24.2";
version = "1.24.3";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-5MhKeGdefv7zsm6cueLkJzGEIbStnuS1E2767rtrugw=";
hash = "sha256-YmKOzKeLj1tRxZpNYCxl6SBf/FDDyDzWH6sfY0i2NWU=";
};
outputs = [

4
pkgs/development/libraries/gstreamer/ugly/default.nix
View File

@ -25,13 +25,13 @@
stdenv.mkDerivation rec {
pname = "gst-plugins-ugly";
version = "1.24.2";
version = "1.24.3";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-RdqYvxBAyUcv1Z9icSgt4lo3IauFt4qq+BBJSVUPvvU=";
hash = "sha256-TJUTQcTGSGMLb+EjTsET2B3S0khSm/K1R44K0HfIDtM=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/gstreamer/vaapi/default.nix
View File

@ -24,11 +24,11 @@
stdenv.mkDerivation rec {
pname = "gstreamer-vaapi";
version = "1.24.2";
version = "1.24.3";
src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-zFq4yIRD4PW/I9YRC0qsM99Z5K5ib1NtlosWBcx7li8=";
hash = "sha256-hF8u/g3KjasjTd6PsJHaLNBqnSpoNCK1bctoiVT5Bw4=";
};
outputs = [

4
pkgs/development/libraries/gtk/3.x.nix
View File

@ -64,7 +64,7 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "gtk+3";
version = "3.24.41";
version = "3.24.42";
outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc";
outputBin = "dev";
@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs) version;
in fetchurl {
url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
sha256 = "sha256-R9phSHrzCHqUvEkpb9AlygvAL5bvBsVW58iYi9ZRtvo=";
sha256 = "sha256-UPifYVCS1N0Bu9dZcZ+L04Dl8Un2/XipRyXi3hEjd+I=";
};
patches = [

4
pkgs/development/libraries/gtk/4.x.nix
View File

@ -70,7 +70,7 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "gtk4";
version = "4.14.3";
version = "4.14.4";
outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ];
outputBin = "dev";
@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = with finalAttrs; "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz";
hash = "sha256-K+XIWL3vEQTTeEjJd5wIk3LI0xUD9u/EuU5TtUb8mkM=";
hash = "sha256-RDUYuX6DSPn2QwrENbEBD5psUgf03Gp81dJOOCDO5jM=";
};
depsBuildBuild = [

6
pkgs/development/libraries/jemalloc/default.nix
View File

@ -26,6 +26,12 @@ stdenv.mkDerivation rec {
url = "https://github.com/jemalloc/jemalloc/commit/d00ecee6a8dfa90afcb1bbc0858985c17bef6559.patch";
hash = "sha256-N5i4IxGJ4SSAgFiq5oGRnrNeegdk2flw9Sh2mP0yl4c=";
})
# fix linking with libc++, can be removed in the next update (after 5.3.0).
# https://github.com/jemalloc/jemalloc/pull/2348
(fetchpatch {
url = "https://github.com/jemalloc/jemalloc/commit/4422f88d17404944a312825a1aec96cd9dc6c165.patch";
hash = "sha256-dunkE7XHzltn5bOb/rSHqzpRniAFuGubBStJeCxh0xo=";
})
];
configureFlags =

5
pkgs/development/libraries/kerberos/krb5.nix
View File

@ -74,6 +74,11 @@ stdenv.mkDerivation rec {
postPatch = ''
substituteInPlace config/shlib.conf \
--replace "'ld " "'${stdenv.cc.targetPrefix}ld "
''
# this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
# necessary for FreeBSD code path in configure
+ ''
substituteInPlace ./config/config.guess --replace-fail /usr/bin/uname uname
'';
libFolders = [ "util" "include" "lib" "build-tools" ];

4
pkgs/development/libraries/ldb/default.nix
View File

@ -12,6 +12,7 @@
, docbook_xml_dtd_42
, cmocka
, wafHook
, buildPackages
, libxcrypt
, testers
}:
@ -62,6 +63,9 @@ stdenv.mkDerivation (finalAttrs: {
"--bundled-libraries=NONE"
"--builtin-libraries=replace"
"--without-ldb-lmdb"
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"--cross-compile"
"--cross-execute=${stdenv.hostPlatform.emulator buildPackages}"
];
# python-config from build Python gives incorrect values when cross-compiling.

4
pkgs/development/libraries/libev/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl
{ lib, stdenv, fetchurl, updateAutotoolsGnuConfigScriptsHook
, # Note: -static hasn’t work on darwin
static ? with stdenv.hostPlatform; isStatic && !isDarwin
}:
@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
sha256 = "1sjs4324is7fp21an4aas2z4dwsvs6z4xwrmp72vwpq1s6wbfzjh";
};
nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
configureFlags = lib.optional (static) "LDFLAGS=-static";
meta = {

Some files were not shown because too many files have changed in this diff Show More