Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
4bff9bab6b
39 changed files with 1283 additions and 1109 deletions
|
|
@ -2,7 +2,7 @@ name: "Update terraform-providers"
|
|||
|
||||
on:
|
||||
schedule:
|
||||
- cron: "14 3 * * 1"
|
||||
- cron: "14 3 * * 0"
|
||||
workflow_dispatch:
|
||||
|
||||
permissions:
|
||||
|
|
|
|||
|
|
@ -156,6 +156,13 @@
|
|||
<link linkend="opt-services.expressvpn.enable">services.expressvpn</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://www.grafana.com/oss/tempo/">Grafana
|
||||
Tempo</link>, a distributed tracing store. Available as
|
||||
<link linkend="opt-services.tempo.enable">services.tempo</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-22.11-incompatibilities">
|
||||
|
|
|
|||
|
|
@ -64,6 +64,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- [expressvpn](https://www.expressvpn.com), the CLI client for ExpressVPN. Available as [services.expressvpn](#opt-services.expressvpn.enable).
|
||||
|
||||
- [Grafana Tempo](https://www.grafana.com/oss/tempo/), a distributed tracing store. Available as [services.tempo](#opt-services.tempo.enable).
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
## Backward Incompatibilities {#sec-release-22.11-incompatibilities}
|
||||
|
|
|
|||
|
|
@ -1033,6 +1033,7 @@
|
|||
./services/torrent/peerflix.nix
|
||||
./services/torrent/rtorrent.nix
|
||||
./services/torrent/transmission.nix
|
||||
./services/tracing/tempo.nix
|
||||
./services/ttys/getty.nix
|
||||
./services/ttys/gpm.nix
|
||||
./services/ttys/kmscon.nix
|
||||
|
|
|
|||
|
|
@ -298,6 +298,7 @@ in
|
|||
environment = env // {
|
||||
HYDRA_DBI = "${env.HYDRA_DBI};application_name=hydra-init";
|
||||
};
|
||||
path = [ pkgs.util-linux ];
|
||||
preStart = ''
|
||||
mkdir -p ${baseDir}
|
||||
chown hydra:hydra ${baseDir}
|
||||
|
|
@ -318,11 +319,11 @@ in
|
|||
|
||||
${optionalString haveLocalDB ''
|
||||
if ! [ -e ${baseDir}/.db-created ]; then
|
||||
${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createuser hydra
|
||||
${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -O hydra hydra
|
||||
runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createuser hydra
|
||||
runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -O hydra hydra
|
||||
touch ${baseDir}/.db-created
|
||||
fi
|
||||
echo "create extension if not exists pg_trgm" | ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} -- ${config.services.postgresql.package}/bin/psql hydra
|
||||
echo "create extension if not exists pg_trgm" | runuser -u ${config.services.postgresql.superUser} -- ${config.services.postgresql.package}/bin/psql hydra
|
||||
''}
|
||||
|
||||
if [ ! -e ${cfg.gcRootsDir} ]; then
|
||||
|
|
|
|||
68
nixos/modules/services/tracing/tempo.nix
Normal file
68
nixos/modules/services/tracing/tempo.nix
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
let
|
||||
inherit (lib) mkEnableOption mkIf mkOption types;
|
||||
|
||||
cfg = config.services.tempo;
|
||||
|
||||
settingsFormat = pkgs.formats.yaml {};
|
||||
in {
|
||||
options.services.tempo = {
|
||||
enable = mkEnableOption "Grafana Tempo";
|
||||
|
||||
settings = mkOption {
|
||||
type = settingsFormat.type;
|
||||
default = {};
|
||||
description = ''
|
||||
Specify the configuration for Tempo in Nix.
|
||||
|
||||
See https://grafana.com/docs/tempo/latest/configuration/ for available options.
|
||||
'';
|
||||
};
|
||||
|
||||
configFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
description = ''
|
||||
Specify a path to a configuration file that Tempo should use.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
# for tempo-cli and friends
|
||||
environment.systemPackages = [ pkgs.tempo ];
|
||||
|
||||
assertions = [{
|
||||
assertion = (
|
||||
(cfg.settings == {}) != (cfg.configFile == null)
|
||||
);
|
||||
message = ''
|
||||
Please specify a configuration for Tempo with either
|
||||
'services.tempo.settings' or
|
||||
'services.tempo.configFile'.
|
||||
'';
|
||||
}];
|
||||
|
||||
systemd.services.tempo = {
|
||||
description = "Grafana Tempo Service Daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = let
|
||||
conf = if cfg.configFile == null
|
||||
then settingsFormat.generate "config.yaml" cfg.settings
|
||||
else cfg.configFile;
|
||||
in
|
||||
{
|
||||
ExecStart = "${pkgs.tempo}/bin/tempo --config.file=${conf}";
|
||||
DynamicUser = true;
|
||||
Restart = "always";
|
||||
ProtectSystem = "full";
|
||||
DevicePolicy = "closed";
|
||||
NoNewPrivileges = true;
|
||||
WorkingDirectory = "/var/lib/tempo";
|
||||
StateDirectory = "tempo";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -12,6 +12,11 @@ import ./make-test-python.nix ({ pkgs, ... } : {
|
|||
imports = [ ../modules/profiles/hardened.nix ];
|
||||
environment.memoryAllocator.provider = "graphene-hardened";
|
||||
nix.settings.sandbox = false;
|
||||
nixpkgs.overlays = [
|
||||
(final: super: {
|
||||
dhcpcd = super.dhcpcd.override { enablePrivSep = false; };
|
||||
})
|
||||
];
|
||||
virtualisation.emptyDiskImages = [ 4096 ];
|
||||
boot.initrd.postDeviceCommands = ''
|
||||
${pkgs.dosfstools}/bin/mkfs.vfat -n EFISYS /dev/vdb
|
||||
|
|
@ -85,8 +90,8 @@ import ./make-test-python.nix ({ pkgs, ... } : {
|
|||
|
||||
# Test Nix dæmon usage
|
||||
with subtest("nix-daemon cannot be used by all users"):
|
||||
machine.fail("su -l nobody -s /bin/sh -c 'nix ping-store'")
|
||||
machine.succeed("su -l alice -c 'nix ping-store'")
|
||||
machine.fail("su -l nobody -s /bin/sh -c 'nix --extra-experimental-features nix-command ping-store'")
|
||||
machine.succeed("su -l alice -c 'nix --extra-experimental-features nix-command ping-store'")
|
||||
|
||||
|
||||
# Test kernel image protection
|
||||
|
|
|
|||
|
|
@ -45,9 +45,9 @@
|
|||
}
|
||||
},
|
||||
"ungoogled-chromium": {
|
||||
"version": "103.0.5060.53",
|
||||
"sha256": "00di0nw6h3kb0qp2wp3ny3zsar1ayn1lyx5zr28dl1h5cwaaxjqf",
|
||||
"sha256bin64": "19wxd4jl6fyjpcpy2331ckz6dgzrfj52wvdkp0kb18n0sym17fyn",
|
||||
"version": "103.0.5060.114",
|
||||
"sha256": "0rarcd2q1ggl10cw3vwjk7j9aka7i129a0qv8qr7751vy083as3p",
|
||||
"sha256bin64": "1qxbnnnq0miizazprwynvxxvgaaw9dd9y7bssybvmga3g2c00fk9",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-05-11",
|
||||
|
|
@ -56,8 +56,8 @@
|
|||
"sha256": "03dqfrdpf5xxl64dby3qmbwpzdq2gsa8g7xl438py3a629rgxg63"
|
||||
},
|
||||
"ungoogled-patches": {
|
||||
"rev": "103.0.5060.53-1",
|
||||
"sha256": "1g5ciwzrhg9g13gvhrwqf19djk9jhj1d6nx2f6a8d5ch1mhi2z8s"
|
||||
"rev": "103.0.5060.114-1",
|
||||
"sha256": "11i7d480q21vcd9p14rc7rb408xwlg2nkj88dq0sfj2rz60lzy0a"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@ let
|
|||
special-providers =
|
||||
{
|
||||
brightbox = automated-providers.brightbox.override { mkProviderGoModule = buildGo118Module; };
|
||||
hcloud = automated-providers.hcloud.override { mkProviderGoModule = buildGo118Module; };
|
||||
# mkisofs needed to create ISOs holding cloud-init data,
|
||||
# and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
|
||||
libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; });
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@
|
|||
"owner": "vancluever",
|
||||
"provider-source-address": "registry.terraform.io/vancluever/acme",
|
||||
"repo": "terraform-provider-acme",
|
||||
"rev": "v2.9.0",
|
||||
"sha256": "sha256-ptWoKXuV6jcDu2v1oOcW11VjXOgf/jUG1kpFGcNLHtw=",
|
||||
"vendorSha256": "sha256-sU8g+mjn14H9f3LwomcNJ7ho8LpYjCEevv4++6KPzow=",
|
||||
"version": "2.9.0"
|
||||
"rev": "v2.10.0",
|
||||
"sha256": "sha256-nafJJ2Gr2jA09mjh8hozdDgl67h+10D35KtqjTUPgBE=",
|
||||
"vendorSha256": "sha256-lNI0u8DCBl4mGVecRfAqieCooyJlqK+Z4eixPFFyBuU=",
|
||||
"version": "2.10.0"
|
||||
},
|
||||
"age": {
|
||||
"owner": "clementblaise",
|
||||
|
|
@ -76,10 +76,10 @@
|
|||
"owner": "auth0",
|
||||
"provider-source-address": "registry.terraform.io/auth0/auth0",
|
||||
"repo": "terraform-provider-auth0",
|
||||
"rev": "v0.31.0",
|
||||
"sha256": "sha256-Huv+eL/5RiI2A1X8RLU9LbIWMjb5yuuslV4CaP/kFiQ=",
|
||||
"vendorSha256": "sha256-kTR8kSirqhY1GdKLzeFIPt6QNJ4wq2ESUT5ShQUhvRI=",
|
||||
"version": "0.31.0"
|
||||
"rev": "v0.32.0",
|
||||
"sha256": "sha256-zy5brS1KsQM8JZahcmIsBdUS389OoQ53d4OGHpF6zwo=",
|
||||
"vendorSha256": "sha256-xQEgoYPXt3ivgOMk+yQMS0SlPhDJ5qCVsI12LMU6ZcI=",
|
||||
"version": "0.32.0"
|
||||
},
|
||||
"avi": {
|
||||
"owner": "vmware",
|
||||
|
|
@ -103,28 +103,28 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/aws",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v4.21.0",
|
||||
"sha256": "sha256-XqUJGcKQh2QfKjiIcJ02ZUZ+pKUZAaYErIdVRCKLAKM=",
|
||||
"vendorSha256": "sha256-KimkmnSGgynmxS3VcmNP4d+B6j1xy4+OZXkoG2iIS/w=",
|
||||
"version": "4.21.0"
|
||||
"rev": "v4.22.0",
|
||||
"sha256": "sha256-F+YzXIKkF/eGUY3l8MjeP+8GqS37e1N9b+fmNCkdeMM=",
|
||||
"vendorSha256": "sha256-kz0bPsfLCekRj/ZGCBT+eFRMRkV+Dc69RkyBbFaztd0=",
|
||||
"version": "4.22.0"
|
||||
},
|
||||
"azuread": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azuread",
|
||||
"repo": "terraform-provider-azuread",
|
||||
"rev": "v2.25.0",
|
||||
"sha256": "sha256-+9h9rdbnqIul+V/fhrsNEq/cX24i05i2LBqIk6g9mRE=",
|
||||
"rev": "v2.26.0",
|
||||
"sha256": "sha256-M61kkeBRLb0fDPH1FZH5koFRZqCVfTlEXJ8N0Amc8ac=",
|
||||
"vendorSha256": null,
|
||||
"version": "2.25.0"
|
||||
"version": "2.26.0"
|
||||
},
|
||||
"azurerm": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v3.12.0",
|
||||
"sha256": "sha256-P/KFdDGDUJofsOEnPUJ3rAdZHoJw8YF3ReQFdSsMUj4=",
|
||||
"rev": "v3.13.0",
|
||||
"sha256": "sha256-ptEsCgJsB++RYtc+SekUPoV9ONRfGCCoPGM6alwQ/wY=",
|
||||
"vendorSha256": null,
|
||||
"version": "3.12.0"
|
||||
"version": "3.13.0"
|
||||
},
|
||||
"azurestack": {
|
||||
"owner": "hashicorp",
|
||||
|
|
@ -140,10 +140,10 @@
|
|||
"owner": "baidubce",
|
||||
"provider-source-address": "registry.terraform.io/baidubce/baiducloud",
|
||||
"repo": "terraform-provider-baiducloud",
|
||||
"rev": "v1.12.9",
|
||||
"sha256": "sha256-RKkTKRipmTqAfCGWzibrIsTrckwvEKCQmPhNjCXmFR4=",
|
||||
"vendorSha256": "sha256-pA2dAC8AasWLTlC+SddS4kWT16FqcyBrtdVMV9k/FtE=",
|
||||
"version": "1.12.9"
|
||||
"rev": "v1.13.0",
|
||||
"sha256": "sha256-C/dvFwtqOJAXgk5CNr06cehOiVZ2c4Zcqcb+g/k0iPY=",
|
||||
"vendorSha256": "sha256-GZZKJkK9ug6iUhaAXxR2nKfQQ96MHiYv/hsaB5O9Oig=",
|
||||
"version": "1.13.0"
|
||||
},
|
||||
"bigip": {
|
||||
"owner": "F5Networks",
|
||||
|
|
@ -185,10 +185,10 @@
|
|||
"owner": "checkly",
|
||||
"provider-source-address": "registry.terraform.io/checkly/checkly",
|
||||
"repo": "terraform-provider-checkly",
|
||||
"rev": "v1.6.0",
|
||||
"sha256": "sha256-zmA6fVpXW4HOJaZzmv5K6cbmO2vM3yGWsa9TSYY4obY=",
|
||||
"rev": "v1.6.1",
|
||||
"sha256": "sha256-vzYOieW4KdYcaPSSa6j57GsPAAIdwmWu5hIBCCmnstM=",
|
||||
"vendorSha256": "sha256-VnYRDBneQ+bUzISJM9DJdBEBmjA1WOXPo+kaYBW4w4U=",
|
||||
"version": "1.6.0"
|
||||
"version": "1.6.1"
|
||||
},
|
||||
"checkpoint": {
|
||||
"deleteVendor": true,
|
||||
|
|
@ -367,10 +367,10 @@
|
|||
"owner": "equinix",
|
||||
"provider-source-address": "registry.terraform.io/equinix/equinix",
|
||||
"repo": "terraform-provider-equinix",
|
||||
"rev": "v1.6.0",
|
||||
"sha256": "sha256-wvx0dZS38i5B7Jpaaa9iuv93PyzNAaKCxxU8OxklOhE=",
|
||||
"vendorSha256": "sha256-tWMmwCFWwRvsFC/Bu4Eax+uopxN3ijRP9qr35bcg6qQ=",
|
||||
"version": "1.6.0"
|
||||
"rev": "v1.6.1",
|
||||
"sha256": "sha256-QktIBtSz7UZoU6+z/sjpU4bZhc+Cw1BptO6hW19uJoU=",
|
||||
"vendorSha256": "sha256-G1lDfygJnuJaQ4ms2/R6oynZCJAtIwx7xoU6Bec3CfQ=",
|
||||
"version": "1.6.1"
|
||||
},
|
||||
"exoscale": {
|
||||
"owner": "exoscale",
|
||||
|
|
@ -394,10 +394,10 @@
|
|||
"owner": "fastly",
|
||||
"provider-source-address": "registry.terraform.io/fastly/fastly",
|
||||
"repo": "terraform-provider-fastly",
|
||||
"rev": "v2.1.0",
|
||||
"sha256": "sha256-d6hi8b8KdCBHvb3pRR5UB+jC81aVYnj1RgzOI6wO6jA=",
|
||||
"rev": "v2.2.0",
|
||||
"sha256": "sha256-x5Rl4JW59kuAoX0pSpCpto3dcvyEhvZlocg8fv2R6Jw=",
|
||||
"vendorSha256": null,
|
||||
"version": "2.1.0"
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"flexibleengine": {
|
||||
"owner": "FlexibleEngineCloud",
|
||||
|
|
@ -439,10 +439,10 @@
|
|||
"owner": "gitlabhq",
|
||||
"provider-source-address": "registry.terraform.io/gitlabhq/gitlab",
|
||||
"repo": "terraform-provider-gitlab",
|
||||
"rev": "v3.15.1",
|
||||
"sha256": "sha256-10dxre+HwpXZ//+PfQvAa3bipHCaJ4+dgaMXiTkSS04=",
|
||||
"vendorSha256": "sha256-uc29HXlsMRn/MuXlOfYIr49NtfN1goL4y22EX3farBU=",
|
||||
"version": "3.15.1"
|
||||
"rev": "v3.16.0",
|
||||
"sha256": "sha256-RG1d0B6SdT3c9zIHtOZUZBHOdi7azc9uJe0aDdY5c/U=",
|
||||
"vendorSha256": "sha256-5OXllLq5VjFpay2vVEXczqvSmgLeAQ66fXqYf+eDJOI=",
|
||||
"version": "3.16.0"
|
||||
},
|
||||
"google": {
|
||||
"owner": "hashicorp",
|
||||
|
|
@ -495,10 +495,10 @@
|
|||
"owner": "hetznercloud",
|
||||
"provider-source-address": "registry.terraform.io/hetznercloud/hcloud",
|
||||
"repo": "terraform-provider-hcloud",
|
||||
"rev": "v1.34.1",
|
||||
"sha256": "sha256-+Duv9D4yG2bS9xGJIfA86nSpPk6TFuGjk8CZp5dUigU=",
|
||||
"vendorSha256": "sha256-fFQte/gp/PY/cdTS6ehoqgNYvCqRj88cOLGzf5bxn+U=",
|
||||
"version": "1.34.1"
|
||||
"rev": "v1.34.3",
|
||||
"sha256": "sha256-3p7pdpBxrbKZx6di39GQb2DOS2ZtN4uVmIb2OU0Zs+c=",
|
||||
"vendorSha256": "sha256-3JFdsuJlDW6xTgSgn7hkIWfH9Iqr35t8op4yVXYIFpg=",
|
||||
"version": "1.34.3"
|
||||
},
|
||||
"helm": {
|
||||
"owner": "hashicorp",
|
||||
|
|
@ -648,10 +648,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/kubernetes",
|
||||
"repo": "terraform-provider-kubernetes",
|
||||
"rev": "v2.12.0",
|
||||
"sha256": "sha256-MmXJutHh1M/KLJvF8h8hFrihiTOUDxwuXPtxeUvUgAw=",
|
||||
"rev": "v2.12.1",
|
||||
"sha256": "sha256-wswBD4XqtHZsg8vhxIqtjZkXNhFLu/nHUCJDW/24dbQ=",
|
||||
"vendorSha256": null,
|
||||
"version": "2.12.0"
|
||||
"version": "2.12.1"
|
||||
},
|
||||
"launchdarkly": {
|
||||
"owner": "launchdarkly",
|
||||
|
|
@ -756,10 +756,10 @@
|
|||
"owner": "mongodb",
|
||||
"provider-source-address": "registry.terraform.io/mongodb/mongodbatlas",
|
||||
"repo": "terraform-provider-mongodbatlas",
|
||||
"rev": "v1.3.1",
|
||||
"sha256": "sha256-X2Utt+MUboLc0/nAXB78ko3w2ieTIQaVsDK6MhbUKSQ=",
|
||||
"vendorSha256": "sha256-yZ/TgAVlBxHhrrZU6SH1KXNoZj8oWRqx3BjVHkTtI+Q=",
|
||||
"version": "1.3.1"
|
||||
"rev": "v1.4.2",
|
||||
"sha256": "sha256-bu/DpqeOIIgtUauBVzbKW+DHJUoD2oVhIhmk+M7fcBg=",
|
||||
"vendorSha256": "sha256-yomqc0uxB02zi/IfZKIOBq3mcs0GkHbRpaQos0jcELw=",
|
||||
"version": "1.4.2"
|
||||
},
|
||||
"namecheap": {
|
||||
"owner": "namecheap",
|
||||
|
|
@ -838,28 +838,28 @@
|
|||
"owner": "nutanix",
|
||||
"provider-source-address": "registry.terraform.io/nutanix/nutanix",
|
||||
"repo": "terraform-provider-nutanix",
|
||||
"rev": "v1.5.0",
|
||||
"sha256": "sha256-H8wLMLBB4pSbiilmP9C0WPn62fCYHgPhy8OlvtrUYro=",
|
||||
"rev": "v1.6.1",
|
||||
"sha256": "sha256-eqWx48ARoL2elnaqTgp/L6a0K8TFSvIFaNH72gdbrZA=",
|
||||
"vendorSha256": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=",
|
||||
"version": "1.5.0"
|
||||
"version": "1.6.1"
|
||||
},
|
||||
"oci": {
|
||||
"owner": "oracle",
|
||||
"provider-source-address": "registry.terraform.io/oracle/oci",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.82.0",
|
||||
"sha256": "sha256-S/UraZfbirBkUjLQQO+6imvNVGRu+lzENIWKlobHdGw=",
|
||||
"rev": "v4.83.0",
|
||||
"sha256": "sha256-WuvWE3k2j1whH7UaEx7fa4lZF+GZUKp7T1bVpatxF1w=",
|
||||
"vendorSha256": null,
|
||||
"version": "4.82.0"
|
||||
"version": "4.83.0"
|
||||
},
|
||||
"okta": {
|
||||
"owner": "okta",
|
||||
"provider-source-address": "registry.terraform.io/okta/okta",
|
||||
"repo": "terraform-provider-okta",
|
||||
"rev": "v3.30.0",
|
||||
"sha256": "sha256-iE+lLWnVwb5jUt4EsNc3jZqQ4HEtjE8GB2RniKGegy0=",
|
||||
"vendorSha256": "sha256-9Qz3uGI2x40XL8JAB9l3Lsw6OQ47sHEBFVJNgsbVt/c=",
|
||||
"version": "3.30.0"
|
||||
"rev": "v3.31.0",
|
||||
"sha256": "sha256-IUCiImmT4LG58r342mvWVMxBjVO9zGX8BVHe5G1GiMg=",
|
||||
"vendorSha256": "sha256-BnxtHEd1C0DOUPVggPCXSBtQ36gcNwL7Hl0Pl1B5e4U=",
|
||||
"version": "3.31.0"
|
||||
},
|
||||
"oktaasa": {
|
||||
"owner": "oktadeveloper",
|
||||
|
|
@ -874,10 +874,10 @@
|
|||
"owner": "OpenNebula",
|
||||
"provider-source-address": "registry.terraform.io/OpenNebula/opennebula",
|
||||
"repo": "terraform-provider-opennebula",
|
||||
"rev": "v0.5.0",
|
||||
"sha256": "sha256-MJQQyU+NmLbIWSQY1BqWKY7q9RrF+HAFIr8AFNg2dWc=",
|
||||
"rev": "v0.5.1",
|
||||
"sha256": "sha256-lrdL0aWgrODvgI0gUW1tmHEHldeD5jJzOCD2BMvGPM8=",
|
||||
"vendorSha256": "sha256-NOIXn4RWMUz0invWRqAHxVWez7MD0DyWccwcKYz8jTY=",
|
||||
"version": "0.5.0"
|
||||
"version": "0.5.1"
|
||||
},
|
||||
"openstack": {
|
||||
"owner": "terraform-provider-openstack",
|
||||
|
|
@ -892,10 +892,10 @@
|
|||
"owner": "opentelekomcloud",
|
||||
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
|
||||
"repo": "terraform-provider-opentelekomcloud",
|
||||
"rev": "v1.29.8",
|
||||
"sha256": "sha256-oIJ+ygunt8ilW3IfnR0sAvwLOxknt7BN5Ks63tJMbQ4=",
|
||||
"vendorSha256": "sha256-1z5SaH6AoYkrMZVnNurZLmtvVRDNwTBwmQMX0KngKpA=",
|
||||
"version": "1.29.8"
|
||||
"rev": "v1.29.9",
|
||||
"sha256": "sha256-jVDpiNGGw93XLAMYaDrO3mEcok3bnzC4y9tz6C27lhM=",
|
||||
"vendorSha256": "sha256-ImrWG+IPNkFr9lTGdiYaBU2OnHrKXIiNIDGSy4Br+Aw=",
|
||||
"version": "1.29.9"
|
||||
},
|
||||
"opsgenie": {
|
||||
"owner": "opsgenie",
|
||||
|
|
@ -1090,10 +1090,10 @@
|
|||
"owner": "spotinst",
|
||||
"provider-source-address": "registry.terraform.io/spotinst/spotinst",
|
||||
"repo": "terraform-provider-spotinst",
|
||||
"rev": "v1.78.0",
|
||||
"sha256": "sha256-Irbjqp4Yoa8+nNxCLdXvFTCQZhRWUcXK9WfqayIIiPU=",
|
||||
"vendorSha256": "sha256-uXRatEtZMP6V1yJQHSjbWNXKf/DGLTvkCZM7LhbbElU=",
|
||||
"version": "1.78.0"
|
||||
"rev": "v1.79.0",
|
||||
"sha256": "sha256-UOqXUUqbZ7qVlqFI1YABahfW4+ghyMS7n2Yc9Lfd6cc=",
|
||||
"vendorSha256": "sha256-AJfQhIsh7a1WVQ//oT6P12H/sqmGtKD7jwW3JthvVNQ=",
|
||||
"version": "1.79.0"
|
||||
},
|
||||
"stackpath": {
|
||||
"owner": "stackpath",
|
||||
|
|
@ -1126,19 +1126,19 @@
|
|||
"owner": "tencentcloudstack",
|
||||
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.75.5",
|
||||
"sha256": "sha256-tDdNkDtUuwtOrbvdR/NPUXpsyrRsES4MtreOKD7/PYc=",
|
||||
"rev": "v1.75.7",
|
||||
"sha256": "sha256-FSdBAaG1xrr0Jnl7wPsaooraerlqKti5uskZyixkbSY=",
|
||||
"vendorSha256": null,
|
||||
"version": "1.75.5"
|
||||
"version": "1.75.7"
|
||||
},
|
||||
"tfe": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/tfe",
|
||||
"repo": "terraform-provider-tfe",
|
||||
"rev": "v0.32.1",
|
||||
"sha256": "sha256-7a2uc0f7+OFrbCvHJkKyeX7hXR63PpzpfNhUCWHqOxU=",
|
||||
"vendorSha256": "sha256-V1nXhDwDMWJsbhPu9otXrOmtzVv0rjvL7CH/13AR5iw=",
|
||||
"version": "0.32.1"
|
||||
"rev": "v0.33.0",
|
||||
"sha256": "sha256-OmQQau3nr84sSIiCGeoi2vDvvoK2L7Zve2tzuul0Wyg=",
|
||||
"vendorSha256": "sha256-IeteO1xIpEwdfHGkz9SKy5EZJCHsHho2L02O6yWzoTk=",
|
||||
"version": "0.33.0"
|
||||
},
|
||||
"thunder": {
|
||||
"owner": "a10networks",
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ gtk3 ];
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "Gtk Analog Wave viewer";
|
||||
longDescription = ''
|
||||
Gaw is a software tool for displaying analog waveforms from
|
||||
|
|
@ -30,6 +29,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "http://gaw.tuxfamily.org";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ fbeffa ];
|
||||
platforms = platforms.all;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
|
|||
configureFlags = [ "--disable-rpath" ];
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "GiNaC is Not a CAS";
|
||||
homepage = "https://www.ginac.de/";
|
||||
maintainers = with maintainers; [ lovek323 ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
|
||||
|
||||
let
|
||||
nodeEnv = import ../../../node-packages/node-env.nix {
|
||||
|
|
|
|||
1890
pkgs/development/compilers/elm/packages/node-packages.nix
generated
1890
pkgs/development/compilers/elm/packages/node-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -13,13 +13,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gdcm";
|
||||
version = "3.0.12";
|
||||
version = "3.0.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "malaterre";
|
||||
repo = "GDCM";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ChHsbnX+128ZOugL6Nc8EqfaDMaNMNDmKTN55pyyem8=";
|
||||
sha256 = "sha256-gXREvxgGpIBo5oVxxal+Xdwk0WFZufuJKGzABzhB7zM=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
|
|
|||
|
|
@ -9,6 +9,13 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0ya4q001g111d3pqlzrf3yaifadl0ccirx5dndz1pih7x3qp41mp";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchurl {
|
||||
url = "https://build.opensuse.org/public/source/openSUSE:Factory/libhugetlbfs/glibc-2.34-fix.patch?rev=50";
|
||||
sha256 = "sha256-eRQa6M0ZdHMtwA5nnzDTWYv/x4AnRZhj+MpDiwyCvVM=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "bin" "dev" "man" "doc" "lib" "out" ];
|
||||
|
||||
postConfigure = ''
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@ let
|
|||
then "DYLD_LIBRARY_PATH"
|
||||
else "LD_LIBRARY_PATH";
|
||||
|
||||
generic = { version, sha256, patches ? [] }: stdenv.mkDerivation rec {
|
||||
generic = { version, hash, patches ? [] }: stdenv.mkDerivation rec {
|
||||
pname = "libressl";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://openbsd/LibreSSL/${pname}-${version}.tar.gz";
|
||||
inherit sha256;
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
@ -86,11 +86,11 @@ let
|
|||
in {
|
||||
libressl_3_4 = generic {
|
||||
version = "3.4.3";
|
||||
sha256 = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0=";
|
||||
hash = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0=";
|
||||
};
|
||||
|
||||
libressl_3_5 = generic {
|
||||
version = "3.5.2";
|
||||
sha256 = "sha256-Vv6rjiHD+mVJ+LfXURZYuOmFGBYoOKeVMUcyZUrfPl8=";
|
||||
version = "3.5.3";
|
||||
hash = "sha256-OrXl6u9pziDGsXDuZNeFtCI19I8uYrCV/KXXtmcriyg=";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,51 @@
|
|||
{ lib
|
||||
, aio-geojson-client
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, asynctest
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pytz
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aio-geojson-usgs-earthquakes";
|
||||
version = "0.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "exxamalte";
|
||||
repo = "python-aio-geojson-usgs-earthquakes";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Hb0/BdK/jjxlPl9WJJpFdOCzZpZDCguXoGreGIyN8oo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aio-geojson-client
|
||||
aiohttp
|
||||
pytz
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aresponses
|
||||
asynctest
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aio_geojson_usgs_earthquakes"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for accessing the U.S. Geological Survey Earthquake Hazards Program feeds";
|
||||
homepage = "https://github.com/exxamalte/python-aio-geojson-usgs-earthquakes";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -67,7 +67,5 @@ buildPythonPackage rec {
|
|||
description = "A tool for searching a given binary image for embedded files";
|
||||
maintainers = [ maintainers.koral ];
|
||||
license = licenses.mit;
|
||||
# Signature Exception: [Errno 1] Operation not permitted: '/testing/tests/input-vectors/_dirtraversal.tar.extracted'
|
||||
broken = (stdenv.isDarwin && stdenv.isx86_64); # broken on hydra since 2021-11-02
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "levenshtein";
|
||||
version = "0.18.2";
|
||||
version = "0.19.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
|
@ -20,8 +20,8 @@ buildPythonPackage rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "maxbachmann";
|
||||
repo = "Levenshtein";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-FmEB0i235rzK6S1MV189iDNB+CYpcBvcdVE+kdclwmE=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2/m9vn3yHDt5sjE/hY3s3gBCkZnehbk25+VReLo2jn8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,18 +3,19 @@
|
|||
, click
|
||||
, pyyaml
|
||||
, buildPythonPackage
|
||||
, isPy3k
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec{
|
||||
version = "2.1.3";
|
||||
pname = "panflute";
|
||||
version = "2.1.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = !isPy3k;
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "y5QkT+dmiTuy8XLruCfsPe12G4//qE5MhLZ4ufip/5U=";
|
||||
hash = "sha256-7xHcWVoZh51PlonvmoOCBKJGNMpjT7z8jkoO1B65EqE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -22,8 +23,12 @@ buildPythonPackage rec{
|
|||
pyyaml
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"panflute"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Pythonic alternative to John MacFarlane's pandocfilters, with extra helper functions";
|
||||
description = "Pythonic alternative to John MacFarlane's pandocfilters, with extra helper functions";
|
||||
homepage = "http://scorreia.com/software/panflute";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ synthetica ];
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymazda";
|
||||
version = "0.3.4";
|
||||
version = "0.3.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Xq+DXrZp1NrsCgUnjaMWUoM+SDfnXK+YDX2Gcr7FKvQ=";
|
||||
sha256 = "sha256-zzyaG1i5eEnQWBiW8Wh/cIncJsU/XdEC61JmkB6Z6mY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "shodan";
|
||||
version = "1.27.0";
|
||||
version = "1.28.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-XkrnBuALYxZ6n/f34PM0QvxqxvC08mKci9Mswwf41VA=";
|
||||
sha256 = "sha256-GL0q6BEUtwg24OMxUicyXhQ5gnUiOZiowjWwmUMvSws=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -31,14 +31,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sunpy";
|
||||
version = "4.0.2";
|
||||
version = "4.0.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ZswUFdMRqEiMpTXAuVtEnsHJ4dgwcx2f4k1DwLl8pz8=";
|
||||
hash = "sha256-Ett9CBubdyKJh9MkwUhQ1kQH6/zBb6Ma0CdEH5Eqcw8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
, pythonOlder
|
||||
, requests
|
||||
, requests-oauthlib
|
||||
, six
|
||||
, vcrpy
|
||||
}:
|
||||
|
||||
|
|
@ -31,6 +32,7 @@ buildPythonPackage rec {
|
|||
oauthlib
|
||||
requests
|
||||
requests-oauthlib
|
||||
six
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -11,9 +11,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
nativeBuildInputs = [ perl ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-std=c++11"
|
||||
];
|
||||
CXXFLAGS = "-std=c++11";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
@ -22,7 +20,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "The C preprocessor chainsaw";
|
||||
longDescription = ''
|
||||
A software engineering tool for analysing preprocessor-based
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{ lib, appleDerivation, xcbuildHook
|
||||
, libressl, Librpcsvc, xnu, libpcap, developer_cmds }:
|
||||
, libressl_3_4, Librpcsvc, xnu, libpcap, developer_cmds }:
|
||||
|
||||
appleDerivation {
|
||||
nativeBuildInputs = [ xcbuildHook ];
|
||||
buildInputs = [ libressl xnu Librpcsvc libpcap developer_cmds ];
|
||||
buildInputs = [ libressl_3_4 xnu Librpcsvc libpcap developer_cmds ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/";
|
||||
|
||||
|
|
|
|||
|
|
@ -12,10 +12,9 @@ in runCommandCC "sdnotify-wrapper" {
|
|||
outputs = [ "bin" "doc" "out" ];
|
||||
|
||||
meta = {
|
||||
broken = stdenv.isDarwin;
|
||||
homepage = "https://skarnet.org/software/misc/sdnotify-wrapper.c";
|
||||
description = "Use systemd sd_notify without having to link against libsystemd";
|
||||
platforms = lib.platforms.all;
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.isc;
|
||||
maintainers = with lib.maintainers; [ Profpatsch ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2917,7 +2917,8 @@
|
|||
"uscis" = ps: with ps; [
|
||||
]; # missing inputs: uscisstatus
|
||||
"usgs_earthquakes_feed" = ps: with ps; [
|
||||
]; # missing inputs: aio_geojson_usgs_earthquakes
|
||||
aio-geojson-usgs-earthquakes
|
||||
];
|
||||
"utility_meter" = ps: with ps; [
|
||||
croniter
|
||||
];
|
||||
|
|
@ -3803,6 +3804,7 @@
|
|||
"uptime"
|
||||
"uptimerobot"
|
||||
"usb"
|
||||
"usgs_earthquakes_feed"
|
||||
"utility_meter"
|
||||
"uvc"
|
||||
"vacuum"
|
||||
|
|
|
|||
|
|
@ -1,18 +1,28 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
version = "1.1.0";
|
||||
pname = "tempo";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "tempo";
|
||||
sha256 = "sha256-qKsgcc62HTwl7Usmp8zk4vKDo4XEJnwL+A3hoLhgBkk=";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-kxR+xwhthsK3gThs0jPJfWlsRG35kCuWvKH3Wr7ENTs=";
|
||||
};
|
||||
|
||||
vendorSha256 = null;
|
||||
|
||||
subPackages = [
|
||||
"cmd/tempo-cli"
|
||||
"cmd/tempo-query"
|
||||
# FIXME: build is broken upstream, enable for next release
|
||||
# "cmd/tempo-serverless"
|
||||
"cmd/tempo-vulture"
|
||||
"cmd/tempo"
|
||||
];
|
||||
|
||||
# tests use docker
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
, autoPatchelfHook
|
||||
, bash
|
||||
, coreutils
|
||||
, copyDesktopItems
|
||||
, cryptsetup
|
||||
, dosfstools
|
||||
, e2fsprogs
|
||||
|
|
@ -15,6 +16,7 @@
|
|||
, gtk3
|
||||
, hexdump
|
||||
, makeWrapper
|
||||
, makeDesktopItem
|
||||
, ntfs3g
|
||||
, parted
|
||||
, procps
|
||||
|
|
@ -47,11 +49,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "ventoy-bin";
|
||||
version = "1.0.77";
|
||||
version = "1.0.78";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz";
|
||||
hash = "sha256-DmDWt06gjrAEZ9Qvb7qbKbfJr/u84qmQ44kfDA3HDp0=";
|
||||
hash = "sha256-vlSnnExtuh85yGFYUBeE7BRsVwl+kn7nSaIx2d3WICk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -66,6 +68,9 @@ in stdenv.mkDerivation rec {
|
|||
|
||||
patchFlags = [ "-p0" ];
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
postPatch = ''
|
||||
# Fix permissions.
|
||||
find -type f -name \*.sh -exec chmod a+x '{}' \;
|
||||
|
|
@ -79,6 +84,7 @@ in stdenv.mkDerivation rec {
|
|||
autoPatchelfHook
|
||||
makeWrapper
|
||||
]
|
||||
++ lib.optional (withQt5 || withGtk3) copyDesktopItems
|
||||
++ lib.optional withQt5 qt5.wrapQtAppsHook;
|
||||
|
||||
buildInputs = [
|
||||
|
|
@ -103,6 +109,18 @@ in stdenv.mkDerivation rec {
|
|||
++ lib.optional withXfs xfsprogs
|
||||
++ lib.optional withQt5 qt5.qtbase;
|
||||
|
||||
desktopItems = [
|
||||
(makeDesktopItem {
|
||||
name = "Ventoy";
|
||||
desktopName = "Ventoy";
|
||||
comment = "Tool to create bootable USB drive for ISO/WIM/IMG/VHD(x)/EFI files";
|
||||
icon = "VentoyLogo";
|
||||
exec = "ventoy-gui";
|
||||
terminal = false;
|
||||
categories = [ "Utility" ];
|
||||
startupNotify = true;
|
||||
})];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
|
|
@ -146,7 +164,7 @@ in stdenv.mkDerivation rec {
|
|||
done
|
||||
''
|
||||
# VentoGUI uses the `ventoy_gui_type` file to determine the type of GUI.
|
||||
# See <https://github.com/ventoy/Ventoy/blob/471432fc50ffad80bde5de0b22e4c30fa3aac41b/LinuxGUI/Ventoy2Disk/ventoy_gui.c#L1044>.
|
||||
# See: https://github.com/ventoy/Ventoy/blob/v1.0.78/LinuxGUI/Ventoy2Disk/ventoy_gui.c#L1096
|
||||
+ lib.optionalString (withGtk3 || withQt5) ''
|
||||
echo "${defaultGuiType}" > "$VENTOY_PATH/ventoy_gui_type"
|
||||
makeWrapper "$VENTOY_PATH/VentoyGUI.$ARCH" "$out/bin/ventoy-gui" \
|
||||
|
|
@ -154,7 +172,6 @@ in stdenv.mkDerivation rec {
|
|||
--chdir "$VENTOY_PATH"
|
||||
mkdir "$out"/share/{applications,pixmaps}
|
||||
ln -s "$VENTOY_PATH"/WebUI/static/img/VentoyLogo.png "$out"/share/pixmaps/
|
||||
cp ${./ventoy-gui.desktop} "$out"/share/applications/
|
||||
''
|
||||
+ lib.optionalString (!withGtk3) ''
|
||||
rm "$VENTOY_PATH"/tool/{"$ARCH"/Ventoy2Disk.gtk3,VentoyGTK.glade}
|
||||
|
|
@ -187,9 +204,9 @@ in stdenv.mkDerivation rec {
|
|||
800+ image files are tested. 90%+ distros in DistroWatch supported.
|
||||
'';
|
||||
changelog = "https://www.ventoy.net/doc_news.html";
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ k4leg AndersonTorres ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "mipsel-linux" ];
|
||||
maintainers = with maintainers; [ k4leg ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
[Desktop Entry]
|
||||
Categories=Utility;
|
||||
Comment=Tool to create bootable USB drive for ISO/WIM/IMG/VHD(x)/EFI files
|
||||
Exec=ventoy-gui
|
||||
Hidden=false
|
||||
Icon=VentoyLogo
|
||||
Name=Ventoy
|
||||
StartupNotify=true
|
||||
Terminal=false
|
||||
Type=Application
|
||||
|
|
@ -1,26 +1,35 @@
|
|||
{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform }:
|
||||
{ lib, fetchFromGitHub, rustPlatform, testers, hwatch, installShellFiles }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hwatch";
|
||||
version = "0.3.6";
|
||||
version = "0.3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "blacknon";
|
||||
repo = pname;
|
||||
# prefix, because just "0.3.6' causes the download to silently fail:
|
||||
# $ curl -v https://github.com/blacknon/hwatch/archive/0.3.6.tar.gz
|
||||
# ...
|
||||
# < HTTP/2 300
|
||||
# ...
|
||||
# the given path has multiple possibilities: #<Git::Ref:0x00007fbb2e52bed0>, #<Git::Ref:0x00007fbb2e52ae40>
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-uaAgA6DWwYVT9mQh55onW+qxIC2i9GVuimctTJpUgfA=";
|
||||
sha256 = "sha256-FVqvwqsHkV/yK5okL1p6TiNUGDK2ZnzVNO4UDVkG+zM=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-Xt3Z6ax3Y45KZhTYMBr/Rfx1o+ZAoPYj51SN5hnrXQM=";
|
||||
cargoSha256 = "sha256-E4qh2cfpVNUa9OyJowSsaHU7pYiNu7IpxwISP0djVRA=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd hwatch \
|
||||
--bash $src/completion/bash/hwatch-completion.bash \
|
||||
--fish $src/completion/fish/hwatch.fish \
|
||||
--zsh $src/completion/zsh/_hwatch \
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = hwatch;
|
||||
command = "hwatch --version";
|
||||
version = version;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/blackmon/hwatch";
|
||||
homepage = "https://github.com/blacknon/hwatch";
|
||||
description= "Modern alternative to the watch command";
|
||||
longDescription = ''
|
||||
A modern alternative to the watch command, records the differences in
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {
|
|||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "Rust implementation of Magic Wormhole, with new features and enhancements";
|
||||
homepage = "https://github.com/magic-wormhole/magic-wormhole.rs";
|
||||
changelog = "https://github.com/magic-wormhole/magic-wormhole.rs/raw/${version}/changelog.md";
|
||||
|
|
|
|||
|
|
@ -37,9 +37,10 @@ python3.pkgs.buildPythonApplication rec {
|
|||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require socket access
|
||||
"test_raw_l2"
|
||||
"test_raw_l3"
|
||||
"TestNetworkMonitor"
|
||||
"TestNoResponseFailure"
|
||||
"TestProcessMonitor"
|
||||
"TestSocketConnection"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
@ -51,7 +52,5 @@ python3.pkgs.buildPythonApplication rec {
|
|||
homepage = "https://github.com/jtpereyda/boofuzz";
|
||||
license = with licenses; [ gpl2Plus ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
# FAILED unit_tests/test_monitors.py::TestProcessMonitor::test_set_options_persistent
|
||||
broken = (stdenv.isDarwin && stdenv.isx86_64);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "A Random Number Generator test suite";
|
||||
homepage = "https://webhome.phy.duke.edu/~rgb/General/dieharder.php";
|
||||
license = licenses.gpl2Plus;
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ buildGoModule rec {
|
|||
vendorSha256 = null;
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "Automatic Linux privilege escalation";
|
||||
longDescription = ''
|
||||
Automatically exploit low-hanging fruit to pop a root shell. Traitor packages
|
||||
|
|
@ -26,6 +25,7 @@ buildGoModule rec {
|
|||
(including most of GTFOBins) in order to pop a root shell.
|
||||
'';
|
||||
homepage = "https://github.com/liamg/traitor";
|
||||
platforms = platforms.linux;
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1075,7 +1075,10 @@ with pkgs;
|
|||
|
||||
aether-lv2 = callPackage ../applications/audio/aether-lv2 { };
|
||||
|
||||
acme-client = callPackage ../tools/networking/acme-client { stdenv = gccStdenv; };
|
||||
acme-client = callPackage ../tools/networking/acme-client {
|
||||
stdenv = gccStdenv;
|
||||
libressl = libressl_3_4;
|
||||
};
|
||||
|
||||
adrgen = callPackage ../tools/misc/adrgen { };
|
||||
|
||||
|
|
@ -6301,6 +6304,7 @@ with pkgs;
|
|||
|
||||
fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb {
|
||||
openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||
libressl = libressl_3_4;
|
||||
});
|
||||
|
||||
inherit (fdbPackages)
|
||||
|
|
@ -9351,7 +9355,9 @@ with pkgs;
|
|||
|
||||
otpw = callPackage ../os-specific/linux/otpw { };
|
||||
|
||||
ovftool = callPackage ../tools/virtualization/ovftool { };
|
||||
ovftool = callPackage ../tools/virtualization/ovftool {
|
||||
libressl = libressl_3_4;
|
||||
};
|
||||
|
||||
overcommit = callPackage ../development/tools/overcommit { };
|
||||
|
||||
|
|
@ -20341,7 +20347,7 @@ with pkgs;
|
|||
libressl_3_4
|
||||
libressl_3_5;
|
||||
|
||||
libressl = libressl_3_4;
|
||||
libressl = libressl_3_5;
|
||||
|
||||
boringssl = callPackage ../development/libraries/boringssl { };
|
||||
|
||||
|
|
@ -35383,6 +35389,7 @@ with pkgs;
|
|||
|
||||
wasm-pack = callPackage ../development/tools/wasm-pack {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
libressl = libressl_3_4;
|
||||
};
|
||||
|
||||
wasynth = callPackage ../development/tools/wasynth { };
|
||||
|
|
|
|||
|
|
@ -241,6 +241,8 @@ in {
|
|||
|
||||
aio-geojson-nsw-rfs-incidents = callPackage ../development/python-modules/aio-geojson-nsw-rfs-incidents { };
|
||||
|
||||
aio-geojson-usgs-earthquakes = callPackage ../development/python-modules/aio-geojson-usgs-earthquakes { };
|
||||
|
||||
aio-georss-client = callPackage ../development/python-modules/aio-georss-client { };
|
||||
|
||||
aio-georss-gdacs = callPackage ../development/python-modules/aio-georss-gdacs { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue