Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
2a54df0946
@ -129,6 +129,7 @@ let
|
||||
initialRamdisk = pkgs.makeInitrdNG {
|
||||
name = "initrd-${kernel-name}";
|
||||
inherit (config.boot.initrd) compressor compressorArgs prepend;
|
||||
inherit (cfg) strip;
|
||||
|
||||
contents = map (path: { object = path; symlink = ""; }) (subtractLists cfg.suppressedStorePaths cfg.storePaths)
|
||||
++ mapAttrsToList (_: v: { object = v.source; symlink = v.target; }) (filterAttrs (_: v: v.enable) cfg.contents);
|
||||
@ -169,6 +170,19 @@ in {
|
||||
default = [];
|
||||
};
|
||||
|
||||
strip = mkOption {
|
||||
description = lib.mdDoc ''
|
||||
Whether to completely strip executables and libraries copied to the initramfs.
|
||||
|
||||
Setting this to false may save on the order of 30MiB on the
|
||||
machine building the system (by avoiding a binutils
|
||||
reference), at the cost of ~1MiB of initramfs size. This puts
|
||||
this option firmly in the territory of micro-optimisation.
|
||||
'';
|
||||
type = types.bool;
|
||||
default = true;
|
||||
};
|
||||
|
||||
extraBin = mkOption {
|
||||
description = lib.mdDoc ''
|
||||
Tools to add to /bin
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, autoreconfHook
|
||||
, gettext
|
||||
, help2man
|
||||
, pkg-config
|
||||
@ -40,6 +41,7 @@ in stdenv.mkDerivation rec {
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
gettext
|
||||
pkg-config
|
||||
texinfo
|
||||
@ -108,7 +110,6 @@ in stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres kira-bruneau ];
|
||||
platforms = platforms.unix;
|
||||
broken = stdenv.isDarwin && stdenv.isAarch64; # Undefined symbols for architecture arm64
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
"1ir5akl4vrzb0b5s37s2viqisvf4sylw8rfnfj434h1q0gqz79sc"
|
||||
"09x0l50frck8v2zhgp84m57q3kj74chk37sc69mpbhwy0s6vg980"
|
||||
|
||||
@ -1 +1 @@
|
||||
"5.11.1.3595"
|
||||
"5.11.3.3882"
|
||||
|
||||
253
pkgs/applications/networking/n8n/node-packages.nix
generated
253
pkgs/applications/networking/n8n/node-packages.nix
generated
@ -175,31 +175,31 @@ let
|
||||
sha512 = "aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g==";
|
||||
};
|
||||
};
|
||||
"@azure/msal-browser-2.28.0" = {
|
||||
"@azure/msal-browser-2.28.1" = {
|
||||
name = "_at_azure_slash_msal-browser";
|
||||
packageName = "@azure/msal-browser";
|
||||
version = "2.28.0";
|
||||
version = "2.28.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.28.0.tgz";
|
||||
sha512 = "d83BBMT6id+eAdox+M37PCVWYDiqd6BrXxvjAVI2xJluRoSJCZQvB02Bcg6QCSe3ruLUK6vGwMTe8p1cDExePQ==";
|
||||
url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.28.1.tgz";
|
||||
sha512 = "5uAfwpNGBSRzBGTSS+5l4Zw6msPV7bEmq99n0U3n/N++iTcha+nIp1QujxTPuOLHmTNCeySdMx9qzGqWuy22zQ==";
|
||||
};
|
||||
};
|
||||
"@azure/msal-common-7.2.0" = {
|
||||
"@azure/msal-common-7.3.0" = {
|
||||
name = "_at_azure_slash_msal-common";
|
||||
packageName = "@azure/msal-common";
|
||||
version = "7.2.0";
|
||||
version = "7.3.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.2.0.tgz";
|
||||
sha512 = "+Oz8LKTOACDHqDmv+MZy/z+DZRH8RZbMjhadmvp0scQ0R75OrzZro+HkxifWhtDG8l1ViYkvV9NHb4pEZyajAQ==";
|
||||
url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.3.0.tgz";
|
||||
sha512 = "revxB3z+QLjwAtU1d04nC1voFr+i3LfqTpUfgrWZVqKh/sSgg0mZZUvw4vKVWB57qtL95sul06G+TfdFZny1Xw==";
|
||||
};
|
||||
};
|
||||
"@azure/msal-node-1.12.0" = {
|
||||
"@azure/msal-node-1.12.1" = {
|
||||
name = "_at_azure_slash_msal-node";
|
||||
packageName = "@azure/msal-node";
|
||||
version = "1.12.0";
|
||||
version = "1.12.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.12.0.tgz";
|
||||
sha512 = "bNJe5xx3YXj7lrj9wUYl7HX4g1Be7s8VHjDhKPzOnlI54JnRKI+nQ95EmFBs3ckUYM9u82HUsHumDcB21YIC9w==";
|
||||
url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.12.1.tgz";
|
||||
sha512 = "m909lX9C8Ty01DBxbjr4KfAKWibohgRvY7hrdDo13U1ztlH+0Nbt7cPF1vrWonW/CRT4H4xtUa4LCNmivghggw==";
|
||||
};
|
||||
};
|
||||
"@azure/storage-blob-12.11.0" = {
|
||||
@ -211,13 +211,13 @@ let
|
||||
sha512 = "na+FisoARuaOWaHWpmdtk3FeuTWf2VWamdJ9/TJJzj5ZdXPLC3juoDgFs6XVuJIoK30yuBpyFBEDXVRK4pB7Tg==";
|
||||
};
|
||||
};
|
||||
"@babel/parser-7.18.9" = {
|
||||
"@babel/parser-7.18.10" = {
|
||||
name = "_at_babel_slash_parser";
|
||||
packageName = "@babel/parser";
|
||||
version = "7.18.9";
|
||||
version = "7.18.10";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.9.tgz";
|
||||
sha512 = "9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg==";
|
||||
url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.10.tgz";
|
||||
sha512 = "TYk3OA0HKL6qNryUayb5UUEhM/rkOQozIBEA5ITXh5DWrSp0TlUQXMyZmnWxG/DizSWBeeQ0Zbc5z8UGaaqoeg==";
|
||||
};
|
||||
};
|
||||
"@babel/runtime-7.18.9" = {
|
||||
@ -400,13 +400,13 @@ let
|
||||
sha512 = "sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA==";
|
||||
};
|
||||
};
|
||||
"@oclif/core-1.12.1" = {
|
||||
"@oclif/core-1.13.1" = {
|
||||
name = "_at_oclif_slash_core";
|
||||
packageName = "@oclif/core";
|
||||
version = "1.12.1";
|
||||
version = "1.13.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@oclif/core/-/core-1.12.1.tgz";
|
||||
sha512 = "9ZPh9MLirv2CbOHMybPw3Fczr56OAVi8UQZXTBM4AYmtuL3nHsovV5lvsNPvtAqa+IQuJQb//ERpKTThwJY6WA==";
|
||||
url = "https://registry.npmjs.org/@oclif/core/-/core-1.13.1.tgz";
|
||||
sha512 = "vIrk0qJllAu+q/nzxXWx8QHN4/+hmkYqh0Qx1V2x3Nkun18wF7HfkIzgy1Ml0ZxDv1WA9AfL4MXvgbaQxVXQ+Q==";
|
||||
};
|
||||
};
|
||||
"@oclif/errors-1.3.5" = {
|
||||
@ -706,13 +706,13 @@ let
|
||||
sha512 = "zPE8kmpeL5/6L5gtTQHSOkAW/OSYYNTDRt6/2oEgLO1Zd3Rj5WVDoMloTtLJxQJhZGLGbL4pktKSh3NbzdaWdw==";
|
||||
};
|
||||
};
|
||||
"@types/mime-1.3.2" = {
|
||||
"@types/mime-3.0.0" = {
|
||||
name = "_at_types_slash_mime";
|
||||
packageName = "@types/mime";
|
||||
version = "1.3.2";
|
||||
version = "3.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz";
|
||||
sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==";
|
||||
url = "https://registry.npmjs.org/@types/mime/-/mime-3.0.0.tgz";
|
||||
sha512 = "fccbsHKqFDXClBZTDLA43zl0+TbxyIwyzIzwwhvoJvhNjOErCdeX2xJbURimv2EbSVUGav001PaCJg4mZxMl4w==";
|
||||
};
|
||||
};
|
||||
"@types/minimatch-3.0.5" = {
|
||||
@ -733,13 +733,13 @@ let
|
||||
sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA==";
|
||||
};
|
||||
};
|
||||
"@types/node-18.6.1" = {
|
||||
"@types/node-18.6.3" = {
|
||||
name = "_at_types_slash_node";
|
||||
packageName = "@types/node";
|
||||
version = "18.6.1";
|
||||
version = "18.6.3";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/node/-/node-18.6.1.tgz";
|
||||
sha512 = "z+2vB6yDt1fNwKOeGbckpmirO+VBDuQqecXkgeIqDlaOtmKn6hPR/viQ8cxCfqLU4fTlvM3+YjM367TukWdxpg==";
|
||||
url = "https://registry.npmjs.org/@types/node/-/node-18.6.3.tgz";
|
||||
sha512 = "6qKpDtoaYLM+5+AFChLhHermMQxc3TOEFIDzrZLPRGHPrLEwqFkkT5Kx3ju05g6X7uDPazz3jHbKPX0KzCjntg==";
|
||||
};
|
||||
};
|
||||
"@types/node-fetch-2.6.2" = {
|
||||
@ -787,13 +787,13 @@ let
|
||||
sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==";
|
||||
};
|
||||
};
|
||||
"@types/serve-static-1.13.10" = {
|
||||
"@types/serve-static-1.15.0" = {
|
||||
name = "_at_types_slash_serve-static";
|
||||
packageName = "@types/serve-static";
|
||||
version = "1.13.10";
|
||||
version = "1.15.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz";
|
||||
sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==";
|
||||
url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz";
|
||||
sha512 = "z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==";
|
||||
};
|
||||
};
|
||||
"@types/shelljs-0.8.11" = {
|
||||
@ -1246,13 +1246,13 @@ let
|
||||
sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w==";
|
||||
};
|
||||
};
|
||||
"aws-sdk-2.1182.0" = {
|
||||
"aws-sdk-2.1187.0" = {
|
||||
name = "aws-sdk";
|
||||
packageName = "aws-sdk";
|
||||
version = "2.1182.0";
|
||||
version = "2.1187.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1182.0.tgz";
|
||||
sha512 = "iemVvLTc2iy0rz3xTp8zc/kD27gIfDF/mk6bxY8/35xMulKCVANWUkAH8jWRKReHh5F/gX4bp33dnfG63ny1Ww==";
|
||||
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1187.0.tgz";
|
||||
sha512 = "QcxQ3asIhH9QQnN/5JO3MaHRjwcy3/AsBzcAjPU+lHZGV0drnuDmg3ZkZuAa/mOgQ3MEi68G3gYD+481QJgnMg==";
|
||||
};
|
||||
};
|
||||
"aws-sign2-0.7.0" = {
|
||||
@ -2227,13 +2227,13 @@ let
|
||||
sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==";
|
||||
};
|
||||
};
|
||||
"core-js-3.24.0" = {
|
||||
"core-js-3.24.1" = {
|
||||
name = "core-js";
|
||||
packageName = "core-js";
|
||||
version = "3.24.0";
|
||||
version = "3.24.1";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/core-js/-/core-js-3.24.0.tgz";
|
||||
sha512 = "IeOyT8A6iK37Ep4kZDD423mpi6JfPRoPUdQwEWYiGolvn4o6j2diaRzNfDfpTdu3a5qMbrGUzKUpYpRY8jXCkQ==";
|
||||
url = "https://registry.npmjs.org/core-js/-/core-js-3.24.1.tgz";
|
||||
sha512 = "0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg==";
|
||||
};
|
||||
};
|
||||
"core-util-is-1.0.2" = {
|
||||
@ -4603,13 +4603,13 @@ let
|
||||
sha512 = "xOqorG21Va+3CjpFOfFTU7SWohHH2uIX9ZY4Byz6J+lvpfvc486tOAT/G9GfbrKtJ9O7NCX9o0aC2lxqbnZ9EA==";
|
||||
};
|
||||
};
|
||||
"libphonenumber-js-1.10.10" = {
|
||||
"libphonenumber-js-1.10.11" = {
|
||||
name = "libphonenumber-js";
|
||||
packageName = "libphonenumber-js";
|
||||
version = "1.10.10";
|
||||
version = "1.10.11";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.10.tgz";
|
||||
sha512 = "JzYUapWcHkUe5n6OFqxJtHfCfuU0juqkqc9P+hrfzgmJODaREYLUgceiNAmIGx5j3Gjp7KVxi3koFo7OJFSTxg==";
|
||||
url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.11.tgz";
|
||||
sha512 = "ehoihx4HpRXO6FH/uJ0EnaEV4dVU+FDny+jv0S6k9JPyPsAIr0eXDAFvGRMBKE1daCtyHAaFSKCiuCxrOjVAzQ==";
|
||||
};
|
||||
};
|
||||
"libqp-1.1.0" = {
|
||||
@ -5368,49 +5368,49 @@ let
|
||||
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
|
||||
};
|
||||
};
|
||||
"n8n-core-0.128.0" = {
|
||||
"n8n-core-0.129.0" = {
|
||||
name = "n8n-core";
|
||||
packageName = "n8n-core";
|
||||
version = "0.128.0";
|
||||
version = "0.129.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.128.0.tgz";
|
||||
sha512 = "JQhSmiqbZxq+zK41Rf71RIpSTnVnhPnxGnDR19wygVESTys0MEZ1d4PXe/p1H+OKHZ/SfKwN2jcp9C/8fOwyZw==";
|
||||
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.129.0.tgz";
|
||||
sha512 = "YHFEKx+K0FpI5AaFlN2dskb7Ub8uyh5HNH63D4DJO7gsJjS0U1OQO9vMsaThm4w9KGOs3faPpJu5ZBGumkmX3Q==";
|
||||
};
|
||||
};
|
||||
"n8n-design-system-0.28.0" = {
|
||||
"n8n-design-system-0.29.0" = {
|
||||
name = "n8n-design-system";
|
||||
packageName = "n8n-design-system";
|
||||
version = "0.28.0";
|
||||
version = "0.29.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.28.0.tgz";
|
||||
sha512 = "ff2TuXrr/2sueh37hXdqSWNSd/2Oz6oAxsjPVnOyxwqAP6vj5rmI4O1qZWYfwdXjqOKXOFzEPY1U9NIKLkC4ag==";
|
||||
url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.29.0.tgz";
|
||||
sha512 = "R0FoLuGksBdd95fKVyKR4WTvFf1VjHD8fXrTPim4kq7QYlnT+44UQTZjmMAY6eN9b8PUk2/39TZMByyc/6YALQ==";
|
||||
};
|
||||
};
|
||||
"n8n-editor-ui-0.154.0" = {
|
||||
"n8n-editor-ui-0.155.0" = {
|
||||
name = "n8n-editor-ui";
|
||||
packageName = "n8n-editor-ui";
|
||||
version = "0.154.0";
|
||||
version = "0.155.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.154.0.tgz";
|
||||
sha512 = "YmCb4KkK18+v6ecre17ctN4Gzy0q05wMWHQG3Q36GmScGNoCTcSzZpJmygECXQuh0ouoc98sy4YQfeyb8YmKvw==";
|
||||
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.155.0.tgz";
|
||||
sha512 = "4Q/T5W6Rl9EFbHlQvLInQTcIMT8pPf3q20OjoUMbWINiakBPs8wxNDH53P80igdI2nM1ruqF4uI3Zk4etVcfYA==";
|
||||
};
|
||||
};
|
||||
"n8n-nodes-base-0.186.0" = {
|
||||
"n8n-nodes-base-0.187.0" = {
|
||||
name = "n8n-nodes-base";
|
||||
packageName = "n8n-nodes-base";
|
||||
version = "0.186.0";
|
||||
version = "0.187.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.186.0.tgz";
|
||||
sha512 = "gWHuDqhjafqJ7KECM3CcyoiCuYALskKAwkoOj/SOjHTPDq4egLOUjvHXghOZpAoooAk2CTfP0gheEoGSNPVhjA==";
|
||||
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.187.0.tgz";
|
||||
sha512 = "wSqP7dMp8NxgnxFh1Qz/sIr09ONDm5CrpVZOPLA1QIeTbYsVlBEOgTIVCR4fHahcvkqV5KvX9gZJbSoU3F9byQ==";
|
||||
};
|
||||
};
|
||||
"n8n-workflow-0.110.0" = {
|
||||
"n8n-workflow-0.111.0" = {
|
||||
name = "n8n-workflow";
|
||||
packageName = "n8n-workflow";
|
||||
version = "0.110.0";
|
||||
version = "0.111.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.110.0.tgz";
|
||||
sha512 = "PZAV/k0Jq2UiiCK5Bx3RqD4qKNfSAdy7+19bn2fkFrzOD6t3aT481PPOgood04iBx0In4l57WJXlOGBkw32eCg==";
|
||||
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.111.0.tgz";
|
||||
sha512 = "/4Zy2Kcw54l0r0Clhco+k5fw26/d8b/8hz/FoGYKJ9TaleEaI0JmiMjJP/yxd2D5Ehgy1pZQUCaQE2/Y44lhnQ==";
|
||||
};
|
||||
};
|
||||
"named-placeholders-1.1.2" = {
|
||||
@ -7384,13 +7384,13 @@ let
|
||||
sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==";
|
||||
};
|
||||
};
|
||||
"simple-git-3.10.0" = {
|
||||
"simple-git-3.11.0" = {
|
||||
name = "simple-git";
|
||||
packageName = "simple-git";
|
||||
version = "3.10.0";
|
||||
version = "3.11.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/simple-git/-/simple-git-3.10.0.tgz";
|
||||
sha512 = "2w35xrS5rVtAW0g67LqtxCZN5cdddz/woQRfS0OJXaljXEoTychZ4jnE+CQgra/wX4ZvHeiChTUMenCwfIYEYw==";
|
||||
url = "https://registry.npmjs.org/simple-git/-/simple-git-3.11.0.tgz";
|
||||
sha512 = "XULamN/hxviH/ABjDbxJqUTpH59Pn3fHRtwZZZ6v7KWTLE3wKl6CLB0SPXFfzjalQ5hUp+R5DWX2X8rKm4crvw==";
|
||||
};
|
||||
};
|
||||
"simple-lru-cache-0.0.2" = {
|
||||
@ -7528,13 +7528,13 @@ let
|
||||
sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==";
|
||||
};
|
||||
};
|
||||
"sqlite3-5.0.10" = {
|
||||
"sqlite3-5.0.11" = {
|
||||
name = "sqlite3";
|
||||
packageName = "sqlite3";
|
||||
version = "5.0.10";
|
||||
version = "5.0.11";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.10.tgz";
|
||||
sha512 = "xG4XPp7+b/lIlb/acs4XzBmmahI1Qq3Yhy+jZnZJivwB6DXpoOpGR6QinRbsQkHJIvMZyUsJDXouSva/JXcWFA==";
|
||||
url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.11.tgz";
|
||||
sha512 = "4akFOr7u9lJEeAWLJxmwiV43DJcGV7w3ab7SjQFAFaTVyknY3rZjvXTKIVtWqUoY4xwhjwoHKYs2HDW2SoHVsA==";
|
||||
};
|
||||
};
|
||||
"sqlstring-2.3.3" = {
|
||||
@ -7771,13 +7771,13 @@ let
|
||||
sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==";
|
||||
};
|
||||
};
|
||||
"swagger-ui-dist-4.13.0" = {
|
||||
"swagger-ui-dist-4.13.2" = {
|
||||
name = "swagger-ui-dist";
|
||||
packageName = "swagger-ui-dist";
|
||||
version = "4.13.0";
|
||||
version = "4.13.2";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.13.0.tgz";
|
||||
sha512 = "5yqhkUU9uV5oT/MTMBeSgDGI0Vx6eCOU43AszQBs88poI8OB1v+FoXEFHv+NaBbEfTkXCMWlAJrH6iWyDzLETQ==";
|
||||
url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.13.2.tgz";
|
||||
sha512 = "jHL6UyIYpvEI7NsuWd0R3hJaPQTg6Oo4qSBo+oVfOEkv6rrQm/475RGSMmZgV6ajp+Sgrp9CqrDjQYAgQqiv1A==";
|
||||
};
|
||||
};
|
||||
"swagger-ui-express-4.5.0" = {
|
||||
@ -8911,20 +8911,15 @@ in
|
||||
n8n = nodeEnv.buildNodePackage {
|
||||
name = "n8n";
|
||||
packageName = "n8n";
|
||||
version = "0.188.0";
|
||||
version = "0.189.0";
|
||||
src = fetchurl {
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.188.0.tgz";
|
||||
sha512 = "Y5qHnMg608MvJq9f+5Bf+A7eAFxyLVF99siBRX76xj7OWGJUtYrCnOPrKd3zvLJuWCWZXMznjwNnlZwgutsLkA==";
|
||||
url = "https://registry.npmjs.org/n8n/-/n8n-0.189.0.tgz";
|
||||
sha512 = "6s0KJFpqs2E7qSHuU+db0usc7yStuLpDnJMP3dUH7fiGsew7iRoLvoFThtg7DNPPTaLyLs9eyWEDj2VGWKJBsw==";
|
||||
};
|
||||
dependencies = [
|
||||
sources."@apidevtools/json-schema-ref-parser-8.0.0"
|
||||
sources."@apidevtools/openapi-schemas-2.1.0"
|
||||
(sources."@apidevtools/swagger-cli-4.0.0" // {
|
||||
dependencies = [
|
||||
sources."chalk-3.0.0"
|
||||
sources."supports-color-7.2.0"
|
||||
];
|
||||
})
|
||||
sources."@apidevtools/swagger-cli-4.0.0"
|
||||
sources."@apidevtools/swagger-methods-3.0.2"
|
||||
(sources."@apidevtools/swagger-parser-9.0.1" // {
|
||||
dependencies = [
|
||||
@ -8999,16 +8994,16 @@ in
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."@azure/msal-browser-2.28.0"
|
||||
sources."@azure/msal-common-7.2.0"
|
||||
sources."@azure/msal-node-1.12.0"
|
||||
sources."@azure/msal-browser-2.28.1"
|
||||
sources."@azure/msal-common-7.3.0"
|
||||
sources."@azure/msal-node-1.12.1"
|
||||
(sources."@azure/storage-blob-12.11.0" // {
|
||||
dependencies = [
|
||||
sources."@azure/core-tracing-1.0.0-preview.13"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
sources."@babel/parser-7.18.9"
|
||||
sources."@babel/parser-7.18.10"
|
||||
sources."@babel/runtime-7.18.9"
|
||||
sources."@colors/colors-1.5.0"
|
||||
(sources."@dabh/diagnostics-2.0.3" // {
|
||||
@ -9043,9 +9038,16 @@ in
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
(sources."@oclif/core-1.12.1" // {
|
||||
(sources."@oclif/core-1.13.1" // {
|
||||
dependencies = [
|
||||
(sources."chalk-4.1.2" // {
|
||||
dependencies = [
|
||||
sources."supports-color-7.2.0"
|
||||
];
|
||||
})
|
||||
sources."supports-color-8.1.1"
|
||||
sources."tslib-2.4.0"
|
||||
sources."wrap-ansi-7.0.0"
|
||||
];
|
||||
})
|
||||
(sources."@oclif/errors-1.3.5" // {
|
||||
@ -9053,18 +9055,20 @@ in
|
||||
sources."fs-extra-8.1.0"
|
||||
sources."jsonfile-4.0.0"
|
||||
sources."universalify-0.1.2"
|
||||
sources."wrap-ansi-7.0.0"
|
||||
];
|
||||
})
|
||||
(sources."@oclif/help-1.0.1" // {
|
||||
dependencies = [
|
||||
sources."@oclif/config-1.18.2"
|
||||
sources."chalk-4.1.2"
|
||||
sources."tslib-2.4.0"
|
||||
sources."wrap-ansi-6.2.0"
|
||||
];
|
||||
})
|
||||
sources."@oclif/linewrap-1.0.0"
|
||||
(sources."@oclif/parser-3.8.7" // {
|
||||
dependencies = [
|
||||
sources."chalk-4.1.2"
|
||||
sources."tslib-2.4.0"
|
||||
];
|
||||
})
|
||||
@ -9096,10 +9100,10 @@ in
|
||||
sources."@types/lodash-4.14.182"
|
||||
sources."@types/lodash.intersection-4.4.7"
|
||||
sources."@types/lossless-json-1.0.1"
|
||||
sources."@types/mime-1.3.2"
|
||||
sources."@types/mime-3.0.0"
|
||||
sources."@types/minimatch-3.0.5"
|
||||
sources."@types/multer-1.4.7"
|
||||
sources."@types/node-18.6.1"
|
||||
sources."@types/node-18.6.3"
|
||||
(sources."@types/node-fetch-2.6.2" // {
|
||||
dependencies = [
|
||||
sources."form-data-3.0.1"
|
||||
@ -9109,7 +9113,7 @@ in
|
||||
sources."@types/promise-ftp-common-1.1.0"
|
||||
sources."@types/qs-6.9.7"
|
||||
sources."@types/range-parser-1.2.4"
|
||||
sources."@types/serve-static-1.13.10"
|
||||
sources."@types/serve-static-1.15.0"
|
||||
sources."@types/shelljs-0.8.11"
|
||||
sources."@types/snowflake-sdk-1.6.7"
|
||||
sources."@types/swagger-ui-express-4.1.3"
|
||||
@ -9175,7 +9179,7 @@ in
|
||||
})
|
||||
sources."available-typed-arrays-1.0.5"
|
||||
sources."avsc-5.7.4"
|
||||
(sources."aws-sdk-2.1182.0" // {
|
||||
(sources."aws-sdk-2.1187.0" // {
|
||||
dependencies = [
|
||||
sources."buffer-4.9.2"
|
||||
sources."events-1.1.1"
|
||||
@ -9264,11 +9268,7 @@ in
|
||||
sources."adler-32-1.3.1"
|
||||
];
|
||||
})
|
||||
(sources."chalk-4.1.2" // {
|
||||
dependencies = [
|
||||
sources."supports-color-7.2.0"
|
||||
];
|
||||
})
|
||||
sources."chalk-3.0.0"
|
||||
(sources."change-case-4.1.2" // {
|
||||
dependencies = [
|
||||
sources."tslib-2.4.0"
|
||||
@ -9287,8 +9287,10 @@ in
|
||||
sources."cli-cursor-3.1.0"
|
||||
(sources."cli-highlight-2.1.11" // {
|
||||
dependencies = [
|
||||
sources."chalk-4.1.2"
|
||||
sources."cliui-7.0.4"
|
||||
sources."parse5-5.1.1"
|
||||
sources."wrap-ansi-7.0.0"
|
||||
sources."y18n-5.0.8"
|
||||
sources."yargs-16.2.0"
|
||||
sources."yargs-parser-20.2.9"
|
||||
@ -9297,11 +9299,7 @@ in
|
||||
sources."cli-progress-3.11.2"
|
||||
sources."cli-width-3.0.0"
|
||||
sources."client-oauth2-4.3.3"
|
||||
(sources."cliui-6.0.0" // {
|
||||
dependencies = [
|
||||
sources."wrap-ansi-6.2.0"
|
||||
];
|
||||
})
|
||||
sources."cliui-6.0.0"
|
||||
sources."cluster-key-slot-1.1.0"
|
||||
sources."codepage-1.15.0"
|
||||
(sources."color-3.2.1" // {
|
||||
@ -9349,7 +9347,7 @@ in
|
||||
sources."cookie-parser-1.4.6"
|
||||
sources."cookie-signature-1.0.6"
|
||||
sources."copy-to-2.0.1"
|
||||
sources."core-js-3.24.0"
|
||||
sources."core-js-3.24.1"
|
||||
sources."core-util-is-1.0.3"
|
||||
sources."crc-32-1.2.2"
|
||||
sources."cron-1.7.2"
|
||||
@ -9591,7 +9589,11 @@ in
|
||||
sources."indent-string-4.0.0"
|
||||
sources."inflight-1.0.6"
|
||||
sources."inherits-2.0.4"
|
||||
sources."inquirer-7.3.3"
|
||||
(sources."inquirer-7.3.3" // {
|
||||
dependencies = [
|
||||
sources."chalk-4.1.2"
|
||||
];
|
||||
})
|
||||
sources."internal-slot-1.0.3"
|
||||
sources."interpret-1.4.0"
|
||||
sources."ioredis-4.28.5"
|
||||
@ -9640,7 +9642,11 @@ in
|
||||
sources."isexe-2.0.0"
|
||||
sources."iso-639-1-2.1.15"
|
||||
sources."isstream-0.1.2"
|
||||
sources."jake-10.8.5"
|
||||
(sources."jake-10.8.5" // {
|
||||
dependencies = [
|
||||
sources."chalk-4.1.2"
|
||||
];
|
||||
})
|
||||
sources."jmespath-0.16.0"
|
||||
sources."join-component-1.1.0"
|
||||
sources."js-md4-0.3.2"
|
||||
@ -9680,7 +9686,7 @@ in
|
||||
sources."iconv-lite-0.6.3"
|
||||
];
|
||||
})
|
||||
sources."libphonenumber-js-1.10.10"
|
||||
sources."libphonenumber-js-1.10.11"
|
||||
sources."libqp-1.1.0"
|
||||
sources."limiter-1.1.5"
|
||||
sources."linkify-it-4.0.0"
|
||||
@ -9688,6 +9694,7 @@ in
|
||||
dependencies = [
|
||||
sources."cliui-7.0.4"
|
||||
sources."debug-4.3.2"
|
||||
sources."wrap-ansi-7.0.0"
|
||||
sources."y18n-5.0.8"
|
||||
sources."yargs-17.1.1"
|
||||
sources."yargs-parser-20.2.9"
|
||||
@ -9810,15 +9817,15 @@ in
|
||||
];
|
||||
})
|
||||
sources."mz-2.7.0"
|
||||
sources."n8n-core-0.128.0"
|
||||
sources."n8n-design-system-0.28.0"
|
||||
sources."n8n-editor-ui-0.154.0"
|
||||
(sources."n8n-nodes-base-0.186.0" // {
|
||||
sources."n8n-core-0.129.0"
|
||||
sources."n8n-design-system-0.29.0"
|
||||
sources."n8n-editor-ui-0.155.0"
|
||||
(sources."n8n-nodes-base-0.187.0" // {
|
||||
dependencies = [
|
||||
sources."iconv-lite-0.6.3"
|
||||
];
|
||||
})
|
||||
sources."n8n-workflow-0.110.0"
|
||||
sources."n8n-workflow-0.111.0"
|
||||
(sources."named-placeholders-1.1.2" // {
|
||||
dependencies = [
|
||||
sources."lru-cache-4.1.5"
|
||||
@ -10114,7 +10121,7 @@ in
|
||||
})
|
||||
sources."side-channel-1.0.4"
|
||||
sources."signal-exit-3.0.7"
|
||||
sources."simple-git-3.10.0"
|
||||
sources."simple-git-3.11.0"
|
||||
sources."simple-lru-cache-0.0.2"
|
||||
sources."simple-swizzle-0.2.2"
|
||||
sources."slash-3.0.0"
|
||||
@ -10148,7 +10155,7 @@ in
|
||||
];
|
||||
})
|
||||
sources."sprintf-js-1.0.3"
|
||||
sources."sqlite3-5.0.10"
|
||||
sources."sqlite3-5.0.11"
|
||||
sources."sqlstring-2.3.3"
|
||||
sources."sse-channel-3.1.1"
|
||||
sources."ssf-0.11.2"
|
||||
@ -10178,14 +10185,10 @@ in
|
||||
})
|
||||
sources."strip-ansi-6.0.1"
|
||||
sources."strtok3-6.3.0"
|
||||
sources."supports-color-8.1.1"
|
||||
(sources."supports-hyperlinks-2.2.0" // {
|
||||
dependencies = [
|
||||
sources."supports-color-7.2.0"
|
||||
];
|
||||
})
|
||||
sources."supports-color-7.2.0"
|
||||
sources."supports-hyperlinks-2.2.0"
|
||||
sources."supports-preserve-symlinks-flag-1.0.0"
|
||||
sources."swagger-ui-dist-4.13.0"
|
||||
sources."swagger-ui-dist-4.13.2"
|
||||
sources."swagger-ui-express-4.5.0"
|
||||
(sources."tar-6.1.11" // {
|
||||
dependencies = [
|
||||
@ -10248,10 +10251,12 @@ in
|
||||
dependencies = [
|
||||
sources."argparse-2.0.1"
|
||||
sources."buffer-6.0.3"
|
||||
sources."chalk-4.1.2"
|
||||
sources."cliui-7.0.4"
|
||||
sources."js-yaml-4.1.0"
|
||||
sources."mkdirp-1.0.4"
|
||||
sources."tslib-2.4.0"
|
||||
sources."wrap-ansi-7.0.0"
|
||||
sources."y18n-5.0.8"
|
||||
sources."yargs-17.5.1"
|
||||
sources."yargs-parser-21.0.1"
|
||||
@ -10344,7 +10349,7 @@ in
|
||||
sources."word-0.3.0"
|
||||
sources."word-wrap-1.2.3"
|
||||
sources."wordwrap-1.0.0"
|
||||
sources."wrap-ansi-7.0.0"
|
||||
sources."wrap-ansi-6.2.0"
|
||||
sources."wrappy-1.0.2"
|
||||
sources."ws-7.5.9"
|
||||
sources."xlsx-0.17.5"
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv, lib, fetchurl, doxygen, extra-cmake-modules, graphviz, kdoctools
|
||||
, wrapQtAppsHook
|
||||
, autoPatchelfHook
|
||||
|
||||
, akonadi, alkimia, aqbanking, gmp, gwenhywfar, kactivities, karchive
|
||||
, kcmutils, kcontacts, kdewebkit, kdiagram, kholidays, kidentitymanagement
|
||||
@ -10,24 +11,24 @@
|
||||
# Needed for running tests:
|
||||
, qtbase, xvfb-run
|
||||
|
||||
, python2, python3Packages
|
||||
, python3
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kmymoney";
|
||||
version = "5.1.1";
|
||||
version = "5.1.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-33ufeOhZb5nSgpXKc4cI8GVe4Fd4nf2SHHsbq5ZXgpg=";
|
||||
sha256 = "sha256-OTi4B4tzkboy4Su0I5di+uE0aDoMLsGnUQXDAso+Xj8=";
|
||||
};
|
||||
|
||||
# Hidden dependency that wasn't included in CMakeLists.txt:
|
||||
NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5";
|
||||
|
||||
nativeBuildInputs = [
|
||||
doxygen extra-cmake-modules graphviz kdoctools python2
|
||||
python3Packages.wrapPython wrapQtAppsHook
|
||||
doxygen extra-cmake-modules graphviz kdoctools
|
||||
python3.pkgs.wrapPython wrapQtAppsHook autoPatchelfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@ -38,20 +39,18 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Put it into buildInputs so that CMake can find it, even though we patch
|
||||
# it into the interface later.
|
||||
python3Packages.weboob
|
||||
python3.pkgs.woob
|
||||
];
|
||||
|
||||
weboobPythonPath = [ python3Packages.weboob ];
|
||||
|
||||
postInstall = ''
|
||||
buildPythonPath "$weboobPythonPath"
|
||||
patchPythonScript "$out/share/kmymoney/weboob/kmymoneyweboob.py"
|
||||
postPatch = ''
|
||||
buildPythonPath "${python3.pkgs.woob}"
|
||||
patchPythonScript "kmymoney/plugins/woob/interface/kmymoneywoob.py"
|
||||
|
||||
# Within the embedded Python interpreter, sys.argv is unavailable, so let's
|
||||
# assign it to a dummy value so that the assignment of sys.argv[0] injected
|
||||
# by patchPythonScript doesn't fail:
|
||||
sed -i -e '1i import sys; sys.argv = [""]' \
|
||||
"$out/share/kmymoney/weboob/kmymoneyweboob.py"
|
||||
"kmymoney/plugins/woob/interface/kmymoneywoob.py"
|
||||
'';
|
||||
|
||||
doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;
|
||||
@ -62,10 +61,18 @@ stdenv.mkDerivation rec {
|
||||
ARGS="-E '(reports-chart-test)'" # Test fails, so exclude it for now.
|
||||
'';
|
||||
|
||||
# libpython is required by the python interpreter embedded in kmymoney, so we
|
||||
# need to explicitly tell autoPatchelf about it.
|
||||
postFixup = ''
|
||||
patchelf --debug --add-needed libpython${python3.pythonVersion}.so \
|
||||
"$out/bin/.kmymoney-wrapped"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Personal finance manager for KDE";
|
||||
homepage = "https://kmymoney.org/";
|
||||
platforms = lib.platforms.linux;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ aidalgol das-g ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -65,7 +65,7 @@ tmp="${here}/,versions.nix.${RANDOM}"
|
||||
libs=( symbols templates footprints packages3d )
|
||||
|
||||
get_rev() {
|
||||
git ls-remote --heads --tags "$@"
|
||||
git ls-remote --tags "$@"
|
||||
}
|
||||
|
||||
gitlab="https://gitlab.com/kicad"
|
||||
|
||||
@ -3,23 +3,23 @@
|
||||
{
|
||||
"kicad" = {
|
||||
kicadVersion = {
|
||||
version = "6.0.6";
|
||||
version = "6.0.7";
|
||||
src = {
|
||||
rev = "3a73a7531170b37afa1eb22d5924ef8af7f9e71e";
|
||||
sha256 = "0cb9zba812dlmn2w27s1q38mjpfdwhv0nnbilwsxchpvwg8j4k2j";
|
||||
rev = "77480857076960b2e8a70e01aee0b843db37f5f7";
|
||||
sha256 = "10bqn99nif9zyi5v0lkic3na2vac5lgacw01ayil359vaw7d0pzy";
|
||||
};
|
||||
};
|
||||
libVersion = {
|
||||
version = "6.0.6";
|
||||
version = "6.0.7";
|
||||
libSources = {
|
||||
symbols.rev = "3df4c49795a65a051fafb1cf81d291be4c891f62";
|
||||
symbols.sha256 = "02z3vqhz1rlf57zi8vyrlxvvdl1hpsh447p41qdgcpn5dyjycb9d";
|
||||
templates.rev = "17aca4385144bf872e69f41bf5012fd2018cec2c";
|
||||
symbols.rev = "059abdef06a0b7b44994ae9948a4f98f7224cb1f";
|
||||
symbols.sha256 = "006ksx8r6cm6q7v701nalggivp21cmysj8p9zc18y3sch8n1mj4g";
|
||||
templates.rev = "16d1898d52f1277ce9bd75640a32f7d2c6d122bf";
|
||||
templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v";
|
||||
footprints.rev = "64bae4c4a0d51afbc8129682ef0c2bf28b005c04";
|
||||
footprints.sha256 = "1phynxisha2pq2knbx5l1hkdz1bmjm0qxl3lcb4ab82h8d35r37c";
|
||||
packages3d.rev = "6cb25bc10f8c94fbf71479fe9782aecfcc9952bd";
|
||||
packages3d.sha256 = "0ci9gxbpfnfqwah95ki4qcwlca78s1z6s7hckisnp58a1cm9siya";
|
||||
footprints.rev = "26e8be9805444cc25d03d2263277aa06620f5374";
|
||||
footprints.sha256 = "0c5fm4hlkka0ms43j02kbv7s9yrlkffn0jz6649ac3gpx6pk8lbf";
|
||||
packages3d.rev = "cd9551dfb37ab0c086cac63564e54a7bc7b611d8";
|
||||
packages3d.sha256 = "0rdhwyhknrc63sc5ykmq097rzrl36zibnkls7q5hf54lrhn0n3k4";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
@ -84,6 +85,19 @@ stdenv.mkDerivation rec {
|
||||
|
||||
mesonFlags = [ "-Dsystemd=true" "-Dcompositor=${phoc}/bin/phoc" ];
|
||||
|
||||
patches = [
|
||||
# build: Adjust to polkit version changes
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/World/Phosh/phosh/-/commit/16b46e295b86cbf1beaccf8218cf65ebb4b7a6f1.patch";
|
||||
sha256 = "sha256-Db1OEdiI1QBHGEBs1Coi7LTF9bCScdDgxmovpBdIY/g=";
|
||||
})
|
||||
# polkit-auth-agent: Scope cleanup function for PolkitAgentListener
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/World/Phosh/phosh/-/commit/b864653df50bfd8f34766fc6b37a3bf32cfbdfa4.patch";
|
||||
sha256 = "sha256-YCw3tGk94NAa6PPTmA1lCJVzzi9GC74BmvtTcvuHPh0=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
chmod +x build-aux/post_install.py
|
||||
patchShebangs build-aux/post_install.py
|
||||
@ -113,7 +127,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru = {
|
||||
providedSessions = [
|
||||
"sm.puri.Phosh"
|
||||
"sm.puri.Phosh"
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@ -7,10 +7,11 @@ rustPlatform.buildRustPackage {
|
||||
src = ./make-initrd-ng;
|
||||
cargoLock.lockFile = ./make-initrd-ng/Cargo.lock;
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
passthru.updateScript = ./make-initrd-ng/update.sh;
|
||||
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/make-initrd-ng \
|
||||
--prefix PATH : ${lib.makeBinPath [ patchelf glibc binutils ]}
|
||||
'';
|
||||
meta = {
|
||||
description = "Tool for copying binaries and their dependencies";
|
||||
maintainers = with lib.maintainers; [ das_j elvishjerricco k900 lheckemann ];
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,10 +8,12 @@ let
|
||||
# compression type and filename extension.
|
||||
compressorName = fullCommand: builtins.elemAt (builtins.match "([^ ]*/)?([^ ]+).*" fullCommand) 1;
|
||||
in
|
||||
{ stdenvNoCC, perl, cpio, ubootTools, lib, pkgsBuildHost, makeInitrdNGTool, patchelf, runCommand
|
||||
{ stdenvNoCC, perl, cpio, ubootTools, lib, pkgsBuildHost, makeInitrdNGTool, binutils, runCommand
|
||||
# Name of the derivation (not of the resulting file!)
|
||||
, name ? "initrd"
|
||||
|
||||
, strip ? true
|
||||
|
||||
# Program used to compress the cpio archive; use "cat" for no compression.
|
||||
# This can also be a function which takes a package set and returns the path to the compressor,
|
||||
# such as `pkgs: "${pkgs.lzop}/bin/lzop"`.
|
||||
@ -59,7 +61,7 @@ in
|
||||
# If this isn't guessed, you may want to complete the metadata above and send a PR :)
|
||||
, uInitrdCompression ? _compressorMeta.ubootName or
|
||||
(throw "Unrecognised compressor ${_compressorName}, please specify uInitrdCompression")
|
||||
}: runCommand name {
|
||||
}: runCommand name ({
|
||||
compress = "${_compressorExecutable} ${lib.escapeShellArgs _compressorArgsReal}";
|
||||
passthru = {
|
||||
compressorExecutableFunction = _compressorFunction;
|
||||
@ -72,8 +74,10 @@ in
|
||||
passAsFile = ["contents"];
|
||||
contents = lib.concatMapStringsSep "\n" ({ object, symlink, ... }: "${object}\n${if symlink == null then "" else symlink}") contents + "\n";
|
||||
|
||||
nativeBuildInputs = [makeInitrdNGTool patchelf cpio] ++ lib.optional makeUInitrd ubootTools;
|
||||
} ''
|
||||
nativeBuildInputs = [makeInitrdNGTool cpio] ++ lib.optional makeUInitrd ubootTools ++ lib.optional strip binutils;
|
||||
|
||||
STRIP = if strip then "${(binutils.nativeDrv or binutils).targetPrefix}strip" else null;
|
||||
}) ''
|
||||
mkdir ./root
|
||||
make-initrd-ng "$contentsPath" ./root
|
||||
mkdir "$out"
|
||||
|
||||
92
pkgs/build-support/kernel/make-initrd-ng/Cargo.lock
generated
92
pkgs/build-support/kernel/make-initrd-ng/Cargo.lock
generated
@ -1,5 +1,97 @@
|
||||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
version = 3
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "goblin"
|
||||
version = "0.5.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "91766b1121940d622933a13e20665857648681816089c9bc2075c4b75a6e4f6b"
|
||||
dependencies = [
|
||||
"log",
|
||||
"plain",
|
||||
"scroll",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
version = "0.4.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "make-initrd-ng"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"goblin",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "plain"
|
||||
version = "0.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.42"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c278e965f1d8cf32d6e0e96de3d3e79712178ae67986d9cf9151f51e95aac89b"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.20"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "scroll"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da"
|
||||
dependencies = [
|
||||
"scroll_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "scroll_derive"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.98"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7"
|
||||
|
||||
@ -7,3 +7,4 @@ edition = "2018"
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
goblin = "0.5.0"
|
||||
|
||||
@ -3,11 +3,13 @@ use std::env;
|
||||
use std::ffi::OsStr;
|
||||
use std::fs;
|
||||
use std::hash::Hash;
|
||||
use std::io::{BufReader, BufRead, Error, ErrorKind};
|
||||
use std::io::{BufRead, BufReader, Error};
|
||||
use std::os::unix;
|
||||
use std::path::{Component, Path, PathBuf};
|
||||
use std::process::Command;
|
||||
|
||||
use goblin::{elf::Elf, Object};
|
||||
|
||||
struct NonRepeatingQueue<T> {
|
||||
queue: VecDeque<T>,
|
||||
seen: HashSet<T>,
|
||||
@ -38,42 +40,32 @@ impl<T: Clone + Eq + Hash> NonRepeatingQueue<T> {
|
||||
}
|
||||
}
|
||||
|
||||
fn patch_elf<S: AsRef<OsStr>, P: AsRef<OsStr>>(mode: S, path: P) -> Result<String, Error> {
|
||||
let output = Command::new("patchelf")
|
||||
.arg(&mode)
|
||||
.arg(&path)
|
||||
.output()?;
|
||||
if output.status.success() {
|
||||
Ok(String::from_utf8(output.stdout).expect("Failed to parse output"))
|
||||
} else {
|
||||
Err(Error::new(ErrorKind::Other, format!("failed: patchelf {:?} {:?}", OsStr::new(&mode), OsStr::new(&path))))
|
||||
}
|
||||
}
|
||||
|
||||
fn copy_file<P: AsRef<Path> + AsRef<OsStr>, S: AsRef<Path> + AsRef<OsStr>>(
|
||||
fn add_dependencies<P: AsRef<Path> + AsRef<OsStr>>(
|
||||
source: P,
|
||||
target: S,
|
||||
elf: Elf,
|
||||
queue: &mut NonRepeatingQueue<Box<Path>>,
|
||||
) -> Result<(), Error> {
|
||||
fs::copy(&source, &target)?;
|
||||
|
||||
if !Command::new("ldd").arg(&source).output()?.status.success() {
|
||||
// Not dynamically linked - no need to recurse
|
||||
return Ok(());
|
||||
) {
|
||||
if let Some(interp) = elf.interpreter {
|
||||
queue.push_back(Box::from(Path::new(interp)));
|
||||
}
|
||||
|
||||
let rpath_string = patch_elf("--print-rpath", &source)?;
|
||||
let needed_string = patch_elf("--print-needed", &source)?;
|
||||
// Shared libraries don't have an interpreter
|
||||
if let Ok(interpreter_string) = patch_elf("--print-interpreter", &source) {
|
||||
queue.push_back(Box::from(Path::new(&interpreter_string.trim())));
|
||||
}
|
||||
let rpaths = if elf.runpaths.len() > 0 {
|
||||
elf.runpaths
|
||||
} else if elf.rpaths.len() > 0 {
|
||||
elf.rpaths
|
||||
} else {
|
||||
vec![]
|
||||
};
|
||||
|
||||
let rpath = rpath_string.trim().split(":").map(|p| Box::<Path>::from(Path::new(p))).collect::<Vec<_>>();
|
||||
let rpaths_as_path = rpaths
|
||||
.into_iter()
|
||||
.flat_map(|p| p.split(":"))
|
||||
.map(|p| Box::<Path>::from(Path::new(p)))
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
for line in needed_string.lines() {
|
||||
for line in elf.libraries {
|
||||
let mut found = false;
|
||||
for path in &rpath {
|
||||
for path in &rpaths_as_path {
|
||||
let lib = path.join(line);
|
||||
if lib.exists() {
|
||||
// No need to recurse. The queue will bring it back round.
|
||||
@ -85,20 +77,45 @@ fn copy_file<P: AsRef<Path> + AsRef<OsStr>, S: AsRef<Path> + AsRef<OsStr>>(
|
||||
if !found {
|
||||
// glibc makes it tricky to make this an error because
|
||||
// none of the files have a useful rpath.
|
||||
println!("Warning: Couldn't satisfy dependency {} for {:?}", line, OsStr::new(&source));
|
||||
println!(
|
||||
"Warning: Couldn't satisfy dependency {} for {:?}",
|
||||
line,
|
||||
OsStr::new(&source)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Make file writable to strip it
|
||||
let mut permissions = fs::metadata(&target)?.permissions();
|
||||
permissions.set_readonly(false);
|
||||
fs::set_permissions(&target, permissions)?;
|
||||
fn copy_file<P: AsRef<Path> + AsRef<OsStr>, S: AsRef<Path> + AsRef<OsStr>>(
|
||||
source: P,
|
||||
target: S,
|
||||
queue: &mut NonRepeatingQueue<Box<Path>>,
|
||||
) -> Result<(), Error> {
|
||||
fs::copy(&source, &target)?;
|
||||
|
||||
// Strip further than normal
|
||||
if !Command::new("strip").arg("--strip-all").arg(OsStr::new(&target)).output()?.status.success() {
|
||||
println!("{:?} was not successfully stripped.", OsStr::new(&target));
|
||||
}
|
||||
let contents = fs::read(&source)?;
|
||||
|
||||
if let Ok(Object::Elf(e)) = Object::parse(&contents) {
|
||||
add_dependencies(source, e, queue);
|
||||
|
||||
// Make file writable to strip it
|
||||
let mut permissions = fs::metadata(&target)?.permissions();
|
||||
permissions.set_readonly(false);
|
||||
fs::set_permissions(&target, permissions)?;
|
||||
|
||||
// Strip further than normal
|
||||
if let Ok(strip) = env::var("STRIP") {
|
||||
if !Command::new(strip)
|
||||
.arg("--strip-all")
|
||||
.arg(OsStr::new(&target))
|
||||
.output()?
|
||||
.status
|
||||
.success()
|
||||
{
|
||||
println!("{:?} was not successfully stripped.", OsStr::new(&target));
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
4
pkgs/build-support/kernel/make-initrd-ng/update.sh
Executable file
4
pkgs/build-support/kernel/make-initrd-ng/update.sh
Executable file
@ -0,0 +1,4 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -p cargo -i bash
|
||||
cd "$(dirname "$0")"
|
||||
cargo update
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, callPackage, gnat, zlib, llvm, lib
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, callPackage, gnat11, zlib, llvm, lib
|
||||
, backend ? "mcode" }:
|
||||
|
||||
assert backend == "mcode" || backend == "llvm";
|
||||
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
LIBRARY_PATH = "${stdenv.cc.libc}/lib";
|
||||
|
||||
buildInputs = [ gnat zlib ] ++ lib.optional (backend == "llvm") [ llvm ];
|
||||
buildInputs = [ gnat11 zlib ] ++ lib.optional (backend == "llvm") [ llvm ];
|
||||
propagatedBuildInputs = lib.optionals (backend == "llvm") [ zlib ];
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib, callPackage, stdenv, makeWrapper, fetchurl, ocaml, findlib, dune_2
|
||||
, ncurses
|
||||
, fix, menhir, menhirLib, menhirSdk, merlin-extend, ppxlib, utop, cppo, ppx_derivers
|
||||
}:
|
||||
|
||||
@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
ocaml
|
||||
ppxlib
|
||||
utop
|
||||
];
|
||||
] ++ lib.optional (lib.versionOlder ocaml.version "4.07") ncurses;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
menhirLib
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xdg-desktop-portal";
|
||||
version = "1.14.5";
|
||||
version = "1.14.6";
|
||||
|
||||
outputs = [ "out" "installedTests" ];
|
||||
|
||||
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "flatpak";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-leLCG+ZdQ4zB1LsTN8gZh7yhJ7EZCYYyxwE3hR9vIkM=";
|
||||
sha256 = "sha256-MD1zjKDWwvVTui0nYPgvVjX48DaHWcP7Q10vDrNKYz0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -45,7 +45,7 @@ buildPythonPackage rec {
|
||||
# Upstream is releasing with the help of a CI to PyPI, GitHub releases
|
||||
# are not in their focus
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'version="main",' 'version="${version}",'
|
||||
--replace 'version = "0"' 'version = "${version}"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "simplisafe-python";
|
||||
version = "2022.07.0";
|
||||
version = "2022.07.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-v3N2f5B6BrwTb4ik2bME8OLzwsHZ3qWx+Jx1pv7KX8A=";
|
||||
sha256 = "sha256-mbdL1fX86OPMw6I7Lk7NDhm2kE6/iamYbyvYvJrkwLQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-tally";
|
||||
version = "1.0.8";
|
||||
version = "1.0.9";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-NGYXe94eHvRQNxJgH7EiQaL9S+dtNlUrpVSWWQ/wHWY=";
|
||||
sha256 = "sha256-KwR//7UpVoxreQVBY4/GawdU9Bk0d2Qj9EW3odvofc0=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-vXhZyVMKa/itc+loKuSkSqIWyS3VSowOg1QRS213DPo=";
|
||||
cargoSha256 = "sha256-myqSki5pBT01bsJcEy92HkZHbLaWT+5Tl5u4LEUmlK4=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
DiskArbitration
|
||||
|
||||
@ -1,19 +1,20 @@
|
||||
{ stdenv, lib, fetchurl, unzip }:
|
||||
let
|
||||
# You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version`
|
||||
version = "4.4.40";
|
||||
# There's a handy prefetch script in ./fetch-latest.sh
|
||||
version = "4.4.98";
|
||||
supportedPlatforms = {
|
||||
"x86_64-linux" = {
|
||||
name = "x86_64-unknown-linux-musl";
|
||||
sha256 = "sha256-goPPGU4oZWBD/C15rbbX5YMqua16A4MdLhBoC4JxaCI=";
|
||||
hash = "sha256-AYgv/XrHjEOhtyx8QeOhssdsc/fssShZcA+15fFgI1g=";
|
||||
};
|
||||
"x86_64-darwin" = {
|
||||
name = "x86_64-apple-darwin";
|
||||
sha256 = "sha256-CgYHQ91U6K3+kMyOSSia2B7IncR5u0eq9h3EZiBsRdU=";
|
||||
hash = "sha256-XUd97ZUUb8XqMrlnSBER68fU3+58zpwKnzZ+i3dlWIs=";
|
||||
};
|
||||
"aarch64-darwin" = {
|
||||
name = "aarch64-apple-darwin";
|
||||
sha256 = "sha256-JwX3TdKYmLQO3mWb15Ds/60VAAurGxqfJlMCQqy2pxg=";
|
||||
hash = "sha256-L2r4fB4OtJJUvwnFP7zYAm8RLf8b7r6kDNGlwZRkLnw=";
|
||||
};
|
||||
};
|
||||
platform =
|
||||
@ -28,7 +29,7 @@ stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://update.tabnine.com/bundles/${version}/${platform.name}/TabNine.zip";
|
||||
inherit (platform) sha256;
|
||||
inherit (platform) hash;
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
29
pkgs/development/tools/tabnine/fetch-latest.sh
Executable file
29
pkgs/development/tools/tabnine/fetch-latest.sh
Executable file
@ -0,0 +1,29 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
function prefetch-sri() {
|
||||
nix-prefetch-url "$1" 2>/dev/null | xargs nix hash to-sri --type sha256
|
||||
}
|
||||
|
||||
declare -a PLATFORMS=(
|
||||
x86_64-unknown-linux-musl
|
||||
x86_64-apple-darwin
|
||||
aarch64-apple-darwin
|
||||
)
|
||||
|
||||
LATEST="$(curl -sS https://update.tabnine.com/bundles/version)"
|
||||
|
||||
cat <<-EOF
|
||||
version = "${LATEST}";
|
||||
EOF
|
||||
|
||||
for platform in "${PLATFORMS[@]}"; do
|
||||
url="https://update.tabnine.com/bundles/${LATEST}/${platform}/TabNine.zip"
|
||||
sha="$(prefetch-sri "$url")"
|
||||
cat <<-EOF
|
||||
name = "${platform}";
|
||||
hash = "${sha}";
|
||||
|
||||
EOF
|
||||
done
|
||||
@ -31,13 +31,13 @@ python3Packages.buildPythonApplication rec {
|
||||
gobject-introspection
|
||||
desktop-file-utils
|
||||
glib
|
||||
gtk3
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cairo
|
||||
gettext
|
||||
gtk3
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2022.7.5";
|
||||
version = "2022.7.7";
|
||||
components = {
|
||||
"abode" = ps: with ps; [
|
||||
abodepy
|
||||
|
||||
@ -30,6 +30,29 @@ let
|
||||
defaultOverrides = [
|
||||
# Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt
|
||||
|
||||
(self: super: {
|
||||
advantage-air = super.advantage-air.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.3.1";
|
||||
src = super.fetchPypi {
|
||||
pname = "advantage_air";
|
||||
inherit version;
|
||||
hash = "sha256-C+cB6oHmbr9mHZKnbls42yenQy3+L8huLk9wKazIWfU=";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
aiohomekit = super.aiohomekit.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.7.20";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Jc2k";
|
||||
repo = "aiohomekit";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-g7N+CIBJCMnW4FjN502SahhSpPS1p7AXZvduteHu+Z4=";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
backoff = super.backoff.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.11.1";
|
||||
@ -56,6 +79,30 @@ let
|
||||
});
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
gridnet = super.gridnet.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "4.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "klaasnicolaas";
|
||||
repo = "python-gridnet";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Ihs8qUx50tAUcRBsVArRhzoLcQUi1vbYh8sPyK75AEk=";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
p1monitor = super.p1monitor.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.0.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "klaasnicolaas";
|
||||
repo = "python-p1monitor";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-g3isA2gF2AD+VVzTqpnD+YiJQ9Kcl0VKvwd5l5Yx/Uo=";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
# pytest-aiohttp>0.3.0 breaks home-assistant tests
|
||||
(self: super: {
|
||||
pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec {
|
||||
@ -113,6 +160,56 @@ let
|
||||
});
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
pyatmo = super.pyatmo.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "6.2.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "jabesq";
|
||||
repo = "pyatmo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VXkQByaNA02fwBO2yuf7w1ZF/oJwd/h21de1EQlCu2U=";
|
||||
};
|
||||
checkInputs = [ super.freezegun ];
|
||||
});
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
python-homewizard-energy = super.python-homewizard-energy.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.0.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "DCSBL";
|
||||
repo = "python-homewizard-energy";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ioISqRFZZCojTJ/KYS8QUtoEpBNOPqY9lC9NFbZyh5A=";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
# pyunifiprotect excludes pydantic==1.9.1
|
||||
(self: super: {
|
||||
pydantic = super.pydantic.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "1.9.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "samuelcolvin";
|
||||
repo = "pydantic";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-C4WP8tiMRFmkDkQRrvP3yOSM2zN8pHJmX9cdANIckpM=";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "98";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Kane610";
|
||||
repo = "deconz";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-hCJRoyDWDxrBrxs2g6mVh7MOe6UMd+S8+ftfWyzWgH8=";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec {
|
||||
pname = "python-slugify";
|
||||
@ -124,6 +221,40 @@ let
|
||||
});
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
pytradfri = super.pytradfri.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "9.0.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "home-assistant-libs";
|
||||
repo = "pytradfri";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-12ol+2CnoPfkxmDGJJAkoafHGpQuWC4lh0N7lSvx2DE=";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
solax = super.solax.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.2.9";
|
||||
src = super.fetchPypi {
|
||||
pname = "solax";
|
||||
inherit version;
|
||||
hash = "sha256-5m2wxdTshAsEfldPAyXqAYYtH1VjqERRBUGzX6pV85I=";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
pysoma = super.pysoma.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.0.10";
|
||||
src = super.fetchPypi {
|
||||
pname = "pysoma";
|
||||
inherit version;
|
||||
hash = "sha256-sU1qHbAjdIUu0etjate8+U1zvunbw3ddBtDVUU10CuE=";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
# Pinned due to API changes in 0.4.0
|
||||
(self: super: {
|
||||
vilfo-api-client = super.vilfo-api-client.overridePythonAttrs (oldAttrs: rec {
|
||||
@ -150,6 +281,18 @@ let
|
||||
});
|
||||
})
|
||||
|
||||
(self: super: {
|
||||
wled = super.wled.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.13.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "frenck";
|
||||
repo = "python-wled";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Rv0jaKkN6jQ7oiv1cBYx4HAr7IqPm57jZFykXayp0T0=";
|
||||
};
|
||||
});
|
||||
})
|
||||
|
||||
# home-assistant-frontend does not exist in python3.pkgs
|
||||
(self: super: {
|
||||
home-assistant-frontend = self.callPackage ./frontend.nix { };
|
||||
@ -189,7 +332,7 @@ let
|
||||
extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
|
||||
|
||||
# Don't forget to run parse-requirements.py after updating
|
||||
hassVersion = "2022.7.5";
|
||||
hassVersion = "2022.7.7";
|
||||
|
||||
in python.pkgs.buildPythonApplication rec {
|
||||
pname = "homeassistant";
|
||||
@ -207,7 +350,7 @@ in python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
rev = version;
|
||||
hash = "sha256-fUKT9ZSu8dhwapvdjq50t5kh6ZwGsMteuvCjYpPQNx0=";
|
||||
hash = "sha256-OU6tPTBC53ogkynH6NrYiQCerPo8Fu0ZLHhNsY0emGs=";
|
||||
};
|
||||
|
||||
# leave this in, so users don't have to constantly update their downstream patch handling
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "statsd_exporter";
|
||||
version = "0.22.2";
|
||||
version = "0.22.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "prometheus";
|
||||
repo = "statsd_exporter";
|
||||
sha256 = "sha256-pLzUbeSCMV0yr4gSR7m6NYrpm8ZhCPbwwZ5nQzy6lEM=";
|
||||
sha256 = "sha256-hkzgLjxFczqKKJHdVfCKPqMXVFShlS5lZoX8NA27u90=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-gBeeOxnVT0+x33VuwZhfjk3Fb8JHZdAzaDuFZlUfdgM=";
|
||||
vendorSha256 = "sha256-/qc3Ui18uSDfHsXiNA63+uPSfxShz7cs3kv0rQPgCok=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Receives StatsD-style metrics and exports them to Prometheus";
|
||||
|
||||
@ -105,16 +105,16 @@ in rec {
|
||||
mkdir $out/include
|
||||
cp -rd ${llvmPackages.libcxx.dev}/include/c++ $out/include
|
||||
|
||||
# copy .tbd assembly utils
|
||||
cp -d ${pkgs.darwin.rewrite-tbd}/bin/rewrite-tbd $out/bin
|
||||
cp -d ${lib.getLib pkgs.libyaml}/lib/libyaml*.dylib $out/lib
|
||||
|
||||
# copy package extraction tools
|
||||
cp -d ${pkgs.pbzx}/bin/pbzx $out/bin
|
||||
cp -d ${lib.getLib pkgs.xar}/lib/libxar*.dylib $out/lib
|
||||
cp -d ${pkgs.bzip2.out}/lib/libbz2*.dylib $out/lib
|
||||
|
||||
${lib.optionalString targetPlatform.isAarch64 ''
|
||||
# copy .tbd assembly utils
|
||||
cp -d ${pkgs.darwin.rewrite-tbd}/bin/rewrite-tbd $out/bin
|
||||
cp -d ${lib.getLib pkgs.libyaml}/lib/libyaml*.dylib $out/lib
|
||||
|
||||
# copy package extraction tools
|
||||
cp -d ${pkgs.pbzx}/bin/pbzx $out/bin
|
||||
cp -d ${lib.getLib pkgs.xar}/lib/libxar*.dylib $out/lib
|
||||
cp -d ${pkgs.bzip2.out}/lib/libbz2*.dylib $out/lib
|
||||
|
||||
# copy sigtool
|
||||
cp -d ${pkgs.darwin.sigtool}/bin/sigtool $out/bin
|
||||
cp -d ${pkgs.darwin.sigtool}/bin/codesign $out/bin
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xdg-user-dirs";
|
||||
version = "0.17";
|
||||
version = "0.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://user-dirs.freedesktop.org/releases/xdg-user-dirs-${version}.tar.gz";
|
||||
sha256 = "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra";
|
||||
sha256 = "sha256-7G8G10lc26N6cyA5+bXhV4vLKWV2/eDaQO2y9SIg3zw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper libxslt docbook_xsl ];
|
||||
|
||||
@ -15,16 +15,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zellij";
|
||||
version = "0.31.0";
|
||||
version = "0.31.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zellij-org";
|
||||
repo = "zellij";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8QHebxjNKnEhF7CdaEkSuSwvb0nbDSxYTlJN2Vn/pRk=";
|
||||
sha256 = "sha256-8ISOyfLNtLW244HkCOpB38fhafnxRaOBBezpVz4Mb2o=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-dPK0gq+zCLn5n3tXt2DNqsL4+I+3vwR8ebRsrPlaMl0=";
|
||||
cargoSha256 = "sha256-lBmJL7p7mqfly6CmZBFR2FFD4QlAccCAYU251HuI9jY=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
mandown
|
||||
|
||||
@ -109,13 +109,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "airgeddon";
|
||||
version = "11.01";
|
||||
version = "11.02";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "v1s1t0r1sh3r3";
|
||||
repo = "airgeddon";
|
||||
rev = "v${version}";
|
||||
sha256 = "3TjaLEcerRk69Ys4kj7vOMCRUd0ifFJzL4MB5ifoK68=";
|
||||
hash = "sha256-k3xQndF1m3fnn7nCb2T/wGxbUPJ83wOV33Ky0FbToVg=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
21
pkgs/tools/text/tuc/default.nix
Normal file
21
pkgs/tools/text/tuc/default.nix
Normal file
@ -0,0 +1,21 @@
|
||||
{ lib, fetchFromGitHub, rustPlatform }:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tuc";
|
||||
version = "0.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "riquito";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-M2SK6KF8R0WcyFf8eTyYNK5oXj/DfCrAkUZJ3J2LF6U=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-MhEIDRC40zQ8mBXxONavtPr87SrueV57HhmIRLIagGA=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "When cut doesn't cut it";
|
||||
homepage = "https://github.com/riquito/tuc";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with maintainers; [ dit7ya ];
|
||||
};
|
||||
}
|
||||
@ -4355,6 +4355,8 @@ with pkgs;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
inherit (ocamlPackages) patdiff;
|
||||
|
||||
patool = with python3Packages; toPythonApplication patool;
|
||||
|
||||
pbgopy = callPackage ../tools/text/pbgopy { };
|
||||
@ -9319,6 +9321,8 @@ with pkgs;
|
||||
|
||||
tinystatus = callPackage ../tools/networking/tinystatus { };
|
||||
|
||||
tuc = callPackage ../tools/text/tuc { };
|
||||
|
||||
opensshPackages = dontRecurseIntoAttrs (callPackage ../tools/networking/openssh {});
|
||||
|
||||
openssh = opensshPackages.openssh.override {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user