Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts: nixos/doc/manual/from_md/release-notes/rl-2205.section.xml nixos/doc/manual/release-notes/rl-2205.section.md
This commit is contained in:
Alyssa Ross
commit
43aa75b313
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -375,6 +375,20 @@
|
|||
the FIDO security key middleware interface.
|
||||
</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>,
|
||||
|
|
@ -763,6 +777,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>
|
||||
|
|
@ -1079,6 +1105,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
|
||||
|
|
|
|||
|
|
@ -125,6 +125,10 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- `openssh` has been update to 8.9p1, changing the FIDO security key middleware interface.
|
||||
|
||||
- `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.
|
||||
|
|
@ -293,6 +297,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
|
||||
|
|
@ -396,6 +408,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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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; [
|
||||
|
|
|
|||
|
|
@ -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 = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-monitoring";
|
||||
version = "2.9.0";
|
||||
version = "2.9.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-6Xu07QBrVGQOwxi65KZaYFKF3DJ/1uc+zC+NUKqJeWM=";
|
||||
hash = "sha256-FoB6SGDrVDHG60WeWmGwfVbSwt6xdq9da2QwSikpIlU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-redis";
|
||||
version = "2.7.0";
|
||||
version = "2.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-i3jgEaAJ0zEaJWtpzhOe23CtpUpt1ON4gXnVvSG8fTI=";
|
||||
hash = "sha256-tz2upcRjgE6/4cB0riARwot3Vhw4QSKqqHTlJS3i7is=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-resource-manager";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-InkkAtqK5f1oqUK0Nsxc2PYt5JWBlB3ElGVNs5IJV/Q=";
|
||||
hash = "sha256-NUqFkvIwfaqz3MZEUoLqO7hFCVwV5124+lA8LGzccl0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-securitycenter";
|
||||
version = "1.9.0";
|
||||
version = "1.10.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-qtaZs6mgcYeEEdf6KGQNx7c+RP8SqSNyTCZuhTVAq38=";
|
||||
hash = "sha256-VaU6DRkq1pOESSOSynRRjaljp68C1X2H8anjHeHorbI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-speech";
|
||||
version = "2.13.0";
|
||||
version = "2.13.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-NO2oxVszbm2KYiN2NCn3edIyBx+E++sttJTgZd/yXzQ=";
|
||||
hash = "sha256-JxhIC4OMsXjdJYNDomEhmHPUCzveFS0oeDWsX/wd5zA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-videointelligence";
|
||||
version = "2.6.0";
|
||||
version = "2.6.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-blkNMdh9ehRM9sidgGajIkrHgrJCT96hzG3nVU0DBo4=";
|
||||
sha256 = "sha256-p1HXFxURs0axONrqHahl/SPvWN2mhAhvJePFOwzRR4c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core proto-plus ];
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-vision";
|
||||
version = "2.7.0";
|
||||
version = "2.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-antpKF6egHtya4g9sKuQLQepz1QRLQ6LiCdpfYBsDh8=";
|
||||
hash = "sha256-Ty80C73K3/TebsdSHinmp2y8TKgOftqT5PIDafq1GgM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-websecurityscanner";
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-FBTJlr4mN5qW3BvA1l/glRaqdcJGFFjqPea3KQjwUqQ=";
|
||||
sha256 = "sha256-yK4xEu9rfFkA6RDNDjul0V+Xjc8TehJ6f8lv1k2WULc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ google-api-core libcst proto-plus ];
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "losant-rest";
|
||||
version = "1.15.2";
|
||||
version = "1.16.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
owner = "Losant";
|
||||
repo = "losant-rest-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JmLQ3Hj9WnL/XfMxDiVAizGFASWMwF36ohp8asErUMM=";
|
||||
sha256 = "sha256-1beURMpQ2klwupcd4wJZud6MnAKzwXPvVlobk/eSvXo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
58
pkgs/development/python-modules/pycep-parser/default.nix
Normal file
58
pkgs/development/python-modules/pycep-parser/default.nix
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
{ lib
|
||||
, assertpy
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lark
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, regex
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycep-parser";
|
||||
version = "0.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruebel";
|
||||
repo = "pycep";
|
||||
rev = version;
|
||||
hash = "sha256-S4jBqMgyreWrEp1SuR8J5RVFc+i1O0xbfgux1UvFP5k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
lark
|
||||
regex
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
assertpy
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'version = "0.3.1-alpha.1"' 'version = "${version}"' \
|
||||
--replace 'regex = "^2022.3.2"' 'regex = "*"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pycep"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python based Bicep parser";
|
||||
homepage = "https://github.com/gruebel/pycep";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -32,13 +32,13 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.0.918";
|
||||
version = "2.0.921";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-8nhz32ugnheBH1W3YKKmjRvjjx4WcpSyLwBS0STvsPM=";
|
||||
hash = "sha256-Bl9zwJGyZN5vJVpy63GeaCQ+4X0dYMTAV4FtT96L42U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with py.pkgs; [
|
||||
|
|
@ -71,6 +71,7 @@ buildPythonApplication rec {
|
|||
packaging
|
||||
policyuniverse
|
||||
prettytable
|
||||
pycep-parser
|
||||
pyyaml
|
||||
semantic-version
|
||||
tabulate
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sqlfluff";
|
||||
version = "0.10.1";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-ZgLg+pIdTBxMNXgFFL8jCbQa444pkgtnSx+QjMqQhag=";
|
||||
hash = "sha256-Cem53w/pzSDTi9A9mh9VeLlRn1m6KhkxWaqJjEtfwUs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, rustPlatform, fetchFromGitHub }:
|
||||
{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rebazel";
|
||||
version = "0.1.4";
|
||||
|
|
@ -12,6 +13,8 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "sha256-cBAm8LyNKEVJkhZJ+QZU5XtQutb1oNvad8xH70Bi2LM=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "tool for expediting bazel build workflows";
|
||||
homepage = "https://github.com/meetup/rebazel";
|
||||
|
|
|
|||
35
pkgs/misc/dxvk/darwin-dxvk-compat.patch
Normal file
35
pkgs/misc/dxvk/darwin-dxvk-compat.patch
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
Source: https://github.com/marzent/dxvk/commit/65247afe2de5dd6b555b8fdd46dddcdc6325e1d6
|
||||
---
|
||||
src/d3d11/d3d11_device.cpp | 12 +-
|
||||
1 file changed, 8 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/d3d11/d3d11_device.cpp b/src/d3d11/d3d11_device.cpp
|
||||
index 21f0d1b4a..5b1d05335 100644
|
||||
--- a/src/d3d11/d3d11_device.cpp
|
||||
+++ b/src/d3d11/d3d11_device.cpp
|
||||
@@ -799,8 +799,12 @@ namespace dxvk {
|
||||
InitReturnPtr(ppGeometryShader);
|
||||
D3D11CommonShader module;
|
||||
|
||||
- if (!m_dxvkDevice->features().extTransformFeedback.transformFeedback)
|
||||
- return DXGI_ERROR_INVALID_CALL;
|
||||
+ if (!m_dxvkDevice->features().extTransformFeedback.transformFeedback) {
|
||||
+ Logger::err(
|
||||
+ "D3D11: CreateGeometryShaderWithStreamOutput:"
|
||||
+ "\n Transform feedback not supported by device");
|
||||
+ return S_OK;
|
||||
+ }
|
||||
|
||||
// Zero-init some counterss so that we can increment
|
||||
// them while walking over the stream output entries
|
||||
@@ -1973,8 +1977,8 @@ namespace dxvk {
|
||||
enabled.core.features.logicOp = supported.core.features.logicOp;
|
||||
enabled.core.features.shaderImageGatherExtended = VK_TRUE;
|
||||
enabled.core.features.variableMultisampleRate = supported.core.features.variableMultisampleRate;
|
||||
- enabled.extTransformFeedback.transformFeedback = VK_TRUE;
|
||||
- enabled.extTransformFeedback.geometryStreams = VK_TRUE;
|
||||
+ enabled.extTransformFeedback.transformFeedback = supported.extTransformFeedback.transformFeedback;
|
||||
+ enabled.extTransformFeedback.geometryStreams = supported.extTransformFeedback.geometryStreams;
|
||||
}
|
||||
|
||||
if (featureLevel >= D3D_FEATURE_LEVEL_10_1) {
|
||||
59
pkgs/misc/dxvk/darwin-moltenvk-compat.patch
Normal file
59
pkgs/misc/dxvk/darwin-moltenvk-compat.patch
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
Source: https://github.com/Gcenx/MoltenVK/commit/1f268bd45f6c928784d7cb90dedce382895f10ae
|
||||
|
||||
Fake extensions for DXVK;
|
||||
- _features.geometryShader
|
||||
- _features.tessellationShader
|
||||
- _features.shaderCullDistance
|
||||
|
||||
Enabled defaults;
|
||||
- MVK_ALLOW_METAL_FENCES=1
|
||||
- MVK_CONFIG_RESUME_LOST_DEVICE=1
|
||||
---
|
||||
MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm | 3 +++
|
||||
MoltenVK/MoltenVK/Utility/MVKEnvironment.h | 4 ++--
|
||||
2 files changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
|
||||
index bc6d19df..e1959c6e 100644
|
||||
--- a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
|
||||
+++ b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm
|
||||
@@ -1656,6 +1656,8 @@
|
||||
_features.robustBufferAccess = true; // XXX Required by Vulkan spec
|
||||
_features.fullDrawIndexUint32 = true;
|
||||
_features.independentBlend = true;
|
||||
+ _features.geometryShader = true; // XXX Required by DXVK for D3D10
|
||||
+ _features.tessellationShader = true; // XXX Required by DXVK for D3D11
|
||||
_features.sampleRateShading = true;
|
||||
_features.depthBiasClamp = true;
|
||||
_features.fillModeNonSolid = true;
|
||||
@@ -1669,6 +1671,7 @@
|
||||
_features.shaderUniformBufferArrayDynamicIndexing = true;
|
||||
_features.shaderStorageBufferArrayDynamicIndexing = true;
|
||||
_features.shaderClipDistance = true;
|
||||
+ _features.shaderCullDistance = true; // XXX Required by DXVK for 10level9
|
||||
_features.shaderInt16 = true;
|
||||
_features.multiDrawIndirect = true;
|
||||
_features.inheritedQueries = true;
|
||||
diff --git a/MoltenVK/MoltenVK/Utility/MVKEnvironment.h b/MoltenVK/MoltenVK/Utility/MVKEnvironment.h
|
||||
index 81d0defc..80c414d3 100644
|
||||
--- a/MoltenVK/MoltenVK/Utility/MVKEnvironment.h
|
||||
+++ b/MoltenVK/MoltenVK/Utility/MVKEnvironment.h
|
||||
@@ -240,7 +240,7 @@ void mvkSetConfig(const MVKConfiguration& mvkConfig);
|
||||
# define MVK_ALLOW_METAL_EVENTS 1
|
||||
#endif
|
||||
#ifndef MVK_ALLOW_METAL_FENCES
|
||||
-# define MVK_ALLOW_METAL_FENCES 0
|
||||
+# define MVK_ALLOW_METAL_FENCES 1 // XXX Required by DXVK for Apple/NVidia GPUs (better FPS than CPU Emulation)
|
||||
#endif
|
||||
|
||||
/** Substitute Metal 2D textures for Vulkan 1D images. Enabled by default. */
|
||||
@@ -275,7 +275,7 @@ void mvkSetConfig(const MVKConfiguration& mvkConfig);
|
||||
|
||||
/** Resume MVKDevice VK_ERROR_DEVICE_LOST errors that do not cause MVKPhysicalDevice errors. Disabled by default. */
|
||||
#ifndef MVK_CONFIG_RESUME_LOST_DEVICE
|
||||
-# define MVK_CONFIG_RESUME_LOST_DEVICE 0
|
||||
+# define MVK_CONFIG_RESUME_LOST_DEVICE 1
|
||||
#endif
|
||||
|
||||
/** Support Metal argument buffers. Disabled by default. */
|
||||
|
||||
80
pkgs/misc/dxvk/default.nix
Normal file
80
pkgs/misc/dxvk/default.nix
Normal file
|
|
@ -0,0 +1,80 @@
|
|||
{ lib
|
||||
, pkgs
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, pkgsCross
|
||||
}:
|
||||
|
||||
let
|
||||
# DXVK needs to be a separate derivation because it’s actually a set of DLLs for Windows that
|
||||
# needs to be built with a cross-compiler.
|
||||
dxvk32 = pkgsCross.mingw32.callPackage ./dxvk.nix { inherit (self) src version dxvkPatches; };
|
||||
dxvk64 = pkgsCross.mingwW64.callPackage ./dxvk.nix { inherit (self) src version dxvkPatches; };
|
||||
|
||||
# Use the self pattern to support overriding `src` and `version` via `overrideAttrs`. A recursive
|
||||
# attrset wouldn’t work.
|
||||
self = stdenv.mkDerivation {
|
||||
name = "dxvk";
|
||||
version = "1.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doitsujin";
|
||||
repo = "dxvk";
|
||||
rev = "v${self.version}";
|
||||
hash = "sha256-/zH6vER/6s/d+Tt181UJOa97sqdkJyKGw6E36+1owzQ=";
|
||||
};
|
||||
|
||||
# Patch DXVK to work with MoltenVK even though it doesn’t support some required features.
|
||||
# Some games will work poorly (particularly Unreal Engine 4 games), but others work pretty well.
|
||||
# Override this to patch DXVK itself (rather than the setup script).
|
||||
dxvkPatches = lib.optional stdenv.isDarwin ./darwin-dxvk-compat.patch;
|
||||
|
||||
outputs = [ "out" "bin" "lib" ];
|
||||
|
||||
# Also copy `mcfgthread-12.dll` due to DXVK’s being built in a MinGW cross environment.
|
||||
patches = [ ./mcfgthread.patch ];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin $bin $lib
|
||||
substitute setup_dxvk.sh $out/bin/setup_dxvk.sh \
|
||||
--subst-var-by mcfgthreads32 "${pkgsCross.mingw32.windows.mcfgthreads}" \
|
||||
--subst-var-by mcfgthreads64 "${pkgsCross.mingwW64.windows.mcfgthreads}" \
|
||||
--replace 'basedir=$(dirname "$(readlink -f $0)")' "basedir=$bin"
|
||||
chmod a+x $out/bin/setup_dxvk.sh
|
||||
declare -A dxvks=( [x32]=${dxvk32} [x64]=${dxvk64} )
|
||||
for arch in "''${!dxvks[@]}"; do
|
||||
ln -s "''${dxvks[$arch]}/bin" $bin/$arch
|
||||
ln -s "''${dxvks[$arch]}/lib" $lib/$arch
|
||||
done
|
||||
'';
|
||||
|
||||
# DXVK with MoltenVK requires a patched MoltenVK in addition to its own patches. Provide a
|
||||
# convenience function to handle the necessary patching.
|
||||
# Usage:
|
||||
# let
|
||||
# patchedMoltenVK = dxvk.patchMoltenVK darwin.moltenvk;
|
||||
# in
|
||||
# wine64Packages.full.override { moltenvk = patchedMoltenVK; vkd3dSupport = false; }
|
||||
passthru.patchMoltenVK = moltenvk:
|
||||
moltenvk.overrideAttrs (old: {
|
||||
patches = old.patches or [ ] ++ [
|
||||
# Lie to DXVK about certain features that DXVK expects to be available and set defaults
|
||||
# for better performance/compatability on certain hardware.
|
||||
./darwin-moltenvk-compat.patch
|
||||
];
|
||||
});
|
||||
|
||||
meta = {
|
||||
description = "A Vulkan-based translation layer for Direct3D 9/10/11";
|
||||
homepage = "https://github.com/doitsujin/dxvk";
|
||||
changelog = "https://github.com/doitsujin/dxvk/releases";
|
||||
maintainers = [ lib.maintainers.reckenrode ];
|
||||
license = lib.licenses.zlib;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
};
|
||||
in
|
||||
self
|
||||
52
pkgs/misc/dxvk/dxvk.nix
Normal file
52
pkgs/misc/dxvk/dxvk.nix
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, glslang
|
||||
, meson
|
||||
, ninja
|
||||
, windows
|
||||
, src
|
||||
, version
|
||||
, dxvkPatches
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "dxvk";
|
||||
inherit src version;
|
||||
|
||||
nativeBuildInputs = [ glslang meson ninja ];
|
||||
buildInputs = [ windows.pthreads ];
|
||||
|
||||
patches = dxvkPatches;
|
||||
|
||||
# Replace use of DXVK’s threading classes with the ones from the C++ standard library, which uses
|
||||
# mcfgthreads in nixpkgs.
|
||||
postPatch = ''
|
||||
for class in mutex recursive_mutex condition_variable; do
|
||||
for file in $(grep -rl dxvk::$class *); do
|
||||
if [ "$(basename "$file")" != "thread.h" ]; then
|
||||
substituteInPlace "$file" --replace dxvk::$class std::$class
|
||||
fi
|
||||
done
|
||||
done
|
||||
'';
|
||||
|
||||
mesonFlags =
|
||||
let
|
||||
arch = if stdenv.is32bit then "32" else "64";
|
||||
in
|
||||
[
|
||||
"--buildtype" "release"
|
||||
"--cross-file" "build-win${arch}.txt"
|
||||
"--prefix" "${placeholder "out"}"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "A Vulkan-based translation layer for Direct3D 9/10/11";
|
||||
homepage = "https://github.com/doitsujin/dxvk";
|
||||
changelog = "https://github.com/doitsujin/dxvk/releases";
|
||||
maintainers = [ lib.maintainers.reckenrode ];
|
||||
license = lib.licenses.zlib;
|
||||
platforms = lib.platforms.windows;
|
||||
};
|
||||
}
|
||||
34
pkgs/misc/dxvk/mcfgthread.patch
Normal file
34
pkgs/misc/dxvk/mcfgthread.patch
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
diff --git a/setup_dxvk.sh b/setup_dxvk.sh
|
||||
index 3e63ecf0..87c04f23 100755
|
||||
--- a/setup_dxvk.sh
|
||||
+++ b/setup_dxvk.sh
|
||||
@@ -133,6 +133,8 @@
|
||||
rm -v "${dstfile}"
|
||||
fi
|
||||
$file_cmd "${srcfile}" "${dstfile}"
|
||||
+ elif [ "${4}" = "--force" ]; then
|
||||
+ $file_cmd "${srcfile}" "${dstfile}"
|
||||
else
|
||||
echo "${dstfile}: File not found in wine prefix" >&2
|
||||
return 1
|
||||
@@ -170,12 +172,12 @@
|
||||
}
|
||||
|
||||
install() {
|
||||
- installFile "$win64_sys_path" "$dxvk_lib64" "$1"
|
||||
+ installFile "$win64_sys_path" "$dxvk_lib64" "$1" "${2-}"
|
||||
inst64_ret="$?"
|
||||
|
||||
inst32_ret=-1
|
||||
if $wow64; then
|
||||
- installFile "$win32_sys_path" "$dxvk_lib32" "$1"
|
||||
+ installFile "$win32_sys_path" "$dxvk_lib32" "$1" "${2-}"
|
||||
inst32_ret="$?"
|
||||
fi
|
||||
|
||||
@@ -214,3 +216,5 @@
|
||||
|
||||
$action d3d10core
|
||||
$action d3d11
|
||||
+
|
||||
+basedir="" dxvk_lib32=@mcfgthreads32@/bin dxvk_lib64=@mcfgthreads64@/bin $action mcfgthread-12 --force
|
||||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "matrix-dendrite";
|
||||
version = "0.5.1";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matrix-org";
|
||||
repo = "dendrite";
|
||||
rev = "v${version}";
|
||||
sha256 = "1HCVWSxXOR2syN+dLDSvrNzYHTj/vXZRHkXhU0f3m1k=";
|
||||
sha256 = "jSn2awZsfsniSOTNkaEdQw/sZm7nUfiMntsxigy/51Y=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-RqEt0RAsKWKy6NvMzulqY56nZ7fIxgJkgN/WpEZ3F2I=";
|
||||
vendorSha256 = "sha256-B4d3FGXy8TrED3oikTjETQso/AtEfIWWcdY6FykD/8A=";
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) dendrite;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "exoscale-cli";
|
||||
version = "1.50.0";
|
||||
version = "1.51.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exoscale";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-RpUnJzMnYIvPpJd6+IVpDxCS/FGM+PHXvbQPJQEoS8Y=";
|
||||
sha256 = "sha256-NU4xJTW0KCi8PZAY4cRJijGHCZEn5Z41xNF7+iH01oo=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/exoscale/cli";
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }:
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "birdfont";
|
||||
version = "2.29.6";
|
||||
version = "2.30.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://birdfont.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-INHLH3wv1Rr3RLECAN2CQvctIjWdksxdfVfBkWnx+Is=";
|
||||
sha256 = "sha256-aIhJXmzLY2Sw9mFe2AmLkXb+YRnFu1pMnFeDF+zfHRE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook ];
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "subfinder";
|
||||
version = "2.4.9";
|
||||
version = "2.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BtyPy6ow3flHl4jM9cfF+y3JCtLYx2c+a8f7ol3nQj4=";
|
||||
sha256 = "sha256-RzZlr0mscJgOGWOn4RU9SOr/WkKOrY39cIUKFKxis6Y=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-lgbTfIsfYFSToCaDppMGaxfE1Bmk52eShQ+40g2VNw0=";
|
||||
vendorSha256 = "sha256-P98giu0a5FLBsE87XVTurYNGnNk8JUfz1awY49OBj9M=";
|
||||
|
||||
modRoot = "./v2";
|
||||
|
||||
|
|
|
|||
25
pkgs/tools/security/authz0/default.nix
Normal file
25
pkgs/tools/security/authz0/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "authz0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hahwul";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8WtvUeHP7fJ1/G+UB1QLCSSNx7XA+vREcwJxoMeQsgM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-EQhvHu/LXZtVQ+MzjB96K0MUM4THiRDe1FkAATfGhdw=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automated authorization test tool";
|
||||
homepage = "https://github.com/hahwul/authz0";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cfripper";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Skyscanner";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-nomNjt/BV/Tu/9w4IEu3tXWQw4/wLTc64khdnQeliH0=";
|
||||
hash = "sha256-/qcpLCk1ZZMKxhqK6q6sSbRDjiF5GQmDJzvCaV2kAqQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -25,16 +25,16 @@ rustPlatform.buildRustPackage rec {
|
|||
pname = "sequoia";
|
||||
# Upstream has separate version numbering for the library and the CLI frontend.
|
||||
# This derivation provides the CLI frontend, and thus uses its version number.
|
||||
version = "0.25.0";
|
||||
version = "0.26.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "sequoia-pgp";
|
||||
repo = "sequoia";
|
||||
rev = "sq/v${version}";
|
||||
sha256 = "13f582g10vba0cpbdmqkkfzgd5jgagb640jaz1w425wf5nbh6q50";
|
||||
sha256 = "1rcbv1s7wpxhrzw082q6vfrq1ja2ssfxn53c90h8fh5wrj7ns751";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-qIGP48uj2iQ6MVgy5anKI9QrX9vnuKh46Fmmcczda4w=";
|
||||
cargoSha256 = "0f3b8rh4pl03n8j9ihazaak214sv1rsksbgrb1nfcy8sq2yqfj4g";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
@ -77,15 +77,6 @@ rustPlatform.buildRustPackage rec {
|
|||
# Sometimes, tests fail on CI (ofborg) & hydra without this
|
||||
CARGO_TEST_ARGS = "--workspace --exclude sequoia-store";
|
||||
|
||||
# Without this, the examples won't build
|
||||
postPatch = ''
|
||||
substituteInPlace openpgp-ffi/examples/Makefile \
|
||||
--replace '-O0 -g -Wall -Werror' '-g'
|
||||
substituteInPlace ffi/examples/Makefile \
|
||||
--replace '-O0 -g -Wall -Werror' '-g'
|
||||
'';
|
||||
|
||||
|
||||
preInstall = lib.optionalString pythonSupport ''
|
||||
export installFlags="PYTHONPATH=$PYTHONPATH:$out/${pythonPackages.python.sitePackages}"
|
||||
'' + lib.optionalString (!pythonSupport) ''
|
||||
|
|
|
|||
|
|
@ -213,8 +213,11 @@ with pkgs;
|
|||
|
||||
appthreat-depscan = callPackage ../development/tools/appthreat-depscan { };
|
||||
|
||||
|
||||
authy = callPackage ../applications/misc/authy { };
|
||||
|
||||
authz0 = callPackage ../tools/security/authz0 { };
|
||||
|
||||
avro-tools = callPackage ../development/tools/avro-tools { };
|
||||
|
||||
bacnet-stack = callPackage ../tools/networking/bacnet-stack {};
|
||||
|
|
@ -14475,7 +14478,9 @@ with pkgs;
|
|||
|
||||
bazelisk = callPackage ../development/tools/bazelisk { };
|
||||
|
||||
rebazel = callPackage ../development/tools/rebazel { };
|
||||
rebazel = callPackage ../development/tools/rebazel {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreServices;
|
||||
};
|
||||
|
||||
buildBazelPackage = callPackage ../build-support/build-bazel-package { };
|
||||
|
||||
|
|
@ -33103,6 +33108,8 @@ with pkgs;
|
|||
|
||||
dump = callPackage ../tools/backup/dump { };
|
||||
|
||||
dxvk = callPackage ../misc/dxvk { };
|
||||
|
||||
ecdsatool = callPackage ../tools/security/ecdsatool { };
|
||||
|
||||
emulationstation = callPackage ../applications/emulators/emulationstation { };
|
||||
|
|
|
|||
|
|
@ -6705,6 +6705,8 @@ in {
|
|||
|
||||
pycec = callPackage ../development/python-modules/pycec { };
|
||||
|
||||
pycep-parser = callPackage ../development/python-modules/pycep-parser { };
|
||||
|
||||
pycfdns = callPackage ../development/python-modules/pycfdns { };
|
||||
|
||||
pycflow2dot = callPackage ../development/python-modules/pycflow2dot {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user