Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
4c0a636de3
@ -909,6 +909,13 @@ in mkLicense lset) ({
|
||||
url = "https://github.com/thestk/stk/blob/master/LICENSE";
|
||||
};
|
||||
|
||||
tsl = {
|
||||
shortName = "TSL";
|
||||
fullName = "Timescale License Agreegment";
|
||||
url = "https://github.com/timescale/timescaledb/blob/main/tsl/LICENSE-TIMESCALE";
|
||||
unfree = true;
|
||||
};
|
||||
|
||||
tcltk = {
|
||||
spdxId = "TCL";
|
||||
fullName = "TCL/TK License";
|
||||
|
||||
@ -2757,6 +2757,15 @@
|
||||
githubId = 2245737;
|
||||
name = "Christopher Mark Poole";
|
||||
};
|
||||
christoph-heiss = {
|
||||
email = "christoph@c8h4.io";
|
||||
github = "christoph-heiss";
|
||||
githubId = 7571069;
|
||||
name = "Christoph Heiss";
|
||||
keys = [{
|
||||
fingerprint = "9C56 1D64 30B2 8D6B DCBC 9CEB 73D5 E7FD EE3D E49A";
|
||||
}];
|
||||
};
|
||||
chuahou = {
|
||||
email = "human+github@chuahou.dev";
|
||||
github = "chuahou";
|
||||
@ -4700,6 +4709,12 @@
|
||||
githubId = 32169529;
|
||||
name = "Etienne Jean";
|
||||
};
|
||||
ettom = {
|
||||
email = "ettom22@hotmail.com";
|
||||
github = "ettom";
|
||||
githubId = 36895504;
|
||||
name = "ettom";
|
||||
};
|
||||
etu = {
|
||||
email = "elis@hirwing.se";
|
||||
matrix = "@etu:semi.social";
|
||||
@ -4726,6 +4741,13 @@
|
||||
fingerprint = "8129 5B85 9C5A F703 C2F4 1E29 2D1D 402E 1776 3DD6";
|
||||
}];
|
||||
};
|
||||
evan-goode = {
|
||||
email = "mail@evangoo.de";
|
||||
name = "Evan Goode";
|
||||
github = "evan-goode";
|
||||
githubId = 7495216;
|
||||
matrix = "@goode:matrix.org";
|
||||
};
|
||||
evanjs = {
|
||||
email = "evanjsx@gmail.com";
|
||||
github = "evanjs";
|
||||
|
||||
@ -187,6 +187,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- [services.xserver.videoDrivers](options.html#opt-services.xserver.videoDrivers) now defaults to the `modesetting` driver over device-specific ones. The `radeon`, `amdgpu` and `nouveau` drivers are still available, but effectively unmaintained and not recommended for use.
|
||||
|
||||
- To enable the HTTP3 (QUIC) protocol for a nginx virtual host, set the `quic` attribute on it to true, e.g. `services.nginx.virtualHosts.<name>.quic = true;`.
|
||||
|
||||
- conntrack helper autodetection has been removed from kernels 6.0 and up upstream, and an assertion was added to ensure things don't silently stop working. Migrate your configuration to assign helpers explicitly or use an older LTS kernel branch as a temporary workaround.
|
||||
|
||||
- The `services.pipewire.config` options have been removed, as they have basically never worked correctly. All behavior defined by the default configuration can be overridden with drop-in files as necessary - see [below](#sec-release-23.05-migration-pipewire) for details.
|
||||
@ -284,6 +286,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
```
|
||||
|
||||
- `services.dhcpcd` service now don't solicit or accept IPv6 Router Advertisements on interfaces that use static IPv6 addresses.
|
||||
If network uses both IPv6 Unique local addresses (ULA) and global IPv6 address auto-configuration with SLAAC, must add the parameter `networking.dhcpcd.IPv6rs = true;`.
|
||||
|
||||
- The module `services.headscale` was refactored to be compliant with [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md). To be precise, this means that the following things have changed:
|
||||
|
||||
|
||||
@ -26,6 +26,8 @@ let
|
||||
nvidiaPersistencedEnabled = cfg.nvidiaPersistenced;
|
||||
nvidiaSettings = cfg.nvidiaSettings;
|
||||
busIDType = types.strMatching "([[:print:]]+[\:\@][0-9]{1,3}\:[0-9]{1,2}\:[0-9])?";
|
||||
|
||||
ibtSupport = cfg.open || (nvidia.ibtSupport or false);
|
||||
in
|
||||
|
||||
{
|
||||
@ -462,7 +464,7 @@ in
|
||||
boot.kernelParams = optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1"
|
||||
++ optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1"
|
||||
++ optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1"
|
||||
++ optional (!cfg.open && config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && lib.versionOlder nvidia_x11.version "530") "ibt=off";
|
||||
++ optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && !ibtSupport) "ibt=off";
|
||||
|
||||
services.udev.extraRules =
|
||||
''
|
||||
|
||||
@ -562,6 +562,7 @@
|
||||
./services/mail/schleuder.nix
|
||||
./services/mail/spamassassin.nix
|
||||
./services/mail/sympa.nix
|
||||
./services/mail/zeyple.nix
|
||||
./services/matrix/appservice-discord.nix
|
||||
./services/matrix/appservice-irc.nix
|
||||
./services/matrix/conduit.nix
|
||||
|
||||
125
nixos/modules/services/mail/zeyple.nix
Normal file
125
nixos/modules/services/mail/zeyple.nix
Normal file
@ -0,0 +1,125 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.services.zeyple;
|
||||
ini = pkgs.formats.ini { };
|
||||
|
||||
gpgHome = pkgs.runCommand "zeyple-gpg-home" { } ''
|
||||
mkdir -p $out
|
||||
for file in ${lib.concatStringsSep " " cfg.keys}; do
|
||||
${config.programs.gnupg.package}/bin/gpg --homedir="$out" --import "$file"
|
||||
done
|
||||
|
||||
# Remove socket files
|
||||
rm -f $out/S.*
|
||||
'';
|
||||
in {
|
||||
options.services.zeyple = {
|
||||
enable = mkEnableOption (lib.mdDoc "Zeyple, an utility program to automatically encrypt outgoing emails with GPG");
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "zeyple";
|
||||
description = lib.mdDoc ''
|
||||
User to run Zeyple as.
|
||||
|
||||
::: {.note}
|
||||
If left as the default value this user will automatically be created
|
||||
on system activation, otherwise the sysadmin is responsible for
|
||||
ensuring the user exists.
|
||||
:::
|
||||
'';
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "zeyple";
|
||||
description = lib.mdDoc ''
|
||||
Group to use to run Zeyple.
|
||||
|
||||
::: {.note}
|
||||
If left as the default value this group will automatically be created
|
||||
on system activation, otherwise the sysadmin is responsible for
|
||||
ensuring the user exists.
|
||||
:::
|
||||
'';
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
type = ini.type;
|
||||
default = { };
|
||||
description = lib.mdDoc ''
|
||||
Zeyple configuration. refer to
|
||||
<https://github.com/infertux/zeyple/blob/master/zeyple/zeyple.conf.example>
|
||||
for details on supported values.
|
||||
'';
|
||||
};
|
||||
|
||||
keys = mkOption {
|
||||
type = with types; listOf path;
|
||||
description = lib.mdDoc "List of public key files that will be imported by gpg.";
|
||||
};
|
||||
|
||||
rotateLogs = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc "Whether to enable rotation of log files.";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
users.groups = optionalAttrs (cfg.group == "zeyple") { "${cfg.group}" = { }; };
|
||||
users.users = optionalAttrs (cfg.user == "zeyple") {
|
||||
"${cfg.user}" = {
|
||||
isSystemUser = true;
|
||||
group = cfg.group;
|
||||
};
|
||||
};
|
||||
|
||||
services.zeyple.settings = {
|
||||
zeyple = mapAttrs (name: mkDefault) {
|
||||
log_file = "/var/log/zeyple/zeyple.log";
|
||||
force_encrypt = true;
|
||||
};
|
||||
|
||||
gpg = mapAttrs (name: mkDefault) { home = "${gpgHome}"; };
|
||||
|
||||
relay = mapAttrs (name: mkDefault) {
|
||||
host = "localhost";
|
||||
port = 10026;
|
||||
};
|
||||
};
|
||||
|
||||
environment.etc."zeyple.conf".source = ini.generate "zeyple.conf" cfg.settings;
|
||||
|
||||
systemd.tmpfiles.rules = [ "f '${cfg.settings.zeyple.log_file}' 0600 ${cfg.user} ${cfg.group} - -" ];
|
||||
services.logrotate = mkIf cfg.rotateLogs {
|
||||
enable = true;
|
||||
settings.zeyple = {
|
||||
files = cfg.settings.zeyple.log_file;
|
||||
frequency = "weekly";
|
||||
rotate = 5;
|
||||
compress = true;
|
||||
copytruncate = true;
|
||||
};
|
||||
};
|
||||
|
||||
services.postfix.extraMasterConf = ''
|
||||
zeyple unix - n n - - pipe
|
||||
user=${cfg.user} argv=${pkgs.zeyple}/bin/zeyple ''${recipient}
|
||||
|
||||
localhost:${toString cfg.settings.relay.port} inet n - n - 10 smtpd
|
||||
-o content_filter=
|
||||
-o receive_override_options=no_unknown_recipient_checks,no_header_body_checks,no_milters
|
||||
-o smtpd_helo_restrictions=
|
||||
-o smtpd_client_restrictions=
|
||||
-o smtpd_sender_restrictions=
|
||||
-o smtpd_recipient_restrictions=permit_mynetworks,reject
|
||||
-o mynetworks=127.0.0.0/8,[::1]/128
|
||||
-o smtpd_authorized_xforward_hosts=127.0.0.0/8,[::1]/128
|
||||
'';
|
||||
|
||||
services.postfix.extraConfig = "content_filter = zeyple";
|
||||
};
|
||||
}
|
||||
@ -218,6 +218,7 @@ with lib;
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
restartTriggers = optional (cfg.configFile != null) cfg.configFile;
|
||||
path = lib.optional (lib.hasPrefix "if," cfg.use) pkgs.iproute2;
|
||||
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
|
||||
@ -81,9 +81,12 @@ let
|
||||
noipv6
|
||||
''}
|
||||
|
||||
${cfg.extraConfig}
|
||||
${optionalString (config.networking.enableIPv6 && cfg.IPv6rs == null && staticIPv6Addresses != [ ]) noIPv6rs}
|
||||
${optionalString (config.networking.enableIPv6 && cfg.IPv6rs == false) ''
|
||||
noipv6rs
|
||||
''}
|
||||
|
||||
${optionalString config.networking.enableIPv6 noIPv6rs}
|
||||
${cfg.extraConfig}
|
||||
'';
|
||||
|
||||
exitHook = pkgs.writeText "dhcpcd.exit-hook"
|
||||
@ -160,6 +163,16 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
networking.dhcpcd.IPv6rs = mkOption {
|
||||
type = types.nullOr types.bool;
|
||||
default = null;
|
||||
description = lib.mdDoc ''
|
||||
Force enable or disable solicitation and receipt of IPv6 Router Advertisements.
|
||||
This is required, for example, when using a static unique local IPv6 address (ULA)
|
||||
and global IPv6 address auto-configuration with SLAAC.
|
||||
'';
|
||||
};
|
||||
|
||||
networking.dhcpcd.runHook = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
|
||||
@ -36,7 +36,8 @@ let
|
||||
);
|
||||
'';
|
||||
configFile = pkgs.writeText "config.php" ''
|
||||
${strings.fileContents "${pkgs.cloudlog}/install/config/config.php"}
|
||||
<?php
|
||||
include('${pkgs.cloudlog}/install/config/config.php');
|
||||
$config['datadir'] = "${cfg.dataDir}/";
|
||||
$config['base_url'] = "${cfg.baseUrl}";
|
||||
${cfg.extraConfig}
|
||||
|
||||
@ -184,8 +184,9 @@ let
|
||||
brotli_types ${lib.concatStringsSep " " compressMimeTypes};
|
||||
''}
|
||||
|
||||
${optionalString cfg.recommendedGzipSettings ''
|
||||
${optionalString cfg.recommendedGzipSettings
|
||||
# https://docs.nginx.com/nginx/admin-guide/web-server/compression/
|
||||
''
|
||||
gzip on;
|
||||
gzip_static on;
|
||||
gzip_vary on;
|
||||
@ -311,12 +312,15 @@ let
|
||||
else defaultListen;
|
||||
|
||||
listenString = { addr, port, ssl, extraParameters ? [], ... }:
|
||||
(if ssl && vhost.http3 then "
|
||||
# UDP listener for **QUIC+HTTP/3
|
||||
listen ${addr}:${toString port} http3 "
|
||||
# UDP listener for QUIC transport protocol.
|
||||
(if ssl && vhost.quic then "
|
||||
listen ${addr}:${toString port} quic "
|
||||
+ optionalString vhost.default "default_server "
|
||||
+ optionalString vhost.reuseport "reuseport "
|
||||
+ optionalString (extraParameters != []) (concatStringsSep " " extraParameters)
|
||||
+ optionalString (extraParameters != []) (concatStringsSep " " (
|
||||
let inCompatibleParameters = [ "ssl" "proxy_protocol" "http2" ];
|
||||
isCompatibleParameter = param: !(any (p: p == param) inCompatibleParameters);
|
||||
in filter isCompatibleParameter extraParameters))
|
||||
+ ";" else "")
|
||||
+ "
|
||||
|
||||
@ -363,6 +367,10 @@ let
|
||||
server {
|
||||
${concatMapStringsSep "\n" listenString hostListen}
|
||||
server_name ${vhost.serverName} ${concatStringsSep " " vhost.serverAliases};
|
||||
${optionalString (hasSSL && vhost.quic) ''
|
||||
http3 ${if vhost.http3 then "on" else "off"};
|
||||
http3_hq ${if vhost.http3_hq then "on" else "off"};
|
||||
''}
|
||||
${acmeLocation}
|
||||
${optionalString (vhost.root != null) "root ${vhost.root};"}
|
||||
${optionalString (vhost.globalRedirect != null) ''
|
||||
@ -384,9 +392,10 @@ let
|
||||
ssl_conf_command Options KTLS;
|
||||
''}
|
||||
|
||||
${optionalString (hasSSL && vhost.http3) ''
|
||||
${optionalString (hasSSL && vhost.quic && vhost.http3)
|
||||
# Advertise that HTTP/3 is available
|
||||
add_header Alt-Svc 'h3=":443"; ma=86400' always;
|
||||
''
|
||||
add_header Alt-Svc 'h3=":$server_port"; ma=86400';
|
||||
''}
|
||||
|
||||
${mkBasicAuth vhostName vhost}
|
||||
@ -476,7 +485,8 @@ in
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = lib.mdDoc ''
|
||||
Enable recommended brotli settings. Learn more about compression in Brotli format [here](https://github.com/google/ngx_brotli/blob/master/README.md).
|
||||
Enable recommended brotli settings.
|
||||
Learn more about compression in Brotli format [here](https://github.com/google/ngx_brotli/).
|
||||
|
||||
This adds `pkgs.nginxModules.brotli` to `services.nginx.additionalModules`.
|
||||
'';
|
||||
@ -487,6 +497,18 @@ in
|
||||
type = types.bool;
|
||||
description = lib.mdDoc ''
|
||||
Enable recommended gzip settings.
|
||||
Learn more about compression in Gzip format [here](https://docs.nginx.com/nginx/admin-guide/web-server/compression/).
|
||||
'';
|
||||
};
|
||||
|
||||
recommendedZstdSettings = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = lib.mdDoc ''
|
||||
Enable recommended zstd settings.
|
||||
Learn more about compression in Zstd format [here](https://github.com/tokers/zstd-nginx-module).
|
||||
|
||||
This adds `pkgs.nginxModules.zstd` to `services.nginx.additionalModules`.
|
||||
'';
|
||||
};
|
||||
|
||||
@ -498,16 +520,6 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
recommendedZstdSettings = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
description = lib.mdDoc ''
|
||||
Enable recommended zstd settings. Learn more about compression in Zstd format [here](https://github.com/tokers/zstd-nginx-module).
|
||||
|
||||
This adds `pkgs.nginxModules.zstd` to `services.nginx.additionalModules`.
|
||||
'';
|
||||
};
|
||||
|
||||
proxyTimeout = mkOption {
|
||||
type = types.str;
|
||||
default = "60s";
|
||||
@ -1027,6 +1039,14 @@ in
|
||||
services.nginx.virtualHosts.<name>.useACMEHost are mutually exclusive.
|
||||
'';
|
||||
}
|
||||
|
||||
{
|
||||
assertion = cfg.package.pname != "nginxQuic" -> all (host: !host.quic) (attrValues virtualHosts);
|
||||
message = ''
|
||||
services.nginx.service.virtualHosts.<name>.quic requires using nginxQuic package,
|
||||
which can be achieved by setting `services.nginx.package = pkgs.nginxQuic;`.
|
||||
'';
|
||||
}
|
||||
] ++ map (name: mkCertOwnershipAssertion {
|
||||
inherit (cfg) group user;
|
||||
cert = config.security.acme.certs.${name};
|
||||
|
||||
@ -188,24 +188,54 @@ with lib;
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc ''
|
||||
Whether to enable HTTP 2.
|
||||
Whether to enable the HTTP/2 protocol.
|
||||
Note that (as of writing) due to nginx's implementation, to disable
|
||||
HTTP 2 you have to disable it on all vhosts that use a given
|
||||
HTTP/2 you have to disable it on all vhosts that use a given
|
||||
IP address / port.
|
||||
If there is one server block configured to enable http2,then it is
|
||||
If there is one server block configured to enable http2, then it is
|
||||
enabled for all server blocks on this IP.
|
||||
See https://stackoverflow.com/a/39466948/263061.
|
||||
'';
|
||||
};
|
||||
|
||||
http3 = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
description = lib.mdDoc ''
|
||||
Whether to enable the HTTP/3 protocol.
|
||||
This requires using `pkgs.nginxQuic` package
|
||||
which can be achieved by setting `services.nginx.package = pkgs.nginxQuic;`
|
||||
and activate the QUIC transport protocol
|
||||
`services.nginx.virtualHosts.<name>.quic = true;`.
|
||||
Note that HTTP/3 support is experimental and
|
||||
*not* yet recommended for production.
|
||||
Read more at https://quic.nginx.org/
|
||||
'';
|
||||
};
|
||||
|
||||
http3_hq = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Whether to enable HTTP 3.
|
||||
Whether to enable the HTTP/0.9 protocol negotiation used in QUIC interoperability tests.
|
||||
This requires using `pkgs.nginxQuic` package
|
||||
which can be achieved by setting `services.nginx.package = pkgs.nginxQuic;`
|
||||
and activate the QUIC transport protocol
|
||||
`services.nginx.virtualHosts.<name>.quic = true;`.
|
||||
Note that special application protocol support is experimental and
|
||||
*not* yet recommended for production.
|
||||
Read more at https://quic.nginx.org/
|
||||
'';
|
||||
};
|
||||
|
||||
quic = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = lib.mdDoc ''
|
||||
Whether to enable the QUIC transport protocol.
|
||||
This requires using `pkgs.nginxQuic` package
|
||||
which can be achieved by setting `services.nginx.package = pkgs.nginxQuic;`.
|
||||
Note that HTTP 3 support is experimental and
|
||||
Note that QUIC support is experimental and
|
||||
*not* yet recommended for production.
|
||||
Read more at https://quic.nginx.org/
|
||||
'';
|
||||
|
||||
@ -27,8 +27,7 @@ in
|
||||
type = types.enum [ "x11" "wayland" ];
|
||||
default = "x11";
|
||||
description = lib.mdDoc ''
|
||||
Backend to use in qtile:
|
||||
<option>x11</option> or <option>wayland</option>.
|
||||
Backend to use in qtile: `x11` or `wayland`.
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -36,8 +36,10 @@ in
|
||||
sslCertificateKey = ./common/acme/server/acme.test.key.pem;
|
||||
http2 = true;
|
||||
http3 = true;
|
||||
http3_hq = false;
|
||||
quic = true;
|
||||
reuseport = true;
|
||||
root = lib.mkForce (pkgs.runCommandLocal "testdir2" {} ''
|
||||
root = lib.mkForce (pkgs.runCommandLocal "testdir" {} ''
|
||||
mkdir "$out"
|
||||
cat > "$out/index.html" <<EOF
|
||||
<html><body>Hello World!</body></html>
|
||||
@ -82,6 +84,8 @@ in
|
||||
|
||||
# Check header reading
|
||||
client.succeed("curl --verbose --http3 --head https://acme.test | grep 'content-type'")
|
||||
client.succeed("curl --verbose --http3 --head https://acme.test | grep 'HTTP/3 200'")
|
||||
client.succeed("curl --verbose --http3 --head https://acme.test/error | grep 'HTTP/3 404'")
|
||||
|
||||
# Check change User-Agent
|
||||
client.succeed("curl --verbose --http3 --user-agent 'Curl test 3.0' https://acme.test")
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "eartag";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "knuxify";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-XvbfQtE8LsztQ2VByG2jLYND3qVpH6owdAgh3b//lI4=";
|
||||
sha256 = "sha256-120voKmlEDsVSxNfqmwBvTB90dQUwnf2CtxvOKqi8+U=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchurl, buildPythonApplication, pyqt5, qttools, which }:
|
||||
{ lib, fetchurl, buildPythonApplication, libjack2, pyqt5, qttools, which }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "patchance";
|
||||
@ -16,13 +16,17 @@ buildPythonApplication rec {
|
||||
qttools # lrelease to build translations.
|
||||
which # which to find lrelease.
|
||||
];
|
||||
|
||||
buildInputs = [ libjack2 ];
|
||||
propagatedBuildInputs = [ pyqt5 ];
|
||||
|
||||
dontWrapQtApps = true; # The program is a python script.
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix" "LD_LIBRARY_PATH" ":" (lib.makeLibraryPath [ libjack2 ])
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn "$out/share/patchance/src" "$out $pythonPath"
|
||||
'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, fetchurl, buildPythonApplication, pydbus, pyliblo, pyqt5, qttools, which }:
|
||||
{ lib, fetchurl, buildPythonApplication, libjack2, pydbus, pyliblo, pyqt5, qttools, which }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "raysession";
|
||||
@ -23,13 +23,17 @@ buildPythonApplication rec {
|
||||
qttools # lrelease to build translations.
|
||||
which # which to find lrelease.
|
||||
];
|
||||
|
||||
buildInputs = [ libjack2 ];
|
||||
propagatedBuildInputs = [ pydbus pyliblo pyqt5 ];
|
||||
|
||||
dontWrapQtApps = true; # The program is a python script.
|
||||
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix" "LD_LIBRARY_PATH" ":" (lib.makeLibraryPath [ libjack2 ])
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
wrapPythonProgramsIn "$out/share/raysession/src" "$out $pythonPath"
|
||||
'';
|
||||
|
||||
@ -21,19 +21,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "spot";
|
||||
version = "0.3.3";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xou816";
|
||||
repo = "spot";
|
||||
rev = version;
|
||||
hash = "sha256-0iuLZq9FSxaOchxx6LzGwpY8qnOq2APl/qkBYzEV2uw=";
|
||||
hash = "sha256-K6wGWhAUUGsbE4O+z0TmJcJyGarvHgZteY527jfAa90=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-g46BkrTv6tdrGe/p245O4cBoPjbvyRP7U6hH1Hp4ja0=";
|
||||
hash = "sha256-eM2XLumn4dr2YtyUzBZJADlqdexc1iOaNJUudMlfSUc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
39
pkgs/applications/audio/tone/default.nix
Normal file
39
pkgs/applications/audio/tone/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchNuGet, linkFarmFromDrvs, buildDotnetModule, ffmpeg-full, msbuild, dotnetCorePackages }:
|
||||
|
||||
let
|
||||
nugetSource = linkFarmFromDrvs "nuget-packages" (
|
||||
import ./nuget-deps.nix { inherit fetchNuGet; }
|
||||
);
|
||||
|
||||
in buildDotnetModule rec {
|
||||
pname = "tone";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sandreas";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Z3cumXAIJhUB3/EbzB08MfBCrga1JHtDKr44TmRQuno=";
|
||||
};
|
||||
|
||||
projectFile = "tone/tone.csproj";
|
||||
executables = [ "tone" ];
|
||||
nugetDeps = ./nuget-deps.nix;
|
||||
dotnetBuildFlags = [ "--no-self-contained" ];
|
||||
dotnetInstallFlags = [
|
||||
"-p:PublishSingleFile=false"
|
||||
"-p:PublishTrimmed=false"
|
||||
"-p:PublishReadyToRun=false"
|
||||
];
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_6_0;
|
||||
runtimeDeps = [ ffmpeg-full ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/sandreas/tone";
|
||||
description = "tone is a cross platform utility to dump and modify audio metadata for a wide variety of formats";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.jvanbruegge ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
55
pkgs/applications/audio/tone/nuget-deps.nix
Normal file
55
pkgs/applications/audio/tone/nuget-deps.nix
Normal file
@ -0,0 +1,55 @@
|
||||
# This file was automatically generated by passthru.fetch-deps.
|
||||
# Please dont edit it manually, your changes might get overwritten!
|
||||
|
||||
{ fetchNuGet }: [
|
||||
(fetchNuGet { pname = "CliWrap"; version = "3.6.0"; sha256 = "0x96awy81kn0dr8h5d376cgfzxg5bvmzd610rc017nliv152zkw2"; })
|
||||
(fetchNuGet { pname = "CSharp.OperationResult"; version = "0.1.6"; sha256 = "127hjd30vvcks977yxxh59g89dbsf7h1khcr1vignrgk9fanvzyi"; })
|
||||
(fetchNuGet { pname = "Esprima"; version = "3.0.0-beta-9"; sha256 = "1gwdi537832z5whyqx58474ys2akgmrkabm51sy7725c91814snz"; })
|
||||
(fetchNuGet { pname = "grok.net"; version = "1.1.0"; sha256 = "01vm1b658dwxcxp1l4cpsplg8pwpmbs6v6fbqwg1lvrm7li9bgjz"; })
|
||||
(fetchNuGet { pname = "Jint"; version = "3.0.0-beta-2044"; sha256 = "0sy0qy33gn54sszhq4dkiihxd224n58xhcxg46qi4p3i93qn3snl"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "7.0.0"; sha256 = "0n1grglxql9llmrsbbnlz5chx8mxrb5cpvjngm0hfyrkgzcwz90d"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "7.0.0"; sha256 = "1as8cygz0pagg17w22nsf6mb49lr2mcl1x8i3ad1wi8lyzygy1a3"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "7.0.0"; sha256 = "1qifb1pv7s76lih8wnjk418wdk4qwn87q2n6dx54knfvxai410bl"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "7.0.0"; sha256 = "0nhh7rnh45s39x8sjn88czg7nyfpry85pkm0g619j8b468zj8nb4"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "7.0.0"; sha256 = "1fk7dcz6gfhd1k1d8ksz22rnjvj1waqjzk29ym4i3dz73rsq8j1i"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "7.0.0"; sha256 = "05zjmrpp99l128wijp1fy8asskc11ls871qaqr4mjnz3gbfycxnj"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "3.0.0"; sha256 = "1cm0hycgb33mf1ja9q91wxi3gk13d1p462gdq7gndrya23hw2jm5"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "7.0.0"; sha256 = "0ff20yklyjgyjzdyv7sybczgqhgd557m05dbwxzjznr0x41b180d"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "7.0.0"; sha256 = "1f1h0l47abw0spssd64qkhgd7b54pyzslyb586zp21milimcfmgv"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "7.0.0"; sha256 = "1812vnkn8n0i4yr3k5azcxcfx1bbpcsmms95rdyxjfrzfksr05ai"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "7.0.0"; sha256 = "1liyprh0zha2vgmqh92n8kkjz61zwhr7g16f0gmr297z2rg1j5pj"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; })
|
||||
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.13"; sha256 = "0sjd1npl37mky8gqi4bir2fgp0bm6y3jy641asfxa0k0cidbfzwl"; })
|
||||
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; })
|
||||
(fetchNuGet { pname = "Sandreas.AudioMetadata"; version = "0.1.1"; sha256 = "11ibv23h7qj5qshibmlsqmjca51dqbhib9p1gz66c5kqhk7ci38j"; })
|
||||
(fetchNuGet { pname = "Sandreas.Files"; version = "1.1.2"; sha256 = "08qk229q2y1dpdxdnp8xi9mgk8fgpjxrxm4z6ak8n09npp67nhn0"; })
|
||||
(fetchNuGet { pname = "Sandreas.SpectreConsoleHelpers"; version = "0.0.2"; sha256 = "1vy2fka11n0smgrbwdxabl6cdcsg6fv1gymxrws8m0sf9qm64nd1"; })
|
||||
(fetchNuGet { pname = "Serilog"; version = "2.12.0"; sha256 = "0lqxpc96qcjkv9pr1rln7mi4y7n7jdi4vb36c2fv3845w1vswgr4"; })
|
||||
(fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "3.1.0"; sha256 = "0lv370ks2fjdn1nsgkbzbmw6hybnincw3jabr471a5w39pp4fl1c"; })
|
||||
(fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "3.4.0"; sha256 = "1l6fyy9y5a168i1mm107aqyrwzhqmpy0cp1v13l2b89yv8dc105j"; })
|
||||
(fetchNuGet { pname = "Serilog.Sinks.Console"; version = "4.1.0"; sha256 = "1rpkphmqfh3bv3m7v1zwz88wz4sirj4xqyff9ga0c6bqhblj6wii"; })
|
||||
(fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; sha256 = "097rngmgcrdfy7jy8j7dq3xaq2qky8ijwg0ws6bfv5lx0f3vvb0q"; })
|
||||
(fetchNuGet { pname = "Spectre.Console"; version = "0.46.0"; sha256 = "1fr7090f2s7q9cw1k25m439blgicsbgl9k5nhqql9xvp0b00s4n9"; })
|
||||
(fetchNuGet { pname = "Spectre.Console.Cli"; version = "0.46.0"; sha256 = "00clv0mw97z8a9r7zam97prdv4ich33m4dhi7v8mjdqwwhj6q4jr"; })
|
||||
(fetchNuGet { pname = "System.IO.Abstractions"; version = "19.0.1"; sha256 = "16dasj8bwsdyl5phgqgfgswkbghzdb3sq7sidigr3b5ykna6n96g"; })
|
||||
(fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; })
|
||||
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; })
|
||||
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; })
|
||||
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; })
|
||||
(fetchNuGet { pname = "System.Text.Json"; version = "4.6.0"; sha256 = "0ism236hwi0k6axssfq58s1d8lihplwiz058pdvl8al71hagri39"; })
|
||||
(fetchNuGet { pname = "System.Text.Json"; version = "7.0.0"; sha256 = "0scb0lp7wbgcinaa4kqiqs7b8i5nx4ppfad81138jiwd1sl37pyp"; })
|
||||
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; })
|
||||
(fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "19.0.1"; sha256 = "01v2wgb6y2z7df4b2dsy0jb4hnhpv5kgyxypzyqdk7h6plad2axd"; })
|
||||
(fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "19.0.1"; sha256 = "1ms8wqar5w3z2y2qgxii9pqnsb4f1aikji2vaw01zxvnh2wry42n"; })
|
||||
(fetchNuGet { pname = "Ude.NetStandard"; version = "1.2.0"; sha256 = "074yff6g272zpkhk0zvmbfiaaxyp3b05fl24i7ffp2jf9r8bnfpl"; })
|
||||
(fetchNuGet { pname = "z440.atl.core"; version = "4.18.0"; sha256 = "0wwqhpl3xw9vf6c5idz1kwpd72kbg7b9fcmj6gmccxa99kcgljzk"; })
|
||||
]
|
||||
@ -0,0 +1,182 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Lamprecht <thomas@lamprecht.org>
|
||||
Date: Wed, 18 May 2022 08:41:14 +0200
|
||||
Subject: [PATCH] re-route dependencies not available on crates.io to git repos
|
||||
|
||||
Signed-off-by: Thomas Lamprecht <thomas@lamprecht.org>
|
||||
---
|
||||
Cargo.toml | 130 +++++++++--------------------------------------------
|
||||
1 file changed, 21 insertions(+), 109 deletions(-)
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 0c86cd1b..7d5c282b 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -41,9 +41,6 @@ members = [
|
||||
|
||||
"proxmox-backup-banner",
|
||||
"proxmox-backup-client",
|
||||
- "proxmox-file-restore",
|
||||
- "proxmox-restore-daemon",
|
||||
- "proxmox-rrd",
|
||||
|
||||
"pxar-bin",
|
||||
]
|
||||
@@ -101,7 +98,6 @@ proxmox-rrd = { path = "proxmox-rrd" }
|
||||
|
||||
# regular crates
|
||||
anyhow = "1.0"
|
||||
-apt-pkg-native = "0.3.2"
|
||||
base64 = "0.13"
|
||||
bitflags = "1.2.1"
|
||||
bytes = "1.0"
|
||||
@@ -114,7 +110,6 @@ flate2 = "1.0"
|
||||
foreign-types = "0.3"
|
||||
futures = "0.3"
|
||||
h2 = { version = "0.3", features = [ "stream" ] }
|
||||
-handlebars = "3.0"
|
||||
hex = "0.4.3"
|
||||
http = "0.2"
|
||||
hyper = { version = "0.14", features = [ "full" ] }
|
||||
@@ -152,120 +147,37 @@ walkdir = "2"
|
||||
xdg = "2.2"
|
||||
zstd = { version = "0.6", features = [ "bindgen" ] }
|
||||
|
||||
-[dependencies]
|
||||
-anyhow.workspace = true
|
||||
-apt-pkg-native.workspace = true
|
||||
-base64.workspace = true
|
||||
-bitflags.workspace = true
|
||||
-bytes.workspace = true
|
||||
-cidr.workspace = true
|
||||
-crc32fast.workspace = true
|
||||
-crossbeam-channel.workspace = true
|
||||
-endian_trait.workspace = true
|
||||
-flate2.workspace = true
|
||||
-futures.workspace = true
|
||||
-h2.workspace = true
|
||||
-handlebars.workspace = true
|
||||
-hex.workspace = true
|
||||
-http.workspace = true
|
||||
-hyper.workspace = true
|
||||
-lazy_static.workspace = true
|
||||
-libc.workspace = true
|
||||
-log.workspace = true
|
||||
-nix.workspace = true
|
||||
-nom.workspace = true
|
||||
-num-traits.workspace = true
|
||||
-once_cell.workspace = true
|
||||
-openssl.workspace = true
|
||||
-pam-sys.workspace = true
|
||||
-pam.workspace = true
|
||||
-percent-encoding.workspace = true
|
||||
-regex.workspace = true
|
||||
-rustyline.workspace = true
|
||||
-serde.workspace = true
|
||||
-serde_json.workspace = true
|
||||
-siphasher.workspace = true
|
||||
-syslog.workspace = true
|
||||
-termcolor.workspace = true
|
||||
-thiserror.workspace = true
|
||||
-tokio = { workspace = true, features = [ "fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "time" ] }
|
||||
-tokio-openssl.workspace = true
|
||||
-tokio-stream.workspace = true
|
||||
-tokio-util = { workspace = true, features = [ "codec" ] }
|
||||
-tower-service.workspace = true
|
||||
-udev.workspace = true
|
||||
-url.workspace = true
|
||||
-walkdir.workspace = true
|
||||
-xdg.workspace = true
|
||||
-zstd.workspace = true
|
||||
-
|
||||
#valgrind_request = { git = "https://github.com/edef1c/libvalgrind_request", version = "1.1.0", optional = true }
|
||||
|
||||
-proxmox-async.workspace = true
|
||||
-proxmox-auth-api = { workspace = true, features = [ "api", "pam-authenticator" ] }
|
||||
-proxmox-compression.workspace = true
|
||||
-proxmox-http = { workspace = true, features = [ "client-trait", "proxmox-async", "rate-limited-stream" ] } # pbs-client doesn't use these
|
||||
-proxmox-io.workspace = true
|
||||
-proxmox-lang.workspace = true
|
||||
-proxmox-ldap.workspace = true
|
||||
-proxmox-metrics.workspace = true
|
||||
-proxmox-rest-server = { workspace = true, features = [ "rate-limited-stream" ] }
|
||||
-proxmox-router = { workspace = true, features = [ "cli", "server"] }
|
||||
-proxmox-schema = { workspace = true, features = [ "api-macro" ] }
|
||||
-proxmox-section-config.workspace = true
|
||||
-proxmox-serde = { workspace = true, features = [ "serde_json" ] }
|
||||
-proxmox-shared-memory.workspace = true
|
||||
-proxmox-sortable-macro.workspace = true
|
||||
-proxmox-subscription.workspace = true
|
||||
-proxmox-sys = { workspace = true, features = [ "timer" ] }
|
||||
-proxmox-tfa.workspace = true
|
||||
-proxmox-time.workspace = true
|
||||
-proxmox-uuid.workspace = true
|
||||
-
|
||||
-pathpatterns.workspace = true
|
||||
-proxmox-acme-rs.workspace = true
|
||||
-proxmox-apt.workspace = true
|
||||
-proxmox-openid.workspace = true
|
||||
-pxar.workspace = true
|
||||
-
|
||||
-pbs-api-types.workspace = true
|
||||
-pbs-buildcfg.workspace = true
|
||||
-pbs-client.workspace = true
|
||||
-pbs-config.workspace = true
|
||||
-pbs-datastore.workspace = true
|
||||
-pbs-key-config.workspace = true
|
||||
-pbs-tape.workspace = true
|
||||
-pbs-tools.workspace = true
|
||||
-proxmox-rrd.workspace = true
|
||||
-
|
||||
# Local path overrides
|
||||
# NOTE: You must run `cargo update` after changing this for it to take effect!
|
||||
[patch.crates-io]
|
||||
#proxmox-acme-rs = { path = "../proxmox-acme-rs" }
|
||||
-#proxmox-async = { path = "../proxmox/proxmox-async" }
|
||||
-#proxmox-auth-api = { path = "../proxmox/proxmox-auth-api" }
|
||||
-#proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
|
||||
-#proxmox-compression = { path = "../proxmox/proxmox-compression" }
|
||||
-#proxmox-fuse = { path = "../proxmox-fuse" }
|
||||
-#proxmox-http = { path = "../proxmox/proxmox-http" }
|
||||
-#proxmox-io = { path = "../proxmox/proxmox-io" }
|
||||
-#proxmox-lang = { path = "../proxmox/proxmox-lang" }
|
||||
-#proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
|
||||
-#proxmox-router = { path = "../proxmox/proxmox-router" }
|
||||
-#proxmox-schema = { path = "../proxmox/proxmox-schema" }
|
||||
-#proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
|
||||
-#proxmox-serde = { path = "../proxmox/proxmox-serde" }
|
||||
-#proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
|
||||
-#proxmox-subscription = { path = "../proxmox/proxmox-subscription" }
|
||||
-#proxmox-sys = { path = "../proxmox/proxmox-sys" }
|
||||
-#proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
|
||||
-#proxmox-time = { path = "../proxmox/proxmox-time" }
|
||||
-#proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
|
||||
+proxmox-async = { path = "../proxmox/proxmox-async" }
|
||||
+proxmox-auth-api = { path = "../proxmox/proxmox-auth-api" }
|
||||
+proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
|
||||
+proxmox-compression = { path = "../proxmox/proxmox-compression" }
|
||||
+proxmox-fuse = { path = "../proxmox-fuse" }
|
||||
+proxmox-http = { path = "../proxmox/proxmox-http" }
|
||||
+proxmox-io = { path = "../proxmox/proxmox-io" }
|
||||
+proxmox-lang = { path = "../proxmox/proxmox-lang" }
|
||||
+proxmox-rest-server = { path = "../proxmox/proxmox-rest-server" }
|
||||
+proxmox-router = { path = "../proxmox/proxmox-router" }
|
||||
+proxmox-schema = { path = "../proxmox/proxmox-schema" }
|
||||
+proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
|
||||
+proxmox-serde = { path = "../proxmox/proxmox-serde" }
|
||||
+proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
|
||||
+proxmox-sortable-macro = { path = "../proxmox/proxmox-sortable-macro" }
|
||||
+proxmox-subscription = { path = "../proxmox/proxmox-subscription" }
|
||||
+proxmox-sys = { path = "../proxmox/proxmox-sys" }
|
||||
+proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
|
||||
+proxmox-time = { path = "../proxmox/proxmox-time" }
|
||||
+proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
|
||||
|
||||
#proxmox-apt = { path = "../proxmox-apt" }
|
||||
#proxmox-openid = { path = "../proxmox-openid-rs" }
|
||||
|
||||
-#pxar = { path = "../pxar" }
|
||||
+pxar = { path = "../pxar" }
|
||||
|
||||
[features]
|
||||
default = []
|
||||
@ -0,0 +1,72 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Lamprecht <thomas@lamprecht.org>
|
||||
Date: Tue, 29 Nov 2022 17:20:28 +0100
|
||||
Subject: [PATCH] docs: drop all but client man pages
|
||||
|
||||
Signed-off-by: Thomas Lamprecht <thomas@lamprecht.org>
|
||||
---
|
||||
docs/Makefile | 16 ----------------
|
||||
docs/conf.py | 19 -------------------
|
||||
2 files changed, 35 deletions(-)
|
||||
|
||||
diff --git a/docs/Makefile b/docs/Makefile
|
||||
index b06badff..94130228 100644
|
||||
--- a/docs/Makefile
|
||||
+++ b/docs/Makefile
|
||||
@@ -1,25 +1,9 @@
|
||||
include ../defines.mk
|
||||
|
||||
GENERATED_SYNOPSIS := \
|
||||
- proxmox-tape/synopsis.rst \
|
||||
proxmox-backup-client/synopsis.rst \
|
||||
proxmox-backup-client/catalog-shell-synopsis.rst \
|
||||
- proxmox-backup-manager/synopsis.rst \
|
||||
- proxmox-backup-debug/synopsis.rst \
|
||||
- proxmox-file-restore/synopsis.rst \
|
||||
pxar/synopsis.rst \
|
||||
- pmtx/synopsis.rst \
|
||||
- pmt/synopsis.rst \
|
||||
- config/media-pool/config.rst \
|
||||
- config/tape/config.rst \
|
||||
- config/tape-job/config.rst \
|
||||
- config/user/config.rst \
|
||||
- config/remote/config.rst \
|
||||
- config/sync/config.rst \
|
||||
- config/verification/config.rst \
|
||||
- config/acl/roles.rst \
|
||||
- config/datastore/config.rst \
|
||||
- config/domains/config.rst
|
||||
|
||||
MAN1_PAGES := \
|
||||
pxar.1 \
|
||||
diff --git a/docs/conf.py b/docs/conf.py
|
||||
index 8944926e..deeb63bf 100644
|
||||
--- a/docs/conf.py
|
||||
+++ b/docs/conf.py
|
||||
@@ -93,26 +93,7 @@ rst_epilog += f"\n.. |pbs-copyright| replace:: Copyright (C) {copyright}"
|
||||
man_pages = [
|
||||
# CLI
|
||||
('proxmox-backup-client/man1', 'proxmox-backup-client', 'Command line tool for Backup and Restore', [author], 1),
|
||||
- ('proxmox-backup-manager/man1', 'proxmox-backup-manager', 'Command line tool to manage and configure the backup server.', [author], 1),
|
||||
- ('proxmox-backup-debug/man1', 'proxmox-backup-debug', 'Debugging command line tool for Backup and Restore', [author], 1),
|
||||
- ('proxmox-backup-proxy/man1', 'proxmox-backup-proxy', 'Proxmox Backup Public API Server', [author], 1),
|
||||
- ('proxmox-backup/man1', 'proxmox-backup', 'Proxmox Backup Local API Server', [author], 1),
|
||||
- ('proxmox-file-restore/man1', 'proxmox-file-restore', 'CLI tool for restoring files and directories from Proxmox Backup Server archives', [author], 1),
|
||||
- ('proxmox-tape/man1', 'proxmox-tape', 'Proxmox Tape Backup CLI Tool', [author], 1),
|
||||
('pxar/man1', 'pxar', 'Proxmox File Archive CLI Tool', [author], 1),
|
||||
- ('pmt/man1', 'pmt', 'Control Linux Tape Devices', [author], 1),
|
||||
- ('pmtx/man1', 'pmtx', 'Control SCSI media changer devices (tape autoloaders)', [author], 1),
|
||||
- # configs
|
||||
- ('config/acl/man5', 'acl.cfg', 'Access Control Configuration', [author], 5),
|
||||
- ('config/datastore/man5', 'datastore.cfg', 'Datastore Configuration', [author], 5),
|
||||
- ('config/domains/man5', 'domains.cfg', 'Realm Configuration', [author], 5),
|
||||
- ('config/media-pool/man5', 'media-pool.cfg', 'Media Pool Configuration', [author], 5),
|
||||
- ('config/remote/man5', 'remote.cfg', 'Remote Server Configuration', [author], 5),
|
||||
- ('config/sync/man5', 'sync.cfg', 'Synchronization Job Configuration', [author], 5),
|
||||
- ('config/tape-job/man5', 'tape-job.cfg', 'Tape Job Configuration', [author], 5),
|
||||
- ('config/tape/man5', 'tape.cfg', 'Tape Drive and Changer Configuration', [author], 5),
|
||||
- ('config/user/man5', 'user.cfg', 'User Configuration', [author], 5),
|
||||
- ('config/verification/man5', 'verification.cfg', 'Verification Job Configuration', [author], 5),
|
||||
]
|
||||
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
From f8c26751c51c1618278689d8b3ce94496c579064 Mon Sep 17 00:00:00 2001
|
||||
From: Christoph Heiss <christoph@c8h4.io>
|
||||
Date: Fri, 10 Feb 2023 23:54:41 +0100
|
||||
Subject: [PATCH] docs: Add target path fixup variable
|
||||
|
||||
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
|
||||
---
|
||||
docs/Makefile | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/docs/Makefile b/docs/Makefile
|
||||
index 94130228..f4766a64 100644
|
||||
--- a/docs/Makefile
|
||||
+++ b/docs/Makefile
|
||||
@@ -67,12 +67,13 @@ API_VIEWER_FILES := \
|
||||
SPHINXOPTS =
|
||||
SPHINXBUILD = sphinx-build
|
||||
BUILDDIR = output
|
||||
+RUSTC_TARGET ?=
|
||||
|
||||
ifeq ($(BUILD_MODE), release)
|
||||
-COMPILEDIR := ../target/release
|
||||
+COMPILEDIR := ../target/$(RUSTC_TARGET)/release
|
||||
SPHINXOPTS += -t release
|
||||
else
|
||||
-COMPILEDIR := ../target/debug
|
||||
+COMPILEDIR := ../target/$(RUSTC_TARGET)/debug
|
||||
SPHINXOPTS += -t devbuild
|
||||
endif
|
||||
|
||||
--
|
||||
2.40.0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,40 +1,45 @@
|
||||
{ lib, fetchgit, rustPlatform, pkg-config, openssl, fuse3, libuuid, acl, libxcrypt }:
|
||||
{
|
||||
lib, fetchgit, rustPlatform, pkg-config, openssl, fuse3, libuuid, acl,
|
||||
libxcrypt, git, installShellFiles, sphinx, stdenv,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "proxmox-backup-client";
|
||||
version = "2.2.1";
|
||||
version = "2.4.1";
|
||||
|
||||
srcs = [
|
||||
(fetchgit {
|
||||
url = "git://git.proxmox.com/git/proxmox-backup.git";
|
||||
rev = "v${version}";
|
||||
name = pname;
|
||||
hash = "sha256-uOKQe/BzO69f/ggEPoZQ2Rn3quytQrUeH7be19QV3KI=";
|
||||
name = "proxmox-backup";
|
||||
hash = "sha256-DWzNRi675ZP9HGc/uPvnV/FBTJUNZ4K5RtU9NFRQCcA=";
|
||||
})
|
||||
(fetchgit {
|
||||
url = "git://git.proxmox.com/git/proxmox.git";
|
||||
rev = "43b4440ef015d846161657490b18cf6ac7600fc4";
|
||||
rev = "5df815f660e4f3793e974eb8130224538350bb12";
|
||||
name = "proxmox";
|
||||
hash = "sha256-05Z+IRRIioFGn+iAYG04DyNsgw9gQrJ6qAArpCwoIb0=";
|
||||
hash = "sha256-Vn1poqkIWcR2rNiAr+ENLNthgk3pMCivzXnUX9hvZBw=";
|
||||
})
|
||||
(fetchgit {
|
||||
url = "git://git.proxmox.com/git/proxmox-fuse.git";
|
||||
rev = "d162ef9039878b871e2aa11b7d9a373ae512e2d1";
|
||||
rev = "93099f76b6bbbc8a0bbaca9b459a1ce4dc5e0a79";
|
||||
name = "proxmox-fuse";
|
||||
hash = "sha256-w33ViWpBkCkMAhZVXiOdqnGOn/tddNRgzn71WioTnBU=";
|
||||
hash = "sha256-3l0lAZVFQC0MYaqZvB+S+ihb1fTkEgs5i9q463+cbvQ=";
|
||||
})
|
||||
(fetchgit {
|
||||
url = "git://git.proxmox.com/git/pxar.git";
|
||||
rev = "6f3f889e98c5f4e60c3b2c6bce73bd506b548c21";
|
||||
rev = "6ad046f9f92b40413f59cc5f4c23d2bafdf141f2";
|
||||
name = "pxar";
|
||||
hash = "sha256-GtNq6+O1xnxuR7b4TTWLFxcsejRyadSlk85H8C+yUGA=";
|
||||
hash = "sha256-I9kk27oN9BDQpnLDWltjZMrh2yJitCpcD/XAhkmtJUg=";
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = pname;
|
||||
sourceRoot = "proxmox-backup";
|
||||
|
||||
cargoPatches = [
|
||||
./re-route-dependencies.patch
|
||||
./0001-re-route-dependencies-not-available-on-crates.io-to-.patch
|
||||
./0002-docs-drop-all-but-client-man-pages.patch
|
||||
./0003-docs-Add-target-path-fixup-variable.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
@ -42,6 +47,26 @@ rustPlatform.buildRustPackage rec {
|
||||
rm .cargo/config
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
make -C docs \
|
||||
DEB_VERSION=${version} DEB_VERSION_UPSTREAM=${version} \
|
||||
RUSTC_TARGET=${stdenv.targetPlatform.config} \
|
||||
BUILD_MODE=release \
|
||||
proxmox-backup-client.1 pxar.1
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
installManPage docs/output/man/proxmox-backup-client.1
|
||||
installShellCompletion --cmd proxmox-backup-client \
|
||||
--bash debian/proxmox-backup-client.bc \
|
||||
--zsh zsh-completions/_proxmox-backup-client
|
||||
|
||||
installManPage docs/output/man/pxar.1
|
||||
installShellCompletion --cmd pxar \
|
||||
--bash debian/pxar.bc \
|
||||
--zsh zsh-completions/_pxar
|
||||
'';
|
||||
|
||||
cargoLock = {
|
||||
lockFileContents = builtins.readFile ./Cargo.lock;
|
||||
};
|
||||
@ -50,21 +75,21 @@ rustPlatform.buildRustPackage rec {
|
||||
"--package=proxmox-backup-client"
|
||||
"--bin=proxmox-backup-client"
|
||||
"--bin=dump-catalog-shell-cli"
|
||||
|
||||
"--package=pxar-bin"
|
||||
"--bin=pxar"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
|
||||
nativeBuildInputs = [ git pkg-config rustPlatform.bindgenHook installShellFiles sphinx ];
|
||||
buildInputs = [ openssl fuse3 libuuid acl libxcrypt ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The command line client for Proxmox Backup Server";
|
||||
homepage = "https://pbs.proxmox.com/docs/backup-client.html";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ cofob ];
|
||||
maintainers = with maintainers; [ cofob christoph-heiss ];
|
||||
platforms = platforms.linux;
|
||||
mainProgram = pname;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,148 +0,0 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Lamprecht <thomas@lamprecht.org>
|
||||
Date: Wed, 18 May 2022 08:41:14 +0200
|
||||
Subject: [PATCH] re-route dependencies not available on crates.io to git repos
|
||||
|
||||
Signed-off-by: Thomas Lamprecht <thomas@lamprecht.org>
|
||||
---
|
||||
Cargo.toml | 112 +++++++-------------------------------------------
|
||||
1 file changed, 15 insertions(+), 97 deletions(-)
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 41980292..e7daaad5 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -25,94 +25,12 @@ members = [
|
||||
"pbs-config",
|
||||
"pbs-datastore",
|
||||
"pbs-fuse-loop",
|
||||
- "proxmox-rest-server",
|
||||
- "proxmox-rrd",
|
||||
- "pbs-tape",
|
||||
"pbs-tools",
|
||||
|
||||
- "proxmox-backup-banner",
|
||||
"proxmox-backup-client",
|
||||
- "proxmox-file-restore",
|
||||
- "proxmox-restore-daemon",
|
||||
"pxar-bin",
|
||||
]
|
||||
|
||||
-[lib]
|
||||
-name = "proxmox_backup"
|
||||
-path = "src/lib.rs"
|
||||
-
|
||||
-[dependencies]
|
||||
-apt-pkg-native = "0.3.2"
|
||||
-base64 = "0.13"
|
||||
-bitflags = "1.2.1"
|
||||
-bytes = "1.0"
|
||||
-cidr = "0.2.1"
|
||||
-crc32fast = "1"
|
||||
-endian_trait = { version = "0.6", features = ["arrays"] }
|
||||
-flate2 = "1.0"
|
||||
-anyhow = "1.0"
|
||||
-thiserror = "1.0"
|
||||
-futures = "0.3"
|
||||
-h2 = { version = "0.3", features = [ "stream" ] }
|
||||
-handlebars = "3.0"
|
||||
-hex = "0.4.3"
|
||||
-http = "0.2"
|
||||
-hyper = { version = "0.14", features = [ "full" ] }
|
||||
-lazy_static = "1.4"
|
||||
-libc = "0.2"
|
||||
-log = "0.4.17"
|
||||
-nix = "0.19.1"
|
||||
-num-traits = "0.2"
|
||||
-once_cell = "1.3.1"
|
||||
-openssl = "0.10.38" # currently patched!
|
||||
-pam = "0.7"
|
||||
-pam-sys = "0.5"
|
||||
-percent-encoding = "2.1"
|
||||
-regex = "1.5.5"
|
||||
-rustyline = "7"
|
||||
-serde = { version = "1.0", features = ["derive"] }
|
||||
-serde_json = "1.0"
|
||||
-siphasher = "0.3"
|
||||
-syslog = "4.0"
|
||||
-tokio = { version = "1.6", features = [ "fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "time" ] }
|
||||
-tokio-openssl = "0.6.1"
|
||||
-tokio-stream = "0.1.0"
|
||||
-tokio-util = { version = "0.6", features = [ "codec", "io" ] }
|
||||
-tower-service = "0.3.0"
|
||||
-udev = "0.4"
|
||||
-url = "2.1"
|
||||
-#valgrind_request = { git = "https://github.com/edef1c/libvalgrind_request", version = "1.1.0", optional = true }
|
||||
-walkdir = "2"
|
||||
-xdg = "2.2"
|
||||
-nom = "5.1"
|
||||
-crossbeam-channel = "0.5"
|
||||
-
|
||||
-# Used only by examples currently:
|
||||
-zstd = { version = "0.6", features = [ "bindgen" ] }
|
||||
-
|
||||
-pathpatterns = "0.1.2"
|
||||
-pxar = { version = "0.10.1", features = [ "tokio-io" ] }
|
||||
-
|
||||
-proxmox-http = { version = "0.6.1", features = [ "client", "http-helpers", "websocket" ] }
|
||||
-proxmox-io = "1"
|
||||
-proxmox-lang = "1.1"
|
||||
-proxmox-router = { version = "1.2.2", features = [ "cli" ] }
|
||||
-proxmox-schema = { version = "1.3.1", features = [ "api-macro" ] }
|
||||
-proxmox-section-config = "1"
|
||||
-proxmox-tfa = { version = "2", features = [ "api", "api-types" ] }
|
||||
-proxmox-time = "1.1.2"
|
||||
-proxmox-uuid = "1"
|
||||
-proxmox-serde = "0.1"
|
||||
-proxmox-shared-memory = "0.2"
|
||||
-proxmox-sys = { version = "0.2", features = [ "sortable-macro" ] }
|
||||
-proxmox-compression = "0.1"
|
||||
-
|
||||
-
|
||||
-proxmox-acme-rs = "0.4"
|
||||
-proxmox-apt = "0.8.0"
|
||||
-proxmox-async = "0.4"
|
||||
-proxmox-openid = "0.9.0"
|
||||
-
|
||||
pbs-api-types = { path = "pbs-api-types" }
|
||||
pbs-buildcfg = { path = "pbs-buildcfg" }
|
||||
pbs-client = { path = "pbs-client" }
|
||||
@@ -126,22 +44,23 @@ pbs-tape = { path = "pbs-tape" }
|
||||
# Local path overrides
|
||||
# NOTE: You must run `cargo update` after changing this for it to take effect!
|
||||
[patch.crates-io]
|
||||
-#proxmox = { path = "../proxmox/proxmox" }
|
||||
-#proxmox-async = { path = "../proxmox/proxmox-async" }
|
||||
-#proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
|
||||
-#proxmox-fuse = { path = "../proxmox-fuse" }
|
||||
-#proxmox-http = { path = "../proxmox/proxmox-http" }
|
||||
-#proxmox-io = { path = "../proxmox/proxmox-io" }
|
||||
-#proxmox-lang = { path = "../proxmox/proxmox-lang" }
|
||||
-#proxmox-router = { path = "../proxmox/proxmox-router" }
|
||||
-#proxmox-schema = { path = "../proxmox/proxmox-schema" }
|
||||
-#proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
|
||||
-#proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
|
||||
-#proxmox-sys = { path = "../proxmox/proxmox-sys" }
|
||||
+proxmox-async = { path = "../proxmox/proxmox-async" }
|
||||
+proxmox-compression = { path = "../proxmox/proxmox-compression" }
|
||||
+proxmox-borrow = { path = "../proxmox/proxmox-borrow" }
|
||||
+proxmox-fuse = { path = "../proxmox-fuse" }
|
||||
+proxmox-http = { path = "../proxmox/proxmox-http" }
|
||||
+proxmox-io = { path = "../proxmox/proxmox-io" }
|
||||
+proxmox-lang = { path = "../proxmox/proxmox-lang" }
|
||||
+proxmox-router = { path = "../proxmox/proxmox-router" }
|
||||
+proxmox-schema = { path = "../proxmox/proxmox-schema" }
|
||||
+proxmox-section-config = { path = "../proxmox/proxmox-section-config" }
|
||||
+proxmox-serde = { path = "../proxmox/proxmox-serde" }
|
||||
+proxmox-shared-memory = { path = "../proxmox/proxmox-shared-memory" }
|
||||
+proxmox-sys = { path = "../proxmox/proxmox-sys" }
|
||||
#proxmox-tfa = { path = "../proxmox/proxmox-tfa" }
|
||||
-#proxmox-time = { path = "../proxmox/proxmox-time" }
|
||||
-#proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
|
||||
-#pxar = { path = "../pxar" }
|
||||
+proxmox-time = { path = "../proxmox/proxmox-time" }
|
||||
+proxmox-uuid = { path = "../proxmox/proxmox-uuid" }
|
||||
+pxar = { path = "../pxar" }
|
||||
|
||||
[features]
|
||||
default = []
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, git, doxygen, graphviz
|
||||
, boost, miniupnpc, openssl, unbound, cppzmq
|
||||
, zeromq, pcsclite, readline, libsodium
|
||||
, pcsclite, readline, libsodium
|
||||
}:
|
||||
|
||||
let
|
||||
@ -22,7 +22,7 @@ stdenv.mkDerivation {
|
||||
|
||||
buildInputs = [
|
||||
boost miniupnpc openssl unbound
|
||||
cppzmq zeromq pcsclite readline libsodium
|
||||
cppzmq pcsclite readline libsodium
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -24,13 +24,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = if withGui then "elements" else "elementsd";
|
||||
version = "22.1";
|
||||
version = "22.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ElementsProject";
|
||||
repo = "elements";
|
||||
rev = "elements-${version}";
|
||||
sha256 = "sha256-HDV06O9k+TpYR0ZwLas2hvDwxvnfoa8VUzgvkXv/WV8=";
|
||||
sha256 = "sha256-V8Ym4dGshf2E6KsboALXn1DJ5nL3QQvMmVMNdjSw7B8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, unbound, openssl, boost
|
||||
, lmdb, miniupnpc, readline, git, zeromq, libsodium, rapidjson, cppzmq }:
|
||||
, lmdb, miniupnpc, readline, git, libsodium, rapidjson, cppzmq }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "masari";
|
||||
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
boost miniupnpc openssl unbound
|
||||
zeromq readline libsodium
|
||||
readline libsodium
|
||||
rapidjson cppzmq
|
||||
];
|
||||
|
||||
|
||||
@ -138,7 +138,7 @@ assert withTreeSitter -> tree-sitter != null;
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ]
|
||||
++ lib.optionals (srcRepo || withMacport) [ texinfo ]
|
||||
++ lib.optionals srcRepo [ autoreconfHook ]
|
||||
++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
|
||||
++ lib.optional (withPgtk || withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
|
||||
|
||||
buildInputs =
|
||||
[ ncurses gconf libxml2 gnutls gettext jansson harfbuzz.dev ]
|
||||
|
||||
@ -22,13 +22,13 @@
|
||||
|
||||
let
|
||||
# when bumping the version, check if imhex has gotten support for the capstone version in nixpkgs
|
||||
version = "1.26.2";
|
||||
version = "1.27.1";
|
||||
|
||||
patterns_src = fetchFromGitHub {
|
||||
owner = "WerWolv";
|
||||
repo = "ImHex-Patterns";
|
||||
rev = "ImHex-v${version}";
|
||||
hash = "sha256-2+7bJzgwHfXcINM5oxwi3vEbUtq9gGJc/uxFOwT4RnM=";
|
||||
hash = "sha256-7Aaj+W+zXjHO8A2gmWtp5Pa/i5Uk8lXzX2WHjPIPRZI=";
|
||||
};
|
||||
|
||||
in
|
||||
@ -41,7 +41,7 @@ gcc12Stdenv.mkDerivation rec {
|
||||
owner = "WerWolv";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-H2bnRByCUAltngmVWgPW4vW8k5AWecOAzwtBKsjbpTw=";
|
||||
hash = "sha256-meOx8SkufXbXuBIVefr/mO9fsUi3zeQmqmf86+aDMaI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake llvm python3 perl pkg-config ];
|
||||
|
||||
@ -58,12 +58,12 @@ let
|
||||
};
|
||||
|
||||
# this plugin checks that it's ftplugin/vim.tex is loaded before $VIMRUNTIME/ftplugin/vim.tex
|
||||
# the answer is store in `plugin_was_loaded_too_late` in the cwd
|
||||
# $VIMRUNTIME/ftplugin/vim.tex sources $VIMRUNTIME/ftplugin/initex.vim which sets b:did_ftplugin
|
||||
# we save b:did_ftplugin's value in a `plugin_was_loaded_too_late` file
|
||||
texFtplugin = (pkgs.runCommandLocal "tex-ftplugin" {} ''
|
||||
mkdir -p $out/ftplugin
|
||||
echo 'call system("echo ". exists("b:did_ftplugin") . " > plugin_was_loaded_too_late")' > $out/ftplugin/tex.vim
|
||||
echo 'call system("echo ". exists("b:did_ftplugin") . " > plugin_was_loaded_too_late")' >> $out/ftplugin/tex.vim
|
||||
echo ':q!' >> $out/ftplugin/tex.vim
|
||||
echo '\documentclass{article}' > $out/main.tex
|
||||
'') // { pname = "test-ftplugin"; };
|
||||
|
||||
# neovim-drv must be a wrapped neovim
|
||||
@ -141,10 +141,12 @@ rec {
|
||||
# files from $VIMRUNTIME
|
||||
run_nvim_with_ftplugin = runTest nvim_with_ftplugin ''
|
||||
export HOME=$TMPDIR
|
||||
${nvim_with_ftplugin}/bin/nvim ${texFtplugin}/main.tex
|
||||
result="$(cat plugin_was_loaded_too_late)"
|
||||
echo $result
|
||||
[ "$result" = 0 ]
|
||||
echo '\documentclass{article}' > main.tex
|
||||
|
||||
${nvim_with_ftplugin}/bin/nvim main.tex -c "set ft?" -c quit
|
||||
ls -l $TMPDIR
|
||||
# if the file exists, then our plugin has been loaded instead of neovim's
|
||||
[ ! -f plugin_was_loaded_too_late ]
|
||||
'';
|
||||
|
||||
|
||||
@ -260,13 +262,12 @@ rec {
|
||||
packadd dashboard-nvim-unique-for-tests-please-dont-use-opt
|
||||
|
||||
" Try to run Dashboard again, and throw if it fails
|
||||
try
|
||||
Dashboard
|
||||
echo "Dashboard found"
|
||||
catch /^Vim\%((\a\+)\)\=:E492/
|
||||
let res = exists(':Dashboard')
|
||||
if res == 0
|
||||
echo "Dashboard not found, throwing error"
|
||||
cquit 1
|
||||
endtry
|
||||
endif
|
||||
cquit 0
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -1,14 +1,24 @@
|
||||
{ lib, stdenv, fetchFromGitHub,
|
||||
qmake, qtbase, qtxmlpatterns, qtsvg, qtscxml, qtquick1, libGLU }:
|
||||
{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtxmlpatterns, qtsvg, qtscxml
|
||||
, qtquick1, libGLU }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qxmledit" ;
|
||||
version = "0.9.15" ;
|
||||
src = fetchFromGitHub ( lib.importJSON ./qxmledit.json ) ;
|
||||
nativeBuildInputs = [ qmake ] ;
|
||||
buildInputs = [ qtbase qtxmlpatterns qtsvg qtscxml qtquick1 libGLU ] ;
|
||||
qmakeFlags = [ "CONFIG+=release" ] ;
|
||||
outputs = [ "out" "doc" ] ;
|
||||
pname = "qxmledit";
|
||||
version = "0.9.17";
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lbellonda";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-UzN5U+aC/uKokSdeUG2zv8+mkaH4ndYZ0sfzkpQ3l1M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ qmake ];
|
||||
|
||||
buildInputs = [ qtbase qtxmlpatterns qtsvg qtscxml qtquick1 libGLU ];
|
||||
|
||||
qmakeFlags = [ "CONFIG+=release" ];
|
||||
|
||||
preConfigure = ''
|
||||
export QXMLEDIT_INST_DATA_DIR="$out/share/data"
|
||||
@ -23,9 +33,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "Simple XML editor based on qt libraries" ;
|
||||
description = "Simple XML editor based on qt libraries";
|
||||
homepage = "https://sourceforge.net/projects/qxmledit";
|
||||
license = licenses.lgpl2;
|
||||
platforms = platforms.all;
|
||||
} ;
|
||||
platforms = platforms.unix;
|
||||
changelog = "https://github.com/lbellonda/qxmledit/blob/${version}/NEWS";
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
{
|
||||
"owner": "lbellonda",
|
||||
"repo": "qxmledit",
|
||||
"rev": "6136dca50ceb3b4447c91a7a18dcf84785ea11d1",
|
||||
"sha256": "1wcnphalwf0a5gz9r44jgk8wcv1w2qipbwjkbzkra2kxanxns834"
|
||||
}
|
||||
@ -1,38 +1,61 @@
|
||||
{ lib
|
||||
, pkgs
|
||||
, file
|
||||
, openssl
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, waylandSupport ? stdenv.isLinux
|
||||
, x11Support ? stdenv.isLinux
|
||||
, makeWrapper
|
||||
, file
|
||||
, openssl
|
||||
, atool
|
||||
, bat
|
||||
, chafa
|
||||
, delta
|
||||
, ffmpeg
|
||||
, ffmpegthumbnailer
|
||||
, fontforge
|
||||
, glow
|
||||
, imagemagick
|
||||
, jq
|
||||
, ueberzug
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ctpv";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NikitaIvanovV";
|
||||
repo = "${pname}";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0OuskRCBVm8vMd2zH5u5EPABmCOlEv5N4ZZMdc7bAwM=";
|
||||
hash = "sha256-3BQi4m44hBmPkJBFNCg6d9YKRbDZwLxdzBb/NDWTQP4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = [
|
||||
file # libmagic
|
||||
openssl
|
||||
];
|
||||
|
||||
buildInputs = with pkgs; [
|
||||
ffmpegthumbnailer ffmpeg
|
||||
] ++ lib.optionals waylandSupport [ chafa ]
|
||||
++ lib.optionals x11Support [ ueberzug ];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
preFixup = ''
|
||||
wrapProgram $out/bin/ctpv \
|
||||
--prefix PATH ":" "${lib.makeBinPath [
|
||||
atool # for archive files
|
||||
bat
|
||||
chafa # for image files on Wayland
|
||||
delta # for diff files
|
||||
ffmpeg
|
||||
ffmpegthumbnailer
|
||||
fontforge
|
||||
glow # for markdown files
|
||||
imagemagick
|
||||
jq # for json files
|
||||
ueberzug # for image files on X11
|
||||
]}";
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Image previews for lf (list files) file manager";
|
||||
description = "File previewer for a terminal";
|
||||
homepage = "https://github.com/NikitaIvanovV/ctpv";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
|
||||
@ -102,6 +102,18 @@ perlPackages.buildPerlPackage rec {
|
||||
]);
|
||||
|
||||
checkPhase = ''
|
||||
# Temporarily disable a test failing after a patch imagemagick update.
|
||||
# It might only due to the reporting and matching used in the test.
|
||||
# See https://github.com/NixOS/nixpkgs/issues/223446
|
||||
# See https://sourceforge.net/p/gscan2pdf/bugs/417/
|
||||
#
|
||||
# Failed test 'valid TIFF created'
|
||||
# at t/131_save_tiff.t line 44.
|
||||
# 'test.tif TIFF 70x46 70x46+0+0 8-bit sRGB 10024B 0.000u 0:00.000
|
||||
# '
|
||||
# doesn't match '(?^:test.tif TIFF 70x46 70x46\+0\+0 8-bit sRGB [7|9][.\d]+K?B)'
|
||||
rm t/131_save_tiff.t
|
||||
|
||||
# Temporarily disable a dubiously failing test:
|
||||
# t/169_import_scan.t ........................... 1/1
|
||||
# # Failed test 'variable-height scan imported with expected size'
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "komikku";
|
||||
version = "1.16.0";
|
||||
version = "1.17.0";
|
||||
|
||||
format = "other";
|
||||
|
||||
@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "valos";
|
||||
repo = "Komikku";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-SzK86uzdGnNFNtbvw56n3AxjxcCBjHFs9wD98TVggAo=";
|
||||
hash = "sha256-DxW9uefY6Fks3qSUeLMp3BB85SfLgzwBr4KO9do2y2o=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
59
pkgs/applications/graphics/paleta/default.nix
Normal file
59
pkgs/applications/graphics/paleta/default.nix
Normal file
@ -0,0 +1,59 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, wrapGAppsHook4
|
||||
, appstream-glib
|
||||
, desktop-file-utils
|
||||
, glib
|
||||
, gtk4
|
||||
, libadwaita
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "paleta";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nate-xyz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-c+X49bMywstRg7cSAbbpG/vd8OUB7RhdQVRumTIBDDk=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-2/ZfKvlvAY4pfUU3F9pEw+OR5oRSsSAAi3/W5x4zVs0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
appstream-glib
|
||||
desktop-file-utils
|
||||
] ++ (with rustPlatform; [
|
||||
cargoSetupHook
|
||||
rust.cargo
|
||||
rust.rustc
|
||||
]);
|
||||
|
||||
buildInputs = [
|
||||
glib
|
||||
gtk4
|
||||
libadwaita
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extract the dominant colors from any image";
|
||||
homepage = "https://github.com/nate-xyz/paleta";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ zendo ];
|
||||
};
|
||||
}
|
||||
@ -1,73 +1,100 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, javaPackages, rsync, ffmpeg, batik, gsettings-desktop-schemas, xorg, wrapGAppsHook }:
|
||||
let
|
||||
buildNumber = "1289";
|
||||
vaqua = fetchurl {
|
||||
name = "VAqua9.jar";
|
||||
url = "https://violetlib.org/release/vaqua/9/VAqua9.jar";
|
||||
sha256 = "cd0b82df8e7434c902ec873364bf3e9a3e6bef8b59cbf42433130d71bf1a779c";
|
||||
};
|
||||
|
||||
jna = fetchurl {
|
||||
name = "jna-5.10.0.zip";
|
||||
url = "https://github.com/java-native-access/jna/archive/5.10.0.zip";
|
||||
sha256 = "B5CakOQ8225xNsk2TMV8CbK3RcsLlb+pHzjaY5JNwg0=";
|
||||
};
|
||||
|
||||
flatlaf = fetchurl {
|
||||
name = "flatlaf-2.4.jar";
|
||||
url = "https://repo1.maven.org/maven2/com/formdev/flatlaf/2.4/flatlaf-2.4.jar";
|
||||
sha256 = "NVMYiCd+koNCJ6X3EiRx1Aj+T5uAMSJ9juMmB5Os+zc=";
|
||||
};
|
||||
|
||||
lsp4j = fetchurl {
|
||||
name = "org.eclipse.lsp4j-0.19.0.jar";
|
||||
url = "https://repo1.maven.org/maven2/org/eclipse/lsp4j/org.eclipse.lsp4j/0.19.0/org.eclipse.lsp4j-0.19.0.jar";
|
||||
sha256 = "sha256-1DI5D9KW+GL4gT1qjwVZveOl5KVOEjt6uXDwsFzi8Sg=";
|
||||
};
|
||||
|
||||
lsp4j-jsonrpc = fetchurl {
|
||||
name = "org.eclipse.lsp4j.jsonrpc-0.19.0.jar";
|
||||
url = "https://repo1.maven.org/maven2/org/eclipse/lsp4j/org.eclipse.lsp4j.jsonrpc/0.19.0/org.eclipse.lsp4j.jsonrpc-0.19.0.jar";
|
||||
sha256 = "sha256-ozYTkvv7k0psCeX/PbSM3/Bl17qT3upX3trt65lmM9I=";
|
||||
};
|
||||
|
||||
gson = fetchurl {
|
||||
name = "gson-2.9.1.jar";
|
||||
url = "https://repo1.maven.org/maven2/com/google/code/gson/gson/2.9.1/gson-2.9.1.jar";
|
||||
sha256 = "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM=";
|
||||
};
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "processing";
|
||||
version = "3.5.4";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "processing";
|
||||
repo = "processing";
|
||||
rev = "processing-0270-${version}";
|
||||
sha256 = "0cvv8jda9y8qnfcsziasyv3w7h3w22q78ihr23cm4an63ghxci58";
|
||||
repo = "processing4";
|
||||
rev = "processing-${buildNumber}-${version}";
|
||||
sha256 = "sha256-OjTqANxzcW/RrAdqmVYAegrlLPu6w2pjzSyZyvUYIt4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "oraclejdk-8u281-compat.patch";
|
||||
url = "https://github.com/processing/processing/commit/7e176876173c93e3a00a922e7ae37951366d1761.patch";
|
||||
sha256 = "g+zwpoIVgw7Sp6QWW3vyPZ/fKHk+o/YCY6xnrX8IGKo=";
|
||||
})
|
||||
];
|
||||
nativeBuildInputs = [ ant unzip makeWrapper wrapGAppsHook ];
|
||||
buildInputs = [ jdk javaPackages.jogl_2_3_2 ant rsync ffmpeg batik ];
|
||||
|
||||
nativeBuildInputs = [ ant rsync makeWrapper ];
|
||||
buildInputs = [ jdk ];
|
||||
dontWrapGApps = true;
|
||||
|
||||
buildPhase = ''
|
||||
# use compiled jogl to avoid patchelf'ing .so files inside jars
|
||||
rm core/library/*.jar
|
||||
cp ${javaPackages.jogl_2_3_2}/share/java/*.jar core/library/
|
||||
|
||||
# do not download a file during build
|
||||
${xmlstarlet}/bin/xmlstarlet ed --inplace -P -d '//get[@src="http://download.processing.org/reference.zip"]' build/build.xml
|
||||
install -D -m0444 ${fetchurl {
|
||||
# Use archive.org link for reproducibility until the following issue is fixed:
|
||||
# https://github.com/processing/processing/issues/5711
|
||||
url = "https://web.archive.org/web/20200406132357/https://download.processing.org/reference.zip";
|
||||
sha256 = "093hc7kc9wfxqgf5dzfmfp68pbsy8x647cj0a25vgjm1swi61zbi";
|
||||
}
|
||||
} ./java/reference.zip
|
||||
|
||||
# suppress "Not fond of this Java VM" message box
|
||||
substituteInPlace app/src/processing/app/platform/LinuxPlatform.java \
|
||||
--replace 'Messages.showWarning' 'if (false) Messages.showWarning'
|
||||
|
||||
( cd build
|
||||
substituteInPlace build.xml --replace "jre-download," "" # do not download jre1.8.0_144
|
||||
mkdir -p linux/jre1.8.0_144 # fake dir to avoid error
|
||||
ant build )
|
||||
echo "tarring jdk"
|
||||
tar --checkpoint=10000 -czf build/linux/jdk-17.0.5-amd64.tgz ${jdk}
|
||||
cp ${ant}/lib/ant/lib/{ant.jar,ant-launcher.jar} app/lib/
|
||||
mkdir -p core/library
|
||||
ln -s ${javaPackages.jogl_2_3_2}/share/java/* core/library/
|
||||
ln -s ${vaqua} app/lib/VAqua9.jar
|
||||
ln -s ${flatlaf} app/lib/flatlaf.jar
|
||||
ln -s ${lsp4j} java/mode/org.eclipse.lsp4j.jar
|
||||
ln -s ${lsp4j-jsonrpc} java/mode/org.eclipse.lsp4j.jsonrpc.jar
|
||||
ln -s ${gson} java/mode/gson.jar
|
||||
unzip -qo ${jna} -d app/lib/
|
||||
mv app/lib/{jna-5.10.0/dist/jna.jar,}
|
||||
mv app/lib/{jna-5.10.0/dist/jna-platform.jar,}
|
||||
ln -sf ${batik}/* java/libraries/svg/library/
|
||||
cp java/libraries/svg/library/lib/batik-all-${batik.version}.jar java/libraries/svg/library/batik.jar
|
||||
echo "tarring ffmpeg"
|
||||
tar --checkpoint=10000 -czf build/shared/tools/MovieMaker/ffmpeg-5.0.1.gz ${ffmpeg}
|
||||
cd build
|
||||
ant build
|
||||
cd ..
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir $out
|
||||
cp -dpR build/linux/work $out/${pname}
|
||||
|
||||
rmdir $out/${pname}/java
|
||||
ln -s ${jdk} $out/${pname}/java
|
||||
|
||||
makeWrapper $out/${pname}/processing $out/bin/processing \
|
||||
--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \
|
||||
--prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \
|
||||
--prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
|
||||
makeWrapper $out/${pname}/processing-java $out/bin/processing-java \
|
||||
--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \
|
||||
--prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd \
|
||||
--prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib
|
||||
mkdir -p $out/share/
|
||||
cp -dpr build/linux/work $out/share/${pname}
|
||||
rmdir $out/share/${pname}/java
|
||||
ln -s ${jdk} $out/share/${pname}/java
|
||||
makeWrapper $out/share/${pname}/processing $out/bin/processing \
|
||||
''${gappsWrapperArgs[@]} \
|
||||
--prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd
|
||||
makeWrapper $out/share/${pname}/processing-java $out/bin/processing-java \
|
||||
''${gappsWrapperArgs[@]} \
|
||||
--prefix _JAVA_OPTIONS " " -Dawt.useSystemAAFontSettings=lcd
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A language and IDE for electronic arts";
|
||||
homepage = "https://processing.org";
|
||||
license = licenses.gpl2Plus;
|
||||
license = with licenses; [ gpl2Only lgpl21Only ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ evan-goode ];
|
||||
};
|
||||
}
|
||||
|
||||
87
pkgs/applications/graphics/seamly2d/default.nix
Normal file
87
pkgs/applications/graphics/seamly2d/default.nix
Normal file
@ -0,0 +1,87 @@
|
||||
{ stdenv, lib, qtbase, wrapQtAppsHook, fetchFromGitHub,
|
||||
addOpenGLRunpath, poppler_utils, qtxmlpatterns, qtsvg, mesa, gcc, xvfb-run,
|
||||
fontconfig, freetype, xorg, ccache, qmake, python3, qttools, git
|
||||
}:
|
||||
let
|
||||
qtPython = python3.withPackages (pkgs: with pkgs; [ pyqt5 ]);
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "seamly2d";
|
||||
version = "2022-08-15.0339";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FashionFreedom";
|
||||
repo = "Seamly2D";
|
||||
rev = "v${version}";
|
||||
sha256 = "13jxkg84jfz8g52zwhh5jvi23wryzkavwbsfalzr9m04blj5xnik";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
git
|
||||
qtPython
|
||||
qtbase
|
||||
poppler_utils
|
||||
qtxmlpatterns
|
||||
qtsvg
|
||||
mesa
|
||||
freetype
|
||||
xorg.libXi
|
||||
xorg.libXrender
|
||||
xorg.libxcb
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
addOpenGLRunpath
|
||||
xvfb-run
|
||||
fontconfig
|
||||
wrapQtAppsHook
|
||||
qmake
|
||||
qttools
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace common.pri \
|
||||
--replace '$$[QT_INSTALL_HEADERS]/QtXmlPatterns' '${lib.getDev qtxmlpatterns}/include/QtXmlPatterns' \
|
||||
--replace '$$[QT_INSTALL_HEADERS]/QtSvg' '${lib.getDev qtsvg}/include/QtSvg' \
|
||||
--replace '$$[QT_INSTALL_HEADERS]/' '${lib.getDev qtbase}/include/' \
|
||||
--replace '$$[QT_INSTALL_HEADERS]' '${lib.getDev qtbase}'
|
||||
substituteInPlace src/app/translations.pri \
|
||||
--replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${lib.getDev qttools}/bin/lrelease'
|
||||
substituteInPlace src/app/seamly2d/mainwindowsnogui.cpp \
|
||||
--replace 'define PDFTOPS "pdftops"' 'define PDFTOPS "${lib.getBin poppler_utils}/bin/pdftops"'
|
||||
substituteInPlace src/libs/vwidgets/export_format_combobox.cpp \
|
||||
--replace 'define PDFTOPS "pdftops"' 'define PDFTOPS "${lib.getBin poppler_utils}/bin/pdftops"'
|
||||
substituteInPlace src/app/seamlyme/mapplication.cpp \
|
||||
--replace 'diagrams.rcc' '../share/diagrams.rcc'
|
||||
'';
|
||||
|
||||
qmakeFlags = [
|
||||
"PREFIX=/"
|
||||
"PREFIX_LIB=/lib"
|
||||
"Seamly2D.pro"
|
||||
"-r"
|
||||
"CONFIG+=noDebugSymbols"
|
||||
"CONFIG+=no_ccache"
|
||||
];
|
||||
|
||||
installFlags = [ "INSTALL_ROOT=$(out)" ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/usr/share $out/
|
||||
rmdir $out/usr
|
||||
|
||||
mv $out/share/seamly2d/* $out/share/.
|
||||
rmdir $out/share/seamly2d
|
||||
|
||||
mkdir -p $out/share/mime/packages
|
||||
cp dist/debian/seamly2d.sharedmimeinfo $out/share/mime/packages/seamly2d.xml
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Open source patternmaking software";
|
||||
homepage = "https://seamly.net/";
|
||||
license = lib.licenses.gpl3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ WhittlesJr ];
|
||||
};
|
||||
}
|
||||
@ -1,36 +1,33 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, gettext
|
||||
, magic
|
||||
, pexpect
|
||||
, pyyaml
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sosreport";
|
||||
version = "4.3";
|
||||
version = "4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sosreport";
|
||||
repo = "sos";
|
||||
rev = version;
|
||||
sha256 = "sha256-fLEYRRQap7xqSyUU9MAV8cxxYKydHjn8J147VTXSf78=";
|
||||
sha256 = "sha256-xbL/4CmDnygiL/u3Jsa6fAkO4YfklDzuFMsxSGy1Ra4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# fix sos --help
|
||||
url = "https://github.com/sosreport/sos/commit/ac4eb48fa35c13b99ada41540831412480babf8d.patch";
|
||||
sha256 = "sha256-6ZRoDDZN2KkHTXOKuHTAquB/HTIUppodmx83WxxYFP0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
magic
|
||||
pexpect
|
||||
pyyaml
|
||||
setuptools
|
||||
];
|
||||
|
||||
# requires avocado-framework 94.0, latest version as of writing is 96.0
|
||||
|
||||
@ -12,12 +12,12 @@ let
|
||||
if extension == "zip" then fetchzip args else fetchurl args;
|
||||
|
||||
pname = "1password-cli";
|
||||
version = "2.16.0";
|
||||
version = "2.16.1";
|
||||
sources = rec {
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-G0kn3BsgC8En4wNNr0aUSa52is+xmx3Ho+l3aMxKcKs=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-b5v8BGf7QkEU61TrLhCWprxcpUJp5BmUwrB9Oi+qyDI=" "zip";
|
||||
x86_64-linux = fetch "linux_amd64" "sha256-ctHNRESQp+l7s1uXCv6AgNBARFQJydA/rLfdYDNyDXU=" "zip";
|
||||
aarch64-darwin = fetch "apple_universal" "sha256-j+BiFJawqAhZHJhYDQx51G/aEgwAqq7mXedP65HyaGo=" "pkg";
|
||||
aarch64-linux = fetch "linux_arm64" "sha256-8zKxd2yY8syGhgyPv06b+ag2bEfFfG19ZmQPrfi+Qh4=" "zip";
|
||||
i686-linux = fetch "linux_386" "sha256-3OO0JMJMRqbmq/rD/VRKIMBdjYu66ebEFGNLKX9K6A8=" "zip";
|
||||
x86_64-linux = fetch "linux_amd64" "sha256-ZCXfreBiFDc5YFd9YsMddEvzl22KwnnfSQsV6BmHqeA=" "zip";
|
||||
aarch64-darwin = fetch "apple_universal" "sha256-vlsqvz+AgEhL7M8cJhxmjjZ6ocIVUdq7MC1EVZOExU8=" "pkg";
|
||||
x86_64-darwin = aarch64-darwin;
|
||||
};
|
||||
platforms = builtins.attrNames sources;
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dasel";
|
||||
version = "2.1.1";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TomWright";
|
||||
repo = "dasel";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-27tQEWnirDhqYt5smRFwADa9wKXSk6yXR8+mXvJVtYI=";
|
||||
sha256 = "sha256-3zYBgDtptEmuAhLFnPt0eDvgTYltHDdQGX1JCem/UxE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-GO5Vg8zsXfjMBzRDC1/s/SYpviKUf59JB14vauKVFcE=";
|
||||
|
||||
35
pkgs/applications/misc/golden-cheetah-bin/default.nix
Normal file
35
pkgs/applications/misc/golden-cheetah-bin/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ appimageTools, lib, fetchurl, stdenv }:
|
||||
let
|
||||
|
||||
pname = "golden-cheetah";
|
||||
version = "3.6-RC3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/GoldenCheetah/GoldenCheetah/releases/download/v${version}/GoldenCheetah_v3.6-DEV_x64.AppImage";
|
||||
hash = "sha256-Bp1IFql96tHc5ssg9nhTrFQqNtaM+5iYJguPGkguvns=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit pname src version; };
|
||||
in
|
||||
appimageTools.wrapType2 {
|
||||
inherit pname src version;
|
||||
|
||||
extraPkgs = pkgs: with pkgs; [ R zlib libusb-compat-0_1 ];
|
||||
|
||||
extraInstallCommands = ''
|
||||
mv $out/bin/${pname}-${version} $out/bin/GoldenCheetah
|
||||
mkdir -p $out/share/applications
|
||||
mkdir -p $out/share/pixmaps
|
||||
cp ${appimageContents}/GoldenCheetah.desktop $out/share/applications/
|
||||
cp ${appimageContents}/gc.png $out/share/pixmaps/
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Performance software for cyclists, runners and triathletes. This version includes the API Tokens for e.g. Strava";
|
||||
platforms = platforms.linux;
|
||||
broken = !stdenv.isx86_64;
|
||||
maintainers = with maintainers; [ gador ];
|
||||
license = licenses.gpl2Plus;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
@ -73,7 +73,7 @@ in mkDerivation rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Performance software for cyclists, runners and triathletes";
|
||||
description = "Performance software for cyclists, runners and triathletes. Built from source and without API tokens";
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ adamcstephens ];
|
||||
license = licenses.gpl2Plus;
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libosmocore";
|
||||
version = "1.7.0";
|
||||
version = "1.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "osmocom";
|
||||
repo = "libosmocore";
|
||||
rev = version;
|
||||
hash = "sha256-Dkud3ZA9m/UVbPugbQztUJXFpkQYTWjK2mamxfto9JA=";
|
||||
hash = "sha256-xs8XI6xIUIZ7e0b+z4+FB6jNGY08t1wI4Ud8EHdi93I=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
talloc
|
||||
libmnl
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -38,7 +39,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
gnutls
|
||||
libmnl
|
||||
libusb1
|
||||
lksctp-tools
|
||||
pcsclite
|
||||
|
||||
@ -19,13 +19,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "p2pool";
|
||||
version = "2.7";
|
||||
version = "3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SChernykh";
|
||||
repo = "p2pool";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-j3SVwat/LGw/iGcyNn8acR29Ob/WXDKyeCfDTsH+gxA=";
|
||||
sha256 = "sha256-yHxg/9QhaDNlUFzylftsJEk+pJoSoTfA0rJfcolBdTs=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ libuv zeromq libsodium gss hwloc openssl curl ]
|
||||
++ lib.optionals stdenv.isDarwin [ Foundation ];
|
||||
|
||||
cmakeFlags = ["-DWITH_LTO=OFF"];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tilemaker";
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "systemed";
|
||||
repo = "tilemaker";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-O1zoRYNUeReIH2ZpL05SiwCZrZrM2IAkwhsP30k/hHc=";
|
||||
hash = "sha256-xpOF/0qFuvTUWQ1I8x/gy5qSLKzSgcQahS47PG+bTRA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,4 +1,9 @@
|
||||
{ lib, stdenv, fetchFromGitHub, imagemagick }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, imagemagick
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tiv";
|
||||
@ -11,12 +16,19 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-mCgybL4af19zqECN1pBV+WnxMq2ZtlK5GDTQO3u9CK0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
buildInputs = [ imagemagick ];
|
||||
|
||||
makeFlags = [ "prefix=$(out)" ];
|
||||
|
||||
preConfigure = "cd src/main/cpp";
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/tiv \
|
||||
--prefix PATH : ${lib.makeBinPath [ imagemagick ]}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/stefanhaustein/TerminalImageViewer";
|
||||
description = "Small C++ program to display images in a (modern) terminal using RGB ANSI codes and unicode block graphics characters";
|
||||
|
||||
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "asn";
|
||||
version = "0.73";
|
||||
version = "0.73.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nitefood";
|
||||
repo = "asn";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-z0vjYU6k+6p/lASqOase91aqkUvmuy8sUBjsq2OPnxE=";
|
||||
sha256 = "sha256-W8Q6DOvLdp3iRi7OvTsvIdb8XnUatK/vt7bhtwtep/8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec {
|
||||
inherit pname;
|
||||
version = "3.25.0";
|
||||
version = "3.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectcalico";
|
||||
repo = "calico";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-sD79WiGKfwjtoiYlLow4h58skbHpuZyzMQ0VOyBKRnk=";
|
||||
hash = "sha256-msXTukje7tS8rovhbZs8CBsfIiDOCx6wkWHoDdhxK+8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-p4Ve6qWnYyHUUyKmLfbaZIGGfleLuzz+MZgGRSsBoWM=";
|
||||
vendorHash = "sha256-aJdzizXtW1wI9ZdQVTW8RyGFTXDdtLxpZ4oxXP/0gP0=";
|
||||
|
||||
inherit doCheck subPackages;
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flink";
|
||||
version = "1.14.4";
|
||||
version = "1.17.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz";
|
||||
sha256 = "sha256-qvWUh+EQT/MljN5LCX2JLMEapIEGAbAljrCMTYsFqtw=";
|
||||
url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.12.tgz";
|
||||
sha256 = "sha256-x60Lk/xXf+Isg1J6z5qAIZ2/dbDiztPIKWrdPITp3Tg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
|
||||
downloadPage = "https://flink.apache.org/downloads.html";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ mbode ];
|
||||
maintainers = with maintainers; [ mbode autophagy ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -46,11 +46,11 @@
|
||||
"vendorHash": "sha256-nwl8GvS/hc07xSzM+wEwOAkT9oQcAuguHaEcM1nWjwg="
|
||||
},
|
||||
"alicloud": {
|
||||
"hash": "sha256-L+KTE97aSrZI8Wn5SDKoNvsFO/con4IsNmrgWQymXno=",
|
||||
"hash": "sha256-ZFnVCrC2fK2i5idK2rWCOZQ3W4K3nDSG5ZkEZk2Zg9c=",
|
||||
"homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
|
||||
"owner": "aliyun",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.201.2",
|
||||
"rev": "v1.202.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -540,11 +540,11 @@
|
||||
"vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y="
|
||||
},
|
||||
"huaweicloud": {
|
||||
"hash": "sha256-DYgqq4Joq7R9pljbtKi/Oi150qTxYK4hOLXu3h3ZcMI=",
|
||||
"hash": "sha256-oPwvZClbKk4fbYc+cVHINcxNBU55w8LK53oyTUsCrTw=",
|
||||
"homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
|
||||
"owner": "huaweicloud",
|
||||
"repo": "terraform-provider-huaweicloud",
|
||||
"rev": "v1.46.0",
|
||||
"rev": "v1.47.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -593,6 +593,15 @@
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
"jetstream": {
|
||||
"hash": "sha256-XFJo01AK5UCraIzi/KkOoVbZznJwaA8BrRAIomK3U7Q=",
|
||||
"homepage": "https://registry.terraform.io/providers/nats-io/jetstream",
|
||||
"owner": "nats-io",
|
||||
"repo": "terraform-provider-jetstream",
|
||||
"rev": "v0.0.34",
|
||||
"spdx": "Apache-2.0",
|
||||
"vendorHash": "sha256-vSIeSEzyJQzh9Aid/FWsF4xDYXMOhbsaLQ31mtfH7/Y="
|
||||
},
|
||||
"kafka": {
|
||||
"hash": "sha256-p8KT6K9fcd0OFy+NoZyZzQxG13fIiyMJg2yNPKIWH60=",
|
||||
"homepage": "https://registry.terraform.io/providers/Mongey/kafka",
|
||||
@ -811,11 +820,11 @@
|
||||
"vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI="
|
||||
},
|
||||
"oci": {
|
||||
"hash": "sha256-KxhX9QJ7VssZz388xhmNsyDcnDKxu5MDL0nDWMOfEXQ=",
|
||||
"hash": "sha256-pgiuMw/ciguj54C1qN8VYWsozXuNNXiU36ZdzYP+Eds=",
|
||||
"homepage": "https://registry.terraform.io/providers/oracle/oci",
|
||||
"owner": "oracle",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.113.0",
|
||||
"rev": "v4.114.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -1099,11 +1108,11 @@
|
||||
"vendorHash": "sha256-GkmUKSnqkabwGCl22/90529BWb0oJaIJHYHlS/h3KNY="
|
||||
},
|
||||
"tencentcloud": {
|
||||
"hash": "sha256-Lf6IKNdl7eiFBdCSbuXaawMno7grlIQBwM99sg75sS0=",
|
||||
"hash": "sha256-N8+voF13P+uWtFYCYVItcqtPBxFiDDz1yp5gSpTTXPM=",
|
||||
"homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
|
||||
"owner": "tencentcloudstack",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.79.19",
|
||||
"rev": "v1.80.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@ -1245,13 +1254,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"wavefront": {
|
||||
"hash": "sha256-goiYeZ2iV9KjacBr/MMkA+t2WNTJGHHmwebr/ci+Ezg=",
|
||||
"hash": "sha256-aHOPfVmYe7O+9ZEfwZx6JDBjmFoN9RNvp7kiYoBEWww=",
|
||||
"homepage": "https://registry.terraform.io/providers/vmware/wavefront",
|
||||
"owner": "vmware",
|
||||
"repo": "terraform-provider-wavefront",
|
||||
"rev": "v3.4.0",
|
||||
"rev": "v3.5.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ="
|
||||
"vendorHash": "sha256-itSr5HHjus6G0t5/KFs0sNiredH9m3JnQ3siLtm+NHs="
|
||||
},
|
||||
"yandex": {
|
||||
"hash": "sha256-bkKGZAGxeJC5JeVwRB+moChFvTF2zUHxB75H82RSACI=",
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "dnscontrol";
|
||||
version = "3.29.1";
|
||||
version = "3.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StackExchange";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-sfmdOwwB3X3GFTg7NNAh7mi+fu4YZy9+c5Co3qaVo1o=";
|
||||
sha256 = "sha256-/ULO0ev1ybENaSrzAgblUdnyGp6QfFxO8XSHpH2wGpU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-nOgb8UNDhumMyYu1v55qflYrU9HE8cWSGdfLqIAm/w4=";
|
||||
vendorHash = "sha256-BtwSn3MLeMkjKBRXhln7hCB3wBVkKASe0zzfqbALQMQ=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
||||
3306
pkgs/applications/networking/instant-messengers/fractal/Cargo.lock
generated
Normal file
3306
pkgs/applications/networking/instant-messengers/fractal/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
@ -34,10 +34,13 @@ stdenv.mkDerivation rec {
|
||||
hash = "sha256-/vPadtyiYDX0PdneMxc0oSWb5OYnikevqajl3WgZiGA=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-RbJPhmZLRS4evvzzYQOYWnlxKUd4oC2Dh2GK5X5IF8Q=";
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"either-1.5.99" = "sha256-Lmv9OPZKEb7tmkN+7Mua2nx0xmZwm3d1W623UKUlPeg=";
|
||||
"gettext-rs-0.4.2" = "sha256-wyZ1bf0oFcQo8gEi2GEalRUoKMoJYHysu79qcfjd4Ng=";
|
||||
"sourceview4-0.2.0" = "sha256-RuCg05/qjkPri1QUd5acsGVqJtGvM5OO8/R+Nibxoa4=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -177,7 +177,7 @@ let
|
||||
# Fix the desktop link
|
||||
substituteInPlace $out/share/applications/slack.desktop \
|
||||
--replace /usr/bin/ $out/bin/ \
|
||||
--replace /usr/share/ $out/share/ \
|
||||
--replace /usr/share/pixmaps/slack.png slack \
|
||||
--replace bin/slack "bin/slack -s"
|
||||
|
||||
runHook postInstall
|
||||
|
||||
@ -16,13 +16,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "irssi";
|
||||
version = "1.4.3";
|
||||
version = "1.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "irssi";
|
||||
repo = "irssi";
|
||||
rev = version;
|
||||
hash = "sha256-wRJp4KfI+2IAJ70XW7+0LR83cRvS/SGq7CpDVuc636Q=";
|
||||
hash = "sha256-a/+9M2zoywZBdOfXHrA4O6Q9W7HJZNTthB/aseUNefA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
43
pkgs/applications/office/beebeep/default.nix
Normal file
43
pkgs/applications/office/beebeep/default.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, fetchzip
|
||||
, wrapQtAppsHook
|
||||
, autoPatchelfHook
|
||||
, qtbase
|
||||
, qtmultimedia
|
||||
, qtx11extras
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "beebeep";
|
||||
version = "5.8.6";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://netix.dl.sourceforge.net/project/beebeep/Linux/beebeep-${version}-qt5-amd64.tar.gz";
|
||||
sha256 = "sha256-YDgFRXFBM1tjLP99mHYJadgccHJYYPAZ1kqR+FngLKU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
wrapQtAppsHook
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
qtbase
|
||||
qtmultimedia
|
||||
qtx11extras
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp * $out/bin
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.beebeep.net/";
|
||||
description = "BeeBEEP is the free office messenger that is indispensable in all those places where privacy and security are an essential requirement.";
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ mglolenstine ];
|
||||
};
|
||||
}
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "iotas";
|
||||
version = "0.1.9";
|
||||
version = "0.1.11";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
owner = "cheywood";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-TdsqxpJq2+hoLHcJ58JQ20TWerZMXL3wkT9oIlVkrk4=";
|
||||
hash = "sha256-exXY0JFGuDZTbMmUEM+sFEitHXCsFBAHjybIyMmilk8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -25,7 +25,6 @@
|
||||
, SDL
|
||||
, gsl
|
||||
, cppzmq
|
||||
, zeromq
|
||||
# Needed only if qt-gui is disabled, from some reason
|
||||
, icu
|
||||
# GUI related
|
||||
@ -203,7 +202,7 @@ let
|
||||
runtime = [ gsl ];
|
||||
};
|
||||
gr-zeromq = {
|
||||
runtime = [ cppzmq zeromq ];
|
||||
runtime = [ cppzmq ];
|
||||
cmakeEnableFlag = "GR_ZEROMQ";
|
||||
};
|
||||
};
|
||||
|
||||
@ -28,7 +28,6 @@
|
||||
, libunwind
|
||||
, thrift
|
||||
, cppzmq
|
||||
, zeromq
|
||||
# Needed only if qt-gui is disabled, from some reason
|
||||
, icu
|
||||
# GUI related
|
||||
@ -228,7 +227,7 @@ let
|
||||
runtime = [ gsl libsodium ];
|
||||
};
|
||||
gr-zeromq = {
|
||||
runtime = [ cppzmq zeromq ];
|
||||
runtime = [ cppzmq ];
|
||||
cmakeEnableFlag = "GR_ZEROMQ";
|
||||
};
|
||||
gr-network = {
|
||||
|
||||
@ -30,7 +30,6 @@
|
||||
, libunwind
|
||||
, thrift
|
||||
, cppzmq
|
||||
, zeromq
|
||||
# Needed only if qt-gui is disabled, from some reason
|
||||
, icu
|
||||
# GUI related
|
||||
@ -48,13 +47,13 @@
|
||||
, pname ? "gnuradio"
|
||||
, versionAttr ? {
|
||||
major = "3.10";
|
||||
minor = "5";
|
||||
patch = "1";
|
||||
minor = "6";
|
||||
patch = "0";
|
||||
}
|
||||
}:
|
||||
|
||||
let
|
||||
sourceSha256 = "sha256-D5Bsj70IHFOLPZQbaxkGdx7Lz94bXhCfnNfhZb3dDp4=";
|
||||
sourceSha256 = "sha256-WLxb9vJBlRfo9bKWEIsCI0Zb040XkLNjYw84j6ivOrk=";
|
||||
featuresInfo = {
|
||||
# Needed always
|
||||
basic = {
|
||||
@ -247,7 +246,7 @@ let
|
||||
runtime = [ gsl libsodium ];
|
||||
};
|
||||
gr-zeromq = {
|
||||
runtime = [ cppzmq zeromq ];
|
||||
runtime = [ cppzmq ];
|
||||
cmakeEnableFlag = "GR_ZEROMQ";
|
||||
};
|
||||
gr-network = {
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gridtracker";
|
||||
version = "1.23.0206";
|
||||
version = "1.23.0402";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gridtracker.org";
|
||||
repo = "gridtracker";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XWjKJga9aQrMb0ZfA4ElsPU1CfMwFtwYSK1vjgtlKes=";
|
||||
sha256 = "sha256-6SQuFN8Fi0fbWCYrQIIeSaXR2haI7uux4txCPKEoJvo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
, speex
|
||||
, speexdsp
|
||||
, cppzmq
|
||||
, zeromq
|
||||
}:
|
||||
|
||||
gnuradio3_8.pkgs.mkDerivation rec {
|
||||
@ -67,7 +66,6 @@ gnuradio3_8.pkgs.mkDerivation rec {
|
||||
libftdi
|
||||
libsndfile
|
||||
cppzmq
|
||||
zeromq
|
||||
gnuradio3_8.qwt
|
||||
] ++ lib.optionals (gnuradio3_8.hasFeature "gr-ctrlport") [
|
||||
thrift
|
||||
|
||||
@ -70,7 +70,6 @@ python3Packages.buildPythonApplication rec {
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
inherit description;
|
||||
homepage = "https://www.pymol.org/";
|
||||
license = licenses.mit;
|
||||
|
||||
@ -19,7 +19,6 @@
|
||||
, python3
|
||||
, sqlite
|
||||
, wrapGAppsHook
|
||||
, zeromq
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -48,7 +47,6 @@ stdenv.mkDerivation rec {
|
||||
podofo
|
||||
python3
|
||||
sqlite
|
||||
zeromq
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{
|
||||
"version": "15.10.0",
|
||||
"repo_hash": "sha256-jpJd6CneCfw+Ia0CTlX5YcEMl+2Tmd2+zfw8L+hKYTk=",
|
||||
"version": "15.10.1",
|
||||
"repo_hash": "sha256-BETTehy2GxZDGWLgdao1I0cqm4cNaL9lhXe+JmCNi10=",
|
||||
"yarn_hash": "1il8dnjb7591ss6w14zibdihg3bylw866jjjclv1qm8cihp8k3y8",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v15.10.0-ee",
|
||||
"rev": "v15.10.1-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "15.10.0",
|
||||
"GITLAB_PAGES_VERSION": "15.10.0",
|
||||
"GITALY_SERVER_VERSION": "15.10.1",
|
||||
"GITLAB_PAGES_VERSION": "15.10.1",
|
||||
"GITLAB_SHELL_VERSION": "14.18.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "15.10.0"
|
||||
"GITLAB_WORKHORSE_VERSION": "15.10.1"
|
||||
}
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@ let
|
||||
gemdir = ./.;
|
||||
};
|
||||
|
||||
version = "15.10.0";
|
||||
version = "15.10.1";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
@ -22,7 +22,7 @@ let
|
||||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-MHxpij4aT4sq7csWRAEr6NQ9PdFkEnrEPegVtBIXUNo=";
|
||||
sha256 = "sha256-iGYmBMRno2qCvdklyztGTV48m0UMeozuyX7ZZdS7K/c=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-knuUyJGz5JvYyKeDQ66cMQQSh2YKkkDB54iCir1QpEY=";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-pages";
|
||||
version = "15.10.0";
|
||||
version = "15.10.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "gitlab-org";
|
||||
repo = "gitlab-pages";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-LTUGWnZCqyLA5kNlCWMVGIOivfWVGb6GcAdO2tNW1/o=";
|
||||
sha256 = "sha256-FZ7Ifb8bau1helYnmKcS90oASnjF/knxbtPsck6lwKk=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-s3HHoz9URACuVVhePQQFviTqlQU7vCLOjTJPBlus1Vo=";
|
||||
|
||||
@ -5,7 +5,7 @@ in
|
||||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "15.10.0";
|
||||
version = "15.10.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
||||
@ -1,14 +1,21 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
let
|
||||
pname = "lefthook";
|
||||
version = "1.3.7";
|
||||
version = "1.3.8";
|
||||
in
|
||||
buildGoModule rec {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "evilmartians";
|
||||
repo = "lefthook";
|
||||
hash = "sha256-6wVzl2hu6bH2dqB/m/kgUQxRxOxMQltcGlo/TIIgh/Y=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AtqCRGl+xvFA3mW9hYZALSrknUbuJ83LOKgOvLDLIPU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-cMRl+TqSLlfoAja+JNaNKfHDR9fkvMTWdB1FT3XxPd4=";
|
||||
@ -26,11 +33,11 @@ buildGoModule rec {
|
||||
--zsh <($out/bin/lefthook completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Fast and powerful Git hooks manager for any type of projects";
|
||||
homepage = "https://github.com/evilmartians/lefthook";
|
||||
changelog = "https://github.com/evilmartians/lefthook/raw/v${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ rencire ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -11,15 +11,16 @@
|
||||
, mono
|
||||
, mpv
|
||||
, tesseract4
|
||||
, nix-update-script
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "subtitleedit";
|
||||
version = "3.6.11";
|
||||
version = "3.6.12";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${lib.replaceStrings [ "." ] [ "" ] version}.zip";
|
||||
sha256 = "00w9jx704in3hbnzp0i7bhqkhbl0h5mahc5izwa980b67w08dc26";
|
||||
sha256 = "08p67krgcignjisbq7nmnb3nga2sad4vl739ak4a5rp3b49l1dmb";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
@ -79,6 +80,8 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "A subtitle editor";
|
||||
homepage = "https://nikse.dk/subtitleedit/";
|
||||
|
||||
@ -231,8 +231,9 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Add a ‘qemu-kvm’ wrapper for compatibility/convenience.
|
||||
postInstall = ''
|
||||
ln -s $out/libexec/virtiofsd $out/bin
|
||||
ln -s $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} $out/bin/qemu-kvm
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
ln -s $out/libexec/virtiofsd $out/bin
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null;
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = if set != null then "iosevka-${set}" else "iosevka";
|
||||
version = "20.0.0";
|
||||
version = "22.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "be5invis";
|
||||
repo = "iosevka";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JXlv9/P5tBAnRVNCBavG5AtM11Q6mikTN+Qu+u3pLP0=";
|
||||
hash = "sha256-TvzUUuwmDP2K1deUsODV/FDjPTgZjVvilUdfrkeaO88=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-fecGkN6MEdBP8UokBY/w0TnPOC93KsAISEg3VW0bvHU=";
|
||||
npmDepsHash = "sha256-G+iAGKweh5MOFTaNHLnSUwVMTSlgL/w0zrS2SrJrsJE=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
remarshal
|
||||
|
||||
45
pkgs/development/embedded/edl/default.nix
Normal file
45
pkgs/development/embedded/edl/default.nix
Normal file
@ -0,0 +1,45 @@
|
||||
{ lib, stdenv, fetchFromGitHub, python3Packages }:
|
||||
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "edl";
|
||||
version = "unstable-2022-09-07";
|
||||
|
||||
src = fetchFromGitHub rec {
|
||||
owner = "bkerler";
|
||||
repo = "edl";
|
||||
rev = "f6b94da5faa003b48d24a5f4a8f0b8495626fd5b";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-bxnRy+inWNArE2gUA/qDPy7NKvqBm43sbxdIaTc9N28=";
|
||||
};
|
||||
# edl has a spurious dependency on "usb" which has nothing to do with the
|
||||
# project and was probably added by accident trying to add pyusb
|
||||
postPatch = ''
|
||||
sed -i '/'usb'/d' setup.py
|
||||
'';
|
||||
# No tests set up
|
||||
doCheck = false;
|
||||
# EDL loaders are ELFs but shouldn't be touched, rest is Python anyways
|
||||
dontStrip = true;
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pyusb
|
||||
pyserial
|
||||
docopt
|
||||
pylzma
|
||||
pycryptodome
|
||||
lxml
|
||||
colorama
|
||||
# usb
|
||||
capstone
|
||||
keystone-engine
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/bkerler/edl";
|
||||
description = "Qualcomm EDL tool (Sahara / Firehose / Diag)";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ lorenz ];
|
||||
# Case-sensitive files in 'Loader' submodule
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -4,9 +4,9 @@ let
|
||||
pio-pkgs = pkgs:
|
||||
let
|
||||
python = pkgs.python3;
|
||||
platformio = python.pkgs.callPackage ./core.nix { inherit version src; };
|
||||
in
|
||||
(with pkgs; [
|
||||
platformio-core
|
||||
zlib
|
||||
git
|
||||
xdg-user-dirs
|
||||
@ -15,7 +15,6 @@ let
|
||||
setuptools
|
||||
pip
|
||||
bottle
|
||||
platformio
|
||||
]);
|
||||
|
||||
in
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ newScope, fetchFromGitHub }:
|
||||
{ newScope, fetchFromGitHub, python3Packages }:
|
||||
|
||||
let
|
||||
callPackage = newScope self;
|
||||
@ -14,6 +14,8 @@ let
|
||||
};
|
||||
|
||||
self = {
|
||||
platformio-core = python3Packages.callPackage ./core.nix { inherit version src; };
|
||||
|
||||
platformio-chrootenv = callPackage ./chrootenv.nix { inherit version src; };
|
||||
};
|
||||
|
||||
|
||||
@ -3,6 +3,7 @@
|
||||
, substituteAll
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, mesonEmulatorHook
|
||||
, ninja
|
||||
, pkg-config
|
||||
, gettext
|
||||
@ -49,6 +50,12 @@ stdenv.mkDerivation rec {
|
||||
./installed-tests-path.patch
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
@ -61,6 +68,9 @@ stdenv.mkDerivation rec {
|
||||
gobject-introspection
|
||||
itstool
|
||||
vala
|
||||
gperf
|
||||
] ++ lib.optional (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
|
||||
mesonEmulatorHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -71,7 +81,6 @@ stdenv.mkDerivation rec {
|
||||
libxml2
|
||||
libxmlb
|
||||
libyaml
|
||||
gperf
|
||||
curl
|
||||
];
|
||||
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ zeromq ];
|
||||
propagatedBuildInputs = [ zeromq ];
|
||||
|
||||
cmakeFlags = [
|
||||
# Tests try to download googletest at compile time; there is no option
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grpc";
|
||||
version = "1.52.1"; # N.B: if you change this, please update:
|
||||
version = "1.53.0"; # N.B: if you change this, please update:
|
||||
# pythonPackages.grpcio-tools
|
||||
# pythonPackages.grpcio-status
|
||||
|
||||
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "grpc";
|
||||
repo = "grpc";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-TE4Q2L4TF0bhgQyPcfgYolb5VXDWjOIyt5mv/HNIfTk=";
|
||||
hash = "sha256-YRVWR1woMDoq8TWFrL2nqQvAbtqBnUd3QlfbFTJm8dc=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -902,4 +902,16 @@ rec {
|
||||
platforms = platforms.all;
|
||||
};
|
||||
};
|
||||
|
||||
/* POLISH */
|
||||
|
||||
pl_PL = pl-pl;
|
||||
pl-pl = mkDictFromLibreOffice {
|
||||
shortName = "pl-pl";
|
||||
dictFileName = "pl_PL";
|
||||
shortDescription = "Polish (Poland)";
|
||||
readmeFile = "README_en.txt";
|
||||
# the README doesn't specify versions of licenses :/
|
||||
license = with lib.licenses; [ gpl2Plus lgpl2Plus mpl10 asl20 cc-by-sa-25 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libzim";
|
||||
version = "8.1.0";
|
||||
version = "8.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openzim";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ab7UUF+I0/xaGChvdjylEQRHLOjmtg/wk+/JEGehGLE=";
|
||||
hash = "sha256-t3ssScI66oJ0lT1saAFLJACAZZmfBqZP0EGUM8MykHY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ngtcp2";
|
||||
version = "0.14.0";
|
||||
version = "0.14.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngtcp2";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6XHOMBsgKSVwpTwQlIt+H9tRPF8YBjfOLmHtdC/LVlE=";
|
||||
hash = "sha256-VsacRYvjTWVx2ga952s1vs02GElXIW6umgcYr3UCcgE=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ];
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openexr";
|
||||
version = "3.1.6";
|
||||
version = "3.1.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AcademySoftwareFoundation";
|
||||
repo = "openexr";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-rXiltW7PHvye6bIyhDyo8aaVvssfGOwr9TguaYlLuUc=";
|
||||
sha256 = "sha256-Kl+aOA797aZvrvW4ZQNHdSU7YFPieZEzX3aYeaoH6eU=";
|
||||
};
|
||||
|
||||
outputs = [ "bin" "dev" "out" "doc" ];
|
||||
|
||||
@ -19,6 +19,11 @@
|
||||
}:
|
||||
|
||||
let
|
||||
name-zero = "librocfft-device-0.so.0.1";
|
||||
name-one = "librocfft-device-1.so.0.1";
|
||||
name-two = "librocfft-device-2.so.0.1";
|
||||
name-three = "librocfft-device-3.so.0.1";
|
||||
|
||||
# This is over 3GB, to allow hydra caching we separate it
|
||||
rf = stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rocfft";
|
||||
@ -26,6 +31,10 @@ let
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
"libzero"
|
||||
"libone"
|
||||
"libtwo"
|
||||
"libthree"
|
||||
] ++ lib.optionals buildTests [
|
||||
"test"
|
||||
] ++ lib.optionals buildBenchmarks [
|
||||
@ -58,7 +67,7 @@ let
|
||||
openmp
|
||||
];
|
||||
|
||||
propogatedBuildInputs = lib.optionals buildTests [
|
||||
propagatedBuildInputs = lib.optionals buildTests [
|
||||
fftw
|
||||
fftwFloat
|
||||
];
|
||||
@ -80,7 +89,16 @@ let
|
||||
"-DBUILD_CLIENTS_SAMPLES=ON"
|
||||
];
|
||||
|
||||
postInstall = lib.optionalString buildTests ''
|
||||
postInstall = ''
|
||||
mv $out/lib/${name-zero} $libzero
|
||||
mv $out/lib/${name-one} $libone
|
||||
mv $out/lib/${name-two} $libtwo
|
||||
mv $out/lib/${name-three} $libthree
|
||||
ln -s $libzero $out/lib/${name-zero}
|
||||
ln -s $libone $out/lib/${name-one}
|
||||
ln -s $libtwo $out/lib/${name-two}
|
||||
ln -s $libthree $out/lib/${name-three}
|
||||
'' + lib.optionalString buildTests ''
|
||||
mkdir -p $test/{bin,lib/fftw}
|
||||
cp -a $out/bin/* $test/bin
|
||||
ln -s ${fftw}/lib/libfftw*.so $test/lib/fftw
|
||||
@ -113,23 +131,31 @@ let
|
||||
};
|
||||
});
|
||||
|
||||
rf-zero = runCommand "librocfft-device-0.so.0.1" { preferLocalBuild = true; } ''
|
||||
cp -a ${rf}/lib/$name $out
|
||||
rf-zero = runCommand name-zero { preferLocalBuild = true; } ''
|
||||
cp -a ${rf.libzero} $out
|
||||
'';
|
||||
|
||||
rf-one = runCommand "librocfft-device-1.so.0.1" { preferLocalBuild = true; } ''
|
||||
cp -a ${rf}/lib/$name $out
|
||||
rf-one = runCommand name-one { preferLocalBuild = true; } ''
|
||||
cp -a ${rf.libone} $out
|
||||
'';
|
||||
|
||||
rf-two = runCommand "librocfft-device-2.so.0.1" { preferLocalBuild = true; } ''
|
||||
cp -a ${rf}/lib/$name $out
|
||||
rf-two = runCommand name-two { preferLocalBuild = true; } ''
|
||||
cp -a ${rf.libtwo} $out
|
||||
'';
|
||||
|
||||
rf-three = runCommand "librocfft-device-3.so.0.1" { preferLocalBuild = true; } ''
|
||||
cp -a ${rf}/lib/$name $out
|
||||
rf-three = runCommand name-three { preferLocalBuild = true; } ''
|
||||
cp -a ${rf.libthree} $out
|
||||
'';
|
||||
in stdenv.mkDerivation {
|
||||
inherit (rf) pname version outputs src passthru meta;
|
||||
inherit (rf) pname version src passthru meta;
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
] ++ lib.optionals buildTests [
|
||||
"test"
|
||||
] ++ lib.optionals buildBenchmarks [
|
||||
"benchmark"
|
||||
];
|
||||
|
||||
dontUnpack = true;
|
||||
dontPatch = true;
|
||||
@ -140,10 +166,10 @@ in stdenv.mkDerivation {
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib
|
||||
cp -as ${rf-zero} $out/lib/${rf-zero.name}
|
||||
cp -as ${rf-one} $out/lib/${rf-one.name}
|
||||
cp -as ${rf-two} $out/lib/${rf-two.name}
|
||||
cp -as ${rf-three} $out/lib/${rf-three.name}
|
||||
ln -sf ${rf-zero} $out/lib/${name-zero}
|
||||
ln -sf ${rf-one} $out/lib/${name-one}
|
||||
ln -sf ${rf-two} $out/lib/${name-two}
|
||||
ln -sf ${rf-three} $out/lib/${name-three}
|
||||
cp -an ${rf}/* $out
|
||||
'' + lib.optionalString buildTests ''
|
||||
cp -a ${rf.test} $test
|
||||
|
||||
@ -7,13 +7,34 @@ let
|
||||
coreutils file findutils gawk gnugrep gnused jdk python3 which
|
||||
]) + ":${platform-tools}/platform-tools";
|
||||
in
|
||||
deployAndroidPackage {
|
||||
deployAndroidPackage rec {
|
||||
inherit package os;
|
||||
nativeBuildInputs = [ makeWrapper ]
|
||||
++ lib.optionals stdenv.isLinux [ autoPatchelfHook ];
|
||||
autoPatchelfIgnoreMissingDeps = true;
|
||||
buildInputs = lib.optionals (os == "linux") [ pkgs.zlib ];
|
||||
patchInstructions = ''
|
||||
|
||||
patchElfBnaries = ''
|
||||
# Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling
|
||||
if [ -d $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64 ]; then
|
||||
addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64
|
||||
fi
|
||||
|
||||
if [ -d $out/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib64 ]; then
|
||||
addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib64
|
||||
fi
|
||||
|
||||
find toolchains -type d -name bin -or -name lib64 | while read dir; do
|
||||
autoPatchelf "$dir"
|
||||
done
|
||||
|
||||
# Patch executables
|
||||
if [ -d prebuilt/linux-x86_64 ]; then
|
||||
autoPatchelf prebuilt/linux-x86_64
|
||||
fi
|
||||
'';
|
||||
|
||||
patchOsAgnostic = ''
|
||||
patchShebangs .
|
||||
|
||||
# TODO: allow this stuff
|
||||
@ -22,47 +43,31 @@ deployAndroidPackage {
|
||||
# Ndk now has a prebuilt toolchains inside, the file layout has changed, we do a symlink
|
||||
# to still support the old standalone toolchains builds.
|
||||
if [ -d $out/libexec/android-sdk/ndk ] && [ ! -d $out/libexec/android-sdk/ndk-bundle ]; then
|
||||
ln -sf $out/libexec/android-sdk/ndk/${package.revision} $out/libexec/android-sdk/ndk-bundle
|
||||
ln -sf $out/libexec/android-sdk/ndk/${package.revision} $out/libexec/android-sdk/ndk-bundle
|
||||
elif [ ! -d $out/libexec/android-sdk/ndk-bundle ]; then
|
||||
echo "The ndk-bundle layout has changed. The nix expressions have to be updated!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling
|
||||
if [ -d $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64 ]; then
|
||||
addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64
|
||||
fi
|
||||
|
||||
if [ -d $out/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib64 ]; then
|
||||
addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/lib64
|
||||
fi
|
||||
|
||||
if [ -d toolchains/llvm/prebuilt/linux-x86_64 ]; then
|
||||
find toolchains/llvm/prebuilt/linux-x86_64 -type d -name bin -or -name lib64 | while read dir; do
|
||||
autoPatchelf "$dir"
|
||||
done
|
||||
echo "The ndk-bundle layout has changed. The nix expressions have to be updated!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# fix ineffective PROGDIR / MYNDKDIR determination
|
||||
for progname in ndk-build; do
|
||||
sed -i -e 's|^PROGDIR=`dirname $0`|PROGDIR=`dirname $(readlink -f $(which $0))`|' $progname
|
||||
sed -i -e 's|^PROGDIR=`dirname $0`|PROGDIR=`dirname $(readlink -f $(which $0))`|' $progname
|
||||
done
|
||||
|
||||
# Patch executables
|
||||
if [ -d prebuilt/linux-x86_64 ]; then
|
||||
autoPatchelf prebuilt/linux-x86_64
|
||||
fi
|
||||
|
||||
# wrap
|
||||
for progname in ndk-build; do
|
||||
wrapProgram "$(pwd)/$progname" --prefix PATH : "${runtime_paths}"
|
||||
wrapProgram "$(pwd)/$progname" --prefix PATH : "${runtime_paths}"
|
||||
done
|
||||
|
||||
# make some executables available in PATH
|
||||
mkdir -p $out/bin
|
||||
for progname in ndk-build; do
|
||||
ln -sf ../libexec/android-sdk/ndk-bundle/$progname $out/bin/$progname
|
||||
ln -sf ../libexec/android-sdk/ndk-bundle/$progname $out/bin/$progname
|
||||
done
|
||||
'';
|
||||
|
||||
patchInstructions = patchOsAgnostic
|
||||
+ lib.optionalString stdenv.isLinux patchElfBnaries;
|
||||
|
||||
noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script
|
||||
}
|
||||
|
||||
20
pkgs/development/nim-packages/nimraylib-now/default.nix
Normal file
20
pkgs/development/nim-packages/nimraylib-now/default.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ lib, nimPackages, fetchFromGitHub }:
|
||||
|
||||
nimPackages.buildNimPackage rec {
|
||||
pname = "nimraylib-now";
|
||||
version = "0.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greenfork";
|
||||
repo = "nimraylib_now";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-18YiAzJ46dpD5JN+gH0MWKchZ5YLPBNcm9eVFnyy2Sw=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/greenfork/nimraylib_now";
|
||||
description = "The Ultimate Raylib gaming library wrapper for Nim";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ annaaurora ];
|
||||
};
|
||||
}
|
||||
@ -412,14 +412,13 @@ final: prev: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz";
|
||||
sha512 = "sha512-4zZmBXssPUEiX+GeL0MUq/Yyie4ltiKmGu7jCJFnYMamNrrulTBc+D+QwAQSJ01tyzeGHlD13kOnqPwRipnlNw==";
|
||||
hash = "sha512-xqVper4mbwl32BWzLpdznHAYvYDWQQWK2tBfXjdUD397XaveRyAP7SkBZ6kFlIg8kKayF4hvuaVtYwXd9BodAg==";
|
||||
};
|
||||
postInstall = with pkgs; ''
|
||||
wrapProgram "$out/bin/prisma" \
|
||||
--set PRISMA_MIGRATION_ENGINE_BINARY ${prisma-engines}/bin/migration-engine \
|
||||
--set PRISMA_QUERY_ENGINE_BINARY ${prisma-engines}/bin/query-engine \
|
||||
--set PRISMA_QUERY_ENGINE_LIBRARY ${lib.getLib prisma-engines}/lib/libquery_engine.node \
|
||||
--set PRISMA_INTROSPECTION_ENGINE_BINARY ${prisma-engines}/bin/introspection-engine \
|
||||
--set PRISMA_FMT_BINARY ${prisma-engines}/bin/prisma-fmt
|
||||
'';
|
||||
|
||||
|
||||
@ -2,19 +2,19 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "ocaml-version";
|
||||
version = "3.4.0";
|
||||
version = "3.6.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-v${version}.tbz";
|
||||
sha256 = "sha256-2MG+tejY67dxC19DTOZqPsi3UrHk1rqHxP4nRSvbiiU=";
|
||||
url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz";
|
||||
hash = "sha256-AKCaXUehJ3V8uET1tUDDbIzI8lZv5aygxhIbR21xnTI=";
|
||||
};
|
||||
|
||||
checkInputs = [ alcotest ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
minimumOCamlVersion = "4.07";
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.07";
|
||||
duneVersion = "3";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Manipulate, parse and generate OCaml compiler version strings";
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "adb-enhanced";
|
||||
version = "2.5.16";
|
||||
version = "2.5.18";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
owner = "ashishb";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-+CMXKg3LLxEXGcFQ9zSqy/1HPZS9MsQ1fZxClJ0Vrnw=";
|
||||
hash = "sha256-xsl8AentI4Tqo2mHWFRi6myyb0/MemATJz9erKN9eKQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiolifx-effects";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "aiolifx_effects";
|
||||
hash = "sha256-yh0Nv1r5a5l6unn9qnLjSqct/ZzUuPT6cNebVDMMfUw=";
|
||||
hash = "sha256-Mhxs5PNr2W9ych56WYUZTEGck4HVTQfkil3S3zHv6Qc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiolifx-themes";
|
||||
version = "0.4.2";
|
||||
version = "0.4.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "Djelibeybi";
|
||||
repo = "aiolifx-themes";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-6bbhjmtgGEifYmtgXrnsCF36oU+jJDmHMPPEO5a7AKQ=";
|
||||
hash = "sha256-df3FQdOa3C8eQfgFi+sh7+/GBpE+4B5gOI+3XDQLHEs=";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
25
pkgs/development/python-modules/boa-api/default.nix
Normal file
25
pkgs/development/python-modules/boa-api/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boa-api";
|
||||
version = "0.1.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boalang";
|
||||
repo = "api-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8tt68NLi5ewSKiHdu3gDawTBPylbDmB4zlUUqa7EQuY=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [ "boaapi" ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/boalang/api-python";
|
||||
description = "Python client API for communicating with Boa's (https://boa.cs.iastate.edu/) XML-RPC based services";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ swflint ];
|
||||
};
|
||||
}
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "datasets";
|
||||
version = "2.10.1";
|
||||
version = "2.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
owner = "huggingface";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-CLzEJchNKmwfN1ZRQfCFusXDSgvHilwnM0KkcX822MI=";
|
||||
hash = "sha256-vnKd7KapejcZN1RHNMpH4rrpz2P2DcfiyI33I0wiE+0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "goodwe";
|
||||
version = "0.2.29";
|
||||
version = "0.2.30";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "marcelblijleven";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ukKMWdyaOALA3e68cYilS8TT6aHV3n8qQXobgDTeT2o=";
|
||||
hash = "sha256-vtQK02LofAHYzqYIHcSdbXDEHHlvGt8iaNP2rx+2zwI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-firestore";
|
||||
version = "2.10.0";
|
||||
version = "2.10.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-iCwYBZhWfheyYTOm2IQIXr3OXyoi4FWNykzzbWV+5wY=";
|
||||
hash = "sha256-JrM4asHN40vTuigojvT2lqI2iDuC8je9Yr8i10pU1aU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-iam";
|
||||
version = "2.11.2";
|
||||
version = "2.12.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-viN/BiIYmE83B1JMh5THgj2/HLGOeIotDVLdTODZBAg=";
|
||||
hash = "sha256-lfT4lgW4n3k5Fs2Owng8JoHGYDwjoKTzaKhEf35O+VA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-monitoring";
|
||||
version = "2.14.1";
|
||||
version = "2.14.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-FKg2nEmc5mYKSWJwV0wG09kK4ZQl+Tan+9BqbwJ/8eA=";
|
||||
hash = "sha256-5v2hMJeeLo11mrcNZCe1lISBlIyW9f1KQjcLqWoRlZs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-secret-manager";
|
||||
version = "2.16.0";
|
||||
version = "2.16.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-O1K5qd82o+PnzWZ40GC+0PSgWzZvp5hl7ImFxRgx5Ww=";
|
||||
hash = "sha256-FJ0Rzpvn6oHUrDVE0/zUxxap7bLLd12cB1IxVwsHn7s=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-securitycenter";
|
||||
version = "1.19.0";
|
||||
version = "1.19.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-97KZK9O/+Ul2hnXh1s2HeoQQd4CFcQjJ9HC6fP2ZEgc=";
|
||||
hash = "sha256-xI9CFp3esSxOsOsO5mVWUkMROpuX2QjzKVhKCBUpDhc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user