From 3657157b03ea7964b0c509299ba01b160b6d73c9 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sun, 12 Jan 2025 14:28:44 -0500 Subject: [PATCH] chore: update sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake Inputs: • Updated input 'ags': 'github:Aylur/ags' (2025-01-05) rev: 5527c3c07d92c11e04e7fd99d58429493dba7e3c → 'github:Aylur/ags' (2025-01-12) rev: 90db9b9fecc0f4228440d83107c6c745a35e7d77 • Updated input 'astal': 'github:Aylur/astal' (2025-01-10) rev: ef4f95608481414053ecdbe4de29bd86fb452813 → 'github:Aylur/astal' (2025-01-12) rev: 6fd7ae514af36ff9baf1209a2eeebd3a26cf94ce • Updated input 'custom-sidebar-src': 'github:elchininet/custom-sidebar' (2025-01-05) rev: f5a9a86adcbe68aeefea45e12294368d54fe8156 → 'github:elchininet/custom-sidebar' (2025-01-12) rev: dd69b17b383e6135a8198248292786b7839aef85 • Updated input 'hyprgrass': 'github:horriblename/hyprgrass' (2025-01-02) rev: bdfa960b97ac98ad9d05c908ee20e053e2942928 → 'github:horriblename/hyprgrass' (2025-01-09) rev: dcf43737772490f9dc755983f5c8ddda5f83ec5b • Updated input 'hyprland': 'github:hyprwm/Hyprland' (2025-01-06) rev: b9f110ef8726fcba2b4ee69856027731e73003a5 → 'github:hyprwm/Hyprland' (2025-01-12) rev: a6b263713a2b862ed41362082e2147e081934077 • Updated input 'hyprland-plugins': 'github:hyprwm/hyprland-plugins' (2025-01-05) rev: b6b31113ce84419c69ed575c22194e4023d2952a → 'github:hyprwm/hyprland-plugins' (2025-01-08) rev: b4c0fa3ebc6ccd1589dcd17904652223088efede • Updated input 'jovian': 'github:Jovian-Experiments/Jovian-NixOS' (2025-01-11) rev: 1ddf0b3bfe076fa50b84244e42a55b9234f96083 → 'github:Jovian-Experiments/Jovian-NixOS' (2025-01-12) rev: 54d7806eb668a28ab1dbdd25ee0caab6f8c62433 • Updated input 'material-rounded-theme-src': 'github:Nerwyn/material-rounded-theme' (2025-01-08) rev: 64b43de45e1e5bcfab8aa84f7b9dccd9764e027f → 'github:Nerwyn/material-rounded-theme' (2025-01-11) rev: 6d3b79a79b72f70c4a015dd7dbbf1c41a2b33a35 • Updated input 'nix-gaming': 'github:fufexan/nix-gaming' (2025-01-11) rev: 0e562d23a2df60788af3aeda21590032b416be7c → 'github:fufexan/nix-gaming' (2025-01-12) rev: f0bba32370e38a6ed18d7c5c741d23fe53e2d265 • Updated input 'nix-index-db': 'github:Mic92/nix-index-database' (2025-01-09) rev: a2200b499efa01ca8646173e94cdfcc93188f2b8 → 'github:Mic92/nix-index-database' (2025-01-12) rev: 271e5bd7c57e1f001693799518b10a02d1123b12 • Updated input 'nixpkgs': 'github:NixOS/nixpkgs' (2025-01-08) rev: bffc22eb12172e6db3c5dde9e3e5628f8e3e7912 → 'github:NixOS/nixpkgs' (2025-01-10) rev: 130595eba61081acde9001f43de3248d8888ac4a • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland' (2025-01-11) rev: 37553f5a9728a5ced261f0aa9c050056e7f61bde → 'github:nix-community/nixpkgs-wayland' (2025-01-12) rev: 2cb439411d17eb145a99536196f5ab11685268b8 • Updated input 'tuya-local-src': 'github:make-all/tuya-local' (2025-01-11) rev: 29def3abf990d04f311a0d4324d54aedc4b841c8 → 'github:make-all/tuya-local' (2025-01-12) rev: 627e07e5627da27ccc474bfe9cdb61f3126e0adb Docker Images: • rssbridge/rss-bridge latest: sha256:2f94bc58b926a9ae2efb62c2bd08723b22adceb47d5590be00b56dc05ba2a0e3 → sha256:f2ffb2127499e4c86f001ba5adaa86f80f5167ae4bcea6bdd11401eb0f769224 • ghcr.io/linuxserver/radarr latest: sha256:e633fc93b9e2cea959853d27c6acc1d0b2d1ed7db4a800f6f46fe5b217f13102 → sha256:dce7e81d08da67cf44437c7213d19faeef1323aa839712fbb53d1253ef94f93f --- .../docker/freshrss/images/rss-bridge.nix | 4 +- .../docker/media/radarr/images/radarr.nix | 4 +- flake.lock | Bin 57580 -> 57403 bytes flake.nix | Bin 12197 -> 12029 bytes inputs/default.nix | 9 - lib/pkgs/mk-types/default.nix | 2 +- lib/pkgs/mk-types/package-lock.json | Bin 65182 -> 65182 bytes modules/ags/config/default.nix | 2 +- modules/ags/config/package-lock.json | Bin 73246 -> 73246 bytes overlays/build-failures/bat-extras.nix | 209 ++++++++++++++++++ overlays/build-failures/default.nix | 9 +- .../custom-sidebar/default.nix | 2 +- .../material-rounded-theme/default.nix | 2 +- 13 files changed, 225 insertions(+), 18 deletions(-) create mode 100644 overlays/build-failures/bat-extras.nix diff --git a/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix b/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix index 9e84b5fb..b210cde3 100644 --- a/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix +++ b/configurations/nos/modules/docker/freshrss/images/rss-bridge.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "rssbridge/rss-bridge"; - imageDigest = "sha256:2f94bc58b926a9ae2efb62c2bd08723b22adceb47d5590be00b56dc05ba2a0e3"; - hash = "sha256-h1vq77Z+zH1eYb8HfEaOFP/DmzlNgZfnEkoKjITug4Y="; + imageDigest = "sha256:f2ffb2127499e4c86f001ba5adaa86f80f5167ae4bcea6bdd11401eb0f769224"; + hash = "sha256-b1RneJXa1393nZxPSsB+nyTPoJOu5mFhWnKhQ+xEpn8="; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/configurations/nos/modules/docker/media/radarr/images/radarr.nix b/configurations/nos/modules/docker/media/radarr/images/radarr.nix index b8133584..16513771 100644 --- a/configurations/nos/modules/docker/media/radarr/images/radarr.nix +++ b/configurations/nos/modules/docker/media/radarr/images/radarr.nix @@ -1,8 +1,8 @@ pkgs: pkgs.dockerTools.pullImage rec { imageName = "ghcr.io/linuxserver/radarr"; - imageDigest = "sha256:e633fc93b9e2cea959853d27c6acc1d0b2d1ed7db4a800f6f46fe5b217f13102"; - hash = "sha256-CcUwDtI9gKPA5krZK7X6CEA86yspDndSwGRrS/NIfV4="; + imageDigest = "sha256:dce7e81d08da67cf44437c7213d19faeef1323aa839712fbb53d1253ef94f93f"; + hash = "sha256-ofd2SBBeWZ1n9igIq0wp3G4L1tt8UMIVvhtt35pVl3I="; finalImageName = imageName; finalImageTag = "latest"; } diff --git a/flake.lock b/flake.lock index a86c9497d648ad5aedd6071979873eb72e650105..9ce8bf6a4d96fbc5b1de8e988b63d6aaa6791101 100644 GIT binary patch delta 1833 zcmYLKOKf9T8P-fPNfuQ_N+HaMnMtLNV#ZLP_hVFsN$fa&KVv&_r-FO#IX8(NKVrwP zEYNgAC8QFSqjm!=VbcYxB8$a#tZwu-~YY- z`_IPIo6t*#Ipq7R=dUa?LIrk2XCj{kqd}%vkw$KlgHp0~l#!$vOM*i` zo*Kj(nO^;*f0B>X{KEE}=->XdZXdn6Y#-kH%7*p>f;r~SG9p1Bwa+P)0teI=T5FF6 zZY7`EH@=*)|DSu_{wwv(>0dU#dwG!qDD1tvH^XVB#v0aDvY7Vcuu{$q2Hjy;^|zaJ zXL6)>%8@gFx3YUsI~DUSE@Cv~F@+fB(21%9Lq-#b83FSJ zXy2o^?4#_`^t0{Ir6tUrEod%5crZ3wrQKev-cPW^Y4!9tJ4j_Rh13WS`i1Teiga6% z3l?&H%fm*wMEM$0;rMIFB_NCmT%QQdtO_&cv{Z&0GS0L&=HgolKupjKKVY7Fo_Pq9Gw3=wQsS2Fg_Yj>yM{16gi5=A}9l+@m$19G?F4Q9+$_1LT*Cx!&i*>`3`r*KX6!~doX?ZO z?qpw1j-nY#V%0oe|*Xh{U%NgQ)D%vt|}F3;jg3 z-8QV0mi=^gvkvU~tu=e?fd~aaDGwvefx*IKMnj>wPu=Z+8sWfDY>-B5-YPc$ZT5#7 z)9Y{idvVFR?=mnG_qG^xjuV?(2ffbT$yp!Zq8=P4x*{PBZPtqQcKguR9?YiImVF#r zv!6Y_YM(qjZ!`ZJohIJ=$CV}O z)|T^n-`-QA)ikUU-ESNi*({V~hZJDD+B#^%pom}Y;39BYCleTI43>YnVDYt>S!de|KX z<(y3KZ4J}gd)?#SDBUjCbDN!9A&8VCbIkL1LiQtv{Kawz635MVDW(V_#u@Y-OO3UV z3TfecAaFlG0q0lS%}qbDolBS9X?ybVdbr+2ZIbUq`@_b#48=ec`vY8vi&8jwc$nV~ zdY$G$y*18{diyTPckG96E!x(*FWT=#oYcN@`x6LVfsKOh{or)Q3`!PIS1HH@MNBCB z^mhe&K3Sj5PFwH(oh?X+?dKog43~74?iJd}On+1!v^X5z delta 1966 zcmbVNU2kJY8P;w#9~VnWsAy=>W`mTHbdB(Qo-(J#+?|W_&hxzQ z`#jJ4>t|Dce?IlmTeoKb2b^>JN%P)=1P!vi^qI+ah9%*5i!uk&-1B%m6|{EJry^eR z6Fk+sNVV+apDo%q=U%bbQ!m)hKAl~o6!{U3fUh`;Ak=_p-zd%%Wdw1;v68~qII{4y z+_-RbJ@t#JX~KO9>`%VA6g%#9Izd?2%XRCl)2!2?kGy(t9wfDfEnHW}RW=BCV_Re* z`=wW3a!)+?-oIy8wIPO64=}e8U=DH3P{9TBgo>p0 zn9$m2L8ykvb%{NuC^4Er>Wv#6eX#J|ug+4RA&&gXgnbszdh5aQP9uGps|=H+pv-G^ zb>Me)P@}8QE2jtj+5s7`j9vKMqNRUYw$I*}wZD4w`7cXl1owdCzKA#ziYq`P4w%*m z=yBtY0OIy>yYT;&y=s@|KV$b(bEBWG@86z*95Ol~9m|(@$`|>Hh&pXrD4E^P`bM%9 zG-8@pQmhD3=Dh6_f3K)}jmd7VAHHI*l3!ev+&~DlVQ!Zuk^)Jhwa1y;7xH}!wT}V7 z!alyv+fQG!GUhwlPsMM|Ku8h9_W65D4>d;}*e>^Y zcygTSpuP0}s4m(0&E-{3VhACQG$RD^$m3d3pGF8lPBZ}sE5s=h_SV-AKh^&*%k6Lf zeAiZ1?%DaBMSK1FOLl&P*hjhj(Ld7u!Zc-oa=ZR;Db|f8293=^)PRG*pq!`$>)G8t zskhT`r<)u)F$ZQCp0wAqr))Cix9h1@sFVQ`OXIrrjG#a|w-Lt}2}&hL*tx@*V=RCB zcKzY#>Kk91z5{&jX7%CySTYqa)lbBEi}C_QU(j_MhVA8{c8A9d+P5Mwk}?gBegt5%;zagu*y73>*9S#k^e>ua91k!R=}6 zIcN+2uoT19RM@Y!0xFJ9a%`hlj+d}UlceL96M!b$2c6AWZM%VSx;g2!so$_q`P?dz z1S>tZo2D`{LNXy3F}~y~iWK)fqMfwN#CuKsqnD>Cxz}randl{ZQVx zQcK^uH~Qg|zfMnMLMXOpzgdd0y=utoa>w*4O(ZJ@<+hJJu(jP0`BJX5140sRlw}l) z&`qT7zk}DLF;4VaLIi!JJtc8OmC{_}@hq5O?!)I0O)&T0d2#gqQ*>trU_RcgJ0Y>+ zmME)cA;s3Sg_H28IZ*9ZWvep`JDJ^#(x;u~c5W9`VI`BAXzDNDU$uAb{6td}c+&To zr`$o(KUXAwW)0<6{|~gq_Rtf!sVF?q<5}M65onB##b2br?TtY;+T9 zGpy8enT)JWj^)h9d<}7>orI*}94J7H%Nzj|!HBrC;gl5-=U*7zY;@*hWPeOoMst6} GpZgD1Bxj8P diff --git a/flake.nix b/flake.nix index 13e7dd0615209928eae872082fb1488fb74f8591..e88f3fb485dae99d10feb1a19e1e57af1d494a4a 100644 GIT binary patch delta 48 pcmZ1)|2KAn1n=ZsQZkbl@UToS;601PW|=&bZxf8ac`-ke0sz>o5$XT{ delta 187 zcmX}ly9ok85CBk+3%!dB3>V=Hb!PTEfu)G-XSM(X`;cuw19L&J3o8;q47>s!@3X%h z?#q6Al#|-2RVp>IgTy{&4zX|nn;C)#fq>OQY=|ke>tbw|dDlY!nk-jDkQzL>np31? zL>vd}fV|fzUIXZ8Cp!+$&Hr^tBcjd{j6u$hrC4t>5wZ~jqzkd7cJ9`{_VFHO>I+uJ BHO~M5 diff --git a/inputs/default.nix b/inputs/default.nix index 31165859..9135ba35 100644 --- a/inputs/default.nix +++ b/inputs/default.nix @@ -115,26 +115,17 @@ let owner = "hyprwm"; repo = "Hyprland"; - # FIXME: hypr stuff not really working - rev = "b9f110ef8726fcba2b4ee69856027731e73003a5"; - inputs.hyprutils.follows = "hyprutils"; }; hyprland-plugins = mkHyprDep { owner = "hyprwm"; repo = "hyprland-plugins"; - - # FIXME: hypr stuff not really working - rev = "b6b31113ce84419c69ed575c22194e4023d2952a"; }; hyprgrass = mkHyprDep { owner = "horriblename"; repo = "hyprgrass"; - - # FIXME: hypr stuff not really working - rev = "bdfa960b97ac98ad9d05c908ee20e053e2942928"; }; hyprpaper = mkDep { diff --git a/lib/pkgs/mk-types/default.nix b/lib/pkgs/mk-types/default.nix index 1f805c94..784fd73f 100644 --- a/lib/pkgs/mk-types/default.nix +++ b/lib/pkgs/mk-types/default.nix @@ -21,7 +21,7 @@ in pname = "${pname}-types"; version = "0.0.0"; - npmDepsHash = "sha256-P59Y6QRGcPIIvTN36NLwxlLM+Gxw2rx8t7Tyc+vKqr4="; + npmDepsHash = "sha256-Ory8Ia4BYgHzmftcSQm6k4P14IRgqYDYGmckxTiuGLs="; src = ./.; dontNpmBuild = true; diff --git a/lib/pkgs/mk-types/package-lock.json b/lib/pkgs/mk-types/package-lock.json index a9e8fdab25c21d99b038f435df67a65432886b20..b95aac1bd12c42101a86976cf30777bed7811b91 100644 GIT binary patch delta 1726 zcmZXV+l%AY9mjE#k}#9(Zj#Mrw+TCw*|eF7GSSttTqs1cY+Wo%vaXgPOC;-JTedE? zWXtZ$E`8|*nuqgRw*Nw4Af@Cz5XwRWd1xOB+q~p?q2!?u$gF2~6Otz#>2S``_w)OH zf9Kw}&)oa=nU7DN1I9O30J4XJ*>kS}_FpFk55s*GZ&TI=Nu5D`wkB=8lPJbSGvzq} zNsi`iP#9g18{AK|a*^agOizhSOij<1>TSIpNx9e&>-<<|Z6mAqH(T)VO9R|_<$4W2 zyLXG!c1l8-7=_Y`Od{wuQN}8nE{}uS^KlIacMor#-PwP! zc0PP_uXSk=z^CviT?D5n@*WBv{{I~dYQTQWS+jA8RpH1M?Ez^nDvxrtE$Jg&h?r@S z!1NF*F4`2~&ml-tH6=={(9Vgm)U9`{5>|+Xr!@IQEZi-g71$a)G&S(?^Lya0$G<%z zFa5Cwn9r%5>YrV?x>L=llDM=hNg)?RV{Kx2!Eulq_sdjor3E`vN{TatShOlJlV!_E zXcDQqe5`X`o2DfNVsW+;XoEH)c2?)m@ulTW!GGVq2_D?&T_^{4_Aj5EzVvQwSL%OW z#=&1+e&tcA%}$87a(+IddZk%5X+-KqVX+nb3}Wjs92*YL&8JRdl9meIP)e1QGs4Uz zWHgJXeaz&uaYND8s|lj@LS0UHTaUry;ZHF5~I25KDT1wwPc= z(KIhEC6~bmO|jKa8Q6_5f3ww8U;jbjAG~(yLOQaC0p!Njopc3`M&^2~BgU5TndR0g zgC))os0(L?Yq6t7z!9eGLjA&*X0BKX z%1^j|4e-}b9w!U~_g=rgI~z6=-=ji<)l*U$G@435FMZdw5vn2wRdc%_w#|W$S{5u5 zF`J0Z(B7E5h*1p-85nubiFmlKCqu@>0?OJ(8D}fh_kwr0@4xZR6SE!eD95HxNT^PY z%NW8so-jj9kI9E*M9rN};YLl>qlA1L1fk$W+F+v-$_Q&t;!>ZDLp^RgQx1w4nyw2O zBCg7no)@A0Sn&G*I=FH!^Hrc8`~nE4ukJkmhl9(&-9G?-JAXc!JI}%XB+1I+=+}ow zw+V22|LBFJoO{7y_W=j}Z?5kazJK`AlLa6ff%}J-Yjr^X>fhj#H;XgXRDOOwpTUAh?eyDOZO9W8Rl%b~!@g0-Q7b)hHetRP+<<}=Ho+;mC% zO3yxj%|>(s3fNg*w;A6XQ|{2C2Lpr`iV)=lpPf?MelmtAb%n44v!SefSF%PH;XR?e zi}P^`KD_lm@W$J}d@A~PZ(p2UH|Zp^^CiOJDA`+!zV1h^HnLTrG}YORcd5+htqHtt zcH3|#gt@IfR@Y|IY#T)mCluG7*sQrwVaXR|sv}lmL-fA4^m*sj1Mt;?0x$geMhyk@ z?@!FOSdIs58ufw_PqT@Xj6xz@#UWN-an%eNG0qCL1wXfNZ{-gcE}I|>j&4&q@9;sx yPJE^}Du$&K4`Ch_6m+wuHWy8EcUkP3$LU8`&TaG__|Nfgzz3I3&c68Qe)1i{!$<)D delta 1743 zcmZ{l&9CF+6~=X;2y_SL-ht^bXwXb%DCMSR@Mj#mtHyTXIEfuQ{){CMcAUf?v7Ok7 z7su?k*?ILVnr9-R0ws+4t3LYp<;*BB=<5cAU4(`>(%@Coac9r zAAR-YqpzO)p!)O?0q!0%VD|KjJB5B;)rO5O+ZgeZ=uN^N>D$^sUq=G7QK+V1vsO0~ z6uVuw!UmT}a9Ip=KcsYzapx?tP4#WT`hKLc@OIF3WO&KtxM$D7M}JhogBNasU)?x8 zfA8!UN5H;w43@vV4gPRW0r>VYaF1_*FV3raVf0j&9|e%mRSK@Z+|FfcD+OMA z)L77+p^=)JiR6V_YXxhymo6g_>R6IB4kuxUN0Tjlylqd>cmj8jflIIkm3XX#6c`ohv#h<4>rj)8Q5J4M zbBC#0J~ng3h%BLKJyuvKv-_n8569gg+Loh~a=|-4K*48k-2)#ya}0ie_VaV{>Tiy~ zKeLO9pE$h^h`g$o3GHxBAd^YUA#f}psSfM(a0F{@dgKNsn><}l8q0|wC#DU>raWcE z9zP;18&ec9x0fq=fp@%GW6Q{)<)esW(GfU$CfYZ9UoCiW<>dVSwbze!0e^JDfZsj; z!cM*a)S1o?(@_R7@}}&{r9$ZTMiLixOXa)jNYzJ(5utTKz&jA)a-%7qD>2d?DpHzC zs8S1&$4u+(=XqanmD>-yW4^oa9X05odOG3VCAykT*8XRL& zm$3@Q9~$2c{IeIY?#sV>+yKZ+*LO;JSk zn-_gI*1;@L`lc6(R4ZX(PiQX{17jUrMWLn0=;O@agwcR4&?!WOYSCPe`4!ExqrzxT zyPU5v8d^)TvWRN1Yh=8>P;+z*{;dzb9 z$D~*8+}hRnPUZG)z)!)$FMoJo|JQd;z+bOk=s({%xj1npNam~My`NU@y+wcrU*6oG zJWW=yJI)R-@i&k+F0T4n<=W+?^UCQ#-9J1l;FHR8JJtB{r{GU_&vt5`Z{^;No!a9q z;TDsP9 z8ZN_$gA(Zs?fY~sAxpEa4wKp>kRt*vvW~pTk?B-513~rV?U?9kPW^v;oxKg-e&s*l z<=0-lEd1eXm(GU09rjke-7?k$lWulm2nw0`AkcE3U#Pf(rnN=CsVt^jhndA*9x53* zZxEU;Me7yWXNFS|i-m#9Zpm2pTij#@^DXEbeC?JvHwG9^foFgF5_td9s*X!Rsap%k z7pd_!#MYzwn#Jobj={UliHd8<=7wHTLLM2WQJ;e{D4-NVjy5x&UJB|^Mp2@HVpNZ{ ks6p3H=WJ~-dCb-2zvF=Q{dZ3f&c&j diff --git a/modules/ags/config/default.nix b/modules/ags/config/default.nix index 422df170..ca67fa53 100644 --- a/modules/ags/config/default.nix +++ b/modules/ags/config/default.nix @@ -1,3 +1,3 @@ { - npmDepsHash = "sha256-AYc9Rl2PIO1f3JRTO8jHKUsuufrg2cZ02NMHvwl4FY4="; + npmDepsHash = "sha256-Kv9I+qf1b40FhV1orDFUIhURw1rvA8ggU+eXcZS+KXU="; } diff --git a/modules/ags/config/package-lock.json b/modules/ags/config/package-lock.json index 71d3fbbbfc6352317be70e206b8ec8b2cb4c0b01..e5eda6b239075d2bccbb3ad1df107006e49df2d2 100644 GIT binary patch delta 104 zcmbQYhh^R#mJJV*Lfy?W!;AAgstj`6f{Gk-Lk-OfGRvbv4g3>}jkELJybbcr{E94s zjLienvI=v|%Y5CPyc0bG+&yx0)5{F}N>h`Q^UIRT)69GlBchB8GCi`4bBiW#be7v3 IoP2s00N<=8v;Y7A delta 104 zcmbQYhh^R#mJJV*LVa?QQe2V^DxEWfl1y?8GtFHLO3gFOqFky1(v7_=N&;O?TvG}Y zouaZ$B6A}H1A`sC%=|p^{7PMd(<~~Yf<3*;l1#!QOU=D3j6EGaBU0T`{7oiLoF=z9 IIQjH00G`Js0ssI2 diff --git a/overlays/build-failures/bat-extras.nix b/overlays/build-failures/bat-extras.nix new file mode 100644 index 00000000..9e7607d6 --- /dev/null +++ b/overlays/build-failures/bat-extras.nix @@ -0,0 +1,209 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + makeWrapper, + bat, + # batdiff, batgrep, and batwatch + coreutils, + getconf, + less, + # tests + bash, + zsh, + fish, + # batgrep + ripgrep, + # prettybat + withShFmt ? shfmt != null, + shfmt ? null, + withPrettier ? nodePackages ? prettier, + nodePackages ? null, + withClangTools ? clang-tools != null, + clang-tools ? null, + withRustFmt ? rustfmt != null, + rustfmt ? null, + # batwatch + withEntr ? entr != null, + entr ? null, + # batdiff + gitMinimal, + withDelta ? delta != null, + delta ? null, + # batman + util-linux, +}: let + # Core derivation that all the others are based on. + # This includes the complete source so the per-script derivations can run the tests. + core = stdenv.mkDerivation rec { + pname = "bat-extras"; + version = "2024.07.10"; + + src = fetchFromGitHub { + owner = "eth-p"; + repo = "bat-extras"; + rev = "v${version}"; + hash = "sha256-6IRAKSy5f/WcQZBcJKVSweTjHLznzdxhsyx074bXnUQ="; + fetchSubmodules = true; + }; + + # bat needs to be in the PATH during building so EXECUTABLE_BAT picks it up + nativeBuildInputs = [bat]; + + dontConfigure = true; + + patches = [ + (fetchpatch { + url = "https://github.com/petrzjunior/nixpkgs/raw/80d08100fa04fdb0187f3a7a8667e12aa3614b5e/pkgs/tools/misc/bat-extras/disable-theme-tests.patch"; + hash = "sha256-vBNMaJFwr9zTobvIRc5VljMPG3kVk07E+mNc1SJVyzg="; + }) + ]; + + postPatch = '' + patchShebangs --build test.sh test/shimexec .test-framework/bin/best.sh + ''; + + buildPhase = '' + runHook preBuild + bash ./build.sh --minify=none --no-verify + runHook postBuild + ''; + + # Run the library tests as they don't have external dependencies + doCheck = true; + nativeCheckInputs = + [ + bash + fish + zsh + ] + ++ (lib.optionals stdenv.hostPlatform.isDarwin [getconf]); + checkPhase = '' + runHook preCheck + # test list repeats suites. Unique them + declare -A test_suites + while read -r action arg _; do + [[ "$action" == "test_suite" && "$arg" == lib_* ]] && + test_suites+=(["$arg"]=1) + done <<<"$(./test.sh --compiled --list --porcelain)" + (( ''${#test_suites[@]} != 0 )) || { + echo "Couldn't find any library test suites" + exit 1 + } + ./test.sh --compiled $(printf -- "--suite %q\n" "''${!test_suites[@]}") + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + cp -a . $out + runHook postInstall + ''; + + # A few random files have shebangs. Don't patch them, they don't make it into the final output. + # The per-script derivations will go ahead and patch the files they actually install. + dontPatchShebangs = true; + + meta = with lib; { + description = "Bash scripts that integrate bat with various command line tools"; + homepage = "https://github.com/eth-p/bat-extras"; + license = with licenses; [mit]; + maintainers = with maintainers; [bbigras]; + platforms = platforms.all; + }; + }; + script = name: + # the name of the script + dependencies: + # the tools we need to prefix onto PATH + stdenv.mkDerivation { + pname = name; + inherit (core) version; + + src = core; + + nativeBuildInputs = [makeWrapper]; + # Make the dependencies available to the tests. + buildInputs = dependencies; + + # Patch shebangs now because our tests rely on them + postPatch = '' + patchShebangs --host bin/${name} + ''; + + dontConfigure = true; + dontBuild = true; # we've already built + + doCheck = true; + nativeCheckInputs = + [ + bat + bash + fish + zsh + ] + ++ (lib.optionals stdenv.hostPlatform.isDarwin [getconf]); + checkPhase = '' + runHook preCheck + bash ./test.sh --compiled --suite ${name} + runHook postCheck + ''; + + installPhase = + '' + runHook preInstall + mkdir -p $out/bin + cp -p bin/${name} $out/bin/${name} + '' + + lib.optionalString (dependencies != []) '' + wrapProgram $out/bin/${name} \ + --prefix PATH : ${lib.makeBinPath dependencies} + '' + + '' + runHook postInstall + ''; + + # We already patched + dontPatchShebangs = true; + + meta = + core.meta + // { + mainProgram = name; + }; + }; + optionalDep = cond: dep: + assert cond -> dep != null; + lib.optional cond dep; +in { + batdiff = script "batdiff" ( + [ + less + coreutils + gitMinimal + ] + ++ optionalDep withDelta delta + ); + batgrep = script "batgrep" [ + less + coreutils + ripgrep + ]; + batman = script "batman" (lib.optionals stdenv.hostPlatform.isLinux [util-linux]); + batpipe = script "batpipe" [less]; + batwatch = script "batwatch" ( + [ + less + coreutils + ] + ++ optionalDep withEntr entr + ); + prettybat = script "prettybat" ( + [] + ++ optionalDep withShFmt shfmt + ++ optionalDep withPrettier nodePackages.prettier + ++ optionalDep withClangTools clang-tools + ++ optionalDep withRustFmt rustfmt + ); +} diff --git a/overlays/build-failures/default.nix b/overlays/build-failures/default.nix index a2fe3df7..4a27131e 100644 --- a/overlays/build-failures/default.nix +++ b/overlays/build-failures/default.nix @@ -1,4 +1,11 @@ -final: prev: { +final: prev: let + pkgs = final; + + inherit (pkgs) recurseIntoAttrs callPackages; +in { + # FIXME: https://pr-tracker.nelim.org/?pr=373146 + bat-extras = recurseIntoAttrs (callPackages ./bat-extras.nix {}); + # FIXME: https://pr-tracker.nelim.org/?pr=357699 nodejs_latest = prev.nodejs_22; diff --git a/scopedPackages/lovelace-components/custom-sidebar/default.nix b/scopedPackages/lovelace-components/custom-sidebar/default.nix index 55eb6556..829daca2 100644 --- a/scopedPackages/lovelace-components/custom-sidebar/default.nix +++ b/scopedPackages/lovelace-components/custom-sidebar/default.nix @@ -30,7 +30,7 @@ in pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-H4ayvaFBN2K5poIHE97lA4dxOYoaG8pHoWpMNW85Xy0="; + hash = "sha256-7cVWjyRZXd7xUZsgRNRYPfAap3LGH5VbLzvi2ocbkwc="; }; passthru.update = concatTextFile { diff --git a/scopedPackages/lovelace-components/material-rounded-theme/default.nix b/scopedPackages/lovelace-components/material-rounded-theme/default.nix index 1ae17fa6..bad683e8 100644 --- a/scopedPackages/lovelace-components/material-rounded-theme/default.nix +++ b/scopedPackages/lovelace-components/material-rounded-theme/default.nix @@ -15,7 +15,7 @@ in substituteInPlace ./webpack.config.js --replace-fail "git branch --show-current" "echo main" ''; - npmDepsHash = "sha256-l/g6gXCOyOe4N2ZawXsep1QpmvI31DTFgTQPp+LCDfk="; + npmDepsHash = "sha256-BlG/IuyJpigw6twUoaxJ5a970JfwBb75FuwgtH4xrCw="; installPhase = '' mkdir $out