Merge remote-tracking branch 'origin/staging-next' into staging

Conflicts:
	pkgs/development/compilers/go/2-dev.nix
This commit is contained in:
zowoq 2022-04-07 22:12:13 +10:00
commit 3a70d5dc83
40 changed files with 315 additions and 280 deletions

View File

@ -0,0 +1,23 @@
{ lib, stdenv, fetchurl }:
stdenv.mkDerivation {
name = "control-lock";
src = fetchurl {
url = "https://github.com/emacsmirror/emacswiki.org/blob/185fdc34fb1e02b43759ad933d3ee5646b0e78f8/control-lock.el";
sha256 = "1b5xcgq2r565pr1c14dwrmn1fl05p56infapa5pqvajv2kpfla7h";
};
dontUnpack = true;
installPhase = ''
install -d $out/share/emacs/site-lisp
install $src $out/share/emacs/site-lisp/control-lock.el
'';
meta = {
description = "Like caps-lock, but for your control key. Give your pinky a rest!";
homepage = "https://www.emacswiki.org/emacs/control-lock.el";
platforms = lib.platforms.all;
};
}

View File

@ -190,6 +190,8 @@
perl-completion = callPackage ./perl-completion { };
control-lock = callPackage ./control-lock { };
plz = callPackage ./plz { };
pod-mode = callPackage ./pod-mode { };

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gsctl";
version = "1.1.4";
version = "1.1.5";
src = fetchFromGitHub {
owner = "giantswarm";
repo = pname;
rev = version;
sha256 = "sha256-uCNWgaLZMm1vPxFduj8mpjKYuYlp1ChF6bK+bmAWy50=";
sha256 = "sha256-P1hJoZ1YSZTCo5ha/Um/nYVVhbYC3dcrQGJYTSnqNu4=";
};
vendorSha256 = "sha256-lZgHrQYqoyoM1Iv6vCqTMcv62zSKyxaAsq56kUXHrIA=";
vendorSha256 = "sha256-NeRABlKUpD2ZHRid/vu34Dh9uHZ+7IXWFPX8jkexUog=";
ldflags =
[ "-s" "-w" "-X github.com/giantswarm/gsctl/buildinfo.Version=${version}" ];

View File

@ -10,11 +10,11 @@ with lib;
stdenv.mkDerivation rec {
pname = "zathura";
version = "0.4.8";
version = "0.4.9";
src = fetchurl {
url = "https://pwmt.org/projects/${pname}/download/${pname}-${version}.tar.xz";
sha256 = "1nr0ym1mi2afk4ycdf1ppmkcv7i7hyzwn4p3r4m0j2qm3nvaiami";
sha256 = "0msy7s57mlx0wya99qpia4fpcy40pbj253kmx2y97nb0sqnc8c7w";
};
outputs = [ "bin" "man" "dev" "out" ];

View File

@ -44,14 +44,14 @@ let
pname = "slack";
x86_64-darwin-version = "4.23.0";
x86_64-darwin-sha256 = "0l4zfyys0yf95dn0sldyjkhzp7bpn84z9q9li1lvv5jj55f0g9jd";
x86_64-darwin-version = "4.25.0";
x86_64-darwin-sha256 = "1ffg003ic0jhkis9ai2873axwzqj9yvjab8212zwhvr3a23zzr5c";
x86_64-linux-version = "4.23.0";
x86_64-linux-sha256 = "1wsrxacnj9f3cb6as7ncbdvi02jqcbyc7ijsavps5bls9phkp0is";
x86_64-linux-version = "4.25.0";
x86_64-linux-sha256 = "0b22hnf9bzdzffnxrsjqcimqhz5imshvp9gw9baz12d45jh610g8";
aarch64-darwin-version = "4.23.0";
aarch64-darwin-sha256 = "053psiqysyi7l8pviq0vwvk2azlxcpdrwfa0b99f1h6lbfcf48f3";
aarch64-darwin-version = "4.25.0";
aarch64-darwin-sha256 = "0s4c66bzi42y2r1c94r4ds5fyzzgvzkvrria0z45ysa47lnldp0f";
version = {
x86_64-darwin = x86_64-darwin-version;

View File

@ -445,13 +445,13 @@ let
sha512 = "zm6xBQpFDIDM6o9r6HSgDeIcLy82TKWctCXEPbJJcXb5AKmi5BNNdLXneixK4lplX3PqIVcwLBCGE/kAGnlD4A==";
};
};
"@types/lodash-4.14.180" = {
"@types/lodash-4.14.181" = {
name = "_at_types_slash_lodash";
packageName = "@types/lodash";
version = "4.14.180";
version = "4.14.181";
src = fetchurl {
url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.180.tgz";
sha512 = "XOKXa1KIxtNXgASAnwj7cnttJxS4fksBRywK/9LzRV5YxrF80BXZIGeQSuoESQ/VkUj30Ae0+YcuHc15wJCB2g==";
url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.181.tgz";
sha512 = "n3tyKthHJbkiWhDZs3DkhkCzt2MexYHXlX0td5iMplyfwketaOeKboEVBqzceH7juqvEg3q5oUoBFxSLu7zFag==";
};
};
"@types/lossless-json-1.0.1" = {
@ -661,13 +661,13 @@ let
sha1 = "6a3e6bf0a63900ba15652808cb15c6813d1a5f25";
};
};
"adler-32-1.3.0" = {
"adler-32-1.3.1" = {
name = "adler-32";
packageName = "adler-32";
version = "1.3.0";
version = "1.3.1";
src = fetchurl {
url = "https://registry.npmjs.org/adler-32/-/adler-32-1.3.0.tgz";
sha512 = "f5nltvjl+PRUh6YNfUstRaXwJxtfnKEWhAWWlmKvh+Y3J2+98a0KKVYDEhz6NdKGqswLhjNGznxfSsZGOvOd9g==";
url = "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz";
sha512 = "ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==";
};
};
"agent-base-6.0.2" = {
@ -958,22 +958,22 @@ let
sha512 = "h7diyELoq692AA4oqO50ULoYKIomUdzuQ+NW+eFPwIX0xzVbXEu9cIcgzZ3TYNVbpkGtcNKh51aRfAQNef7HVA==";
};
};
"avsc-5.7.3" = {
"avsc-5.7.4" = {
name = "avsc";
packageName = "avsc";
version = "5.7.3";
version = "5.7.4";
src = fetchurl {
url = "https://registry.npmjs.org/avsc/-/avsc-5.7.3.tgz";
sha512 = "uUbetCWczQHbsKyX1C99XpQHBM8SWfovvaZhPIj23/1uV7SQf0WeRZbiLpw0JZm+LHTChfNgrLfDJOVoU2kU+A==";
url = "https://registry.npmjs.org/avsc/-/avsc-5.7.4.tgz";
sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w==";
};
};
"aws-sdk-2.1101.0" = {
"aws-sdk-2.1106.0" = {
name = "aws-sdk";
packageName = "aws-sdk";
version = "2.1101.0";
version = "2.1106.0";
src = fetchurl {
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1101.0.tgz";
sha512 = "7lyVb7GXGl8yyu954Qxf6vU6MrcgFlmKyTLBVXJyo3Phn1OB+qOExA55WtSC6gQiQ7e5TeWOn1RUHLg30ywTBA==";
url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1106.0.tgz";
sha512 = "3dr0TTR2LI70ST8fa4IgXHpWdH4yv7FLnt9YEndwFQ8ar2EMCMpMU67wwCGBA72GUi0aOg4+lsLjGmCvIq3jug==";
};
};
"aws-sign2-0.7.0" = {
@ -1174,6 +1174,15 @@ let
sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==";
};
};
"body-parser-1.20.0" = {
name = "body-parser";
packageName = "body-parser";
version = "1.20.0";
src = fetchurl {
url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz";
sha512 = "DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==";
};
};
"body-parser-xml-2.0.3" = {
name = "body-parser-xml";
packageName = "body-parser-xml";
@ -1435,13 +1444,13 @@ let
sha512 = "hjx1XE1M/D5pAtMgvWwE21QClmAEeGHOIDfycgmndisdNgI6PE1cGRQkMGBcsbUbmEQyWu5PJLUcAOjtQS8DWw==";
};
};
"cheerio-select-1.5.0" = {
"cheerio-select-1.6.0" = {
name = "cheerio-select";
packageName = "cheerio-select";
version = "1.5.0";
version = "1.6.0";
src = fetchurl {
url = "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.5.0.tgz";
sha512 = "qocaHPv5ypefh6YNxvnbABM07KMxExbtbfuJoIie3iZXX1ERwYmJcIiRrr9H05ucQP1k28dav8rpdDgjQd8drg==";
url = "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.6.0.tgz";
sha512 = "eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g==";
};
};
"chokidar-3.5.2" = {
@ -1894,22 +1903,22 @@ let
sha512 = "uTqEnCvWRk042asU6JtapDTcJeeailFy4ydOQS28bj1hcLnYRiqi8SsD2jS412AY1I/4qdOwWZun774iqywf9w==";
};
};
"css-select-4.2.1" = {
"css-select-4.3.0" = {
name = "css-select";
packageName = "css-select";
version = "4.2.1";
version = "4.3.0";
src = fetchurl {
url = "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz";
sha512 = "/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==";
url = "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz";
sha512 = "wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==";
};
};
"css-what-5.1.0" = {
"css-what-6.1.0" = {
name = "css-what";
packageName = "css-what";
version = "5.1.0";
version = "6.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz";
sha512 = "arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==";
url = "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz";
sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==";
};
};
"cssfilter-0.0.10" = {
@ -2074,6 +2083,15 @@ let
sha1 = "978857442c44749e4206613e37946205826abd80";
};
};
"destroy-1.2.0" = {
name = "destroy";
packageName = "destroy";
version = "1.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz";
sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==";
};
};
"detect-libc-1.0.3" = {
name = "detect-libc";
packageName = "detect-libc";
@ -2299,13 +2317,13 @@ let
sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==";
};
};
"es-abstract-1.19.1" = {
"es-abstract-1.19.2" = {
name = "es-abstract";
packageName = "es-abstract";
version = "1.19.1";
version = "1.19.2";
src = fetchurl {
url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.1.tgz";
sha512 = "2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==";
url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.19.2.tgz";
sha512 = "gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w==";
};
};
"es-to-primitive-1.2.1" = {
@ -3064,6 +3082,15 @@ let
sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==";
};
};
"http-errors-2.0.0" = {
name = "http-errors";
packageName = "http-errors";
version = "2.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz";
sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==";
};
};
"http-proxy-agent-4.0.1" = {
name = "http-proxy-agent";
packageName = "http-proxy-agent";
@ -3442,13 +3469,13 @@ let
sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==";
};
};
"is-number-object-1.0.6" = {
"is-number-object-1.0.7" = {
name = "is-number-object";
packageName = "is-number-object";
version = "1.0.6";
version = "1.0.7";
src = fetchurl {
url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz";
sha512 = "bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==";
url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz";
sha512 = "k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==";
};
};
"is-promise-1.0.1" = {
@ -3496,13 +3523,13 @@ let
sha512 = "XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==";
};
};
"is-shared-array-buffer-1.0.1" = {
"is-shared-array-buffer-1.0.2" = {
name = "is-shared-array-buffer";
packageName = "is-shared-array-buffer";
version = "1.0.1";
version = "1.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz";
sha512 = "IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==";
url = "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz";
sha512 = "sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==";
};
};
"is-stream-2.0.1" = {
@ -4504,13 +4531,13 @@ let
sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==";
};
};
"n8n-core-0.111.0" = {
"n8n-core-0.112.0" = {
name = "n8n-core";
packageName = "n8n-core";
version = "0.111.0";
version = "0.112.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.111.0.tgz";
sha512 = "fZLLJ60yIuuX+geKGQrO6jk+kxn1UaCJMoWEi2FVE+InTmi+/r51Bv6LGoapoW0Oz+Em+CDq0wE7Yzg3xNx7fw==";
url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.112.0.tgz";
sha512 = "1b/J9XWBrjqMCcDAM1vZlsEpeBXI7gZ9Jpxgpgu4eHh3l/BJfyeqq5KXgULfyDtolDn/bil0s7qXA2njmZLerw==";
};
};
"n8n-design-system-0.16.0" = {
@ -4522,31 +4549,31 @@ let
sha512 = "X7Qa+DoXRyJL4gqh7x59udnPIBYAUgDvhchL33dpI/Rgq9gaFajT9eAuOFQnXKMUaL0FZ5hu3rRGcAmwwEA/bA==";
};
};
"n8n-editor-ui-0.137.0" = {
"n8n-editor-ui-0.138.0" = {
name = "n8n-editor-ui";
packageName = "n8n-editor-ui";
version = "0.137.0";
version = "0.138.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.137.0.tgz";
sha512 = "/wYAIh/3RtVaFxY+vtVEACfo6xsVOi3cEPWd+GSFCK/AMxXs517CNGbwNz54geqaGNUH+rhhUz87C0pG+TgiUg==";
url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.138.0.tgz";
sha512 = "1/mUJYSWG4vmUfMlT65lvtQzfDBMCHxhdIU3TUG2umvdIEsSHJM1gZwAPfoJZppoZ6DX/ApuxXY/67OXfgatQw==";
};
};
"n8n-nodes-base-0.168.0" = {
"n8n-nodes-base-0.169.0" = {
name = "n8n-nodes-base";
packageName = "n8n-nodes-base";
version = "0.168.0";
version = "0.169.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.168.0.tgz";
sha512 = "TyIL5Gwn+qvfi+1nNkQTPfrJYMqjx2P2OCiDWAMfzahauJyJpfJMYpIEKF3UxoKXCfWpBYPmHVoov6GadEOR1w==";
url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.169.0.tgz";
sha512 = "O8vwS7ROybSRLqXwG58xdLNrbA8hAvX4jSodXsztpGChbDWcrYJUXBewN9+Lfh1UAegz12G1devygc1W92qveQ==";
};
};
"n8n-workflow-0.93.0" = {
"n8n-workflow-0.94.0" = {
name = "n8n-workflow";
packageName = "n8n-workflow";
version = "0.93.0";
version = "0.94.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.93.0.tgz";
sha512 = "IqZrnTKdIZD7aeL9/FiwoI7w1WBgeBmqZVXRF+OGtIHooK/lDkHpy17hoXXqAyeATiVf2licgl8F/zMvSsnuJA==";
url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.94.0.tgz";
sha512 = "cVs5XPlbNDcCrGU5IoYzjO7IOsYNsNtEt5vVxkL9q5EgEmHhPYakValJN4GyLQ7Otdpsf47lJg/0EG3TvOssGQ==";
};
};
"named-placeholders-1.1.2" = {
@ -4567,13 +4594,13 @@ let
sha512 = "wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==";
};
};
"nanoid-3.3.1" = {
"nanoid-3.3.2" = {
name = "nanoid";
packageName = "nanoid";
version = "3.3.1";
version = "3.3.2";
src = fetchurl {
url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz";
sha512 = "n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==";
url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.2.tgz";
sha512 = "CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==";
};
};
"native-duplexpair-1.0.0" = {
@ -4864,6 +4891,15 @@ let
sha1 = "20f1336481b083cd75337992a16971aa2d906947";
};
};
"on-finished-2.4.1" = {
name = "on-finished";
packageName = "on-finished";
version = "2.4.1";
src = fetchurl {
url = "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz";
sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==";
};
};
"on-headers-1.0.2" = {
name = "on-headers";
packageName = "on-headers";
@ -5431,15 +5467,6 @@ let
sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==";
};
};
"printj-1.2.3" = {
name = "printj";
packageName = "printj";
version = "1.2.3";
src = fetchurl {
url = "https://registry.npmjs.org/printj/-/printj-1.2.3.tgz";
sha512 = "sanczS6xOJOg7IKDvi4sGOUOe7c1tsEzjwlLFH/zgwx/uyImVM9/rgBkc8AfiQa/Vg54nRd8mkm9yI7WV/O+WA==";
};
};
"printj-1.3.1" = {
name = "printj";
packageName = "printj";
@ -5737,6 +5764,15 @@ let
sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==";
};
};
"raw-body-2.5.1" = {
name = "raw-body";
packageName = "raw-body";
version = "2.5.1";
src = fetchurl {
url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz";
sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==";
};
};
"rc-1.2.8" = {
name = "rc";
packageName = "rc";
@ -6286,13 +6322,13 @@ let
sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==";
};
};
"simple-git-2.48.0" = {
"simple-git-3.5.0" = {
name = "simple-git";
packageName = "simple-git";
version = "2.48.0";
version = "3.5.0";
src = fetchurl {
url = "https://registry.npmjs.org/simple-git/-/simple-git-2.48.0.tgz";
sha512 = "z4qtrRuaAFJS4PUd0g+xy7aN4y+RvEt/QTJpR184lhJguBA1S/LsVlvE/CM95RsYMOFJG3NGGDjqFCzKU19S/A==";
url = "https://registry.npmjs.org/simple-git/-/simple-git-3.5.0.tgz";
sha512 = "fZsaq5nzdxQRhMNs6ESGLpMUHoL5GRP+boWPhq9pMYMKwOGZV2jHOxi8AbFFA2Y/6u4kR99HoULizSbpzaODkA==";
};
};
"simple-lru-cache-0.0.2" = {
@ -6430,13 +6466,13 @@ let
sha512 = "+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==";
};
};
"ssh2-1.8.0" = {
"ssh2-1.9.0" = {
name = "ssh2";
packageName = "ssh2";
version = "1.8.0";
version = "1.9.0";
src = fetchurl {
url = "https://registry.npmjs.org/ssh2/-/ssh2-1.8.0.tgz";
sha512 = "NVIRkIwJvWl+mcRozp+EBzHMVCcbDKBea64ToPdZEk43yAVGwmfqYZRPFRnnvGjsKC34wYCmiupTcKgCVNVNNg==";
url = "https://registry.npmjs.org/ssh2/-/ssh2-1.9.0.tgz";
sha512 = "rhhIZT0eMPvCBSOG8CpqZZ7gre2vgXaIqmb3Jb83t88rjsxIsFzDanqBJM9Ns8BmP1835A5IbQ199io4EUZwOA==";
};
};
"ssh2-sftp-client-7.2.3" = {
@ -6484,6 +6520,15 @@ let
sha1 = "161c7dac177659fd9811f43771fa99381478628c";
};
};
"statuses-2.0.1" = {
name = "statuses";
packageName = "statuses";
version = "2.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz";
sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==";
};
};
"stealthy-require-1.1.1" = {
name = "stealthy-require";
packageName = "stealthy-require";
@ -7258,13 +7303,13 @@ let
sha512 = "KEW0gkeNOLJjtXN4jqJhTazez5jtrwimHkE5Few/VxblH4F9EcvJiEsahrV5kg5uKd5U8du4ORKS6QjGE0piYA==";
};
};
"vue-i18n-8.27.0" = {
"vue-i18n-8.27.1" = {
name = "vue-i18n";
packageName = "vue-i18n";
version = "8.27.0";
version = "8.27.1";
src = fetchurl {
url = "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.27.0.tgz";
sha512 = "SX35iJHL5PJ4Gfh0Mo/q0shyHiI2V6Zkh51c+k8E9O1RKv5BQyYrCxRzpvPrsIOJEnLaeiovet3dsUB0e/kDzw==";
url = "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.27.1.tgz";
sha512 = "lWrGm4F25qReJ7XxSnFVb2h3PfW54ldnM4C+YLBGGJ75+Myt/kj4hHSTKqsyDLamvNYpvINMicSOdW+7yuqgIQ==";
};
};
"vue2-boring-avatars-0.3.4" = {
@ -7579,10 +7624,10 @@ in
n8n = nodeEnv.buildNodePackage {
name = "n8n";
packageName = "n8n";
version = "0.170.0";
version = "0.171.0";
src = fetchurl {
url = "https://registry.npmjs.org/n8n/-/n8n-0.170.0.tgz";
sha512 = "aY4A9+P7K6iinxFyDZl9Jdin283csAbiMStjfxLX5IfO75/aNbjXhSmpjclV9PCUuuTonvoMiVMTvpbCaeImqg==";
url = "https://registry.npmjs.org/n8n/-/n8n-0.171.0.tgz";
sha512 = "GenMxluqj0PfttyWndoMUsmyJ8r5pilWoY7xT+TVjCl5znhtIUT+3GTeDZ8K3vYqJILHXVxspyF5yLz2Ytnjow==";
};
dependencies = [
(sources."@azure/abort-controller-1.0.5" // {
@ -7691,7 +7736,7 @@ in
sources."@types/ftp-0.3.33"
sources."@types/json-diff-0.5.2"
sources."@types/jsonwebtoken-8.5.8"
sources."@types/lodash-4.14.180"
sources."@types/lodash-4.14.181"
sources."@types/lossless-json-1.0.1"
sources."@types/mime-1.3.2"
sources."@types/node-17.0.23"
@ -7762,8 +7807,8 @@ in
sources."semver-6.3.0"
];
})
sources."avsc-5.7.3"
(sources."aws-sdk-2.1101.0" // {
sources."avsc-5.7.4"
(sources."aws-sdk-2.1106.0" // {
dependencies = [
sources."buffer-4.9.2"
sources."events-1.1.1"
@ -7817,7 +7862,7 @@ in
})
sources."bluebird-3.7.2"
sources."bn.js-4.12.0"
(sources."body-parser-1.19.2" // {
(sources."body-parser-1.20.0" // {
dependencies = [
sources."debug-2.6.9"
sources."ms-2.0.0"
@ -7853,11 +7898,7 @@ in
sources."caseless-0.12.0"
(sources."cfb-1.2.1" // {
dependencies = [
(sources."adler-32-1.3.0" // {
dependencies = [
sources."printj-1.2.3"
];
})
sources."adler-32-1.3.1"
sources."printj-1.3.1"
];
})
@ -7870,7 +7911,7 @@ in
sources."chardet-0.7.0"
sources."charenc-0.0.2"
sources."cheerio-1.0.0-rc.6"
sources."cheerio-select-1.5.0"
sources."cheerio-select-1.6.0"
sources."chokidar-3.5.2"
sources."chownr-1.1.4"
sources."clamp-1.0.1"
@ -7956,8 +7997,8 @@ in
sources."crypt-0.0.2"
sources."crypto-js-4.1.1"
sources."csrf-3.1.0"
sources."css-select-4.2.1"
sources."css-what-5.1.0"
sources."css-select-4.3.0"
sources."css-what-6.1.0"
sources."cssfilter-0.0.10"
sources."dashdash-1.14.1"
sources."date-utils-1.2.21"
@ -7969,8 +8010,8 @@ in
sources."delayed-stream-1.0.0"
sources."delegates-1.0.0"
sources."denque-1.5.1"
sources."depd-1.1.2"
sources."destroy-1.0.4"
sources."depd-2.0.0"
sources."destroy-1.2.0"
sources."detect-libc-1.0.3"
sources."diagnostics-1.1.1"
sources."difflib-0.2.4"
@ -8006,7 +8047,7 @@ in
sources."entities-2.2.0"
sources."env-variable-0.0.6"
sources."err-code-2.0.3"
sources."es-abstract-1.19.1"
sources."es-abstract-1.19.2"
sources."es-to-primitive-1.2.1"
sources."es5-ext-0.8.2"
sources."escalade-3.1.1"
@ -8022,9 +8063,16 @@ in
sources."expand-tilde-2.0.2"
(sources."express-4.17.3" // {
dependencies = [
sources."body-parser-1.19.2"
sources."cookie-0.4.2"
sources."debug-2.6.9"
sources."depd-1.1.2"
sources."http-errors-1.8.1"
sources."ms-2.0.0"
sources."on-finished-2.3.0"
sources."qs-6.9.7"
sources."raw-body-2.4.3"
sources."statuses-1.5.0"
];
})
sources."extend-3.0.2"
@ -8048,6 +8096,8 @@ in
dependencies = [
sources."debug-2.6.9"
sources."ms-2.0.0"
sources."on-finished-2.3.0"
sources."statuses-1.5.0"
];
})
sources."flatted-3.2.5"
@ -8126,7 +8176,7 @@ in
sources."homedir-polyfill-1.0.3"
sources."html-to-text-8.0.0"
sources."htmlparser2-6.1.0"
sources."http-errors-1.8.1"
sources."http-errors-2.0.0"
sources."http-proxy-agent-4.0.1"
sources."http-signature-1.2.0"
sources."https-proxy-agent-5.0.0"
@ -8162,13 +8212,13 @@ in
sources."is-negated-glob-1.0.0"
sources."is-negative-zero-2.0.2"
sources."is-number-7.0.0"
sources."is-number-object-1.0.6"
sources."is-number-object-1.0.7"
sources."is-promise-1.0.1"
sources."is-property-1.0.2"
sources."is-regex-1.1.4"
sources."is-relative-1.0.0"
sources."is-retry-allowed-2.2.0"
sources."is-shared-array-buffer-1.0.1"
sources."is-shared-array-buffer-1.0.2"
sources."is-stream-2.0.1"
sources."is-string-1.0.7"
sources."is-symbol-1.0.4"
@ -8327,19 +8377,15 @@ in
];
})
sources."mz-2.7.0"
(sources."n8n-core-0.111.0" // {
dependencies = [
sources."qs-6.10.3"
];
})
sources."n8n-core-0.112.0"
sources."n8n-design-system-0.16.0"
sources."n8n-editor-ui-0.137.0"
(sources."n8n-nodes-base-0.168.0" // {
sources."n8n-editor-ui-0.138.0"
(sources."n8n-nodes-base-0.169.0" // {
dependencies = [
sources."iconv-lite-0.6.3"
];
})
sources."n8n-workflow-0.93.0"
sources."n8n-workflow-0.94.0"
(sources."named-placeholders-1.1.2" // {
dependencies = [
sources."lru-cache-4.1.5"
@ -8347,7 +8393,7 @@ in
];
})
sources."nanoclone-0.2.1"
sources."nanoid-3.3.1"
sources."nanoid-3.3.2"
sources."native-duplexpair-1.0.0"
(sources."nearley-2.20.1" // {
dependencies = [
@ -8402,7 +8448,7 @@ in
sources."async-1.5.2"
];
})
sources."on-finished-2.3.0"
sources."on-finished-2.4.1"
sources."on-headers-1.0.2"
sources."once-1.4.0"
sources."one-time-1.0.0"
@ -8520,7 +8566,7 @@ in
})
sources."punycode-2.1.1"
sources."python-struct-1.1.3"
sources."qs-6.9.7"
sources."qs-6.10.3"
sources."querystring-0.2.0"
sources."querystringify-2.2.0"
sources."queue-microtask-1.2.3"
@ -8530,7 +8576,7 @@ in
sources."random-bytes-1.0.0"
sources."randombytes-2.1.0"
sources."range-parser-1.2.1"
sources."raw-body-2.4.3"
sources."raw-body-2.5.1"
sources."rc-1.2.8"
sources."readable-stream-1.1.14"
sources."readable-web-to-node-stream-2.0.0"
@ -8593,7 +8639,12 @@ in
sources."ms-2.0.0"
];
})
sources."depd-1.1.2"
sources."destroy-1.0.4"
sources."http-errors-1.8.1"
sources."ms-2.1.3"
sources."on-finished-2.3.0"
sources."statuses-1.5.0"
];
})
(sources."sentence-case-3.0.4" // {
@ -8612,7 +8663,7 @@ in
sources."shell-escape-0.2.0"
sources."side-channel-1.0.4"
sources."signal-exit-3.0.7"
sources."simple-git-2.48.0"
sources."simple-git-3.5.0"
sources."simple-lru-cache-0.0.2"
sources."simple-swizzle-0.2.2"
sources."slash-3.0.0"
@ -8643,12 +8694,12 @@ in
sources."sqlstring-2.3.3"
sources."sse-channel-3.1.1"
sources."ssf-0.11.2"
sources."ssh2-1.8.0"
sources."ssh2-1.9.0"
sources."ssh2-sftp-client-7.2.3"
sources."sshpk-1.17.0"
sources."stack-trace-0.0.10"
sources."standard-as-callback-2.1.0"
sources."statuses-1.5.0"
sources."statuses-2.0.1"
sources."stealthy-require-1.1.1"
sources."stream-shift-1.0.1"
sources."string-similarity-4.0.4"
@ -8672,7 +8723,6 @@ in
dependencies = [
sources."@types/node-12.20.47"
sources."bl-3.0.1"
sources."depd-2.0.0"
sources."iconv-lite-0.5.2"
sources."readable-stream-3.6.0"
sources."string_decoder-1.3.0"
@ -8773,7 +8823,7 @@ in
sources."vue-2.6.14"
sources."vue-color-2.8.1"
sources."vue-fragment-1.5.2"
sources."vue-i18n-8.27.0"
sources."vue-i18n-8.27.1"
sources."vue2-boring-avatars-0.3.4"
sources."webidl-conversions-3.0.1"
sources."whatwg-url-5.0.0"

View File

@ -138,6 +138,7 @@ stdenv.mkDerivation rec {
'';
homepage = "http://caffe.berkeleyvision.org/";
maintainers = with maintainers; [ ];
broken = pythonSupport && (python.isPy310);
license = licenses.bsd2;
platforms = platforms.linux ++ platforms.darwin;
};

View File

@ -2,6 +2,7 @@
, opencv3, gtest, blas, gomp, llvmPackages, perl
, cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11
, cudnnSupport ? cudaSupport, cudnn
, cudaCapabilities ? [ "3.7" "5.0" "6.0" "7.0" "7.5" "8.0" "8.6" ]
}:
assert cudnnSupport -> cudaSupport;
@ -44,6 +45,7 @@ stdenv.mkDerivation rec {
"-DUSE_OLDCMAKECUDA=ON" # see https://github.com/apache/incubator-mxnet/issues/10743
"-DCUDA_ARCH_NAME=All"
"-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"
"-DMXNET_CUDA_ARCH=${lib.concatStringsSep ";" cudaCapabilities}"
] else [ "-DUSE_CUDA=OFF" ])
++ lib.optional (!cudnnSupport) "-DUSE_CUDNN=OFF";
@ -60,6 +62,12 @@ stdenv.mkDerivation rec {
rm "$out"/lib/*.a
'';
# used to mark cudaSupport in python310Packages.mxnet as broken;
# other attributes exposed for consistency
passthru = {
inherit cudaSupport cudnnSupport cudatoolkit cudnn;
};
meta = with lib; {
description = "Lightweight, Portable, Flexible Distributed/Mobile Deep Learning with Dynamic, Mutation-aware Dataflow Dep Scheduler";
homepage = "https://mxnet.incubator.apache.org/";

View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "wxmaxima";
version = "21.11.0";
version = "22.03.0";
src = fetchFromGitHub {
owner = "wxMaxima-developers";
repo = "wxmaxima";
rev = "Version-${version}";
sha256 = "sha256-LwuqldMGsmFR8xrNg5vsrogmdi5ysqEQGWITM460IZk=";
sha256 = "sha256-ynLx1HPfDjLbyFziWFbjpCeUBaA3hAFRFm5/1GeFKRE=";
};
buildInputs = [

View File

@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=${if systemdSupport then "enabled" else "disabled"}" ];
postPatch = "substituteInPlace main.c --replace '%lu' '%zu'";
meta = with lib; {
description = "Idle management daemon for Wayland";
longDescription = ''

View File

@ -28,14 +28,15 @@ copyDesktopItems() {
return
fi
applications="${!outputBin}/share/applications"
for desktopItem in $desktopItems; do
if [[ -f "$desktopItem" ]]; then
echo "Copying '$desktopItem' into '$out/share/applications'"
install -D -m 444 -t "$out"/share/applications "$desktopItem"
echo "Copying '$desktopItem' into '${applications}'"
install -D -m 444 -t "${applications}" "$desktopItem"
else
for f in "$desktopItem"/share/applications/*.desktop; do
echo "Copying '$f' into '$out/share/applications'"
install -D -m 444 -t "$out"/share/applications "$f"
echo "Copying '$f' into '${applications}'"
install -D -m 444 -t "${applications}" "$f"
done
fi
done

View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-about";
version = "6.0.1";
version = "6.1.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "0c075ac7iqz4hqbp2ph0cwyhiq0jn6c1g1jjfhygjbssv3vvd268";
sha256 = "sha256-/8K3xSbzlagOT0zHdXNwEERJP88C+H2I6qJHXwdlTS4=";
};
patches = [

View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-onlineaccounts";
version = "6.3.0";
version = "6.4.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-aRh2zbKqcGOH4Qw5gdJw07hod8a/QGWUcJo/2R9erQs=";
sha256 = "sha256-Fppl/IvdlW8lZ6YKEHaHNticv3FFFKEKTPPVnz4u9b4=";
};
nativeBuildInputs = [

View File

@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-sound";
version = "2.3.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-yHuboDpIcioZPNgpmnrM6J2eUCJpoNDdvgu27YuN65I=";
sha256 = "sha256-hyBmo9P68XSXRUuLw+baEAetba2QdqOwUti64geH6xc=";
};
nativeBuildInputs = [

View File

@ -90,5 +90,5 @@ rec {
# latest cudnn, nccl, cutensor, etc! It sometimes happens that CUDA versions
# are released prior to compatibility with the rest of the ecosystem. And
# don't forget to request a review from @NixOS/cuda-maintainers!
cudatoolkit_11 = cudatoolkit_11_5;
cudatoolkit_11 = cudatoolkit_11_5; # update me to 11_6 when cudnn>=8.3.3
}

View File

@ -1,54 +0,0 @@
diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go
index 05593bb105..a6a11eeec1 100644
--- a/src/crypto/x509/root_darwin.go
+++ b/src/crypto/x509/root_darwin.go
@@ -11,6 +11,7 @@ import (
"bytes"
macOS "crypto/x509/internal/macos"
"fmt"
+ "io/ioutil"
"os"
"strings"
)
@@ -22,6 +23,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
}
func loadSystemRoots() (*CertPool, error) {
+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
+ data, err := ioutil.ReadFile(file)
+ if err == nil {
+ roots := NewCertPool()
+ roots.AppendCertsFromPEM(data)
+ return roots, nil
+ }
+ }
var trustedRoots []*Certificate
untrustedRoots := make(map[string]bool)
diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go
index dede825edd..ffb3caf4a4 100644
--- a/src/crypto/x509/root_unix.go
+++ b/src/crypto/x509/root_unix.go
@@ -9,6 +9,7 @@ package x509
import (
"io/fs"
+ "io/ioutil"
"os"
"path/filepath"
"strings"
@@ -32,6 +33,13 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate
func loadSystemRoots() (*CertPool, error) {
roots := NewCertPool()
+ if file := os.Getenv("NIX_SSL_CERT_FILE"); file != "" {
+ data, err := ioutil.ReadFile(file)
+ if err == nil {
+ roots.AppendCertsFromPEM(data)
+ return roots, nil
+ }
+ }
files := certFiles
if f := os.Getenv(certFileEnv); f != "" {

View File

@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic";
doCheck = true;
doCheck = !stdenv.hostPlatform.isi686;
# The test driver runs a test `LibraryCLinkageTest` which without
# LD_LIBRARY_PATH setting errors with:

View File

@ -1,6 +1,10 @@
{ config, lib, stdenv, fetchFromGitHub, cmake, pkg-config, xorg, libGLU
, libGL, glew, ocl-icd, python3
, cudaSupport ? config.cudaSupport or false, cudatoolkit
# For visibility mostly. The whole approach to cuda architectures and capabilities
# will be reworked soon.
, cudaArch ? "compute_37"
, openclSupport ? !cudaSupport
, darwin
}:
@ -24,7 +28,7 @@ stdenv.mkDerivation rec {
glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor
xorg.libXinerama xorg.libXi
]
++ lib.optional (!stdenv.isDarwin) ocl-icd
++ lib.optional (openclSupport && !stdenv.isDarwin) ocl-icd
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [OpenCL Cocoa CoreVideo IOKit AppKit AGL ])
++ lib.optional cudaSupport cudatoolkit;
@ -37,8 +41,10 @@ stdenv.mkDerivation rec {
"-DGLEW_INCLUDE_DIR=${glew.dev}/include"
"-DGLEW_LIBRARY=${glew.dev}/lib"
] ++ lib.optionals cudaSupport [
"-DOSD_CUDA_NVCC_FLAGS=--gpu-architecture=compute_30"
"-DOSD_CUDA_NVCC_FLAGS=--gpu-architecture=${cudaArch}"
"-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc"
] ++ lib.optionals (!openclSupport) [
"-DNO_OPENCL=1"
];
postInstall = "rm $out/lib/*.a";
@ -46,6 +52,7 @@ stdenv.mkDerivation rec {
meta = {
description = "An Open-Source subdivision surface library";
homepage = "http://graphics.pixar.com/opensubdiv";
broken = openclSupport && cudaSupport;
platforms = lib.platforms.unix;
maintainers = [ lib.maintainers.eelco ];
license = lib.licenses.asl20;

View File

@ -85,6 +85,8 @@ buildPythonPackage rec {
# aarch64-only (?) failure, unknown reason so far
# https://github.com/adobe-type-tools/afdko/issues/1425
"test_spec"
] ++ lib.optionals (stdenv.hostPlatform.isi686) [
"test_type1mm_inputs"
];
passthru.tests = {

View File

@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
{ config, lib, buildPythonPackage, fetchFromGitHub, isPy3k
, filelock, protobuf, numpy, pytestCheckHook, mock, typing-extensions
, cupy, cudaSupport ? false
, cupy, cudaSupport ? config.cudaSupport or false
}:
buildPythonPackage rec {
@ -39,6 +39,8 @@ buildPythonPackage rec {
meta = with lib; {
description = "A flexible framework of neural networks for deep learning";
homepage = "https://chainer.org/";
# Un-break me when updating chainer next time!
broken = cudaSupport && (lib.versionAtLeast cupy.version "8.0.0");
license = licenses.mit;
maintainers = with maintainers; [ hyphon81 ];
};

View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "dotmap";
version = "1.3.29";
version = "1.3.30";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-5mhR+Ey8RrruucUIt5LxBNM6OBUWbLy5jNOWg6tzxRE=";
hash = "sha256-WCGnkz8HX7R1Y0F8DpLgt8AxFYtMmmp+VhY0ebZYs2g=";
};
checkInputs = [

View File

@ -6,10 +6,11 @@
, graphviz
, python
, isPy3k
, isPy310
}:
buildPythonPackage {
inherit (pkgs.mxnet) pname version src meta;
inherit (pkgs.mxnet) pname version src;
buildInputs = [ pkgs.mxnet ];
propagatedBuildInputs = [ requests numpy graphviz ];
@ -32,4 +33,7 @@ buildPythonPackage {
ln -s ${pkgs.mxnet}/lib/libmxnet.so $out/${python.sitePackages}/mxnet
'';
meta = pkgs.mxnet.meta // {
broken = (pkgs.mxnet.broken or false) || (isPy310 && pkgs.mxnet.cudaSupport);
};
}

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pycfmodel";
version = "0.18.0";
version = "0.18.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,8 +17,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "Skyscanner";
repo = pname;
rev = version;
hash = "sha256-g249Nq4u4pPQLbW9Kw5vLwVKCaZoots5LD6yk1NPv6s=";
rev = "refs/tags/${version}";
hash = "sha256-oP9u62PpnBCDAwE9LJHkm93f9eYyXbHai/gp62bL84M=";
};
propagatedBuildInputs = [

View File

@ -20,7 +20,7 @@
buildPythonPackage rec {
pname = "toggl-cli";
version = "3";
version = "2.4.3";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -28,7 +28,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "togglCli";
inherit version;
sha256 = "sha256-SkA/u1q//AyYn0v6uAXXsjANhFppxxjKhlhWhsK649w=";
sha256 = "sha256-ncMwiMwYivaFu5jrAsm1oCuXP/PZ2ALT+M+CmV6dtFo=";
};
nativeBuildInputs = [
@ -58,8 +58,9 @@ buildPythonPackage rec {
postPatch = ''
substituteInPlace requirements.txt \
--replace "notify-py==0.3.1" "notify-py>=0.3.1" \
--replace "click==7.1.2" "click>=7.1.2" \
--replace "pbr==5.5.1" "pbr>=5.5.1"
--replace "click==8.0.3" "click>=8.0.3" \
--replace "pbr==5.8.0" "pbr>=5.8.0" \
--replace "inquirer==2.9.1" "inquirer>=2.9.1"
substituteInPlace pytest.ini \
--replace ' --cov toggl -m "not premium"' ""
'';

View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "youtube-search-python";
version = "1.6.3";
version = "1.6.4";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-zAza1XMKLIMZFFS0v/4ATqh6j7aEB2Y+eliE/hNPORw=";
hash = "sha256-9ZAZaLkJb2mEg0rstBxOvs9/L4wtbLuCTdFDOuxMqN0=";
};
propagatedBuildInputs = [

View File

@ -10,7 +10,7 @@
buildGoModule rec {
pname = "actionlint";
version = "1.6.10";
version = "1.6.11";
subPackages = [ "cmd/actionlint" ];
@ -18,10 +18,10 @@ buildGoModule rec {
owner = "rhysd";
repo = "actionlint";
rev = "v${version}";
sha256 = "sha256-RFsNJiCeSAeEWOUnfBpeIZKoS2mlXazYMQd1M6yFLGU=";
sha256 = "sha256-BlJxgRDnAlfM/81qAEGEW09luScivYSDf5w2lR8hQUA=";
};
vendorSha256 = "sha256-CxNER8aQftMG14M+x6bPwcXgUZRkUDYZtFg1cPxxg+I=";
vendorSha256 = "sha256-nG0u5hZ/YRn+yUoEGTBo6ZdOp0e+sH6Jl9F+QhpfYAU=";
nativeBuildInputs = [ makeWrapper ronn installShellFiles ];

View File

@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-lfj6KyB9QYvUy4Ybo8f30omAg4K/jT5MEERJPm0aJ7U=";
};
makeFlags = [ "FLOW_RELEASE=1" ];
installPhase = ''
install -Dm755 bin/flow $out/bin/flow
install -Dm644 resources/shell/bash-completion $out/share/bash-completion/completions/flow

View File

@ -9,13 +9,13 @@ let
in
buildGoModule rec {
pname = "faas-cli";
version = "0.14.3";
version = "0.14.4";
src = fetchFromGitHub {
owner = "openfaas";
repo = "faas-cli";
rev = version;
sha256 = "sha256-1aflQXfW/y31Dk0OZW77qNQKEwkhi6p8ZBfTUyRDbdo=";
sha256 = "sha256-hpQn1lEJP0FmU1jhmXDgV/11RbMdEqblLPIrTQLKLOc=";
};
CGO_ENABLED = 0;
@ -35,6 +35,6 @@ buildGoModule rec {
homepage = "https://github.com/openfaas/faas-cli";
description = "Official CLI for OpenFaaS ";
license = licenses.mit;
maintainers = with maintainers; [ welteki ];
maintainers = with maintainers; [ welteki techknowlogick ];
};
}

View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "kotlin-language-server";
version = "1.2.0";
version = "1.3.0";
src = fetchurl {
url = "https://github.com/fwcd/kotlin-language-server/releases/download/${version}/server.zip";
sha256 = "sha256-GXr+sOGa09qeQrfaJYRPsoHULwfMst8tTr4y2cv752k=";
sha256 = "sha256-yyqI+87vtggSeAfb3OEftalknqbTDEQ5gTJwB/EMIlY=";
};
dontBuild = true;

View File

@ -13,8 +13,6 @@ buildGoModule rec {
vendorSha256 = "sha256-qS/tIi6umSuQcl43SI4LyL0k5eWfRWs7kVybRPGKcbs=";
doCheck = false;
meta = with lib; {
description = "A utility to examine and validate certificates in a variety of formats";
homepage = "https://github.com/square/certigo";

View File

@ -13,8 +13,6 @@ buildGoModule rec {
vendorSha256 = "sha256-C3xnBANsymSgI7l446CjJzEMY1gURGTxDNBBjNjHmaE=";
doCheck = false;
nativeBuildInputs = [ makeWrapper ];
postInstall = ''

View File

@ -1,6 +1,7 @@
{
lib,
stdenv,
fetchpatch,
fetchFromGitHub,
opencl-headers,
cmake,
@ -31,6 +32,21 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
patches = [
# global context library is separated from libethash
./add-global-context.patch
# CUDA 11 no longer support SM30
(fetchpatch {
url = "https://github.com/ethereum-mining/ethminer/commit/dae359dff28f376d4ce7ddfbd651dcd34d6dad8f.patch";
hash = "sha256-CJGKc0rXOcKDX1u5VBzc8gyBi1Me9CNATfQzKViqtAA=";
})
];
postPatch = ''
sed -i 's/_lib_static//' libpoolprotocols/CMakeLists.txt
'';
# NOTE: dbus is broken
cmakeFlags = [
"-DHUNTER_ENABLED=OFF"
@ -64,15 +80,6 @@ stdenv.mkDerivation rec {
cudatoolkit
];
patches = [
# global context library is separated from libethash
./add-global-context.patch
];
preConfigure = ''
sed -i 's/_lib_static//' libpoolprotocols/CMakeLists.txt
'';
postInstall = ''
wrapProgram $out/bin/ethminer --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib
'';

View File

@ -5,16 +5,16 @@
buildGoModule rec {
pname = "interactsh";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "projectdiscovery";
repo = pname;
rev = "v${version}";
sha256 = "sha256-czXcncEm2Wm0ezGjNOpcCin5KOZKuimnnMPUWfGE0FY=";
sha256 = "sha256-AtWcVzY/1DnKRva/PGISTHmBsWpJ6nxJvlWR/B/fRcE=";
};
vendorSha256 = "sha256-YfHsl0AFNQNCg4HEP9FyrHUMMz0SFn5aDRrOruseE5k=";
vendorSha256 = "sha256-LV5K4fToE26i4Av/YcNPjIyYmf/kxmBMuiyXYYfL3Y4=";
modRoot = ".";
subPackages = [

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "shadowsocks-rust";
version = "1.13.5";
version = "1.14.2";
src = fetchFromGitHub {
rev = "v${version}";
owner = "shadowsocks";
repo = pname;
sha256 = "sha256-0TKAchPDjB7YKJO2JqBwJPZITWXDQbjPbRN8amilJ6E=";
sha256 = "sha256-zWiC1GhrI3gcXhr8JpAbFF6t7N6aBSho33FMu8bhF2o=";
};
cargoSha256 = "sha256-LBLUNBXsaGfviUUleoYIFf/vrbejKYwB9Lqetx3Agxc=";
cargoSha256 = "sha256-nSKeFLWTHhtmlvA9MV6NpupKJo3d1jKpTBI5H8cHJ9s=";
RUSTC_BOOTSTRAP = 1;

View File

@ -12,16 +12,16 @@
rustPlatform.buildRustPackage rec {
pname = "termscp";
version = "0.8.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "veeso";
repo = pname;
rev = "v${version}";
sha256 = "sha256-fVZDpzgcpMWOoUtoq7go/NFWfoR1aONuRtTba0sqPZk=";
sha256 = "sha256-WqOkud8gOa81P6FT44y5RZX4CWjmou9HufZ3QPoYuAk=";
};
cargoSha256 = "sha256-iLm73dWF9z/obtAXe5dZlvJcxU6hB5N0vaSc/HLuTuQ=";
cargoSha256 = "sha256-jckJiFhiUvbn0fkgKzqDorWQvuLenx/S8+RyPoqaWUg=";
nativeBuildInputs = [
pkg-config

View File

@ -10,7 +10,7 @@
buildPythonApplication rec{
pname = "xxh";
version = "0.8.9";
version = "0.8.10";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -19,7 +19,7 @@ buildPythonApplication rec{
owner = pname;
repo = pname;
rev = version;
hash = "sha256-Uo7xFwE9e5MFWDlNWq15kg+4xf/hF4WGUNTpTK+rgVg=";
hash = "sha256-2RMzgIAhM//XReCFBGlTlXn9j4WQiM/k2pLxP2iPUy8=";
};
propagatedBuildInputs = [

View File

@ -33,6 +33,7 @@ gccStdenv.mkDerivation rec {
meta = with lib; {
description = "TrueCrack is a brute-force password cracker for TrueCrypt volumes. It works on Linux and it is optimized for Nvidia Cuda technology.";
homepage = "https://gitlab.com/kalilinux/packages/truecrack";
broken = cudaSupport;
license = licenses.gpl3Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ ethancedwards8 ];

View File

@ -1,11 +1,9 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib, buildGoModule, fetchFromGitHub }:
buildGoPackage rec {
buildGoModule rec {
pname = "asciigraph";
version = "0.5.3";
goPackagePath = "github.com/guptarohit/asciigraph";
src = fetchFromGitHub {
owner = "guptarohit";
repo = pname;
@ -13,10 +11,14 @@ buildGoPackage rec {
sha256 = "sha256-GzFJT4LI1QZzghs9g2A+pqkTg68XC+m9F14rYpMxEXM=";
};
vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
homepage = "https://github.com/guptarohit/asciigraph";
description = "Lightweight ASCII line graph command line app";
license = licenses.bsd3;
maintainers = [ maintainers.mmahut ];
maintainers = with maintainers; [ mmahut ];
};
}

View File

@ -4628,7 +4628,7 @@ with pkgs;
cudatoolkit_11_5
cudatoolkit_11_6;
cudatoolkit = cudatoolkit_10;
cudatoolkit = cudatoolkit_11;
cudnnPackages = callPackages ../development/libraries/science/math/cudnn { };
inherit (cudnnPackages)
@ -4651,7 +4651,7 @@ with pkgs;
cudnn_8_3_cudatoolkit_11;
# Make sure to keep this in sync with the `cudatoolkit` version!
cudnn = cudnn_8_3_cudatoolkit_10;
cudnn = cudnn_8_3_cudatoolkit_11;
cutensorPackages = callPackages ../development/libraries/science/math/cutensor { };
inherit (cutensorPackages)
@ -4665,7 +4665,7 @@ with pkgs;
cutensor_cudatoolkit_11_3
cutensor_cudatoolkit_11_4;
cutensor = cutensor_cudatoolkit_10;
cutensor = cutensor_cudatoolkit_11;
curie = callPackage ../data/fonts/curie { };
@ -12721,13 +12721,6 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security Foundation;
};
go_2-dev = callPackage ../development/compilers/go/2-dev.nix ({
inherit (darwin.apple_sdk.frameworks) Security Foundation;
} // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) {
stdenv = gcc8Stdenv;
buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; };
});
go = go_1_17;
go-repo-root = callPackage ../development/tools/go-repo-root { };
@ -26400,7 +26393,10 @@ with pkgs;
gpsprune = callPackage ../applications/misc/gpsprune { };
gpu-screen-recorder = callPackage ../applications/video/gpu-screen-recorder { };
gpu-screen-recorder = callPackage ../applications/video/gpu-screen-recorder {
# rm me as soon as this package gains the support for cuda 11
cudatoolkit = cudatoolkit_10;
};
gpu-screen-recorder-gtk = callPackage ../applications/video/gpu-screen-recorder/gpu-screen-recorder-gtk.nix { };

View File

@ -8382,24 +8382,6 @@ in {
pytorch = callPackage ../development/python-modules/pytorch {
cudaSupport = pkgs.config.cudaSupport or false;
# TODO: next time pytorch is updated (to 1.11.0, currently in staging as of
# 2022-03-31), make the following changes:
# -> cudatoolk_11
cudatoolkit = pkgs.cudatoolkit_10;
# -> cudnn_8_3_cudatoolkit_11
cudnn = pkgs.cudnn_8_1_cudatoolkit_10;
# -> cutensor_cudatoolkit_11 (cutensor is a new dependency in v1.11.0)
# cutensor = pkgs.cutensor_cudatoolkit_11;
# -> setting a custom magma should be unnecessary with v1.11.0
magma = pkgs.magma.override { cudatoolkit = pkgs.cudatoolkit_10; };
# -> nccl_cudatoolkit_11
nccl = pkgs.nccl.override { cudatoolkit = pkgs.cudatoolkit_10; };
};
pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { };