Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-05-11 18:01:59 +00:00 committed by GitHub
commit 100cd84a08
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
146 changed files with 1408 additions and 630 deletions
maintainers
pkgs
applications
audio/ncspot
editors/emacs/elisp-packages
emulators
graphics
lightburn
oculante
misc
networking
avalanchego
browsers/opera
cluster
datovka
gns3
ids/suricata
instant-messengers/alfaview
mailreaders/tutanota-desktop
newsreaders/pan
sync/storj-uplink
office
mendeley
planify
radio
science/misc/snakemake
terminal-emulators/terminator
video/rtabmap
virtualization
build-support/lib
by-name
al
alephone-durandal
alephone-infinity
alephone-marathon
br/bruno
bu/bugstalker
ca
cl/cli11
fr/free42
gl/glsl_analyzer
go/go-passbolt-cli
ha/halo
hy/hyprland-workspaces
kc/kcl-cli
li
libation
litmusctl
ni/nim_lk
nr/nrr
on/onedriver
ot/oterm
pr/pragtical
sb/sbom-utility
su/superfile
ta/tailscale-nginx-auth
ue/ueberzugpp
wo/wowup-cf
xc/xcaddy
data
fonts/undefined-medium
icons/whitesur-cursors
development
compilers
interpreters/php
libraries
java/commons
libsolv
malcontent
rutabaga_gfx
python-modules
asyncio-dgram
binance-connector
boto3-stubs
dask-jobqueue
meilisearch
ollama
pydeck
pyexploitdb
rq
thriftpy2
types-pyopenssl
tools
analysis/stylelint
apko
biome
continuous-integration/drone
database/atlas
ent
faas-cli

View File

@ -17819,6 +17819,12 @@
fingerprint = "E628 C811 6FB8 1657 F706 4EA4 F251 ADDC 9D04 1C7E";
}];
};
sailord = {
name = "Sailord";
email = "sailord328@gmail.com";
github = "Sail0rd";
githubId = 55802415;
};
samalws = {
email = "sam@samalws.com";
name = "Sam Alws";
@ -20692,6 +20698,11 @@
githubId = 9870613;
name = "Hubert Mühlhans";
};
trishtzy = {
github = "trishtzy";
githubId = 5356506;
name = "Tricia Tan";
};
trobert = {
email = "thibaut.robert@gmail.com";
github = "trobert";
@ -21892,6 +21903,12 @@
github = "wr0belj";
githubId = 40501814;
};
wr7 = {
name = "wr7";
email = "d-wr7@outlook.com";
github = "wr7";
githubId = 53203261;
};
wraithm = {
name = "Matthew Wraith";
email = "wraithm@gmail.com";

View File

@ -20,16 +20,16 @@
rustPlatform.buildRustPackage rec {
pname = "ncspot";
version = "1.1.0";
version = "1.1.1";
src = fetchFromGitHub {
owner = "hrkfdn";
repo = "ncspot";
rev = "v${version}";
hash = "sha256-RgA3jV/vD6qgIVQCZ0Sm+9CST4SlqN4MUurVM3nIdh0=";
hash = "sha256-Sl4i9HFl+Dth9jmW6hPZzgh0Y35pRo1Xi9LRxCuSIP4=";
};
cargoHash = "sha256-8ZUgm1O4NmZpxgNRKnh1MNhiFNoBWQHo22kyP3hWJwI=";
cargoHash = "sha256-INgDavtBI75h+qVlxTncYu3su+SH/D7HTlThRHJzwkY=";
nativeBuildInputs = [ pkg-config ]
++ lib.optional withClipboard python3;

View File

@ -260,7 +260,7 @@
"s"
],
"commit": "966bfcfdd3b2e288576ffe363d676ad282902090",
"sha256": "0apcbfaa70kgrpjjsfbr0lg9lcfiijpx5bms4sbzc606vlnxxn0d"
"sha256": "0zmzn8rdn1q0dfql3awivhrxd1nrvqr6mb8gv2ynaldyidgsb487"
}
},
{
@ -1610,7 +1610,7 @@
"keyfreq"
],
"commit": "5c3c430b21bcf685c412cf5ceb3769f630082e4f",
"sha256": "14p9lmnrpsnx94ycvsqmfxnk5kws0cman4a6fbnikl35ma8zc01x"
"sha256": "0zjncby2884cv8nz2ss7i0p17l15lsk88zwvb7b0gr3apbfpcpa3"
}
},
{
@ -1895,7 +1895,7 @@
1033
],
"commit": "04fed0ef795bfe2482998c5b6f87c37c13fe8c50",
"sha256": "0klzdgicxfsfwg66a5lnlsfv4mpli6fikplk3qldpwz21652xsz9"
"sha256": "0kk571d7ww6j8y6krfsr9v5yvssz8gvfjq4xc3vsgvpzl6bdh8rl"
},
"stable": {
"version": [
@ -1904,7 +1904,7 @@
0
],
"commit": "0907961986a582ded514d54a8bfdf691f7bfaf86",
"sha256": "0klzdgicxfsfwg66a5lnlsfv4mpli6fikplk3qldpwz21652xsz9"
"sha256": "10hm8anw78n37pl9rz3dnjphrnsxf3fy00d008gayn70jfjl1433"
}
},
{
@ -2442,7 +2442,7 @@
0
],
"commit": "97c20b1fd9ad3f138e1100e3a837d05108c4c564",
"sha256": "1x4apig2hrvvy6pjciklmz5afpq5l4rmfjahc2wvyzs79abh0icx"
"sha256": "1wsvs756cbwbxlaxij352kman7196m39684m6sqnfb685cfrwzdj"
}
},
{
@ -3318,7 +3318,7 @@
806
],
"commit": "6ad8c6be4f44de0c33eab012e507320b732d4800",
"sha256": "0cq960q11lpic6zcw71z2ap80jzrzgcwwy2vwhgc1zwi8k8l9i4q"
"sha256": "1pg0xqzixw3nq68hsy263q7j76fggy6wqgmcl5yd0wfhbzd23qqz"
}
},
{
@ -3628,7 +3628,7 @@
0
],
"commit": "785f0bad0c73069e6c41ca543c29675785b614a8",
"sha256": "05q548dyb620kg12mgkmw6jpwbr2y2aqs5p7314y2c37khvw5irg"
"sha256": "1ja0q2z9kqkz3ycclgaw1ib83cjh6kym9lrikni0if3spbb0df3w"
}
},
{
@ -6746,7 +6746,7 @@
1821
],
"commit": "927257e97a602b6979a75028e8417bf1499582d4",
"sha256": "1vw1vpnxa4qxbdsmis8d0df3qhwr1c5h0q04rvwmyviixd729mlr"
"sha256": "1jbpf28918pjiqhw8rackv9r8iq9ydd3jw1zwwifznglmpyca7jk"
},
"stable": {
"version": [
@ -6754,7 +6754,7 @@
1
],
"commit": "927257e97a602b6979a75028e8417bf1499582d4",
"sha256": "1vw1vpnxa4qxbdsmis8d0df3qhwr1c5h0q04rvwmyviixd729mlr"
"sha256": "1jbpf28918pjiqhw8rackv9r8iq9ydd3jw1zwwifznglmpyca7jk"
}
},
{
@ -6835,7 +6835,7 @@
"flycheck"
],
"commit": "5bfd5f91b9f91e46158e0419c6bb5c350e7684a1",
"sha256": "0mb85g7bydd0nv3hjzvqb3d01cs4hg5846ibcznaqhsqk93pgm2h"
"sha256": "0nb6dbk8aclkq7jki52y4lwgbxg61xh1598l08yfv2l1ykhgg0n0"
}
},
{
@ -9075,7 +9075,7 @@
2201
],
"commit": "587b39ea7a1d786df5c04796d51bf2a5a4eda0d7",
"sha256": "14nxqlrza35l955zgc4yi9yaymd9slyyyjmbnbd831v8jlddngm9"
"sha256": "0bvg2vpak2bv3s7wc0zzrqb3pys5s7vi6rs7k7l4fmaj5amaq9vb"
}
},
{
@ -16469,7 +16469,7 @@
"seq"
],
"commit": "b2bcf2e6997a5ab3502baba9143af44ac2cc2eb3",
"sha256": "1gjdmdg496lkgm7xkgvfl4b4xir91kzn7sizyrgwdj845i9lfjmp"
"sha256": "0mfs261nzi5svxliy2yaxwhzgfb8my5f4580jizll1vkxi33c358"
},
"stable": {
"version": [
@ -16483,7 +16483,7 @@
"seq"
],
"commit": "1334f44725bd80a265de858d652f3fde4ae401fa",
"sha256": "1milqql0p9gp4dn9phn4fw1izf37wizpirvmzh5s71rwzrr6a9ix"
"sha256": "1h1lqrl3p9qgkicds8v44vdry19g53rya56hdj3cz5q8xj1nisn1"
}
},
{
@ -16713,7 +16713,7 @@
"s"
],
"commit": "0e6941e1832faafb2176238339667edd482acd95",
"sha256": "0xw475spfwq32nn5qz3gk22cggj1f5y245da9030vzi2jfb9vvid"
"sha256": "1ri022shrwiw10gdydm66c2xya1qxl449r5f8qadals7m4crczp2"
},
"stable": {
"version": [
@ -16728,7 +16728,7 @@
"s"
],
"commit": "0e6941e1832faafb2176238339667edd482acd95",
"sha256": "0xw475spfwq32nn5qz3gk22cggj1f5y245da9030vzi2jfb9vvid"
"sha256": "1ri022shrwiw10gdydm66c2xya1qxl449r5f8qadals7m4crczp2"
}
},
{
@ -21363,7 +21363,7 @@
0
],
"commit": "2ecd466ffa7a3157b9ddcd7545b6fb8ad308c976",
"sha256": "1y8rsc63nl4n43pvn283f1vcpqyjnv6xl60fwyscwrqaz19bsnl1"
"sha256": "1h5lssnc1am54hkprnp61bsj5fnm8j556q2gbhljfjgrdwnqv8ky"
}
},
{
@ -21985,7 +21985,7 @@
"ht"
],
"commit": "5123477396a562fae350a89fbed79464cc498bc9",
"sha256": "1bkiwg1wp3l904159gycdr83xkb3i0h2k0da7akzkwc957abvp8w"
"sha256": "0xd94cpqpv0yw70ajrvs69ygds62m40fk0m4s59zvdn5qs7ivj4k"
}
},
{
@ -23098,7 +23098,7 @@
0
],
"commit": "6d0c4203eb192d73d89261b3a9bad52951e394af",
"sha256": "0a89bp9vz8lzg5klhmzpfmc0mhqmx667ivr86ckkjhiwr2mmzq0s"
"sha256": "1rdmhsrlqn19a140i3099fp7f9wnlglp760rnrjp5p840wzfm74q"
}
},
{
@ -24019,7 +24019,7 @@
5
],
"commit": "dbace8d2250f84487d31b39050fcdc260fcde804",
"sha256": "0r9qmr2l5kjwh1frp0k87nyaf13f7f9fjjf9yf9z92djqapfm9dd"
"sha256": "1d9105ibaw858gqp19rx2m6xm3hl57vzsmdqir883cy46qpvwhki"
}
},
{
@ -24221,7 +24221,7 @@
"hydra"
],
"commit": "79e422be55c72bfe36d2ec8a838f19d1cc8d101a",
"sha256": "01zdha3p7wsf98yayvwgpd4arcs7yhz62yk1nyq9n13hvmqg7dvk"
"sha256": "14hb3d76y4n8qvfl74v9hzgl6774bqdcmsa0npv3gs144fbx9prk"
}
},
{
@ -28860,7 +28860,7 @@
"spinner"
],
"commit": "b80b773238719fa7160e598219f300dfbc4db06d",
"sha256": "1w2xh207rm4a242iykhzsp3r3s8gv1cw8qr3cvwfbkxqrzmki7z4"
"sha256": "1whgbwdv3zrhxq2casxj784bx95j0vzlpnvi51i4xdxpdf77g521"
},
"stable": {
"version": [
@ -31629,7 +31629,7 @@
0
],
"commit": "f0add6820d250875f7d7c21aa5d813dc73dbcf96",
"sha256": "0zg52b3hl0rp9hjz04546kngssxs0l64dm01bwp9hapy7pichbci"
"sha256": "18bnw6yb41ki1xvkhi07v7fqx3var928majgd6613ra9nirnyqnj"
}
},
{
@ -32979,7 +32979,7 @@
"dash"
],
"commit": "7aa2e1715e6ea286b08bb446d2d9915afa0fdf03",
"sha256": "0b2a9qvqxhm2z4zb4qg6d5h0pp82hdmjl8qnk03zr1awi5angiyv"
"sha256": "11wag6sgfr62yj4zjr9n71kxd3kfa105l0rpbag47qmac2wsg7h5"
}
},
{
@ -33125,7 +33125,7 @@
"switch-buffer-functions"
],
"commit": "feb0fbf1fd4bdf220ae2d31ea7c066d8e62089f9",
"sha256": "0pfnp7gw75hfhsy7jizp622s6yv61h3k2s0l2g33i801ar6abwm5"
"sha256": "1wb3xm45g77daw2ncs8a8w0m8d2hi591jmzwy5xli1zgrr5mm8h3"
},
"stable": {
"version": [
@ -33137,7 +33137,7 @@
"switch-buffer-functions"
],
"commit": "7539654e4a72edcc5bba07a101961e5bf0a9d449",
"sha256": "0pfnp7gw75hfhsy7jizp622s6yv61h3k2s0l2g33i801ar6abwm5"
"sha256": "11zpqwh1mlfifbgnvhc63bvnhg340jgxssm3m43hr1sxsyb52lh6"
}
},
{
@ -37773,7 +37773,7 @@
"xelb"
],
"commit": "047c83aa6b54bfb6ca8cac4d3ea18542611cef77",
"sha256": "1bwnw6qacdrm54lx4hc36f9lnidfw1wl399n7wasa24n9wrbr8z0"
"sha256": "08g7ly2syvmjgnj8qjgw5cva3wk08jmqnd85h49f76y0clcx6dsx"
}
},
{
@ -39486,7 +39486,7 @@
4
],
"commit": "ba63f0591c3be1644ee7ee972430c74b5d346579",
"sha256": "1yjfvb2vn5pmrq5fw4sfx1lfkbnkwlc160izpvkrf9ww9xsas6al"
"sha256": "014vbzxz1jmm83a5mg4zsyxm8nw96n8s2l7h3myhrn880d9xnqgg"
}
},
{
@ -39578,7 +39578,7 @@
929
],
"commit": "608dd1120d35b02a02570f024c585f7569508586",
"sha256": "08yq6hncy8vqa2plpxa4gkq244wig2pd05w4ws0j8nmpwcwl6zki"
"sha256": "1gcqllsdlkkmgrwxwczxsj4zllwpprw7df479j6sj563j6qds53r"
}
},
{
@ -40412,7 +40412,7 @@
"flycheck"
],
"commit": "0eb3dd630391e4d8a26e09c9032cfb9f4bd71e08",
"sha256": "1zk3rjabmpfl37zrnnim4h6cbnwp9vg8yjwirw8hjsayfh1pp0kk"
"sha256": "1nrhybhpkv3rvks1vqzahfjg0vva76kakd99wpdqsa60ylb5i4jw"
},
"stable": {
"version": [
@ -41583,7 +41583,7 @@
"flycheck"
],
"commit": "54744a78d06373404933fedc3ca836916e83de51",
"sha256": "1vvsswadiks9mpb49vz2q8z69wq0jalsvgalhn10k3pyz7p0abnd"
"sha256": "1zdvan6l2s97s7swnccq21z1ja8vl64l757j3hg50ipq8j5yy9dl"
},
"stable": {
"version": [
@ -41594,7 +41594,7 @@
"flycheck"
],
"commit": "54744a78d06373404933fedc3ca836916e83de51",
"sha256": "1vvsswadiks9mpb49vz2q8z69wq0jalsvgalhn10k3pyz7p0abnd"
"sha256": "1zdvan6l2s97s7swnccq21z1ja8vl64l757j3hg50ipq8j5yy9dl"
}
},
{
@ -46888,7 +46888,7 @@
14
],
"commit": "362f1d1189c090ece8b94f6a51680f74b1ff40f9",
"sha256": "1gsvl0r6r385lkv0z4gkxirz9as6k0ghmk402zsyz8gvdpl0f3jw"
"sha256": "15bmrhpg4kh6dv6bwzxs15wf4rm7a3g09z6ram762hf2kinfiihy"
}
},
{
@ -46949,7 +46949,7 @@
"geiser"
],
"commit": "f76b53dbc1465dbd799e29bdcd2be34cc1603f50",
"sha256": "1i4ywb4ggq884p2lbpmp6y53l8ys5ajma7sk21zxi1jx28nb01nm"
"sha256": "097gyi299fyjy4v22l2l95mzs319ljr9jas4n6893vghac3rf1r6"
}
},
{
@ -47007,7 +47007,7 @@
"geiser"
],
"commit": "42376b74ae0ad84d02c26560dfd9181493dcccd7",
"sha256": "1aqsvmk1hi7kc3j4h8xlza7c6rwm71v98fv5wpw8kmyj9vsp49wx"
"sha256": "04gwd9qa0785zfr6m9a5443ilgvyz05l06cb1waicf83sgp8xl32"
}
},
{
@ -47621,7 +47621,7 @@
2
],
"commit": "fa81e915c256271fa10b807a2935d5eaa4700dff",
"sha256": "1jiglrlhrph57p5kkm1qlqihwl6z7h9qh16qmmd5783ynksnbxp3"
"sha256": "1yf6yipvhhna29mzaan5vb3d5qvbrkp2awr5diyf381mvxgk8akh"
}
},
{
@ -48001,7 +48001,7 @@
"s"
],
"commit": "8a403005ea7f7611bb1bfd829eeefe5a4f10bb40",
"sha256": "02hag6jd55mqf0n90p0hvihmqjvd0cdlpm5knsxk3cll7fp0kkkr"
"sha256": "0w5xl9r7sbhlwxzg391x50pnsjmjjakn761v3qg0lj6xhv23sdl5"
}
},
{
@ -48224,7 +48224,7 @@
0
],
"commit": "ea49e2e005af977a08331f8caa8f64d102b3b932",
"sha256": "05bkpg7xz8644np9imsj5ms821sbsb784ap5fjdnnn69kllz0d33"
"sha256": "0prx0xbnhhp46c09nnzpz07jgr3s5ngrw8zjksf48abr8acwywfv"
}
},
{
@ -48914,7 +48914,7 @@
"yaml-mode"
],
"commit": "2651e831aed84ee2512245952fac94901b086549",
"sha256": "0yd6s5vy5afkigm87xyh1nnwljplx1wdn5h02224ica0py48fzhd"
"sha256": "16fb4r3vq8xkzl911v7gaky95w1agfxjlpaxpjmidwx48rbcar59"
}
},
{
@ -48945,7 +48945,7 @@
"gitlab-ci-mode"
],
"commit": "30ea0eab74b24818f187242b079845785035e967",
"sha256": "1w1simnlffg56j79gal1qf1nlav9f8fmr2zfswfrmcv6cac6fhj9"
"sha256": "0awv24znkxs0h8pkj4b5jwjajxkf1agam09m5glr8zn5g3xbj798"
}
},
{
@ -48994,7 +48994,7 @@
"helm"
],
"commit": "5fe0a66642da6f4e7ba9e1e3a96572c7f1876e37",
"sha256": "1mxkcnjgazc1pyjbqqfnhc9phpyrgah960avm2fmi7m9n5v8cf0w"
"sha256": "1c5js19zyb1z61hapvbfcl5jhrjqij46cxldgqij6al0scw44dga"
},
"stable": {
"version": [
@ -49007,7 +49007,7 @@
"helm"
],
"commit": "5fe0a66642da6f4e7ba9e1e3a96572c7f1876e37",
"sha256": "1mxkcnjgazc1pyjbqqfnhc9phpyrgah960avm2fmi7m9n5v8cf0w"
"sha256": "1c5js19zyb1z61hapvbfcl5jhrjqij46cxldgqij6al0scw44dga"
}
},
{
@ -49548,7 +49548,7 @@
"gnus"
],
"commit": "44ebe0241a19f4052cd427dff408206542aa3c8f",
"sha256": "0h7w5wrkrd0jw8nmgbkzq8wam7ynvy7flhjg4frphzmimlhysli2"
"sha256": "1fqkclbddwfqywvkrb7l2cpibapxrk82ikdpbxapj09iwyn3ijlz"
},
"stable": {
"version": [
@ -49559,7 +49559,7 @@
"gnus"
],
"commit": "210c70f0021ee78e724f1d8e00ca96e1e99928ca",
"sha256": "0h7w5wrkrd0jw8nmgbkzq8wam7ynvy7flhjg4frphzmimlhysli2"
"sha256": "08j8x0iaz5s9q0b68d8h3153w0z6vak5l8qgw3dd1drz5p9xnvyw"
}
},
{
@ -62193,7 +62193,7 @@
"islisp-mode"
],
"commit": "423b84fe4cc6944e36971225b3e19c888e7e4690",
"sha256": "174zjlgcikaydgx5npsbwqblzc61pxnnpw50nia8jhh8175j2sbl"
"sha256": "0m3vxm4q5kbdn3q524z50zvwdk63gixaqxw9qxa6d175iv0xfwv8"
},
"stable": {
"version": [
@ -62205,7 +62205,7 @@
"islisp-mode"
],
"commit": "18258f7134cfd8e0bd12538351b3cd23ae44cec1",
"sha256": "174zjlgcikaydgx5npsbwqblzc61pxnnpw50nia8jhh8175j2sbl"
"sha256": "1s6alrv1hfi1plj5lh826j0h71xvm2v092kglj3yvy34g73dgrna"
}
},
{
@ -62700,7 +62700,7 @@
2108
],
"commit": "8f13262ebcb3f271f1d188584d04ca6d87214111",
"sha256": "0cqc23y9n63a7kl2p1zrfcsxnclfxcszfmbh2hmbrs6q05ys0kzg"
"sha256": "1aa6c9rswwgxyh8js0bnjrzcmyqc1az7vr5m68lbbmsbjb495awq"
}
},
{
@ -63394,7 +63394,7 @@
1
],
"commit": "18258f7134cfd8e0bd12538351b3cd23ae44cec1",
"sha256": "174zjlgcikaydgx5npsbwqblzc61pxnnpw50nia8jhh8175j2sbl"
"sha256": "1s6alrv1hfi1plj5lh826j0h71xvm2v092kglj3yvy34g73dgrna"
}
},
{
@ -64631,7 +64631,7 @@
1017
],
"commit": "c2ad37e2ada14b5551a83211cc4692b39be4e5fb",
"sha256": "18ibnf995yymgxv7xz7xql6lnix3sxn6pn659b1vp00g5d5yl2jf"
"sha256": "05izmyp875pfbpygy54ybwkxnjv3fmam024pkjd70i5m6xmg4wi6"
},
"stable": {
"version": [
@ -70952,7 +70952,7 @@
2206
],
"commit": "2b719baf0ccba79e28fcb3c2633c4849d976ac23",
"sha256": "1hlqairbjlrcbzb4r5fjm80znr9hdgny3vgm27dwwxxa340m0r6i"
"sha256": "0rxqam6cgi404m8n45mw73j3jdd2gb3iwpmyyixbv3cxfb7y1b0l"
},
"stable": {
"version": [
@ -70961,7 +70961,7 @@
4
],
"commit": "2b719baf0ccba79e28fcb3c2633c4849d976ac23",
"sha256": "1hlqairbjlrcbzb4r5fjm80znr9hdgny3vgm27dwwxxa340m0r6i"
"sha256": "0rxqam6cgi404m8n45mw73j3jdd2gb3iwpmyyixbv3cxfb7y1b0l"
}
},
{
@ -75866,7 +75866,7 @@
"test-simple"
],
"commit": "1334f44725bd80a265de858d652f3fde4ae401fa",
"sha256": "1milqql0p9gp4dn9phn4fw1izf37wizpirvmzh5s71rwzrr6a9ix"
"sha256": "1h1lqrl3p9qgkicds8v44vdry19g53rya56hdj3cz5q8xj1nisn1"
}
},
{
@ -77593,7 +77593,7 @@
1
],
"commit": "beb22e85f6073a930f7338a78bd186e3090abdd7",
"sha256": "1yf21gm4ziplmgx8yn7jqq45mwfiindbrman7fc5b9ifq78x9ryn"
"sha256": "1dhljrh44dsnixd8hbb11k6dgap8r8n7jknhfy2afdzq889fih74"
}
},
{
@ -78457,7 +78457,7 @@
1309
],
"commit": "d1c024fdf9543fbc0101cd2c6e8b248378f591cd",
"sha256": "1xvx26xbd0ylih6xyvwylzjl7z5dbw9sv828p5zykr6fg2kz9nb3"
"sha256": "11r54zj0q14f88wl6bp46gz4j2wv6cb37d42b2hfvhkgh88a71c5"
},
"stable": {
"version": [
@ -78466,7 +78466,7 @@
1
],
"commit": "d5b6b5b3552a5b84f4f887e2f805d9e72747fab2",
"sha256": "1xvx26xbd0ylih6xyvwylzjl7z5dbw9sv828p5zykr6fg2kz9nb3"
"sha256": "19yh93kkyailczv1yyg7jhmzwl768sg0rk4as5kgqays87h9bnfn"
}
},
{
@ -79386,7 +79386,7 @@
812
],
"commit": "98110bb9c300fc9866dee8e0023355f9f79c9b96",
"sha256": "1ysj9x9m1lxg1gy0z7y07qsi3g26qfqdwwa8kjkf40pchb2wxg0s"
"sha256": "080s96jkcw2p288sp1vgds91rgl693iz6hi2dv56p2ih0nnivwlg"
}
},
{
@ -82329,7 +82329,7 @@
0
],
"commit": "7825f88cb881a84eaa5cd1689772819a18eb2943",
"sha256": "0f8s7mhcs1ym4an8d4dabfvhin30xs2d0c5gv875hsgz8p3asgxs"
"sha256": "009did3i3i8yi0virq606l02w1mw0gdyiqablqg7m368gx0gfvh5"
}
},
{
@ -82407,7 +82407,7 @@
0
],
"commit": "dfe065acdd06be176fce3ab150fae699b2ad1a13",
"sha256": "1nqxw9s41ln91gjrglrbyhqasakgk0542ymhbwivw9l19yyizmaz"
"sha256": "0m5rfwp2y8iz7lrshdy09nk6dhrd7bgwb0761cmz1ky8w6f3di7v"
}
},
{
@ -83168,7 +83168,7 @@
1249
],
"commit": "44d506105989873dc1725e0cfc675925b35c9c98",
"sha256": "1g030806d2l238sr173ypdkkq0g8kf8qdp7a1ls5d3rw0bng4ds1"
"sha256": "0lgz0sknnrxmc7iy4lniday1nwpz4q841c3w2hm72aiwn5z21h22"
}
},
{
@ -87315,7 +87315,7 @@
"seq"
],
"commit": "e55415221eedba2f2bd37a30cb71c842e344b5ee",
"sha256": "079x6rcz50rpw0vdq5q2kjpixz95k9f3j9dwk91r5111vvr428w3"
"sha256": "0gjkl8j8jrimg45z9bsfkkbvmxsplh3nyqgr8g8d5mqm0w9b4pn3"
},
"stable": {
"version": [
@ -87329,7 +87329,7 @@
"seq"
],
"commit": "4c114489e682e514e79701045d541ab6f3dc3fb4",
"sha256": "079x6rcz50rpw0vdq5q2kjpixz95k9f3j9dwk91r5111vvr428w3"
"sha256": "13y302lyscdqrba1sfx60yf5ji2xi7fbsvjsjbw7hiz63kg6rccy"
}
},
{
@ -88091,7 +88091,7 @@
"jami-bot"
],
"commit": "020b03f299dad438f65d7bcbf93553b273fd7c33",
"sha256": "0fj166qawhnjbc14237fj8ph4f4xdjka7p8r2gxkfq6h0z101nr2"
"sha256": "18nhkmmrzs6i6px23c88wlml0gn43b38zfvpwq8bnabq3ak6q7j2"
},
"stable": {
"version": [
@ -88444,7 +88444,7 @@
9
],
"commit": "edf9f6f7254f72be939daf92942f76f44b72d32d",
"sha256": "0ijlmfq6dbdmk3jpl87g4knk4l76yxf63nmk3n2nll3v3swbk22g"
"sha256": "0jmavx9cd49y7lqb0zjpfyslqfd21a1anhpb6n6ksrxn65q6pf9q"
}
},
{
@ -88947,7 +88947,7 @@
"ov"
],
"commit": "b95b6a7ed9289637cb512232470633b330ca9713",
"sha256": "0gjvd7xd9kl06cgdyya2qbl7r4a9y4zfq1ci0109w5axs3zjin1m"
"sha256": "03x3n2ywgk2x7slpzy26bw3l9l000pd964z0yifvf9fqhpbk5d0r"
}
},
{
@ -89179,7 +89179,7 @@
2
],
"commit": "549fa6969660dcf0cf9bca5b7341d0cb48ec3b77",
"sha256": "0ksj6hssyr44qnvb32qj9lrq825ivvndhck9gzx4h7gbxmvq12a4"
"sha256": "12s74if74vw8q5awgrk0d1244ysfgb9kw3dxhypsccsbf413jmii"
}
},
{
@ -89556,7 +89556,7 @@
"org-ref"
],
"commit": "abcd622e4edaa5e4480bcd1e7e4953f67c90e036",
"sha256": "1467vskijg2n8k7fa2jj2hz8xr2s04r8a89521wmz54cza21g5j4"
"sha256": "08ia6gn0x0yydl28dhghifyxz0mrn0asllqg4s449gaz729cxqkd"
}
},
{
@ -90949,7 +90949,7 @@
"org-ql"
],
"commit": "a7c386ff134c71fd4f1f042e320751f077d57ddb",
"sha256": "11xbm6161rd5kv2bffqw678a7bymclvhpmm1qjxsvmi8bhfk1ls0"
"sha256": "1xc9g82pmd6fl48bbibwp5rb044cj2j0gw9d6qvn73pqdg8mj9jy"
}
},
{
@ -93021,7 +93021,7 @@
"s"
],
"commit": "e8cd440632fd46812d7311360f565828a12380b7",
"sha256": "0v2lrmak1lhaccwm2a68z4w554ng38wpk0sbw2qaj8qn03gv9dn4"
"sha256": "118km0hgxf1nss765cnykqyymjhg30pim9qjyxl31v07khr1d373"
}
},
{
@ -101079,7 +101079,7 @@
2031
],
"commit": "d76c5d5589a4f8a94cc5537686d9a3b46ea7cc59",
"sha256": "1bkkgs2agy00wivilljkj3a9fsb2ba935icjmhbk46zjc6yf3y6q"
"sha256": "03872n1v5qqqblviq9sf2ml6ibs50mcjrh0i35sb0m7l202nh52b"
},
"stable": {
"version": [
@ -101087,7 +101087,7 @@
8
],
"commit": "708cae8e67dbae293c7c4be0ca5e49d76fac6714",
"sha256": "1bkkgs2agy00wivilljkj3a9fsb2ba935icjmhbk46zjc6yf3y6q"
"sha256": "1v48i37iqrrwbyy3bscicfq66vbbml4sg0f0n950bnk0qagjx8py"
}
},
{
@ -102188,7 +102188,7 @@
0
],
"commit": "906b0a107f7bcfe6e32bcfedb977e6f0f99fda59",
"sha256": "17clkgs94dgq5nsjlwkr52m5s446ibfss3qc8a8m0zaz6j4f8l1m"
"sha256": "0d7hc2llr9dkjyfgyyjb2k72rny0j395a29pqgqgqyrwcn8b1py1"
}
},
{
@ -102305,7 +102305,7 @@
"python"
],
"commit": "e606469aafec2e6beda8c589540b88a5a6f6f33f",
"sha256": "0vyipfsppissa87pdnbksamdby0yl2q8nzawqivv6smn33jp6vsn"
"sha256": "00i7cc4r7275l22k3708xi4hqw2j44yivdb1madzrpf314v3kabr"
}
},
{
@ -105645,7 +105645,7 @@
1940
],
"commit": "4aab5a5be16b69b47ef5e67d02782df5e41dbd7b",
"sha256": "1zq4nnp3yqv46129kazm76bvdqvjjhlrfg95bkdxvkd7qrdjc9a3"
"sha256": "1pancvhm4g4010814jy1cdhdrjh5hlig2j31fcsa5jn331d7rj6g"
},
"stable": {
"version": [
@ -105654,7 +105654,7 @@
0
],
"commit": "4aab5a5be16b69b47ef5e67d02782df5e41dbd7b",
"sha256": "1zq4nnp3yqv46129kazm76bvdqvjjhlrfg95bkdxvkd7qrdjc9a3"
"sha256": "1pancvhm4g4010814jy1cdhdrjh5hlig2j31fcsa5jn331d7rj6g"
}
},
{
@ -105802,7 +105802,7 @@
0
],
"commit": "c7c6b726806df7e8cb25a41b213a207850c91cb7",
"sha256": "18rba101m9vmjl4mf3x0k7wvbgn6qmay9la745vzpr3lx1f4nn98"
"sha256": "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5"
}
},
{
@ -105999,7 +105999,7 @@
"web-mode"
],
"commit": "6cf58cf04fee933113857af07414b3f27c24b505",
"sha256": "0b3gqs1lsk80shirsc41zajzjbg1sgzksmnfazffx88h612p7ygd"
"sha256": "0s3hs0w6hz8vx4172mfraiqfjhd1a9h1w61ra6fklc5fjf3y8pn8"
},
"stable": {
"version": [
@ -106011,7 +106011,7 @@
"web-mode"
],
"commit": "6cf58cf04fee933113857af07414b3f27c24b505",
"sha256": "0b3gqs1lsk80shirsc41zajzjbg1sgzksmnfazffx88h612p7ygd"
"sha256": "0s3hs0w6hz8vx4172mfraiqfjhd1a9h1w61ra6fklc5fjf3y8pn8"
}
},
{
@ -106269,7 +106269,7 @@
4
],
"commit": "71e475ab35555e0a1eca26d73acf1ced911e422e",
"sha256": "0y18i4ly61jyvxymvgjr99arhxfn5y5s659jnqf4gvyp3d671dkf"
"sha256": "0x3mmf4gq4d0cqfqbkrrpwhayvmplacck0zc9nlzcn35y17jzpcz"
}
},
{
@ -108372,7 +108372,7 @@
"s"
],
"commit": "91c56311b48a26aa6ef5a113b0a828e174059b0a",
"sha256": "10ikd6ksz5adpldyx9h8s3qnwc488rqixzwnd0rjjwqigmllj9lb"
"sha256": "1iyq8m75gzyx2ww919i4zl63gajsaczgwax214a1jgf8x91j590k"
}
},
{
@ -110039,7 +110039,7 @@
"s"
],
"commit": "9b8cfb59a2dcee8b39b680ab9adad5ecb1f53c0b",
"sha256": "1xnby24gpxij1z03wvx89s459jw0f8bwhgi80xvdq8gxhbbz2w7a"
"sha256": "0kx0c4syd7k6ff9j463bib32pz4wq0rzjlg6b0yqnymlzfr1mbki"
}
},
{
@ -110666,7 +110666,7 @@
"rtm"
],
"commit": "37c5feffea7c9b571279b6f549d06cf9c0720273",
"sha256": "1kkhnsxr8zrb21k4ckyg69nsndwy4zdkvfw2drk4v1vnbgx8144f"
"sha256": "0rwvlhwg66ny0rm972wjfz41ck9kqmbax49wkagrkimm1cdrjfia"
}
},
{
@ -111983,7 +111983,7 @@
"dash"
],
"commit": "d3b616843167f04b8a9f53dd25e84818c9f6fbce",
"sha256": "0gadjaq39g8zsh3lvbx29nm2lgyzna2x435xyf7rb89ly4v22wa6"
"sha256": "04vv9swkn3l2lcdb4ncmc6vr3967mglfgiabn1978gyhv4xp9nwm"
},
"stable": {
"version": [
@ -119401,7 +119401,7 @@
9
],
"commit": "0505a7c0d306632972f29e584e83e0cd58eba2ce",
"sha256": "04b6lyrn9hj754ykb07ks60c602h5gla11scyisnzga662li16ib"
"sha256": "0k4jpfc9m6834gng6w4zab8jh0d4i3dh5yvn89mlznsb9r9d6148"
}
},
{
@ -120012,7 +120012,7 @@
"s"
],
"commit": "a715f7f2df416b8a6c827a9493ce7004180a3a4f",
"sha256": "188cdgic25wrb4jdgdcj070a0pxsh3m0rd9d2r6i1s1n1nalrs6g"
"sha256": "08awv1vbqg0x0h7f036sh07vypm8lq6b5g36gq9dmyfaqci9ccw6"
}
},
{
@ -120056,7 +120056,7 @@
"base32"
],
"commit": "927257e97a602b6979a75028e8417bf1499582d4",
"sha256": "1vw1vpnxa4qxbdsmis8d0df3qhwr1c5h0q04rvwmyviixd729mlr"
"sha256": "1jbpf28918pjiqhw8rackv9r8iq9ydd3jw1zwwifznglmpyca7jk"
}
},
{
@ -122342,7 +122342,7 @@
0
],
"commit": "c2f4870aff70efe70a8d1b089e56d3a2d6d048b9",
"sha256": "14ybav1f82m2gsxkciwlc0pm01ihqqaqq6arnjqvgxdnw0z6qniq"
"sha256": "0i6jfr4l7mr8gpavmfblr5d41ck8aqzaf4iv1qk5fyzsb6yi0nla"
}
},
{
@ -124707,7 +124707,7 @@
"outshine"
],
"commit": "9cb2354874608d971be407ad9299ed918a6c061a",
"sha256": "1qfjwsxi3w2gdl258jbk5d3z645gs6zccxx2iah54zbgql17pgj9"
"sha256": "0gak3gvqw1pvall2rx82npil283z83aq79w5pw2a5rhi8a3imha4"
},
"stable": {
"version": [
@ -124720,7 +124720,7 @@
"outshine"
],
"commit": "5202db4c6a511a90a950a723293d11d55ec05264",
"sha256": "1qfjwsxi3w2gdl258jbk5d3z645gs6zccxx2iah54zbgql17pgj9"
"sha256": "1ygx8g9cxyyhhpcqan1ca4g741s3dd141bcmp6jjqbjfn2gqraz6"
}
},
{
@ -131180,7 +131180,7 @@
"request"
],
"commit": "98323098c37a444de49cfef44f1506e9386e8c5f",
"sha256": "18hi6m2ngl9yz599q5bhifafi4vz1adc06bjl0bhb3rs62vbkwk2"
"sha256": "1zr67h0w49rsi84mgf6jdili28h8782q6vjl8za0iq1hcx9zqxyf"
}
},
{

View File

@ -419,10 +419,10 @@
"src": {
"owner": "libretro",
"repo": "mame2000-libretro",
"rev": "1472da3a39ab14fff8325b1f51a1dfdb8eabb5c8",
"hash": "sha256-Nd5OqkoMJZ8TzEZGqDT0YX6lHK/H3I5EqJ841PteLi8="
"rev": "905808fbcc3adf8c610c1c60f0e41ce4b35db1c5",
"hash": "sha256-2J3QGlSb4YhDZND4T0wmt9zzDjOuNiscsMxn9zA1TtI="
},
"version": "unstable-2023-10-31"
"version": "unstable-2024-05-07"
},
"mame2003": {
"fetcher": "fetchFromGitHub",
@ -652,11 +652,11 @@
"src": {
"owner": "jpd002",
"repo": "Play-",
"rev": "9f8d623f5d7e6a9bb6fa7ff30ce4d5b1fdf72a1e",
"hash": "sha256-DtPIAQGHXR3urmKeFXNfKIdqQVU3HrrH6M28Ctwj3eI=",
"rev": "700a44a1548d099705c901203414724518c90d43",
"hash": "sha256-OZO8vVA2B/SdckC2Rm/v35cdJDzkpdU9lJhFYEyyl1U=",
"fetchSubmodules": true
},
"version": "unstable-2024-05-01"
"version": "unstable-2024-05-05"
},
"ppsspp": {
"fetcher": "fetchFromGitHub",

View File

@ -12,10 +12,9 @@
with import ./util.nix { inherit lib; };
let
patches' = patches;
prevName = pname;
prevPlatforms = platforms;
prevConfigFlags = configureFlags;
setupHookDarwin = makeSetupHook {
name = "darwin-mingw-hook";
substitutions = {
@ -23,30 +22,37 @@ let
mingwGccsSuffixSalts = map (gcc: gcc.suffixSalt) mingwGccs;
};
} ./setup-hook-darwin.sh;
darwinUnsupportedFlags = [ "alsaSupport" "cairoSupport" "dbusSupport" "fontconfigSupport" "gtkSupport" "netapiSupport" "pulseaudioSupport" "udevSupport" "v4lSupport" "vaSupport" "waylandSupport" "x11Support" "xineramaSupport" ];
darwinUnsupported = builtins.any (name: builtins.getAttr name supportFlags) darwinUnsupportedFlags;
darwinFrameworks = lib.optionals stdenv.isDarwin (
toBuildInputs pkgArches (pkgs: with pkgs.buildPackages.darwin.apple_sdk.frameworks; [
CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration PCSC Security
ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon
])
);
# Building Wine with these flags isnt supported on Darwin. Using any of them will result in an evaluation failures
# because they will put Darwin in `meta.badPlatforms`.
darwinUnsupportedFlags = [
"alsaSupport" "cairoSupport" "dbusSupport" "fontconfigSupport" "gtkSupport" "netapiSupport" "pulseaudioSupport"
"udevSupport" "v4lSupport" "vaSupport" "waylandSupport" "x11Support" "xineramaSupport"
];
badPlatforms = lib.optional (!supportFlags.mingwSupport || lib.any (flag: supportFlags.${flag}) darwinUnsupportedFlags) "x86_64-darwin";
in
stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
builder = buildScript;
}) // (lib.optionalAttrs stdenv.isDarwin {
postConfigure = ''
# dynamic fallback, so this shouldnt cause problems for older versions of macOS and will
# provide additional functionality on newer ones. This can be removed once the x86_64-darwin
# SDK is updated.
sed 's|/\* #undef HAVE_MTLDEVICE_REGISTRYID \*/|#define HAVE_MTLDEVICE_REGISTRYID 1|' \
-i include/config.h
'';
postBuild = ''
# The Wine preloader must _not_ be linked to any system libraries, but `NIX_LDFLAGS` will link
# to libintl, libiconv, and CoreFoundation no matter what. Delete the one that was built and
# rebuild it with empty NIX_LDFLAGS.
for preloader in wine-preloader wine64-preloader; do
rm loader/$preloader &> /dev/null \
&& ( echo "Relinking loader/$preloader"; make loader/$preloader NIX_LDFLAGS="" NIX_LDFLAGS_${stdenv.cc.suffixSalt}="" ) \
|| echo "loader/$preloader not built, skipping relink."
done
'';
}) // rec {
stdenv.mkDerivation (finalAttrs:
lib.optionalAttrs (buildScript != null) { builder = buildScript; }
// lib.optionalAttrs stdenv.isDarwin {
postBuild = ''
# The Wine preloader must _not_ be linked to any system libraries, but `NIX_LDFLAGS` will link
# to libintl, libiconv, and CoreFoundation no matter what. Delete the one that was built and
# rebuild it with empty NIX_LDFLAGS.
for preloader in wine-preloader wine64-preloader; do
rm loader/$preloader &> /dev/null \
&& ( echo "Relinking loader/$preloader"; make loader/$preloader NIX_LDFLAGS="" NIX_LDFLAGS_${stdenv.cc.suffixSalt}="" ) \
|| echo "loader/$preloader not built, skipping relink."
done
'';
}
// {
inherit version src;
pname = prevName + lib.optionalString (wineRelease != "stable" && wineRelease != "unstable") "-${wineRelease}";
@ -95,10 +101,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ]
++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ]
++ lib.optionals (openglSupport && !stdenv.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ]
++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [
CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration PCSC Security
ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon
])
++ lib.optionals stdenv.isDarwin darwinFrameworks
++ lib.optionals (x11Support) (with pkgs.xorg; [
libX11 libXcomposite libXcursor libXext libXfixes libXi libXrandr libXrender libXxf86vm
])
@ -107,29 +110,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
mesa # for libgbm
])));
patches = [ ]
++ lib.optionals stdenv.isDarwin [
# Wine uses `MTLDevice.registryID` in `winemac.drv`, but that property is not available in
# the 10.12 SDK (current SDK on x86_64-darwin). That can be worked around by using selector
# syntax. As of Wine 8.12, the logic has changed and uses selector syntax, but it still
# uses property syntax in one place. The first patch is necessary only with older
# versions of Wine. The second is needed on all versions of Wine.
(lib.optional (lib.versionOlder version "8.12") ./darwin-metal-compat-pre8.12.patch)
(lib.optional (lib.versionOlder version "8.18") ./darwin-metal-compat-pre8.18.patch)
(lib.optional (lib.versionAtLeast version "8.18") ./darwin-metal-compat.patch)
# Wine requires `qos.h`, which is not included by default on the 10.12 SDK in nixpkgs.
./darwin-qos.patch
]
++ patches';
# Because the 10.12 SDK doesnt define `registryID`, clang assumes the undefined selector returns
# `id`, which is a pointer. This causes implicit pointer to integer errors in clang 15+.
# The following post-processing step adds a cast to `uint64_t` before the selector invocation to
# silence these errors.
postPatch = lib.optionalString stdenv.isDarwin ''
sed -e 's|\(\[[A-Za-z_][][A-Za-z_0-9]* registryID\]\)|(uint64_t)\1|' \
-i dlls/winemac.drv/cocoa_display.m
'';
inherit patches;
configureFlags = prevConfigFlags
++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ]
@ -140,7 +121,9 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
# them to the RPATH so that the user doesn't have to set them in
# LD_LIBRARY_PATH.
NIX_LDFLAGS = toString (map (path: "-rpath " + path) (
map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ buildInputs)
map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ]
# Avoid adding rpath references to non-existent framework `lib` paths.
++ lib.subtractLists darwinFrameworks finalAttrs.buildInputs)
# libpulsecommon.so is linked but not found otherwise
++ lib.optionals supportFlags.pulseaudioSupport (map (x: "${lib.getLib x}/lib/pulseaudio")
(toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ])))
@ -210,9 +193,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) {
fromSource
binaryNativeCode # mono, gecko
];
broken = stdenv.isDarwin && !supportFlags.mingwSupport;
description = "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix";
platforms = if darwinUnsupported then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms;
inherit badPlatforms platforms;
maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira reckenrode ];
inherit mainProgram;
};

View File

@ -1,22 +0,0 @@
diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m
--- a/dlls/winemac.drv/cocoa_display.m
+++ b/dlls/winemac.drv/cocoa_display.m
@@ -289,7 +289,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count)
* the primary GPU because we need to hide the integrated GPU for an automatic graphic switching pair to avoid apps
* using the integrated GPU. This is the behavior of Windows on a Mac. */
primary_device = [MTLCreateSystemDefaultDevice() autorelease];
- if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, primary_device.registryID))
+ if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, [primary_device registryID]))
goto done;
/* Hide the integrated GPU if the system default device is a dedicated GPU */
@@ -301,7 +301,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count)
for (i = 0; i < devices.count; i++)
{
- if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], devices[i].registryID))
+ if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], [devices[i] registryID]))
goto done;
if (hide_integrated && devices[i].isLowPower)

View File

@ -1,12 +0,0 @@
diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m
--- a/dlls/winemac.drv/cocoa_display.m
+++ b/dlls/winemac.drv/cocoa_display.m
@@ -354,7 +354,7 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp
device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease];
if (device && [device respondsToSelector:@selector(registryID)])
- ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID);
+ ret = macdrv_get_gpu_info_from_registry_id(gpu, [device registryID]);
done:
[pool release];

View File

@ -1,13 +0,0 @@
diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m
index fbbe16efcbf..2db375ff3d5 100644
--- a/dlls/winemac.drv/cocoa_display.m
+++ b/dlls/winemac.drv/cocoa_display.m
@@ -387,7 +387,7 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp
device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease];
if (device && [device respondsToSelector:@selector(registryID)])
- return macdrv_get_gpu_info_from_registry_id(gpu, device.registryID);
+ return macdrv_get_gpu_info_from_registry_id(gpu, [device registryID]);
else
return -1;
}

View File

@ -1,12 +0,0 @@
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index cde37c48b0d..be237bc0ad3 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -65,6 +65,7 @@
# undef LoadResource
# undef GetCurrentThread
# include <pthread.h>
+# include <pthread/qos.h>
# include <mach/mach.h>
# include <mach/mach_error.h>
# include <mach-o/getsect.h>

View File

@ -69,9 +69,9 @@ in rec {
unstable = fetchurl rec {
# NOTE: Don't forget to change the hash for staging as well.
version = "9.7";
version = "9.8";
url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz";
hash = "sha256-2fPDM2VuiL1M71Mx80sci2nJZKUnWe73RdjdrlGhU1M=";
hash = "sha256-hpQ8g47aj62aeUDUCZcDOUvx0b6aEBQ0L+2HnH3DuZM=";
inherit (stable) patches;
## see http://wiki.winehq.org/Gecko
@ -117,7 +117,7 @@ in rec {
staging = fetchFromGitLab rec {
# https://gitlab.winehq.org/wine/wine-staging
inherit (unstable) version;
hash = "sha256-KU6i1P81Fr+4aZH/SJ+YibaIfX88SZMPdPcGS2mT2CE=";
hash = "sha256-c69E+jr5DKdD8JJxQhM3ILJgvmGvOe54FqMghcVPkpg=";
domain = "gitlab.winehq.org";
owner = "wine";
repo = "wine-staging";

View File

@ -1,4 +1,4 @@
{ lib, callPackage, autoconf, hexdump, perl, python3, wineUnstable }:
{ lib, stdenv, callPackage, autoconf, hexdump, perl, python3, wineUnstable }:
with callPackage ./util.nix {};
@ -7,8 +7,8 @@ let patch = (callPackage ./sources.nix {}).staging;
(mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra;
in assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMinor patch.version;
(lib.overrideDerivation (wineUnstable.override { wineRelease = "staging"; }) (self: {
buildInputs = build-inputs [ "perl" "util-linux" "autoconf" "gitMinimal" ] self.buildInputs;
(wineUnstable.override { wineRelease = "staging"; }).overrideAttrs (self: {
buildInputs = build-inputs ([ "perl" "autoconf" "gitMinimal" ] ++ lib.optional stdenv.isLinux "util-linux") self.buildInputs;
nativeBuildInputs = [ autoconf hexdump perl python3 ] ++ self.nativeBuildInputs;
prePatch = self.prePatch or "" + ''
@ -18,7 +18,7 @@ in assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMino
patchShebangs ./patches/gitapply.sh
python3 ./staging/patchinstall.py DESTDIR="$PWD" --all ${lib.concatMapStringsSep " " (ps: "-W ${ps}") patch.disabledPatchsets}
'';
})) // {
}) // {
meta = wineUnstable.meta // {
description = wineUnstable.meta.description + " (with staging patches)";
};

View File

@ -6,7 +6,7 @@
stdenv.mkDerivation rec {
pname = "lightburn";
version = "1.5.06";
version = "1.6.00";
nativeBuildInputs = [
p7zip
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
sha256 = "sha256-VJMfvZHqdgUQXLyBBZLEV3nyP0qzibuXLnZyBhBBg9E=";
sha256 = "sha256-R9DBlmqvV23QXzC45Z4GN0t+ysv4WM63POJGU5N7jbw=";
};
buildInputs = [

View File

@ -22,16 +22,16 @@
rustPlatform.buildRustPackage rec {
pname = "oculante";
version = "0.8.19";
version = "0.8.21";
src = fetchFromGitHub {
owner = "woelper";
repo = "oculante";
rev = version;
hash = "sha256-oCgnz1WMg7YypIT8Tjk2m+f/43Aj88rDVCxQ92aL3RY=";
hash = "sha256-2QX7cD9SjhLb82O8T90BTQGsy3/gDaNwoX4Mbe2H6s4=";
};
cargoHash = "sha256-vlU7egAht+kgA5Vx0HAwQOIax9qD4FLRo1ZUNx4RieY=";
cargoHash = "sha256-VAWLs15xsjoT0VSJjS/j0wd5P7OjQGrvyUSHp4B8hHI=";
nativeBuildInputs = [
cmake

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "exercism";
version = "3.3.0";
version = "3.4.0";
src = fetchFromGitHub {
owner = "exercism";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-Mtb5c1/k8kp7bETOSE0X969BV176jpoprr1/mQ3E4Vg=";
hash = "sha256-+Tg9b7JZtriF5b+mnLgOeTTLiswH/dSGg3Mj1TBt4Wk=";
};
vendorHash = "sha256-fnsSvbuVGRAndU88su2Ck7mV8QBDhxozdmwI3XGtxcA=";
vendorHash = "sha256-xY3C3emqtPIKyxIN9aEkrLXhTxWNmo0EJXNZVtbtIvs=";
doCheck = false;

View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "ttdl";
version = "4.2.1";
version = "4.3.0";
src = fetchFromGitHub {
owner = "VladimirMarkelov";
repo = "ttdl";
rev = "v${version}";
sha256 = "sha256-fspqUzF3QqFpd16J1dbcNMdqjcR3PIiRu/s+VB4KgwQ=";
sha256 = "sha256-5v3Eu85x3xNvTRgfxhlDz4hiJ4UO010pZPY7UPHk7mQ=";
};
cargoHash = "sha256-dvzm9lbVGGM4t6KZcHSlqwo55jssxi8HyFREMaj5I0Q=";
cargoHash = "sha256-+jYl/oUeJaABgDX/OBTyeo/B7RYc2MUTreU1ySLG0XQ=";
meta = with lib; {
description = "A CLI tool to manage todo lists in todo.txt format";

View File

@ -16,7 +16,7 @@
stdenv.mkDerivation rec {
pname = "wmenu";
version = "0.1.7";
version = "0.1.8";
strictDeps = true;
@ -24,17 +24,9 @@ stdenv.mkDerivation rec {
owner = "~adnano";
repo = "wmenu";
rev = version;
hash = "sha256-9do7zL7yaZuqVjastySwjsByo5ja+KUP3590VjIyVnI=";
hash = "sha256-gVoqRHQ5bcY58LTgKxpPM1PnZJrLRoSOJUiYYqc/vRI=";
};
# Upstream patch needed to fix NULL deref
patches = [
(fetchpatch {
url = "https://git.sr.ht/~adnano/wmenu/commit/2856dddcac861ddf248143e66ba164d7aa05a0bb.patch";
hash = "sha256-P7SEjMssA8unNAlrgrTHm0uW5pefjpupPb4s/u2fTAM=";
})
];
nativeBuildInputs = [ pkg-config meson ninja wayland-scanner ];
buildInputs = [ cairo pango wayland libxkbcommon wayland-protocols scdoc ];

View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "avalanchego";
version = "1.11.4";
version = "1.11.5";
src = fetchFromGitHub {
owner = "ava-labs";
repo = pname;
rev = "v${version}";
hash = "sha256-0YS+q1gy7YmTx/DwxaElBG1tzosXReXqPu6RpR3hTjw=";
hash = "sha256-IZ4Q67b+VsmBN/NEBPDzN2PYO8cVfLpHBU0tCo+v3Xc=";
};
vendorHash = "sha256-et1PVLJQ/vBsg5438s6d9MA2oV40zahp9YKQOE0RX58=";
vendorHash = "sha256-z6MF/Kb///BSirdRycNs+7SMThv+yS7WmcrIcgiwBNg=";
# go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
proxyVendor = true;

View File

@ -51,11 +51,11 @@ let
in
stdenv.mkDerivation rec {
pname = "opera";
version = "109.0.5097.38";
version = "109.0.5097.80";
src = fetchurl {
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
hash = "sha256-eljVXaHN7gPqpoL3z+Fz/BH6b+1qxSHtFln6NCxl9tc=";
hash = "sha256-3NSinITYisulR5rNhSnwQC3D9pKWj4SdBtFt/9OgCvo=";
};
unpackPhase = "dpkg-deb -x $src .";

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "atmos";
version = "1.71.0";
version = "1.72.0";
src = fetchFromGitHub {
owner = "cloudposse";
repo = pname;
rev = "v${version}";
sha256 = "sha256-RnBMVVbZQrJ85uPVLniNjpcledYnOyu5zxIYsvV63qk=";
sha256 = "sha256-d4TgVSXTqrzgTdpGl1uXIdEvwb0EIgzqiEjOaWYAZgk=";
};
vendorHash = "sha256-dcQWD6UrsSPJZzasovBSXUKaXvL9mZF6cLp458Ia8O4=";
vendorHash = "sha256-T3FvJfyGseW5vwN/mMCFEjpcpW90MG8QPkmaXJafD4s=";
ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ];

View File

@ -2,20 +2,22 @@
, buildGoModule
, fetchFromGitHub
, installShellFiles
, testers
, k0sctl
}:
buildGoModule rec {
pname = "k0sctl";
version = "0.17.5";
version = "0.17.8";
src = fetchFromGitHub {
owner = "k0sproject";
repo = pname;
rev = "v${version}";
hash = "sha256-NHfS1iJtpt0t2iIqXBETiD4rpA2XzA8eOg5mP4N8El4=";
hash = "sha256-QHTVNrPglNDT9CUQWwc6oD7ttwEUBq8WIX49DiAXf8s=";
};
vendorHash = "sha256-MPTdOcNoveBnHMJ2YHqHuvOHHe6IdisZLc05qViA1YQ=";
vendorHash = "sha256-6Kj1kHKXbbPMr9thkDTmGYbZvCSW7CvSzASpk6agEpI=";
ldflags = [
"-s"
@ -34,6 +36,13 @@ buildGoModule rec {
done
'';
passthru.tests.version = testers.testVersion {
package = k0sctl;
command = "k0sctl version";
# See https://github.com/carlmjohnson/versioninfo/discussions/12
version = "version: (devel)\ncommit: v${version}\n";
};
meta = with lib; {
description = "A bootstrapping and management tool for k0s clusters.";
homepage = "https://k0sproject.io/";

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "kubefirst";
version = "2.4.6";
version = "2.4.8";
src = fetchFromGitHub {
owner = "kubefirst";
repo = "kubefirst";
rev = "refs/tags/v${version}";
hash = "sha256-PjqTtu9n9AqHaYnc/2yVQeIWLiQrQcFNdumDSigY7dY=";
hash = "sha256-r5y1eWjcw0HP/E9AQodEdCgWgKikGrwV6TvZ2mVcuoE=";
};
vendorHash = "sha256-ZcZl4knlyKAwTsiyZvlkN5e2ox30B5aNzutI/2UEE9U=";

View File

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "nerdctl";
version = "1.7.5";
version = "1.7.6";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
hash = "sha256-eGDshnJ26rrRuM9lWwcdRg8udA4uE5ee6c+SYES7qt4=";
hash = "sha256-z83c8Ji0zSM1QDwjB4FwhHW6XCqG0Hb5crM3jjK46jk=";
};
vendorHash = "sha256-GsI695T7nkwwAt78l7mc5JCD9wXAUcTxwsiLLFcANBI=";
vendorHash = "sha256-KqWmwwQRrWoyRehuSJBnlyPQgwk5hUGk2/d0Ue/reVc=";
nativeBuildInputs = [ makeWrapper installShellFiles ];
@ -48,13 +48,13 @@ buildGoModule rec {
runHook postInstallCheck
'';
meta = with lib; {
meta = {
homepage = "https://github.com/containerd/nerdctl/";
changelog = "https://github.com/containerd/nerdctl/releases/tag/v${version}";
description = "A Docker-compatible CLI for containerd";
mainProgram = "nerdctl";
license = licenses.asl20;
maintainers = with maintainers; [ jk developer-guy ];
platforms = platforms.linux;
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ developer-guy jk ];
platforms = lib.platforms.linux;
};
}

View File

@ -12,11 +12,11 @@
mkDerivation rec {
pname = "datovka";
version = "4.23.6";
version = "4.23.7";
src = fetchurl {
url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz";
sha256 = "sha256-g6IMUAE8z5uoLSUpoT+GradQRgwyIXNANt7g4JPOCxg=";
sha256 = "sha256-mGuTxOqudDhoJKZ9517H+A4PZxBqAOD+PfBHunhPXGw=";
};
buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ];

View File

@ -4,16 +4,17 @@
}:
{ lib
, python3
, python3Packages
, fetchFromGitHub
, pkgsStatic
, stdenv
, nixosTests
, testers
, util-linux
, gns3-server
}:
python3.pkgs.buildPythonApplication {
python3Packages.buildPythonApplication {
pname = "gns3-server";
inherit version;
@ -29,7 +30,7 @@ python3.pkgs.buildPythonApplication {
cp ${pkgsStatic.busybox}/bin/busybox gns3server/compute/docker/resources/bin/busybox
'';
propagatedBuildInputs = with python3.pkgs; [
propagatedBuildInputs = with python3Packages; [
aiofiles
aiohttp
aiohttp-cors
@ -55,6 +56,9 @@ python3.pkgs.buildPythonApplication {
rm $out/bin/gns3loopback
'';
# util-linux (script program) is required for Docker support
makeWrapperArgs = [ "--suffix PATH : ${lib.makeBinPath [ util-linux ]}" ];
doCheck = true;
# Otherwise tests will fail to create directory
@ -63,7 +67,7 @@ python3.pkgs.buildPythonApplication {
export HOME=$(mktemp -d)
'';
checkInputs = with python3.pkgs; [
checkInputs = with python3Packages; [
pytest-aiohttp
pytest-rerunfailures
(pytestCheckHook.override { pytest = pytest_7; })

View File

@ -33,11 +33,11 @@
in
stdenv.mkDerivation rec {
pname = "suricata";
version = "7.0.4";
version = "7.0.5";
src = fetchurl {
url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz";
hash = "sha256-ZABgEgAkvnDb6B9uxu/HLkYlD8s2IZ3/Z+ZBciD/Ibc=";
hash = "sha256-H/tWgVjyZcCFVEZL+4VOZWjvaDvwMxKSO1HyjFB5Ck4=";
};
nativeBuildInputs = [

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "alfaview";
version = "9.9.1";
version = "9.10.1";
src = fetchurl {
url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb";
hash = "sha256-GZLIVpXQ22W4JykdLJ7pTogOFhDaiukgsLa2E7giiaU=";
hash = "sha256-k58v8l/LE0lWQFbQ6p2XGiRjMMwzArW3KVbIxlKC1SA=";
};
nativeBuildInputs = [

View File

@ -5,11 +5,11 @@
appimageTools.wrapType2 rec {
pname = "tutanota-desktop";
version = "220.240321.0";
version = "227.240502.0";
src = fetchurl {
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
hash = "sha256-LbvldnhvKHvBEaOwkxA2acuUKMcYi16ceYPuMW73qLs=";
hash = "sha256-D7qWwIFuCJmBvfdgf4Dsd2/jvi39tbAttaHOwLND4DY=";
};
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ];

View File

@ -22,14 +22,14 @@
stdenv.mkDerivation rec {
pname = "pan";
version = "0.157";
version = "0.158";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "GNOME";
repo = pname;
rev = "v${version}";
hash = "sha256-+zzAnppP6ICIhhlqXGVF4h/yIDa6oE1lxenmzcr2BQo=";
hash = "sha256-gcs3TsUzZAW8PhNPMzyOfwu+2SNynjRgfxdGIfAHrpA=";
};
nativeBuildInputs = [ autoreconfHook pkg-config gettext intltool itstool libxml2 makeWrapper ];

View File

@ -5,18 +5,18 @@
buildGoModule rec {
pname = "storj-uplink";
version = "1.102.4";
version = "1.104.1";
src = fetchFromGitHub {
owner = "storj";
repo = "storj";
rev = "v${version}";
hash = "sha256-ryOWnVcJOUs9kToXtwjUTk7nwuAW0NCDn5Npn27hKXU=";
hash = "sha256-wB8SK91eJp+8Jjc/bfMqDQQC3FYtSLEjpqVdxEq9P3c=";
};
subPackages = [ "cmd/uplink" ];
vendorHash = "sha256-atIb/SmOShLIhvEsTcegX7+xoDXN+SI5a7TQrXpqdUg=";
vendorHash = "sha256-Eo6JHcTcfC8zmKZh9sXrZ90RhIgdEBgTldIUnvNm8ms=";
ldflags = [ "-s" "-w" ];

View File

@ -7,13 +7,13 @@
let
pname = "mendeley";
version = "2.111.0";
version = "2.114.0";
executableName = "${pname}-reference-manager";
src = fetchurl {
url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage";
hash = "sha256-tN76RKHETTMkJ239I6+a36RPTuWqYlCSs+tEP+BcB+M=";
hash = "sha256-1eLxk+nlgHoe0Gmo/DXlTOnWssrN9cAubvqpV6SqQS8=";
};
appimageContents = appimageTools.extractType2 {

View File

@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "planify";
version = "4.7";
version = "4.7.2";
src = fetchFromGitHub {
owner = "alainm23";
repo = "planify";
rev = version;
hash = "sha256-5hiVTU1w3Rk/BdxYwDB0Y+EZFnSAaEWtx19IB1ak1yY=";
hash = "sha256-G0A3U0TUGL4RT1wpIXw/cIwDDlaLCPpo5QG6bJfoIYc=";
};
nativeBuildInputs = [

View File

@ -8,11 +8,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "quisk";
version = "4.2.32";
version = "4.2.33";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-zzcygf7oVICO2/wfgyej1GD78fQB1xNRGHq19w6K4uY=";
sha256 = "sha256-41eyqYxRg0crtN6qp239eHWSFPt7XuJneTAndZuS3EY=";
};
buildInputs = [

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "tqsl";
version = "2.7.2";
version = "2.7.3";
src = fetchurl {
url = "https://www.arrl.org/files/file/LoTW%20Instructions/${pname}-${version}.tar.gz";
sha256 = "sha256-T4NBCUTYHT6ugSg1gSfjQBOBndqwSwyWLr/qlDPQGKI=";
sha256 = "sha256-Ca9PsytjPvrU4u+b/x6pIbQc8CDNWI6hNM6jF60Bds8=";
};
nativeBuildInputs = [ cmake wrapGAppsHook3 ];

View File

@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "snakemake";
version = "8.11.2";
version = "8.11.3";
format = "setuptools";
src = fetchFromGitHub {
owner = "snakemake";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-rIA757FIIkb6h/QNzyVbIbipkZTwysNonHrPHLqFOyI=";
hash = "sha256-wNs5OW8bM5LU0Ik77VU47dEq2PlrsfNNtl6Zedocnm4=";
# https://github.com/python-versioneer/python-versioneer/issues/217
postFetch = ''
sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#'

View File

@ -7,6 +7,7 @@
, gtk3
, gobject-introspection
, libnotify
, makeBinaryWrapper
, wrapGAppsHook3
, vte
, nixosTests
@ -27,6 +28,7 @@ python3.pkgs.buildPythonApplication rec {
file
intltool
gobject-introspection
makeBinaryWrapper
wrapGAppsHook3
python3.pkgs.pytest-runner
];
@ -55,8 +57,15 @@ python3.pkgs.buildPythonApplication rec {
dontWrapGApps = true;
# HACK: 'wrapPythonPrograms' will add things to the $PATH in the wrapper. This bleeds into the
# terminal session produced by terminator. To avoid this, we force wrapPythonPrograms to only
# use gappsWrapperArgs by redefining wrapProgram to ignore its arguments and only apply the
# wrapper arguments we want it to use.
# TODO: Adjust wrapPythonPrograms to respect an argument that tells it to leave $PATH alone.
preFixup = ''
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
wrapProgram() {
wrapProgramBinary "$1" "''${gappsWrapperArgs[@]}"
}
'';
passthru.tests.test = nixosTests.terminal-emulators.terminator;

View File

@ -27,13 +27,13 @@
stdenv.mkDerivation rec {
pname = "rtabmap";
version = "0.21.4";
version = "0.21.4.1";
src = fetchFromGitHub {
owner = "introlab";
repo = "rtabmap";
rev = "refs/tags/${version}";
hash = "sha256-HrIATYRuhFfTlO4oTRZo7CM30LFVyatZJON31Fe4HTQ=";
hash = "sha256-y/p1uFSxVQNXO383DLGCg4eWW7iu1esqpWlyPMF3huk=";
};
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook wrapGAppsHook3 ];

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "podman-tui";
version = "1.0.0";
version = "1.0.1";
src = fetchFromGitHub {
owner = "containers";
repo = "podman-tui";
rev = "v${version}";
hash = "sha256-sJaiZJeT0oUAnSg9Kv8uMp1XoumumC3LB77lelmwSgw=";
hash = "sha256-t1vrUXv0ZP+vmOcUIue/yvB34DP+gduopuN0U9oixBQ=";
};
vendorHash = null;

View File

@ -10,11 +10,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "tart";
version = "2.7.2";
version = "2.10.0";
src = fetchurl {
url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz";
hash = "sha256-Z/LZ8g1/FYT7Jh943tFxN8L5HeNf0CVz1VEJj+2fCd8=";
hash = "sha256-9spBDqNm47nUZEGCCOfISjNpGx/22OtPPheB7iJTq1A=";
};
sourceRoot = ".";

View File

@ -23,6 +23,10 @@ let
[binaries]
llvm-config = 'llvm-config-native'
rust = ['rustc', '--target', '${stdenv.targetPlatform.rust.rustcTargetSpec}']
# Meson refuses to consider any CMake binary during cross compilation if it's
# not explicitly specified here, in the cross file.
# https://github.com/mesonbuild/meson/blob/0ed78cf6fa6d87c0738f67ae43525e661b50a8a2/mesonbuild/cmake/executor.py#L72
cmake = 'cmake'
'';
crossFlags = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ];

View File

@ -3,13 +3,13 @@
alephone.makeWrapper rec {
pname = "durandal";
desktopName = "Marathon-Durandal";
version = "20240119";
version = "20240510";
icon = alephone.icons + "/marathon2.png";
zip = fetchurl {
url =
"https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon2-${version}-Data.zip";
sha256 = "sha256-Tp9EWMIY0moK6RLIpxB7rMzLOQ7zPfV58oeAyQsTbnM=";
sha256 = "sha256-uoBl1/7XlXmMLqpk3tvme9w18q4Yh0WCrmqSzjGxNz0=";
};
meta = {

View File

@ -3,13 +3,13 @@
alephone.makeWrapper rec {
pname = "marathon-infinity";
desktopName = "Marathon-Infinity";
version = "20240119";
version = "20240510";
icon = alephone.icons + "/marathon-infinity.png";
zip = fetchurl {
url =
"https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/MarathonInfinity-${version}-Data.zip";
sha256 = "sha256-KfFu+cboaZMfjnu3W84/Qbcrc9kbkIZ2Y0GM1fXeXh8=";
sha256 = "sha256-+FPym4Avqzyo4cZtfYPHXCS+q21+g9AIdKOImkd/UjU=";
};
meta = {

View File

@ -3,13 +3,13 @@
alephone.makeWrapper rec {
pname = "marathon";
desktopName = "Marathon";
version = "20240119";
version = "20240510";
icon = alephone.icons + "/marathon.png";
zip = fetchurl {
url =
"https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip";
sha256 = "sha256-60+dvXyzHe5PDepyKHcEIdWoRiGMvx5zYehubWKqaB0=";
sha256 = "sha256-shZ82e7veaaT/petxDQ8Fd7YtJPmTgxSCStf0kGfrFs=";
};
meta = {

View File

@ -27,20 +27,20 @@ let
in
buildNpmPackage' rec {
pname = "bruno";
version = "1.16.1";
version = "1.17.0";
src = fetchFromGitHub {
owner = "usebruno";
repo = "bruno";
rev = "v${version}";
hash = "sha256-rP3PHS6kuJCgbCQy4h+bJksmJAJvHDBMSysLM5FxQjk=";
hash = "sha256-z4KL6CX1jtuC4lxqYA6Mg1zPSc9/OpRb530jPIQK3Is=";
postFetch = ''
${lib.getExe npm-lockfile-fix} $out/package-lock.json
'';
};
npmDepsHash = "sha256-p4rBEOK9zKGO1q3SCKpfdX3EPMkYHRvn9UnGBhsksSE=";
npmDepsHash = "sha256-NIf7aMDAeE39+putw/7GTYODIdVmjJIvIwnL5O+sBmI=";
npmFlags = [ "--legacy-peer-deps" ];
nativeBuildInputs = [

View File

@ -0,0 +1,104 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, libunwind
}:
rustPlatform.buildRustPackage rec {
pname = "bugstalker";
version = "0.1.4";
src = fetchFromGitHub {
owner = "godzie44";
repo = "BugStalker";
rev = "v${version}";
hash = "sha256-16bmvz6/t8H8Sx/32l+fp3QqP5lwi0o1Q9KqDHqF22U=";
};
cargoHash = "sha256-kp0GZ0cM57BMpH/8lhxevnBuJhUSH0rtxP4B/9fXYiU=";
buildInputs = [ libunwind ];
nativeBuildInputs = [ pkg-config ];
# Tests which require access to example source code fail in the sandbox. I
# haven't managed to figure out how to fix this.
checkFlags = [
"--skip=breakpoints::test_breakpoint_at_fn_with_monomorphization"
"--skip=breakpoints::test_breakpoint_at_line_with_monomorphization"
"--skip=breakpoints::test_brkpt_on_function"
"--skip=breakpoints::test_brkpt_on_function_name_collision"
"--skip=breakpoints::test_brkpt_on_line"
"--skip=breakpoints::test_brkpt_on_line2"
"--skip=breakpoints::test_brkpt_on_line_collision"
"--skip=breakpoints::test_debugee_run"
"--skip=breakpoints::test_deferred_breakpoint"
"--skip=breakpoints::test_multiple_brkpt_on_addr"
"--skip=breakpoints::test_set_breakpoint_idempotence"
"--skip=io::test_backtrace"
"--skip=io::test_read_register_write"
"--skip=io::test_read_value_u64"
"--skip=multithreaded::test_multithreaded_app_running"
"--skip=multithreaded::test_multithreaded_backtrace"
"--skip=multithreaded::test_multithreaded_breakpoints"
"--skip=multithreaded::test_multithreaded_trace"
"--skip=signal::test_signal_stop_multi_thread"
"--skip=signal::test_signal_stop_multi_thread_multiple_signal"
"--skip=signal::test_signal_stop_single_thread"
"--skip=signal::test_transparent_signals"
"--skip=steps::test_step_into"
"--skip=steps::test_step_into_recursion"
"--skip=steps::test_step_out"
"--skip=steps::test_step_over"
"--skip=steps::test_step_over_inline_code"
"--skip=steps::test_step_over_on_fn_decl"
"--skip=symbol::test_symbol"
"--skip=test_debugger_disassembler"
"--skip=test_debugger_graceful_shutdown"
"--skip=test_debugger_graceful_shutdown_multithread"
"--skip=test_frame_cfa"
"--skip=test_registers"
"--skip=variables::test_arguments"
"--skip=variables::test_btree_map"
"--skip=variables::test_cast_pointers"
"--skip=variables::test_cell"
"--skip=variables::test_circular_ref_types"
"--skip=variables::test_lexical_blocks"
"--skip=variables::test_read_array"
"--skip=variables::test_read_atomic"
"--skip=variables::test_read_btree_set"
"--skip=variables::test_read_closures"
"--skip=variables::test_read_enum"
"--skip=variables::test_read_hashmap"
"--skip=variables::test_read_hashset"
"--skip=variables::test_read_only_local_variables"
"--skip=variables::test_read_pointers"
"--skip=variables::test_read_scalar_variables"
"--skip=variables::test_read_scalar_variables_at_place"
"--skip=variables::test_read_static_in_fn_variable"
"--skip=variables::test_read_static_variables"
"--skip=variables::test_read_static_variables_different_modules"
"--skip=variables::test_read_strings"
"--skip=variables::test_read_struct"
"--skip=variables::test_read_tls_variables"
"--skip=variables::test_read_type_alias"
"--skip=variables::test_read_union"
"--skip=variables::test_read_uuid"
"--skip=variables::test_read_vec_and_slice"
"--skip=variables::test_read_vec_deque"
"--skip=variables::test_shared_ptr"
"--skip=variables::test_slice_operator"
"--skip=variables::test_type_parameters"
"--skip=variables::test_zst_types"
];
meta = {
description = "Rust debugger for Linux x86-64";
homepage = "https://github.com/godzie44/BugStalker";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ jacg ];
mainProgram = "bs";
platforms = [ "x86_64-linux" ];
};
}

View File

@ -5,6 +5,7 @@
, caddy
, testers
, installShellFiles
, stdenv
}:
let
version = "2.7.6";
@ -40,8 +41,13 @@ buildGoModule {
postInstall = ''
install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system
substituteInPlace $out/lib/systemd/system/caddy.service --replace "/usr/bin/caddy" "$out/bin/caddy"
substituteInPlace $out/lib/systemd/system/caddy-api.service --replace "/usr/bin/caddy" "$out/bin/caddy"
substituteInPlace $out/lib/systemd/system/caddy.service \
--replace-fail "/usr/bin/caddy" "$out/bin/caddy"
substituteInPlace $out/lib/systemd/system/caddy-api.service \
--replace-fail "/usr/bin/caddy" "$out/bin/caddy"
'' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
# Generating man pages and completions fail on cross-compilation
# https://github.com/NixOS/nixpkgs/issues/308283
$out/bin/caddy manpage --directory manpages
installManPage manpages/*

View File

@ -0,0 +1,42 @@
{ lib
, rustPlatform
, fetchFromGitHub
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "caligula";
version = "0.4.5";
src = fetchFromGitHub {
owner = "ifd3f";
repo = "caligula";
rev = "v${version}";
hash = "sha256-9+aLpxmMP76CsLFFmr1mhKgbaT7Zz0lx4D2jQCUA9VY=";
};
cargoHash = "sha256-VwtmU5jTQPn3hpNuLckPQl6joEFPfuax1gRVG0/nceg=";
buildInputs = lib.optionals stdenv.isDarwin (
with darwin.apple_sdk.frameworks; [
Cocoa
IOKit
Foundation
DiskArbitration
]
);
RUSTFLAGS = "--cfg tracing_unstable";
meta = with lib; {
description = "A user-friendly, lightweight TUI for disk imaging";
homepage = "https://github.com/ifd3f/caligula/";
license = licenses.gpl3Only;
maintainers = with maintainers; [ sodiboo ];
platforms = platforms.linux ++ platforms.darwin;
# https://github.com/ifd3f/caligula/issues/105
broken = stdenv.hostPlatform.isDarwin;
mainProgram = "caligula";
};
}

View File

@ -1,29 +1,34 @@
{ lib
, stdenv
, fetchFromGitHub
, boost
, catch2
, cmake
, gtest
, python3
{
lib,
stdenv,
fetchFromGitHub,
boost,
catch2,
cmake,
python3,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "cli11";
version = "2.3.2";
src = fetchFromGitHub {
owner = "CLIUtils";
repo = "CLI11";
rev = "v${version}";
rev = "v${finalAttrs.version}";
sha256 = "sha256-x3/kBlf5LdzkTO4NYOKanZBfcU4oK+fJw9L7cf88LsY=";
};
buildInputs = [ catch2 ];
nativeBuildInputs = [ cmake ];
nativeCheckInputs = [ boost python3 catch2 ];
nativeCheckInputs = [
boost
python3
];
doCheck = true;
strictDeps = true;
meta = with lib; {
description = "Command line parser for C++11";
@ -32,5 +37,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ ];
license = licenses.bsd3;
};
}
})

View File

@ -10,13 +10,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "free42";
version = "3.1.5";
version = "3.1.8";
src = fetchFromGitHub {
owner = "thomasokken";
repo = "free42";
rev = "v${finalAttrs.version}";
hash = "sha256-YFTmEyOd/r8Pbj+PzD+VYkkB0gqDJ4wteLBTdwa1qcE=";
hash = "sha256-z1HlI2e3mCRJ/sWMdsLF7IpcvTh+Zlrk77M8gaJXMzQ=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,39 @@
{ lib
, pkgs
, fetchFromGitHub
, zig_0_12
, darwin
}:
let stdenv = if pkgs.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; in
stdenv.mkDerivation (finalAttrs: {
pname = "glsl_analyzer";
version = "1.4.5";
src = fetchFromGitHub {
owner = "nolanderc";
repo = "glsl_analyzer";
rev = "v${finalAttrs.version}";
hash = "sha256-+eYBw/F1RzI5waAkLgbV0J/Td91hbNcAtHcisQaL82k=";
};
nativeBuildInputs = [
zig_0_12.hook
];
postPatch = ''
substituteInPlace build.zig \
--replace-fail 'b.run(&.{ "git", "describe", "--tags", "--always" })' '"${finalAttrs.src.rev}"'
'';
meta = {
description = "Language server for GLSL (OpenGL Shading Language)";
changelog = "https://github.com/nolanderc/glsl_analyzer/releases/tag/v${finalAttrs.version}";
homepage = "https://github.com/nolanderc/glsl_analyzer";
mainProgram = "glsl_analyzer";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [ wr7 ];
platforms = lib.platforms.unix;
};
})

View File

@ -0,0 +1,52 @@
{ buildGoModule, fetchFromGitHub, installShellFiles, lib, stdenv }:
buildGoModule rec {
pname = "go-passbolt-cli";
version = "0.3.1";
src = fetchFromGitHub {
owner = "passbolt";
repo = "go-passbolt-cli";
rev = "v${version}";
hash = "sha256-I+niNUowKTFDMa7yOnRToMFPzO/CbnjXHJr5nAhhHcg=";
};
vendorHash = "sha256-XRHGq3Qeq7VWHzw5WWVv4x5orQu740lttGVreiu7qP4=";
ldflags = [
"-X=main.version=${version}"
"-X=main.commit=${src.rev}"
"-X=main.date=1970-01-01T00:00:00Z"
];
subPackages = [ "." ];
nativeBuildInputs = [
installShellFiles
];
installPhase = ''
runHook preInstall
install -D $GOPATH/bin/go-passbolt-cli $out/bin/passbolt
runHook postInstall
'';
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd passbolt \
--bash <($out/bin/passbolt completion bash) \
--fish <($out/bin/passbolt completion fish) \
--zsh <($out/bin/passbolt completion zsh)
export tmpDir=$(mktemp -d)
cd $tmpDir && mkdir man && $out/bin/passbolt gendoc --type man && installManPage man/*
'';
meta = with lib; {
description = "CLI tool to interact with Passbolt, an open source password manager for teams";
homepage = "https://github.com/passbolt/go-passbolt-cli";
license = licenses.mit;
maintainers = with maintainers; [ pbek ];
mainProgram = "passbolt";
platforms = platforms.linux ++ platforms.darwin;
};
}

View File

@ -7,10 +7,10 @@
}:
stdenv.mkDerivation rec {
pname = "halo";
version = "2.15.1";
version = "2.15.2";
src = fetchurl {
url = "https://github.com/halo-dev/halo/releases/download/v${version}/${pname}-${version}.jar";
hash = "sha256-6qgbUXd0E38Rhv0Jf1qP54yJhQiB1a/Jr1FYw3bC4qI=";
hash = "sha256-BCcIDaWtn8OkI+GWs741nWgqyO8qlE9m2hZ3e+iViUI=";
};
nativeBuildInputs = [

View File

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "hyprland-workspaces";
version = "2.0.0";
version = "2.0.1";
src = fetchFromGitHub {
owner = "FieldofClay";
repo = "hyprland-workspaces";
rev = "v${version}";
hash = "sha256-4QGLTimIpx74gWUyHCheUZZT1WgVzBoJRY8OlUDdOh4=";
hash = "sha256-GhUjvFMlgjTdgtV9ASW7IqE2dBktPyOlRwg6qM1r7vc=";
};
cargoHash = "sha256-9ndP0nyRBCdOGth4UWA263IvjbgnVW2x9PK8oTaMrxg=";
cargoHash = "sha256-RZVQSkegX8Fa9SNY7tGNxyu312oeDjXK4U1+1/UIAyA=";
meta = with lib; {
description = "A multi-monitor aware Hyprland workspace widget";

View File

@ -5,14 +5,14 @@
buildGoModule rec {
pname = "kcl-cli";
version = "0.8.7";
version = "0.8.8";
src = fetchFromGitHub {
owner = "kcl-lang";
repo = "cli";
rev = "v${version}";
hash = "sha256-OKRMgxynKmHnO+5tcKlispFkpQehHINzB6qphH+lwHQ=";
hash = "sha256-Bk/sCNMDupdY/YyKT+VoPIzEfjFDa5z9pevcCPnTX8U=";
};
vendorHash = "sha256-dF0n1/SmQVd2BUVOPmvZWWUJYTn2mMnbgZC92luSY2s=";
vendorHash = "sha256-Xv8Tfq9Kb1xGFCWZQwBFDX9xZW9j99td/DUb7jBtkpE=";
ldflags = [
"-X=kcl-lang.io/cli/pkg/version.version=${version}"
];

View File

@ -1,20 +1,21 @@
{ lib
, stdenv
, buildDotnetModule
, fetchFromGitHub
, dotnetCorePackages
, wrapGAppsHook3
{
lib,
stdenv,
buildDotnetModule,
fetchFromGitHub,
dotnetCorePackages,
wrapGAppsHook3,
, libX11
, libICE
, libSM
, libXi
, libXcursor
, libXext
, libXrandr
, fontconfig
, glew
, gtk3
libX11,
libICE,
libSM,
libXi,
libXcursor,
libXext,
libXrandr,
fontconfig,
glew,
gtk3,
}:
buildDotnetModule rec {
@ -61,10 +62,10 @@ buildDotnetModule rec {
];
postInstall = ''
install -Dm644 LoadByOS/LinuxConfigApp/libation_glass.svg $out/share/icons/hicolor/scalable/apps/${pname}.svg
install -Dm644 LoadByOS/LinuxConfigApp/Libation.desktop $out/share/applications/${pname}.desktop
substituteInPlace $out/share/applications/${pname}.desktop \
--replace "/usr/bin/libation" "${meta.mainProgram}"
install -Dm644 LoadByOS/LinuxConfigApp/libation_glass.svg $out/share/icons/hicolor/scalable/apps/libation.svg
install -Dm644 LoadByOS/LinuxConfigApp/Libation.desktop $out/share/applications/libation.desktop
substituteInPlace $out/share/applications/libation.desktop \
--replace-fail "/usr/bin/libation" "${meta.mainProgram}"
'';
# wrap manually, because we need lower case excutables

View File

@ -0,0 +1,43 @@
{ buildGoModule
, fetchFromGitHub
, installShellFiles
, kubectl
, lib
}:
buildGoModule rec {
pname = "litmusctl";
version = "1.5.0";
nativeBuildInputs = [
installShellFiles
];
buildInputs = [
kubectl
];
src = fetchFromGitHub {
owner = "litmuschaos";
repo = "litmusctl";
rev = "${version}";
hash = "sha256-FORrvPKDTG48WV03+HbXiBJa1IHfHV7yMDhQX64kn6U=";
};
vendorHash = "sha256-U4dp2E2TZ3rds63PS6GzUVhb2qDSv92bf9JCkWpdLew=";
postInstall = ''
installShellCompletion --cmd litmusctl \
--bash <($out/bin/litmusctl completion bash) \
--fish <($out/bin/listmusctl completion fish) \
--zsh <($out/bin/litmusctl completion zsh)
'';
meta = {
description = "Command-Line tool to manage Litmuschaos's agent plane";
homepage = "https://github.com/litmuschaos/litmusctl";
license = lib.licenses.asl20;
mainProgram = "litmusctl";
maintainers = with lib.maintainers; [ vinetos sailord ];
};
}

View File

@ -1,23 +1,26 @@
{ lib
, buildNimPackage
, fetchFromSourcehut
, nim
, nix-prefetch
, nix-prefetch-git
, openssl
, makeWrapper
{
lib,
buildNimPackage,
fetchFromSourcehut,
nim,
nix-prefetch,
nix-prefetch-git,
openssl,
makeWrapper,
}:
let nim' = nim.passthru.nim;
in buildNimPackage (finalAttrs: {
let
nim' = nim.passthru.nim;
in
buildNimPackage (finalAttrs: {
pname = "nim_lk";
version = "20240210";
version = "20240510";
src = fetchFromSourcehut {
owner = "~ehmry";
repo = "nim_lk";
rev = finalAttrs.version;
hash = "sha256-LLOf8HNee0Mol+e7/dvu9hQUCmpaVBNggTxaAl/wV6Y=";
hash = "sha256-fwoGyYkbGstWG0qw15dOq1gmr3GyIn6ZEBeBmEivHlA=";
};
lockFile = ./lock.json;
@ -29,7 +32,13 @@ in buildNimPackage (finalAttrs: {
postFixup = ''
wrapProgram $out/bin/nim_lk \
--suffix PATH : ${lib.makeBinPath [ nim' nix-prefetch nix-prefetch-git ]}
--suffix PATH : ${
lib.makeBinPath [
nim'
nix-prefetch
nix-prefetch-git
]
}
'';
meta = finalAttrs.src.meta // {

View File

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "nrr";
version = "0.9.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "ryanccn";
repo = "nrr";
rev = "v${version}";
hash = "sha256-94BeBCYCxZBoOp6xo4I/uxd6ULjIfmF4nw/vUWoaEpo=";
hash = "sha256-wof/KmoHiBkcn2aTh+M6bNH/B6Le3H6hnT8BzUCs0Pw=";
};
cargoHash = "sha256-DTQTIAk914XC+LecQTXk1TdBc/5sMFG8KiD9lO5HLiM=";
cargoHash = "sha256-BtYZNZxFjgY/BFd1kwGyy/F1iRezSDxoPHF4exrNzuk=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation

View File

@ -7,6 +7,7 @@
, fuse
, installShellFiles
, wrapGAppsHook3
, glib-networking
, wrapperDir ? "/run/wrappers/bin"
}:
let
@ -25,7 +26,7 @@ buildGoModule {
vendorHash = "sha256-OOiiKtKb+BiFkoSBUQQfqm4dMfDW3Is+30Kwcdg8LNA=";
nativeBuildInputs = [ pkg-config installShellFiles wrapGAppsHook3 ];
buildInputs = [ webkitgtk_4_1 glib fuse ];
buildInputs = [ webkitgtk_4_1 glib fuse glib-networking ];
ldflags = [ "-X github.com/jstaf/onedriver/cmd/common.commit=v${version}" ];

View File

@ -1,59 +1,58 @@
{ lib
, python3Packages
, fetchFromGitHub
{
lib,
python3Packages,
fetchFromGitHub,
}:
python3Packages.buildPythonApplication rec {
pname = "oterm";
version = "0.2.7";
version = "0.2.8";
pyproject = true;
src = fetchFromGitHub {
owner = "ggozad";
repo = "oterm";
rev = "refs/tags/${version}";
hash = "sha256-vKVGSIneKQkFO1uoNaW/Yr6QTDhgokmIpkYFYIbm+U4=";
hash = "sha256-6UFNsEc6bYBrBYfCbeiDfemueeRMEXHGCT8junZVFtk=";
};
pythonRelaxDeps = [
"aiosqlite"
"pillow"
"httpx"
"ollama"
"packaging"
"pillow"
"typer"
];
build-system = with python3Packages; [ poetry-core ];
nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ];
propagatedBuildInputs = with python3Packages; [
ollama
textual
typer
python-dotenv
httpx
aiohttp
aiosql
aiosqlite
pyperclip
httpx
ollama
packaging
rich-pixels
pillow
aiohttp
pyperclip
python-dotenv
rich-pixels
textual
typer
];
nativeBuildInputs = with python3Packages; [
poetry-core
pythonRelaxDepsHook
];
pythonImportsCheck = [
"oterm"
];
pythonImportsCheck = [ "oterm" ];
# Tests require a HTTP connection to ollama
doCheck = false;
meta = {
changelog = "https://github.com/ggozad/oterm/releases/tag/${version}";
description = "A text-based terminal client for Ollama";
homepage = "https://github.com/ggozad/oterm";
changelog = "https://github.com/ggozad/oterm/releases/tag/${version}";
license = lib.licenses.mit;
mainProgram = "oterm";
maintainers = with lib.maintainers; [ suhr ];

View File

@ -0,0 +1,86 @@
{
lib,
stdenv,
fetchFromGitHub,
cacert,
meson,
ninja,
pkg-config,
freetype,
libgit2,
libuchardet,
libzip,
lua5_4,
luajit,
mbedtls_2,
pcre2,
SDL2,
zlib,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "pragtical";
version = "3.3.1";
pluginManagerVersion = "1.2.9";
src = fetchFromGitHub {
owner = "pragtical";
repo = "pragtical";
rev = "v${finalAttrs.version}";
fetchSubmodules = true;
# also fetch required git submodules
postFetch = ''
cd "$out"
export NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
substituteInPlace subprojects/ppm.wrap \
--replace-fail 'revision = head' 'revision = v${finalAttrs.pluginManagerVersion}'
${lib.getExe meson} subprojects download \
colors plugins ppm
find subprojects -type d -name .git -prune -execdir rm -r {} +
'';
hash = "sha256-T0IHpfMfx4P84RyBLtaYNead6a7cID2cUYwkyNnYMgc=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
];
buildInputs = [
freetype
libgit2
libuchardet
libzip
lua5_4
luajit
mbedtls_2
pcre2
SDL2
zlib
];
# workaround for `libmbedx509.so.1, libmbedcrypto.so.7: error adding symbols: DSO missing from command line`
env.NIX_LDFLAGS = "-lmbedx509 -lmbedcrypto";
mesonFlags = [ "-Duse_system_lua=true" ];
meta = {
changelog = "https://github.com/pragtical/pragtical/blob/${finalAttrs.src.rev}/changelog.md";
description = "A practical and pragmatic code editor";
homepage = "https://pragtical.dev";
license = lib.licenses.mit;
mainProgram = "pragtical";
maintainers = with lib.maintainers; [
suhr
tomasajt
];
platforms = lib.platforms.linux;
};
})

View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "sbom-utility";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "CycloneDX";
repo = "sbom-utility";
rev = "refs/tags/v${version}";
hash = "sha256-tNLMrtJj1eeJ4sVhDRR24/KVI1HzZSRquiImuDTNZFI=";
hash = "sha256-EqK2TGlv2RGfvR95lzYz3EHJkfq4q4Ty5H2zFdd9cME=";
};
vendorHash = "sha256-EdzI5ypwZRksQVmcfGDUgEMa4CeAPcm237ZaKqmWQDY=";
vendorHash = "sha256-qh8kIwgrlmHkocM5ZoGnOY7ISJlct/TV7dAxvXlPw68=";
preCheck = ''
cd test

View File

@ -0,0 +1,32 @@
{
lib,
buildGoModule,
fetchFromGitHub,
}:
let
version = "1.1.2";
in
buildGoModule {
pname = "superfile";
inherit version;
src =
fetchFromGitHub {
owner = "MHNightCat";
repo = "superfile";
rev = "v${version}";
hash = "sha256-Cn03oPGT+vCZQcC62p7COx8N8BGgra+qQaZyF+osVsA=";
}
+ "/src";
vendorHash = "sha256-gWrhy3qzlXG072u5mW971N2Y4Vmt0KbZkB8SFsFgSzo=";
meta = {
changelog = "https://github.com/MHNightCat/superfile/blob/v${version}/changelog.md";
description = "Pretty fancy and modern terminal file manager";
homepage = "https://github.com/MHNightCat/superfile";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ momeemt ];
mainProgram = "superfile";
};
}

View File

@ -1,7 +1,7 @@
{ lib, stdenv, buildGoModule, fetchFromGitHub }:
let
version = "1.64.2";
version = "1.66.0";
in
buildGoModule {
pname = "tailscale-nginx-auth";
@ -11,9 +11,9 @@ buildGoModule {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
hash = "sha256-DS7C/G1Nj9gIjYwXaEeCLbtH9HbB0tRoJBDjZc/nq5g=";
hash = "sha256-ZI9/YlVHbdvEwD0YHWfUhciU2x4wp4GzTanwDvuIpz4=";
};
vendorHash = "sha256-pYeHqYd2cCOVQlD1r2lh//KC+732H0lj1fPDBr+W8qA=";
vendorHash = "sha256-Hd77xy8stw0Y6sfk3/ItqRIbM/349M/4uf0iNy1xJGw=";
CGO_ENABLED = 0;

View File

@ -30,13 +30,13 @@
stdenv.mkDerivation rec {
pname = "ueberzugpp";
version = "2.9.4";
version = "2.9.5";
src = fetchFromGitHub {
owner = "jstkdng";
repo = "ueberzugpp";
rev = "v${version}";
hash = "sha256-D+7a+3Vxrt+XUq7c2F2eqi8ZGQ2eZd37aTqighWEKPs=";
hash = "sha256-BuVInCYpogkn1CnQ2hqLaTi1KJ0mHEEfRIOrTIg9duY=";
};
strictDeps = true;

View File

@ -0,0 +1,37 @@
{ lib, appimageTools, fetchurl }:
let
version = "2.12.0";
pname = "wowup-cf";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/WowUp/WowUp.CF/releases/download/v${version}/WowUp-CF-${version}.AppImage";
hash = "sha256-uWz/EQBX/d1UBfpc9EL4x+UH72kINd6pqFIvJkV16e8=";
};
appimageContents = appimageTools.extractType1 { inherit name src; };
in appimageTools.wrapType1 {
inherit name src;
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications
substituteInPlace $out/share/applications/${pname}.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
cp -r ${appimageContents}/usr/share/icons $out/share
'';
meta = with lib; {
description = "World of Warcraft addon updater with CurseForge support";
longDescription = ''
WowUp is the community centered World of Warcraft addon updater. We attempt to bring the addon community together in an easy to use updater application. We have an ever growing list of supported features.
'';
homepage = "https://wowup.io/";
downloadPage = "https://github.com/WowUp/WowUp.CF/releases";
license = licenses.unfree;
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
maintainers = with maintainers; [ pbek ];
platforms = [ "x86_64-linux" ];
};
}

View File

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "undefined-medium";
version = "1.2";
version = "1.3";
src = fetchzip {
url = "https://github.com/andirueckel/undefined-medium/archive/v1.2.zip";
hash = "sha256-hgHwi25T+aM7ljzk5uR4x+CqoRJ3/IOyktdp/mDW46I=";
url = "https://github.com/andirueckel/undefined-medium/archive/v1.3.zip";
hash = "sha256-cVdk6a0xijAQ/18W5jalqRS7IiPufMJW27Scns+nbEY=";
};
installPhase = ''

View File

@ -1,17 +1,18 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
{
lib,
stdenvNoCC,
fetchFromGitHub,
}:
stdenvNoCC.mkDerivation {
pname = "whitesur-cursors";
version = "unstable-2022-06-17";
version = "0-unstable-2022-06-17";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = "WhiteSur-cursors";
rev = "5c94e8c22de067282f4cf6d782afd7b75cdd08c8";
sha256 = "sha256-CFse0XZzJu+PWDcqmvIXvue+3cKX47oavZU9HYRDAg0=";
hash = "sha256-CFse0XZzJu+PWDcqmvIXvue+3cKX47oavZU9HYRDAg0=";
};
installPhase = ''

View File

@ -28,7 +28,7 @@
, sysctl
, buildLlvmTools
, debugVersion ? false
, doCheck ? (if lib.versionOlder release_version "15" then stdenv.isLinux else true)
, doCheck ? !stdenv.isAarch32 && (if lib.versionOlder release_version "15" then stdenv.isLinux else true)
&& (!stdenv.isx86_32 /* TODO: why */) && (!stdenv.hostPlatform.isMusl)
&& !(stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isBigEndian)
&& (stdenv.hostPlatform == stdenv.buildPlatform)

View File

@ -113,6 +113,15 @@ stdenv.mkDerivation (self: rec {
# have it block a release.
"futex-wait.test.sh"
];
patches = [
# Support the NIX_SBCL_DYNAMIC_SPACE_SIZE envvar. Upstream SBCL didnt want
# to include this (see
# "https://sourceforge.net/p/sbcl/mailman/sbcl-devel/thread/2cf20df7-01d0-44f2-8551-0df01fe55f1a%400brg.net/"),
# but for Nix envvars are sufficiently useful that its worth maintaining
# this functionality downstream.
./dynamic-space-size-envvar-feature.patch
./dynamic-space-size-envvar-tests.patch
];
postPatch = lib.optionalString (self.disabledTestFiles != [ ]) ''
(cd tests ; rm -f ${lib.concatStringsSep " " self.disabledTestFiles})
''

View File

@ -0,0 +1,63 @@
From ac15f9f7c75c1fb5767514e64b609e2a75e6fe9d Mon Sep 17 00:00:00 2001
From: Hraban Luyat <hraban@0brg.net>
Date: Sat, 13 Apr 2024 14:04:57 -0400
Subject: [PATCH] feat: NIX_SBCL_DYNAMIC_SPACE_SIZE envvar
Read SBCL dynamic space size configuration from env if available.
---
src/runtime/runtime.c | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c
index 274687c8f..970caa8f4 100644
--- a/src/runtime/runtime.c
+++ b/src/runtime/runtime.c
@@ -422,6 +422,29 @@ static int is_memsize_arg(char *argv[], int argi, int argc, int *merge_core_page
return 0;
}
+/**
+ * Read memory options from the environment, if present.
+ *
+ * Memory settings are read in the following priority:
+ *
+ * 1. command line arguments
+ * 2. environment variable
+ * 3. embedded options in core
+ * 4. default
+ */
+static void
+read_memsize_from_env(void) {
+ const char *val = getenv("NIX_SBCL_DYNAMIC_SPACE_SIZE");
+ // The distinction is blurry between setting an envvar to the empty string and
+ // unsetting it entirely. Depending on the calling environment it can even be
+ // tricky to properly unset an envvar in the first place. An empty envvar is
+ // practically always intended to just mean “unset”, so lets interpret it
+ // that way.
+ if (val != NULL && (strcmp(val, "") != 0)) {
+ dynamic_space_size = parse_size_arg(val, "NIX_SBCL_DYNAMIC_SPACE_SIZE");
+ }
+}
+
static struct cmdline_options
parse_argv(struct memsize_options memsize_options,
int argc, char *argv[], char *envp[], char *core)
@@ -462,6 +485,7 @@ parse_argv(struct memsize_options memsize_options,
dynamic_space_size = memsize_options.dynamic_space_size;
thread_control_stack_size = memsize_options.thread_control_stack_size;
dynamic_values_bytes = memsize_options.thread_tls_bytes;
+ read_memsize_from_env();
int stop_parsing = 0; // have we seen '--'
int output_index = 1;
@@ -488,6 +512,7 @@ parse_argv(struct memsize_options memsize_options,
}
sbcl_argv[output_index] = 0;
} else {
+ read_memsize_from_env();
bool end_runtime_options = 0;
/* Parse our any of the command-line options that we handle from C,
* stopping at the first one that we don't, and leave the rest */
--
2.44.0

View File

@ -0,0 +1,104 @@
From 9d4a886a8a76ea8be51bcf754cefacdf30986f46 Mon Sep 17 00:00:00 2001
From: Hraban Luyat <hraban@0brg.net>
Date: Sat, 13 Apr 2024 15:39:58 -0400
Subject: [PATCH 2/2] test: dynamic space size envvar and precedence
---
tests/memory-args.test.sh | 22 ++++++++++++++++++++++
tests/save7.test.sh | 37 ++++++++++++++++++++++++++++++++-----
2 files changed, 54 insertions(+), 5 deletions(-)
create mode 100755 tests/memory-args.test.sh
diff --git a/tests/memory-args.test.sh b/tests/memory-args.test.sh
new file mode 100755
index 000000000..72ef0cc79
--- /dev/null
+++ b/tests/memory-args.test.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+. ./subr.sh
+
+use_test_subdirectory
+
+set -e
+
+# Allow slight shrinkage if heap relocation has to adjust for alignment
+NIX_SBCL_DYNAMIC_SPACE_SIZE=234mb run_sbcl_with_args --script <<EOF
+(assert (<= 0 (- (* 234 1024 1024) (sb-ext:dynamic-space-size)) 65536))
+EOF
+
+NIX_SBCL_DYNAMIC_SPACE_SIZE=555mb run_sbcl_with_args --dynamic-space-size 234mb --script <<EOF
+(assert (<= 0 (- (* 234 1024 1024) (sb-ext:dynamic-space-size)) 65536))
+EOF
+
+run_sbcl_with_args --dynamic-space-size 234mb --script <<EOF
+(assert (<= 0 (- (* 234 1024 1024) (sb-ext:dynamic-space-size)) 65536))
+EOF
+
+exit $EXIT_TEST_WIN
diff --git a/tests/save7.test.sh b/tests/save7.test.sh
index f9225543b..3c35e7b31 100644
--- a/tests/save7.test.sh
+++ b/tests/save7.test.sh
@@ -59,9 +59,9 @@ run_sbcl_with_core "$tmpcore" --noinform --control-stack-size 640KB \
(assert (eql (extern-alien "dynamic_values_bytes" (unsigned 32))
(* 5000 sb-vm:n-word-bytes)))
; allow slight shrinkage if heap relocation has to adjust for alignment
- (defun dynamic-space-size-good-p ()
- (<= 0 (- (* 260 1048576) (dynamic-space-size)) 65536))
- (assert (dynamic-space-size-good-p))
+ (defun dynamic-space-size-good-p (expected-mb)
+ (<= 0 (- (* expected-mb 1024 1024) (dynamic-space-size)) 65536))
+ (assert (dynamic-space-size-good-p 260))
(save-lisp-and-die "${tmpcore}2" :executable t :save-runtime-options t)
EOF
chmod u+x "${tmpcore}2"
@@ -70,15 +70,42 @@ echo "::: INFO: prepared test core"
(when (and (eql (extern-alien "thread_control_stack_size" unsigned) (* 640 1024))
(eql (extern-alien "dynamic_values_bytes" (unsigned 32))
(* 5000 sb-vm:n-word-bytes))
- (dynamic-space-size-good-p))
+ (dynamic-space-size-good-p 260))
(exit :code 42))
EOF
status=$?
-rm "$tmpcore" "${tmpcore}2"
if [ $status -ne 42 ]; then
echo "re-saved executable used wrong memory size options"
exit 1
fi
echo "::: Success"
+echo "::: Running :DYNAMIC-SPACE-SIZE-ENV"
+NIX_SBCL_DYNAMIC_SPACE_SIZE=432MB ./"${tmpcore}2" --no-userinit --no-sysinit --noprint <<EOF
+ (when (dynamic-space-size-good-p 432)
+ (exit :code 42))
+EOF
+status=$?
+if [ $status -ne 42 ]; then
+ echo "re-saved executable should have prioritized memory specification from env"
+ exit 1
+fi
+echo "::: Success"
+
+echo "::: Running :DYNAMIC-SPACE-SIZE-PRECEDENCE"
+NIX_SBCL_DYNAMIC_SPACE_SIZE=432MB ./"${tmpcore}2" --dynamic-space-size 333MB \
+ --no-userinit --no-sysinit --noprint <<EOF
+ (when (dynamic-space-size-good-p 333))
+ (exit :code 42))
+EOF
+status=$?
+rm "$tmpcore" "${tmpcore}2"
+if [ $status -ne 42 ]; then
+ echo "re-saved executable should have prioritized memory specification from arg"
+ exit 1
+fi
+echo "::: Success"
+
+
+
exit $EXIT_TEST_WIN
--
2.44.0

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, llvmPackages, ncurses, cmake, libxml2
{ lib, stdenv, fetchFromGitHub, llvmPackages_16, ncurses, cmake, libxml2
, symlinkJoin, breakpointHook, cudaPackages, enableCUDA ? false
, libffi, libobjc, libpfm, Cocoa, Foundation
}:
@ -14,6 +14,7 @@ let
sha256 = "1g87pl014b5v6z2nnhiwn3wf405skawszfr5wdzyfbx00j3kgxd0";
};
llvmPackages = llvmPackages_16;
llvmMerged = symlinkJoin {
name = "llvmClangMerged";
paths = with llvmPackages; [

View File

@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.2.18";
hash = "sha256-ygsHwlQgAyD1GKxbPfVAqc8U2GbzyT7cMBO1Lgb6x5Y=";
version = "8.2.19";
hash = "sha256-PBj3zlG3x7JreX4flwedOGswNH6wToF/XmyOmydeKmo=";
});
in
base.withExtensions ({ all, ... }: with all; ([

View File

@ -2,8 +2,8 @@
let
base = callPackage ./generic.nix (_args // {
version = "8.3.6";
hash = "sha256-YySx3djrMCWwQQNLiNwrwLSBmwAiEp7q66N+R4AxCLw=";
version = "8.3.7";
hash = "sha256-AcIM3hxaVpZlGHXtIvUHhJZ5+6dA+MQhYWt9Q9f3l9o=";
});
in
base.withExtensions ({ all, ... }: with all; ([

View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation rec {
version = "2.15.1";
version = "2.16.1";
pname = "commons-io";
src = fetchurl {
url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz";
sha256 = "sha256-nYoYGHetdd3vFryFXLxuvvSUCIs6VZyPwWb8s0h+edg=";
sha256 = "sha256-4+YYSDyCHwUwlw71nAnGy4g9GOl1Z8qr3gHQEyv8EPo=";
};
installPhase = ''

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "commons-logging";
version = "1.3.0";
version = "1.3.1";
src = fetchurl {
url = "mirror://apache/commons/logging/binaries/commons-logging-${version}-bin.tar.gz";
sha256 = "sha256-ij6jOi1Y/iQ/9Ht41nKtmOdZCvf0NmNseFGxBpyq1fg=";
sha256 = "sha256-mM85vfWDc88fNwwflvnRvoh/tb+jDH3o+96RZa9Sp7w=";
};
installPhase = ''

View File

@ -17,14 +17,14 @@
}:
stdenv.mkDerivation rec {
version = "0.7.28";
version = "0.7.29";
pname = "libsolv";
src = fetchFromGitHub {
owner = "openSUSE";
repo = "libsolv";
rev = version;
hash = "sha256-cL7SDwCzXM2qJQfiu/3nfAiFbcFNn1YXD23Sl3n9nzY=";
hash = "sha256-867sCGFvKib1As9BCiCi6LYVrLUK0pjtM5Bw9Yuu0D8=";
};
cmakeFlags = [

View File

@ -19,7 +19,7 @@
stdenv.mkDerivation rec {
pname = "malcontent";
version = "0.11.1";
version = "0.12.0";
outputs = [ "bin" "out" "lib" "pam" "dev" "man" "installedTests" ];
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
owner = "pwithnall";
repo = "malcontent";
rev = version;
hash = "sha256-NZwVCnQrEG2gecUjuWe1+cyWFR3OdYJCmj87V14Uwjw=";
hash = "sha256-UK/WVqDMkwIqkTFFjzh7PRCA/Ej8Iyu33FasnAEApRs=";
};
patches = [

View File

@ -54,14 +54,22 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-wuF3Isrp+u5J8jPQoPsIOWYGNKLSNa2pLfvladAWkLs=";
};
CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
"CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_LINKER" =
"${stdenv.cc.targetPrefix}cc";
postConfigure = ''
cd rutabaga_gfx/ffi
substituteInPlace Makefile --replace-fail pkg-config "$PKG_CONFIG"
'';
# make install always rebuilds
dontBuild = true;
makeFlags = [ "prefix=$(out)" ];
preInstall = ''
cd rutabaga_gfx/ffi
'';
makeFlags = [
"prefix=$(out)"
"OUT=target/${stdenv.hostPlatform.rust.cargoShortTarget}/release"
];
meta = with lib; {
homepage = "https://crosvm.dev/book/appendix/rutabaga_gfx.html";

View File

@ -1,32 +1,33 @@
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, pytest-asyncio
, pytestCheckHook
, pythonOlder
{
lib,
stdenv,
buildPythonPackage,
fetchFromGitHub,
pytest-asyncio,
pytestCheckHook,
pythonOlder,
setuptools,
}:
buildPythonPackage rec {
pname = "asyncio-dgram";
version = "2.1.2";
format = "setuptools";
version = "2.2.0";
pyproject = true;
disabled = pythonOlder "3.5";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "jsbronder";
repo = pname;
rev = "refs/tagsv${version}";
repo = "asyncio-dgram";
rev = "refs/tags/v${version}";
hash = "sha256-Eb/9JtgPT2yOlfnn5Ox8M0kcQhSlRCuX8+Rq6amki8Q=";
};
nativeCheckInputs = [
pytestCheckHook
];
build-system = [ setuptools ];
checkInputs = [
nativeCheckInputs = [
pytest-asyncio
pytestCheckHook
];
# OSError: AF_UNIX path too long
@ -38,9 +39,7 @@ buildPythonPackage rec {
"test_from_socket_bad_socket"
];
pythonImportsCheck = [
"asyncio_dgram"
];
pythonImportsCheck = [ "asyncio_dgram" ];
meta = with lib; {
description = "Python support for higher level Datagram";

View File

@ -0,0 +1,61 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pycryptodome
, pythonOlder
, requests
, websocket-client
# dependencies for tests
, pytest-cov
, pytest
, sure
, responses
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "binance-connector";
version = "3.7.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "binance";
repo = "${pname}-python";
rev = "refs/tags/v${version}";
hash = "sha256-hmn8WKr+krzOzHNJ/aynXAbf+rHxDfyKDgycdQQU3xk=";
};
propagatedBuildInputs = [
requests
pycryptodome
websocket-client
];
nativeCheckInputs = [
pytest-cov
pytest
sure
responses
pytestCheckHook
];
# pytestCheckHook attempts to run examples directory, which requires
# network access
disabledTestPaths = [
"examples/"
];
pythonImportsCheck = [
"binance.spot"
"binance.websocket"
];
meta = with lib; {
description = "Simple connector to Binance Public API";
homepage = "https://github.com/binance/binance-connector-python";
license = licenses.mit;
maintainers = with maintainers; [ trishtzy ];
};
}

View File

@ -366,7 +366,7 @@
buildPythonPackage rec {
pname = "boto3-stubs";
version = "1.34.101";
version = "1.34.103";
pyproject = true;
disabled = pythonOlder "3.7";
@ -374,7 +374,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "boto3_stubs";
inherit version;
hash = "sha256-GexON+k1FlMZID3tULcKLLxrVUscVMzS9fZNgD+rB4U=";
hash = "sha256-MxMTEnOQKpgEYyL4wZkl7NUykk66ZOm/wFKNBGrrbYw=";
};
build-system = [ setuptools ];

View File

@ -8,6 +8,7 @@
, fetchPypi
, pytest-asyncio
, pytestCheckHook
, pythonAtLeast
, pythonOlder
}:
@ -16,7 +17,8 @@ buildPythonPackage rec {
version = "0.8.5";
format = "setuptools";
disabled = pythonOlder "3.8";
# Python 3.12 support should be added in 0.8.6
disabled = pythonOlder "3.8" || pythonAtLeast "3.12";
src = fetchPypi {
inherit pname version;

View File

@ -1,38 +1,35 @@
{ lib
, buildPythonPackage
, camel-converter
, fetchFromGitHub
, pythonOlder
, setuptools
, requests
{
lib,
buildPythonPackage,
camel-converter,
fetchFromGitHub,
pythonOlder,
setuptools,
requests,
}:
buildPythonPackage rec {
pname = "meilisearch";
version = "0.31.0";
version = "0.31.1";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "meilisearch";
repo = "meilisearch-python";
rev = "refs/tags/v${version}";
hash = "sha256-mgslzRd2hvDI0SbQR3eY2vzvaaOVI6mUihdNPKe4jcg=";
hash = "sha256-rD9f0J8Ez+WrpEyDZa3GVuBxj6Kv7McBzIuk9RtsjHk=";
};
nativeBuildInputs = [
setuptools
];
build-system = [ setuptools ];
propagatedBuildInputs = [
dependencies = [
camel-converter
requests
] ++ camel-converter.optional-dependencies.pydantic;
pythonImportsCheck = [
"meilisearch"
];
pythonImportsCheck = [ "meilisearch" ];
# Tests spin up a local server and are not mocking the requests
doCheck = false;

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "ollama";
version = "0.1.9";
version = "0.2.0";
pyproject = true;
disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "ollama";
repo = "ollama-python";
rev = "refs/tags/v${version}";
hash = "sha256-ilJgRMzCn/T+6Lr7IuvaCnKhN5cyyEOWuV0N1FtR+Yg=";
hash = "sha256-kfotKUUXBekUd0X32BYAjNWvQJO94bdEDCSrBg2yJRQ=";
};
postPatch = ''

View File

@ -16,14 +16,14 @@
buildPythonPackage rec {
pname = "pydeck";
version = "0.8.0";
version = "0.9.0";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-B+3egz98/O9nSRJDURlap9zSRmPUkJ/XiY29C2+8Aew=";
hash = "sha256-/Yt19hyg1HEtMrTgc0QPHLdPLgwWoLV+V6AOZcVjzFQ=";
};
# upstream has an invalid pyproject.toml

View File

@ -1,26 +1,30 @@
{ lib
, buildPythonPackage
, fetchPypi
, gitpython
, pytestCheckHook
, pythonOlder
, requests
{
lib,
buildPythonPackage,
fetchPypi,
gitpython,
pytestCheckHook,
pythonOlder,
requests,
setuptools,
}:
buildPythonPackage rec {
pname = "pyexploitdb";
version = "0.2.9";
format = "setuptools";
version = "0.2.16";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
pname = "pyExploitDb";
inherit version;
hash = "sha256-q16YB0lLlw9nXohcT20l41Bv40CqshWzE8nVBBSEppE=";
hash = "sha256-PP9dR8Jl4eWsky3vO9Pgraw0plik/5aWvmOAEc2/Qpo=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
gitpython
requests
];
@ -28,14 +32,12 @@ buildPythonPackage rec {
# Module has no tests
doCheck = false;
pythonImportsCheck = [
"pyExploitDb"
];
pythonImportsCheck = [ "pyExploitDb" ];
meta = with lib; {
description = "Library to fetch the most recent exploit-database";
homepage = "https://github.com/GoVanguard/pyExploitDb";
changelog = "https://github.com/GoVanguard/pyExploitDb/blob/master/Changelog.txt";
changelog = "https://github.com/GoVanguard/pyExploitDb/blob/master/ChangeLog.md";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ fab ];
};

View File

@ -47,16 +47,17 @@ buildPythonPackage rec {
sentry-sdk
];
preCheck = lib.optionalString stdenv.isLinux ''
preCheck = ''
PATH=$out/bin:$PATH
${redis-server}/bin/redis-server &
REDIS_PID=$!
'';
postCheck = lib.optionalString stdenv.isLinux ''
kill $REDIS_PID
postCheck = ''
kill %%
'';
__darwinAllowLocalNetworking = true;
disabledTests = [
# https://github.com/rq/rq/commit/fd261d5d8fc0fe604fa396ee6b9c9b7a7bb4142f
"test_clean_large_registry"

View File

@ -1,32 +1,34 @@
{ lib
, buildPythonPackage
, cython
, fetchFromGitHub
, ply
, pythonOlder
, six
, tornado
{
lib,
buildPythonPackage,
cython,
fetchFromGitHub,
ply,
pythonOlder,
six,
setuptools,
tornado,
}:
buildPythonPackage rec {
pname = "thriftpy2";
version = "0.4.20";
format = "setuptools";
version = "0.5.0";
pyproject = true;
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "Thriftpy";
repo = pname;
repo = "thriftpy2";
rev = "refs/tags/v${version}";
hash = "sha256-IEYoSLaJUeQdwHaXR0UUlCZg5zBEh5Y2/IwB4RVEAcg=";
hash = "sha256-Pjy9OPwFfKaw+XVl7IbbAKPz050TlqI4+yLqSITOkSY=";
};
nativeBuildInputs = [
cython
];
build-system = [ setuptools ];
propagatedBuildInputs = [
nativeBuildInputs = [ cython ];
dependencies = [
ply
six
tornado
@ -35,9 +37,7 @@ buildPythonPackage rec {
# Not all needed files seems to be present
doCheck = false;
pythonImportsCheck = [
"thriftpy2"
];
pythonImportsCheck = [ "thriftpy2" ];
meta = with lib; {
description = "Python module for Apache Thrift";

View File

@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "types-pyopenssl";
version = "24.0.0.20240417";
version = "24.1.0.20240425";
format = "setuptools";
src = fetchPypi {
pname = "types-pyOpenSSL";
inherit version;
hash = "sha256-OOdfuCjScXvhc3cLuujCKBH97GjivD9YM5VBE+uEI30=";
hash = "sha256-Cn6CYmwZg9yNxZKSvyBlSlHDw4gby7mzN8HabjLwIE4=";
};
propagatedBuildInputs = [

View File

@ -2,16 +2,16 @@
buildNpmPackage rec {
pname = "stylelint";
version = "16.4.0";
version = "16.5.0";
src = fetchFromGitHub {
owner = "stylelint";
repo = "stylelint";
rev = version;
hash = "sha256-N689OjxUo3KPN3mfNQ1cKYoe8DXcVTNkUO4NuZPGuXI=";
hash = "sha256-kbcf0OPAIeEdh5YI2qqaLJww+ZejfXt/llJTK10nE0M=";
};
npmDepsHash = "sha256-V+hiUMenskHV+ccYysBDD5WoQH9vem+uEfQ5SWEdVFU=";
npmDepsHash = "sha256-tENUngFWjrmsJErvbmFflwGL0uxou0vQjC/MwfCpm+Y=";
dontNpmBuild = true;

View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "apko";
version = "0.13.2";
version = "0.14.0";
src = fetchFromGitHub {
owner = "chainguard-dev";
repo = pname;
rev = "v${version}";
hash = "sha256-PGRbJ7znsjvh/ATBF8k+pMnRO8wvGY0PAVswVmFaBUc=";
hash = "sha256-e9xWLDs0txl+eiqim3gj7vJRGOFY6MrqOAa1l0TaTbs=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -24,7 +24,7 @@ buildGoModule rec {
find "$out" -name .git -print0 | xargs -0 rm -rf
'';
};
vendorHash = "sha256-aqxXCqhvCGQKI+4FDjbqPNeFvELZviQ7Inwxl65sowk=";
vendorHash = "sha256-FeljCUtHTKni0yU7JwnaeKYJU7pM527drqBgaxWH/cI=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "biome";
version = "1.6.3";
version = "1.7.3";
src = fetchFromGitHub {
owner = "biomejs";
repo = "biome";
rev = "cli/v${version}";
hash = "sha256-DooUOp+fr5oOrx04SLlTGro8xc2LieVPNtdvDyTLL/s=";
hash = "sha256-iSL0PRHj32PpKoUogej0bc/zXGpS4ZgZG/+9Pewhl4k=";
};
cargoHash = "sha256-zMMfLDhiqG8Ahe+7PFjpOtwaBXbKkLDIIoHS329/4uQ=";
cargoHash = "sha256-no6ZrH1Ma+n66SLgA3h9dQX8FgeVjFVkxfqR35F/prs=";
nativeBuildInputs = [
pkg-config
@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "-p=biome_cli" ];
cargoTestFlags = cargoBuildFlags ++
# skip a broken test from v1.6.3 release
# skip a broken test from v1.7.3 release
# this will be removed on the next version
[ "-- --skip=diagnostics::test::termination_diagnostic_size" ];

View File

@ -6,13 +6,13 @@
buildGoModule rec {
pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}";
version = "2.23.0";
version = "2.24.0";
src = fetchFromGitHub {
owner = "harness";
repo = "drone";
rev = "v${version}";
sha256 = "sha256-HkyR2h7dgbEhqexJXyGebP3zkoTLlzuY+1O2pidAveQ=";
sha256 = "sha256-IiSsw0bZDAVuOrm7JBTT14Cf7I/koeS2Yw6vWYBG7kA=";
};
vendorHash = "sha256-n4KbKkqAnHDIsXs8A/FE+rCkSKQKr5fv7npJ/X6t0mk=";

View File

@ -2,19 +2,19 @@
buildGoModule rec {
pname = "atlas";
version = "0.21.1";
version = "0.22.0";
src = fetchFromGitHub {
owner = "ariga";
repo = "atlas";
rev = "v${version}";
hash = "sha256-i0nqjlL22sM8eVXCD/SBJyNdy0l0Hq4rjW0Lr3CRZlE=";
hash = "sha256-NsSDNeciHwlc7LZmuTOzoLNVsjAE+4YGThD/omMbjaE=";
};
modRoot = "cmd/atlas";
proxyVendor = true;
vendorHash = "sha256-48UmLwp93SjwPPrdySFVApjVf1Rsj3oNhi1lha4ZvyE=";
vendorHash = "sha256-rM2l7U/ZkL0NIGPPbmBQ+P6mzGxdX4aQeS8Hz6EFmQc=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "ent-go";
version = "0.12.5";
version = "0.13.1";
src = fetchFromGitHub {
owner = "ent";
repo = "ent";
rev = "v${version}";
sha256 = "sha256-g4n9cOTv/35WkvMjrtP2eEcbiu5kiafVXifz1zlEuCY=";
sha256 = "sha256-OEQWNWGVs0QYhPuCGEFgAVaUnfswmvWVt+e0cAdkBKE=";
};
vendorHash = "sha256-DUi4Ik+qFbx4LIm9MDJ4H9/+sIfCzK8MMGKp0GIGX7w=";
vendorHash = "sha256-9KdSGIyi95EVQq9jGoVqK8aq3JXlQXB+Qwlh/Kfz4Oc=";
subPackages = [ "cmd/ent" ];
@ -29,13 +29,13 @@ buildGoModule rec {
--zsh <($out/bin/ent completion zsh)
'';
meta = with lib; {
meta = {
description = "An entity framework for Go";
homepage = "https://entgo.io/";
changelog = "https://github.com/ent/ent/releases/tag/v${version}";
downloadPage = "https://github.com/ent/ent";
license = licenses.asl20;
maintainers = with maintainers; [ ];
license = lib.licenses.asl20;
maintainers = [ ];
mainProgram = "ent";
};
}

View File

@ -18,13 +18,13 @@ let
in
buildGoModule rec {
pname = "faas-cli";
version = "0.16.26";
version = "0.16.27";
src = fetchFromGitHub {
owner = "openfaas";
repo = "faas-cli";
rev = version;
sha256 = "sha256-eyQpeud0rW07eb6wtcTYem10LWf/g2dxRwQEMH29wL8=";
sha256 = "sha256-CZvIvvkDfpb4YPQIe5i8vZcmhLu7x0zTQGXCL8SxcvM=";
};
vendorHash = null;

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