Merge staging-next into staging
This commit is contained in:
commit
6c87856002
@ -6571,6 +6571,11 @@
|
||||
githubId = 541748;
|
||||
name = "Felipe Espinoza";
|
||||
};
|
||||
feathecutie = {
|
||||
name = "feathecutie";
|
||||
github = "feathecutie";
|
||||
githubId = 53912746;
|
||||
};
|
||||
fedx-sudo = {
|
||||
email = "fedx-sudo@pm.me";
|
||||
github = "FedX-sudo";
|
||||
|
@ -70,6 +70,8 @@
|
||||
|
||||
- [Apache Tika](https://github.com/apache/tika), a toolkit that detects and extracts metadata and text from over a thousand different file types. Available as [services.tika](option.html#opt-services.tika).
|
||||
|
||||
- [Misskey](https://misskey-hub.net/en/), an interplanetary microblogging platform. Available as [services.misskey](options.html#opt-services.misskey).
|
||||
|
||||
- [Improved File Manager](https://github.com/misterunknown/ifm), or IFM, a single-file web-based file manager.
|
||||
|
||||
- [OpenGFW](https://github.com/apernet/OpenGFW), an implementation of the Great Firewall on Linux. Available as [services.opengfw](#opt-services.opengfw.enable).
|
||||
|
@ -302,7 +302,6 @@ in
|
||||
|
||||
trusted-users = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [ "root" ];
|
||||
example = [ "root" "alice" "@wheel" ];
|
||||
description = ''
|
||||
A list of names of users that have additional rights when
|
||||
@ -376,6 +375,7 @@ in
|
||||
environment.etc."nix/nix.conf".source = nixConf;
|
||||
nix.settings = {
|
||||
trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
|
||||
trusted-users = [ "root" ];
|
||||
substituters = mkAfter [ "https://cache.nixos.org/" ];
|
||||
system-features = mkDefault (
|
||||
[ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++
|
||||
|
@ -1438,6 +1438,7 @@
|
||||
./services/web-apps/meme-bingo-web.nix
|
||||
./services/web-apps/microbin.nix
|
||||
./services/web-apps/miniflux.nix
|
||||
./services/web-apps/misskey.nix
|
||||
./services/web-apps/monica.nix
|
||||
./services/web-apps/moodle.nix
|
||||
./services/web-apps/movim.nix
|
||||
|
@ -125,7 +125,7 @@ with lib;
|
||||
'';
|
||||
|
||||
# allow nix-copy to live system
|
||||
nix.settings.trusted-users = [ "root" "nixos" ];
|
||||
nix.settings.trusted-users = [ "nixos" ];
|
||||
|
||||
# Install less voices for speechd to save some space
|
||||
services.speechd.package = pkgs.speechd.override {
|
||||
|
@ -123,7 +123,7 @@ in
|
||||
|
||||
max-free = cfg.max-free;
|
||||
|
||||
trusted-users = [ "root" user ];
|
||||
trusted-users = [ user ];
|
||||
};
|
||||
|
||||
services = {
|
||||
|
418
nixos/modules/services/web-apps/misskey.nix
Normal file
418
nixos/modules/services/web-apps/misskey.nix
Normal file
@ -0,0 +1,418 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
cfg = config.services.misskey;
|
||||
settingsFormat = pkgs.formats.yaml { };
|
||||
redisType = lib.types.submodule {
|
||||
freeformType = lib.types.attrsOf settingsFormat.type;
|
||||
options = {
|
||||
host = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "localhost";
|
||||
description = "The Redis host.";
|
||||
};
|
||||
port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 6379;
|
||||
description = "The Redis port.";
|
||||
};
|
||||
};
|
||||
};
|
||||
settings = lib.mkOption {
|
||||
description = ''
|
||||
Configuration for Misskey, see
|
||||
[`example.yml`](https://github.com/misskey-dev/misskey/blob/develop/.config/example.yml)
|
||||
for all supported options.
|
||||
'';
|
||||
type = lib.types.submodule {
|
||||
freeformType = lib.types.attrsOf settingsFormat.type;
|
||||
options = {
|
||||
url = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
example = "https://example.tld/";
|
||||
description = ''
|
||||
The final user-facing URL. Do not change after running Misskey for the first time.
|
||||
|
||||
This needs to match up with the configured reverse proxy and is automatically configured when using `services.misskey.reverseProxy`.
|
||||
'';
|
||||
};
|
||||
port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 3000;
|
||||
description = "The port your Misskey server should listen on.";
|
||||
};
|
||||
socket = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
example = "/path/to/misskey.sock";
|
||||
description = "The UNIX socket your Misskey server should listen on.";
|
||||
};
|
||||
chmodSocket = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
example = "777";
|
||||
description = "The file access mode of the UNIX socket.";
|
||||
};
|
||||
db = lib.mkOption {
|
||||
description = "Database settings.";
|
||||
type = lib.types.submodule {
|
||||
options = {
|
||||
host = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "/var/run/postgresql";
|
||||
example = "localhost";
|
||||
description = "The PostgreSQL host.";
|
||||
};
|
||||
port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 5432;
|
||||
description = "The PostgreSQL port.";
|
||||
};
|
||||
db = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "misskey";
|
||||
description = "The database name.";
|
||||
};
|
||||
user = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "misskey";
|
||||
description = "The user used for database authentication.";
|
||||
};
|
||||
pass = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
description = "The password used for database authentication.";
|
||||
};
|
||||
disableCache = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Whether to disable caching queries.";
|
||||
};
|
||||
extra = lib.mkOption {
|
||||
type = lib.types.nullOr (lib.types.attrsOf settingsFormat.type);
|
||||
default = null;
|
||||
example = {
|
||||
ssl = true;
|
||||
};
|
||||
description = "Extra connection options.";
|
||||
};
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
};
|
||||
redis = lib.mkOption {
|
||||
type = redisType;
|
||||
default = { };
|
||||
description = "`ioredis` options. See [`README`](https://github.com/redis/ioredis?tab=readme-ov-file#connect-to-redis) for reference.";
|
||||
};
|
||||
redisForPubsub = lib.mkOption {
|
||||
type = lib.types.nullOr redisType;
|
||||
default = null;
|
||||
description = "`ioredis` options for pubsub. See [`README`](https://github.com/redis/ioredis?tab=readme-ov-file#connect-to-redis) for reference.";
|
||||
};
|
||||
redisForJobQueue = lib.mkOption {
|
||||
type = lib.types.nullOr redisType;
|
||||
default = null;
|
||||
description = "`ioredis` options for the job queue. See [`README`](https://github.com/redis/ioredis?tab=readme-ov-file#connect-to-redis) for reference.";
|
||||
};
|
||||
redisForTimelines = lib.mkOption {
|
||||
type = lib.types.nullOr redisType;
|
||||
default = null;
|
||||
description = "`ioredis` options for timelines. See [`README`](https://github.com/redis/ioredis?tab=readme-ov-file#connect-to-redis) for reference.";
|
||||
};
|
||||
meilisearch = lib.mkOption {
|
||||
description = "Meilisearch connection options.";
|
||||
type = lib.types.nullOr (
|
||||
lib.types.submodule {
|
||||
options = {
|
||||
host = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "localhost";
|
||||
description = "The Meilisearch host.";
|
||||
};
|
||||
port = lib.mkOption {
|
||||
type = lib.types.port;
|
||||
default = 7700;
|
||||
description = "The Meilisearch port.";
|
||||
};
|
||||
apiKey = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
description = "The Meilisearch API key.";
|
||||
};
|
||||
ssl = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Whether to connect via SSL.";
|
||||
};
|
||||
index = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
description = "Meilisearch index to use.";
|
||||
};
|
||||
scope = lib.mkOption {
|
||||
type = lib.types.enum [
|
||||
"local"
|
||||
"global"
|
||||
];
|
||||
default = "local";
|
||||
description = "The search scope.";
|
||||
};
|
||||
};
|
||||
}
|
||||
);
|
||||
default = null;
|
||||
};
|
||||
id = lib.mkOption {
|
||||
type = lib.types.enum [
|
||||
"aid"
|
||||
"aidx"
|
||||
"meid"
|
||||
"ulid"
|
||||
"objectid"
|
||||
];
|
||||
default = "aidx";
|
||||
description = "The ID generation method to use. Do not change after starting Misskey for the first time.";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
{
|
||||
options = {
|
||||
services.misskey = {
|
||||
enable = lib.mkEnableOption "misskey";
|
||||
package = lib.mkPackageOption pkgs "misskey" { };
|
||||
inherit settings;
|
||||
database = {
|
||||
createLocally = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Create the PostgreSQL database locally. Sets `services.misskey.settings.db.{db,host,port,user,pass}`.";
|
||||
};
|
||||
passwordFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
description = "The path to a file containing the database password. Sets `services.misskey.settings.db.pass`.";
|
||||
};
|
||||
};
|
||||
redis = {
|
||||
createLocally = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Create and use a local Redis instance. Sets `services.misskey.settings.redis.host`.";
|
||||
};
|
||||
passwordFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
description = "The path to a file containing the Redis password. Sets `services.misskey.settings.redis.pass`.";
|
||||
};
|
||||
};
|
||||
meilisearch = {
|
||||
createLocally = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = "Create and use a local Meilisearch instance. Sets `services.misskey.settings.meilisearch.{host,port,ssl}`.";
|
||||
};
|
||||
keyFile = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
default = null;
|
||||
description = "The path to a file containing the Meilisearch API key. Sets `services.misskey.settings.meilisearch.apiKey`.";
|
||||
};
|
||||
};
|
||||
reverseProxy = {
|
||||
enable = lib.mkEnableOption "a HTTP reverse proxy for Misskey";
|
||||
webserver = lib.mkOption {
|
||||
type = lib.types.attrTag {
|
||||
nginx = lib.mkOption {
|
||||
type = lib.types.submodule (import ../web-servers/nginx/vhost-options.nix);
|
||||
default = { };
|
||||
description = ''
|
||||
Extra configuration for the nginx virtual host of Misskey.
|
||||
Set to `{ }` to use the default configuration.
|
||||
'';
|
||||
};
|
||||
caddy = lib.mkOption {
|
||||
type = lib.types.submodule (
|
||||
import ../web-servers/caddy/vhost-options.nix { cfg = config.services.caddy; }
|
||||
);
|
||||
default = { };
|
||||
description = ''
|
||||
Extra configuration for the caddy virtual host of Misskey.
|
||||
Set to `{ }` to use the default configuration.
|
||||
'';
|
||||
};
|
||||
};
|
||||
description = "The webserver to use as the reverse proxy.";
|
||||
};
|
||||
host = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
description = ''
|
||||
The fully qualified domain name to bind to. Sets `services.misskey.settings.url`.
|
||||
|
||||
This is required when using `services.misskey.reverseProxy.enable = true`.
|
||||
'';
|
||||
example = "misskey.example.com";
|
||||
default = null;
|
||||
};
|
||||
ssl = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.bool;
|
||||
description = ''
|
||||
Whether to enable SSL for the reverse proxy. Sets `services.misskey.settings.url`.
|
||||
|
||||
This is required when using `services.misskey.reverseProxy.enable = true`.
|
||||
'';
|
||||
example = true;
|
||||
default = null;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion =
|
||||
cfg.reverseProxy.enable -> ((cfg.reverseProxy.host != null) && (cfg.reverseProxy.ssl != null));
|
||||
message = "`services.misskey.reverseProxy.enable` requires `services.misskey.reverseProxy.host` and `services.misskey.reverseProxy.ssl` to be set.";
|
||||
}
|
||||
];
|
||||
|
||||
services.misskey.settings = lib.mkMerge [
|
||||
(lib.mkIf cfg.database.createLocally {
|
||||
db = {
|
||||
db = lib.mkDefault "misskey";
|
||||
# Use unix socket instead of localhost to allow PostgreSQL peer authentication,
|
||||
# required for `services.postgresql.ensureUsers`
|
||||
host = lib.mkDefault "/var/run/postgresql";
|
||||
port = lib.mkDefault config.services.postgresql.settings.port;
|
||||
user = lib.mkDefault "misskey";
|
||||
pass = lib.mkDefault null;
|
||||
};
|
||||
})
|
||||
(lib.mkIf (cfg.database.passwordFile != null) { db.pass = lib.mkDefault "@DATABASE_PASSWORD@"; })
|
||||
(lib.mkIf cfg.redis.createLocally { redis.host = lib.mkDefault "localhost"; })
|
||||
(lib.mkIf (cfg.redis.passwordFile != null) { redis.pass = lib.mkDefault "@REDIS_PASSWORD@"; })
|
||||
(lib.mkIf cfg.meilisearch.createLocally {
|
||||
meilisearch = {
|
||||
host = lib.mkDefault "localhost";
|
||||
port = lib.mkDefault config.services.meilisearch.listenPort;
|
||||
ssl = lib.mkDefault false;
|
||||
};
|
||||
})
|
||||
(lib.mkIf (cfg.meilisearch.keyFile != null) {
|
||||
meilisearch.apiKey = lib.mkDefault "@MEILISEARCH_KEY@";
|
||||
})
|
||||
(lib.mkIf cfg.reverseProxy.enable {
|
||||
url = lib.mkDefault "${
|
||||
if cfg.reverseProxy.ssl then "https" else "http"
|
||||
}://${cfg.reverseProxy.host}";
|
||||
})
|
||||
];
|
||||
|
||||
systemd.services.misskey = {
|
||||
after = [
|
||||
"network-online.target"
|
||||
"postgresql.service"
|
||||
];
|
||||
wants = [ "network-online.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
environment = {
|
||||
MISSKEY_CONFIG_YML = "/run/misskey/default.yml";
|
||||
};
|
||||
preStart =
|
||||
''
|
||||
install -m 700 ${settingsFormat.generate "misskey-config.yml" cfg.settings} /run/misskey/default.yml
|
||||
''
|
||||
+ (lib.optionalString (cfg.database.passwordFile != null) ''
|
||||
${pkgs.replace-secret}/bin/replace-secret '@DATABASE_PASSWORD@' "${cfg.database.passwordFile}" /run/misskey/default.yml
|
||||
'')
|
||||
+ (lib.optionalString (cfg.redis.passwordFile != null) ''
|
||||
${pkgs.replace-secret}/bin/replace-secret '@REDIS_PASSWORD@' "${cfg.redis.passwordFile}" /run/misskey/default.yml
|
||||
'')
|
||||
+ (lib.optionalString (cfg.meilisearch.keyFile != null) ''
|
||||
${pkgs.replace-secret}/bin/replace-secret '@MEILISEARCH_KEY@' "${cfg.meilisearch.keyFile}" /run/misskey/default.yml
|
||||
'');
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/misskey migrateandstart";
|
||||
RuntimeDirectory = "misskey";
|
||||
RuntimeDirectoryMode = "700";
|
||||
StateDirectory = "misskey";
|
||||
StateDirectoryMode = "700";
|
||||
TimeoutSec = 60;
|
||||
DynamicUser = true;
|
||||
User = "misskey";
|
||||
LockPersonality = true;
|
||||
PrivateDevices = true;
|
||||
PrivateUsers = true;
|
||||
ProtectClock = true;
|
||||
ProtectControlGroups = true;
|
||||
ProtectHome = true;
|
||||
ProtectHostname = true;
|
||||
ProtectKernelLogs = true;
|
||||
ProtectProc = "invisible";
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX AF_NETLINK";
|
||||
};
|
||||
};
|
||||
|
||||
services.postgresql = lib.mkIf cfg.database.createLocally {
|
||||
enable = true;
|
||||
ensureDatabases = [ "misskey" ];
|
||||
ensureUsers = [
|
||||
{
|
||||
name = "misskey";
|
||||
ensureDBOwnership = true;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
services.redis.servers = lib.mkIf cfg.redis.createLocally {
|
||||
misskey = {
|
||||
enable = true;
|
||||
port = cfg.settings.redis.port;
|
||||
};
|
||||
};
|
||||
|
||||
services.meilisearch = lib.mkIf cfg.meilisearch.createLocally { enable = true; };
|
||||
|
||||
services.caddy = lib.mkIf (cfg.reverseProxy.enable && cfg.reverseProxy.webserver ? caddy) {
|
||||
enable = true;
|
||||
virtualHosts.${cfg.settings.url} = lib.mkMerge [
|
||||
cfg.reverseProxy.webserver.caddy
|
||||
{
|
||||
hostName = lib.mkDefault cfg.settings.url;
|
||||
extraConfig = ''
|
||||
reverse_proxy localhost:${toString cfg.settings.port}
|
||||
'';
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
services.nginx = lib.mkIf (cfg.reverseProxy.enable && cfg.reverseProxy.webserver ? nginx) {
|
||||
enable = true;
|
||||
virtualHosts.${cfg.reverseProxy.host} = lib.mkMerge [
|
||||
cfg.reverseProxy.webserver.nginx
|
||||
{
|
||||
locations."/" = {
|
||||
proxyPass = lib.mkDefault "http://localhost:${toString cfg.settings.port}";
|
||||
proxyWebsockets = lib.mkDefault true;
|
||||
recommendedProxySettings = lib.mkDefault true;
|
||||
};
|
||||
}
|
||||
(lib.mkIf (cfg.reverseProxy.ssl != null) { forceSSL = lib.mkDefault cfg.reverseProxy.ssl; })
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
maintainers = [ lib.maintainers.feathecutie ];
|
||||
};
|
||||
}
|
@ -48,6 +48,7 @@ class BootSpec:
|
||||
toplevel: str
|
||||
specialisations: dict[str, "BootSpec"]
|
||||
sortKey: str # noqa: N815
|
||||
devicetree: str | None = None # noqa: N815
|
||||
initrdSecrets: str | None = None # noqa: N815
|
||||
|
||||
@dataclass
|
||||
@ -85,6 +86,7 @@ class DiskEntry:
|
||||
kernel_params: str | None
|
||||
machine_id: str | None
|
||||
sort_key: str
|
||||
devicetree: str | None
|
||||
|
||||
@classmethod
|
||||
def from_path(cls: Type["DiskEntry"], path: Path) -> "DiskEntry":
|
||||
@ -109,7 +111,9 @@ class DiskEntry:
|
||||
initrd=entry_map["initrd"],
|
||||
kernel_params=entry_map.get("options"),
|
||||
machine_id=entry_map.get("machine-id"),
|
||||
sort_key=entry_map.get("sort_key", "nixos"))
|
||||
sort_key=entry_map.get("sort_key", "nixos"),
|
||||
devicetree=entry_map.get("devicetree"),
|
||||
)
|
||||
return disk_entry
|
||||
|
||||
def write(self, sorted_first: str) -> None:
|
||||
@ -128,7 +132,8 @@ class DiskEntry:
|
||||
f"initrd {self.initrd}",
|
||||
f"options {self.kernel_params}" if self.kernel_params is not None else None,
|
||||
f"machine-id {self.machine_id}" if self.machine_id is not None else None,
|
||||
f"sort-key {default_sort_key if self.default else self.sort_key}"
|
||||
f"sort-key {default_sort_key if self.default else self.sort_key}",
|
||||
f"devicetree {self.devicetree}" if self.devicetree is not None else None,
|
||||
]
|
||||
|
||||
f.write("\n".join(filter(None, boot_entry)))
|
||||
@ -236,10 +241,12 @@ def bootspec_from_json(bootspec_json: dict[str, Any]) -> BootSpec:
|
||||
specialisations = {k: bootspec_from_json(v) for k, v in specialisations.items()}
|
||||
systemdBootExtension = bootspec_json.get('org.nixos.systemd-boot', {})
|
||||
sortKey = systemdBootExtension.get('sortKey', 'nixos')
|
||||
devicetree = systemdBootExtension.get('devicetree')
|
||||
return BootSpec(
|
||||
**bootspec_json['org.nixos.bootspec.v1'],
|
||||
specialisations=specialisations,
|
||||
sortKey=sortKey
|
||||
sortKey=sortKey,
|
||||
devicetree=devicetree,
|
||||
)
|
||||
|
||||
|
||||
@ -264,6 +271,7 @@ def write_entry(profile: str | None,
|
||||
bootspec = bootspec.specialisations[specialisation]
|
||||
kernel = copy_from_file(bootspec.kernel)
|
||||
initrd = copy_from_file(bootspec.initrd)
|
||||
devicetree = copy_from_file(bootspec.devicetree) if bootspec.devicetree is not None else None
|
||||
|
||||
title = "{name}{profile}{specialisation}".format(
|
||||
name=DISTRO_NAME,
|
||||
@ -306,6 +314,7 @@ def write_entry(profile: str | None,
|
||||
machine_id=machine_id,
|
||||
description=f"Generation {generation} {bootspec.label}, built on {build_date}",
|
||||
sort_key=bootspec.sortKey,
|
||||
devicetree=devicetree,
|
||||
default=current
|
||||
).write(sorted_first)
|
||||
|
||||
|
@ -191,6 +191,15 @@ in {
|
||||
'';
|
||||
};
|
||||
|
||||
installDeviceTree = mkOption {
|
||||
default = with config.hardware.deviceTree; enable && name != null;
|
||||
defaultText = ''with config.hardware.deviceTree; enable && name != null'';
|
||||
description = ''
|
||||
Install the devicetree blob specified by `config.hardware.deviceTree.name`
|
||||
to the ESP and instruct systemd-boot to pass this DTB to linux.
|
||||
'';
|
||||
};
|
||||
|
||||
extraInstallCommands = mkOption {
|
||||
default = "";
|
||||
example = ''
|
||||
@ -369,6 +378,10 @@ in {
|
||||
assertion = (config.boot.kernelPackages.kernel.features or { efiBootStub = true; }) ? efiBootStub;
|
||||
message = "This kernel does not support the EFI boot stub";
|
||||
}
|
||||
{
|
||||
assertion = cfg.installDeviceTree -> config.hardware.deviceTree.enable -> config.hardware.deviceTree.name != null;
|
||||
message = "Cannot install devicetree without 'config.hardware.deviceTree.enable' enabled and 'config.hardware.deviceTree.name' set";
|
||||
}
|
||||
] ++ concatMap (filename: [
|
||||
{
|
||||
assertion = !(hasInfix "/" filename);
|
||||
@ -426,6 +439,7 @@ in {
|
||||
|
||||
boot.bootspec.extensions."org.nixos.systemd-boot" = {
|
||||
inherit (config.boot.loader.systemd-boot) sortKey;
|
||||
devicetree = lib.mkIf cfg.installDeviceTree "${config.hardware.deviceTree.package}/${config.hardware.deviceTree.name}";
|
||||
};
|
||||
|
||||
system = {
|
||||
|
@ -584,6 +584,7 @@ in {
|
||||
miracle-wm = runTest ./miracle-wm.nix;
|
||||
miriway = handleTest ./miriway.nix {};
|
||||
misc = handleTest ./misc.nix {};
|
||||
misskey = handleTest ./misskey.nix {};
|
||||
mjolnir = handleTest ./matrix/mjolnir.nix {};
|
||||
mobilizon = handleTest ./mobilizon.nix {};
|
||||
mod_perl = handleTest ./mod_perl.nix {};
|
||||
|
29
nixos/tests/misskey.nix
Normal file
29
nixos/tests/misskey.nix
Normal file
@ -0,0 +1,29 @@
|
||||
import ./make-test-python.nix (
|
||||
{ lib, ... }:
|
||||
let
|
||||
port = 61812;
|
||||
in
|
||||
{
|
||||
name = "misskey";
|
||||
|
||||
meta.maintainers = [ lib.maintainers.feathecutie ];
|
||||
|
||||
nodes.machine = {
|
||||
services.misskey = {
|
||||
enable = true;
|
||||
settings = {
|
||||
url = "http://misskey.local";
|
||||
inherit port;
|
||||
};
|
||||
database.createLocally = true;
|
||||
redis.createLocally = true;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("misskey.service")
|
||||
machine.wait_for_open_port(${toString port})
|
||||
machine.succeed("curl --fail http://localhost:${toString port}/")
|
||||
'';
|
||||
}
|
||||
)
|
@ -172,10 +172,23 @@ rec {
|
||||
imports = [ common ];
|
||||
specialisation.something.configuration = {
|
||||
boot.loader.systemd-boot.sortKey = "something";
|
||||
|
||||
# Since qemu will dynamically create a devicetree blob when starting
|
||||
# up, it is not straight forward to create an export of that devicetree
|
||||
# blob without knowing before-hand all the flags we would pass to qemu
|
||||
# (we would then be able to use `dumpdtb`). Thus, the following config
|
||||
# will not boot, but it does allow us to assert that the boot entry has
|
||||
# the correct contents.
|
||||
boot.loader.systemd-boot.installDeviceTree = pkgs.stdenv.hostPlatform.isAarch64;
|
||||
hardware.deviceTree.name = "dummy.dtb";
|
||||
hardware.deviceTree.package = lib.mkForce (pkgs.runCommand "dummy-devicetree-package" { } ''
|
||||
mkdir -p $out
|
||||
cp ${pkgs.emptyFile} $out/dummy.dtb
|
||||
'');
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
testScript = { nodes, ... }: ''
|
||||
machine.start()
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
|
||||
@ -188,6 +201,10 @@ rec {
|
||||
machine.succeed(
|
||||
"grep 'sort-key something' /boot/loader/entries/nixos-generation-1-specialisation-something.conf"
|
||||
)
|
||||
'' + pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isAarch64 ''
|
||||
machine.succeed(
|
||||
"grep 'devicetree .*dummy' /boot/loader/entries/nixos-generation-1-specialisation-something.conf"
|
||||
)
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -12,7 +12,7 @@
|
||||
"new": "vim-fern"
|
||||
},
|
||||
"gina-vim": {
|
||||
"date": "2024-07-27",
|
||||
"date": "2024-08-05",
|
||||
"new": "vim-gina"
|
||||
},
|
||||
"gist-vim": {
|
||||
@ -60,7 +60,7 @@
|
||||
"new": "vim-suda"
|
||||
},
|
||||
"vim-fsharp": {
|
||||
"date": "2024-07-27",
|
||||
"date": "2024-08-05",
|
||||
"new": "zarchive-vim-fsharp"
|
||||
},
|
||||
"vim-jade": {
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -191,17 +191,6 @@
|
||||
};
|
||||
meta.homepage = "https://github.com/ambroisie/tree-sitter-bp";
|
||||
};
|
||||
bqn = buildGrammar {
|
||||
language = "bpn";
|
||||
version = "0.0.0+rev=8c62b74";
|
||||
src = fetchFromGitHub {
|
||||
owner = "shnarazk";
|
||||
repo = "tree-sitter-bqn";
|
||||
rev = "8c62b746924398304c8fa1aa18393c3124d1e50d";
|
||||
hash = "sha256-jK0zn7DWzy2yfYOX1ZBoGOC7QBrcp4PHWnaOKaDL9ws=";
|
||||
};
|
||||
meta.homepage = "https://github.com/shnarazk/tree-sitter-bqn";
|
||||
};
|
||||
c = buildGrammar {
|
||||
language = "c";
|
||||
version = "0.0.0+rev=be23d2c";
|
||||
@ -370,12 +359,12 @@
|
||||
};
|
||||
cuda = buildGrammar {
|
||||
language = "cuda";
|
||||
version = "0.0.0+rev=07f2f15";
|
||||
version = "0.0.0+rev=7c97acb";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "tree-sitter-cuda";
|
||||
rev = "07f2f157d484a27dc91c04cc116f94f6fd4fc654";
|
||||
hash = "sha256-GWiSQzMHtXd0EESjC1a0l0O8Q7zx3gjvNy8YZw/U/Bk=";
|
||||
rev = "7c97acb8398734d790c86210c53c320df61ff66b";
|
||||
hash = "sha256-E5bXdBfCE1lP5GngZBZ4qn9kKPQYVDvdvE5UPMoUsas=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
|
||||
};
|
||||
@ -392,12 +381,12 @@
|
||||
};
|
||||
d = buildGrammar {
|
||||
language = "d";
|
||||
version = "0.0.0+rev=750dde9";
|
||||
version = "0.0.0+rev=ac58458";
|
||||
src = fetchFromGitHub {
|
||||
owner = "gdamore";
|
||||
repo = "tree-sitter-d";
|
||||
rev = "750dde90ed9cdbd82493bc28478d8ab1976b0e9f";
|
||||
hash = "sha256-Epw1QW4WS1le8OdQI0soO0VaDOgNveh7WTL4sol/cQU=";
|
||||
rev = "ac584585a15c4cacd6cda8e6bfe7cb1ca7b3898e";
|
||||
hash = "sha256-+6+9x+5pyjv252X3XzpN2CnrUXVzMvaCrCPVhhjEELo=";
|
||||
};
|
||||
meta.homepage = "https://github.com/gdamore/tree-sitter-d";
|
||||
};
|
||||
@ -933,12 +922,12 @@
|
||||
};
|
||||
gomod = buildGrammar {
|
||||
language = "gomod";
|
||||
version = "0.0.0+rev=bbe2fe3";
|
||||
version = "0.0.0+rev=1f55029";
|
||||
src = fetchFromGitHub {
|
||||
owner = "camdencheek";
|
||||
repo = "tree-sitter-go-mod";
|
||||
rev = "bbe2fe3be4b87e06a613e685250f473d2267f430";
|
||||
hash = "sha256-OPtqXe6OMC9c5dgFH8Msj+6DU01LvLKVbCzGLj0PnLI=";
|
||||
rev = "1f55029bacd0a6a11f6eb894c4312d429dcf735c";
|
||||
hash = "sha256-/sjC117YAFniFws4F/8+Q5Wrd4l4v4nBUaO9IdkixSE=";
|
||||
};
|
||||
meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod";
|
||||
};
|
||||
@ -999,12 +988,12 @@
|
||||
};
|
||||
groovy = buildGrammar {
|
||||
language = "groovy";
|
||||
version = "0.0.0+rev=3912291";
|
||||
version = "0.0.0+rev=105ee34";
|
||||
src = fetchFromGitHub {
|
||||
owner = "murtaza64";
|
||||
repo = "tree-sitter-groovy";
|
||||
rev = "391229139d9f79879ccc84cb271889c9240c28a1";
|
||||
hash = "sha256-AtA6249CHaOYQGgYfaECFESmJi9Wq+iFC58rHSh5x9M=";
|
||||
rev = "105ee343682b7eee86b38ec6858a269e16474a72";
|
||||
hash = "sha256-HYb3TXMSC+Zfss+vqgdSxsB35tqPmc6GNMWuFof9e5g=";
|
||||
};
|
||||
meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy";
|
||||
};
|
||||
@ -1110,12 +1099,12 @@
|
||||
};
|
||||
hlsl = buildGrammar {
|
||||
language = "hlsl";
|
||||
version = "0.0.0+rev=80517ca";
|
||||
version = "0.0.0+rev=81dbfa4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "tree-sitter-hlsl";
|
||||
rev = "80517ca13317fb8591503c0d99f2ad76e8979a72";
|
||||
hash = "sha256-3MoTDW0LyZd0wge7R5d+H7QG9zPBykXVE73eJEWMdK8=";
|
||||
rev = "81dbfa44a2e0f9e36d16f449fc792020e2f38426";
|
||||
hash = "sha256-uhCBhS68J6gxWxv/Ehk6OOo3/UMakf9Rrr3JnYAUD/s=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
|
||||
};
|
||||
@ -1176,23 +1165,23 @@
|
||||
};
|
||||
http = buildGrammar {
|
||||
language = "http";
|
||||
version = "0.0.0+rev=e061995";
|
||||
version = "0.0.0+rev=5ae6c7c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rest-nvim";
|
||||
repo = "tree-sitter-http";
|
||||
rev = "e061995f0caf2fa30f68fa1fdf2c08bcbd4629a8";
|
||||
hash = "sha256-zwPIO75l3OBmuWX1ABZNA6ZulJUtSsp3Xs7+dcnxLCo=";
|
||||
rev = "5ae6c7cfa62a7d7325c26171a1de4f6b866702b5";
|
||||
hash = "sha256-C1U0vyW237XB8eFNYcn7/FBsGlCLuIQoUSlFV8K5TsM=";
|
||||
};
|
||||
meta.homepage = "https://github.com/rest-nvim/tree-sitter-http";
|
||||
};
|
||||
hurl = buildGrammar {
|
||||
language = "hurl";
|
||||
version = "0.0.0+rev=ad705af";
|
||||
version = "0.0.0+rev=fba6ed8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "pfeiferj";
|
||||
repo = "tree-sitter-hurl";
|
||||
rev = "ad705af8c44c737bdb965fc081329c50716d2d03";
|
||||
hash = "sha256-Pdk7wGaTtQHola+Ek5a7pLBfRUEJfgx+nSunh7/c13I=";
|
||||
rev = "fba6ed8db3a009b9e7d656511931b181a3ee5b08";
|
||||
hash = "sha256-JWFEk1R19YIeDNm3LkBmdL+mmfhtBDhHfg6GESwruU0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/pfeiferj/tree-sitter-hurl";
|
||||
};
|
||||
@ -1363,12 +1352,12 @@
|
||||
};
|
||||
just = buildGrammar {
|
||||
language = "just";
|
||||
version = "0.0.0+rev=379fbe3";
|
||||
version = "0.0.0+rev=6648ac1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "IndianBoy42";
|
||||
repo = "tree-sitter-just";
|
||||
rev = "379fbe36d1e441bc9414ea050ad0c85c9d6935ea";
|
||||
hash = "sha256-rJXgKNYnAjpAh+1dfYH9W6v5t457ROLtjqU3ndzvjr8=";
|
||||
rev = "6648ac1c0cdadaec8ee8bcf9a4ca6ace5102cf21";
|
||||
hash = "sha256-EVISh9r+aJ6Og1UN8bGCLk4kVjS/cEOYyhqHF40ztqg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/IndianBoy42/tree-sitter-just";
|
||||
};
|
||||
@ -1396,12 +1385,12 @@
|
||||
};
|
||||
kotlin = buildGrammar {
|
||||
language = "kotlin";
|
||||
version = "0.0.0+rev=c9cb850";
|
||||
version = "0.0.0+rev=8d9d372";
|
||||
src = fetchFromGitHub {
|
||||
owner = "fwcd";
|
||||
repo = "tree-sitter-kotlin";
|
||||
rev = "c9cb8504b81684375e7beb8907517dbd6947a1be";
|
||||
hash = "sha256-fuEKCtCzaWOp0gKrsPMOW9oGOXnM2Qb652Nhn1lc1eA=";
|
||||
rev = "8d9d372b09fa4c3735657c5fc2ad03e53a5f05f5";
|
||||
hash = "sha256-uaoFBA8rLhlzmDQ9sCbBU5KRSb63k1DSa6VvmioRSNw=";
|
||||
};
|
||||
meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin";
|
||||
};
|
||||
@ -1440,12 +1429,12 @@
|
||||
};
|
||||
latex = buildGrammar {
|
||||
language = "latex";
|
||||
version = "0.0.0+rev=f074e14";
|
||||
version = "0.0.0+rev=efe5afd";
|
||||
src = fetchFromGitHub {
|
||||
owner = "latex-lsp";
|
||||
repo = "tree-sitter-latex";
|
||||
rev = "f074e142ade9cdc292346d0484be27f9ebdbc4ea";
|
||||
hash = "sha256-t6P+5RW426enWVFB/SPFHIIhXqshjKzmKQpOWfu0eQg=";
|
||||
rev = "efe5afdbb59b70214e6d70db5197dc945d5b213e";
|
||||
hash = "sha256-4sFqboyE94yvkZYKw5wgQjdVkNaIGLif3qB8GMCEBE0=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex";
|
||||
@ -1608,12 +1597,12 @@
|
||||
};
|
||||
matlab = buildGrammar {
|
||||
language = "matlab";
|
||||
version = "0.0.0+rev=821f7bd";
|
||||
version = "0.0.0+rev=0d5a05e";
|
||||
src = fetchFromGitHub {
|
||||
owner = "acristoffers";
|
||||
repo = "tree-sitter-matlab";
|
||||
rev = "821f7bdf9d922822302a0170c2f157e36ffb7a94";
|
||||
hash = "sha256-oaq1b/yBH+EOQZ8IW7j2f1nz66RFjXT45IGXz7B8pnY=";
|
||||
rev = "0d5a05e543af2de60cdb5e71f0f5888c95ab936f";
|
||||
hash = "sha256-B5BoHezwfUW156S5ixOGukjX+qFGLmS0WqxpT0MVNG8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab";
|
||||
};
|
||||
@ -1741,12 +1730,12 @@
|
||||
};
|
||||
nix = buildGrammar {
|
||||
language = "nix";
|
||||
version = "0.0.0+rev=0fdada1";
|
||||
version = "0.0.0+rev=68d3b79";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cstrahan";
|
||||
repo = "tree-sitter-nix";
|
||||
rev = "0fdada10f1f845ca9116e279ad8f5d0ca93e9949";
|
||||
hash = "sha256-hnY0lDF4S5W5DUJXNcXt2qySnCu16AgEiGmy/zQSzu4=";
|
||||
rev = "68d3b7999ad89d31690461884270e5658e0a22c4";
|
||||
hash = "sha256-EMkhmAGi2NPTeliGZyWo/UtYJnNJAkp04/LMs4DDF8s=";
|
||||
};
|
||||
meta.homepage = "https://github.com/cstrahan/tree-sitter-nix";
|
||||
};
|
||||
@ -1887,12 +1876,12 @@
|
||||
};
|
||||
perl = buildGrammar {
|
||||
language = "perl";
|
||||
version = "0.0.0+rev=7581cbf";
|
||||
version = "0.0.0+rev=3a21d9c";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tree-sitter-perl";
|
||||
repo = "tree-sitter-perl";
|
||||
rev = "7581cbf8fb793bce94d0241c89fe49b01b1477f9";
|
||||
hash = "sha256-iBr2KbfJWohjHXlFUGvVMg3xUAy78zPk2Kr3UsqXtUs=";
|
||||
rev = "3a21d9cb2a20a062c17f8f53d5983fd473c4673c";
|
||||
hash = "sha256-cBF3wvAl5PJCzjlTn1wx9+Q81xsitKW3+TwD0yAoWM4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl";
|
||||
};
|
||||
@ -1988,12 +1977,12 @@
|
||||
};
|
||||
powershell = buildGrammar {
|
||||
language = "powershell";
|
||||
version = "0.0.0+rev=804d86f";
|
||||
version = "0.0.0+rev=fc15514";
|
||||
src = fetchFromGitHub {
|
||||
owner = "airbus-cert";
|
||||
repo = "tree-sitter-powershell";
|
||||
rev = "804d86fd4ad286bd0cc1c1f0f7b28bd7af6755ad";
|
||||
hash = "sha256-W+v+Gj1KViIF+8wd9auy448hyxz0Uam5FpIpdjCzF/k=";
|
||||
rev = "fc15514b2f1dbba9c58528d15a3708f89eda6a01";
|
||||
hash = "sha256-StVnRNM0HPevLSRDIDr+Sakjo+NqXYWPPUFjI29Cowo=";
|
||||
};
|
||||
meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell";
|
||||
};
|
||||
@ -2021,24 +2010,24 @@
|
||||
};
|
||||
problog = buildGrammar {
|
||||
language = "problog";
|
||||
version = "0.0.0+rev=d8bc22c";
|
||||
version = "0.0.0+rev=93c69d2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "foxyseta";
|
||||
repo = "tree-sitter-prolog";
|
||||
rev = "d8bc22c007825d3af3d62b4326f9d8f9ca529974";
|
||||
hash = "sha256-Mpx5csjeRtYARD+nYbZjygOKfGKgvFUW0r2ZG7/2+Vo=";
|
||||
rev = "93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8";
|
||||
hash = "sha256-NWB4PvnVE+L1A7QDKcQtc15YIf8Ik7hKIOUW8XT/pFY=";
|
||||
};
|
||||
location = "grammars/problog";
|
||||
meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog";
|
||||
};
|
||||
prolog = buildGrammar {
|
||||
language = "prolog";
|
||||
version = "0.0.0+rev=d8bc22c";
|
||||
version = "0.0.0+rev=93c69d2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "foxyseta";
|
||||
repo = "tree-sitter-prolog";
|
||||
rev = "d8bc22c007825d3af3d62b4326f9d8f9ca529974";
|
||||
hash = "sha256-Mpx5csjeRtYARD+nYbZjygOKfGKgvFUW0r2ZG7/2+Vo=";
|
||||
rev = "93c69d2f84d8a167c0a3f4a8d51ccefe365a4dc8";
|
||||
hash = "sha256-NWB4PvnVE+L1A7QDKcQtc15YIf8Ik7hKIOUW8XT/pFY=";
|
||||
};
|
||||
location = "grammars/prolog";
|
||||
meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog";
|
||||
@ -2308,6 +2297,17 @@
|
||||
};
|
||||
meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-requirements";
|
||||
};
|
||||
rescript = buildGrammar {
|
||||
language = "rescript";
|
||||
version = "0.0.0+rev=4606cd8";
|
||||
src = fetchFromGitHub {
|
||||
owner = "rescript-lang";
|
||||
repo = "tree-sitter-rescript";
|
||||
rev = "4606cd81c4c31d1d02390fee530858323410a74c";
|
||||
hash = "sha256-md3fgW+h99va2Rwxzub7nrsEe64fC52g6NPCaXGAaxg=";
|
||||
};
|
||||
meta.homepage = "https://github.com/rescript-lang/tree-sitter-rescript";
|
||||
};
|
||||
rnoweb = buildGrammar {
|
||||
language = "rnoweb";
|
||||
version = "0.0.0+rev=1a74dc0";
|
||||
@ -2343,12 +2343,12 @@
|
||||
};
|
||||
roc = buildGrammar {
|
||||
language = "roc";
|
||||
version = "0.0.0+rev=6ea64b6";
|
||||
version = "0.0.0+rev=ef46edd";
|
||||
src = fetchFromGitHub {
|
||||
owner = "faldor20";
|
||||
repo = "tree-sitter-roc";
|
||||
rev = "6ea64b6434a45472bd87b0772fd84a017de0a557";
|
||||
hash = "sha256-lmrRGSwCg2QCaEbbDeHOHo3KcIq5slpQv2zb32L9n2M=";
|
||||
rev = "ef46edd0c03ea30a22f7e92bc68628fb7231dc8a";
|
||||
hash = "sha256-H76cnMlBT1Z/9WXAdoVslImkyy38uCqum9qEnH+Ics8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/faldor20/tree-sitter-roc";
|
||||
};
|
||||
@ -2443,12 +2443,12 @@
|
||||
};
|
||||
slang = buildGrammar {
|
||||
language = "slang";
|
||||
version = "0.0.0+rev=ea77a4d";
|
||||
version = "0.0.0+rev=d84b43d";
|
||||
src = fetchFromGitHub {
|
||||
owner = "theHamsta";
|
||||
repo = "tree-sitter-slang";
|
||||
rev = "ea77a4d91dd93f4483965efcc41f3faebb9131c8";
|
||||
hash = "sha256-X+fQoAe9VZekDERw55vz7viXtcVhuZxtAZDYlh4F4Tg=";
|
||||
rev = "d84b43d75d65bbc4ba57166ce17555f32c0b8983";
|
||||
hash = "sha256-KcFntOBXADBu7nSFQ5XVY6/nfSl2uLJfhsfVFFjudd8=";
|
||||
};
|
||||
meta.homepage = "https://github.com/theHamsta/tree-sitter-slang";
|
||||
};
|
||||
@ -2555,12 +2555,12 @@
|
||||
};
|
||||
sql = buildGrammar {
|
||||
language = "sql";
|
||||
version = "0.0.0+rev=a966446";
|
||||
version = "0.0.0+rev=b817500";
|
||||
src = fetchFromGitHub {
|
||||
owner = "derekstride";
|
||||
repo = "tree-sitter-sql";
|
||||
rev = "a9664463580473e92d8f5e29fa06fb1be88752af";
|
||||
hash = "sha256-0SY6dOofB+zv4xa7oXabEoUZd5NUV1NHhB+Jx6m137I=";
|
||||
rev = "b8175006d9c8120d41cf40a4ef3711bbbbc08973";
|
||||
hash = "sha256-idQB8Wqw7lvU192y7+UgFvcwlmY71/mu9jJ4hRc4ud4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
|
||||
};
|
||||
@ -2654,12 +2654,12 @@
|
||||
};
|
||||
swift = buildGrammar {
|
||||
language = "swift";
|
||||
version = "0.0.0+rev=b3dc8cc";
|
||||
version = "0.0.0+rev=769bb83";
|
||||
src = fetchFromGitHub {
|
||||
owner = "alex-pinkus";
|
||||
repo = "tree-sitter-swift";
|
||||
rev = "b3dc8cc5c266effd7bcfde01aa086b83927f2eda";
|
||||
hash = "sha256-GtOE80hjFsyFEVkpuxbpNt9vCHrbw2+WnQgyCKAU0jQ=";
|
||||
rev = "769bb834feb2947f2c706d82830b0a05958727de";
|
||||
hash = "sha256-Rqvk1dBEBAnQV/51MUSzgzX0J/pecwA5o8SBOfrvu+I=";
|
||||
};
|
||||
generate = true;
|
||||
meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
|
||||
@ -2913,12 +2913,12 @@
|
||||
};
|
||||
typespec = buildGrammar {
|
||||
language = "typespec";
|
||||
version = "0.0.0+rev=28821d0";
|
||||
version = "0.0.0+rev=0ee0554";
|
||||
src = fetchFromGitHub {
|
||||
owner = "happenslol";
|
||||
repo = "tree-sitter-typespec";
|
||||
rev = "28821d0d6da5f0a6b5eb02b9bad953fecafd7248";
|
||||
hash = "sha256-MzUcz6vnsakszAMJtTOajniFC72sCREdrMhS/zDa3Ng=";
|
||||
rev = "0ee05546d73d8eb64635ed8125de6f35c77759fe";
|
||||
hash = "sha256-qXA87soeEdlpzj8svEao8L0F5V14NSZc1WsX9z0PVB0=";
|
||||
};
|
||||
meta.homepage = "https://github.com/happenslol/tree-sitter-typespec";
|
||||
};
|
||||
@ -3069,12 +3069,12 @@
|
||||
};
|
||||
vim = buildGrammar {
|
||||
language = "vim";
|
||||
version = "0.0.0+rev=b448ca6";
|
||||
version = "0.0.0+rev=f3cd62d";
|
||||
src = fetchFromGitHub {
|
||||
owner = "neovim";
|
||||
repo = "tree-sitter-vim";
|
||||
rev = "b448ca63f972ade12c373c808acdd2bf972937db";
|
||||
hash = "sha256-wQQSeDzcSY9qNVgeDhrELS1x1UoilRa7iHML9qSgchY=";
|
||||
rev = "f3cd62d8bd043ef20507e84bb6b4b53731ccf3a7";
|
||||
hash = "sha256-KVaTJKU7r7zk57Fn9zl5s34oq8tsLkSRV3VHM6Q6F+s=";
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/tree-sitter-vim";
|
||||
};
|
||||
@ -3089,6 +3089,17 @@
|
||||
};
|
||||
meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc";
|
||||
};
|
||||
vrl = buildGrammar {
|
||||
language = "vrl";
|
||||
version = "0.0.0+rev=274b3ce";
|
||||
src = fetchFromGitHub {
|
||||
owner = "belltoy";
|
||||
repo = "tree-sitter-vrl";
|
||||
rev = "274b3ce63f72aa8ffea18e7fc280d3062d28f0ba";
|
||||
hash = "sha256-R+wuG8UkvGA11uTiiUAdzzgjRv1ik4W+qh3YwIREUd4=";
|
||||
};
|
||||
meta.homepage = "https://github.com/belltoy/tree-sitter-vrl";
|
||||
};
|
||||
vue = buildGrammar {
|
||||
language = "vue";
|
||||
version = "0.0.0+rev=22bdfa6";
|
||||
@ -3135,12 +3146,12 @@
|
||||
};
|
||||
wit = buildGrammar {
|
||||
language = "wit";
|
||||
version = "0.0.0+rev=cd7e653";
|
||||
version = "0.0.0+rev=c52f0b0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "liamwh";
|
||||
repo = "tree-sitter-wit";
|
||||
rev = "cd7e6534fd9a22e3e9a7a85feecf4e35461e47cb";
|
||||
hash = "sha256-/Lvo0YbdSaIoRFSm74kBQRM1sQTO3t9+OrxFK4/KyEo=";
|
||||
rev = "c52f0b07786603df17ad0197f6cef680f312eb2c";
|
||||
hash = "sha256-0MyRMippVOdb0RzyJQhPwX7GlWzFV9Z+/mghYuUW7NU=";
|
||||
};
|
||||
meta.homepage = "https://github.com/liamwh/tree-sitter-wit";
|
||||
};
|
||||
|
@ -1241,7 +1241,7 @@
|
||||
inherit (old) version src;
|
||||
sourceRoot = "${old.src.name}/spectre_oxi";
|
||||
|
||||
cargoHash = "sha256-J9L9j8iyeZQRMjiVqdI7V7BOAkZaiLGOtKDpgq2wyi0=";
|
||||
cargoHash = "sha256-D7KUJ8q521WWgUqBBOgepGJ3NQ4DdKr+Bg/4k3Lf+mw=";
|
||||
|
||||
preCheck = ''
|
||||
mkdir tests/tmp/
|
||||
|
@ -1625,8 +1625,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "elixir-ls";
|
||||
publisher = "JakeBecker";
|
||||
version = "0.22.1";
|
||||
hash = "sha256-zi+Rcy63AUqDnVZCbPuljs+aBHsyOTHgbiJ+h9dB9us=";
|
||||
version = "0.23.0";
|
||||
hash = "sha256-eqS/xYK7yh7MvPAl61o1ZJ9wH9amqngJupU+puDq9xs=";
|
||||
};
|
||||
meta = {
|
||||
changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog";
|
||||
|
@ -38,14 +38,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mame";
|
||||
version = "0.267";
|
||||
version = "0.268";
|
||||
srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mamedev";
|
||||
repo = "mame";
|
||||
rev = "mame${srcVersion}";
|
||||
hash = "sha256-H3idND2cC0KSGa9EIEVN2diticfM9r6FwRqQYkWmEM0=";
|
||||
hash = "sha256-zH/82WC4xXa/NMJ2W4U57Uv8+5994U5YcMbRvPiAtTI=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "tools" ];
|
||||
|
@ -3,8 +3,8 @@
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, installShellFiles
|
||||
, installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform
|
||||
, installManPages ? stdenv.hostPlatform == stdenv.buildPlatform
|
||||
, installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
|
||||
, installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
|
||||
, withTcp ? true
|
||||
}:
|
||||
|
||||
|
@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd flavours \
|
||||
--zsh <($out/bin/flavours --completions zsh) \
|
||||
--fish <($out/bin/flavours --completions fish) \
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, rustPlatform, fetchFromGitHub, installShellFiles }:
|
||||
{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "genact";
|
||||
@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
$out/bin/genact --print-manpage > genact.1
|
||||
installManPage genact.1
|
||||
|
||||
|
@ -51,11 +51,11 @@ rustPlatform.buildRustPackage rec {
|
||||
"--skip=watcher::tests::the_gauntlet"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd inlyne \
|
||||
--bash <($out/bin/inlyne --gen-completions bash) \
|
||||
--fish <($out/bin/inlyne --gen-completions fish) \
|
||||
--zsh <($out/bin/inlyne --gen-completions zsh)
|
||||
--bash completions/inlyne.bash \
|
||||
--fish completions/inlyne.fish \
|
||||
--zsh completions/_inlyne
|
||||
'';
|
||||
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
|
@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
|
||||
sqlite
|
||||
] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd leetcode \
|
||||
--bash <($out/bin/leetcode completions bash) \
|
||||
--fish <($out/bin/leetcode completions fish) \
|
||||
|
@ -30,13 +30,13 @@ let
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "organicmaps";
|
||||
version = "2024.07.23-8";
|
||||
version = "2024.07.29-2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "organicmaps";
|
||||
repo = "organicmaps";
|
||||
rev = "${version}-android";
|
||||
hash = "sha256-6RQodQh4p8v6xFW/GUzR0AHNpgB1AxBB7q+FW4hYo/Q=";
|
||||
hash = "sha256-cAoG/4vuA664+JcLTUdlLMMRggAznqHh3NA0Pk8RcFc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
{
|
||||
"packageVersion": "128.0.3-1",
|
||||
"packageVersion": "128.0.3-2",
|
||||
"source": {
|
||||
"rev": "128.0.3-1",
|
||||
"sha256": "0pp36q4rcsiyv9b09jfgfrl1k3vqp5bh08c9iq0r2v8is5rbcdz5"
|
||||
"rev": "128.0.3-2",
|
||||
"sha256": "1g1biavphqykj0zvi1brakrncj1h4gqhs1cy5mxlp4w4p7ahpv6d"
|
||||
},
|
||||
"settings": {
|
||||
"rev": "1debc2d30949baff2d1e7df23e87900f1987a8ae",
|
||||
|
@ -2,17 +2,17 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "argocd";
|
||||
version = "2.11.7";
|
||||
version = "2.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "argoproj";
|
||||
repo = "argo-cd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/gbclPcYSDobwftFi0CECgBp6PNqxHW9svP3A5y8eEY=";
|
||||
hash = "sha256-l2J7inrV82ej8baoY3FTcGeusN5e6WNEZMtzOdE8/WY=";
|
||||
};
|
||||
|
||||
proxyVendor = true; # darwin/linux hash mismatch
|
||||
vendorHash = "sha256-y6B//zal2OyzZ1slC+x3vxHasFTM+xD+/6Sd2AFHFgY=";
|
||||
vendorHash = "sha256-abhoGqxM+2wiWPjZaGMDQnD9r60+E0aXTrH7J5r5prk=";
|
||||
|
||||
# Set target as ./cmd per cli-local
|
||||
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227
|
||||
|
@ -3,6 +3,7 @@
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, libpcap
|
||||
, libxkbcommon
|
||||
, openssl
|
||||
, stdenv
|
||||
, alsa-lib
|
||||
@ -62,7 +63,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
postFixup = lib.optionalString stdenv.isLinux ''
|
||||
patchelf $out/bin/sniffnet \
|
||||
--add-rpath ${lib.makeLibraryPath [ vulkan-loader xorg.libX11 ]}
|
||||
--add-rpath ${lib.makeLibraryPath [ vulkan-loader xorg.libX11 libxkbcommon ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -19,6 +19,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
postInstall = ''
|
||||
installManPage Documentation/git-absorb.1
|
||||
'' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd git-absorb \
|
||||
--bash <($out/bin/git-absorb --gen-completions bash) \
|
||||
--fish <($out/bin/git-absorb --gen-completions fish) \
|
||||
|
@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
|
||||
libiconv
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
$out/bin/jj util mangen > ./jj.1
|
||||
installManPage ./jj.1
|
||||
|
||||
|
@ -6,6 +6,7 @@
|
||||
, dbus
|
||||
, libseccomp
|
||||
, systemd
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -27,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
buildInputs = [ dbus libseccomp systemd ];
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd youki \
|
||||
--bash <($out/bin/youki completion -s bash) \
|
||||
--fish <($out/bin/youki completion -s fish) \
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, rustPlatform, fetchFromGitHub, installShellFiles }:
|
||||
{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ab-av1";
|
||||
@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd ab-av1 \
|
||||
--bash <($out/bin/ab-av1 print-completions bash) \
|
||||
--fish <($out/bin/ab-av1 print-completions fish) \
|
||||
|
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
||||
rm .cargo/config.toml
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd sg \
|
||||
--bash <($out/bin/sg completions bash) \
|
||||
--fish <($out/bin/sg completions fish) \
|
||||
|
@ -46,7 +46,7 @@ rustPlatform.buildRustPackage {
|
||||
# to nix-daemon to import NARs, which is not possible in the build sandbox.
|
||||
doCheck = false;
|
||||
|
||||
postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
if [[ -f $out/bin/attic ]]; then
|
||||
installShellCompletion --cmd attic \
|
||||
--bash <($out/bin/attic gen-completions bash) \
|
||||
|
@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
|
||||
"--skip=test_x11_primary"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
for cmd in clipcatd clipcatctl clipcat-menu clipcat-notify; do
|
||||
installShellCompletion --cmd $cmd \
|
||||
--bash <($out/bin/$cmd completions bash) \
|
||||
|
44
pkgs/by-name/cl/cloudlens/package.nix
Normal file
44
pkgs/by-name/cl/cloudlens/package.nix
Normal file
@ -0,0 +1,44 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, autoPatchelfHook
|
||||
, xclip
|
||||
,
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cloudlens";
|
||||
version = "0.1.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "one2nc";
|
||||
repo = "cloudlens";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-b0i9xaIm42RKWzzZdSAmapbmZDmTpCa4IxVsM9eSMqM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-7TxtM0O3wlfq0PF5FGn4i+Ph7dWRIcyLjFgnnKITLGM=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X=github.com/one2nc/cloudlens/cmd.version=v${version}"
|
||||
"-X=github.com/one2nc/cloudlens/cmd.commit=${src.rev}"
|
||||
"-X=github.com/one2nc/cloudlens/cmd.date=1970-01-01T00:00:00Z"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook ];
|
||||
|
||||
buildInputs = [ xclip ];
|
||||
|
||||
#Some tests require internet access
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "K9s like CLI for AWS and GCP";
|
||||
homepage = "https://github.com/one2nc/cloudlens";
|
||||
license = lib.licenses.apsl20;
|
||||
maintainers = with lib.maintainers; [ ByteSudoer ];
|
||||
mainProgram = "cloudlens";
|
||||
};
|
||||
}
|
@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
|
||||
]
|
||||
);
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd berg \
|
||||
--bash <($out/bin/berg completion bash) \
|
||||
--fish <($out/bin/berg completion fish) \
|
||||
|
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitea
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, intltool
|
||||
, libdeltachat
|
||||
@ -12,26 +11,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "deltatouch";
|
||||
version = "1.4.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "lk108";
|
||||
repo = "deltatouch";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-tqcQmFmF8Z9smVMfaXOmXQ3Uw41bUcU4iUi8fxBlg8U=";
|
||||
hash = "sha256-OQrTxxmiBiAc9il1O5aEl9iN3fCfoxSAwJDfrASCPxs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "0001-deltatouch-Fix-localisation.patch";
|
||||
url = "https://codeberg.org/lk108/deltatouch/commit/dcfdd8a0fca5fff10d0383f77f4c0cbea302de00.patch";
|
||||
hash = "sha256-RRjHG/xKtj757ZP2SY0GtWwh66kkTWoICV1vDkFAw3k=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
qt5.wrapQtAppsHook
|
||||
intltool
|
||||
@ -76,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
changelog = "https://codeberg.org/lk108/deltatouch/src/commit/${finalAttrs.src.rev}/CHANGELOG";
|
||||
changelog = "https://codeberg.org/lk108/deltatouch/src/tag/${finalAttrs.src.rev}/CHANGELOG";
|
||||
description = "Messaging app for Ubuntu Touch, powered by Delta Chat core";
|
||||
longDescription = ''
|
||||
DeltaTouch is a messenger for Ubuntu Touch based on Delta Chat core.
|
||||
|
@ -79,7 +79,7 @@ rustPlatform.buildRustPackage rec {
|
||||
# Tests currently fail due to *many* duplicate definition errors
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd diesel \
|
||||
--bash <($out/bin/diesel completions bash) \
|
||||
--fish <($out/bin/diesel completions fish) \
|
||||
|
@ -4,6 +4,7 @@
|
||||
, lib
|
||||
, micronucleus
|
||||
, rustPlatform
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -23,7 +24,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
buildInputs = [ micronucleus ];
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd elf2nucleus \
|
||||
--bash <($out/bin/elf2nucleus --completions bash) \
|
||||
--fish <($out/bin/elf2nucleus --completions fish) \
|
||||
|
@ -2,6 +2,7 @@
|
||||
, installShellFiles
|
||||
, rustPlatform
|
||||
, fetchFromGitLab
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
let
|
||||
@ -25,7 +26,8 @@ rustPlatform.buildRustPackage {
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
postInstall = "installShellCompletion --cmd ${pname} "
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) (
|
||||
"installShellCompletion --cmd ${pname} "
|
||||
+ builtins.concatStringsSep
|
||||
" "
|
||||
(builtins.map
|
||||
@ -35,7 +37,8 @@ rustPlatform.buildRustPackage {
|
||||
"fish"
|
||||
"zsh"
|
||||
]
|
||||
);
|
||||
)
|
||||
);
|
||||
|
||||
meta = {
|
||||
description = "Task runner with DAG-based parallelism";
|
||||
|
@ -5,8 +5,8 @@
|
||||
, pkg-config
|
||||
, darwin
|
||||
, installShellFiles
|
||||
, installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform
|
||||
, installManPages ? stdenv.hostPlatform == stdenv.buildPlatform
|
||||
, installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
|
||||
, installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
|
||||
, notmuch
|
||||
, gpgme
|
||||
, buildNoDefaultFeatures ? false
|
||||
|
@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
|
||||
darwin.apple_sdk.frameworks.Foundation
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd joshuto \
|
||||
--bash <($out/bin/joshuto completions bash) \
|
||||
--zsh <($out/bin/joshuto completions zsh) \
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "json2tsv";
|
||||
version = "1.1";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://codemadness.org/releases/json2tsv/json2tsv-${version}.tar.gz";
|
||||
hash = "sha256-7r5+YoZVivCqDbfFUqTB/x41DrZi7GZRVcJhGZCpw0o=";
|
||||
hash = "sha256-ET5aeuspXn+BNfIxytkACR+Zrr1smDFvdh03fptQ/YQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
@ -42,38 +42,38 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
# https://github.com/MaaAssistantArknights/maa-cli/pull/126
|
||||
buildNoDefaultFeatures = true;
|
||||
buildFeatures = [
|
||||
"git2"
|
||||
"core_installer"
|
||||
];
|
||||
buildFeatures = [ "git2" ];
|
||||
|
||||
cargoHash = "sha256-C4NkJc7msyaUjQAsc0kbDwkr0cj3Esv+JjA24RvFsXA=";
|
||||
|
||||
# maa-cli would only seach libMaaCore.so and resources in itself's path
|
||||
# https://github.com/MaaAssistantArknights/maa-cli/issues/67
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/maa-assistant-arknights/
|
||||
ln -s ${maa-assistant-arknights}/share/maa-assistant-arknights/* $out/share/maa-assistant-arknights/
|
||||
ln -s ${maa-assistant-arknights}/lib/* $out/share/maa-assistant-arknights/
|
||||
mv $out/bin/maa $out/share/maa-assistant-arknights/
|
||||
postInstall =
|
||||
''
|
||||
mkdir -p $out/share/maa-assistant-arknights/
|
||||
ln -s ${maa-assistant-arknights}/share/maa-assistant-arknights/* $out/share/maa-assistant-arknights/
|
||||
ln -s ${maa-assistant-arknights}/lib/* $out/share/maa-assistant-arknights/
|
||||
mv $out/bin/maa $out/share/maa-assistant-arknights/
|
||||
|
||||
makeWrapper $out/share/maa-assistant-arknights/maa $out/bin/maa \
|
||||
--prefix PATH : "${
|
||||
lib.makeBinPath [
|
||||
android-tools
|
||||
git
|
||||
]
|
||||
}"
|
||||
makeWrapper $out/share/maa-assistant-arknights/maa $out/bin/maa \
|
||||
--prefix PATH : "${
|
||||
lib.makeBinPath [
|
||||
android-tools
|
||||
git
|
||||
]
|
||||
}"
|
||||
|
||||
installShellCompletion --cmd maa \
|
||||
--bash <($out/bin/maa complete bash) \
|
||||
--fish <($out/bin/maa complete fish) \
|
||||
--zsh <($out/bin/maa complete zsh)
|
||||
''
|
||||
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd maa \
|
||||
--bash <($out/bin/maa complete bash) \
|
||||
--fish <($out/bin/maa complete fish) \
|
||||
--zsh <($out/bin/maa complete zsh)
|
||||
|
||||
mkdir -p manpage
|
||||
$out/bin/maa mangen --path manpage
|
||||
installManPage manpage/*
|
||||
'';
|
||||
mkdir -p manpage
|
||||
$out/bin/maa mangen --path manpage
|
||||
installManPage manpage/*
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple CLI for MAA by Rust";
|
||||
|
@ -26,13 +26,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "melonDS";
|
||||
version = "0.9.5-unstable-2024-07-21";
|
||||
version = "0.9.5-unstable-2024-08-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "melonDS-emu";
|
||||
repo = "melonDS";
|
||||
rev = "837a58208711722e1762098c2a0244c2d8409864";
|
||||
hash = "sha256-SSW/+wLnZKlldVIBXMqDvXuwyK1LxcfON6ZTKLxY68U=";
|
||||
rev = "dd386d12a94252364b5e0706ec719c390faf90b8";
|
||||
hash = "sha256-pgTtRNifyziioY+GN4BQFVFHlKKK1Da5XioLUnGRGpQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
125
pkgs/by-name/mi/misskey/package.nix
Normal file
125
pkgs/by-name/mi/misskey/package.nix
Normal file
@ -0,0 +1,125 @@
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
nixosTests,
|
||||
fetchFromGitHub,
|
||||
nodejs,
|
||||
pnpm,
|
||||
makeWrapper,
|
||||
python3,
|
||||
bash,
|
||||
jemalloc,
|
||||
ffmpeg-headless,
|
||||
writeShellScript,
|
||||
...
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "misskey";
|
||||
|
||||
version = "2024.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "misskey-dev";
|
||||
repo = finalAttrs.pname;
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-nKf+SfuF6MQtNO53E6vN9CMDvQzKMv3PrD6gs9Qa86w=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
pnpm.configHook
|
||||
makeWrapper
|
||||
python3
|
||||
];
|
||||
|
||||
# https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-A1JBLa6lIw5tXFuD2L3vvkH6pHS5rlwt8vU2+UUQYdg=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/pull/296697/files#r1617546739
|
||||
(
|
||||
cd node_modules/.pnpm/node_modules/v-code-diff
|
||||
pnpm run postinstall
|
||||
)
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/pull/296697/files#r1617595593
|
||||
export npm_config_nodedir=${nodejs}
|
||||
(
|
||||
cd node_modules/.pnpm/node_modules/re2
|
||||
pnpm run rebuild
|
||||
)
|
||||
(
|
||||
cd node_modules/.pnpm/node_modules/sharp
|
||||
pnpm run install
|
||||
)
|
||||
|
||||
pnpm build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase =
|
||||
let
|
||||
checkEnvVarScript = writeShellScript "misskey-check-env-var" ''
|
||||
if [[ -z $MISSKEY_CONFIG_YML ]]; then
|
||||
echo "MISSKEY_CONFIG_YML must be set to the location of the Misskey config file."
|
||||
exit 1
|
||||
fi
|
||||
'';
|
||||
in
|
||||
''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/data
|
||||
cp -r . $out/data
|
||||
|
||||
# Set up symlink for use at runtime
|
||||
# TODO: Find a better solution for this (potentially patch Misskey to make this configurable?)
|
||||
# Line that would need to be patched: https://github.com/misskey-dev/misskey/blob/9849aab40283cbde2184e74d4795aec8ef8ccba3/packages/backend/src/core/InternalStorageService.ts#L18
|
||||
# Otherwise, maybe somehow bindmount a writable directory into <package>/data/files.
|
||||
ln -s /var/lib/misskey $out/data/files
|
||||
|
||||
makeWrapper ${pnpm}/bin/pnpm $out/bin/misskey \
|
||||
--run "${checkEnvVarScript} || exit" \
|
||||
--chdir $out/data \
|
||||
--add-flags run \
|
||||
--set-default NODE_ENV production \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
nodejs
|
||||
pnpm
|
||||
bash
|
||||
]
|
||||
} \
|
||||
--prefix LD_LIBRARY_PATH : ${
|
||||
lib.makeLibraryPath [
|
||||
jemalloc
|
||||
ffmpeg-headless
|
||||
stdenv.cc.cc.lib
|
||||
]
|
||||
}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit (finalAttrs) pnpmDeps;
|
||||
tests.misskey = nixosTests.misskey;
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "🌎 An interplanetary microblogging platform 🚀";
|
||||
homepage = "https://misskey-hub.net/";
|
||||
license = lib.licenses.agpl3Only;
|
||||
maintainers = [ lib.maintainers.feathecutie ];
|
||||
platforms = lib.platforms.unix;
|
||||
mainProgram = "misskey";
|
||||
};
|
||||
})
|
@ -5,8 +5,8 @@
|
||||
, pkg-config
|
||||
, darwin
|
||||
, installShellFiles
|
||||
, installShellCompletions ? stdenv.hostPlatform == stdenv.buildPlatform
|
||||
, installManPages ? stdenv.hostPlatform == stdenv.buildPlatform
|
||||
, installShellCompletions ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
|
||||
, installManPages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
|
||||
, notmuch
|
||||
, buildNoDefaultFeatures ? false
|
||||
, buildFeatures ? []
|
||||
|
@ -7,19 +7,19 @@
|
||||
}:
|
||||
let
|
||||
pname = "open-webui";
|
||||
version = "0.3.10";
|
||||
version = "0.3.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-webui";
|
||||
repo = "open-webui";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Q8ZUc3fNfWeijPLUtgwkU2rv7SWSfi7Q1QOlt14O3nE= ";
|
||||
hash = "sha256-z/BtMe+CRS9l8WTG6CUjuDNCerYO41KKPUSESNz69SY=";
|
||||
};
|
||||
|
||||
frontend = buildNpmPackage {
|
||||
inherit pname version src;
|
||||
|
||||
npmDepsHash = "sha256-nkJksj1FAOMqEDQS1k++E2izv9TT3PkoZLxzHIcHzvA=";
|
||||
npmDepsHash = "sha256-ODt5OIcSQNW6LGG6uE3d1Itn2oyXhzg45jjXxILE0vM=";
|
||||
|
||||
# Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
|
||||
# Until this is solved, running python packages from the browser will not work.
|
||||
@ -103,6 +103,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
pymysql
|
||||
pypandoc
|
||||
pypdf
|
||||
python-dotenv
|
||||
python-jose
|
||||
python-multipart
|
||||
python-pptx
|
||||
|
@ -3,6 +3,7 @@
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
stdenv,
|
||||
}: let
|
||||
version = "0.15.2";
|
||||
in
|
||||
@ -21,7 +22,7 @@ in
|
||||
|
||||
nativeBuildInputs = [installShellFiles];
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd pace \
|
||||
--bash <($out/bin/pace setup completions bash) \
|
||||
--fish <($out/bin/pace setup completions fish) \
|
||||
|
@ -86,7 +86,7 @@ rustPlatform.buildRustPackage rec {
|
||||
"--skip=task::task_graph::test::test_multi_env_defaults_ambigu"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd pixi \
|
||||
--bash <($out/bin/pixi completion --shell bash) \
|
||||
--fish <($out/bin/pixi completion --shell fish) \
|
||||
|
@ -1,30 +1,33 @@
|
||||
{ lib
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, primesieve
|
||||
, stdenv
|
||||
{
|
||||
lib,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
primesieve,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "primecount";
|
||||
version = "7.13";
|
||||
version = "7.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimwalisch";
|
||||
repo = "primecount";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-VjsJjG2pSnDMVg3lY3cmpdnASeqClPjHUGY5wqupf2w=";
|
||||
hash = "sha256-N4eENwYuf8ZR1JQyFtoWl6H3ITpGZVaOMEU3gx0f9yQ=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "lib" "man" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"lib"
|
||||
"man"
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
primesieve
|
||||
];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ primesieve ];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -36,6 +39,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
(lib.cmakeBool "BUILD_TESTS" true)
|
||||
];
|
||||
|
||||
passthru = {
|
||||
tests = {
|
||||
inherit primesieve; # dependency
|
||||
};
|
||||
updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/kimwalisch/primecount";
|
||||
description = "Fast prime counting function implementations";
|
||||
|
@ -1,22 +1,29 @@
|
||||
{ lib
|
||||
, cmake
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
, primecount
|
||||
{
|
||||
lib,
|
||||
cmake,
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
stdenv,
|
||||
primecount,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "primesieve";
|
||||
version = "12.3";
|
||||
version = "12.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kimwalisch";
|
||||
repo = "primesieve";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-jULYLJK3iwPKgWpdTEetmSz1Nv2md1XUfR9A9mTQu9M=";
|
||||
hash = "sha256-3iVQsksnyw9KFBTYsmyZ6YxYICVq1GzOzemDBpqpU3M=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "lib" "man" ];
|
||||
outputs = [
|
||||
"out"
|
||||
"dev"
|
||||
"lib"
|
||||
"man"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -26,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
tests = {
|
||||
inherit primecount; # dependent
|
||||
};
|
||||
updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
@ -42,8 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
changelog = "https://github.com/kimwalisch/primesieve/blob/${finalAttrs.src.rev}/ChangeLog";
|
||||
license = lib.licenses.bsd2;
|
||||
mainProgram = "primesieve";
|
||||
maintainers = lib.teams.sage.members ++
|
||||
(with lib.maintainers; [ abbradar AndersonTorres ]);
|
||||
maintainers = lib.teams.sage.members;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
})
|
||||
|
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
, asciidoctor
|
||||
@ -24,6 +25,7 @@ rustPlatform.buildRustPackage rec {
|
||||
# Built by ./build.rs using `asciidoctor`
|
||||
installManPage ./target/*/release/build/qrtool*/out/*.?
|
||||
|
||||
'' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd qrtool \
|
||||
--bash <($out/bin/qrtool --generate-completion bash) \
|
||||
--fish <($out/bin/qrtool --generate-completion fish) \
|
||||
|
@ -1,17 +1,18 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, undmg
|
||||
, gitUpdater
|
||||
{
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchurl,
|
||||
undmg,
|
||||
gitUpdater,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "rectangle";
|
||||
version = "0.80";
|
||||
version = "0.81";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rxhanson/Rectangle/releases/download/v${version}/Rectangle${version}.dmg";
|
||||
hash = "sha256-CmYhMnEhn3UK82RXuT1KQhAoK/0ewcUU6h73el2Lpw8=";
|
||||
hash = "sha256-oZZz6bsgG+4leQNq2C+nLaAO/Yk+OkS6BnlMQHjlK9E=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
@ -37,8 +38,10 @@ stdenvNoCC.mkDerivation rec {
|
||||
homepage = "https://rectangleapp.com/";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
platforms = platforms.darwin;
|
||||
maintainers = with maintainers; [ Intuinewin wegank ];
|
||||
maintainers = with maintainers; [
|
||||
Intuinewin
|
||||
wegank
|
||||
];
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
|
||||
# Tests depend on additional infrastructure to be running locally
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd ${meta.mainProgram} \
|
||||
--bash <($out/bin/${meta.mainProgram} generate-completions bash) \
|
||||
--fish <($out/bin/${meta.mainProgram} generate-completions fish) \
|
||||
|
77
pkgs/by-name/rf/rfdump/package.nix
Normal file
77
pkgs/by-name/rf/rfdump/package.nix
Normal file
@ -0,0 +1,77 @@
|
||||
{
|
||||
autoreconfHook,
|
||||
expat,
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
glib,
|
||||
gtk3-x11,
|
||||
lib,
|
||||
pkg-config,
|
||||
stdenv,
|
||||
zlib,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rfdump";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.rfdump.org/dl/rfdump-${version}.tar.bz2";
|
||||
hash = "sha256-fbEmh7i3ug5GCeyJ2wT45bbDq0ZEOv8yH+MOJwzER4U=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/pkg-security-team/rfdump/-/raw/debian/master/debian/patches/01_fix_desktop_file.patch";
|
||||
hash = "sha256-r6BR+eAg963GjcFvV6/1heW7uKi8tmi7j8LyxtpcgYk=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/pkg-security-team/rfdump/-/raw/debian/master/debian/patches/03_fix-format-security-errors.patch";
|
||||
hash = "sha256-rQKvFeSQ09P46lhvlov51Oej0HurlR++5Yv4kCLn9J8=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/pkg-security-team/rfdump/-/raw/debian/master/debian/patches/02_configure.in-preserve-CFLAGS.patch";
|
||||
hash = "sha256-4+Yj5I019ZkHbtE3s67miAlMeuV8aZdc9RzJrySLmgM=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/pkg-security-team/rfdump/-/raw/debian/master/debian/patches/04_gcc10.patch";
|
||||
hash = "sha256-LTsBkdwvmZ11+gwfe/XaapxzLaEVu7CdtCw8mqJcXr4=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://salsa.debian.org/pkg-security-team/rfdump/-/raw/debian/master/debian/patches/05_gtk3.patch";
|
||||
hash = "sha256-1y/JFePfnQMMVwqLYgUQyP/SNZRMHgV+cHjbHP6szQs=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/main.c --replace-fail "/usr/share/rfdump/rfdump.ui" "$out/share/rfdump/rfdump.ui"
|
||||
substituteInPlace src/Makefile.am --replace-fail "/usr/share/pixmaps" "$out/share/pixmaps"
|
||||
substituteInPlace src/tagtypes.c --replace-fail "/usr/share/rfdump/rfd_types.xml" "$out/share/rfdump/rfd_types.xml"
|
||||
'';
|
||||
|
||||
configureFlags = [ "PREFIX=$out" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
expat
|
||||
glib
|
||||
gtk3-x11
|
||||
zlib
|
||||
];
|
||||
|
||||
makeFlags = [ "LIBS=-lexpat" ];
|
||||
|
||||
meta = {
|
||||
description = "Tool to detect RFID-Tags and show their meta information";
|
||||
homepage = "https://www.rfdump.org/";
|
||||
changelog = "https://salsa.debian.org/pkg-security-team/rfdump/-/blob/debian/master/ChangeLog";
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ tochiaha ];
|
||||
mainProgram = "rfdump";
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
|
||||
# in "checkPhase", hence fails in sandbox of "nix".
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd sn0int \
|
||||
--bash <($out/bin/sn0int completions bash) \
|
||||
--fish <($out/bin/sn0int completions fish) \
|
||||
|
@ -80,7 +80,7 @@ rustPlatform.buildRustPackage rec {
|
||||
Libsystem
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd solana \
|
||||
--bash <($out/bin/solana completion --shell bash) \
|
||||
--fish <($out/bin/solana completion --shell fish) \
|
||||
|
46
pkgs/by-name/sq/sqlite-vec/package.nix
Normal file
46
pkgs/by-name/sq/sqlite-vec/package.nix
Normal file
@ -0,0 +1,46 @@
|
||||
{
|
||||
lib,
|
||||
gettext,
|
||||
fetchFromGitHub,
|
||||
sqlite,
|
||||
stdenv,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sqlite-vec";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asg017";
|
||||
repo = "sqlite-vec";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-h5gCKyeEAgmXCpOpXVDzoZEtv7Yiq7GtgImuoF9uBm0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext ];
|
||||
|
||||
buildInputs = [ sqlite ];
|
||||
|
||||
makeFlags = [
|
||||
"loadable"
|
||||
"static"
|
||||
];
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm444 -t "$out/lib" \
|
||||
"dist/libsqlite_vec0${stdenv.hostPlatform.extensions.staticLibrary}" \
|
||||
"dist/vec0${stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Vector search SQLite extension that runs anywhere";
|
||||
homepage = "https://github.com/asg017/sqlite-vec";
|
||||
changelog = "https://github.com/asg017/sqlite-vec/releases/tag/${finalAttrs.src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.anmonteiro ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
@ -2,6 +2,7 @@
|
||||
, lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -18,7 +19,7 @@ rustPlatform.buildRustPackage rec {
|
||||
cargoHash = "sha256-MSN0xQj6IfOjI0qQqVBaGhh0BQJa4z24El2rGLlFBSM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd steamguard \
|
||||
--bash <($out/bin/steamguard completion --shell bash) \
|
||||
--fish <($out/bin/steamguard completion --shell fish) \
|
||||
|
50
pkgs/by-name/vi/villain/package.nix
Normal file
50
pkgs/by-name/vi/villain/package.nix
Normal file
@ -0,0 +1,50 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
python3,
|
||||
python3Packages,
|
||||
makeWrapper,
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "villain";
|
||||
version = "2.1.0";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "t3l3machus";
|
||||
repo = "Villain";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8MOpbyw4HEJMcv84bNkNLBSZfEmIm3RDSUi0s62t9ko=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
dependencies = with python3Packages; [
|
||||
gnureadline
|
||||
netifaces
|
||||
pycryptodomex
|
||||
pyperclip
|
||||
requests
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/{bin,share/villain}
|
||||
rm README.md requirements.txt LICENSE.md
|
||||
cp -a * $out/share/villain/
|
||||
makeWrapper ${python3}/bin/python $out/bin/villain \
|
||||
--add-flags "$out/share/villain/Villain.py" \
|
||||
--prefix PYTHONPATH : ${python3Packages.makePythonPath dependencies}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "High level stage 0/1 C2 framework that can handle multiple TCP socket & HoaxShell-based reverse shells";
|
||||
homepage = "https://github.com/t3l3machus/Villain";
|
||||
license = lib.licenses.cc-by-nc-nd-40;
|
||||
mainProgram = "villain";
|
||||
maintainers = with lib.maintainers; [ d3vil0p3r ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
55
pkgs/by-name/vs/vscode-runner/package.nix
Normal file
55
pkgs/by-name/vs/vscode-runner/package.nix
Normal file
@ -0,0 +1,55 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
buildDartApplication,
|
||||
kdePackages,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Merrit";
|
||||
repo = "vscode-runner";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-mDhwydAFlDcpbpmh+I2zjjuC+/5hmygFkpHSZGEpuLs=";
|
||||
};
|
||||
in
|
||||
buildDartApplication {
|
||||
pname = "vscode-runner";
|
||||
inherit version src;
|
||||
|
||||
vendorHash = "sha256-jS4jH00uxZIX81sZQIi+s42ofmXpD4/tPMRV2heaM2U=";
|
||||
|
||||
pubspecLock = lib.importJSON ./pubspec.lock.json;
|
||||
|
||||
dartEntryPoints = {
|
||||
"bin/vscode_runner" = "bin/vscode_runner.dart";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace ./package/codes.merritt.vscode_runner.service \
|
||||
--replace-fail "Exec=" "Exec=$out/bin/vscode_runner"
|
||||
install -D \
|
||||
./package/codes.merritt.vscode_runner.service \
|
||||
$out/share/dbus-1/services/codes.merritt.vscode_runner.service
|
||||
|
||||
install -D \
|
||||
./package/plasma-runner-vscode_runner.desktop \
|
||||
$out/share/krunner/dbusplugins/plasma-runner-vscode_runner.desktop
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "KRunner plugin for quickly opening recent VSCode workspaces";
|
||||
homepage = "https://github.com/Merrit/vscode-runner";
|
||||
changelog = "https://github.com/Merrit/vscode-runner/blob/${src.rev}/CHANGELOG.md";
|
||||
license = lib.licenses.gpl3Only;
|
||||
sourceProvenance = [ lib.sourceTypes.fromSource ];
|
||||
maintainers = [ lib.maintainers.pinage404 ];
|
||||
mainProgram = "vscode_runner";
|
||||
inherit (kdePackages.krunner.meta) platforms;
|
||||
};
|
||||
}
|
557
pkgs/by-name/vs/vscode-runner/pubspec.lock.json
Normal file
557
pkgs/by-name/vs/vscode-runner/pubspec.lock.json
Normal file
@ -0,0 +1,557 @@
|
||||
{
|
||||
"packages": {
|
||||
"_fe_analyzer_shared": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "_fe_analyzer_shared",
|
||||
"sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "67.0.0"
|
||||
},
|
||||
"analyzer": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "analyzer",
|
||||
"sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.4.1"
|
||||
},
|
||||
"args": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "args",
|
||||
"sha256": "eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.2"
|
||||
},
|
||||
"async": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "async",
|
||||
"sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.11.0"
|
||||
},
|
||||
"boolean_selector": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "boolean_selector",
|
||||
"sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.1"
|
||||
},
|
||||
"collection": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "collection",
|
||||
"sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.18.0"
|
||||
},
|
||||
"convert": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "convert",
|
||||
"sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.1.1"
|
||||
},
|
||||
"coverage": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "coverage",
|
||||
"sha256": "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.7.2"
|
||||
},
|
||||
"crypto": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "crypto",
|
||||
"sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.0.3"
|
||||
},
|
||||
"dbus": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "dbus",
|
||||
"sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.10"
|
||||
},
|
||||
"ffi": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "ffi",
|
||||
"sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.2"
|
||||
},
|
||||
"file": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "file",
|
||||
"sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "7.0.0"
|
||||
},
|
||||
"frontend_server_client": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "frontend_server_client",
|
||||
"sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.0.0"
|
||||
},
|
||||
"glob": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "glob",
|
||||
"sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.2"
|
||||
},
|
||||
"http_multi_server": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "http_multi_server",
|
||||
"sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.2.1"
|
||||
},
|
||||
"http_parser": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "http_parser",
|
||||
"sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "4.0.2"
|
||||
},
|
||||
"io": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "io",
|
||||
"sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.4"
|
||||
},
|
||||
"js": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "js",
|
||||
"sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.6.7"
|
||||
},
|
||||
"krunner": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "krunner",
|
||||
"sha256": "b027c8405c45d3f16b35037e0209665b0bdc9b975537f1216640ee8e1f839d31",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.2.0"
|
||||
},
|
||||
"lints": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "lints",
|
||||
"sha256": "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.1"
|
||||
},
|
||||
"logger": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "logger",
|
||||
"sha256": "8c94b8c219e7e50194efc8771cd0e9f10807d8d3e219af473d89b06cc2ee4e04",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"logging": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "logging",
|
||||
"sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.0"
|
||||
},
|
||||
"matcher": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "matcher",
|
||||
"sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.12.16+1"
|
||||
},
|
||||
"meta": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "meta",
|
||||
"sha256": "25dfcaf170a0190f47ca6355bdd4552cb8924b430512ff0cafb8db9bd41fe33b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.14.0"
|
||||
},
|
||||
"mime": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "mime",
|
||||
"sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.5"
|
||||
},
|
||||
"node_preamble": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "node_preamble",
|
||||
"sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.0.2"
|
||||
},
|
||||
"package_config": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "package_config",
|
||||
"sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.0"
|
||||
},
|
||||
"path": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "path",
|
||||
"sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.9.0"
|
||||
},
|
||||
"petitparser": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "petitparser",
|
||||
"sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.0.2"
|
||||
},
|
||||
"pool": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "pool",
|
||||
"sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.5.1"
|
||||
},
|
||||
"pub_semver": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "pub_semver",
|
||||
"sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.4"
|
||||
},
|
||||
"shelf": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "shelf",
|
||||
"sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.4.1"
|
||||
},
|
||||
"shelf_packages_handler": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "shelf_packages_handler",
|
||||
"sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.0.2"
|
||||
},
|
||||
"shelf_static": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "shelf_static",
|
||||
"sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.2"
|
||||
},
|
||||
"shelf_web_socket": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "shelf_web_socket",
|
||||
"sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.4"
|
||||
},
|
||||
"source_map_stack_trace": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "source_map_stack_trace",
|
||||
"sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.1"
|
||||
},
|
||||
"source_maps": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "source_maps",
|
||||
"sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.10.12"
|
||||
},
|
||||
"source_span": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "source_span",
|
||||
"sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.10.0"
|
||||
},
|
||||
"sqlite3": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "sqlite3",
|
||||
"sha256": "281b672749af2edf259fc801f0fcba092257425bcd32a0ce1c8237130bc934c7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.11.2"
|
||||
},
|
||||
"stack_trace": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "stack_trace",
|
||||
"sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.11.1"
|
||||
},
|
||||
"stream_channel": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "stream_channel",
|
||||
"sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.1.2"
|
||||
},
|
||||
"string_scanner": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "string_scanner",
|
||||
"sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.0"
|
||||
},
|
||||
"term_glyph": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "term_glyph",
|
||||
"sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.1"
|
||||
},
|
||||
"test": {
|
||||
"dependency": "direct dev",
|
||||
"description": {
|
||||
"name": "test",
|
||||
"sha256": "d87214d19fb311997d8128ec501a980f77cb240ac4e7e219accf452813ff473c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.25.3"
|
||||
},
|
||||
"test_api": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_api",
|
||||
"sha256": "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.7.1"
|
||||
},
|
||||
"test_core": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "test_core",
|
||||
"sha256": "2236f70be1e5ab405c675e88c36935a87dad9e05a506b57dd5c0f617f5aebcb2",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.6.1"
|
||||
},
|
||||
"typed_data": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "typed_data",
|
||||
"sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.3.2"
|
||||
},
|
||||
"vm_service": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "vm_service",
|
||||
"sha256": "a75f83f14ad81d5fe4b3319710b90dec37da0e22612326b696c9e1b8f34bbf48",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "14.2.0"
|
||||
},
|
||||
"watcher": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "watcher",
|
||||
"sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.1.0"
|
||||
},
|
||||
"web": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "web",
|
||||
"sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "0.5.1"
|
||||
},
|
||||
"web_socket_channel": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "web_socket_channel",
|
||||
"sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "2.4.5"
|
||||
},
|
||||
"webkit_inspection_protocol": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "webkit_inspection_protocol",
|
||||
"sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.2.1"
|
||||
},
|
||||
"xdg_directories": {
|
||||
"dependency": "direct main",
|
||||
"description": {
|
||||
"name": "xdg_directories",
|
||||
"sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "1.0.4"
|
||||
},
|
||||
"xml": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "xml",
|
||||
"sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "6.5.0"
|
||||
},
|
||||
"yaml": {
|
||||
"dependency": "transitive",
|
||||
"description": {
|
||||
"name": "yaml",
|
||||
"sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
|
||||
"url": "https://pub.dev"
|
||||
},
|
||||
"source": "hosted",
|
||||
"version": "3.1.2"
|
||||
}
|
||||
},
|
||||
"sdks": {
|
||||
"dart": ">=3.3.0 <4.0.0"
|
||||
}
|
||||
}
|
@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "workout-tracker";
|
||||
version = "1.16.1";
|
||||
version = "1.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jovandeginste";
|
||||
repo = "workout-tracker";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-A5HmNKRiHwo7aPrhQWHjPZUT29zaxCN6z4SR8jR9jOg=";
|
||||
hash = "sha256-Sn6SOHrsp1ZgsPntc2+cmlAEPVBUrYv1vKLKAQvT9m4=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
@ -2,11 +2,11 @@
|
||||
|
||||
buildGraalvmNativeImage rec {
|
||||
pname = "yamlscript";
|
||||
version = "0.1.68";
|
||||
version = "0.1.69";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar";
|
||||
hash = "sha256-NeiG8o5Le549kYILw9vA1EmQ1PcHjCAdwQAnKdYNMwk=";
|
||||
hash = "sha256-Bw+TO9u0o+GHqVLPR7M4hFl1lMPa+tVDCeTEUoBBgcU=";
|
||||
};
|
||||
|
||||
executable = "ys";
|
||||
|
@ -16,13 +16,13 @@ python3Packages.buildPythonApplication rec {
|
||||
# The websites yt-dlp deals with are a very moving target. That means that
|
||||
# downloads break constantly. Because of that, updates should always be backported
|
||||
# to the latest stable release.
|
||||
version = "2024.8.1";
|
||||
version = "2024.8.6";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "yt_dlp";
|
||||
hash = "sha256-QxiqUjaUYRVi8BQZyNUmtmKnLfNO+LpFQBazTINmwVg=";
|
||||
hash = "sha256-6FUfJryL9nuZwSNzzIftIHNDbDQ35TKQh40PS0ux9mM=";
|
||||
};
|
||||
|
||||
build-system = with python3Packages; [
|
||||
|
2
pkgs/by-name/ze/zed-editor/Cargo.lock
generated
2
pkgs/by-name/ze/zed-editor/Cargo.lock
generated
@ -13597,7 +13597,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zed"
|
||||
version = "0.146.4"
|
||||
version = "0.146.5"
|
||||
dependencies = [
|
||||
"activity_indicator",
|
||||
"anyhow",
|
||||
|
@ -35,13 +35,13 @@ assert withGLES -> stdenv.isLinux;
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zed";
|
||||
version = "0.146.4";
|
||||
version = "0.146.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-U/PTPmZjhmsY9MVH7/SbooyTCR7ATHTWswv0IOokIu4=";
|
||||
hash = "sha256-rHdvANczB2ccLOCNh1ZgkkknCNbTaPPODT72WjuOezs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
RUSTONIG_SYSTEM_LIBONIG = true;
|
||||
|
||||
postInstall = ''
|
||||
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd zola \
|
||||
--bash <($out/bin/zola completion bash) \
|
||||
--fish <($out/bin/zola completion fish) \
|
||||
|
@ -10,11 +10,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gorm";
|
||||
version = "1.3.1";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-${finalAttrs.version}.tar.gz";
|
||||
sha256 = "sha256-W+NgbvLjt1PpDiauhzWFaU1/CUhmDACQz+GoyRUyWB8=";
|
||||
sha256 = "sha256-B7NNRA3qA2PFbb03m58EBBONuIciLf6eU+YSR0qvaCo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ make wrapGNUstepAppsHook ];
|
||||
|
@ -1,44 +1,69 @@
|
||||
{ lib, stdenv, fetchFromGitHub, coreutils, ocaml-ng, zlib, pcre, pcre2, neko, mbedtls_2, Security }:
|
||||
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
coreutils,
|
||||
ocaml-ng,
|
||||
zlib,
|
||||
pcre,
|
||||
pcre2,
|
||||
neko,
|
||||
mbedtls_2,
|
||||
Security,
|
||||
}:
|
||||
let
|
||||
ocamlDependencies = version:
|
||||
if lib.versionAtLeast version "4.3"
|
||||
then with ocaml-ng.ocamlPackages_4_14; [
|
||||
ocaml
|
||||
findlib
|
||||
sedlex
|
||||
xml-light
|
||||
ptmap
|
||||
camlp5
|
||||
sha
|
||||
dune_3
|
||||
luv
|
||||
extlib
|
||||
] else with ocaml-ng.ocamlPackages_4_10; [
|
||||
ocaml
|
||||
findlib
|
||||
sedlex
|
||||
xml-light
|
||||
ptmap
|
||||
camlp5
|
||||
sha
|
||||
dune_3
|
||||
luv
|
||||
extlib-1-7-7
|
||||
];
|
||||
ocamlDependencies =
|
||||
version:
|
||||
if lib.versionAtLeast version "4.3" then
|
||||
with ocaml-ng.ocamlPackages_4_14;
|
||||
[
|
||||
ocaml
|
||||
findlib
|
||||
sedlex
|
||||
xml-light
|
||||
ptmap
|
||||
camlp5
|
||||
sha
|
||||
dune_3
|
||||
luv
|
||||
extlib
|
||||
]
|
||||
else
|
||||
with ocaml-ng.ocamlPackages_4_10;
|
||||
[
|
||||
ocaml
|
||||
findlib
|
||||
sedlex
|
||||
xml-light
|
||||
ptmap
|
||||
camlp5
|
||||
sha
|
||||
dune_3
|
||||
luv
|
||||
extlib-1-7-7
|
||||
];
|
||||
|
||||
defaultPatch = ''
|
||||
substituteInPlace extra/haxelib_src/src/haxelib/client/Main.hx \
|
||||
--replace '"neko"' '"${neko}/bin/neko"'
|
||||
'';
|
||||
|
||||
generic = { hash, version, prePatch ? defaultPatch }:
|
||||
generic =
|
||||
{
|
||||
hash,
|
||||
version,
|
||||
prePatch ? defaultPatch,
|
||||
}:
|
||||
stdenv.mkDerivation {
|
||||
pname = "haxe";
|
||||
inherit version;
|
||||
|
||||
buildInputs = [ zlib neko ]
|
||||
++ (if lib.versionAtLeast version "4.3" then [pcre2] else [pcre])
|
||||
buildInputs =
|
||||
[
|
||||
zlib
|
||||
neko
|
||||
]
|
||||
++ (if lib.versionAtLeast version "4.3" then [ pcre2 ] else [ pcre ])
|
||||
++ lib.optional (lib.versionAtLeast version "4.1") mbedtls_2
|
||||
++ lib.optional (lib.versionAtLeast version "4.1" && stdenv.isDarwin) Security
|
||||
++ ocamlDependencies version;
|
||||
@ -53,7 +78,10 @@ let
|
||||
|
||||
inherit prePatch;
|
||||
|
||||
buildFlags = [ "all" "tools" ];
|
||||
buildFlags = [
|
||||
"all"
|
||||
"tools"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
install -vd "$out/bin" "$out/lib/haxe/std"
|
||||
@ -111,12 +139,21 @@ let
|
||||
meta = with lib; {
|
||||
description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++";
|
||||
homepage = "https://haxe.org";
|
||||
license = with licenses; [ gpl2Plus mit ]; # based on upstream opam file
|
||||
maintainers = [ maintainers.marcweber maintainers.locallycompact maintainers.logo ];
|
||||
license = with licenses; [
|
||||
gpl2Plus
|
||||
mit
|
||||
]; # based on upstream opam file
|
||||
maintainers = [
|
||||
maintainers.marcweber
|
||||
maintainers.locallycompact
|
||||
maintainers.logo
|
||||
maintainers.bwkam
|
||||
];
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
};
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
haxe_4_0 = generic {
|
||||
version = "4.0.5";
|
||||
hash = "sha256-Ck/py+tZS7dBu/uikhSLKBRNljpg2h5PARX0Btklozg=";
|
||||
@ -126,7 +163,7 @@ in {
|
||||
hash = "sha256-QP5/jwexQXai1A5Iiwiyrm+/vkdAc+9NVGt+jEQz2mY=";
|
||||
};
|
||||
haxe_4_3 = generic {
|
||||
version = "4.3.4";
|
||||
hash = "sha256-XGV4VG8nUofHGjHbtrLA+2kIpnnPqw5IlcNrP3EsL+Q=";
|
||||
version = "4.3.5";
|
||||
hash = "sha256-vms7FoOL8cDPorHd/EJq8HEHGRX1JfL8EZmDtxW9lOw=";
|
||||
};
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
{ lib, rustPlatform, fetchFromGitHub, installShellFiles }:
|
||||
{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "jrsonnet";
|
||||
@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec {
|
||||
postInstall = ''
|
||||
ln -s $out/bin/jrsonnet $out/bin/jsonnet
|
||||
|
||||
'' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
for shell in bash zsh fish; do
|
||||
installShellCompletion --cmd jrsonnet \
|
||||
--$shell <($out/bin/jrsonnet --generate $shell /dev/null)
|
||||
|
@ -24,9 +24,9 @@ let
|
||||
"18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
|
||||
"19.1.0-rc1".officialRelease.sha256 = "sha256-uaM+CKE+l+ksLtfhVMTLXbLlu+lUZScf+ucBcRENSDM=";
|
||||
"20.0.0-git".gitRelease = {
|
||||
rev = "62e9f40949ddc52e9660b25ab146bd5d9b39ad88";
|
||||
rev-version = "20.0.0-unstable-2024-07-28";
|
||||
sha256 = "sha256-MBNhBdY+fLrxUxWACqDLBoEEDCCaHOtbBeM5/f8SEf4=";
|
||||
rev = "5f7e921fe3b5402127868faf5855a835cf238196";
|
||||
rev-version = "20.0.0-unstable-2024-08-04";
|
||||
sha256 = "sha256-gW5yPHqmM3sbL9KCt7oXHG8I1ECdKAxNlSZkubve60A=";
|
||||
};
|
||||
} // llvmVersions;
|
||||
|
||||
|
@ -4,7 +4,8 @@
|
||||
aresponses,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
hatchling,
|
||||
httpx,
|
||||
pytest-asyncio,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
@ -12,26 +13,31 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioweenect";
|
||||
version = "1.1.1";
|
||||
format = "pyproject";
|
||||
version = "1.1.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eifinger";
|
||||
repo = pname;
|
||||
repo = "aioweenect";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-9CYdOUPCt4TkepVuVJHMZngFHyCLFwVvik1xDnfneEc=";
|
||||
hash = "sha256-qVhF+gy5qcH/okuncDuzbAUPonkmQo1/QwOjC70IV4w=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "--cov --cov-report term-missing --cov-report xml --cov=aioweenect tests" ""
|
||||
--replace-fail "--cov --cov-report term-missing --cov=src/aioweenect --asyncio-mode=auto" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
pythonRelaxDeps = [ "aiohttp" ];
|
||||
|
||||
propagatedBuildInputs = [ aiohttp ];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
httpx
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
aresponses
|
||||
@ -44,6 +50,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Library for the weenect API";
|
||||
homepage = "https://github.com/eifinger/aioweenect";
|
||||
changelog = "https://github.com/eifinger/aioweenect/releases/tag/v${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
@ -50,7 +50,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "chromadb";
|
||||
version = "0.5.3";
|
||||
version = "0.5.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -59,13 +59,13 @@ buildPythonPackage rec {
|
||||
owner = "chroma-core";
|
||||
repo = "chroma";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-czDL2b+Jj7mrYZCTfnaZArkOHBaWyTV0BTE2wvykHps=";
|
||||
hash = "sha256-wzfzuWuNqLAjfAZC38p1iTtJHez/pJ9Ncgeo23o1dMo=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-eTVT1yowuDsajjceWojdUdX466FKneUt1i5QipBFdp4=";
|
||||
hash = "sha256-0OE2i29oE6RpJRswQWI8+5dbA6lOWd3nhqe1RGlnjhk=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "clarifai-grpc";
|
||||
version = "10.6.6";
|
||||
version = "10.7.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "Clarifai";
|
||||
repo = "clarifai-python-grpc";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-UnMIl+fB5BA0LTurHN2XpMlhvOzvAgveLG+EuQE2WG4=";
|
||||
hash = "sha256-OWx+YtpZRWTsap4go89yia+DqqAewZq+0cTaoXdDRSk=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "edk2-pytool-library";
|
||||
version = "0.21.9";
|
||||
version = "0.21.10";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "tianocore";
|
||||
repo = "edk2-pytool-library";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-397YJotA5PxyrOU+xwaOakPHf6Hynd7bdro/HIBDPHo=";
|
||||
hash = "sha256-77Eu1yqCsYgRgEMxBFEmV51Tj/NGH1sFjx016fC3uMM=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "faraday-plugins";
|
||||
version = "1.18.1";
|
||||
version = "1.18.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "infobyte";
|
||||
repo = "faraday_plugins";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ogfshtuHQ1UBNX24gTevWKGsFFaA097oEW3J3fzcXFo=";
|
||||
hash = "sha256-QSJrzZyqwaHu8as03YIzB7PjUMzCnyADZgcBVnhm6c0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
36
pkgs/development/python-modules/hass-splunk/default.nix
Normal file
36
pkgs/development/python-modules/hass-splunk/default.nix
Normal file
@ -0,0 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
aiohttp,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hass-splunk";
|
||||
version = "0.1.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Bre77";
|
||||
repo = "hass_splunk";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-bgF6gHAA57MiWdmpwilGa+l05/ETKdpyi2naVagkRlc=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ aiohttp ];
|
||||
|
||||
pythonImportsCheck = [ "hass_splunk" ];
|
||||
|
||||
# upstream has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "Async single threaded connector to Splunk HEC using an asyncio session";
|
||||
homepage = "https://github.com/Bre77/hass_splunk";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
42
pkgs/development/python-modules/llama-cloud/default.nix
Normal file
42
pkgs/development/python-modules/llama-cloud/default.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
httpx,
|
||||
poetry-core,
|
||||
pydantic,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-cloud";
|
||||
version = "0.0.11";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_cloud";
|
||||
inherit version;
|
||||
hash = "sha256-EAiCtSiJIGUhFDbaBIJS1X7KFNhoPS/eb4nusglQrBg=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
httpx
|
||||
pydantic
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "llama_cloud" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "LlamaIndex Python Client";
|
||||
homepage = "https://pypi.org/project/llama-cloud/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-agent-openai";
|
||||
version = "0.2.7";
|
||||
version = "0.2.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_agent_openai";
|
||||
inherit version;
|
||||
hash = "sha256-E85TXwPjLIIXY8AeJq9CIvOYEXhiJBTThoAToZRugSQ=";
|
||||
hash = "sha256-3r6G2m2dmD2zK0Rd3KfHmKwUD+WVc7r97XNZWzmV89U=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "llama-index-llms-openai" ];
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-cli";
|
||||
version = "0.1.12";
|
||||
version = "0.1.13";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_cli";
|
||||
inherit version;
|
||||
hash = "sha256-PPH3BsPGnGsaqwf8p/qtOVnbFwmAjv1QSRtmnTiwtYA=";
|
||||
hash = "sha256-hhR97UQ5+6sdbHwNcujyMdKTXan99cnT8N3k811Eqlk=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
@ -22,6 +22,7 @@
|
||||
pytest-mock,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pyvis,
|
||||
pyyaml,
|
||||
requests,
|
||||
spacy,
|
||||
@ -46,7 +47,7 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-core";
|
||||
version = "0.10.48.post1";
|
||||
version = "0.10.60";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -55,7 +56,7 @@ buildPythonPackage rec {
|
||||
owner = "run-llama";
|
||||
repo = "llama_index";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-O8mHttYMRUzWvhydQsOux7tynhDuMKapsSDJQXL0MRQ=";
|
||||
hash = "sha256-CH/YTG0/SVDhwY1iN+K1s7cdTDFDZboO6N9208qLFf4=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/${pname}";
|
||||
@ -91,6 +92,7 @@ buildPythonPackage rec {
|
||||
openai
|
||||
pandas
|
||||
pillow
|
||||
pyvis
|
||||
pyyaml
|
||||
requests
|
||||
spacy
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-embeddings-ollama";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_embeddings_ollama";
|
||||
inherit version;
|
||||
hash = "sha256-qeCAm93S5K2IjySVGe3H49M5x05OA/xaQMMGDcQdR6k=";
|
||||
hash = "sha256-S9HdMjDJvgTPpFsow6gGbkbBZU1DYPy+zcFxiskBPso=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-graph-stores-neo4j";
|
||||
version = "0.2.7";
|
||||
version = "0.2.11";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_graph_stores_neo4j";
|
||||
inherit version;
|
||||
hash = "sha256-SMdEeJ3kZPbiIU1PW3PWBKBI/B5fRwC/wqEZnkLekHY=";
|
||||
hash = "sha256-nXKpwbE28vq2Ew8Vrw0rxveHBVbu6542wt+aM1t4xl0=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
@ -3,13 +3,14 @@
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
poetry-core,
|
||||
llama-cloud,
|
||||
llama-index-core,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-indices-managed-llama-cloud";
|
||||
version = "0.1.6";
|
||||
version = "0.2.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,12 +18,15 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_indices_managed_llama_cloud";
|
||||
inherit version;
|
||||
hash = "sha256-dLOw6ev500jTBU+fwMZXAxrM65NRwxEWrY1aeuRyn1w=";
|
||||
hash = "sha256-1+m0zFAhSzz8116mPKzOTuNgkstnLAA/Ff0jujHEnsA=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [ llama-index-core ];
|
||||
dependencies = [
|
||||
llama-cloud
|
||||
llama-index-core
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
@ -3,13 +3,14 @@
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
llama-index-core,
|
||||
ollama,
|
||||
poetry-core,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-llms-ollama";
|
||||
version = "0.1.5";
|
||||
version = "0.2.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,12 +18,15 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_llms_ollama";
|
||||
inherit version;
|
||||
hash = "sha256-dWl9lshg2H6AzOkMnqQly9I2kYRY4P6q7gNZcGi6mEQ=";
|
||||
hash = "sha256-DH8ZLLi3aHB71RVLl+KkEoRzLWIHDrdhkN7hJelSReo=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [ llama-index-core ];
|
||||
dependencies = [
|
||||
llama-index-core
|
||||
ollama
|
||||
];
|
||||
|
||||
# Tests are only available in the mono repo
|
||||
doCheck = false;
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-llms-openai";
|
||||
version = "0.1.22";
|
||||
version = "0.1.27";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_llms_openai";
|
||||
inherit version;
|
||||
hash = "sha256-cpvy6nBDUXRl4dWFCJUSt32LPOkiM6Z8E41dYhBh7VY=";
|
||||
hash = "sha256-N8LRFZtWYH06gH2QJg7iW08AIIbWJRxycq+8U/JRRgM=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-multi-modal-llms-openai";
|
||||
version = "0.1.6";
|
||||
version = "0.1.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_multi_modal_llms_openai";
|
||||
inherit version;
|
||||
hash = "sha256-EN51qHekRK81MGOF+q2bnwYkOR5VMJlwVkEUoICgV4w=";
|
||||
hash = "sha256-XiyUpkFaJQnK0DXM6jRGGVmuMnpZANPoIEF+nruaE+w=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-program-openai";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_program_openai";
|
||||
inherit version;
|
||||
hash = "sha256-xqSYDF6oJgiLKLTe4zZ+2yAiHm0F6w4FAZBJGQEx13I=";
|
||||
hash = "sha256-v362GgczgXFL5aBJ2TtABE3+Ub1DM77lOdFTK3QHYh8=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "llama-index-agent-openai" ];
|
||||
|
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-vector-stores-postgres";
|
||||
version = "0.1.11";
|
||||
version = "0.1.13";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_vector_stores_postgres";
|
||||
inherit version;
|
||||
hash = "sha256-ziP/lUnFJpvcy6Y4h1uSH6qkpYHO+3U+mfg2XIJIeg4=";
|
||||
hash = "sha256-aqSSgXb1fmEY98pj8xNQolDLOFbsq/UOXCVZReHYgD4=";
|
||||
};
|
||||
|
||||
pythonRemoveDeps = [ "psycopg2-binary" ];
|
||||
|
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-vector-stores-qdrant";
|
||||
version = "0.2.10";
|
||||
version = "0.2.14";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_vector_stores_qdrant";
|
||||
inherit version;
|
||||
hash = "sha256-kFUZiE7rtVQQzaTstKOaM2XkKZQ7ydqVR/2xyPdVtt8=";
|
||||
hash = "sha256-+wwwZNQXt2NBSVqYcF5ATiy5K2Cku+Auuhuni7usnKI=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-parse";
|
||||
version = "0.4.5";
|
||||
version = "0.4.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_parse";
|
||||
inherit version;
|
||||
hash = "sha256-CKSLz0r1tiO/JvpiZgOFcrlUCfe+ZHRgZ9uNOPaSf+U=";
|
||||
hash = "sha256-ZX+PpffTmfFMBFT8BcrmA02gNz8ZHfbPyhehtKcE74c=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
@ -1,46 +1,72 @@
|
||||
{
|
||||
lib,
|
||||
beautifulsoup4,
|
||||
buildPythonPackage,
|
||||
defusedxml,
|
||||
docutils,
|
||||
fetchPypi,
|
||||
fetchFromGitHub,
|
||||
flit-core,
|
||||
jinja2,
|
||||
markdown-it-py,
|
||||
mdit-py-plugins,
|
||||
pytest-param-files,
|
||||
pytest-regressions,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
pyyaml,
|
||||
sphinx-pytest,
|
||||
sphinx,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "myst-docutils";
|
||||
version = "3.0.1";
|
||||
format = "pyproject";
|
||||
version = "4.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "myst_docutils";
|
||||
inherit version;
|
||||
hash = "sha256-alQvF0OWNjDck022ORJ1Nl4t1jgzMZKEbJxPHsrmBcI=";
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "executablebooks";
|
||||
repo = "MyST-Parser";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-QbFENC/Msc4pkEOPdDztjyl+2TXtAbMTHPJNAsUB978=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flit-core ];
|
||||
build-system = [ flit-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
docutils
|
||||
jinja2
|
||||
markdown-it-py
|
||||
mdit-py-plugins
|
||||
pyyaml
|
||||
sphinx
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
beautifulsoup4
|
||||
defusedxml
|
||||
pytest-param-files
|
||||
pytest-regressions
|
||||
pytestCheckHook
|
||||
sphinx-pytest
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "myst_parser" ];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require linkify
|
||||
"test_cmdline"
|
||||
"test_extended_syntaxes"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extended commonmark compliant parser, with bridges to docutils/sphinx";
|
||||
homepage = "https://github.com/executablebooks/MyST-Parser";
|
||||
changelog = "https://github.com/executablebooks/MyST-Parser/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dpausp ];
|
||||
broken = pythonOlder "3.8"; # dependency networkx requires 3.8
|
||||
};
|
||||
}
|
||||
|
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "neo4j";
|
||||
version = "5.23.0";
|
||||
version = "5.23.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "neo4j";
|
||||
repo = "neo4j-python-driver";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-IeRPjhjPKr65lUNltERvaHmxHhRJwUfXbyjrnDnBbR8=";
|
||||
hash = "sha256-0kxeBwdhiDRCA4mkvr/wU07mr4bdvegO8sqghrH7dYg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "netutils";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "networktocode";
|
||||
repo = "netutils";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-JPGdxkrbDGdehBviXl851J5da10auu8TDQDBnQzK2uk=";
|
||||
hash = "sha256-hB5ySup7vd01VPyRuNT5d3FufuMvbHF8x5ULOzR1TWY=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
@ -35,6 +35,9 @@ buildPythonPackage {
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Tests have issues starting with 0.47b0
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "opentelemetry.instrumentation.asgi" ];
|
||||
|
||||
meta = opentelemetry-instrumentation.meta // {
|
||||
|
@ -1,14 +1,14 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
pythonOlder,
|
||||
fetchFromGitHub,
|
||||
hatchling,
|
||||
opentelemetry-api,
|
||||
opentelemetry-test-utils,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
wrapt,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
# to avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta
|
||||
# To avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python-contrib";
|
||||
@ -46,8 +46,8 @@ buildPythonPackage rec {
|
||||
passthru.updateScript = opentelemetry-api.updateScript;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation";
|
||||
description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python";
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation";
|
||||
changelog = "https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/${src.rev}";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.deshaw.members ++ [ maintainers.natsukium ];
|
||||
|
@ -4,7 +4,7 @@
|
||||
cogapp,
|
||||
fetchPypi,
|
||||
mock,
|
||||
nose,
|
||||
setuptools,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
six,
|
||||
@ -14,7 +14,7 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "paver";
|
||||
version = "1.3.4";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -24,12 +24,13 @@ buildPythonPackage rec {
|
||||
hash = "sha256-0+ZJiIFIWrdQ7+QMUniYKpNDvGJ+E3sRrc7WJ3GTCMc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [ six ];
|
||||
|
||||
checkInputs = [
|
||||
cogapp
|
||||
mock
|
||||
nose
|
||||
pytestCheckHook
|
||||
virtualenv
|
||||
];
|
||||
@ -37,15 +38,17 @@ buildPythonPackage rec {
|
||||
pythonImportsCheck = [ "paver" ];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Test depends on distutils
|
||||
# Tests depend on distutils
|
||||
"paver/tests/test_setuputils.py"
|
||||
"paver/tests/test_doctools.py"
|
||||
"paver/tests/test_tasks.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Python-based build/distribution/deployment scripting tool";
|
||||
mainProgram = "paver";
|
||||
homepage = "https://github.com/paver/paver";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ lovek323 ];
|
||||
};
|
||||
}
|
||||
|
34
pkgs/development/python-modules/refoss-ha/default.nix
Normal file
34
pkgs/development/python-modules/refoss-ha/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "refoss-ha";
|
||||
version = "1.2.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ashionky";
|
||||
repo = "refoss_ha";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DFP2lEZkjW5L94CnhJS04ydM66gnKzvgpiXOAejs768=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
pythonImportsCheck = [ "refoss_ha" ];
|
||||
|
||||
# upstream has no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/ashionky/refoss_ha/releases/tag/v${version}";
|
||||
description = "Refoss support for Home Assistant";
|
||||
homepage = "https://github.com/ashionky/refoss_ha";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user