Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -9468,6 +9468,12 @@
|
||||
githubId = 49935860;
|
||||
name = "Henri Rosten";
|
||||
};
|
||||
henrispriet = {
|
||||
email = "henri.spriet@gmail.com";
|
||||
github = "henrispriet";
|
||||
githubId = 36509362;
|
||||
name = "Henri Spriet";
|
||||
};
|
||||
henrytill = {
|
||||
email = "henrytill@gmail.com";
|
||||
github = "henrytill";
|
||||
@@ -16516,6 +16522,13 @@
|
||||
githubId = 56316606;
|
||||
name = "Amneesh Singh";
|
||||
};
|
||||
naufik = {
|
||||
email = "naufal@naufik.net";
|
||||
github = "naufik";
|
||||
githubId = 8577904;
|
||||
name = "Naufal Fikri";
|
||||
keys = [ { fingerprint = "1575 D651 E31EC 6117A CF0AA C1A3B 8BBC A515 8835"; } ];
|
||||
};
|
||||
naxdy = {
|
||||
name = "Naxdy";
|
||||
email = "naxdy@naxdy.org";
|
||||
|
||||
@@ -48,7 +48,7 @@ let
|
||||
};
|
||||
|
||||
repartConfig = lib.mkOption {
|
||||
type = with lib.types; attrsOf (oneOf [ str int bool ]);
|
||||
type = with lib.types; attrsOf (oneOf [ str int bool (listOf str) ]);
|
||||
example = {
|
||||
Type = "home";
|
||||
SizeMinBytes = "512M";
|
||||
@@ -311,7 +311,7 @@ in
|
||||
(lib.mapAttrsToList (_n: v: v.repartConfig.Format or null) cfg.partitions);
|
||||
|
||||
|
||||
format = pkgs.formats.ini { };
|
||||
format = pkgs.formats.ini { listsAsDuplicateKeys = true; };
|
||||
|
||||
definitionsDirectory = utils.systemdUtils.lib.definitions
|
||||
"repart.d"
|
||||
|
||||
@@ -93,11 +93,7 @@ let
|
||||
};
|
||||
} cfg.extraConfig;
|
||||
|
||||
configFile = pkgs.runCommandLocal "config.toml" { } ''
|
||||
${pkgs.buildPackages.remarshal}/bin/remarshal -if json -of toml \
|
||||
< ${pkgs.writeText "config.json" (builtins.toJSON configOptions)} \
|
||||
> $out
|
||||
'';
|
||||
configFile = (pkgs.formats.toml {}).generate "config.toml" configOptions;
|
||||
in
|
||||
{
|
||||
|
||||
|
||||
@@ -140,12 +140,10 @@ let
|
||||
}
|
||||
);
|
||||
|
||||
configFile = pkgs.runCommandLocal "config.toml" { } ''
|
||||
${pkgs.buildPackages.jq}/bin/jq 'del(..|nulls)' \
|
||||
< ${pkgs.writeText "config.json" (builtins.toJSON athensConfig)} | \
|
||||
${pkgs.buildPackages.remarshal}/bin/remarshal -if json -of toml \
|
||||
> $out
|
||||
'';
|
||||
configFile = lib.pipe athensConfig [
|
||||
(lib.filterAttrsRecursive (_k: v: v != null))
|
||||
((pkgs.formats.toml {}).generate "config.toml")
|
||||
];
|
||||
in
|
||||
{
|
||||
meta = {
|
||||
|
||||
@@ -2,9 +2,11 @@
|
||||
let
|
||||
cfg = config.services.promtail;
|
||||
|
||||
prettyJSON = conf: pkgs.runCommandLocal "promtail-config.json" {} ''
|
||||
echo '${builtins.toJSON conf}' | ${pkgs.buildPackages.jq}/bin/jq 'del(._module)' > $out
|
||||
'';
|
||||
format = pkgs.formats.json {};
|
||||
prettyJSON = conf: with lib; pipe conf [
|
||||
(flip removeAttrs [ "_module" ])
|
||||
(format.generate "promtail-config.json")
|
||||
];
|
||||
|
||||
allowSystemdJournal = cfg.configuration ? scrape_configs && lib.any (v: v ? journal) cfg.configuration.scrape_configs;
|
||||
|
||||
@@ -20,7 +22,7 @@ in {
|
||||
enable = mkEnableOption "the Promtail ingresser";
|
||||
|
||||
configuration = mkOption {
|
||||
type = (pkgs.formats.json {}).type;
|
||||
type = format.type;
|
||||
description = ''
|
||||
Specify the configuration for Promtail in Nix.
|
||||
This option will be ignored if `services.promtail.configFile` is defined.
|
||||
|
||||
@@ -69,7 +69,7 @@ in
|
||||
validateSettings = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = "Weither to run renovate's config validator on the built configuration.";
|
||||
description = "Whether to run renovate's config validator on the built configuration.";
|
||||
};
|
||||
settings = mkOption {
|
||||
type = json.type;
|
||||
|
||||
@@ -28,7 +28,7 @@ let
|
||||
cfg = config.services.thanos;
|
||||
|
||||
nullOpt = type: description: mkOption {
|
||||
type = types.nullOr type;
|
||||
type = if type.check null then type else types.nullOr type;
|
||||
default = null;
|
||||
description = description;
|
||||
};
|
||||
@@ -85,11 +85,7 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
toYAML = name: attrs: pkgs.runCommand name {
|
||||
preferLocalBuild = true;
|
||||
json = builtins.toFile "${name}.json" (builtins.toJSON attrs);
|
||||
nativeBuildInputs = [ pkgs.remarshal ];
|
||||
} "json2yaml -i $json -o $out";
|
||||
format = pkgs.formats.yaml {};
|
||||
|
||||
thanos = cmd: "${cfg.package}/bin/thanos ${cmd}" +
|
||||
(let args = cfg.${cmd}.arguments;
|
||||
@@ -144,10 +140,10 @@ let
|
||||
option = mkOption {
|
||||
type = with types; nullOr str;
|
||||
default = if cfg.tracing.config == null then null
|
||||
else toString (toYAML "tracing.yaml" cfg.tracing.config);
|
||||
else toString (format.generate "tracing.yaml" cfg.tracing.config);
|
||||
defaultText = literalExpression ''
|
||||
if config.services.thanos.<cmd>.tracing.config == null then null
|
||||
else toString (toYAML "tracing.yaml" config.services.thanos.<cmd>.tracing.config);
|
||||
else toString (format.generate "tracing.yaml" config.services.thanos.<cmd>.tracing.config);
|
||||
'';
|
||||
description = ''
|
||||
Path to YAML file that contains tracing configuration.
|
||||
@@ -160,7 +156,7 @@ let
|
||||
tracing.config =
|
||||
{
|
||||
toArgs = _opt: _attrs: [];
|
||||
option = nullOpt types.attrs ''
|
||||
option = nullOpt format.type ''
|
||||
Tracing configuration.
|
||||
|
||||
When not `null` the attribute set gets converted to
|
||||
@@ -209,10 +205,10 @@ let
|
||||
option = mkOption {
|
||||
type = with types; nullOr str;
|
||||
default = if cfg.objstore.config == null then null
|
||||
else toString (toYAML "objstore.yaml" cfg.objstore.config);
|
||||
else toString (format.generate "objstore.yaml" cfg.objstore.config);
|
||||
defaultText = literalExpression ''
|
||||
if config.services.thanos.<cmd>.objstore.config == null then null
|
||||
else toString (toYAML "objstore.yaml" config.services.thanos.<cmd>.objstore.config);
|
||||
else toString (format.generate "objstore.yaml" config.services.thanos.<cmd>.objstore.config);
|
||||
'';
|
||||
description = ''
|
||||
Path to YAML file that contains object store configuration.
|
||||
@@ -225,7 +221,7 @@ let
|
||||
objstore.config =
|
||||
{
|
||||
toArgs = _opt: _attrs: [];
|
||||
option = nullOpt types.attrs ''
|
||||
option = nullOpt format.type ''
|
||||
Object store configuration.
|
||||
|
||||
When not `null` the attribute set gets converted to
|
||||
|
||||
@@ -4,25 +4,8 @@ let
|
||||
cfg = cfgs.ncdns;
|
||||
|
||||
dataDir = "/var/lib/ncdns";
|
||||
username = "ncdns";
|
||||
|
||||
valueType = with lib.types; oneOf [ int str bool path ]
|
||||
// { description = "setting type (integer, string, bool or path)"; };
|
||||
|
||||
configType = with lib.types; attrsOf (nullOr (either valueType configType))
|
||||
// { description = ''
|
||||
ncdns.conf configuration type. The format consists of an
|
||||
attribute set of settings. Each setting can be either `null`,
|
||||
a value or an attribute set. The allowed values are integers,
|
||||
strings, booleans or paths.
|
||||
'';
|
||||
};
|
||||
|
||||
configFile = pkgs.runCommand "ncdns.conf"
|
||||
{ json = builtins.toJSON cfg.settings;
|
||||
passAsFile = [ "json" ];
|
||||
}
|
||||
"${pkgs.remarshal}/bin/json2toml < $jsonPath > $out";
|
||||
format = pkgs.formats.toml {};
|
||||
|
||||
defaultFiles = {
|
||||
public = "${dataDir}/bit.key";
|
||||
@@ -35,7 +18,7 @@ let
|
||||
needsKeygen = lib.all lib.id (lib.flip lib.mapAttrsToList cfg.dnssec.keys
|
||||
(n: v: v == lib.getAttr n defaultFiles));
|
||||
|
||||
mkDefaultAttrs = lib.mapAttrs (n: v: lib.mkDefault v);
|
||||
mkDefaultAttrs = lib.mapAttrs (_n: v: lib.mkDefault v);
|
||||
|
||||
in
|
||||
|
||||
@@ -160,7 +143,7 @@ in
|
||||
};
|
||||
|
||||
settings = lib.mkOption {
|
||||
type = configType;
|
||||
type = format.type;
|
||||
default = { };
|
||||
example = lib.literalExpression ''
|
||||
{ # enable webserver
|
||||
@@ -257,7 +240,7 @@ in
|
||||
User = "ncdns";
|
||||
StateDirectory = "ncdns";
|
||||
Restart = "on-failure";
|
||||
ExecStart = "${pkgs.ncdns}/bin/ncdns -conf=${configFile}";
|
||||
ExecStart = "${pkgs.ncdns}/bin/ncdns -conf=${format.generate "ncdns.conf" cfg.settings}";
|
||||
};
|
||||
|
||||
preStart = lib.optionalString (cfg.dnssec.enable && needsKeygen) ''
|
||||
|
||||
@@ -95,7 +95,7 @@ let
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
description = "Akkoma frontend package.";
|
||||
example = literalExpression "pkgs.akkoma-frontends.akkoma-fe";
|
||||
example = literalExpression "pkgs.akkoma-fe";
|
||||
};
|
||||
|
||||
name = mkOption {
|
||||
@@ -520,12 +520,12 @@ in {
|
||||
type = with types; attrsOf (submodule frontend);
|
||||
default = {
|
||||
primary = {
|
||||
package = pkgs.akkoma-frontends.akkoma-fe;
|
||||
package = pkgs.akkoma-fe;
|
||||
name = "akkoma-fe";
|
||||
ref = "stable";
|
||||
};
|
||||
admin = {
|
||||
package = pkgs.akkoma-frontends.admin-fe;
|
||||
package = pkgs.akkoma-admin-fe;
|
||||
name = "admin-fe";
|
||||
ref = "stable";
|
||||
};
|
||||
@@ -533,12 +533,12 @@ in {
|
||||
defaultText = literalExpression ''
|
||||
{
|
||||
primary = {
|
||||
package = pkgs.akkoma-frontends.akkoma-fe;
|
||||
package = pkgs.akkoma-fe;
|
||||
name = "akkoma-fe";
|
||||
ref = "stable";
|
||||
};
|
||||
admin = {
|
||||
package = pkgs.akkoma-frontends.admin-fe;
|
||||
package = pkgs.akkoma-admin-fe;
|
||||
name = "admin-fe";
|
||||
ref = "stable";
|
||||
};
|
||||
@@ -557,7 +557,7 @@ in {
|
||||
default = null;
|
||||
example = literalExpression ''
|
||||
{
|
||||
"emoji/blobs.gg" = pkgs.akkoma-emoji.blobs_gg;
|
||||
"emoji/blobs.gg" = pkgs.blobs_gg;
|
||||
"static/terms-of-service.html" = pkgs.writeText "terms-of-service.html" '''
|
||||
…
|
||||
''';
|
||||
|
||||
@@ -4,48 +4,18 @@ with lib;
|
||||
|
||||
let
|
||||
cfg = config.services.traefik;
|
||||
jsonValue = with types;
|
||||
let
|
||||
valueType = nullOr (oneOf [
|
||||
bool
|
||||
int
|
||||
float
|
||||
str
|
||||
(lazyAttrsOf valueType)
|
||||
(listOf valueType)
|
||||
]) // {
|
||||
description = "JSON value";
|
||||
emptyValue.value = { };
|
||||
};
|
||||
in valueType;
|
||||
|
||||
format = pkgs.formats.toml {};
|
||||
|
||||
dynamicConfigFile = if cfg.dynamicConfigFile == null then
|
||||
pkgs.runCommand "config.toml" {
|
||||
buildInputs = [ pkgs.remarshal ];
|
||||
preferLocalBuild = true;
|
||||
} ''
|
||||
remarshal -if json -of toml \
|
||||
< ${
|
||||
pkgs.writeText "dynamic_config.json"
|
||||
(builtins.toJSON cfg.dynamicConfigOptions)
|
||||
} \
|
||||
> $out
|
||||
''
|
||||
format.generate "config.toml" cfg.dynamicConfigOptions
|
||||
else
|
||||
cfg.dynamicConfigFile;
|
||||
|
||||
staticConfigFile = if cfg.staticConfigFile == null then
|
||||
pkgs.runCommand "config.toml" {
|
||||
buildInputs = [ pkgs.yj ];
|
||||
preferLocalBuild = true;
|
||||
} ''
|
||||
yj -jt -i \
|
||||
< ${
|
||||
pkgs.writeText "static_config.json" (builtins.toJSON
|
||||
(recursiveUpdate cfg.staticConfigOptions {
|
||||
providers.file.filename = "${dynamicConfigFile}";
|
||||
}))
|
||||
} \
|
||||
> $out
|
||||
''
|
||||
format.generate "config.toml" (recursiveUpdate cfg.staticConfigOptions {
|
||||
providers.file.filename = "${dynamicConfigFile}";
|
||||
})
|
||||
else
|
||||
cfg.staticConfigFile;
|
||||
|
||||
@@ -71,7 +41,7 @@ in {
|
||||
description = ''
|
||||
Static configuration for Traefik.
|
||||
'';
|
||||
type = jsonValue;
|
||||
type = format.type;
|
||||
default = { entryPoints.http.address = ":80"; };
|
||||
example = {
|
||||
entryPoints.web.address = ":8080";
|
||||
@@ -95,7 +65,7 @@ in {
|
||||
description = ''
|
||||
Dynamic configuration for Traefik.
|
||||
'';
|
||||
type = jsonValue;
|
||||
type = format.type;
|
||||
default = { };
|
||||
example = {
|
||||
http.routers.router1 = {
|
||||
|
||||
@@ -10,7 +10,7 @@ let
|
||||
cfg = config.systemd.repart;
|
||||
initrdCfg = config.boot.initrd.systemd.repart;
|
||||
|
||||
format = pkgs.formats.ini { };
|
||||
format = pkgs.formats.ini { listsAsDuplicateKeys = true; };
|
||||
|
||||
definitionsDirectory = utils.systemdUtils.lib.definitions "repart.d" format (
|
||||
lib.mapAttrs (_n: v: { Partition = v; }) cfg.partitions
|
||||
@@ -93,6 +93,7 @@ in
|
||||
str
|
||||
int
|
||||
bool
|
||||
(listOf str)
|
||||
])
|
||||
);
|
||||
default = { };
|
||||
|
||||
@@ -363,7 +363,7 @@ in
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = ''
|
||||
Weither to configure OpenSSH to use the [SSH Proxy](https://libvirt.org/ssh-proxy.html).
|
||||
Whether to configure OpenSSH to use the [SSH Proxy](https://libvirt.org/ssh-proxy.html).
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -61,12 +61,12 @@
|
||||
};
|
||||
asm = buildGrammar {
|
||||
language = "asm";
|
||||
version = "0.0.0+rev=5bb5b03";
|
||||
version = "0.0.0+rev=04962e1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "RubixDev";
|
||||
repo = "tree-sitter-asm";
|
||||
rev = "5bb5b03e3c1ce5853b5282b9fba060f7c7bbf11e";
|
||||
hash = "sha256-JUJm83iqjjIT1eoribBO9D29ETanR/MIkLjDrXjuvEQ=";
|
||||
rev = "04962e15f6b464cf1d75eada59506dc25090e186";
|
||||
hash = "sha256-a/wbmJQFddf+19E2uHmObQ5XfUkF5iaCSI1Y8avntGw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/RubixDev/tree-sitter-asm";
|
||||
};
|
||||
@@ -169,6 +169,17 @@
|
||||
};
|
||||
meta.homepage = "https://github.com/amaanq/tree-sitter-bitbake";
|
||||
};
|
||||
blade = buildGrammar {
|
||||
language = "blade";
|
||||
version = "0.0.0+rev=bcdc4b0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "EmranMR";
|
||||
repo = "tree-sitter-blade";
|
||||
rev = "bcdc4b01827cac21205f7453e9be02f906943128";
|
||||
hash = "sha256-Svco/cweC311fUlKi34sh0AWfP/VYRWJMXyAuUVRhAw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/EmranMR/tree-sitter-blade";
|
||||
};
|
||||
blueprint = buildGrammar {
|
||||
language = "blueprint";
|
||||
version = "0.0.0+rev=60ba737";
|
||||
@@ -270,12 +281,12 @@
|
||||
};
|
||||
cmake = buildGrammar {
|
||||
language = "cmake";
|
||||
version = "0.0.0+rev=cd00bbc";
|
||||
version = "0.0.0+rev=fe48221";
|
||||
src = fetchFromGitHub {
|
||||
owner = "uyha";
|
||||
repo = "tree-sitter-cmake";
|
||||
rev = "cd00bbcb77fe31283ca79b0038387ec7411759ae";
|
||||
hash = "sha256-Lz2K+/GvmNsQAm1g4TCDdHs+Vebu8fERzTvlVAsA40U=";
|
||||
rev = "fe48221d4d9842d916d66b5e71ab3c6307ec28b3";
|
||||
hash = "sha256-lU6EU+ikUJ1Q/SzJ2/PzziRLO8PSS3oQ8hCANO4n8Tw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/uyha/tree-sitter-cmake";
|
||||
};
|
||||
@@ -658,12 +669,12 @@
|
||||
};
|
||||
erlang = buildGrammar {
|
||||
language = "erlang";
|
||||
version = "0.0.0+rev=370cea6";
|
||||
version = "0.0.0+rev=364e323";
|
||||
src = fetchFromGitHub {
|
||||
owner = "WhatsApp";
|
||||
repo = "tree-sitter-erlang";
|
||||
rev = "370cea629eb62a8686504b9fb3252a5e1ae55313";
|
||||
hash = "sha256-BBm5lK9dqMr4ghM7Ii+qy4Nncr2eZq8nuk1WmyUILgY=";
|
||||
rev = "364e323b32d098ad0e7b29e7adb4005c2bb5cf34";
|
||||
hash = "sha256-mMaJCF+xLIN3x+4PWspdJdKWDRbnSWSKH5v0jJ/fs50=";
|
||||
};
|
||||
meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang";
|
||||
};
|
||||
@@ -890,12 +901,12 @@
|
||||
};
|
||||
gitcommit = buildGrammar {
|
||||
language = "gitcommit";
|
||||
version = "0.0.0+rev=db0e0c4";
|
||||
version = "0.0.0+rev=a716678";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gbprod";
|
||||
repo = "tree-sitter-gitcommit";
|
||||
rev = "db0e0c4fb9095fdc42a7af34019c0616c071e9eb";
|
||||
hash = "sha256-rMLYEU4WdCInfNNAOuESCceavgWTy9NS8kgkTRaK1OE=";
|
||||
rev = "a716678c0f00645fed1e6f1d0eb221481dbd6f6d";
|
||||
hash = "sha256-KYfcs99p03b0RiPYnZeKJf677fmVf658FLZcFk2v2Ws=";
|
||||
};
|
||||
meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit";
|
||||
};
|
||||
@@ -1331,12 +1342,12 @@
|
||||
};
|
||||
ini = buildGrammar {
|
||||
language = "ini";
|
||||
version = "0.0.0+rev=962568c";
|
||||
version = "0.0.0+rev=32b3186";
|
||||
src = fetchFromGitHub {
|
||||
owner = "justinmk";
|
||||
repo = "tree-sitter-ini";
|
||||
rev = "962568c9efa71d25720ab42c5d36e222626ef3a6";
|
||||
hash = "sha256-G11Aynq2rnkRwdkhspjYqtBD/h5k4aD+NvuE0QfploU=";
|
||||
rev = "32b31863f222bf22eb43b07d4e9be8017e36fb31";
|
||||
hash = "sha256-kWCaOIC81GP5EHCqzPZP9EUgYy39CZ6/8TVS6soB6Wo=";
|
||||
};
|
||||
meta.homepage = "https://github.com/justinmk/tree-sitter-ini";
|
||||
};
|
||||
@@ -1408,24 +1419,24 @@
|
||||
};
|
||||
jinja = buildGrammar {
|
||||
language = "jinja";
|
||||
version = "0.0.0+rev=07a62ad";
|
||||
version = "0.0.0+rev=9af6ce9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cathaysia";
|
||||
repo = "tree-sitter-jinja";
|
||||
rev = "07a62adf99c0f41e0cab7ab523541309a8d73dc4";
|
||||
hash = "sha256-6m6WTOWEl9r343vNDfEsVp4ofK/+06mRm72yETt/I1k=";
|
||||
rev = "9af6ce9380fabd3d5b19d0254b8c8936e879c471";
|
||||
hash = "sha256-9powNKoE5JpB+5vVtZLE5falMiS6I/ZXp4NrqabiWLs=";
|
||||
};
|
||||
location = "tree-sitter-jinja";
|
||||
meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja";
|
||||
};
|
||||
jinja_inline = buildGrammar {
|
||||
language = "jinja_inline";
|
||||
version = "0.0.0+rev=07a62ad";
|
||||
version = "0.0.0+rev=9af6ce9";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cathaysia";
|
||||
repo = "tree-sitter-jinja";
|
||||
rev = "07a62adf99c0f41e0cab7ab523541309a8d73dc4";
|
||||
hash = "sha256-6m6WTOWEl9r343vNDfEsVp4ofK/+06mRm72yETt/I1k=";
|
||||
rev = "9af6ce9380fabd3d5b19d0254b8c8936e879c471";
|
||||
hash = "sha256-9powNKoE5JpB+5vVtZLE5falMiS6I/ZXp4NrqabiWLs=";
|
||||
};
|
||||
location = "tree-sitter-jinja_inline";
|
||||
meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja";
|
||||
@@ -1642,12 +1653,12 @@
|
||||
};
|
||||
liquid = buildGrammar {
|
||||
language = "liquid";
|
||||
version = "0.0.0+rev=6e03a05";
|
||||
version = "0.0.0+rev=d269f4d";
|
||||
src = fetchFromGitHub {
|
||||
owner = "hankthetank27";
|
||||
repo = "tree-sitter-liquid";
|
||||
rev = "6e03a054a71cd419d9702725243137641e97ba51";
|
||||
hash = "sha256-KDbI8jmSeXm1T3WGoZ60IFWK8xaJwmU2Ofnr/khKz+U=";
|
||||
rev = "d269f4d52cd08f6cbc6636ee23cc30a9f6c32e42";
|
||||
hash = "sha256-vOQirMsR+UqUyC7yJfuFynXEorkkUYjAB4C08Wf+zE4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/hankthetank27/tree-sitter-liquid";
|
||||
};
|
||||
@@ -1798,12 +1809,12 @@
|
||||
};
|
||||
meson = buildGrammar {
|
||||
language = "meson";
|
||||
version = "0.0.0+rev=742a21e";
|
||||
version = "0.0.0+rev=03fd221";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Decodetalkers";
|
||||
repo = "tree-sitter-meson";
|
||||
rev = "742a21e11e914096e0172dad2f0b85e7554c95ff";
|
||||
hash = "sha256-XwGCwwLM6sdLLNAVK8TGc6XMJ3eXFq6Ayk4dj0FmJmQ=";
|
||||
rev = "03fd2216bc52976c9b92ca64b5ec2e1f06408f7e";
|
||||
hash = "sha256-EhpqSS0R8aCqUnmDHtmfwzyMZMsqkGC/6U3zJpjuVAc=";
|
||||
};
|
||||
meta.homepage = "https://github.com/Decodetalkers/tree-sitter-meson";
|
||||
};
|
||||
@@ -1898,12 +1909,12 @@
|
||||
};
|
||||
nix = buildGrammar {
|
||||
language = "nix";
|
||||
version = "0.0.0+rev=48057cf";
|
||||
version = "0.0.0+rev=cfc53fd";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cstrahan";
|
||||
repo = "tree-sitter-nix";
|
||||
rev = "48057cf966641e7a49b09700550751195c34bcb5";
|
||||
hash = "sha256-VZGTHZdTZSKhjycFALHxYmelez6FR2BMqhIVSOv+kLU=";
|
||||
rev = "cfc53fd287d23ab7281440a8526c73542984669b";
|
||||
hash = "sha256-eqqneqZqA73McjPZfy7GbUi4ccmDYC5O++Ezt9+lqi4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/cstrahan/tree-sitter-nix";
|
||||
};
|
||||
@@ -1931,12 +1942,12 @@
|
||||
};
|
||||
nu = buildGrammar {
|
||||
language = "nu";
|
||||
version = "0.0.0+rev=b99dc3b";
|
||||
version = "0.0.0+rev=c10340b";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nushell";
|
||||
repo = "tree-sitter-nu";
|
||||
rev = "b99dc3b7b26337d84f95c0de4dda81077b03e5c7";
|
||||
hash = "sha256-w1zG976wp0PE3SpbZnh0GKS/WiRyXEif7jNjKMwfcvY=";
|
||||
rev = "c10340b5bb3789f69182acf8f34c3d4fc24d2fe1";
|
||||
hash = "sha256-EyaFrO9NE2Ivo8YTXZ6nmC31PB7WFbFdz7AMRw0ooHo=";
|
||||
};
|
||||
meta.homepage = "https://github.com/nushell/tree-sitter-nu";
|
||||
};
|
||||
@@ -1964,24 +1975,24 @@
|
||||
};
|
||||
ocaml = buildGrammar {
|
||||
language = "ocaml";
|
||||
version = "0.0.0+rev=6921a83";
|
||||
version = "0.0.0+rev=91708de";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-ocaml";
|
||||
rev = "6921a831d79d515d64400a9e022cf30e68a2a3dd";
|
||||
hash = "sha256-hD4OOMpwIdUTGPJoQFple5oDdpbXJa+i4x3eaAArSAw=";
|
||||
rev = "91708deb10cb4fe68ab3c50891426b9967dbf35a";
|
||||
hash = "sha256-HFFvg+4HrUJ12/rbXwCvYthx+yXqxa3OlY3j8/GnYFk=";
|
||||
};
|
||||
location = "grammars/ocaml";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
|
||||
};
|
||||
ocaml_interface = buildGrammar {
|
||||
language = "ocaml_interface";
|
||||
version = "0.0.0+rev=6921a83";
|
||||
version = "0.0.0+rev=91708de";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter";
|
||||
repo = "tree-sitter-ocaml";
|
||||
rev = "6921a831d79d515d64400a9e022cf30e68a2a3dd";
|
||||
hash = "sha256-hD4OOMpwIdUTGPJoQFple5oDdpbXJa+i4x3eaAArSAw=";
|
||||
rev = "91708deb10cb4fe68ab3c50891426b9967dbf35a";
|
||||
hash = "sha256-HFFvg+4HrUJ12/rbXwCvYthx+yXqxa3OlY3j8/GnYFk=";
|
||||
};
|
||||
location = "grammars/interface";
|
||||
meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
|
||||
@@ -2522,12 +2533,12 @@
|
||||
};
|
||||
roc = buildGrammar {
|
||||
language = "roc";
|
||||
version = "0.0.0+rev=de0839d";
|
||||
version = "0.0.0+rev=32e20cb";
|
||||
src = fetchFromGitHub {
|
||||
owner = "faldor20";
|
||||
repo = "tree-sitter-roc";
|
||||
rev = "de0839d6c7db2405e827435cf3ac62d22f4bd5e9";
|
||||
hash = "sha256-jB0oljkzNfxvKdDP8zMmD3q/843qANVGHSrzCGIeS2E=";
|
||||
rev = "32e20cb1133a5a189f986c3b5df47ac730fbee3d";
|
||||
hash = "sha256-kBuVTL2elBM398Il6t8WuzUu4MrL9md+NEtVy7EGkdE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/faldor20/tree-sitter-roc";
|
||||
};
|
||||
@@ -2845,12 +2856,12 @@
|
||||
};
|
||||
superhtml = buildGrammar {
|
||||
language = "superhtml";
|
||||
version = "0.0.0+rev=15ff939";
|
||||
version = "0.0.0+rev=91d9284";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kristoff-it";
|
||||
repo = "superhtml";
|
||||
rev = "15ff939100f9d52342445407973f3ce125a8437e";
|
||||
hash = "sha256-fM+zhRvEwjMIq9RtgbMBF9GlybIWdO53ln6qZv+xHJs=";
|
||||
rev = "91d92846e8baaafc8854d2b9d0ac436bc16234db";
|
||||
hash = "sha256-vBquZJOfE4HBsUKIG3o/Wo9s6wMSJ8U77u7e8n2Gc0M=";
|
||||
};
|
||||
location = "tree-sitter-superhtml";
|
||||
meta.homepage = "https://github.com/kristoff-it/superhtml";
|
||||
@@ -2890,12 +2901,12 @@
|
||||
};
|
||||
swift = buildGrammar {
|
||||
language = "swift";
|
||||
version = "0.0.0+rev=42ad8f6";
|
||||
version = "0.0.0+rev=02db52e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "alex-pinkus";
|
||||
repo = "tree-sitter-swift";
|
||||
rev = "42ad8f6b4dc9b46285893cc37b460323b54932d4";
|
||||
hash = "sha256-nxKOyyDXrQAxb/ZmuMKSqesm6SUSbCq+cI+lU0hZwuU=";
|
||||
rev = "02db52e14bc303322d22019fff7823d72904dfe5";
|
||||
hash = "sha256-Uh1YVc871KdYXeAhF/lRDv58NW/XdHqasfZw0jDUSBE=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
|
||||
@@ -2946,12 +2957,12 @@
|
||||
};
|
||||
tact = buildGrammar {
|
||||
language = "tact";
|
||||
version = "0.0.0+rev=83e2649";
|
||||
version = "0.0.0+rev=a19be2d";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tact-lang";
|
||||
repo = "tree-sitter-tact";
|
||||
rev = "83e264928fa194b7283428527259e88e54205264";
|
||||
hash = "sha256-gSLVUjn8MBRDQhZoEsPGao2lZI1gcxJsg6d8suA4D50=";
|
||||
rev = "a19be2d4c1956e12facfc717e28f13a6ad0860e0";
|
||||
hash = "sha256-TBleyQmrHbKQJKftg2VcLstYIteuPbKuCct4ImmMtcU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tact-lang/tree-sitter-tact";
|
||||
};
|
||||
@@ -2989,6 +3000,17 @@
|
||||
};
|
||||
meta.homepage = "https://github.com/vrischmann/tree-sitter-templ";
|
||||
};
|
||||
tera = buildGrammar {
|
||||
language = "tera";
|
||||
version = "0.0.0+rev=482b475";
|
||||
src = fetchFromGitHub {
|
||||
owner = "uncenter";
|
||||
repo = "tree-sitter-tera";
|
||||
rev = "482b475b32e6bae67f9d57abc60545399fd9b0a3";
|
||||
hash = "sha256-ndauBItrpUTIVjt5Sm0+jUjQtuAcHwLVdmw6IwcNXII=";
|
||||
};
|
||||
meta.homepage = "https://github.com/uncenter/tree-sitter-tera";
|
||||
};
|
||||
terraform = buildGrammar {
|
||||
language = "terraform";
|
||||
version = "0.0.0+rev=9e3ec98";
|
||||
@@ -3025,12 +3047,12 @@
|
||||
};
|
||||
tiger = buildGrammar {
|
||||
language = "tiger";
|
||||
version = "0.0.0+rev=a7f11d9";
|
||||
version = "0.0.0+rev=4a77b2d";
|
||||
src = fetchFromGitHub {
|
||||
owner = "ambroisie";
|
||||
repo = "tree-sitter-tiger";
|
||||
rev = "a7f11d946b44244f71df41d2a78af0665d618dae";
|
||||
hash = "sha256-zGrbf5cCkgKGw+dQiEqUyHqj8Fu42MfAhEEADoC8DIA=";
|
||||
rev = "4a77b2d7a004587646bddc4e854779044b6db459";
|
||||
hash = "sha256-jLdJ3nLShoBxVCcUbnaswYG5d4UU8aaE1xexb2LnmTQ=";
|
||||
};
|
||||
meta.homepage = "https://github.com/ambroisie/tree-sitter-tiger";
|
||||
};
|
||||
@@ -3149,12 +3171,12 @@
|
||||
};
|
||||
typoscript = buildGrammar {
|
||||
language = "typoscript";
|
||||
version = "0.0.0+rev=43b221c";
|
||||
version = "0.0.0+rev=5d8fde8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Teddytrombone";
|
||||
repo = "tree-sitter-typoscript";
|
||||
rev = "43b221c0b76e77244efdaa9963e402a17c930fbc";
|
||||
hash = "sha256-7ottrupSWC83rDP59yceDG/TuikNHoyCBnAlns/x6Tc=";
|
||||
rev = "5d8fde870b0ded1f429ba5bb249a9d9f8589ff5f";
|
||||
hash = "sha256-GysGb879dk5e1U6OO26q1gVAhkWxc/GRpkNN785ZoQw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/Teddytrombone/tree-sitter-typoscript";
|
||||
};
|
||||
@@ -3227,12 +3249,12 @@
|
||||
};
|
||||
v = buildGrammar {
|
||||
language = "v";
|
||||
version = "0.0.0+rev=532bebd";
|
||||
version = "0.0.0+rev=26c2c4c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "v-analyzer";
|
||||
rev = "532bebd50742ef15949bdd67c36d46697c847628";
|
||||
hash = "sha256-lBrX5n4hYdDq+2m7j9JXyeGGS3yl4oBu8jK7VV+OE7I=";
|
||||
rev = "26c2c4c2b3fb4f7a07ae78d298b36998b7ffa956";
|
||||
hash = "sha256-sKD4CoClychNS5B6JmnGCPLiNxWbOLt0t2PV30mvjoI=";
|
||||
};
|
||||
location = "tree_sitter_v";
|
||||
meta.homepage = "https://github.com/vlang/v-analyzer";
|
||||
@@ -3272,12 +3294,12 @@
|
||||
};
|
||||
vhdl = buildGrammar {
|
||||
language = "vhdl";
|
||||
version = "0.0.0+rev=db1d744";
|
||||
version = "0.0.0+rev=35ed277";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpt13653903";
|
||||
repo = "tree-sitter-vhdl";
|
||||
rev = "db1d7446bd07d811981734cd501fe1994cbad99d";
|
||||
hash = "sha256-0lNyEc6MS+k+vJvegQDI6/nlsx47xwLSro2ZGcaoADM=";
|
||||
rev = "35ed277d3e98836796bc764010dc3fb800d14ee4";
|
||||
hash = "sha256-BuPqRNzsPKaUwXNp10KoZwnW5+/rFQ/11TcY0DpNUuk=";
|
||||
};
|
||||
meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl";
|
||||
};
|
||||
@@ -3471,24 +3493,24 @@
|
||||
};
|
||||
ziggy = buildGrammar {
|
||||
language = "ziggy";
|
||||
version = "0.0.0+rev=af41bdb";
|
||||
version = "0.0.0+rev=00958fa";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kristoff-it";
|
||||
repo = "ziggy";
|
||||
rev = "af41bdb5b1d64404c2ec7eb1d9de01083c0d2596";
|
||||
hash = "sha256-crL9qmSq2XzaYdjinXQ2frZ8GHArRGlU1EId8dFwVGs=";
|
||||
rev = "00958faeaeb97d9b7beb76f128a5401441182204";
|
||||
hash = "sha256-G1Wo3Az5qQdSQU5OXE5GaahgXFjuj43o3UfmUXjjSF4=";
|
||||
};
|
||||
location = "tree-sitter-ziggy";
|
||||
meta.homepage = "https://github.com/kristoff-it/ziggy";
|
||||
};
|
||||
ziggy_schema = buildGrammar {
|
||||
language = "ziggy_schema";
|
||||
version = "0.0.0+rev=af41bdb";
|
||||
version = "0.0.0+rev=00958fa";
|
||||
src = fetchFromGitHub {
|
||||
owner = "kristoff-it";
|
||||
repo = "ziggy";
|
||||
rev = "af41bdb5b1d64404c2ec7eb1d9de01083c0d2596";
|
||||
hash = "sha256-crL9qmSq2XzaYdjinXQ2frZ8GHArRGlU1EId8dFwVGs=";
|
||||
rev = "00958faeaeb97d9b7beb76f128a5401441182204";
|
||||
hash = "sha256-G1Wo3Az5qQdSQU5OXE5GaahgXFjuj43o3UfmUXjjSF4=";
|
||||
};
|
||||
location = "tree-sitter-ziggy-schema";
|
||||
meta.homepage = "https://github.com/kristoff-it/ziggy";
|
||||
|
||||
@@ -883,6 +883,7 @@ https://github.com/drewtempelmeyer/palenight.vim/,,
|
||||
https://github.com/JoosepAlviste/palenightfall.nvim/,,
|
||||
https://github.com/roobert/palette.nvim/,HEAD,
|
||||
https://github.com/NLKNguyen/papercolor-theme/,,
|
||||
https://github.com/pappasam/papercolor-theme-slim/,HEAD,
|
||||
https://github.com/dundalek/parpar.nvim/,,
|
||||
https://github.com/tmsvg/pear-tree/,,
|
||||
https://github.com/steelsojka/pears.nvim/,,
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "klayout";
|
||||
version = "0.29.11";
|
||||
version = "0.29.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KLayout";
|
||||
repo = "klayout";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MIXuqDnK8kXjQOSTALVPQHIE1eMk1Dl1M+/GMbw92bg=";
|
||||
hash = "sha256-TLLAIlZYKGeQENtzfc9ilWwl4yu2ln7yBy+VW7Zwexc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -516,13 +516,13 @@
|
||||
"vendorHash": "sha256-UzoyVVBSrpxQnTfTJvGHIGR0wSFx8cSVVuTpo9tio2A="
|
||||
},
|
||||
"google-beta": {
|
||||
"hash": "sha256-bxL3ufwXuioA73my5G89YSbvhHSz/DjzNbN3CfxarF8=",
|
||||
"hash": "sha256-1lrov28rU1K4QEiTuRqzaTLMzL+sZVsOLfgj3KNNJsw=",
|
||||
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
|
||||
"owner": "hashicorp",
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v6.23.0",
|
||||
"rev": "v6.25.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-lPjjaFKYLI4JoYGzhw9GcXl0z/zb22nzqIP+tMeAGOc="
|
||||
"vendorHash": "sha256-Vr6nFT+MDC8MNZU7zqH0aeQUCUIR338QYGGKPb1GSW0="
|
||||
},
|
||||
"googleworkspace": {
|
||||
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
|
||||
|
||||
@@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qtox";
|
||||
version = "1.18.2";
|
||||
version = "1.18.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TokTok";
|
||||
repo = "qTox";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-NPJ1tBIcM4zR5izsoiydUO2+cEuWOdWAf2xte7bwOxg=";
|
||||
hash = "sha256-5pH39NsJdt4+ldlbpkvA0n/X/LkEUEv4UL1K/W3BqmM=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "0-unstable-2025-02-20";
|
||||
version = "0-unstable-2025-03-03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "4e4d99df2080535cf4838319a8b3526425ba7bb7";
|
||||
hash = "sha256-zM890w0GgtW++mAhze73GaCThx7WhyucrC24yDZYq0k=";
|
||||
rev = "a09352dabf6c491eed411bca5e613ba58142debc";
|
||||
hash = "sha256-3lO8bsdluj24EMikvSQ7qOciHmIlKVxR3GWAG/SfUFM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "obs-teleport";
|
||||
version = "0.7.3";
|
||||
version = "0.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fzwoch";
|
||||
repo = "obs-teleport";
|
||||
rev = version;
|
||||
sha256 = "sha256-daDP4WElVu2nyqS1zMHpzSunVq6X3d4t/CQg5r6v2+E=";
|
||||
sha256 = "sha256-mHHPlmUyR9NDdQHqw1YNgThGl/8DH/aiCE9rdZhrIK4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bXBkv/nQv6UYSzPat6PcykU2hRW/UGDvmYrGOwo9I04=";
|
||||
vendorHash = "sha256-U/5smUMpcVEFWB+xMxLKF9E6N7dyh67QoB+Afq5Ga2Q=";
|
||||
|
||||
buildInputs = [
|
||||
libjpeg
|
||||
|
||||
+1
-1
@@ -16,7 +16,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "admin-fe";
|
||||
version = "unstable-2024-04-27";
|
||||
version = "2.3.0-2-unstable-2024-04-27";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "akkoma.dev";
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
beamPackages.mixRelease rec {
|
||||
pname = "akkoma";
|
||||
version = "3.15.1";
|
||||
version = "3.15.2";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "akkoma.dev";
|
||||
owner = "AkkomaGang";
|
||||
repo = "akkoma";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6qsqTguEVu9t6dW8c+VAE5Z7D3FbQ0S2ZfAN5qy7Xak=";
|
||||
hash = "sha256-GW86OyO/XPIrCS+cPKQ8LG8PdhhfA2rNH1FXFiuL6vM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@@ -26,7 +26,7 @@ beamPackages.mixRelease rec {
|
||||
mixFodDeps = beamPackages.fetchMixDeps {
|
||||
pname = "mix-deps-${pname}";
|
||||
inherit src version;
|
||||
hash = "sha256-nWtY5eohP9pv/vS9FuCh2nlPxLJ2Y4IRmve5in328DU=";
|
||||
hash = "sha256-ygRj0s9J2/nBXR5s9CE7eMRBxsRhKlV/IZrkwPpco14=";
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace "$out/http_signatures/mix.exs" \
|
||||
@@ -77,6 +77,7 @@ beamPackages.mixRelease rec {
|
||||
meta = {
|
||||
description = "ActivityPub microblogging server";
|
||||
homepage = "https://akkoma.social";
|
||||
changelog = "https://akkoma.dev/AkkomaGang/akkoma/releases/tag/v${version}";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = with lib.maintainers; [ mvs ];
|
||||
platforms = lib.platforms.unix;
|
||||
@@ -40,18 +40,18 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "alvr";
|
||||
version = "20.12.1";
|
||||
version = "20.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alvr-org";
|
||||
repo = "ALVR";
|
||||
tag = "v${version}";
|
||||
fetchSubmodules = true; #TODO devendor openvr
|
||||
hash = "sha256-T7KyGZwnJ9t4Bh8KFy190IV3igWCG+yn+OW9a6mgmYI=";
|
||||
hash = "sha256-h7/fuuolxbNkjUbqXZ7NTb1AEaDMFaGv/S05faO2HIc=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-DE88nMC6qpbPJsBpdyITv6igMgwy4g40VCgFQQuRRTA=";
|
||||
cargoHash = "sha256-A0ADPMhsREH1C/xpSxW4W2u4ziDrKRrQyY5kBDn//gQ=";
|
||||
|
||||
patches = [
|
||||
(replaceVars ./fix-finding-libs.patch {
|
||||
@@ -142,7 +142,10 @@ rustPlatform.buildRustPackage rec {
|
||||
changelog = "https://github.com/alvr-org/ALVR/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
mainProgram = "alvr_dashboard";
|
||||
maintainers = with maintainers; [ passivelemon ];
|
||||
maintainers = with maintainers; [
|
||||
luNeder
|
||||
jopejoe1
|
||||
];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -11,14 +11,18 @@ let
|
||||
p = python3.pkgs;
|
||||
self = p.buildPythonApplication rec {
|
||||
pname = "backgroundremover";
|
||||
version = "0.2.8";
|
||||
version = "0.2.9";
|
||||
pyproject = true;
|
||||
|
||||
build-system = [
|
||||
p.setuptools
|
||||
];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nadermx";
|
||||
repo = "backgroundremover";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-LjVT4j0OzfbVSQgU0z/gzRTLm7N0RQRrfxtTugWwOxs=";
|
||||
hash = "sha256-tQ8J3xamOzPPSbFMxIDYKv1TzK1AVwF/DWXdZlrlYvM=";
|
||||
};
|
||||
|
||||
models = runCommand "background-remover-models" { } ''
|
||||
@@ -29,21 +33,21 @@ let
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
rm -rf *dist
|
||||
substituteInPlace backgroundremover/bg.py backgroundremover/u2net/detect.py \
|
||||
--replace-fail 'os.path.expanduser(os.path.join("~", ".u2net", model_name + ".pth"))' "os.path.join(\"$models\", model_name + \".pth\")"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
p.setuptools
|
||||
p.wheel
|
||||
];
|
||||
substituteInPlace backgroundremover/bg.py \
|
||||
--replace-fail 'import moviepy.editor' 'import moviepy'
|
||||
'';
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"pillow"
|
||||
"torchvision"
|
||||
"moviepy"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
p.certifi
|
||||
p.charset-normalizer
|
||||
p.ffmpeg-python
|
||||
@@ -95,13 +99,13 @@ let
|
||||
|
||||
doCheck = false; # no tests
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
mainProgram = "backgroundremover";
|
||||
description = "Command line tool to remove background from image and video, made by nadermx to power";
|
||||
homepage = "https://BackgroundRemoverAI.com";
|
||||
downloadPage = "https://github.com/nadermx/backgroundremover/releases";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.lucasew ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.lucasew ];
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@@ -27,17 +27,17 @@ in
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "bacon";
|
||||
version = "3.11.0";
|
||||
version = "3.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Canop";
|
||||
repo = "bacon";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yFU4U1TWoumg61Vs6F5Gqz22VuI2Qs0IRz/TPGBYX4E=";
|
||||
hash = "sha256-M/9QzLRY0QhMSSadjxZArLhcM3S6yjLPdP6R9p/1cL4=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-g8DWFhgguxPked7kCCsmUPXzRqu5DaPopoxORBl4/1o=";
|
||||
cargoHash = "sha256-799hpVUj4RfF2ei19bE/+qOixk5/v7PPuxmmDC0Zkqw=";
|
||||
|
||||
buildFeatures = lib.optionals withSound [
|
||||
"sound"
|
||||
|
||||
@@ -3,24 +3,24 @@
|
||||
|
||||
let
|
||||
pname = "brave";
|
||||
version = "1.76.73";
|
||||
version = "1.76.74";
|
||||
|
||||
allArchives = {
|
||||
aarch64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
|
||||
hash = "sha256-9rpH7A63AJRlHRohSa9Pp6Hdq57LwUCfM9KkvewzXKQ=";
|
||||
hash = "sha256-O8hXKkuw86TeKH4lsyqGdKslrCRbw7mzXfHULCGpgxk=";
|
||||
};
|
||||
x86_64-linux = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
|
||||
hash = "sha256-HkQkIvUdkV4pMdAaO7Oa7pR22UXFtTiH2BAsp2/gLQg=";
|
||||
hash = "sha256-tGf3tjZyzgyojDkgFb/SUvZxdVnYFlx6bPTLeFuTtRI=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
|
||||
hash = "sha256-sgdmvQ7Po5JygHoxCOs2aufL8meHP27lyW8omyl5BY8=";
|
||||
hash = "sha256-l9Ufg9w5P0TIl4gXMJ+JK83x+5QZL0i9+k9X05Llwr4=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
|
||||
hash = "sha256-auGpQicHJLJpEeVS0tIkvqjbzAfrn6h7vDgeERqT5kk=";
|
||||
hash = "sha256-MH/WT/eUWaJXWln4uiXN1BD+K0jVoX7xqsKZGXQ/BmI=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -9,20 +9,20 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2025.1.3";
|
||||
version = "2025.1.4";
|
||||
|
||||
product =
|
||||
if proEdition then
|
||||
{
|
||||
productName = "pro";
|
||||
productDesktop = "Burp Suite Professional Edition";
|
||||
hash = "sha256-BlVAQe6KLn9THVJTk+rDZoLeAbIW8IA3rDpS6xPhDLo=";
|
||||
hash = "sha256-NpWqrdUaxPvU4O2MplLTRfnqOB2yC/zQJx7o9stjKCU=";
|
||||
}
|
||||
else
|
||||
{
|
||||
productName = "community";
|
||||
productDesktop = "Burp Suite Community Edition";
|
||||
hash = "sha256-M1T7atQmB0fRmH9NDZ3uyc3rQpqBc2u3WRZO5rDBj+g=";
|
||||
hash = "sha256-jLwI9r1l/bf2R7BOImEnbW3iLgsF+/1n0/N55Jx8Lzw=";
|
||||
};
|
||||
|
||||
src = fetchurl {
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clickhouse-backup";
|
||||
version = "2.6.5";
|
||||
version = "2.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Altinity";
|
||||
repo = "clickhouse-backup";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tRZo2PQYCzryd593MTzrHOzVxM58ONz61A6eekyr1wo=";
|
||||
hash = "sha256-kWJpySeyeEje7tntnImT7UpOgQMsrfVxIvQ+2/uB6Ko=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-skL0yF0sVj3yza0LseNLfUn3jxPXuOFS/1FfHg0/H7Q=";
|
||||
vendorHash = "sha256-HB9BntvoUNrw23m4T+9p65aWUvQNpz3+ff1ydVqNfQM=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=${version}"
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
bash,
|
||||
docker,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "docker-vackup";
|
||||
version = "0-unstable-2024-11-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BretFisher";
|
||||
repo = "docker-vackup";
|
||||
rev = "2a8a73136302af0bebeb7f210fc14be868ab2958";
|
||||
hash = "sha256-/iMQNnkRNTMiw+E6Wv/WatRB0DnapOVWqqszluUFed4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace vackup --replace-fail "/bin/bash" "${lib.getExe bash}"
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 vackup "$out/bin/vackup"
|
||||
|
||||
wrapProgram "$out/bin/vackup" \
|
||||
--suffix PATH : ${lib.makeBinPath [ docker ]}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Shell script to backup and restore Docker volumes";
|
||||
homepage = "https://github.com/BretFisher/docker-vackup";
|
||||
license = lib.licenses.unlicense;
|
||||
maintainers = with lib.maintainers; [ liberodark ];
|
||||
mainProgram = "vackup";
|
||||
};
|
||||
})
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ecapture";
|
||||
version = "0.9.4";
|
||||
version = "0.9.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gojue";
|
||||
repo = "ecapture";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-94aZBsQG7xVX3mnE3z3bmTM9NUIG0/huov2OVZJmOe4=";
|
||||
hash = "sha256-aubGM7kJMtfCRBeFgISuyXS9CkDwBC9hB3d6VA9mG2E=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "elfcat";
|
||||
version = "0.1.8";
|
||||
version = "0.1.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ruslashev";
|
||||
repo = "elfcat";
|
||||
rev = version;
|
||||
sha256 = "sha256-NzFKNCCPWBj/fhaEJF34nyeyvLMeQwIcQgTlYc6mgYo=";
|
||||
sha256 = "sha256-lmoOwxRGXcInoFb2YDawLKaebkcUftzpPZ1iTXbl++c=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-CwK+xc77QADjQyrCI6NIrZ2A/DgnNfs57p9wdKJQZ4w=";
|
||||
cargoHash = "sha256-3rqxST7dcp/2+B7DiY92C75P0vQyN2KY3DigBEZ1W1w=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "ELF visualizer, generates HTML files from ELF binaries";
|
||||
|
||||
@@ -267,11 +267,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cmakeFlags =
|
||||
[
|
||||
"-DCMAKE_INSTALL_DOCDIR=${placeholder "doc"}/share/doc/fish"
|
||||
"-DRust_CARGO_TARGET=${stdenv.hostPlatform.rust.rustcTarget}"
|
||||
(lib.cmakeFeature "CMAKE_INSTALL_DOCDIR" "${placeholder "doc"}/share/doc/fish")
|
||||
(lib.cmakeFeature "Rust_CARGO_TARGET" stdenv.hostPlatform.rust.rustcTarget)
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"-DMAC_CODESIGN_ID=OFF"
|
||||
(lib.cmakeBool "MAC_CODESIGN_ID" false)
|
||||
];
|
||||
|
||||
# Fish’s test suite needs to be able to look up process information and send signals.
|
||||
@@ -321,6 +321,12 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
preCheck = ''
|
||||
export TERMINFO="${ncurses}/share/terminfo"
|
||||
'';
|
||||
checkFlags = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
|
||||
# thread 'tests::string_escape::test_escape_random_url' panicked at src/tests/string_escape.rs:122:9:
|
||||
# assertion `left == right` failed: Escaped and then unescaped string ... but got back a different string ...
|
||||
# https://github.com/fish-shell/fish-shell/issues/11254
|
||||
"--skip=tests::string_escape::test_escape_random_url"
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
@@ -375,13 +381,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tee -a $out/share/fish/__fish_build_paths.fish < ${fishPreInitHooks}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Smart and user-friendly command line shell";
|
||||
homepage = "https://fishshell.com/";
|
||||
changelog = "https://github.com/fish-shell/fish-shell/releases/tag/${version}";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [
|
||||
changelog = "https://github.com/fish-shell/fish-shell/releases/tag/${finalAttrs.version}";
|
||||
license = lib.licenses.gpl2Only;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [
|
||||
adamcstephens
|
||||
cole-h
|
||||
winter
|
||||
|
||||
@@ -25,13 +25,13 @@ in
|
||||
stdenv'.mkDerivation {
|
||||
pname = "flameshot";
|
||||
# wlr screenshotting is currently only available on unstable version (>12.1.0)
|
||||
version = "12.1.0-unstable-2025-02-12";
|
||||
version = "12.1.0-unstable-2025-03-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "flameshot-org";
|
||||
repo = "flameshot";
|
||||
rev = "7aa69e4e253b0a69b67c018b701db5ee8448142c";
|
||||
hash = "sha256-1OPZsOoe+z7xql1o44BisxF/pWqd5vx2a+Ar0gLerVA=";
|
||||
rev = "1997aed8a332eeb3b468559bf454c5d78b4d2cbb";
|
||||
hash = "sha256-liiL0/H70XfsG2zM7N+GuIdvd6RE29QXYQLExiYCuvc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -8,10 +8,10 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.4.0";
|
||||
srcHash = "sha256-b4mu/iijfALBm+7OIdKgZs55fR6xWfPgL6OMOgIOi3w=";
|
||||
vendorHash = "sha256-rVyirt6+D1qedbTvPZjLog16sMAq+zyFUmbjnJIieRg=";
|
||||
manifestsHash = "sha256-85Ykc6B+DP9PVqwGbvqsQCUHpx/IzIP9TgOt3id7P5g=";
|
||||
version = "2.5.0";
|
||||
srcHash = "sha256-PhApozD/oWmT4PjzDRKBitE23V3KC40o17AwbmzzPdI=";
|
||||
vendorHash = "sha256-J8tgcNRc2m+6wcBM/iRizyOTO7OvKinl4Ojc8InQoKk=";
|
||||
manifestsHash = "sha256-mU0rnbb63ATjf2Q7TzbsQJcbRBUb2QCeC8WKaKmpxOo=";
|
||||
|
||||
manifests = fetchzip {
|
||||
url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
|
||||
|
||||
@@ -19,12 +19,11 @@ buildGoModule rec {
|
||||
|
||||
vendorHash = "sha256-I/umXgVm9a+0Ay3ARuaa4Dua4Zhc5p2TONHvhCt3Qtk=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace health/checks/checks_test.go \
|
||||
--replace-fail \
|
||||
'func TestHTTPChecker(t *testing.T) {' \
|
||||
'func TestHTTPChecker(t *testing.T) { t.Skip("Test requires network connection")'
|
||||
'';
|
||||
checkFlags = [
|
||||
# TestHTTPChecker requires internet
|
||||
# TestS3DriverPathStyle requires s3 credentials/urls
|
||||
"-skip TestHTTPChecker|TestS3DriverPathStyle"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "GitLab Docker toolset to pack, ship, store, and deliver content";
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-chromecast";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vishen";
|
||||
repo = "go-chromecast";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-R1VGgustsKRoVZFiH2wuYRRSOolWIYq33H0DyQXHDvg=";
|
||||
hash = "sha256-6I10UZ7imH1R78L2uM/697PskPYjhKSiPHoMM7EFElU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-EI37KPdNxPXdgmxvawTiRQ516dLxt5o0iYvGcAHXdUw=";
|
||||
vendorHash = "sha256-cu8PuZLkWLatU46VieaeoV5oyejyjR0uVUMVzOrheLM=";
|
||||
|
||||
env.CGO_ENABLED = 0;
|
||||
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGo124Module rec {
|
||||
pname = "golangci-lint";
|
||||
version = "1.64.6";
|
||||
version = "1.64.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golangci";
|
||||
repo = "golangci-lint";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-uJKZRJx+hUCXrLrLq1UcBknRSR/o+R9trfacgg27MLs=";
|
||||
hash = "sha256-nxJ+b491qdtT2pSznYPhKZtLZENsmQj8zYCd3KRSqRc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6vL6lYZcpi9roRa+sFbQPq4Ysd8TM3j40wg68B5VbX0=";
|
||||
vendorHash = "sha256-i7ec4U4xXmRvHbsDiuBjbQ0xP7xRuilky3gi+dT1H10=";
|
||||
|
||||
subPackages = [ "cmd/golangci-lint" ];
|
||||
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
libGLU,
|
||||
libnotify,
|
||||
libX11,
|
||||
lsb-release,
|
||||
nix-update-script,
|
||||
pciutils,
|
||||
polkit,
|
||||
procps,
|
||||
qt6Packages,
|
||||
@@ -26,13 +26,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "goverlay";
|
||||
version = "1.2";
|
||||
version = "1.3-2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "benjamimgois";
|
||||
repo = "goverlay";
|
||||
rev = version;
|
||||
sha256 = "sha256-tSpM+XLlFQLfL750LTNWbWFg1O+0fSfsPRXuRCm/KlY=";
|
||||
sha256 = "sha256-Vxmmsf/l3OK1Q6UKdhCWvU4WPJkdQG2Hn+s9tS+D5KM=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@@ -48,8 +48,10 @@ stdenv.mkDerivation rec {
|
||||
--replace-fail '/usr/share/icons/hicolor/128x128/apps/goverlay.png' "$out/share/icons/hicolor/128x128/apps/goverlay.png" \
|
||||
--replace-fail '/sbin/ip' "${lib.getExe' iproute2 "ip"}" \
|
||||
--replace-fail '/bin/bash' "${lib.getExe' bash "bash"}" \
|
||||
--replace-fail '/usr/lib/os-release' '/etc/os-release' \
|
||||
--replace-fail 'lsb_release' "${lib.getExe' lsb-release "lsb_release"} 2> /dev/null"
|
||||
--replace-fail '/bin/uname' "${lib.getExe' coreutils "uname"}" \
|
||||
--replace-fail '/usr/bin/lspci' "${lib.getExe' pciutils "lspci"}" \
|
||||
--replace-fail "FONTFOLDER := '/usr/share/fonts/'" "FONTFOLDER := GetEnvironmentVariable('HOME') + '/.local/share/fonts/'" \
|
||||
--replace-fail "'/usr/share/fonts/'" 'FONTFOLDER'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grpc_cli";
|
||||
version = "1.70.1";
|
||||
version = "1.71.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc";
|
||||
repo = "grpc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/Mg999SA/19iypjacXrEnX1B08hajyq7sC7yab+eTCk=";
|
||||
hash = "sha256-QKSdMpfl0pdKy/r4z8VKcGN0gsQmx9lBRHlCjaaF5Sg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hck";
|
||||
version = "0.11.1";
|
||||
version = "0.11.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sstadick";
|
||||
repo = "hck";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QodwSirWCMQqimzUEcpH7lnCc2k4WIZiqww+kqI1zoU=";
|
||||
hash = "sha256-XnkLKslZY2nvjO5ZeTIBJ0Y47/JPhfIS/F5KKqm5iwI=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-TxYLfTw/CpU+bFfXYCpRfSk7b/aSNkcUvNaA1EGIFGc=";
|
||||
cargoHash = "sha256-NKyBC/kD2tq61su7tUsSPQ2Rr4YBYUsotL55aCoFNGw=";
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hellwal";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "danihek";
|
||||
repo = "hellwal";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-TrqXInoz6OEtS12YmXUILV41IkZW0B4XAAESiU2yMMU=";
|
||||
hash = "sha256-ei612uqAdEDwodsVDkmI4CGASMzCC/q0+CuNS54B53U=";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
installPhase = ''
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
}:
|
||||
let
|
||||
pname = "heptabase";
|
||||
version = "1.53.1";
|
||||
version = "1.53.4";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
|
||||
hash = "sha256-CRV+ihjaGz+I2CdZVbASGTUbOjSb8TXcrBb8dvR/hDc=";
|
||||
hash = "sha256-dDwz9bn5UZJ3aQYy2SJYKSSaZJzj/B+zRmfwxgsUjBc=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
|
||||
@@ -7,17 +7,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "httm";
|
||||
version = "0.46.2";
|
||||
version = "0.46.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimono-koans";
|
||||
repo = "httm";
|
||||
rev = version;
|
||||
hash = "sha256-KihorfQfHBNUhePnNbjrY+X4j0lOLW3C3bHMZSW57N0=";
|
||||
hash = "sha256-QMw5FrI5GCaUrUPaxqGDBtz7RPcCFQn+jntmyertzhM=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-ierJVMenS/VT23Nd0tsfI3TpPOWMsZOkWTN5PvYwsj4=";
|
||||
cargoHash = "sha256-dIF3Qi8rK+H07x4uhi8uXs1Pdr8p3KIkVUrXqEQpCsc=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
callPackage,
|
||||
crystal,
|
||||
fetchFromGitHub,
|
||||
fetchpatch,
|
||||
librsvg,
|
||||
pkg-config,
|
||||
libxml2,
|
||||
@@ -87,15 +86,6 @@ crystal.buildCrystalPackage rec {
|
||||
sqlite
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Fix proxied video streaming: https://github.com/iv-org/invidious/pull/4992
|
||||
(fetchpatch {
|
||||
name = "invidious-fix-video-proxy.patch";
|
||||
url = "https://github.com/iv-org/invidious/compare/aa33d9b7ec5a41867c256542653ad8465fe22e7f~1...3ac8978e96069e58a02e91fc29bf52b8fc651d5c.patch";
|
||||
hash = "sha256-xENsVRfEE9ACLiniOgGMDfdC0ZtJge1e1Lak2orLJro=";
|
||||
})
|
||||
];
|
||||
|
||||
format = "crystal";
|
||||
shardsFile = ./shards.nix;
|
||||
crystalBinaries.invidious = {
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"invidious": {
|
||||
"hash": "sha256-O5Uv5Qat7Is/0gk0HVi8Hr2UPMLXQw7AwYnjOFaaTP8=",
|
||||
"version": "2.20241110.0",
|
||||
"date": "2024.11.10",
|
||||
"commit": "5d2dd40b"
|
||||
"hash": "sha256-OBD1QBzLPWZUz2PrMbwpjaH4bnirTkbm4HlCK4UZUbE=",
|
||||
"version": "2.20250314.0",
|
||||
"date": "2025.03.14",
|
||||
"commit": "e23d0d1"
|
||||
},
|
||||
"videojs": {
|
||||
"hash": "sha256-jED3zsDkPN8i6GhBBJwnsHujbuwlHdsVpVqa1/pzSH4="
|
||||
"hash": "sha256-jED3zsDkPN8i6GhBBJwnsHujbuwlHdsVpVqa1/pzSH4"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,15 +6,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "jumppad";
|
||||
version = "0.16.1";
|
||||
version = "0.17.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jumppad-labs";
|
||||
repo = "jumppad";
|
||||
rev = version;
|
||||
hash = "sha256-2xJsTkgvBYbbKGLr24Mpgcpd3AJkuePi+FXnbZJP2wg=";
|
||||
hash = "sha256-SoiF5y0Vc2T8qT75cII3HqNSEZhWAzKEk3xw4BGICpo=";
|
||||
};
|
||||
vendorHash = "sha256-dxMCkLrE97fpRI60PqWoo/+HKDbTLKmMNtegDigQPAI=";
|
||||
vendorHash = "sha256-mJKawveIoDu2v+GxIoljmFbCwle9d1SQiHzsoerP66I=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mihomo-party";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
|
||||
fetchurl {
|
||||
url = "https://github.com/mihomo-party-org/mihomo-party/releases/download/v${version}/mihomo-party-linux-${version}-${arch}.deb";
|
||||
hash = selectSystem {
|
||||
x86_64-linux = "sha256-fVPW4lk+1uY+zTPk0wNeHz7ILKB+7p9hunHrqnuPI6w=";
|
||||
aarch64-linux = "sha256-wEOOP5ha7R0z0DCTCsmn5lfwJdzEWtNGdWNjVB5cI6k=";
|
||||
x86_64-linux = "sha256-hJnb0K3ytw0ITwL6dY1klSG260WrZQiHhz4FRZ0idI4=";
|
||||
aarch64-linux = "sha256-6hAB1QezewgKI2We0zDTK+vNgxcMP2AEmGZqdSbMcWQ=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mongoc";
|
||||
version = "1.30.1";
|
||||
version = "1.30.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mongodb";
|
||||
repo = "mongo-c-driver";
|
||||
tag = version;
|
||||
hash = "sha256-jkMt6+nNV0fO8jp6L0ayed3MEWO56yQP7Rd1r7ccIrM=";
|
||||
hash = "sha256-RDUrD8MPZd1VBePyR+L5GiT/j5EZIY1KHLQKG5MsuSM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -11,16 +11,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "multiplex";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pojntfx";
|
||||
repo = "multiplex";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zU4Lnc66wY5lFxy82Mg52WSEGRyoEk9LY6E7LmeuKHs=";
|
||||
hash = "sha256-+KvFBzoIYmSbuazstJae8lC0xdPtXLhFWawlc+iGGoU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-fS5wdBe1vuqaUBPcxLzhCMRztW8eq+MGojMVWlOZO+U=";
|
||||
vendorHash = "sha256-a99zmJ89QN+bf1WgAin+Eoqaizb7vyesb4uxt5L8qNY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -66,11 +66,11 @@ let
|
||||
|
||||
derivation = stdenv.mkDerivation rec {
|
||||
pname = "onlyoffice-desktopeditors";
|
||||
version = "8.3.0";
|
||||
version = "8.3.1";
|
||||
minor = null;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb";
|
||||
hash = "sha256-rx9jh2jWA7+EOoNackHEUsLg1lX+VXbqp+cCUQAoQuM=";
|
||||
hash = "sha256-6eoXLOLshHpn3eaEx57ll66nD+gs1LZUET0CSm4od5c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -20,13 +20,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "p2pool";
|
||||
version = "4.3";
|
||||
version = "4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SChernykh";
|
||||
repo = "p2pool";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PHrmTkmpYOPKx9q+/mhjr8MIbFqmljKs2F26tqyCzcE=";
|
||||
hash = "sha256-+wkcTkHhGNanCznL5d9yUezi9wLIchxt6TPPpEUqgN8=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From b3cd46bf1ea7ddc7ce26e9b713bb7fb5faadba40 Mon Sep 17 00:00:00 2001
|
||||
From: Ulysses Zhan <ulysseszhan@gmail.com>
|
||||
Date: Wed, 20 Mar 2024 21:57:47 -0700
|
||||
Subject: [PATCH] fix `Unknown option --pdf-page` when calling inkscape
|
||||
|
||||
---
|
||||
pdftowrite/pdftowrite.py | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/pdftowrite/pdftowrite.py b/pdftowrite/pdftowrite.py
|
||||
index 6c12515..4d03fc2 100644
|
||||
--- a/pdftowrite/pdftowrite.py
|
||||
+++ b/pdftowrite/pdftowrite.py
|
||||
@@ -79,7 +79,7 @@ def process_page(filename: str, page_num: int, output_dir: str, ns: argparse.Nam
|
||||
opts = ['--pdf-poppler'] if ns.mode is Mode.POPPLER or ns.mode is Mode.MIXED else []
|
||||
utils.inkscape_run([
|
||||
*opts,
|
||||
- f'--pdf-page={page_num}',
|
||||
+ f'--pages={page_num}',
|
||||
f'--export-dpi={ns.dpi}',
|
||||
'--export-plain-svg',
|
||||
'-o', output,
|
||||
@@ -90,7 +90,7 @@ def process_page(filename: str, page_num: int, output_dir: str, ns: argparse.Nam
|
||||
if ns.mode is Mode.MIXED:
|
||||
text_layer_output = str(Path(output_dir) / f'output-{page_num}-text.svg')
|
||||
utils.inkscape_run([
|
||||
- f'--pdf-page={page_num}',
|
||||
+ f'--pages={page_num}',
|
||||
f'--export-dpi={ns.dpi}',
|
||||
'--export-plain-svg',
|
||||
'-o', text_layer_output,
|
||||
@@ -0,0 +1,91 @@
|
||||
{
|
||||
lib,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
|
||||
# shared
|
||||
gzip,
|
||||
# pdftowrite
|
||||
poppler-utils,
|
||||
inkscape,
|
||||
ghostscript,
|
||||
imagemagick,
|
||||
libxml2,
|
||||
libxslt,
|
||||
# writetopdf
|
||||
wkhtmltopdf,
|
||||
pdftk,
|
||||
librsvg,
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pdftowrite";
|
||||
version = "2021.05.03";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apebl";
|
||||
repo = "pdftowrite";
|
||||
tag = version;
|
||||
hash = "sha256-IFX9K74tfGKyMtqlc/RsV00baZEzE3HcPAGfrmTHnDQ=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
python3Packages.shortuuid
|
||||
python3Packages.picosvg
|
||||
];
|
||||
|
||||
build-system = [
|
||||
python3Packages.setuptools
|
||||
python3Packages.setuptools-scm
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
patches = [
|
||||
# fix inkscape flag (see https://gitlab.com/inkscape/inkscape/-/issues/4536)
|
||||
./inkscape-unknown-option-pdf-page.patch
|
||||
];
|
||||
|
||||
postInstall =
|
||||
let
|
||||
pdftowritePath = lib.makeBinPath [
|
||||
# shared
|
||||
gzip
|
||||
# pdftowrite
|
||||
poppler-utils
|
||||
inkscape
|
||||
ghostscript
|
||||
imagemagick
|
||||
libxml2
|
||||
libxslt
|
||||
];
|
||||
writetopdfPath = lib.makeBinPath [
|
||||
# shared
|
||||
gzip
|
||||
# writetopdf
|
||||
wkhtmltopdf
|
||||
pdftk
|
||||
librsvg
|
||||
];
|
||||
in
|
||||
# `SELF_CALL=xxx` prevents inkscape shananigans (see https://gitlab.com/inkscape/inkscape/-/issues/4716)
|
||||
''
|
||||
wrapProgram $out/bin/pdftowrite --prefix PATH : ${pdftowritePath} \
|
||||
--set SELF_CALL=xxx
|
||||
wrapProgram $out/bin/writetopdf --prefix PATH : ${writetopdfPath}
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [ versionCheckHook ];
|
||||
versionCheckProgramArg = "--version";
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/apebl/pdftowrite";
|
||||
description = "Utility that converts PDF to Stylus Labs Write documents, and vice versa";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ henrispriet ];
|
||||
};
|
||||
}
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "postmoogle";
|
||||
version = "0.9.25";
|
||||
version = "0.9.26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "etkecc";
|
||||
repo = "postmoogle";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Pn+IHqHvKo1936Pw8WI2IhporIy/sIvh8PAUt0y5niU=";
|
||||
hash = "sha256-nbkPwHMQTadflHE8q525cB4cgVNxldOMBi4Kwrp52rE=";
|
||||
};
|
||||
|
||||
tags = [
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
copyDesktopItems,
|
||||
}:
|
||||
let
|
||||
version = "2.61.3";
|
||||
version = "2.62.1";
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
inherit version;
|
||||
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "pyfa-org";
|
||||
repo = "Pyfa";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-i8NcRTn817gqwQP6j0RPUJkq09eTI4nfe3EVqYnWRpo=";
|
||||
hash = "sha256-yNMqP4YsfwTrf92wizstBXiTbhxAwIFoml4CUecqjbo=";
|
||||
};
|
||||
|
||||
desktopItems = [
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qucsator-rf";
|
||||
version = "1.0.4";
|
||||
version = "1.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ra3xdh";
|
||||
repo = "qucsator_rf";
|
||||
rev = version;
|
||||
hash = "sha256-01GQmakwLzaNnPZvtYYtt5WJmYF3EytlAA0Xy1/AAsU=";
|
||||
hash = "sha256-Q1hpCt3SeXRzUFX4jPUu8ZsPTx2W28LQ3YwlYtOZhqg=";
|
||||
};
|
||||
|
||||
# Upstream forces NO_DEFAULT_PATH on APPLE
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "quickjs-ng";
|
||||
version = "0.8.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "quickjs-ng";
|
||||
repo = "quickjs";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-o0Cpy+20EqNdNENaYlasJcKIGU7W4RYBcTMsQwFTUNc=";
|
||||
hash = "sha256-/E9JSINmuv+9M5qODsmTCkcpdTyG0qN6I+iUbq5XclE=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "rqlite";
|
||||
version = "8.36.12";
|
||||
version = "8.36.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rqlite";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sEdU4BhRlkSCrUvrzcj+LNsSUO7mXCUHnIEqN8ydzc8=";
|
||||
sha256 = "sha256-1yDz9rbjJCzl0pXvrMoAHdv4O9DAnE9HN6LQm3wp6kI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kdBYU0+8G/XspBXWPXTUy3vwbM90irM8xIpQgTMtRrA=";
|
||||
|
||||
@@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "signalbackup-tools";
|
||||
version = "20250305-2";
|
||||
version = "20250313-1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bepaald";
|
||||
repo = "signalbackup-tools";
|
||||
rev = version;
|
||||
hash = "sha256-y655shDg3gnm5V1qhEbw6l0JzabhALXPeRQxyFhq2Cs=";
|
||||
hash = "sha256-N72BNa/6ZqWD5epdVIeuC7tOCkn5Hy8+txPT4ScUgjo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,11 +10,12 @@
|
||||
extraBwrapArgs ? [ ], # extra arguments to pass to bubblewrap (real default is at usage site)
|
||||
extraArgs ? "", # arguments to always pass to steam
|
||||
extraEnv ? { }, # Environment variables to pass to Steam
|
||||
privateTmp ? true, # if the steam bubblewrap should isolate /tmp
|
||||
}:
|
||||
let
|
||||
steamEnv = { name, runScript, passthru ? {}, meta ? {} }:
|
||||
buildFHSEnv {
|
||||
inherit name runScript passthru meta;
|
||||
inherit name runScript passthru meta privateTmp;
|
||||
|
||||
multiArch = true;
|
||||
includeClosures = true;
|
||||
@@ -105,8 +106,6 @@ let
|
||||
${extraProfile}
|
||||
'';
|
||||
|
||||
privateTmp = true;
|
||||
|
||||
inherit extraPreBwrapCmds;
|
||||
|
||||
extraBwrapArgs = [
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tun2proxy";
|
||||
version = "0.7.4";
|
||||
version = "0.7.6";
|
||||
|
||||
src = fetchCrate {
|
||||
pname = "tun2proxy";
|
||||
inherit version;
|
||||
hash = "sha256-ccFaFeTqgkDYuMssxOaWHW2oWgbdacyj6k8qF42OzM8=";
|
||||
hash = "sha256-hAZZ9pSoIgAb4JYhi9mGHMD4CIjnxVJU00PDsQe6OLY=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-XqiSVndG6Ep8wifgkAILBbKnljeZNehSL8UTf5I9vEU=";
|
||||
cargoHash = "sha256-A/hBV/koIR7gLIZVCoaRk5DI11NZ5HI+xn6qkU+fxaI=";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/tun2proxy/tun2proxy";
|
||||
|
||||
@@ -9,17 +9,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "turn-rs";
|
||||
version = "3.3.3";
|
||||
version = "3.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mycrl";
|
||||
repo = "turn-rs";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-kNE6FbHAFVWH04uTJBCRkrB0yzIjuXX3rxi2h5WmKWo=";
|
||||
hash = "sha256-GAmer7uSCgHdVVvTafMfAgdvMCp/FUT/quF88VLcWgo=";
|
||||
};
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-VHfWVEYla7iHOATC4Rv7k560O2VUqAe4ZMo/hLiSOi4=";
|
||||
cargoHash = "sha256-vLx6bvhb/Xq5BzKPOEqfx1BzGeDHx+47okdcW5Pu5YM=";
|
||||
|
||||
# By default, no features are enabled
|
||||
# https://github.com/mycrl/turn-rs?tab=readme-ov-file#features-1
|
||||
|
||||
@@ -4,10 +4,9 @@
|
||||
fetchgit,
|
||||
libX11,
|
||||
perl,
|
||||
...
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xbattbar";
|
||||
version = "1.4.9";
|
||||
|
||||
@@ -15,40 +14,47 @@ stdenv.mkDerivation rec {
|
||||
# repository.
|
||||
src = fetchgit {
|
||||
url = "https://salsa.debian.org/debian/xbattbar.git";
|
||||
rev = "upstream/${version}";
|
||||
sha256 = "10w7gs0l4hzhdn38yqyr3az7n4ncmfnd6hhhly6lk5dg7k441ck6";
|
||||
tag = "upstream/${finalAttrs.version}";
|
||||
hash = "sha256-ZrJAyDyvlUmNpxBC06yrzBJ7vhrZY4+GbfBDQoF+h4M=";
|
||||
};
|
||||
|
||||
buildInputs = [ libX11 ];
|
||||
|
||||
# The following patches are applied:
|
||||
# - sys-by-default: remove the APM checker binary, make the sys checker
|
||||
# script the default. Rationale: checking battery status by /proc/apm is
|
||||
# extremely oldschool and does not work on NixOS, while the sysfs script
|
||||
# does.
|
||||
# remove the APM checker binary, make the sys checker
|
||||
# script the default. Rationale: checking battery status by /proc/apm is
|
||||
# extremely oldschool and does not work on NixOS, while the sysfs script
|
||||
# does.
|
||||
patches = [ ./sys-by-default.patch ];
|
||||
# - perl shebang patches for acpi/sys scripts
|
||||
# - unhardcode path to checker scripts
|
||||
patchPhase = ''
|
||||
patch -p1 < ${./sys-by-default.patch}
|
||||
# - add missing return type in main function
|
||||
postPatch = ''
|
||||
substituteInPlace xbattbar.c \
|
||||
--replace-fail "main(int argc" "int main(int argc"
|
||||
|
||||
sed -i -e "s,/usr/lib/xbattbar/,$out/libexec/," xbattbar.c
|
||||
sed -i -e "s,/usr/bin/perl,${perl}/bin/perl," xbattbar-check-acpi
|
||||
sed -i -e "s,/usr/bin/perl,${perl}/bin/perl," xbattbar-check-sys
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/libexec
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/{bin,libexec}
|
||||
|
||||
install -m 0755 xbattbar $out/bin/
|
||||
install -m 0755 xbattbar-check-acpi $out/libexec/
|
||||
install -m 0755 xbattbar-check-sys $out/libexec/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Display battery status in X11";
|
||||
homepage = "https://salsa.debian.org/debian/xbattbar";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.q3k ];
|
||||
license = with lib; licenses.gpl2Plus;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ q3k ];
|
||||
mainProgram = "xbattbar";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "xdg-desktop-portal-shana";
|
||||
version = "0.3.13";
|
||||
version = "0.3.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Decodetalkers";
|
||||
repo = "xdg-desktop-portal-shana";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-myEqJnXHCByc9CMX8vMDaQQkL84pfW/7fKPZpiNQHJA=";
|
||||
hash = "sha256-9uie6VFyi7sO8DbthUTgpEc68MvvLA+bUwyV/DSpKkE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
|
||||
mesonBuildType = "release";
|
||||
|
||||
useFetchCargoVendor = true;
|
||||
cargoHash = "sha256-E573A3njd+IMOEHnKwyKmA4I4bfCt4Kttj7MiFOUw/0=";
|
||||
cargoHash = "sha256-f9kfCoH0YHVzzZC4rChJgz0yQqVVAYR7Gpa6HuXhQZY=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Filechooser portal backend for any desktop environment";
|
||||
|
||||
@@ -374,8 +374,8 @@ buildLuarocksPackage {
|
||||
src = fetchFromGitHub {
|
||||
owner = "teal-language";
|
||||
repo = "cyan";
|
||||
rev = "0650e05c656b73f85b2bcd02ac1f27453f65cb17";
|
||||
hash = "sha256-pj1Zy5ygg90/6uuNi2jc5xax/vg64aHm1G1e9kAcZv8=";
|
||||
rev = "00e6088707422dcce78f05d33574e6333b76204b";
|
||||
hash = "sha256-AMfLXH/D5dbMAzPi91G1eC6A2D7VpbRXyPb5hDOdPQk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ argparse luafilesystem luasystem tl ];
|
||||
@@ -579,14 +579,14 @@ buildLuarocksPackage {
|
||||
fzf-lua = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "fzf-lua";
|
||||
version = "0.0.1768-1";
|
||||
version = "0.0.1783-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/fzf-lua-0.0.1768-1.rockspec";
|
||||
sha256 = "0jd4xcy4hpmhqrgpqp166rpim36yldhrp76xp92vgq3z8sdpjy7i";
|
||||
url = "mirror://luarocks/fzf-lua-0.0.1783-1.rockspec";
|
||||
sha256 = "1br2cx5h07hcsyq15fizv8nd0indg194yv5qpsii6n8daw95q7ak";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/ibhagwan/fzf-lua/archive/9b84b53f3297d4912d7eb95b979e9b27e2e61281.zip";
|
||||
sha256 = "1p3fb68h7x50b6m6aaxxqcylipa5rdg0yfz6jlrd5i2kmr5gxldq";
|
||||
url = "https://github.com/ibhagwan/fzf-lua/archive/15d5cd9a74da7f8739030a5c411c046c70f66a60.zip";
|
||||
sha256 = "1i761ndiydma9fcpc8xd4br5cy0g8vx043bs6h0h7563bs6r7ss1";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -2309,16 +2309,16 @@ buildLuarocksPackage {
|
||||
luasystem = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "luasystem";
|
||||
version = "0.4.5-1";
|
||||
version = "0.5.1-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/luasystem-0.4.5-1.rockspec";
|
||||
sha256 = "0769h7mlw8gv3zw0yvnwmg1f0k02a85w4cnxbmpd19k07m6v9izr";
|
||||
url = "mirror://luarocks/luasystem-0.5.1-1.rockspec";
|
||||
sha256 = "0aiav3a3gw9l3gxxlq6ak6vigqqg0z9iyfq28knfm8rb23bvyi60";
|
||||
}).outPath;
|
||||
src = fetchFromGitHub {
|
||||
owner = "lunarmodules";
|
||||
repo = "luasystem";
|
||||
rev = "v0.4.5";
|
||||
hash = "sha256-miubEXFrfB3/PzToOOh3sKGXwrRRc3Wd+gWbxj9M5ns=";
|
||||
rev = "v0.5.1";
|
||||
hash = "sha256-+dkXf4F2mZgQSRQRpJnjwo5Swi06Pi2BQjjY5p3PQGc=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -2941,8 +2941,8 @@ buildLuarocksPackage {
|
||||
src = fetchFromGitHub {
|
||||
owner = "hrsh7th";
|
||||
repo = "nvim-cmp";
|
||||
rev = "5a11682453ac6b13dbf32cd403da4ee9c07ef1c3";
|
||||
hash = "sha256-dBAYadxdnl0j5e8VnnyGxx2AE6GgCDyIBxEgmrNawxo=";
|
||||
rev = "1e1900b0769324a9675ef85b38f99cca29e203b3";
|
||||
hash = "sha256-zl/rgbZF3+nsLI7Sd6xzQFlcpa5n/8pyganS+u0jD/s=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1" || luaAtLeast "5.4";
|
||||
@@ -3025,14 +3025,14 @@ buildLuarocksPackage {
|
||||
orgmode = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, tree-sitter-orgmode }:
|
||||
buildLuarocksPackage {
|
||||
pname = "orgmode";
|
||||
version = "0.4.32-1";
|
||||
version = "0.5.2-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/orgmode-0.4.32-1.rockspec";
|
||||
sha256 = "1n3nd975m58f5kr4gl6d5mpgsm7aaz2pmcar0hlkisc91fq5pfyz";
|
||||
url = "mirror://luarocks/orgmode-0.5.2-1.rockspec";
|
||||
sha256 = "0ljb27lc1w3464l7fnyn051zvi9nzbxzq8qnx83i135r5jl7ls3d";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nvim-orgmode/orgmode/archive/0.4.32.zip";
|
||||
sha256 = "0qwv2pg4s9spmy5wvkvflhcb0a2drlygch6hmjanj3g2kkn3ph5f";
|
||||
url = "https://github.com/nvim-orgmode/orgmode/archive/0.5.2.zip";
|
||||
sha256 = "0f66nfl8agnk9765p79xr0b2qvyqx8z46rzcf0y349q8fs681kp6";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -3045,6 +3045,30 @@ buildLuarocksPackage {
|
||||
};
|
||||
}) {};
|
||||
|
||||
papis-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nui-nvim, pathlib-nvim, sqlite }:
|
||||
buildLuarocksPackage {
|
||||
pname = "papis.nvim";
|
||||
version = "0.7.0-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/papis.nvim-0.7.0-1.rockspec";
|
||||
sha256 = "1bza3blszq1kz224zx7k0mn636lnj5rcx5s7q6l3ng8rzddw4isa";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/jghauser/papis.nvim/archive/16983a7aac24ea787d9b9ac5dce3c35d0077b990.zip";
|
||||
sha256 = "0virafyw0d46iwscbs1f1y7ks9jafhq214m17wqdz25srb7hmrxd";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
propagatedBuildInputs = [ nui-nvim pathlib-nvim sqlite ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/jghauser/papis.nvim";
|
||||
description = "Manage your bibliography from within your favourite editor";
|
||||
maintainers = with lib.maintainers; [ GaetanLepage ];
|
||||
license.fullName = "GPL-3.0";
|
||||
};
|
||||
}) {};
|
||||
|
||||
pathlib-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio }:
|
||||
buildLuarocksPackage {
|
||||
pname = "pathlib.nvim";
|
||||
@@ -3068,29 +3092,6 @@ buildLuarocksPackage {
|
||||
};
|
||||
}) {};
|
||||
|
||||
papis-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nui-nvim, pathlib-nvim, sqlite }:
|
||||
buildLuarocksPackage {
|
||||
pname = "papis.nvim";
|
||||
version = "0.7.0-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/papis.nvim-0.7.0-1.rockspec";
|
||||
sha256 = "1bza3blszq1kz224zx7k0mn636lnj5rcx5s7q6l3ng8rzddw4isa";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/jghauser/papis.nvim/archive/16983a7aac24ea787d9b9ac5dce3c35d0077b990.zip";
|
||||
sha256 = "0virafyw0d46iwscbs1f1y7ks9jafhq214m17wqdz25srb7hmrxd";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
propagatedBuildInputs = [ nui-nvim pathlib-nvim sqlite ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/jghauser/papis.nvim";
|
||||
description = "Manage your bibliography from within your favourite editor";
|
||||
license.fullName = "GPL-3.0";
|
||||
};
|
||||
}) {};
|
||||
|
||||
penlight = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, luafilesystem }:
|
||||
buildLuarocksPackage {
|
||||
pname = "penlight";
|
||||
@@ -3259,14 +3260,14 @@ buildLuarocksPackage {
|
||||
rocks-git-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder, nvim-nio, rocks-nvim }:
|
||||
buildLuarocksPackage {
|
||||
pname = "rocks-git.nvim";
|
||||
version = "2.5.2-1";
|
||||
version = "2.5.3-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/rocks-git.nvim-2.5.2-1.rockspec";
|
||||
sha256 = "1c7rmn735d0axk92mk1hpiyqrv9hw4a2naai9naq57g6fy7wh0cc";
|
||||
url = "mirror://luarocks/rocks-git.nvim-2.5.3-1.rockspec";
|
||||
sha256 = "0p69zdlh552r8grpbhx2h78hhc6d6cihc5dyanlxqfxr6kxw221m";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v2.5.2.zip";
|
||||
sha256 = "1bhaa40j2dz1660q5fqdbjxvbscd6wk6l3psqm7mmh60zyvibnf2";
|
||||
url = "https://github.com/nvim-neorocks/rocks-git.nvim/archive/v2.5.3.zip";
|
||||
sha256 = "0nm4yf3z2wmb7g10ij706vkwg9ss83ndp5wps3gfjr4zqdf85ayy";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -3283,14 +3284,14 @@ buildLuarocksPackage {
|
||||
rocks-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, fidget-nvim, fzy, luaOlder, luarocks, nvim-nio, rtp-nvim, toml-edit }:
|
||||
buildLuarocksPackage {
|
||||
pname = "rocks.nvim";
|
||||
version = "2.43.1-1";
|
||||
version = "2.44.0-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/rocks.nvim-2.43.1-1.rockspec";
|
||||
sha256 = "0d9k3ya358spl2bcj4m1fwjrqf48byhnc5n40076l2lndwc806n0";
|
||||
url = "mirror://luarocks/rocks.nvim-2.44.0-1.rockspec";
|
||||
sha256 = "1jrln4s5zdp9mv8w9r156nk80sdmigy9l6pb4jbhyms16fa1d7q6";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.43.1.zip";
|
||||
sha256 = "097f3zm7r1qwgd66gq8y31yzkn1p567kgn2p4pbxwkyn070gr787";
|
||||
url = "https://github.com/nvim-neorocks/rocks.nvim/archive/v2.44.0.zip";
|
||||
sha256 = "1g02704jld32lxv414pwdwsc5yzdcyj11qyhyqkhymrk5hi3pxr3";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
@@ -3688,14 +3689,14 @@ buildLuarocksPackage {
|
||||
tree-sitter-orgmode = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luarocks-build-treesitter-parser }:
|
||||
buildLuarocksPackage {
|
||||
pname = "tree-sitter-orgmode";
|
||||
version = "1.3.4-1";
|
||||
version = "2.0.0-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/tree-sitter-orgmode-1.3.4-1.rockspec";
|
||||
sha256 = "00p8abqdnjwshi6nqkhjaxdvqilfppvlv2bk98cmspgjhb3sd2bh";
|
||||
url = "mirror://luarocks/tree-sitter-orgmode-2.0.0-1.rockspec";
|
||||
sha256 = "1vgn8nxb3xjns30agbk0zz29ixf31ipvyl3q12lb5girhrwx43y0";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/nvim-orgmode/tree-sitter-org/archive/1.3.4.zip";
|
||||
sha256 = "08lmcvvklr2nyx8v8gacaip8n8cfmywj3fnkhwa0p9yzpza86b4r";
|
||||
url = "https://github.com/nvim-orgmode/tree-sitter-org/archive/2.0.0.zip";
|
||||
sha256 = "1yw4f4gd80dg9cc5m1d7abl22psgkssbxa2nrb7v5ay4zc0b3s7r";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ luarocks-build-treesitter-parser ];
|
||||
|
||||
@@ -188,11 +188,13 @@ in
|
||||
"T[\"files()\"][\"icons\"] = new_set({ parametrize = { { \"devicons\" }, { \"mini\" } } })" \
|
||||
"T[\"files()\"][\"icons\"] = new_set({ parametrize = { { \"mini\" } } })"
|
||||
|
||||
# TODO: Figure out why 2 files extra for `fd`
|
||||
substituteInPlace tests/file/ui_spec.lua \
|
||||
--replace-fail \
|
||||
"T[\"files()\"][\"executable\"] = new_set({ parametrize = { { \"fd\" }, { \"rg\" }, { \"find|dir\" } } }, {" \
|
||||
"T[\"files()\"][\"executable\"] = new_set({ parametrize = { { \"rg\" }, { \"find|dir\" } } }, {"
|
||||
# TODO: Figure out why 2 files extra
|
||||
substituteInPlace tests/screenshots/tests-file-ui_spec.lua---files\(\)---executable---1-+-args-{-\'fd\'-} \
|
||||
--replace-fail "111" "113"
|
||||
|
||||
# TODO: Figure out why 2 files extra
|
||||
substituteInPlace tests/screenshots/tests-file-ui_spec.lua---files\(\)---preview-should-work-after-chdir-#1864 \
|
||||
--replace-fail "110" "112"
|
||||
|
||||
make test
|
||||
|
||||
@@ -1114,13 +1116,13 @@ in
|
||||
orgmode = prev.orgmode.overrideAttrs (oa: {
|
||||
# Patch in tree-sitter-orgmode dependency
|
||||
postPatch = ''
|
||||
substituteInPlace lua/orgmode/utils/treesitter/install.lua lua/orgmode/health.lua \
|
||||
substituteInPlace lua/orgmode/config/init.lua \
|
||||
--replace-fail \
|
||||
"pcall(vim.treesitter.language.add, 'org')" \
|
||||
"pcall(function() vim.treesitter.language.add('org', { path = '${final.tree-sitter-orgmode}/lib/lua/${final.tree-sitter-orgmode.lua.luaversion}/parser/org.so'}) end)"
|
||||
|
||||
substituteInPlace lua/orgmode/utils/treesitter/install.lua \
|
||||
--replace-fail "if M.outdated() then" "if false then"
|
||||
"require('orgmode.utils.treesitter.install').install()" \
|
||||
"pcall(function() vim.treesitter.language.add('org', { path = '${final.tree-sitter-orgmode}/lib/lua/${final.tree-sitter-orgmode.lua.luaversion}/parser/org.so'}) end)" \
|
||||
--replace-fail \
|
||||
"require('orgmode.utils.treesitter.install').reinstall()" \
|
||||
"pcall(function() vim.treesitter.language.add('org', { path = '${final.tree-sitter-orgmode}/lib/lua/${final.tree-sitter-orgmode.lua.luaversion}/parser/org.so'}) end)"
|
||||
'';
|
||||
});
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
angr,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
progressbar,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
tqdm,
|
||||
@@ -27,7 +26,6 @@ buildPythonPackage rec {
|
||||
|
||||
dependencies = [
|
||||
angr
|
||||
progressbar
|
||||
tqdm
|
||||
];
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "anthropic";
|
||||
version = "0.47.2";
|
||||
version = "0.49.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
owner = "anthropics";
|
||||
repo = "anthropic-sdk-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-W7ByBoPTpSOww+hf/uOQdpRm0NxX7vA9QbSLd9mVQdE=";
|
||||
hash = "sha256-vbK8rqCekWbgLAU7YlHUhfV+wB7Q3Rpx0OUYvq3WYWw=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "circuitbreaker";
|
||||
version = "2.0.0";
|
||||
version = "2.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "fabfuel";
|
||||
repo = pname;
|
||||
tag = version;
|
||||
hash = "sha256-jaDCMGCZZu3STluYeHDNgdEPf2DNq7bXJ0LPV3JZdk0=";
|
||||
hash = "sha256-lwLy/bWvXhmQbRJ6Qii7e0SrEL3iDPGs6k7Bqamvg50=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "coinmetrics-api-client";
|
||||
version = "2025.3.3.16";
|
||||
version = "2025.3.12.17";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "coinmetrics_api_client";
|
||||
hash = "sha256-HQoP9HkNZmNJWKfMNfnIQpQygRpBQPmRUkV/nyp/dUw=";
|
||||
hash = "sha256-vmmsslR+4fhNqkzvXB87ilc6vQ+b9PdMlj6LEV7ms7A=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "typer" ];
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cyclopts";
|
||||
version = "3.9.2";
|
||||
version = "3.9.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
owner = "BrianPugh";
|
||||
repo = "cyclopts";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Juu9OeSygHzhny9leS250YhsP+/3/0Dor9SXFP+wMPA=";
|
||||
hash = "sha256-BJkpQhQuKm/yI3p8zspojYzUcpgMz1LAQwTx4Ppf06U=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "extract-msg";
|
||||
version = "0.53.1";
|
||||
version = "0.53.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "TeamMsgExtractor";
|
||||
repo = "msg-extractor";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-vkWINRUQh/zfKzSJifJMn0EVnBdPODLFdS/jMdGI36I=";
|
||||
hash = "sha256-aPYTkJn1v5JW0Q2zCOKinlVpkRyPilaiClCwhFXJ4GI=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gardena-bluetooth";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "elupus";
|
||||
repo = "gardena-bluetooth";
|
||||
tag = version;
|
||||
hash = "sha256-U/Spy9Jc86BJ4AokqdWFRlZ4nOHIFTQ8aphK/xhofWg=";
|
||||
hash = "sha256-L726A0o9TIxFjHOxx0e42RIj4XMOdeZTJE2gWo6OhG4=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gvm-tools";
|
||||
version = "25.2.0";
|
||||
version = "25.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "greenbone";
|
||||
repo = "gvm-tools";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-WWt/wWuni1rf2A3ggzbVF6l2ApDHm5Z5TBk5UWseo74=";
|
||||
hash = "sha256-DDs08VnyUB32n3JuVNmt9uMTssmbHOb351pla4zdE54=";
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lastversion";
|
||||
version = "3.5.0";
|
||||
version = "3.5.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@@ -31,8 +31,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "dvershinin";
|
||||
repo = "lastversion";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SeDLpMP8cF6CC3qJ6V8dLErl6ihpnl4lHeBkp7jtQgI=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-z3QrtnhIgXLVyaDNm0XqaVqZb05K3pq8mbweTpphdBQ=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -78,7 +78,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Find the latest release version of an arbitrary project";
|
||||
homepage = "https://github.com/dvershinin/lastversion";
|
||||
changelog = "https://github.com/dvershinin/lastversion/blob/${src.rev}/CHANGELOG.md";
|
||||
changelog = "https://github.com/dvershinin/lastversion/blob/${src.tag}/CHANGELOG.md";
|
||||
license = lib.licenses.bsd2;
|
||||
maintainers = with lib.maintainers; [ ShamrockLee ];
|
||||
mainProgram = "lastversion";
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mailchecker";
|
||||
version = "6.0.16";
|
||||
version = "6.0.17";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XZT70Nc1L/WGPM4tRgOrjs1N1AUD4O1V/evjcqS5qOk=";
|
||||
hash = "sha256-FHIFsBltIe1BMiN9hzP99uig9mq68hQ0p5D9C8utClw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
requests,
|
||||
packaging,
|
||||
pydantic,
|
||||
typing-extensions,
|
||||
requests-mock,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
name = "marqo";
|
||||
version = "3.11.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "marqo-ai";
|
||||
repo = "py-marqo";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-8BcYJZ7tXkuvtQzopZO9bvLXAJQdd8MnQflVTawTaw0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Tests require network
|
||||
"tests/v2_tests/test_tensor_search.py"
|
||||
"tests/v2_tests/test_client.py"
|
||||
"tests/v2_tests/test_get_settings.py"
|
||||
"tests/v2_tests/test_tensor_search.py"
|
||||
"tests/v2_tests/test_add_documents.py"
|
||||
"tests/v2_tests/test_delete_documents.py"
|
||||
"tests/v2_tests/test_demos.py"
|
||||
"tests/v2_tests/test_custom_vector_search.py"
|
||||
"tests/v2_tests/test_create_index.py"
|
||||
"tests/v2_tests/test_image_chunking.py"
|
||||
"tests/v2_tests/test_telemetry.py"
|
||||
"tests/v2_tests/test_score_modifier_search.py"
|
||||
"tests/v2_tests/test_model_cache_management.py"
|
||||
"tests/v2_tests/test_embed.py"
|
||||
"tests/v2_tests/test_index_init_logging.py"
|
||||
"tests/v2_tests/test_marqo_cloud_instance_mapping.py"
|
||||
"tests/v2_tests/test_index_manipulation_features.py"
|
||||
"tests/v2_tests/test_index.py"
|
||||
"tests/v2_tests/test_get_indexes.py"
|
||||
"tests/v2_tests/test_hybrid_search.py"
|
||||
"tests/v2_tests/test_logging.py"
|
||||
"tests/v2_tests/test_recommend.py"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
packaging
|
||||
pydantic
|
||||
requests
|
||||
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [ "urllib3" ];
|
||||
|
||||
pythonImportsCheck = [ "marqo" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Unified embedding generation and search engine";
|
||||
homepage = "https://marqo.ai";
|
||||
changelog = "https://github.com/marqo-ai/py-marqo/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ naufik ];
|
||||
};
|
||||
}
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "model-checker";
|
||||
version = "0.8.6";
|
||||
version = "0.8.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "model_checker";
|
||||
inherit version;
|
||||
hash = "sha256-rg2Z6Twwm7cDagfYt1kJoXv+o9LWWkc5ui8jaUtamx8=";
|
||||
hash = "sha256-jxj397xLP0VMlqPfFLHQ2Uh5Bo3n9EUh/BeZdWZEVaQ=";
|
||||
};
|
||||
|
||||
# z3 does not provide a dist-info, so python-runtime-deps-check will fail
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "msgraph-sdk";
|
||||
version = "1.23.0";
|
||||
version = "1.24.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "microsoftgraph";
|
||||
repo = "msgraph-sdk-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-dx79wF6BXhTRGW31TPJ1bbMCPGEm+Hrc5EVFeg6HyHk=";
|
||||
hash = "sha256-7r7TuGR8J31BZdG8wJJAgWwllbkf3wYj1xLULNm8+xQ=";
|
||||
};
|
||||
|
||||
build-system = [ flit-core ];
|
||||
|
||||
@@ -23,14 +23,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "narwhals";
|
||||
version = "1.28.0";
|
||||
version = "1.30.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "narwhals-dev";
|
||||
repo = "narwhals";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-zI167qTGXMKgjMUSGiEKjGw2tITRQL4//wMqzj3DhVU=";
|
||||
hash = "sha256-jqrrQRviWllzZQEnlOTZ6oJM3WYQ3YlDvareTTBcNl4=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
python,
|
||||
|
||||
# build-system
|
||||
cython,
|
||||
@@ -36,15 +37,28 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pytest.ini \
|
||||
--replace "--flakes" ""
|
||||
--replace-fail "--flakes" ""
|
||||
'';
|
||||
|
||||
optional-dependencies.arrays = [ numpy ];
|
||||
|
||||
pythonImportsCheck = [ "ndindex" ];
|
||||
|
||||
# fix Hypothesis timeouts
|
||||
preCheck = ''
|
||||
cd $out
|
||||
|
||||
echo > ${python.sitePackages}/ndindex/tests/conftest.py <<EOF
|
||||
|
||||
import hypothesis
|
||||
|
||||
hypothesis.settings.register_profile(
|
||||
"ci",
|
||||
deadline=None,
|
||||
print_blob=True,
|
||||
derandomize=True,
|
||||
)
|
||||
EOF
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
@@ -54,8 +68,13 @@ buildPythonPackage rec {
|
||||
sympy
|
||||
] ++ optional-dependencies.arrays;
|
||||
|
||||
pytestFlagsArray = [
|
||||
"--hypothesis-profile"
|
||||
"ci"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "";
|
||||
description = "Python library for manipulating indices of ndarrays";
|
||||
homepage = "https://github.com/Quansight-Labs/ndindex";
|
||||
changelog = "https://github.com/Quansight-Labs/ndindex/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pipdeptree";
|
||||
version = "2.25.0";
|
||||
version = "2.25.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "tox-dev";
|
||||
repo = "pipdeptree";
|
||||
tag = version;
|
||||
hash = "sha256-U1zr38eZks7uMXKgsbRZUZlDsxScUsKaq+scH/mLRG4=";
|
||||
hash = "sha256-vZPxpbR8O3XIyGcp2rn4skjy2xMQb6+5BHc4tjO84tw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "publicsuffixlist";
|
||||
version = "1.0.2.20250312";
|
||||
version = "1.0.2.20250314";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-xa8ZlThHFuw97SLVVxWS2YUFUD9mQ1V+vyfVPYYZ6Pk=";
|
||||
hash = "sha256-ssjLDBvX8TU7BEeA5k9VcE1TDaW7aY8A64rqdo8cxzw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylutron-caseta";
|
||||
version = "0.23.0";
|
||||
version = "0.24.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "gurumitts";
|
||||
repo = "pylutron-caseta";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-p8c+WY+x5KcF7r6FXeF89JNtAwogRZELqXWgDc2iJek=";
|
||||
hash = "sha256-67y/YaXWHklSppUxsJ44CDMsvBXLzKBGl00LXBWi4+g=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -33,16 +33,16 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-arango";
|
||||
version = "8.1.4";
|
||||
version = "8.1.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arangodb";
|
||||
repo = "python-arango";
|
||||
tag = version;
|
||||
hash = "sha256-NAFleaZaZFWwhAPsuJG9S81w/FlkHgefqVWg5F+lhUo=";
|
||||
hash = "sha256-y+ECfrLoenjXl71hty7snNdu6tN5q8XTGtBlXtkSg7g=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -153,7 +153,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python Driver for ArangoDB";
|
||||
homepage = "https://github.com/ArangoDB-Community/python-arango";
|
||||
changelog = "https://github.com/ArangoDB-Community/python-arango/releases/tag/${version}";
|
||||
changelog = "https://github.com/ArangoDB-Community/python-arango/releases/tag/${src.tag}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jsoo1 ];
|
||||
};
|
||||
|
||||
@@ -11,15 +11,15 @@
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.4";
|
||||
version = "0.4.01";
|
||||
pname = "pywinctl";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kalmat";
|
||||
repo = "pywinctl";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-n7P12+8e1pPnJQrsYnRiYlzsKJTIYPH+iF1FuRx8A7M=";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-l9wUnEjOpKrjulruUX+AqQIjduDfX+iMmSv/V32jpdc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reolink-aio";
|
||||
version = "0.12.1";
|
||||
version = "0.12.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "starkillerOG";
|
||||
repo = "reolink_aio";
|
||||
tag = version;
|
||||
hash = "sha256-P2h4vVFNs2PChNviFknzGKDhy4aHy/0ptMVaKfzV/9I=";
|
||||
hash = "sha256-js7+x5Ft3gBsycaUKTz7qDaPOlgOZmnmxmfHSVGy1cw=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -40,14 +40,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sagemaker";
|
||||
version = "2.240.0";
|
||||
version = "2.242.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aws";
|
||||
repo = "sagemaker-python-sdk";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-DgyGWNb4zkJj+Gv0K2Imp+2q9zznCqQ7fnotTEZIoA4=";
|
||||
hash = "sha256-86FnB/HJ43RxFuezzbNADUVsifV0+HHVR0yfb+aQZ8M=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlmap";
|
||||
version = "1.9.2";
|
||||
version = "1.9.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-YWuJkNn6oKKTCZTdmJQA7+Eh1s37QQKSOJacXOHYhnw=";
|
||||
hash = "sha256-h4zYzhjOYsmbOv9FfIsVc1duC/D76g3YNxCGDOBhwtY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,19 +9,19 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "stupidartnet";
|
||||
version = "1.5.0";
|
||||
version = "1.6.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cpvalente";
|
||||
repo = "stupidArtnet";
|
||||
tag = version;
|
||||
hash = "sha256-6vEzInt1ofVVjTZAOH0Zw3BdwpX//1ZWwJqWPP5fIC8=";
|
||||
hash = "sha256-prLIQn1vFp0Q8FR2WBaU1tr6eKJpEY1ul4ldd4c35ls=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tencentcloud-sdk-python";
|
||||
version = "3.0.1338";
|
||||
version = "3.0.1339";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "TencentCloud";
|
||||
repo = "tencentcloud-sdk-python";
|
||||
tag = version;
|
||||
hash = "sha256-xp+5hJP6WIK+ROj0+ZRLSNVhuDmOfRBrfufZhUTnJ2Q=";
|
||||
hash = "sha256-SyrN+EiDlKzP0nc/dYib8TQmyO3CoUT7BydXl116SEE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -24,14 +24,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "torchmetrics";
|
||||
version = "1.6.2";
|
||||
version = "1.6.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Lightning-AI";
|
||||
repo = "torchmetrics";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-IPhBgGciB/3IFYVX+miID4oQ+5CpcjvAHiufxKiHzFw=";
|
||||
hash = "sha256-zBsqotwL6KUpcNV7SyEGnuW9Vl3oxaVy5wMHgGD7U/M=";
|
||||
};
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "zwave-js-server-python";
|
||||
version = "0.60.1";
|
||||
version = "0.61.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "home-assistant-libs";
|
||||
repo = "zwave-js-server-python";
|
||||
tag = version;
|
||||
hash = "sha256-YRC9DA77sLuTxw7YRbhYKxUOaBQaERTV4UWAwAEldhU=";
|
||||
hash = "sha256-bIo+Kggk8vQHtdey36WunhTR3x8nfySVaJOyZDzKXRk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -12,24 +12,24 @@
|
||||
},
|
||||
"33": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "9ccd393f8e7d817fb4595fd082b1e791ff0a794b34c50d71bd0c8ac37b8ced45",
|
||||
"aarch64-linux": "10c2abca8baa52f5fac1ddf48450135ea321e8e2d177598798232ad8ea268f77",
|
||||
"armv7l-linux": "e485d0e0d5a7e923e9060e34a0473b561a7e1f58d878e856cd86562a30d9fb9e",
|
||||
"headers": "17sxs7qxjy3r9vxlvmm1l3hnr82w9yqjybkjhx7dramq5c3r9fc3",
|
||||
"x86_64-darwin": "b072f47e5140b7f0bb9be8aa30e57a863056d4da260daec7228b4452369e9b85",
|
||||
"x86_64-linux": "3d14f1447654542bafd40736a131478fa2496955533043f21e306b06c923cf65"
|
||||
"aarch64-darwin": "01cdfb1537bd56691bd65a855c5680f43336b402d3c44bf2e3fde2c9522ad39f",
|
||||
"aarch64-linux": "1b91071b2da78c8a2e35113ae4f0705b60e4dbf74626cc1962af68fc1583ce11",
|
||||
"armv7l-linux": "94dfc24c44900795609ce0cb02598a5f40ca9ef10fd685f8939f9142e8aca4ed",
|
||||
"headers": "1whlam8s7n8rz46z3s4mq41079zd5jkkdk4xrppzkgpmcz98rzq1",
|
||||
"x86_64-darwin": "5d84d441d7e3ee4c4a3088426c1da39369cf7bdf96ed709f1f15db5e1d1624df",
|
||||
"x86_64-linux": "1fcc119c2b35d7d6e347bca6c4280111ac87f138d5f53817e8cba10027ef0d88"
|
||||
},
|
||||
"version": "33.4.3"
|
||||
"version": "33.4.5"
|
||||
},
|
||||
"34": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "2a4aa7e8fa30f229e465ebd18d3e4722e2b41529dc51a68a954d333a7e556ffe",
|
||||
"aarch64-linux": "774e4ccb39d553e5487994a9f8c60774a90f08cdb049ff65f3963fc27c969ff2",
|
||||
"armv7l-linux": "73ae92c8fffb351d3a455569cf57ce9a3f676f42bf61939c613c607fe0fc3bfb",
|
||||
"headers": "0qzvyqr3jy5bkfv9rwngqjad0gbq1f399d077y4vad5i0mrpqn61",
|
||||
"x86_64-darwin": "23938c62257a65a863ed7aa7c7966ba5f257a7d3dc16c78293e826962cc39c5c",
|
||||
"x86_64-linux": "7b74c0c4fae82e27c7e9cbca13e9763e046113dba8737d3e27de9a0b300ac87e"
|
||||
"aarch64-darwin": "dab1531dc858b2f8b888182bc62272b4d7d40dc53cee97454779f37e1803acb3",
|
||||
"aarch64-linux": "26c5509e785b4e3117f9430e6b52ad1cb8c7dc83a3b7c7ad4b593c724fc334f2",
|
||||
"armv7l-linux": "26f50b1ef9bfb572fea3af20cdebae01112aaff69cf0933602d2c33de1a5e71a",
|
||||
"headers": "0a41rnr2fbhrqgxzhglvm3xxznhh01zhl92qmdz2r9kj352lm4bl",
|
||||
"x86_64-darwin": "c515f2b65af0f2c0fd08c478e26801061a14d17decdb5dd40ed7a36fd03e0ff4",
|
||||
"x86_64-linux": "7ddd7e64846d72f90f62c4af29ce7930859b7d2ffac256c156e5bfa36f9e9b39"
|
||||
},
|
||||
"version": "34.3.2"
|
||||
"version": "34.3.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,24 +12,24 @@
|
||||
},
|
||||
"33": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "df4c6a7748c216487400c69672c01e79528e2bc3f0b3e2b0d9e211c0e9a6d112",
|
||||
"aarch64-linux": "1e02eb6c463069ab6a6e835c12f9258caee5fcfca959f14a676a03d0df650fa9",
|
||||
"armv7l-linux": "258df5b303f49c9c5b5e70947eb4530bf1a59ce1b8578c2ad137aa1dfb85b645",
|
||||
"headers": "17sxs7qxjy3r9vxlvmm1l3hnr82w9yqjybkjhx7dramq5c3r9fc3",
|
||||
"x86_64-darwin": "b1bc51d58977d14b22040e87dc31114e0be37f3395e98e52548d974a86df7f71",
|
||||
"x86_64-linux": "9fd0d0c010de003d68ae4bbce57241f6d8a9d852d98c708412a3490fd48bca51"
|
||||
"aarch64-darwin": "3cb2951e2591648e0d55f52b14d0743cca22dbdff5b832a5616434a68f24f3c2",
|
||||
"aarch64-linux": "dbb5dccda630f37e52d6dd09be9f26cacbead7981b2bf4ab7fd0cb8793e1ef2c",
|
||||
"armv7l-linux": "aaf4c2e562a0c9bbcaf72cd652531376d31cbe9745a4e811b904e32448a3bd8b",
|
||||
"headers": "1whlam8s7n8rz46z3s4mq41079zd5jkkdk4xrppzkgpmcz98rzq1",
|
||||
"x86_64-darwin": "c9721607e7c6e86986d05bf9bf3ea9674b1409516aa1a6956d0c8537a4995fa2",
|
||||
"x86_64-linux": "6377a8be4424a1469f54ecc68d64b757d16b55c9f942eae97149610e1347588f"
|
||||
},
|
||||
"version": "33.4.3"
|
||||
"version": "33.4.5"
|
||||
},
|
||||
"34": {
|
||||
"hashes": {
|
||||
"aarch64-darwin": "c9b82c9f381742e839fea00aeb14f24519bcaf38a0f4eed25532191701f9535b",
|
||||
"aarch64-linux": "1cabad4f3303ac2ff172a9f22185f64944dbaa6fc68271609077158eaefdee35",
|
||||
"armv7l-linux": "4213ce52c72ef414179b5c5c22ae8423847ff030d438296bd6c2aac763930a7b",
|
||||
"headers": "0qzvyqr3jy5bkfv9rwngqjad0gbq1f399d077y4vad5i0mrpqn61",
|
||||
"x86_64-darwin": "d556c1e2b06f1bf131e83c2fb981de755c28e1083a884d257eb964815be16b0c",
|
||||
"x86_64-linux": "3c64c08221fdfc0f4be60ea8b1b126f2ecca45f60001b63778522f711022c6ea"
|
||||
"aarch64-darwin": "aa80917205c7bf0c3fa01c4c9246415d1668836ba8244509e495d67fa197f383",
|
||||
"aarch64-linux": "6c99a95b2c9fc98636678c44477f11c39e2603d93211f41e788442445a210020",
|
||||
"armv7l-linux": "b1c0ebc724e8e833201b23348477f348086cfd102879d6c1cc8269f72e177d72",
|
||||
"headers": "0a41rnr2fbhrqgxzhglvm3xxznhh01zhl92qmdz2r9kj352lm4bl",
|
||||
"x86_64-darwin": "7ba6b42a5fba86391c3f496db885fd240b22e8fa80790747a11697dab80ef099",
|
||||
"x86_64-linux": "999fb44c5877b34da0ee6e24eb0ce74e521ed47e84db107b6037488ec51d45f1"
|
||||
},
|
||||
"version": "34.3.2"
|
||||
"version": "34.3.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
"src": {
|
||||
"fetcher": "fetchFromGitiles",
|
||||
"hash": "sha256-hJZWDT7D2YP75CQJwYNqnMTvLyMIF3wS2yJaRuUiOhY=",
|
||||
"postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
|
||||
"postFetch": "rm -r $out/third_party/blink/web_tests; rm -rf $out/third_party/hunspell/tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
|
||||
"rev": "130.0.6723.191",
|
||||
"url": "https://chromium.googlesource.com/chromium/src.git"
|
||||
},
|
||||
@@ -47,10 +47,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"hash": "sha256-/tGxWvyqwb0TWli2JkFDiyrqAm6DF5JHD7NfC1XTa8I=",
|
||||
"hash": "sha256-jumOmlCUiRRR0ubLuVRGl5E2lwbID5C0JYJ2+gJUrA8=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"rev": "v33.4.3"
|
||||
"rev": "v33.4.5"
|
||||
},
|
||||
"src/media/cdm/api": {
|
||||
"fetcher": "fetchFromGitiles",
|
||||
@@ -950,7 +950,7 @@
|
||||
"electron_yarn_hash": "0bzsswcg62b39xinq5vikk7qz7d15276s2vc15v1gcb5wvh05ff8",
|
||||
"modules": "130",
|
||||
"node": "20.18.3",
|
||||
"version": "33.4.3"
|
||||
"version": "33.4.5"
|
||||
},
|
||||
"34": {
|
||||
"chrome": "132.0.6834.210",
|
||||
@@ -1000,10 +1000,10 @@
|
||||
},
|
||||
"src/electron": {
|
||||
"fetcher": "fetchFromGitHub",
|
||||
"hash": "sha256-HQ2RHDTG0DaZ54j6Il9Ajez8dBIg1zwG71/yOQg7o0s=",
|
||||
"hash": "sha256-mOrKKuUkfTDjLxNvjlvHS5NP4NjdgaIdS4xgWKJBET8=",
|
||||
"owner": "electron",
|
||||
"repo": "electron",
|
||||
"rev": "v34.3.2"
|
||||
"rev": "v34.3.3"
|
||||
},
|
||||
"src/media/cdm/api": {
|
||||
"fetcher": "fetchFromGitiles",
|
||||
@@ -1915,6 +1915,6 @@
|
||||
"electron_yarn_hash": "10ny8cj2m8wn8zb5ljsfc8rpv6y4rp049zv5i5slyk3lj2zpgr6y",
|
||||
"modules": "132",
|
||||
"node": "20.18.3",
|
||||
"version": "34.3.2"
|
||||
"version": "34.3.3"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,8 +16,8 @@ let
|
||||
hash = "sha256-HBjZi6W/BzT8fij2yPG0OxvNhmd33s3igdFIWTkGA/w=";
|
||||
};
|
||||
"10" = {
|
||||
version = "10.6.2";
|
||||
hash = "sha256-IAcqH27dF2RuqSNL8yxC1WPa03spc+l6Ld5cF3dKgk0=";
|
||||
version = "10.6.3";
|
||||
hash = "sha256-vB7+ku5NQLGnpkTlyp4YVcXF6vxrFRL5AXsxuSRUGds=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user