Merge master into staging-next
This commit is contained in:
commit
a8ed6b85b5
|
@ -522,6 +522,7 @@ with lib.maintainers; {
|
|||
|
||||
mate = {
|
||||
members = [
|
||||
bobby285271
|
||||
j03
|
||||
romildo
|
||||
];
|
||||
|
@ -828,6 +829,7 @@ with lib.maintainers; {
|
|||
|
||||
xfce = {
|
||||
members = [
|
||||
bobby285271
|
||||
romildo
|
||||
muscaln
|
||||
];
|
||||
|
|
|
@ -7,25 +7,20 @@ let
|
|||
opt = options.services.syncthing;
|
||||
defaultUser = "syncthing";
|
||||
defaultGroup = defaultUser;
|
||||
settingsFormat = pkgs.formats.json { };
|
||||
|
||||
devices = mapAttrsToList (name: device: {
|
||||
devices = mapAttrsToList (_: device: device // {
|
||||
deviceID = device.id;
|
||||
inherit (device) name addresses introducer autoAcceptFolders;
|
||||
}) cfg.devices;
|
||||
}) cfg.settings.devices;
|
||||
|
||||
folders = mapAttrsToList ( _: folder: {
|
||||
inherit (folder) path id label type;
|
||||
devices = map (device: { deviceId = cfg.devices.${device}.id; }) folder.devices;
|
||||
rescanIntervalS = folder.rescanInterval;
|
||||
fsWatcherEnabled = folder.watch;
|
||||
fsWatcherDelayS = folder.watchDelay;
|
||||
ignorePerms = folder.ignorePerms;
|
||||
ignoreDelete = folder.ignoreDelete;
|
||||
versioning = folder.versioning;
|
||||
}) (filterAttrs (
|
||||
_: folder:
|
||||
folder.enable
|
||||
) cfg.folders);
|
||||
folders = mapAttrsToList (_: folder: folder // {
|
||||
devices = map (device:
|
||||
if builtins.isString device then
|
||||
{ deviceId = cfg.settings.devices.${device}.id; }
|
||||
else
|
||||
device
|
||||
) folder.devices;
|
||||
}) cfg.settings.folders;
|
||||
|
||||
updateConfig = pkgs.writers.writeDash "merge-syncthing-config" ''
|
||||
set -efu
|
||||
|
@ -54,10 +49,10 @@ let
|
|||
old_cfg=$(curl ${cfg.guiAddress}/rest/config)
|
||||
|
||||
# generate the new config by merging with the NixOS config options
|
||||
new_cfg=$(printf '%s\n' "$old_cfg" | ${pkgs.jq}/bin/jq -c '. * {
|
||||
"devices": (${builtins.toJSON devices}${optionalString (cfg.devices == {} || ! cfg.overrideDevices) " + .devices"}),
|
||||
"folders": (${builtins.toJSON folders}${optionalString (cfg.folders == {} || ! cfg.overrideFolders) " + .folders"})
|
||||
} * ${builtins.toJSON cfg.extraOptions}')
|
||||
new_cfg=$(printf '%s\n' "$old_cfg" | ${pkgs.jq}/bin/jq -c ${escapeShellArg ''. * ${builtins.toJSON cfg.settings} * {
|
||||
"devices": (${builtins.toJSON devices}${optionalString (cfg.settings.devices == {} || ! cfg.overrideDevices) " + .devices"}),
|
||||
"folders": (${builtins.toJSON folders}${optionalString (cfg.settings.folders == {} || ! cfg.overrideFolders) " + .folders"})
|
||||
}''})
|
||||
|
||||
# send the new config
|
||||
curl -X PUT -d "$new_cfg" ${cfg.guiAddress}/rest/config
|
||||
|
@ -99,287 +94,282 @@ in {
|
|||
default = true;
|
||||
description = mdDoc ''
|
||||
Whether to delete the devices which are not configured via the
|
||||
[devices](#opt-services.syncthing.devices) option.
|
||||
[devices](#opt-services.syncthing.settings.devices) option.
|
||||
If set to `false`, devices added via the web
|
||||
interface will persist and will have to be deleted manually.
|
||||
'';
|
||||
};
|
||||
|
||||
devices = mkOption {
|
||||
default = {};
|
||||
description = mdDoc ''
|
||||
Peers/devices which Syncthing should communicate with.
|
||||
|
||||
Note that you can still add devices manually, but those changes
|
||||
will be reverted on restart if [overrideDevices](#opt-services.syncthing.overrideDevices)
|
||||
is enabled.
|
||||
'';
|
||||
example = {
|
||||
bigbox = {
|
||||
id = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU";
|
||||
addresses = [ "tcp://192.168.0.10:51820" ];
|
||||
};
|
||||
};
|
||||
type = types.attrsOf (types.submodule ({ name, ... }: {
|
||||
options = {
|
||||
|
||||
name = mkOption {
|
||||
type = types.str;
|
||||
default = name;
|
||||
description = lib.mdDoc ''
|
||||
The name of the device.
|
||||
'';
|
||||
};
|
||||
|
||||
addresses = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
description = lib.mdDoc ''
|
||||
The addresses used to connect to the device.
|
||||
If this is left empty, dynamic configuration is attempted.
|
||||
'';
|
||||
};
|
||||
|
||||
id = mkOption {
|
||||
type = types.str;
|
||||
description = mdDoc ''
|
||||
The device ID. See <https://docs.syncthing.net/dev/device-ids.html>.
|
||||
'';
|
||||
};
|
||||
|
||||
introducer = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = mdDoc ''
|
||||
Whether the device should act as an introducer and be allowed
|
||||
to add folders on this computer.
|
||||
See <https://docs.syncthing.net/users/introducer.html>.
|
||||
'';
|
||||
};
|
||||
|
||||
autoAcceptFolders = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = mdDoc ''
|
||||
Automatically create or share folders that this device advertises at the default path.
|
||||
See <https://docs.syncthing.net/users/config.html?highlight=autoaccept#config-file-format>.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
}));
|
||||
};
|
||||
|
||||
overrideFolders = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = mdDoc ''
|
||||
Whether to delete the folders which are not configured via the
|
||||
[folders](#opt-services.syncthing.folders) option.
|
||||
[folders](#opt-services.syncthing.settings.folders) option.
|
||||
If set to `false`, folders added via the web
|
||||
interface will persist and will have to be deleted manually.
|
||||
'';
|
||||
};
|
||||
|
||||
folders = mkOption {
|
||||
default = {};
|
||||
description = mdDoc ''
|
||||
Folders which should be shared by Syncthing.
|
||||
|
||||
Note that you can still add folders manually, but those changes
|
||||
will be reverted on restart if [overrideFolders](#opt-services.syncthing.overrideFolders)
|
||||
is enabled.
|
||||
'';
|
||||
example = literalExpression ''
|
||||
{
|
||||
"/home/user/sync" = {
|
||||
id = "syncme";
|
||||
devices = [ "bigbox" ];
|
||||
};
|
||||
}
|
||||
'';
|
||||
type = types.attrsOf (types.submodule ({ name, ... }: {
|
||||
settings = mkOption {
|
||||
type = types.submodule {
|
||||
freeformType = settingsFormat.type;
|
||||
options = {
|
||||
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc ''
|
||||
Whether to share this folder.
|
||||
This option is useful when you want to define all folders
|
||||
in one place, but not every machine should share all folders.
|
||||
'';
|
||||
};
|
||||
|
||||
path = mkOption {
|
||||
# TODO for release 23.05: allow relative paths again and set
|
||||
# working directory to cfg.dataDir
|
||||
type = types.str // {
|
||||
check = x: types.str.check x && (substring 0 1 x == "/" || substring 0 2 x == "~/");
|
||||
description = types.str.description + " starting with / or ~/";
|
||||
};
|
||||
default = name;
|
||||
description = lib.mdDoc ''
|
||||
The path to the folder which should be shared.
|
||||
Only absolute paths (starting with `/`) and paths relative to
|
||||
the [user](#opt-services.syncthing.user)'s home directory
|
||||
(starting with `~/`) are allowed.
|
||||
'';
|
||||
};
|
||||
|
||||
id = mkOption {
|
||||
type = types.str;
|
||||
default = name;
|
||||
description = lib.mdDoc ''
|
||||
The ID of the folder. Must be the same on all devices.
|
||||
'';
|
||||
};
|
||||
|
||||
label = mkOption {
|
||||
type = types.str;
|
||||
default = name;
|
||||
description = lib.mdDoc ''
|
||||
The label of the folder.
|
||||
'';
|
||||
};
|
||||
|
||||
devices = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
# global options
|
||||
options = mkOption {
|
||||
default = {};
|
||||
description = mdDoc ''
|
||||
The devices this folder should be shared with. Each device must
|
||||
be defined in the [devices](#opt-services.syncthing.devices) option.
|
||||
The options element contains all other global configuration options
|
||||
'';
|
||||
};
|
||||
|
||||
versioning = mkOption {
|
||||
default = null;
|
||||
description = mdDoc ''
|
||||
How to keep changed/deleted files with Syncthing.
|
||||
There are 4 different types of versioning with different parameters.
|
||||
See <https://docs.syncthing.net/users/versioning.html>.
|
||||
'';
|
||||
example = literalExpression ''
|
||||
[
|
||||
{
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
}
|
||||
{
|
||||
versioning = {
|
||||
type = "trashcan";
|
||||
params.cleanoutDays = "1000";
|
||||
};
|
||||
}
|
||||
{
|
||||
versioning = {
|
||||
type = "staggered";
|
||||
fsPath = "/syncthing/backup";
|
||||
params = {
|
||||
cleanInterval = "3600";
|
||||
maxAge = "31536000";
|
||||
};
|
||||
};
|
||||
}
|
||||
{
|
||||
versioning = {
|
||||
type = "external";
|
||||
params.versionsPath = pkgs.writers.writeBash "backup" '''
|
||||
folderpath="$1"
|
||||
filepath="$2"
|
||||
rm -rf "$folderpath/$filepath"
|
||||
''';
|
||||
};
|
||||
}
|
||||
]
|
||||
'';
|
||||
type = with types; nullOr (submodule {
|
||||
type = types.attrsOf (types.submodule ({ name, ... }: {
|
||||
freeformType = settingsFormat.type;
|
||||
options = {
|
||||
type = mkOption {
|
||||
type = enum [ "external" "simple" "staggered" "trashcan" ];
|
||||
description = mdDoc ''
|
||||
The type of versioning.
|
||||
See <https://docs.syncthing.net/users/versioning.html>.
|
||||
|
||||
localAnnounceEnabled = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc ''
|
||||
Whether to send announcements to the local LAN, also use such announcements to find other devices.
|
||||
'';
|
||||
};
|
||||
fsPath = mkOption {
|
||||
default = "";
|
||||
type = either str path;
|
||||
description = mdDoc ''
|
||||
Path to the versioning folder.
|
||||
See <https://docs.syncthing.net/users/versioning.html>.
|
||||
|
||||
localAnnouncePort = mkOption {
|
||||
type = types.int;
|
||||
default = 21027;
|
||||
description = lib.mdDoc ''
|
||||
The port on which to listen and send IPv4 broadcast announcements to.
|
||||
'';
|
||||
};
|
||||
params = mkOption {
|
||||
type = attrsOf (either str path);
|
||||
description = mdDoc ''
|
||||
The parameters for versioning. Structure depends on
|
||||
[versioning.type](#opt-services.syncthing.folders._name_.versioning.type).
|
||||
See <https://docs.syncthing.net/users/versioning.html>.
|
||||
|
||||
relaysEnabled = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc ''
|
||||
When true, relays will be connected to and potentially used for device to device connections.
|
||||
'';
|
||||
};
|
||||
|
||||
urAccepted = mkOption {
|
||||
type = types.int;
|
||||
default = 0;
|
||||
description = lib.mdDoc ''
|
||||
Whether the user has accepted to submit anonymous usage data.
|
||||
The default, 0, mean the user has not made a choice, and Syncthing will ask at some point in the future.
|
||||
"-1" means no, a number above zero means that that version of usage reporting has been accepted.
|
||||
'';
|
||||
};
|
||||
|
||||
limitBandwidthInLan = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Whether to apply bandwidth limits to devices in the same broadcast domain as the local device.
|
||||
'';
|
||||
};
|
||||
|
||||
maxFolderConcurrency = mkOption {
|
||||
type = types.int;
|
||||
default = 0;
|
||||
description = lib.mdDoc ''
|
||||
This option controls how many folders may concurrently be in I/O-intensive operations such as syncing or scanning.
|
||||
The mechanism is described in detail in a [separate chapter](https://docs.syncthing.net/advanced/option-max-concurrency.html).
|
||||
'';
|
||||
};
|
||||
};
|
||||
});
|
||||
}));
|
||||
};
|
||||
|
||||
rescanInterval = mkOption {
|
||||
type = types.int;
|
||||
default = 3600;
|
||||
description = lib.mdDoc ''
|
||||
How often the folder should be rescanned for changes.
|
||||
'';
|
||||
};
|
||||
|
||||
type = mkOption {
|
||||
type = types.enum [ "sendreceive" "sendonly" "receiveonly" "receiveencrypted" ];
|
||||
default = "sendreceive";
|
||||
description = lib.mdDoc ''
|
||||
Whether to only send changes for this folder, only receive them
|
||||
or both. `receiveencrypted` can be used for untrusted devices. See
|
||||
<https://docs.syncthing.net/users/untrusted.html> for reference.
|
||||
'';
|
||||
};
|
||||
|
||||
watch = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc ''
|
||||
Whether the folder should be watched for changes by inotify.
|
||||
'';
|
||||
};
|
||||
|
||||
watchDelay = mkOption {
|
||||
type = types.int;
|
||||
default = 10;
|
||||
description = lib.mdDoc ''
|
||||
The delay after an inotify event is triggered.
|
||||
'';
|
||||
};
|
||||
|
||||
ignorePerms = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc ''
|
||||
Whether to ignore permission changes.
|
||||
'';
|
||||
};
|
||||
|
||||
ignoreDelete = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
# device settings
|
||||
devices = mkOption {
|
||||
default = {};
|
||||
description = mdDoc ''
|
||||
Whether to skip deleting files that are deleted by peers.
|
||||
See <https://docs.syncthing.net/advanced/folder-ignoredelete.html>.
|
||||
'';
|
||||
};
|
||||
};
|
||||
}));
|
||||
};
|
||||
Peers/devices which Syncthing should communicate with.
|
||||
|
||||
extraOptions = mkOption {
|
||||
type = types.addCheck (pkgs.formats.json {}).type isAttrs;
|
||||
Note that you can still add devices manually, but those changes
|
||||
will be reverted on restart if [overrideDevices](#opt-services.syncthing.overrideDevices)
|
||||
is enabled.
|
||||
'';
|
||||
example = {
|
||||
bigbox = {
|
||||
id = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU";
|
||||
addresses = [ "tcp://192.168.0.10:51820" ];
|
||||
};
|
||||
};
|
||||
type = types.attrsOf (types.submodule ({ name, ... }: {
|
||||
freeformType = settingsFormat.type;
|
||||
options = {
|
||||
|
||||
name = mkOption {
|
||||
type = types.str;
|
||||
default = name;
|
||||
description = lib.mdDoc ''
|
||||
The name of the device.
|
||||
'';
|
||||
};
|
||||
|
||||
id = mkOption {
|
||||
type = types.str;
|
||||
description = mdDoc ''
|
||||
The device ID. See <https://docs.syncthing.net/dev/device-ids.html>.
|
||||
'';
|
||||
};
|
||||
|
||||
autoAcceptFolders = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = mdDoc ''
|
||||
Automatically create or share folders that this device advertises at the default path.
|
||||
See <https://docs.syncthing.net/users/config.html?highlight=autoaccept#config-file-format>.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
}));
|
||||
};
|
||||
|
||||
# folder settings
|
||||
folders = mkOption {
|
||||
default = {};
|
||||
description = mdDoc ''
|
||||
Folders which should be shared by Syncthing.
|
||||
|
||||
Note that you can still add folders manually, but those changes
|
||||
will be reverted on restart if [overrideFolders](#opt-services.syncthing.overrideFolders)
|
||||
is enabled.
|
||||
'';
|
||||
example = literalExpression ''
|
||||
{
|
||||
"/home/user/sync" = {
|
||||
id = "syncme";
|
||||
devices = [ "bigbox" ];
|
||||
};
|
||||
}
|
||||
'';
|
||||
type = types.attrsOf (types.submodule ({ name, ... }: {
|
||||
freeformType = settingsFormat.type;
|
||||
options = {
|
||||
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc ''
|
||||
Whether to share this folder.
|
||||
This option is useful when you want to define all folders
|
||||
in one place, but not every machine should share all folders.
|
||||
'';
|
||||
};
|
||||
|
||||
path = mkOption {
|
||||
# TODO for release 23.05: allow relative paths again and set
|
||||
# working directory to cfg.dataDir
|
||||
type = types.str // {
|
||||
check = x: types.str.check x && (substring 0 1 x == "/" || substring 0 2 x == "~/");
|
||||
description = types.str.description + " starting with / or ~/";
|
||||
};
|
||||
default = name;
|
||||
description = lib.mdDoc ''
|
||||
The path to the folder which should be shared.
|
||||
Only absolute paths (starting with `/`) and paths relative to
|
||||
the [user](#opt-services.syncthing.user)'s home directory
|
||||
(starting with `~/`) are allowed.
|
||||
'';
|
||||
};
|
||||
|
||||
id = mkOption {
|
||||
type = types.str;
|
||||
default = name;
|
||||
description = lib.mdDoc ''
|
||||
The ID of the folder. Must be the same on all devices.
|
||||
'';
|
||||
};
|
||||
|
||||
label = mkOption {
|
||||
type = types.str;
|
||||
default = name;
|
||||
description = lib.mdDoc ''
|
||||
The label of the folder.
|
||||
'';
|
||||
};
|
||||
|
||||
devices = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [];
|
||||
description = mdDoc ''
|
||||
The devices this folder should be shared with. Each device must
|
||||
be defined in the [devices](#opt-services.syncthing.settings.devices) option.
|
||||
'';
|
||||
};
|
||||
|
||||
versioning = mkOption {
|
||||
default = null;
|
||||
description = mdDoc ''
|
||||
How to keep changed/deleted files with Syncthing.
|
||||
There are 4 different types of versioning with different parameters.
|
||||
See <https://docs.syncthing.net/users/versioning.html>.
|
||||
'';
|
||||
example = literalExpression ''
|
||||
[
|
||||
{
|
||||
versioning = {
|
||||
type = "simple";
|
||||
params.keep = "10";
|
||||
};
|
||||
}
|
||||
{
|
||||
versioning = {
|
||||
type = "trashcan";
|
||||
params.cleanoutDays = "1000";
|
||||
};
|
||||
}
|
||||
{
|
||||
versioning = {
|
||||
type = "staggered";
|
||||
fsPath = "/syncthing/backup";
|
||||
params = {
|
||||
cleanInterval = "3600";
|
||||
maxAge = "31536000";
|
||||
};
|
||||
};
|
||||
}
|
||||
{
|
||||
versioning = {
|
||||
type = "external";
|
||||
params.versionsPath = pkgs.writers.writeBash "backup" '''
|
||||
folderpath="$1"
|
||||
filepath="$2"
|
||||
rm -rf "$folderpath/$filepath"
|
||||
''';
|
||||
};
|
||||
}
|
||||
]
|
||||
'';
|
||||
type = with types; nullOr (submodule {
|
||||
options = {
|
||||
type = mkOption {
|
||||
type = enum [ "external" "simple" "staggered" "trashcan" ];
|
||||
description = mdDoc ''
|
||||
The type of versioning.
|
||||
See <https://docs.syncthing.net/users/versioning.html>.
|
||||
'';
|
||||
};
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
copyOwnershipFromParent = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = mdDoc ''
|
||||
On Unix systems, tries to copy file/folder ownership from the parent directory (the directory it’s located in).
|
||||
Requires running Syncthing as a privileged user, or granting it additional capabilities (e.g. CAP_CHOWN on Linux).
|
||||
'';
|
||||
};
|
||||
};
|
||||
}));
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
default = {};
|
||||
description = mdDoc ''
|
||||
Extra configuration options for Syncthing.
|
||||
|
@ -530,6 +520,10 @@ in {
|
|||
This option was removed because Syncthing now has the inotify functionality included under the name "fswatcher".
|
||||
It can be enabled on a per-folder basis through the web interface.
|
||||
'')
|
||||
(mkRenamedOptionModule [ "services" "syncthing" "extraOptions" ] [ "services" "syncthing" "settings" ])
|
||||
(mkRenamedOptionModule [ "services" "syncthing" "folders" ] [ "services" "syncthing" "settings" "folders" ])
|
||||
(mkRenamedOptionModule [ "services" "syncthing" "devices" ] [ "services" "syncthing" "settings" "devices" ])
|
||||
(mkRenamedOptionModule [ "services" "syncthing" "options" ] [ "services" "syncthing" "settings" "options" ])
|
||||
] ++ map (o:
|
||||
mkRenamedOptionModule [ "services" "syncthing" "declarative" o ] [ "services" "syncthing" o ]
|
||||
) [ "cert" "key" "devices" "folders" "overrideDevices" "overrideFolders" "extraOptions"];
|
||||
|
@ -616,7 +610,7 @@ in {
|
|||
};
|
||||
};
|
||||
syncthing-init = mkIf (
|
||||
cfg.devices != {} || cfg.folders != {} || cfg.extraOptions != {}
|
||||
cfg.settings.devices != {} || cfg.folders != {} || cfg.extraOptions != {}
|
||||
) {
|
||||
description = "Syncthing configuration updater";
|
||||
requisite = [ "syncthing.service" ];
|
||||
|
|
|
@ -588,11 +588,12 @@ in {
|
|||
'';
|
||||
}
|
||||
{
|
||||
assertion = 1 == builtins.length
|
||||
(lib.mapAttrsToList
|
||||
(_: v: builtins.elem "scheduler" v.jobClasses || v.jobClasses == [ ])
|
||||
cfg.sidekiqProcesses);
|
||||
message = "There must be one and only one Sidekiq queue in services.mastodon.sidekiqProcesses with jobClass \"scheduler\".";
|
||||
assertion = 1 ==
|
||||
(lib.count (x: x)
|
||||
(lib.mapAttrsToList
|
||||
(_: v: builtins.elem "scheduler" v.jobClasses || v.jobClasses == [ ])
|
||||
cfg.sidekiqProcesses));
|
||||
message = "There must be exactly one Sidekiq queue in services.mastodon.sidekiqProcesses with jobClass \"scheduler\".";
|
||||
}
|
||||
];
|
||||
|
||||
|
|
|
@ -9,14 +9,16 @@ in {
|
|||
nodes.machine = {
|
||||
services.syncthing = {
|
||||
enable = true;
|
||||
devices.testDevice = {
|
||||
id = testId;
|
||||
settings = {
|
||||
devices.testDevice = {
|
||||
id = testId;
|
||||
};
|
||||
folders.testFolder = {
|
||||
path = "/tmp/test";
|
||||
devices = [ "testDevice" ];
|
||||
};
|
||||
gui.user = "guiUser";
|
||||
};
|
||||
folders.testFolder = {
|
||||
path = "/tmp/test";
|
||||
devices = [ "testDevice" ];
|
||||
};
|
||||
extraOptions.gui.user = "guiUser";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -52,13 +52,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "mixxx";
|
||||
version = "2.3.4";
|
||||
version = "2.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mixxxdj";
|
||||
repo = "mixxx";
|
||||
rev = version;
|
||||
sha256 = "sha256-1hOMU/Mdk1vT0GQipn/WX2fm9ddN0mPIq7kf2i2w3xQ=";
|
||||
sha256 = "sha256-NAp7RoYSI6BRw7C0ejW4pCJJYx9BG8D+BGVCVTDrggQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
@ -116,7 +116,7 @@ mkDerivation rec {
|
|||
|
||||
# mixxx installs udev rules to DATADIR instead of SYSCONFDIR
|
||||
# let's disable this and install udev rules manually via postInstall
|
||||
# see https://github.com/mixxxdj/mixxx/blob/2.3.4/CMakeLists.txt#L1381-L1392
|
||||
# see https://github.com/mixxxdj/mixxx/blob/2.3.5/CMakeLists.txt#L1381-L1392
|
||||
cmakeFlags = [
|
||||
"-DINSTALL_USER_UDEV_RULES=OFF"
|
||||
];
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
, minizip
|
||||
, pkg-config
|
||||
, libsForQt5
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -36,9 +37,15 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapGAppsHook
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
preFixup = ''
|
||||
qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
ffmpeg
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "geoipupdate";
|
||||
version = "5.1.0";
|
||||
version = "5.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "maxmind";
|
||||
repo = "geoipupdate";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DYZqvLuPcoek07YJLur/By9Wi2VxDz6C7jAOVmdKt4Y=";
|
||||
sha256 = "sha256-n32HxXNk/mHYL6Dn3c8jmTIwrwOfyyd/dui1Uw/xf90=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-t6uhFvuR54Q4nYur/3oBzAbBTaIjzHfx7GeEk6X/0os=";
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, gitUpdater
|
||||
, icu
|
||||
, libkiwix
|
||||
, meson
|
||||
|
@ -10,13 +11,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kiwix-tools";
|
||||
version = "3.4.0";
|
||||
version = "3.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kiwix";
|
||||
repo = "kiwix-tools";
|
||||
rev = version;
|
||||
sha256 = "sha256-r3/aTH/YoDuYpKLPakP4toS3OtiRueTUjmR34rdmr+w=";
|
||||
sha256 = "sha256-bOxi51H28LhA+5caX6kllIY5B3Q1FoGVFadFIhYRkG0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -30,6 +31,8 @@ stdenv.mkDerivation rec {
|
|||
libkiwix
|
||||
];
|
||||
|
||||
passthru.updateScript = gitUpdater { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Command line Kiwix tools: kiwix-serve, kiwix-manage, ...";
|
||||
homepage = "https://kiwix.org";
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "spicetify-cli";
|
||||
version = "2.18.0";
|
||||
version = "2.18.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spicetify";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-k9fbChpHy997Mj+U9n/iiSGDdsHZ22AoYUkCHUMGfbo=";
|
||||
sha256 = "sha256-BZuvuvbFCZ6VaztlZhlUZhJ7vf4W49mVHiORhH8oH2Y=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-mAtwbYuzkHUqG4fr2JffcM8PmBsBrnHWyl4DvVzfJCw=";
|
||||
vendorHash = "sha256-g0SuXDzYjg0mGzeDuB2tQnVnDmTiL5vw0r9QWSgIs3Q=";
|
||||
|
||||
ldflags = [
|
||||
"-s -w"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
(callPackage ./generic.nix { }) {
|
||||
channel = "stable";
|
||||
version = "2.13.2";
|
||||
sha256 = "0pcb4f8s8l156y0zd9g9f0pyydvp52n02krjy2giajp00gaqx3s3";
|
||||
vendorSha256 = "sha256-6KuXEKuQJvRNUM+6Uo+J9D3eHI+1tt62C5XZsEDwkTc=";
|
||||
version = "2.13.3";
|
||||
sha256 = "080ay0qqb98m208rzj3jnv4jprcfg60b46dbv594i9ps6vhb4ndc";
|
||||
vendorSha256 = "sha256-5T3YrYr7xeRkAADeE24BPu4PYU4mHFspqAiBpS8n4Y0=";
|
||||
}
|
||||
|
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "velero";
|
||||
version = "1.10.3";
|
||||
version = "1.11.0";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "velero";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-tNWFZrvq9bDV00TSM+q9D05Tc25judNzRxn0nU/RnCc=";
|
||||
sha256 = "sha256-vrRVNVcNahTC+HSHr7Bw3WedNhe+SSX03P65C5xiUnw=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
@ -20,7 +20,7 @@ buildGoModule rec {
|
|||
"-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-8yyZ6qIQqpl9PSvaCwhU/i2ZwRe171oMVGqFWeOZExo=";
|
||||
vendorHash = "sha256-WkJk+46+9U4TegDnGtQ+EoqqV/D7githz2pJvxCbV4c=";
|
||||
|
||||
excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ];
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chatty";
|
||||
version = "0.7.0";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "source.puri.sm";
|
||||
|
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
|||
repo = "chatty";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-e3lYzQjQx1ndomq4mJ8TmwXoUG3Bjl9JrLuTmjXmRCs=";
|
||||
hash = "sha256-H9cW19Eoz8cSv26Cyw5BIZSEWsWJktsEw92CHeecFsM=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -17,13 +17,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "teams-for-linux";
|
||||
version = "1.0.83";
|
||||
version = "1.0.88";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "IsmaelMartinez";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2tCBFc4CEgaYJq5fMbHi+M/Cz5Eeo2Slqgu9xUUkUjA=";
|
||||
sha256 = "sha256-eaXW52e+YJbL+0d2Cqrpp6M11rGsyNfIhgjHLzLDbWQ=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
diff --git a/app/index.js b/app/index.js
|
||||
index 20ccf43..b251f62 100644
|
||||
index ea89608..98f4a90 100644
|
||||
--- a/app/index.js
|
||||
+++ b/app/index.js
|
||||
@@ -1,4 +1,4 @@
|
||||
-const { app, ipcMain, desktopCapturer, systemPreferences, powerMonitor } = require('electron');
|
||||
+const { app, ipcMain, desktopCapturer, nativeImage, systemPreferences, powerMonitor } = require('electron');
|
||||
const path = require('path');
|
||||
const fs = require('fs');
|
||||
const { LucidLog } = require('lucid-log');
|
||||
const isDev = require('electron-is-dev');
|
||||
@@ -93,7 +93,16 @@ if (!gotTheLock) {
|
||||
@@ -97,7 +97,16 @@ if (!gotTheLock) {
|
||||
ipcMain.handle('getSystemIdleState', handleGetSystemIdleState);
|
||||
ipcMain.handle('getZoomLevel', handleGetZoomLevel);
|
||||
ipcMain.handle('saveZoomLevel', handleSaveZoomLevel);
|
||||
|
@ -23,6 +23,6 @@ index 20ccf43..b251f62 100644
|
|||
+ thumbnail: nativeImage.createEmpty()
|
||||
+ }])
|
||||
+ : desktopCapturer.getSources(opts));
|
||||
ipcMain.handle('getCustomBGList', handleGetCustomBGList);
|
||||
ipcMain.on('play-notification-sound', playNotificationSound);
|
||||
}
|
||||
|
||||
ipcMain.on('user-status-changed', userStatusChangedHandler);
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
, udev
|
||||
, libxcb
|
||||
, libxkbcommon
|
||||
, libxcrypt
|
||||
, libxcrypt-legacy
|
||||
, lshw
|
||||
, mesa
|
||||
, nspr
|
||||
|
@ -49,6 +49,7 @@
|
|||
, xcbutilrenderutil
|
||||
, xcbutilwm
|
||||
, p7zip
|
||||
, tbb
|
||||
, wayland
|
||||
, libXScrnSaver
|
||||
}:
|
||||
|
@ -62,6 +63,10 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "c58a0da26c8f64302cc612c60980dbd68c074d6d8a567b3d870d7d6d06b420ad";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
p7zip
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
at-spi2-atk
|
||||
|
@ -92,7 +97,7 @@ stdenv.mkDerivation rec {
|
|||
udev
|
||||
libxcb
|
||||
libxkbcommon
|
||||
libxcrypt
|
||||
libxcrypt-legacy
|
||||
libX11
|
||||
libXcomposite
|
||||
libXcursor
|
||||
|
@ -110,7 +115,7 @@ stdenv.mkDerivation rec {
|
|||
xcbutilkeysyms
|
||||
xcbutilrenderutil
|
||||
xcbutilwm
|
||||
p7zip
|
||||
tbb
|
||||
wayland
|
||||
];
|
||||
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "cloudlog";
|
||||
version = "2.4.1";
|
||||
version = "2.4.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "magicbug";
|
||||
repo = "Cloudlog";
|
||||
rev = version;
|
||||
sha256 = "sha256-tFerQJhe/FemtOaP56b2XhLtXH2a8CRT2E69v/77Qz0=";
|
||||
sha256 = "sha256-btfHHrb7m6ITWe/18u2pmZiZKpKebKMThqcXFIvO/P8=";
|
||||
};
|
||||
|
||||
postPath = ''
|
||||
|
|
|
@ -19,11 +19,17 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-9FzMyBIR2u1zXHtTWJABM6RF1+OyjYdEPlRwtig9blI=";
|
||||
};
|
||||
|
||||
# remove large unneeded files
|
||||
postUnpack = ''
|
||||
find -name "lib*.so" -delete
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook unzip ];
|
||||
|
||||
buildInputs = [ gsettings-desktop-schemas gtk3 ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/bin \
|
||||
$out/opt/${pname}
|
||||
|
||||
|
@ -32,6 +38,7 @@ stdenv.mkDerivation rec {
|
|||
cp -r ${desktopItem}/share/applications $out/share/
|
||||
|
||||
makeWrapper ${nwjs}/bin/nw $out/bin/${pname} --add-flags $out/opt/${pname}
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -7,10 +7,10 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bilibili";
|
||||
version = "1.9.2-1";
|
||||
version = "1.10.1-1";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb";
|
||||
hash = "sha256-y3dUBImvcIG89m82RaIOa0cxJXIAIGa+n3FJkASacaY=";
|
||||
hash = "sha256-Kx45erpxS66/CWmo4Csw0jhp23u03fn7r+vkq5CtJg0=";
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
|
|
38
pkgs/applications/video/mpv/scripts/thumbfast.nix
Normal file
38
pkgs/applications/video/mpv/scripts/thumbfast.nix
Normal file
|
@ -0,0 +1,38 @@
|
|||
{ lib, stdenvNoCC, fetchFromGitHub, mpv-unwrapped }:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "mpv-thumbfast";
|
||||
version = "unstable-2023-05-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "po5";
|
||||
repo = "thumbfast";
|
||||
rev = "10e9f6133d4ea88e3e5d154969abfaee17173570";
|
||||
hash = "sha256-3fzkAR/itgheXQHTr30XPQR3NpYpIVeZfkcBxEoAnGg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace thumbfast.lua \
|
||||
--replace 'mpv_path = "mpv"' 'mpv_path = "${lib.getBin mpv-unwrapped}/bin/mpv"'
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/share/mpv/scripts
|
||||
cp -r thumbfast.lua $out/share/mpv/scripts/thumbfast.lua
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.scriptName = "thumbfast.lua";
|
||||
|
||||
meta = {
|
||||
description = "High-performance on-the-fly thumbnailer for mpv";
|
||||
homepage = "https://github.com/po5/thumbfast";
|
||||
license = lib.licenses.unfree; # no explicit licensing information available at this time
|
||||
maintainers = with lib.maintainers; [ apfelkuchen6 ];
|
||||
};
|
||||
}
|
|
@ -3,7 +3,7 @@
|
|||
, xorgproto, libX11, bison, ksh, perl, gnum4
|
||||
, libXinerama, libXt, libXext, libtirpc, motif, libXft, xbitmaps
|
||||
, libjpeg, libXmu, libXdmcp, libXScrnSaver, symlinkJoin, bdftopcf
|
||||
, ncompress, mkfontdir, tcl, libXaw, libxcrypt, gcc, glibcLocales
|
||||
, ncompress, mkfontdir, tcl-8_5, libXaw, libxcrypt, gcc, glibcLocales
|
||||
, autoPatchelfHook, libredirect, makeWrapper, xset, xrdb, fakeroot
|
||||
, rpcsvc-proto }:
|
||||
|
||||
|
@ -40,7 +40,7 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
libX11 libXinerama libXt libXext libtirpc motif libXft xbitmaps
|
||||
libjpeg libXmu libXdmcp libXScrnSaver tcl libXaw ksh libxcrypt
|
||||
libjpeg libXmu libXdmcp libXScrnSaver tcl-8_5 libXaw ksh libxcrypt
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
bison ncompress autoPatchelfHook makeWrapper fakeroot
|
||||
|
@ -59,6 +59,9 @@ in stdenv.mkDerivation rec {
|
|||
"BOOTSTRAPCFLAGS=-I${xorgproto}/include/X11"
|
||||
"IMAKECPP=cpp"
|
||||
"LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive"
|
||||
# Workaround for dtdocbook issue with tcl 8.6.13.
|
||||
# TODO: this might be possible to remove when updating CDE
|
||||
"TCLLIB=-ltcl8.5"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
|
|
|
@ -16,6 +16,8 @@ in
|
|||
mixRelease {
|
||||
inherit pname version src elixir;
|
||||
|
||||
stripDebug = true;
|
||||
|
||||
mixFodDeps = fetchMixDeps {
|
||||
pname = "mix-deps-${pname}";
|
||||
inherit src version elixir;
|
||||
|
|
|
@ -9,16 +9,25 @@
|
|||
, enableDebugInfo ? false
|
||||
, mixEnv ? "prod"
|
||||
, compileFlags ? [ ]
|
||||
|
||||
# mix fixed output derivation dependencies
|
||||
, mixFodDeps ? null
|
||||
|
||||
# mix dependencies generated by mix2nix
|
||||
# this assumes each dependency is built by buildMix or buildRebar3
|
||||
# each dependency needs to have a setup hook to add the lib path to $ERL_LIBS
|
||||
# this is how mix will find dependencies
|
||||
, mixNixDeps ? { }
|
||||
|
||||
, elixir ? inputs.elixir
|
||||
, hex ? inputs.hex.override { inherit elixir; }
|
||||
, stripDebug ? true
|
||||
|
||||
# This reduces closure size, but can lead to some hard to understand runtime
|
||||
# errors, so use with caution. See e.g.
|
||||
# https://github.com/whitfin/cachex/issues/205
|
||||
# https://framagit.org/framasoft/mobilizon/-/issues/1169
|
||||
, stripDebug ? false
|
||||
|
||||
, ...
|
||||
}@attrs:
|
||||
let
|
||||
|
|
|
@ -75,7 +75,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
outputs = [ "out" "info" "man" ];
|
||||
|
||||
doCheck = true;
|
||||
# Test segfault for static build
|
||||
doCheck = !stdenv.hostPlatform.isStatic;
|
||||
|
||||
checkTarget = "test";
|
||||
# https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10142.html
|
||||
preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
|
||||
|
|
|
@ -1,30 +1,31 @@
|
|||
{ lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, makeWrapper, upx }:
|
||||
{ lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, makeWrapper, upx, pkgsStatic, xorg, binaryen }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
version = "weekly.2023.19";
|
||||
# Required for bootstrap.
|
||||
vc = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "vc";
|
||||
rev = "f7c2b5f2a0738d0d236161c9de9f31dd0280ac86";
|
||||
sha256 = "sha256-xU3TvyNgc0o4RCsHtoC6cZTNaue2yuAiolEOvP37TKA=";
|
||||
};
|
||||
# Required for vdoc.
|
||||
markdown = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "markdown";
|
||||
rev = "6e970bd0a7459ad7798588f1ace4aa46c5e789a2";
|
||||
hash = "sha256-hFf7c8ZNMU1j7fgmDakuO7tBVr12Wq0dgQddJnkMajE=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
pname = "vlang";
|
||||
version = "weekly.2022.20";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "v";
|
||||
rev = version;
|
||||
sha256 = "1isbyfs98bdbm2qjf7q4bqbpsmdiqlavn3gznwr12bkvhnsf4j3x";
|
||||
};
|
||||
|
||||
# Required for bootstrap.
|
||||
vc = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "vc";
|
||||
rev = "167f262866090493650f58832d62d910999dd5a4";
|
||||
sha256 = "1xax8355qkrccjcmx24gcab88xnrqj15mhqy0bgp3v2rb1hw1n3a";
|
||||
};
|
||||
|
||||
# Required for vdoc.
|
||||
markdown = fetchFromGitHub {
|
||||
owner = "vlang";
|
||||
repo = "markdown";
|
||||
rev = "bbbd324a361e404ce0682fc00666df3a7877b398";
|
||||
sha256 = "0cawzizr3rjz81blpvxvxrcvcdai1adj66885ss390444qq1fnv7";
|
||||
sha256 = "sha256-fHn1z2q3LmSycCOa1ii4DoHvbEW4uJt3Psq3/VuZNVQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ glfw freetype openssl ]
|
||||
|
@ -34,17 +35,28 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeFlags = [
|
||||
"local=1"
|
||||
"VC=${vc}"
|
||||
];
|
||||
|
||||
env.VC = vc;
|
||||
# libX11.dev and xorg.xorgproto are needed because of
|
||||
# builder error: Header file <X11/Xlib.h>, needed for module `clipboard.x11` was not found. Please install a package with the X11 development headers, for example: `apt-get install libx11-dev`.
|
||||
# libXau, libxcb, libXdmcp need to be static if you use static gcc otherwise
|
||||
# /nix/store/xnk2z26fqy86xahiz3q797dzqx96sidk-glibc-2.37-8/lib/libc.so.6: undefined reference to `_rtld_glob al_ro@GLIBC_PRIVATE'
|
||||
env.VFLAGS = "-cc ${pkgsStatic.gcc}/bin/gcc -no-retry-compilation -cflags -I${xorg.libX11.dev}/include -cflags -I${xorg.xorgproto}/include -ldflags -L${binaryen}/lib -ldflags -L${pkgsStatic.xorg.libX11}/lib -ldflags -L${pkgsStatic.xorg.libxcb}/lib -ldflags -lxcb -ldflags -L${pkgsStatic.xorg.libXau}/lib -ldflags -lXau -ldflags -L${pkgsStatic.xorg.libXdmcp}/lib -ldflags -lXdmcp";
|
||||
|
||||
preBuild = ''
|
||||
export HOME=$(mktemp -d)
|
||||
mkdir -p ./thirdparty/tcc/lib
|
||||
# this step is not needed it's just to silence a warning
|
||||
# we don't use tcc at all since it fails on a missing libatomic
|
||||
ln -s ${pkgsStatic.tinycc}/bin/tcc ./thirdparty/tcc/tcc.exe
|
||||
cp -r ${pkgsStatic.boehmgc}/lib/* ./thirdparty/tcc/lib
|
||||
'';
|
||||
|
||||
# vcreate_test.v requires git, so we must remove it when building the tools.
|
||||
# vtest.v fails on Darwin, so let's just disable it for now.
|
||||
preInstall = ''
|
||||
mv cmd/tools/vcreate_test.v $HOME/vcreate_test.v
|
||||
mv cmd/tools/vcreate/vcreate_test.v $HOME/vcreate_test.v
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
mv cmd/tools/vtest.v $HOME/vtest.v
|
||||
'';
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcouchbase";
|
||||
version = "3.3.6";
|
||||
version = "3.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "couchbase";
|
||||
repo = "libcouchbase";
|
||||
rev = version;
|
||||
sha256 = "sha256-sq/sPEZO6/9WYukOQ1w47ZTW0G8uLCJqnBS6mTD6P+M=";
|
||||
sha256 = "sha256-EPVz9+qEuJe4VGXNuUnbH61EDxdyohZhxoxleO5j/Uk=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DLCB_NO_MOCK=ON" ];
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libmysqlconnectorcpp";
|
||||
version = "8.0.32";
|
||||
version = "8.0.33";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz";
|
||||
hash = "sha256-+9t/IUQnYy9CPoS6dZS+H5IF6sgSjGsYVyA7L1RVzvM=";
|
||||
hash = "sha256-Fgz2iB+96b1GzRGq8Skwtna8bidYmsXHuknBlrl+BTs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -4,15 +4,13 @@
|
|||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "miniaudio";
|
||||
version = "0.11.14";
|
||||
version = "0.11.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mackron";
|
||||
repo = "miniaudio";
|
||||
rev = "9a7663496fc06f7a9439c752fd7666ca93328c20";
|
||||
# upstream does not maintain tags:
|
||||
# https://github.com/mackron/miniaudio/issues/273#issuecomment-783861269
|
||||
hash = "sha256-v/Eo4/CYcpB4tbOoy1gPqk6PUvkQIZNWrweG3l5EcMk=";
|
||||
rev = version;
|
||||
hash = "sha256-POe/dYPJ25RKNGIhaLoqxm9JJ08MrTyHVN4NmaGOdwM=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "uring";
|
||||
version = "0.5";
|
||||
version = "0.6";
|
||||
|
||||
minimalOCamlVersion = "4.12";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocaml-multicore/ocaml-uring/releases/download/v${version}/${pname}-${version}.tbz";
|
||||
sha256 = "106w7mabqihdhj4csk9jfqag220rwhqdp5lapn0xmw2035scvxvk";
|
||||
url = "https://github.com/ocaml-multicore/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
|
||||
sha256 = "ZltD9JnF1lJs0xjWwFXBfWMP8e5XRhCaB2P4iqHFreo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ansible-compat";
|
||||
version = "4.0.2";
|
||||
version = "4.0.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-JbDcWro8Q+DP3JFATlcErphX5mTCEPf4SlVm4A111/M=";
|
||||
hash = "sha256-rXzr++4EVt+/7g6AJRWxEeABYCVSUFF0+jo1/wi6Izk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
27
pkgs/development/python-modules/bangla/default.nix
Normal file
27
pkgs/development/python-modules/bangla/default.nix
Normal file
|
@ -0,0 +1,27 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bangla";
|
||||
version = "0.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-F8j9UBMhZgB31atqebdGu6cfnkk573isDZp1171xXag=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "bangla" ];
|
||||
|
||||
# https://github.com/arsho/bangla/issues/5
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bangla is a package for Bangla language users with various functionalities including Bangla date and Bangla numeric conversation";
|
||||
homepage = "https://github.com/arsho/bangla";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.tts.members;
|
||||
};
|
||||
}
|
27
pkgs/development/python-modules/bnnumerizer/default.nix
Normal file
27
pkgs/development/python-modules/bnnumerizer/default.nix
Normal file
|
@ -0,0 +1,27 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bnnumerizer";
|
||||
version = "0.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Qd9v0Le1GqTsR3a2ZDzt6+5f0R4zXX1W1KIMCFFeXw0=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "bnnumerizer" ];
|
||||
|
||||
# https://github.com/mnansary/bnUnicodeNormalizer/issues/10
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bangla Number text to String Converter";
|
||||
homepage = "https://github.com/banglakit/number-to-bengali-word";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.tts.members;
|
||||
};
|
||||
}
|
|
@ -0,0 +1,27 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "bnunicodenormalizer";
|
||||
version = "0.1.6";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-qVC6+0SnAs25DFzKPHFUOoYPlrRvkGWFptjIVom8wJM=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
pythonImportsCheck = [ "bnunicodenormalizer" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Bangla Unicode Normalization Toolkit";
|
||||
homepage = "https://github.com/mnansary/bnUnicodeNormalizer";
|
||||
license = licenses.mit;
|
||||
maintainers = teams.tts.members;
|
||||
};
|
||||
}
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cinemagoer";
|
||||
version = "2022.12.27";
|
||||
version = "2023.5.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-uUq/6Uijv6krBNCa5ftBWG/uYLs/5pLyDONLvBoxjYo=";
|
||||
hash = "sha256-XOHXeuZUZwFhjxHlsVVqGdGO3srRttfZaXPsNJQbGPI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cloudsmith-api";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
format = "wheel";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "cloudsmith_api";
|
||||
inherit format version;
|
||||
hash = "sha256-wFSHlUdZTARsAV3igVXThrXoGsPUaZyzXBJCSJFZYYQ=";
|
||||
hash = "sha256-6y63xo3ftZPT7GX/oN8bHZIEJRdKnUFar3eThjyKN6w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonAtLeast
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
|
@ -25,6 +26,15 @@ buildPythonPackage rec {
|
|||
"coqpit.coqpit"
|
||||
];
|
||||
|
||||
# https://github.com/coqui-ai/coqpit/issues/40
|
||||
disabledTests = lib.optionals (pythonAtLeast "3.11")[
|
||||
"test_init_argparse_list_and_nested"
|
||||
];
|
||||
|
||||
disabledTestPaths = lib.optionals (pythonAtLeast "3.11")[
|
||||
"tests/test_nested_configs.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple but maybe too simple config management through python data classes";
|
||||
longDescription = ''
|
||||
|
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "croniter";
|
||||
version = "1.3.8";
|
||||
version = "1.3.14";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-MqXsBOl+wIN7zfATdnq9LnHM7u/TwuFMgECYzlGtbNk=";
|
||||
hash = "sha256-0Gex+VtVPG6C2VqYPEZWlZE9zRL0eouaqTigRQ2U3V4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dkimpy";
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8zIhlR9jOBEXb9D1qGH0S8I721/cKn+jWXUxlUAbEwg=";
|
||||
hash = "sha256-7bbng4OzpUx3K8n/eG5+7X12pXupRiCdmVG0P1BzqwI=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytest ];
|
||||
|
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ignite";
|
||||
version = "0.4.11";
|
||||
version = "0.4.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytorch";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-iuaBuKoKlt7F7Z7fbVOZAUAoFnU3AOxYC/ANgqoQksU=";
|
||||
hash = "sha256-cLlPUPzYyOpqk4qHsn22s3Xr/VkGjnHL4JVw2qy2iTc=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ];
|
||||
|
|
|
@ -1,23 +1,30 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, unittestCheckHook
|
||||
, hypothesis
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "justbases";
|
||||
version = "0.15";
|
||||
version = "0.15.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-vQEfC8Z7xMM/fhBG6jSuhLEP/Iece5Rje1yqbpjVuPg=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mulkieran";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XraUh3beI2JqKPRHYN5W3Tn3gg0GJCwhnhHIOFdzh6U=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [ hypothesis ];
|
||||
nativeCheckInputs = [
|
||||
unittestCheckHook
|
||||
hypothesis
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "conversion of ints and rationals to any base";
|
||||
homepage = "https://pythonhosted.org/justbases";
|
||||
homepage = "https://github.com/mulkieran/justbases";
|
||||
changelog = "https://github.com/mulkieran/justbases/blob/v${version}/CHANGES.txt";
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = with maintainers; [ nickcao ];
|
||||
};
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "miniaudio";
|
||||
version = "1.56";
|
||||
version = "1.57";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "irmen";
|
||||
repo = "pyminiaudio";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vNh9BupU6T+Gfa8fdt8r3/vqtTtfVDyrxM9GkFUcDcI=";
|
||||
hash = "sha256-jAGJEXNDclcGHnoDYMjQXz5ZS9U9pmIWEHzgYKp49/o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -16,14 +16,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ndindex";
|
||||
version = "1.6";
|
||||
version = "1.7";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Quansight-Labs";
|
||||
repo = "ndindex";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-QLWGgbF5nNTa1SsSkupo+fAs9K7eTexTK9n9yDLVgrQ=";
|
||||
hash = "sha256-JP0cEuxXfPTWc1EIUtMsy5Hx6eIo9vDzD0IUXm1lFME=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -1,16 +1,33 @@
|
|||
{ lib, buildPythonPackage, isPy27, fetchPypi
|
||||
, paramiko, pycurl, ajpy, impacket, pyopenssl, cx_oracle, mysqlclient
|
||||
, psycopg2, pycrypto, dnspython, ipy, pysnmp, pyasn1, pysqlcipher3 }:
|
||||
|
||||
{ lib
|
||||
, ajpy
|
||||
, buildPythonPackage
|
||||
, cx_oracle
|
||||
, dnspython
|
||||
, fetchPypi
|
||||
, impacket
|
||||
, ipy
|
||||
, mysqlclient
|
||||
, paramiko
|
||||
, psycopg2
|
||||
, pyasn1
|
||||
, pycrypto
|
||||
, pycurl
|
||||
, pyopenssl
|
||||
, pysnmp
|
||||
, pysqlcipher3
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "patator";
|
||||
version = "0.9";
|
||||
disabled = isPy27;
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "68cb24bdc3042ee0d47a288b19a8b99a6c54bdbd4ddf0c5817d9b9ac0a0d8a15";
|
||||
hash = "sha256-aMskvcMELuDUeiiLGai5mmxUvb1N3wxYF9m5rAoNihU=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -19,19 +36,19 @@ buildPythonPackage rec {
|
|||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
paramiko
|
||||
pycurl
|
||||
ajpy
|
||||
impacket
|
||||
pyopenssl
|
||||
cx_oracle
|
||||
mysqlclient
|
||||
psycopg2
|
||||
pycrypto
|
||||
dnspython
|
||||
impacket
|
||||
ipy
|
||||
pysnmp
|
||||
mysqlclient
|
||||
paramiko
|
||||
psycopg2
|
||||
pyasn1
|
||||
pycrypto
|
||||
pycurl
|
||||
pyopenssl
|
||||
pysnmp
|
||||
pysqlcipher3
|
||||
];
|
||||
|
||||
|
@ -39,9 +56,9 @@ buildPythonPackage rec {
|
|||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "multi-purpose brute-forcer";
|
||||
description = "Multi-purpose brute-forcer";
|
||||
homepage = "https://github.com/lanjelot/patator";
|
||||
license = licenses.gpl2;
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ y0no SuperSandro2000 ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "piccolo-theme";
|
||||
version = "0.14.0";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "piccolo_theme";
|
||||
inherit version;
|
||||
hash = "sha256-PGPf05TQfC6Somn2PR07Y2qiOuyg+37U1l16m2LKykU=";
|
||||
hash = "sha256-8VxkrzADp3yCeb02BxtT6oSP1FCX8GW4oc6OECK2hJw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-testmon";
|
||||
version = "2.0.2";
|
||||
version = "2.0.6";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "tarpas";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hQJ52CuCBgxGcbbkbqsshh+lcevrgD8Xjde2ErghRKk=";
|
||||
hash = "sha256-hyWt5Dk8CK9b8DhcZGHFnHGAgIefvIoM3AjogZPY+i0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-roborock";
|
||||
version = "0.17.6";
|
||||
version = "0.18.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "humbertogontijo";
|
||||
repo = "python-roborock";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0AmtB0T8xqsd8TOh2MN+CBSLLq8hIl7QT+a2HdmGRYI=";
|
||||
hash = "sha256-a1X7aRWURteIBVwl+pgHcaeWXAWv+zicz154fJgWVy4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyunifiprotect";
|
||||
version = "4.8.3";
|
||||
version = "4.9.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -40,7 +40,7 @@ buildPythonPackage rec {
|
|||
owner = "briis";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2DR1SPWElDZcTYF6TaJK3lxqJ5Skv76X+K+y6i69bj4=";
|
||||
hash = "sha256-fIkZh/fkeVzQyEa4goGnaCxOWsKLKRlw+0/nGBDmKlY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyworld";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Zo0JhCw8+nSx9u2r2wBYpkwE+c8XuTiD5tqBHhIErU0=";
|
||||
hash = "sha256-o6gXVZg9+iKZqeKUd1JYLdzISlwnewT0WVzkQGNy0eU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "regenmaschine";
|
||||
version = "2022.11.2";
|
||||
version = "2023.05.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-0ih0qlN9NxkYkcRl990gVyZF33ymSNUJoNFzpcnqu1o=";
|
||||
hash = "sha256-u6GHDiTGa7v9tK/4VTVPQL/2kjomo0x/EGC7LD8lMvM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "requests-hawk";
|
||||
version = "1.1.1";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4c74bd31b581f6d2b36d575bb537b1f29469509f560f5050339a48195d48929b";
|
||||
sha256 = "sha256-rZIFBCyUvbFa+qGbB4DhEHeyTZ5c/6wfs9JssIqkNbc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mohawk requests ];
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tensorflow-metadata";
|
||||
version = "1.13.0";
|
||||
version = "1.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tensorflow";
|
||||
repo = "metadata";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-XzOV0gTZo9Flr3HVI5mzK+qgol4rsteerfrgLpw4Ouo=";
|
||||
hash = "sha256-G7OEupjKDbblp96u2oHVdSueGG5NON5gvYhuvyz4f3E=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-pillow";
|
||||
version = "9.4.0.17";
|
||||
version = "9.5.0.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "types-Pillow";
|
||||
hash = "sha256-fw6HHS1G+7a8feyj4C3FUs+cHotJ3rlZVQlVG+OVTkk=";
|
||||
hash = "sha256-8bavR6vRUYR+4lkR/+unhImbx9x/nrqMpqWqxSKwEu8=";
|
||||
};
|
||||
|
||||
# Modules doesn't have tests
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "weconnect";
|
||||
version = "0.54.2";
|
||||
version = "0.55.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
owner = "tillsteinbach";
|
||||
repo = "WeConnect-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Zjh4rWnpzzBZFQRZIoceeIn4DYn0/HqLLZFhc57yhLQ=";
|
||||
hash = "sha256-+ISWPrpY/urpZZZrn6+Ii8gbrwkQMLL6gXhydXd8HqI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -3,22 +3,22 @@
|
|||
let
|
||||
pname = "anki-bin";
|
||||
# Update hashes for both Linux and Darwin!
|
||||
version = "2.1.62";
|
||||
version = "2.1.63";
|
||||
|
||||
sources = {
|
||||
linux = fetchurl {
|
||||
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst";
|
||||
sha256 = "sha256-vsuR+pDqjPGejlxrDPCxKVnvTilRDGGhMDDKSQhVxVQ=";
|
||||
sha256 = "sha256-AioLmz8nvrvW1c5e5cYfs/zE+YqA4D/X2GUekugOhGo=";
|
||||
};
|
||||
|
||||
# For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version
|
||||
darwin-x86_64 = fetchurl {
|
||||
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg";
|
||||
sha256 = "sha256-8TMdNEnnlDQrk+TVlsmvFxoqrsCU2BRY6hnaC3PGdYo=";
|
||||
sha256 = "sha256-rkVPRFZP7v2XEqWGypw0jTw/0CBe1u2tQF9L5omcIoQ=";
|
||||
};
|
||||
darwin-aarch64 = fetchurl {
|
||||
url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg";
|
||||
sha256 = "sha256-zdrw3AE1ijlJryGf30YLr71TtoT6ANHvi+1BweZiFM8=";
|
||||
sha256 = "sha256-GTrmm9JJPiVR+MFfF6u0s4yHqTAz/p2ktX5lOLj2jcA=";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -34,5 +34,6 @@ stdenv.mkDerivation rec {
|
|||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"];
|
||||
maintainers = [ maintainers.matthew-levan ];
|
||||
license = licenses.mit;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cpuid";
|
||||
version = "20230406";
|
||||
version = "20230505";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz";
|
||||
sha256 = "sha256-9ARd5TXzDjTowBKwVM5m9ArDmRRNbjw4lr2AwN7u8bA=";
|
||||
sha256 = "sha256-VdMEAM1rq5rPNZft/JpSeiWOOntcQMzJuLMrENPimzA=";
|
||||
};
|
||||
|
||||
# For pod2man during the build process.
|
||||
|
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "sof-firmware";
|
||||
version = "2.2.4";
|
||||
version = "2.2.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/thesofproject/sof-bin/releases/download/v${version}/sof-bin-v${version}.tar.gz";
|
||||
sha256 = "sha256-zoquuhA6pWqCZiVSsPM/M6hZqhAI2L+8LCLwzPyMazo=";
|
||||
sha256 = "sha256-V39FCHW9gzr5uLcW42jYc6rJE6Nd2ZbHqg9Srd3vku4=";
|
||||
};
|
||||
|
||||
dontFixup = true; # binaries must not be stripped or patchelfed
|
||||
|
|
|
@ -214,7 +214,17 @@ stdenv'.mkDerivation {
|
|||
homepage = "https://github.com/openzfs/zfs";
|
||||
changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}";
|
||||
license = lib.licenses.cddl;
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
# The case-block for TARGET_CPU has branches for only five CPU families,
|
||||
# which prevents ZFS from building on any other platform. Since the NixOS
|
||||
# `boot.zfs.enabled` property is `readOnly`, excluding platforms where ZFS
|
||||
# does not build is the only way to produce a NixOS installer on such
|
||||
# platforms.
|
||||
# https://github.com/openzfs/zfs/blob/6a6bd493988c75331deab06e5352a9bed035a87d/config/always-arch.m4#L16
|
||||
platforms =
|
||||
with lib.systems.inspect.patterns;
|
||||
map (p: p // isLinux) [ isx86_32 isx86_64 isPower isAarch64 isSparc ];
|
||||
|
||||
maintainers = with lib.maintainers; [ jcumming jonringer globin raitobezarius ];
|
||||
mainProgram = "zfs";
|
||||
# If your Linux kernel version is not yet supported by zfs, try zfsUnstable.
|
||||
|
|
|
@ -31,9 +31,6 @@ beamPackages.mixRelease rec {
|
|||
mix phx.digest --no-deps-check
|
||||
'';
|
||||
|
||||
# cf. https://github.com/whitfin/cachex/issues/205
|
||||
stripDebug = false;
|
||||
|
||||
mixNixDeps = import ./mix.nix {
|
||||
inherit beamPackages lib;
|
||||
overrides = (final: prev: {
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
let
|
||||
pname = "miniflux";
|
||||
version = "2.0.43";
|
||||
version = "2.0.44";
|
||||
|
||||
in buildGoModule {
|
||||
inherit pname version;
|
||||
|
@ -11,10 +11,10 @@ in buildGoModule {
|
|||
owner = pname;
|
||||
repo = "v2";
|
||||
rev = version;
|
||||
sha256 = "sha256-IVIAlDYOuAl51V/Q1hpkjIREHTXq8E5D/w4cyTZ8ebs=";
|
||||
sha256 = "sha256-PBhoKDljLpgi8cJicY7U7yrW3qNPDMzno/6PacOZ76E=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-/BINHOlRmAfOIXY9x5VjnQwIc87Mt2TAvBE1tPq6W80=";
|
||||
vendorHash = "sha256-Ydd1LiVq4cCyj7dvcwxpKNU1HjcvXbSerHYJNoV/YQY=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
@ -17,7 +17,6 @@ beamPackages.mixRelease rec {
|
|||
rev = "v${version}";
|
||||
sha256 = "sha256-3iG2s7jVEnhq1kLLgtaHnFmLYBO2Xr5M5jjZfSNA9z4=";
|
||||
};
|
||||
stripDebug = false;
|
||||
|
||||
mixNixDeps = import ./mix.nix {
|
||||
inherit beamPackages lib;
|
||||
|
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dokuwiki";
|
||||
version = "2023-04-04";
|
||||
version = "2023-04-04a";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dokuwiki";
|
||||
repo = pname;
|
||||
rev = "release-${version}";
|
||||
sha256 = "sha256-QJnXKsEhvEcE88wvfMZR2j7X/pW8+28zlEnxhvhl+44=";
|
||||
sha256 = "sha256-PVfJfGYa2Drf4ljnnhb7kNpjfQlW4dDt5Xd5h+C8tP4=";
|
||||
};
|
||||
|
||||
preload = writeText "preload.php" ''
|
||||
|
|
|
@ -49,9 +49,6 @@ beamPackages.mixRelease {
|
|||
|
||||
nativeBuildInputs = [ nodejs ];
|
||||
|
||||
# https://github.com/whitfin/cachex/issues/205
|
||||
stripDebug = false;
|
||||
|
||||
passthru = {
|
||||
tests = { inherit (nixosTests) plausible; };
|
||||
updateScript = ./update.sh;
|
||||
|
|
|
@ -1,28 +1,13 @@
|
|||
{ lib
|
||||
, anyconfig
|
||||
, appdirs
|
||||
, buildPythonPackage
|
||||
, colorama
|
||||
, environs
|
||||
, fetchFromGitHub
|
||||
, jinja2
|
||||
, jsonschema
|
||||
, nested-lookup
|
||||
, pathspec
|
||||
, poetry-core
|
||||
, python-json-logger
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, ruamel-yaml
|
||||
, python3
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ansible-doctor";
|
||||
version = "2.0.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thegeeklab";
|
||||
repo = "ansible-doctor";
|
||||
|
@ -37,12 +22,12 @@ buildPythonPackage rec {
|
|||
--replace 'version = "0.0.0"' 'version = "${version}"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
anyconfig
|
||||
appdirs
|
||||
colorama
|
|
@ -1,34 +1,13 @@
|
|||
{ lib
|
||||
, ansible
|
||||
, ansible-core
|
||||
, anyconfig
|
||||
, appdirs
|
||||
, buildPythonPackage
|
||||
, colorama
|
||||
, fetchFromGitHub
|
||||
, flake8
|
||||
, jsonschema
|
||||
, nested-lookup
|
||||
, pathspec
|
||||
, poetry-core
|
||||
, pytest-mock
|
||||
, python-json-logger
|
||||
, pytestCheckHook
|
||||
, pythonRelaxDepsHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, toolz
|
||||
, unidiff
|
||||
, yamllint
|
||||
, python3
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ansible-later";
|
||||
version = "3.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thegeeklab";
|
||||
repo = pname;
|
||||
|
@ -53,12 +32,12 @@ buildPythonPackage rec {
|
|||
"yamllint"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
ansible
|
||||
ansible-core
|
||||
anyconfig
|
||||
|
@ -75,7 +54,7 @@ buildPythonPackage rec {
|
|||
yamllint
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
|
@ -1,35 +1,17 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, python3
|
||||
, fetchPypi
|
||||
, setuptools-scm
|
||||
, ansible-compat
|
||||
, ansible-core
|
||||
, black
|
||||
, enrich
|
||||
, filelock
|
||||
, flaky
|
||||
, jsonschema
|
||||
, pythonOlder
|
||||
, pytest
|
||||
, pytest-xdist
|
||||
, pytestCheckHook
|
||||
, pyyaml
|
||||
, rich
|
||||
, ruamel-yaml
|
||||
, wcmatch
|
||||
, yamllint
|
||||
, ansible
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ansible-lint";
|
||||
version = "6.15.0";
|
||||
version = "6.16.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-TOeQzwAGdgugHYuUbYAwNwL8dFS9GcazB53ZjUBRfm8=";
|
||||
hash = "sha256-34Lzk18SCeMHRAjurl6DfM7G/VLB0xJmif9BJKuwpcs=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -38,21 +20,27 @@ buildPythonPackage rec {
|
|||
--replace "sys.exit(1)" ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ansible-compat
|
||||
pythonRelaxDeps = [
|
||||
"ruamel.yaml"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
# https://github.com/ansible/ansible-lint/blob/master/.config/requirements.in
|
||||
ansible-core
|
||||
black
|
||||
enrich
|
||||
filelock
|
||||
jsonschema
|
||||
pytest # yes, this is an actual runtime dependency
|
||||
packaging
|
||||
pyyaml
|
||||
rich
|
||||
ruamel-yaml
|
||||
subprocess-tee
|
||||
wcmatch
|
||||
yamllint
|
||||
];
|
||||
|
@ -60,7 +48,7 @@ buildPythonPackage rec {
|
|||
# tests can't be easily run without installing things from ansible-galaxy
|
||||
doCheck = false;
|
||||
|
||||
nativeCheckInputs = [
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
flaky
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
|
@ -69,7 +57,7 @@ buildPythonPackage rec {
|
|||
preCheck = ''
|
||||
# ansible wants to write to $HOME and crashes if it can't
|
||||
export HOME=$(mktemp -d)
|
||||
export PATH=$PATH:${lib.makeBinPath [ ansible-core ]}
|
||||
export PATH=$PATH:${lib.makeBinPath [ ansible ]}
|
||||
|
||||
# create a working ansible-lint executable
|
||||
export PATH=$PATH:$PWD/src/ansiblelint
|
||||
|
@ -95,7 +83,7 @@ buildPythonPackage rec {
|
|||
"test_discover_lintables_umlaut"
|
||||
];
|
||||
|
||||
makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible-core ]}" ];
|
||||
makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible ]}" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Best practices checker for Ansible";
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, espeak-ng
|
||||
, tts
|
||||
}:
|
||||
|
@ -14,29 +13,19 @@ let
|
|||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "tts";
|
||||
version = "0.13.2";
|
||||
version = "0.13.3";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coqui-ai";
|
||||
repo = "TTS";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-3t4JYEwQ+puGLhGl3nn93qsL8IeOwlYtHXTrnZ5Cf+w=";
|
||||
hash = "sha256-cu714/XtVqqlHN2CmUObcNFG6Vdi9VqC4at/HB8euDs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# upgrade librosa to 0.10.0
|
||||
url = "https://github.com/coqui-ai/TTS/commit/4c829e74a1399ab083b566a70c1b7e879eda6e1e.patch";
|
||||
hash = "sha256-QP9AnMbdEpGJywiZBreojHUjq29ihqy6HxvUtS5OKvQ=";
|
||||
excludes = [
|
||||
"requirements.txt"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = let
|
||||
relaxedConstraints = [
|
||||
"bnunicodenormalizer"
|
||||
"cython"
|
||||
"gruut"
|
||||
"inflect"
|
||||
|
@ -64,6 +53,9 @@ python.pkgs.buildPythonApplication rec {
|
|||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
anyascii
|
||||
bangla
|
||||
bnnumerizer
|
||||
bnunicodenormalizer
|
||||
coqpit
|
||||
flask
|
||||
fsspec
|
||||
|
|
|
@ -27,13 +27,15 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
libftdi1
|
||||
libgpiod
|
||||
libjaylink
|
||||
libusb1
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
libgpiod
|
||||
pciutils
|
||||
];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" "libinstall" ];
|
||||
makeFlags = [ "PREFIX=$(out)" "libinstall" ] ++ lib.optionals stdenv.isDarwin [ "CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no" ]
|
||||
++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "CONFIG_INTERNAL_X86=no" "CONFIG_INTERNAL_DMI=no" "CONFIG_RAYER_SPI=0" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.flashrom.org";
|
||||
|
@ -41,6 +43,5 @@ stdenv.mkDerivation rec {
|
|||
license = with licenses; [ gpl2 gpl2Plus ];
|
||||
maintainers = with maintainers; [ felixsinger ];
|
||||
platforms = platforms.all;
|
||||
broken = stdenv.isDarwin; # requires DirectHW
|
||||
};
|
||||
}
|
||||
|
|
|
@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config installShellFiles ];
|
||||
buildInputs = [ libftdi1 libusb1 pciutils ]
|
||||
buildInputs = [ libftdi1 libusb1 ]
|
||||
++ lib.optional (!stdenv.isDarwin) [ pciutils ]
|
||||
++ lib.optional jlinkSupport libjaylink;
|
||||
|
||||
postPatch = ''
|
||||
|
@ -30,7 +31,8 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" "libinstall" ]
|
||||
++ lib.optional jlinkSupport "CONFIG_JLINK_SPI=yes";
|
||||
++ lib.optional jlinkSupport "CONFIG_JLINK_SPI=yes"
|
||||
++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "CONFIG_INTERNAL_X86=no" "CONFIG_INTERNAL_DMI=no" "CONFIG_RAYER_SPI=no" ];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm644 util/flashrom_udev.rules $out/lib/udev/rules.d/flashrom.rules
|
||||
|
@ -42,6 +44,5 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ fpletz felixsinger ];
|
||||
platforms = platforms.all;
|
||||
broken = stdenv.isDarwin; # requires DirectHW
|
||||
};
|
||||
}
|
||||
|
|
34
pkgs/tools/misc/qmk_hid/default.nix
Normal file
34
pkgs/tools/misc/qmk_hid/default.nix
Normal file
|
@ -0,0 +1,34 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, systemd
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "qmk_hid";
|
||||
version = "0.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FrameworkComputer";
|
||||
repo = "qmk_hid";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-k5D+Ph4DtdTafdNhclK3t4SmHmktuOKRlMMGMmKp48E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-+frWup9sbxCAxl2oiHAn1ccpuGkfa3kjerUByd65oSI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
buildInputs = [
|
||||
systemd
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Commandline tool for interactng with QMK devices over HID";
|
||||
homepage = "https://github.com/FrameworkComputer/qmk_hid";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ janik ];
|
||||
};
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
{ lib, fetchurl, jdk, buildFHSEnv, unzip, makeDesktopItem }:
|
||||
let
|
||||
version = "2023.3.5";
|
||||
version = "2023.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
name = "burpsuite.jar";
|
||||
|
@ -8,7 +8,7 @@ let
|
|||
"https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar"
|
||||
"https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar"
|
||||
];
|
||||
sha256 = "ef1b1094bbe7388b5b4d515b8e42347243efb34a4d8acc27d9d553fe62f45fb5";
|
||||
sha256 = "2e756e48f31b88590445f2b1dc4806c2f3613f9fde4dab357acb3850fd77303e";
|
||||
};
|
||||
|
||||
name = "burpsuite-${version}";
|
||||
|
|
|
@ -23,7 +23,6 @@ buildGoModule rec {
|
|||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ahrzb ];
|
||||
mainProgram = "v2ray-plugin";
|
||||
broken = true; # build fails with go > 1.17
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -19,6 +19,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
|
||||
pythonRelaxDeps = [
|
||||
"aiofiles"
|
||||
"argcomplete"
|
||||
"msgspec"
|
||||
];
|
||||
|
||||
|
|
|
@ -4,13 +4,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stress-ng";
|
||||
version = "0.15.06";
|
||||
version = "0.15.07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ColinIanKing";
|
||||
repo = pname;
|
||||
rev = "V${version}";
|
||||
hash = "sha256-64PEeVpbFs0BjH4DvATlwErxqeJl/vn5otfiylT1RNk=";
|
||||
hash = "sha256-mNV0izRm6vVmmkpI9z1lswWtyTKIc2CXIBDNyC4XDPc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cloudmonkey";
|
||||
version = "6.2.0";
|
||||
version = "6.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apache";
|
||||
repo = "cloudstack-cloudmonkey";
|
||||
rev = version;
|
||||
sha256 = "sha256-C9e2KsnoggjWZp8gx757MbFdGxmfh+TtAd+luS3ycHU=";
|
||||
sha256 = "sha256-FoouZ2udtZ68W5p32Svr8yAn0oBdWMupn1LEzqY04Oc=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
meta = with lib; {
|
||||
description = "CLI for Apache CloudStack";
|
||||
|
|
|
@ -11608,6 +11608,8 @@ with pkgs;
|
|||
|
||||
qmk = callPackage ../tools/misc/qmk { };
|
||||
|
||||
qmk_hid = callPackage ../tools/misc/qmk_hid { };
|
||||
|
||||
qmarkdowntextedit = libsForQt5.callPackage ../development/libraries/qmarkdowntextedit { };
|
||||
|
||||
qodem = callPackage ../tools/networking/qodem { };
|
||||
|
@ -17511,7 +17513,7 @@ with pkgs;
|
|||
meta.changelog = "https://github.com/ansible/ansible/blob/v${version}/changelogs/CHANGELOG-v${lib.versions.majorMinor version}.rst";
|
||||
}));
|
||||
|
||||
ansible-doctor = with python3.pkgs; toPythonApplication ansible-doctor;
|
||||
ansible-doctor = callPackage ../tools/admin/ansible/doctor.nix { };
|
||||
|
||||
phpunit = callPackage ../development/tools/misc/phpunit { };
|
||||
|
||||
|
@ -17571,9 +17573,9 @@ with pkgs;
|
|||
zig = buildPackages.zig_0_10;
|
||||
};
|
||||
|
||||
ansible-later = with python3.pkgs; toPythonApplication ansible-later;
|
||||
ansible-later = callPackage ../tools/admin/ansible/later.nix { };
|
||||
|
||||
ansible-lint = with python3.pkgs; toPythonApplication ansible-lint;
|
||||
ansible-lint = callPackage ../tools/admin/ansible/lint.nix { };
|
||||
|
||||
antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
|
||||
antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { };
|
||||
|
@ -32565,6 +32567,7 @@ with pkgs;
|
|||
mpvacious = callPackage ../applications/video/mpv/scripts/mpvacious.nix { };
|
||||
simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix { };
|
||||
sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix { };
|
||||
thumbfast = callPackage ../applications/video/mpv/scripts/thumbfast.nix { };
|
||||
thumbnail = callPackage ../applications/video/mpv/scripts/thumbnail.nix { };
|
||||
uosc = callPackage ../applications/video/mpv/scripts/uosc.nix { };
|
||||
vr-reversal = callPackage ../applications/video/mpv/scripts/vr-reversal.nix { };
|
||||
|
|
|
@ -36,6 +36,9 @@ mapAliases ({
|
|||
abodepy = jaraco-abode; # added 2023-02-01
|
||||
aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30
|
||||
ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30
|
||||
ansible-doctor = throw "ansible-doctor has been promoted to a top-level attribute"; # Added 2023-05-16
|
||||
ansible-later = throw "ansible-later has been promoted to a top-level attribute"; # Added 2023-05-16
|
||||
ansible-lint = throw "ansible-lint has been promoted to a top-level attribute"; # Added 2023-05-16
|
||||
anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
|
||||
argon2_cffi = argon2-cffi; # added 2022-05-09
|
||||
APScheduler = apscheduler; # added 2023-02-19
|
||||
|
|
|
@ -494,14 +494,8 @@ self: super: with self; {
|
|||
|
||||
ansible-core = callPackage ../development/python-modules/ansible/core.nix { };
|
||||
|
||||
ansible-doctor = callPackage ../development/python-modules/ansible-doctor { };
|
||||
|
||||
ansible-kernel = callPackage ../development/python-modules/ansible-kernel { };
|
||||
|
||||
ansible-later = callPackage ../development/python-modules/ansible-later { };
|
||||
|
||||
ansible-lint = callPackage ../development/python-modules/ansible-lint { };
|
||||
|
||||
ansible-runner = callPackage ../development/python-modules/ansible-runner { };
|
||||
|
||||
ansi = callPackage ../development/python-modules/ansi { };
|
||||
|
@ -1191,6 +1185,8 @@ self: super: with self; {
|
|||
|
||||
bandit = callPackage ../development/python-modules/bandit { };
|
||||
|
||||
bangla = callPackage ../development/python-modules/bangla { };
|
||||
|
||||
bap = callPackage ../development/python-modules/bap {
|
||||
inherit (pkgs.ocaml-ng.ocamlPackages) bap;
|
||||
};
|
||||
|
@ -1410,6 +1406,10 @@ self: super: with self; {
|
|||
|
||||
bme680 = callPackage ../development/python-modules/bme680 { };
|
||||
|
||||
bnnumerizer = callPackage ../development/python-modules/bnnumerizer { };
|
||||
|
||||
bnunicodenormalizer = callPackage ../development/python-modules/bnunicodenormalizer { };
|
||||
|
||||
boa-api = callPackage ../development/python-modules/boa-api { };
|
||||
|
||||
bokeh = callPackage ../development/python-modules/bokeh { };
|
||||
|
|
Loading…
Reference in a new issue