mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-19 18:44:13 +00:00
Merge master into staging-next
This commit is contained in:
commit
98dddbad91
@ -11758,6 +11758,12 @@
|
||||
githubId = 1730718;
|
||||
name = "Hideaki Kawai";
|
||||
};
|
||||
kaylorben = {
|
||||
email = "blkaylor22@gmail.com";
|
||||
github = "kaylorben";
|
||||
githubId = 41012641;
|
||||
name = "Benjamin Kaylor";
|
||||
};
|
||||
kazcw = {
|
||||
email = "kaz@lambdaverse.org";
|
||||
github = "kazcw";
|
||||
@ -21062,6 +21068,12 @@
|
||||
githubId = 174749595;
|
||||
keys = [ { fingerprint = "E3CD E225 47C6 2DB6 6CCD BC06 CC3A E2EA 0000 0000"; } ];
|
||||
};
|
||||
sigmike = {
|
||||
email = "mike+nixpkgs@lepton.fr";
|
||||
github = "sigmike";
|
||||
githubId = 28259;
|
||||
name = "Michael Witrant";
|
||||
};
|
||||
sikmir = {
|
||||
email = "sikmir@disroot.org";
|
||||
matrix = "@sikmir:matrix.org";
|
||||
|
@ -8,6 +8,50 @@ let
|
||||
cfg = config.services.borgmatic;
|
||||
settingsFormat = pkgs.formats.yaml { };
|
||||
|
||||
postgresql = config.services.postgresql.package;
|
||||
mysql = config.services.mysql.package;
|
||||
requireSudo =
|
||||
s:
|
||||
s ? postgresql_databases
|
||||
&& lib.any (d: d ? username && !(d ? password) && !(d ? pg_dump_command)) s.postgresql_databases;
|
||||
addRequiredBinaries =
|
||||
s:
|
||||
s
|
||||
// {
|
||||
postgresql_databases = map (
|
||||
d:
|
||||
let
|
||||
as_user = if d ? username && !(d ? password) then "${pkgs.sudo}/bin/sudo -u ${d.username} " else "";
|
||||
in
|
||||
{
|
||||
pg_dump_command =
|
||||
if d.name == "all" then
|
||||
"${as_user}${postgresql}/bin/pg_dumpall"
|
||||
else
|
||||
"${as_user}${postgresql}/bin/pg_dump";
|
||||
pg_restore_command = "${as_user}${postgresql}/bin/pg_restore";
|
||||
psql_command = "${as_user}${postgresql}/bin/psql";
|
||||
}
|
||||
// d
|
||||
) (s.postgresql_databases or [ ]);
|
||||
mariadb_databases = map (
|
||||
d:
|
||||
{
|
||||
mariadb_dump_command = "${mysql}/bin/mariadb-dump";
|
||||
mariadb_command = "${mysql}/bin/mariadb";
|
||||
}
|
||||
// d
|
||||
) (s.mariadb_databases or [ ]);
|
||||
mysql_databases = map (
|
||||
d:
|
||||
{
|
||||
mysql_dump_command = "${mysql}/bin/mysqldump";
|
||||
mysql_command = "${mysql}/bin/mysql";
|
||||
}
|
||||
// d
|
||||
) (s.mysql_databases or [ ]);
|
||||
};
|
||||
|
||||
repository =
|
||||
with lib.types;
|
||||
submodule {
|
||||
@ -72,7 +116,10 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
cfgfile = settingsFormat.generate "config.yaml" cfg.settings;
|
||||
cfgfile = settingsFormat.generate "config.yaml" (addRequiredBinaries cfg.settings);
|
||||
|
||||
anycfgRequiresSudo =
|
||||
requireSudo cfg.settings || lib.any requireSudo (lib.attrValues cfg.configurations);
|
||||
in
|
||||
{
|
||||
options.services.borgmatic = {
|
||||
@ -106,7 +153,7 @@ in
|
||||
// lib.mapAttrs' (
|
||||
name: value:
|
||||
lib.nameValuePair "borgmatic.d/${name}.yaml" {
|
||||
source = settingsFormat.generate "${name}.yaml" value;
|
||||
source = settingsFormat.generate "${name}.yaml" (addRequiredBinaries value);
|
||||
}
|
||||
) cfg.configurations;
|
||||
borgmaticCheck =
|
||||
@ -132,6 +179,11 @@ in
|
||||
environment.etc = configFiles;
|
||||
|
||||
systemd.packages = [ pkgs.borgmatic ];
|
||||
systemd.services.borgmatic.path = [ pkgs.coreutils ];
|
||||
systemd.services.borgmatic.serviceConfig = lib.optionalAttrs anycfgRequiresSudo {
|
||||
NoNewPrivileges = false;
|
||||
CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_NET_RAW CAP_SETUID CAP_SETGID";
|
||||
};
|
||||
|
||||
# Workaround: https://github.com/NixOS/nixpkgs/issues/81138
|
||||
systemd.timers.borgmatic.wantedBy = [ "timers.target" ];
|
||||
|
@ -31,13 +31,13 @@ let
|
||||
in
|
||||
melpaBuild {
|
||||
pname = "lsp-bridge";
|
||||
version = "0-unstable-2024-12-27";
|
||||
version = "0-unstable-2025-01-11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "manateelazycat";
|
||||
repo = "lsp-bridge";
|
||||
rev = "402e65f372bb4268c0cd0514a12f0b0e9649c4af";
|
||||
hash = "sha256-iUOjc/iEJMsR87Kk96729luQx34b924zlZejA2oPNZ0=";
|
||||
rev = "6fd5eb21a174e6a04247a2f370b544dcd6cb2420";
|
||||
hash = "sha256-+E1l0Ea0Db5ksX9tDW+cvNUMjT4be5i9qcI/rIvFKbY=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -39,6 +39,10 @@
|
||||
"date": "2023-08-08",
|
||||
"new": "lspsaga-nvim"
|
||||
},
|
||||
"lua-async-await": {
|
||||
"date": "2025-01-09",
|
||||
"new": "lua-async"
|
||||
},
|
||||
"lua-dev-nvim": {
|
||||
"date": "2022-10-14",
|
||||
"new": "neodev-nvim"
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -193,23 +193,23 @@
|
||||
};
|
||||
c = buildGrammar {
|
||||
language = "c";
|
||||
version = "0.0.0+rev=3efee11";
|
||||
version = "0.0.0+rev=3aa2995";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-c";
|
||||
rev = "3efee11f784605d44623d7dadd6cd12a0f73ea92";
|
||||
hash = "sha256-nb+CoRbX7RFAGus7USWA1NhAnnkkJ89vIdSN36QmSCE=";
|
||||
rev = "3aa2995549d5d8b26928e8d3fa2770fd4327414e";
|
||||
hash = "sha256-iT0sjwtrDtCduxCU3wVB1AP6gzxW3DpmqNQaP3LUBiA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c";
|
||||
};
|
||||
c_sharp = buildGrammar {
|
||||
language = "c_sharp";
|
||||
version = "0.0.0+rev=4bf615f";
|
||||
version = "0.0.0+rev=acff8cb";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-c-sharp";
|
||||
rev = "4bf615f8d688f50d69fc5677187dc35f22e03ad6";
|
||||
hash = "sha256-jcZcmqQEOPzkiT1jJ4wuE9Ryg10XXpwBoyANNAhCbZg=";
|
||||
rev = "acff8cbb53a1d7b9cd07b209c9933a0e2da9ef35";
|
||||
hash = "sha256-Mdcr4UuoKiNodrNV7/NRfQkmgynPa798Rv9f6Qm3cFw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";
|
||||
};
|
||||
@ -458,12 +458,12 @@
|
||||
};
|
||||
diff = buildGrammar {
|
||||
language = "diff";
|
||||
version = "0.0.0+rev=63439b5";
|
||||
version = "0.0.0+rev=e42b8de";
|
||||
src = fetchFromGitHub {
|
||||
owner = "the-mikedavis";
|
||||
repo = "tree-sitter-diff";
|
||||
rev = "63439b5e6e35750aff1e53d9eecc663d369c54bc";
|
||||
hash = "sha256-dMEeSOb4DlSPs5eq6tmFhrvkp9Imy3xS85hGoPFeH24=";
|
||||
rev = "e42b8def4f75633568f1aecfe01817bf15164928";
|
||||
hash = "sha256-1ibGin1e6+geAQNoV/KLCBOoXYcZo7S5+Q2XgsZPIfU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff";
|
||||
};
|
||||
@ -559,12 +559,12 @@
|
||||
};
|
||||
editorconfig = buildGrammar {
|
||||
language = "editorconfig";
|
||||
version = "0.0.0+rev=efcd7c2";
|
||||
version = "0.0.0+rev=ad9d7b8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValdezFOmar";
|
||||
repo = "tree-sitter-editorconfig";
|
||||
rev = "efcd7c2852c69822d625786324538b7457fafddb";
|
||||
hash = "sha256-/JJKr4wZc9aGs8VFH479hazUDGD7kt3rw8LpH4w2GX8=";
|
||||
rev = "ad9d7b84453426c40717c2b2c6b13d0a955d0662";
|
||||
hash = "sha256-N717l1J0MCaWbjpmZ5hQI5bUy9kp9FSn2Coeqjn6CGE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
|
||||
};
|
||||
@ -768,12 +768,12 @@
|
||||
};
|
||||
fsharp = buildGrammar {
|
||||
language = "fsharp";
|
||||
version = "0.0.0+rev=971da5f";
|
||||
version = "0.0.0+rev=207f1c9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ionide";
|
||||
repo = "tree-sitter-fsharp";
|
||||
rev = "971da5ff0266bfe4a6ecfb94616548032d6d1ba0";
|
||||
hash = "sha256-0jrbznAXcjXrbJ5jnxWMzPKxRopxKCtoQXGl80R1M0M=";
|
||||
rev = "207f1c988f4649e12fe207e4a7e4f83b9da037d1";
|
||||
hash = "sha256-NKK83ZwhpFY3TtSxLlAbaY8bBaQ7TXcVT4wMMm4Zm0A=";
|
||||
};
|
||||
location = "fsharp";
|
||||
meta.homepage = "https://github.com/ionide/tree-sitter-fsharp";
|
||||
@ -824,12 +824,12 @@
|
||||
};
|
||||
gdscript = buildGrammar {
|
||||
language = "gdscript";
|
||||
version = "0.0.0+rev=bf39f1b";
|
||||
version = "0.0.0+rev=48b4933";
|
||||
src = fetchFromGitHub {
|
||||
owner = "PrestonKnopp";
|
||||
repo = "tree-sitter-gdscript";
|
||||
rev = "bf39f1b38a234d79940fd8866abb0b132ab51b1e";
|
||||
hash = "sha256-z3/uxEgP1MomeGsAQimeUFBNhBLiUsYzvz0XlxwxoBU=";
|
||||
rev = "48b49330888a4669b48619b211cc8da573827725";
|
||||
hash = "sha256-mGmrCK3nGSzi/66mOxvpRyTA9b74aTMSoIISqzj+l90=";
|
||||
};
|
||||
meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-gdscript";
|
||||
};
|
||||
@ -1000,12 +1000,12 @@
|
||||
};
|
||||
godot_resource = buildGrammar {
|
||||
language = "godot_resource";
|
||||
version = "0.0.0+rev=74105cc";
|
||||
version = "0.0.0+rev=941955d";
|
||||
src = fetchFromGitHub {
|
||||
owner = "PrestonKnopp";
|
||||
repo = "tree-sitter-godot-resource";
|
||||
rev = "74105cc46a09850ebe626b894ecc6c61a12fb999";
|
||||
hash = "sha256-aVIxIz92uVtbIZvT6x/eDNGJxiUhYasTWMq+W4/bySo=";
|
||||
rev = "941955d027f1d8530501e77ce5e1d6035f5f99c1";
|
||||
hash = "sha256-qecg47cYY3TXDz6aQLAyuJtxhvunIRB3bcNCftZAmqk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/PrestonKnopp/tree-sitter-godot-resource";
|
||||
};
|
||||
@ -1088,12 +1088,12 @@
|
||||
};
|
||||
groovy = buildGrammar {
|
||||
language = "groovy";
|
||||
version = "0.0.0+rev=b53a8cc";
|
||||
version = "0.0.0+rev=1f30c33";
|
||||
src = fetchFromGitHub {
|
||||
owner = "murtaza64";
|
||||
repo = "tree-sitter-groovy";
|
||||
rev = "b53a8cc1075e056b8223b86f3bb392e0d57ae101";
|
||||
hash = "sha256-yLl3/4qla45tsjCd2EFutcNqVrDjyMUjnSpUUHwaIyE=";
|
||||
rev = "1f30c3398495dfeba24c7aa3b12a2bc68c0bd419";
|
||||
hash = "sha256-oq3IzUuY4eF/8/7UhOAoR4ZWAz5onUgiB+f4TmHf7Vc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy";
|
||||
};
|
||||
@ -1329,6 +1329,17 @@
|
||||
};
|
||||
meta.homepage = "https://github.com/inko-lang/tree-sitter-inko";
|
||||
};
|
||||
ipkg = buildGrammar {
|
||||
language = "ipkg";
|
||||
version = "0.0.0+rev=8d3e978";
|
||||
src = fetchFromGitHub {
|
||||
owner = "srghma";
|
||||
repo = "tree-sitter-ipkg";
|
||||
rev = "8d3e9782f2d091d0cd39c13bfb3068db0c675960";
|
||||
hash = "sha256-DyxD+Ehoqh0ywgU+J6EgnOQTcwOUJEuuXSOVjZ8M89c=";
|
||||
};
|
||||
meta.homepage = "https://github.com/srghma/tree-sitter-ipkg";
|
||||
};
|
||||
ispc = buildGrammar {
|
||||
language = "ispc";
|
||||
version = "0.0.0+rev=9b2f9ae";
|
||||
@ -1441,23 +1452,23 @@
|
||||
};
|
||||
julia = buildGrammar {
|
||||
language = "julia";
|
||||
version = "0.0.0+rev=e01c928";
|
||||
version = "0.0.0+rev=ffdd9fe";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-julia";
|
||||
rev = "e01c928d11375513138a175a68485c4d53e55ea9";
|
||||
hash = "sha256-QOJfpPVW4G1Fmbggv4DloJA7sLzq0QYaHLsdgr07r24=";
|
||||
rev = "ffdd9fe4dccdc26d62ce1654fceac52c394f0cf3";
|
||||
hash = "sha256-AMKnttpHAThjas1gj/8YhB9y0TwNxqaIXAgPtiqGDZk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia";
|
||||
};
|
||||
just = buildGrammar {
|
||||
language = "just";
|
||||
version = "0.0.0+rev=4f4e566";
|
||||
version = "0.0.0+rev=bb0c898";
|
||||
src = fetchFromGitHub {
|
||||
owner = "IndianBoy42";
|
||||
repo = "tree-sitter-just";
|
||||
rev = "4f4e566fe47c30b14cfe388a28f70b79009609e5";
|
||||
hash = "sha256-WBUNS+XFXi/h5AUM7Q8j8zAE2oqZeBHdpC5Au2QwqP8=";
|
||||
rev = "bb0c898a80644de438e6efe5d88d30bf092935cd";
|
||||
hash = "sha256-FwEuH/2R745jsuFaVGNeUTv65xW+MPjbcakRNcAWfZU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just";
|
||||
};
|
||||
@ -1496,12 +1507,12 @@
|
||||
};
|
||||
koto = buildGrammar {
|
||||
language = "koto";
|
||||
version = "0.0.0+rev=b420f79";
|
||||
version = "0.0.0+rev=7258681";
|
||||
src = fetchFromGitHub {
|
||||
owner = "koto-lang";
|
||||
repo = "tree-sitter-koto";
|
||||
rev = "b420f7922d0d74905fd0d771e5b83be9ee8a8a9a";
|
||||
hash = "sha256-X1YnhmOpVJ+ENHXSK7jZxl1SXxa0UM07nkXdejlQDOA=";
|
||||
rev = "7258681498ac92f24b2d7ebb844b5e79dc3cf9ac";
|
||||
hash = "sha256-dBx0iyG1p+Lij/yKKhBZLZcnoB70P6A4Xd9UYzq2iVU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/koto-lang/tree-sitter-koto";
|
||||
};
|
||||
@ -1552,12 +1563,12 @@
|
||||
};
|
||||
leo = buildGrammar {
|
||||
language = "leo";
|
||||
version = "0.0.0+rev=6ca11a9";
|
||||
version = "0.0.0+rev=44a061b";
|
||||
src = fetchFromGitHub {
|
||||
owner = "r001";
|
||||
repo = "tree-sitter-leo";
|
||||
rev = "6ca11a96fc2cab51217e0cf4a2f9ed3ea63e28fb";
|
||||
hash = "sha256-ye2zzLNZC2ZJqnXtBl7fdSC78kph3rs7j4whIdfDYAE=";
|
||||
rev = "44a061bac4d9443d75f2700c62a71cd4dcf16f05";
|
||||
hash = "sha256-BcQpqCrzn5qNsOlFL1wHvj48vsP1ZrMCYB+HMlIQ0cw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/r001/tree-sitter-leo";
|
||||
};
|
||||
@ -1741,12 +1752,12 @@
|
||||
};
|
||||
mlir = buildGrammar {
|
||||
language = "mlir";
|
||||
version = "0.0.0+rev=72929ac";
|
||||
version = "0.0.0+rev=01065de";
|
||||
src = fetchFromGitHub {
|
||||
owner = "artagnon";
|
||||
repo = "tree-sitter-mlir";
|
||||
rev = "72929ac13d7e1c46010114202262b7102a821293";
|
||||
hash = "sha256-lJzZAWYjqX7HG/fbYCIoYWBjpndhlUV5c7ukFvXvRLQ=";
|
||||
rev = "01065decfd6877fe3c4bae05782b8892544cb73e";
|
||||
hash = "sha256-XygafBpyD5WQ9JBZstWjbjKYuDbPWzPbvO/6VLMuQt4=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
|
||||
@ -1786,12 +1797,12 @@
|
||||
};
|
||||
nickel = buildGrammar {
|
||||
language = "nickel";
|
||||
version = "0.0.0+rev=ddaa2bc";
|
||||
version = "0.0.0+rev=25464b3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickel-lang";
|
||||
repo = "tree-sitter-nickel";
|
||||
rev = "ddaa2bc22355effd97c0d6b09ff5962705c6368d";
|
||||
hash = "sha256-jL054OJj+1eXksNYOTTTFzZjwPqTFp06syC3TInN8rc=";
|
||||
rev = "25464b33522c3f609fa512aa9651707c0b66d48b";
|
||||
hash = "sha256-dQeUoHQHkPYywYIm3TMnTWPXUlh2xh8M5CVUiXASBu8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel";
|
||||
};
|
||||
@ -1863,12 +1874,12 @@
|
||||
};
|
||||
nu = buildGrammar {
|
||||
language = "nu";
|
||||
version = "0.0.0+rev=755efd5";
|
||||
version = "0.0.0+rev=9822fc6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nushell";
|
||||
repo = "tree-sitter-nu";
|
||||
rev = "755efd545d39e23418ce6f96f2a8600ff1a7e74d";
|
||||
hash = "sha256-7lfSO/2GyWYicgmLRvwCfM4pqvFeUSD5urA4XE1uKew=";
|
||||
rev = "9822fc63a62ff87939c88ead9f381f951f092dee";
|
||||
hash = "sha256-fcwWrM1KpK1V+TeGqe/iMICOIv7/lA1WZW/8jJXL7WA=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nushell/tree-sitter-nu";
|
||||
};
|
||||
@ -1896,24 +1907,24 @@
|
||||
};
|
||||
ocaml = buildGrammar {
|
||||
language = "ocaml";
|
||||
version = "0.0.0+rev=98c2130";
|
||||
version = "0.0.0+rev=57644ed";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-ocaml";
|
||||
rev = "98c2130c59ca7553b47086f91c5d22180151ad55";
|
||||
hash = "sha256-afzEd9+hm/J5T4GPWV6jvL4SGqUPvHCP6HnQixi/O+w=";
|
||||
rev = "57644edfbba0edb38ac17dba2add4c243fa3539b";
|
||||
hash = "sha256-eRCO7hNbNXd6k6I+cSLHMX8Ry68fKXTjJXLFmBvnQro=";
|
||||
};
|
||||
location = "grammars/ocaml";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
|
||||
};
|
||||
ocaml_interface = buildGrammar {
|
||||
language = "ocaml_interface";
|
||||
version = "0.0.0+rev=98c2130";
|
||||
version = "0.0.0+rev=57644ed";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-ocaml";
|
||||
rev = "98c2130c59ca7553b47086f91c5d22180151ad55";
|
||||
hash = "sha256-afzEd9+hm/J5T4GPWV6jvL4SGqUPvHCP6HnQixi/O+w=";
|
||||
rev = "57644edfbba0edb38ac17dba2add4c243fa3539b";
|
||||
hash = "sha256-eRCO7hNbNXd6k6I+cSLHMX8Ry68fKXTjJXLFmBvnQro=";
|
||||
};
|
||||
location = "grammars/interface";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
|
||||
@ -2156,12 +2167,12 @@
|
||||
};
|
||||
properties = buildGrammar {
|
||||
language = "properties";
|
||||
version = "0.0.0+rev=f93f673";
|
||||
version = "0.0.0+rev=579b62f";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter-grammars";
|
||||
repo = "tree-sitter-properties";
|
||||
rev = "f93f673990deffbfa548826eebade93af81887b4";
|
||||
hash = "sha256-XATT9i8lYcdTDtNHChtbUux9E6pg7jFPKnWR6tMEBew=";
|
||||
rev = "579b62f5ad8d96c2bb331f07d1408c92767531d9";
|
||||
hash = "sha256-4WgGbU6fthFH1DcvlQiqNGXucCfxA+hANZ7Y+r8eXHg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-properties";
|
||||
};
|
||||
@ -2245,12 +2256,12 @@
|
||||
};
|
||||
python = buildGrammar {
|
||||
language = "python";
|
||||
version = "0.0.0+rev=bffb65a";
|
||||
version = "0.0.0+rev=409b5d6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-python";
|
||||
rev = "bffb65a8cfe4e46290331dfef0dbf0ef3679de11";
|
||||
hash = "sha256-71Od4sUsxGEvTwmXX8hBvzqD55hnXkVJublrhp1GICg=";
|
||||
rev = "409b5d671eb0ea4972eeacaaca24bbec1acf79b1";
|
||||
hash = "sha256-IIAL2qteFPBCPmDK1N2EdDgpI4CwfMuuVL8t5tYueLU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-python";
|
||||
};
|
||||
@ -2278,12 +2289,12 @@
|
||||
};
|
||||
qmljs = buildGrammar {
|
||||
language = "qmljs";
|
||||
version = "0.0.0+rev=6d4db24";
|
||||
version = "0.0.0+rev=8fef30e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "yuja";
|
||||
repo = "tree-sitter-qmljs";
|
||||
rev = "6d4db242185721e1f5ef21fde613ca90c743ec47";
|
||||
hash = "sha256-S6rBQRecJvPgyWq1iydFZgDyXbm9CZBw8kxzNI0cqdw=";
|
||||
rev = "8fef30e231d74b65c713bcbac21956156d8963da";
|
||||
hash = "sha256-4OIXOePSu1Pc2BJuXoNNVZnKvjTjOQ6ixqE8NU7tLqg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/yuja/tree-sitter-qmljs";
|
||||
};
|
||||
@ -2344,12 +2355,12 @@
|
||||
};
|
||||
rbs = buildGrammar {
|
||||
language = "rbs";
|
||||
version = "0.0.0+rev=8d8e65a";
|
||||
version = "0.0.0+rev=de893b1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "joker1007";
|
||||
repo = "tree-sitter-rbs";
|
||||
rev = "8d8e65ac3f77fbc9e15b1cdb9f980a3e0ac3ab99";
|
||||
hash = "sha256-M72rShapD813gpBbWUIil6UgcnoF1DVTffMSnTpejgg=";
|
||||
rev = "de893b166476205b09e79cd3689f95831269579a";
|
||||
hash = "sha256-87Z8XQfuqrWYj9Mc+whVu9o3ZwfjGYylbvxZNYnA3UM=";
|
||||
};
|
||||
meta.homepage = "https://github.com/joker1007/tree-sitter-rbs";
|
||||
};
|
||||
@ -2621,12 +2632,12 @@
|
||||
};
|
||||
snakemake = buildGrammar {
|
||||
language = "snakemake";
|
||||
version = "0.0.0+rev=29a82dd";
|
||||
version = "0.0.0+rev=f36c158";
|
||||
src = fetchFromGitHub {
|
||||
owner = "osthomas";
|
||||
repo = "tree-sitter-snakemake";
|
||||
rev = "29a82ddde86c0d428acf971b04794c13525c4bc5";
|
||||
hash = "sha256-55nfPYR9iuHpV1TXELOAyF+PVqI1LYpCGc9RP2RylVU=";
|
||||
rev = "f36c1587624d6d84376c82a357c20fc319cbf02c";
|
||||
hash = "sha256-yiEfMB67bIaIj+iXQ/ShvVQES6HCWnKI6DzWxsrIrRk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/osthomas/tree-sitter-snakemake";
|
||||
};
|
||||
@ -2689,12 +2700,12 @@
|
||||
};
|
||||
sql = buildGrammar {
|
||||
language = "sql";
|
||||
version = "0.0.0+rev=f2a6b6f";
|
||||
version = "0.0.0+rev=b9d1095";
|
||||
src = fetchFromGitHub {
|
||||
owner = "derekstride";
|
||||
repo = "tree-sitter-sql";
|
||||
rev = "f2a6b6f86cd4322c346faa312ddf2b839bf5e989";
|
||||
hash = "sha256-8rEUNBP8ZChtPcQVTcVm7tg9E4ImogSYkLA6aw0hz+E=";
|
||||
rev = "b9d109588d5b5ed986c857464830c2f0bef53f18";
|
||||
hash = "sha256-uEiwHIlLC6AyqD3/fH9KmXMdgQUb30MwBGrjPoyAPbc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
|
||||
};
|
||||
@ -2711,12 +2722,12 @@
|
||||
};
|
||||
ssh_config = buildGrammar {
|
||||
language = "ssh_config";
|
||||
version = "0.0.0+rev=dd32616";
|
||||
version = "0.0.0+rev=0dd3c7e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ObserverOfTime";
|
||||
repo = "tree-sitter-ssh-config";
|
||||
rev = "dd32616275c6e9d7800c58f40c16a09ad1c7c238";
|
||||
hash = "sha256-BOvCOnt76f00+hqjEmJ8VLiwqSPd3p/yScTXsuNdexY=";
|
||||
rev = "0dd3c7e9f301758f6c69a6efde43d3048deb4d8a";
|
||||
hash = "sha256-jNB9cHOfHDIRPELm8LedJjNzjx16/ApcPGi8eaaJKZs=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config";
|
||||
};
|
||||
@ -2811,12 +2822,12 @@
|
||||
};
|
||||
swift = buildGrammar {
|
||||
language = "swift";
|
||||
version = "0.0.0+rev=7ca0504";
|
||||
version = "0.0.0+rev=f4be807";
|
||||
src = fetchFromGitHub {
|
||||
owner = "alex-pinkus";
|
||||
repo = "tree-sitter-swift";
|
||||
rev = "7ca0504e6d1a3e1e2f5fa725dafecf5e5bd2b202";
|
||||
hash = "sha256-k+8dgX0VYVu9B1UwFdLcxjnfOGQiqQr0LCXbr+T4N8o=";
|
||||
rev = "f4be8072f18fb9704fd35d4b8154ae2b19e314c0";
|
||||
hash = "sha256-B/LtB+HyZKXra/Fs2ZyhVSjUXUJKQDgG8xuv/LpL6YA=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
|
||||
@ -2901,12 +2912,12 @@
|
||||
};
|
||||
templ = buildGrammar {
|
||||
language = "templ";
|
||||
version = "0.0.0+rev=9269b5a";
|
||||
version = "0.0.0+rev=60310af";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vrischmann";
|
||||
repo = "tree-sitter-templ";
|
||||
rev = "9269b5a65e79be8fb6b6669935823263343b7ba0";
|
||||
hash = "sha256-GnL5J5JBx+DW2UbKRGVg3eSDHryvJMs7irOqnWZXpL0=";
|
||||
rev = "60310af0d788a0160d719d4aff8f146b6e6c55bd";
|
||||
hash = "sha256-M0+Yw2Ld9qT9Ag9OaMpmls8LO4+IK0xtAZ8X5oZ2c78=";
|
||||
};
|
||||
meta.homepage = "https://github.com/vrischmann/tree-sitter-templ";
|
||||
};
|
||||
@ -3148,12 +3159,12 @@
|
||||
};
|
||||
v = buildGrammar {
|
||||
language = "v";
|
||||
version = "0.0.0+rev=b9644a2";
|
||||
version = "0.0.0+rev=5351039";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "v-analyzer";
|
||||
rev = "b9644a24bf0be5bf41de61bda681b28492dd3112";
|
||||
hash = "sha256-XURrUjpp7tytq5eO4BY0fmaMssE4B46P3gybbcfVzr4=";
|
||||
rev = "535103910159887a41d019635c1cdbec910d1a31";
|
||||
hash = "sha256-4VxvK9KzJlN0AsXz0XL5FIs3H65vPgyj/YqTc138zC4=";
|
||||
};
|
||||
location = "tree_sitter_v";
|
||||
meta.homepage = "https://github.com/vlang/v-analyzer";
|
||||
@ -3171,12 +3182,12 @@
|
||||
};
|
||||
vento = buildGrammar {
|
||||
language = "vento";
|
||||
version = "0.0.0+rev=3321077";
|
||||
version = "0.0.0+rev=3b32474";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ventojs";
|
||||
repo = "tree-sitter-vento";
|
||||
rev = "3321077d7446c1b3b017c294fd56ce028ed817fe";
|
||||
hash = "sha256-/U8hZiYC9/pWscAYDIFgttLDMTq6RLNuHKNTZ/Q4bAc=";
|
||||
rev = "3b32474bc29584ea214e4e84b47102408263fe0e";
|
||||
hash = "sha256-h8yC+MJIAH7DM69UQ8moJBmcmrSZkxvWrMb+NqtYB2Y=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ventojs/tree-sitter-vento";
|
||||
};
|
||||
@ -3193,12 +3204,12 @@
|
||||
};
|
||||
vhdl = buildGrammar {
|
||||
language = "vhdl";
|
||||
version = "0.0.0+rev=eb15328";
|
||||
version = "0.0.0+rev=63d0360";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpt13653903";
|
||||
repo = "tree-sitter-vhdl";
|
||||
rev = "eb1532861767a46fc336102bd4ebc938da8773f5";
|
||||
hash = "sha256-IEE3uSS+XD8xXrbAzebfiDKGZpoYVOEazAX1tC7L2p8=";
|
||||
rev = "63d0360d42c43b4902b8470c7ddcf323432e2dde";
|
||||
hash = "sha256-D85VFM82lU4GDpIWZmY+j6134DHp0pGbqg8Haj2mgiw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl";
|
||||
};
|
||||
@ -3326,12 +3337,12 @@
|
||||
};
|
||||
xresources = buildGrammar {
|
||||
language = "xresources";
|
||||
version = "0.0.0+rev=5fd347f";
|
||||
version = "0.0.0+rev=8117b0a";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ValdezFOmar";
|
||||
repo = "tree-sitter-xresources";
|
||||
rev = "5fd347f0b950b2d2563d41176373c610a0a5468c";
|
||||
hash = "sha256-M0oDcCiAlybi0kXXor1g1Kxj3ulZEJkBiMNA0OcxNao=";
|
||||
rev = "8117b0ab58df8afb902c0862b7f6eb3bbb06c7ab";
|
||||
hash = "sha256-3umsmD5avsKW4BmBvwXI14Ex82E8hXq8xk4EFabDjO0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
|
||||
};
|
||||
|
@ -10,6 +10,7 @@
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
neovimUtils,
|
||||
replaceVars,
|
||||
substituteAll,
|
||||
# Language dependencies
|
||||
fetchYarnDeps,
|
||||
@ -2659,13 +2660,9 @@ in
|
||||
};
|
||||
|
||||
aider-nvim = super.aider-nvim.overrideAttrs {
|
||||
patches = [ ./patches/aider.nvim/fix-paths.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace lua/aider.lua --replace-fail '@aider@' ${aider-chat}/bin/aider
|
||||
substituteInPlace lua/helpers.lua --replace-fail '@aider@' ${aider-chat}/bin/aider
|
||||
'';
|
||||
nvimRequireCheck = "aider";
|
||||
patches = [
|
||||
(replaceVars ./patches/aider-nvim/bin.patch { aider = lib.getExe' aider-chat "aider"; })
|
||||
];
|
||||
};
|
||||
|
||||
refactoring-nvim = super.refactoring-nvim.overrideAttrs {
|
||||
|
@ -0,0 +1,15 @@
|
||||
diff --git a/lua/aider.lua b/lua/aider.lua
|
||||
index 98b5071..589b06d 100644
|
||||
--- a/lua/aider.lua
|
||||
+++ b/lua/aider.lua
|
||||
@@ -61,9 +61,9 @@ function M.AiderOpen(args, window_type)
|
||||
log("Existing aider buffer found, opening in new window")
|
||||
helpers.open_buffer_in_new_window(window_type, M.aider_buf)
|
||||
else
|
||||
log("No existing aider buffer, creating new one")
|
||||
- local command = "aider " .. (args or "")
|
||||
+ local command = "@aider@ " .. (args or "")
|
||||
log("Opening window with type: " .. window_type)
|
||||
helpers.open_window(window_type)
|
||||
log("Adding buffers to command")
|
||||
command = helpers.add_buffers_to_command(command, is_valid_buffer)
|
@ -1,26 +0,0 @@
|
||||
diff --git a/lua/aider.lua b/lua/aider.lua
|
||||
index 38db0d1..d1ad6d5 100644
|
||||
--- a/lua/aider.lua
|
||||
+++ b/lua/aider.lua
|
||||
@@ -26,7 +26,7 @@ function M.AiderOpen(args, window_type)
|
||||
if M.aider_buf and vim.api.nvim_buf_is_valid(M.aider_buf) then
|
||||
helpers.open_buffer_in_new_window(window_type, M.aider_buf)
|
||||
else
|
||||
- command = 'aider ' .. (args or '')
|
||||
+ command = '@aider@ ' .. (args or '')
|
||||
helpers.open_window(window_type)
|
||||
command = helpers.add_buffers_to_command(command)
|
||||
M.aider_job_id = vim.fn.termopen(command, {on_exit = OnExit})
|
||||
diff --git a/lua/helpers.lua b/lua/helpers.lua
|
||||
index 152182b..aa21584 100644
|
||||
--- a/lua/helpers.lua
|
||||
+++ b/lua/helpers.lua
|
||||
@@ -63,7 +63,7 @@ end
|
||||
|
||||
local function build_background_command(args, prompt)
|
||||
prompt = prompt or "Complete as many todo items as you can and remove the comment for any item you complete."
|
||||
- local command = 'aider --msg "' .. prompt .. '" ' .. (args or '')
|
||||
+ local command = '@aider@ --msg "' .. prompt .. '" ' .. (args or '')
|
||||
command = add_buffers_to_command(command)
|
||||
return command
|
||||
end
|
@ -531,7 +531,7 @@ https://github.com/deathbeam/lspecho.nvim/,HEAD,
|
||||
https://github.com/onsails/lspkind.nvim/,,
|
||||
https://github.com/nvimdev/lspsaga.nvim/,,
|
||||
https://github.com/barreiroleo/ltex_extra.nvim/,HEAD,
|
||||
https://github.com/nvim-java/lua-async-await/,HEAD,
|
||||
https://github.com/nvim-java/lua-async/,HEAD,
|
||||
https://github.com/arkav/lualine-lsp-progress/,,
|
||||
https://github.com/nvim-lualine/lualine.nvim/,,
|
||||
https://github.com/l3mon4d3/luasnip/,,
|
||||
|
@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkLibretroCore {
|
||||
core = "mame2003-plus";
|
||||
version = "0-unstable-2025-01-06";
|
||||
version = "0-unstable-2025-01-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "mame2003-plus-libretro";
|
||||
rev = "aee3dac97c72e45b43423349289937dbe2d4a1ce";
|
||||
hash = "sha256-X8K536+VfM/WAr4LIhYGWKEt8Oz8GCUMoSqYwQXBQos=";
|
||||
rev = "61305d60329d6a9abf7ddad1c3657b3253c5e64d";
|
||||
hash = "sha256-fLThBOHkX0dV0zjDuJIh1ILpWi2FNV9oOXRH4ApcGbs=";
|
||||
};
|
||||
|
||||
makefile = "Makefile";
|
||||
|
@ -27,12 +27,87 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-oOg94nUsT9LLKnHocY0S5g02Y9a1UazzZAjpEI/s+yM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/xsane/raw/rawhide/f/xsane-0.998-libpng.patch";
|
||||
hash = "sha256-0z292+Waa2g0PCQpUebdWprl9VDyBOY0XgqMJaIcRb8=";
|
||||
})
|
||||
];
|
||||
# add all fedora patchs. fix gcc-14 build among other things
|
||||
# https://src.fedoraproject.org/rpms/xsane/tree/main
|
||||
patches =
|
||||
let
|
||||
fetchFedoraPatch =
|
||||
{ name, hash }:
|
||||
fetchpatch {
|
||||
inherit name hash;
|
||||
url = "https://src.fedoraproject.org/rpms/xsane/raw/846ace0a29063335c708b01e9696eda062d7459c/f/${name}";
|
||||
};
|
||||
in
|
||||
map fetchFedoraPatch [
|
||||
{
|
||||
name = "0001-Follow-new-convention-for-registering-gimp-plugin.patch";
|
||||
hash = "sha256-yOY7URyc8HEHHynvdcZAV1Pri31N/rJ0ddPavOF5zLw=";
|
||||
}
|
||||
{
|
||||
name = "xsane-0.995-close-fds.patch";
|
||||
hash = "sha256-qE7larHpBEikz6OaOQmmi9jl6iQxy/QM7iDg9QrVV1o=";
|
||||
}
|
||||
{
|
||||
name = "xsane-0.995-xdg-open.patch";
|
||||
hash = "sha256-/kHwwuDC2naGEp4NALfaJ0pJe+9kYhV4TX1eGeARvq8=";
|
||||
}
|
||||
{
|
||||
name = "xsane-0.996-no-eula.patch";
|
||||
hash = "sha256-CYmp1zFg11PUPz9um2W7XF6pzCzafKSEn2nvPiUSxNo=";
|
||||
}
|
||||
{
|
||||
name = "xsane-0.997-ipv6.patch";
|
||||
hash = "sha256-D3xH++DHxyTKMxgatU+PNCVN1u5ajPc3gQxvzhMYIdM=";
|
||||
}
|
||||
{
|
||||
name = "xsane-0.997-off-root-build.patch";
|
||||
hash = "sha256-2LXQfMbvqP+TAhAmxRe6pBqNlSX4tVjhDkBHIfX9HcA=";
|
||||
}
|
||||
{
|
||||
name = "xsane-0.998-desktop-file.patch";
|
||||
hash = "sha256-3xEj6IaOk/FS8pv+/yaNjZpIoB+0Oei0QB9mD4/owkM=";
|
||||
}
|
||||
{
|
||||
name = "xsane-0.998-libpng.patch";
|
||||
hash = "sha256-0z292+Waa2g0PCQpUebdWprl9VDyBOY0XgqMJaIcRb8=";
|
||||
}
|
||||
{
|
||||
name = "xsane-0.998-preview-selection.patch";
|
||||
hash = "sha256-TZ8vRA+0qPY2Rqz0VNHjgkj3YPob/BW+zBoVqxnUhb8=";
|
||||
}
|
||||
{
|
||||
name = "xsane-0.998-wmclass.patch";
|
||||
hash = "sha256-RubFOs+hsZS+GdxF0yvLSy4v+Fi6vb9G6zfwWZcUlkY=";
|
||||
}
|
||||
{
|
||||
name = "xsane-0.999-lcms2.patch";
|
||||
hash = "sha256-eiAxa1lhFrinqBvlIhH+NP7WBKk0Plf2S+OVTcpxXac=";
|
||||
}
|
||||
{
|
||||
name = "xsane-0.999-man-page.patch";
|
||||
hash = "sha256-4g0w4x9boAIOA6s5eTzKMh2mkkRKtF1TZ9KgHNTDaAg=";
|
||||
}
|
||||
{
|
||||
name = "xsane-0.999-no-file-selected.patch";
|
||||
hash = "sha256-e/QKtvsIwU5yy0SJKAEAmhmCoxWqV6FHmAW41SbW/eI=";
|
||||
}
|
||||
{
|
||||
name = "xsane-0.999-pdf-no-high-bpp.patch";
|
||||
hash = "sha256-o3LmOvgERuB9CQ8RL2Nd40h1ePuuuGMSK1GN68QlJ6s=";
|
||||
}
|
||||
{
|
||||
name = "xsane-0.999-signal-handling.patch";
|
||||
hash = "sha256-JU9BJ6UIDa1FsuPaQKsxcjxvsJkwgmuopIqCVWY3LQ0=";
|
||||
}
|
||||
{
|
||||
name = "xsane-0.999-snprintf-update.patch";
|
||||
hash = "sha256-bSTeoIOLeJ4PEsBHR+ZUQLPmrc0D6aQzyJGlLVhXt8o=";
|
||||
}
|
||||
{
|
||||
name = "xsane-configure-c99.patch";
|
||||
hash = "sha256-ukaNGgzCGiQwbOzSguAqBIKOUzXofSC3lct812U/8gY=";
|
||||
}
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/xsane-back-gtk.c
|
||||
|
@ -1,11 +1,11 @@
|
||||
{
|
||||
"packageVersion": "133.0.3-1",
|
||||
"packageVersion": "134.0-1",
|
||||
"source": {
|
||||
"rev": "133.0.3-1",
|
||||
"sha256": "05mlqqcvsa84h3nagm51hwsxkxsbcn2676fj4bih37ddlgkylf3b"
|
||||
"rev": "134.0-1",
|
||||
"sha256": "bu9ec9gK4b1OkC2Z1ycr/lmhrSB5TcIqcHXaZxf0Vmw="
|
||||
},
|
||||
"firefox": {
|
||||
"version": "133.0.3",
|
||||
"sha512": "ce48beaa5bb1717d9b6dbfff035b1bb5de1456df14b6a91adfaf3ccfb7ac550ab7ee854546231424a920e01d981825253609fce2ec326c4aa1ca316bbbdb31f8"
|
||||
"version": "134.0",
|
||||
"sha512": "EnWmhtwKJ7SN9K4FYWURUS9nbgNHTjCVslIerCWjhdNFqj6HhnFtvoEq9J4H1ysydyR5CJ1kiWjiAEygycNTRA=="
|
||||
}
|
||||
}
|
||||
|
@ -46,14 +46,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "telegram-desktop-unwrapped";
|
||||
version = "5.10.0";
|
||||
version = "5.10.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "telegramdesktop";
|
||||
repo = "tdesktop";
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-gkwu28VWelUhjkvcosBnGuT1J0MLykOufcsn9jl7vqU=";
|
||||
hash = "sha256-uVXBQPUz1eSJkHk5q7MK2JOT4R7sbtJjTxXBt9WsUzI=";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
|
@ -21,13 +21,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "anilibria-winmaclinux";
|
||||
version = "2.2.23";
|
||||
version = "2.2.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anilibria";
|
||||
repo = "anilibria-winmaclinux";
|
||||
rev = version;
|
||||
hash = "sha256-RF0pe2G4K0uiqlOiAVESOi6bgwO0gJOh1VFkF7V3Wnc=";
|
||||
hash = "sha256-FAnVgrH6ZXfIp8FaacSpcHIwF6DCFt4K5e+UMAUb6qI=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/src";
|
||||
|
@ -9,15 +9,15 @@
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
version = "1.2.0";
|
||||
version = "1.3.0";
|
||||
pname = "podman-compose";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "podman-compose";
|
||||
owner = "containers";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-40RatexY/6eRfCodaiBeJpyt1sDUj2STSPL0gBECdRs=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-0k+vJwWYEXQ6zxkcvjxBv9cq8nIBS15F7ul5VwqYtys=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (self: {
|
||||
pname = "alacritty-theme";
|
||||
version = "0-unstable-2024-12-02";
|
||||
version = "0-unstable-2025-01-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alacritty";
|
||||
repo = "alacritty-theme";
|
||||
rev = "95a7d695605863ede5b7430eb80d9e80f5f504bc";
|
||||
hash = "sha256-IsUIfoacXJYilTPQBKXnDEuyQCt9ofBMJ8UZ1McFwXM=";
|
||||
rev = "aff9d111d43e1ad5c22d4e27fc1c98176e849fb9";
|
||||
hash = "sha256-GxCdyBihypHKkPlCVGiTAD4dP3ggkSyQSNS5AKUhSVo=";
|
||||
sparseCheckout = [ "themes" ];
|
||||
};
|
||||
|
||||
|
60
pkgs/by-name/ay/ayugram-desktop/package.nix
Normal file
60
pkgs/by-name/ay/ayugram-desktop/package.nix
Normal file
@ -0,0 +1,60 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
telegram-desktop,
|
||||
withWebkit ? true,
|
||||
}:
|
||||
|
||||
telegram-desktop.override {
|
||||
pname = "ayugram-desktop";
|
||||
inherit withWebkit;
|
||||
unwrapped = telegram-desktop.unwrapped.overrideAttrs (
|
||||
finalAttrs: previousAttrs: {
|
||||
pname = "ayugram-desktop-unwrapped";
|
||||
version = "5.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AyuGram";
|
||||
repo = "AyuGramDesktop";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-bgfqYI77kxHmFZB6LCdLzeIFv6bfsXXJrrkbz5MD6Q0=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# Since the original .desktop file is for Flatpak, we need to fix it
|
||||
postPatch =
|
||||
(previousAttrs.postPatch or "")
|
||||
+
|
||||
lib.optionalString stdenv.hostPlatform.isLinux
|
||||
# Rudiment: related functionality is disabled by disabling the auto-updater
|
||||
# and it breaks the .desktop file in Aylur's Gtk Shell
|
||||
# (with it, it causes the application to not be seen by the app launcher)
|
||||
# https://github.com/AyuGram/AyuGramDesktop/blob/5566a8ca0abe448a7f1865222b64b68ed735ee07/Telegram/SourceFiles/platform/linux/specific_linux.cpp#L455
|
||||
''
|
||||
substituteInPlace lib/xdg/com.ayugram.desktop.desktop \
|
||||
--replace-fail "DESKTOPINTEGRATION=1 " ""
|
||||
''
|
||||
+
|
||||
# Since we aren't in Flatpak, "DBusActivatable" has no unit to
|
||||
# activate and it causes the .desktop file to show the error "Could not activate remote peer
|
||||
# 'com.ayugram.desktop': unit failed" (at least on KDE6)
|
||||
''
|
||||
substituteInPlace lib/xdg/com.ayugram.desktop.desktop \
|
||||
--replace-fail "DBusActivatable=true" ""
|
||||
'';
|
||||
|
||||
meta = previousAttrs.meta // {
|
||||
mainProgram = if stdenv.hostPlatform.isLinux then "ayugram-desktop" else "AyuGram";
|
||||
description = "Desktop Telegram client with good customization and Ghost mode";
|
||||
longDescription = ''
|
||||
The best that could be in the world of Telegram clients.
|
||||
AyuGram is a Telegram client with a very pleasant features.
|
||||
'';
|
||||
homepage = "https://github.com/AyuGram/AyuGramDesktop";
|
||||
changelog = "https://github.com/AyuGram/AyuGramDesktop/releases/tag/v${finalAttrs.version}";
|
||||
maintainers = with lib.maintainers; [ aucub ];
|
||||
};
|
||||
}
|
||||
);
|
||||
}
|
@ -11,7 +11,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "codeql";
|
||||
version = "2.20.0";
|
||||
version = "2.20.1";
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
|
||||
hash = "sha256-c9O4rmAuCBuFeM8R2ha6wBCAnGwYRdapNpPhlSvgYjg=";
|
||||
hash = "sha256-9BNp4PxRL9YbzQ/AeW6EFk6xv1XmwDwxZgu3DL79H8w=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -7,23 +7,23 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "ddns-updater";
|
||||
version = "2.7.0";
|
||||
version = "2.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "qdm12";
|
||||
repo = "ddns-updater";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-U8Vw7dsj/efqvpooT3QQjNp41AuGYJ/Gz/pA8Em3diE=";
|
||||
hash = "sha256-Vvk3owtSpwstmC5UaVyUEY+FW25KA+nYp2dOqiP4HTs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-M9Al3zl2Ltv4yWdyRB3+9zpTr3foliu5WweImHltz3M=";
|
||||
vendorHash = "sha256-RKaUgE/cdzattMWMxiJ5fIXjx3IKE+On6dT/P6y4wqU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
|
||||
subPackages = [ "cmd/updater" ];
|
||||
subPackages = [ "cmd/ddns-updater" ];
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
@ -32,10 +32,6 @@ buildGoModule rec {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/updater $out/bin/ddns-updater
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Container to update DNS records periodically with WebUI for many DNS providers";
|
||||
homepage = "https://github.com/qdm12/ddns-updater";
|
||||
|
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dstp";
|
||||
version = "0.4.0";
|
||||
version = "0.4.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ycd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YvuUgHHa8Egk+bbSI0SH0i3YrKWRbzjAckNG32RBRXw=";
|
||||
sha256 = "sha256-QODp9IbIc2Z7N/xfRd0UV9r8t6RndOjdGe9hQXJyiN0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-qNH71MPKOC0ld7xxppjZrHSTJ6t8E0LljM1OzT7pM9g=";
|
||||
vendorHash = "sha256-EE3xSRu7zAuQjaXCdTD924K6OamEkdxHYEaM0rW/O+o=";
|
||||
|
||||
# Tests require network connection, but is not allowed by nix
|
||||
doCheck = false;
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "easyjson";
|
||||
version = "0.9";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mailru";
|
||||
repo = "easyjson";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-m2WZwi6TM6hiBlCQOe+rxF5z3vvnYqtHQX8d7y5NLgI=";
|
||||
hash = "sha256-m2WZwi6TM6hiBlCQOe+rxF5z3vvnYqtHQX8d7y5NLgI=";
|
||||
};
|
||||
vendorHash = "sha256-BsksTYmfPQezbWfIWX0NhuMbH4VvktrEx06C2Nb/FYE=";
|
||||
|
||||
|
@ -6,12 +6,12 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "fanficfare";
|
||||
version = "4.40.0";
|
||||
version = "4.41.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-5WquEgSqPFMq+HU0K94QiC9WsP6Iv+CpE1ZsBgdYGFI=";
|
||||
hash = "sha256-KZm3hhJzXZzHy11Ad6IdB5ixlLtIDFcx5X8ydqVpJKA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3Packages; [
|
||||
|
@ -8,11 +8,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "flix";
|
||||
version = "0.55.0";
|
||||
version = "0.56.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar";
|
||||
sha256 = "sha256-O10RWB9WDs0r4j5uowDjgatcADU77nde/jY9Zy4p/jk=";
|
||||
sha256 = "sha256-1xrfJesagHlN7Kur/ZeaYxqDVmFK+DaJ9ELmPfrQEVo=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
@ -20,7 +20,7 @@ let
|
||||
pname = "gitea-frontend";
|
||||
inherit (gitea) src version;
|
||||
|
||||
npmDepsHash = "sha256-7kYGFJffP7Mu4+tWlcLTb7eBibgpwEis2zQYMWCI7dw=";
|
||||
npmDepsHash = "sha256-xSJOEXDF/1Cc7ptNMLGE7RqqbxelI2XS/Mi9JZSWu/Y=";
|
||||
|
||||
# use webpack directly instead of 'make frontend' as the packages are already installed
|
||||
buildPhase = ''
|
||||
@ -35,18 +35,18 @@ let
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "gitea";
|
||||
version = "1.22.6";
|
||||
version = "1.23.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "go-gitea";
|
||||
repo = "gitea";
|
||||
rev = "v${gitea.version}";
|
||||
hash = "sha256-WQ8RAx4yW2dl1a/NXHF9fqAG6y62mXmB2lH8DFCg+nA=";
|
||||
hash = "sha256-0/mzOKSRhXLhwmDnMHQCjkalP+4hkQR6kICsAj6+6zE=";
|
||||
};
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-BR5PDhag557F4nLRoNJuwz+dlSjYgxzoKx/DIsXBPto=";
|
||||
vendorHash = "sha256-qOntP6zBd21PjCAV5ZvksgwIV4zDTOYiVBBWkC6O7rk=";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
|
@ -166,11 +166,11 @@ let
|
||||
|
||||
linux = stdenv.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "131.0.6778.204";
|
||||
version = "131.0.6778.264";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-vAZUFufRfvkRsbXnqWD4zE3hgTWbhFqDlauXN7m6mIw=";
|
||||
hash = "sha256-zfPXkfjnvVGO09X4eqTii7rPwieMEsQMy9p9tXb5fDU=";
|
||||
};
|
||||
|
||||
# With strictDeps on, some shebangs were not being patched correctly
|
||||
@ -266,11 +266,11 @@ let
|
||||
|
||||
darwin = stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
inherit pname meta passthru;
|
||||
version = "131.0.6778.205";
|
||||
version = "131.0.6778.265";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.google.com/release2/chrome/adzhzymuuqppdtyulfwtrtnxa2oq_131.0.6778.205/GoogleChrome-131.0.6778.205.dmg";
|
||||
hash = "sha256-5YkibnlOv3QLa+Ni8qZG+qvcucpTCilfATcv3wrBPZo=";
|
||||
url = "http://dl.google.com/release2/chrome/accjagybvz5mf6voljw3khsklaaa_131.0.6778.265/GoogleChrome-131.0.6778.265.dmg";
|
||||
hash = "sha256-mHfBmBJVlUYQf8UnCBBTbgizTuV/IucXg2H+i4zhnPU=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
|
@ -15,13 +15,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "hdrop";
|
||||
version = "0.6.0";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Schweber";
|
||||
repo = "hdrop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0GkZBqpORJqhhC19bsJHvkbHKOno1ZyBBA7nhzfqLZw=";
|
||||
hash = "sha256-XpC/LLqB5EwvI2MwnR2x142UtG5WEt5Wwbhx6gdNJ68=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
owner = "kanboard";
|
||||
repo = "kanboard";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-/PFE5h4elHFNbbIssoGMDkhGkEIec2uEMz+vU+DN5D0=";
|
||||
hash = "sha256-pKWn6CZZu/iHnHLIY/6fMBDvAGXmBmsiFNdIyjSI98w=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
@ -40,13 +40,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "koboldcpp";
|
||||
version = "1.81";
|
||||
version = "1.81.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LostRuins";
|
||||
repo = "koboldcpp";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VRT/8rlLI3J/w8hPJ+g7UYSczbRwemz6R8bO+HLAiMM=";
|
||||
hash = "sha256-Ndi7EQ4Idh946iQuf1mFluLh+9SEfTRtIu8uYN9uHpE=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
@ -6,11 +6,11 @@
|
||||
|
||||
let
|
||||
pname = "librewolf-bin";
|
||||
upstreamVersion = "133.0.3-1";
|
||||
upstreamVersion = "134.0-1";
|
||||
version = lib.replaceStrings [ "-" ] [ "." ] upstreamVersion;
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.com/api/v4/projects/24386000/packages/generic/librewolf/${upstreamVersion}/LibreWolf.x86_64.AppImage";
|
||||
hash = "sha256-mQR1hvMcAiNI8Xhwqfy6oysJ29Dbu12RPZg8xN4zPyw=";
|
||||
hash = "sha256-WlI0a2Sb59O6QGZ59vseTeDIkzyJd4/VIZ/qTFcLWm0=";
|
||||
};
|
||||
appimageContents = appimageTools.extract { inherit pname version src; };
|
||||
in
|
||||
|
@ -8,16 +8,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lightningcss";
|
||||
version = "1.28.2";
|
||||
version = "1.29.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "parcel-bundler";
|
||||
repo = "lightningcss";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-IwuDJcKCG1CDyRsZbobPQnRzsaUfpJHKFemOWLJNM9c=";
|
||||
hash = "sha256-xnsTYOjnfcaPHlLpf83efD3w5cjqyFV5bCV89zG1GaA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-um8G6QKxqPEcuCWmlFOqZVQLU8GxLwZ3S7z2Na2uzhQ=";
|
||||
cargoHash = "sha256-cip1ZhHR39PE6ZX8PhGJ3oXCkR5LE/OWyjMqiG+lHvY=";
|
||||
|
||||
patches = [
|
||||
# Backport fix for build error for lightningcss-napi
|
||||
|
@ -18,7 +18,7 @@ let
|
||||
llvmPackages = llvmPackages_18;
|
||||
stdenv = llvmPackages.stdenv;
|
||||
|
||||
version = "8.6.1";
|
||||
version = "8.7.0";
|
||||
|
||||
hasI686 =
|
||||
(if targets == [ ] then stdenv.hostPlatform.isx86_32 else (builtins.elem "i686" targets))
|
||||
@ -64,7 +64,7 @@ stdenv.mkDerivation {
|
||||
# Packaging that in Nix is very cumbersome.
|
||||
src = fetchurl {
|
||||
url = "https://github.com/limine-bootloader/limine/releases/download/v${version}/limine-${version}.tar.gz";
|
||||
hash = "sha256-T64ydpYz299SHDEY0L0gOb4xwRpOQkGv8RIjl9j/5Ew=";
|
||||
hash = "sha256-pwoR9ptMpdhdEe/Kbyc+smv9oNIqtJ9L0KFdf6/g0Ec=";
|
||||
};
|
||||
|
||||
hardeningDisable = [
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
libsForQt5,
|
||||
|
||||
withUnrar ? true,
|
||||
withUnrar ? false,
|
||||
unrar, # has an unfree license
|
||||
}:
|
||||
|
||||
|
@ -7,22 +7,22 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
let
|
||||
version = "0.3.7";
|
||||
version = "0.3.10";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "lla";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "triyanox";
|
||||
owner = "chaqchase";
|
||||
repo = "lla";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-8BnYLC5SGFvk9srRyLxflDgfVbbGMSHXBOjXQLMLIi8=";
|
||||
hash = "sha256-/6p23JW3ZaSuDf34IWcTggR92/zUTMRerQ32bTsRujo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeBinaryWrapper ];
|
||||
|
||||
cargoHash = "sha256-H/BnJiR9+wcddAEWkKaqamTEDgjTUOMq1AiGWQAfjDM=";
|
||||
cargoHash = "sha256-U0peFuyWZ0RP1Chtj7WY646fIQ8Q+HB2gtnhTO3hhiM=";
|
||||
|
||||
cargoBuildFlags = [ "--workspace" ];
|
||||
|
||||
@ -37,13 +37,15 @@ rustPlatform.buildRustPackage {
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Modern alternative to ls";
|
||||
description = "Blazing-fast `ls` replacement with superpowers";
|
||||
longDescription = ''
|
||||
`lla` is a high-performance, extensible alternative to the traditional ls command, written in Rust.
|
||||
It offers enhanced functionality, customizable output, and a plugin system for extended capabilities.
|
||||
`lla` is a modern `ls` replacement that transforms how developers interact with their filesystem.
|
||||
Built with Rust's performance capabilities and designed with user experience in mind,
|
||||
`lla` combines the familiarity of ls with powerful features like specialized views,
|
||||
Git integration, and a robust plugin system with an extensible list of plugins to add more functionality.
|
||||
'';
|
||||
homepage = "https://github.com/triyanox/lla";
|
||||
changelog = "https://github.com/triyanox/lla/blob/refs/tags/v${version}/CHANGELOG.md";
|
||||
homepage = "https://lla.chaqchase.com";
|
||||
changelog = "https://github.com/chaqchase/lla/blob/refs/tags/v${version}/CHANGELOG.md";
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ pluiedev ];
|
||||
platforms = lib.platforms.unix;
|
||||
|
@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "luminous-ttv";
|
||||
version = "0.5.7";
|
||||
version = "0.5.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlyoshaVasilieva";
|
||||
repo = "luminous-ttv";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uaq5uiSp4lci27BxtqjdtUeiJvXhWo25lfFE+dQys6Y=";
|
||||
hash = "sha256-pT+hiREKdzw9MKv28QpLK6LmHvnRci26f0DlcXns2rA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-jbtHxarRQ8gpCBc/HZWSnkzMrlMMltpknUBV1SGVq/I=";
|
||||
cargoHash = "sha256-sUSXcVv93Sn6qNPNsbPvKXSZYkTdrOQifpSPBWjfqy8=";
|
||||
|
||||
meta = {
|
||||
description = "Rust server to retrieve and relay a playlist for Twitch livestreams/VODs";
|
||||
|
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "marwaita-teal";
|
||||
version = "22";
|
||||
version = "24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkomarko42";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-aSzeF4winpea21gADa/HT+a+FZ4Ykrpue/ePmveJU8E=";
|
||||
hash = "sha256-63VJrmb0TcsXT1JM77+ZxN4kOZPBlqR2ANAhY041QCA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
@ -14,16 +14,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "mpris-timer";
|
||||
version = "1.6.2";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "efogdev";
|
||||
repo = "mpris-timer";
|
||||
tag = version;
|
||||
hash = "sha256-QOnyu2FphqQW6aFa3rdJwLvQw+DXTS2JSzixshixLEg=";
|
||||
hash = "sha256-N2F7eTNDHL9ABIq6ExjIj7uhYBkrRXDAeKwy1f4arYE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-APcQgNEn7ULIjBk7f4q6MMSX9k58+F7vzgUDiIZ3Jxc=";
|
||||
vendorHash = "sha256-BYOmlV3x+SXMOyAfBktVThG4vog0mWSsIU2caOFYc5A=";
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
|
@ -1,40 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
meson,
|
||||
ninja,
|
||||
python3,
|
||||
rustPlatform,
|
||||
rustc,
|
||||
cargo,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "neocmakelsp";
|
||||
version = "0.8.13";
|
||||
version = "0.8.15";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Decodetalkers";
|
||||
repo = "neocmakelsp";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MRno86pi389p2lBTu86LCPx5yFN76CbM5AXAs4bsl7c=";
|
||||
hash = "sha256-TCzW8QPSCGufLQanwcvgA5YsTV/QqDs7NKgOMPOgGho=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit pname version src;
|
||||
hash = "sha256-UVXJF8jvZUcEWbsL+UmrO2VSlvowkXNGRbxCEmB89OU=";
|
||||
};
|
||||
cargoHash = "sha256-oRt4af7KqPIckzZ8FhCNjkVC/j2PdprFL91K/qUWV3g=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
python3
|
||||
rustPlatform.cargoSetupHook
|
||||
rustc
|
||||
cargo
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --bash completions/bash/neocmakelsp
|
||||
installShellCompletion --fish completions/fish/neocmakelsp.fish
|
||||
installShellCompletion --zsh completions/zsh/_neocmakelsp
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "CMake lsp based on tower-lsp and treesitter";
|
||||
homepage = "https://github.com/Decodetalkers/neocmakelsp";
|
||||
|
@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "nu_scripts";
|
||||
version = "0-unstable-2024-12-27";
|
||||
version = "0-unstable-2025-01-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nushell";
|
||||
repo = pname;
|
||||
rev = "a83a40dff05e91daf90bb42e7a23c5e70c85a759";
|
||||
hash = "sha256-SstIYp97dUX0+R3wN1yufDNHpKzppuCOlGUp6u503Ws=";
|
||||
rev = "a9b829115ff3c77981616ae777379fc0bd4dc998";
|
||||
hash = "sha256-fIayTOyJCqOkFUkmghBQJfCp8s8oNrdUi+/BuOjcbTU=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvc";
|
||||
version = "1.14.2";
|
||||
version = "1.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nickg";
|
||||
repo = "nvc";
|
||||
rev = "r${version}";
|
||||
hash = "sha256-ppZ6rvSmny4wKCpdlJvvaLOTUn3/hUAiEhEkj33oF3c=";
|
||||
hash = "sha256-EpDJhgj1oYz+050qPwrToQAJNMtkSb423+Bh09qlka0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -14,16 +14,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nwg-menu";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-menu";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-njh2GGYg3YbBXh3h6zrTJc9E0ehAbmaVQN/2DdsBjQU=";
|
||||
sha256 = "sha256-pWdLSoTeRgr5FPdBWMTVdsnijuwu8fLuNkyIRZ+JEe8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-l6Xfna4btWhUGqqmIx6+s+cR9YZ33KQyEviySd2Eopw=";
|
||||
vendorHash = "sha256-iR+ytThRwmCvFEMcpSELPRwiramN5jPXAjaJtda4pOw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "oha";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hatoo";
|
||||
repo = pname;
|
||||
tag = "v${version}";
|
||||
hash = "sha256-repm6Od9vuDZVZRoU8QTXTTVeqjlw9lFmFVWDNjToyU=";
|
||||
hash = "sha256-P710b6Bs3O4pNrusoXLmIfYzmAB+BzXCuSX9k7KOWno=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-4rKndnw+R78bfsUMOfFV3ZGM6df+ZhcxL3OeFCndZM4=";
|
||||
cargoHash = "sha256-k4nG95cPntlMYnICYSDIgXPgD8vBCk4q5/XO4ykJyZU=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
pkg-config
|
||||
|
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "operator-sdk";
|
||||
version = "1.38.0";
|
||||
version = "1.39.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "operator-framework";
|
||||
repo = pname;
|
||||
tag = "v${version}";
|
||||
hash = "sha256-YCYieXT+3LCpae3V/vub/TAKUG03HjB9FdHEhDVP4uM=";
|
||||
hash = "sha256-D3LAKrMlqfRqSLuQv6qh5dyQVzIAXCPwTpb1mDkjLF4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-8qNrXLmp3FKb6ByrIWa7VupEhW4Wc4xZCJmURqt/mfw=";
|
||||
vendorHash = "sha256-3CtVl3HWUcbXp/U/pTqoCol4kmJqtLsTlcAijGHENtI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
@ -16,7 +16,7 @@ php.buildComposerProject2 (finalAttrs: {
|
||||
hash = "sha256-8TQlqXhZ3rHmOAuxsBYa+7JD+SxMQY0NZgCyElStFag=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Q1y18ERUs4iRd94JqBYVRNizR3v5MBTtItsxvGkrkyU=";
|
||||
vendorHash = "sha256-PVaa0o8daoqXs8l3bF/Fsmtx3bdpO2uXTnR4tx8cUC4=";
|
||||
|
||||
# Needed because of the unbound version constraint on phpdocumentor/json-path
|
||||
composerStrictValidation = false;
|
||||
|
65
pkgs/by-name/ph/phylophlan/package.nix
Normal file
65
pkgs/by-name/ph/phylophlan/package.nix
Normal file
@ -0,0 +1,65 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
raxml,
|
||||
mafft,
|
||||
trimal,
|
||||
blast,
|
||||
diamond,
|
||||
python3Packages,
|
||||
}:
|
||||
let
|
||||
finalAttrs = {
|
||||
pname = "phylophlan";
|
||||
version = "3.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "biobakery";
|
||||
repo = "phylophlan";
|
||||
rev = "refs/tags/${finalAttrs.version}";
|
||||
hash = "sha256-KlWKt2tH2lQBh/eQ2Hbcu2gXHEFfmFEc6LrybluxINc=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [ setuptools ];
|
||||
|
||||
# It has no tests
|
||||
doCheck = false;
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
biopython
|
||||
dendropy
|
||||
matplotlib
|
||||
numpy
|
||||
pandas
|
||||
seaborn
|
||||
distutils
|
||||
requests
|
||||
];
|
||||
|
||||
# Minimum needed external tools
|
||||
# See https://github.com/biobakery/phylophlan/wiki#dependencies
|
||||
propagatedBuildInputs = [
|
||||
raxml
|
||||
mafft
|
||||
trimal
|
||||
blast
|
||||
diamond
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# Not revelant in this context
|
||||
rm -f $out/bin/phylophlan_write_default_configs.sh
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/biobakery/phylophlan";
|
||||
description = "Precise phylogenetic analysis of microbial isolates and genomes from metagenomes";
|
||||
changelog = "https://github.com/biobakery/phylophlan/releases";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ theobori ];
|
||||
mainProgram = "phylophlan";
|
||||
};
|
||||
};
|
||||
in
|
||||
python3Packages.buildPythonApplication finalAttrs
|
@ -4,6 +4,8 @@
|
||||
}:
|
||||
|
||||
{
|
||||
mollie = callPackage ./mollie.nix { };
|
||||
|
||||
pages = callPackage ./pages.nix { };
|
||||
|
||||
passbook = callPackage ./passbook.nix { };
|
||||
|
36
pkgs/by-name/pr/pretix/plugins/mollie.nix
Normal file
36
pkgs/by-name/pr/pretix/plugins/mollie.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pretix-plugin-build,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pretix-mollie";
|
||||
version = "2.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pretix";
|
||||
repo = "pretix-mollie";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-utrdFrE4XHDTi/45gUTFarD+PQoGIHc4gTkDR8dGu40=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
pretix-plugin-build
|
||||
setuptools
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pretix_mollie"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Mollie payments for pretix";
|
||||
homepage = "https://github.com/pretix/pretix-mollie";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ hexa ];
|
||||
};
|
||||
}
|
@ -7,18 +7,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pv-migrate";
|
||||
version = "2.0.1";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "utkuozdemir";
|
||||
repo = pname;
|
||||
tag = "v${version}";
|
||||
sha256 = "sha256-QD/yacQOII1AS9VHB/2cTgoxLioyKYoROSizkHooX9w=";
|
||||
sha256 = "sha256-41yuxvGsJ+BTvw96hWhVRqqJ1UXhvqGO9Y0hU7PfjTU=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/pv-migrate" ];
|
||||
|
||||
vendorHash = "sha256-NXL7LaGSfiJW9lQrZyh5Iw1QvQ9T8omfafADm4PlGik=";
|
||||
vendorHash = "sha256-bkyANbdQIsb8XHRQvI//RogFfVr7x6wwsieru1KIppU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "rain";
|
||||
version = "1.20.2";
|
||||
version = "1.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws-cloudformation";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-T/J01oxiCaZ8vBzSvB3j+dacehHCFs5+46MIoc2DKLU=";
|
||||
sha256 = "sha256-2yb965fDzNgrPXT2xMRdqD/inyvlwdKlkMj16YSFHBk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ML65zg8TVblNcFVmvsiIwxRIfL+jxgUpLx2lVUFHXxI=";
|
||||
vendorHash = "sha256-TlS9SfqMJa5w+JMUx+7ZMF0xk/VsnjOScSGXEw1dVkU=";
|
||||
|
||||
subPackages = [ "cmd/rain" ];
|
||||
|
||||
|
43
pkgs/by-name/ra/razer-cli/package.nix
Normal file
43
pkgs/by-name/ra/razer-cli/package.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{
|
||||
lib,
|
||||
python3,
|
||||
fetchFromGitHub,
|
||||
xrdb,
|
||||
}:
|
||||
|
||||
# requires openrazer-daemon to be running on the system
|
||||
# on NixOS hardware.openrazer.enable or pkgs.openrazer-daemon
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "razer-cli";
|
||||
version = "2.2.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lolei";
|
||||
repo = "razer-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-p/RcBpkvtqYQ3Ekt0pLvKyi1Vv93oHDd7hqSTu/5CSw=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [
|
||||
setuptools
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
python3.pkgs.openrazer
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
xrdb
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/LoLei/razer-cli";
|
||||
description = "Command line interface for controlling Razer devices on Linux";
|
||||
mainProgram = "razer-cli";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = [ lib.maintainers.kaylorben ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
@ -7,13 +7,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "retroarch-joypad-autoconfig";
|
||||
version = "1.19.0";
|
||||
version = "1.20.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libretro";
|
||||
repo = "retroarch-joypad-autoconfig";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-iwxTMwGHix2K5UyjBWFamyo3nVULxwbIF+djyQWz5L0=";
|
||||
hash = "sha256-TdNyQOMLBgwpeYDE8qrRrIMUYcagiBJ02rSVU4Ycn1o=";
|
||||
};
|
||||
|
||||
makeFlags = [
|
||||
|
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rofi-calc";
|
||||
version = "2.2.1";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "svenstaro";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uXaI8dwTRtg8LnFxopgXr9x/vEl8ixzIGOsSQQkAkoQ=";
|
||||
sha256 = "sha256-YDij0j/AOl69FlsGfolzv8lI+iQfDmJrXo2duTIoMRA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -27,7 +27,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
apsw
|
||||
cryptography
|
||||
defusedxml
|
||||
dugong
|
||||
google-auth
|
||||
google-auth-oauthlib
|
||||
pyfuse3
|
||||
|
@ -8,13 +8,13 @@
|
||||
python3.pkgs.toPythonModule (
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "searxng";
|
||||
version = "0-unstable-2024-11-25";
|
||||
version = "0-unstable-2025-01-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "searxng";
|
||||
repo = "searxng";
|
||||
rev = "bad070b4bc2c5afa73edea546c68d3e142a476fc";
|
||||
hash = "sha256-pJl0pD+lx1L7CMKEZaK15ahd96gwWKsR53EVF7RRNtY=";
|
||||
rev = "94a0b415ef587e013df9e7350667b752a3822e90";
|
||||
hash = "sha256-ZeFHsoQXmG2sZXhPY7aRTsAXmFGHNT5ig0c2Hy344vw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sequoia-sq";
|
||||
version = "1.0.0";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "sequoia-pgp";
|
||||
repo = "sequoia-sq";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fXKX4/K3Pcfzdwi0yIVrwZk/7OunQh7g38dVpYhDoxE=";
|
||||
hash = "sha256-m6uUqTXswzdtIabNgijdU54VGQSk0SkSqdh+7m1Q7RU=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-9Nu9hZDBNgfjAmorQBKhdSRavljhtzZ3XIG0mi/xl+s=";
|
||||
cargoHash = "sha256-tq0TLiu8pdLIP0hGQ5x6TJKhweio0XdBMvlTdl8MvEY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
77
pkgs/by-name/sh/shader-slang/1-find-packages.patch
Normal file
77
pkgs/by-name/sh/shader-slang/1-find-packages.patch
Normal file
@ -0,0 +1,77 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index dc281211..c36b9bcb 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -154,6 +154,8 @@ advanced_option(
|
||||
"Build using system unordered dense"
|
||||
OFF
|
||||
)
|
||||
+advanced_option(SLANG_USE_SYSTEM_SPIRV_TOOLS "Build using system SPIR-V tools library" OFF)
|
||||
+advanced_option(SLANG_USE_SYSTEM_GLSLANG "Build using system glslang library" OFF)
|
||||
|
||||
option(
|
||||
SLANG_SPIRV_HEADERS_INCLUDE_DIR
|
||||
@@ -289,6 +291,34 @@ if(${SLANG_USE_SYSTEM_UNORDERED_DENSE})
|
||||
find_package(unordered_dense CONFIG QUIET)
|
||||
endif()
|
||||
|
||||
+if(${SLANG_USE_SYSTEM_MINIZ})
|
||||
+ find_package(miniz REQUIRED)
|
||||
+ add_library(miniz ALIAS miniz::miniz)
|
||||
+endif()
|
||||
+
|
||||
+if(${SLANG_USE_SYSTEM_LZ4})
|
||||
+ find_package(lz4 REQUIRED)
|
||||
+ add_library(lz4_static ALIAS LZ4::lz4)
|
||||
+endif()
|
||||
+
|
||||
+if(${SLANG_USE_SYSTEM_VULKAN_HEADERS})
|
||||
+ find_package(VulkanHeaders REQUIRED)
|
||||
+endif()
|
||||
+
|
||||
+if(${SLANG_USE_SYSTEM_SPIRV_HEADERS})
|
||||
+ find_package(SPIRV-Headers REQUIRED)
|
||||
+ add_library(SPIRV-Headers ALIAS SPIRV-Headers::SPIRV-Headers)
|
||||
+endif()
|
||||
+
|
||||
+if(${SLANG_USE_SYSTEM_SPIRV_TOOLS})
|
||||
+ find_package(SPIRV-Tools REQUIRED)
|
||||
+endif()
|
||||
+
|
||||
+if(${SLANG_USE_SYSTEM_GLSLANG})
|
||||
+ find_package(glslang REQUIRED)
|
||||
+ add_library(glslang ALIAS glslang::glslang)
|
||||
+endif()
|
||||
+
|
||||
add_subdirectory(external)
|
||||
|
||||
# webgpu_dawn is only available as a fetched shared library, since Dawn's nested source
|
||||
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
|
||||
index 43105a5f..8b9c0f14 100644
|
||||
--- a/external/CMakeLists.txt
|
||||
+++ b/external/CMakeLists.txt
|
||||
@@ -73,19 +73,24 @@ if(NOT ${SLANG_USE_SYSTEM_SPIRV_HEADERS})
|
||||
endif()
|
||||
|
||||
if(SLANG_ENABLE_SLANG_GLSLANG)
|
||||
+if(NOT ${SLANG_USE_SYSTEM_SPIRV_TOOLS})
|
||||
# SPIRV-Tools
|
||||
set(SPIRV_TOOLS_BUILD_STATIC ON)
|
||||
set(SPIRV_WERROR OFF)
|
||||
set(SPIRV_HEADER_DIR "${CMAKE_CURRENT_LIST_DIR}/spirv-headers/")
|
||||
set(SPIRV_SKIP_TESTS ON)
|
||||
add_subdirectory(spirv-tools EXCLUDE_FROM_ALL ${system})
|
||||
+endif()
|
||||
|
||||
+if(NOT ${SLANG_USE_SYSTEM_GLSLANG})
|
||||
# glslang
|
||||
set(SKIP_GLSLANG_INSTALL ON)
|
||||
set(ENABLE_OPT ON)
|
||||
set(ENABLE_PCH OFF)
|
||||
+ set(ALLOW_EXTERNAL_SPIRV_TOOLS ${SLANG_USE_SYSTEM_SPIRV_TOOLS})
|
||||
add_subdirectory(glslang EXCLUDE_FROM_ALL ${system})
|
||||
endif()
|
||||
+endif()
|
||||
|
||||
# imgui
|
||||
add_library(imgui INTERFACE)
|
27
pkgs/by-name/sh/shader-slang/2-shared-llvm.patch
Normal file
27
pkgs/by-name/sh/shader-slang/2-shared-llvm.patch
Normal file
@ -0,0 +1,27 @@
|
||||
diff --git a/cmake/LLVM.cmake b/cmake/LLVM.cmake
|
||||
index 3c7c1b54..7f66d6bd 100644
|
||||
--- a/cmake/LLVM.cmake
|
||||
+++ b/cmake/LLVM.cmake
|
||||
@@ -7,7 +7,7 @@ function(llvm_target_from_components target_name)
|
||||
${components}
|
||||
)
|
||||
add_library(${target_name} INTERFACE)
|
||||
- target_link_libraries(${target_name} INTERFACE ${llvm_libs})
|
||||
+ target_link_libraries(${target_name} INTERFACE LLVM)
|
||||
target_include_directories(
|
||||
${target_name}
|
||||
SYSTEM
|
||||
@@ -66,12 +66,7 @@ function(fetch_or_build_slang_llvm)
|
||||
llvm_target_from_components(llvm-dep filecheck native orcjit)
|
||||
clang_target_from_libs(
|
||||
clang-dep
|
||||
- clangBasic
|
||||
- clangCodeGen
|
||||
- clangDriver
|
||||
- clangLex
|
||||
- clangFrontend
|
||||
- clangFrontendTool
|
||||
+ clang-cpp
|
||||
)
|
||||
slang_add_target(
|
||||
source/slang-llvm
|
45
pkgs/by-name/sh/shader-slang/3-glslang-15.patch
Normal file
45
pkgs/by-name/sh/shader-slang/3-glslang-15.patch
Normal file
@ -0,0 +1,45 @@
|
||||
diff --git a/source/slang-glslang/slang-glslang.cpp b/source/slang-glslang/slang-glslang.cpp
|
||||
index 4abcada6..0f63a64e 100644
|
||||
--- a/source/slang-glslang/slang-glslang.cpp
|
||||
+++ b/source/slang-glslang/slang-glslang.cpp
|
||||
@@ -1,8 +1,7 @@
|
||||
// slang-glslang.cpp
|
||||
#include "slang-glslang.h"
|
||||
|
||||
-#include "SPIRV/GlslangToSpv.h"
|
||||
-#include "glslang/MachineIndependent/localintermediate.h"
|
||||
+#include "glslang/SPIRV/GlslangToSpv.h"
|
||||
#include "glslang/Public/ShaderLang.h"
|
||||
#include "slang.h"
|
||||
#include "spirv-tools/libspirv.h"
|
||||
@@ -17,6 +16,7 @@
|
||||
#include <memory>
|
||||
#include <mutex>
|
||||
#include <sstream>
|
||||
+#include <cassert>
|
||||
|
||||
// This is a wrapper to allow us to run the `glslang` compiler
|
||||
// in a controlled fashion.
|
||||
@@ -718,6 +718,11 @@ static int glslang_compileGLSLToSPIRV(glslang_CompileRequest_1_2 request)
|
||||
return 1;
|
||||
}
|
||||
|
||||
+ if (debugLevel == SLANG_DEBUG_INFO_LEVEL_MAXIMAL)
|
||||
+ {
|
||||
+ shader->addSourceText(sourceText, sourceTextLength);
|
||||
+ }
|
||||
+
|
||||
if (request.entryPointName && strlen(request.entryPointName))
|
||||
shader->setEntryPoint(request.entryPointName);
|
||||
|
||||
@@ -741,10 +746,6 @@ static int glslang_compileGLSLToSPIRV(glslang_CompileRequest_1_2 request)
|
||||
auto stageIntermediate = program->getIntermediate((EShLanguage)stage);
|
||||
if (!stageIntermediate)
|
||||
continue;
|
||||
- if (debugLevel == SLANG_DEBUG_INFO_LEVEL_MAXIMAL)
|
||||
- {
|
||||
- stageIntermediate->addSourceText(sourceText, sourceTextLength);
|
||||
- }
|
||||
|
||||
std::vector<unsigned int> spirv;
|
||||
spv::SpvBuildLogger logger;
|
158
pkgs/by-name/sh/shader-slang/package.nix
Normal file
158
pkgs/by-name/sh/shader-slang/package.nix
Normal file
@ -0,0 +1,158 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
ninja,
|
||||
python3,
|
||||
miniz,
|
||||
lz4,
|
||||
libxml2,
|
||||
libX11,
|
||||
spirv-headers,
|
||||
glslang,
|
||||
llvmPackages_13,
|
||||
versionCheckHook,
|
||||
gitUpdater,
|
||||
|
||||
# Required for compiling to SPIR-V or GLSL
|
||||
withGlslang ? true,
|
||||
# Can be used for compiling shaders to CPU targets, see:
|
||||
# https://github.com/shader-slang/slang/blob/master/docs/cpu-target.md
|
||||
# If `withLLVM` is disabled, Slang will fall back to the C++ compiler found
|
||||
# in the environment, if one exists.
|
||||
withLLVM ? false,
|
||||
# Dynamically link against libllvm and libclang++ (upstream defaults to static)
|
||||
withSharedLLVM ? withLLVM,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "shader-slang";
|
||||
version = "2025.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shader-slang";
|
||||
repo = "slang";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-H/ePYu6o926M22zussW1f15iYRJCq29TeNJzBD0eAao=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches =
|
||||
[
|
||||
# Slang's build definitions do not support using system provided cmake packages
|
||||
# for its dependencies.
|
||||
# While it does come with "SLANG_USE_SYSTEM_XYZ" flags, these expect Slang to be
|
||||
# imported into some other CMake build that already provides the necessary target.
|
||||
# This patch adds the required `find_package` calls and sets up target aliases where needed.
|
||||
./1-find-packages.patch
|
||||
]
|
||||
++ lib.optionals withSharedLLVM [
|
||||
# Upstream statically links libllvm and libclang++, resulting in a ~5x increase in binary size.
|
||||
./2-shared-llvm.patch
|
||||
]
|
||||
++ lib.optionals withGlslang [
|
||||
# Upstream depends on glslang 13 and there are minor breaking changes in glslang 15, the version
|
||||
# we ship in nixpkgs.
|
||||
./3-glslang-15.patch
|
||||
];
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"doc"
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
python3
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
miniz
|
||||
lz4
|
||||
libxml2
|
||||
spirv-headers
|
||||
]
|
||||
++ (lib.optionals stdenv.hostPlatform.isLinux [
|
||||
libX11
|
||||
])
|
||||
++ (lib.optionals withLLVM [
|
||||
# Slang only supports LLVM 13:
|
||||
# https://github.com/shader-slang/slang/blob/master/docs/building.md#llvm-support
|
||||
llvmPackages_13.llvm
|
||||
llvmPackages_13.libclang
|
||||
])
|
||||
++ (lib.optionals withGlslang [
|
||||
# SPIRV-tools is included in glslang.
|
||||
glslang
|
||||
]);
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
# Required for spaces in cmakeFlags, see https://github.com/NixOS/nixpkgs/issues/114044
|
||||
__structuredAttrs = true;
|
||||
|
||||
preConfigure =
|
||||
lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
# required to handle LTO objects
|
||||
export AR="${stdenv.cc.targetPrefix}gcc-ar"
|
||||
export NM="${stdenv.cc.targetPrefix}gcc-nm"
|
||||
export RANLIB="${stdenv.cc.targetPrefix}gcc-ranlib"
|
||||
''
|
||||
+ ''
|
||||
# cmake setup hook only sets CMAKE_AR and CMAKE_RANLIB, but not these
|
||||
prependToVar cmakeFlags "-DCMAKE_CXX_COMPILER_AR=$(command -v $AR)"
|
||||
prependToVar cmakeFlags "-DCMAKE_CXX_COMPILER_RANLIB=$(command -v $RANLIB)"
|
||||
'';
|
||||
|
||||
cmakeFlags =
|
||||
[
|
||||
"-GNinja Multi-Config"
|
||||
# The cmake setup hook only specifies `-DCMAKE_BUILD_TYPE=Release`,
|
||||
# which does nothing for "Ninja Multi-Config".
|
||||
"-DCMAKE_CONFIGURATION_TYPES=RelWithDebInfo"
|
||||
# Handled by separateDebugInfo so we don't need special installation handling
|
||||
"-DSLANG_ENABLE_SPLIT_DEBUG_INFO=OFF"
|
||||
"-DSLANG_VERSION_FULL=v${finalAttrs.version}-nixpkgs"
|
||||
# slang-rhi tries to download WebGPU dawn binaries, and as stated on
|
||||
# https://github.com/shader-slang/slang-rhi is "under active refactoring
|
||||
# and development, and is not yet ready for general use."
|
||||
"-DSLANG_ENABLE_SLANG_RHI=OFF"
|
||||
"-DSLANG_USE_SYSTEM_MINIZ=ON"
|
||||
"-DSLANG_USE_SYSTEM_LZ4=ON"
|
||||
"-DSLANG_SPIRV_HEADERS_INCLUDE_DIR=${spirv-headers}/include"
|
||||
"-DSLANG_SLANG_LLVM_FLAVOR=${if withLLVM then "USE_SYSTEM_LLVM" else "DISABLE"}"
|
||||
]
|
||||
# Currently depends on unreleased op type `SpvOpTypeNodePayloadArrayAMDX`,
|
||||
# which will be included in next release >1.3.296
|
||||
++ lib.optional (lib.versionAtLeast spirv-headers.version "1.3.297.0") "-DSLANG_USE_SYSTEM_SPIRV_HEADERS=ON"
|
||||
++ (lib.optionals withGlslang [
|
||||
"-DSLANG_USE_SYSTEM_SPIRV_TOOLS=ON"
|
||||
"-DSLANG_USE_SYSTEM_GLSLANG=ON"
|
||||
])
|
||||
++ lib.optional (!withGlslang) "-DSLANG_ENABLE_SLANG_GLSLANG=OFF";
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/slangc";
|
||||
versionCheckProgramArg = [ "-v" ];
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
ignoredVersions = "*-draft";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A shading language that makes it easier to build and maintain large shader codebases in a modular and extensible fashion";
|
||||
homepage = "https://github.com/shader-slang/slang";
|
||||
license = lib.licenses.asl20-llvm;
|
||||
maintainers = with lib.maintainers; [ niklaskorz ];
|
||||
mainProgram = "slangc";
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
})
|
52
pkgs/by-name/so/soapyplutosdr/package.nix
Normal file
52
pkgs/by-name/so/soapyplutosdr/package.nix
Normal file
@ -0,0 +1,52 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
pkg-config,
|
||||
darwin,
|
||||
libad9361,
|
||||
libiio,
|
||||
libusb1,
|
||||
soapysdr,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "soapyplutosdr";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pothosware";
|
||||
repo = "SoapyPlutoSDR";
|
||||
rev = "soapy-plutosdr-${finalAttrs.version}";
|
||||
hash = "sha256-uXKvv/QRbYknqsLGlPFxSH7KLh0CucLjq4XEFFcieWw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
];
|
||||
buildInputs =
|
||||
[
|
||||
libad9361
|
||||
libiio
|
||||
libusb1
|
||||
soapysdr
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
darwin.apple_sdk.frameworks.IOKit
|
||||
darwin.libobjc
|
||||
];
|
||||
|
||||
cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pothosware/SoapyPlutoSDR";
|
||||
changelog = "https://github.com/pothosware/SoapyPlutoSDR/blob/soapy-plutosdr-${finalAttrs.version}/Changelog.txt";
|
||||
description = "SoapySDR plugin for Pluto SDR devices";
|
||||
license = licenses.lgpl21;
|
||||
maintainers = with maintainers; [ wucke13 ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
@ -4,27 +4,39 @@
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
pandoc,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stenc";
|
||||
version = "1.1.1";
|
||||
version = "2.0.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scsitape";
|
||||
repo = "stenc";
|
||||
rev = version;
|
||||
sha256 = "GcCRVkv+1mREq3MhMRn5fICthwI4WRQJSP6InuzxP1Q=";
|
||||
tag = version;
|
||||
sha256 = "sha256-L0g285H8bf3g+HDYUDRWBZMOBCnWz3Vm38Ijttu404U=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Fix gcc-13 build by pulling missing header. UPstream also fixed it
|
||||
# in next major version, but there are many other patch dependencies.
|
||||
# TODO: remove on next major version update
|
||||
sed -e '1i #include <cstdint>' -i src/scsiencrypt.h
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
pandoc
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
doCheck = true;
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --bash bash-completion/stenc
|
||||
'';
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
buildGo123Module,
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
nixosTests,
|
||||
stdenv,
|
||||
@ -8,9 +8,9 @@
|
||||
telegraf,
|
||||
}:
|
||||
|
||||
buildGo123Module rec {
|
||||
buildGoModule rec {
|
||||
pname = "telegraf";
|
||||
version = "1.33.0";
|
||||
version = "1.33.1";
|
||||
|
||||
subPackages = [ "cmd/telegraf" ];
|
||||
|
||||
@ -18,10 +18,10 @@ buildGo123Module rec {
|
||||
owner = "influxdata";
|
||||
repo = "telegraf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Psrhm854/9xywJlWKBGDbKMq6R3kVb2DGKI+c04PaLI=";
|
||||
hash = "sha256-35L83l1aa7TDis0bZss4xBrciK1QEofkKY04JInmRmo=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QEg6vDghz6CWHsLs745kxt959+b3cj45Tjfb3moryzM=";
|
||||
vendorHash = "sha256-JGG+IIYC0JKjetkrgTS6gwhk0/ehvSIxZi6ts234Gi4=";
|
||||
proxyVendor = true;
|
||||
|
||||
ldflags = [
|
||||
|
@ -17,17 +17,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "uv";
|
||||
version = "0.5.16";
|
||||
version = "0.5.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
tag = version;
|
||||
hash = "sha256-fetK0xzob0njNPqpfezPKV07NXByfLXcC3mIhQvFBaw=";
|
||||
hash = "sha256-LK+S1L5XaflfkmKQcYHPDrXO+XjNJNX4mBg1ST74PzY=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-IPOtFLkW/ShiQz82vHgTNKjIqA6Iebng929fAA6ryPU=";
|
||||
cargoHash = "sha256-3wPR9OOgmZ99BXaHBzPPPPt5dHPXRDiNY0S6nhC2nx4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
@ -4,22 +4,23 @@
|
||||
buildGoModule,
|
||||
darwin,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
testers,
|
||||
vfkit,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "vfkit";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "crc-org";
|
||||
repo = "vfkit";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9iPr9VhN60B6kBikdEIFAs5mMH+VcmnjGhLuIa3A2JU=";
|
||||
hash = "sha256-uBFL3iZLpGcVUSgZSoq8FI87CDAr3NI8uu+u5UsrZCc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6O1T9aOCymYXGAIR/DQBWfjc2sCyU/nZu9b1bIuXEps=";
|
||||
vendorHash = "sha256-+5QZcoI+/98hyd87NV6uX/VZqd5z38fk7K7RibX/9vw=";
|
||||
|
||||
subPackages = [ "cmd/vfkit" ];
|
||||
|
||||
@ -45,11 +46,17 @@ buildGoModule rec {
|
||||
version = testers.testVersion { package = vfkit; };
|
||||
};
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Simple command line tool to start VMs through the macOS Virtualization framework";
|
||||
homepage = "https://github.com/crc-org/vfkit";
|
||||
changelog = "https://github.com/crc-org/vfkit/releases/tag/v${version}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ sarcasticadmin ];
|
||||
maintainers = with lib.maintainers; [
|
||||
sarcasticadmin
|
||||
phaer
|
||||
];
|
||||
platforms = lib.platforms.darwin;
|
||||
sourceProvenance = [ lib.sourceTypes.fromSource ];
|
||||
mainProgram = "vfkit";
|
||||
|
56
pkgs/by-name/vk/vkdevicechooser/package.nix
Normal file
56
pkgs/by-name/vk/vkdevicechooser/package.nix
Normal file
@ -0,0 +1,56 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
writeText,
|
||||
meson,
|
||||
vulkan-headers,
|
||||
vulkan-utility-libraries,
|
||||
ninja,
|
||||
jq,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vkdevicechooser";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jiriks74";
|
||||
repo = "vkdevicechooser";
|
||||
rev = version;
|
||||
hash = "sha256-j4hefarOQ3q0sKkB2g/dO2/4bSYzt4oxmCna0nMAjFk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
jq
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
vulkan-headers
|
||||
vulkan-utility-libraries
|
||||
];
|
||||
|
||||
# Help vulkan-loader find the layer
|
||||
setupHook = writeText "setup-hook" ''
|
||||
addToSearchPath XDG_DATA_DIRS @out@/share
|
||||
'';
|
||||
|
||||
# Include absolute paths to layer libraries in their associated
|
||||
# layer definition json files.
|
||||
preFixup = ''
|
||||
for f in "$out"/share/vulkan/explicit_layer.d/*.json "$out"/share/vulkan/implicit_layer.d/*.json; do
|
||||
jq <"$f" >tmp.json ".layer.library_path = \"$out/lib/\" + .layer.library_path"
|
||||
mv tmp.json "$f"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Vulkan layer to force a specific device to be used";
|
||||
homepage = "https://github.com/aejsmith/vkdevicechooser";
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.sigmike ];
|
||||
};
|
||||
}
|
@ -9,13 +9,13 @@
|
||||
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "wayland-proxy-virtwl";
|
||||
version = "0-unstable-2024-06-17";
|
||||
version = "0-unstable-2025-01-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "talex5";
|
||||
repo = pname;
|
||||
rev = "1c0cd6d4f13454f0c72148b4c4a1c1e3b728205e";
|
||||
sha256 = "sha256-E9UTq9sNBdg+ANO8b9Nga/JBD+Tt9O5QV5NQmbY6GLE=";
|
||||
rev = "a49bb541a7b008e13be226b3aaf0c4bda795af26";
|
||||
sha256 = "sha256-lX/ccHV1E7iAuGqTig+fvcY22qyk4ZJui17nLotaWjw=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "5.0";
|
||||
|
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "yamlfmt";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "yamlfmt";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-l9PtVaAKjtP9apTrKCkC1KDR0IXqLqinpj1onzSrPnI=";
|
||||
hash = "sha256-eAcHl4h7c3HU901cuqzAPs49qRldxKQDxrWBmccmwos=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-lsNldfacBoeTPyhkjyDZhI5YR+kDke0TarfG/KdjEOg=";
|
||||
vendorHash = "sha256-za95/Zj8MXJqt9tW6csaRlXFs+5ET/D4CUsCnGqcLQQ=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
@ -5,6 +5,7 @@
|
||||
glib,
|
||||
gnome,
|
||||
libexif,
|
||||
libheif,
|
||||
libjxl,
|
||||
librsvg,
|
||||
libxfce4ui,
|
||||
@ -31,11 +32,12 @@ mkXfceDerivation {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
# Pull in JXL and WebP support for ristretto.
|
||||
# Pull in HEIF, JXL and WebP support for ristretto.
|
||||
# In postInstall to run before gappsWrapperArgsHook.
|
||||
export GDK_PIXBUF_MODULE_FILE="${
|
||||
gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
|
||||
extraLoaders = [
|
||||
libheif.out
|
||||
libjxl
|
||||
librsvg
|
||||
webp-pixbuf-loader
|
||||
|
@ -1,17 +1,19 @@
|
||||
{ lib
|
||||
, mkXfceDerivation
|
||||
, ffmpegthumbnailer
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, freetype
|
||||
, libgepub
|
||||
, libgsf
|
||||
, libjxl
|
||||
, librsvg
|
||||
, poppler
|
||||
, gst_all_1
|
||||
, webp-pixbuf-loader
|
||||
, libxfce4util
|
||||
{
|
||||
lib,
|
||||
mkXfceDerivation,
|
||||
ffmpegthumbnailer,
|
||||
gdk-pixbuf,
|
||||
glib,
|
||||
freetype,
|
||||
libgepub,
|
||||
libgsf,
|
||||
libheif,
|
||||
libjxl,
|
||||
librsvg,
|
||||
poppler,
|
||||
gst_all_1,
|
||||
webp-pixbuf-loader,
|
||||
libxfce4util,
|
||||
}:
|
||||
|
||||
# TODO: add libopenraw
|
||||
@ -38,13 +40,22 @@ mkXfceDerivation {
|
||||
preFixup = ''
|
||||
gappsWrapperArgs+=(
|
||||
# Thumbnailers
|
||||
--prefix XDG_DATA_DIRS : "${lib.makeSearchPath "share" [ libjxl librsvg webp-pixbuf-loader ]}"
|
||||
--prefix XDG_DATA_DIRS : "${
|
||||
lib.makeSearchPath "share" [
|
||||
libheif.out
|
||||
libjxl
|
||||
librsvg
|
||||
webp-pixbuf-loader
|
||||
]
|
||||
}"
|
||||
# For heif-thumbnailer in heif.thumbnailer
|
||||
--prefix PATH : "${lib.makeBinPath [ libheif ]}"
|
||||
)
|
||||
'';
|
||||
|
||||
# WrapGAppsHook won't touch this binary automatically, so we wrap manually.
|
||||
postFixup = ''
|
||||
wrapProgram $out/lib/tumbler-1/tumblerd "''${gappsWrapperArgs[@]}"
|
||||
wrapGApp $out/lib/tumbler-1/tumblerd
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
cmake,
|
||||
rapidjson,
|
||||
AppKit,
|
||||
@ -32,6 +33,15 @@ stdenv.mkDerivation rec {
|
||||
"-DBUILD_EXAMPLES=${lib.boolToString buildExamples}"
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Adds unreleased PR https://github.com/discord/discord-rpc/pull/387
|
||||
(fetchpatch {
|
||||
name = "0001-Update-.clang-format.patch";
|
||||
url = "https://github.com/discord/discord-rpc/commit/dc26645316a1996a10995d9f5fae53ca1caddade.patch";
|
||||
hash = "sha256-geofgXwfbDsvsYCz92IVFrdvBDiGvMBiFd3GEbsdoHU=";
|
||||
})
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Official library to interface with the Discord client";
|
||||
homepage = "https://github.com/discordapp/discord-rpc";
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioshelly";
|
||||
version = "12.2.0";
|
||||
version = "12.3.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "home-assistant-libs";
|
||||
repo = "aioshelly";
|
||||
tag = version;
|
||||
hash = "sha256-Y6gFFo0kzdHGaRqNVHhr0vvWBwRO2kOaoR4BFUbyYUQ=";
|
||||
hash = "sha256-ZijjqUvCcCVWhFlHzXN0xpAjn+3OCYf6rmBApxfT2c4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -359,7 +359,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.35.96";
|
||||
version = "1.35.97";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -367,7 +367,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-A2hb88YvKjTrjlVCAHTxdZQBU82QDkXK864xVu5seGE=";
|
||||
hash = "sha256-QYL58Y8nmWn7y2lyAPmommsHqV5F99snarkNzfZacro=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.35.96";
|
||||
version = "1.35.97";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-pBfc3PEn2mRMl1ljvHQDsYjSrlqMG7kHhJ1LhoHk+5A=";
|
||||
hash = "sha256-quCOpKKqPDYM/Xg/jkxxPbZDUbQpuu4UiCDVsKbZIho=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
@ -1,38 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dugong";
|
||||
version = "3.8.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "python-dugong";
|
||||
repo = "python-dugong";
|
||||
rev = "release-${version}";
|
||||
sha256 = "1063c1779idc5nrjzfv5w1xqvyy3crapb2a2xll9y6xphxclnkjc";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
# Lots of tests hang during teardown with:
|
||||
# ssl.SSLEOFError: EOF occurred in violation of protocol (_ssl.c:2396)
|
||||
doCheck = pythonOlder "3.10";
|
||||
|
||||
pythonImportsCheck = [ "dugong" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "HTTP 1.1 client designed for REST-ful APIs";
|
||||
homepage = "https://github.com/python-dugong/python-dugong/";
|
||||
license = with licenses; [
|
||||
psfl
|
||||
asl20
|
||||
];
|
||||
maintainers = [ ];
|
||||
};
|
||||
}
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "freebox-api";
|
||||
version = "1.2.1";
|
||||
version = "1.2.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,12 +20,10 @@ buildPythonPackage rec {
|
||||
owner = "hacf-fr";
|
||||
repo = "freebox-api";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-a4d7fjSPBcVlCkY8y7dTLPW949YUg9wD62kQxJRxp0I=";
|
||||
hash = "sha256-piPC3F63Yqk1rYPYyIoEHSpC8TS4HyIVa8XbQlAgcqA=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
pythonRelaxDeps = [ "urllib3" ];
|
||||
|
||||
@ -40,10 +38,10 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module to interact with the Freebox OS API";
|
||||
mainProgram = "freebox_api";
|
||||
homepage = "https://github.com/hacf-fr/freebox-api";
|
||||
changelog = "https://github.com/hacf-fr/freebox-api/releases/tag/v${version}";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "freebox_api";
|
||||
};
|
||||
}
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "geoalchemy2";
|
||||
version = "0.16.0";
|
||||
version = "0.17.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "geoalchemy";
|
||||
repo = "geoalchemy2";
|
||||
tag = version;
|
||||
hash = "sha256-LjfCPSpKwcyjmGReTC4M58890ow3hbxlwl1f7iC9i6Y=";
|
||||
hash = "sha256-MxoX5WGJATIvzfeuHFqYGlnaxPNzvqD/v82Zm4Iav1g=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ghrepo-stats";
|
||||
version = "0.5.4";
|
||||
version = "0.5.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "mrbean-bremen";
|
||||
repo = pname;
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Mr0FM2CbdgAUF8siMjUIZvypWiPNPU9OncPiBPqK3uE=";
|
||||
hash = "sha256-zdBIX/uetkOAalg4uJPWXRL9WUgNN+hmqUwQDTdzrzA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigtable";
|
||||
version = "2.27.0";
|
||||
version = "2.28.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "google_cloud_bigtable";
|
||||
inherit version;
|
||||
hash = "sha256-pqIZgoO9fRHkPD+Ydnqa9DeJs4mvhadhoFsI/dn1e6s=";
|
||||
hash = "sha256-BztPc0MxvbUXkNWg0LWL95kC/919USJ6vyiBgw+sgk0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "identify";
|
||||
version = "2.6.2";
|
||||
version = "2.6.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "pre-commit";
|
||||
repo = "identify";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6sKnHsVLkwHy2udd8znqiFFMfWnmWTxTU949X4bqLNU=";
|
||||
hash = "sha256-FKF3+jN5/D0hRSvr90AY/C/5KBx0c7LvR+l12IP+zbU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -23,16 +23,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jedi-language-server";
|
||||
version = "0.42.0";
|
||||
version = "0.43.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pappasam";
|
||||
repo = "jedi-language-server";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-KWkKIKiaRR26CctDFrHJAITM+nmRKGxLeC5HHwVZz4s=";
|
||||
hash = "sha256-w0qasGuBvY6KVhLB17wux7Sm94Xuk1z2La/DPSLEp/4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-embeddings-gemini";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_embeddings_gemini";
|
||||
inherit version;
|
||||
hash = "sha256-vytKBvvNVbW1GpFS9+0ydkyUqih3UUGusRIp79hMjtI=";
|
||||
hash = "sha256-Bt6NazogM8O5QDtrIN2uooKMCwzLseOU/v5H9e0hvEk=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "google-generativeai" ];
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-embeddings-huggingface";
|
||||
version = "0.4.0";
|
||||
version = "0.5.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_embeddings_huggingface";
|
||||
inherit version;
|
||||
hash = "sha256-zo+LMLKc/4VAGrohGChftj+4FHpWtlbuIPfoUQyghaI=";
|
||||
hash = "sha256-u3WSS9UmMTZL07GksKt4dToL7wAhDyditCXL0F9Opg4=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-graph-stores-neo4j";
|
||||
version = "0.4.4";
|
||||
version = "0.4.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_graph_stores_neo4j";
|
||||
inherit version;
|
||||
hash = "sha256-P//9FvSUD0ZQybRgBjZjQREEdwqw9wiNygE8M0I2FhY=";
|
||||
hash = "sha256-PF2Dacn7DhoI6pLWJCh3idKhwc0VM9jgaBzmW8uSg6E=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-llms-openai";
|
||||
version = "0.3.12";
|
||||
version = "0.3.13";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_llms_openai";
|
||||
inherit version;
|
||||
hash = "sha256-GIAnOn5AnAXx28zbrFzjwhR3GQHNNpautVainf7YR3o=";
|
||||
hash = "sha256-Ud2iQNrnZxw36Eu1D+d/5rtYqbKn4z3M2ERzyZmK/Oo=";
|
||||
};
|
||||
|
||||
pythonRemoveDeps = [
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-readers-file";
|
||||
version = "0.4.2";
|
||||
version = "0.4.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_readers_file";
|
||||
inherit version;
|
||||
hash = "sha256-1nei7vBpXQC0h6xOoUyC5qTqreOgnFQPj4FibYUuNJE=";
|
||||
hash = "sha256-B1FL6+185DHBs++SedCao9G7qONC1mGGCgMzVbmPszo=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
@ -14,12 +14,12 @@
|
||||
let
|
||||
finalAttrs = {
|
||||
pname = "loompy";
|
||||
version = "3.0.7";
|
||||
version = "3.0.8";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-tc33tUc0xr7ToYHRGUevcK8sbg3K3AL9Docd8jL6qPQ=";
|
||||
hash = "sha256-wfSNC/Iaorve7iGgV3VTy6lgnZQ118MraHaGu7WGnKc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -1094,8 +1094,8 @@ rec {
|
||||
"sha256-anaaP4VNdI4ZQWTp/8R6G4APscb6AS5Lo6YRjwbtGFM=";
|
||||
|
||||
mypy-boto3-redshift =
|
||||
buildMypyBoto3Package "redshift" "1.35.93"
|
||||
"sha256-Y7MZ0ZZu11nCFU2PJWue6zpXp0kefb1vWDYu2HqAe58=";
|
||||
buildMypyBoto3Package "redshift" "1.35.97"
|
||||
"sha256-gJm76sCPgpS9ekNDCmtt68atbVbNh4B8IqO7lS6C3ic=";
|
||||
|
||||
mypy-boto3-redshift-data =
|
||||
buildMypyBoto3Package "redshift-data" "1.35.93"
|
||||
@ -1226,8 +1226,8 @@ rec {
|
||||
"sha256-2kPOD5J5TK+vQbQVFfK9z68uTeXL62sj1Jqe2CuB4sw=";
|
||||
|
||||
mypy-boto3-securitylake =
|
||||
buildMypyBoto3Package "securitylake" "1.35.93"
|
||||
"sha256-mHi82d7YO8N0ybimZ22wautkkJR3KILHu78p0am9lmk=";
|
||||
buildMypyBoto3Package "securitylake" "1.35.97"
|
||||
"sha256-m+cjupsQESwFSTcWE6JwIG6Pyx9kri4GwJyjXLlLdos=";
|
||||
|
||||
mypy-boto3-serverlessrepo =
|
||||
buildMypyBoto3Package "serverlessrepo" "1.35.93"
|
||||
@ -1330,8 +1330,8 @@ rec {
|
||||
"sha256-HVi4ZB2gqc1Y+yTrQagG0JgtMsMoASoLrHlLCZA7GUE=";
|
||||
|
||||
mypy-boto3-sts =
|
||||
buildMypyBoto3Package "sts" "1.35.93"
|
||||
"sha256-s+uh11yTUuMPnKswfc2JAh175JcZh26IECKzSlLqdfw=";
|
||||
buildMypyBoto3Package "sts" "1.35.97"
|
||||
"sha256-bfaY9qQAqC68wvEK20NVf2YnhGcgDg91WI594+ShYi0=";
|
||||
|
||||
mypy-boto3-support =
|
||||
buildMypyBoto3Package "support" "1.35.93"
|
||||
|
@ -13,16 +13,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pandantic";
|
||||
version = "0.3.1";
|
||||
version = "1.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wesselhuising";
|
||||
repo = "pandantic";
|
||||
tag = version;
|
||||
hash = "sha256-JRhnDVRYX0OV/dZkfqNoS2qFcoHOZHm9QZphF/JhgxM=";
|
||||
hash = "sha256-c108zoKBnjlELCDia8XSsdG8Exa/k7HKyRvcTocndss=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plexapi";
|
||||
version = "4.16.0";
|
||||
version = "4.16.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "pkkid";
|
||||
repo = "python-plexapi";
|
||||
tag = version;
|
||||
hash = "sha256-4dWtSj6OwD4c18yDKtlqXyPc37JQhbsAuj9OmcIHe0I=";
|
||||
hash = "sha256-ncinm2wtFx2lzsDTsK+D4rz4hVhcwcK2VkL6osNUftY=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "publicsuffixlist";
|
||||
version = "1.0.2.20250110";
|
||||
version = "1.0.2.20250111";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-qG3vY6LWm3N2RTiErmz8H644YFsMRjXS2ZMpBby7MTI=";
|
||||
hash = "sha256-ul/bjvMgjBzNVyWV4o11CzMD6LT55+baTzITVt8H7wc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pwlf";
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cjekel";
|
||||
repo = "piecewise_linear_fit_py";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-FAH38mSaABdNR8lpxxA/YVo5ec2WYOMEsAQqravbM9k=";
|
||||
tag = "v.${version}";
|
||||
hash = "sha256-TamFg+bX8QPRjY0HdrYviJRP8VwM7ucDFE2eZz5xNr0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pypalazzetti";
|
||||
version = "0.1.15";
|
||||
version = "0.1.16";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "dotvav";
|
||||
repo = "py-palazzetti-api";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-gqJZVlX060BMbTbkbpK6UMnM71Mr06sNHX++ObI3Y5Y=";
|
||||
hash = "sha256-JYTrZ1Ty9y+yvoeVXus1qqNFnB0NmczCz6Kq2PjpiLk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -18,14 +18,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pythonqwt";
|
||||
version = "0.14.1";
|
||||
version = "0.14.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PlotPyStack";
|
||||
repo = "PythonQwt";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-apvUilKx6Xl2PluvmQVW5Lkoub2He/75EdYv10jMR+k=";
|
||||
hash = "sha256-8bhcfm4sPA32IpEcS4Z12nfNgfmWJUDxDjX1TULWwCU=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
@ -11,8 +11,8 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "questionary";
|
||||
version = "2.0.1";
|
||||
format = "pyproject";
|
||||
version = "2.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@ -20,16 +20,14 @@ buildPythonPackage rec {
|
||||
owner = "tmbo";
|
||||
repo = pname;
|
||||
tag = version;
|
||||
hash = "sha256-JY0kXomgiGtOrsXfRf0756dTPVgud91teh+jW+kFNdk=";
|
||||
hash = "sha256-HiQsOkG3oK+hnyeFjebnVASxpZhUPGBGz69JvPO43fM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [ "prompt_toolkit" ];
|
||||
|
||||
propagatedBuildInputs = [ prompt-toolkit ];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [ prompt-toolkit ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
@ -48,7 +46,7 @@ buildPythonPackage rec {
|
||||
description = "Python library to build command line user prompts";
|
||||
homepage = "https://github.com/tmbo/questionary";
|
||||
changelog = "https://github.com/tmbo/questionary/blob/${src.rev}/docs/pages/changelog.rst";
|
||||
license = with licenses; [ mit ];
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
@ -17,6 +17,10 @@ buildPythonPackage rec {
|
||||
patches = [
|
||||
# https://github.com/equinor/segyio/pull/570
|
||||
./add_missing_cstdint.patch
|
||||
# https://github.com/equinor/segyio/pull/576/
|
||||
./fix-setuptools.patch
|
||||
./explicitly-cast.patch
|
||||
./numpy-2.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@ -49,10 +53,10 @@ buildPythonPackage rec {
|
||||
numpy
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Fast Python library for SEGY files";
|
||||
homepage = "https://github.com/equinor/segyio";
|
||||
license = licenses.lgpl3Only;
|
||||
maintainers = with maintainers; [ atila ];
|
||||
license = lib.licenses.lgpl3Only;
|
||||
maintainers = with lib.maintainers; [ atila ];
|
||||
};
|
||||
}
|
||||
|
32
pkgs/development/python-modules/segyio/explicitly-cast.patch
Normal file
32
pkgs/development/python-modules/segyio/explicitly-cast.patch
Normal file
@ -0,0 +1,32 @@
|
||||
From eafe8476566e1d8e8b9a486ca808685cb439a767 Mon Sep 17 00:00:00 2001
|
||||
From: Sveinung Rundhovde <ssru@equinor.com>
|
||||
Date: Mon, 29 Jul 2024 10:46:35 +0200
|
||||
Subject: [PATCH] Explicitly cast from BinField to int
|
||||
|
||||
Parsing segyio.BinField type as int in PyArg_ParseTuple is no longer
|
||||
possible.
|
||||
---
|
||||
python/segyio/open.py | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/python/segyio/open.py b/python/segyio/open.py
|
||||
index cd902c15..80bc3a5b 100644
|
||||
--- a/python/segyio/open.py
|
||||
+++ b/python/segyio/open.py
|
||||
@@ -166,8 +166,8 @@ def open(filename, mode="r", iline = 189,
|
||||
f = segyio.SegyFile(fd,
|
||||
filename = str(filename),
|
||||
mode = mode,
|
||||
- iline = iline,
|
||||
- xline = xline,
|
||||
+ iline = int(iline),
|
||||
+ xline = int(xline),
|
||||
endian = endian,
|
||||
)
|
||||
|
||||
@@ -189,4 +189,4 @@ def open(filename, mode="r", iline = 189,
|
||||
if ignore_geometry:
|
||||
return f
|
||||
|
||||
- return infer_geometry(f, metrics, iline, xline, strict)
|
||||
+ return infer_geometry(f, metrics, int(iline), int(xline), strict)
|
32
pkgs/development/python-modules/segyio/fix-setuptools.patch
Normal file
32
pkgs/development/python-modules/segyio/fix-setuptools.patch
Normal file
@ -0,0 +1,32 @@
|
||||
From 6df089258c2ef4356427263f652cff0c053c6173 Mon Sep 17 00:00:00 2001
|
||||
From: Sveinung Rundhovde <ssru@equinor.com>
|
||||
Date: Fri, 26 Jul 2024 15:03:33 +0200
|
||||
Subject: [PATCH] Fix attribute error in setup.py
|
||||
|
||||
This line was causing a error due to an update to scikit-build. The
|
||||
issue was that the setuptools.command.test module is not put into the
|
||||
symbol table by the setuptools import, but it was put there during the
|
||||
skbuild import causing it to be available. Due to changes in
|
||||
scikit-build this is no longer the case and the line gives an
|
||||
AttributError.
|
||||
|
||||
The rationale for this line was that scikit-builds test command implied
|
||||
develop (this was obnoxious), something that is no longer true. There is
|
||||
thus no longer any reason to keep this line, so we can fix this issue by
|
||||
simply removing it.
|
||||
---
|
||||
python/setup.py | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/python/setup.py b/python/setup.py
|
||||
index 6c6553bc..6bae62f0 100644
|
||||
--- a/python/setup.py
|
||||
+++ b/python/setup.py
|
||||
@@ -95,7 +95,6 @@ def src(x):
|
||||
# supported OS X release 10.9
|
||||
'-DCMAKE_OSX_DEPLOYMENT_TARGET=10.9',
|
||||
],
|
||||
- cmdclass = { 'test': setuptools.command.test.test },
|
||||
classifiers = [
|
||||
'Development Status :: 5 - Production/Stable',
|
||||
'Environment :: Other Environment',
|
34
pkgs/development/python-modules/segyio/numpy-2.patch
Normal file
34
pkgs/development/python-modules/segyio/numpy-2.patch
Normal file
@ -0,0 +1,34 @@
|
||||
From 75b2156a6414e2464eb15663004b8ab928374135 Mon Sep 17 00:00:00 2001
|
||||
From: Sveinung Rundhovde <ssru@equinor.com>
|
||||
Date: Tue, 30 Jul 2024 08:32:56 +0200
|
||||
Subject: [PATCH] Fix test failing due to Numpy 2.0 promotion rules
|
||||
|
||||
From Numpy 2.0 adding a numpy.float32 and a Python numeric type returns
|
||||
a numy.float32 when it previously returned a numpy.float64. This changes
|
||||
the behavior when using the Python builtin sum function on a
|
||||
numpy.float32 array as the internal computations now will be performed
|
||||
as numpy.float32 additions when it used to be numpy.float64.
|
||||
|
||||
Passing a numpy.double(0) as a start value to the innermost sum forces
|
||||
the old behavior and provides consistent results for Numpy 1 and 2.
|
||||
---
|
||||
python/test/segyio_c.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/python/test/segyio_c.py b/python/test/segyio_c.py
|
||||
index 45fe95d89..b1e144d9d 100644
|
||||
--- a/python/test/segyio_c.py
|
||||
+++ b/python/test/segyio_c.py
|
||||
@@ -540,10 +540,10 @@ def read_line(f, metrics, iline_idx, xline_idx):
|
||||
buf = numpy.zeros((len(iline_idx), samples), dtype=numpy.single)
|
||||
|
||||
f.getline(xline_trace0, len(iline_idx), xline_stride, offsets, buf)
|
||||
- assert sum(sum(buf)) == approx(800.061169624, abs=1e-6)
|
||||
+ assert sum(sum(buf), numpy.double(0)) == approx(800.061169624, abs=1e-6)
|
||||
|
||||
f.getline(iline_trace0, len(xline_idx), iline_stride, offsets, buf)
|
||||
- assert sum(sum(buf)) == approx(305.061146736, abs=1e-6)
|
||||
+ assert sum(sum(buf), numpy.double(0)) == approx(305.061146736, abs=1e-6)
|
||||
|
||||
f.close()
|
||||
|
@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "smhi-pkg";
|
||||
version = "1.0.18";
|
||||
version = "1.0.19";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joysoftware";
|
||||
repo = "pypi_smhi";
|
||||
tag = version;
|
||||
hash = "sha256-ygjlUEQpyHjIO1QLB+MrijWQr84v3v+RdlcRwi9H/cs=";
|
||||
hash = "sha256-8jx2lDBXflnt/Ou+7rnetPEnvpsJ72OWenw8lct+u3M=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ aiohttp ];
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user