Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
81f7f2db14
@ -6003,6 +6003,12 @@
|
||||
githubId = 2502736;
|
||||
name = "James Hillyerd";
|
||||
};
|
||||
jiegec = {
|
||||
name = "Jiajie Chen";
|
||||
email = "c@jia.je";
|
||||
github = "jiegec";
|
||||
githubId = 6127678;
|
||||
};
|
||||
jiehong = {
|
||||
email = "nixos@majiehong.com";
|
||||
github = "Jiehong";
|
||||
|
||||
@ -89,7 +89,8 @@ in {
|
||||
};
|
||||
datadir = mkOption {
|
||||
type = types.str;
|
||||
defaultText = "config.services.nextcloud.home";
|
||||
default = config.services.nextcloud.home;
|
||||
defaultText = literalExpression "config.services.nextcloud.home";
|
||||
description = ''
|
||||
Data storage path of nextcloud. Will be <xref linkend="opt-services.nextcloud.home" /> by default.
|
||||
This folder will be populated with a config.php and data folder which contains the state of the instance (excl the database).";
|
||||
@ -629,8 +630,6 @@ in {
|
||||
else nextcloud24
|
||||
);
|
||||
|
||||
services.nextcloud.datadir = mkOptionDefault config.services.nextcloud.home;
|
||||
|
||||
services.nextcloud.phpPackage =
|
||||
if versionOlder cfg.package.version "24" then pkgs.php80
|
||||
# FIXME: Use PHP 8.1 with Nextcloud 24 and higher, once issues like this one are fixed:
|
||||
@ -650,6 +649,7 @@ in {
|
||||
|
||||
{ systemd.timers.nextcloud-cron = {
|
||||
wantedBy = [ "timers.target" ];
|
||||
after = [ "nextcloud-setup.service" ];
|
||||
timerConfig.OnBootSec = "5m";
|
||||
timerConfig.OnUnitActiveSec = "5m";
|
||||
timerConfig.Unit = "nextcloud-cron.service";
|
||||
@ -840,12 +840,14 @@ in {
|
||||
serviceConfig.User = "nextcloud";
|
||||
};
|
||||
nextcloud-cron = {
|
||||
after = [ "nextcloud-setup.service" ];
|
||||
environment.NEXTCLOUD_CONFIG_DIR = "${datadir}/config";
|
||||
serviceConfig.Type = "oneshot";
|
||||
serviceConfig.User = "nextcloud";
|
||||
serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${cfg.package}/cron.php";
|
||||
};
|
||||
nextcloud-update-plugins = mkIf cfg.autoUpdateApps.enable {
|
||||
after = [ "nextcloud-setup.service" ];
|
||||
serviceConfig.Type = "oneshot";
|
||||
serviceConfig.ExecStart = "${occ}/bin/nextcloud-occ app:update --all";
|
||||
serviceConfig.User = "nextcloud";
|
||||
@ -914,7 +916,6 @@ in {
|
||||
priority = 100;
|
||||
extraConfig = ''
|
||||
allow all;
|
||||
log_not_found off;
|
||||
access_log off;
|
||||
'';
|
||||
};
|
||||
|
||||
@ -3,18 +3,9 @@
|
||||
pkgs ? import ../.. { inherit system config; },
|
||||
debug ? false,
|
||||
enableUnfree ? false,
|
||||
# Nested KVM virtualization (https://www.linux-kvm.org/page/Nested_Guests)
|
||||
# requires a modprobe flag on the build machine: (kvm-amd for AMD CPUs)
|
||||
# boot.extraModprobeConfig = "options kvm-intel nested=Y";
|
||||
# Without this VirtualBox will use SW virtualization and will only be able
|
||||
# to run 32-bit guests.
|
||||
useKvmNestedVirt ? false,
|
||||
# Whether to run 64-bit guests instead of 32-bit. Requires nested KVM.
|
||||
use64bitGuest ? false
|
||||
use64bitGuest ? true
|
||||
}:
|
||||
|
||||
assert use64bitGuest -> useKvmNestedVirt;
|
||||
|
||||
with import ../lib/testing-python.nix { inherit system pkgs; };
|
||||
with pkgs.lib;
|
||||
|
||||
@ -26,7 +17,8 @@ let
|
||||
#!${pkgs.runtimeShell} -xe
|
||||
export PATH="${lib.makeBinPath [ pkgs.coreutils pkgs.util-linux ]}"
|
||||
|
||||
mkdir -p /run/dbus
|
||||
mkdir -p /run/dbus /var
|
||||
ln -s /run /var
|
||||
cat > /etc/passwd <<EOF
|
||||
root:x:0:0::/root:/bin/false
|
||||
messagebus:x:1:1::/run/dbus:/bin/false
|
||||
@ -200,6 +192,7 @@ let
|
||||
systemd.services."vboxtestlog-${name}@" = {
|
||||
description = "VirtualBox Test Machine Log For ${name}";
|
||||
serviceConfig.StandardInput = "socket";
|
||||
serviceConfig.StandardOutput = "journal";
|
||||
serviceConfig.SyslogIdentifier = "GUEST-${name}";
|
||||
serviceConfig.ExecStart = "${pkgs.coreutils}/bin/cat";
|
||||
};
|
||||
@ -226,6 +219,7 @@ let
|
||||
|
||||
|
||||
def create_vm_${name}():
|
||||
cleanup_${name}()
|
||||
vbm("createvm --name ${name} ${createFlags}")
|
||||
vbm("modifyvm ${name} ${vmFlags}")
|
||||
vbm("setextradata ${name} VBoxInternal/PDM/HaltOnReset 1")
|
||||
@ -233,7 +227,6 @@ let
|
||||
vbm("storageattach ${name} ${diskFlags}")
|
||||
vbm("sharedfolder add ${name} ${sharedFlags}")
|
||||
vbm("sharedfolder add ${name} ${nixstoreFlags}")
|
||||
cleanup_${name}()
|
||||
|
||||
${mkLog "$HOME/VirtualBox VMs/${name}/Logs/VBox.log" "HOST-${name}"}
|
||||
|
||||
@ -317,10 +310,7 @@ let
|
||||
];
|
||||
|
||||
dhcpScript = pkgs: ''
|
||||
${pkgs.dhcp}/bin/dhclient \
|
||||
-lf /run/dhcp.leases \
|
||||
-pf /run/dhclient.pid \
|
||||
-v eth0 eth1
|
||||
${pkgs.dhcpcd}/bin/dhcpcd eth0 eth1
|
||||
|
||||
otherIP="$(${pkgs.netcat}/bin/nc -l 1234 || :)"
|
||||
${pkgs.iputils}/bin/ping -I eth1 -c1 "$otherIP"
|
||||
@ -359,8 +349,7 @@ let
|
||||
vmConfigs = mapAttrsToList mkVMConf vms;
|
||||
in [ ./common/user-account.nix ./common/x11.nix ] ++ vmConfigs;
|
||||
virtualisation.memorySize = 2048;
|
||||
virtualisation.qemu.options =
|
||||
if useKvmNestedVirt then ["-cpu" "kvm64,vmx=on"] else [];
|
||||
virtualisation.qemu.options = ["-cpu" "kvm64,svm=on,vmx=on"];
|
||||
virtualisation.virtualbox.host.enable = true;
|
||||
test-support.displayManager.auto.user = "alice";
|
||||
users.users.alice.extraGroups = let
|
||||
@ -468,7 +457,7 @@ in mapAttrs (mkVBoxTest false vboxVMs) {
|
||||
|
||||
headless = ''
|
||||
create_vm_headless()
|
||||
machine.succeed(ru("VBoxHeadless --startvm headless & disown %1"))
|
||||
machine.succeed(ru("VBoxHeadless --startvm headless >&2 & disown %1"))
|
||||
wait_for_startup_headless()
|
||||
wait_for_vm_boot_headless()
|
||||
shutdown_vm_headless()
|
||||
@ -476,6 +465,8 @@ in mapAttrs (mkVBoxTest false vboxVMs) {
|
||||
'';
|
||||
|
||||
host-usb-permissions = ''
|
||||
import sys
|
||||
|
||||
user_usb = remove_uuids(vbm("list usbhost"))
|
||||
print(user_usb, file=sys.stderr)
|
||||
root_usb = remove_uuids(machine.succeed("VBoxManage list usbhost"))
|
||||
|
||||
@ -21,11 +21,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clightning";
|
||||
version = "0.11.1";
|
||||
version = "0.11.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
|
||||
sha256 = "0vsh6gpv3458pfc5cggay9pw7bxjzyxpcniks9b2s3y1rxwk15xi";
|
||||
sha256 = "09qqfnj809dpwar9ijm3ic5cv4019hsnvh2h6sfpdqp1smf9igxs";
|
||||
};
|
||||
|
||||
# when building on darwin we need dawin.cctools to provide the correct libtool
|
||||
|
||||
@ -23,16 +23,16 @@
|
||||
inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix)
|
||||
}) rec {
|
||||
pname = "dbeaver";
|
||||
version = "22.1.0"; # When updating also update mvnSha256
|
||||
version = "22.1.1"; # When updating also update mvnSha256
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dbeaver";
|
||||
repo = "dbeaver";
|
||||
rev = version;
|
||||
sha256 = "sha256-gMs9q0+Yy/2l8TEG9vIuzv0qOh7QwawwlXKr3/Mz8wk=";
|
||||
sha256 = "sha256-+MFULieuwfvuAP0HjJ+C0hb/uqhHtnP/nOoIfWwjtoI=";
|
||||
};
|
||||
|
||||
mvnSha256 = "veclFlzLhTU+nT360qxRNut+yEi2dfTBxdQASyRMqhI=";
|
||||
mvnSha256 = "pSZL+GDSXSm+sLymlSlq2ZIRdYJY1B3PCmCpjtosdGY=";
|
||||
mvnParameters = "-P desktop,all-platforms";
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -30,10 +30,10 @@
|
||||
"owner": "aiven",
|
||||
"provider-source-address": "registry.terraform.io/aiven/aiven",
|
||||
"repo": "terraform-provider-aiven",
|
||||
"rev": "v3.1.0",
|
||||
"sha256": "sha256-or9zftygo0W0bcw2FZl9S8dp4K8enlC5MYrrqgB2IUs=",
|
||||
"rev": "v3.2.0",
|
||||
"sha256": "sha256-kKKln180j3b1AkuXdjSwboa3T5nLQeZtbOn6jB7i4nw=",
|
||||
"vendorSha256": "sha256-k6pKet1YdQYCyFICw67nKI3RGNZ4b+zA+T9jpa2ZLFM=",
|
||||
"version": "3.1.0"
|
||||
"version": "3.2.0"
|
||||
},
|
||||
"akamai": {
|
||||
"owner": "akamai",
|
||||
@ -49,10 +49,10 @@
|
||||
"owner": "aliyun",
|
||||
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
|
||||
"repo": "terraform-provider-alicloud",
|
||||
"rev": "v1.172.0",
|
||||
"sha256": "sha256-EtZXUJe3tl4ySOMXWZQPvBF2UrhlK2+RqWFhlUHBl+E=",
|
||||
"vendorSha256": "sha256-xu1m/wE67gXYKc3sIkDpQGovs/LKfUVI+vl6V0Uc4FE=",
|
||||
"version": "1.172.0"
|
||||
"rev": "v1.173.0",
|
||||
"sha256": "sha256-jLjliUWCpxoawwCl61qHXNzareuF7qCkjSdeQgj6IsE=",
|
||||
"vendorSha256": "sha256-6FiVXy/q3WImYDbwvj9e3ns9gilaL6GBW5qCpaUNCW0=",
|
||||
"version": "1.173.0"
|
||||
},
|
||||
"ansible": {
|
||||
"owner": "nbering",
|
||||
@ -76,10 +76,10 @@
|
||||
"owner": "auth0",
|
||||
"provider-source-address": "registry.terraform.io/auth0/auth0",
|
||||
"repo": "terraform-provider-auth0",
|
||||
"rev": "v0.30.3",
|
||||
"sha256": "sha256-mtf5gsY7ZVkok6zUTRFgdlRRUnTSeej36aAABfo7NyA=",
|
||||
"vendorSha256": "sha256-ZN7P9PD8MqThtc6x/Lm4Yeb7ciPVWpFP4zDo0gQHYTo=",
|
||||
"version": "0.30.3"
|
||||
"rev": "v0.31.0",
|
||||
"sha256": "sha256-Huv+eL/5RiI2A1X8RLU9LbIWMjb5yuuslV4CaP/kFiQ=",
|
||||
"vendorSha256": "sha256-kTR8kSirqhY1GdKLzeFIPt6QNJ4wq2ESUT5ShQUhvRI=",
|
||||
"version": "0.31.0"
|
||||
},
|
||||
"avi": {
|
||||
"owner": "vmware",
|
||||
@ -103,28 +103,28 @@
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/aws",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v4.19.0",
|
||||
"sha256": "sha256-0pgCGv6a+/cBBInISM8Lmfapz+FIPwxAaqd+Rd6jax0=",
|
||||
"vendorSha256": "sha256-n3iXCX87bu5rETz18GgUdIcy1NH+OTuA4ff56yE7kNg=",
|
||||
"version": "4.19.0"
|
||||
"rev": "v4.20.1",
|
||||
"sha256": "sha256-k6JcwtTUfmZrfiFfacEPTXdtCbnjBrivNQp1dDzXFfM=",
|
||||
"vendorSha256": "sha256-pKCIL1GD+oA+DVx24Xr07dFnhUcxT/TdASx0sCPWWIQ=",
|
||||
"version": "4.20.1"
|
||||
},
|
||||
"azuread": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azuread",
|
||||
"repo": "terraform-provider-azuread",
|
||||
"rev": "v2.24.0",
|
||||
"sha256": "sha256-obaS2MzLTeIKskGRz8CanRgWzSKTaiK09xxc0kdMDeQ=",
|
||||
"rev": "v2.25.0",
|
||||
"sha256": "sha256-+9h9rdbnqIul+V/fhrsNEq/cX24i05i2LBqIk6g9mRE=",
|
||||
"vendorSha256": null,
|
||||
"version": "2.24.0"
|
||||
"version": "2.25.0"
|
||||
},
|
||||
"azurerm": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
|
||||
"repo": "terraform-provider-azurerm",
|
||||
"rev": "v3.10.0",
|
||||
"sha256": "sha256-2xRSHKHC8ypleatXt6cYtZtDMxCSlcDh5lfNmyBb3/4=",
|
||||
"rev": "v3.11.0",
|
||||
"sha256": "sha256-81Z+z9h1X8OPkLSZlVwQqhy2gkdYc0DfXs5k8W7wO+k=",
|
||||
"vendorSha256": null,
|
||||
"version": "3.10.0"
|
||||
"version": "3.11.0"
|
||||
},
|
||||
"azurestack": {
|
||||
"owner": "hashicorp",
|
||||
@ -185,20 +185,20 @@
|
||||
"owner": "checkly",
|
||||
"provider-source-address": "registry.terraform.io/checkly/checkly",
|
||||
"repo": "terraform-provider-checkly",
|
||||
"rev": "v1.4.3",
|
||||
"sha256": "sha256-5VF1cAFgdm2TR4wvuNlycpgQuVdHesFYnTv34MeauxY=",
|
||||
"vendorSha256": "sha256-7X2cS5Erf373zu8xqe2KBSz52ZmZOnAlNC8lq2/LXV4=",
|
||||
"version": "1.4.3"
|
||||
"rev": "v1.6.0",
|
||||
"sha256": "sha256-zmA6fVpXW4HOJaZzmv5K6cbmO2vM3yGWsa9TSYY4obY=",
|
||||
"vendorSha256": "sha256-VnYRDBneQ+bUzISJM9DJdBEBmjA1WOXPo+kaYBW4w4U=",
|
||||
"version": "1.6.0"
|
||||
},
|
||||
"checkpoint": {
|
||||
"deleteVendor": true,
|
||||
"owner": "CheckPointSW",
|
||||
"provider-source-address": "registry.terraform.io/CheckPointSW/checkpoint",
|
||||
"repo": "terraform-provider-checkpoint",
|
||||
"rev": "v1.9.1",
|
||||
"sha256": "sha256-5fyOw4Pu5a+kju4/RXKYZY0TBJ+6PVDwi/VjBWYCPHs=",
|
||||
"vendorSha256": "sha256-LCKISUjXguV+T/rxde+++JzJZnVQisgxoUMRkeAusyQ=",
|
||||
"version": "1.9.1"
|
||||
"rev": "v2.0.0",
|
||||
"sha256": "sha256-z/mB20gQmglr0usVrzhqxR3v9vhoRHXNJ57j8fqNREM=",
|
||||
"vendorSha256": "sha256-rb/X9C8eS9QH88FwuvfvDkGdrjZOTiI9nmcYqydOhdc=",
|
||||
"version": "2.0.0"
|
||||
},
|
||||
"ciscoasa": {
|
||||
"owner": "CiscoDevNet",
|
||||
@ -340,19 +340,19 @@
|
||||
"owner": "kreuzwerker",
|
||||
"provider-source-address": "registry.terraform.io/kreuzwerker/docker",
|
||||
"repo": "terraform-provider-docker",
|
||||
"rev": "v2.16.0",
|
||||
"sha256": "sha256-VXKIj7bvhnDMR+DE+5WmJ5SlMDiZIiB+++wbnag6Ai4=",
|
||||
"vendorSha256": "sha256-9QKHd9rarChp3NN8dY37ldE95OO4pWh5F4Yx5/Ssbno=",
|
||||
"version": "2.16.0"
|
||||
"rev": "v2.17.0",
|
||||
"sha256": "sha256-V+FuDhgih/hTpyuT13INY5vWIaNS/7Z8RlK15mR+CnE=",
|
||||
"vendorSha256": "sha256-nTulwft8xfpE83ZLJvG7xllQJIqd2M0zzbqpfD3/Mno=",
|
||||
"version": "2.17.0"
|
||||
},
|
||||
"dome9": {
|
||||
"owner": "dome9",
|
||||
"provider-source-address": "registry.terraform.io/dome9/dome9",
|
||||
"repo": "terraform-provider-dome9",
|
||||
"rev": "v1.26.0",
|
||||
"sha256": "sha256-Edgtt+q1SPm/7wOIWUhe91lluXezNHfxUBu+h1NlEL4=",
|
||||
"rev": "v1.27.1",
|
||||
"sha256": "sha256-VmobLWMjHH+GzxUk0bnIr4dWkuH8D00U7VrN9eApF5c=",
|
||||
"vendorSha256": null,
|
||||
"version": "1.26.0"
|
||||
"version": "1.27.1"
|
||||
},
|
||||
"elasticsearch": {
|
||||
"owner": "phillbaker",
|
||||
@ -376,10 +376,10 @@
|
||||
"owner": "exoscale",
|
||||
"provider-source-address": "registry.terraform.io/exoscale/exoscale",
|
||||
"repo": "terraform-provider-exoscale",
|
||||
"rev": "v0.37.1",
|
||||
"sha256": "sha256-PNm/As+N6+kB79J0lEaQM9LyybCwaRipG/eZCjTPMFY=",
|
||||
"rev": "v0.38.0",
|
||||
"sha256": "sha256-TVJlfce5bF5Z64FOPKqb0ac+NtjzeHsid+Q7vWIINuk=",
|
||||
"vendorSha256": null,
|
||||
"version": "0.37.1"
|
||||
"version": "0.38.0"
|
||||
},
|
||||
"external": {
|
||||
"owner": "hashicorp",
|
||||
@ -449,20 +449,20 @@
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/google",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google",
|
||||
"rev": "v4.25.0",
|
||||
"sha256": "sha256-5tgQpiWjMC+Xh5SPGrTqZVW3GDrlRKTc7K5XMHT6uRA=",
|
||||
"rev": "v4.26.0",
|
||||
"sha256": "sha256-iCHhOuHEvynBUFKrKapzg7Jc673TiczG6zttgrABUEs=",
|
||||
"vendorSha256": "sha256-uwyl79TGrnFOxJLBTJ5LaAZLZdb/VbS7IW4jQ2A5xQM=",
|
||||
"version": "4.25.0"
|
||||
"version": "4.26.0"
|
||||
},
|
||||
"google-beta": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
|
||||
"proxyVendor": true,
|
||||
"repo": "terraform-provider-google-beta",
|
||||
"rev": "v4.25.0",
|
||||
"sha256": "sha256-vIuZNjrgLGAF8szY0b9KeB1GoIDtlVLbnE5+IUXmccg=",
|
||||
"rev": "v4.26.0",
|
||||
"sha256": "sha256-udk+LtpMe4M4SoMpac06knOY6t5hFFa1yze9THTa5hQ=",
|
||||
"vendorSha256": "sha256-uwyl79TGrnFOxJLBTJ5LaAZLZdb/VbS7IW4jQ2A5xQM=",
|
||||
"version": "4.25.0"
|
||||
"version": "4.26.0"
|
||||
},
|
||||
"googleworkspace": {
|
||||
"owner": "hashicorp",
|
||||
@ -513,10 +513,10 @@
|
||||
"owner": "heroku",
|
||||
"provider-source-address": "registry.terraform.io/heroku/heroku",
|
||||
"repo": "terraform-provider-heroku",
|
||||
"rev": "v5.0.2",
|
||||
"sha256": "sha256-HzbqqIr2RjarjuIw+9p8JqGRDbPRDfq2OLLztJLCLoM=",
|
||||
"vendorSha256": "sha256-HrsjhaMlzs+uel5tBlxJD69Kkjl+4qVisWWREANBx40=",
|
||||
"version": "5.0.2"
|
||||
"rev": "v5.1.0",
|
||||
"sha256": "sha256-MMX8zaM3J2GxMXUX0YNX03V8uQzb67cIUF432tjm3Mw=",
|
||||
"vendorSha256": null,
|
||||
"version": "5.1.0"
|
||||
},
|
||||
"hetznerdns": {
|
||||
"owner": "timohirt",
|
||||
@ -621,10 +621,10 @@
|
||||
"owner": "mrparkers",
|
||||
"provider-source-address": "registry.terraform.io/mrparkers/keycloak",
|
||||
"repo": "terraform-provider-keycloak",
|
||||
"rev": "v3.8.1",
|
||||
"sha256": "sha256-++yoMIn6K4VwAGyRVe/MUjMU46gBeHjIRF2nrXktC7E=",
|
||||
"rev": "v3.9.0",
|
||||
"sha256": "sha256-MdsOZptj46RuvLK6wZJL3va8kMSzqxaS4wGEUpgky7Q=",
|
||||
"vendorSha256": "sha256-8x0MlwAzeA2O6wXXHSk++K0ePmzE9/2lfo2ID83LzRM=",
|
||||
"version": "3.8.1"
|
||||
"version": "3.9.0"
|
||||
},
|
||||
"ksyun": {
|
||||
"owner": "kingsoftcloud",
|
||||
@ -792,10 +792,10 @@
|
||||
"owner": "newrelic",
|
||||
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v2.47.1",
|
||||
"sha256": "sha256-iC4N8o+VJ5/TFGBO8O+SONMZVjHxZ+4+7ZuDDnAtZC4=",
|
||||
"vendorSha256": "sha256-sMH/sdrMxIw/2jzUcYL9WwVNUsn12K+gPMR68zpXYIA=",
|
||||
"version": "2.47.1"
|
||||
"rev": "v2.48.0",
|
||||
"sha256": "sha256-p1y09f/apsqCn9d5Hrh3L09zya8ebAsy+KCojfsW43w=",
|
||||
"vendorSha256": "sha256-/BWmesMF5zzzMi+7IJviMbXOhAfpn9HDg9i+9tLs2ds=",
|
||||
"version": "2.48.0"
|
||||
},
|
||||
"nomad": {
|
||||
"owner": "hashicorp",
|
||||
@ -819,10 +819,10 @@
|
||||
"owner": "vmware",
|
||||
"provider-source-address": "registry.terraform.io/vmware/nsxt",
|
||||
"repo": "terraform-provider-nsxt",
|
||||
"rev": "v3.2.7",
|
||||
"sha256": "sha256-Og/U9bmaZIN7b/JcMnNkt6c3/H+toe4dFYNaQYfxLPM=",
|
||||
"rev": "v3.2.8",
|
||||
"sha256": "sha256-oXcT1VmwC9a+U0vM5O9y2As2PbzPr95LrUB6KlFKcMc=",
|
||||
"vendorSha256": null,
|
||||
"version": "3.2.7"
|
||||
"version": "3.2.8"
|
||||
},
|
||||
"null": {
|
||||
"owner": "hashicorp",
|
||||
@ -847,10 +847,10 @@
|
||||
"owner": "oracle",
|
||||
"provider-source-address": "registry.terraform.io/oracle/oci",
|
||||
"repo": "terraform-provider-oci",
|
||||
"rev": "v4.80.1",
|
||||
"sha256": "sha256-suvtUABb+bLPAyMfS3btwVA4HVZofqKV1Lr/5RczBbw=",
|
||||
"rev": "v4.81.0",
|
||||
"sha256": "sha256-KuEF4VAMKd1IbtUbyDSIzKhk0qTSp/pJiGE5lBI/TFE=",
|
||||
"vendorSha256": null,
|
||||
"version": "4.80.1"
|
||||
"version": "4.81.0"
|
||||
},
|
||||
"okta": {
|
||||
"owner": "okta",
|
||||
@ -892,10 +892,10 @@
|
||||
"owner": "opentelekomcloud",
|
||||
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
|
||||
"repo": "terraform-provider-opentelekomcloud",
|
||||
"rev": "v1.29.6",
|
||||
"sha256": "sha256-zhYmwTJ80+w7H7DJxPjMMtLTsHCEhW9G9x5sMz5IRkM=",
|
||||
"vendorSha256": "sha256-SE6ty/mLRo8nvxrPBW1cVhbxpiYDXr3cmjifF40RrmM=",
|
||||
"version": "1.29.6"
|
||||
"rev": "v1.29.7",
|
||||
"sha256": "sha256-ZdxK143tjtE+pfuy0TxurdblZ2PO7jsYPyrQ1yJeClE=",
|
||||
"vendorSha256": "sha256-1z5SaH6AoYkrMZVnNurZLmtvVRDNwTBwmQMX0KngKpA=",
|
||||
"version": "1.29.7"
|
||||
},
|
||||
"opsgenie": {
|
||||
"owner": "opsgenie",
|
||||
@ -928,10 +928,10 @@
|
||||
"owner": "PaloAltoNetworks",
|
||||
"provider-source-address": "registry.terraform.io/PaloAltoNetworks/panos",
|
||||
"repo": "terraform-provider-panos",
|
||||
"rev": "v1.10.2",
|
||||
"sha256": "sha256-da3ixmkg/xYr182cnAva6DqtCD5KTC3FkFHkvmMm9jA=",
|
||||
"rev": "v1.10.3",
|
||||
"sha256": "sha256-mscWNK113W7CVKI+qPGYX3irQI3YhkLdXox4pddOdF0=",
|
||||
"vendorSha256": null,
|
||||
"version": "1.10.2"
|
||||
"version": "1.10.3"
|
||||
},
|
||||
"pass": {
|
||||
"owner": "camptocamp",
|
||||
@ -982,10 +982,10 @@
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/random",
|
||||
"repo": "terraform-provider-random",
|
||||
"rev": "v3.3.1",
|
||||
"sha256": "sha256-hsNGJmhYrzQhQ0acidx3/dkNFRIabMfgvJsM2Uz+7cE=",
|
||||
"vendorSha256": "sha256-73/tsfe5YoPTpEGUBvBV6jYGFjSNG9h3AY680tAzM7M=",
|
||||
"version": "3.3.1"
|
||||
"rev": "v3.3.2",
|
||||
"sha256": "sha256-izTx/uxe/SAsWSlN5husEWK64c9ugdg8BS7lScnWSX4=",
|
||||
"vendorSha256": "sha256-ofU1zZb/C2LFaRCt0NULi+9dQY02lKBlz3jV1/ZhfWU=",
|
||||
"version": "3.3.2"
|
||||
},
|
||||
"remote": {
|
||||
"owner": "tenstad",
|
||||
@ -1009,10 +1009,10 @@
|
||||
"owner": "scaleway",
|
||||
"provider-source-address": "registry.terraform.io/scaleway/scaleway",
|
||||
"repo": "terraform-provider-scaleway",
|
||||
"rev": "v2.2.1",
|
||||
"sha256": "sha256-a3tSxGTRYQeGfaJOR8z1Qd0SeuoiLwrEbdlw3B9gc2A=",
|
||||
"vendorSha256": "sha256-D/pE1uEpkWIuICNJsuWVHfRNGPf73YliFxqODkl+4QY=",
|
||||
"version": "2.2.1"
|
||||
"rev": "v2.2.2",
|
||||
"sha256": "sha256-uSJga2M+9unC8eJkUjhuCQbTTGXEYGky4MJyVL0ZfiQ=",
|
||||
"vendorSha256": "sha256-DOL38q5463aOMijP6AbBuE7jI7hvLYLm8yCBxrr6DoA=",
|
||||
"version": "2.2.2"
|
||||
},
|
||||
"secret": {
|
||||
"owner": "numtide",
|
||||
@ -1036,10 +1036,10 @@
|
||||
"owner": "jianyuan",
|
||||
"provider-source-address": "registry.terraform.io/jianyuan/sentry",
|
||||
"repo": "terraform-provider-sentry",
|
||||
"rev": "v0.8.0",
|
||||
"sha256": "sha256-3PTM3GOImwO/yqzR6tOuwU0f+74DfK4RQSBY0vmH3qs=",
|
||||
"vendorSha256": "sha256-naMuvrVIJp82NIFoR1oEEN6cZFqG4craDh8YU3+NSf0=",
|
||||
"version": "0.8.0"
|
||||
"rev": "v0.9.0",
|
||||
"sha256": "sha256-n+ca1+YKObcdq5h4Sn9tBLg1vpBooBB/pGJxaW4l3k0=",
|
||||
"vendorSha256": "sha256-hYoLGMI8NGpHW3tsNt6EO1nJrmfeFLuDQ79bkXf7DmQ=",
|
||||
"version": "0.9.0"
|
||||
},
|
||||
"shell": {
|
||||
"owner": "scottwinkler",
|
||||
@ -1090,10 +1090,10 @@
|
||||
"owner": "spotinst",
|
||||
"provider-source-address": "registry.terraform.io/spotinst/spotinst",
|
||||
"repo": "terraform-provider-spotinst",
|
||||
"rev": "v1.76.0",
|
||||
"sha256": "sha256-+/OZw/wpeRHoK5XuwiI2qfbZSheoGd4PRy4TkdtV7yY=",
|
||||
"rev": "v1.77.0",
|
||||
"sha256": "sha256-qP6Hjo4ekEk105nQVwGLHR3LiQzUtEd68y45hppdoyY=",
|
||||
"vendorSha256": "sha256-JaWR7TiU5J7HGWExENqo5lHysCzg4Q6XvpCYfekuAg8=",
|
||||
"version": "1.76.0"
|
||||
"version": "1.77.0"
|
||||
},
|
||||
"stackpath": {
|
||||
"owner": "stackpath",
|
||||
@ -1126,19 +1126,19 @@
|
||||
"owner": "tencentcloudstack",
|
||||
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
|
||||
"repo": "terraform-provider-tencentcloud",
|
||||
"rev": "v1.73.3",
|
||||
"sha256": "sha256-wb1OCD0WupHUSgQJSX1don8GPmqgTqKKap/8DpDasNQ=",
|
||||
"rev": "v1.74.3",
|
||||
"sha256": "sha256-iZrM4TJYqJQddpOrqx836O9Y4yA+VsY4iAA7K29CNNU=",
|
||||
"vendorSha256": null,
|
||||
"version": "1.73.3"
|
||||
"version": "1.74.3"
|
||||
},
|
||||
"tfe": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/tfe",
|
||||
"repo": "terraform-provider-tfe",
|
||||
"rev": "v0.31.0",
|
||||
"sha256": "sha256-BvA+1oCh8xB0XcXMGOmAEdi/lEwGdRed5vDEDVBUMhE=",
|
||||
"vendorSha256": "sha256-7TFfIk+aPbl3CLuNdeJg1O2n3WlCuG5tsayCtbo77I0=",
|
||||
"version": "0.31.0"
|
||||
"rev": "v0.32.1",
|
||||
"sha256": "sha256-7a2uc0f7+OFrbCvHJkKyeX7hXR63PpzpfNhUCWHqOxU=",
|
||||
"vendorSha256": "sha256-V1nXhDwDMWJsbhPu9otXrOmtzVv0rjvL7CH/13AR5iw=",
|
||||
"version": "0.32.1"
|
||||
},
|
||||
"thunder": {
|
||||
"owner": "a10networks",
|
||||
|
||||
@ -45,26 +45,15 @@ in stdenv.mkDerivation rec {
|
||||
patchFlags = [ "-p1" "-d" "src/vboxguest-${version}" ];
|
||||
|
||||
unpackPhase = ''
|
||||
${if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then ''
|
||||
isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run
|
||||
chmod 755 ./VBoxLinuxAdditions.run
|
||||
# An overflow leads the is-there-enough-space check to fail when there's too much space available, so fake how much space there is
|
||||
sed -i 's/\$leftspace/16383/' VBoxLinuxAdditions.run
|
||||
./VBoxLinuxAdditions.run --noexec --keep
|
||||
''
|
||||
else throw ("Architecture: "+stdenv.hostPlatform.system+" not supported for VirtualBox guest additions")
|
||||
}
|
||||
isoinfo -J -i $src -x /VBoxLinuxAdditions.run > ./VBoxLinuxAdditions.run
|
||||
chmod 755 ./VBoxLinuxAdditions.run
|
||||
# An overflow leads the is-there-enough-space check to fail when there's too much space available, so fake how much space there is
|
||||
sed -i 's/\$leftspace/16383/' VBoxLinuxAdditions.run
|
||||
./VBoxLinuxAdditions.run --noexec --keep
|
||||
|
||||
# Unpack files
|
||||
cd install
|
||||
${if stdenv.hostPlatform.system == "i686-linux" then ''
|
||||
tar xfvj VBoxGuestAdditions-x86.tar.bz2
|
||||
''
|
||||
else if stdenv.hostPlatform.system == "x86_64-linux" then ''
|
||||
tar xfvj VBoxGuestAdditions-amd64.tar.bz2
|
||||
''
|
||||
else throw ("Architecture: "+stdenv.hostPlatform.system+" not supported for VirtualBox guest additions")
|
||||
}
|
||||
tar xfvj VBoxGuestAdditions-${if stdenv.hostPlatform.is32bit then "x86" else "amd64"}.tar.bz2
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
@ -158,7 +147,7 @@ in stdenv.mkDerivation rec {
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
license = "GPL";
|
||||
maintainers = [ lib.maintainers.sander ];
|
||||
platforms = lib.platforms.linux;
|
||||
broken = kernel.kernelAtLeast "5.17";
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
broken = kernel.kernelAtLeast (if stdenv.hostPlatform.is32bit then "5.10" else "5.17");
|
||||
};
|
||||
}
|
||||
|
||||
@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [ ./nix-ssl-cert-file.patch ]
|
||||
# Disable native add_system_trust.
|
||||
# FIXME: apparently it's not enough to drop the framework anymore; maybe related to
|
||||
# https://gitlab.com/gnutls/gnutls/-/commit/c19cb93d492e45141bfef9b926dfeba36003261c
|
||||
++ lib.optional (isDarwin && !withSecurity) ./no-security-framework.patch;
|
||||
|
||||
# Skip some tests:
|
||||
@ -74,7 +76,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ lzo lzip libtasn1 libidn2 zlib gmp libunistring unbound gettext libiconv ]
|
||||
++ lib.optional (withP11-kit) p11-kit
|
||||
++ lib.optional (isDarwin && withSecurity) Security
|
||||
++ lib.optional (tpmSupport && stdenv.isLinux) trousers
|
||||
++ lib.optional guileBindings guile;
|
||||
|
||||
@ -82,7 +83,9 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optionals (isDarwin && !withSecurity) [ autoconf automake ]
|
||||
++ lib.optionals doCheck [ which nettools util-linux ];
|
||||
|
||||
propagatedBuildInputs = [ nettle ];
|
||||
propagatedBuildInputs = [ nettle ]
|
||||
# Builds dynamically linking against gnutls seem to need the framework now.
|
||||
++ lib.optional (isDarwin && withSecurity) Security;
|
||||
|
||||
inherit doCheck;
|
||||
# stdenv's `NIX_SSL_CERT_FILE=/no-cert-file.crt` breaks tests.
|
||||
|
||||
@ -13,9 +13,11 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
# networkmanager relies on libjansson.so:
|
||||
# https://github.com/NixOS/nixpkgs/pull/176302#issuecomment-1150239453
|
||||
cmakeFlags = [ "-DJANSSON_BUILD_SHARED_LIBS=ON" ];
|
||||
cmakeFlags = [
|
||||
# networkmanager relies on libjansson.so:
|
||||
# https://github.com/NixOS/nixpkgs/pull/176302#issuecomment-1150239453
|
||||
"-DJANSSON_BUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/akheron/jansson";
|
||||
|
||||
@ -5,6 +5,6 @@
|
||||
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
|
||||
|
||||
import ./generic.nix {
|
||||
version = "3.79";
|
||||
hash = "sha256-698tapZhO2/nCtV56fmD4OlOARAXHPspmdtjPTOUpRQ=";
|
||||
version = "3.80";
|
||||
hash = "sha256-wL8f0sfimmsCswliK6r8RD7skMiTS7FV2ku5iYh4S2o=";
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiounifi";
|
||||
version = "32";
|
||||
version = "33";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "Kane610";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YKkZMOlV4DPScNohU+M2J71CrIT3cHCHrzp4PIOAc5E=";
|
||||
hash = "sha256-MXzUQOC5Y33RgRKf5BPbA9VfQKKdRjawF9kW4QmSHkU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "awesomeversion";
|
||||
version = "22.5.2";
|
||||
version = "22.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
owner = "ludeeus";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-/La54qrejUhyoA1fRPEIItlKojTP5n5YmH+ovL6ASGk=";
|
||||
sha256 = "sha256-osAJzJr9PtGH8wcHam1BolIBTD8QDBWg3mI/z4JW0JE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "blinkpy";
|
||||
version = "0.19.0";
|
||||
version = "0.19.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,8 +19,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "fronzbot";
|
||||
repo = "blinkpy";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-niUGfktP1zVdrRCDy81ou4yAoscnYveHje9423IKcso=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-29wfdRbJ4U3ou/4jkpWBE2FrUuo09k4hTYLnIP1S3uU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,13 +11,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "channels";
|
||||
version = "3.0.4";
|
||||
version = "3.0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "django";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0jdylcb77n04rqyzg9v6qfzaxp1dnvdvnxddwh3x1qazw3csi5y2";
|
||||
sha256 = "sha256-bKrPLbD9zG7DwIYBst1cb+zkDsM8B02wh3D80iortpw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dremel3dpy";
|
||||
version = "1.0.1";
|
||||
version = "1.1.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-wqfCzS9dhRN/zerrC6g/O8tn0k1IC0wBdZMfWumtBds=";
|
||||
hash = "sha256-mf0YjK0nnuNnWgP20yqSgwc0SJfbqnvZqW0MKEXFTg8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyrogram";
|
||||
version = "2.0.27";
|
||||
version = "2.0.30";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "pyrogram";
|
||||
repo = "pyrogram";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-QYNE6VfbhlZpxc3CGitOs0zMwYI6RKQG/GhyWSNoaDI=";
|
||||
hash = "sha256-EG9LafZHqCC4klYm5gAlShnznGoaDOGsak4cEOh2OA4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytibber";
|
||||
version = "0.22.3";
|
||||
version = "0.23.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "Danielhiversen";
|
||||
repo = "pyTibber";
|
||||
rev = version;
|
||||
hash = "sha256-tM8Uu/TpP5a7y+ePFko0bMoZJWG2efYA861Ez8dPeFY=";
|
||||
hash = "sha256-DMYSv66PVBuOHuIio06OLrtGP0q7PeuDGKK+OznaLec=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "yq-go";
|
||||
version = "4.25.2";
|
||||
version = "4.25.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mikefarah";
|
||||
repo = "yq";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yvFh1wPOsmQLGTLrMG7dwcEukFpelP183Xa2n2XiHlQ=";
|
||||
sha256 = "sha256-136qmLHPBWPGiyIckSO9y3zpDxikGVy6w/f4UxWpvrw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-oUpHK6YKjKWTGL2yC1q2hK/K/gK8I+FwTVshTxHBOKI=";
|
||||
vendorSha256 = "sha256-pPZ5pR4RHzrb7k8akrBarUv7CHMCw+T4hfFJNGTrn8Y=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -1,21 +1,20 @@
|
||||
{ lib, stdenv, fetchFromGitHub, darwin, python2 }:
|
||||
{ lib, stdenv, fetchFromGitHub, darwin, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.2.1";
|
||||
version = "1.4.0";
|
||||
pname = "iproute2mac";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brona";
|
||||
repo = "iproute2mac";
|
||||
rev = "v${version}";
|
||||
sha256 = "1n6la7blbxza2m79cpnywsavhzsdv4gzdxrkly4dppyidjg6jy1h";
|
||||
sha256 = "sha256-xakCNjmZpdVY7MMxk38EZatrakgkEeDhvljhl+aMmGg=";
|
||||
};
|
||||
|
||||
buildInputs = [ python2 ];
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace src/ip.py \
|
||||
--replace /usr/bin/python ${python2}/bin/python \
|
||||
--replace /sbin/ifconfig ${darwin.network_cmds}/bin/ifconfig \
|
||||
--replace /sbin/route ${darwin.network_cmds}/bin/route \
|
||||
--replace /usr/sbin/netstat ${darwin.network_cmds}/bin/netstat \
|
||||
@ -32,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://github.com/brona/iproute2mac";
|
||||
description = "CLI wrapper for basic network utilites on Mac OS X inspired with iproute2 on Linux systems - ip command.";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ flokli ];
|
||||
maintainers = with maintainers; [ jiegec ];
|
||||
platforms = platforms.darwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -75,6 +75,11 @@ stdenv.mkDerivation rec {
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch?id=ed92963eb55bbc8d938097b9ccb3e221a94653f4";
|
||||
sha256 = "sha256-vl1wPbsHtXY9naajjnTicQ7Uj3N+EQ8pRNnrdsiow+w=";
|
||||
})
|
||||
(fetchurl {
|
||||
name = "CVE-2022-30065.patch";
|
||||
url = "https://git.alpinelinux.org/aports/plain/main/busybox/CVE-2022-30065.patch?id=4ffd996b3f8298c7dd424b912c245864c816e354";
|
||||
sha256 = "sha256-+WSYxI6eF8S0tya/S62f9Nc6jVMnHO0q1OyM69GlNTY=";
|
||||
})
|
||||
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch;
|
||||
|
||||
separateDebugInfo = true;
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, flex, bison, readline, libssh, nixosTests }:
|
||||
{ lib, stdenv, fetchurl, flex, bison, readline, libssh, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bird";
|
||||
version = "2.0.9";
|
||||
version = "2.0.10";
|
||||
|
||||
src = fetchurl {
|
||||
sha256 = "sha256-dnhrvN7TBh4bsiGwEfLMACIewGPenNoASn2bBhoJbV4=";
|
||||
sha256 = "sha256-ftNB3djch/qXNlhrNRVEeoQ2/sRC1l9AIhVaud4f/Vo=";
|
||||
url = "ftp://bird.network.cz/pub/bird/${pname}-${version}.tar.gz";
|
||||
};
|
||||
|
||||
@ -14,10 +14,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [
|
||||
./dont-create-sysconfdir-2.patch
|
||||
(fetchurl {
|
||||
url = "https://gitlab.nic.cz/labs/bird/-/commit/fcb4dd0c831339c4374ace17d8f2ae6ebfeed279.patch";
|
||||
sha256 = "sha256-PEgpRnOGLa1orHJDEHlblnVhBVv7XOKPR70M1wUMxMQ=";
|
||||
})
|
||||
];
|
||||
|
||||
CPP="${stdenv.cc.targetPrefix}cpp -E";
|
||||
|
||||
@ -8,11 +8,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bind";
|
||||
version = "9.18.3";
|
||||
version = "9.18.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://downloads.isc.org/isc/bind9/${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-CtjadzvZPLoO9mzIGZlpjr35w+UfrtXlyMHrdcrSrm8=";
|
||||
sha256 = "sha256-8neuUBWaAMMA65JqnF1RlTA4qTa9gkLWkT37bqxCdh0=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];
|
||||
|
||||
@ -213,6 +213,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
"cryptography"
|
||||
"httpx"
|
||||
"PyJWT"
|
||||
"requests"
|
||||
];
|
||||
in ''
|
||||
sed -r -i \
|
||||
|
||||
37
pkgs/tools/admin/chkservice/default.nix
Normal file
37
pkgs/tools/admin/chkservice/default.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, ninja, pkg-config, systemd, ncurses, lib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "chkservice";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxenko";
|
||||
repo = "chkservice";
|
||||
rev = version;
|
||||
hash = "sha256:0dfvm62h6dwg18f17fn58nr09mfh6kylm8wy88j00fiy13l4wnb6";
|
||||
};
|
||||
|
||||
# Tools needed during build time
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
# Makes the build faster, adds less than half a megabyte to the build
|
||||
# dependencies
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
systemd
|
||||
ncurses
|
||||
];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
meta = {
|
||||
description = "chkservice is a tool for managing systemd units in terminal.";
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ infinisil ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
homepage = "https://github.com/linuxenko/chkservice";
|
||||
};
|
||||
}
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "unrar";
|
||||
version = "6.1.6";
|
||||
version = "6.1.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
|
||||
sha256 = "sha256-Z/SriRwGIhjCut+qycjKtci/1eltq/ylbI+qPSCagB0=";
|
||||
hash = "sha256-3nW2E2lYFz/fxTDTigFFtyNCzw04Qr97sSDTNmAtiO0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
60
pkgs/tools/misc/sheldon/default.nix
Normal file
60
pkgs/tools/misc/sheldon/default.nix
Normal file
@ -0,0 +1,60 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchCrate
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, openssl
|
||||
, installShellFiles
|
||||
, Security
|
||||
, curl
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sheldon";
|
||||
version = "0.6.6";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-NjNBTjSaFoh+DAJfcM4G3+Meih1czLxs/RMmMwrXqD4=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-uRcaHuDLQm6OYqt01kLbW/mfZnL4HaDabaweaw1EOfs=";
|
||||
|
||||
buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin [ Security curl ];
|
||||
nativeBuildInputs = [ installShellFiles pkg-config ];
|
||||
|
||||
# Needs network connection
|
||||
checkFlags = [
|
||||
"--skip cli::tests::raw_opt_help"
|
||||
"--skip lock::tests::external_plugin_lock_git_with_matches"
|
||||
"--skip lock::tests::external_plugin_lock_git_with_matches_error"
|
||||
"--skip lock::tests::external_plugin_lock_git_with_matches_not_each"
|
||||
"--skip lock::tests::external_plugin_lock_git_with_uses"
|
||||
"--skip lock::tests::external_plugin_lock_remote"
|
||||
"--skip lock::tests::git_checkout_resolve_branch"
|
||||
"--skip lock::tests::git_checkout_resolve_rev"
|
||||
"--skip lock::tests::git_checkout_resolve_tag"
|
||||
"--skip lock::tests::locked_config_clean"
|
||||
"--skip lock::tests::source_lock_git_and_reinstall"
|
||||
"--skip lock::tests::source_lock_git_git_with_checkout"
|
||||
"--skip lock::tests::source_lock_git_https_with_checkout"
|
||||
"--skip lock::tests::source_lock_local"
|
||||
"--skip lock::tests::source_lock_remote_and_reinstall"
|
||||
"--skip lock::tests::source_lock_with_git"
|
||||
"--skip lock::tests::source_lock_with_remote"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd sheldon \
|
||||
--bash <($out/bin/sheldon completions --shell bash) \
|
||||
--zsh <($out/bin/sheldon completions --shell zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fast and configurable shell plugin manager";
|
||||
homepage = "https://github.com/rossmacarthur/sheldon";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ seqizz ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "godns";
|
||||
version = "2.7.8";
|
||||
version = "2.7.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "TimothyYe";
|
||||
repo = "godns";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8uGw8F4HcpSsZF8X4cYz9ETsLLBH/NbOk2QzbAXFVFo=";
|
||||
sha256 = "sha256-gFleIRXYfO/gocyVyVzp3ZnJ6gUVmR7IAc0Z985YnVI=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-tXH62HyA/pJxt69GWkVrJ4VrA16KfpEtpK/YKiUkvtU=";
|
||||
|
||||
@ -207,6 +207,10 @@ with pkgs;
|
||||
}
|
||||
'');
|
||||
|
||||
chkservice = callPackage ../tools/admin/chkservice {
|
||||
stdenv = gcc10StdenvCompat;
|
||||
};
|
||||
|
||||
addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { };
|
||||
|
||||
quickemu = callPackage ../development/quickemu { };
|
||||
@ -4306,6 +4310,8 @@ with pkgs;
|
||||
|
||||
shab = callPackage ../tools/text/shab { };
|
||||
|
||||
sheldon = callPackage ../tools/misc/sheldon { };
|
||||
|
||||
shell-hist = callPackage ../tools/misc/shell-hist { };
|
||||
|
||||
shellhub-agent = callPackage ../applications/networking/shellhub-agent { };
|
||||
@ -30298,7 +30304,9 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
tig = callPackage ../applications/version-management/git-and-tools/tig { };
|
||||
tig = callPackage ../applications/version-management/git-and-tools/tig {
|
||||
readline = readline81;
|
||||
};
|
||||
|
||||
tilemaker = callPackage ../applications/misc/tilemaker { };
|
||||
|
||||
@ -35729,7 +35737,7 @@ with pkgs;
|
||||
|
||||
xsos = callPackage ../os-specific/linux/xsos { };
|
||||
|
||||
xmcp = callPackage ../tools/x11/xmcp { };
|
||||
xmcp = callPackage ../tools/X11/xmcp { };
|
||||
|
||||
zk = callPackage ../applications/office/zk {};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user