Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
05e2709249
|
|
@ -7747,6 +7747,12 @@
|
|||
githubId = 1187050;
|
||||
name = "Maximilian Huber";
|
||||
};
|
||||
maximsmol = {
|
||||
email = "maximsmol@gmail.com";
|
||||
github = "maximsmol";
|
||||
githubId = 1472826;
|
||||
name = "Max Smolin";
|
||||
};
|
||||
maxxk = {
|
||||
email = "maxim.krivchikov@gmail.com";
|
||||
github = "maxxk";
|
||||
|
|
@ -8816,6 +8822,12 @@
|
|||
githubId = 8214542;
|
||||
name = "Nicolò Balzarotti";
|
||||
};
|
||||
nidabdella = {
|
||||
name = "Mohamed Nidabdella";
|
||||
email = "nidabdella.mohamed@gmail.com";
|
||||
github = "nidabdella";
|
||||
githubId = 8083813;
|
||||
};
|
||||
NieDzejkob = {
|
||||
email = "kuba@kadziolka.net";
|
||||
github = "NieDzejkob";
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ luautf8,,,,,,pstn
|
|||
luazip,,,,,,
|
||||
lua-yajl,,,,,,pstn
|
||||
luuid,,,,,,
|
||||
luv,,,,1.42.0-0,,
|
||||
luv,,,,1.43.0-0,,
|
||||
lyaml,,,,,,lblasc
|
||||
markdown,,,,,,
|
||||
mediator_lua,,,,,,
|
||||
|
|
|
|||
|
|
|
@ -25,8 +25,8 @@ from pathlib import Path
|
|||
log = logging.getLogger()
|
||||
log.addHandler(logging.StreamHandler())
|
||||
|
||||
ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent
|
||||
from pluginupdate import Editor, update_plugins, PluginDesc, CleanEnvironment, LOG_LEVELS, Cache
|
||||
ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent # type: ignore
|
||||
from pluginupdate import Editor, update_plugins, FetchConfig, CleanEnvironment
|
||||
|
||||
PKG_LIST="maintainers/scripts/luarocks-packages.csv"
|
||||
TMP_FILE="$(mktemp)"
|
||||
|
|
@ -118,7 +118,7 @@ class LuaEditor(Editor):
|
|||
def attr_path(self):
|
||||
return "luaPackages"
|
||||
|
||||
def get_update(self, input_file: str, outfile: str, proc: int):
|
||||
def get_update(self, input_file: str, outfile: str, config: FetchConfig):
|
||||
_prefetch = generate_pkg_nix
|
||||
|
||||
def update() -> dict:
|
||||
|
|
@ -126,14 +126,14 @@ class LuaEditor(Editor):
|
|||
sorted_plugin_specs = sorted(plugin_specs, key=lambda v: v.name.lower())
|
||||
|
||||
try:
|
||||
pool = Pool(processes=proc)
|
||||
pool = Pool(processes=config.proc)
|
||||
results = pool.map(_prefetch, sorted_plugin_specs)
|
||||
finally:
|
||||
pass
|
||||
|
||||
self.generate_nix(results, outfile)
|
||||
|
||||
redirects = []
|
||||
redirects = {}
|
||||
return redirects
|
||||
|
||||
return update
|
||||
|
|
@ -181,11 +181,9 @@ def generate_pkg_nix(plug: LuaPlugin):
|
|||
|
||||
cmd.append(plug.version)
|
||||
|
||||
#
|
||||
if plug.server != "src" and plug.server:
|
||||
cmd.append(f"--only-server={plug.server}")
|
||||
|
||||
|
||||
if plug.luaversion:
|
||||
with CleanEnvironment():
|
||||
local_pkgs = str(ROOT.resolve())
|
||||
|
|
@ -209,7 +207,6 @@ def main():
|
|||
|
||||
parser = editor.create_parser()
|
||||
args = parser.parse_args()
|
||||
log.setLevel(LOG_LEVELS[args.debug])
|
||||
|
||||
update_plugins(editor, args)
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,6 @@ with lib.maintainers; {
|
|||
|
||||
chia = {
|
||||
members = [
|
||||
atemu
|
||||
lourkeur
|
||||
];
|
||||
scope = "Maintain the Chia blockchain and its dependencies";
|
||||
|
|
|
|||
|
|
@ -364,6 +364,20 @@
|
|||
relying on the insecure behaviour before upgrading.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>services.k3s.enable</literal> no longer implies
|
||||
<literal>systemd.enableUnifiedCgroupHierarchy = false</literal>,
|
||||
and will default to the <quote>systemd</quote> cgroup driver
|
||||
when using <literal>services.k3s.docker = true</literal>. This
|
||||
change may require a reboot to take effect, and k3s may not be
|
||||
able to run if the boot cgroup hierarchy does not match its
|
||||
configuration. The previous behavior may be retained by
|
||||
explicitly setting
|
||||
<literal>systemd.enableUnifiedCgroupHierarchy = false</literal>
|
||||
in your configuration.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The DHCP server (<literal>services.dhcpd4</literal>,
|
||||
|
|
@ -752,6 +766,18 @@
|
|||
directly.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>dendrite</literal> package has been upgraded from
|
||||
0.5.1 to
|
||||
<link xlink:href="https://github.com/matrix-org/dendrite/releases/tag/v0.6.5">0.6.5</link>.
|
||||
Instances configured with split sqlite databases, which has
|
||||
been the default in NixOS, require merging of the federation
|
||||
sender and signing key databases. See upstream
|
||||
<link xlink:href="https://github.com/matrix-org/dendrite/releases/tag/v0.6.0">release
|
||||
notes</link> on version 0.6.0 for details on database changes.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The existing <literal>pkgs.opentelemetry-collector</literal>
|
||||
|
|
@ -1068,6 +1094,12 @@
|
|||
compatibilty, but will be removed at a later date.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>programs.zsh.autosuggestions.strategy</literal> now
|
||||
takes a list of strings instead of a string.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>services.unifi.openPorts</literal> option default
|
||||
|
|
|
|||
|
|
@ -121,6 +121,10 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- `services.kubernetes.scheduler.{port,address}` now set `--secure-port` and `--bind-address` instead of `--port` and `--address`, since the former have been deprecated and are no longer functional in kubernetes>=1.23. Ensure that you are not relying on the insecure behaviour before upgrading.
|
||||
|
||||
- `services.k3s.enable` no longer implies `systemd.enableUnifiedCgroupHierarchy = false`, and will default to the 'systemd' cgroup driver when using `services.k3s.docker = true`.
|
||||
This change may require a reboot to take effect, and k3s may not be able to run if the boot cgroup hierarchy does not match its configuration.
|
||||
The previous behavior may be retained by explicitly setting `systemd.enableUnifiedCgroupHierarchy = false` in your configuration.
|
||||
|
||||
- The DHCP server (`services.dhcpd4`, `services.dhcpd6`) has been hardened.
|
||||
The service is now using the systemd's `DynamicUser` mechanism to run as an unprivileged dynamically-allocated user with limited capabilities.
|
||||
The dhcpd state files are now always stored in `/var/lib/dhcpd{4,6}` and the `services.dhcpd4.stateDir` and `service.dhcpd6.stateDir` options have been removed.
|
||||
|
|
@ -289,6 +293,14 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
This breaks back-compat so it's not possible to mix-and-match with previous versions of nixpkgs. In exchange, it now becomes possible to use the providers from [nixpkgs-terraform-providers-bin](https://github.com/numtide/nixpkgs-terraform-providers-bin) directly.
|
||||
|
||||
- The `dendrite` package has been upgraded from 0.5.1 to
|
||||
[0.6.5](https://github.com/matrix-org/dendrite/releases/tag/v0.6.5). Instances
|
||||
configured with split sqlite databases, which has been the default
|
||||
in NixOS, require merging of the federation sender and signing key
|
||||
databases. See upstream [release
|
||||
notes](https://github.com/matrix-org/dendrite/releases/tag/v0.6.0)
|
||||
on version 0.6.0 for details on database changes.
|
||||
|
||||
- The existing `pkgs.opentelemetry-collector` has been moved to
|
||||
`pkgs.opentelemetry-collector-contrib` to match the actual source being the
|
||||
"contrib" edition. `pkgs.opentelemetry-collector` is now the actual core
|
||||
|
|
@ -392,6 +404,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
combined `influxdb2` package is still provided in this release for
|
||||
backwards compatibilty, but will be removed at a later date.
|
||||
|
||||
- `programs.zsh.autosuggestions.strategy` now takes a list of strings instead of a string.
|
||||
|
||||
- The `services.unifi.openPorts` option default value of `true` is now deprecated and will be changed to `false` in 22.11.
|
||||
Configurations using this default will print a warning when rebuilt.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
x86_64-linux = "/nix/store/67amfijcvhqfgz4bwf2izsvbnklwjbvk-nix-2.6.0";
|
||||
i686-linux = "/nix/store/kinl99f619b2xsma4qnzhidbp65axyzm-nix-2.6.0";
|
||||
aarch64-linux = "/nix/store/8zpm63nn7k4n1alp9a0fcilpgc8j014z-nix-2.6.0";
|
||||
x86_64-darwin = "/nix/store/hw5v03wnc0k1pwgiyhblwlxb1fx5zyx8-nix-2.6.0";
|
||||
aarch64-darwin = "/nix/store/669p1vjnzi56fib98qczwlaglcwcnip4-nix-2.6.0";
|
||||
x86_64-linux = "/nix/store/0n2wfvi1i3fg97cjc54wslvk0804y0sn-nix-2.7.0";
|
||||
i686-linux = "/nix/store/4p27c1k9z99pli6x8cxfph20yfyzn9nh-nix-2.7.0";
|
||||
aarch64-linux = "/nix/store/r9yr8ijsb0gi9r7y92y3yzyld59yp0kj-nix-2.7.0";
|
||||
x86_64-darwin = "/nix/store/hyfj5imsd0c4amlcjpf8l6w4q2draaj3-nix-2.7.0";
|
||||
aarch64-darwin = "/nix/store/9l96qllhbb6xrsjaai76dn74ap7rq92n-nix-2.7.0";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,17 +22,18 @@ in
|
|||
};
|
||||
|
||||
strategy = mkOption {
|
||||
type = types.enum [ "history" "match_prev_cmd" ];
|
||||
default = "history";
|
||||
type = types.listOf (types.enum [ "history" "completion" "match_prev_cmd" ]);
|
||||
default = [ "history" ];
|
||||
description = ''
|
||||
Set ZSH_AUTOSUGGEST_STRATEGY to choose the strategy for generating suggestions.
|
||||
There are currently two to choose from:
|
||||
`ZSH_AUTOSUGGEST_STRATEGY` is an array that specifies how suggestions should be generated.
|
||||
The strategies in the array are tried successively until a suggestion is found.
|
||||
There are currently three built-in strategies to choose from:
|
||||
|
||||
* history: Chooses the most recent match.
|
||||
* match_prev_cmd: Chooses the most recent match whose preceding history item matches
|
||||
the most recently executed command (more info). Note that this strategy won't work as
|
||||
expected with ZSH options that don't preserve the history order such as
|
||||
HIST_IGNORE_ALL_DUPS or HIST_EXPIRE_DUPS_FIRST.
|
||||
- `history`: Chooses the most recent match from history.
|
||||
- `completion`: Chooses a suggestion based on what tab-completion would suggest. (requires `zpty` module)
|
||||
- `match_prev_cmd`: Like `history`, but chooses the most recent match whose preceding history item matches
|
||||
the most recently executed command. Note that this strategy won't work as expected with ZSH options that
|
||||
don't preserve the history order such as `HIST_IGNORE_ALL_DUPS` or `HIST_EXPIRE_DUPS_FIRST`.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -62,7 +63,7 @@ in
|
|||
source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
|
||||
|
||||
export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.highlightStyle}"
|
||||
export ZSH_AUTOSUGGEST_STRATEGY=("${cfg.strategy}")
|
||||
export ZSH_AUTOSUGGEST_STRATEGY=(${concatStringsSep " " cfg.strategy})
|
||||
${optionalString (!cfg.async) "unset ZSH_AUTOSUGGEST_USE_ASYNC"}
|
||||
|
||||
${concatStringsSep "\n" (mapAttrsToList (key: value: ''export ${key}="${value}"'') cfg.extraConfig)}
|
||||
|
|
|
|||
|
|
@ -91,11 +91,6 @@ in
|
|||
virtualisation.docker = mkIf cfg.docker {
|
||||
enable = mkDefault true;
|
||||
};
|
||||
|
||||
# TODO: disable this once k3s supports cgroupsv2, either by docker
|
||||
# supporting it, or their bundled containerd
|
||||
systemd.enableUnifiedCgroupHierarchy = false;
|
||||
|
||||
environment.systemPackages = [ config.services.k3s.package ];
|
||||
|
||||
systemd.services.k3s = {
|
||||
|
|
@ -119,6 +114,7 @@ in
|
|||
[
|
||||
"${cfg.package}/bin/k3s ${cfg.role}"
|
||||
] ++ (optional cfg.docker "--docker")
|
||||
++ (optional (cfg.docker && config.systemd.enableUnifiedCgroupHierarchy) "--kubelet-arg=cgroup-driver=systemd")
|
||||
++ (optional cfg.disableAgent "--disable-agent")
|
||||
++ (optional (cfg.serverAddr != "") "--server ${cfg.serverAddr}")
|
||||
++ (optional (cfg.token != "") "--token ${cfg.token}")
|
||||
|
|
|
|||
|
|
@ -81,7 +81,9 @@ in {
|
|||
user = mkOption {
|
||||
type = types.str;
|
||||
default = redisName name;
|
||||
defaultText = "\"redis\" or \"redis-\${name}\" if name != \"\"";
|
||||
defaultText = literalExpression ''
|
||||
if name == "" then "redis" else "redis-''${name}"
|
||||
'';
|
||||
description = "The username and groupname for redis-server.";
|
||||
};
|
||||
|
||||
|
|
@ -105,8 +107,7 @@ in {
|
|||
|
||||
bind = mkOption {
|
||||
type = with types; nullOr str;
|
||||
default = if name == "" then "127.0.0.1" else null;
|
||||
defaultText = literalExpression ''if name == "" then "127.0.0.1" else null'';
|
||||
default = "127.0.0.1";
|
||||
description = ''
|
||||
The IP interface to bind to.
|
||||
<literal>null</literal> means "all interfaces".
|
||||
|
|
@ -117,7 +118,9 @@ in {
|
|||
unixSocket = mkOption {
|
||||
type = with types; nullOr path;
|
||||
default = "/run/${redisName name}/redis.sock";
|
||||
defaultText = "\"/run/redis/redis.sock\" or \"/run/redis-\${name}/redis.sock\" if name != \"\"";
|
||||
defaultText = literalExpression ''
|
||||
if name == "" then "/run/redis/redis.sock" else "/run/redis-''${name}/redis.sock"
|
||||
'';
|
||||
description = "The path to the socket to bind to.";
|
||||
};
|
||||
|
||||
|
|
@ -370,7 +373,7 @@ in {
|
|||
ProtectKernelTunables = true;
|
||||
ProtectControlGroups = true;
|
||||
RestrictAddressFamilies =
|
||||
optionals (conf.bind != null) ["AF_INET" "AF_INET6"] ++
|
||||
optionals (conf.port != 0) ["AF_INET" "AF_INET6"] ++
|
||||
optional (conf.unixSocket != null) "AF_UNIX";
|
||||
RestrictNamespaces = true;
|
||||
LockPersonality = true;
|
||||
|
|
|
|||
|
|
@ -110,6 +110,15 @@ in
|
|||
'';
|
||||
};
|
||||
};
|
||||
options.app_service_api.database = {
|
||||
connection_string = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "file:federationapi.db";
|
||||
description = ''
|
||||
Database for the Appservice API.
|
||||
'';
|
||||
};
|
||||
};
|
||||
options.client_api = {
|
||||
registration_disabled = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
|
|
@ -120,6 +129,91 @@ in
|
|||
'';
|
||||
};
|
||||
};
|
||||
options.federation_api.database = {
|
||||
connection_string = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "file:federationapi.db";
|
||||
description = ''
|
||||
Database for the Federation API.
|
||||
'';
|
||||
};
|
||||
};
|
||||
options.key_server.database = {
|
||||
connection_string = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "file:keyserver.db";
|
||||
description = ''
|
||||
Database for the Key Server (for end-to-end encryption).
|
||||
'';
|
||||
};
|
||||
};
|
||||
options.media_api = {
|
||||
database = {
|
||||
connection_string = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "file:mediaapi.db";
|
||||
description = ''
|
||||
Database for the Media API.
|
||||
'';
|
||||
};
|
||||
};
|
||||
base_path = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "${workingDir}/media_store";
|
||||
description = ''
|
||||
Storage path for uploaded media.
|
||||
'';
|
||||
};
|
||||
};
|
||||
options.room_server.database = {
|
||||
connection_string = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "file:roomserver.db";
|
||||
description = ''
|
||||
Database for the Room Server.
|
||||
'';
|
||||
};
|
||||
};
|
||||
options.sync_api.database = {
|
||||
connection_string = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "file:syncserver.db";
|
||||
description = ''
|
||||
Database for the Sync API.
|
||||
'';
|
||||
};
|
||||
};
|
||||
options.user_api = {
|
||||
account_database = {
|
||||
connection_string = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "file:userapi_accounts.db";
|
||||
description = ''
|
||||
Database for the User API, accounts.
|
||||
'';
|
||||
};
|
||||
};
|
||||
device_database = {
|
||||
connection_string = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "file:userapi_devices.db";
|
||||
description = ''
|
||||
Database for the User API, devices.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
options.mscs = {
|
||||
database = {
|
||||
connection_string = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "file:mscs.db";
|
||||
description = ''
|
||||
Database for exerimental MSC's.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
default = { };
|
||||
description = ''
|
||||
|
|
|
|||
|
|
@ -924,7 +924,8 @@ in
|
|||
PrivateMounts = true;
|
||||
# System Call Filtering
|
||||
SystemCallArchitectures = "native";
|
||||
SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid" ] ++ optionals (cfg.package != pkgs.tengine) [ "~@ipc" ];
|
||||
SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid" ]
|
||||
++ optionals ((cfg.package != pkgs.tengine) && (!lib.any (mod: (mod.disableIPC or false)) cfg.package.modules)) [ "~@ipc" ];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "praat";
|
||||
version = "6.2.07";
|
||||
version = "6.2.09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "praat";
|
||||
repo = "praat";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MM8uC1+d1P7aZI460fCcHWtE7+xfJV1ZFj2cdp/b1rY=";
|
||||
sha256 = "sha256-BhsbTFwxgWwMwe1ow0ppVsLjfMC7QMA/fq09Utwe+KA=";
|
||||
};
|
||||
|
||||
configurePhase = ''
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
let chia = python3Packages.buildPythonApplication rec {
|
||||
pname = "chia";
|
||||
version = "1.2.11";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Chia-Network";
|
||||
repo = "chia-blockchain";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-hRpZce8ydEsyq7htNfzlRSKPwMAOUurC3uiQpX6WiB8=";
|
||||
hash = "sha256-eUvZc/7gqGkCB2tNKdwqKOmOgEcG9a/7TSvvyQzhNcQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -31,6 +31,7 @@ let chia = python3Packages.buildPythonApplication rec {
|
|||
SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}";
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
aiofiles
|
||||
aiohttp
|
||||
aiosqlite
|
||||
bitstring
|
||||
|
|
@ -46,6 +47,7 @@ let chia = python3Packages.buildPythonApplication rec {
|
|||
colorlog
|
||||
concurrent-log-handler
|
||||
cryptography
|
||||
dnslib
|
||||
dnspythonchia
|
||||
fasteners
|
||||
keyrings-cryptfile
|
||||
|
|
@ -55,6 +57,7 @@ let chia = python3Packages.buildPythonApplication rec {
|
|||
sortedcontainers
|
||||
watchdog
|
||||
websockets
|
||||
zstd
|
||||
];
|
||||
|
||||
checkInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ from typing import List, Tuple
|
|||
from pathlib import Path
|
||||
|
||||
# Import plugin update library from maintainers/scripts/pluginupdate.py
|
||||
ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))
|
||||
ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) # type: ignore
|
||||
sys.path.insert(
|
||||
0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts")
|
||||
)
|
||||
|
|
@ -42,7 +42,7 @@ HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/
|
|||
class KakouneEditor(pluginupdate.Editor):
|
||||
|
||||
|
||||
def generate_nix(plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str):
|
||||
def generate_nix(self, plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str):
|
||||
sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower())
|
||||
|
||||
with open(outfile, "w+") as f:
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "leo-editor";
|
||||
version = "6.5";
|
||||
version = "6.6-b2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leo-editor";
|
||||
repo = "leo-editor";
|
||||
rev = version;
|
||||
sha256 = "sha256-f237oXhnu6OtGVhIFDswFwfjcLgYWvLNRtVW4SChFzU=";
|
||||
sha256 = "sha256-oUOsAYcxknG+bao76bzPhStO1m08pMWTEEiG2rLkklA=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "sigil";
|
||||
version = "1.9.0";
|
||||
version = "1.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = "Sigil";
|
||||
owner = "Sigil-Ebook";
|
||||
rev = version;
|
||||
sha256 = "sha256-3rECGnb0kkQwzsMxLxgAp0QEoHFHv+qCjiCgzCZeUJw=";
|
||||
sha256 = "sha256-PsHliyJu61QFTFZUgDtxguu18GBVTOGMW6pPYjHhvG0=";
|
||||
};
|
||||
|
||||
pythonPath = with python3Packages; [ lxml ];
|
||||
|
|
|
|||
|
|
@ -536,6 +536,19 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
daohong-emilio.yash = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
publisher = "daohong-emilio";
|
||||
name = "yash";
|
||||
version = "0.2.8";
|
||||
sha256 = "ummOEBSXUI78hBb1AUh+x339T7ocB/evOVaz79geHRM=";
|
||||
};
|
||||
meta = {
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ kamadorueda ];
|
||||
};
|
||||
};
|
||||
|
||||
davidanson.vscode-markdownlint = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "vscode-markdownlint";
|
||||
|
|
@ -1787,6 +1800,23 @@ let
|
|||
};
|
||||
};
|
||||
|
||||
skellock.just = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "just";
|
||||
publisher = "skellock";
|
||||
version = "2.0.0";
|
||||
sha256 = "sha256-FOp/dcW0+07rADEpUMzx+SGYjhvE4IhcCOqUQ38yCN4=";
|
||||
};
|
||||
meta = with lib; {
|
||||
changelog = "https://github.com/skellock/vscode-just/blob/master/CHANGELOG.md";
|
||||
description = "Provides syntax and recipe launcher for Just scripts";
|
||||
downloadPage = "https://marketplace.visualstudio.com/items?itemName=skellock.just";
|
||||
homepage = "https://github.com/skellock/vscode-just";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ maximsmol ];
|
||||
};
|
||||
};
|
||||
|
||||
skyapps.fish-vscode = buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "fish-vscode";
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "avocode";
|
||||
version = "4.15.5";
|
||||
version = "4.15.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
|
||||
sha256 = "sha256-vPS2hTaWjundVjtguy/1eH1qBaipN2Ij8PQODka+IGg=";
|
||||
sha256 = "sha256-vNQT4jyMIIAk1pV3Hrp40nawFutWCv7xtwg2gU6ejy0=";
|
||||
};
|
||||
|
||||
libPath = lib.makeLibraryPath (with xorg; [
|
||||
|
|
|
|||
78
pkgs/applications/graphics/hdrmerge/default.nix
Normal file
78
pkgs/applications/graphics/hdrmerge/default.nix
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
{ lib
|
||||
, mkDerivation
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, qtbase
|
||||
, wrapQtAppsHook
|
||||
, libraw
|
||||
, exiv2
|
||||
, zlib
|
||||
, alglib
|
||||
, pkg-config
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "hdrmerge";
|
||||
version = "unstable-2020-11-12";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcelaya";
|
||||
repo = "hdrmerge";
|
||||
rev = "f5a2538cffe3e27bd9bea5d6a199fa211d05e6da";
|
||||
sha256 = "1bzf9wawbdvdbv57hnrmh0gpjfi5hamgf2nwh2yzd4sh1ssfa8jz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
wrapQtAppsHook
|
||||
copyDesktopItems
|
||||
];
|
||||
|
||||
buildInputs = [ qtbase libraw exiv2 zlib alglib ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DALGLIB_DIR:PATH=${alglib}"
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# patch FindAlglib.cmake to respect ALGLIB_DIR
|
||||
# see https://github.com/jcelaya/hdrmerge/pull/213
|
||||
name = "patch-hdrmerge-CMake.patch";
|
||||
url = "https://github.com/mkroehnert/hdrmerge/commit/472b2dfe7d54856158aea3d5412a02d0bab1da4c.patch";
|
||||
sha256 = "0jc713ajr4w08pfbi6bva442prj878nxp1fpl9112i3xj34x9sdi";
|
||||
})
|
||||
];
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "HDRMerge";
|
||||
genericName = "HDR raw image merge";
|
||||
desktopName = "HDRMerge";
|
||||
comment = meta.description;
|
||||
icon = "hdrmerge";
|
||||
exec = "@out@/bin/hdrmerge -F";
|
||||
categories = [ "Graphics" ];
|
||||
mimeTypes = [ "image/x-dcraw" "image/x-adobe-dng" ];
|
||||
terminal = false;
|
||||
})
|
||||
];
|
||||
|
||||
postInstallPhase = ''
|
||||
# Make a desktop item
|
||||
mkdir -p $out/share/icons/ $out/share/applications/
|
||||
cp ../data/images/logo.png $out/share/icons/hdrmerge.png
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jcelaya/hdrmerge";
|
||||
description = "Combines two or more raw images into an HDR";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.paperdigits ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,64 +1,80 @@
|
|||
{ lib
|
||||
, dbus
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, dbus
|
||||
, ffmpeg
|
||||
, x264
|
||||
, libva
|
||||
, gst_all_1
|
||||
, xorg
|
||||
, libdrm
|
||||
, libva
|
||||
, fetchzip
|
||||
, copyDesktopItems
|
||||
, fontconfig
|
||||
, libpng
|
||||
, pipewire
|
||||
, makeWrapper
|
||||
, autoPatchelfHook
|
||||
, pkg-config
|
||||
, pango
|
||||
, cmake
|
||||
, autoconf
|
||||
, libtool
|
||||
, nodePackages
|
||||
, ApplicationServices
|
||||
, Carbon
|
||||
, Cocoa
|
||||
, VideoToolbox
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "weylus";
|
||||
version = "0.11.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/H-M-H/Weylus/releases/download/v${version}/linux.zip";
|
||||
sha256 = "sha256-EW3TdI4F4d4X/BeSqI05QtS77ym1U5jdswFfNtSFyFk=";
|
||||
stripRoot = false;
|
||||
src = fetchFromGitHub {
|
||||
owner = "H-M-H";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0gq2czxvahww97j4i3k18np29zl6wx85f8253wn3ibqrpfnklz6l";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dm755 ./weylus $out/bin/weylus
|
||||
copyDesktopItems ./weylus.desktop
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
buildInputs = [
|
||||
libpng
|
||||
ffmpeg
|
||||
x264
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
ApplicationServices
|
||||
Carbon
|
||||
Cocoa
|
||||
VideoToolbox
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
dbus
|
||||
libdrm
|
||||
fontconfig
|
||||
libva
|
||||
gst_all_1.gst-plugins-base
|
||||
pipewire
|
||||
# autoPatchelfHook complains if these are missing, even on wayland
|
||||
xorg.libXext
|
||||
xorg.libXft
|
||||
xorg.libXinerama
|
||||
xorg.libXcursor
|
||||
xorg.libXrender
|
||||
xorg.libXfixes
|
||||
xorg.libXtst
|
||||
xorg.libXrandr
|
||||
xorg.libXcomposite
|
||||
xorg.libXtst
|
||||
xorg.libXi
|
||||
xorg.libXv
|
||||
pango
|
||||
libdrm
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ copyDesktopItems autoPatchelfHook makeWrapper ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
nodePackages.typescript
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
pkg-config
|
||||
autoconf
|
||||
libtool
|
||||
];
|
||||
|
||||
postFixup = let
|
||||
GST_PLUGIN_PATH = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [
|
||||
gst_all_1.gst-plugins-base
|
||||
pipewire
|
||||
];
|
||||
in ''
|
||||
wrapProgram $out/bin/weylus --prefix GST_PLUGIN_PATH : ${GST_PLUGIN_PATH}
|
||||
cargoSha256 = "1pigmch0sy9ipsafd83b8q54xwqjxdaif363n1q8n46arq4v81j0";
|
||||
|
||||
cargoBuildFlags = [ "--features=ffmpeg-system" ];
|
||||
cargoTestFlags = [ "--features=ffmpeg-system" ];
|
||||
|
||||
postInstall = ''
|
||||
install -vDm755 weylus.desktop $out/share/applications/weylus.desktop
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
@ -66,6 +82,5 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/H-M-H/Weylus";
|
||||
license = with licenses; [ agpl3Only ];
|
||||
maintainers = with maintainers; [ lom ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "spicetify-cli";
|
||||
version = "2.9.1";
|
||||
version = "2.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "khanhas";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Rs70LmJ/+pbISQpPuEYV2URFv7uf+jdTVQopUSKExSY=";
|
||||
sha256 = "sha256-r6xm0Gq2QXWQEcYEu1n0y6S4r4odzYP8Srr0U+jZr6U=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-g0RYIVIq4oMXdRZDBDnVYg7ombN5WEo/6O9hChQvOYs=";
|
||||
|
|
|
|||
|
|
@ -30,13 +30,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "waybar";
|
||||
version = "0.9.9";
|
||||
version = "0.9.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Alexays";
|
||||
repo = "Waybar";
|
||||
rev = version;
|
||||
sha256 = "sha256-yXvT9NMXtUxr9VVLADoL6PUOMko5yFFc51zNsfHz6S4=";
|
||||
sha256 = "sha256-KiRtU32h3AvThDWnCw55LnqbWVAZLXY/7fU1HxLMjLo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "bombadillo";
|
||||
version = "2.3.3";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://tildegit.org/sloum/bombadillo.git";
|
||||
rev = version;
|
||||
sha256 = "02w6h44sxzmk3bkdidl8xla0i9rwwpdqljnvcbydx5kyixycmg0q";
|
||||
sha256 = "sha256-FjU9AyRAdGFr1bVpkmj5STkbzCXvpxOaOj7WNQJq7A0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"packageVersion": "97.0.1-1",
|
||||
"packageVersion": "97.0.2-1",
|
||||
"source": {
|
||||
"rev": "97.0.1-1",
|
||||
"sha256": "10gbnkmyivawwqn3gf5c98l49b03j70gbniaar8bfl80j8av0v5j"
|
||||
"rev": "97.0.2-1",
|
||||
"sha256": "0pk9ci0wvz61879w3fvy8p1w4w8anv5s7rfiimz21m351gcf3d7m"
|
||||
},
|
||||
"firefox": {
|
||||
"version": "97.0.1",
|
||||
"sha512": "8620aace77167593aab5acd230860eb3e67eeddc49c0aad0491b5dc20bd0ddb6089dbb8975aed241426f57b2ad772238b04d03b95390175f580cbd80bb6d5f6c"
|
||||
"version": "97.0.2",
|
||||
"sha512": "efbf33723f5979025454b6cc183927afb4bc72a51c00b5d45940122da596b8ac99080f3a6a59f5dd85a725e356349ec57e7eba1c36cdab7d55a28b04895d274c"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ rec {
|
|||
meta = {
|
||||
description = "A web browser built from Firefox source tree";
|
||||
homepage = "http://www.mozilla.com/en-US/firefox/";
|
||||
maintainers = with lib.maintainers; [ eelco lovesegfault hexa ];
|
||||
maintainers = with lib.maintainers; [ lovesegfault hexa ];
|
||||
platforms = lib.platforms.unix;
|
||||
badPlatforms = lib.platforms.darwin;
|
||||
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
|
||||
|
|
@ -32,10 +32,10 @@ rec {
|
|||
|
||||
firefox-esr-91 = common rec {
|
||||
pname = "firefox-esr";
|
||||
version = "91.6.1esr";
|
||||
version = "91.7.0esr";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "e72ff7114e251ec3558f47bb45e4017fe4c665a95e0a108d5818c628b3de44c92f57cfb3dd9f5a25b7abad889be228f89dda838bc20fc9617c90655694184ed5";
|
||||
sha512 = "925811989d8a91d826ba356bd46ac54be8153288ec0319c28d2bfbe89191e62e107691159dd7ca247253e2a4952eb59a5b9613e3feea3f5351238d4822e26301";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ let
|
|||
|
||||
enterprisePolicies =
|
||||
{
|
||||
policies = lib.optionalAttrs usesNixExtensions {
|
||||
policies = {
|
||||
DisableAppUpdate = true;
|
||||
} //
|
||||
lib.optionalAttrs usesNixExtensions {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
let
|
||||
# look for GO_LDFLAGS getting set in the Makefile
|
||||
version = "0.14.2";
|
||||
sha256 = "sha256-sQtry94T5cDO+836D/p/8ptQi3WYKDBLr1QZyEXdLQI=";
|
||||
vendorSha256 = "sha256-cd2iNMxWmkSWqqkPLYocUG+fCUXoeUXEuGQxjUWQnXk=";
|
||||
pkgsVersion = "0.9.0-4-gc875fbe";
|
||||
extrasVersion = "0.7.0-2-gb4c9d21";
|
||||
version = "0.14.3";
|
||||
sha256 = "sha256-toEbWUZxnJkUe9jkZRdJrcPXu+CIh62fUKyX38OkXxU=";
|
||||
vendorSha256 = "sha256-Pj1918TIOGfhkRiFEKkURL4xMFgWroiNsNU6yWzT8yk=";
|
||||
pkgsVersion = "v0.9.0-6-gbfcc795";
|
||||
extrasVersion = "v0.7.0-2-gb4c9d21";
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "talosctl";
|
||||
|
|
@ -29,8 +29,8 @@ buildGoModule rec {
|
|||
"-X ${versionPkg}.Name=Talos"
|
||||
"-X ${versionPkg}.SHA=${src.rev}" # should be the hash, but as we build from tags, this needs to do
|
||||
"-X ${versionPkg}.Tag=${src.rev}"
|
||||
"-X ${versionPkg}.PkgsVersion=v${pkgsVersion}" # PKGS
|
||||
"-X ${versionPkg}.ExtrasVersion=v${extrasVersion}" # EXTRAS
|
||||
"-X ${versionPkg}.PkgsVersion=${pkgsVersion}" # PKGS
|
||||
"-X ${versionPkg}.ExtrasVersion=${extrasVersion}" # EXTRAS
|
||||
"-X ${imagesPkgs}.Username=talos-systems" # USERNAME
|
||||
"-X ${imagesPkgs}.Registry=ghcr.io" # REGISTRY
|
||||
"-X ${mgmtHelpersPkg}.ArtifactsPath=_out" # ARTIFACTS
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "3.14.0";
|
||||
version = "3.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-4az63Ff4aUAFMZoQeHshS9TxA/BIyHFZ/svFgAsU6WU=";
|
||||
sha256 = "sha256-znBvV6z5rMfLeyEBRmAtfwVw1is5jJlGPQplXqEGAAM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-KbM2bKYnllxTw4B9W5E8iLZKvN/DJqBmWkXXLhEtsSQ=";
|
||||
vendorSha256 = "sha256-S2og/isDy6Jvo9XgIV6XbgrmRJsLnePwh/gll/14Ds0=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
"name": "element-desktop",
|
||||
"productName": "Element",
|
||||
"main": "lib/electron-main.js",
|
||||
"version": "1.10.4",
|
||||
"version": "1.10.6",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "Element",
|
||||
"repository": {
|
||||
|
|
@ -61,7 +61,7 @@
|
|||
"app-builder-lib": "^22.14.10",
|
||||
"asar": "^2.0.1",
|
||||
"chokidar": "^3.5.2",
|
||||
"electron": "^15.3.5",
|
||||
"electron": "^17",
|
||||
"electron-builder": "22.11.4",
|
||||
"electron-builder-squirrel-windows": "22.11.4",
|
||||
"electron-devtools-installer": "^3.1.1",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"version": "1.10.4",
|
||||
"desktopSrcHash": "cuMo0wRMC6+un3BQK0+Ecnjvs6HugNk71yElNJarlyc=",
|
||||
"desktopYarnHash": "0llnqwgiqggfcgjyaar2h2r1pyw8m14icfb1pcdphqxrah9gpsar",
|
||||
"webHash": "0vf8npddbx4dmq9c1ghak97jn28b18ssblbrq5smdhlzsnxlpm3l"
|
||||
"version": "1.10.6",
|
||||
"desktopSrcHash": "TJGYavawLDLbP9Sg7HxIcOkr7hcTfAwk4fyOOEv4KhI=",
|
||||
"desktopYarnHash": "038rqg26dn8chzscck5mlhnw2viy6gr8pjb7zrcmi7ipx9h038a0",
|
||||
"webHash": "1wax4h5gfcq4giyq1igsix748cngky487kwvf69zb1gz95hjds9r"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ flutter.mkFlutterApp rec {
|
|||
icon = "fluffychat";
|
||||
desktopName = "Fluffychat";
|
||||
genericName = "Chat with your friends (matrix client)";
|
||||
categories = "Chat;Network;InstantMessaging;";
|
||||
categories = [ "Chat" "Network" "InstantMessaging" ];
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -49,7 +49,7 @@ flutter.mkFlutterApp rec {
|
|||
|
||||
# replace olm dummy path
|
||||
postConfigure = ''
|
||||
M=$(echo $TMP/.pub-cache/hosted/pub.dartlang.org/matrix-*)
|
||||
M=$(echo $depsFolder/.pub-cache/hosted/pub.dartlang.org/matrix-*)
|
||||
ln -sf ${olm}/lib/libolm.so.3 $M/ffi/olm/libolm.so
|
||||
'';
|
||||
|
||||
|
|
|
|||
106
pkgs/applications/networking/n8n/node-packages.nix
generated
106
pkgs/applications/networking/n8n/node-packages.nix
generated
|
|
@ -976,13 +976,13 @@ let
|
|||
sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A==";
|
||||
};
|
||||
};
|
||||
"aws-sdk-2.1083.0" = {
|
||||
"aws-sdk-2.1087.0" = {
|
||||
name = "aws-sdk";
|
||||
packageName = "aws-sdk";
|
||||
version = "2.1083.0";
|
||||
version = "2.1087.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1083.0.tgz";
|
||||
sha512 = "o9pOC3LrkJRKLwSumdFrNWzGAVRNPGt4EFS48/917BaFafvnOAzOG/DM8cl5yguz3wT7eylj92I4pP2TE3qZIQ==";
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1087.0.tgz";
|
||||
sha512 = "m5EERT29Fwh2cv3SaSdygeAjJBXnjSaXRRERy70bf6PQ7KgmASJouBxY11g5G7LTEPK/yfB0TGshujKh3hEtPA==";
|
||||
};
|
||||
};
|
||||
"aws-sign2-0.7.0" = {
|
||||
|
|
@ -2956,13 +2956,13 @@ let
|
|||
sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==";
|
||||
};
|
||||
};
|
||||
"has-symbols-1.0.2" = {
|
||||
"has-symbols-1.0.3" = {
|
||||
name = "has-symbols";
|
||||
packageName = "has-symbols";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz";
|
||||
sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==";
|
||||
url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz";
|
||||
sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==";
|
||||
};
|
||||
};
|
||||
"has-tostringtag-1.0.0" = {
|
||||
|
|
@ -4486,49 +4486,49 @@ let
|
|||
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
|
||||
};
|
||||
};
|
||||
"n8n-core-0.106.0" = {
|
||||
"n8n-core-0.107.0" = {
|
||||
name = "n8n-core";
|
||||
packageName = "n8n-core";
|
||||
version = "0.106.0";
|
||||
version = "0.107.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.106.0.tgz";
|
||||
sha512 = "0aEoY00VPKNodcQl9NN2hTvqQysCNPeg/Ex1UKlt4b0xeqhkIEJ2KMILexXwHitPnTyJwXhn7ewqK7YafdKBcw==";
|
||||
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.107.0.tgz";
|
||||
sha512 = "jwlEv67bPCn1Npp5SkZ11MViQgN96B2bUmSdsKPIBkJGkAPdd6BAUNAhF6qlAS53KhkbSqjuZkn71sDwbHv1cg==";
|
||||
};
|
||||
};
|
||||
"n8n-design-system-0.12.0" = {
|
||||
"n8n-design-system-0.13.0" = {
|
||||
name = "n8n-design-system";
|
||||
packageName = "n8n-design-system";
|
||||
version = "0.12.0";
|
||||
version = "0.13.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.12.0.tgz";
|
||||
sha512 = "ZMPcOVL/yzsIut7mvHbIx03OxLa2z+jE3CtaZjSyK4tk2NQ8gVc+BOBAasmVCkO4CeJbdDMGDF+ktnUaC4ougw==";
|
||||
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.13.0.tgz";
|
||||
sha512 = "dnweYfFdU9RLdZhmllAlF35dFp0F8Cxw2YAVPMTYOJ2saTs992kvI+09k5iVHDdRxA92BKRXgRRfvY1p0goXcQ==";
|
||||
};
|
||||
};
|
||||
"n8n-editor-ui-0.132.1" = {
|
||||
"n8n-editor-ui-0.133.0" = {
|
||||
name = "n8n-editor-ui";
|
||||
packageName = "n8n-editor-ui";
|
||||
version = "0.132.1";
|
||||
version = "0.133.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.132.1.tgz";
|
||||
sha512 = "Kggz0oSLjmh/kqIkerfTaPqGE+qk8mEK9Vs7ZxgmQ4CdRreELSBBVGZiuZALfDjm//+hUF2VnLU3PWUm6uqfDg==";
|
||||
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.133.0.tgz";
|
||||
sha512 = "lKi2eyx5mn5vfo5sArvsnQ+1khdkX7I1Aqml5VFgzTUhHDLZB2Pvupu+czE55l9QSGs6oqaN9a9NRblWOHc0zQ==";
|
||||
};
|
||||
};
|
||||
"n8n-nodes-base-0.163.0" = {
|
||||
"n8n-nodes-base-0.164.0" = {
|
||||
name = "n8n-nodes-base";
|
||||
packageName = "n8n-nodes-base";
|
||||
version = "0.163.0";
|
||||
version = "0.164.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.163.0.tgz";
|
||||
sha512 = "kLndPbDemejOGROHrf5KHs7E1yQ5JwwAdyhJpzWX4M2C2Od52YRk4G97r5FZsaxW/e6vJawY6tw1O6PVM1H6nw==";
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.164.0.tgz";
|
||||
sha512 = "5GSd0f1rQZfKt9e0S1zwn5K34TSd1lYkd3MEPKDHjvksxfNOumtZpf0rwEgb/7Uf6azw7ESqk4VXwxiVQu0sgw==";
|
||||
};
|
||||
};
|
||||
"n8n-workflow-0.88.0" = {
|
||||
"n8n-workflow-0.89.0" = {
|
||||
name = "n8n-workflow";
|
||||
packageName = "n8n-workflow";
|
||||
version = "0.88.0";
|
||||
version = "0.89.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.88.0.tgz";
|
||||
sha512 = "Rrlw7MqzPS0Q8T2AIe+aDioIkxC9v1aDbs5L0L/SDlGe54W2uG9qmLZ9/TTfzZZ4qzXX6fTEMNbICVmlmbEaUQ==";
|
||||
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.89.0.tgz";
|
||||
sha512 = "hggmmjHsa3VjP5puRssH4Q8hoigqJ3W+KQeY54Qsa1rJoJEjZYy53NGOQ3QMmuPuTUvVMHe4Z/Hb6u4Bbh1wAg==";
|
||||
};
|
||||
};
|
||||
"named-placeholders-1.1.2" = {
|
||||
|
|
@ -6340,13 +6340,13 @@ let
|
|||
sha512 = "1SdTNo+BVU211Xj1csWa8lV6KM0CtucDwRyA0VHl91wEH1Mgh7RxUpI4rVvG7OhHrzCSGaVyW5g8vKvlrk9DJA==";
|
||||
};
|
||||
};
|
||||
"sqlstring-2.3.2" = {
|
||||
"sqlstring-2.3.3" = {
|
||||
name = "sqlstring";
|
||||
packageName = "sqlstring";
|
||||
version = "2.3.2";
|
||||
version = "2.3.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.2.tgz";
|
||||
sha512 = "vF4ZbYdKS8OnoJAWBmMxCQDkiEBkGQYU7UZPtL8flbDRSNkhaXvRJ279ZtI6M+zDaQovVU4tuRgzK5fVhvFAhg==";
|
||||
url = "https://registry.npmjs.org/sqlstring/-/sqlstring-2.3.3.tgz";
|
||||
sha512 = "qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==";
|
||||
};
|
||||
};
|
||||
"sse-channel-3.1.1" = {
|
||||
|
|
@ -6367,13 +6367,13 @@ let
|
|||
sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==";
|
||||
};
|
||||
};
|
||||
"ssh2-1.6.0" = {
|
||||
"ssh2-1.7.0" = {
|
||||
name = "ssh2";
|
||||
packageName = "ssh2";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/ssh2/-/ssh2-1.6.0.tgz";
|
||||
sha512 = "lxc+uvXqOxyQ99N2M7k5o4pkYDO5GptOTYduWw7hIM41icxvoBcCNHcj+LTKrjkL0vFcAl+qfZekthoSFRJn2Q==";
|
||||
url = "https://registry.npmjs.org/ssh2/-/ssh2-1.7.0.tgz";
|
||||
sha512 = "u1gdFfqKV1PTGR2szS5FImhFii40o+8FOUpg1M//iimNaS4BkTyUVfVdoydXS93M1SquOU02Z4KFhYDBNqQO+g==";
|
||||
};
|
||||
};
|
||||
"ssh2-sftp-client-7.2.2" = {
|
||||
|
|
@ -7375,13 +7375,13 @@ let
|
|||
sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943";
|
||||
};
|
||||
};
|
||||
"xss-1.0.10" = {
|
||||
"xss-1.0.11" = {
|
||||
name = "xss";
|
||||
packageName = "xss";
|
||||
version = "1.0.10";
|
||||
version = "1.0.11";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/xss/-/xss-1.0.10.tgz";
|
||||
sha512 = "qmoqrRksmzqSKvgqzN0055UFWY7OKx1/9JWeRswwEVX9fCG5jcYRxa/A2DHcmZX6VJvjzHRQ2STeeVcQkrmLSw==";
|
||||
url = "https://registry.npmjs.org/xss/-/xss-1.0.11.tgz";
|
||||
sha512 = "EimjrjThZeK2MO7WKR9mN5ZC1CSqivSl55wvUK5EtU6acf0rzEE1pN+9ZDrFXJ82BRp3JL38pPE6S4o/rpp1zQ==";
|
||||
};
|
||||
};
|
||||
"xtend-4.0.2" = {
|
||||
|
|
@ -7480,10 +7480,10 @@ in
|
|||
n8n = nodeEnv.buildNodePackage {
|
||||
name = "n8n";
|
||||
packageName = "n8n";
|
||||
version = "0.165.1";
|
||||
version = "0.166.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.165.1.tgz";
|
||||
sha512 = "bezUoR+PGGZIoZ4fV7BfH3C9poVJj0GXBkswsA2nhCSGoE2WExhLFEh8mR1ExDUqCwe9mhVLUEdJHO/RNJAD4g==";
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.166.0.tgz";
|
||||
sha512 = "t8tRpOyrEIxaIuLzfBajDPjAMygcCapiIqHDjU8YloJalI0MnbuoQ6DgA2RdRDZElN0yew0rQR8ZxZ2nMUk8Fg==";
|
||||
};
|
||||
dependencies = [
|
||||
(sources."@azure/abort-controller-1.0.5" // {
|
||||
|
|
@ -7664,7 +7664,7 @@ in
|
|||
];
|
||||
})
|
||||
sources."avsc-5.7.3"
|
||||
(sources."aws-sdk-2.1083.0" // {
|
||||
(sources."aws-sdk-2.1087.0" // {
|
||||
dependencies = [
|
||||
sources."buffer-4.9.2"
|
||||
sources."events-1.1.1"
|
||||
|
|
@ -8011,7 +8011,7 @@ in
|
|||
})
|
||||
sources."has-bigints-1.0.1"
|
||||
sources."has-flag-4.0.0"
|
||||
sources."has-symbols-1.0.2"
|
||||
sources."has-symbols-1.0.3"
|
||||
sources."has-tostringtag-1.0.0"
|
||||
sources."has-unicode-2.0.1"
|
||||
sources."he-1.2.0"
|
||||
|
|
@ -8224,19 +8224,19 @@ in
|
|||
];
|
||||
})
|
||||
sources."mz-2.7.0"
|
||||
(sources."n8n-core-0.106.0" // {
|
||||
(sources."n8n-core-0.107.0" // {
|
||||
dependencies = [
|
||||
sources."qs-6.10.3"
|
||||
];
|
||||
})
|
||||
sources."n8n-design-system-0.12.0"
|
||||
sources."n8n-editor-ui-0.132.1"
|
||||
(sources."n8n-nodes-base-0.163.0" // {
|
||||
sources."n8n-design-system-0.13.0"
|
||||
sources."n8n-editor-ui-0.133.0"
|
||||
(sources."n8n-nodes-base-0.164.0" // {
|
||||
dependencies = [
|
||||
sources."iconv-lite-0.6.3"
|
||||
];
|
||||
})
|
||||
sources."n8n-workflow-0.88.0"
|
||||
sources."n8n-workflow-0.89.0"
|
||||
(sources."named-placeholders-1.1.2" // {
|
||||
dependencies = [
|
||||
sources."lru-cache-4.1.5"
|
||||
|
|
@ -8534,10 +8534,10 @@ in
|
|||
})
|
||||
sources."sprintf-js-1.1.2"
|
||||
sources."sqlite3-5.0.2"
|
||||
sources."sqlstring-2.3.2"
|
||||
sources."sqlstring-2.3.3"
|
||||
sources."sse-channel-3.1.1"
|
||||
sources."ssf-0.11.2"
|
||||
sources."ssh2-1.6.0"
|
||||
sources."ssh2-1.7.0"
|
||||
sources."ssh2-sftp-client-7.2.2"
|
||||
sources."sshpk-1.17.0"
|
||||
sources."stack-trace-0.0.10"
|
||||
|
|
@ -8695,7 +8695,7 @@ in
|
|||
sources."xmlbuilder-11.0.1"
|
||||
sources."xpath.js-1.1.0"
|
||||
sources."xregexp-2.0.0"
|
||||
(sources."xss-1.0.10" // {
|
||||
(sources."xss-1.0.11" // {
|
||||
dependencies = [
|
||||
sources."commander-2.20.3"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -52,13 +52,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "freerdp";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FreeRDP";
|
||||
repo = "FreeRDP";
|
||||
rev = version;
|
||||
sha256 = "sha256-gYHnorj2Up0aAVeltCCPOg/j3DY0ukWWNUU7uikvys0=";
|
||||
sha256 = "sha256-+yKdB/glNf74drv9EvBwVMWrqr5ADBkSJVVDH+UKb2U=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,7 +1,21 @@
|
|||
{ lib, fetchurl, cups, libssh, libXpm, nx-libs, openldap, openssh
|
||||
, mkDerivation, qtbase, qtsvg, qtx11extras, qttools, phonon, pkg-config }:
|
||||
{ lib
|
||||
, fetchurl
|
||||
, cups
|
||||
, libssh
|
||||
, libXpm
|
||||
, nx-libs
|
||||
, openldap
|
||||
, openssh
|
||||
, qt5
|
||||
, qtbase
|
||||
, qtsvg
|
||||
, qtx11extras
|
||||
, qttools
|
||||
, phonon
|
||||
, pkg-config
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
qt5.mkDerivation rec {
|
||||
pname = "x2goclient";
|
||||
version = "4.1.2.2";
|
||||
|
||||
|
|
@ -10,8 +24,24 @@ mkDerivation rec {
|
|||
sha256 = "yZUyZ8QPpnEZrZanO6yx8mYZbaIFnwzc0bjVGZQh0So=";
|
||||
};
|
||||
|
||||
buildInputs = [ cups libssh libXpm nx-libs openldap openssh
|
||||
qtbase qtsvg qtx11extras qttools phonon pkg-config ];
|
||||
buildInputs = [
|
||||
cups
|
||||
libssh
|
||||
libXpm
|
||||
nx-libs
|
||||
openldap
|
||||
openssh
|
||||
qtbase
|
||||
qtsvg
|
||||
qtx11extras
|
||||
qttools
|
||||
phonon
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
qt5.wrapQtAppsHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/onmainwindow.cpp --replace "/usr/sbin/sshd" "${openssh}/bin/sshd"
|
||||
|
|
@ -26,7 +56,7 @@ mkDerivation rec {
|
|||
|
||||
installTargets = [ "install_client" "install_man" ];
|
||||
|
||||
qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" ];
|
||||
qtWrapperArgs = [ "--suffix PATH : ${nx-libs}/bin:${openssh}/libexec" "--set QT_QPA_PLATFORM xcb" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Graphical NoMachine NX3 remote desktop client";
|
||||
|
|
|
|||
|
|
@ -25,14 +25,14 @@ let
|
|||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "14.32.28";
|
||||
version = "14.32.30";
|
||||
pname = "jmol";
|
||||
|
||||
src = let
|
||||
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
|
||||
in fetchurl {
|
||||
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
|
||||
sha256 = "sha256-J5m18pHjm3mbMwmCR1v9ycPNFwJdewp6zP4pxCZ+lF0=";
|
||||
sha256 = "sha256-VpOoduUA0iD+nI83GSQYQDHoK2Snog0NHkHWHfpLqFM=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "ffmpeg-normalize";
|
||||
version = "1.22.7";
|
||||
version = "1.22.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-yWn9SoVKnj9KtvBdI3k1a7fuKJmYeu9KrNyvPqw9SHU=";
|
||||
sha256 = "sha256-vxiq6q8fPh8ZLKnxYdIN591UQW73FWsoke1PvKTkko8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas, version }:
|
||||
{ appimageTools, lib, fetchurl, gtk3, gsettings-desktop-schemas, version, sha256 }:
|
||||
|
||||
let
|
||||
pname = "losslesscut";
|
||||
|
|
@ -11,7 +11,7 @@ let
|
|||
src = fetchurl {
|
||||
url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}";
|
||||
name = nameSource;
|
||||
sha256 = "0aqz5ijl5japfzzbcdcd2mmihkb8b2fc2hs9kkm3211yb37c5ygv";
|
||||
inherit sha256;
|
||||
};
|
||||
extracted = appimageTools.extractType2 {
|
||||
inherit name src;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ callPackage, stdenvNoCC, lib }:
|
||||
let
|
||||
version = "3.33.1";
|
||||
appimage = callPackage ./appimage.nix { inherit version; };
|
||||
dmg = callPackage ./dmg.nix { inherit version; };
|
||||
windows = callPackage ./windows.nix { inherit version; };
|
||||
version = "3.43.0";
|
||||
appimage = callPackage ./appimage.nix { inherit version; sha256 = "1xfr3i4gsi13wj374yr5idhgs0q71s4h33yxdr7b7xjdg2gb8lp1"; };
|
||||
dmg = callPackage ./dmg.nix { inherit version; sha256 = "1axki47hrxx5m0hrmjpxcya091lahqfnh2pd3zhn5dd496slq8an"; };
|
||||
windows = callPackage ./windows.nix { inherit version; sha256 = "1v00gym18hjxxm42dfqmw7vhwh8lgjz2jgv6fmg234npr3d43py5"; };
|
||||
in (
|
||||
if stdenvNoCC.isDarwin then dmg
|
||||
else if stdenvNoCC.isCygwin then windows
|
||||
|
|
@ -13,7 +13,7 @@ in (
|
|||
meta = with lib; {
|
||||
description = "The swiss army knife of lossless video/audio editing";
|
||||
homepage = "https://mifi.no/losslesscut/";
|
||||
license = licenses.mit;
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ ShamrockLee ];
|
||||
} // oldAttrs.meta // {
|
||||
platforms =
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenvNoCC, lib, fetchurl, undmg, version }:
|
||||
{ stdenvNoCC, lib, fetchurl, undmg, version , sha256 }:
|
||||
|
||||
let
|
||||
pname = "losslesscut";
|
||||
|
|
@ -10,7 +10,7 @@ let
|
|||
src = fetchurl {
|
||||
url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}";
|
||||
name = nameSource;
|
||||
sha256 = "0xa1avbwar7x7kv5yn2ldca4vj3nwaz0dhjm3bcdy59q914xn3dj";
|
||||
inherit sha256;
|
||||
};
|
||||
in stdenvNoCC.mkDerivation {
|
||||
inherit pname version src;
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, fetchurl
|
||||
, unzip
|
||||
, version
|
||||
, sha256
|
||||
, useMklink ? false
|
||||
, customSymlinkCommand ? null
|
||||
}:
|
||||
|
|
@ -18,12 +19,12 @@ let
|
|||
else if useMklink then (targetPath: linkPath: "mklink ${targetPath} ${linkPath}")
|
||||
else (targetPath: linkPath: "ln -s ${targetPath} ${linkPath}");
|
||||
in stdenvNoCC.mkDerivation {
|
||||
inherit pname version;
|
||||
inherit pname version sha256;
|
||||
|
||||
src = fetchurl {
|
||||
name = nameSource;
|
||||
url = "https://github.com/${owner}/${nameRepo}/releases/download/v${version}/${nameSource}";
|
||||
sha256 = "1rq9frab0jl9y1mgmjhzsm734jvz0a646zq2wi5xzzspn4wikhvb";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "colima";
|
||||
version = "0.3.3";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abiosoft";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-nov+DIaeYaRJy7Cz1hcKJUA88IKlZ4z/tn4WASZjxLI=";
|
||||
sha256 = "sha256-g7q2DmtyArtW7Ii2XF5umXQ0+BlCSa1Q7VNNuIuX65k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute2 }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "x11docker";
|
||||
version = "7.1.0";
|
||||
version = "7.1.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mviereck";
|
||||
repo = "x11docker";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-SBX50wQbNUvgmnO0B0iXiEXEmJrkVmtNqUUv0O6yRic=";
|
||||
sha256 = "sha256-SUHWqcDL/oDljCpngkhUvzOvMIlZSc1p0j0wjupPBqw=";
|
||||
};
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
|
|
|||
|
|
@ -5,20 +5,15 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "swaylock";
|
||||
version = "1.5";
|
||||
version = "1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "swaywm";
|
||||
repo = "swaylock";
|
||||
rev = version;
|
||||
sha256 = "0r95p4w11dwm5ra614vddz83r8j7z6gd120z2vcchy7m9b0f15kf";
|
||||
sha256 = "sha256-VVGgidmSQWKxZNx9Cd6z52apxpxVfmX3Ut/G9kzfDcY=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace meson.build \
|
||||
--replace "version: '1.4'" "version: '${version}'"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ];
|
||||
buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, writeTextFile, desktop-file-utils }:
|
||||
{ lib, writeTextFile, buildPackages }:
|
||||
|
||||
# All possible values as defined by the spec, version 1.4.
|
||||
# Please keep in spec order for easier maintenance.
|
||||
|
|
@ -119,5 +119,5 @@ writeTextFile {
|
|||
name = "${cleanName}.desktop";
|
||||
destination = "/share/applications/${cleanName}.desktop";
|
||||
text = builtins.concatStringsSep "\n" content;
|
||||
checkPhase = "${desktop-file-utils}/bin/desktop-file-validate $target";
|
||||
checkPhase = "${buildPackages.desktop-file-utils}/bin/desktop-file-validate $target";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ mkDerivation rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "zealdocs";
|
||||
repo = "zeal";
|
||||
rev = "1ce0e2e446232e7647c5588c1f603f1dd88e0f67";
|
||||
sha256 = "0gj5qcm7ck8m5zfmiabay2f7wbxldmrkw8m3xi7v9i8y8hx0jkxr";
|
||||
rev = "763edca12ccd6c67e51f10891d1ced8b2510904f";
|
||||
sha256 = "sha256-1/wQXkRWvpRia8UDvvvmzHinPG8q2Tz9Uoeegej9uC8=";
|
||||
};
|
||||
|
||||
# we only need this if we are using a version that hasn't been released. We
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "Fluid-3";
|
||||
pname = "Fluid";
|
||||
version = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://ftp.osuosl.org/pub/musescore/soundfont/fluid-soundfont.tar.gz";
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "ydp-grand";
|
||||
pname = "ydp-grand";
|
||||
version = "unstable-2016-08-04";
|
||||
|
||||
src = fetchurl {
|
||||
|
|
|
|||
|
|
@ -1,12 +1,16 @@
|
|||
{ lib, stdenv, fetchgit }:
|
||||
{ lib, stdenv, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gnome-breeze-20160526";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/dirruk1/gnome-breeze";
|
||||
sha256 = "0hkk0gqlnrs1m4rb5r84f5y96qfamrbiwm09z89yc32124x1a1lm";
|
||||
pname = "gnome-breeze";
|
||||
version = "unstable-2016-05-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dirruk1";
|
||||
repo = "gnome-breeze";
|
||||
rev = "49a5cd67a270e13a4c04a4b904f126ef728e9221";
|
||||
sha256 = "sha256-lQYVOhFBDOYT+glUHleuymGTfHEE5bIyqUFnS/EDc0I=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/themes
|
||||
cp -r Breeze* $out/share/themes
|
||||
|
|
@ -14,12 +18,12 @@ stdenv.mkDerivation {
|
|||
|
||||
preferLocalBuild = true;
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A GTK theme built to match KDE's breeze theme";
|
||||
homepage = "https://github.com/dirruk1/gnome-breeze";
|
||||
license = lib.licenses.lgpl2;
|
||||
maintainers = with lib.maintainers; [ bennofs ];
|
||||
platforms = lib.platforms.all;
|
||||
license = licenses.lgpl2;
|
||||
maintainers = with maintainers; [ bennofs ];
|
||||
platforms = platforms.all;
|
||||
hydraPlatforms = [];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "2.3.2";
|
||||
name = "cde-${version}";
|
||||
pname = "cde";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/cdesktopenv/${name}.tar.gz";
|
||||
url = "mirror://sourceforge/cdesktopenv/cde-${version}.tar.gz";
|
||||
sha256 = "029rljhi5r483x8rzdpl8625z0wx8r7k2m0364nbw66h5pig9lbx";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,8 @@ let
|
|||
testingName = lib.optionalString (testName != null) "${testName}-";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${testingName}${switchboard.name}-with-plugs";
|
||||
pname = "${testingName}${switchboard.pname}-with-plugs";
|
||||
inherit (switchboard) version;
|
||||
|
||||
src = null;
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,8 @@ let
|
|||
else indicators ++ (lib.optionals useDefaultIndicators wingpanelIndicators);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${wingpanel.name}-with-indicators";
|
||||
pname = "${wingpanel.pname}-with-indicators";
|
||||
inherit (wingpanel) version;
|
||||
|
||||
src = null;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, src, version }:
|
||||
stdenv.mkDerivation rec {
|
||||
inherit src version;
|
||||
name = "ocaml-${version}+bs";
|
||||
pname = "ocaml-bs";
|
||||
configurePhase = ''
|
||||
./configure -prefix $out
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
automake, autoconf, libtool, clangStdenv } :
|
||||
|
||||
clangStdenv.mkDerivation rec {
|
||||
name = "ios-cross-compile-${version}";
|
||||
pname = "ios-cross-compile";
|
||||
version = "9.2";
|
||||
sdk = "iPhoneOS9.2.sdk";
|
||||
cctools_port = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
let
|
||||
release_version = "14.0.0";
|
||||
candidate = "rc1"; # empty or "rcN"
|
||||
candidate = "rc2"; # empty or "rcN"
|
||||
dash-candidate = lib.optionalString (candidate != "") "-${candidate}";
|
||||
rev = ""; # When using a Git commit
|
||||
rev-version = ""; # When using a Git commit
|
||||
|
|
@ -30,7 +30,7 @@ let
|
|||
owner = "llvm";
|
||||
repo = "llvm-project";
|
||||
rev = if rev != "" then rev else "llvmorg-${version}";
|
||||
sha256 = "sha256-bO13J5bhE4YVGvoaTuzFgf62HYh+Shv6T0u07CFjI9E=";
|
||||
sha256 = "sha256-5wJEaWvwJohtjqlIsBkqQ5rE6rcWw07MaQnN1RxPb5w=";
|
||||
};
|
||||
|
||||
llvm_meta = {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,8 @@ let
|
|||
"-x86-64";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = if enableX11 then "mit-scheme-x11-${version}" else "mit-scheme-${version}";
|
||||
pname = "mit-scheme" + lib.optionalString enableX11 "-x11";
|
||||
inherit version;
|
||||
|
||||
# MIT/GNU Scheme is not bootstrappable, so it's recommended to compile from
|
||||
# the platform-specific tarballs, which contain pre-built binaries. It
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
let
|
||||
jre = stdenv.mkDerivation {
|
||||
name = "${jdk.name}-minimal-jre";
|
||||
pname = "${jdk.pname}-minimal-jre";
|
||||
version = jdk.version;
|
||||
|
||||
buildInputs = [ jdk ];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ let boost_static = boost165.override { enableStatic = true; };
|
|||
in clangStdenv.mkDerivation rec {
|
||||
# In theory this could use GCC + Clang rather than just Clang,
|
||||
# but https://github.com/NixOS/nixpkgs/issues/29877 stops this
|
||||
name = "openshadinglanguage-${version}";
|
||||
pname = "openshadinglanguage";
|
||||
version = "1.10.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ stdenv, lib, rustPlatform, rustc, Security, patchelf }:
|
||||
rustPlatform.buildRustPackage {
|
||||
name = "clippy-${rustc.version}";
|
||||
pname = "clippy";
|
||||
inherit (rustc) version src;
|
||||
|
||||
# the rust source tarball already has all the dependencies vendored, no need to fetch them again
|
||||
|
|
|
|||
|
|
@ -7,7 +7,8 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "dotty-${dotty-bare.version}";
|
||||
pname = "dotty";
|
||||
inherit (dotty-bare) version;
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -182,7 +182,8 @@ let
|
|||
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
name = "swift-${versions.swift}";
|
||||
pname = "swift";
|
||||
version = versions.swift;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
|
|
|
|||
|
|
@ -21,7 +21,8 @@ let
|
|||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "urn-${optionalString (extraLibraries != []) "with-libraries-"}${version}";
|
||||
pname = "urn${optionalString (extraLibraries != []) "-with-libraries"}";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "urn";
|
||||
|
|
|
|||
|
|
@ -694,11 +694,6 @@ self: super: builtins.intersectAttrs super {
|
|||
testToolDepends = [ pkgs.git pkgs.mercurial ] ++ drv.testToolDepends or [];
|
||||
}) super.retrie_1_2_0_0;
|
||||
|
||||
nix-output-monitor = overrideCabal {
|
||||
# Can't ran the golden-tests with nix, because they call nix
|
||||
testTarget = "unit-tests";
|
||||
} super.nix-output-monitor;
|
||||
|
||||
haskell-language-server = overrideCabal (drv: {
|
||||
# starting with 1.6.1.1 haskell-language-server wants to be linked dynamically
|
||||
# by default. Unless we reflect this in the generic builder, GHC is going to
|
||||
|
|
|
|||
|
|
@ -1,18 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper }:
|
||||
let
|
||||
version = "0.10";
|
||||
name = "chibi-scheme-${version}";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/ashinn/chibi-scheme";
|
||||
description = "Small Footprint Scheme for use as a C Extension Language";
|
||||
platforms = lib.platforms.all;
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.DerGuteMoritz ];
|
||||
};
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.10";
|
||||
pname = "chibi-scheme";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ashinn";
|
||||
|
|
@ -36,4 +26,12 @@ stdenv.mkDerivation {
|
|||
--replace "/usr/bin/env chibi-scheme" "$out/bin/chibi-scheme"
|
||||
done
|
||||
'';
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/ashinn/chibi-scheme";
|
||||
description = "Small Footprint Scheme for use as a C Extension Language";
|
||||
platforms = lib.platforms.all;
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = [ lib.maintainers.DerGuteMoritz ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ in
|
|||
assert versionAtLeast (getVersion erlang) minimumOTPVersion;
|
||||
|
||||
stdenv.mkDerivation ({
|
||||
name = "${baseName}-${version}";
|
||||
pname = "${baseName}";
|
||||
|
||||
inherit src version debugInfo;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,9 +2,10 @@
|
|||
}:
|
||||
|
||||
racket.overrideAttrs (oldAttrs: rec {
|
||||
name = "racket-minimal-${oldAttrs.version}";
|
||||
pname = "racket-minimal";
|
||||
version = oldAttrs.version;
|
||||
src = oldAttrs.src.override {
|
||||
inherit name;
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "sha256-FZlUWvjtioe4S8gPetj7vdneVX6jEFguJo4j2wJsKAw=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
{ version, artifactId, groupId, sha512, type ? "jar", suffix ? "" }:
|
||||
|
||||
let
|
||||
name = "${artifactId}-${version}";
|
||||
m2Path = "${builtins.replaceStrings ["."] ["/"] groupId}/${artifactId}/${version}";
|
||||
m2File = "${name}${suffix}.${type}";
|
||||
m2File = "${artifactId}-${version}${suffix}.${type}";
|
||||
src = fetchurl {
|
||||
inherit sha512;
|
||||
url = "mirror://maven/${m2Path}/${m2File}";
|
||||
};
|
||||
in stdenv.mkDerivation {
|
||||
inherit name m2Path m2File src;
|
||||
inherit version m2Path m2File src;
|
||||
pname = artifactId;
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.14.2";
|
||||
name = "cgal-" + version;
|
||||
pname = "cgal";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CGAL";
|
||||
|
|
|
|||
36
pkgs/development/libraries/alglib/default.nix
Normal file
36
pkgs/development/libraries/alglib/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib, stdenv, fetchurl, cmake, clang }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "alglib3";
|
||||
version = "3.18.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.alglib.net/translator/re/alglib-${version}.cpp.gpl.tgz";
|
||||
sha256 = "0ag8dvcxzzp9riqvk4lhcbwhvh0lq54lbdnsbyr107rjfi2p1vlq";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
clang
|
||||
];
|
||||
|
||||
patches = [
|
||||
./patch-alglib-CMakeLists.patch
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Numerical analysis and data processing library";
|
||||
homepage = "https://www.alglib.net/";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.paperdigits ];
|
||||
longDescription = ''
|
||||
ALGLIB is a cross-platform numerical analysis and data processing library. It supports several programming languages (C++, C#, Delphi) and several operating systems (Windows and POSIX, including Linux). ALGLIB features include:
|
||||
|
||||
* Data analysis (classification/regression, statistics)
|
||||
* Optimization and nonlinear solvers
|
||||
* Interpolation and linear/nonlinear least-squares fitting
|
||||
* Linear algebra (direct algorithms, EVD/SVD), direct and iterative linear solvers
|
||||
* Fast Fourier Transform and many other algorithms
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
--- /dev/null
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -0,0 +1,20 @@
|
||||
+cmake_minimum_required(VERSION 2.8)
|
||||
+
|
||||
+project(alglib3 CXX)
|
||||
+
|
||||
+file(GLOB_RECURSE sources src/*.cpp)
|
||||
+file(GLOB_RECURSE headers src/*.h)
|
||||
+
|
||||
+add_library(${PROJECT_NAME} STATIC ${sources} ${headers})
|
||||
+
|
||||
+install(
|
||||
+ TARGETS ${PROJECT_NAME}
|
||||
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
+)
|
||||
+
|
||||
+install(
|
||||
+ FILES ${headers}
|
||||
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/alglib
|
||||
+)
|
||||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "coeurl";
|
||||
version = "0.1.1";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "nheko.im";
|
||||
owner = "nheko-reborn";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-F4kHE9r2pR8hI+CrZQ9ElPjtp0McgwfSxoD5p56KDGs=";
|
||||
sha256 = "sha256-IIIl+/5Omv0lYTNAjeA63ofJlBmNe3+yTOxDsvL+ak0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ninja pkg-config meson ];
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
, gtest
|
||||
, ninja
|
||||
, nlohmann_json
|
||||
, openssl
|
||||
, pkg-config
|
||||
, protobuf
|
||||
# default list of APIs: https://github.com/googleapis/google-cloud-cpp/blob/v1.32.1/CMakeLists.txt#L173
|
||||
|
|
@ -18,29 +19,29 @@
|
|||
, staticOnly ? stdenv.hostPlatform.isStatic
|
||||
}:
|
||||
let
|
||||
googleapisRev = "ed739492993c4a99629b6430affdd6c0fb59d435";
|
||||
googleapisRev = "d4f3468ef85278428005ed555b3a85db91551ee6";
|
||||
googleapis = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "googleapis";
|
||||
rev = googleapisRev;
|
||||
hash = "sha256:1xrnh77vb8hxmf1ywqsifzd39kylhbdyah0b0b9bm7nw0mnahssl";
|
||||
hash = "sha256-sIQVFQhE3Ae6ia45apzdgtwzglMM4hFZ8efNAhMO5ZY=";
|
||||
};
|
||||
excludedTests = builtins.fromTOML (builtins.readFile ./skipped_tests.toml);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "google-cloud-cpp";
|
||||
version = "1.32.1";
|
||||
version = "1.38.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "google-cloud-cpp";
|
||||
rev = "v${version}";
|
||||
sha256 = "0g720sni70nlncv4spm4rlfykdkpjnv81axfz2jd1arpdajm0mg9";
|
||||
sha256 = "sha256-kobOkohWIDTQaaihhoh/25tZUNv+CjKFwj2xQqO52bA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace external/googleapis/CMakeLists.txt \
|
||||
--replace "https://github.com/googleapis/googleapis/archive/${googleapisRev}.tar.gz" "file://${googleapis}"
|
||||
--replace "https://github.com/googleapis/googleapis/archive/\''${GOOGLE_CLOUD_CPP_GOOGLEAPIS_COMMIT_SHA}.tar.gz" "file://${googleapis}"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
|
|||
ninja
|
||||
pkg-config
|
||||
] ++ lib.optionals (!doInstallCheck) [
|
||||
# enable these dependencies when doInstallCheck failse because we're
|
||||
# enable these dependencies when doInstallCheck is false because we're
|
||||
# unconditionally building tests and benchmarks
|
||||
#
|
||||
# when doInstallCheck is true, these deps are added to installCheckInputs
|
||||
|
|
@ -63,6 +64,7 @@ stdenv.mkDerivation rec {
|
|||
curl
|
||||
grpc
|
||||
nlohmann_json
|
||||
openssl
|
||||
protobuf
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
whole = [
|
||||
"bigquery_bigquery_read_integration_test",
|
||||
"bigtable_admin_backup_integration_test",
|
||||
"bigtable_admin_admin_iam_policy_integration_test",
|
||||
"bigtable_admin_iam_policy_integration_test",
|
||||
"bigtable_admin_integration_test",
|
||||
"bigtable_apply_read_latency_benchmark",
|
||||
|
|
@ -15,12 +15,15 @@ whole = [
|
|||
"bigtable_table_sample_rows_integration_test",
|
||||
"iam_iam_credentials_integration_test",
|
||||
"iam_iam_integration_test",
|
||||
"logging_quickstart",
|
||||
"pubsub_endurance",
|
||||
"pubsub_schema_admin_integration_test",
|
||||
"pubsub_subscriber_integration_test",
|
||||
"pubsub_subscription_admin_integration_test",
|
||||
"pubsub_throughput",
|
||||
"pubsub_topic_admin_integration_test",
|
||||
"rest_internal_internal_curl_rest_client_integration_test",
|
||||
"rest_internal_internal_unified_rest_credentials_integration_test",
|
||||
"spanner_admin_backup_extra_integration_test",
|
||||
"spanner_admin_database_admin_integration_test",
|
||||
"spanner_admin_instance_admin_integration_test",
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liblouis";
|
||||
version = "3.20.0";
|
||||
version = "3.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "liblouis";
|
||||
repo = "liblouis";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-DuMVs9cC0VnZg3E9GtZB8LYkp3Ybfzlv8vd4d1Muwyc=";
|
||||
sha256 = "sha256-Hfn0dfXihtUfO3R+qJaetrPwupcIwblvi1DQdHCF1s8=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" "info" "doc" ];
|
||||
|
|
|
|||
|
|
@ -39,6 +39,16 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-xwfggrjKHh5mZdvH6dKqQo6o1ltxuYdjoGYaWl31C/Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# backport a patch to fix hangs in some applications
|
||||
# ref: https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/213
|
||||
# FIXME: drop this in 0.4.9
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/afbc0ce57aac7aee8dc1651de4620f15c73dbace.patch";
|
||||
sha256 = "sha256-8ycFnrzDq7QHgjwJ/772OTMsSsN3m7gjbdvTmlMJ+mU=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@
|
|||
, addOpenGLRunpath
|
||||
, enableGeoLocation ? true
|
||||
, withLibsecret ? true
|
||||
, systemdSupport ? stdenv.isLinux
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
@ -158,9 +159,10 @@ stdenv.mkDerivation rec {
|
|||
bubblewrap
|
||||
libseccomp
|
||||
libmanette
|
||||
systemd
|
||||
wayland
|
||||
xdg-dbus-proxy
|
||||
] ++ lib.optionals systemdSupport [
|
||||
systemd
|
||||
] ++ lib.optionals enableGeoLocation [
|
||||
geoclue2
|
||||
] ++ lib.optionals withLibsecret [
|
||||
|
|
@ -193,7 +195,7 @@ stdenv.mkDerivation rec {
|
|||
"-DUSE_APPLE_ICU=OFF"
|
||||
"-DUSE_OPENGL_OR_ES=OFF"
|
||||
"-DUSE_SYSTEM_MALLOC=ON"
|
||||
] ++ lib.optionals (!stdenv.isLinux) [
|
||||
] ++ lib.optionals (!systemdSupport) [
|
||||
"-DUSE_SYSTEMD=OFF"
|
||||
] ++ lib.optionals (stdenv.isLinux && enableGLES) [
|
||||
"-DENABLE_GLES2=ON"
|
||||
|
|
|
|||
|
|
@ -2033,14 +2033,14 @@ luv = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast
|
|||
}:
|
||||
buildLuarocksPackage {
|
||||
pname = "luv";
|
||||
version = "1.42.0-0";
|
||||
version = "1.43.0-0";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "https://luarocks.org/luv-1.42.0-0.rockspec";
|
||||
sha256 = "0pr2gjjnm60w0csb0dacrjalan7ifsfw4lki4ykxx1f4m5snam09";
|
||||
url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luv-1.43.0-0.rockspec";
|
||||
sha256 = "0z5a7yp20xbb3f9w73skm9fj89gxxqv72nrxjq3kycsc6c2v3m8f";
|
||||
}).outPath;
|
||||
src = fetchurl {
|
||||
url = "https://github.com/luvit/luv/releases/download/1.42.0-0/luv-1.42.0-0.tar.gz";
|
||||
sha256 = "0dkzjkkm0h516ag6sfz5iji761y9slrcfw325f39zkda1sfql8mm";
|
||||
url = "https://github.com/luvit/luv/releases/download/1.43.0-0/luv-1.43.0-0.tar.gz";
|
||||
sha256 = "1qlx1r79sfn8r20yx19bhdr0v58ykpwgwzy5vma9p2ngrlynyyjn";
|
||||
};
|
||||
|
||||
disabled = with lua; (luaOlder "5.1");
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchFromGitHub, buildDunePackage, cppo }:
|
||||
{ lib, fetchFromGitHub, buildDunePackage, ocaml, cppo }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "camomile";
|
||||
|
|
@ -23,6 +23,10 @@ buildDunePackage rec {
|
|||
runHook postConfigure
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
echo "version = \"${version}\"" >> $out/lib/ocaml/${ocaml.version}/site-lib/camomile/META
|
||||
'';
|
||||
|
||||
meta = {
|
||||
inherit (src.meta) homepage;
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "adafruit-platformdetect";
|
||||
version = "3.20.1";
|
||||
version = "3.21.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Adafruit-PlatformDetect";
|
||||
inherit version;
|
||||
sha256 = "sha256-P5OWPsbRsTEMcvw7/uq0rj9p/4beVj/2OdWkllVMKMw=";
|
||||
sha256 = "sha256-H65Ar/+9AwhKFNRK/SZyU8XzrMt3myjBo+YNJYtQ0b4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-rdbms";
|
||||
version = "10.0.0";
|
||||
version = "10.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "bdc479b3bbcac423943d63e746a81dd5fc80b46a4dbb4393e760016e3fa4f74a";
|
||||
sha256 = "sha256-qH1AHIdshHNM3UiIr1UeShRhtLMo2YFq9gy4rFl58DU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,33 +1,21 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, lark
|
||||
, nose
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
let
|
||||
lark-parser = buildPythonPackage rec {
|
||||
pname = "lark-parser";
|
||||
version = "0.10.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "15jr4c1falvgkq664xdgamykk6waklh1psy8v3wlrg0v59hngws2";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "bc-python-hcl2";
|
||||
version = "0.3.30";
|
||||
version = "0.3.33";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-wfcTIPKbMPa7xpXzkFtxnxG2ZRFzTw35EP7f4zwHxcs=";
|
||||
hash = "sha256-tdsw9gf64VGH9tRWgYZZq3FNa5B5JNhN3k6wUHrU5zY=";
|
||||
};
|
||||
|
||||
# Nose is required during build process, so can not use `checkInputs`.
|
||||
|
|
@ -36,7 +24,7 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
lark-parser
|
||||
lark
|
||||
];
|
||||
|
||||
# This fork of python-hcl2 doesn't ship tests
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "blspy";
|
||||
version = "1.0.8";
|
||||
version = "1.0.9";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-yKLirwWWeUTs5BFXZfqfuNJUXtQW40EiNPxuP+FeHso=";
|
||||
hash = "sha256-6keimQqwh37G9xc1Xyxlr+0n9Qgv87Np2D7Gzj6ik5Y=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -80,7 +80,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "clvm_rs"
|
||||
-version = "0.1.14"
|
||||
+version = "0.1.15"
|
||||
dependencies = [
|
||||
"bls12_381",
|
||||
"hex",
|
||||
|
|
@ -5,35 +5,59 @@
|
|||
, pythonOlder
|
||||
, openssl
|
||||
, perl
|
||||
, pkgs
|
||||
}:
|
||||
|
||||
let
|
||||
# clvm-rs does not work with maturin 0.12
|
||||
# https://github.com/Chia-Network/clvm_rs/commit/32fba40178a5440a1306623f47d8b0684ae2339a#diff-50c86b7ed8ac2cf95bd48334961bf0530cdc77b5a56f852c5c61b89d735fd711
|
||||
maturin_0_11 = with pkgs; rustPlatform.buildRustPackage rec {
|
||||
pname = "maturin";
|
||||
version = "0.11.5";
|
||||
src = fetchFromGitHub {
|
||||
owner = "PyO3";
|
||||
repo = "maturin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hwc6WObcJa6EXf+9PRByUtiupMMYuXThA8i/K4rl0MA=";
|
||||
};
|
||||
cargoHash = "sha256-qGCEfKpQwAC57LKonFnUEgLW4Cc7HFJgSyUOzHkKN9c=";
|
||||
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = lib.optionals stdenv.isLinux [ dbus ]
|
||||
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv ];
|
||||
|
||||
# Requires network access, fails in sandbox.
|
||||
doCheck = false;
|
||||
};
|
||||
in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "clvm_rs";
|
||||
version = "0.1.15";
|
||||
version = "0.1.19";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Chia-Network";
|
||||
repo = "clvm_rs";
|
||||
rev = version;
|
||||
sha256 = "sha256-4QFreQlRjKqGhPvuXU/pZpxMfF8LkIf6X7C3K2q77MI=";
|
||||
sha256 = "sha256-mCKY/PqNOUTaRsFDxQBvbTD6wC4qzP0uv5FldYkwl6c=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# upstream forgot to refresh the lock file
|
||||
./bump-cargo-lock.patch
|
||||
];
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src patches;
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
sha256 = "sha256-jPNU+P6JgxTPL1GYUBE4VPU3p6cgL8u/+AIELr7r5Mk=";
|
||||
sha256 = "sha256-TmrR8EeySsGWXohMdo3dCX4oT3l9uLVv5TUeRxCBQeE=";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
buildAndTestSubdir = "wheel";
|
||||
|
||||
nativeBuildInputs = [
|
||||
perl # used by openssl-sys to configure
|
||||
maturin_0_11
|
||||
] ++ (with rustPlatform; [
|
||||
cargoSetupHook
|
||||
maturinBuildHook
|
||||
|
|
|
|||
58
pkgs/development/python-modules/coqui-trainer/default.nix
Normal file
58
pkgs/development/python-modules/coqui-trainer/default.nix
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
, coqpit
|
||||
, fsspec
|
||||
, pytorch-bin
|
||||
|
||||
, pytestCheckHook
|
||||
, soundfile
|
||||
, tensorboardx
|
||||
, torchvision
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "coqui-trainer";
|
||||
version = "0.0.4";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coqui-ai";
|
||||
repo = "Trainer";
|
||||
# https://github.com/coqui-ai/Trainer/issues/4
|
||||
rev = "776eba829231543d3207927fc69b321d121e527c";
|
||||
hash = "sha256-ICveftJjBNsCgegTmd/ewd/Y6XGMg7YOvchx640RFPI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
coqpit
|
||||
fsspec
|
||||
pytorch-bin
|
||||
soundfile
|
||||
tensorboardx
|
||||
];
|
||||
|
||||
# tests are failing; tests require the clearml library
|
||||
# https://github.com/coqui-ai/Trainer/issues/5
|
||||
doCheck = false;
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
torchvision
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"trainer"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A general purpose model trainer, as flexible as it gets";
|
||||
homepage = "https://github.com/coqui-ai/Trainer";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.tts.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-access-context-manager";
|
||||
version = "0.1.9";
|
||||
version = "0.1.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "249a1c1a858bb182b73749784457baacfcab8e7c13da5f3421109d5b8dace5b8";
|
||||
sha256 = "sha256-/qQxNUVAHKZ5Go4GYpJ9ATi/EeseJPMyK5HsQCjtL0o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,15 +7,19 @@
|
|||
, proto-plus
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-appengine-logging";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "91fe9b0833f6e1a46293dcc0e483716372c9ff4a95ebe51276c5f0092cb9defd";
|
||||
hash = "sha256-NhRQ7X17/Y79DvJT4haArrb23zzwV+XoJT9YUfjLvKc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-automl";
|
||||
version = "2.7.1";
|
||||
version = "2.7.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-NHjHzZm20jDdIg91Zr0ytM0V2sHAmZUF0hlD1C9DeSM=";
|
||||
hash = "sha256-CUsLMX0zRONChgzejZnBztth5ORMZyb6rj6mok2pMMU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,19 +8,33 @@
|
|||
, pytest-asyncio
|
||||
, pytz
|
||||
, mock
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery-datatransfer";
|
||||
version = "3.6.0";
|
||||
version = "3.6.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-1syubhGCY8sYgV2mdneAV/8YOdplf5YZNEeZ0RAJC6E=";
|
||||
hash = "sha256-hR5qHucBpq1LS9pIZeovcPMiVbw3dhSeeJxkYH8xuMk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ];
|
||||
checkInputs = [ mock pytestCheckHook pytest-asyncio ];
|
||||
propagatedBuildInputs = [
|
||||
google-api-core
|
||||
libcst
|
||||
proto-plus
|
||||
pytz
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
mock
|
||||
pytestCheckHook
|
||||
pytest-asyncio
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"google.cloud.bigquery_datatransfer"
|
||||
|
|
|
|||
|
|
@ -18,12 +18,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery";
|
||||
version = "2.34.1";
|
||||
version = "2.34.2";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-gzWuWmcSYeuBcFQpVUNwsLVGSF2+h4JulN4bIkUBWaM=";
|
||||
sha256 = "sha256-DriC3zCgD1oe89M5ojpnAjCACyqySUWVkafmharWcU8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigtable";
|
||||
version = "2.6.0";
|
||||
version = "2.7.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-z6qhLNPfZnFJE6CStAByqxHBv3Itfzn1FtxDE+JPci8=";
|
||||
hash = "sha256-TUgC/6IZ9kNE5iDtbhKPHJqo3sv9W+nl7KcxuXfrbyM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-container";
|
||||
version = "2.10.5";
|
||||
version = "2.10.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-doxO6Q8SaRqXNNMQow8kPp2BawpiTtSm2yuzyaOl7RY=";
|
||||
sha256 = "sha256-dBt2Vs9J0+l534YtKS70MuUEUegwVoU66zghmcz7fGk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ];
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datacatalog";
|
||||
version = "3.7.0";
|
||||
version = "3.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-5ehghcpPZTlw8dOJ74pkB4k0g79wHLh+zj3fLCOR4Rc=";
|
||||
hash = "sha256-99hJvY195iUjXOZEOwFQftDkfgtD5V8hSg5ZLWKyWZU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-datastore";
|
||||
version = "2.5.0";
|
||||
version = "2.5.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-4OwOEb+E+doiQ+gm3f4O+O88PXwFWINfTpRvOlzMuCA=";
|
||||
sha256 = "sha256-1fpWovsg60uyAGps9QKXTdqV4WqZOOyeDFxX8YfgAMc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dlp";
|
||||
version = "3.6.1";
|
||||
version = "3.6.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-zDGLdyBvm2haNaWRanHkRJZqHl+yvBuHRxCGqXYO7Ow=";
|
||||
hash = "sha256-MMTeoyC30MW9NdrXLAqelIeeIdsdNi7u5zwVhLeeTyk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,15 +7,19 @@
|
|||
, proto-plus
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-iam-logging";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4ac688593279c48d7863f0a90457202ff9b235e3ee8862498e8a5b8f867cc137";
|
||||
hash = "sha256-ZmoBaY0OM2pQcqasGCJQIeN6Rmbo4xlYK7LtH7SecgY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,12 +12,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-iam";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-iLfXzZ3LCNlkgsMilf8TW5ZXgdSBWRgJtuL8zIpUlns=";
|
||||
sha256 = "sha256-c1XPE5PBDXRgpiKGBfAhHB6yTPyvby3aZ5nF40+qFiQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-iot";
|
||||
version = "2.4.0";
|
||||
version = "2.4.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-5AOurJ/XIggFo3QZOQKiRNpbcHwdrIuMBbHeYDA001M=";
|
||||
sha256 = "sha256-AjGoEAAI8aTACtcZp7zT5n9y6WCMc4GOfgUusUVXAVk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-kms";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-8JOa8HzYGJq1lrPXCWRvspXpopEK+qf5av7kmKbFIrQ=";
|
||||
sha256 = "sha256-n0alfJIsaqhQ4Wr4/d2JRXTCE24JTrRJBsYOnRhpV00=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ];
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user