ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-05 20:19:16 +03:00
Code Issues Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2024-06-13 18:02:02 +00:00 committed by GitHub
commit 5bcad2c689
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
82 changed files with 1500 additions and 1903 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
maintainers/maintainer-list.nix
View File

@ -12590,6 +12590,15 @@
githubId = 2321672;
name = "Makise Kurisu";
};
Makuru = {
email = "makuru@makuru.org";
github = "makuru-dd";
githubId = 58048293;
name = "Makuru";
keys = [{
fingerprint = "5B22 7123 362F DEF1 8F79 BF2B 4792 3A0F EEB5 51C7";
}];
};
malbarbo = {
email = "malbarbo@gmail.com";
github = "malbarbo";
@ -21139,6 +21148,12 @@
github = "tpwrules";
githubId = 208010;
};
traverseda = {
email = "traverse.da@gmail.com";
github = "traverseda";
githubId = 2125828;
name = "Alex Davies";
};
travisbhartwell = {
email = "nafai@travishartwell.net";
github = "travisbhartwell";

198
nixos/modules/services/networking/wstunnel.nix
View File

@ -7,6 +7,9 @@ let
(name: value: if value == true then "--${name}" else "--${name}=${value}")
attrs
);
hostPortToString = { host, port }: "${host}:${builtins.toString port}";
hostPortSubmodule = {
options = {
host = mkOption {
@ -19,28 +22,7 @@ let
};
};
};
localRemoteSubmodule = {
options = {
local = mkOption {
description = "Local address and port to listen on.";
type = types.submodule hostPortSubmodule;
example = {
host = "127.0.0.1";
port = 51820;
};
};
remote = mkOption {
description = "Address and port on remote to forward traffic to.";
type = types.submodule hostPortSubmodule;
example = {
host = "127.0.0.1";
port = 51820;
};
};
};
};
hostPortToString = { host, port }: "${host}:${builtins.toString port}";
localRemoteToString = { local, remote }: utils.escapeSystemdExecArg "${hostPortToString local}:${hostPortToString remote}";
commonOptions = {
enable = mkOption {
description = "Whether to enable this `wstunnel` instance.";
@ -66,10 +48,16 @@ let
};
};
verboseLogging = mkOption {
description = "Enable verbose logging.";
type = types.bool;
default = false;
loggingLevel = mkOption {
description = ''
Passed to --log-lvl
Control the log verbosity. i.e: TRACE, DEBUG, INFO, WARN, ERROR, OFF
For more details, checkout [EnvFilter](https://docs.rs/tracing-subscriber/latest/tracing_subscriber/filter/struct.EnvFilter.html#example-syntax)
'';
type = types.nullOr types.str;
example = "INFO";
default = null;
};
environmentFile = mkOption {
@ -99,11 +87,12 @@ let
restrictTo = mkOption {
description = "Accepted traffic will be forwarded only to this service. Set to `null` to allow forwarding to arbitrary addresses.";
type = types.nullOr (types.submodule hostPortSubmodule);
example = {
type = types.listOf (types.submodule hostPortSubmodule);
default = [];
example = [{
host = "127.0.0.1";
port = 51820;
};
}];
};
enableHTTPS = mkOption {
@ -134,59 +123,36 @@ let
};
};
};
clientSubmodule = { config, ... }: {
options = commonOptions // {
connectTo = mkOption {
description = "Server address and port to connect to.";
type = types.submodule hostPortSubmodule;
example = {
host = "example.com";
};
};
enableHTTPS = mkOption {
description = "Enable HTTPS when connecting to the server.";
type = types.bool;
default = true;
type = types.str;
example = "https://wstunnel.server.com:8443";
};
localToRemote = mkOption {
description = "Local hosts and ports to listen on, plus the hosts and ports on remote to forward traffic to. Setting a local port to a value less than 1024 will additionally give the process the required CAP_NET_BIND_SERVICE capability.";
type = types.listOf (types.submodule localRemoteSubmodule);
description = ''Listen on local and forwards traffic from remote.'';
type = types.listOf (types.str);
default = [];
example = [ {
local = {
host = "127.0.0.1";
port = 8080;
};
remote = {
host = "127.0.0.1";
port = 8080;
};
} ];
example = [
"tcp://1212:google.com:443"
"unix:///tmp/wstunnel.sock:g.com:443"
];
};
dynamicToRemote = mkOption {
description = "Host and port for the SOCKS5 proxy to dynamically forward traffic to. Leave this at `null` to disable the SOCKS5 proxy. Setting the port to a value less than 1024 will additionally give the service the required CAP_NET_BIND_SERVICE capability.";
type = types.nullOr (types.submodule hostPortSubmodule);
default = null;
example = {
host = "127.0.0.1";
port = 1080;
};
remoteToLocal = mkOption {
description = "Listen on remote and forwards traffic from local. Only tcp is supported";
type = types.listOf (types.str);
default = [];
example = [
"tcp://1212:google.com:443"
"unix://wstunnel.sock:g.com:443"
];
};
udp = mkOption {
description = "Whether to forward UDP instead of TCP traffic.";
type = types.bool;
default = false;
};
udpTimeout = mkOption {
description = "When using UDP forwarding, timeout in seconds after which the tunnel connection is closed. `-1` means no timeout.";
type = types.int;
default = 30;
};
addNetBind = mkEnableOption "Whether add CAP_NET_BIND_SERVICE to the tunnel service, this should be enabled if you want to bind port < 1024";
httpProxy = mkOption {
description = ''
@ -214,12 +180,6 @@ let
example = "wstunnel";
};
hostHeader = mkOption {
description = "Use this as the HTTP host header instead of the real hostname. Useful for circumventing hostname-based firewalls.";
type = types.nullOr types.str;
default = null;
};
tlsSNI = mkOption {
description = "Use this as the SNI while connecting via TLS. Useful for circumventing hostname-based firewalls.";
type = types.nullOr types.str;
@ -234,7 +194,7 @@ let
# The original argument name `websocketPingFrequency` is a misnomer, as the frequency is the inverse of the interval.
websocketPingInterval = mkOption {
description = "Do a heartbeat ping every N seconds to keep up the websocket connection.";
description = "Frequency at which the client will send websocket ping to the server.";
type = types.nullOr types.ints.unsigned;
default = null;
};
@ -261,6 +221,7 @@ let
};
};
};
generateServerUnit = name: serverCfg: {
name = "wstunnel-server-${name}";
value = {
@ -282,11 +243,11 @@ let
else tlsKey;
in ''
${package}/bin/wstunnel \
--server \
${optionalString (restrictTo != null) "--restrictTo=${utils.escapeSystemdExecArg (hostPortToString restrictTo)}"} \
${optionalString (resolvedTlsCertificate != null) "--tlsCertificate=${utils.escapeSystemdExecArg resolvedTlsCertificate}"} \
${optionalString (resolvedTlsKey != null) "--tlsKey=${utils.escapeSystemdExecArg resolvedTlsKey}"} \
${optionalString verboseLogging "--verbose"} \
server \
${concatStringsSep " " (builtins.map (hostPair: "--restrict-to ${utils.escapeSystemdExecArg (hostPortToString hostPair)}") restrictTo)} \
${optionalString (resolvedTlsCertificate != null) "--tls-certificate ${utils.escapeSystemdExecArg resolvedTlsCertificate}"} \
${optionalString (resolvedTlsKey != null) "--tls-private-key ${utils.escapeSystemdExecArg resolvedTlsKey}"} \
${optionalString (loggingLevel != null) "--log-lvl ${loggingLevel}"} \
${attrsToArgs extraArgs} \
${utils.escapeSystemdExecArg "${if enableHTTPS then "wss" else "ws"}://${hostPortToString listen}"}
'';
@ -304,10 +265,10 @@ let
ProtectControlGroups = true;
PrivateDevices = true;
RestrictSUIDSGID = true;
};
};
};
generateClientUnit = name: clientCfg: {
name = "wstunnel-client-${name}";
value = {
@ -319,28 +280,25 @@ let
serviceConfig = {
Type = "simple";
ExecStart = with clientCfg; ''
${package}/bin/wstunnel \
${concatStringsSep " " (builtins.map (x: "--localToRemote=${localRemoteToString x}") localToRemote)} \
${concatStringsSep " " (mapAttrsToList (n: v: "--customHeaders=\"${n}: ${v}\"") customHeaders)} \
${optionalString (dynamicToRemote != null) "--dynamicToRemote=${utils.escapeSystemdExecArg (hostPortToString dynamicToRemote)}"} \
${optionalString udp "--udp"} \
${optionalString (httpProxy != null) "--httpProxy=${httpProxy}"} \
${optionalString (soMark != null) "--soMark=${toString soMark}"} \
${optionalString (upgradePathPrefix != null) "--upgradePathPrefix=${upgradePathPrefix}"} \
${optionalString (hostHeader != null) "--hostHeader=${hostHeader}"} \
${optionalString (tlsSNI != null) "--tlsSNI=${tlsSNI}"} \
${optionalString tlsVerifyCertificate "--tlsVerifyCertificate"} \
${optionalString (websocketPingInterval != null) "--websocketPingFrequency=${toString websocketPingInterval}"} \
${optionalString (upgradeCredentials != null) "--upgradeCredentials=${upgradeCredentials}"} \
--udpTimeoutSec=${toString udpTimeout} \
${optionalString verboseLogging "--verbose"} \
${package}/bin/wstunnel client \
${concatStringsSep " " (builtins.map (x: "--local-to-remote ${x}") localToRemote)} \
${concatStringsSep " " (builtins.map (x: "--remote-to-local ${x}") remoteToLocal)} \
${concatStringsSep " " (mapAttrsToList (n: v: "--http-headers \"${n}: ${v}\"") customHeaders)} \
${optionalString (httpProxy != null) "--http-proxy ${httpProxy}"} \
${optionalString (soMark != null) "--socket-so-mark=${toString soMark}"} \
${optionalString (upgradePathPrefix != null) "--http-upgrade-path-prefix ${upgradePathPrefix}"} \
${optionalString (tlsSNI != null) "--tls-sni-override ${tlsSNI}"} \
${optionalString tlsVerifyCertificate "--tls-verify-certificate"} \
${optionalString (websocketPingInterval != null) "--websocket-ping-frequency-sec ${toString websocketPingInterval}"} \
${optionalString (upgradeCredentials != null) "--http-upgrade-credentials ${upgradeCredentials}"} \
${optionalString (loggingLevel != null) "--log-lvl ${loggingLevel}"} \
${attrsToArgs extraArgs} \
${utils.escapeSystemdExecArg "${if enableHTTPS then "wss" else "ws"}://${hostPortToString connectTo}"}
${utils.escapeSystemdExecArg connectTo}
'';
EnvironmentFile = optional (clientCfg.environmentFile != null) clientCfg.environmentFile;
DynamicUser = true;
PrivateTmp = true;
AmbientCapabilities = (optionals (clientCfg.soMark != null) [ "CAP_NET_ADMIN" ]) ++ (optionals ((clientCfg.dynamicToRemote.port or 1024) < 1024 || (any (x: x.local.port < 1024) clientCfg.localToRemote)) [ "CAP_NET_BIND_SERVICE" ]);
AmbientCapabilities = (optionals (clientCfg.soMark != null) [ "CAP_NET_ADMIN" ]) ++ (optionals (clientCfg.addNetBind) [ "CAP_NET_BIND_SERVICE" ]);
NoNewPrivileges = true;
RestrictNamespaces = "uts ipc pid user cgroup";
ProtectSystem = "strict";
@ -363,14 +321,17 @@ in {
default = {};
example = {
"wg-tunnel" = {
listen.port = 8080;
listen = {
host = "0.0.0.0";
port = 8080;
};
enableHTTPS = true;
tlsCertificate = "/var/lib/secrets/fullchain.pem";
tlsKey = "/var/lib/secrets/key.pem";
restrictTo = {
restrictTo = [{
host = "127.0.0.1";
port = 51820;
};
}];
};
};
};
@ -381,22 +342,15 @@ in {
default = {};
example = {
"wg-tunnel" = {
connectTo = {
host = "example.com";
port = 8080;
};
enableHTTPS = true;
localToRemote = {
local = {
host = "127.0.0.1";
port = 51820;
};
remote = {
host = "127.0.0.1";
port = 51820;
};
};
udp = true;
connectTo = "https://wstunnel.server.com:8443";
localToRemote = [
"tcp://1212:google.com:443"
"tcp://2:n.lan:4?proxy_protocol"
];
remoteToLocal = [
"socks5://[::1]:1212"
"unix://wstunnel.sock:g.com:443"
];
};
};
};
@ -418,12 +372,12 @@ in {
'';
}) cfg.servers) ++
(mapAttrsToList (name: clientCfg: {
assertion = !(clientCfg.localToRemote == [] && clientCfg.dynamicToRemote == null);
assertion = !(clientCfg.localToRemote == [] && clientCfg.remoteToLocal == []);
message = ''
Either one of services.wstunnel.clients."${name}".localToRemote or services.wstunnel.clients."${name}".dynamicToRemote must be set.
Either one of services.wstunnel.clients."${name}".localToRemote or services.wstunnel.clients."${name}".remoteToLocal must be set.
'';
}) cfg.clients);
};
meta.maintainers = with maintainers; [ alyaeanyx ];
meta.maintainers = with maintainers; [ alyaeanyx neverbehave ];
}

35
nixos/modules/system/etc/build-composefs-dump.py
View File

@ -175,7 +175,7 @@ def main() -> None:
paths[glob_target] = composefs_path
add_leading_directories(glob_target, attrs, paths)
else: # Without globbing
if mode == "symlink":
if mode == "symlink" or mode == "direct-symlink":
composefs_path = ComposefsPath(
attrs,
# A high approximation of the size of a symlink
@ -184,24 +184,23 @@ def main() -> None:
mode="0777",
payload=source,
)
elif os.path.isdir(source):
composefs_path = ComposefsPath(
attrs,
size=4096,
filetype=FileType.directory,
mode=mode,
payload=source,
)
else:
if os.path.isdir(source):
composefs_path = ComposefsPath(
attrs,
size=4096,
filetype=FileType.directory,
mode=mode,
payload=source,
)
else:
composefs_path = ComposefsPath(
attrs,
size=os.stat(source).st_size,
filetype=FileType.file,
mode=mode,
# payload needs to be relative path in this case
payload=target.lstrip("/"),
)
composefs_path = ComposefsPath(
attrs,
size=os.stat(source).st_size,
filetype=FileType.file,
mode=mode,
# payload needs to be relative path in this case
payload=target.lstrip("/"),
)
paths[target] = composefs_path
add_leading_directories(target, attrs, paths)

2
nixos/modules/system/etc/etc.nix
View File

@ -62,7 +62,7 @@ let
]) etc'}
'';
etcHardlinks = filter (f: f.mode != "symlink") etc';
etcHardlinks = filter (f: f.mode != "symlink" && f.mode != "direct-symlink") etc';
build-composefs-dump = pkgs.runCommand "build-composefs-dump.py"
{

4
nixos/tests/activation/etc-overlay-immutable.nix
View File

@ -13,6 +13,7 @@
users.mutableUsers = false;
boot.initrd.systemd.enable = true;
boot.kernelPackages = pkgs.linuxPackages_latest;
time.timeZone = "Utc";
specialisation.new-generation.configuration = {
environment.etc."newgen".text = "newgen";
@ -23,6 +24,9 @@
with subtest("/etc is mounted as an overlay"):
machine.succeed("findmnt --kernel --type overlay /etc")
with subtest("direct symlinks point to the target without indirection"):
assert machine.succeed("readlink -n /etc/localtime") == "/etc/zoneinfo/Utc"
with subtest("switching to the same generation"):
machine.succeed("/run/current-system/bin/switch-to-configuration test")

4
pkgs/applications/blockchains/quorum/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "quorum";
version = "24.4.0";
version = "24.4.1";
src = fetchFromGitHub {
owner = "Consensys";
repo = pname;
rev = "v${version}";
hash = "sha256-vQyKguoSUU6Drkg8XqWtK8Ow/B9dqDKkKq6yeDQk1c0=";
hash = "sha256-pW8I4ivcKo6dsa8rQVKU6nUZuKxaki/7cMDKwEsSzNw=";
};
vendorHash = "sha256-YK2zpQz4pAFyA+aHOn6Nx0htl5SJ2HNC+TDV1RdLQJk=";

2
pkgs/applications/misc/whalebird/default.nix
View File

@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
homepage = "https://whalebird.social";
changelog = "https://github.com/h3poteto/whalebird-desktop/releases/tag/v${version}";
license = licenses.gpl3Only;
maintainers = with maintainers; [ wolfangaukang colinsane weathercold ];
maintainers = with maintainers; [ wolfangaukang weathercold ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
};
}

6
pkgs/applications/networking/cluster/helm/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "kubernetes-helm";
version = "3.15.1";
version = "3.15.2";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
sha256 = "sha256-DTHohUkL4ophYeXSZ/acle6Ruum9IIHxnu7gvPOOaYY=";
sha256 = "sha256-gZfL9ejW9Md5X1S8Zvlc4OpywJfU2rlT+p78imgPjpw=";
};
vendorHash = "sha256-VPahAeeRz3fk1475dlCofiLVAKXMhpvspENmQmlPyPM=";
vendorHash = "sha256-2q5IziYSW2FFfRZvWKz6dVnJfauRlE9lRrb4/l2EGC0=";
subPackages = [ "cmd/helm" ];
ldflags = [

6
pkgs/applications/networking/cluster/kubectl-cnpg/default.nix
View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "kubectl-cnpg";
version = "1.23.1";
version = "1.23.2";
src = fetchFromGitHub {
owner = "cloudnative-pg";
repo = "cloudnative-pg";
rev = "v${version}";
hash = "sha256-sh9ogECNEZ6AYhdJD87ELnr8E0iWPLhDu3Qkdpb2194=";
hash = "sha256-/h2hvyjC/rHOkyZbt0kYn0TcQeXutU4rxYBD7Mh948Q=";
};
vendorHash = "sha256-3yh6b0dB2JC0t2EwykWiLk6glyKUhTpqmqvfFZ4RekE=";
vendorHash = "sha256-MY4yU0UpN3V3RxsFWqxZOsZZA1kma3NNTHE9e/gquno=";
subPackages = [ "cmd/kubectl-cnpg" ];

6
pkgs/applications/networking/instant-messengers/twitch-tui/default.nix
View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "twitch-tui";
version = "2.6.10";
version = "2.6.11";
src = fetchFromGitHub {
owner = "Xithrius";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-RJ/+yXbCS8DkdvblBYlxE4sStpTQcGQZXWAApdL7/2o=";
hash = "sha256-3Ibf9UULQ0NQ6+oVvLVxUsSSaQ4ilxLehBPZhkrzILQ=";
};
cargoHash = "sha256-lI0HR0iNA2C0kf+oBLxxjcOhsf70wCo3tKPMAC76EZM=";
cargoHash = "sha256-GK9P+IytkfhfogvPLuYF9+ngs2vr6Quv+v+Rai2cgx8=";
nativeBuildInputs = [
pkg-config

553
pkgs/applications/networking/mumble/0001-BUILD-crypto-Migrate-to-OpenSSL-3.0-compatible-API.patch
View File

@ -1,553 +0,0 @@
From f4cea62ed95e4967d8591f25e903f5e8fc2e2a30 Mon Sep 17 00:00:00 2001
From: Terry Geng <terry@terriex.com>
Date: Mon, 6 Dec 2021 10:45:11 -0500
Subject: [PATCH] BUILD(crypto): Migrate to OpenSSL 3.0-compatible API
OpenSSL 3.0 deprecated several low-level APIs and the usage of them
caused errors/warnings that prevent the binary from being built against
OpenSSL 3.0.
Some primitive efforts have been made in #5317 but were incomplete.
This commit follows https://www.openssl.org/docs/man3.0/man7/migration_guide.html,
https://code.woboq.org/qt6/qtopcua/src/opcua/x509/qopcuakeypair_openssl.cpp.html,
and clears all errors/warnings related to the usage of deprecated APIs.
Fixes #5277
Fixes #4266
---
src/SelfSignedCertificate.cpp | 235 +++++++++++-----------------------
src/SelfSignedCertificate.h | 5 +
src/crypto/CryptStateOCB2.cpp | 53 +++++---
src/crypto/CryptStateOCB2.h | 9 +-
4 files changed, 121 insertions(+), 181 deletions(-)
diff --git a/src/SelfSignedCertificate.cpp b/src/SelfSignedCertificate.cpp
index a77e5fad9..ea0dec4cc 100644
--- a/src/SelfSignedCertificate.cpp
+++ b/src/SelfSignedCertificate.cpp
@@ -5,8 +5,6 @@
#include "SelfSignedCertificate.h"
-#include <openssl/x509v3.h>
-
#define SSL_STRING(x) QString::fromLatin1(x).toUtf8().data()
static int add_ext(X509 *crt, int nid, char *value) {
@@ -28,108 +26,86 @@ static int add_ext(X509 *crt, int nid, char *value) {
return 1;
}
-bool SelfSignedCertificate::generate(CertificateType certificateType, QString clientCertName, QString clientCertEmail,
- QSslCertificate &qscCert, QSslKey &qskKey) {
- bool ok = true;
- X509 *x509 = nullptr;
- EVP_PKEY *pkey = nullptr;
- RSA *rsa = nullptr;
- BIGNUM *e = nullptr;
- X509_NAME *name = nullptr;
- ASN1_INTEGER *serialNumber = nullptr;
- ASN1_TIME *notBefore = nullptr;
- ASN1_TIME *notAfter = nullptr;
- QString commonName;
- bool isServerCert = certificateType == CertificateTypeServerCertificate;
-
- if (CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON) == -1) {
- ok = false;
- goto out;
+EVP_PKEY *SelfSignedCertificate::generate_rsa_keypair() {
+ EVP_PKEY *pkey = EVP_PKEY_new();
+ if (!pkey) {
+ return nullptr;
}
- x509 = X509_new();
- if (!x509) {
- ok = false;
- goto out;
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA, nullptr);
+ if (!ctx) {
+ return nullptr;
}
-
- pkey = EVP_PKEY_new();
- if (!pkey) {
- ok = false;
- goto out;
+ if (EVP_PKEY_keygen_init(ctx) <= 0) {
+ return nullptr;
}
-
- rsa = RSA_new();
+ if (EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, 2048) <= 0) {
+ return nullptr;
+ }
+ if (EVP_PKEY_keygen(ctx, &pkey) <= 0) {
+ return nullptr;
+ }
+ EVP_PKEY_CTX_free(ctx);
+#else
+ RSA *rsa = RSA_new();
+ BIGNUM *e = BN_new();
if (!rsa) {
- ok = false;
- goto out;
+ return nullptr;
}
-
- e = BN_new();
if (!e) {
- ok = false;
- goto out;
+ return nullptr;
}
if (BN_set_word(e, 65537) == 0) {
- ok = false;
- goto out;
+ return nullptr;
}
-
if (RSA_generate_key_ex(rsa, 2048, e, nullptr) == 0) {
- ok = false;
- goto out;
+ return nullptr;
}
-
if (EVP_PKEY_assign_RSA(pkey, rsa) == 0) {
- ok = false;
- goto out;
+ return nullptr;
}
+ BN_free(e);
+ RSA_free(rsa);
+#endif
+ return pkey;
+}
- if (X509_set_version(x509, 2) == 0) {
- ok = false;
- goto out;
+#define CHECK(statement) \
+ if (!(statement)) { \
+ ok = false; \
+ goto out; \
}
- serialNumber = X509_get_serialNumber(x509);
- if (!serialNumber) {
- ok = false;
- goto out;
- }
- if (ASN1_INTEGER_set(serialNumber, 1) == 0) {
- ok = false;
- goto out;
- }
- notBefore = X509_get_notBefore(x509);
- if (!notBefore) {
- ok = false;
- goto out;
- }
- if (!X509_gmtime_adj(notBefore, 0)) {
- ok = false;
- goto out;
- }
+bool SelfSignedCertificate::generate(CertificateType certificateType, QString clientCertName, QString clientCertEmail,
+ QSslCertificate &qscCert, QSslKey &qskKey) {
+ bool ok = true;
+ EVP_PKEY *pkey = nullptr;
+ X509 *x509 = nullptr;
+ X509_NAME *name = nullptr;
+ ASN1_INTEGER *serialNumber = nullptr;
+ ASN1_TIME *notBefore = nullptr;
+ ASN1_TIME *notAfter = nullptr;
+ QString commonName;
+ bool isServerCert = certificateType == CertificateTypeServerCertificate;
- notAfter = X509_get_notAfter(x509);
- if (!notAfter) {
- ok = false;
- goto out;
- }
- if (!X509_gmtime_adj(notAfter, 60 * 60 * 24 * 365 * 20)) {
- ok = false;
- goto out;
- }
+ // In Qt 5.15, a class was added to wrap up the procedures of generating a self-signed certificate.
+ // See https://doc.qt.io/qt-5/qopcuax509certificatesigningrequest.html.
+ // We should consider migrating to this class after switching to Qt 5.15.
- if (X509_set_pubkey(x509, pkey) == 0) {
- ok = false;
- goto out;
- }
+ CHECK(pkey = generate_rsa_keypair());
- name = X509_get_subject_name(x509);
- if (!name) {
- ok = false;
- goto out;
- }
+ CHECK(x509 = X509_new());
+ CHECK(X509_set_version(x509, 2));
+ CHECK(serialNumber = X509_get_serialNumber(x509));
+ CHECK(ASN1_INTEGER_set(serialNumber, 1));
+ CHECK(notBefore = X509_get_notBefore(x509));
+ CHECK(X509_gmtime_adj(notBefore, 0));
+ CHECK(notAfter = X509_get_notAfter(x509));
+ CHECK(X509_gmtime_adj(notAfter, 60 * 60 * 24 * 365 * 20))
+ CHECK(X509_set_pubkey(x509, pkey));
+ CHECK(name = X509_get_subject_name(x509));
if (isServerCert) {
commonName = QLatin1String("Murmur Autogenerated Certificate v2");
@@ -141,120 +117,63 @@ bool SelfSignedCertificate::generate(CertificateType certificateType, QString cl
}
}
- if (X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_UTF8,
- reinterpret_cast< unsigned char * >(commonName.toUtf8().data()), -1, -1, 0)
- == 0) {
- ok = false;
- goto out;
- }
+ CHECK(X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_UTF8,
+ reinterpret_cast< unsigned char * >(commonName.toUtf8().data()), -1, -1, 0));
- if (X509_set_issuer_name(x509, name) == 0) {
- ok = false;
- goto out;
- }
+ CHECK(X509_set_issuer_name(x509, name));
- if (add_ext(x509, NID_basic_constraints, SSL_STRING("critical,CA:FALSE")) == 0) {
- ok = false;
- goto out;
- }
+ CHECK(add_ext(x509, NID_basic_constraints, SSL_STRING("critical,CA:FALSE")));
if (isServerCert) {
- if (add_ext(x509, NID_ext_key_usage, SSL_STRING("serverAuth,clientAuth")) == 0) {
- ok = false;
- goto out;
- }
+ CHECK(add_ext(x509, NID_ext_key_usage, SSL_STRING("serverAuth,clientAuth")))
} else {
- if (add_ext(x509, NID_ext_key_usage, SSL_STRING("clientAuth")) == 0) {
- ok = false;
- goto out;
- }
+ CHECK(add_ext(x509, NID_ext_key_usage, SSL_STRING("clientAuth")));
}
- if (add_ext(x509, NID_subject_key_identifier, SSL_STRING("hash")) == 0) {
- ok = false;
- goto out;
- }
+ CHECK(add_ext(x509, NID_subject_key_identifier, SSL_STRING("hash")));
if (isServerCert) {
- if (add_ext(x509, NID_netscape_comment, SSL_STRING("Generated from murmur")) == 0) {
- ok = false;
- goto out;
- }
+ CHECK(add_ext(x509, NID_netscape_comment, SSL_STRING("Generated from murmur")));
} else {
- if (add_ext(x509, NID_netscape_comment, SSL_STRING("Generated by Mumble")) == 0) {
- ok = false;
- goto out;
- }
+ CHECK(add_ext(x509, NID_netscape_comment, SSL_STRING("Generated by Mumble")));
}
if (!isServerCert) {
if (!clientCertEmail.trimmed().isEmpty()) {
- if (add_ext(x509, NID_subject_alt_name,
- QString::fromLatin1("email:%1").arg(clientCertEmail).toUtf8().data())
- == 0) {
- ok = false;
- goto out;
- }
+ CHECK(add_ext(x509, NID_subject_alt_name,
+ QString::fromLatin1("email:%1").arg(clientCertEmail).toUtf8().data()));
}
}
- if (X509_sign(x509, pkey, EVP_sha1()) == 0) {
- ok = false;
- goto out;
- }
+ CHECK(X509_sign(x509, pkey, EVP_sha1()));
{
QByteArray crt;
int len = i2d_X509(x509, nullptr);
- if (len <= 0) {
- ok = false;
- goto out;
- }
+ CHECK(len > 0);
crt.resize(len);
unsigned char *dptr = reinterpret_cast< unsigned char * >(crt.data());
- if (i2d_X509(x509, &dptr) != len) {
- ok = false;
- goto out;
- }
+ CHECK(i2d_X509(x509, &dptr) == len);
qscCert = QSslCertificate(crt, QSsl::Der);
- if (qscCert.isNull()) {
- ok = false;
- goto out;
- }
+ CHECK(!qscCert.isNull());
}
{
QByteArray key;
int len = i2d_PrivateKey(pkey, nullptr);
- if (len <= 0) {
- ok = false;
- goto out;
- }
+ CHECK(len > 0);
key.resize(len);
unsigned char *dptr = reinterpret_cast< unsigned char * >(key.data());
- if (i2d_PrivateKey(pkey, &dptr) != len) {
- ok = false;
- goto out;
- }
+ CHECK(i2d_PrivateKey(pkey, &dptr) == len);
qskKey = QSslKey(key, QSsl::Rsa, QSsl::Der);
- if (qskKey.isNull()) {
- ok = false;
- goto out;
- }
+ CHECK(!qskKey.isNull());
}
out:
- if (e) {
- BN_free(e);
- }
- // We only need to free the pkey pointer,
- // not the RSA pointer. We have assigned
- // our RSA key to pkey, and it will be freed
- // once we free pkey.
if (pkey) {
EVP_PKEY_free(pkey);
}
diff --git a/src/SelfSignedCertificate.h b/src/SelfSignedCertificate.h
index b85a8752b..7c5f59e9c 100644
--- a/src/SelfSignedCertificate.h
+++ b/src/SelfSignedCertificate.h
@@ -6,6 +6,10 @@
#ifndef MUMBLE_SELFSIGNEDCERTIFICATE_H_
#define MUMBLE_SELFSIGNEDCERTIFICATE_H_
+#include <openssl/evp.h>
+#include <openssl/rsa.h>
+#include <openssl/x509v3.h>
+
#include <QtCore/QString>
#include <QtNetwork/QSslCertificate>
#include <QtNetwork/QSslKey>
@@ -16,6 +20,7 @@ class SelfSignedCertificate {
private:
static bool generate(CertificateType certificateType, QString clientCertName, QString clientCertEmail,
QSslCertificate &qscCert, QSslKey &qskKey);
+ static EVP_PKEY *generate_rsa_keypair();
public:
static bool generateMumbleCertificate(QString name, QString email, QSslCertificate &qscCert, QSslKey &qskKey);
diff --git a/src/crypto/CryptStateOCB2.cpp b/src/crypto/CryptStateOCB2.cpp
index 2176d6488..640fdedac 100644
--- a/src/crypto/CryptStateOCB2.cpp
+++ b/src/crypto/CryptStateOCB2.cpp
@@ -30,7 +30,7 @@
#include <cstring>
#include <openssl/rand.h>
-CryptStateOCB2::CryptStateOCB2() : CryptState() {
+CryptStateOCB2::CryptStateOCB2() : CryptState(), enc_ctx(EVP_CIPHER_CTX_new()), dec_ctx(EVP_CIPHER_CTX_new()) {
for (int i = 0; i < 0x100; i++)
decrypt_history[i] = 0;
memset(raw_key, 0, AES_KEY_SIZE_BYTES);
@@ -38,6 +38,11 @@ CryptStateOCB2::CryptStateOCB2() : CryptState() {
memset(decrypt_iv, 0, AES_BLOCK_SIZE);
}
+CryptStateOCB2::~CryptStateOCB2() noexcept {
+ EVP_CIPHER_CTX_free(enc_ctx);
+ EVP_CIPHER_CTX_free(dec_ctx);
+}
+
bool CryptStateOCB2::isValid() const {
return bInit;
}
@@ -46,8 +51,6 @@ void CryptStateOCB2::genKey() {
CryptographicRandom::fillBuffer(raw_key, AES_KEY_SIZE_BYTES);
CryptographicRandom::fillBuffer(encrypt_iv, AES_BLOCK_SIZE);
CryptographicRandom::fillBuffer(decrypt_iv, AES_BLOCK_SIZE);
- AES_set_encrypt_key(raw_key, AES_KEY_SIZE_BITS, &encrypt_key);
- AES_set_decrypt_key(raw_key, AES_KEY_SIZE_BITS, &decrypt_key);
bInit = true;
}
@@ -56,8 +59,6 @@ bool CryptStateOCB2::setKey(const std::string &rkey, const std::string &eiv, con
memcpy(raw_key, rkey.data(), AES_KEY_SIZE_BYTES);
memcpy(encrypt_iv, eiv.data(), AES_BLOCK_SIZE);
memcpy(decrypt_iv, div.data(), AES_BLOCK_SIZE);
- AES_set_encrypt_key(raw_key, AES_KEY_SIZE_BITS, &encrypt_key);
- AES_set_decrypt_key(raw_key, AES_KEY_SIZE_BITS, &decrypt_key);
bInit = true;
return true;
}
@@ -256,10 +257,24 @@ static void inline ZERO(keyblock &block) {
block[i] = 0;
}
-#define AESencrypt(src, dst, key) \
- AES_encrypt(reinterpret_cast< const unsigned char * >(src), reinterpret_cast< unsigned char * >(dst), key);
-#define AESdecrypt(src, dst, key) \
- AES_decrypt(reinterpret_cast< const unsigned char * >(src), reinterpret_cast< unsigned char * >(dst), key);
+#define AESencrypt(src, dst, key) \
+ { \
+ int outlen = 0; \
+ EVP_EncryptInit_ex(enc_ctx, EVP_aes_128_ecb(), NULL, key, NULL); \
+ EVP_CIPHER_CTX_set_padding(enc_ctx, 0); \
+ EVP_EncryptUpdate(enc_ctx, reinterpret_cast< unsigned char * >(dst), &outlen, \
+ reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE); \
+ EVP_EncryptFinal_ex(enc_ctx, reinterpret_cast< unsigned char * >(dst + outlen), &outlen); \
+ }
+#define AESdecrypt(src, dst, key) \
+ { \
+ int outlen = 0; \
+ EVP_DecryptInit_ex(dec_ctx, EVP_aes_128_ecb(), NULL, key, NULL); \
+ EVP_CIPHER_CTX_set_padding(dec_ctx, 0); \
+ EVP_DecryptUpdate(dec_ctx, reinterpret_cast< unsigned char * >(dst), &outlen, \
+ reinterpret_cast< const unsigned char * >(src), AES_BLOCK_SIZE); \
+ EVP_DecryptFinal_ex(dec_ctx, reinterpret_cast< unsigned char * >(dst + outlen), &outlen); \
+ }
bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encrypted, unsigned int len,
const unsigned char *nonce, unsigned char *tag, bool modifyPlainOnXEXStarAttack) {
@@ -267,7 +282,7 @@ bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encr
bool success = true;
// Initialize
- AESencrypt(nonce, delta, &encrypt_key);
+ AESencrypt(nonce, delta, raw_key);
ZERO(checksum);
while (len > AES_BLOCK_SIZE) {
@@ -299,7 +314,7 @@ bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encr
if (flipABit) {
*reinterpret_cast< unsigned char * >(tmp) ^= 1;
}
- AESencrypt(tmp, tmp, &encrypt_key);
+ AESencrypt(tmp, tmp, raw_key);
XOR(reinterpret_cast< subblock * >(encrypted), delta, tmp);
XOR(checksum, checksum, reinterpret_cast< const subblock * >(plain));
if (flipABit) {
@@ -315,7 +330,7 @@ bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encr
ZERO(tmp);
tmp[BLOCKSIZE - 1] = SWAPPED(len * 8);
XOR(tmp, tmp, delta);
- AESencrypt(tmp, pad, &encrypt_key);
+ AESencrypt(tmp, pad, raw_key);
memcpy(tmp, plain, len);
memcpy(reinterpret_cast< unsigned char * >(tmp) + len, reinterpret_cast< const unsigned char * >(pad) + len,
AES_BLOCK_SIZE - len);
@@ -325,7 +340,7 @@ bool CryptStateOCB2::ocb_encrypt(const unsigned char *plain, unsigned char *encr
S3(delta);
XOR(tmp, delta, checksum);
- AESencrypt(tmp, tag, &encrypt_key);
+ AESencrypt(tmp, tag, raw_key);
return success;
}
@@ -336,13 +351,13 @@ bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *
bool success = true;
// Initialize
- AESencrypt(nonce, delta, &encrypt_key);
+ AESencrypt(nonce, delta, raw_key);
ZERO(checksum);
while (len > AES_BLOCK_SIZE) {
S2(delta);
XOR(tmp, delta, reinterpret_cast< const subblock * >(encrypted));
- AESdecrypt(tmp, tmp, &decrypt_key);
+ AESdecrypt(tmp, tmp, raw_key);
XOR(reinterpret_cast< subblock * >(plain), delta, tmp);
XOR(checksum, checksum, reinterpret_cast< const subblock * >(plain));
len -= AES_BLOCK_SIZE;
@@ -354,7 +369,7 @@ bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *
ZERO(tmp);
tmp[BLOCKSIZE - 1] = SWAPPED(len * 8);
XOR(tmp, tmp, delta);
- AESencrypt(tmp, pad, &encrypt_key);
+ AESencrypt(tmp, pad, raw_key);
memset(tmp, 0, AES_BLOCK_SIZE);
memcpy(tmp, encrypted, len);
XOR(tmp, tmp, pad);
@@ -372,7 +387,7 @@ bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *
S3(delta);
XOR(tmp, delta, checksum);
- AESencrypt(tmp, tag, &encrypt_key);
+ AESencrypt(tmp, tag, raw_key);
return success;
}
@@ -381,5 +396,5 @@ bool CryptStateOCB2::ocb_decrypt(const unsigned char *encrypted, unsigned char *
#undef SHIFTBITS
#undef SWAPPED
#undef HIGHBIT
-#undef AES_encrypt
-#undef AES_decrypt
+#undef AESencrypt
+#undef AESdecrypt
diff --git a/src/crypto/CryptStateOCB2.h b/src/crypto/CryptStateOCB2.h
index 53d4b4b6a..cc3f1c0bc 100644
--- a/src/crypto/CryptStateOCB2.h
+++ b/src/crypto/CryptStateOCB2.h
@@ -8,8 +8,9 @@
#include "CryptState.h"
-#include <openssl/aes.h>
+#include <openssl/evp.h>
+#define AES_BLOCK_SIZE 16
#define AES_KEY_SIZE_BITS 128
#define AES_KEY_SIZE_BYTES (AES_KEY_SIZE_BITS / 8)
@@ -17,7 +18,7 @@
class CryptStateOCB2 : public CryptState {
public:
CryptStateOCB2();
- ~CryptStateOCB2(){};
+ ~CryptStateOCB2() noexcept override;
virtual bool isValid() const Q_DECL_OVERRIDE;
virtual void genKey() Q_DECL_OVERRIDE;
@@ -43,8 +44,8 @@ private:
unsigned char decrypt_iv[AES_BLOCK_SIZE];
unsigned char decrypt_history[0x100];
- AES_KEY encrypt_key;
- AES_KEY decrypt_key;
+ EVP_CIPHER_CTX *enc_ctx;
+ EVP_CIPHER_CTX *dec_ctx;
};
--
2.38.4

31
pkgs/applications/networking/mumble/0002-FIX-positional-audio-Force-8-bytes-alignment-for-CCa.patch
View File

@ -1,31 +0,0 @@
From 13c051b36b387356815cff5d685bc628b74ba136 Mon Sep 17 00:00:00 2001
From: Davide Beatrici <git@davidebeatrici.dev>
Date: Thu, 1 Sep 2022 23:32:57 +0200
Subject: [PATCH] FIX(positional-audio): Force 8 bytes alignment for
CCameraAngles in GTAV plugin
https://en.cppreference.com/w/cpp/language/alignas
This fixes compilation when the implicit alignment is not 8 bytes.
It can be the case with 32 bit targets.
---
plugins/gtav/structs.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/gtav/structs.h b/plugins/gtav/structs.h
index 2829dc11e..0e4f76eda 100644
--- a/plugins/gtav/structs.h
+++ b/plugins/gtav/structs.h
@@ -118,7 +118,7 @@ struct CCameraManagerAngles {
ptr_t cameraAngles; // CCameraAngles *
};
-struct CCameraAngles {
+struct alignas(8) CCameraAngles {
uint8_t pad1[960];
ptr_t playerAngles; // CPlayerAngles *
uint8_t pad2[60];
--
2.38.5

30
pkgs/applications/networking/mumble/default.nix
View File

@ -19,17 +19,6 @@ let
pname = overrides.type;
version = source.version;
patches = [
./0001-BUILD-crypto-Migrate-to-OpenSSL-3.0-compatible-API.patch
# fix crash caused by openssl3 thread unsafe evp implementation
# see https://github.com/mumble-voip/mumble/issues/5361#issuecomment-1173001440
(fetchpatch {
url = "https://github.com/mumble-voip/mumble/commit/f8d47db318f302f5a7d343f15c9936c7030c49c4.patch";
hash = "sha256-xk8vBrPwvQxHCY8I6WQJAyaBGHmlH9NCixweP6FyakU=";
})
./0002-FIX-positional-audio-Force-8-bytes-alignment-for-CCa.patch
];
nativeBuildInputs = [ cmake pkg-config python3 qt5.wrapQtAppsHook qt5.qttools ]
++ (overrides.nativeBuildInputs or [ ]);
@ -72,11 +61,11 @@ let
"-D bundled-celt=ON"
"-D bundled-opus=OFF"
"-D bundled-speex=OFF"
"-D bundled-rnnoise=OFF"
"-D bundle-qt-translations=OFF"
"-D update=OFF"
"-D overlay-xcompile=OFF"
"-D oss=OFF"
"-D warnings-as-errors=OFF" # conversion error workaround
] ++ lib.optional (!speechdSupport) "-D speechd=OFF"
++ lib.optional (!pulseSupport) "-D pulseaudio=OFF"
++ lib.optional (!pipewireSupport) "-D pipewire=OFF"
@ -107,27 +96,16 @@ let
} source;
source = rec {
version = "1.4.287";
version = "1.5.634";
# Needs submodules
src = fetchFromGitHub {
owner = "mumble-voip";
repo = "mumble";
rev = "5d808e287e99b402b724e411a7a0848e00956a24";
sha256 = "sha256-SYsGCuj3HeyAQRUecGLaRdJR9Rm7lbaM54spY/zx0jU=";
rev = "v${version}";
sha256 = "sha256-d9XmXHq264rTT80zphYcKLxS+AyUhjb19D3DuBJvMI4=";
fetchSubmodules = true;
};
patches = [
# fixes 'static assertion failed: static_assert(sizeof(CCameraAngles) == 0x408, "");'
# when compiling pkgsi686Linux.mumble, which is a dependency of x64 mumble_overlay
# https://github.com/mumble-voip/mumble/pull/5850
# Remove with next version update
(fetchpatch {
url = "https://github.com/mumble-voip/mumble/commit/13c051b36b387356815cff5d685bc628b74ba136.patch";
hash = "sha256-Rq8fb6NFd4DCNWm6OOMYIP7tBllufmQcB5CSxPU4qqg=";
})
];
};
in {
mumble = client source;

2
pkgs/applications/networking/mumble/overlay.nix
View File

@ -19,7 +19,7 @@ in stdenv.mkDerivation {
ln -s ${mumble_i686}/lib/libmumble.so.1 $out/lib32/
''}
install -Dm755 scripts/mumble-overlay $out/bin/mumble-overlay
install -Dm755 auxiliary_files/run_scripts/mumble-overlay.in $out/bin/mumble-overlay
sed -i "s,/usr/lib,$out/lib,g" $out/bin/mumble-overlay
sed -i '2iPATH="${binPath}:$PATH"' $out/bin/mumble-overlay
'';

16
pkgs/applications/version-management/gitlab/data.json
View File

@ -1,15 +1,15 @@
{
"version": "16.10.6",
"repo_hash": "sha256-+nEUyD+ryZicH7suh4MnQRDKMC3M3VWRdO4nZCi2LGs=",
"yarn_hash": "0yzywfg4lqxjwm5cqsm4bn97zcrfvpnrs8rjrv9wv3xqvi9h9skd",
"version": "16.11.4",
"repo_hash": "sha256-VtjGV/0Xtmwqu/YZa6P6jUvlTYj9FNKALcJ3ZvMUJBw=",
"yarn_hash": "03q7h8dyssvsr91klr1jk65f5jz1ac71lx0114zq9c7awxrgp6kq",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v16.10.6-ee",
"rev": "v16.11.4-ee",
"passthru": {
"GITALY_SERVER_VERSION": "16.10.6",
"GITLAB_PAGES_VERSION": "16.10.6",
"GITLAB_SHELL_VERSION": "14.34.0",
"GITALY_SERVER_VERSION": "16.11.4",
"GITLAB_PAGES_VERSION": "16.11.4",
"GITLAB_SHELL_VERSION": "14.35.0",
"GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0",
"GITLAB_WORKHORSE_VERSION": "16.10.6"
"GITLAB_WORKHORSE_VERSION": "16.11.4"
}
}

6
pkgs/applications/version-management/gitlab/default.nix
View File

@ -4,6 +4,7 @@
, gitlabEnterprise ? false, callPackage, yarn
, fixup-yarn-lock, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config
, cargo, rustc, rustPlatform
, icu, zlib, which
}:
let
@ -49,7 +50,7 @@ let
cp Cargo.lock $out
'';
};
hash = "sha256-7q2xWAsFkXHxkYNzIjPwJRy72xMXF278cpVzqGLt/9Y=";
hash = "sha256-SncgYYnoSaWA4kQWonoXXbSMu1mnwTyhdLXFagqgH+o=";
};
dontBuild = false;
@ -74,6 +75,9 @@ let
find $out -type f -name .rustc_info.json -delete
'';
};
static_holmes = attrs: {
buildInputs = [ which icu zlib ];
};
};
groups = [
"default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos"

6
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@ -5,7 +5,7 @@
}:
let
version = "16.10.6";
version = "16.11.4";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@ -17,10 +17,10 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
hash = "sha256-C57p3H1L6ZQfjipGoQJup8u6ofir3rrxORtzUA1afL0=";
hash = "sha256-sdRKKOWoX0yyqUGpu/mqDdTq2nLZ2Gr5GNV9x99rdeU=";
};
vendorHash = "sha256-6gZr0/0ZGcFwwAY4IuW2puL/7akMZvaU0ONJGYyyJas=";
vendorHash = "sha256-WCZF7XVW6J1zyPx8e/Mcn+HmHElAUGcEICxiF5HLzBg=";
ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ];

4
pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix
View File

@ -2,7 +2,7 @@
buildGoModule rec {
pname = "gitlab-container-registry";
version = "4.1.0";
version = "4.5.0";
rev = "v${version}-gitlab";
# nixpkgs-update: no auto update
@ -10,7 +10,7 @@ buildGoModule rec {
owner = "gitlab-org";
repo = "container-registry";
inherit rev;
hash = "sha256-t+i9IuBH94PpfriIAaqqWYZHxKJJDOedJ3BQXGEPp0A=";
hash = "sha256-dCDybwIfzC79Mobejz/5XbEMQXkPuO8HejjannA6k/M=";
};
vendorHash = "sha256-sybppXCoTrc196xLBW1+sUg9Y5uA0GAptlJ7RjhzuGc=";

4
pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
View File

@ -2,14 +2,14 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "16.10.6";
version = "16.11.4";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
hash = "sha256-30ojS+TBIJ4Qzg1jh2Bpdd2s2Yo2S+UqxRRdvNBvB/k=";
hash = "sha256-6Fh1IKCs2Bg7Eg44kbCMM8YhLmwWvdZnXp39fphLzcE=";
};
vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M=";

11
pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
View File

@ -2,21 +2,24 @@
buildGoModule rec {
pname = "gitlab-shell";
version = "14.34.0";
version = "14.35.0";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-shell";
rev = "v${version}";
sha256 = "sha256-0LzZZn4kS5uRcj/uJgHvLvd6ZOLi1l4yaSqqRhmTYZs=";
sha256 = "sha256-WyIUdDKPKQE1Ddz40WaMA5lDs37OyDuZl/6/nKDYY/8=";
};
buildInputs = [ ruby libkrb5 ];
patches = [ ./remove-hardcoded-locations.patch ];
patches = [
./remove-hardcoded-locations.patch
./go-mod-tidy.patch
];
vendorHash = "sha256-RtZ9d3cempY8PxaCPFJ2uEEorem6NDURHZPirr0SUjU=";
vendorHash = "sha256-7TUHD14/aCs3lkpTy5CH9WYUc1Ud6rDFCx+JgsINvxU=";
postInstall = ''
cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin

12
pkgs/applications/version-management/gitlab/gitlab-shell/go-mod-tidy.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/go.mod b/go.mod
index 513ccc40..30ba0f6e 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module gitlab.com/gitlab-org/gitlab-shell/v14
-go 1.20
+go 1.21
require (
github.com/charmbracelet/git-lfs-transfer v0.1.1-0.20240402115927-f0b226fa61cc

5
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "16.10.6";
version = "16.11.4";
# nixpkgs-update: no auto update
src = fetchFromGitLab {
@ -17,10 +17,11 @@ buildGoModule rec {
sourceRoot = "${src.name}/workhorse";
vendorHash = "sha256-bbKX22Tb2pM+Wnyl1ojdA1nmT40Z5R99mDP1hLD+lco=";
vendorHash = "sha256-44EtpjYsxYqDH035/ruPfshfejiO011HybKD2inp8bU=";
buildInputs = [ git ];
ldflags = [ "-X main.Version=${version}" ];
doCheck = false;
prodyVendor = true;
meta = with lib; {
homepage = "http://www.gitlab.com/";

58
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
View File

@ -107,7 +107,7 @@ gem 'invisible_captcha', '~> 2.1.0' # rubocop:todo Gemfile/MissingFeatureCategor
# Two-factor authentication
gem 'devise-two-factor', '~> 4.1.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'rqrcode', '~> 2.0', feature_category: :system_access
gem 'rqrcode', '~> 2.2', feature_category: :system_access
gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted' # rubocop:todo Gemfile/MissingFeatureCategory
@ -135,7 +135,7 @@ gem 'net-ldap', '~> 0.17.1' # rubocop:todo Gemfile/MissingFeatureCategory
# API
gem 'grape', '~> 2.0.0', feature_category: :api
gem 'grape-entity', '~> 0.10.2', feature_category: :api
gem 'grape-swagger', '~> 2.0.1', group: [:development, :test], feature_category: :api
gem 'grape-swagger', '~> 2.0.2', group: [:development, :test], feature_category: :api
gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test], feature_category: :api
gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api
gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' # rubocop:todo Gemfile/MissingFeatureCategory
@ -160,7 +160,7 @@ gem 'hamlit', '~> 2.15.0' # rubocop:todo Gemfile/MissingFeatureCategory
# Files attachments
gem 'carrierwave', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'mini_magick', '~> 4.10.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'mini_magick', '~> 4.12' # rubocop:todo Gemfile/MissingFeatureCategory
# for backups
gem 'fog-aws', '~> 3.18' # rubocop:todo Gemfile/MissingFeatureCategory
@ -176,7 +176,7 @@ gem 'fog-local', '~> 0.8' # rubocop:todo Gemfile/MissingFeatureCategory
# We may want to update this dependency if this is ever addressed upstream, e.g. via
# https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93
gem 'fog-aliyun', '~> 0.4' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'gitlab-fog-azure-rm', '~> 1.8.0', require: 'fog/azurerm' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'gitlab-fog-azure-rm', '~> 1.9.1', require: 'fog/azurerm' # rubocop:todo Gemfile/MissingFeatureCategory
# for Google storage
@ -207,9 +207,9 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'aws-sdk-core', '~> 3.191.3' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'aws-sdk-core', '~> 3.191.6' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'aws-sdk-s3', '~> 1.144.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'aws-sdk-s3', '~> 1.146.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory
@ -230,7 +230,7 @@ gem 'asciidoctor-kroki', '~> 0.8.0', require: false # rubocop:todo Gemfile/Missi
gem 'rouge', '~> 4.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'truncato', '~> 0.7.12' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'nokogiri', '~> 1.16' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'gitlab-glfm-markdown', '~> 0.0.13', feature_category: :team_planning
gem 'gitlab-glfm-markdown', '~> 0.0.14', feature_category: :team_planning
# Calendar rendering
gem 'icalendar' # rubocop:todo Gemfile/MissingFeatureCategory
@ -277,7 +277,7 @@ gem 're2', '2.7.0' # rubocop:todo Gemfile/MissingFeatureCategory
# Misc
gem 'semver_dialects', '~> 2.0', feature_category: :static_application_security_testing
gem 'semver_dialects', '~> 2.0', '>= 2.0.2', feature_category: :static_application_security_testing
gem 'version_sorter', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'csv_builder', path: 'gems/csv_builder' # rubocop:todo Gemfile/MissingFeatureCategory
@ -327,7 +327,9 @@ gem 'loofah', '~> 2.22.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'licensee', '~> 9.16' # rubocop:todo Gemfile/MissingFeatureCategory
# Detect and convert string character encoding
gem 'charlock_holmes', '~> 0.7.7' # rubocop:todo Gemfile/MissingFeatureCategory
# We forked charlock_holmes at https://gitlab.com/gitlab-org/ruby/gems/charlock_holmes
# but changed it's name to 'static_holmes' in the gemspec file.
gem 'static_holmes', '~> 0.7.7', require: 'charlock_holmes' # rubocop:todo Gemfile/MissingFeatureCategory
# Detect mime content type from content
gem 'ruby-magic', '~> 0.6' # rubocop:todo Gemfile/MissingFeatureCategory
@ -376,7 +378,7 @@ gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory
# I18n
gem 'rails-i18n', '~> 7.0', feature_category: :internationalization
gem 'gettext_i18n_rails', '~> 1.11.0', feature_category: :internationalization
gem 'gettext_i18n_rails', '~> 1.12.0', feature_category: :internationalization
gem 'gettext', '~> 3.4', '>= 3.4.9',
require: false,
group: [:development, :test],
@ -400,12 +402,12 @@ gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', require: 'prometheus/client'
gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
group :development do
gem 'lefthook', '~> 1.5.6', require: false, feature_category: :tooling
gem 'lefthook', '~> 1.6.8', require: false, feature_category: :tooling
gem 'rubocop', feature_category: :tooling
gem 'solargraph', '~> 0.47.2', require: false # rubocop:todo Gemfile/MissingFeatureCategory
gem 'letter_opener_web', '~> 2.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'lookbook', '~> 2.2' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'lookbook', '~> 2.2', '>= 2.2.2' # rubocop:todo Gemfile/MissingFeatureCategory
# Better errors handler
gem 'better_errors', '~> 2.10.1' # rubocop:todo Gemfile/MissingFeatureCategory
@ -414,17 +416,19 @@ group :development do
gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'ruby-lsp', "~> 0.14.4", require: false, feature_category: :tooling
gem 'ruby-lsp', "~> 0.14.6", require: false, feature_category: :tooling
gem 'ruby-lsp-rails', "~> 0.3.0", feature_category: :tooling
gem 'ruby-lsp-rails', "~> 0.3.3", feature_category: :tooling
gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling
gem 'gdk-toogle', '~> 0.9', require: 'toogle', feature_category: :tooling
end
group :development, :test do
gem 'deprecation_toolkit', '~> 1.5.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
gem 'bullet', '~> 7.1.2' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'parser', '~> 3.3', '>= 3.3.0.2' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'parser', '~> 3.3', '>= 3.3.0.5' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'pry-byebug' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'pry-rails', '~> 0.3.9' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'pry-shell', '~> 0.6.4' # rubocop:todo Gemfile/MissingFeatureCategory
@ -441,9 +445,9 @@ group :development, :test do
gem 'spring', '~> 4.1.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'spring-commands-rspec', '~> 1.0.4' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'gitlab-styles', '~> 11.0.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
gem 'gitlab-styles', '~> 11.0.0', feature_category: :tooling
gem 'haml_lint', '~> 0.53', feature_category: :tooling
gem 'haml_lint', '~> 0.53', require: false # rubocop:todo Gemfile/MissingFeatureCategory
gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory
# Benchmarking & profiling
@ -455,7 +459,7 @@ group :development, :test do
gem 'knapsack', '~> 1.22.0', feature_category: :tooling
gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling
gem 'test_file_finder', '~> 0.2.1', feature_category: :tooling
gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling
gem 'simple_po_parser', '~> 1.1.6', require: false # rubocop:todo Gemfile/MissingFeatureCategory
@ -500,34 +504,34 @@ end
group :test do
gem 'fuubar', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling
gem 'rspec_profiling', '~> 0.0.8', feature_category: :tooling
gem 'rspec_profiling', '~> 0.0.9', feature_category: :tooling
gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling
gem 'rspec-parameterized', '~> 1.0', require: false, feature_category: :tooling
gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling
gem 'capybara', '~> 3.40' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'capybara-screenshot', '~> 1.0.26' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'selenium-webdriver', '~> 4.18', '>= 4.18.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'selenium-webdriver', '~> 4.19' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'shoulda-matchers', '~> 5.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory
gem 'email_spec', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'webmock', '~> 3.22.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'webmock', '~> 3.23.0', feature_category: :shared
gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'test-prof', '~> 1.3.1' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'test-prof', '~> 1.3.2', feature_category: :tooling
gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'axe-core-rspec', '~> 4.8.2', feature_category: :tooling
gem 'axe-core-rspec', '~> 4.9.0', feature_category: :tooling
# Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory
gem 'gitlab_quality-test_tooling', '~> 1.17.0', require: false, feature_category: :tooling
gem 'gitlab_quality-test_tooling', '~> 1.21.1', require: false, feature_category: :tooling
end
gem 'octokit', '~> 8.0', feature_category: :importers
gem 'octokit', '~> 8.1', feature_category: :importers
gem 'gitlab-mail_room', '~> 0.0.24', require: 'mail_room', feature_category: :shared
@ -559,7 +563,7 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
# Gitaly GRPC protocol definitions
gem 'gitaly', '~> 16.10.0-rc1', feature_category: :gitaly
gem 'gitaly', '~> 16.11.0.pre.rc1', feature_category: :gitaly
# KAS GRPC protocol definitions
gem 'kas-grpc', '~> 0.4.0', feature_category: :deployment_management
@ -641,7 +645,7 @@ gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' # rubocop:todo Gemfile/Missi
gem 'arr-pm', '~> 0.0.12' # rubocop:todo Gemfile/MissingFeatureCategory
# Remote Development
gem 'devfile', '~> 0.0.25.pre.alpha1', feature_category: :remote_development
gem 'devfile', '~> 0.0.26.pre.alpha1', feature_category: :remote_development
# Apple plist parsing
gem 'CFPropertyList', '~> 3.0.0' # rubocop:todo Gemfile/MissingFeatureCategory

121
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
View File

@ -27,6 +27,8 @@ PATH
remote: gems/gitlab-backup-cli
specs:
gitlab-backup-cli (0.0.1)
activesupport (~> 7.0.8)
rainbow (~> 3.0)
thor (~> 1.3)
PATH
@ -309,7 +311,7 @@ GEM
aws-sdk-cloudformation (1.41.0)
aws-sdk-core (~> 3, >= 3.99.0)
aws-sigv4 (~> 1.1)
aws-sdk-core (3.191.3)
aws-sdk-core (3.191.6)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
@ -317,7 +319,7 @@ GEM
aws-sdk-kms (1.76.0)
aws-sdk-core (~> 3, >= 3.188.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.144.0)
aws-sdk-s3 (1.146.1)
aws-sdk-core (~> 3, >= 3.191.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.8)
@ -326,7 +328,7 @@ GEM
axe-core-api (4.8.0)
dumb_delegator
virtus
axe-core-rspec (4.8.2)
axe-core-rspec (4.9.0)
axe-core-api
dumb_delegator
virtus
@ -392,7 +394,6 @@ GEM
ssrf_filter (~> 1.0, < 1.1.0)
cbor (0.5.9.8)
character_set (1.8.0)
charlock_holmes (0.7.7)
chef-config (18.3.0)
addressable
chef-utils (= 18.3.0)
@ -415,7 +416,7 @@ GEM
descendants_tracker (~> 0.0.1)
colored2 (3.1.2)
commonmarker (0.23.10)
concurrent-ruby (1.2.2)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
cork (0.3.0)
colored2 (~> 3.1)
@ -481,7 +482,7 @@ GEM
thor (>= 0.19, < 2)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
devfile (0.0.25.pre.alpha1)
devfile (0.0.26.pre.alpha1)
device_detector (1.0.0)
devise (4.9.3)
bcrypt (~> 3.0)
@ -669,6 +670,9 @@ GEM
googleapis-common-protos-types (>= 1.3.1, < 2.a)
googleauth (~> 1.0)
grpc (~> 1.36)
gdk-toogle (0.9.3)
haml
rails (>= 7.0.4.2)
gemoji (3.0.1)
get_process_mem (0.2.7)
ffi (~> 1.0)
@ -678,12 +682,12 @@ GEM
prime
racc
text (>= 1.3.0)
gettext_i18n_rails (1.11.0)
gettext_i18n_rails (1.12.0)
fast_gettext (>= 0.9.0)
git (1.18.0)
addressable (~> 2.8)
rchardet (~> 1.8)
gitaly (16.10.0.pre.rc1)
gitaly (16.11.0.pre.rc1)
grpc (~> 1.0)
gitlab (4.19.0)
httparty (~> 0.20)
@ -697,13 +701,13 @@ GEM
gitlab-experiment (0.9.1)
activesupport (>= 3.0)
request_store (>= 1.0)
gitlab-fog-azure-rm (1.8.0)
gitlab-fog-azure-rm (1.9.1)
azure-storage-blob (~> 2.0)
azure-storage-common (~> 2.0)
fog-core (= 2.1.0)
fog-json (~> 1.2.0)
fog-core (~> 2.1)
fog-json (~> 1.2)
mime-types
gitlab-glfm-markdown (0.0.13)
gitlab-glfm-markdown (0.0.14)
rb_sys (~> 0.9.86)
gitlab-labkit (0.35.1)
actionpack (>= 5.0.0, < 8.0.0)
@ -739,8 +743,8 @@ GEM
omniauth (>= 1.3, < 3)
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
rubyntlm (~> 0.5)
gitlab_quality-test_tooling (1.17.0)
activesupport (>= 6.1, < 7.1)
gitlab_quality-test_tooling (1.21.1)
activesupport (>= 6.1, < 7.2)
amatch (~> 0.4.1)
gitlab (~> 4.19)
http (~> 5.0)
@ -856,7 +860,7 @@ GEM
grape (~> 2.0)
rake (> 12)
ruby2_keywords (~> 0.0.2)
grape-swagger (2.0.1)
grape-swagger (2.0.2)
grape (>= 1.7, < 3.0)
rack-test (~> 2)
grape-swagger-entity (0.5.1)
@ -923,7 +927,7 @@ GEM
thor
tilt
hana (1.3.7)
hashdiff (1.0.1)
hashdiff (1.1.0)
hashie (5.0.0)
health_check (3.1.0)
railties (>= 5.0)
@ -949,7 +953,7 @@ GEM
mini_mime (>= 1.0.0)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
i18n (1.14.1)
i18n (1.14.4)
concurrent-ruby (~> 1.0)
i18n_data (0.13.1)
icalendar (2.8.0)
@ -1023,7 +1027,7 @@ GEM
language_server-protocol (3.17.0.3)
launchy (2.5.0)
addressable (~> 2.7)
lefthook (1.5.6)
lefthook (1.6.8)
letter_opener (1.7.0)
launchy (~> 2.2)
letter_opener_web (2.0.0)
@ -1061,7 +1065,7 @@ GEM
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
lookbook (2.2.0)
lookbook (2.2.2)
activemodel
css_parser
htmlbeautifier (~> 1.3)
@ -1071,7 +1075,7 @@ GEM
redcarpet (~> 3.5)
rouge (>= 3.26, < 5.0)
view_component (>= 2.0)
yard (~> 0.9.25)
yard (~> 0.9)
zeitwerk (~> 2.5)
lru_redux (1.1.0)
lumberjack (1.2.7)
@ -1091,7 +1095,7 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2023.1003)
mini_histogram (0.3.1)
mini_magick (4.10.1)
mini_magick (4.12.0)
mini_mime (1.1.2)
mini_portile2 (2.8.5)
minitest (5.11.3)
@ -1153,7 +1157,8 @@ GEM
rack (>= 1.2, < 4)
snaky_hash (~> 2.0)
version_gem (~> 1.1)
octokit (8.0.0)
octokit (8.1.0)
base64
faraday (>= 1, < 3)
sawyer (~> 0.9)
ohai (18.1.3)
@ -1260,7 +1265,7 @@ GEM
expgen (~> 0.1)
rainbow (~> 3.1.1)
parallel (1.22.1)
parser (3.3.0.2)
parser (3.3.0.5)
ast (~> 2.4.1)
racc
parslet (1.8.2)
@ -1471,7 +1476,7 @@ GEM
rspec-support (3.12.0)
rspec_junit_formatter (0.6.0)
rspec-core (>= 2, < 4, != 2.12.0)
rspec_profiling (0.0.8)
rspec_profiling (0.0.9)
activerecord
get_process_mem
rails
@ -1508,11 +1513,11 @@ GEM
ruby-fogbugz (0.3.0)
crack (~> 0.4)
multipart-post (~> 2.0)
ruby-lsp (0.14.4)
ruby-lsp (0.14.6)
language_server-protocol (~> 3.17.0)
prism (>= 0.22.0, < 0.25)
sorbet-runtime (>= 0.5.10782)
ruby-lsp-rails (0.3.1)
ruby-lsp-rails (0.3.3)
actionpack (>= 6.0)
activerecord (>= 6.0)
railties (>= 6.0)
@ -1550,12 +1555,12 @@ GEM
seed-fu (2.3.7)
activerecord (>= 3.1)
activesupport (>= 3.1)
selenium-webdriver (4.18.1)
selenium-webdriver (4.19.0)
base64 (~> 0.2)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
semver_dialects (2.0.0)
semver_dialects (2.0.2)
deb_version (~> 1.0.1)
pastel (~> 0.8.0)
thor (~> 1.3)
@ -1641,6 +1646,7 @@ GEM
state_machines-activerecord (0.8.0)
activerecord (>= 5.1)
state_machines-activemodel (>= 0.8.0)
static_holmes (0.7.7)
strings (0.2.1)
strings-ansi (~> 0.2)
unicode-display_width (>= 1.5, < 3.0)
@ -1667,8 +1673,8 @@ GEM
unicode-display_width (>= 1.1.1, < 3)
terser (1.0.2)
execjs (>= 0.3.0, < 3)
test-prof (1.3.1)
test_file_finder (0.2.1)
test-prof (1.3.2)
test_file_finder (0.3.1)
faraday (>= 1.0, < 3.0, != 2.0.0)
text (1.3.1)
thor (1.3.1)
@ -1783,7 +1789,7 @@ GEM
webfinger (1.2.0)
activesupport
httpclient (>= 2.4)
webmock (3.22.0)
webmock (3.23.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
@ -1830,9 +1836,9 @@ DEPENDENCIES
attr_encrypted (~> 3.2.4)!
awesome_print
aws-sdk-cloudformation (~> 1)
aws-sdk-core (~> 3.191.3)
aws-sdk-s3 (~> 1.144.0)
axe-core-rspec (~> 4.8.2)
aws-sdk-core (~> 3.191.6)
aws-sdk-s3 (~> 1.146.1)
axe-core-rspec (~> 4.9.0)
babosa (~> 2.0)
base32 (~> 0.3.0)
batch-loader (~> 2.0.1)
@ -1848,7 +1854,6 @@ DEPENDENCIES
capybara (~> 3.40)
capybara-screenshot (~> 1.0.26)
carrierwave (~> 1.3)
charlock_holmes (~> 0.7.7)
circuitbox (= 2.0.0)
click_house-client!
cloud_profiler_agent (~> 0.0.0)!
@ -1866,7 +1871,7 @@ DEPENDENCIES
declarative_policy (~> 1.1.0)
deprecation_toolkit (~> 1.5.1)
derailed_benchmarks
devfile (~> 0.0.25.pre.alpha1)
devfile (~> 0.0.26.pre.alpha1)
device_detector
devise (~> 4.9.3)
devise-pbkdf2-encryptable (~> 0.0.0)!
@ -1899,15 +1904,16 @@ DEPENDENCIES
fog-local (~> 0.8)
fugit (~> 1.8.1)
fuubar (~> 2.2.0)
gdk-toogle (~> 0.9)
gettext (~> 3.4, >= 3.4.9)
gettext_i18n_rails (~> 1.11.0)
gitaly (~> 16.10.0.pre.rc1)
gettext_i18n_rails (~> 1.12.0)
gitaly (~> 16.11.0.pre.rc1)
gitlab-backup-cli!
gitlab-chronic (~> 0.10.5)
gitlab-dangerfiles (~> 4.7.0)
gitlab-experiment (~> 0.9.1)
gitlab-fog-azure-rm (~> 1.8.0)
gitlab-glfm-markdown (~> 0.0.13)
gitlab-fog-azure-rm (~> 1.9.1)
gitlab-glfm-markdown (~> 0.0.14)
gitlab-housekeeper!
gitlab-http!
gitlab-labkit (~> 0.35.1)
@ -1926,7 +1932,7 @@ DEPENDENCIES
gitlab-utils!
gitlab_chronic_duration (~> 0.12)
gitlab_omniauth-ldap (~> 2.2.0)
gitlab_quality-test_tooling (~> 1.17.0)
gitlab_quality-test_tooling (~> 1.21.1)
gon (~> 6.4.0)
google-apis-androidpublisher_v3 (~> 0.34.0)
google-apis-cloudbilling_v1 (~> 0.21.0)
@ -1948,7 +1954,7 @@ DEPENDENCIES
grape (~> 2.0.0)
grape-entity (~> 0.10.2)
grape-path-helpers (~> 2.0.1)
grape-swagger (~> 2.0.1)
grape-swagger (~> 2.0.2)
grape-swagger-entity (~> 0.5.1)
grape_logging (~> 1.8, >= 1.8.4)
graphiql-rails (~> 1.8.0)
@ -1983,7 +1989,7 @@ DEPENDENCIES
knapsack (~> 1.22.0)
kramdown (~> 2.3.1)
kubeclient (~> 4.11.0)
lefthook (~> 1.5.6)
lefthook (~> 1.6.8)
letter_opener_web (~> 2.0.0)
license_finder (~> 7.0)
licensee (~> 9.16)
@ -1991,14 +1997,14 @@ DEPENDENCIES
lockbox (~> 1.3.0)
lograge (~> 0.5)
loofah (~> 2.22.0)
lookbook (~> 2.2)
lookbook (~> 2.2, >= 2.2.2)
lru_redux
mail (= 2.8.1)
mail-smtp_pool (~> 0.1.0)!
marginalia (~> 1.11.1)
memory_profiler (~> 1.0)
microsoft_graph_mailer (~> 0.1.0)!
mini_magick (~> 4.10.1)
mini_magick (~> 4.12)
minitest (~> 5.11.0)
multi_json (~> 1.14.1)
neighbor (~> 0.2.3)
@ -2008,7 +2014,7 @@ DEPENDENCIES
net-protocol (~> 0.1.3)
nokogiri (~> 1.16)
oauth2 (~> 2.0)
octokit (~> 8.0)
octokit (~> 8.1)
ohai (~> 18.1)
oj (~> 3.13.21)
oj-introspect (~> 0.7)
@ -2036,7 +2042,7 @@ DEPENDENCIES
os (~> 1.1, >= 1.1.4)
pact (~> 1.64)
parallel (~> 1.19)
parser (~> 3.3, >= 3.3.0.2)
parser (~> 3.3, >= 3.3.0.5)
parslet (~> 1.8)
peek (~> 1.1)
pg (~> 1.5.6)
@ -2070,17 +2076,17 @@ DEPENDENCIES
retriable (~> 3.1.2)
rexml (~> 3.2.6)
rouge (~> 4.2.0)
rqrcode (~> 2.0)
rqrcode (~> 2.2)
rspec-benchmark (~> 0.6.0)
rspec-parameterized (~> 1.0)
rspec-rails (~> 6.1.1)
rspec-retry (~> 0.6.2)
rspec_junit_formatter
rspec_profiling (~> 0.0.8)
rspec_profiling (~> 0.0.9)
rubocop
ruby-fogbugz (~> 0.3.0)
ruby-lsp (~> 0.14.4)
ruby-lsp-rails (~> 0.3.0)
ruby-lsp (~> 0.14.6)
ruby-lsp-rails (~> 0.3.3)
ruby-lsp-rspec (~> 0.1.10)
ruby-magic (~> 0.6)
ruby-openai (~> 3.7)
@ -2091,8 +2097,8 @@ DEPENDENCIES
sanitize (~> 6.0.2)
sd_notify (~> 0.1.0)
seed-fu (~> 2.3.7)
selenium-webdriver (~> 4.18, >= 4.18.1)
semver_dialects (~> 2.0)
selenium-webdriver (~> 4.19)
semver_dialects (~> 2.0, >= 2.0.2)
sentry-rails (~> 5.10.0)
sentry-raven (~> 3.1)
sentry-ruby (~> 5.10.0)
@ -2116,12 +2122,13 @@ DEPENDENCIES
ssh_data (~> 1.3)
stackprof (~> 0.2.25)
state_machines-activerecord (~> 0.8.0)
static_holmes (~> 0.7.7)
sys-filesystem (~> 1.4.3)
tanuki_emoji (~> 0.9)
telesignenterprise (~> 2.2)
terser (= 1.0.2)
test-prof (~> 1.3.1)
test_file_finder (~> 0.2.1)
test-prof (~> 1.3.2)
test_file_finder (~> 0.3.1)
thrift (>= 0.16.0)
timfel-krb5-auth (~> 0.8)
toml-rb (~> 2.2.0)
@ -2138,10 +2145,10 @@ DEPENDENCIES
vmstat (~> 2.3.0)
warning (~> 1.3.0)
webauthn (~> 3.0)
webmock (~> 3.22.0)
webmock (~> 3.23.0)
webrick (~> 1.8.1)
wikicloth (= 0.8.1)
yajl-ruby (~> 1.4.3)
BUNDLED WITH
2.5.6
2.5.8

141
pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
View File

@ -400,10 +400,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "088nq8yz9n4p7pnhjwp9nbxlkj7jwchpkzvnl4nybfb1dkvk4dns";
sha256 = "08h9apxdn2aflkg751j4i56ks4750znfbj56w4zlxf4jk7jxkbyk";
type = "gem";
};
version = "3.191.3";
version = "3.191.6";
};
aws-sdk-kms = {
dependencies = ["aws-sdk-core" "aws-sigv4"];
@ -422,10 +422,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ypg31pfzbd43n1m20cyf6gyrlv6m0c8hmk2p5hidy1y4pi34f6g";
sha256 = "1al80phz4x9wwfnr07q1l8h5f0qxgfrrycbg8jvznhxm3zhrakrq";
type = "gem";
};
version = "1.144.0";
version = "1.146.1";
};
aws-sigv4 = {
dependencies = ["aws-eventstream"];
@ -455,10 +455,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "14h4abf5h242a0vn2r05pkr8311qbxgkl63py7vbhx8bfpk1kq3i";
sha256 = "0fnzb49lmxs18lc6z6araqy1j7jiqh8naiwq9hjj3i7hbajizy75";
type = "gem";
};
version = "4.8.2";
version = "4.9.0";
};
axiom-types = {
dependencies = ["descendants_tracker" "ice_nine" "thread_safe"];
@ -787,16 +787,6 @@ src:
};
version = "1.8.0";
};
charlock_holmes = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p";
type = "gem";
};
version = "0.7.7";
};
chef-config = {
dependencies = ["addressable" "chef-utils" "fuzzyurl" "mixlib-config" "mixlib-shellout" "tomlrb"];
groups = ["default"];
@ -936,14 +926,14 @@ src:
version = "0.23.10";
};
concurrent-ruby = {
groups = ["default" "development" "test"];
groups = ["default" "development" "monorepo" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
type = "gem";
};
version = "1.2.2";
version = "1.2.3";
};
connection_pool = {
groups = ["default"];
@ -1233,10 +1223,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1p11hv0a2s4m29vvyr7z22wjr9f4cfmdjnqidrv62rfcg9r73w0g";
sha256 = "1r69vrhh72j6fq41ii99n4ncf0kgb82nhb7j8ia1pr94m4prc4i0";
type = "gem";
};
version = "0.0.25.pre.alpha1";
version = "0.0.26.pre.alpha1";
};
device_detector = {
groups = ["default"];
@ -2089,6 +2079,17 @@ src:
};
version = "0.20.0";
};
gdk-toogle = {
dependencies = ["haml" "rails"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gzf4b6y5v0d5pbc0lq33383m3c8y8kq5yy57124lb9bblymszw9";
type = "gem";
};
version = "0.9.3";
};
gemoji = {
groups = ["default" "development" "test"];
platforms = [];
@ -2127,10 +2128,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1gibn9j4k9ck54v7rxbqwa587fc2l92clv9r71zhyl3c4m57x771";
sha256 = "1gn1mzqx49i5zfmal499piij457r6jn82cz8w53wxqm965vq3i3a";
type = "gem";
};
version = "1.11.0";
version = "1.12.0";
};
git = {
dependencies = ["addressable" "rchardet"];
@ -2149,10 +2150,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nwc8mlpznq9b7rgcbxwzaj936pn0syjasxdhplpiz3iqbr64ca8";
sha256 = "1bp7lsqhcmb1fi1wsij1gbl0ip9jcwmzxagfg39c7dnm7xglycr4";
type = "gem";
};
version = "16.10.0.pre.rc1";
version = "16.11.0.pre.rc1";
};
gitlab = {
dependencies = ["httparty" "terminal-table"];
@ -2166,7 +2167,7 @@ src:
version = "4.19.0";
};
gitlab-backup-cli = {
dependencies = ["thor"];
dependencies = ["activesupport" "rainbow" "thor"];
groups = ["default"];
platforms = [];
source = {
@ -2214,10 +2215,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0a3c3slg1iqlhyci9mnbasgw1qcsnznczyqjkn28hfr79cblpwp4";
sha256 = "0dsg53f6gfhf9rs6wslragagl3ysi429p45iy4dkq664i8c8wsq2";
type = "gem";
};
version = "1.8.0";
version = "1.9.1";
};
gitlab-glfm-markdown = {
dependencies = ["rb_sys"];
@ -2225,10 +2226,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nk9kp3zb2x1hpqirq7x2qqpmfsqq4izprbicxjb20bqvm4mvvdb";
sha256 = "0finxlax2pgxw85qnyz3p4pmi8dz6qj8bsjkrkrnkd93k41lyfcn";
type = "gem";
};
version = "0.0.13";
version = "0.0.14";
};
gitlab-housekeeper = {
dependencies = ["activesupport" "awesome_print" "httparty" "rubocop"];
@ -2422,10 +2423,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d59k5c0y8vkmz7fjh7x455d4d19fpw4r9agv02vqyvp7glrbm34";
sha256 = "1g4fsldxs63ds31sni422xk0g3yrr9jpga0bah5ip4hys8as3wl3";
type = "gem";
};
version = "1.17.0";
version = "1.21.1";
};
globalid = {
dependencies = ["activesupport"];
@ -2805,10 +2806,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1467ni6f0yy4z3qldjs8x0h50n9ym6zyjbx5gqqzbq6zhvgbx40g";
sha256 = "018843mknkjs1ybazs7b8k7k0g67m1ldc42z8vlb5yinp9b9l4x7";
type = "gem";
};
version = "2.0.1";
version = "2.0.2";
};
grape-swagger-entity = {
dependencies = ["grape-entity" "grape-swagger"];
@ -3010,10 +3011,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nynpl0xbj0nphqx1qlmyggq58ms1phf5i03hk64wcc0a17x1m1c";
sha256 = "1jf9dxgjz6z7fvymyz2acyvn9iyvwkn6d9sk7y4fxwbmfc75yimm";
type = "gem";
};
version = "1.0.1";
version = "1.1.0";
};
hashie = {
groups = ["default"];
@ -3158,10 +3159,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7";
type = "gem";
};
version = "1.14.1";
version = "1.14.4";
};
i18n_data = {
groups = ["default"];
@ -3507,10 +3508,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1rc7fzg4rjchyv7rd6vlz35hg5n8k5625s78hj12zji0xhg1jznc";
sha256 = "08y6f6f4nhg4dc96rbawhjjalxn0chzvvza5d8qfzsac6zl83094";
type = "gem";
};
version = "1.5.6";
version = "1.6.8";
};
letter_opener = {
dependencies = ["launchy"];
@ -3636,10 +3637,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1nd26yk8fwhb7lf7knzl6pf93v2spyf90gz4c6f8xfzq9hv6kj17";
sha256 = "0kxnshqv3xv3hprnn4rsqq0djrqpmfcr7x8qmwy6p91g7yqhkhx5";
type = "gem";
};
version = "2.2.0";
version = "2.2.2";
};
lru_redux = {
groups = ["default"];
@ -3783,10 +3784,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lpq12z70n10c1qshcddd5nib2pkcbkwzvmiqqzj60l01k3x4fg9";
sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37";
type = "gem";
};
version = "4.10.1";
version = "4.12.0";
};
mini_mime = {
groups = ["default" "development" "test"];
@ -4165,15 +4166,15 @@ src:
version = "2.0.9";
};
octokit = {
dependencies = ["faraday" "sawyer"];
dependencies = ["base64" "faraday" "sawyer"];
groups = ["danger" "default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11fhv1a43c51jkgmqf62aypf9yw74lc6ph4qmzsh2bydwwzbwqn3";
sha256 = "1kgqga0ycrlrk586gw2s7f8p4w699gjj3zvmmqkhx4afnplrq8l2";
type = "gem";
};
version = "8.0.0";
version = "8.1.0";
};
ohai = {
dependencies = ["chef-config" "chef-utils" "ffi" "ffi-yajl" "ipaddress" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" "plist" "train-core" "wmi-lite"];
@ -4565,10 +4566,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "181faqz59p2mbfab5q4l1r298pq0nxl0k85rjcb58g0lardmv321";
sha256 = "11r6kp8wam0nkfvnwyc1fmvky102r1vcfr84vi2p1a2wa0z32j3p";
type = "gem";
};
version = "3.3.0.2";
version = "3.3.0.5";
};
parslet = {
groups = ["default" "development" "test"];
@ -5483,10 +5484,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0icl94f0mmw7g4h1qnsil0cw6zw7b5wv0ilxda01928vh5bf87mk";
sha256 = "143m9yiawqrjc02wack30k7m5w4d1axlsw0ds71vl55amqnvx6b1";
type = "gem";
};
version = "0.0.8";
version = "0.0.9";
};
rubocop = {
dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
@ -5593,10 +5594,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v0dwirw4mq7qkf5a7wvagil4ppvk4dw4ln8hs6rmf2xrf56ga5f";
sha256 = "0ja3ag2q0w8xsbf25sf2x98gvdia534ld2m8hn1bfwzhwb5ysfsl";
type = "gem";
};
version = "0.14.4";
version = "0.14.6";
};
ruby-lsp-rails = {
dependencies = ["actionpack" "activerecord" "railties" "ruby-lsp" "sorbet-runtime"];
@ -5604,10 +5605,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "033kxj55pywnc4cjqcfb2jvn96nsa93m93qd2p636jf5hkqazq41";
sha256 = "1hrb39svnd8v6vnd3vyzsby6qr0z28cj0v9r02hcjvadm2p67g03";
type = "gem";
};
version = "0.3.1";
version = "0.3.3";
};
ruby-lsp-rspec = {
dependencies = ["ruby-lsp"];
@ -5804,10 +5805,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1asysih4l1mv24wqxrbnz0c0454kw3dhqaj6nsa8pyn9fjjdms5b";
sha256 = "0rjh9s5x7jqaxjfcz2m3hphhlajk9nxs6wdsnia62iba07bd32sc";
type = "gem";
};
version = "4.18.1";
version = "4.19.0";
};
semver_dialects = {
dependencies = ["deb_version" "pastel" "thor" "tty-command"];
@ -5815,10 +5816,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "11s5nr5v81qjlf2glgqjisvnv12vmwsmi9abbzqkb1nqjhw43691";
sha256 = "1zhnq4wkcy8vv6qazfg0p3zrlswxhz9glqnq2991p4vg86grq1b0";
type = "gem";
};
version = "2.0.0";
version = "2.0.2";
};
sentry-rails = {
dependencies = ["railties" "sentry-ruby"];
@ -6197,6 +6198,16 @@ src:
};
version = "0.8.0";
};
static_holmes = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "01w2vjm0sssiw3j38jhgkqsqn1wdqnm2ld24hi8ib2bj47c2di47";
type = "gem";
};
version = "0.7.7";
};
strings = {
dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"];
groups = ["default" "development" "test"];
@ -6350,10 +6361,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08vm33d51zdan4zj4cccw3lx06p6flc1h40kgdfm9rp4x83csdda";
sha256 = "09zw1y52yhzw2z01za87dglpfpdrm1dma00629wpq6462nxq9574";
type = "gem";
};
version = "1.3.1";
version = "1.3.2";
};
test_file_finder = {
dependencies = ["faraday"];
@ -6361,10 +6372,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cyd1wpi280w4v6f6panbvrli8493phzbb09nvxswxhcv1lv7sd5";
sha256 = "16bi2x6n8vwpinlm3n7j666ryq06zndhp4cj32sq89vbl240byw3";
type = "gem";
};
version = "0.2.1";
version = "0.3.1";
};
text = {
groups = ["default" "development"];
@ -6888,10 +6899,10 @@ src:
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13jb9q0qv9ajw1ajr4cawnqj4h0dws3w5j4v5n6v3xk7a8rnjzr7";
sha256 = "07zk8ljq5kyd1mm9qw3452fcnf7frg3irh9ql8ln2m8zbi1qf1qh";
type = "gem";
};
version = "3.22.0";
version = "3.23.0";
};
webrick = {
groups = ["default" "development" "test"];

15
pkgs/applications/video/mpv/default.nix
View File

@ -121,17 +121,14 @@ let
overrideSDK =
platform: version:
platform
// lib.optionalAttrs (platform ? darwinMinVersion) {
darwinMinVersion = version;
};
platform // lib.optionalAttrs (platform ? darwinMinVersion) { darwinMinVersion = version; };
stdenv' =
if swiftSupport && stdenv.isDarwin && stdenv.isx86_64 then
stdenv.override (old: {
buildPlatform = overrideSDK old.buildPlatform "10.15";
hostPlatform = overrideSDK old.hostPlatform "10.15";
targetPlatform = overrideSDK old.targetPlatform "10.15";
buildPlatform = overrideSDK old.buildPlatform "11.0";
hostPlatform = overrideSDK old.hostPlatform "11.0";
targetPlatform = overrideSDK old.targetPlatform "11.0";
})
else
stdenv;
@ -357,9 +354,7 @@ stdenv'.mkDerivation (finalAttrs: {
tests = {
inherit (nixosTests) mpv;
version = testers.testVersion {
package = finalAttrs.finalPackage;
};
version = testers.testVersion { package = finalAttrs.finalPackage; };
pkg-config = testers.hasPkgConfigModules {
package = finalAttrs.finalPackage;
moduleNames = [ "mpv" ];

9
pkgs/by-name/ap/apt-offline/package.nix
View File

@ -2,6 +2,7 @@
, fetchFromGitHub
, python3Packages
, gnupg
, installShellFiles
}:
let
@ -18,6 +19,8 @@ in
python3Packages.buildPythonApplication {
inherit pname version src;
nativeBuildInputs = [ installShellFiles ];
postPatch = ''
substituteInPlace org.debian.apt.aptoffline.policy \
--replace /usr/bin/ "$out/bin"
@ -26,6 +29,10 @@ python3Packages.buildPythonApplication {
--replace /usr/bin/gpgv "${lib.getBin gnupg}/bin/gpgv"
'';
postInstall = ''
installManPage apt-offline.8
'';
postFixup = ''
rm "$out/bin/apt-offline-gui" "$out/bin/apt-offline-gui-pkexec"
'';
@ -34,6 +41,8 @@ python3Packages.buildPythonApplication {
pythonImportsCheck = [ "apt_offline_core" ];
outputs = [ "out" "man" ];
meta = {
homepage = "https://github.com/rickysarraf/apt-offline";
description = "Offline APT package manager";

6
pkgs/by-name/ig/igvm-tooling/package.nix
View File

@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = [ acpica-tools ];
propagatedBuildInputs = with python3.pkgs; [
propagatedBuildInputs = (with python3.pkgs; [
setuptools
ecdsa
cstruct
@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication rec {
pytest
cached-property
frozendict
] ++ [
]) ++ [
acpica-tools
which
];
@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec {
description = "IGVM Image Generator";
homepage = "https://github.com/microsoft/igvm-tooling";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.malt3 ];
maintainers = with lib.maintainers; [ malt3 katexochen ];
changelog = "https://github.com/microsoft/igvm-tooling/releases/tag/igvm-${version}";
mainProgram = "igvmgen";
platforms = lib.platforms.all;

29
pkgs/servers/misc/irrd/default.nix → pkgs/by-name/ir/irrd/package.nix
View File

@ -43,26 +43,40 @@ in
py.pkgs.buildPythonPackage rec {
pname = "irrd";
version = "4.4.2";
version = "4.4.4";
format = "pyproject";
src = fetchFromGitHub {
owner = "irrdnet";
repo = "irrd";
rev = "v${version}";
hash = "sha256-vZSuBP44ZvN0mu2frcaQNZN/ilvKWIY9ETnrStzSnG0=";
hash = "sha256-UIOKXU92JEOeVdpYLNmDBtLn0u3LMdKItcn9bFd9u8g=";
};
patches = [
# replace poetry dependency with poetry-core
# https://github.com/irrdnet/irrd/pull/884
# starlette 0.37.2 reverted the behaviour change which this adjusted to
(fetchpatch {
url = "https://github.com/irrdnet/irrd/commit/4fb6e9b50d65729aff2d0a94c2e9b4e2daadea85.patch";
hash = "sha256-DcE6VZfJkbHnPiEdYDpXea7S/8P0SmdvvJ42hywnpf0=";
url = "https://github.com/irrdnet/irrd/commit/43e26647e18f8ff3459bbf89ffbff329a0f1eed5.patch";
revert = true;
hash = "sha256-G216rHfWMZIl9GuXBz6mjHCIm3zrfDDLSmHQK/HkkzQ=";
})
# Backport build fix for webauthn 2.1
(fetchpatch {
url = "https://github.com/irrdnet/irrd/commit/20b771e1ee564f38e739fdb0a2a79c10319f638f.patch";
hash = "sha256-PtNdhSoFPT1kt71kFsySp/VnUpUdO23Gu9FKknHLph8=";
includes = ["irrd/webui/auth/endpoints_mfa.py"];
})
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail psycopg2-binary psycopg2
'';
pythonRelaxDeps = true;
nativeBuildInputs = with python3.pkgs; [
poetry-core
pythonRelaxDepsHook
];
nativeCheckInputs = [
@ -75,6 +89,7 @@ py.pkgs.buildPythonPackage rec {
pytest-freezegun
pytestCheckHook
smtpdfix
httpx
]);
propagatedBuildInputs = with py.pkgs; [
@ -119,6 +134,7 @@ py.pkgs.buildPythonPackage rec {
asgi-logger
wtforms-bootstrap5
email-validator
jinja2
] ++ py.pkgs.uvicorn.optional-dependencies.standard;
preCheck = ''
@ -157,7 +173,6 @@ py.pkgs.buildPythonPackage rec {
license = licenses.mit;
homepage = "https://github.com/irrdnet/irrd";
maintainers = teams.wdz.members;
broken = true; # last successful build 2023-10-21
};
}

4
pkgs/by-name/na/namespace-cli/package.nix
View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "namespace-cli";
version = "0.0.374";
version = "0.0.376";
src = fetchFromGitHub {
owner = "namespacelabs";
repo = "foundation";
rev = "v${version}";
hash = "sha256-ZHvFp27yobFGqitsyKYHaxUMdpngFkufyeiNK4foioI=";
hash = "sha256-kBB4TuC0ZRTJEzys7LEsD3WxdLhXpLOkU8K9VyS84Wk=";
};
vendorHash = "sha256-72cHswoTZszo42NOrPNuokDlqoJ3/YEhGe+rQSKvgAw=";

7
pkgs/by-name/ol/ollama/package.nix
View File

@ -31,13 +31,13 @@
let
pname = "ollama";
# don't forget to invalidate all hashes each update
version = "0.1.42";
version = "0.1.43";
src = fetchFromGitHub {
owner = "ollama";
repo = "ollama";
rev = "v${version}";
hash = "sha256-lmnfFJBPgjaCdxkMALNQigrtD/V2T3Vs1GEKvRCgWaM=";
hash = "sha256-+WCyRZPm4EyLH68uXDUJEW76v6FXq2WS5fqt4momKDA=";
fetchSubmodules = true;
};
@ -197,12 +197,13 @@ goBuild ((lib.optionalAttrs enableRocm {
];
passthru.tests = {
inherit ollama;
service = nixosTests.ollama;
version = testers.testVersion {
inherit version;
package = ollama;
};
} // stdenv.isLinux {
} // lib.optionalAttrs stdenv.isLinux {
inherit ollama-rocm ollama-cuda;
};

4
pkgs/by-name/rc/rclip/package.nix
View File

@ -4,14 +4,14 @@
}:
python3Packages.buildPythonApplication rec {
pname = "rclip";
version = "1.8.10";
version = "1.9.0";
pyproject = true;
src = fetchFromGitHub {
owner = "yurijmikhalevich";
repo = "rclip";
rev = "refs/tags/v${version}";
hash = "sha256-wjwi6GBblv8Z3SA1bMrtPz3KVF8Zw5595Hqyp8FPgcg=";
hash = "sha256-q6z/JEIPnVnaHx9x53f9KyCKt7nZRxQGPeVTT1SqxkU=";
};
nativeBuildInputs = with python3Packages; [

4
pkgs/by-name/re/regal/package.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
name = "regal";
version = "0.23.0";
version = "0.23.1";
src = fetchFromGitHub {
owner = "StyraInc";
repo = "regal";
rev = "v${version}";
hash = "sha256-isivyYBxYinHQKfuLNyfXB1MNqdqNwu5iqsUd+WRwq8=";
hash = "sha256-ui4SY8HNpS5CV2zh84w8CYZmZAoNOPxIj/eG+KvKlwI=";
};
vendorHash = "sha256-I0aJFvJmmnxlqgeETOyg2/mjGX8lUJz99t56Qe+9uZg=";

14
pkgs/by-name/ri/ride/package.nix
View File

@ -3,6 +3,7 @@
stdenv,
buildNpmPackage,
fetchFromGitHub,
fetchpatch,
substituteAll,
jq,
moreutils,
@ -10,7 +11,7 @@
makeWrapper,
copyDesktopItems,
makeDesktopItem,
electron_27,
electron,
}:
let
@ -30,9 +31,6 @@ let
};
platformInfo = platformInfos.${stdenv.system};
# Electron 27 is the latest version that works as of RIDE version 4.5.4097
electron = electron_27;
in
buildNpmPackage rec {
pname = "ride";
@ -45,9 +43,15 @@ buildNpmPackage rec {
hash = "sha256-xR+HVC1JVrPkgPhIJZxdTVG52+QbanmD1c/uO5l84oc=";
};
npmDepsHash = "sha256-EG3pZkjDGBI2dDaQZ6351+oU4xfHd6HNB8eD7ErpYIg=";
npmDepsHash = "sha256-h+48/9h7/cD8woyA0UCLtzKuE9jCrfpDk6IeoDWnYik=";
patches = [
# Adds support for electron versions >=28
(fetchpatch {
name = "bump-electron-version.patch";
url = "https://github.com/Dyalog/ride/commit/de42ebbd5036cfe0c7e6604296e87cc57ac9d365.patch";
hash = "sha256-5iKSNcxOOo2fKNvy3Rv+AlH3psYhLWLWUY0l8M6mAD4=";
})
# Fix info in the "about" page, set electron version, set local-cache as zipdir
(substituteAll {
src = ./mk.patch;

4
pkgs/by-name/tc/tcsh/package.nix
View File

@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "tcsh";
version = "6.24.12";
version = "6.24.13";
src = fetchurl {
url = "mirror://tcsh/tcsh-${finalAttrs.version}.tar.gz";
hash = "sha256-4ycM6WZ/1b0qBGaHZZ/PX9ameBMm+Abr1yTx4cnNQYU=";
hash = "sha256-HpJ9UunIXRYr+YXyTRPGzO3pvriA2G/sSS7RVIClxxo=";
};
strictDeps = true;

6
pkgs/by-name/ty/typstyle/package.nix
View File

@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "typstyle";
version = "0.11.25";
version = "0.11.26";
src = fetchFromGitHub {
owner = "Enter-tainer";
repo = "typstyle";
rev = "refs/tags/v${version}";
hash = "sha256-wpG+laz1k/zCnEAVOyXzrN2DOECpKWT1nVCuQUwD+p0=";
hash = "sha256-zuMsYSiGHJkvI1y+vH77FHzCZFPkYqVoeve2kXwKVDI=";
};
cargoHash = "sha256-JeEM2sxVR5qWCPBV1BT097HvkIikwPdZhOa5747e3vQ=";
cargoHash = "sha256-PVve8zJvMQuMw4k2fEnjA2viv+f3dNgQ6xmPjbx7EgY=";
nativeBuildInputs = [
pkg-config

32
pkgs/by-name/ws/wstunnel/package.nix Normal file
View File

@ -0,0 +1,32 @@
{ fetchFromGitHub
, rustPlatform
, lib
}:
rustPlatform.buildRustPackage rec {
pname = "wstunnel";
version = "9.6.2";
src = fetchFromGitHub {
owner = "erebe";
repo = "wstunnel";
rev = "v${version}";
hash = "sha256-0r+8C8Gf3/s3opzplzc22d9VVp39FtBq1bYkxlmtqjg=";
};
cargoHash = "sha256-hHVxa7Ihmuuf26ZSzGmrHA2RczhzXtse3h1M4cNCvhw=";
checkFlags = [
# make use of network connection
"--skip=tcp::tests::test_proxy_connection"
];
meta = {
description = "Tunneling program over websocket protocol";
mainProgram = "wstunnel";
homepage = "https://github.com/erebe/wstunnel";
license = with lib.licenses; [ bsd3 ];
maintainers = with lib.maintainers; [ neverbehave ];
platforms = lib.platforms.linux;
};
}

4
pkgs/development/libraries/aws-c-cal/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "aws-c-cal";
version = "0.6.12";
version = "0.6.15";
src = fetchFromGitHub {
owner = "awslabs";
repo = finalAttrs.pname;
rev = "v${finalAttrs.version}";
hash = "sha256-aegK01wYdOc6RGNVf/dZKn1HkqQr+yEblcu6hnlMZE4=";
hash = "sha256-RrUJz3IqwbBJ8NuJTIWqK33FlJHolcaid55PT2EhO24=";
};
patches = [

4
pkgs/development/libraries/aws-c-common/default.nix
View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-common";
version = "0.9.17";
version = "0.9.21";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
hash = "sha256-Ee3wkgIOTsZn2PgHoaO5HqblXuOacuKm5vUwkl4Dg+4=";
hash = "sha256-lJCQPatwZeHpuzQni6SMMGYBH4iESQH8ofFgmRbxtnM=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/aws-c-http/default.nix
View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-http";
version = "0.8.1";
version = "0.8.2";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-http";
rev = "v${version}";
hash = "sha256-S5ETVkdGTndt2GJBNL4DU5SycHAufsmN06xBDRMFVKo=";
hash = "sha256-86auAZGoaYIpoTVlB9uC+nKMNt1QRNor+/68B5D36r8=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/aws-c-io/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-io";
version = "0.14.7";
version = "0.14.9";
src = fetchFromGitHub {
owner = "awslabs";
repo = pname;
rev = "v${version}";
hash = "sha256-Z4o1vv/8FWp3S7GfLDsV0a8ih+IdJIUC0DL4klOXjnw=";
hash = "sha256-YrEpb4+yzrNci0/ZW+UsPlEmnCBkcRFDgo8SuxsTWXg=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/aws-c-s3/default.nix
View File

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-s3";
version = "0.5.7";
version = "0.5.10";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-s3";
rev = "v${version}";
hash = "sha256-zzsRYhLgJfd02fPgoZBf7n6dTfbLHarc1aQa0fx/uck=";
hash = "sha256-yQY5yZFRm/2K97ffyumAQhgPlU6Nzy8PDGcy9L53Y84=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/aws-sdk-cpp/default.nix
View File

@ -27,13 +27,13 @@ in
stdenv.mkDerivation rec {
pname = "aws-sdk-cpp";
version = "1.11.318";
version = "1.11.336";
src = fetchFromGitHub {
owner = "aws";
repo = "aws-sdk-cpp";
rev = version;
hash = "sha256-HQNtVCt8vemRVnz0v9TNjUpjYn/IlbgIOeDESt3iI4A=";
hash = "sha256-hetXtXM8HG6V3rAuyf+w+DtlxEcpsyaroZsw0nIJoAw=";
};
postPatch = ''

4
pkgs/development/libraries/ngtcp2/gnutls.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "ngtcp2";
version = "1.5.0";
version = "1.6.0";
src = fetchFromGitHub {
owner = "ngtcp2";
repo = "ngtcp2";
rev = "v${version}";
hash = "sha256-3tB1AvwGJJiujZEc5Uc2NSAETop4LFEgiml/v68oheM=";
hash = "sha256-Oaz5LX4R0vriURueQNklZ1dx1r8SWDaeK8oaUadlGtI=";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/sentry-native/default.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec {
pname = "sentry-native";
version = "0.7.5";
version = "0.7.6";
src = fetchFromGitHub {
owner = "getsentry";
repo = "sentry-native";
rev = version;
hash = "sha256-Q19b2J7v94jByzQUPHdot7MZZTLa6cgZgzSYkSbyyHw=";
hash = "sha256-yriFV6OLk+miaKKWQKd08MmwDx0blkiiyq6gQHUaNWE=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/bandit/default.nix
View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "bandit";
version = "1.7.8";
version = "1.7.9";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-Nt5Q9yCFarJKJNuqX+4sZgUO2XwUd+ChFZ3qsXdeq2s=";
hash = "sha256-fDlaQ2dDAY974KTLsKTqm5ArbYcmTd7PjP3HO094/2E=";
};
nativeBuildInputs = [ pbr ];

4
pkgs/development/python-modules/bloodyad/default.nix
View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "bloodyad";
version = "2.0.3";
version = "2.0.4";
pyproject = true;
disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "CravateRouge";
repo = "bloodyAD";
rev = "refs/tags/v${version}";
hash = "sha256-+Lw9Apm+zzUlM19fGgxOb2bTmmKQ1Nd7dUjF9rhHXKQ=";
hash = "sha256-VqjWv7z2mU0mLM6rM4KBLS4JZaM3DGRxjXXBJQQcu9I=";
};
build-system = [ hatchling ];

4
pkgs/development/python-modules/clarifai-grpc/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "clarifai-grpc";
version = "10.5.0";
version = "10.5.2";
pyproject = true;
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "Clarifai";
repo = "clarifai-python-grpc";
rev = "refs/tags/${version}";
hash = "sha256-n4Wzg8G5i/4hh7IMyThTPfPqcVhNiPB8E6ucq2gSajo=";
hash = "sha256-IlMI4rD4bgAmsNCFpKJwEdZGiY4uCnBsoc2MYN8eXOs=";
};
build-system = [ setuptools ];

4
pkgs/development/python-modules/datasette/default.nix
View File

@ -30,7 +30,7 @@
buildPythonPackage rec {
pname = "datasette";
version = "0.64.6";
version = "0.64.7";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -39,7 +39,7 @@ buildPythonPackage rec {
owner = "simonw";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-chU0AFaVfkJMRwraX/Ky0e6/g3ZSZ2efNIJ15veqFmg=";
hash = "sha256-MxTCVgV0xDKXiYOx6rh5v55uQqlf9Wd06wHfnhDS4Hk=";
};
postPatch = ''

50
pkgs/development/python-modules/py-slvs/default.nix Normal file
View File

@ -0,0 +1,50 @@
{
lib,
buildPythonPackage,
fetchPypi,
swig,
cmake,
ninja,
setuptools,
scikit-build,
}:
buildPythonPackage rec {
pname = "py-slvs";
version = "1.0.6";
src = fetchPypi {
pname = "py_slvs";
inherit version;
sha256 = "sha256-U6T/aXy0JTC1ptL5oBmch0ytSPmIkRA8XOi31NpArnI=";
};
pyproject = true;
nativeBuildInputs = [
swig
];
build-system = [
cmake
ninja
setuptools
scikit-build
];
dontUseCmakeConfigure = true;
pythonImportsCheck = [
"py_slvs"
];
meta = {
description = "Python binding of SOLVESPACE geometry constraint solver";
homepage = "https://github.com/realthunder/slvs_py";
license = lib.licenses.gpl3Only;
maintainers = with lib.maintainers; [
traverseda
];
};
}

22
pkgs/development/python-modules/pycfmodel/default.nix
View File

@ -6,26 +6,31 @@
pydantic,
pytestCheckHook,
pythonOlder,
pythonRelaxDepsHook,
setuptools,
}:
buildPythonPackage rec {
pname = "pycfmodel";
version = "0.22.0";
version = "1.0.0";
pyproject = true;
disabled = pythonOlder "3.7";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "Skyscanner";
repo = "pycfmodel";
rev = "refs/tags/v${version}";
hash = "sha256-NLi94W99LhrBXNFItMfJczV9EZlgvmvkavrfDQJs0YU=";
rev = "refs/tags/${version}";
hash = "sha256-iCjOSwW6rdG3H4e/B/um+QioP45nOr9OcPAwXxZs3mU=";
};
nativeBuildInputs = [ setuptools ];
pythonRelaxDeps = [ "pydantic" ];
propagatedBuildInputs = [ pydantic ];
build-system = [ setuptools ];
nativeBuildInputs = [ pythonRelaxDepsHook ];
dependencies = [ pydantic ];
nativeCheckInputs = [
httpx
@ -39,6 +44,10 @@ buildPythonPackage rec {
"test_valid_es_domain_from_aws_documentation_examples_resource_can_be_built"
"test_valid_opensearch_domain_from_aws_documentation_examples_resource_can_be_built"
"test_resolve_booleans_different_properties_for_generic_resource"
"test_loose_ip"
"test_extra_fields_not_allowed_s3_bucket"
"test_raise_error_if_invalid_fields_in_resource"
""
];
pythonImportsCheck = [ "pycfmodel" ];
@ -49,6 +58,5 @@ buildPythonPackage rec {
changelog = "https://github.com/Skyscanner/pycfmodel/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
broken = versionAtLeast pydantic.version "2";
};
}

26
pkgs/development/python-modules/spyder-kernels/default.nix
View File

@ -1,6 +1,7 @@
{
lib,
buildPythonPackage,
setuptools,
cloudpickle,
fetchPypi,
ipykernel,
@ -15,17 +16,20 @@
buildPythonPackage rec {
pname = "spyder-kernels";
version = "2.5.1";
format = "setuptools";
version = "2.5.2";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-BQQqP5eyXxfN+o11AR/Xmq8CdSM0ip3/8PWiC92wubA=";
pname = "spyder_kernels";
inherit version;
hash = "sha256-cfJSkA4CsDlIIMxwSfie1yUkP2/M9kC3bdMpIDxBOWA=";
};
propagatedBuildInputs = [
build-system = [ setuptools ];
dependencies = [
cloudpickle
ipykernel
ipython
@ -36,23 +40,17 @@ buildPythonPackage rec {
wurlitzer
];
postPatch = ''
substituteInPlace setup.py \
--replace "ipykernel>=6.16.1,<7" "ipykernel" \
--replace "ipython>=7.31.1,<8" "ipython"
'';
# No tests
doCheck = false;
pythonImportsCheck = [ "spyder_kernels" ];
meta = with lib; {
meta = {
description = "Jupyter kernels for Spyder's console";
homepage = "https://docs.spyder-ide.org/current/ipythonconsole.html";
downloadPage = "https://github.com/spyder-ide/spyder-kernels/releases";
changelog = "https://github.com/spyder-ide/spyder-kernels/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ gebner ];
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ gebner ];
};
}

21
pkgs/development/python-modules/spyder/default.nix
View File

@ -44,14 +44,14 @@
buildPythonPackage rec {
pname = "spyder";
version = "5.5.4";
version = "5.5.5";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-UiIyoFREfd3gV0uhSgZ8TVFQiP3yprrBZDOm3+8Dge0=";
hash = "sha256-Y+JZO/LfWi1QzoSSV1uDI4zxLcte0HwVMNmBK0aXgd4=";
};
patches = [ ./dont-clear-pythonpath.patch ];
@ -103,15 +103,6 @@ buildPythonPackage rec {
# There is no test for spyder
doCheck = false;
postPatch = ''
# Remove dependency on pyqtwebengine
# This is still part of the pyqt 5.11 version we have in nixpkgs
sed -i /pyqtwebengine/d setup.py
substituteInPlace setup.py \
--replace "qdarkstyle>=3.0.2,<3.1.0" "qdarkstyle" \
--replace "ipython>=7.31.1,<8.0.0" "ipython"
'';
postInstall = ''
# Add Python libs to env so Spyder subprocesses
# created to run compute kernels don't fail with ImportErrors
@ -124,7 +115,7 @@ buildPythonPackage rec {
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
'';
meta = with lib; {
meta = {
description = "Scientific python development environment";
mainProgram = "spyder";
longDescription = ''
@ -135,8 +126,8 @@ buildPythonPackage rec {
homepage = "https://www.spyder-ide.org/";
downloadPage = "https://github.com/spyder-ide/spyder/releases";
changelog = "https://github.com/spyder-ide/spyder/blob/master/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ gebner ];
platforms = platforms.linux;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ gebner ];
platforms = lib.platforms.linux;
};
}

4
pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1166";
version = "3.0.1167";
pyproject = true;
disabled = pythonOlder "3.9";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-bzn858miWIsu3zzwkxAAy0Fo3xDfS10ojp7TpJEjt6M=";
hash = "sha256-GO1iAkIJyuXAa+iAmIIbnARcm90MjTG689P0WEj8VIA=";
};
build-system = [ setuptools ];

4
pkgs/development/tools/cpm-cmake/default.nix
View File

@ -5,13 +5,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cpm-cmake";
version = "0.39.0";
version = "0.40.0";
src = fetchFromGitHub {
owner = "cpm-cmake";
repo = "cpm.cmake";
rev = "v${finalAttrs.version}";
hash = "sha256-cDFt+fDpb/gDlFx+3C5Hw/ybf4hdjZOrpeNR8yBwd1M=";
hash = "sha256-307U/7gO8Ps5UvslYGOrVKHRjO9TYJrYsnAzu0Kljt8=";
};
dontConfigure = true;

4
pkgs/development/tools/extism-cli/default.nix
View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "extism-cli";
version = "1.5.0";
version = "1.5.1";
src = fetchFromGitHub {
owner = "extism";
repo = "cli";
rev = "refs/tags/v${version}";
hash = "sha256-t0SbjTuM298Cka2zhavR6bOGDriz2XUGcfAy25se7M4=";
hash = "sha256-b+X0pFrKhcfzucUM8akV061zslkdF1Jc9X1aqCqXagU=";
};
vendorHash = "sha256-5QSZDPRMlLVyOQGCSxNC5BBiuegschkHA0sWvOVAODI=";

4
pkgs/development/tools/misc/editorconfig-core-c/default.nix
View File

@ -8,7 +8,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "editorconfig-core-c";
version = "0.12.7";
version = "0.12.8";
outputs = [ "out" "dev" ];
@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "editorconfig";
repo = "editorconfig-core-c";
rev = "v${finalAttrs.version}";
hash = "sha256-uKukgQPKIx+zJPf08MTYEtoBiWeVcQmZnjWl4Zk9xaY=";
hash = "sha256-zhWq87X8n7iyp5HBmV2ZTjcN09zQ/sBXPrGmQT0iRr4=";
fetchSubmodules = true;
};

6
pkgs/development/tools/misc/pest-ide-tools/default.nix
View File

@ -10,14 +10,14 @@
rustPlatform.buildRustPackage rec {
pname = "pest-ide-tools";
version = "0.3.9";
cargoSha256 = "sha256-kFLVzsk2ML78zWoLVX/tPz+rwBPziXmfGAcVSA7GiTA=";
version = "0.3.11";
cargoSha256 = "sha256-ZD8UQbkk5JhkanBkzo+c86DZE4aD44ma5cN97aKx97U=";
src = fetchFromGitHub {
owner = "pest-parser";
repo = "pest-ide-tools";
rev = "v${version}";
sha256 = "sha256-6051J3DQjI+Wp3iLn65GRmMnwOjGEtcWyXEKsT9k9fE=";
sha256 = "sha256-12/FndzUbUlgcYcwMT1OfamSKgy2q+CvtGyx5YY4IFQ=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [

6
pkgs/development/tools/squawk/default.nix
View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "squawk";
version = "0.29.0";
version = "1.0.0";
src = fetchFromGitHub {
owner = "sbdchd";
repo = pname;
rev = "v${version}";
hash = "sha256-YKwoMZkr+UWri4WLm+a44DA8sygy67UkSm160OqDGus=";
hash = "sha256-Uc357UspC2O/IxRRTy04jubzhKDRnIAN2CoHvbrGbHg=";
};
cargoHash = "sha256-pX87ccAyMkR7qA/k3zLgqYEIhNLFa5yrrVZVtWUKfyc=";
cargoHash = "sha256-G0t3wvcp1Dm0ZCDnzTVf1XJ2Dtr0LyrKM1Vvso0IoaA=";
nativeBuildInputs = [
pkg-config

4
pkgs/development/tools/vendir/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "vendir";
version = "0.40.1";
version = "0.40.2";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "carvel-vendir";
rev = "v${version}";
sha256 = "sha256-v+p3I0PJc+7vgZqQA/dClv/GqOQTniwWHxXQamM+8oo=";
sha256 = "sha256-cGcp7bMdxZrg+4ni5kX4jEq2Aybfmonna0jM1Ux6s9Q=";
};
vendorHash = null;

4
pkgs/development/tools/ytt/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "ytt";
version = "0.49.0";
version = "0.49.1";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "carvel-ytt";
rev = "v${version}";
sha256 = "sha256-7eG9ATZTqA48KFdPW/XVYNdq+giYVx0v1GDtabiTpQI=";
sha256 = "sha256-1W7pnljAzeIjXdjCj8nauvca4IGpsn0TmrKUNJtMg+E=";
};
vendorHash = null;

6
pkgs/development/web/function-runner/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "function-runner";
version = "5.0.0";
version = "5.1.0";
src = fetchFromGitHub {
owner = "Shopify";
repo = pname;
rev = "v${version}";
sha256 = "sha256-Li3v3kXze0KgK16XVwdshZWaRF89YSC1Yk9iHXfGWKI=";
sha256 = "sha256-jhT/xkkPC0gpQqn2gOymEYP1afULd4W7pf7Z8XHGces=";
};
cargoHash = "sha256-jPiy4ULEfF/aRhWV1j2SOIe2u9uctEsmzWQ6MLXRu7A=";
cargoHash = "sha256-kiic/rVvSUxNGfEYAa23WOgyfCcnG4oI/iP1OfkL95Y=";
meta = with lib; {
description = "CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure";

49
pkgs/games/julius/darwin-fixes.patch Normal file
View File

@ -0,0 +1,49 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 038a34ba..d46b9258 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -669,16 +669,14 @@ endif()
if(APPLE)
# generating a macOS icns file (see https://stackoverflow.com/a/20703594)
add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/res/julius.icns
- COMMAND mkdir -p julius.iconset
- COMMAND sips -z 16 16 julius_256.png --out julius.iconset/icon_16x16.png
- COMMAND sips -z 32 32 julius_256.png --out julius.iconset/icon_16x16@2x.png
- COMMAND sips -z 32 32 julius_256.png --out julius.iconset/icon_32x32.png
- COMMAND sips -z 64 64 julius_256.png --out julius.iconset/icon_32x32@2x.png
- COMMAND sips -z 128 128 julius_256.png --out julius.iconset/icon_128x128.png
- COMMAND sips -z 256 256 julius_256.png --out julius.iconset/icon_128x128@2x.png
- COMMAND sips -z 256 256 julius_256.png --out julius.iconset/icon_256x256.png
- COMMAND sips -z 512 512 julius_512.png --out julius.iconset/icon_256x256@2x.png
- COMMAND iconutil -c icns julius.iconset
+ COMMAND mkdir julius.iconset
+ COMMAND convert julius_256.png -resize 16x16 julius.iconset/icon_16.png
+ COMMAND convert julius_256.png -resize 32x32 julius.iconset/icon_32.png
+ COMMAND convert julius_256.png -resize 64x64 julius.iconset/icon_64.png
+ COMMAND convert julius_256.png -resize 128x128 julius.iconset/icon_128.png
+ COMMAND cp julius_256.png julius.iconset/icon_256.png
+ COMMAND cp julius_512.png julius.iconset/icon_512.png
+ COMMAND png2icns julius.icns julius.iconset/icon_{16,32,64,128,256,512}.png
COMMAND rm -R julius.iconset
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/res)
set_source_files_properties(${PROJECT_SOURCE_DIR}/res/julius.icns PROPERTIES
@@ -687,7 +685,6 @@ if(APPLE)
# setting variables that will populate Info.plist
set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.github.bvschaik.julius")
set(MACOSX_BUNDLE_BUNDLE_NAME ${USER_FRIENDLY_NAME})
- set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10" CACHE STRING "Minimum OS X deployment version" FORCE)
set(MACOSX_BUNDLE_ICON_FILE "julius.icns")
set(MACOSX_BUNDLE_BUNDLE_VERSION
"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${VERSION_REVISION}")
diff --git a/cmake/FindSDL2_mixer.cmake b/cmake/FindSDL2_mixer.cmake
index 29cc683c..1fa28a1f 100644
--- a/cmake/FindSDL2_mixer.cmake
+++ b/cmake/FindSDL2_mixer.cmake
@@ -93,7 +93,6 @@ ELSE()
PATH_SUFFIXES include include/SDL2
PATHS ${SDL2_SEARCH_PATHS}
)
- set(SDL2_MIXER_INCLUDE_DIR "${SDL2_MIXER_INCLUDE_DIR}/Headers")
endif()
if(NOT APPLE OR NOT EXISTS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h")

37
pkgs/games/julius/default.nix
View File

@ -5,8 +5,10 @@
, SDL2_mixer
, cmake
, libpng
, darwin
, libicns
, imagemagick
}:
stdenv.mkDerivation rec {
pname = "julius";
version = "1.7.0";
@ -18,16 +20,41 @@ stdenv.mkDerivation rec {
hash = "sha256-I5GTaVWzz0ryGLDSS3rzxp+XFVXZa9hZmgwon/6r83A=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ SDL2 SDL2_mixer libpng ];
patches = [
# This fixes the darwin bundle generation, sets min. deployment version
# and patches SDL2_mixer include
./darwin-fixes.patch
];
nativeBuildInputs = [
cmake
] ++ lib.optionals stdenv.isDarwin [
darwin.sigtool
libicns
imagemagick
];
buildInputs = [
SDL2
SDL2_mixer
libpng
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Cocoa
];
installPhase = lib.optionalString stdenv.isDarwin ''
runHook preInstall
mkdir -p $out/Applications
cp -r julius.app $out/Applications/
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/bvschaik/julius";
description = "Open source re-implementation of Caesar III";
mainProgram = "julius";
license = licenses.agpl3Only;
maintainers = with maintainers; [ Thra11 ];
maintainers = with maintainers; [ Thra11 matteopacini ];
platforms = platforms.all;
broken = stdenv.isDarwin;
};
}

4
pkgs/games/naev/default.nix
View File

@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "naev";
version = "0.11.4";
version = "0.11.5";
src = fetchFromGitHub {
owner = "naev";
repo = "naev";
rev = "v${version}";
sha256 = "sha256-Cyun9BxIcv5V3HbMuFEhbYZnAuneTUwztc+ZlNaTp70=";
sha256 = "sha256-vdPkACgLGSTb9E/HZR5KoXn/fro0iHV7hX9kJim1j/M=";
fetchSubmodules = true;
};

2
pkgs/kde/gear/akonadi-search/default.nix
View File

@ -7,7 +7,7 @@
cargo,
rustc,
# provided as callPackage input to enable easier overrides through overlays
cargoHash ? "sha256-xT1SkW5iJy5Y9CK0CSxp+08XXjrbljxZzwYo2fEqxYE=",
cargoHash ? "sha256-fSue83tCE1TqaEfp1dxlRblxzJQUTNIQMYA5fXcaDqc=",
}:
mkKdeDerivation rec {
pname = "akonadi-search";

2
pkgs/kde/gear/angelfish/default.nix
View File

@ -8,7 +8,7 @@
cargo,
rustc,
# provided as callPackage input to enable easier overrides through overlays
cargoHash ? "sha256-94f4DKRXcp3o6l3zbQzCpH2ZOztZMEAHa9ookPxbeDU=",
cargoHash ? "sha256-Y0aG8NgiDTbDYgh8hMxfwSCHFh8f7PGABxw10m07dgs=",
qcoro,
}:
mkKdeDerivation rec {

2
pkgs/kde/gear/kdepim-addons/default.nix
View File

@ -8,7 +8,7 @@
corrosion,
alpaka,
# provided as callPackage input to enable easier overrides through overlays
cargoHash ? "sha256-AMOgchdx9754rkGJg8IdsNgYgH8esnlrreuY5AFZlwE=",
cargoHash ? "sha256-uFQhxNpH9KG5+27EZNBwDX2sswd1nI86bESeeOnPXA4=",
}:
mkKdeDerivation rec {
pname = "kdepim-addons";

1500
pkgs/kde/generated/sources/gear.json
View File

File diff suppressed because it is too large Load Diff

4
pkgs/servers/monitoring/mackerel-agent/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "mackerel-agent";
version = "0.81.0";
version = "0.82.0";
src = fetchFromGitHub {
owner = "mackerelio";
repo = pname;
rev = "v${version}";
sha256 = "sha256-C0/l5dt5HpSgpTw1rlQXWOh4CfCI8D/tKPTGNt67M08=";
sha256 = "sha256-zkwYYkI7oeOdJH/K9E8/ZkTOexEKyP1I2kOJlt7PcK4=";
};
nativeBuildInputs = [ makeWrapper ];

36
pkgs/servers/simplehttp2server/default.nix
View File

@ -1,26 +1,32 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub, fetchpatch }:
buildGoPackage rec {
buildGoModule rec {
pname = "simplehttp2server";
version = "3.1.3";
goPackagePath = "github.com/GoogleChromeLabs/simplehttp2server";
src = fetchFromGitHub {
owner = "GoogleChromeLabs";
repo = "simplehttp2server";
rev = version;
sha256 = "113mcfvy1m91wask5039mhr0187nlw325ac32785yl4bb4igi8aw";
owner = "GoogleChromeLabs";
repo = "simplehttp2server";
rev = version;
sha256 = "113mcfvy1m91wask5039mhr0187nlw325ac32785yl4bb4igi8aw";
};
goDeps = ./deps.nix;
patches = [
# Migrate to Go modules
(fetchpatch {
url = "https://github.com/GoogleChromeLabs/simplehttp2server/commit/7090b4af33846c48b336335f6a19514b7c1d4392.patch";
hash = "sha256-xGBPNdAmOAUkr7j2VDfTi3Bm13y/b3nuqDLf1jiGct4=";
})
];
vendorHash = "sha256-PcDy+46Pz6xOxxwkSjojsbKZyR1yHdbWAJT+HFAEKkA=";
proxyVendor = true;
meta = with lib; {
homepage = "https://github.com/GoogleChromeLabs/simplehttp2server";
description = "HTTP/2 server for development purposes";
license = licenses.asl20;
maintainers = with maintainers; [ yrashk ];
mainProgram = "simplehttp2server";
homepage = "https://github.com/GoogleChromeLabs/simplehttp2server";
description = "HTTP/2 server for development purposes";
license = licenses.asl20;
maintainers = with maintainers; [ yrashk ];
mainProgram = "simplehttp2server";
};
}

6
pkgs/servers/tailscale/default.nix
View File

@ -13,7 +13,7 @@
}:
let
version = "1.66.4";
version = "1.68.0";
in
buildGoModule {
pname = "tailscale";
@ -23,7 +23,7 @@ buildGoModule {
owner = "tailscale";
repo = "tailscale";
rev = "v${version}";
hash = "sha256-ETBca3qKO2iS30teIF5sr/oyJdRSKFqLFVO3+mmm7bo=";
hash = "sha256-GTl5RCwIoDuzbaigy0/++xaPPEMLRDbBi/z82xCDOZY=";
};
patches = [
@ -35,7 +35,7 @@ buildGoModule {
})
];
vendorHash = "sha256-Hd77xy8stw0Y6sfk3/ItqRIbM/349M/4uf0iNy1xJGw=";
vendorHash = "sha256-SUjoeOFYz6zbEgv/vND7kEXbuWlZDrUKF2Dmqsf/KVw=";
nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];

2
pkgs/servers/tidb/default.nix
View File

@ -24,7 +24,7 @@ buildGoModule rec {
description = "Open-source, cloud-native, distributed, MySQL-Compatible database for elastic scale and real-time analytics";
homepage = "https://pingcap.com";
license = licenses.asl20;
maintainers = [];
maintainers = with maintainers; [ Makuru ];
mainProgram = "tidb-server";
};
}

3
pkgs/shells/zsh/zsh-abbr/default.nix
View File

@ -18,6 +18,9 @@ stdenv.mkDerivation rec {
installPhase = ''
install -D zsh-abbr.zsh $out/share/zsh/${pname}/abbr.plugin.zsh
# Needed so that `man` can find the manpage, since it looks via PATH
mkdir -p $out/bin
mv man $out/share/man
'';
meta = with lib; {

4
pkgs/shells/zsh/zsh-you-should-use/default.nix
View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "zsh-you-should-use";
version = "1.7.4";
version = "1.8.0";
src = fetchFromGitHub {
owner = "MichaelAquilina";
repo = pname;
rev = version;
sha256 = "sha256-Jl3wZa/WIA+GtkUiCn0vKfd6N/GitOavwZ+uqfmzdps=";
sha256 = "sha256-fJX748lwVP1+GF/aIl1J3c6XAy/AtYCpEHsP8weUNo0=";
};
strictDeps = true;

85
pkgs/tools/admin/azure-cli/extensions-generated.nix
View File

@ -57,9 +57,9 @@
};
aks-preview = mkAzExtension rec {
pname = "aks-preview";
version = "3.0.0b9";
version = "5.0.0b1";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-${version}-py2.py3-none-any.whl";
sha256 = "3d5e43cd1b92ef9abe959fd2aea3e3c66dbebe2cd22df6fdb8abcf7b6682bbd9";
sha256 = "2c0a6b1a952b30f10f36f744e214a03774016fe7834038b917b8bc0ef03ce0c9";
description = "Provides a preview for upcoming AKS features";
};
akshybrid = mkAzExtension rec {
@ -85,9 +85,9 @@
};
amg = mkAzExtension rec {
pname = "amg";
version = "1.3.2";
version = "1.3.4";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/amg-${version}-py3-none-any.whl";
sha256 = "cf31e9336e8b8bf63b7a1362ea05871f65493cfd49fd4a2cb73c1cb63c81f91a";
sha256 = "cf665da8629edfef5189eb2dd57d849d458f841cff83d2cad2a1b61104febf22";
description = "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension";
};
amlfs = mkAzExtension rec {
@ -99,9 +99,9 @@
};
apic-extension = mkAzExtension rec {
pname = "apic-extension";
version = "1.0.0b4";
version = "1.0.0b5";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/apic_extension-${version}-py3-none-any.whl";
sha256 = "67294fd30190b66b339c8d550e58e1401117b313bea638fb0c126dec26249408";
sha256 = "fbca1f8446013142d676159b8292fd7c2d3175f39e1baeb5c4d13f9637003254";
description = "Microsoft Azure Command-Line Tools ApicExtension Extension";
};
appservice-kube = mkAzExtension rec {
@ -169,9 +169,9 @@
};
bastion = mkAzExtension rec {
pname = "bastion";
version = "0.3.0";
version = "1.0.0";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/bastion-${version}-py3-none-any.whl";
sha256 = "c20d8e423acef3b6728c9abdfe90ad4a7020f2d122068983d7b59b9e3fef84c3";
sha256 = "39b1468f0741f640294e2b9f258bf9fd46541e061b913003c70756f5298fed42";
description = "Microsoft Azure Command-Line Tools Bastion Extension";
};
billing-benefits = mkAzExtension rec {
@ -225,16 +225,16 @@
};
connectedmachine = mkAzExtension rec {
pname = "connectedmachine";
version = "0.7.0";
version = "1.0.0b1";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/connectedmachine-${version}-py3-none-any.whl";
sha256 = "792975ebf0260767481b2ffab0aa3154509c55a9ab60c7f987c3fdead726cd82";
sha256 = "f829b171bc489bd1bffea518040acc74608581dae798f4b23bedfe8bf7445383";
description = "Microsoft Azure Command-Line Tools ConnectedMachine Extension";
};
connectedvmware = mkAzExtension rec {
pname = "connectedvmware";
version = "1.0.1";
version = "1.1.0";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/connectedvmware-${version}-py2.py3-none-any.whl";
sha256 = "92bcb19c2d19f7e5cf3e8527894324937380b831de19845cf4d382092c5dff39";
sha256 = "d2122c64426853a4b3b766160f6291f29aed66d9aa266585c73d63305ed4d22b";
description = "Microsoft Azure Command-Line Tools Connectedvmware Extension";
};
connection-monitor-preview = mkAzExtension rec {
@ -302,9 +302,9 @@
};
datafactory = mkAzExtension rec {
pname = "datafactory";
version = "1.0.0";
version = "1.0.2";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/datafactory-${version}-py3-none-any.whl";
sha256 = "30941f7e2c093f040c958db024367b750068a5181554b23f7403f4522375c41e";
sha256 = "ea134e2963b7cdf2bcbd50244a6f1a411da77bd4db7e42c8c8f9651638c82ac7";
description = "Microsoft Azure Command-Line Tools DataFactoryManagementClient Extension";
};
datamigration = mkAzExtension rec {
@ -316,9 +316,9 @@
};
dataprotection = mkAzExtension rec {
pname = "dataprotection";
version = "1.1.0";
version = "1.5.0";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-${version}-py3-none-any.whl";
sha256 = "bb3774425d586d03b4e26ffa0021c0024b79227963ec003430e9cd6beaa2cac7";
sha256 = "5d756d16607364bb98325d2f63580f115a9f8a6bf9c9a74d55c2af2d9a485833";
description = "Microsoft Azure Command-Line Tools DataProtectionClient Extension";
};
datashare = mkAzExtension rec {
@ -351,9 +351,9 @@
};
devcenter = mkAzExtension rec {
pname = "devcenter";
version = "5.0.1";
version = "6.0.1";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/devcenter-${version}-py3-none-any.whl";
sha256 = "f90caa530ef9a11d0e4706b94a860edca419205d4a528dab72859dd6d7870b9c";
sha256 = "25e3dcdc9cb83243ceb2ed6a6dedc227953c06cb610ba95c84ddec0f7503224f";
description = "Microsoft Azure Command-Line Tools DevCenter Extension";
};
diskpool = mkAzExtension rec {
@ -463,9 +463,9 @@
};
front-door = mkAzExtension rec {
pname = "front-door";
version = "1.0.17";
version = "1.1.1";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/front_door-${version}-py3-none-any.whl";
sha256 = "20996a4d864963451572b71fecf4906f3e7fe8f403a651a1d1e98363df63d095";
sha256 = "3f3dd05dd0fce357dd0c7c6ba886a7f1bb37096a0d2d5dc0decf057431819ea4";
description = "Manage networking Front Doors";
};
fzf = mkAzExtension rec {
@ -638,9 +638,9 @@
};
managednetworkfabric = mkAzExtension rec {
pname = "managednetworkfabric";
version = "6.0.0";
version = "6.2.0";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-${version}-py3-none-any.whl";
sha256 = "340483c69484865bb4e2cadc97aa5f6b258ee894920f4df0dd74ac412a8b2d59";
sha256 = "3761e2319e0a6bccde79d59e2ab2d508f00e601562c0b7e4bf290ff9d9b14479";
description = "Support for managednetworkfabric commands based on 2023-06-15 API version";
};
managementpartner = mkAzExtension rec {
@ -673,9 +673,9 @@
};
monitor-control-service = mkAzExtension rec {
pname = "monitor-control-service";
version = "1.0.1";
version = "1.0.2";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/monitor_control_service-${version}-py3-none-any.whl";
sha256 = "66475eb79c577ea566c74f986b9ef6af936580beb02dde622701370323d430a3";
sha256 = "e0a271c65997120e0022baf51e63c2feec4df3235258a6243a60ff069315b84a";
description = "Microsoft Azure Command-Line Tools MonitorClient Extension";
};
network-analytics = mkAzExtension rec {
@ -708,9 +708,9 @@
};
nginx = mkAzExtension rec {
pname = "nginx";
version = "2.0.0b2";
version = "2.0.0b4";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/nginx-${version}-py2.py3-none-any.whl";
sha256 = "7f26070f348d7af3132974f4393fb993eba5293ae18494af6a868e85aa34103c";
sha256 = "5327d108083910acbc066b46b8aaf7cb9355bc6e82b4857c706e9990074b512c";
description = "Microsoft Azure Command-Line Tools Nginx Extension";
};
notification-hub = mkAzExtension rec {
@ -855,9 +855,9 @@
};
self-help = mkAzExtension rec {
pname = "self-help";
version = "0.3.0";
version = "0.4.0";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/self_help-${version}-py3-none-any.whl";
sha256 = "0545610ee482069ad89c3fcc342e3d94f72b4d5eb139312c778501c843e8216d";
sha256 = "8c903aaf10d6cb61e6455f6010deeeb496d1e23d6876662089266a49403586b6";
description = "Microsoft Azure Command-Line Tools SelfHelp Extension";
};
sentinel = mkAzExtension rec {
@ -876,9 +876,9 @@
};
spring = mkAzExtension rec {
pname = "spring";
version = "1.21.0";
version = "1.24.4";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/spring-${version}-py3-none-any.whl";
sha256 = "a513aff7c4034e4b7016b948ae6fcfabcc0c754c1631d619233ea7bf61508ab1";
sha256 = "2e298a74b53fcac40d6173a5e9ea386568fcf73d88bde4c44b37c8b755b7555d";
description = "Microsoft Azure Command-Line Tools spring Extension";
};
spring-cloud = mkAzExtension rec {
@ -897,9 +897,9 @@
};
stack-hci-vm = mkAzExtension rec {
pname = "stack-hci-vm";
version = "1.1.2";
url = "https://hybridaksstorage.z13.web.core.windows.net/SelfServiceVM/CLI/stack_hci_vm-${version}-py3-none-any.whl";
sha256 = "eac2401a6aebfcacd2f9d7dd468c00024b2b83ecfe72e33c77697b04a2af0d20";
version = "1.1.11";
url = "https://hciarcvmsstorage.blob.core.windows.net/cli-extension/stack_hci_vm-${version}-py3-none-any.whl";
sha256 = "35810b2c3e02a7e3f0fa985c5bd443fbf94ccd72ac28b6ebff5aad1b2d7469aa";
description = "Microsoft Azure Command-Line Tools Stack-HCi-VM Extension";
};
standbypool = mkAzExtension rec {
@ -916,6 +916,13 @@
sha256 = "fb1dcd876fc2d829cc7a1cc545e9445364d43357d888bb3deeb36a716b805717";
description = "Microsoft Azure Command-Line Tools Staticwebapp Extension";
};
storage-actions = mkAzExtension rec {
pname = "storage-actions";
version = "1.0.0b1";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/storage_actions-${version}-py3-none-any.whl";
sha256 = "07c5be256edbbe2c81d839e4c6d3d917a56b93921515028cf962393e1176331b";
description = "Microsoft Azure Command-Line Tools StorageActions Extension";
};
storage-blob-preview = mkAzExtension rec {
pname = "storage-blob-preview";
version = "0.7.2";
@ -953,9 +960,9 @@
};
support = mkAzExtension rec {
pname = "support";
version = "1.0.4";
version = "2.0.0";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/support-${version}-py2.py3-none-any.whl";
sha256 = "ac554e2b6362a9a6ff8e03000730df31dd72781aba8bbdcf05ceb44ce1b680a0";
sha256 = "5dde97f8fb12eaa258530f68ec2cae00a957f30479835e9f5ed057940312741a";
description = "Microsoft Azure Command-Line Tools Support Extension";
};
timeseriesinsights = mkAzExtension rec {
@ -967,9 +974,9 @@
};
traffic-collector = mkAzExtension rec {
pname = "traffic-collector";
version = "0.1.2";
version = "0.1.3";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/traffic_collector-${version}-py3-none-any.whl";
sha256 = "98bda4d9a9233efb0ae1c5fae1a6c2a42942e8a71b0ebf19d3a7193548b13ff2";
sha256 = "a144a4fda3bce84db22277bd8611084ae1ae39e0bb8c7b50619ec378711f57ba";
description = "Microsoft Azure Command-Line Tools TrafficCollector Extension";
};
trustedsigning = mkAzExtension rec {
@ -981,9 +988,9 @@
};
virtual-network-manager = mkAzExtension rec {
pname = "virtual-network-manager";
version = "1.0.1";
version = "1.2.0";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_manager-${version}-py3-none-any.whl";
sha256 = "a18581c625791fb29736e7ec1b9e18d4a00f3765a8600192e10c892fd27b7ba1";
sha256 = "7f9f239fd7904645beacc2b738dd4660fb36779966e9b2331c43826e37564793";
description = "Microsoft Azure Command-Line Tools NetworkManagementClient Extension";
};
virtual-network-tap = mkAzExtension rec {

6
pkgs/tools/misc/phrase-cli/default.nix
View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "phrase-cli";
version = "2.27.1";
version = "2.28.0";
src = fetchFromGitHub {
owner = "phrase";
repo = "phrase-cli";
rev = version;
sha256 = "sha256-96avkMhIjVdUou6gOddEGOsRNI5HEH5jLQu39HdJmSQ=";
sha256 = "sha256-jaGCNWbq/CDxJXiGqueM1mj86K26Eyr0ND08Pt0IEj0=";
};
vendorHash = "sha256-srLQ2T8Ltigm6vcov4l4/f6DRs9+Mqyy9tovvnpUASc=";
vendorHash = "sha256-MwwIzgOmEUcTxdlJWKZU8A4fH3efuNIeS/mFceBYBY0=";
ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ];

4
pkgs/tools/networking/kapp/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kapp";
version = "0.62.0";
version = "0.62.1";
src = fetchFromGitHub {
owner = "carvel-dev";
repo = "kapp";
rev = "v${version}";
hash = "sha256-yaTQ1dE0WiH+FTyWaUZwp2qmpnUdhk+I6IKM8lOHXYM=";
hash = "sha256-JwrUkurxSSET8OOfgALXOrM9KnfvXGZuDOnyk3ZoAoQ=";
};
vendorHash = null;

26
pkgs/tools/security/cfripper/default.nix
View File

@ -3,36 +3,32 @@
, python3
}:
let
python = python3.override {
packageOverrides = self: super: {
pydantic = self.pydantic_1;
};
};
in python.pkgs.buildPythonApplication rec {
python3.pkgs.buildPythonApplication rec {
pname = "cfripper";
version = "1.15.6";
version = "1.15.7";
pyproject = true;
src = fetchFromGitHub {
owner = "Skyscanner";
repo = "cfripper";
rev = "refs/tags/v${version}";
hash = "sha256-h/NNTE5u1coyD4owiGjsK6SIuvDq1SQOPW4RM4yJtno=";
hash = "sha256-ymuxZwW3Pwx/CyG2iPoY7LP9e+1K6EUBi/TApg0YvkE=";
};
pythonRelaxDeps = [
"pluggy"
];
nativeBuildInputs = with python.pkgs; [
pythonRelaxDepsHook
build-system = with python3.pkgs; [
setuptools
setuptools-scm
];
propagatedBuildInputs = with python.pkgs; [
nativeBuildInputs = with python3.pkgs; [
pythonRelaxDepsHook
];
dependencies = with python3.pkgs; [
boto3
cfn-flip
click
@ -43,7 +39,7 @@ in python.pkgs.buildPythonApplication rec {
setuptools
];
nativeCheckInputs = with python.pkgs; [
nativeCheckInputs = with python3.pkgs; [
moto
pytestCheckHook
];
@ -65,10 +61,10 @@ in python.pkgs.buildPythonApplication rec {
meta = with lib; {
description = "Tool for analysing CloudFormation templates";
mainProgram = "cfripper";
homepage = "https://github.com/Skyscanner/cfripper";
changelog = "https://github.com/Skyscanner/cfripper/releases/tag/v${version}";
license = with licenses; [ asl20 ];
maintainers = with maintainers; [ fab ];
mainProgram = "cfripper";
};
}

4
pkgs/tools/security/ldeep/default.nix
View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "ldeep";
version = "1.0.57";
version = "1.0.58";
pyproject = true;
src = fetchFromGitHub {
owner = "franc-pentest";
repo = "ldeep";
rev = "refs/tags/${version}";
hash = "sha256-RjPpxKbZ9QK+dPe3Vj2IG2gr5ROtLLnVaHI3CdNwJpE=";
hash = "sha256-u8qcihjGZmOAjjVBa6nLruD74zGozHnahShqUUXILcY=";
};
pythonRelaxDeps = [

4
pkgs/top-level/all-packages.nix
View File

@ -9220,8 +9220,6 @@ with pkgs;
iroh = callPackage ../applications/networking/iroh { };
irrd = callPackage ../servers/misc/irrd { };
ised = callPackage ../tools/misc/ised { };
isl = isl_0_20;
@ -14258,8 +14256,6 @@ with pkgs;
wsmancli = callPackage ../tools/system/wsmancli { };
wstunnel = haskell.lib.compose.justStaticExecutables haskellPackages.wstunnel;
wolfebin = callPackage ../tools/networking/wolfebin { };
wthrr = callPackage ../applications/misc/wthrr { };

2
pkgs/top-level/python-packages.nix
View File

@ -14124,6 +14124,8 @@ self: super: with self; {
slugid = callPackage ../development/python-modules/slugid { };
py-slvs = callPackage ../development/python-modules/py-slvs { };
sly = callPackage ../development/python-modules/sly { };
smart-meter-texas = callPackage ../development/python-modules/smart-meter-texas { };