mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-18 18:14:42 +00:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
77670642a2
@ -112,6 +112,7 @@ nvim-nio,,,,,,mrcjkb
|
||||
pathlib.nvim,,,,,,
|
||||
penlight,,,,,,alerque
|
||||
plenary.nvim,https://raw.githubusercontent.com/nvim-lua/plenary.nvim/master/plenary.nvim-scm-1.rockspec,,,,5.1,
|
||||
psl,,,,0.3,,
|
||||
rapidjson,,,,,,
|
||||
rest.nvim,,,,,5.1,teto
|
||||
rocks.nvim,,,,,,mrcjkb
|
||||
|
||||
|
@ -1,7 +1,36 @@
|
||||
# Amazon images
|
||||
|
||||
* The `create-amis.sh` script will be replaced by https://github.com/NixOS/amis which will regularly upload AMIs per NixOS channel bump.
|
||||
AMIs are regularly uploaded from Hydra. This automation lives in
|
||||
https://github.com/NixOS/amis
|
||||
|
||||
* @arianvp is planning to drop zfs support
|
||||
|
||||
## How to upload an AMI for testing
|
||||
|
||||
If you want to upload an AMI from changes in a local nixpkgs checkout.
|
||||
|
||||
```bash
|
||||
nix-build nixos/release.nix -A amazonImage
|
||||
|
||||
export AWS_REGION=us-west-2
|
||||
export AWS_PROFILE=my-profile
|
||||
nix run nixpkgs#upload-ami -- --image-info ./result/nix-support/image-info.json
|
||||
```
|
||||
|
||||
## How to build your own NixOS config into an AMI
|
||||
|
||||
I suggest looking at https://github.com/nix-community/nixos-generators for a user-friendly interface.
|
||||
|
||||
```bash
|
||||
nixos-generate -c ./my-config.nix -f amazon
|
||||
|
||||
export AWS_REGION=us-west-2
|
||||
export AWS_PROFILE=my-profile
|
||||
nix run github:NixOS/amis#upload-ami -- --image-info ./result/nix-support/image-info.json
|
||||
```
|
||||
|
||||
## Roadmap
|
||||
|
||||
* @arianvp is planning to drop zfs support unless someone else picks it up
|
||||
* @arianvp is planning to rewrite the image builder to use the repart-based image builder.
|
||||
|
||||
* @arianvp is planning to perhaps rewrite `upload-ami` to use coldnsap
|
||||
* @arianvp is planning to move `upload-ami` tooling into nixpkgs once it has stabilized. And only keep the Github Action in separate repo
|
||||
|
||||
@ -1,368 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -p awscli -p jq -p qemu -i bash
|
||||
# shellcheck shell=bash
|
||||
#
|
||||
# Future Deprecation?
|
||||
# This entire thing should probably be replaced with a generic terraform config
|
||||
|
||||
# Uploads and registers NixOS images built from the
|
||||
# <nixos/release.nix> amazonImage attribute. Images are uploaded and
|
||||
# registered via a home region, and then copied to other regions.
|
||||
|
||||
# The home region requires an s3 bucket, and an IAM role named "vmimport"
|
||||
# (by default) with access to the S3 bucket. The name can be
|
||||
# configured with the "service_role_name" variable. Configuration of the
|
||||
# vmimport role is documented in
|
||||
# https://docs.aws.amazon.com/vm-import/latest/userguide/vmimport-image-import.html
|
||||
|
||||
# set -x
|
||||
set -euo pipefail
|
||||
|
||||
var () { true; }
|
||||
|
||||
# configuration
|
||||
var ${state_dir:=$HOME/amis/ec2-images}
|
||||
var ${home_region:=eu-west-1}
|
||||
var ${bucket:=nixos-amis}
|
||||
var ${service_role_name:=vmimport}
|
||||
|
||||
# Output of the command:
|
||||
# $ nix-shell -I nixpkgs=. -p awscli --run 'aws ec2 describe-regions --region us-east-1 --all-regions --query "Regions[].{Name:RegionName}" --output text | sort | sed -e s/^/\ \ /'
|
||||
var ${regions:=
|
||||
af-south-1
|
||||
ap-east-1
|
||||
ap-northeast-1
|
||||
ap-northeast-2
|
||||
ap-northeast-3
|
||||
ap-south-1
|
||||
ap-south-2
|
||||
ap-southeast-1
|
||||
ap-southeast-2
|
||||
ap-southeast-3
|
||||
ap-southeast-4
|
||||
ca-central-1
|
||||
eu-central-1
|
||||
eu-central-2
|
||||
eu-north-1
|
||||
eu-south-1
|
||||
eu-south-2
|
||||
eu-west-1
|
||||
eu-west-2
|
||||
eu-west-3
|
||||
il-central-1
|
||||
me-central-1
|
||||
me-south-1
|
||||
sa-east-1
|
||||
us-east-1
|
||||
us-east-2
|
||||
us-west-1
|
||||
us-west-2
|
||||
}
|
||||
|
||||
regions=($regions)
|
||||
|
||||
log() {
|
||||
echo "$@" >&2
|
||||
}
|
||||
|
||||
if [ "$#" -ne 1 ]; then
|
||||
log "Usage: ./upload-amazon-image.sh IMAGE_OUTPUT"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# result of the amazon-image from nixos/release.nix
|
||||
store_path=$1
|
||||
|
||||
if [ ! -e "$store_path" ]; then
|
||||
log "Store path: $store_path does not exist, fetching..."
|
||||
nix-store --realise "$store_path"
|
||||
fi
|
||||
|
||||
if [ ! -d "$store_path" ]; then
|
||||
log "store_path: $store_path is not a directory. aborting"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
read_image_info() {
|
||||
if [ ! -e "$store_path/nix-support/image-info.json" ]; then
|
||||
log "Image missing metadata"
|
||||
exit 1
|
||||
fi
|
||||
jq -r "$1" "$store_path/nix-support/image-info.json"
|
||||
}
|
||||
|
||||
# We handle a single image per invocation, store all attributes in
|
||||
# globals for convenience.
|
||||
zfs_disks=$(read_image_info .disks)
|
||||
is_zfs_image=
|
||||
if jq -e .boot <<< "$zfs_disks"; then
|
||||
is_zfs_image=1
|
||||
zfs_boot=".disks.boot"
|
||||
fi
|
||||
image_label="$(read_image_info .label)${is_zfs_image:+-ZFS}"
|
||||
image_system=$(read_image_info .system)
|
||||
image_files=( $(read_image_info ".disks.root.file") )
|
||||
|
||||
image_logical_bytes=$(read_image_info "${zfs_boot:-.disks.root}.logical_bytes")
|
||||
|
||||
if [[ -n "$is_zfs_image" ]]; then
|
||||
image_files+=( $(read_image_info .disks.boot.file) )
|
||||
fi
|
||||
|
||||
# Derived attributes
|
||||
|
||||
image_logical_gigabytes=$(((image_logical_bytes-1)/1024/1024/1024+1)) # Round to the next GB
|
||||
|
||||
case "$image_system" in
|
||||
aarch64-linux)
|
||||
amazon_arch=arm64
|
||||
;;
|
||||
x86_64-linux)
|
||||
amazon_arch=x86_64
|
||||
;;
|
||||
*)
|
||||
log "Unknown system: $image_system"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
image_name="NixOS-${image_label}-${image_system}"
|
||||
image_description="NixOS ${image_label} ${image_system}"
|
||||
|
||||
log "Image Details:"
|
||||
log " Name: $image_name"
|
||||
log " Description: $image_description"
|
||||
log " Size (gigabytes): $image_logical_gigabytes"
|
||||
log " System: $image_system"
|
||||
log " Amazon Arch: $amazon_arch"
|
||||
|
||||
read_state() {
|
||||
local state_key=$1
|
||||
local type=$2
|
||||
|
||||
cat "$state_dir/$state_key.$type" 2>/dev/null || true
|
||||
}
|
||||
|
||||
write_state() {
|
||||
local state_key=$1
|
||||
local type=$2
|
||||
local val=$3
|
||||
|
||||
mkdir -p "$state_dir"
|
||||
echo "$val" > "$state_dir/$state_key.$type"
|
||||
}
|
||||
|
||||
wait_for_import() {
|
||||
local region=$1
|
||||
local task_id=$2
|
||||
local state snapshot_id
|
||||
log "Waiting for import task $task_id to be completed"
|
||||
while true; do
|
||||
read -r state message snapshot_id < <(
|
||||
aws ec2 describe-import-snapshot-tasks --region "$region" --import-task-ids "$task_id" | \
|
||||
jq -r '.ImportSnapshotTasks[].SnapshotTaskDetail | "\(.Status) \(.StatusMessage) \(.SnapshotId)"'
|
||||
)
|
||||
log " ... state=$state message=$message snapshot_id=$snapshot_id"
|
||||
case "$state" in
|
||||
active)
|
||||
sleep 10
|
||||
;;
|
||||
completed)
|
||||
echo "$snapshot_id"
|
||||
return
|
||||
;;
|
||||
*)
|
||||
log "Unexpected snapshot import state: '${state}'"
|
||||
log "Full response: "
|
||||
aws ec2 describe-import-snapshot-tasks --region "$region" --import-task-ids "$task_id" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
wait_for_image() {
|
||||
local region=$1
|
||||
local ami_id=$2
|
||||
local state
|
||||
log "Waiting for image $ami_id to be available"
|
||||
|
||||
while true; do
|
||||
read -r state < <(
|
||||
aws ec2 describe-images --image-ids "$ami_id" --region "$region" | \
|
||||
jq -r ".Images[].State"
|
||||
)
|
||||
log " ... state=$state"
|
||||
case "$state" in
|
||||
pending)
|
||||
sleep 10
|
||||
;;
|
||||
available)
|
||||
return
|
||||
;;
|
||||
*)
|
||||
log "Unexpected AMI state: '${state}'"
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
make_image_public() {
|
||||
local region=$1
|
||||
local ami_id=$2
|
||||
|
||||
wait_for_image "$region" "$ami_id"
|
||||
|
||||
log "Making image $ami_id public"
|
||||
|
||||
aws ec2 modify-image-attribute \
|
||||
--image-id "$ami_id" --region "$region" --launch-permission 'Add={Group=all}' >&2
|
||||
}
|
||||
|
||||
upload_image() {
|
||||
local region=$1
|
||||
|
||||
for image_file in "${image_files[@]}"; do
|
||||
local aws_path=${image_file#/}
|
||||
|
||||
if [[ -n "$is_zfs_image" ]]; then
|
||||
local suffix=${image_file%.*}
|
||||
suffix=${suffix##*.}
|
||||
fi
|
||||
|
||||
local state_key="$region.$image_label${suffix:+.${suffix}}.$image_system"
|
||||
local task_id
|
||||
task_id=$(read_state "$state_key" task_id)
|
||||
local snapshot_id
|
||||
snapshot_id=$(read_state "$state_key" snapshot_id)
|
||||
local ami_id
|
||||
ami_id=$(read_state "$state_key" ami_id)
|
||||
|
||||
if [ -z "$task_id" ]; then
|
||||
log "Checking for image on S3"
|
||||
if ! aws s3 ls --region "$region" "s3://${bucket}/${aws_path}" >&2; then
|
||||
log "Image missing from aws, uploading"
|
||||
aws s3 cp --region "$region" "$image_file" "s3://${bucket}/${aws_path}" >&2
|
||||
fi
|
||||
|
||||
log "Importing image from S3 path s3://$bucket/$aws_path"
|
||||
|
||||
task_id=$(aws ec2 import-snapshot --role-name "$service_role_name" --disk-container "{
|
||||
\"Description\": \"nixos-image-${image_label}-${image_system}\",
|
||||
\"Format\": \"vhd\",
|
||||
\"UserBucket\": {
|
||||
\"S3Bucket\": \"$bucket\",
|
||||
\"S3Key\": \"$aws_path\"
|
||||
}
|
||||
}" --region "$region" | jq -r '.ImportTaskId')
|
||||
|
||||
write_state "$state_key" task_id "$task_id"
|
||||
fi
|
||||
|
||||
if [ -z "$snapshot_id" ]; then
|
||||
snapshot_id=$(wait_for_import "$region" "$task_id")
|
||||
write_state "$state_key" snapshot_id "$snapshot_id"
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -z "$ami_id" ]; then
|
||||
log "Registering snapshot $snapshot_id as AMI"
|
||||
|
||||
local block_device_mappings=(
|
||||
"DeviceName=/dev/xvda,Ebs={SnapshotId=$snapshot_id,VolumeSize=$image_logical_gigabytes,DeleteOnTermination=true,VolumeType=gp3}"
|
||||
)
|
||||
|
||||
if [[ -n "$is_zfs_image" ]]; then
|
||||
local root_snapshot_id=$(read_state "$region.$image_label.root.$image_system" snapshot_id)
|
||||
|
||||
local root_image_logical_bytes=$(read_image_info ".disks.root.logical_bytes")
|
||||
local root_image_logical_gigabytes=$(((root_image_logical_bytes-1)/1024/1024/1024+1)) # Round to the next GB
|
||||
|
||||
block_device_mappings+=(
|
||||
"DeviceName=/dev/xvdb,Ebs={SnapshotId=$root_snapshot_id,VolumeSize=$root_image_logical_gigabytes,DeleteOnTermination=true,VolumeType=gp3}"
|
||||
)
|
||||
fi
|
||||
|
||||
|
||||
local extra_flags=(
|
||||
--root-device-name /dev/xvda
|
||||
--sriov-net-support simple
|
||||
--ena-support
|
||||
--virtualization-type hvm
|
||||
)
|
||||
|
||||
block_device_mappings+=("DeviceName=/dev/sdb,VirtualName=ephemeral0")
|
||||
block_device_mappings+=("DeviceName=/dev/sdc,VirtualName=ephemeral1")
|
||||
block_device_mappings+=("DeviceName=/dev/sdd,VirtualName=ephemeral2")
|
||||
block_device_mappings+=("DeviceName=/dev/sde,VirtualName=ephemeral3")
|
||||
|
||||
ami_id=$(
|
||||
aws ec2 register-image \
|
||||
--name "$image_name" \
|
||||
--description "$image_description" \
|
||||
--region "$region" \
|
||||
--architecture $amazon_arch \
|
||||
--block-device-mappings "${block_device_mappings[@]}" \
|
||||
--boot-mode $(read_image_info .boot_mode) \
|
||||
"${extra_flags[@]}" \
|
||||
| jq -r '.ImageId'
|
||||
)
|
||||
|
||||
write_state "$state_key" ami_id "$ami_id"
|
||||
fi
|
||||
|
||||
[[ -v PRIVATE ]] || make_image_public "$region" "$ami_id"
|
||||
|
||||
echo "$ami_id"
|
||||
}
|
||||
|
||||
copy_to_region() {
|
||||
local region=$1
|
||||
local from_region=$2
|
||||
local from_ami_id=$3
|
||||
|
||||
state_key="$region.$image_label.$image_system"
|
||||
ami_id=$(read_state "$state_key" ami_id)
|
||||
|
||||
if [ -z "$ami_id" ]; then
|
||||
log "Copying $from_ami_id to $region"
|
||||
ami_id=$(
|
||||
aws ec2 copy-image \
|
||||
--region "$region" \
|
||||
--source-region "$from_region" \
|
||||
--source-image-id "$from_ami_id" \
|
||||
--name "$image_name" \
|
||||
--description "$image_description" \
|
||||
| jq -r '.ImageId'
|
||||
)
|
||||
|
||||
write_state "$state_key" ami_id "$ami_id"
|
||||
fi
|
||||
|
||||
[[ -v PRIVATE ]] || make_image_public "$region" "$ami_id"
|
||||
|
||||
echo "$ami_id"
|
||||
}
|
||||
|
||||
upload_all() {
|
||||
home_image_id=$(upload_image "$home_region")
|
||||
jq -n \
|
||||
--arg key "$home_region.$image_system" \
|
||||
--arg value "$home_image_id" \
|
||||
'$ARGS.named'
|
||||
|
||||
for region in "${regions[@]}"; do
|
||||
if [ "$region" = "$home_region" ]; then
|
||||
continue
|
||||
fi
|
||||
copied_image_id=$(copy_to_region "$region" "$home_region" "$home_image_id")
|
||||
|
||||
jq -n \
|
||||
--arg key "$region.$image_system" \
|
||||
--arg value "$copied_image_id" \
|
||||
'$ARGS.named'
|
||||
done
|
||||
}
|
||||
|
||||
upload_all | jq --slurp from_entries
|
||||
@ -3,8 +3,8 @@
|
||||
let
|
||||
inherit (lib) optionalString mkDefault mkIf mkOption mkEnableOption literalExpression;
|
||||
inherit (lib.types) nullOr attrsOf oneOf str int bool path package enum submodule;
|
||||
inherit (lib.strings) concatMapStringsSep removePrefix toShellVars removeSuffix hasSuffix;
|
||||
inherit (lib.attrsets) attrValues genAttrs filterAttrs mapAttrs' nameValuePair;
|
||||
inherit (lib.strings) concatLines removePrefix toShellVars removeSuffix hasSuffix;
|
||||
inherit (lib.attrsets) mapAttrsToList attrValues genAttrs filterAttrs mapAttrs' nameValuePair;
|
||||
inherit (builtins) isInt isString toString typeOf;
|
||||
|
||||
cfg = config.services.firefly-iii;
|
||||
@ -21,18 +21,10 @@ let
|
||||
(filterAttrs (n: v: hasSuffix "_FILE" n) cfg.settings);
|
||||
env-nonfile-values = filterAttrs (n: v: ! hasSuffix "_FILE" n) cfg.settings;
|
||||
|
||||
envfile = pkgs.writeText "firefly-iii-env" ''
|
||||
${toShellVars env-file-values}
|
||||
${toShellVars env-nonfile-values}
|
||||
'';
|
||||
|
||||
fileenv-func = ''
|
||||
cp --no-preserve=mode ${envfile} /tmp/firefly-iii-env
|
||||
${concatMapStringsSep "\n"
|
||||
(n: "${pkgs.replace-secret}/bin/replace-secret ${n} ${n} /tmp/firefly-iii-env")
|
||||
(attrValues env-file-values)}
|
||||
set -a
|
||||
. /tmp/firefly-iii-env
|
||||
${toShellVars env-nonfile-values}
|
||||
${concatLines (mapAttrsToList (n: v: "${n}=\"$(< ${v})\"") env-file-values)}
|
||||
set +a
|
||||
'';
|
||||
|
||||
@ -41,15 +33,13 @@ let
|
||||
|
||||
${optionalString (cfg.settings.DB_CONNECTION == "sqlite")
|
||||
"touch ${cfg.dataDir}/storage/database/database.sqlite"}
|
||||
${artisan} migrate --seed --no-interaction --force
|
||||
${artisan} firefly-iii:decrypt-all
|
||||
${artisan} package:discover
|
||||
${artisan} firefly-iii:upgrade-database
|
||||
${artisan} firefly-iii:correct-database
|
||||
${artisan} firefly-iii:report-integrity
|
||||
${artisan} firefly-iii:laravel-passport-keys
|
||||
${artisan} cache:clear
|
||||
|
||||
mv /tmp/firefly-iii-env /run/phpfpm/firefly-iii-env
|
||||
${artisan} view:cache
|
||||
${artisan} route:cache
|
||||
${artisan} config:cache
|
||||
'';
|
||||
|
||||
commonServiceConfig = {
|
||||
@ -146,6 +136,7 @@ in {
|
||||
|
||||
virtualHost = mkOption {
|
||||
type = str;
|
||||
default = "localhost";
|
||||
description = ''
|
||||
The hostname at which you wish firefly-iii to be served. If you have
|
||||
enabled nginx using `services.firefly-iii.enableNginx` then this will
|
||||
@ -170,14 +161,15 @@ in {
|
||||
};
|
||||
|
||||
settings = mkOption {
|
||||
default = {};
|
||||
description = ''
|
||||
Options for firefly-iii configuration. Refer to
|
||||
<https://github.com/firefly-iii/firefly-iii/blob/main/.env.example> for
|
||||
details on supported values. All <option>_FILE values supported by
|
||||
upstream are supported here.
|
||||
|
||||
APP_URL will be set by `services.firefly-iii.virtualHost`, do not
|
||||
redefine it here.
|
||||
APP_URL will be the same as `services.firefly-iii.virtualHost` if the
|
||||
former is unset in `services.firefly-iii.settings`.
|
||||
'';
|
||||
example = literalExpression ''
|
||||
{
|
||||
@ -192,7 +184,6 @@ in {
|
||||
DB_PASSWORD_FILE = "/var/secrets/firefly-iii-mysql-password.txt;
|
||||
}
|
||||
'';
|
||||
default = {};
|
||||
type = submodule {
|
||||
freeformType = attrsOf (oneOf [str int bool]);
|
||||
options = {
|
||||
@ -216,9 +207,9 @@ in {
|
||||
};
|
||||
DB_PORT = mkOption {
|
||||
type = nullOr int;
|
||||
default = if cfg.settings.DB_CONNECTION == "sqlite" then null
|
||||
default = if cfg.settings.DB_CONNECTION == "pgsql" then 5432
|
||||
else if cfg.settings.DB_CONNECTION == "mysql" then 3306
|
||||
else 5432;
|
||||
else null;
|
||||
defaultText = ''
|
||||
`null` if DB_CONNECTION is "sqlite", `3306` if "mysql", `5432` if "pgsql"
|
||||
'';
|
||||
@ -227,6 +218,21 @@ in {
|
||||
this value to be filled.
|
||||
'';
|
||||
};
|
||||
DB_HOST = mkOption {
|
||||
type = str;
|
||||
default = if cfg.settings.DB_CONNECTION == "pgsql" then "/run/postgresql"
|
||||
else "localhost";
|
||||
defaultText = ''
|
||||
"localhost" if DB_CONNECTION is "sqlite" or "mysql", "/run/postgresql" if "pgsql".
|
||||
'';
|
||||
description = ''
|
||||
The machine which hosts your database. This is left at the
|
||||
default value for "mysql" because we use the "DB_SOCKET" option
|
||||
to connect to a unix socket instead. "pgsql" requires that the
|
||||
unix socket location be specified here instead of at "DB_SOCKET".
|
||||
This option does not affect "sqlite".
|
||||
'';
|
||||
};
|
||||
APP_KEY_FILE = mkOption {
|
||||
type = path;
|
||||
description = ''
|
||||
@ -235,6 +241,20 @@ in {
|
||||
/dev/urandom | base64)" > /path/to/key-file`.
|
||||
'';
|
||||
};
|
||||
APP_URL = mkOption {
|
||||
type = str;
|
||||
default = if cfg.virtualHost == "localhost" then "http://${cfg.virtualHost}"
|
||||
else "https://${cfg.virtualHost}";
|
||||
defaultText = ''
|
||||
http(s)://''${config.services.firefly-iii.virtualHost}
|
||||
'';
|
||||
description = ''
|
||||
The APP_URL used by firefly-iii internally. Please make sure this
|
||||
URL matches the external URL of your Firefly III installation. It
|
||||
is used to validate specific requests and to generate URLs in
|
||||
emails.
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -242,12 +262,6 @@ in {
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
services.firefly-iii = {
|
||||
settings = {
|
||||
APP_URL = cfg.virtualHost;
|
||||
};
|
||||
};
|
||||
|
||||
services.phpfpm.pools.firefly-iii = {
|
||||
inherit user group;
|
||||
phpPackage = cfg.package.phpPackage;
|
||||
@ -262,29 +276,27 @@ in {
|
||||
} // cfg.poolConfig;
|
||||
};
|
||||
|
||||
systemd.services.phpfpm-firefly-iii.serviceConfig = {
|
||||
EnvironmentFile = "/run/phpfpm/firefly-iii-env";
|
||||
ExecStartPost = "${pkgs.coreutils}/bin/rm /run/phpfpm/firefly-iii-env";
|
||||
};
|
||||
|
||||
systemd.services.firefly-iii-setup = {
|
||||
after = [ "postgresql.service" "mysql.service" ];
|
||||
requiredBy = [ "phpfpm-firefly-iii.service" ];
|
||||
before = [ "phpfpm-firefly-iii.service" ];
|
||||
serviceConfig = {
|
||||
ExecStart = firefly-iii-maintenance;
|
||||
RuntimeDirectory = "phpfpm";
|
||||
RuntimeDirectoryPreserve = true;
|
||||
RemainAfterExit = true;
|
||||
} // commonServiceConfig;
|
||||
unitConfig.JoinsNamespaceOf = "phpfpm-firefly-iii.service";
|
||||
restartTriggers = [ cfg.package ];
|
||||
};
|
||||
|
||||
systemd.services.firefly-iii-cron = {
|
||||
after = [ "firefly-iii-setup.service" "postgresql.service" "mysql.service" ];
|
||||
wants = [ "firefly-iii-setup.service" ];
|
||||
description = "Daily Firefly III cron job";
|
||||
script = ''
|
||||
${fileenv-func}
|
||||
${artisan} firefly-iii:cron
|
||||
'';
|
||||
serviceConfig = commonServiceConfig;
|
||||
serviceConfig = {
|
||||
ExecStart = "${artisan} firefly-iii:cron";
|
||||
} // commonServiceConfig;
|
||||
};
|
||||
|
||||
systemd.timers.firefly-iii-cron = {
|
||||
@ -295,6 +307,7 @@ in {
|
||||
Persistent = true;
|
||||
};
|
||||
wantedBy = [ "timers.target" ];
|
||||
restartTriggers = [ cfg.package ];
|
||||
};
|
||||
|
||||
services.nginx = mkIf cfg.enableNginx {
|
||||
|
||||
@ -1,14 +1,19 @@
|
||||
import ./make-test-python.nix ({ lib, pkgs, ... }: {
|
||||
import ./make-test-python.nix ({ lib, ... }:
|
||||
|
||||
let
|
||||
db-pass = "Test2Test2";
|
||||
app-key = "TestTestTestTestTestTestTestTest";
|
||||
in
|
||||
{
|
||||
name = "firefly-iii";
|
||||
meta.maintainers = [ lib.maintainers.savyajha ];
|
||||
|
||||
nodes.machine = { config, ... }: {
|
||||
nodes.fireflySqlite = { config, ... }: {
|
||||
environment.etc = {
|
||||
"firefly-iii-appkey".text = "TestTestTestTestTestTestTestTest";
|
||||
"firefly-iii-appkey".text = app-key;
|
||||
};
|
||||
services.firefly-iii = {
|
||||
enable = true;
|
||||
virtualHost = "http://localhost";
|
||||
enableNginx = true;
|
||||
settings = {
|
||||
APP_KEY_FILE = "/etc/firefly-iii-appkey";
|
||||
@ -18,9 +23,87 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
|
||||
};
|
||||
};
|
||||
|
||||
nodes.fireflyPostgresql = { config, pkgs, ... }: {
|
||||
environment.etc = {
|
||||
"firefly-iii-appkey".text = app-key;
|
||||
"postgres-pass".text = db-pass;
|
||||
};
|
||||
services.firefly-iii = {
|
||||
enable = true;
|
||||
enableNginx = true;
|
||||
settings = {
|
||||
APP_KEY_FILE = "/etc/firefly-iii-appkey";
|
||||
LOG_CHANNEL = "stdout";
|
||||
SITE_OWNER = "mail@example.com";
|
||||
DB_CONNECTION = "pgsql";
|
||||
DB_DATABASE = "firefly";
|
||||
DB_USERNAME = "firefly";
|
||||
DB_PASSWORD_FILE = "/etc/postgres-pass";
|
||||
};
|
||||
};
|
||||
|
||||
services.postgresql = {
|
||||
enable = true;
|
||||
package = pkgs.postgresql_15;
|
||||
authentication = ''
|
||||
local all postgres peer
|
||||
local firefly firefly password
|
||||
'';
|
||||
initialScript = pkgs.writeText "firefly-init.sql" ''
|
||||
CREATE USER "firefly" WITH LOGIN PASSWORD '${db-pass}';
|
||||
CREATE DATABASE "firefly" WITH OWNER "firefly";
|
||||
CREATE SCHEMA AUTHORIZATION firefly;
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
nodes.fireflyMysql = { config, pkgs, ... }: {
|
||||
environment.etc = {
|
||||
"firefly-iii-appkey".text = app-key;
|
||||
"mysql-pass".text = db-pass;
|
||||
};
|
||||
services.firefly-iii = {
|
||||
enable = true;
|
||||
enableNginx = true;
|
||||
settings = {
|
||||
APP_KEY_FILE = "/etc/firefly-iii-appkey";
|
||||
LOG_CHANNEL = "stdout";
|
||||
SITE_OWNER = "mail@example.com";
|
||||
DB_CONNECTION = "mysql";
|
||||
DB_DATABASE = "firefly";
|
||||
DB_USERNAME = "firefly";
|
||||
DB_PASSWORD_FILE = "/etc/mysql-pass";
|
||||
DB_SOCKET = "/run/mysqld/mysqld.sock";
|
||||
};
|
||||
};
|
||||
|
||||
services.mysql = {
|
||||
enable = true;
|
||||
package = pkgs.mariadb;
|
||||
initialScript = pkgs.writeText "firefly-init.sql" ''
|
||||
create database firefly DEFAULT CHARACTER SET utf8mb4;
|
||||
create user 'firefly'@'localhost' identified by '${db-pass}';
|
||||
grant all on firefly.* to 'firefly'@'localhost';
|
||||
'';
|
||||
settings.mysqld.character-set-server = "utf8mb4";
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("phpfpm-firefly-iii.service")
|
||||
machine.wait_for_unit("nginx.service")
|
||||
machine.succeed("curl -fvvv -Ls http://localhost/ | grep 'Firefly III'")
|
||||
fireflySqlite.wait_for_unit("phpfpm-firefly-iii.service")
|
||||
fireflySqlite.wait_for_unit("nginx.service")
|
||||
fireflySqlite.succeed("curl -fvvv -Ls http://localhost/ | grep 'Firefly III'")
|
||||
fireflySqlite.succeed("curl -fvvv -Ls http://localhost/v1/js/app.js")
|
||||
fireflySqlite.succeed("systemctl start firefly-iii-cron.service")
|
||||
fireflyPostgresql.wait_for_unit("phpfpm-firefly-iii.service")
|
||||
fireflyPostgresql.wait_for_unit("nginx.service")
|
||||
fireflyPostgresql.wait_for_unit("postgresql.service")
|
||||
fireflyPostgresql.succeed("curl -fvvv -Ls http://localhost/ | grep 'Firefly III'")
|
||||
fireflyPostgresql.succeed("systemctl start firefly-iii-cron.service")
|
||||
fireflyMysql.wait_for_unit("phpfpm-firefly-iii.service")
|
||||
fireflyMysql.wait_for_unit("nginx.service")
|
||||
fireflyMysql.wait_for_unit("mysql.service")
|
||||
fireflyMysql.succeed("curl -fvvv -Ls http://localhost/ | grep 'Firefly III'")
|
||||
fireflyMysql.succeed("systemctl start firefly-iii-cron.service")
|
||||
'';
|
||||
})
|
||||
|
||||
@ -93,5 +93,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ dotlambda gepbird yrd ];
|
||||
platforms = platforms.unix;
|
||||
# compiler error since 2023-11-17
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -45,6 +45,10 @@ stdenv.mkDerivation rec {
|
||||
qpdf
|
||||
];
|
||||
|
||||
CXXFLAGS =
|
||||
# Pending upstream compatibility with GCC 13
|
||||
lib.optional (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "13") "-Wno-changes-meaning";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A simple application to extract, merge, rotate and reorder pages of PDF documents";
|
||||
homepage = "https://junrrein.github.io/pdfslicer/";
|
||||
|
||||
@ -63,14 +63,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "telegram-desktop";
|
||||
version = "5.0.1";
|
||||
version = "5.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "telegramdesktop";
|
||||
repo = "tdesktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-GKKlcNcFPXslyjE7u5t+VLOiEXY8RYjYvBNL+WjpeeY=";
|
||||
hash = "sha256-RaIUk+49uNc+TycC/oV+02o5EpkbP4tSSv7DsLn+WHM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -15,21 +15,21 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.17.6";
|
||||
version = "1.17.7";
|
||||
# Using two URLs as the first one will break as soon as a new version is released
|
||||
src_bin = fetchurl {
|
||||
urls = [
|
||||
"http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
|
||||
"http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "KHZGAFAp93HTZs8OT76xf88QM0UtlVVH3q57CZm07Rs=";
|
||||
hash = "sha256-jFvIMbyVKx+HPMhFDGTjktsLJHm2JtGA8P/JZWaJUdA=";
|
||||
};
|
||||
src_oss = fetchurl {
|
||||
urls = [
|
||||
"http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
|
||||
"http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
|
||||
];
|
||||
sha256 = "2dtNdyv0+QYWQrfrIu5RQKSN4scSWKuLFNlJZXpxDUM=";
|
||||
hash = "sha256-di5VLUb57HWnxi3LfZfA/Z5qFRINDvb1oIDO4pHToO8=";
|
||||
};
|
||||
in
|
||||
mkDerivation {
|
||||
|
||||
@ -53,26 +53,23 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprland" + lib.optionalString debug "-debug";
|
||||
version = "0.40.0-unstable-2024-05-12";
|
||||
version = "0.40.0-unstable-2024-05-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = finalAttrs.pname;
|
||||
fetchSubmodules = true;
|
||||
rev = "2ccd45a84475fab46c6fecd2fe226d3173104743";
|
||||
hash = "sha256-nBCQuRl4sS/G/OUS+txeelFShBEgSk2OrN6kBYMHuOg=";
|
||||
rev = "f15513309b24790099d42974274eb23f66f7c985";
|
||||
hash = "sha256-zKOfgXPTlRqCR+EME4qjN9rgAnC3viI5KWx10dhKszw=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Fix hardcoded paths to /usr installation
|
||||
sed -i "s#/usr#$out#" src/render/OpenGL.cpp
|
||||
|
||||
# Remove extra @PREFIX@ to fix pkg-config paths
|
||||
sed -i "s#@PREFIX@/##g" hyprland.pc.in
|
||||
'';
|
||||
|
||||
# used by version.sh
|
||||
DATE = "2024-05-12";
|
||||
DATE = "2024-05-05";
|
||||
HASH = finalAttrs.src.rev;
|
||||
|
||||
depsBuildBuild = [
|
||||
|
||||
@ -8,20 +8,20 @@
|
||||
|
||||
let
|
||||
pname = "firefly-iii";
|
||||
version = "6.1.15";
|
||||
version = "6.1.16";
|
||||
phpPackage = php83;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "firefly-iii";
|
||||
repo = "firefly-iii";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-9Od8tR8X2OZ2hu81tHWDpBX8snWCRvTnlY1AwjIcMug=";
|
||||
hash = "sha256-1I4Wm10mmloqeWcpc4XloNATpvroiw6m8MiSVsoB6xo=";
|
||||
};
|
||||
|
||||
assets = buildNpmPackage {
|
||||
pname = "${pname}-assets";
|
||||
inherit version src;
|
||||
npmDepsHash = "sha256-UVySgcj1tQLQIxlsZuig4ixkfxfsYWYPKWLz5zHA+Dg=";
|
||||
npmDepsHash = "sha256-Ff7pDKoXvyj/gR+ljQsCjtyzxzJ7/zN6hRMEAderqOg=";
|
||||
dontNpmBuild = true;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@ -36,7 +36,7 @@ in
|
||||
phpPackage.buildComposerProject (finalAttrs: {
|
||||
inherit pname src version;
|
||||
|
||||
vendorHash = "sha256-RDkAbTKj7M7lE8bVRxb+RR5CA6hJIMp61U0+aRtFE50=";
|
||||
vendorHash = "sha256-BanSEqE3KN46VtEZH0TVWUBrgPCwmd2TjheYq+e+lzo=";
|
||||
|
||||
passthru = {
|
||||
inherit phpPackage;
|
||||
|
||||
@ -64,11 +64,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "google-chrome";
|
||||
version = "125.0.6422.76";
|
||||
version = "125.0.6422.112";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
|
||||
hash = "sha256-hLGEwaTx11tqiS7skoNVwCEw+1GZ0pNHpfe11IFjTFc=";
|
||||
hash = "sha256-Tx9SGob0b4mndk+zIhSL8MAuCUdwz2HrbnhfXYYfEUo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ patchelf makeWrapper ];
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hyprwayland-scanner";
|
||||
version = "0.3.8";
|
||||
version = "0.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprwayland-scanner";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-/DwglRvj4XF4ECdNtrCIbthleszAZBwOiXG5A6r0K/c=";
|
||||
hash = "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
86
pkgs/by-name/uv/uv/Cargo.lock
generated
86
pkgs/by-name/uv/uv/Cargo.lock
generated
@ -395,6 +395,7 @@ dependencies = [
|
||||
"criterion",
|
||||
"distribution-filename",
|
||||
"distribution-types",
|
||||
"install-wheel-rs",
|
||||
"once_cell",
|
||||
"pep508_rs",
|
||||
"platform-tags",
|
||||
@ -402,6 +403,7 @@ dependencies = [
|
||||
"uv-cache",
|
||||
"uv-client",
|
||||
"uv-configuration",
|
||||
"uv-dispatch",
|
||||
"uv-distribution",
|
||||
"uv-interpreter",
|
||||
"uv-resolver",
|
||||
@ -1102,7 +1104,6 @@ dependencies = [
|
||||
"cache-key",
|
||||
"distribution-filename",
|
||||
"fs-err",
|
||||
"git2",
|
||||
"indexmap",
|
||||
"itertools 0.13.0",
|
||||
"once_cell",
|
||||
@ -1111,7 +1112,6 @@ dependencies = [
|
||||
"platform-tags",
|
||||
"pypi-types",
|
||||
"rkyv",
|
||||
"rustc-hash",
|
||||
"schemars",
|
||||
"serde",
|
||||
"serde_json",
|
||||
@ -1806,7 +1806,6 @@ dependencies = [
|
||||
"number_prefix",
|
||||
"portable-atomic",
|
||||
"unicode-width",
|
||||
"vt100",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@ -2487,6 +2486,12 @@ dependencies = [
|
||||
"once_cell",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "path-slash"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42"
|
||||
|
||||
[[package]]
|
||||
name = "pathdiff"
|
||||
version = "0.2.1"
|
||||
@ -2859,7 +2864,9 @@ dependencies = [
|
||||
name = "pypi-types"
|
||||
version = "0.0.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"chrono",
|
||||
"git2",
|
||||
"indexmap",
|
||||
"mailparse",
|
||||
"once_cell",
|
||||
@ -2872,6 +2879,7 @@ dependencies = [
|
||||
"toml",
|
||||
"tracing",
|
||||
"url",
|
||||
"uv-git",
|
||||
"uv-normalize",
|
||||
]
|
||||
|
||||
@ -3075,12 +3083,12 @@ dependencies = [
|
||||
"insta",
|
||||
"itertools 0.13.0",
|
||||
"pep508_rs",
|
||||
"pypi-types",
|
||||
"regex",
|
||||
"reqwest",
|
||||
"reqwest-middleware",
|
||||
"tempfile",
|
||||
"test-case",
|
||||
"thiserror",
|
||||
"tokio",
|
||||
"tracing",
|
||||
"unscanny",
|
||||
@ -3821,6 +3829,15 @@ version = "0.1.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231"
|
||||
|
||||
[[package]]
|
||||
name = "temp-env"
|
||||
version = "0.3.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "96374855068f47402c3121c6eed88d29cb1de8f3ab27090e273e420bdabcf050"
|
||||
dependencies = [
|
||||
"parking_lot 0.12.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
version = "3.10.1"
|
||||
@ -4224,18 +4241,6 @@ dependencies = [
|
||||
"tracing-subscriber",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tracing-indicatif"
|
||||
version = "0.3.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "069580424efe11d97c3fef4197fa98c004fa26672cc71ad8770d224e23b1951d"
|
||||
dependencies = [
|
||||
"indicatif",
|
||||
"tracing",
|
||||
"tracing-core",
|
||||
"tracing-subscriber",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tracing-log"
|
||||
version = "0.2.0"
|
||||
@ -4466,7 +4471,7 @@ checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
|
||||
|
||||
[[package]]
|
||||
name = "uv"
|
||||
version = "0.1.45"
|
||||
version = "0.2.3"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anyhow",
|
||||
@ -4570,6 +4575,7 @@ dependencies = [
|
||||
"once_cell",
|
||||
"pep440_rs",
|
||||
"pep508_rs",
|
||||
"pypi-types",
|
||||
"regex",
|
||||
"rustc-hash",
|
||||
"serde",
|
||||
@ -4665,7 +4671,7 @@ dependencies = [
|
||||
"anyhow",
|
||||
"clap",
|
||||
"distribution-types",
|
||||
"itertools 0.13.0",
|
||||
"either",
|
||||
"pep508_rs",
|
||||
"platform-tags",
|
||||
"rustc-hash",
|
||||
@ -4695,6 +4701,7 @@ dependencies = [
|
||||
"pep508_rs",
|
||||
"poloto",
|
||||
"pretty_assertions",
|
||||
"pypi-types",
|
||||
"resvg",
|
||||
"rustc-hash",
|
||||
"schemars",
|
||||
@ -4705,7 +4712,6 @@ dependencies = [
|
||||
"tokio",
|
||||
"tracing",
|
||||
"tracing-durations-export",
|
||||
"tracing-indicatif",
|
||||
"tracing-subscriber",
|
||||
"uv-build",
|
||||
"uv-cache",
|
||||
@ -4811,12 +4817,14 @@ dependencies = [
|
||||
"backoff",
|
||||
"cachedir",
|
||||
"dunce",
|
||||
"either",
|
||||
"encoding_rs_io",
|
||||
"fs-err",
|
||||
"fs2",
|
||||
"junction",
|
||||
"once_cell",
|
||||
"path-absolutize",
|
||||
"path-slash",
|
||||
"tempfile",
|
||||
"tracing",
|
||||
"urlencoding",
|
||||
@ -4889,12 +4897,12 @@ name = "uv-interpreter"
|
||||
version = "0.0.1"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"assert_fs",
|
||||
"cache-key",
|
||||
"configparser",
|
||||
"fs-err",
|
||||
"futures",
|
||||
"indoc",
|
||||
"insta",
|
||||
"install-wheel-rs",
|
||||
"itertools 0.13.0",
|
||||
"once_cell",
|
||||
@ -4910,7 +4918,9 @@ dependencies = [
|
||||
"schemars",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"temp-env",
|
||||
"tempfile",
|
||||
"test-log",
|
||||
"thiserror",
|
||||
"tokio-util",
|
||||
"tracing",
|
||||
@ -4955,6 +4965,7 @@ dependencies = [
|
||||
"pep440_rs",
|
||||
"pep508_rs",
|
||||
"pypi-types",
|
||||
"regex",
|
||||
"requirements-txt",
|
||||
"rustc-hash",
|
||||
"schemars",
|
||||
@ -5046,7 +5057,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "uv-version"
|
||||
version = "0.1.45"
|
||||
version = "0.2.3"
|
||||
|
||||
[[package]]
|
||||
name = "uv-virtualenv"
|
||||
@ -5113,39 +5124,6 @@ version = "0.9.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
|
||||
|
||||
[[package]]
|
||||
name = "vt100"
|
||||
version = "0.15.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "84cd863bf0db7e392ba3bd04994be3473491b31e66340672af5d11943c6274de"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"log",
|
||||
"unicode-width",
|
||||
"vte",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "vte"
|
||||
version = "0.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197"
|
||||
dependencies = [
|
||||
"arrayvec",
|
||||
"utf8parse",
|
||||
"vte_generate_state_changes",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "vte_generate_state_changes"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wait-timeout"
|
||||
version = "0.2.0"
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "uv";
|
||||
version = "0.1.45";
|
||||
version = "0.2.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astral-sh";
|
||||
repo = "uv";
|
||||
rev = version;
|
||||
hash = "sha256-PJeUndpD7jHcpM66dMIyXpDx95Boc01rzovS0Y7io7w=";
|
||||
hash = "sha256-NwIjuOsf6tv+kVEXA2GvQkVwDznZs5fnnkzcnVoOGpY=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "vunnel";
|
||||
version = "0.23.0";
|
||||
version = "0.23.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = "vunnel";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pfR3LxC1sSvLKIwq0P/9DcNkGVIIDfwMiSOpwJ7km9Y=";
|
||||
hash = "sha256-wXBfrlb4i4G3Sm0SopvDVGcQ0/hRGtUdzUQYyUj8/Ps=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -4,8 +4,8 @@ let
|
||||
sources = lib.importJSON ./sources.json;
|
||||
in
|
||||
{
|
||||
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.hotspot; };
|
||||
jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.hotspot; };
|
||||
jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.openj9; };
|
||||
jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.openj9; };
|
||||
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };
|
||||
jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.hotspot; knownVulnerabilities = [ "Support ended" ]; };
|
||||
jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.openj9; knownVulnerabilities = [ "Support ended" ]; };
|
||||
jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.openj9; knownVulnerabilities = [ "Support ended" ]; };
|
||||
}
|
||||
|
||||
@ -5,8 +5,8 @@ let
|
||||
sources = lib.importJSON ./sources.json;
|
||||
in
|
||||
{
|
||||
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.hotspot; };
|
||||
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jre.hotspot; };
|
||||
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.openj9; };
|
||||
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jre.openj9; };
|
||||
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };
|
||||
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jre.hotspot; knownVulnerabilities = [ "Support ended" ]; };
|
||||
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.openj9; knownVulnerabilities = [ "Support ended" ]; };
|
||||
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jre.openj9; knownVulnerabilities = [ "Support ended" ]; };
|
||||
}
|
||||
|
||||
@ -4,8 +4,8 @@ let
|
||||
sources = lib.importJSON ./sources.json;
|
||||
in
|
||||
{
|
||||
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.hotspot; };
|
||||
jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.hotspot; };
|
||||
jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.openj9; };
|
||||
jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.openj9; };
|
||||
jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };
|
||||
jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.hotspot; knownVulnerabilities = [ "Support ended" ]; };
|
||||
jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.openj9; knownVulnerabilities = [ "Support ended" ]; };
|
||||
jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.openj9; knownVulnerabilities = [ "Support ended" ]; };
|
||||
}
|
||||
|
||||
@ -5,8 +5,8 @@ let
|
||||
sources = lib.importJSON ./sources.json;
|
||||
in
|
||||
{
|
||||
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.hotspot; };
|
||||
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jre.hotspot; };
|
||||
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.openj9; };
|
||||
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jre.openj9; };
|
||||
jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };
|
||||
jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jre.hotspot; knownVulnerabilities = [ "Support ended" ]; };
|
||||
jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.openj9; knownVulnerabilities = [ "Support ended" ]; };
|
||||
jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jre.openj9; knownVulnerabilities = [ "Support ended" ]; };
|
||||
}
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ corretto11
|
||||
, fetchFromGitHub
|
||||
{ fetchFromGitHub
|
||||
, gradle_7
|
||||
, jdk11
|
||||
, lib
|
||||
@ -10,7 +9,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
corretto = import ./mk-corretto.nix {
|
||||
corretto = import ./mk-corretto.nix rec {
|
||||
inherit lib stdenv rsync runCommand testers;
|
||||
jdk = jdk11;
|
||||
gradle = gradle_7;
|
||||
@ -20,12 +19,12 @@ let
|
||||
# Corretto, too.
|
||||
"--disable-warnings-as-errors"
|
||||
];
|
||||
version = "11.0.20.9.1";
|
||||
version = "11.0.23.9.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "corretto";
|
||||
repo = "corretto-11";
|
||||
rev = "b880bdc8397ec3dd6b7cd4b837ce846c9e902783";
|
||||
sha256 = "sha256-IomJHQn0ZgqsBZ5BrRqVrEOhTq7wjLiIKMQlz53JxsU=";
|
||||
rev = version;
|
||||
sha256 = "sha256-qSx0kgXTgvsvBaEqgy7Jrp/c1Imoi5/IOqEWoLenJYI=";
|
||||
};
|
||||
};
|
||||
in
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ corretto17
|
||||
, fetchFromGitHub
|
||||
{ fetchFromGitHub
|
||||
, gradle_7
|
||||
, jdk17
|
||||
, lib
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ corretto19
|
||||
, fetchFromGitHub
|
||||
{ fetchFromGitHub
|
||||
, gradle_7
|
||||
, jdk19
|
||||
, lib
|
||||
@ -10,7 +9,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
corretto = import ./mk-corretto.nix {
|
||||
corretto = import ./mk-corretto.nix rec {
|
||||
inherit lib stdenv rsync runCommand testers;
|
||||
jdk = jdk19;
|
||||
gradle = gradle_7;
|
||||
@ -18,7 +17,7 @@ let
|
||||
src = fetchFromGitHub {
|
||||
owner = "corretto";
|
||||
repo = "corretto-19";
|
||||
rev = "72f064a1d716272bd17d4e425d4a264b2c2c7d36";
|
||||
rev = version;
|
||||
sha256 = "sha256-mEj/MIbdXU0+fF5RhqjPuSeyclstesGaXB0e48YlKuw=";
|
||||
};
|
||||
};
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
corretto = import ./mk-corretto.nix {
|
||||
corretto = import ./mk-corretto.nix rec {
|
||||
inherit lib stdenv rsync runCommand testers;
|
||||
jdk = jdk21;
|
||||
gradle = gradle_7;
|
||||
@ -18,7 +18,7 @@ let
|
||||
src = fetchFromGitHub {
|
||||
owner = "corretto";
|
||||
repo = "corretto-21";
|
||||
rev = "97b366227b4dc8f5a89bbedea88b0b18c9e21886";
|
||||
rev = version;
|
||||
sha256 = "sha256-V8UDyukDCQVTWUg4IpSKoY0qnnQ5fePbm3rxcw06Vr0=";
|
||||
};
|
||||
};
|
||||
|
||||
@ -11,8 +11,8 @@
|
||||
let
|
||||
major = "11";
|
||||
minor = "0";
|
||||
update = "19";
|
||||
build = "7";
|
||||
update = "23";
|
||||
build = "9";
|
||||
|
||||
# when building a headless jdk, also bootstrap it with a headless jdk
|
||||
openjdk-bootstrap = openjdk11-bootstrap.override { gtkSupport = !headless; };
|
||||
@ -25,7 +25,7 @@ let
|
||||
owner = "openjdk";
|
||||
repo = "jdk${major}u";
|
||||
rev = "jdk-${version}";
|
||||
sha256 = "sha256-mp8toB1dWcwOtMqNFd7UwRg8pLJckovqD/LD5p9zUoA=";
|
||||
sha256 = "sha256-6y6wge8ZuSKBpb5QNihvAlD4Pv/0d3AQCPOkxUm/sJk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoconf unzip ];
|
||||
|
||||
@ -2,10 +2,10 @@ lib: version: with lib; {
|
||||
homepage = "https://openjdk.java.net/";
|
||||
license = licenses.gpl2Only;
|
||||
description = "The open-source Java Development Kit";
|
||||
maintainers = with maintainers; [ edwtjo ];
|
||||
maintainers = with maintainers; [ edwtjo infinidoge ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" "powerpc64le-linux" ];
|
||||
mainProgram = "java";
|
||||
knownVulnerabilities = optionals (builtins.elem (versions.major version) [ "12" "13" "14" "15" "16" "18" ]) [
|
||||
knownVulnerabilities = optionals (builtins.elem (versions.major version) [ "12" "13" "14" "15" "16" "18" "19" "20" ]) [
|
||||
"This OpenJDK version has reached its end of life."
|
||||
];
|
||||
}
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
let
|
||||
major = "11";
|
||||
update = ".0.18";
|
||||
update = ".0.20";
|
||||
build = "1";
|
||||
repover = "${major}${update}+${build}";
|
||||
gradle_ = (gradle_7.override {
|
||||
@ -31,7 +31,7 @@ let
|
||||
owner = "openjdk";
|
||||
repo = "jfx${major}u";
|
||||
rev = repover;
|
||||
sha256 = "sha256-46DjIzcBHkmp5vnhYnLu78CG72bIBRM4A6mgk2OLOko=";
|
||||
sha256 = "sha256-BbBP2DiPZTSn1SBYMCgyiNdF9GD+NqR6YjeVNOQHHn4=";
|
||||
};
|
||||
|
||||
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ];
|
||||
|
||||
@ -141,5 +141,8 @@ in makePackage {
|
||||
description = "The next-generation Java client toolkit";
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
platforms = platforms.unix;
|
||||
knownVulnerabilities = [
|
||||
"This OpenJFX version has reached its end of life."
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless
|
||||
, openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst
|
||||
, openjdk20_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst
|
||||
, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand
|
||||
, withMedia ? true
|
||||
, withWebKit ? false
|
||||
@ -49,7 +49,7 @@ let
|
||||
|
||||
config = writeText "gradle.properties" (''
|
||||
CONF = Release
|
||||
JDK_HOME = ${openjdk19_headless.home}
|
||||
JDK_HOME = ${openjdk20_headless.home}
|
||||
'' + args.gradleProperties or "");
|
||||
|
||||
buildPhase = ''
|
||||
@ -111,14 +111,14 @@ in makePackage {
|
||||
|
||||
postFixup = ''
|
||||
# Remove references to bootstrap.
|
||||
export openjdkOutPath='${openjdk19_headless.outPath}'
|
||||
export openjdkOutPath='${openjdk20_headless.outPath}'
|
||||
find "$out" -name \*.so | while read lib; do
|
||||
new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')"
|
||||
patchelf --set-rpath "$new_refs" "$lib"
|
||||
done
|
||||
'';
|
||||
|
||||
disallowedReferences = [ openjdk17_headless openjdk19_headless ];
|
||||
disallowedReferences = [ openjdk17_headless openjdk20_headless ];
|
||||
|
||||
passthru.deps = deps;
|
||||
|
||||
@ -128,5 +128,8 @@ in makePackage {
|
||||
description = "The next-generation Java client toolkit";
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
platforms = platforms.unix;
|
||||
knownVulnerabilities = [
|
||||
"This OpenJFX version has reached its end of life."
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless
|
||||
, openjdk19_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst
|
||||
, openjdk21_headless, gradle_7, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst
|
||||
, libXxf86vm, glib, alsa-lib, ffmpeg_4, python3, ruby, fetchurl, runCommand
|
||||
, withMedia ? true
|
||||
, withWebKit ? false
|
||||
@ -49,7 +49,7 @@ let
|
||||
|
||||
config = writeText "gradle.properties" (''
|
||||
CONF = Release
|
||||
JDK_HOME = ${openjdk19_headless.home}
|
||||
JDK_HOME = ${openjdk21_headless.home}
|
||||
'' + args.gradleProperties or "");
|
||||
|
||||
buildPhase = ''
|
||||
@ -111,14 +111,14 @@ in makePackage {
|
||||
|
||||
postFixup = ''
|
||||
# Remove references to bootstrap.
|
||||
export openjdkOutPath='${openjdk19_headless.outPath}'
|
||||
export openjdkOutPath='${openjdk21_headless.outPath}'
|
||||
find "$out" -name \*.so | while read lib; do
|
||||
new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')"
|
||||
patchelf --set-rpath "$new_refs" "$lib"
|
||||
done
|
||||
'';
|
||||
|
||||
disallowedReferences = [ openjdk17_headless openjdk19_headless ];
|
||||
disallowedReferences = [ openjdk17_headless openjdk21_headless ];
|
||||
|
||||
passthru.deps = deps;
|
||||
|
||||
|
||||
@ -7,7 +7,6 @@
|
||||
, libGL
|
||||
, ninja
|
||||
, libX11
|
||||
, webkitgtk
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -35,7 +34,7 @@ stdenv.mkDerivation rec {
|
||||
description = "General-purpose library for WPE WebKit";
|
||||
license = licenses.bsd2;
|
||||
homepage = "https://wpewebkit.org";
|
||||
maintainers = webkitgtk.meta.maintainers ++ (with maintainers; [ matthewbauer ]);
|
||||
maintainers = with maintainers; [ matthewbauer ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -11,7 +11,6 @@
|
||||
, libxkbcommon
|
||||
, libGL
|
||||
, libX11
|
||||
, webkitgtk
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@ -48,7 +47,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Freedesktop.org backend for WPE WebKit";
|
||||
license = licenses.bsd2;
|
||||
homepage = "https://wpewebkit.org";
|
||||
maintainers = webkitgtk.meta.maintainers ++ (with maintainers; [ matthewbauer ]);
|
||||
maintainers = with maintainers; [ matthewbauer ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lmdb";
|
||||
version = "0.9.32";
|
||||
version = "0.9.33";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "git.openldap.org";
|
||||
owner = "openldap";
|
||||
repo = "openldap";
|
||||
rev = "LMDB_${version}";
|
||||
sha256 = "sha256-29ZrGIiGqrvX+WsPRs2V25hPmAJSHTHaGo19nMldsb8=";
|
||||
sha256 = "sha256-5IBoJ3jaNXao5zVzb0LDM8RGid4s8DGQpjVqrVPLpXQ=";
|
||||
};
|
||||
|
||||
postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb";
|
||||
|
||||
@ -2662,6 +2662,27 @@ buildLuarocksPackage {
|
||||
};
|
||||
}) {};
|
||||
|
||||
psl = callPackage({ buildLuarocksPackage, fetchurl, fetchzip }:
|
||||
buildLuarocksPackage {
|
||||
pname = "psl";
|
||||
version = "0.3-0";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/psl-0.3-0.rockspec";
|
||||
sha256 = "1x7sc8n780k67v31bvqqxhh6ihy0k91zmp6xcxmkifr0gd008x9z";
|
||||
}).outPath;
|
||||
src = fetchzip {
|
||||
url = "https://github.com/daurnimator/lua-psl/archive/v0.3.zip";
|
||||
sha256 = "1x9zskjn6fp9343w9314104128ik4lbk98pg6zfhl1v35107m1jx";
|
||||
};
|
||||
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/daurnimator/lua-psl";
|
||||
description = "Bindings to libpsl, a C library that handles the Public Suffix List (PSL)";
|
||||
license.fullName = "MIT";
|
||||
};
|
||||
}) {};
|
||||
|
||||
rapidjson = callPackage({ buildLuarocksPackage, cmake, fetchFromGitHub, fetchurl, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "rapidjson";
|
||||
|
||||
@ -29,6 +29,7 @@
|
||||
, libiconv
|
||||
, libmpack
|
||||
, libmysqlclient
|
||||
, libpsl
|
||||
, libuuid
|
||||
, libuv
|
||||
, libxcrypt
|
||||
@ -617,6 +618,15 @@ in
|
||||
dontPatchShebangs = true;
|
||||
});
|
||||
|
||||
psl = prev.psl.overrideAttrs (drv: {
|
||||
buildInputs = drv.buildInputs or [ ] ++ [ libpsl ];
|
||||
|
||||
luarocksConfig.variables = drv.luarocksConfig.variables // {
|
||||
PSL_INCDIR = lib.getDev libpsl + "/include";
|
||||
PSL_DIR = lib.getLib libpsl;
|
||||
};
|
||||
});
|
||||
|
||||
rapidjson = prev.rapidjson.overrideAttrs (oa: {
|
||||
preBuild = ''
|
||||
sed -i '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt
|
||||
|
||||
@ -366,7 +366,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.34.112";
|
||||
version = "1.34.113";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -374,7 +374,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-70UVtT3M5NhRaPoYXcgDU3xMiC1bDas+XDSJPIPI26o=";
|
||||
hash = "sha256-Fqr40Jec/WX4UFNqLM9DRNAPEmOKo3emW3bAAzjzXFA=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cyclonedx-python-lib";
|
||||
version = "7.3.4";
|
||||
version = "7.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
||||
owner = "CycloneDX";
|
||||
repo = "cyclonedx-python-lib";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-rFxCeQTCQSpg0LQYyOxhk150KOUyV9PXdXo1mOA0KPw=";
|
||||
hash = "sha256-cR/E0xVPl2iBgjhX9xv8nftmmTDWjDUqRgvNqcAWzRo=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
buildPythonPackage,
|
||||
lib,
|
||||
fetchurl,
|
||||
stdenv,
|
||||
|
||||
autoreconfHook,
|
||||
boost,
|
||||
@ -24,12 +25,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "graph-tool";
|
||||
version = "2.65";
|
||||
format = "other";
|
||||
version = "2.45";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
|
||||
hash = "sha256-+S2nrM/aArKXke/k8LPtkzKfJyMq9NOvwHySQh7Ghmg=";
|
||||
hash = "sha256-ozpFv9rri2toG8BeNTqzoJdkwB06GdJ69XjtPkjUKZw=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
@ -48,7 +49,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
# https://git.skewed.de/count0/graph-tool/-/wikis/installation-instructions#manual-compilation
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
boost
|
||||
cairomm
|
||||
cgal
|
||||
@ -69,6 +70,7 @@ buildPythonPackage rec {
|
||||
description = "Python module for manipulation and statistical analysis of graphs";
|
||||
homepage = "https://graph-tool.skewed.de";
|
||||
license = licenses.lgpl3Plus;
|
||||
broken = stdenv.isDarwin;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jsonargparse";
|
||||
version = "4.28.0";
|
||||
version = "4.29.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
||||
owner = "omni-us";
|
||||
repo = "jsonargparse";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-iw6ntzFkvMg5baOgeUzf3qV1eGGqywINd7e6N781llQ=";
|
||||
hash = "sha256-L+bGyn6O3lGu4FPclNFUeIzQhpznBxdkofUS5yCRM3Y=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
fetchFromGitHub,
|
||||
fetchzip,
|
||||
fsspec,
|
||||
jsonpath-ng,
|
||||
llamaindex-py-client,
|
||||
nest-asyncio,
|
||||
networkx,
|
||||
@ -23,10 +24,11 @@
|
||||
pythonOlder,
|
||||
pyyaml,
|
||||
requests,
|
||||
tree-sitter,
|
||||
spacy,
|
||||
sqlalchemy,
|
||||
tenacity,
|
||||
tiktoken,
|
||||
tree-sitter,
|
||||
typing-inspect,
|
||||
}:
|
||||
|
||||
@ -44,7 +46,7 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-core";
|
||||
version = "0.10.36";
|
||||
version = "0.10.38";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -53,7 +55,7 @@ buildPythonPackage rec {
|
||||
owner = "run-llama";
|
||||
repo = "llama_index";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-yP/60DLg43UOOogxbDvb1p5n8dnfBUjGhcfO5g5g0gA=";
|
||||
hash = "sha256-A5wOQE8WK8Mt7TvquSfgPorr39lap2n8AVQP7rr6y/Y=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/${pname}";
|
||||
@ -80,6 +82,7 @@ buildPythonPackage rec {
|
||||
deprecated
|
||||
dirtyjson
|
||||
fsspec
|
||||
jsonpath-ng
|
||||
llamaindex-py-client
|
||||
nest-asyncio
|
||||
networkx
|
||||
@ -90,6 +93,7 @@ buildPythonPackage rec {
|
||||
pillow
|
||||
pyyaml
|
||||
requests
|
||||
spacy
|
||||
sqlalchemy
|
||||
tenacity
|
||||
tiktoken
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-embeddings-gemini";
|
||||
version = "0.1.6";
|
||||
version = "0.1.7";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_embeddings_gemini";
|
||||
inherit version;
|
||||
hash = "sha256-HYwYA67/7gDxE7ZxQkkyblgwE83gZXuDmUuseXujr5g=";
|
||||
hash = "sha256-0ob6t9pFaIsbDyt9+QOKFQctS6s99tEvdstn39iyVpA=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "google-generativeai" ];
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-embeddings-google";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_embeddings_google";
|
||||
inherit version;
|
||||
hash = "sha256-mJ+H4klmGlpTGXLErlLNWH5IUpGyXnbAhNsgT5fwCHs=";
|
||||
hash = "sha256-XPqZ+4aZfrTGU4sOLxMElG6kuGVJa8/3uxW+icSHpzQ=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "google-generativeai" ];
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-embeddings-openai";
|
||||
version = "0.1.9";
|
||||
version = "0.1.10";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_embeddings_openai";
|
||||
inherit version;
|
||||
hash = "sha256-D9KSsvmgrUU0p5DWN0cmvIhYUxiAh+sBgWfc8jlkOSQ=";
|
||||
hash = "sha256-G8H8m0Z3OhKHDF0wl9NzXXyjOAXxJGKo41ropuXOHPY=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-llms-ollama";
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_llms_ollama";
|
||||
inherit version;
|
||||
hash = "sha256-ebwZw9p1rfWrGjYd9aHF3CsubKOL1/Ei/mV4AgQxhtk=";
|
||||
hash = "sha256-dWl9lshg2H6AzOkMnqQly9I2kYRY4P6q7gNZcGi6mEQ=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-llms-openai";
|
||||
version = "0.1.19";
|
||||
version = "0.1.21";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_llms_openai";
|
||||
inherit version;
|
||||
hash = "sha256-9htkqZeJLkJPs81UcJDSecWyEO8VthT8Od6FTTzKp+c=";
|
||||
hash = "sha256-6dYxE1FgrIcJPNfVrj4yxN6/juqvop7kc5Z1hnFV13M=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-readers-file";
|
||||
version = "0.1.22";
|
||||
version = "0.1.23";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_readers_file";
|
||||
inherit version;
|
||||
hash = "sha256-N95UrQz73GB8GVUyuaKSQXpHFPV3c1cLhwJ7jcOB8OI=";
|
||||
hash = "sha256-/ejstYjnA4SeUdwPB19W0fXbO8FHndAMIbQuk7gbYmc=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-readers-s3";
|
||||
version = "0.1.7";
|
||||
version = "0.1.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_readers_s3";
|
||||
inherit version;
|
||||
hash = "sha256-xj7uRsc56Wv/SF4OPo/jc+43PabJ4vaM5HcxhnxTzY8=";
|
||||
hash = "sha256-O8V9b52gcsWm0bfHlNThIvxPox7d+qK4KzvPWT0fkGc=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mizani";
|
||||
version = "0.11.3";
|
||||
version = "0.11.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "has2k1";
|
||||
repo = "mizani";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aEataiB432yKnQ80TxJvsU9DO9wI4ZVGq1k73qeuEv0=";
|
||||
hash = "sha256-2XBvjlVSEjeNc7UlPZ00cNrWVuHh/FgDwkvWus7ndr4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools-scm ];
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "msoffcrypto-tool";
|
||||
version = "5.4.0";
|
||||
version = "5.4.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "nolze";
|
||||
repo = "msoffcrypto-tool";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-1LTFwXTIvFdrYyI1pDUPzQHw3/043+FGHDnKYWaomY0=";
|
||||
hash = "sha256-BVm4hMKvvNI3bJ82t4NIRcx8o8mgQgoulIerDwoVIT0=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@ -51,22 +51,10 @@ buildPythonPackage rec {
|
||||
export PY_IGNORE_IMPORTMISMATCH=1
|
||||
'';
|
||||
|
||||
disabledTests =
|
||||
[
|
||||
# Tests require network access
|
||||
"test_ows_interfaces_wcs"
|
||||
"test_wfs_110_remotemd"
|
||||
"test_wfs_200_remotemd"
|
||||
"test_wms_130_remotemd"
|
||||
"test_wmts_example_informatievlaanderen"
|
||||
"test_opensearch_creodias"
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
"test_ogcapi_processes_pygeoapi"
|
||||
"test_ogcapi_records_pycsw"
|
||||
"test_ogcapi_records_pygeoapi"
|
||||
"test_wms_getfeatureinfo_130"
|
||||
];
|
||||
pytestFlagsArray = [
|
||||
# disable tests which require network access
|
||||
"-m 'not online'"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Client for Open Geospatial Consortium web service interface standards";
|
||||
|
||||
@ -13,24 +13,24 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pylast";
|
||||
version = "5.2.0";
|
||||
format = "pyproject";
|
||||
version = "5.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pylast";
|
||||
repo = pname;
|
||||
repo = "pylast";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-6yxsqruosSOJ5LeIBbvuEko4s9qU/ObNZiJD5YH/hvY=";
|
||||
hash = "sha256-dgqTNISeyBkZ2m68pqw5rsoyPxLW4wWkv6iqq9bD5Ek=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
build-system = [
|
||||
hatch-vcs
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ httpx ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
|
||||
dependencies = [ httpx ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
@ -42,6 +42,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Python interface to last.fm (and compatibles)";
|
||||
homepage = "https://github.com/pylast/pylast";
|
||||
changelog = "https://github.com/pylast/pylast/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [
|
||||
fab
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysigma";
|
||||
version = "0.11.5";
|
||||
version = "0.11.6";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "SigmaHQ";
|
||||
repo = "pySigma";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Mr4etI6VNPWDVZj4A9j3Ka9v+BpFC75MLXppYELIWrg=";
|
||||
hash = "sha256-BPDwGwwstGEBN3FIteyFX05TC/vBhWDiZJJh56Uoclo=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytransportnswv2";
|
||||
version = "0.3.0";
|
||||
version = "0.3.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-9bpIu+Uc6eFSEGeEfpVwfrhvLekR8qOd571qMnLTpVg=";
|
||||
hash = "sha256-Vj16Mmi3cH0V7d+GMQUTr1mmOyXcnZ3BarrE8fHWSns=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
llvmPackages,
|
||||
python,
|
||||
cmake,
|
||||
@ -23,7 +24,16 @@ stdenv'.mkDerivation rec {
|
||||
|
||||
sourceRoot = "pyside-setup-everywhere-src-${version}/sources/${pname}";
|
||||
|
||||
patches = [ ./fix-include-qt-headers.patch ];
|
||||
patches = [
|
||||
./fix-include-qt-headers.patch
|
||||
# Remove this patch when updating to 6.8.0
|
||||
(fetchpatch {
|
||||
name = "backwards-compatibility-with-6.6.x.patch";
|
||||
url = "https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=4f9a20e3635f4f0957e0774588b1d9156e88a572";
|
||||
hash = "sha256-B2jhLWopgaSF/rUXMZFPZArDUNojlBgn7kdVyQull+I=";
|
||||
stripLen = 2;
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "syncedlyrics";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "rtcq";
|
||||
repo = "syncedlyrics";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Q0Hu403Hxr4iDuZfGQjgTSuNMVgsqd9zLRl9Vc1YzyQ=";
|
||||
hash = "sha256-B3+0DPR30MwPL53YIS/3jmMU73Z0NDDaR0pV8wE6P5Q=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
@ -44,10 +44,10 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Module to get LRC format (synchronized) lyrics";
|
||||
mainProgram = "syncedlyrics";
|
||||
homepage = "https://github.com/rtcq/syncedlyrics";
|
||||
changelog = "https://github.com/rtcq/syncedlyrics/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "syncedlyrics";
|
||||
};
|
||||
}
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "twilio";
|
||||
version = "9.0.5";
|
||||
version = "9.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "twilio";
|
||||
repo = "twilio-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-q7tY44L8KA29HeoLBJf75Xp3IZSiT5DOkhtZ+7BD7Hg=";
|
||||
hash = "sha256-jOjja+nuh2asYcIO5QVwmXC1vGlbzEhRnMyvq2paCPU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,16 +1,15 @@
|
||||
{
|
||||
lib,
|
||||
aiobotocore,
|
||||
botocore-stubs,
|
||||
botocore,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
botocore-stubs,
|
||||
typing-extensions,
|
||||
types-aiobotocore-accessanalyzer,
|
||||
types-aiobotocore-account,
|
||||
types-aiobotocore-acm,
|
||||
types-aiobotocore-acm-pca,
|
||||
aiobotocore,
|
||||
botocore,
|
||||
types-aiobotocore-acm,
|
||||
types-aiobotocore-alexaforbusiness,
|
||||
types-aiobotocore-amp,
|
||||
types-aiobotocore-amplify,
|
||||
@ -34,22 +33,22 @@
|
||||
types-aiobotocore-arc-zonal-shift,
|
||||
types-aiobotocore-athena,
|
||||
types-aiobotocore-auditmanager,
|
||||
types-aiobotocore-autoscaling,
|
||||
types-aiobotocore-autoscaling-plans,
|
||||
types-aiobotocore-backup,
|
||||
types-aiobotocore-autoscaling,
|
||||
types-aiobotocore-backup-gateway,
|
||||
types-aiobotocore-backup,
|
||||
types-aiobotocore-backupstorage,
|
||||
types-aiobotocore-batch,
|
||||
types-aiobotocore-billingconductor,
|
||||
types-aiobotocore-braket,
|
||||
types-aiobotocore-budgets,
|
||||
types-aiobotocore-ce,
|
||||
types-aiobotocore-chime,
|
||||
types-aiobotocore-chime-sdk-identity,
|
||||
types-aiobotocore-chime-sdk-media-pipelines,
|
||||
types-aiobotocore-chime-sdk-meetings,
|
||||
types-aiobotocore-chime-sdk-messaging,
|
||||
types-aiobotocore-chime-sdk-voice,
|
||||
types-aiobotocore-chime,
|
||||
types-aiobotocore-cleanrooms,
|
||||
types-aiobotocore-cloud9,
|
||||
types-aiobotocore-cloudcontrol,
|
||||
@ -60,8 +59,8 @@
|
||||
types-aiobotocore-cloudhsmv2,
|
||||
types-aiobotocore-cloudsearch,
|
||||
types-aiobotocore-cloudsearchdomain,
|
||||
types-aiobotocore-cloudtrail,
|
||||
types-aiobotocore-cloudtrail-data,
|
||||
types-aiobotocore-cloudtrail,
|
||||
types-aiobotocore-cloudwatch,
|
||||
types-aiobotocore-codeartifact,
|
||||
types-aiobotocore-codebuild,
|
||||
@ -72,9 +71,9 @@
|
||||
types-aiobotocore-codeguru-security,
|
||||
types-aiobotocore-codeguruprofiler,
|
||||
types-aiobotocore-codepipeline,
|
||||
types-aiobotocore-codestar,
|
||||
types-aiobotocore-codestar-connections,
|
||||
types-aiobotocore-codestar-notifications,
|
||||
types-aiobotocore-codestar,
|
||||
types-aiobotocore-cognito-identity,
|
||||
types-aiobotocore-cognito-idp,
|
||||
types-aiobotocore-cognito-sync,
|
||||
@ -82,8 +81,8 @@
|
||||
types-aiobotocore-comprehendmedical,
|
||||
types-aiobotocore-compute-optimizer,
|
||||
types-aiobotocore-config,
|
||||
types-aiobotocore-connect,
|
||||
types-aiobotocore-connect-contact-lens,
|
||||
types-aiobotocore-connect,
|
||||
types-aiobotocore-connectcampaigns,
|
||||
types-aiobotocore-connectcases,
|
||||
types-aiobotocore-connectparticipant,
|
||||
@ -102,17 +101,17 @@
|
||||
types-aiobotocore-discovery,
|
||||
types-aiobotocore-dlm,
|
||||
types-aiobotocore-dms,
|
||||
types-aiobotocore-docdb,
|
||||
types-aiobotocore-docdb-elastic,
|
||||
types-aiobotocore-docdb,
|
||||
types-aiobotocore-drs,
|
||||
types-aiobotocore-ds,
|
||||
types-aiobotocore-dynamodb,
|
||||
types-aiobotocore-dynamodbstreams,
|
||||
types-aiobotocore-ebs,
|
||||
types-aiobotocore-ec2,
|
||||
types-aiobotocore-ec2-instance-connect,
|
||||
types-aiobotocore-ecr,
|
||||
types-aiobotocore-ec2,
|
||||
types-aiobotocore-ecr-public,
|
||||
types-aiobotocore-ecr,
|
||||
types-aiobotocore-ecs,
|
||||
types-aiobotocore-efs,
|
||||
types-aiobotocore-eks,
|
||||
@ -122,15 +121,15 @@
|
||||
types-aiobotocore-elastictranscoder,
|
||||
types-aiobotocore-elb,
|
||||
types-aiobotocore-elbv2,
|
||||
types-aiobotocore-emr,
|
||||
types-aiobotocore-emr-containers,
|
||||
types-aiobotocore-emr-serverless,
|
||||
types-aiobotocore-emr,
|
||||
types-aiobotocore-entityresolution,
|
||||
types-aiobotocore-es,
|
||||
types-aiobotocore-events,
|
||||
types-aiobotocore-evidently,
|
||||
types-aiobotocore-finspace,
|
||||
types-aiobotocore-finspace-data,
|
||||
types-aiobotocore-finspace,
|
||||
types-aiobotocore-firehose,
|
||||
types-aiobotocore-fis,
|
||||
types-aiobotocore-fms,
|
||||
@ -158,16 +157,16 @@
|
||||
types-aiobotocore-inspector,
|
||||
types-aiobotocore-inspector2,
|
||||
types-aiobotocore-internetmonitor,
|
||||
types-aiobotocore-iot,
|
||||
types-aiobotocore-iot-data,
|
||||
types-aiobotocore-iot-jobs-data,
|
||||
types-aiobotocore-iot-roborunner,
|
||||
types-aiobotocore-iot,
|
||||
types-aiobotocore-iot1click-devices,
|
||||
types-aiobotocore-iot1click-projects,
|
||||
types-aiobotocore-iotanalytics,
|
||||
types-aiobotocore-iotdeviceadvisor,
|
||||
types-aiobotocore-iotevents,
|
||||
types-aiobotocore-iotevents-data,
|
||||
types-aiobotocore-iotevents,
|
||||
types-aiobotocore-iotfleethub,
|
||||
types-aiobotocore-iotfleetwise,
|
||||
types-aiobotocore-iotsecuretunneling,
|
||||
@ -175,19 +174,19 @@
|
||||
types-aiobotocore-iotthingsgraph,
|
||||
types-aiobotocore-iottwinmaker,
|
||||
types-aiobotocore-iotwireless,
|
||||
types-aiobotocore-ivs,
|
||||
types-aiobotocore-ivs-realtime,
|
||||
types-aiobotocore-ivs,
|
||||
types-aiobotocore-ivschat,
|
||||
types-aiobotocore-kafka,
|
||||
types-aiobotocore-kafkaconnect,
|
||||
types-aiobotocore-kendra,
|
||||
types-aiobotocore-kendra-ranking,
|
||||
types-aiobotocore-kendra,
|
||||
types-aiobotocore-keyspaces,
|
||||
types-aiobotocore-kinesis,
|
||||
types-aiobotocore-kinesis-video-archived-media,
|
||||
types-aiobotocore-kinesis-video-media,
|
||||
types-aiobotocore-kinesis-video-signaling,
|
||||
types-aiobotocore-kinesis-video-webrtc-storage,
|
||||
types-aiobotocore-kinesis,
|
||||
types-aiobotocore-kinesisanalytics,
|
||||
types-aiobotocore-kinesisanalyticsv2,
|
||||
types-aiobotocore-kinesisvideo,
|
||||
@ -198,9 +197,9 @@
|
||||
types-aiobotocore-lex-runtime,
|
||||
types-aiobotocore-lexv2-models,
|
||||
types-aiobotocore-lexv2-runtime,
|
||||
types-aiobotocore-license-manager,
|
||||
types-aiobotocore-license-manager-linux-subscriptions,
|
||||
types-aiobotocore-license-manager-user-subscriptions,
|
||||
types-aiobotocore-license-manager,
|
||||
types-aiobotocore-lightsail,
|
||||
types-aiobotocore-location,
|
||||
types-aiobotocore-logs,
|
||||
@ -211,19 +210,19 @@
|
||||
types-aiobotocore-machinelearning,
|
||||
types-aiobotocore-macie,
|
||||
types-aiobotocore-macie2,
|
||||
types-aiobotocore-managedblockchain,
|
||||
types-aiobotocore-managedblockchain-query,
|
||||
types-aiobotocore-managedblockchain,
|
||||
types-aiobotocore-marketplace-catalog,
|
||||
types-aiobotocore-marketplace-entitlement,
|
||||
types-aiobotocore-marketplacecommerceanalytics,
|
||||
types-aiobotocore-mediaconnect,
|
||||
types-aiobotocore-mediaconvert,
|
||||
types-aiobotocore-medialive,
|
||||
types-aiobotocore-mediapackage,
|
||||
types-aiobotocore-mediapackage-vod,
|
||||
types-aiobotocore-mediapackage,
|
||||
types-aiobotocore-mediapackagev2,
|
||||
types-aiobotocore-mediastore,
|
||||
types-aiobotocore-mediastore-data,
|
||||
types-aiobotocore-mediastore,
|
||||
types-aiobotocore-mediatailor,
|
||||
types-aiobotocore-medical-imaging,
|
||||
types-aiobotocore-memorydb,
|
||||
@ -252,31 +251,31 @@
|
||||
types-aiobotocore-osis,
|
||||
types-aiobotocore-outposts,
|
||||
types-aiobotocore-panorama,
|
||||
types-aiobotocore-payment-cryptography,
|
||||
types-aiobotocore-payment-cryptography-data,
|
||||
types-aiobotocore-personalize,
|
||||
types-aiobotocore-payment-cryptography,
|
||||
types-aiobotocore-personalize-events,
|
||||
types-aiobotocore-personalize-runtime,
|
||||
types-aiobotocore-personalize,
|
||||
types-aiobotocore-pi,
|
||||
types-aiobotocore-pinpoint,
|
||||
types-aiobotocore-pinpoint-email,
|
||||
types-aiobotocore-pinpoint-sms-voice,
|
||||
types-aiobotocore-pinpoint-sms-voice-v2,
|
||||
types-aiobotocore-pinpoint-sms-voice,
|
||||
types-aiobotocore-pinpoint,
|
||||
types-aiobotocore-pipes,
|
||||
types-aiobotocore-polly,
|
||||
types-aiobotocore-pricing,
|
||||
types-aiobotocore-privatenetworks,
|
||||
types-aiobotocore-proton,
|
||||
types-aiobotocore-qldb,
|
||||
types-aiobotocore-qldb-session,
|
||||
types-aiobotocore-qldb,
|
||||
types-aiobotocore-quicksight,
|
||||
types-aiobotocore-ram,
|
||||
types-aiobotocore-rbin,
|
||||
types-aiobotocore-rds,
|
||||
types-aiobotocore-rds-data,
|
||||
types-aiobotocore-redshift,
|
||||
types-aiobotocore-rds,
|
||||
types-aiobotocore-redshift-data,
|
||||
types-aiobotocore-redshift-serverless,
|
||||
types-aiobotocore-redshift,
|
||||
types-aiobotocore-rekognition,
|
||||
types-aiobotocore-resiliencehub,
|
||||
types-aiobotocore-resource-explorer-2,
|
||||
@ -284,23 +283,23 @@
|
||||
types-aiobotocore-resourcegroupstaggingapi,
|
||||
types-aiobotocore-robomaker,
|
||||
types-aiobotocore-rolesanywhere,
|
||||
types-aiobotocore-route53,
|
||||
types-aiobotocore-route53-recovery-cluster,
|
||||
types-aiobotocore-route53-recovery-control-config,
|
||||
types-aiobotocore-route53-recovery-readiness,
|
||||
types-aiobotocore-route53,
|
||||
types-aiobotocore-route53domains,
|
||||
types-aiobotocore-route53resolver,
|
||||
types-aiobotocore-rum,
|
||||
types-aiobotocore-s3,
|
||||
types-aiobotocore-s3control,
|
||||
types-aiobotocore-s3outposts,
|
||||
types-aiobotocore-sagemaker,
|
||||
types-aiobotocore-sagemaker-a2i-runtime,
|
||||
types-aiobotocore-sagemaker-edge,
|
||||
types-aiobotocore-sagemaker-featurestore-runtime,
|
||||
types-aiobotocore-sagemaker-geospatial,
|
||||
types-aiobotocore-sagemaker-metrics,
|
||||
types-aiobotocore-sagemaker-runtime,
|
||||
types-aiobotocore-sagemaker,
|
||||
types-aiobotocore-savingsplans,
|
||||
types-aiobotocore-scheduler,
|
||||
types-aiobotocore-schemas,
|
||||
@ -310,32 +309,32 @@
|
||||
types-aiobotocore-securitylake,
|
||||
types-aiobotocore-serverlessrepo,
|
||||
types-aiobotocore-service-quotas,
|
||||
types-aiobotocore-servicecatalog,
|
||||
types-aiobotocore-servicecatalog-appregistry,
|
||||
types-aiobotocore-servicecatalog,
|
||||
types-aiobotocore-servicediscovery,
|
||||
types-aiobotocore-ses,
|
||||
types-aiobotocore-sesv2,
|
||||
types-aiobotocore-shield,
|
||||
types-aiobotocore-signer,
|
||||
types-aiobotocore-simspaceweaver,
|
||||
types-aiobotocore-sms,
|
||||
types-aiobotocore-sms-voice,
|
||||
types-aiobotocore-sms,
|
||||
types-aiobotocore-snow-device-management,
|
||||
types-aiobotocore-snowball,
|
||||
types-aiobotocore-sns,
|
||||
types-aiobotocore-sqs,
|
||||
types-aiobotocore-ssm,
|
||||
types-aiobotocore-ssm-contacts,
|
||||
types-aiobotocore-ssm-incidents,
|
||||
types-aiobotocore-ssm-sap,
|
||||
types-aiobotocore-sso,
|
||||
types-aiobotocore-ssm,
|
||||
types-aiobotocore-sso-admin,
|
||||
types-aiobotocore-sso-oidc,
|
||||
types-aiobotocore-sso,
|
||||
types-aiobotocore-stepfunctions,
|
||||
types-aiobotocore-storagegateway,
|
||||
types-aiobotocore-sts,
|
||||
types-aiobotocore-support,
|
||||
types-aiobotocore-support-app,
|
||||
types-aiobotocore-support,
|
||||
types-aiobotocore-swf,
|
||||
types-aiobotocore-synthetics,
|
||||
types-aiobotocore-textract,
|
||||
@ -348,8 +347,8 @@
|
||||
types-aiobotocore-verifiedpermissions,
|
||||
types-aiobotocore-voice-id,
|
||||
types-aiobotocore-vpc-lattice,
|
||||
types-aiobotocore-waf,
|
||||
types-aiobotocore-waf-regional,
|
||||
types-aiobotocore-waf,
|
||||
types-aiobotocore-wafv2,
|
||||
types-aiobotocore-wellarchitected,
|
||||
types-aiobotocore-wisdom,
|
||||
@ -357,19 +356,21 @@
|
||||
types-aiobotocore-worklink,
|
||||
types-aiobotocore-workmail,
|
||||
types-aiobotocore-workmailmessageflow,
|
||||
types-aiobotocore-workspaces,
|
||||
types-aiobotocore-workspaces-web,
|
||||
types-aiobotocore-workspaces,
|
||||
types-aiobotocore-xray,
|
||||
typing-extensions,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-aiobotocore";
|
||||
version = "2.12.3";
|
||||
version = "2.13.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-h1dg3vgjPBYErgj8UKEcckCQuzGZr+VfhAuBS1biJ/M=";
|
||||
pname = "types_aiobotocore";
|
||||
inherit version;
|
||||
hash = "sha256-CDDY60I1eMMIChOCvbSQi7ZsKSo0mlOccNlvjypq3+U=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@ -1,15 +1,17 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-update nixpkgs-fmt
|
||||
#!nix-shell -i bash -p nix-update nixfmt curl jq
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
source_file=pkgs/development/python-modules/types-aiobotocore-packages/default.nix
|
||||
|
||||
version="2.12.3"
|
||||
|
||||
#nix-update python312Packages.types-aiobotocore --commit --build
|
||||
|
||||
packages=(
|
||||
types-aiobotocore-accessanalyzer
|
||||
types-aiobotocore-account
|
||||
types-aiobotocore-acm
|
||||
types-aiobotocore-acm-pca
|
||||
types-aiobotocore-alexaforbusiness
|
||||
types-aiobotocore-amp
|
||||
types-aiobotocore-amplify
|
||||
@ -138,6 +140,7 @@ packages=(
|
||||
types-aiobotocore-frauddetector
|
||||
types-aiobotocore-fsx
|
||||
types-aiobotocore-gamelift
|
||||
# types-aiobotocore-gamesparks Obsolete, will be removed soon
|
||||
types-aiobotocore-glacier
|
||||
types-aiobotocore-globalaccelerator
|
||||
types-aiobotocore-glue
|
||||
@ -159,7 +162,7 @@ packages=(
|
||||
types-aiobotocore-iot
|
||||
types-aiobotocore-iot-data
|
||||
types-aiobotocore-iot-jobs-data
|
||||
types-aiobotocore-iot-roborunner
|
||||
# types-aiobotocore-iot-roborunner Obsolete, will be removed soon
|
||||
types-aiobotocore-iot1click-devices
|
||||
types-aiobotocore-iot1click-projects
|
||||
types-aiobotocore-iotanalytics
|
||||
@ -207,6 +210,7 @@ packages=(
|
||||
types-aiobotocore-lookoutvision
|
||||
types-aiobotocore-m2
|
||||
types-aiobotocore-machinelearning
|
||||
# types-aiobotocore-macie Obsolete, will be removed soon
|
||||
types-aiobotocore-macie2
|
||||
types-aiobotocore-managedblockchain
|
||||
types-aiobotocore-managedblockchain-query
|
||||
@ -359,21 +363,34 @@ packages=(
|
||||
types-aiobotocore-xray
|
||||
)
|
||||
|
||||
for package in "${packages[@]}"; do
|
||||
echo "Updating ${package}"
|
||||
version=$(curl -s https://pypi.org/pypi/types-aiobotocore/json | jq -r '.info.version')
|
||||
echo "All types-aiobotocore-* packages will be updated to ${version}"
|
||||
|
||||
url="https://pypi.io/packages/source/t/${package}/${package}-${version}.tar.gz"
|
||||
for package in "${packages[@]}"; do
|
||||
echo "Updating ${package} ..."
|
||||
|
||||
url="https://pypi.io/packages/source/t/${package}/${package//-/_}-${version}.tar.gz"
|
||||
hash=$(nix-prefetch-url --type sha256 $url)
|
||||
sri_hash="$(nix hash to-sri --type sha256 $hash)"
|
||||
package_short="${package#types-aiobotocore-}"
|
||||
|
||||
awk -i inplace -v package="$package" -v new_version="$version" -v new_sha256="$sri_hash" '
|
||||
$1 == package {
|
||||
$5 = "\"" new_version "\"";
|
||||
$6 = "\"" new_sha256 "\";";
|
||||
}
|
||||
{print}
|
||||
' $source_file
|
||||
awk -i inplace -v pkg="$package" -v pkg_short="$package_short" -v ver="$version" -v hash="$sri_hash" '
|
||||
{
|
||||
# If the line contains the package name
|
||||
if ($0 ~ "^\\s*" pkg "\\s*=") {
|
||||
print $0
|
||||
inside_block = 1
|
||||
} else if (inside_block && $0 ~ "buildTypesAiobotocorePackage") {
|
||||
print " buildTypesAiobotocorePackage \"" "" pkg_short "\" \"" ver "\""
|
||||
} else if (inside_block && $0 ~ "sha256-") {
|
||||
print " \"" hash "\";"
|
||||
inside_block = 0
|
||||
} else {
|
||||
# Preserve blank lines to honor nixfmt
|
||||
print $0
|
||||
}
|
||||
}' ${source_file}
|
||||
|
||||
done
|
||||
|
||||
nixpkgs-fmt ${source_file}
|
||||
nixfmt ${source_file}
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
pyserial,
|
||||
pyserial-asyncio,
|
||||
pyserial-asyncio-fast,
|
||||
pytestCheckHook,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "velbus-aio";
|
||||
version = "2024.4.1";
|
||||
version = "2024.5.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "Cereal2nd";
|
||||
repo = "velbus-aio";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-rskWnH5zFvBuNL5eJ8O4D6htRP/XtFcq1xH8ZXzT1I4=";
|
||||
hash = "sha256-rOuw1Iw6mGoXNSqxOlBappARzSGIlii03Hd8/3jWiQg=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
||||
dependencies = [
|
||||
backoff
|
||||
pyserial
|
||||
pyserial-asyncio
|
||||
pyserial-asyncio-fast
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bazel-remote";
|
||||
version = "2.4.3";
|
||||
version = "2.4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buchgr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yvdsRc5KZAwzekktSu9tR9R2vvAMi+4JVkvy+ANFkQ8=";
|
||||
hash = "sha256-ncYE48DtH+mIM9ZR7IB38SzQFordhMGLp79poqDKWLE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-0rmqsUMwk5ytAZc94JzvZTuh0WAmQwBEWSE96yNALE0=";
|
||||
vendorHash = "sha256-7rxrnxZwxqRRQf1sWk8ILi2IV/pYmxBuwHl9khfCrKE=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bloop";
|
||||
version = "1.5.17";
|
||||
version = "1.5.18";
|
||||
|
||||
platform =
|
||||
if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux"
|
||||
@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
|
||||
bloop-binary = fetchurl rec {
|
||||
url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";
|
||||
sha256 =
|
||||
if stdenv.isLinux && stdenv.isx86_64 then "sha256-lP7j7pPG7wC36sG+d80F2E6ZHPZcOZN/M/j6CniaNGY="
|
||||
else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-awSBYSN4do4w9dAx6JwoexiptfC01vW1/o53Tp13xj0="
|
||||
if stdenv.isLinux && stdenv.isx86_64 then "sha256-gfmsroHyr/xrbQ72x6LNRvIYaxgUjBOxYsyKqc0c9Oo="
|
||||
else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-fluOkbpVy895YyWisfTaDP2yXbqF+gToc1KbVL8Mon8="
|
||||
else throw "unsupported platform";
|
||||
};
|
||||
|
||||
|
||||
@ -1,19 +1,37 @@
|
||||
{ lib
|
||||
, python3
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "cloudsmith-cli";
|
||||
version = "1.2.3";
|
||||
format = "wheel";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "cloudsmith_cli";
|
||||
inherit format version;
|
||||
hash = "sha256-MIoRLWk6G8uchQlGOYOsg3XliZ1wMrYSOhAEQrus+fQ=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "cloudsmith-io";
|
||||
repo = "cloudsmith-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-a4hLx+INdFq6Ux3XkI5GWgAiGLHCoDA+MP2FNY3E6WA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix compatibility with urllib3 2.0
|
||||
(fetchpatch {
|
||||
url = "https://github.com/cloudsmith-io/cloudsmith-cli/commit/1a8d2d91c01320537b26778003735d6b694141c2.patch";
|
||||
revert = true;
|
||||
includes = [
|
||||
"cloudsmith_cli/core/rest.py"
|
||||
];
|
||||
hash = "sha256-Rf3MMJuLr8fzkRqSftIJ1eUbgNdfrng2V609jYvpogc=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
pip
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
click
|
||||
click-configfile
|
||||
@ -30,13 +48,38 @@ python3.pkgs.buildPythonApplication rec {
|
||||
setuptools # needs pkg_resources
|
||||
];
|
||||
|
||||
# Wheels have no tests
|
||||
doCheck = false;
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
pytest-cov
|
||||
];
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
httpretty
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"cloudsmith_cli"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Permit urllib3 2.0
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail 'urllib3<2.0' 'urllib3'
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
# E _pytest.pathlib.ImportPathMismatchError: ('cloudsmith_cli.cli.tests.conftest', '/build/source/build/lib/cloudsmith_cli/cli/tests/conftest.py', PosixPath('/build/source/cloudsmith_cli/cli/tests/conftest.py'))
|
||||
# ___________ ERROR collecting cloudsmith_cli/core/tests/test_init.py ____________
|
||||
# import file mismatch:
|
||||
# imported module 'cloudsmith_cli.core.tests.test_init' has this __file__ attribute:
|
||||
# /build/source/build/lib/cloudsmith_cli/core/tests/test_init.py
|
||||
# which is not the same as the test file we want to collect:
|
||||
# /build/source/cloudsmith_cli/core/tests/test_init.py
|
||||
# HINT: remove __pycache__ / .pyc files and/or use a unique basename for your test file modules
|
||||
# https://github.com/NixOS/nixpkgs/issues/255262
|
||||
cd "$out"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://help.cloudsmith.io/docs/cli/";
|
||||
description = "Cloudsmith Command Line Interface";
|
||||
|
||||
@ -25,11 +25,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "liquibase";
|
||||
version = "4.27.0";
|
||||
version = "4.28.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz";
|
||||
hash = "sha256-UNieH8ECSb8ZjxqP8tgf0LaObKCAXbKKlNOGSXhNgvA=";
|
||||
hash = "sha256-l90H6soEBqCeGuGbQH7qQqfpRMf0Vxkiv/znG0O3XOg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sqlfluff";
|
||||
version = "3.0.6";
|
||||
version = "3.0.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sqlfluff";
|
||||
repo = "sqlfluff";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-VDLUCxDQKWQEeZQkeZP13KNm48GCQ3i4CLOAB/Kermo=";
|
||||
hash = "sha256-nq+c9NHtQ6pMouJEI7YUhgb9+ljlJECP8REL4Gm4B10=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
|
||||
@ -12,16 +12,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-cyclonedx";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CycloneDX";
|
||||
repo = "cyclonedx-rust-cargo";
|
||||
rev = "${pname}-${version}";
|
||||
hash = "sha256-791FZR9dmwVjORrkpm8el+2VMEEKJG+yKKqq+R1I9U4=";
|
||||
hash = "sha256-FQM2H/W9p0wmI1GGxnleDGU1y9hpz/Fnxi0KhF2RYeA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Cbi1cnUy6HKkgBXVjK0xItx2pzuYVob/Qz4o8eT6Fws=";
|
||||
cargoHash = "sha256-Y4OoQ3JG0syKBJ2KDJ5qzwu/gI+/unvrTafQ+UYiZYA=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-nextest";
|
||||
version = "0.9.70";
|
||||
version = "0.9.72";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextest-rs";
|
||||
repo = "nextest";
|
||||
rev = "cargo-nextest-${version}";
|
||||
hash = "sha256-YTeKcdUszI/0RCAq6Gcakl3hfUSUo3CfVCMod/IPYhw=";
|
||||
hash = "sha256-FQM1SVzGgmu6HHijP9kKEJPhhzSLs/jo36b4qnx0lb4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-FH9ODkK84bPPYyHP4kKcHKWpJ3FV1NC8S/NQFvV63Gw=";
|
||||
cargoHash = "sha256-2ttG9lPIkLRzDPcDNZjROOIIDhcEHfBvs/DTniZtQUY=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.SystemConfiguration
|
||||
|
||||
3710
pkgs/development/tools/rust/cargo-shuttle/Cargo.lock
generated
3710
pkgs/development/tools/rust/cargo-shuttle/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -10,13 +10,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-shuttle";
|
||||
version = "0.39.0";
|
||||
version = "0.45.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shuttle-hq";
|
||||
repo = "shuttle";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-U6C6pUl6Re3fYt5KlBItpErboYXctsotunsUpWmZxiY=";
|
||||
hash = "sha256-bjGyLfeo11Y55WqPwcUxnNkexozlxC61/rSa65gBGZ4=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
@ -24,7 +24,8 @@ rustPlatform.buildRustPackage rec {
|
||||
outputHashes = {
|
||||
"async-posthog-0.2.3" = "sha256-V0f9+UKZkqh80p7UjINEbAW9y8cKBmJTRjAJZV3no1M=";
|
||||
"hyper-reverse-proxy-0.5.2-dev" = "sha256-R1ZXGgWvwHWRHmKX823QLqM6ZJW+tzWUXigKkAyI5OE=";
|
||||
"tokiotest-httpserver-0.2.1" = "sha256-IPUaglIDwCUoczCCnX+R1IBqtc0s8b8toKEL8zN3/i8=";
|
||||
"permit-client-rs-2.0.0" = "sha256-MxsgqPbvWDYDOb3oGuD1I6d3cdcGAhfoWsI7cwfhrb4=";
|
||||
"permit-pdp-client-rs-0.2.0" = "sha256-F9wSvo3WzoRXjZb+We0Bvcwx3rRSG1QxXPsvrmtIN38=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -290,14 +290,14 @@
|
||||
"hash": "sha256-gpxS2xXWm5Dm0isI3qze3NE0I8kB5Nq2OJPoFLTnaFg="
|
||||
},
|
||||
"kwallet": {
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/frameworks/6.2/kwallet-6.2.0.tar.xz",
|
||||
"hash": "sha256-LlgRmmRCywDjAU8BY26HIzfP82LsHvEgyvK6AYE70sE="
|
||||
"version": "6.2.1",
|
||||
"url": "mirror://kde/stable/frameworks/6.2/kwallet-6.2.1.tar.xz",
|
||||
"hash": "sha256-UQxoGPso3ZHCqQxNBWgwEMrxs56a8bOoy7O0t8Yhk7w="
|
||||
},
|
||||
"kwidgetsaddons": {
|
||||
"version": "6.2.0",
|
||||
"url": "mirror://kde/stable/frameworks/6.2/kwidgetsaddons-6.2.0.tar.xz",
|
||||
"hash": "sha256-A87y9mrsa397InbEfnIL2rk5sFt3twNF5/B2096tghE="
|
||||
"version": "6.2.2",
|
||||
"url": "mirror://kde/stable/frameworks/6.2/kwidgetsaddons-6.2.2.tar.xz",
|
||||
"hash": "sha256-ORvVeEatFFHEoa39Cc+/qMI7FL8ra/cQhCNgtX2QBJ0="
|
||||
},
|
||||
"kwindowsystem": {
|
||||
"version": "6.2.0",
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
}:
|
||||
mkKdeDerivation rec {
|
||||
pname = "pulseaudio-qt";
|
||||
version = "1.4.0";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/pulseaudio-qt/pulseaudio-qt-${version}.tar.xz";
|
||||
hash = "sha256-2MpiTs8hMIVrhZz5NBF39v74xR8g93KNgH0JxxUO0GU=";
|
||||
hash = "sha256-zY9RyHAAc9D9kNV4QIOs63PnK6mnBOYF4KZ5CUJqhSA=";
|
||||
};
|
||||
|
||||
extraNativeBuildInputs = [pkg-config];
|
||||
|
||||
@ -301,10 +301,10 @@ let
|
||||
export HOME=${installkernel}
|
||||
'';
|
||||
|
||||
# Some image types need special install targets (e.g. uImage is installed with make uinstall)
|
||||
# Some image types need special install targets (e.g. uImage is installed with make uinstall on arm)
|
||||
installTargets = [
|
||||
(kernelConf.installTarget or (
|
||||
/**/ if kernelConf.target == "uImage" then "uinstall"
|
||||
/**/ if kernelConf.target == "uImage" && stdenv.hostPlatform.isArmv7 then "uinstall"
|
||||
else if kernelConf.target == "zImage" || kernelConf.target == "Image.gz" then "zinstall"
|
||||
else "install"))
|
||||
];
|
||||
|
||||
@ -112,7 +112,8 @@ wrapped-full = runCommand unwrapped.name
|
||||
# For http module, prefill module, trust anchor bootstrap.
|
||||
# It brings lots of deps; some are useful elsewhere (e.g. cqueues).
|
||||
http
|
||||
# psl isn't in nixpkgs yet, but policy.slice_randomize_psl() seems not important.
|
||||
# used by policy.slice_randomize_psl()
|
||||
psl
|
||||
];
|
||||
preferLocalBuild = true;
|
||||
allowSubstitutes = false;
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: rec {
|
||||
pname = "geoserver";
|
||||
version = "2.25.0";
|
||||
version = "2.25.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip";
|
||||
sha256 = "sha256-maWDRRIo5Mqjb6K1NWFplmQwvJ9fLXGnelZcslwp4Oo=";
|
||||
sha256 = "sha256-6F99zHTVRpC64rIPxdrH0ujgoNGQfT53RJ7Rg80ieeA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -11,19 +11,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.51.2";
|
||||
version = "0.51.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = "trivy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-GvX6oR0E+ynYm+7tfnzQUIScdKFWBQ81FNrMdPRuDcY=";
|
||||
hash = "sha256-f7qWD63dvKGnwGmeENPjtqvpRgq06MkLCQ0MVgsLJRw=";
|
||||
};
|
||||
|
||||
# Hash mismatch on across Linux and Darwin
|
||||
proxyVendor = true;
|
||||
|
||||
vendorHash = "sha256-MRdN45629s09Sfr63p6tDDBlEd7MYlDFnJoqcC+ixMU=";
|
||||
vendorHash = "sha256-U1HkIBHoZVrisTbVRqqP/B9idZ9G3KsCGLSVBbBV7lE=";
|
||||
|
||||
subPackages = [ "cmd/trivy" ];
|
||||
|
||||
|
||||
@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
];
|
||||
license = licenses.lgpl21Plus;
|
||||
maintainers = with maintainers; teams.geospatial.members ++ [ das-g ];
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.unix;
|
||||
mainProgram = "ili2c";
|
||||
};
|
||||
})
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nuclei";
|
||||
version = "3.2.7";
|
||||
version = "3.2.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "nuclei";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-sXrDmtuKfFeYAJnxIZGQiYiAjx40YQLfnMQ8YUCkZ7s=";
|
||||
hash = "sha256-U/L9V/1aGMjh30s/XDgV522RdLhS1yyUkHwkFDWjA4U=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-PXa8Fd7LE6uebpep1/HV2EuJdzj8cxeiZ4DYALIoh2A=";
|
||||
vendorHash = "sha256-DGNjDKjFZ0EJPOJxC7nTCCts8pisomfe4eru2WAHHow=";
|
||||
|
||||
subPackages = [ "cmd/nuclei/" ];
|
||||
|
||||
|
||||
1254
pkgs/tools/text/difftastic/Cargo.lock
generated
1254
pkgs/tools/text/difftastic/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -1,48 +1,28 @@
|
||||
{ lib
|
||||
, fetchpatch
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, testers
|
||||
, difftastic
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
let
|
||||
mimallocPatch = fetchpatch {
|
||||
name = "fix-build-on-older-macos-releases.patch";
|
||||
url = "https://github.com/microsoft/mimalloc/commit/40e0507a5959ee218f308d33aec212c3ebeef3bb.patch";
|
||||
sha256 = "sha256-DK0LqsVXXiEVQSQCxZ5jyZMg0UJJx9a/WxzCroYSHZc=";
|
||||
};
|
||||
in
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "difftastic";
|
||||
version = "0.56.1";
|
||||
version = "0.58.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wilfred";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-XQzsLowHtgXIKfUWx1Sj1D0F8scb7fNp33Cwfh5XvJI=";
|
||||
hash = "sha256-PTc8/NhWsLcKJj+9ebV/YaWEmyOWKJCYUjmVbr4z2SY=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"tree_magic_mini-3.0.2" = "sha256-iIX/DeDbquObDPOx/pctVFN4R8GSkD9bPNkNgOLdUJs=";
|
||||
};
|
||||
};
|
||||
cargoSha256 = "sha256-wtWJ32bBoCmx+eGkrOk8o0OQFMhGYZEBEDI1oHn3Zuw=";
|
||||
|
||||
# skip flaky tests
|
||||
checkFlags = [
|
||||
"--skip=options::tests::test_detect_display_width"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patch -d $cargoDepsCopy/libmimalloc-sys-0.1.24/c_src/mimalloc \
|
||||
-p1 < ${mimallocPatch}
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion { package = difftastic; };
|
||||
|
||||
meta = with lib; {
|
||||
@ -50,7 +30,7 @@ rustPlatform.buildRustPackage rec {
|
||||
homepage = "https://github.com/Wilfred/difftastic";
|
||||
changelog = "https://github.com/Wilfred/difftastic/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ethancedwards8 figsoda ];
|
||||
maintainers = with maintainers; [ ethancedwards8 figsoda matthiasbeyer ];
|
||||
mainProgram = "difft";
|
||||
};
|
||||
}
|
||||
|
||||
@ -16094,8 +16094,6 @@ with pkgs;
|
||||
jdk17 = openjdk17;
|
||||
jdk17_headless = openjdk17_headless;
|
||||
|
||||
openjdk16-bootstrap = javaPackages.compiler.openjdk16-bootstrap;
|
||||
|
||||
openjdk19 = javaPackages.compiler.openjdk19;
|
||||
openjdk19_headless = javaPackages.compiler.openjdk19.headless;
|
||||
jdk19 = openjdk19;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user