Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
527dfc0676
22 changed files with 481 additions and 98 deletions
|
|
@ -40,6 +40,8 @@
|
|||
|
||||
- `php80` is no longer supported due to upstream not supporting this version anymore.
|
||||
|
||||
- PHP now defaults to PHP 8.2, updated from 8.1.
|
||||
|
||||
- `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities.
|
||||
|
||||
- The `vlock` program from the `kbd` package has been moved into its own package output and should now be referenced explicitly as `kbd.vlock` or replaced with an alternative such as the standalone `vlock` package or `physlock`.
|
||||
|
|
|
|||
|
|
@ -1277,6 +1277,7 @@
|
|||
./services/web-servers/nginx/gitweb.nix
|
||||
./services/web-servers/phpfpm/default.nix
|
||||
./services/web-servers/pomerium.nix
|
||||
./services/web-servers/rustus.nix
|
||||
./services/web-servers/stargazer.nix
|
||||
./services/web-servers/tomcat.nix
|
||||
./services/web-servers/traefik.nix
|
||||
|
|
|
|||
252
nixos/modules/services/web-servers/rustus.nix
Normal file
252
nixos/modules/services/web-servers/rustus.nix
Normal file
|
|
@ -0,0 +1,252 @@
|
|||
{ lib, pkgs, config, ... }:
|
||||
with lib;
|
||||
let
|
||||
cfg = config.services.rustus;
|
||||
in
|
||||
{
|
||||
meta.maintainers = with maintainers; [ happysalada ];
|
||||
|
||||
options.services.rustus = {
|
||||
|
||||
enable = mkEnableOption (lib.mdDoc "TUS protocol implementation in Rust.");
|
||||
|
||||
host = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc ''
|
||||
The host that rustus will connect to.
|
||||
'';
|
||||
default = "127.0.0.1";
|
||||
example = "127.0.0.1";
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
description = lib.mdDoc ''
|
||||
The port that rustus will connect to.
|
||||
'';
|
||||
default = 1081;
|
||||
example = 1081;
|
||||
};
|
||||
|
||||
log_level = mkOption {
|
||||
type = types.enum [ "DEBUG" "INFO" "ERROR" ];
|
||||
description = lib.mdDoc ''
|
||||
Desired log level
|
||||
'';
|
||||
default = "INFO";
|
||||
example = "ERROR";
|
||||
};
|
||||
|
||||
max_body_size = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc ''
|
||||
Maximum body size in bytes
|
||||
'';
|
||||
default = "10000000"; # 10 mb
|
||||
example = "100000000";
|
||||
};
|
||||
|
||||
url = mkOption {
|
||||
type = types.str;
|
||||
description = lib.mdDoc ''
|
||||
url path for uploads
|
||||
'';
|
||||
default = "/files";
|
||||
};
|
||||
|
||||
disable_health_access_logs = mkOption {
|
||||
type = types.bool;
|
||||
description = lib.mdDoc ''
|
||||
disable access log for /health endpoint
|
||||
'';
|
||||
default = false;
|
||||
};
|
||||
|
||||
cors = mkOption {
|
||||
type = types.listOf types.str;
|
||||
description = lib.mdDoc ''
|
||||
list of origins allowed to upload
|
||||
'';
|
||||
default = ["*"];
|
||||
example = ["*.staging.domain" "*.prod.domain"];
|
||||
};
|
||||
|
||||
tus_extensions = mkOption {
|
||||
type = types.listOf (types.enum [
|
||||
"getting"
|
||||
"creation"
|
||||
"termination"
|
||||
"creation-with-upload"
|
||||
"creation-defer-length"
|
||||
"concatenation"
|
||||
"checksum"
|
||||
]);
|
||||
description = lib.mdDoc ''
|
||||
Since TUS protocol offers extensibility you can turn off some protocol extensions.
|
||||
'';
|
||||
default = [
|
||||
"getting"
|
||||
"creation"
|
||||
"termination"
|
||||
"creation-with-upload"
|
||||
"creation-defer-length"
|
||||
"concatenation"
|
||||
"checksum"
|
||||
];
|
||||
};
|
||||
|
||||
remove_parts = mkOption {
|
||||
type = types.bool;
|
||||
description = lib.mdDoc ''
|
||||
remove parts files after successful concatenation
|
||||
'';
|
||||
default = true;
|
||||
example = false;
|
||||
};
|
||||
|
||||
storage = lib.mkOption {
|
||||
description = lib.mdDoc ''
|
||||
Storages are used to actually store your files. You can configure where you want to store files.
|
||||
'';
|
||||
default = {};
|
||||
example = lib.literalExpression ''
|
||||
{
|
||||
type = "hybrid-s3"
|
||||
s3_access_key_file = konfig.age.secrets.R2_ACCESS_KEY.path;
|
||||
s3_secret_key_file = konfig.age.secrets.R2_SECRET_KEY.path;
|
||||
s3_bucket = "my_bucket";
|
||||
s3_url = "https://s3.example.com";
|
||||
}
|
||||
'';
|
||||
type = lib.types.submodule {
|
||||
options = {
|
||||
type = lib.mkOption {
|
||||
type = lib.types.enum ["file-storage" "hybrid-s3"];
|
||||
description = lib.mdDoc "Type of storage to use";
|
||||
};
|
||||
s3_access_key_file = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = lib.mdDoc "File path that contains the S3 access key.";
|
||||
};
|
||||
s3_secret_key_file = lib.mkOption {
|
||||
type = lib.types.path;
|
||||
description = lib.mdDoc "File path that contains the S3 secret key.";
|
||||
};
|
||||
s3_region = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "us-east-1";
|
||||
description = lib.mdDoc "S3 region name.";
|
||||
};
|
||||
s3_bucket = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = lib.mdDoc "S3 bucket.";
|
||||
};
|
||||
s3_url = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = lib.mdDoc "S3 url.";
|
||||
};
|
||||
|
||||
force_sync = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
description = lib.mdDoc "calls fsync system call after every write to disk in local storage";
|
||||
default = true;
|
||||
};
|
||||
data_dir = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = lib.mdDoc "path to the local directory where all files are stored";
|
||||
default = "/var/lib/rustus";
|
||||
};
|
||||
dir_structure = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = lib.mdDoc "pattern of a directory structure locally and on s3";
|
||||
default = "{year}/{month}/{day}";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
info_storage = lib.mkOption {
|
||||
description = lib.mdDoc ''
|
||||
Info storages are used to store information about file uploads. These storages must be persistent, because every time chunk is uploaded rustus updates information about upload. And when someone wants to download file, information about it requested from storage to get actual path of an upload.
|
||||
'';
|
||||
default = {};
|
||||
type = lib.types.submodule {
|
||||
options = {
|
||||
type = lib.mkOption {
|
||||
type = lib.types.enum ["file-info-storage"];
|
||||
description = lib.mdDoc "Type of info storage to use";
|
||||
default = "file-info-storage";
|
||||
};
|
||||
dir = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
description = lib.mdDoc "directory to store info about uploads";
|
||||
default = "/var/lib/rustus";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
|
||||
systemd.services.rustus =
|
||||
let
|
||||
isHybridS3 = cfg.storage.type == "hybrid-s3";
|
||||
in
|
||||
{
|
||||
description = "Rustus server";
|
||||
documentation = [ "https://s3rius.github.io/rustus/" ];
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
|
||||
environment = {
|
||||
RUSTUS_SERVER_HOST = cfg.host;
|
||||
RUSTUS_SERVER_PORT = toString cfg.port;
|
||||
RUSTUS_LOG_LEVEL = cfg.log_level;
|
||||
RUSTUS_MAX_BODY_SIZE = cfg.max_body_size;
|
||||
RUSTUS_URL = cfg.url;
|
||||
RUSTUS_DISABLE_HEALTH_ACCESS_LOG = lib.mkIf cfg.disable_health_access_logs "true";
|
||||
RUSTUS_CORS = lib.concatStringsSep "," cfg.cors;
|
||||
RUSTUS_TUS_EXTENSIONS = lib.concatStringsSep "," cfg.tus_extensions;
|
||||
RUSTUS_REMOVE_PARTS= if cfg.remove_parts then "true" else "false";
|
||||
RUSTUS_STORAGE = cfg.storage.type;
|
||||
RUSTUS_DATA_DIR = cfg.storage.data_dir;
|
||||
RUSTUS_DIR_STRUCTURE = cfg.storage.dir_structure;
|
||||
RUSTUS_FORCE_FSYNC = if cfg.storage.force_sync then "true" else "false";
|
||||
RUSTUS_S3_URL = mkIf isHybridS3 cfg.storage.s3_url;
|
||||
RUSTUS_S3_BUCKET = mkIf isHybridS3 cfg.storage.s3_bucket;
|
||||
RUSTUS_S3_REGION = mkIf isHybridS3 cfg.storage.s3_region;
|
||||
RUSTUS_S3_ACCESS_KEY_PATH = mkIf isHybridS3 "%d/S3_ACCESS_KEY_PATH";
|
||||
RUSTUS_S3_SECRET_KEY_PATH = mkIf isHybridS3 "%d/S3_SECRET_KEY_PATH";
|
||||
RUSTUS_INFO_STORAGE = cfg.info_storage.type;
|
||||
RUSTUS_INFO_DIR = cfg.info_storage.dir;
|
||||
};
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.rustus}/bin/rustus";
|
||||
StateDirectory = "rustus";
|
||||
DynamicUser = true;
|
||||
LoadCredential = lib.optionals isHybridS3 [
|
||||
"S3_ACCESS_KEY_PATH:${cfg.storage.s3_access_key_file}"
|
||||
"S3_SECRET_KEY_PATH:${cfg.storage.s3_secret_key_file}"
|
||||
];
|
||||
# hardening
|
||||
RestrictRealtime=true;
|
||||
RestrictNamespaces=true;
|
||||
LockPersonality=true;
|
||||
ProtectKernelModules=true;
|
||||
ProtectKernelTunables=true;
|
||||
ProtectKernelLogs=true;
|
||||
ProtectControlGroups=true;
|
||||
ProtectHostUserNamespaces=true;
|
||||
ProtectClock=true;
|
||||
RestrictSUIDSGID=true;
|
||||
SystemCallArchitectures="native";
|
||||
CapabilityBoundingSet="";
|
||||
ProtectProc = "invisible";
|
||||
# TODO consider SystemCallFilter LimitAS ProcSubset
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "fn";
|
||||
version = "0.6.24";
|
||||
version = "0.6.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fnproject";
|
||||
repo = "cli";
|
||||
rev = version;
|
||||
hash = "sha256-em9Bfrk7jJdmg3N+zH0VTpCdKPEOBK8vc297V5vmKzM=";
|
||||
hash = "sha256-hXWsEg4GJ9AGiZBRLKp7yOJ8o3m4EOvb/g8rVUVHFEM=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "starboard";
|
||||
version = "0.15.12";
|
||||
version = "0.15.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-q4TucVRsRH8XRiudU6lRT5R9jAXg6AjEKezUElCCTbQ=";
|
||||
sha256 = "sha256-8sEhR32CaTYGHi6tdhjGl8c42QUbaaUDdFwtpEFwRHo=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
|
@ -20,7 +20,7 @@ buildGoModule rec {
|
|||
find "$out" -name .git -print0 | xargs -0 rm -rf
|
||||
'';
|
||||
};
|
||||
vendorHash = "sha256-gDBMGn3gKbAvMU3V88tjAZJlAiUXXnXGzyCT06l+DZ8=";
|
||||
vendorHash = "sha256-JEji1wPXLfVireuIVD2Ct/1Nvf92ukwRpMDCrT/CbOE=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -52,16 +52,16 @@ let
|
|||
};
|
||||
in buildNpmPackage rec {
|
||||
pname = "deltachat-desktop";
|
||||
version = "1.38.0";
|
||||
version = "1.38.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-desktop";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-JXNc58PXcqeHrWtcNN3hnkgKRnFxHwvqst/bJP8cRJ0=";
|
||||
hash = "sha256-nXYXjq6bLGvH4m8ECwxfkcUjOsUUj07bt3NFb3oD0Gw=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-8A9PpsztHU/JsWQCXMOIDYBsDEl6K4ftBhW3ytw8/zE=";
|
||||
npmDepsHash = "sha256-fQKFSWljHHPp1A8lcxVxrMVESuTiB3GkSWDb98yCZz4=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
|
|
|
|||
|
|
@ -52,9 +52,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
|||
|
||||
[[package]]
|
||||
name = "built"
|
||||
version = "0.6.0"
|
||||
version = "0.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "96f9cdd34d6eb553f9ea20e5bf84abb7b13c729f113fc1d8e49dc00ad9fa8738"
|
||||
checksum = "b99c4cdc7b2c2364182331055623bdf45254fcb679fea565c40c3c11c101889a"
|
||||
dependencies = [
|
||||
"cargo-lock",
|
||||
"chrono",
|
||||
|
|
@ -80,9 +80,9 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
|
|||
|
||||
[[package]]
|
||||
name = "cargo-lock"
|
||||
version = "8.0.3"
|
||||
version = "9.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "031718ddb8f78aa5def78a09e90defe30151d1f6c672f937af4dd916429ed996"
|
||||
checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72"
|
||||
dependencies = [
|
||||
"semver",
|
||||
"serde",
|
||||
|
|
@ -180,7 +180,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "css-inline"
|
||||
version = "0.10.0"
|
||||
version = "0.10.1"
|
||||
dependencies = [
|
||||
"attohttpc",
|
||||
"cssparser",
|
||||
|
|
@ -194,7 +194,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "css-inline-python"
|
||||
version = "0.10.0"
|
||||
version = "0.10.1"
|
||||
dependencies = [
|
||||
"built",
|
||||
"css-inline",
|
||||
|
|
@ -988,6 +988,15 @@ dependencies = [
|
|||
"syn 2.0.18",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_spanned"
|
||||
version = "0.6.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "servo_arc"
|
||||
version = "0.2.0"
|
||||
|
|
@ -1072,9 +1081,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "target-lexicon"
|
||||
version = "0.12.7"
|
||||
version = "0.12.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5"
|
||||
checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac"
|
||||
|
||||
[[package]]
|
||||
name = "tendril"
|
||||
|
|
@ -1104,11 +1113,36 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
|
|||
|
||||
[[package]]
|
||||
name = "toml"
|
||||
version = "0.5.11"
|
||||
version = "0.7.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
|
||||
checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_spanned",
|
||||
"toml_datetime",
|
||||
"toml_edit",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml_datetime"
|
||||
version = "0.6.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml_edit"
|
||||
version = "0.19.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
|
||||
dependencies = [
|
||||
"indexmap",
|
||||
"serde",
|
||||
"serde_spanned",
|
||||
"toml_datetime",
|
||||
"winnow",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1343,3 +1377,12 @@ name = "windows_x86_64_msvc"
|
|||
version = "0.48.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
|
||||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
version = "0.4.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "css-inline";
|
||||
version = "0.10.0";
|
||||
version = "0.10.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Stranger6667";
|
||||
repo = "css-inline";
|
||||
rev = "python-v${version}";
|
||||
hash = "sha256-6KuA9eFQO2GUEok672D17OSq2Q9Dz6XcSRq7AO2kADg=";
|
||||
hash = "sha256-oBAJv/hAz/itT2WakIw/1X1NvOHX108NoeS6V7k+aG8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
|||
ln -s ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-8Oty27rFsNo8/ZspbpJyDb1JNil2IWD5d3bJgbJnsTk=";
|
||||
hash = "sha256-SFG1nsP4+I0zH8VeyL1eeaTx0tHNIvmx6M0cko0pqIA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvclive";
|
||||
version = "2.11.3";
|
||||
version = "2.12.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-u6riFkOx00XwVlb2VOi0SPd8pFQaqn0MXmZ310frz4c=";
|
||||
hash = "sha256-6MHEhYJO1zSqrDGEb/E/0AsA4P2Z7l/sz7NKZFVF0nM=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "embedding-reader";
|
||||
version = "1.5.0";
|
||||
version = "1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rom1504";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-uyeIcAW9O9PR4cqmifC6Lx+Hn6XPb1RH/ksmUWvbdtw=";
|
||||
hash = "sha256-isb7i+RfZvbtQWySiPatuvOTxNXyPhLhoZTQMZjdC24=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pythonRelaxDepsHook ];
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "graphene-django";
|
||||
version = "3.1.1";
|
||||
version = "3.1.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "graphql-python";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-xMEC2GEP39UVWqdLQMRjLOn93PY0aJWEnQRcn8YwxWo=";
|
||||
hash = "sha256-VQwDK9FRbHy/AFbdZKmvl5e52smSCyWTrs00DvJqVmo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "jwcrypto";
|
||||
version = "1.4.2";
|
||||
version = "1.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gKNentGzssQ84D2SxdSObQtmR+KqJhjkljRIkj14o3s=";
|
||||
hash = "sha256-LB3FHPjjjd8yR5Xf6UJt7p3UbK9H9TXMvBh4H7qBC40=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -30,6 +30,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Implementation of JOSE Web standards";
|
||||
homepage = "https://github.com/latchset/jwcrypto";
|
||||
changelog = "https://github.com/latchset/jwcrypto/releases/tag/v${version}";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ costrouc ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,30 +1,49 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchgit
|
||||
, isPy3k
|
||||
, pyusb
|
||||
, fetchFromGitHub
|
||||
, pybluez
|
||||
, pytest
|
||||
, git
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyusb
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "3.0.1";
|
||||
pname = "nxt-python";
|
||||
version = "3.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://github.com/schodet/nxt-python.git";
|
||||
rev = version;
|
||||
sha256 = "004c0dr6767bjiddvp0pchcx05falhjzj33rkk03rrl0ha2nhxvz";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "schodet";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-PWeR8xteLMxlOHcJJCtTI0o8QNzwGJVkUACmvf4tXWY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyusb pybluez pytest git ];
|
||||
propagatedBuildInputs = [
|
||||
pyusb
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
bluetooth = [
|
||||
pybluez
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"nxt"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python driver/interface for Lego Mindstorms NXT robot";
|
||||
homepage = "https://github.com/schodet/nxt-python";
|
||||
license = licenses.gpl3;
|
||||
changelog = "https://github.com/schodet/nxt-python/releases/tag/${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ ibizaman ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,34 +1,46 @@
|
|||
{ buildPythonPackage
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, mbstrdecoder
|
||||
, python-dateutil
|
||||
, pytz
|
||||
, packaging
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, tcolorpy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "typepy";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thombashi";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-J6SgVd2m0wOVr2ZV/pryRcJrn+BYTGstAUQO349c2lE=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-cgy1+6RZ1DUyH45bAKpGPOOZCwhCUghummw2fnfJGww=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ mbstrdecoder python-dateutil pytz packaging ];
|
||||
propagatedBuildInputs = [
|
||||
mbstrdecoder
|
||||
python-dateutil
|
||||
pytz
|
||||
packaging
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
checkInputs = [ tcolorpy ];
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
tcolorpy
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for variable type checker/validator/converter at a run time";
|
||||
homepage = "https://github.com/thombashi/typepy";
|
||||
description = "A library for variable type checker/validator/converter at a run time";
|
||||
maintainers = with maintainers; [ genericnerdyusername ];
|
||||
changelog = "https://github.com/thombashi/typepy/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ genericnerdyusername ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.209.0";
|
||||
version = "0.209.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6PqDCQzK7L8ucFxNEWtJ2ExHcBz2yacxu8rbC21MywE=";
|
||||
sha256 = "sha256-s40gEZjtbqFfQGOVhLYG1Wd/CCyfFB1qoQpk2Huz5P0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -12,14 +12,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-outdated";
|
||||
version = "0.11.2";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-SkFMdE7VAZrT7e5SMrfW8bBA6zPqQV7LhSy3OmshUAs=";
|
||||
sha256 = "sha256-u8VMVW2LJcwDRv43705aOcP0WMRfB3hakdgufYuI7I4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ZcG/4vyrcJNAMiZdR3MFyqX5Udn8wGAfiGT5uP1BSMo=";
|
||||
cargoHash = "sha256-rXLgNzbzMZG+nviAnK9n7ISWuNOPMugubHNMwJRKRZc=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
|
|||
meta = with lib; {
|
||||
description = "A cargo subcommand for displaying when Rust dependencies are out of date";
|
||||
homepage = "https://github.com/kbknapp/cargo-outdated";
|
||||
changelog = "https://github.com/kbknapp/cargo-outdated/blob/${version}/CHANGELOG.md";
|
||||
changelog = "https://github.com/kbknapp/cargo-outdated/blob/v${version}/CHANGELOG.md";
|
||||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ ivan ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dufs";
|
||||
version = "0.34.1";
|
||||
version = "0.34.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sigoden";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WSTY9j7wfoAqovLb9reNe7LXTjy40QObJNfgiidOINQ=";
|
||||
sha256 = "sha256-NkH7w5HEQFhnovUmjN/qW5QZwO8mVQZMbhpNFkKtLTI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-sQQUpbvr5IpsUTTznAfUJ5MvGh8rZ0tuZQkxMVpI2wM=";
|
||||
cargoHash = "sha256-bUznaVyhZswLaXUgC+GUh5ZpJQW7Vkcoui6CO9ds22g=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [
|
||||
pkg-config
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cloudflare-warp";
|
||||
version = "2023.3.398";
|
||||
version = "2023.3.470";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pkg.cloudflareclient.com/uploads/cloudflare_warp_2023_3_398_1_amd64_002e48d521.deb";
|
||||
hash = "sha256-1var+/G3WwICRLXsMHke277tmPYRPFW8Yf9b1Ex9OmU=";
|
||||
url = "https://pkg.cloudflareclient.com/pool/jammy/main/c/cloudflare-warp/cloudflare-warp_2023.3.470-1_amd64.deb";
|
||||
hash = "sha256-AYnmisEQKFiEB2iRJifEqRbdzAyBcfrU0ITeUokKLag=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -44,10 +44,6 @@ stdenv.mkDerivation rec {
|
|||
})
|
||||
];
|
||||
|
||||
unpackPhase = ''
|
||||
dpkg-deb -x ${src} ./
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
|
@ -72,7 +68,10 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://pkg.cloudflareclient.com/packages/cloudflare-warp";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.unfree;
|
||||
maintainers = with maintainers; [ wolfangaukang ];
|
||||
maintainers = with maintainers; [
|
||||
wolfangaukang
|
||||
devpikachu
|
||||
];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
42
pkgs/tools/system/dool/default.nix
Normal file
42
pkgs/tools/system/dool/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dool";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scottchiefbaker";
|
||||
repo = "dool";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-e6gLPmxOZBw6htiJ5Ljob2tQ9xB4kjK8vPs/9WMGER4=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
python3
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"prefix=$(out)"
|
||||
];
|
||||
|
||||
# fix the plugins directory
|
||||
postPatch = ''
|
||||
substituteInPlace dool \
|
||||
--replace \
|
||||
"os.path.abspath(os.path.dirname(sys.argv[0])) + '/plugins/'" \
|
||||
"'$out/share/dool/'"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python3 compatible clone of dstat";
|
||||
homepage = "https://github.com/scottchiefbaker/dool";
|
||||
changelog = "https://github.com/scottchiefbaker/dool/blob/${src.rev}/ChangeLog";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -7,16 +7,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "gtree";
|
||||
version = "1.7.51";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddddddO";
|
||||
repo = "gtree";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3xDXRuRpSoEtC2QGWQgZLBsYcFOsqdSmaHb9YvOoaBA=";
|
||||
hash = "sha256-eaObjK7mG78Ktje8D/V96tRGP68O+dE+ZWdWYPUVVIQ=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-YrqJljKoYpsgVW4PPNYGMUB5uDQF0YTt9s7KxjQHkTw=";
|
||||
vendorHash = "sha256-mzMoXgO60Skqh1fwN647GFctzuM6CCaYEoPIwLjYol4=";
|
||||
|
||||
subPackages = [
|
||||
"cmd/gtree"
|
||||
|
|
|
|||
|
|
@ -7082,6 +7082,8 @@ with pkgs;
|
|||
buildGoModule = buildGo119Module; # build fails with 1.20
|
||||
};
|
||||
|
||||
dool = callPackage ../tools/system/dool { };
|
||||
|
||||
dosfstools = callPackage ../tools/filesystems/dosfstools { };
|
||||
|
||||
dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { };
|
||||
|
|
@ -17316,7 +17318,7 @@ with pkgs;
|
|||
# PHP interpreters, packages and extensions.
|
||||
#
|
||||
# Set default PHP interpreter, extensions and packages
|
||||
php = php81;
|
||||
php = php82;
|
||||
phpExtensions = php.extensions;
|
||||
phpPackages = php.packages;
|
||||
|
||||
|
|
|
|||
|
|
@ -249,10 +249,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0sk2bypzk4igvl1bx1blr6pvn5hxbm453vz1n9hgd0zrn6y9ckaq";
|
||||
sha256 = "1sm8wnvxz4r9iq79s295jsrvznvjpd0pagnh1pz3xfmc9qffi7yi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.17.8";
|
||||
version = "1.17.12";
|
||||
};
|
||||
cairo-gobject = {
|
||||
dependencies = ["cairo" "glib2"];
|
||||
|
|
@ -964,10 +964,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08rxibzssqv14sgdfh45pdm26nbk54xp84vb5pb1mlyalszz1mc3";
|
||||
sha256 = "1ai4cxnymjp7c2xqbfksks82aah0pbyjsl3r2cgc4iimrw2wg8qy";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.6";
|
||||
version = "2.7.7";
|
||||
};
|
||||
faraday-net_http = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1924,10 +1924,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p";
|
||||
sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.7.0";
|
||||
version = "2.7.1";
|
||||
};
|
||||
kramdown = {
|
||||
dependencies = ["rexml"];
|
||||
|
|
@ -1962,6 +1962,16 @@
|
|||
};
|
||||
version = "1.6.6";
|
||||
};
|
||||
language_server-protocol = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.17.0.3";
|
||||
};
|
||||
libv8 = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
|
|
@ -2185,10 +2195,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06";
|
||||
sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.18.0";
|
||||
version = "5.18.1";
|
||||
};
|
||||
molinillo = {
|
||||
groups = ["default"];
|
||||
|
|
@ -2266,10 +2276,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1r1sh17dj6jwmnk4awj0vpagl3fncrkdlvm99m17warqsynbnvji";
|
||||
sha256 = "004wx9xhcam92g1d4ybvrl1yqablm2svalyck9sq4igy9nwkz9nb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.5";
|
||||
version = "1.1.8";
|
||||
};
|
||||
ncursesw = {
|
||||
groups = ["default"];
|
||||
|
|
@ -2287,10 +2297,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8";
|
||||
sha256 = "1k1qyjr9lkk5y3483k6wk6d9h1jx4v5hzby1mf0pj3b4kr2arxbm";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.4";
|
||||
version = "0.3.6";
|
||||
};
|
||||
net-pop = {
|
||||
dependencies = ["net-protocol"];
|
||||
|
|
@ -2474,15 +2484,15 @@
|
|||
version = "1.23.0";
|
||||
};
|
||||
parser = {
|
||||
dependencies = ["ast"];
|
||||
dependencies = ["ast" "racc"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "08f89nssj7ws7sjfvc2fcjpfm83sjgmniyh0npnmpqf5sfv44r8x";
|
||||
sha256 = "1swigds85jddb5gshll1g8lkmbcgbcp9bi1d4nigwvxki8smys0h";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.2.2.1";
|
||||
version = "3.2.2.3";
|
||||
};
|
||||
paru = {
|
||||
groups = ["default"];
|
||||
|
|
@ -2551,10 +2561,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "02fw2pzrmvwp67nbndpy8a2ln74fd8kmsiffw77z7g1mp58ww651";
|
||||
sha256 = "1i9skw2yry57nyphzvhrvw2k1lan0ysfpf157qd7s7apsscdzc7w";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.1";
|
||||
version = "1.5.2";
|
||||
};
|
||||
polyglot = {
|
||||
groups = ["default"];
|
||||
|
|
@ -2646,10 +2656,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0m2i3shf5y7bj253z00gxpw2k5dr6nn97s7ppbs3q4zw78i0pz94";
|
||||
sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.7.0";
|
||||
version = "1.7.1";
|
||||
};
|
||||
rack = {
|
||||
groups = ["default"];
|
||||
|
|
@ -2889,10 +2899,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "17xizkw5ryw8hhq64iqxmzdrrdxpc5lhkqc1fgm1aj0zsk1r2950";
|
||||
sha256 = "136br91alxdwh1s85z912dwz23qlhm212vy6i3wkinz3z8mkxxl3";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
};
|
||||
rest-client = {
|
||||
dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"];
|
||||
|
|
@ -3012,15 +3022,15 @@
|
|||
version = "3.12.0";
|
||||
};
|
||||
rubocop = {
|
||||
dependencies = ["json" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
|
||||
dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "14gg24mn8gmi88133x2aq3k3wr3jq2l6rklyvsb1dmgnj7qhm1m9";
|
||||
sha256 = "0b7pf8916k7ps9jdnkn0774n37jpdzp88mzcqdij3h9hvpn6vr81";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.52.0";
|
||||
version = "1.53.0";
|
||||
};
|
||||
rubocop-ast = {
|
||||
dependencies = ["parser"];
|
||||
|
|
@ -3477,10 +3487,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6";
|
||||
sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.3.2";
|
||||
version = "0.4.0";
|
||||
};
|
||||
tiny_tds = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
Loading…
Reference in a new issue