Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-04-18 06:01:59 +00:00 committed by GitHub
commit 03fdcff754
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 580 additions and 387 deletions

View file

@ -7,10 +7,6 @@ let
nssModulesPath = config.system.nssModules.path;
cfg = config.services.nscd;
nscd = if pkgs.stdenv.hostPlatform.libc == "glibc"
then pkgs.stdenv.cc.libc.bin
else pkgs.glibc.bin;
in
{
@ -37,6 +33,14 @@ in
description = "Configuration to use for Name Service Cache Daemon.";
};
package = mkOption {
type = types.package;
default = if pkgs.stdenv.hostPlatform.libc == "glibc"
then pkgs.stdenv.cc.libc.bin
else pkgs.glibc.bin;
description = "package containing the nscd binary to be used by the service";
};
};
};
@ -69,16 +73,16 @@ in
# files. So prefix the ExecStart command with "!" to prevent systemd
# from dropping privileges early. See ExecStart in systemd.service(5).
serviceConfig =
{ ExecStart = "!@${nscd}/sbin/nscd nscd";
{ ExecStart = "!@${cfg.package}/bin/nscd nscd";
Type = "forking";
DynamicUser = true;
RuntimeDirectory = "nscd";
PIDFile = "/run/nscd/nscd.pid";
Restart = "always";
ExecReload =
[ "${nscd}/sbin/nscd --invalidate passwd"
"${nscd}/sbin/nscd --invalidate group"
"${nscd}/sbin/nscd --invalidate hosts"
[ "${cfg.package}/bin/nscd --invalidate passwd"
"${cfg.package}/bin/nscd --invalidate group"
"${cfg.package}/bin/nscd --invalidate hosts"
];
};
};

View file

@ -40,10 +40,10 @@
"owner": "aliyun",
"provider-source-address": "registry.terraform.io/aliyun/alicloud",
"repo": "terraform-provider-alicloud",
"rev": "v1.163.0",
"sha256": "sha256-lSg8jAzQfRc++U6zAhkfbVf/+hIW/1Nov35o6M8mRrw=",
"vendorSha256": "sha256-8dAk23ISxYuYKj5s0W6g93RBW1++NuZEPva5MaNBSyw=",
"version": "1.163.0"
"rev": "v1.164.0",
"sha256": "sha256-UZ+/l8eBpzo0KBW6x8koLzBt0QniHjP73zdjKIw8ByI=",
"vendorSha256": "sha256-xxq+VOG6FkX1perAcXOiFtL/bjsHl9IWIJb5dfaIkpY=",
"version": "1.164.0"
},
"ansible": {
"owner": "nbering",
@ -94,10 +94,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/aws",
"repo": "terraform-provider-aws",
"rev": "v4.9.0",
"sha256": "sha256-VLw2bqL6VEKwqzXYkNJGJtIi8gg+3/oCwbBf9UtATE4=",
"vendorSha256": "sha256-7pwwQHgtHO3GfcEAOHALo01i1pt9WsriZZkJjFzjwRE=",
"version": "4.9.0"
"rev": "v4.10.0",
"sha256": "sha256-FhW7+Ot1cVxTdDFuwP+Xq9LCfogRTJ7wlTU5TR98UPA=",
"vendorSha256": "sha256-91SSNiWHFcNWg6Ssr8XA+uiOoAbuBpivDPmkzWlFvPk=",
"version": "4.10.0"
},
"azuread": {
"owner": "hashicorp",
@ -112,10 +112,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/azurerm",
"repo": "terraform-provider-azurerm",
"rev": "v3.1.0",
"sha256": "sha256-idrGxmfhnMKvxtKJtjLs321D008Mcv27cHyhAjwCZfA=",
"rev": "v3.2.0",
"sha256": "sha256-GKI6d2zSaaEaKnt6MLqzEbLjLYdrIOa+aeIlFPa5hM4=",
"vendorSha256": null,
"version": "3.1.0"
"version": "3.2.0"
},
"azurestack": {
"owner": "hashicorp",
@ -139,19 +139,19 @@
"owner": "F5Networks",
"provider-source-address": "registry.terraform.io/F5Networks/bigip",
"repo": "terraform-provider-bigip",
"rev": "v1.13.0",
"sha256": "0l1fgbzv3zjsgmnkg96ac299plx9zi4j54cjxrl27csvf87wi4lv",
"rev": "v1.13.1",
"sha256": "sha256-nNcOHTFJrvvjKAZUsb1IVTp71/Xk5OuSzihPyi08anw=",
"vendorSha256": null,
"version": "1.13.0"
"version": "1.13.1"
},
"bitbucket": {
"owner": "DrFaust92",
"provider-source-address": "registry.terraform.io/DrFaust92/bitbucket",
"repo": "terraform-provider-bitbucket",
"rev": "v2.14.0",
"sha256": "sha256-tF1Q55mxwPU6dziiNzdacNtHvemd9ciQHE2E6een1WY=",
"rev": "v2.15.0",
"sha256": "sha256-m9LNW73CZHfOHX7qIn5Xm5JbMoV6ADGpxL9HNn8E+kA=",
"vendorSha256": "sha256-L8QYz1xgw8ZQjrU33uP18XxNUjImPYATZ02h46G4aXs=",
"version": "2.14.0"
"version": "2.15.0"
},
"brightbox": {
"owner": "brightbox",
@ -194,10 +194,10 @@
"owner": "cloudflare",
"provider-source-address": "registry.terraform.io/cloudflare/cloudflare",
"repo": "terraform-provider-cloudflare",
"rev": "v3.12.1",
"sha256": "sha256-8l6+hyjW+N3N5OGj/cviH97EFqouSrnJULk/SXrYCTk=",
"rev": "v3.12.2",
"sha256": "sha256-vshZlMLfyRxbzsk6H34PZb5+RowpEJEvWhNVYzrySeg=",
"vendorSha256": "sha256-v6fUzYwrYt4rk5LT0LyNd8e9X79r3dwtd3s1QIV/w/s=",
"version": "3.12.1"
"version": "3.12.2"
},
"cloudfoundry": {
"owner": "cloudfoundry-community",
@ -227,22 +227,23 @@
"version": "3.2.0"
},
"constellix": {
"deleteVendor": true,
"owner": "Constellix",
"provider-source-address": "registry.terraform.io/Constellix/constellix",
"repo": "terraform-provider-constellix",
"rev": "v0.4.3",
"sha256": "sha256-U5jQVa4dJTqH06psx/vNLSlL8muV15SgkyoM820PwjI=",
"vendorSha256": null,
"version": "0.4.3"
"rev": "v0.4.5",
"sha256": "sha256-ecwXWYrs7XJM1web+kia2ccpvTjxAVFPzav6lLal4e4=",
"vendorSha256": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=",
"version": "0.4.5"
},
"consul": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/consul",
"repo": "terraform-provider-consul",
"rev": "v2.15.0",
"sha256": "sha256-6NQL1ZlHZsxfoRV0zMOXApuCR+nj8CPWjpxj7BAJivY=",
"rev": "v2.15.1",
"sha256": "sha256-QX0f9yM408HfdGNIpmkAKFUz0RfH90V4WBt1Hnwzoy8=",
"vendorSha256": null,
"version": "2.15.0"
"version": "2.15.1"
},
"ct": {
"owner": "poseidon",
@ -302,10 +303,10 @@
"owner": "dnsimple",
"provider-source-address": "registry.terraform.io/dnsimple/dnsimple",
"repo": "terraform-provider-dnsimple",
"rev": "v0.11.1",
"sha256": "0jzw1kjykbka59kx30xm3qicjb6fdmm5l4f2dr8g7nxdaqnxri0s",
"vendorSha256": "06wggchs5khzyg6fd9s0qj76awnw28s7l278awanqimqgqajijkj",
"version": "0.11.1"
"rev": "v0.11.3",
"sha256": "sha256-fUs54xIecPgeQucuQmlpF2iHGonx4OsqFbhkMnO7d0c=",
"vendorSha256": "sha256-csooFX64RmwVV+gIejQS3HJljsRAp+bM8x/OoiF7jxs=",
"version": "0.11.3"
},
"docker": {
"owner": "kreuzwerker",
@ -383,10 +384,10 @@
"owner": "go-gandi",
"provider-source-address": "registry.terraform.io/go-gandi/gandi",
"repo": "terraform-provider-gandi",
"rev": "v2.0.0",
"sha256": "0xvdnjadcddrrfhhp198mraf2bm01xfy7gapjay441dbzffynw1m",
"vendorSha256": "1yccjnz6xw3b51xqmiaw78m87y2xmlp9z5z3gx5dbzz0lkj1k523",
"version": "2.0.0"
"rev": "v2.0.1",
"sha256": "sha256-lcJoDBVoNvNbB5V1rSk09d7pnfVN+FHROtyZCNmZfBk=",
"vendorSha256": "sha256-sloRWqk8j8UWM7gVFaiJ3SmBgnWN/BbFfATQWzpXI7k=",
"version": "2.0.1"
},
"github": {
"owner": "integrations",
@ -411,20 +412,20 @@
"provider-source-address": "registry.terraform.io/hashicorp/google",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.16.0",
"sha256": "sha256-kp6AldlkjiNd3R3hz+wB2uBQ37TyZ0hoEhxQYiFmO7g=",
"rev": "v4.17.0",
"sha256": "sha256-7yGZpCErpriLrqHpCnXmkJkrGMQPkD70NmzuZ0ghF7o=",
"vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=",
"version": "4.16.0"
"version": "4.17.0"
},
"google-beta": {
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.16.0",
"sha256": "sha256-m5K2q83WbWVfjG7vhlh71k14GEXNs+2JfK/S1GnC5c0=",
"rev": "v4.17.0",
"sha256": "sha256-JaZZRjQR9+aH9KTJrazLXlbQ1drIOfE8sOVYi29F1fs=",
"vendorSha256": "sha256-l2OviwplP/Sg2ShaEA88pMwVTkREnLkFAzterjr2kvU=",
"version": "4.16.0"
"version": "4.17.0"
},
"grafana": {
"owner": "grafana",
@ -457,10 +458,10 @@
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/helm",
"repo": "terraform-provider-helm",
"rev": "v2.5.0",
"sha256": "sha256-stJO23B/DNOvAU71S/N3iML1PVQrpmbhoh7e31MI+BY=",
"rev": "v2.5.1",
"sha256": "sha256-PX8mls0m/7B5WULEDVHutzvjAr0a54vg734mBbRQZNA=",
"vendorSha256": null,
"version": "2.5.0"
"version": "2.5.1"
},
"heroku": {
"owner": "heroku",
@ -493,10 +494,10 @@
"owner": "huaweicloud",
"provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud",
"repo": "terraform-provider-huaweicloud",
"rev": "v1.35.0",
"sha256": "sha256-OQGrxnXeYSGLnfD8NuWncag1sSGlSZCipe0CykzzupU=",
"rev": "v1.35.1",
"sha256": "sha256-EC2o+olQaGCAX/0JGlXNMF8QE1k6BjC/4SttbGOxFFw=",
"vendorSha256": null,
"version": "1.35.0"
"version": "1.35.1"
},
"huaweicloudstack": {
"owner": "huaweicloud",
@ -601,10 +602,10 @@
"owner": "launchdarkly",
"provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly",
"repo": "terraform-provider-launchdarkly",
"rev": "v2.6.0",
"sha256": "sha256-Mf7oV5G5XjnE+3m8EDczDvrtn2s4nrNCTdAJz1n9v2Y=",
"rev": "v2.6.1",
"sha256": "sha256-pdANr7W4d6+8WdAxcqSTpyEIshd6FVYy0+25wfDt4d8=",
"vendorSha256": "sha256-HKea86ck97uc/Gv6geJm9TTRfG6bnpB+q8cuU/jubI8=",
"version": "2.6.0"
"version": "2.6.1"
},
"libvirt": {
"owner": "dmacvicar",
@ -682,10 +683,10 @@
"owner": "equinix",
"provider-source-address": "registry.terraform.io/equinix/metal",
"repo": "terraform-provider-metal",
"rev": "v3.3.0-alpha.2",
"sha256": "sha256-RUD4BJy0/s23+OWlQfFEh59BEhhtobW7zDOOcosC0l4=",
"rev": "v3.3.0-alpha.3",
"sha256": "sha256-wuZp0Be8a84y7JqpCGnBDPXgNG8JJcNWsIICP3ZjSVk=",
"vendorSha256": "sha256-Ln9EyycPduVuj+JefH9f+Q5KlNGvbcwcEDgaqH2M0So=",
"version": "3.3.0-alpha.2"
"version": "3.3.0-alpha.3"
},
"minio": {
"owner": "aminueza",
@ -736,10 +737,10 @@
"owner": "newrelic",
"provider-source-address": "registry.terraform.io/newrelic/newrelic",
"repo": "terraform-provider-newrelic",
"rev": "v2.42.0",
"sha256": "sha256-OD0wahsEw86E7TbUxIqEhoZ85An9yRwgTENtdoYnFB0=",
"rev": "v2.42.1",
"sha256": "sha256-3lrO3BOP3X6Pr9wPnWsuQenesRTEDHzlkenIia6YiS8=",
"vendorSha256": "sha256-G/GWIE+XeLiHW0xxyjbIpncAnpBmC/+iZnI8MFmi80k=",
"version": "2.42.0"
"version": "2.42.1"
},
"nomad": {
"owner": "hashicorp",
@ -754,10 +755,10 @@
"owner": "ns1-terraform",
"provider-source-address": "registry.terraform.io/ns1-terraform/ns1",
"repo": "terraform-provider-ns1",
"rev": "v1.12.5",
"sha256": "0g69jr96ns2h578cmh5zz27m5dkgygrfr6shvx79wal26fpr8413",
"vendorSha256": "0s70626ng7pvqxnx0a4rp22b8spy45y011bvvm77fndm8fc1w9zn",
"version": "1.12.5"
"rev": "v1.12.6",
"sha256": "sha256-nP951YipGzsweJvV2PE0UlWGP+cAM6s18F5MCcxTxeo=",
"vendorSha256": "sha256-MaJHCxvD9BM5G8wJbSo06+TIPvJTlXzQ+l9Kdbg0QQw=",
"version": "1.12.6"
},
"nsxt": {
"owner": "vmware",
@ -782,19 +783,19 @@
"owner": "nutanix",
"provider-source-address": "registry.terraform.io/nutanix/nutanix",
"repo": "terraform-provider-nutanix",
"rev": "v1.5.0-beta",
"sha256": "sha256-Luu0myRCzlVpKouFnE7MXESzkxCXxNe2ZfxFUCpGpiU=",
"rev": "v1.5.0-beta.2",
"sha256": "sha256-eC42HXh8Tk3TXWtdeVbv4UGMss3lh4vYyGPypB353X0=",
"vendorSha256": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=",
"version": "1.5.0-beta"
"version": "1.5.0-beta.2"
},
"oci": {
"owner": "oracle",
"provider-source-address": "registry.terraform.io/oracle/oci",
"repo": "terraform-provider-oci",
"rev": "v4.70.0",
"sha256": "sha256-KgpYl1DllCkpXbxYp8cqKE28l4digmaB75BoL6CpkQA=",
"rev": "v4.71.0",
"sha256": "sha256-8v9zfYlWqeKQlk1hNL7iif/AfEjI5lC0clUwgpA132U=",
"vendorSha256": null,
"version": "4.70.0"
"version": "4.71.0"
},
"okta": {
"owner": "okta",
@ -845,10 +846,10 @@
"owner": "opentelekomcloud",
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
"rev": "v1.29.0",
"sha256": "sha256-jhG2TyinnlPPIVA2K+ckOcxlqxeUFkp+WFJcJqYQ13k=",
"vendorSha256": "sha256-qNJ1jkbGgFUxvHYUMPX9kBAwQSx4vfOr7eS0Z6J7X8Q=",
"version": "1.29.0"
"rev": "v1.29.1",
"sha256": "sha256-c7kRS3c+n/5oN3PDKsJzkiK8ravRjBTJHhhqLHy9nhQ=",
"vendorSha256": "sha256-kSZvxbovF2/oCqFY/0zpGmAhLFuCw6nWG3B4ppyxzLY=",
"version": "1.29.1"
},
"opsgenie": {
"owner": "opsgenie",
@ -962,10 +963,10 @@
"owner": "scaleway",
"provider-source-address": "registry.terraform.io/scaleway/scaleway",
"repo": "terraform-provider-scaleway",
"rev": "v2.2.1-rc.2",
"sha256": "sha256-7T+J4T0qm7QMGWWjIT0nKHkHzd6wfFNP3suF7GitErc=",
"vendorSha256": "sha256-kfr8YqLr8CXntkiMEHA5kosZqkloV4rGjEmdXosT7WU=",
"version": "2.2.1-rc.2"
"rev": "v2.2.1-rc.3",
"sha256": "sha256-XprfY4Zy3PIrIJA2F1tnwafg4wYuzrm9nwVZULdX1D0=",
"vendorSha256": "sha256-H5KAo2rpgFGYmOgGOx9Z5LuApmftuYA6PfYCjnr7zC0=",
"version": "2.2.1-rc.3"
},
"secret": {
"owner": "numtide",
@ -980,10 +981,10 @@
"owner": "selectel",
"provider-source-address": "registry.terraform.io/selectel/selectel",
"repo": "terraform-provider-selectel",
"rev": "v3.8.0",
"sha256": "0qc08v217cv2i43cxcx854rvhihrlhlakfark37vcdrh9z6swf1n",
"vendorSha256": "1mjp5yqwl1nya82yf5v6l3sq7iv0m94xy5w7y5avn8h40dl1wfnf",
"version": "3.8.0"
"rev": "v3.8.1",
"sha256": "sha256-542fWLMJ9nO3Pu/QpUFZtu2eQoQOaAjaaK3aqtyoJPQ=",
"vendorSha256": "sha256-kmsO9jFoR/93PkOeIo0pkS/OjE+m3QbIspobAv/9+KI=",
"version": "3.8.1"
},
"sentry": {
"owner": "jianyuan",
@ -1007,10 +1008,10 @@
"owner": "splunk-terraform",
"provider-source-address": "registry.terraform.io/splunk-terraform/signalfx",
"repo": "terraform-provider-signalfx",
"rev": "v6.11.1",
"sha256": "sha256-37D4nblpGK8duohDiyY4UR0jn+T6QX7LnCfGtPdYQ3k=",
"vendorSha256": "sha256-PVbqS37MBkIrr8CO6LxB0NjWWiTI5NFDipX6GvokrnY=",
"version": "6.11.1"
"rev": "v6.12.0",
"sha256": "sha256-mTPiJc2AbtSAHM5J9Wr9fb/M/GDFMCIHod0DAT9DDvI=",
"vendorSha256": "sha256-hI0yz796+xxAFQg+O/2g5ueNx/wrx/40DlQyxtx11aQ=",
"version": "6.12.0"
},
"skytap": {
"owner": "skytap",
@ -1025,10 +1026,10 @@
"owner": "chanzuckerberg",
"provider-source-address": "registry.terraform.io/chanzuckerberg/snowflake",
"repo": "terraform-provider-snowflake",
"rev": "v0.30.0",
"sha256": "sha256-JHpwqMyt/oMZv6P4xEOlyV0pL32HQselDg+dP9JGRpg=",
"vendorSha256": "sha256-G/UIKuKtolLY7RIQF06wzn/ZYTMihEmJZ1DqVcHFGdg=",
"version": "0.30.0"
"rev": "v0.31.0",
"sha256": "sha256-KYgvtdGkzju1qpECVX5vtY7U8JNa8anSmaTq8PwJEl8=",
"vendorSha256": "sha256-l++IzY3/W4qsdFJY7ik0xF6tZWluLb4EcW5KQtBVY5s=",
"version": "0.31.0"
},
"sops": {
"owner": "carlpett",
@ -1043,10 +1044,10 @@
"owner": "spotinst",
"provider-source-address": "registry.terraform.io/spotinst/spotinst",
"repo": "terraform-provider-spotinst",
"rev": "v1.71.0",
"sha256": "sha256-Fcx0KHTAAOQE/Qa+84p5l5ve5nrWXZHgRyc3xNYBJoQ=",
"rev": "v1.72.0",
"sha256": "sha256-h70Tcp+VODMgUDBBcR4Vhqvln76rhwgnfKjIK2+hphw=",
"vendorSha256": "sha256-pI9jX/Wp6Nu1ix82ZE2CBZYu0j4S+HH2+dD5G679VrE=",
"version": "1.71.0"
"version": "1.72.0"
},
"stackpath": {
"owner": "stackpath",
@ -1088,10 +1089,10 @@
"owner": "tencentcloudstack",
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.67.0",
"sha256": "sha256-61Fhh/BW1Iv/7wMU0lDMxPdB86Wqf43F90ZoWM990K0=",
"rev": "v1.69.0",
"sha256": "sha256-GArlBMlQdEjITqvAAcnhurJtYjs03U8pAzcdbuXzbss=",
"vendorSha256": null,
"version": "1.67.0"
"version": "1.69.0"
},
"tfe": {
"owner": "hashicorp",
@ -1161,10 +1162,10 @@
"owner": "cloudposse",
"provider-source-address": "registry.terraform.io/cloudposse/utils",
"repo": "terraform-provider-utils",
"rev": "0.17.19",
"sha256": "sha256-FTZyri4/6QWkLKKectzx3av8fnoDkOIyAkAPasFU8sU=",
"vendorSha256": "sha256-FA2Hev7RS3ZJ/cDTgyZ7uMFlQB/VdJ19GZUpkWTEPV8=",
"version": "0.17.19"
"rev": "0.17.20",
"sha256": "sha256-+pk2cUmYzQsa40iMvbdkYmZtoXOb5ALU/p0EEZx2AIw=",
"vendorSha256": "sha256-cb8Hqe3lGfjNpGmhrJ64x6w/iFW22Ma4AJo2w29kjR0=",
"version": "0.17.20"
},
"vault": {
"owner": "hashicorp",
@ -1179,19 +1180,19 @@
"owner": "vmware",
"provider-source-address": "registry.terraform.io/vmware/vcd",
"repo": "terraform-provider-vcd",
"rev": "v3.5.1",
"sha256": "1fwkbsgnxn0jl84nji57grasdsbw0ydd7vzcllpv7r1z3jpa545q",
"vendorSha256": "0bzp6807l4hspk1c1pmgnzk0axk0nir3v0lqmw9xvkij4c5rnz9s",
"version": "3.5.1"
"rev": "v3.6.0",
"sha256": "sha256-vtqlT3cfrEsbTmsKY6SVYUgyo+zIiX0cK080H03C1d0=",
"vendorSha256": "sha256-g5qcT4xaXQMih4WN3ysk+xGwd3ux8XjMceXgmw8gYB0=",
"version": "3.6.0"
},
"venafi": {
"owner": "Venafi",
"provider-source-address": "registry.terraform.io/Venafi/venafi",
"repo": "terraform-provider-venafi",
"rev": "v0.15.3",
"sha256": "sha256-qucPKnzUNYnnEe0rJoe3RhzBYIJJJroz3qTo8VlQBAE=",
"vendorSha256": "sha256-lj8cuv9jR+3P7OiO/eW8poHcX+LsQo+kOyspiqdMXRY=",
"version": "0.15.3"
"rev": "v0.15.5",
"sha256": "sha256-aNh9P7QqhmdywP47mddcGSDRxkwkrus14tku/xrQcz8=",
"vendorSha256": "sha256-SKdSjBXLX344zt0GeGBLNp8cFw+PO9ObT9jC+dHp/h8=",
"version": "0.15.5"
},
"vercel": {
"owner": "ondrejsika",

View file

@ -29,7 +29,7 @@
stdenv.mkDerivation rec {
pname = "chatty";
version = "0.6.1";
version = "0.6.3";
src = fetchFromGitLab {
domain = "source.puri.sm";
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
repo = "chatty";
rev = "v${version}";
fetchSubmodules = true;
hash = "sha256-AufxwuOibTx5OvLBVbJqay/mYLmcDpE2BgwVv6Y5IlY=";
hash = "sha256-BILi3+i7SCiK7dVbckv3cNMNyEwgKMf0ct0z/J1xysI=";
};
postPatch = ''

View file

@ -43,13 +43,13 @@
stdenv.mkDerivation rec {
pname = "evince";
version = "42.1";
version = "42.2";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "skdnuz1RA7TjWw4VzwM9viSI+IcAzdiC0ipDre7C6Ao=";
sha256 = "/3+B8wjPjUlW7Zf7ckp+SUSMIUvuq5mIEu+e+7ON+K4=";
};
postPatch = ''

View file

@ -0,0 +1,20 @@
--- old/test/doctest.h 2019-03-05 18:04:06.143740733 +0300
+++ new/test/doctest.h 2019-03-05 18:04:43.577284916 +0300
@@ -1307,7 +1307,7 @@
__FILE__, __LINE__, #expr, #as); \
try { \
expr; \
- } catch(as) { \
+ } catch(as e) { \
_DOCTEST_RB.m_threw = true; \
_DOCTEST_RB.m_threw_as = true; \
} catch(...) { _DOCTEST_RB.m_threw = true; } \
@@ -1332,7 +1332,7 @@
#define DOCTEST_REQUIRE_THROWS(expr) DOCTEST_ASSERT_THROWS(expr, DT_REQUIRE_THROWS)
#define DOCTEST_WARN_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_WARN_THROWS_AS)
-#define DOCTEST_CHECK_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_CHECK_THROWS_AS)
+#define DOCTEST_CHECK_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, const ex &, DT_CHECK_THROWS_AS)
#define DOCTEST_REQUIRE_THROWS_AS(expr, ex) DOCTEST_ASSERT_THROWS_AS(expr, ex, DT_REQUIRE_THROWS_AS)
#define DOCTEST_WARN_NOTHROW(expr) DOCTEST_ASSERT_NOTHROW(expr, DT_WARN_NOTHROW)

View file

@ -0,0 +1,46 @@
{ lib
, stdenv
, fetchFromGitHub
, cmake
}:
stdenv.mkDerivation rec {
pname = "argagg";
version = "0.4.6";
src = fetchFromGitHub {
owner = "vietjtnguyen";
repo = pname;
rev = version;
hash = "sha256-MCtlAPfwdJpgfS8IH+zlcgaaxZ5AsP4hJvbZAFtOa4o=";
};
patches = [
# Fix compilation of macro catch statement
./0001-catch.diff
];
nativeBuildInputs = [
cmake
];
meta = with lib; {
homepage = "https://github.com/vietjtnguyen/argagg";
description = "Argument Aggregator";
longDescription = ''
argagg is yet another C++ command line argument/option parser. It was
written as a simple and idiomatic alternative to other frameworks like
getopt, Boost program options, TCLAP, and others. The goal is to achieve
the majority of argument parsing needs in a simple manner with an easy to
use API. It operates as a single pass over all arguments, recognizing
flags prefixed by - (short) or -- (long) and aggregating them into easy to
access structures with lots of convenience functions. It defers processing
types until you access them, so the result structures end up just being
pointers into the original command line argument C-strings.
'';
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
platforms = with platforms; all;
badPlatforms = [ "aarch64-darwin" ];
};
}

View file

@ -1,54 +1,36 @@
{ lib, fetchFromGitHub, fetchpatch, rustPlatform
, openssl, cmake, perl, pkg-config, zlib, curl, libgit2, libssh2
{ lib, rustPlatform, fetchFromGitHub
, pkg-config, openssl, zlib, curl, libgit2, libssh2
}:
with rustPlatform;
buildRustPackage rec {
version = "0.9.1";
rustPlatform.buildRustPackage rec {
pname = "git-series";
version = "unstable-2019-10-15";
src = fetchFromGitHub {
owner = "git-series";
repo = "git-series";
rev = version;
sha256 = "07mgq5h6r1gf3jflbv2khcz32bdazw7z1s8xcsafdarnm13ps014";
rev = "c570a015e15214be46a7fd06ba08526622738e20";
sha256 = "1i0m2b7ma6xvkg95k57gaj1wpc1rfvka6h8jr5hglxmqqbz6cb6w";
};
cargoSha256 = "0870f4rd98fbmyl8524ivfg3xf4qpzb1x68q1idnl47mmf68pyx8";
cargoSha256 = "1hmx14z3098c98achgii0jkcm4474iw762rmib77amcsxj73zzdh";
cargoPatches = [
(fetchpatch {
url = "https://github.com/Mic92/git-series/commit/3aa30a47d74ebf90b444dccdf8c153f07f119483.patch";
sha256 = "06v8br9skvy75kcw2zgbswxyk82sqzc8smkbqpzmivxlc2i9rnh0";
})
# Update Cargo.lock to allow using OpenSSL 1.1
(fetchpatch {
url = "https://github.com/edef1c/git-series/commit/11fe70ffcc18200e5f2a159c36aab070e8ff4228.patch";
sha256 = "0clwllf9mrhq86dhzyyhkw1q2ggpgqpw7s05dvp3gj9zhfsyya4s";
})
# Cargo.lock: Update url, which fixes incompatibility with NLL
(fetchpatch {
url = "https://github.com/edef1c/git-series/commit/27ff2ecf2d615dae1113709eca0e43596de12ac4.patch";
sha256 = "1byjbdcx56nd0bbwz078bl340rk334mb34cvaa58h76byvhpkw10";
})
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl zlib curl libgit2 libssh2 ];
LIBGIT2_SYS_USE_PKG_CONFIG = true;
LIBSSH2_SYS_USE_PKG_CONFIG = true;
nativeBuildInputs = [ cmake pkg-config perl ];
buildInputs = [ openssl zlib curl libgit2 libssh2 ];
postBuild = ''
postInstall = ''
install -D "$src/git-series.1" "$out/man/man1/git-series.1"
'';
meta = with lib; {
description = "A tool to help with formatting git patches for review on mailing lists";
longDescription = ''
git series tracks changes to a patch series over time. git
series also tracks a cover letter for the patch series,
formats the series for email, and prepares pull requests.
git series tracks changes to a patch series over time. git
series also tracks a cover letter for the patch series,
formats the series for email, and prepares pull requests.
'';
homepage = "https://github.com/git-series/git-series";

View file

@ -0,0 +1,41 @@
From 9d76d183a97cb667a1ab6d95af69d6db745215df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <milan@petabyte.dev>
Date: Tue, 1 Jun 2021 16:55:45 +0200
Subject: [PATCH] adjust socket paths for nixos
The original unscd would crash, because it is not allowed to create its
legacy socket at /var/run/.nscd_socket.
This socket is only required for very old glibc versions, but removing it
is currently non-trivial, so we just move it somewhere, where it is
allowed to be created. A patch has been submitted upstream to make this
hack unnecessary.
Also change /var/run to /run, since we shouldn't be using /var/run
anymore.
---
nscd.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/nscd.c b/nscd.c
index a71e474..0cd7106 100644
--- a/nscd.c
+++ b/nscd.c
@@ -2100,10 +2100,10 @@ static void main_loop(void)
** Initialization
*/
-#define NSCD_PIDFILE "/var/run/nscd/nscd.pid"
-#define NSCD_DIR "/var/run/nscd"
-#define NSCD_SOCKET "/var/run/nscd/socket"
-#define NSCD_SOCKET_OLD "/var/run/.nscd_socket"
+#define NSCD_PIDFILE "/run/nscd/nscd.pid"
+#define NSCD_DIR "/run/nscd"
+#define NSCD_SOCKET "/run/nscd/socket"
+#define NSCD_SOCKET_OLD "/run/nscd/socket_legacy"
static smallint wrote_pidfile;
--
2.31.1

View file

@ -0,0 +1,76 @@
{ fetchurl, fetchpatch, stdenv, systemd, lib }:
stdenv.mkDerivation rec {
pname = "unscd";
version = "0.54";
src = fetchurl {
url = "https://busybox.net/~vda/unscd/nscd-${version}.c";
sha256 = "0iv4iwgs3sjnqnwd7dpcw6s7i4ar9q89vgsms32clx14fdqjrqch";
};
unpackPhase = ''
runHook preUnpack
cp $src nscd.c
chmod u+w nscd.c
runHook postUnpack
'';
patches = [
# Patches from Debian that have not (yet) been included upstream, but are useful to us
(fetchpatch {
url = "https://sources.debian.org/data/main/u/${pname}/${version}-1/debian/patches/change_invalidate_request_info_output";
sha256 = "17whakazpisiq9nnw3zybaf7v3lqkww7n6jkx0igxv4z2r3mby6l";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/u/${pname}/${version}-1/debian/patches/support_large_numbers_in_config";
sha256 = "0jrqb4cwclwirpqfb6cvnmiff3sm2jhxnjwxa7h0wx78sg0y3bpp";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/u/${pname}/${version}-1/debian/patches/no_debug_on_invalidate";
sha256 = "0znwzb522zgikb0mm7awzpvvmy0wf5z7l3jgjlkdpgj0scxgz86w";
})
(fetchpatch {
url = "https://sources.debian.org/data/main/u/${pname}/${version}-1/debian/patches/notify_systemd_about_successful_startup";
sha256 = "1ipwmbfwm65yisy74nig9960vxpjx683l3skgxfgssfx1jb9z2mc";
})
# The original unscd would crash, because it is not allowed to create its
# legacy socket at /var/run/.nscd_socket.
# This socket is only required for very old glibc versions, but removing it
# is currently non-trivial, so we just move it somewhere, where it is
# allowed to be created. A patch has been submitted upstream to make this
# hack unnecessary.
# Also change /var/run to /run, since we shouldn't be using /var/run
# anymore.
# See also: http://lists.busybox.net/pipermail/busybox/2021-June/088866.html
./0001-adjust-socket-paths-for-nixos.patch
];
buildInputs = [ systemd ];
buildPhase = ''
runHook preBuild
gcc -Wall \
-Wl,--sort-section -Wl,alignment \
-Wl,--sort-common \
-fomit-frame-pointer \
-lsystemd \
-o nscd nscd.c
runHook postBuild
'';
installPhase = ''
runHook preInstall
install -Dm755 -t $out/bin nscd
runHook postInstall
'';
meta = with lib; {
homepage = "https://busybox.net/~vda/unscd/";
description = "Less buggy replacement for the glibc name service cache daemon";
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [ petabyteboy ];
};
}

View file

@ -10,15 +10,15 @@
stdenv.mkDerivation {
pname = "cht.sh";
version = "unstable-2022-01-01";
version = "unstable-2022-04-17";
nativeBuildInputs = [ makeWrapper ];
src = fetchFromGitHub {
owner = "chubin";
repo = "cheat.sh";
rev = "46d1a5f73c6b88da15d809154245dbf234e9479e";
sha256 = "6uEbxkkNV5EGhiCSoWJgfRUUqUS3OFTVOZFlVyMp/x8=";
rev = "7f769d6f3697541e55fd3ea9b71f190296529e48";
sha256 = "+V3q71neW9X0JPJHqvNGopvIJfUv0VD9GKkz7YqN6Eo=";
};
# Fix ".cht.sh-wrapped" in the help message

View file

@ -277,12 +277,8 @@ with pkgs;
catatonit = callPackage ../applications/virtualization/catatonit { };
cen64 = callPackage ../applications/emulators/cen64 { };
btdu = callPackage ../tools/misc/btdu { };
uxn = callPackage ../applications/emulators/uxn { };
cereal = callPackage ../development/libraries/cereal { };
certgraph = callPackage ../tools/security/certgraph { };
@ -413,8 +409,6 @@ with pkgs;
protoc-gen-validate = callPackage ../development/tools/protoc-gen-validate { };
proton-caller = callPackage ../applications/emulators/proton-caller { };
ptags = callPackage ../development/tools/misc/ptags { };
ptouch-print = callPackage ../misc/ptouch-print { };
@ -1194,6 +1188,262 @@ with pkgs;
breitbandmessung = callPackage ../applications/networking/breitbandmessung { };
### APPLICATIONS/EMULATORS
atari800 = callPackage ../applications/emulators/atari800 { };
ataripp = callPackage ../applications/emulators/atari++ { };
attract-mode = callPackage ../applications/emulators/attract-mode { };
basiliskii = callPackage ../applications/emulators/basiliskii { };
bochs = callPackage ../applications/emulators/bochs {
wxGTK = wxGTK30;
};
caprice32 = callPackage ../applications/emulators/caprice32 { };
ccemux = callPackage ../applications/emulators/ccemux { };
cdemu-client = callPackage ../applications/emulators/cdemu/client.nix { };
cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { };
cen64 = callPackage ../applications/emulators/cen64 { };
citra = libsForQt5.callPackage ../applications/emulators/citra { };
collapseos-cvm = callPackage ../applications/emulators/collapseos-cvm { };
craftos-pc = callPackage ../applications/emulators/craftos-pc { };
darcnes = callPackage ../applications/emulators/darcnes { };
desmume = callPackage ../applications/emulators/desmume { };
dgen-sdl = callPackage ../applications/emulators/dgen-sdl { };
dlx = callPackage ../applications/emulators/dlx { };
dosbox = callPackage ../applications/emulators/dosbox { };
dosbox-staging = callPackage ../applications/emulators/dosbox-staging { };
duckstation = libsForQt5.callPackage ../applications/emulators/duckstation {};
dynamips = callPackage ../applications/emulators/dynamips { };
emu2 = callPackage ../applications/emulators/emu2 { };
emulationstation = callPackage ../applications/emulators/emulationstation { };
fceux = libsForQt5.callPackage ../applications/emulators/fceux { };
firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { };
flycast = callPackage ../applications/emulators/flycast { };
fsuae = callPackage ../applications/emulators/fs-uae { };
fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { };
fuse-emulator = callPackage ../applications/emulators/fuse-emulator {};
gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { };
gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { };
goldberg-emu = callPackage ../applications/emulators/goldberg-emu { };
gxemul = callPackage ../applications/emulators/gxemul { };
hatari = callPackage ../applications/emulators/hatari { };
hercules = callPackage ../applications/emulators/hercules { };
image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { };
kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { };
lambda-delta = callPackage ../applications/emulators/lambda-delta { };
libdsk = callPackage ../applications/emulators/libdsk { };
libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { };
maiko = callPackage ../applications/emulators/maiko {
inherit (xorg) libX11;
};
mame = libsForQt514.callPackage ../applications/emulators/mame {
inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback;
};
mednafen = callPackage ../applications/emulators/mednafen {
inherit (darwin) libiconv;
};
mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { };
mednaffe = callPackage ../applications/emulators/mednaffe { };
melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { };
mgba = libsForQt5.callPackage ../applications/emulators/mgba { };
mupen64plus = callPackage ../applications/emulators/mupen64plus { };
nestopia = callPackage ../applications/emulators/nestopia { };
np2kai = callPackage ../applications/emulators/np2kai { };
oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { };
openmsx = callPackage ../applications/emulators/openmsx {
python = python3;
};
pcem = callPackage ../applications/emulators/pcem { };
pcsx2 = callPackage ../applications/emulators/pcsx2 {
wxGTK = wxGTK30-gtk3;
};
pcsxr = callPackage ../applications/emulators/pcsxr { };
ppsspp = libsForQt5.callPackage ../applications/emulators/ppsspp { };
proton-caller = callPackage ../applications/emulators/proton-caller { };
punes = libsForQt5.callPackage ../applications/emulators/punes { };
py65 = python3Packages.callPackage ../applications/emulators/py65 { };
resim = callPackage ../applications/emulators/resim {};
retrofe = callPackage ../applications/emulators/retrofe { };
rpcs3 = libsForQt5.callPackage ../applications/emulators/rpcs3 { };
ruffle = callPackage ../applications/emulators/ruffle { };
ryujinx = callPackage ../applications/emulators/ryujinx { };
sameboy = callPackage ../applications/emulators/sameboy { };
simh = callPackage ../applications/emulators/simh { };
simplenes = callPackage ../applications/emulators/simplenes { };
snes9x-gtk = callPackage ../applications/emulators/snes9x-gtk { };
stella = callPackage ../applications/emulators/stella { };
termtekst = callPackage ../applications/emulators/termtekst { };
tilem = callPackage ../applications/emulators/tilem { };
tiny8086 = callPackage ../applications/emulators/tiny8086 { };
tinyemu = callPackage ../applications/emulators/tinyemu { };
uae = callPackage ../applications/emulators/uae { };
uxn = callPackage ../applications/emulators/uxn { };
vbam = callPackage ../applications/emulators/vbam { };
vice = callPackage ../applications/emulators/vice { };
winetricks = callPackage ../applications/emulators/wine/winetricks.nix {
inherit (gnome) zenity;
};
xcpc = callPackage ../applications/emulators/xcpc { };
yapesdl = callPackage ../applications/emulators/yapesdl { };
zesarux = callPackage ../applications/emulators/zesarux { };
zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { };
### APPLICATIONS/EMULATORS/BSNES
ares = callPackage ../applications/emulators/bsnes/ares { };
bsnes-hd = callPackage ../applications/emulators/bsnes/bsnes-hd {
inherit (gnome2) gtksourceview;
inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL;
};
higan = callPackage ../applications/emulators/bsnes/higan { };
### APPLICATIONS/EMULATORS/DOLPHIN-EMU
dolphin-emu = callPackage ../applications/emulators/dolphin-emu { };
dolphin-emu-beta = qt5.callPackage ../applications/emulators/dolphin-emu/master.nix {
inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL;
};
dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix {
inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL;
};
### APPLICATIONS/EMULATORS/RETROARCH
retroarchBare = callPackage ../applications/emulators/retroarch {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) AppKit Foundation;
};
retroarchFull = retroarch.override {
cores = builtins.filter
# Remove cores not supported on platform
(c: c ? libretroCore && (lib.meta.availableOn stdenv.hostPlatform c))
(builtins.attrValues libretro);
};
wrapRetroArch = { retroarch }:
callPackage ../applications/emulators/retroarch/wrapper.nix
{ inherit retroarch; };
retroarch = wrapRetroArch { retroarch = retroarchBare; };
libretro = recurseIntoAttrs
(callPackage ../applications/emulators/retroarch/cores.nix {
retroarch = retroarchBare;
});
kodi-retroarch-advanced-launchers =
callPackage ../applications/emulators/retroarch/kodi-advanced-launchers.nix { };
### APPLICATIONS/EMULATORS/YUZU
yuzu-mainline = import ../applications/emulators/yuzu {
branch = "mainline";
inherit libsForQt5 fetchFromGitHub;
};
yuzu-ea = import ../applications/emulators/yuzu {
branch = "early-access";
inherit libsForQt5 fetchFromGitHub;
};
### APPLICATIONS/EMULATORS/COMMANDERX16
x16-emulator = callPackage ../applications/emulators/commanderx16/emulator.nix { };
x16-rom = callPackage ../applications/emulators/commanderx16/rom.nix { };
x16-run = (callPackage ../applications/emulators/commanderx16/run.nix { }) {
emulator = x16-emulator;
rom = x16-rom;
};
yabause = libsForQt5.callPackage ../applications/emulators/yabause {
freeglut = null;
openal = null;
};
### APPLICATIONS/TERMINAL-EMULATORS
alacritty = callPackage ../applications/terminal-emulators/alacritty {
@ -1459,6 +1709,8 @@ with pkgs;
apitrace = libsForQt514.callPackage ../applications/graphics/apitrace {};
argagg = callPackage ../development/libraries/argagg { };
argtable = callPackage ../development/libraries/argtable { };
arguments = callPackage ../development/libraries/arguments { };
@ -2409,10 +2661,6 @@ with pkgs;
boca = callPackage ../development/libraries/boca { };
bochs = callPackage ../applications/emulators/bochs {
wxGTK = wxGTK30;
};
bubblewrap = callPackage ../tools/admin/bubblewrap { };
borgbackup = callPackage ../tools/backup/borgbackup { };
@ -2467,10 +2715,6 @@ with pkgs;
breakpointHook = assert stdenv.isLinux;
makeSetupHook { } ../build-support/setup-hooks/breakpoint-hook.sh;
py65 = python3Packages.callPackage ../applications/emulators/py65 { };
simh = callPackage ../applications/emulators/simh { };
btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { };
btrfs-snap = callPackage ../tools/filesystems/btrfs-snap { };
@ -2592,20 +2836,10 @@ with pkgs;
cde = callPackage ../tools/package-management/cde { };
cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { };
cdemu-client = callPackage ../applications/emulators/cdemu/client.nix { };
ceres-solver = callPackage ../development/libraries/ceres-solver {
gflags = null; # only required for examples/tests
};
craftos-pc = callPackage ../applications/emulators/craftos-pc { };
gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { };
image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { };
cbor-diag = callPackage ../development/tools/cbor-diag { };
cassowary = callPackage ../tools/networking/cassowary { };
@ -2995,10 +3229,6 @@ with pkgs;
djv = callPackage ../applications/graphics/djv { };
dlx = callPackage ../applications/emulators/dlx { };
dgen-sdl = callPackage ../applications/emulators/dgen-sdl { };
dnschef = python3Packages.callPackage ../tools/networking/dnschef { };
doitlive = callPackage ../tools/misc/doitlive { };
@ -3816,8 +4046,6 @@ with pkgs;
ropgadget = with python3Packages; toPythonApplication ropgadget;
ryujinx = callPackage ../applications/emulators/ryujinx { };
scour = with python3Packages; toPythonApplication scour;
s2png = callPackage ../tools/graphics/s2png { };
@ -3840,8 +4068,6 @@ with pkgs;
simg2img = callPackage ../tools/filesystems/simg2img { };
simplenes = callPackage ../applications/emulators/simplenes { };
snippetpixie = callPackage ../tools/text/snippetpixie { };
snowcat = callPackage ../tools/security/snowcat { };
@ -4298,8 +4524,6 @@ with pkgs;
citrix_workspace_21_12_0
;
citra = libsForQt5.callPackage ../applications/emulators/citra { };
cmigemo = callPackage ../tools/text/cmigemo { };
cmst = libsForQt5.callPackage ../tools/networking/cmst { };
@ -4910,14 +5134,6 @@ with pkgs;
dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
dolphin-emu = callPackage ../applications/emulators/dolphin-emu { };
dolphin-emu-beta = qt5.callPackage ../applications/emulators/dolphin-emu/master.nix {
inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL;
};
dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix {
inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL;
};
domoticz = callPackage ../servers/domoticz { };
doomseeker = qt5.callPackage ../applications/misc/doomseeker { };
@ -5524,8 +5740,6 @@ with pkgs;
fio = callPackage ../tools/system/fio { };
firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { };
flamerobin = callPackage ../applications/misc/flamerobin { };
flashrom = callPackage ../tools/misc/flashrom { };
@ -7513,8 +7727,6 @@ with pkgs;
node2nix = nodePackages.node2nix;
np2kai = callPackage ../applications/emulators/np2kai { };
openipmi = callPackage ../tools/system/openipmi { };
ox = callPackage ../applications/editors/ox { };
@ -7942,14 +8154,6 @@ with pkgs;
mdp = callPackage ../applications/misc/mdp { };
mednafen = callPackage ../applications/emulators/mednafen {
inherit (darwin) libiconv;
};
mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { };
mednaffe = callPackage ../applications/emulators/mednaffe { };
megacli = callPackage ../tools/misc/megacli { };
megatools = callPackage ../tools/networking/megatools { };
@ -7964,8 +8168,6 @@ with pkgs;
mfoc = callPackage ../tools/security/mfoc { };
mgba = libsForQt5.callPackage ../applications/emulators/mgba { };
microdnf = callPackage ../tools/package-management/microdnf { };
microplane = callPackage ../tools/misc/microplane { };
@ -8184,8 +8386,6 @@ with pkgs;
nerdfonts = callPackage ../data/fonts/nerdfonts { };
nestopia = callPackage ../applications/emulators/nestopia { };
netatalk = callPackage ../tools/filesystems/netatalk { };
netavark = callPackage ../tools/networking/netavark { };
@ -9636,8 +9836,6 @@ with pkgs;
rubocop = rubyPackages.rubocop;
ruffle = callPackage ../applications/emulators/ruffle { };
runningx = callPackage ../tools/X11/runningx { };
rund = callPackage ../development/tools/rund { };
@ -10516,8 +10714,6 @@ with pkgs;
tiledb = callPackage ../development/libraries/tiledb { };
tilem = callPackage ../applications/emulators/tilem { };
timemachine = callPackage ../applications/audio/timemachine { };
timelapse-deflicker = callPackage ../applications/graphics/timelapse-deflicker { };
@ -10540,10 +10736,6 @@ with pkgs;
tinycbor = callPackage ../development/libraries/tinycbor { };
tiny8086 = callPackage ../applications/emulators/tiny8086 { };
tinyemu = callPackage ../applications/emulators/tinyemu { };
tinyfecvpn = callPackage ../tools/networking/tinyfecvpn { };
tinygltf = callPackage ../development/libraries/tinygltf { };
@ -12117,8 +12309,6 @@ with pkgs;
flasm = callPackage ../development/compilers/flasm { };
flycast = callPackage ../applications/emulators/flycast { };
flyctl = callPackage ../development/web/flyctl { };
fluidd = callPackage ../applications/misc/fluidd { };
@ -14340,7 +14530,6 @@ with pkgs;
mspdebug = callPackage ../development/misc/msp430/mspdebug.nix { };
vc4-newlib = callPackage ../development/misc/vc4/newlib.nix {};
resim = callPackage ../applications/emulators/resim {};
or1k-newlib = callPackage ../development/misc/or1k/newlib.nix {};
@ -16650,8 +16839,6 @@ with pkgs;
duckdb = callPackage ../development/libraries/duckdb {};
duckstation = libsForQt5.callPackage ../applications/emulators/duckstation {};
easyloggingpp = callPackage ../development/libraries/easyloggingpp {};
eccodes = callPackage ../development/libraries/eccodes {
@ -18579,8 +18766,6 @@ with pkgs;
hdf5 = hdf5_1_10;
};
libmirage = callPackage ../applications/emulators/cdemu/libmirage.nix { };
libmkv = callPackage ../development/libraries/libmkv { };
libmms = callPackage ../development/libraries/libmms { };
@ -23520,6 +23705,8 @@ with pkgs;
ugtrain = callPackage ../tools/misc/ugtrain { };
unscd = callPackage ../os-specific/linux/unscd { };
untie = callPackage ../os-specific/linux/untie { };
upower = callPackage ../os-specific/linux/upower { };
@ -24487,8 +24674,6 @@ with pkgs;
fonts = [ "Terminus" ];
};
termtekst = callPackage ../applications/emulators/termtekst { };
tex-gyre = callPackages ../data/fonts/tex-gyre { };
tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { };
@ -25456,8 +25641,6 @@ with pkgs;
dwm-status = callPackage ../applications/window-managers/dwm/dwm-status.nix { };
dynamips = callPackage ../applications/emulators/dynamips { };
exploitdb = callPackage ../tools/security/exploitdb { };
evilwm = callPackage ../applications/window-managers/evilwm {
@ -25915,8 +26098,6 @@ with pkgs;
tuigreet = callPackage ../os-specific/linux/tuigreet { };
};
goldberg-emu = callPackage ../applications/emulators/goldberg-emu { };
goldendict = libsForQt5.callPackage ../applications/misc/goldendict {
inherit (darwin) libiconv;
};
@ -26517,8 +26698,6 @@ with pkgs;
herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { };
hercules = callPackage ../applications/emulators/hercules { };
hexchat = callPackage ../applications/networking/irc/hexchat { };
hexcurse = callPackage ../applications/editors/hexcurse { };
@ -27065,8 +27244,6 @@ with pkgs;
kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/wrapper.nix { };
kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { };
kepubify = callPackage ../tools/misc/kepubify { };
kermit = callPackage ../tools/misc/kermit { };
@ -27260,8 +27437,6 @@ with pkgs;
kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { };
lambda-delta = callPackage ../applications/emulators/lambda-delta { };
lame = callPackage ../development/libraries/lame { };
labwc = callPackage ../applications/window-managers/labwc {
@ -27393,8 +27568,6 @@ with pkgs;
lighttable = callPackage ../applications/editors/lighttable {};
libdsk = callPackage ../applications/emulators/libdsk { };
liblinphone = callPackage ../development/libraries/liblinphone { };
links2 = callPackage ../applications/networking/browsers/links2 { };
@ -27585,8 +27758,6 @@ with pkgs;
melody = callPackage ../tools/misc/melody { };
melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { };
meme-image-generator = callPackage ../applications/graphics/meme-image-generator { };
meme-suite = callPackage ../applications/science/biology/meme-suite { };
@ -28243,8 +28414,6 @@ with pkgs;
obconf = callPackage ../tools/X11/obconf { };
oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { };
gnome-obfuscate = callPackage ../applications/graphics/gnome-obfuscate { };
obs-studio = libsForQt5.callPackage ../applications/video/obs-studio {
@ -28412,12 +28581,6 @@ with pkgs;
pcloud = callPackage ../applications/networking/pcloud { };
pcsxr = callPackage ../applications/emulators/pcsxr { };
pcsx2 = callPackage ../applications/emulators/pcsx2 {
wxGTK = wxGTK30-gtk3;
};
jpsxdec = callPackage ../tools/games/jpsxdec {
jdk = openjdk8;
};
@ -28944,8 +29107,6 @@ with pkgs;
rootlesskit = callPackage ../tools/virtualization/rootlesskit {};
rpcs3 = libsForQt5.callPackage ../applications/emulators/rpcs3 { };
rsclock = callPackage ../applications/misc/rsclock { };
rstudio = libsForQt5.callPackage ../applications/editors/rstudio {
@ -28985,8 +29146,6 @@ with pkgs;
sacc = callPackage ../applications/networking/gopher/sacc { };
sameboy = callPackage ../applications/emulators/sameboy { };
sayonara = libsForQt514.callPackage ../applications/audio/sayonara { };
sbagen = callPackage ../applications/misc/sbagen { };
@ -29123,8 +29282,6 @@ with pkgs;
curses = ncurses;
};
stella = callPackage ../applications/emulators/stella { };
linuxstopmotion = libsForQt5.callPackage ../applications/video/linuxstopmotion { };
sweethome3d = recurseIntoAttrs (
@ -30260,9 +30417,6 @@ with pkgs;
kodi-cli = callPackage ../tools/misc/kodi-cli { };
kodi-retroarch-advanced-launchers =
callPackage ../applications/emulators/retroarch/kodi-advanced-launchers.nix { };
xca = libsForQt5.callPackage ../applications/misc/xca { };
xcalib = callPackage ../tools/X11/xcalib { };
@ -32752,8 +32906,6 @@ with pkgs;
crypto-org-wallet = callPackage ../applications/blockchains/crypto-org-wallet { };
caprice32 = callPackage ../applications/emulators/caprice32 { };
cubicle = callPackage ../applications/science/logic/cubicle {
ocamlPackages = ocaml-ng.ocamlPackages_4_05;
};
@ -33277,12 +33429,6 @@ with pkgs;
antimicrox = libsForQt5.callPackage ../tools/misc/antimicrox { };
ares = callPackage ../applications/emulators/ares { };
atari800 = callPackage ../applications/emulators/atari800 { };
ataripp = callPackage ../applications/emulators/atari++ { };
atlantis = callPackage ../applications/networking/cluster/atlantis { };
fn-cli = callPackage ../applications/networking/cluster/fn-cli { };
@ -33297,14 +33443,10 @@ with pkgs;
argononed = callPackage ../misc/drivers/argononed { };
attract-mode = callPackage ../applications/emulators/attract-mode { };
autotiling = python3Packages.callPackage ../misc/autotiling { };
avell-unofficial-control-center = python3Packages.callPackage ../applications/misc/avell-unofficial-control-center { };
basiliskii = callPackage ../applications/emulators/basiliskii { };
beep = callPackage ../misc/beep { };
bees = callPackage ../tools/filesystems/bees { };
@ -33321,8 +33463,6 @@ with pkgs;
calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {};
ccemux = callPackage ../applications/emulators/ccemux { };
click = callPackage ../applications/networking/cluster/click { };
clinfo = callPackage ../tools/system/clinfo {
@ -33331,8 +33471,6 @@ with pkgs;
clpeak = callPackage ../tools/misc/clpeak { };
collapseos-cvm = callPackage ../applications/emulators/collapseos-cvm { };
cups = callPackage ../misc/cups { };
cups-filters = callPackage ../misc/cups/filters.nix { };
@ -33403,14 +33541,10 @@ with pkgs;
cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { };
darcnes = callPackage ../applications/emulators/darcnes { };
darling-dmg = callPackage ../tools/filesystems/darling-dmg { };
depotdownloader = callPackage ../tools/misc/depotdownloader { };
desmume = callPackage ../applications/emulators/desmume { };
dbacl = callPackage ../tools/misc/dbacl { };
dblatex = callPackage ../tools/typesetting/tex/dblatex { };
@ -33423,14 +33557,8 @@ with pkgs;
dockutil = callPackage ../os-specific/darwin/dockutil { };
dosbox = callPackage ../applications/emulators/dosbox { };
dosbox-staging = callPackage ../applications/emulators/dosbox-staging { };
eiciel = callPackage ../tools/filesystems/eiciel { };
emu2 = callPackage ../applications/emulators/emu2 { };
apt = callPackage ../tools/package-management/apt { };
dpkg = callPackage ../tools/package-management/dpkg { };
@ -33443,8 +33571,6 @@ with pkgs;
ecdsatool = callPackage ../tools/security/ecdsatool { };
emulationstation = callPackage ../applications/emulators/emulationstation { };
electricsheep = callPackage ../misc/screensavers/electricsheep { };
aaphoto = callPackage ../tools/graphics/aaphoto {};
@ -33485,8 +33611,6 @@ with pkgs;
faustStk = callPackage ../applications/audio/faustStk { };
fceux = libsForQt5.callPackage ../applications/emulators/fceux { };
flockit = callPackage ../tools/backup/flockit { };
fahclient = callPackage ../applications/science/misc/foldingathome/client.nix {};
@ -33501,8 +33625,6 @@ with pkgs;
foomatic-filters = callPackage ../misc/drivers/foomatic-filters {};
fuse-emulator = callPackage ../applications/emulators/fuse-emulator {};
gajim = callPackage ../applications/networking/instant-messengers/gajim {
inherit (gst_all_1) gstreamer gst-plugins-base gst-libav;
gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
@ -33510,8 +33632,6 @@ with pkgs;
gammu = callPackage ../applications/misc/gammu { };
gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { };
ghostscript = callPackage ../misc/ghostscript { };
ghostscriptX = ghostscript.override {
@ -33538,10 +33658,6 @@ with pkgs;
gummy = callPackage ../tools/misc/gummy { };
gxemul = callPackage ../applications/emulators/gxemul { };
hatari = callPackage ../applications/emulators/hatari { };
hck = callPackage ../tools/text/hck {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
@ -33655,18 +33771,12 @@ with pkgs;
loop = callPackage ../tools/misc/loop { };
maiko = callPackage ../applications/emulators/maiko { inherit (xorg) libX11; };
mailcore2 = callPackage ../development/libraries/mailcore2 {
icu = icu58;
};
mamba = callPackage ../applications/audio/mamba { };
mame = libsForQt514.callPackage ../applications/emulators/mame {
inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback;
};
martyr = callPackage ../development/libraries/martyr { };
mas = callPackage ../os-specific/darwin/mas { };
@ -33683,8 +33793,6 @@ with pkgs;
morph = callPackage ../tools/package-management/morph { };
mupen64plus = callPackage ../applications/emulators/mupen64plus { };
muse = libsForQt5.callPackage ../applications/audio/muse { };
musly = callPackage ../applications/audio/musly { };
@ -34021,8 +34129,6 @@ with pkgs;
OSCAR = qt5.callPackage ../applications/misc/OSCAR { };
pcem = callPackage ../applications/emulators/pcem { };
pgmanage = callPackage ../applications/misc/pgmanage { };
pgadmin4 = callPackage ../tools/admin/pgadmin { };
@ -34049,14 +34155,10 @@ with pkgs;
pounce = callPackage ../servers/pounce { };
ppsspp = libsForQt5.callPackage ../applications/emulators/ppsspp { };
pt = callPackage ../applications/misc/pt { };
protocol = python3Packages.callPackage ../applications/networking/protocol { };
punes = libsForQt5.callPackage ../applications/emulators/punes { };
pykms = callPackage ../tools/networking/pykms { };
pyupgrade = with python3Packages; toPythonApplication pyupgrade;
@ -34065,12 +34167,6 @@ with pkgs;
pwntools = with python3Packages; toPythonApplication pwntools;
uae = callPackage ../applications/emulators/uae { };
fsuae = callPackage ../applications/emulators/fs-uae { };
fsuae-launcher = callPackage ../applications/emulators/fs-uae/launcher.nix { };
putty = callPackage ../applications/networking/remote/putty {
gtk2 = gtk2-x11;
};
@ -34099,30 +34195,6 @@ with pkgs;
renderizer = callPackage ../development/tools/renderizer {};
retroarchBare = callPackage ../applications/emulators/retroarch {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) AppKit Foundation;
};
wrapRetroArch = { retroarch }: callPackage ../applications/emulators/retroarch/wrapper.nix {
inherit retroarch;
};
retroarch = wrapRetroArch { retroarch = retroarchBare; };
retroarchFull = retroarch.override {
cores = builtins.filter
# Remove cores not supported on platform
(c: c ? libretroCore && (lib.meta.availableOn stdenv.hostPlatform c))
(builtins.attrValues libretro);
};
libretro = recurseIntoAttrs (callPackage ../applications/emulators/retroarch/cores.nix {
retroarch = retroarchBare;
});
retrofe = callPackage ../applications/emulators/retrofe { };
rfc-bibtex = python3Packages.callPackage ../development/python-modules/rfc-bibtex { };
pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker {
@ -34430,12 +34502,8 @@ with pkgs;
vazir-fonts = callPackage ../data/fonts/vazir-fonts { };
vbam = callPackage ../applications/emulators/vbam { };
vgmstream = callPackage ../applications/audio/vgmstream { };
vice = callPackage ../applications/emulators/vice { };
viddy = callPackage ../tools/misc/viddy { };
ViennaRNA = callPackage ../applications/science/molecular-dynamics/viennarna { };
@ -34532,10 +34600,6 @@ with pkgs;
wineRelease = "wayland";
});
winetricks = callPackage ../applications/emulators/wine/winetricks.nix {
inherit (gnome) zenity;
};
wishbone-tool = callPackage ../development/tools/misc/wishbone-tool { };
with-shell = callPackage ../applications/misc/with-shell { };
@ -34624,11 +34688,6 @@ with pkgs;
yabai = callPackage ../os-specific/darwin/yabai { };
yabause = libsForQt5.callPackage ../applications/emulators/yabause {
freeglut = null;
openal = null;
};
yacreader = libsForQt5.callPackage ../applications/graphics/yacreader { };
yadm = callPackage ../applications/version-management/yadm { };
@ -34647,15 +34706,6 @@ with pkgs;
yaxg = callPackage ../tools/graphics/yaxg {};
yuzu-mainline = import ../applications/emulators/yuzu {
branch = "mainline";
inherit libsForQt5 fetchFromGitHub;
};
yuzu-ea = import ../applications/emulators/yuzu {
branch = "early-access";
inherit libsForQt5 fetchFromGitHub;
};
zap = callPackage ../tools/networking/zap { };
zigbee2mqtt = callPackage ../servers/zigbee2mqtt { };
@ -34674,38 +34724,12 @@ with pkgs;
zoneminder = callPackage ../servers/zoneminder { };
zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { };
xcp = callPackage ../tools/misc/xcp { };
xcpc = callPackage ../applications/emulators/xcpc { };
zxcvbn-c = callPackage ../development/libraries/zxcvbn-c { };
zxing-cpp = callPackage ../development/libraries/zxing-cpp { };
snes9x-gtk = callPackage ../applications/emulators/snes9x-gtk { };
openmsx = callPackage ../applications/emulators/openmsx {
python = python3;
};
higan = callPackage ../applications/emulators/higan { };
bsnes-hd = callPackage ../applications/emulators/bsnes-hd {
inherit (gnome2) gtksourceview;
inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL;
};
yapesdl = callPackage ../applications/emulators/yapesdl { };
x16-emulator = callPackage ../applications/emulators/commanderx16/emulator.nix { };
x16-rom = callPackage ../applications/emulators/commanderx16/rom.nix { };
x16-run = (callPackage ../applications/emulators/commanderx16/run.nix { }) {
emulator = x16-emulator;
rom = x16-rom;
};
bullet = callPackage ../development/libraries/bullet {
inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
};
@ -35065,7 +35089,6 @@ with pkgs;
xsos = callPackage ../os-specific/linux/xsos { };
zesarux = callPackage ../applications/emulators/zesarux { };
zk = callPackage ../applications/office/zk {};