From ad735b87e4607f535586b329d9030fbf6974f38b Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Thu, 3 Feb 2022 10:17:55 -0500 Subject: [PATCH 01/59] hidpi: Use gray-scale antialiasing for fonts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For displays with high pixel density, there is no need to do subpixel anti-aliasing (which is the default) – grayscale antialiasing is enough. In terms of fontconfig, we keep antialiasing on, but tell it not to play any RGB tricks. --- nixos/modules/hardware/video/hidpi.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/hardware/video/hidpi.nix b/nixos/modules/hardware/video/hidpi.nix index ac72b652504e..1cb4470f1b3a 100644 --- a/nixos/modules/hardware/video/hidpi.nix +++ b/nixos/modules/hardware/video/hidpi.nix @@ -11,6 +11,14 @@ with lib; console.earlySetup = mkDefault true; boot.loader.systemd-boot.consoleMode = mkDefault "1"; + + # Grayscale anti-aliasing for fonts + fonts.fontconfig.antialias = mkDefault true; + fonts.fontconfig.subpixel = { + rgba = mkDefault "none"; + lcdfilter = mkDefault "none"; + }; + # TODO Find reasonable defaults X11 & wayland }; } From e234e5e8f871b21dce4db2b856d5ed5f40aad5d8 Mon Sep 17 00:00:00 2001 From: Alexander T Date: Sat, 2 Apr 2022 19:15:25 +0300 Subject: [PATCH 02/59] NixOS manual: fix ACME certificates in Nginx configuration example --- nixos/modules/security/acme/doc.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/acme/doc.xml b/nixos/modules/security/acme/doc.xml index f623cc509be6..4817f7a7fc6b 100644 --- a/nixos/modules/security/acme/doc.xml +++ b/nixos/modules/security/acme/doc.xml @@ -81,8 +81,8 @@ services.nginx = { }; # We can also add a different vhost and reuse the same certificate - # but we have to append extraDomainNames manually. - security.acme.certs."foo.example.com".extraDomainNames = [ "baz.example.com" ]; + # but we have to append extraDomainNames manually beforehand: + # security.acme.certs."foo.example.com".extraDomainNames = [ "baz.example.com" ]; "baz.example.com" = { forceSSL = true; useACMEHost = "foo.example.com"; From fbc8dbb075a5c63a5c15008f05a8f9be78dff235 Mon Sep 17 00:00:00 2001 From: Giulio De Pasquale Date: Thu, 7 Apr 2022 13:21:58 +0200 Subject: [PATCH 03/59] nixos/systemd: Add onSuccess module option for units --- nixos/lib/systemd-lib.nix | 2 ++ nixos/lib/systemd-unit-options.nix | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index 16ec47df3a46..779dadece582 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -285,6 +285,8 @@ in rec { Documentation = toString config.documentation; } // optionalAttrs (config.onFailure != []) { OnFailure = toString config.onFailure; } + // optionalAttrs (config.onSuccess != []) { + OnSuccess = toString config.onSuccess; } // optionalAttrs (options.startLimitIntervalSec.isDefined) { StartLimitIntervalSec = toString config.startLimitIntervalSec; } // optionalAttrs (options.startLimitBurst.isDefined) { diff --git a/nixos/lib/systemd-unit-options.nix b/nixos/lib/systemd-unit-options.nix index 02e91fdf1e62..d544fa5e37fc 100644 --- a/nixos/lib/systemd-unit-options.nix +++ b/nixos/lib/systemd-unit-options.nix @@ -201,6 +201,15 @@ in rec { ''; }; + onSuccess = mkOption { + default = []; + type = types.listOf unitNameType; + description = '' + A list of one or more units that are activated when + this unit enters the "inactive" state. + ''; + }; + startLimitBurst = mkOption { type = types.int; description = '' From a04fa422f000aa1f6bd477094b7aaac669b76329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Fri, 29 Apr 2022 22:19:20 +0200 Subject: [PATCH 04/59] nixos/tests/bitcoind: fix test Missing config file --- nixos/tests/bitcoind.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/tests/bitcoind.nix b/nixos/tests/bitcoind.nix index 04655b7f6a51..7726a23d853e 100644 --- a/nixos/tests/bitcoind.nix +++ b/nixos/tests/bitcoind.nix @@ -13,9 +13,11 @@ import ./make-test-python.nix ({ pkgs, ... }: { users.rpc2.passwordHMAC = "1495e4a3ad108187576c68f7f9b5ddc5$accce0881c74aa01bb8960ff3bdbd39f607fd33178147679e055a4ac35f53225"; }; }; + + environment.etc."test.blank".text = ""; services.bitcoind."testnet" = { enable = true; - configFile = "/test.blank"; + configFile = "/etc/test.blank"; testnet = true; rpc = { port = 18332; From a70da63f18dcf3ca8786a9aa5b14862ad5eaf91d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Jul 2022 14:09:43 +0000 Subject: [PATCH 05/59] editres: 1.0.7 -> 1.0.8 --- pkgs/tools/graphics/editres/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index c9c1544c9a0e..ca9be631942a 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "editres"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { url = "mirror://xorg/individual/app/editres-${version}.tar.gz"; - sha256 = "10mbgijb6ac6wqb2grpy9mrazzw68jxjkxr9cbdf1111pa64yj19"; + sha256 = "sha256-LVbWB3vHZ6+n4DD+ssNy/mvok/7EApoj9FodVZ/YRq4="; }; nativeBuildInputs = [ pkg-config ]; From 570d61a7dceccad53dce9273fc96dc9803da1380 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 26 Feb 2022 08:24:49 +0000 Subject: [PATCH 06/59] mongosh: 1.5.0 -> 1.4.2 --- .../tools/mongosh/gen/packages.nix | 394 +++++++++--------- 1 file changed, 197 insertions(+), 197 deletions(-) diff --git a/pkgs/development/tools/mongosh/gen/packages.nix b/pkgs/development/tools/mongosh/gen/packages.nix index 35db2e06eed8..43c6cb0f86ce 100644 --- a/pkgs/development/tools/mongosh/gen/packages.nix +++ b/pkgs/development/tools/mongosh/gen/packages.nix @@ -40,40 +40,40 @@ let sha512 = "dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg=="; }; }; - "@babel/core-7.18.2" = { + "@babel/core-7.17.12" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.18.2"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.18.2.tgz"; - sha512 = "A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.17.12.tgz"; + sha512 = "44ODe6O1IVz9s2oJE3rZ4trNNKTX9O7KpQpfAP4t8QII/zwrVRHL7i2pxhqtcY7tqMLrrKfMlBKnm1QlrRFs5w=="; }; }; - "@babel/generator-7.18.2" = { + "@babel/generator-7.17.12" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.18.2"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz"; - sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.12.tgz"; + sha512 = "V49KtZiiiLjH/CnIW6OjJdrenrGoyh6AmKQ3k2AZFKozC1h846Q4NYlZ5nqAigPDUXfGzC88+LOUuG8yKd2kCw=="; }; }; - "@babel/helper-compilation-targets-7.18.2" = { + "@babel/helper-compilation-targets-7.17.10" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.18.2"; + version = "7.17.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz"; - sha512 = "s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.10.tgz"; + sha512 = "gh3RxjWbauw/dFiU/7whjd0qN9K6nPJMqe6+Er7rOavFh0CQUSwhAE3IcTho2rywPJFxej6TUUHDkWcYI6gGqQ=="; }; }; - "@babel/helper-environment-visitor-7.18.2" = { + "@babel/helper-environment-visitor-7.16.7" = { name = "_at_babel_slash_helper-environment-visitor"; packageName = "@babel/helper-environment-visitor"; - version = "7.18.2"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz"; - sha512 = "14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ=="; + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz"; + sha512 = "SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag=="; }; }; "@babel/helper-function-name-7.17.9" = { @@ -103,13 +103,13 @@ let sha512 = "LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg=="; }; }; - "@babel/helper-module-transforms-7.18.0" = { + "@babel/helper-module-transforms-7.17.12" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.18.0"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz"; - sha512 = "kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.12.tgz"; + sha512 = "t5s2BeSWIghhFRPh9XMn6EIGmvn8Lmw5RVASJzkIx1mSemubQQBNIZiQD7WzaFmaHIrjAec4x8z9Yx8SjJ1/LA=="; }; }; "@babel/helper-plugin-utils-7.17.12" = { @@ -121,13 +121,13 @@ let sha512 = "JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA=="; }; }; - "@babel/helper-simple-access-7.18.2" = { + "@babel/helper-simple-access-7.17.7" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.18.2"; + version = "7.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz"; - sha512 = "7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz"; + sha512 = "txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA=="; }; }; "@babel/helper-split-export-declaration-7.16.7" = { @@ -157,13 +157,13 @@ let sha512 = "TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ=="; }; }; - "@babel/helpers-7.18.2" = { + "@babel/helpers-7.17.9" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.18.2"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.2.tgz"; - sha512 = "j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz"; + sha512 = "cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q=="; }; }; "@babel/highlight-7.17.12" = { @@ -175,22 +175,22 @@ let sha512 = "7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg=="; }; }; - "@babel/parser-7.18.4" = { + "@babel/parser-7.17.12" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.18.4"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.4.tgz"; - sha512 = "FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.12.tgz"; + sha512 = "FLzHmN9V3AJIrWfOpvRlZCeVg/WLdicSnTMsLur6uDj9TT8ymUlG9XxURdW/XvuygK+2CW0poOJABdA4m/YKxA=="; }; }; - "@babel/plugin-transform-destructuring-7.18.0" = { + "@babel/plugin-transform-destructuring-7.17.12" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.18.0"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz"; - sha512 = "Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.12.tgz"; + sha512 = "P8pt0YiKtX5UMUL5Xzsc9Oyij+pJE6JuC+F1k0/brq/OOGs5jDa1If3OY0LRWGvJsJhI+8tsiecL3nJLc0WTlg=="; }; }; "@babel/plugin-transform-parameters-7.17.12" = { @@ -211,13 +211,13 @@ let sha512 = "hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg=="; }; }; - "@babel/runtime-7.18.3" = { + "@babel/runtime-7.17.9" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.18.3"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.3.tgz"; - sha512 = "38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz"; + sha512 = "lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg=="; }; }; "@babel/template-7.16.7" = { @@ -229,22 +229,22 @@ let sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; }; }; - "@babel/traverse-7.18.2" = { + "@babel/traverse-7.17.12" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.18.2"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.2.tgz"; - sha512 = "9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.12.tgz"; + sha512 = "zULPs+TbCvOkIFd4FrG53xrpxvCBwLIgo6tO0tJorY7YV2IWFxUfS/lXDJbGgfyYt9ery/Gxj2niwttNnB0gIw=="; }; }; - "@babel/types-7.18.4" = { + "@babel/types-7.17.12" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.18.4"; + version = "7.17.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.18.4.tgz"; - sha512 = "ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.17.12.tgz"; + sha512 = "rH8i29wcZ6x9xjzI5ILHL/yZkbQnCERdHlogKuIb4PUr7do4iT8DPekrTbBLWTnRQm6U0GYABbTMSzijmEqlAg=="; }; }; "@hapi/hoek-9.3.0" = { @@ -319,157 +319,157 @@ let sha512 = "o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w=="; }; }; - "@mongodb-js/devtools-connect-1.4.3" = { + "@mongodb-js/devtools-connect-1.4.2" = { name = "_at_mongodb-js_slash_devtools-connect"; packageName = "@mongodb-js/devtools-connect"; - version = "1.4.3"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-1.4.3.tgz"; - sha512 = "Y7j5XZo+bmphN/IERA9p++91ZYEXPagONUVP7seQ04ha2jHwB6lr6WudPWcRw7NkzPj/PuEjA50lJXtt2ilA3Q=="; + url = "https://registry.npmjs.org/@mongodb-js/devtools-connect/-/devtools-connect-1.4.2.tgz"; + sha512 = "rNbjzMPQWxKbMc5hEL+BZPSvoh/f9k2DvqE7ilR7B/NjSt2QFo66nz5RFQbQchaB1XA8+K73ch2SPlYrZl0Exw=="; }; }; - "@mongosh/arg-parser-1.5.0" = { + "@mongosh/arg-parser-1.4.2" = { name = "_at_mongosh_slash_arg-parser"; packageName = "@mongosh/arg-parser"; - version = "1.5.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-1.5.0.tgz"; - sha512 = "6zoeSMXpQUACKL2O+4W8p9T0oxo9Ff65aRROTNsWPDu4o4VJ/axV6Eram9QJH7TeQNrXaBqsMdjZW5dm9oOtaw=="; + url = "https://registry.npmjs.org/@mongosh/arg-parser/-/arg-parser-1.4.2.tgz"; + sha512 = "jRGIuVwIsIH7EP2fWJa0V5D2/3qo+D9d+h25Zm0DNEPcV097nzZCQD2maHAfM47Cy3Yrq94ZnbNsmme1BDfF9Q=="; }; }; - "@mongosh/async-rewriter2-1.5.0" = { + "@mongosh/async-rewriter2-1.4.2" = { name = "_at_mongosh_slash_async-rewriter2"; packageName = "@mongosh/async-rewriter2"; - version = "1.5.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-1.5.0.tgz"; - sha512 = "Bwkmy0+kPODoymC+bXd0u+IAr0B+0O3dKm6XJos7oxyaPfq7Fg/r7pvE80EaseLGmZ5HssIgZ1qBEcmdaIdWxA=="; + url = "https://registry.npmjs.org/@mongosh/async-rewriter2/-/async-rewriter2-1.4.2.tgz"; + sha512 = "P6YEwvAbhLVze2BjPXfCK1qc+aSrNWgmDWMoOvwsqfE7at+HNwf/GuPRH5gq9yL1ABm27nYsPpMf+ZK08fy0Mw=="; }; }; - "@mongosh/autocomplete-1.5.0" = { + "@mongosh/autocomplete-1.4.2" = { name = "_at_mongosh_slash_autocomplete"; packageName = "@mongosh/autocomplete"; - version = "1.5.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-1.5.0.tgz"; - sha512 = "wfF7pgTYLwkhXTgk+xdPOqmRMprJ3KKgC2EYS8ZqtjwCdV1wwxFSHh5r0VW3rnBrBUlT9wMVHaxkBH+raA/EGA=="; + url = "https://registry.npmjs.org/@mongosh/autocomplete/-/autocomplete-1.4.2.tgz"; + sha512 = "7H6dKF5PgSGE1YpABWYcAyI8HoTFN+Xpg74bVqeCMX2XyDYEgea/bvHWF3TzH0RSvCgme5oD2s36+8XqV9ehlw=="; }; }; - "@mongosh/cli-repl-1.5.0" = { + "@mongosh/cli-repl-1.4.2" = { name = "_at_mongosh_slash_cli-repl"; packageName = "@mongosh/cli-repl"; - version = "1.5.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-1.5.0.tgz"; - sha512 = "o63KWMPKlO0ZhDtiQ3JTrcrKX0Za1PaJYMZwN2IuUJZNFuOrvL2209y8hVjgpjt3ZvaAjTkNZLnQuHhX2NAnTg=="; + url = "https://registry.npmjs.org/@mongosh/cli-repl/-/cli-repl-1.4.2.tgz"; + sha512 = "KpzE+a2g9ouGwveBB7GpEohm04krEQLGzMcqHFQBAMM7L53hBMSw0ZwFQtmh+ZwKGR6fSnQYbh923T0yl0RzUw=="; }; }; - "@mongosh/editor-1.5.0" = { + "@mongosh/editor-1.4.2" = { name = "_at_mongosh_slash_editor"; packageName = "@mongosh/editor"; - version = "1.5.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/editor/-/editor-1.5.0.tgz"; - sha512 = "Kss+QDyzU1Aad1ckCmG4ZM1AkTgh3aFKRtnCH1cKY43H72OzRbtVrgduiA6OndYBjjFs8G3RIGKBkDr+0tUmKw=="; + url = "https://registry.npmjs.org/@mongosh/editor/-/editor-1.4.2.tgz"; + sha512 = "DWeQKMPX7AGnEdX4o1RIRQ1T6ugX94pZPPgUYGllViyICTGu1oPTyH79Fj+ZUHMUQPGKvVcTHH4afg/ePbV+hw=="; }; }; - "@mongosh/errors-1.5.0" = { + "@mongosh/errors-1.4.2" = { name = "_at_mongosh_slash_errors"; packageName = "@mongosh/errors"; - version = "1.5.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/errors/-/errors-1.5.0.tgz"; - sha512 = "JfZ1h1/+1hTbdWITX/K0yCE4aE20l87aPyQIjiKS5tbiDzYN/Ef6tN1N5PHc7k6wgJMEdkhn7Gnj/unyfXLa/g=="; + url = "https://registry.npmjs.org/@mongosh/errors/-/errors-1.4.2.tgz"; + sha512 = "7oXUztbH5FKsiU2+RcDIhA8QIPqL0fpHjJa8GIIcuMyERPx1CnJsrbbQEayNznc+FZ4w2tmuzy2Fes8wmfoqEg=="; }; }; - "@mongosh/history-1.5.0" = { + "@mongosh/history-1.4.2" = { name = "_at_mongosh_slash_history"; packageName = "@mongosh/history"; - version = "1.5.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/history/-/history-1.5.0.tgz"; - sha512 = "ce7a4PgNMEpWbmFe/GoEiyuQjkUS+5dwOBOSFC+iIERb3AK8aCSYInUaMfylmmNKy9vCxCUvco8CndBzqIkNmA=="; + url = "https://registry.npmjs.org/@mongosh/history/-/history-1.4.2.tgz"; + sha512 = "DC6bXz7nfTacKNF+b2KzQ9Or5wMSJ+xwuWq8j2P0uLFJZihtlaUDAmSCGoWEYP71+pEpsOFM1eYHPq50bqw1bA=="; }; }; - "@mongosh/i18n-1.5.0" = { + "@mongosh/i18n-1.4.2" = { name = "_at_mongosh_slash_i18n"; packageName = "@mongosh/i18n"; - version = "1.5.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/i18n/-/i18n-1.5.0.tgz"; - sha512 = "Z3iD0u9lxCL4EqVKi4eukBNQR4BlUpteo1qPv4nVmQd3JyJJNIwehKFYx7B9D2ASilasPXjFJ+WbnQCVJBW9XA=="; + url = "https://registry.npmjs.org/@mongosh/i18n/-/i18n-1.4.2.tgz"; + sha512 = "m7TUQf8MKJwVjpsmpf6DQF8XtTo978AFaOMz8CSapNP8HHARcMXYmurOUqYRJk8fFVXRjRi8XxlwQjH0dkbAuA=="; }; }; - "@mongosh/js-multiline-to-singleline-1.5.0" = { + "@mongosh/js-multiline-to-singleline-1.4.2" = { name = "_at_mongosh_slash_js-multiline-to-singleline"; packageName = "@mongosh/js-multiline-to-singleline"; - version = "1.5.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-1.5.0.tgz"; - sha512 = "bf87XYMrQMu+7fpStusgdZ5lfrE94PfeQKDsuMEF75AQOwll9EFfy5xcBxSFtNR1BssPFhW2NjWu924QG9HiJQ=="; + url = "https://registry.npmjs.org/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-1.4.2.tgz"; + sha512 = "K31Ra+BEvJeyyvbhpe2atKJ+38w+ctUwxlMt2Cjl/I/zxwAD6ecEsN4smZpbOf/IFwHvYizGVqH2ceZoaV//FQ=="; }; }; - "@mongosh/logging-1.5.0" = { + "@mongosh/logging-1.4.2" = { name = "_at_mongosh_slash_logging"; packageName = "@mongosh/logging"; - version = "1.5.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/logging/-/logging-1.5.0.tgz"; - sha512 = "9rBP9VTldQixkkVVkLees9DG77tccm6+fL4rHFLbGGjmsAc6krUeiRYfLfCMiWlbBGJ2wgmbqmECkK+gCn6Kbw=="; + url = "https://registry.npmjs.org/@mongosh/logging/-/logging-1.4.2.tgz"; + sha512 = "FHwAf9VFMtBBzAL6NkFremFu5SepSmgYHmW345gHfcfwyPrxqiXnpiCfXKuGkHBhWYroiuRwoRCua05tt+h8zA=="; }; }; - "@mongosh/service-provider-core-1.5.0" = { + "@mongosh/service-provider-core-1.4.2" = { name = "_at_mongosh_slash_service-provider-core"; packageName = "@mongosh/service-provider-core"; - version = "1.5.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-1.5.0.tgz"; - sha512 = "DKduPWGLWRbSsk+Vv7FDYmcxp7OnOIDtEWHq5A4m5rG/v/Tduv5ZRwVd+aXf7FF0mbZO0kPZxb0HyAhpayCUpg=="; + url = "https://registry.npmjs.org/@mongosh/service-provider-core/-/service-provider-core-1.4.2.tgz"; + sha512 = "lI92M7lxKowxataEQBk2TKjAN7m3uZ7Oqpe5ujl1yKT5tR3cqUaZCWC3Zdxh7QdqKwDgfEhHIbssqHB8GsstWg=="; }; }; - "@mongosh/service-provider-server-1.5.0" = { + "@mongosh/service-provider-server-1.4.2" = { name = "_at_mongosh_slash_service-provider-server"; packageName = "@mongosh/service-provider-server"; - version = "1.5.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-1.5.0.tgz"; - sha512 = "+Wf8qzKQ+Eshe/xHR1Kx7f/y9CVWEEORs0DzfChA2XyP6RzQV4LiX/REeM72rwvvJdM9z2LSj9x35Hf0qllcPw=="; + url = "https://registry.npmjs.org/@mongosh/service-provider-server/-/service-provider-server-1.4.2.tgz"; + sha512 = "0nqRXdpONrrXUhBmMdjWEf5SYKT1eV9m/l9m3CDp+64Nrd9eODe66QwqgkIZ8T/1iusR6GNt7nSCY8+dT3H8Gg=="; }; }; - "@mongosh/shell-api-1.5.0" = { + "@mongosh/shell-api-1.4.2" = { name = "_at_mongosh_slash_shell-api"; packageName = "@mongosh/shell-api"; - version = "1.5.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-1.5.0.tgz"; - sha512 = "PfJntaZwsOh00LUcXL4DejEK80jl55bhf8YqIMxCROCJHytujEB+wlunDdVUOAzoEAN5/wkn29slBO9YZ/Vl2w=="; + url = "https://registry.npmjs.org/@mongosh/shell-api/-/shell-api-1.4.2.tgz"; + sha512 = "Lan05KEvhIDRttDbts3H19uJNZMUbKvMLXdcJ3FRpH8JKc53wRBETpu247+muuZnGL5EKhm3QMqMlhwHl8dtfw=="; }; }; - "@mongosh/shell-evaluator-1.5.0" = { + "@mongosh/shell-evaluator-1.4.2" = { name = "_at_mongosh_slash_shell-evaluator"; packageName = "@mongosh/shell-evaluator"; - version = "1.5.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-1.5.0.tgz"; - sha512 = "44wLL1zwnBkvECzvz5BZJhVul2K+H7ewQS6Dlzl0PhVmDHBZGSxUD+IJqmNzFkOm26m221nqf+s+75dLbtPN4w=="; + url = "https://registry.npmjs.org/@mongosh/shell-evaluator/-/shell-evaluator-1.4.2.tgz"; + sha512 = "X2LLGvoyqwFVLJ+K7Whv+c/vL+ilGy2f/zd862uw9dOAA6xgmz+Ecjco9u8hCpkmtOq3MaXv9AGYPttZi32uzg=="; }; }; - "@mongosh/snippet-manager-1.5.0" = { + "@mongosh/snippet-manager-1.4.2" = { name = "_at_mongosh_slash_snippet-manager"; packageName = "@mongosh/snippet-manager"; - version = "1.5.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-1.5.0.tgz"; - sha512 = "oyr+g5rJ+oUUeTi2N7JZw328+GArMSvjUilwfjSomjccths3PSHMQ3iMNb2rdKLE7QOqHM0763fv4b7qa1Utxw=="; + url = "https://registry.npmjs.org/@mongosh/snippet-manager/-/snippet-manager-1.4.2.tgz"; + sha512 = "3CcOKYvzFpwYp+jtHf2zPPUtW4L4apq7Vp4Su/kJ7+XODQySI6QVsf1PyF8KKbbz8eS1QR/USo1AX4KR7gfFsw=="; }; }; - "@mongosh/types-1.5.0" = { + "@mongosh/types-1.4.2" = { name = "_at_mongosh_slash_types"; packageName = "@mongosh/types"; - version = "1.5.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mongosh/types/-/types-1.5.0.tgz"; - sha512 = "rXmnqIp6Z1hOXCqDxQFUztykCkzvxNUrrzxbbj8irKwLTn3to3gpoKZcK+rmRdqZYCVxVKnwunFDnfYwHLpf8Q=="; + url = "https://registry.npmjs.org/@mongosh/types/-/types-1.4.2.tgz"; + sha512 = "JbjI6XYociDvq25BW/0Kp8cilUVH2jPd8IOxtziceGKd+o/MOmaJv+Fz1s7nSA/BlCy3D4AHHekFhSl/e0YPwg=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -553,13 +553,13 @@ let sha512 = "/zPMqDkzSZ8t3VtxOa4KPq7uzzW978M9Tvh+j7GHKuo6k6GTLxPJ4J5gE5cjfJ26pnXst0N5Hax8Sr0T2Mi9zQ=="; }; }; - "@types/node-17.0.38" = { + "@types/node-17.0.34" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.38"; + version = "17.0.34"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.38.tgz"; - sha512 = "5jY9RhV7c0Z4Jy09G+NIDTsCZ5G0L5n+Z+p+Y7t5VJHM30bgwzSjVtlcBxqAj+6L/swIlvtOSzr8rBk/aNyV2g=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.34.tgz"; + sha512 = "XImEz7XwTvDBtzlTnm8YvMqGW/ErMWBsKZ+hMTvnDIjGCKxwK5Xpc+c/oQjOauwq8M4OS11hEkpjX8rrI/eEgA=="; }; }; "@types/sinon-10.0.11" = { @@ -814,13 +814,13 @@ let sha512 = "NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg=="; }; }; - "bson-4.6.4" = { + "bson-4.6.3" = { name = "bson"; packageName = "bson"; - version = "4.6.4"; + version = "4.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-4.6.4.tgz"; - sha512 = "TdQ3FzguAu5HKPPlr0kYQCyrYUYh8tFM+CMTpxjNzVzxeiJY00Rtuj3LXLHSgiGvmaWlZ8PE+4KyM2thqE38pQ=="; + url = "https://registry.npmjs.org/bson/-/bson-4.6.3.tgz"; + sha512 = "rAqP5hcUVJhXP2MCSNVsf0oM2OGU1So6A9pVRDYayvJ5+hygXHQApf87wd5NlhPM1J9RJnbqxIG/f8QTzRoQ4A=="; }; }; "buffer-5.7.1" = { @@ -832,13 +832,13 @@ let sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; }; }; - "caniuse-lite-1.0.30001346" = { + "caniuse-lite-1.0.30001341" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001346"; + version = "1.0.30001341"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001346.tgz"; - sha512 = "q6ibZUO2t88QCIPayP/euuDREq+aMAxFE5S70PkrLh0iTDj/zEhgvJRKC2+CvXY6EWc6oQwUR48lL5vCW6jiXQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001341.tgz"; + sha512 = "2SodVrFFtvGENGCv0ChVJIDQ0KPaS1cg7/qtfMaICgeMolDdo/Z2OD32F0Aq9yl6F4YFwGPBS5AaPqNYiW4PoA=="; }; }; "chalk-2.4.2" = { @@ -910,7 +910,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; - sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; + sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; }; }; "color-name-1.1.4" = { @@ -937,7 +937,7 @@ let version = "1.2.1"; src = fetchurl { url = "https://registry.npmjs.org/component-type/-/component-type-1.2.1.tgz"; - sha512 = "Kgy+2+Uwr75vAi6ChWXgHuLvd+QLD7ssgpaRq2zCvt80ptvAfMc/hijcJxXkBa2wMlEZcJvC2H8Ubo+A9ATHIg=="; + sha1 = "8a47901700238e4fc32269771230226f24b415a9"; }; }; "concat-map-0.0.1" = { @@ -946,7 +946,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; }; }; "config-chain-1.1.13" = { @@ -982,7 +982,7 @@ let version = "0.0.2"; src = fetchurl { url = "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"; - sha512 = "mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow=="; + sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; }; }; "debug-4.3.4" = { @@ -1012,13 +1012,13 @@ let sha512 = "M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g=="; }; }; - "electron-to-chromium-1.4.144" = { + "electron-to-chromium-1.4.137" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.144"; + version = "1.4.137"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.144.tgz"; - sha512 = "R3RV3rU1xWwFJlSClVWDvARaOk6VUO/FubHLodIASDB3Mc2dzuWvNdfOgH9bwHUTqT79u92qw60NWfwUdzAqdg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.137.tgz"; + sha512 = "0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA=="; }; }; "emphasize-3.0.0" = { @@ -1045,7 +1045,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; "escape-string-regexp-4.0.0" = { @@ -1066,13 +1066,13 @@ let sha512 = "CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA=="; }; }; - "follow-redirects-1.15.1" = { + "follow-redirects-1.15.0" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.15.1"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz"; - sha512 = "yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz"; + sha512 = "aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ=="; }; }; "format-0.2.2" = { @@ -1081,7 +1081,7 @@ let version = "0.2.2"; src = fetchurl { url = "https://registry.npmjs.org/format/-/format-0.2.2.tgz"; - sha512 = "wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww=="; + sha1 = "d6170107e9efdc4ed30c9dc39016df942b5cb58b"; }; }; "fs-minipass-2.1.0" = { @@ -1099,7 +1099,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; "gensync-1.0.0-beta.2" = { @@ -1144,7 +1144,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; - sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; + sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; }; "has-flag-4.0.0" = { @@ -1162,7 +1162,7 @@ let version = "9.12.0"; src = fetchurl { url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz"; - sha512 = "qNnYpBDO/FQwYVur1+sQBQw7v0cxso1nOYLklqWh6af8ROwwTVoII5+kf/BVa8354WL4ad6rURHYGUXCbD9mMg=="; + sha1 = "e6d9dbe57cbefe60751f02af336195870c90c01e"; }; }; "hijack-stream-1.0.0" = { @@ -1189,7 +1189,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; }; }; "inherits-2.0.4" = { @@ -1252,7 +1252,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; "joi-17.6.0" = { @@ -1270,7 +1270,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz"; - sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="; + sha1 = "b8417b750661a392bee2c2537c68b2a9d4977cd5"; }; }; "js-beautify-1.14.3" = { @@ -1333,7 +1333,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; - sha512 = "0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="; + sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; }; }; "lowlight-1.9.2" = { @@ -1495,7 +1495,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz"; - sha512 = "C40jQ3NzfkP53NsO8kEOFd79p4b9kDXQMwgiY1z8ZwrDZgUyom0AHwGegF4Dm99L+YoYhuaB0ceerUcXmqr1rQ=="; + sha1 = "4f3152e09540fde28c76f44b19bbcd1d5a42478d"; }; }; "nanobus-4.5.0" = { @@ -1534,13 +1534,13 @@ let sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; }; - "node-releases-2.0.5" = { + "node-releases-2.0.4" = { name = "node-releases"; packageName = "node-releases"; - version = "2.0.5"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz"; - sha512 = "U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.4.tgz"; + sha512 = "gbMzqQtTtDz/00jQzZ21PQzdI9PyLYqUSvD0p3naOhX4odFji0ZxYdnVwPTxmSwkmxhcFImpozceidSG+AgoPQ=="; }; }; "nopt-5.0.0" = { @@ -1558,7 +1558,7 @@ let version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/numeral/-/numeral-2.0.6.tgz"; - sha512 = "qaKRmtYPZ5qdw4jWJD6bxEf1FJEqllJrwxCLIm0sQU/A7v2/czigzOb+C2uSiFsa9lBUzeH7M1oK+Q+OLxL3kA=="; + sha1 = "4ad080936d443c2561aed9f2197efffe25f4e506"; }; }; "once-1.4.0" = { @@ -1567,7 +1567,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; }; }; "path-is-absolute-1.0.1" = { @@ -1576,7 +1576,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; "path-key-3.1.1" = { @@ -1612,7 +1612,7 @@ let version = "1.2.4"; src = fetchurl { url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; - sha512 = "vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA=="; + sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; }; }; "pseudomap-1.0.2" = { @@ -1621,7 +1621,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; - sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; }; }; "punycode-2.1.1" = { @@ -1946,50 +1946,50 @@ in mongosh = nodeEnv.buildNodePackage { name = "mongosh"; packageName = "mongosh"; - version = "1.5.0"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/mongosh/-/mongosh-1.5.0.tgz"; - sha512 = "/SdcqHwQdb2hJ39ZkBHHlXtu12pCoYCRbC19nCeBnkNAU3HdxCPjCI1bG+XdDRc8XZzksnMxDatTOiyAEUkTXA=="; + url = "https://registry.npmjs.org/mongosh/-/mongosh-1.4.2.tgz"; + sha512 = "VPXujpv4rb7oRSqtuROhToSx1hz04uRatX5ynW5YrCCx/+AGPoawfzWfaBgm1RkqoBFm88bnsEKSL81bDPAhAw=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" sources."@babel/code-frame-7.16.7" sources."@babel/compat-data-7.17.10" - (sources."@babel/core-7.18.2" // { + (sources."@babel/core-7.17.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.18.2" // { + (sources."@babel/generator-7.17.12" // { dependencies = [ sources."@jridgewell/gen-mapping-0.3.1" ]; }) - (sources."@babel/helper-compilation-targets-7.18.2" // { + (sources."@babel/helper-compilation-targets-7.17.10" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-environment-visitor-7.18.2" + sources."@babel/helper-environment-visitor-7.16.7" sources."@babel/helper-function-name-7.17.9" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.18.0" + sources."@babel/helper-module-transforms-7.17.12" sources."@babel/helper-plugin-utils-7.17.12" - sources."@babel/helper-simple-access-7.18.2" + sources."@babel/helper-simple-access-7.17.7" sources."@babel/helper-split-export-declaration-7.16.7" sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.18.2" + sources."@babel/helpers-7.17.9" sources."@babel/highlight-7.17.12" - sources."@babel/parser-7.18.4" - sources."@babel/plugin-transform-destructuring-7.18.0" + sources."@babel/parser-7.17.12" + sources."@babel/plugin-transform-destructuring-7.17.12" sources."@babel/plugin-transform-parameters-7.17.12" sources."@babel/plugin-transform-shorthand-properties-7.16.7" - sources."@babel/runtime-7.18.3" + sources."@babel/runtime-7.17.9" sources."@babel/template-7.16.7" - sources."@babel/traverse-7.18.2" - sources."@babel/types-7.18.4" + sources."@babel/traverse-7.17.12" + sources."@babel/types-7.17.12" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@jridgewell/gen-mapping-0.1.1" @@ -1997,32 +1997,32 @@ in sources."@jridgewell/set-array-1.1.1" sources."@jridgewell/sourcemap-codec-1.4.13" sources."@jridgewell/trace-mapping-0.3.13" - sources."@mongodb-js/devtools-connect-1.4.3" - sources."@mongosh/arg-parser-1.5.0" - (sources."@mongosh/async-rewriter2-1.5.0" // { + sources."@mongodb-js/devtools-connect-1.4.2" + sources."@mongosh/arg-parser-1.4.2" + (sources."@mongosh/async-rewriter2-1.4.2" // { dependencies = [ sources."@babel/core-7.16.12" sources."semver-6.3.0" ]; }) - sources."@mongosh/autocomplete-1.5.0" - sources."@mongosh/cli-repl-1.5.0" - sources."@mongosh/editor-1.5.0" - sources."@mongosh/errors-1.5.0" - sources."@mongosh/history-1.5.0" - sources."@mongosh/i18n-1.5.0" - sources."@mongosh/js-multiline-to-singleline-1.5.0" - sources."@mongosh/logging-1.5.0" - sources."@mongosh/service-provider-core-1.5.0" - sources."@mongosh/service-provider-server-1.5.0" - sources."@mongosh/shell-api-1.5.0" - sources."@mongosh/shell-evaluator-1.5.0" - (sources."@mongosh/snippet-manager-1.5.0" // { + sources."@mongosh/autocomplete-1.4.2" + sources."@mongosh/cli-repl-1.4.2" + sources."@mongosh/editor-1.4.2" + sources."@mongosh/errors-1.4.2" + sources."@mongosh/history-1.4.2" + sources."@mongosh/i18n-1.4.2" + sources."@mongosh/js-multiline-to-singleline-1.4.2" + sources."@mongosh/logging-1.4.2" + sources."@mongosh/service-provider-core-1.4.2" + sources."@mongosh/service-provider-server-1.4.2" + sources."@mongosh/shell-api-1.4.2" + sources."@mongosh/shell-evaluator-1.4.2" + (sources."@mongosh/snippet-manager-1.4.2" // { dependencies = [ sources."escape-string-regexp-4.0.0" ]; }) - sources."@mongosh/types-1.5.0" + sources."@mongosh/types-1.4.2" sources."@segment/loosely-validate-event-2.0.0" sources."@sideway/address-4.1.4" sources."@sideway/formula-3.0.0" @@ -2032,7 +2032,7 @@ in sources."@types/babel__template-7.4.1" sources."@types/babel__traverse-7.17.1" sources."@types/chai-4.3.1" - sources."@types/node-17.0.38" + sources."@types/node-17.0.34" sources."@types/sinon-10.0.11" sources."@types/sinon-chai-3.2.8" sources."@types/sinonjs__fake-timers-8.1.2" @@ -2060,9 +2060,9 @@ in sources."base64-js-1.5.1" sources."brace-expansion-1.1.11" sources."browserslist-4.20.3" - sources."bson-4.6.4" + sources."bson-4.6.3" sources."buffer-5.7.1" - sources."caniuse-lite-1.0.30001346" + sources."caniuse-lite-1.0.30001341" sources."chalk-2.4.2" sources."charenc-0.0.2" sources."chownr-2.0.0" @@ -2082,7 +2082,7 @@ in sources."semver-5.7.1" ]; }) - sources."electron-to-chromium-1.4.144" + sources."electron-to-chromium-1.4.137" (sources."emphasize-3.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -2096,7 +2096,7 @@ in sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."fault-1.0.4" - sources."follow-redirects-1.15.1" + sources."follow-redirects-1.15.0" sources."format-0.2.2" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -2160,7 +2160,7 @@ in sources."nanoscheduler-1.0.3" sources."nanotiming-7.3.1" sources."node-fetch-2.6.7" - sources."node-releases-2.0.5" + sources."node-releases-2.0.4" sources."nopt-5.0.0" sources."numeral-2.0.6" sources."once-1.4.0" From a6ce9617eb9456f603205eee44fb9bac5da3f734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?= <23130178+ShadowRZ@users.noreply.github.com> Date: Sat, 13 Aug 2022 19:53:48 +0800 Subject: [PATCH 07/59] renpy: 8.0.0 -> 8.0.1 --- .../interpreters/renpy/default.nix | 9 +++--- .../renpy/shutup-erofs-errors.patch | 29 +++++++++++++++++++ .../python-modules/pygame_sdl2/default.nix | 2 +- 3 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/interpreters/renpy/shutup-erofs-errors.patch diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 73c95c740596..21d1f8494649 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -10,15 +10,15 @@ stdenv.mkDerivation rec { # base_version is of the form major.minor.patch # vc_version is of the form YYMMDDCC # version corresponds to the tag on GitHub - base_version = "8.0.0"; - vc_version = "22062402"; + base_version = "8.0.1"; + vc_version = "22070801"; version = "${base_version}.${vc_version}"; src = fetchFromGitHub { owner = "renpy"; repo = "renpy"; rev = version; - sha256 = "sha256-37Hbs0i5eXMjVaETX7ImJCak0y8XtEHUaRFceA9J39A="; + sha256 = "sha256-rwRykovY8vv+boQiaSjCBoGxGpT1dF3qdEyxkykrKyk="; }; nativeBuildInputs = [ @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { patches = [ ./renpy-system-fribidi.diff + ./shutup-erofs-errors.patch ]; postPatch = '' @@ -71,7 +72,7 @@ stdenv.mkDerivation rec { makeWrapper ${python.interpreter} $out/bin/renpy \ --set PYTHONPATH "$PYTHONPATH:$out/${python.sitePackages}" \ - --add-flags "-O $out/share/renpy/renpy.py" + --add-flags "$out/share/renpy/renpy.py" runHook postInstall ''; diff --git a/pkgs/development/interpreters/renpy/shutup-erofs-errors.patch b/pkgs/development/interpreters/renpy/shutup-erofs-errors.patch new file mode 100644 index 000000000000..519840383b8d --- /dev/null +++ b/pkgs/development/interpreters/renpy/shutup-erofs-errors.patch @@ -0,0 +1,29 @@ +From 1660c8f20ac807fcd0ce65a8b9dc31e646a40711 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E5=A4=9C=E5=9D=82=E9=9B=85?= + <23130178+ShadowRZ@users.noreply.github.com> +Date: Sat, 13 Aug 2022 19:26:42 +0800 +Subject: [PATCH] Don't print a backtrace on EROFS + +This can shut up EROFS errors caused by writing to read-only /nix/store. +--- + renpy/script.py | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/renpy/script.py b/renpy/script.py +index 3e5dae8..8f103c1 100644 +--- a/renpy/script.py ++++ b/renpy/script.py +@@ -656,6 +656,10 @@ class Script(object): + rpydigest = hashlib.md5(fullf.read()).digest() + + self.write_rpyc_md5(f, rpydigest) ++ except OSError as e: ++ if e.errno != 30: ++ import traceback ++ traceback.print_exc() + except Exception: + import traceback + traceback.print_exc() +-- +2.37.1 + diff --git a/pkgs/development/python-modules/pygame_sdl2/default.nix b/pkgs/development/python-modules/pygame_sdl2/default.nix index 2d0004cdfc18..1e30869402cc 100644 --- a/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz"; - sha256 = "sha256-iKsnmuSBzfHlIOHUwWECfvPa9LuBbCr9Kmq5dolxUlU="; + sha256 = "sha256-/PCw2sF3CxiBXV7WZcTl6NAs+v++od4Fs6uYFUhJMH8="; }; # force rebuild of headers needed for install From 74b420b612c19c4ea7a19eeb493fcb72ab75c031 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 13 Aug 2022 10:19:56 -0700 Subject: [PATCH 08/59] gcc12: apply working patch for darwin-aarch64 --- pkgs/development/compilers/gcc/12/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index 6fdc31079a89..7e87b4ff57a9 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -70,8 +70,8 @@ let majorVersion = "12"; ./PR106102-musl-poison-cpp.patch ./PR106102-musl-poison-jit.patch ] ++ optional (stdenv.isDarwin && stdenv.isAarch64) (fetchpatch { - url = "https://github.com/fxcoudert/gcc/compare/releases/gcc-11.1.0...gcc-11.1.0-arm-20210504.diff"; - sha256 = "sha256-JqCGJAfbOxSmkNyq49aFHteK/RFsCSLQrL9mzUCnaD0="; + url = "https://github.com/Homebrew/formula-patches/raw/76677f2b/gcc/gcc-12.1.0-arm.diff"; + sha256 = "sha256-IcCYHSCAElJqTAZELJnRRWo0/SlkgQzSvoMjYr3pgD0="; }) ++ optional langD ../libphobos.patch From 8a73271911445fc2206b6572956dd578beb227ef Mon Sep 17 00:00:00 2001 From: Nikola Knezevic Date: Thu, 28 Apr 2022 12:33:10 +0200 Subject: [PATCH 09/59] zq: init at v1.2.0 This change adds zq, a part of the zed project https://zed.brimdata.io/. zq is a command-line tool that uses the Zed language for pipeline-style search and analytics. zq can query a variety of data formats in files, over HTTP, or in S3 storage. It is particularly fast when operating on data in the Zed-native ZNG format. The zq design philosophy blends the query/search-tool approach of jq, awk, and grep with the command-line, embedded database approach of sqlite and duckdb. --- pkgs/development/tools/zq/default.nix | 34 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/tools/zq/default.nix diff --git a/pkgs/development/tools/zq/default.nix b/pkgs/development/tools/zq/default.nix new file mode 100644 index 000000000000..956ce70b41b0 --- /dev/null +++ b/pkgs/development/tools/zq/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildGoModule +, testers +, zq +}: + +buildGoModule rec { + pname = "zq"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "brimdata"; + repo = "zed"; + rev = "v${version}"; + hash = "sha256-BK4LB37jr/9O0sjYgFtnEkbFqTsp/1+hcmCNMFDPiPM="; + }; + + vendorSha256 = "sha256-oAkQRUaEP/RNjpDH4U8XFVokf7KiLk0OWMX+U7qny70="; + + subPackages = [ "cmd/zq" ]; + + ldflags = [ "-s" "-X" "github.com/brimdata/zed/cli.Version=${version}" ]; + + passthru.tests = testers.testVersion { package = zq; }; + + meta = with lib; { + description = "A command-line tool for processing data in diverse input formats, providing search, analytics, and extensive transformations using the Zed language"; + homepage = "https://zed.brimdata.io"; + license = licenses.bsd3; + maintainers = with maintainers; [ knl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39a56d96e964..dbc501c83ef5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1356,6 +1356,8 @@ with pkgs; breitbandmessung = callPackage ../applications/networking/breitbandmessung { }; + zq = callPackage ../development/tools/zq { buildGoModule = buildGo118Module; }; + ### APPLICATIONS/EMULATORS atari800 = callPackage ../applications/emulators/atari800 { }; From 1ed8874bc8f6a5958a9bbd39318b0bdbfd86e1ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Aug 2022 21:12:28 +0000 Subject: [PATCH 10/59] python310Packages.scikit-survival: 0.17.2 -> 0.18.0 --- pkgs/development/python-modules/scikit-survival/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-survival/default.nix b/pkgs/development/python-modules/scikit-survival/default.nix index 340e539e4d2c..1dd50b6380d8 100644 --- a/pkgs/development/python-modules/scikit-survival/default.nix +++ b/pkgs/development/python-modules/scikit-survival/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "scikit-survival"; - version = "0.17.2"; + version = "0.18.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eP58TcFxNG0J32YgnaGhWkkjAC08F3ooPLwMv4ZUA1U="; + sha256 = "sha256-LfQESmKxSJ4tWlp3EZTBajOxZC3IEOUtJmX8A5ROpmU="; }; nativeBuildInputs = [ From cd7ccff1f3435195035a1deeb610809fc28bbbb9 Mon Sep 17 00:00:00 2001 From: Kira Bruneau Date: Tue, 16 Aug 2022 11:09:49 -0400 Subject: [PATCH 11/59] newsflash: fix adding xdg-open to PATH --- .../networking/feedreaders/newsflash/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index fdecf62c6a43..71836c382e89 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -15,8 +15,8 @@ , webkitgtk , glib-networking , librsvg -, xdg-utils , gst_all_1 +, xdg-utils }: stdenv.mkDerivation rec { @@ -78,9 +78,6 @@ stdenv.mkDerivation rec { # SVG support for gdk-pixbuf librsvg - - # Open links in browser - xdg-utils ] ++ (with gst_all_1; [ # Audio & video support for webkitgtk WebView gstreamer @@ -89,6 +86,13 @@ stdenv.mkDerivation rec { gst-plugins-bad ]); + preFixup = '' + gappsWrapperArgs+=(--suffix PATH : "${lib.makeBinPath [ + # Open links in browser + xdg-utils + ]}") + ''; + meta = with lib; { description = "A modern feed reader designed for the GNOME desktop"; homepage = "https://gitlab.com/news-flash/news_flash_gtk"; From 41a6f90b371207e33cb33044b8a6ac0ef1699a0a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Aug 2022 17:05:04 +0200 Subject: [PATCH 12/59] python310Packages.python-awair: 0.2.3 -> 0.2.4 --- pkgs/development/python-modules/python-awair/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-awair/default.nix b/pkgs/development/python-modules/python-awair/default.nix index 913d91c0901c..19fad9db2707 100644 --- a/pkgs/development/python-modules/python-awair/default.nix +++ b/pkgs/development/python-modules/python-awair/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-awair"; - version = "0.2.3"; + version = "0.2.4"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ahayworth"; repo = "python_awair"; rev = version; - sha256 = "sha256-Roqmwamv/2/O87jfyymCGgRlw/woUhCNIuM9MLT3+Cw="; + sha256 = "sha256-zdZyA6adM4bfEYupdZl7CzMjwyfRkQBrntNh0MusynE="; }; nativeBuildInputs = [ poetry-core ]; From d57f90485c5db326d5c1c00ec400ba89feef5bdf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 15:44:42 +0000 Subject: [PATCH 13/59] python310Packages.azure-mgmt-network: 21.0.0 -> 21.0.1 --- .../development/python-modules/azure-mgmt-network/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 60f67855d924..bb517f7ff8ce 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - version = "21.0.0"; + version = "21.0.1"; pname = "azure-mgmt-network"; format = "setuptools"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-NwVC9ln7qXDJMwtCc9AyTOq7wnum3xv5DYAg8AmGR8g="; + hash = "sha256-7PduPg0JK4f/3q/b5pq58TjqVk+Iu+vxa+aJKDnScy8="; }; propagatedBuildInputs = [ From f0f46e03bae6958482fa0e679991331df9634c79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Wed, 17 Aug 2022 21:58:39 +0200 Subject: [PATCH 14/59] q: Init at 0.8.2 --- pkgs/tools/networking/q/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/networking/q/default.nix diff --git a/pkgs/tools/networking/q/default.nix b/pkgs/tools/networking/q/default.nix new file mode 100644 index 000000000000..e7f931d59245 --- /dev/null +++ b/pkgs/tools/networking/q/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "q"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "natesales"; + repo = "q"; + rev = "v${version}"; + sha256 = "sha256-Esg2i8UNT+SuW9+jsnVEOt1ot822CamZ3JoR8ReY0+4="; + }; + + vendorHash = "sha256-oarXbxROTd7knHr9GKlrPnnS6ehkps2ZYYsUS9cn6ek="; + + doCheck = false; # tries to resolve DNS + + meta = { + description = "A tiny and feature-rich command line DNS client with support for UDP, TCP, DoT, DoH, DoQ, and ODoH"; + homepage = "https://github.com/natesales/q"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.das_j ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78c71be382f8..aad1a92b31e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1282,6 +1282,8 @@ with pkgs; pferd = callPackage ../tools/misc/pferd {}; + q = callPackage ../tools/networking/q {}; + qFlipper = libsForQt515.callPackage ../tools/misc/qflipper { }; quich = callPackage ../tools/misc/quich { } ; From 585ceba6899c2d6ae7e463a33dc1fb3a2384917c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 20:26:16 +0000 Subject: [PATCH 15/59] redpanda: 22.1.7 -> 22.2.1 --- pkgs/servers/redpanda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index 44be67fc89be..61a6f5118dc9 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchzip }: let - version = "22.1.7"; + version = "22.2.1"; platform = if stdenv.isLinux then "linux" else "darwin"; arch = if stdenv.isAarch64 then "arm" else "amd"; sha256s = { darwin.amd = "sha256-AXk3aP1SGiHTfHTCBRTagX0DAVmdcVVIkxWaTnZxB8g="; darwin.arm = "sha256-pvOVvNc8lZ2d2fVZVYWvumVWYpnLORNY/3o1t4BN2N4="; - linux.amd = "sha256-FjDDrJmLvelQ8PmTEtnvV+5zpixizR0bowoJPLyPFcA="; + linux.amd = "sha256-cj/XzGtDGpsxWvVK1wiRn14TvvzonaL2hnPit0/7F3A="; linux.arm = "sha256-WHjYAbytiu747jFqN0KZ/CkIwAVI7fb32ywtRiQOBm8="; }; in stdenv.mkDerivation rec { From d7b51601d810ce7497a55a5085c935648f776263 Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 17 Aug 2022 23:01:56 +0200 Subject: [PATCH 16/59] cloud-hypervisor: 25.0 -> 26.0 --- .../virtualization/cloud-hypervisor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 28300b9a5093..2fb2836a6c07 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "25.0"; + version = "26.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vYF0ReYUcWaMbJW920sJHqw6OwzlRS1c/zjG8COs3OI="; + sha256 = "sha256-choTT20TVp42nN/vS6xCDA7Mbf1ZuAE1tFQZn49g9ak="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "sha256-l0nczPcncLhKw9yGmFozLzW5EOdeZcVGp0a84j4wN0w="; + cargoSha256 = "sha256-mmyaT24he33wLI3zLOOKhVtzrPRyWzKgXUvc37suy5E="; OPENSSL_NO_VENDOR = true; From d6c2f82fdee3a2369d0c52e59ee1f330fa14e1c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 21:09:57 +0000 Subject: [PATCH 17/59] rtsp-simple-server: 0.19.3 -> 0.20.0 --- pkgs/servers/rtsp-simple-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index 80cdf08ab906..c0d443a1d4da 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.19.3"; + version = "0.20.0"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - hash = "sha256-nIxh6mbpkM5vX0S2ze8ylfEP1B07/DaqjoF8jDirJb8="; + hash = "sha256-egmTcEhfBxUw8fOpcft0Sna7zXxAfI264yZECDpWYQE="; }; - vendorSha256 = "sha256-zz2RLmljfOw5DtQuFkfS47yHq/bWMJzmmJf+PBlPJJQ="; + vendorSha256 = "sha256-C8+PVFLpFsowjnwMXwyC9TnNcsb8FEPBcWRgtExO7mw="; # Tests need docker doCheck = false; From 173069fbd25185c0f26916386c5884ae76858370 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 21:14:38 +0000 Subject: [PATCH 18/59] sd-local: 1.0.42 -> 1.0.43 --- pkgs/development/tools/sd-local/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/sd-local/default.nix b/pkgs/development/tools/sd-local/default.nix index 2faf1880ffc2..81b3a0bc6161 100644 --- a/pkgs/development/tools/sd-local/default.nix +++ b/pkgs/development/tools/sd-local/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.42"; + version = "1.0.43"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xPskMKInmaWi5dwx5E5z1ssTQ6Smj1L40Voy++g7Rhs="; + sha256 = "sha256-qFEug8fGOi5IwnA1P3FHKte7eiviNk/x8SdDss9J5vo="; }; vendorSha256 = "sha256-43hcIIGqBscMjQzaIGdMqV5lq3od4Ls4TJdTeFGtu5Y="; From f75d7a4a9390de088fa0fc5d30cc72ec0ef447bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 21:19:30 +0000 Subject: [PATCH 19/59] sentry-cli: 2.5.1 -> 2.5.2 --- pkgs/development/tools/sentry-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 2ab48e391873..47f5b8fc4115 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-4X3IzLZRiyQpTwZ/4tl1nBPhSmuZLelEzOxvjCVnaIQ="; + sha256 = "sha256-l632b+Cxs9jiahbeZYzjXDiw+LE2MUgx4negEh9jMAc="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-VsJrdQph8GJrQc0DWskvVdjvtsirEQxEIgr3vr62ktY="; + cargoSha256 = "sha256-uVzUCwYJo3CRykGHSfxigi2N9YSsxh0q8xMXuOe2Zsk="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; From a6c4ffa26d723af8abf55cbef6ef9742301d8ea0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 21:47:50 +0000 Subject: [PATCH 20/59] snappymail: 2.17.0 -> 2.17.2 --- pkgs/servers/snappymail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix index d26497d0e75c..4a7c3ed1a000 100644 --- a/pkgs/servers/snappymail/default.nix +++ b/pkgs/servers/snappymail/default.nix @@ -2,11 +2,11 @@ , dataPath ? "/var/lib/snappymail" }: stdenv.mkDerivation rec { pname = "snappymail"; - version = "2.17.0"; + version = "2.17.2"; src = fetchurl { url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz"; - sha256 = "sha256-Z8By/X4IheOyCT7F4KArBN+CFUTcSn0VZchcYhAJsCU="; + sha256 = "sha256-CKUVi0M9DhhfJRQQIq6gLGspta0BcEK1VpIolhGs3a0="; }; sourceRoot = "snappymail"; From 2859855c0da67c14f4dd766d9b8d4421e49f015f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Aug 2022 23:44:57 +0200 Subject: [PATCH 21/59] python3Packages.related: 0.7.2 -> 0.7.3 --- pkgs/development/python-modules/related/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/related/default.nix b/pkgs/development/python-modules/related/default.nix index ddcedc4eae6d..e6716b55b449 100644 --- a/pkgs/development/python-modules/related/default.nix +++ b/pkgs/development/python-modules/related/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "related"; - version = "0.7.2"; + version = "0.7.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "w0XmNWh1xF08qitH22lQgTRNqO6qyYrYd2dc6x3Fop0="; + hash = "sha256-IqmbqAW6PubN9GBXrMs5Je4u1XkgLl9camSGNrlrFJA="; }; propagatedBuildInputs = [ From d2c47ea0173f8310974eb0512819e69e980d49a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 22:30:24 +0000 Subject: [PATCH 22/59] temporal: 1.17.2 -> 1.17.4 --- pkgs/applications/networking/cluster/temporal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 4c165cc7e10c..78f4b715b1c4 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "temporal"; - version = "1.17.2"; + version = "1.17.4"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - sha256 = "sha256-V80v8nRHAshPnyWdBb4ahCn5FfzT906oZlhalZ547Nk="; + sha256 = "sha256-FT1GOhB3PN5CBktMm5Z2xe6MF3U/BUQj7XViinTjWG4="; }; vendorSha256 = "sha256-MT/BmGTdyEzmXjuwlA6WhLIWlrQz3Wc4Tl5dMI1587Q="; From 7337e729a47f888314b4c26e46003cc8af39bb90 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Aug 2022 23:57:46 +0000 Subject: [PATCH 23/59] jruby: 9.3.6.0 -> 9.3.7.0 --- pkgs/development/interpreters/jruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 53da18e9e9f9..19119a1e2813 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "5" "7" ""; jruby = stdenv.mkDerivation rec { pname = "jruby"; - version = "9.3.6.0"; + version = "9.3.7.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "sha256-dHr2r5mmdPII9A2o2yLXfG2kk6gygOmQtS1SOr2UmeI="; + sha256 = "sha256-lKeos77qwiU6iHbnOt+sa+zssrVNLd+mjyRdyBln0ME="; }; nativeBuildInputs = [ makeWrapper ]; From 5e24229488e7968f05a06a07096dd917138d7f27 Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Thu, 18 Aug 2022 00:23:19 +0000 Subject: [PATCH 24/59] vscode: 1.70.1 -> 1.70.2 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index d5cfe19ffd0f..1a09d6475004 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -15,17 +15,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "04frcbgjvnik1b4ipvyk6v99i9mydkwj9g6b58rns4xd52p9v3sj"; - x86_64-darwin = "1jhj15jn0xqahjldyibqp22l2bs4g1s76rzwp27nmcmp7d9frrlj"; - aarch64-linux = "03vpq8l4392xaqp48jp7994hp29ayr9ny69svyrrdhyasrcsrb9c"; - aarch64-darwin = "0k0nw4jx3cqcjla4ms2p2b57axgn9f69glp1qc9bqv28cbdnyzv8"; - armv7l-linux = "0vz3cfwmcm0s79z3sx0c2l2nnsprassp4yxqh6gy5g4p9b7rr61k"; + x86_64-linux = "08p4l47zr4dm7mw65wwdsf6q1wkzkzg3l2y5zrs3ng3nafql96zs"; + x86_64-darwin = "1pf8xpg2sb0iwfaixvzhmglqrrky2625b66fjwlc5zkj0dlff106"; + aarch64-linux = "1c35s7zykcrqf3va1cv7hqf1dp3cl70kdvqv3vgflqldc1wcza9h"; + aarch64-darwin = "1jpsf54x7yy53d6766gpw90ngdi6kicpqm1qbzbmmsasndl7rklp"; + armv7l-linux = "10vj751bjdkzsdcrdpq6xb430pdhdbz8ysk835ir64i3mv6ygi7k"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.70.1"; + version = "1.70.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 9932fab7c0d03acd5f46fbdf4bea7d774326a299 Mon Sep 17 00:00:00 2001 From: Joe Doyle Date: Wed, 17 Aug 2022 21:01:53 -0400 Subject: [PATCH 25/59] mkp224o: fix typo in amd64-64-24k version --- pkgs/tools/security/mkp224o/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/mkp224o/default.nix b/pkgs/tools/security/mkp224o/default.nix index 4b9beecb3541..dbe60b4a516e 100644 --- a/pkgs/tools/security/mkp224o/default.nix +++ b/pkgs/tools/security/mkp224o/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { { suffix = "donna-sse2"; configureFlags = ["--enable-donna-sse2"]; } ] ++ lib.optionals (!stdenv.isDarwin && stdenv.isx86_64) [ { suffix = "amd64-51-30k"; configureFlags = ["--enable-amd64-51-30k"]; } - { suffix = "amd64-64-20k"; configureFlags = ["--enable-amd64-64-24k"]; } + { suffix = "amd64-64-24k"; configureFlags = ["--enable-amd64-64-24k"]; } ]; in lib.concatMapStrings ({suffix, configureFlags}: '' From 06f89fc55ec106eb8ee1b28daa34131669638bb8 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 18 Aug 2022 13:37:52 +0200 Subject: [PATCH 26/59] python310Packages.tableaudocumentapi: Fix build --- .../python-modules/tableaudocumentapi/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tableaudocumentapi/default.nix b/pkgs/development/python-modules/tableaudocumentapi/default.nix index cf9a55d7391c..ae6f374836d7 100644 --- a/pkgs/development/python-modules/tableaudocumentapi/default.nix +++ b/pkgs/development/python-modules/tableaudocumentapi/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage , fetchPypi +, lxml +, pytestCheckHook }: buildPythonPackage rec { @@ -12,13 +14,19 @@ buildPythonPackage rec { sha256 = "sha256-ahR+o4UgFLm/9aFsEqmlwXkcgTjqI0wU2Tl9EjVjLZs="; }; - # tests not inclued with release + propagatedBuildInputs = [ lxml ]; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "tableaudocumentapi" ]; + + # ModuleNotFoundError: No module named 'test.assets' doCheck = false; meta = with lib; { description = "A Python module for working with Tableau files"; homepage = "https://github.com/tableau/document-api-python"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From f3c99629ae26a6fc8963482f34cbd9178aee41b9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Aug 2022 13:54:01 +0200 Subject: [PATCH 27/59] coinlive: init at 0.2.1 --- pkgs/tools/misc/coinlive/default.nix | 35 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/misc/coinlive/default.nix diff --git a/pkgs/tools/misc/coinlive/default.nix b/pkgs/tools/misc/coinlive/default.nix new file mode 100644 index 000000000000..8841f1df6e3c --- /dev/null +++ b/pkgs/tools/misc/coinlive/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchFromGitHub +, openssl +, pkg-config +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "coinlive"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "mayeranalytics"; + repo = pname; + rev = "v${version}"; + hash = "sha256-i21C1ZSAPoUOBlnDQl40/17yRqmNx3wkjswHJeV9vko="; + }; + + cargoSha256 = "sha256-0pUXCY5rZWh26KGD2OU2+M9L0RtCIan6hmuNeIeBEHI="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + meta = with lib; { + description = "Live cryptocurrency prices CLI"; + homepage = "https://github.com/mayeranalytics/coinlive"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78c71be382f8..453c52db0f24 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17487,6 +17487,8 @@ with pkgs; CoinMP = callPackage ../development/libraries/CoinMP { }; + coinlive = callPackage ../tools/misc/coinlive { }; + cointop = callPackage ../applications/misc/cointop { }; collada-dom = callPackage ../development/libraries/collada-dom { }; From 51bd7cf0d05f996c74b8fabebc755a2fe253b50e Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 8 Jun 2022 02:41:06 +0800 Subject: [PATCH 28/59] emacs: enable native-comp --- .../from_md/release-notes/rl-2211.section.xml | 28 +++++++++++++++++++ .../manual/release-notes/rl-2211.section.md | 4 +++ pkgs/applications/editors/emacs/generic.nix | 2 +- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 5 ---- 5 files changed, 35 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 2e3dfea8cb6e..ce161fca5b40 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -70,6 +70,34 @@ with any supported NixOS release. + + + emacs enables native compilation which + means: + + + + + emacs packages from nixpkgs, builtin or not, will do + native compilation ahead of time so you can enjoy the + benefit of native compilation without compiling them on + you machine; + + + + + emacs packages from somewhere else, e.g. + package-install, will do asynchronously + deferred native compilation. If you do not want this, + maybe to avoid CPU consumption for compilation, you can + use + (setq native-comp-deferred-compilation nil) + to disable it while still enjoy the benefit of native + compilation for packages from nixpkgs. + + + + nixos-generate-config now generates diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 6bc7d1917cae..eea3eef26406 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -35,6 +35,10 @@ In addition to numerous new and upgraded packages, this release has the followin for a transition period so that in time the ecosystem can switch without breaking compatibility with any supported NixOS release. +- `emacs` enables native compilation which means: + - emacs packages from nixpkgs, builtin or not, will do native compilation ahead of time so you can enjoy the benefit of native compilation without compiling them on you machine; + - emacs packages from somewhere else, e.g. `package-install`, will do asynchronously deferred native compilation. If you do not want this, maybe to avoid CPU consumption for compilation, you can use `(setq native-comp-deferred-compilation nil)` to disable it while still enjoy the benefit of native compilation for packages from nixpkgs. + - `nixos-generate-config` now generates configurations that can be built in pure mode. This is achieved by setting the new `nixpkgs.hostPlatform` option. diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index b1c8a8d6cc9b..1f49c3c23af0 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -26,7 +26,7 @@ , withWebP ? false , srcRepo ? true, autoreconfHook ? null, texinfo ? null , siteStart ? ./site-start.el -, nativeComp ? false +, nativeComp ? true , withAthena ? false , withToolkitScrollBars ? true , withPgtk ? false diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c19acf8ce4e0..d41a60a697fe 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -380,8 +380,10 @@ mapAliases ({ electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned"; # Added 2022-01-01 # Emacs + emacs28NativeComp = emacs28; # Added 2022-06-08 emacs28Packages = emacs28.pkgs; # Added 2021-10-04 emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04 + emacsNativeComp = emacs28NativeComp; # Added 2022-06-08 emacsPackages = emacs.pkgs; # Added 2020-12-18 emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 emacsPackagesNg = emacs.pkgs; # Added 2019-08-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e6a1a37376a..b9fd05408f75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26720,7 +26720,6 @@ with pkgs; em = callPackage ../applications/editors/em { }; emacs = emacs28; - emacsNativeComp = emacs28NativeComp; emacs-nox = emacs28-nox; emacs28 = callPackage ../applications/editors/emacs/28.nix { @@ -26735,10 +26734,6 @@ with pkgs; inherit (darwin) sigtool; }; - emacs28NativeComp = emacs28.override { - nativeComp = true; - }; - emacs28-nox = lowPrio (emacs28.override { withX = false; withNS = false; From c6612e92f888cc8abf0126fc3082a9d2738adf42 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 18 Aug 2022 16:21:56 +0300 Subject: [PATCH 29/59] via: 1.3.1 -> 2.0.5 Upstream also relicensed as GPLv3 --- pkgs/tools/misc/via/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/via/default.nix b/pkgs/tools/misc/via/default.nix index 4e5641e304ce..3a7d51f4c7c3 100644 --- a/pkgs/tools/misc/via/default.nix +++ b/pkgs/tools/misc/via/default.nix @@ -2,13 +2,12 @@ let pname = "via"; - version = "1.3.1"; + version = "2.0.5"; name = "${pname}-${version}"; - nameExecutable = pname; src = fetchurl { url = "https://github.com/the-via/releases/releases/download/v${version}/via-${version}-linux.AppImage"; name = "via-${version}-linux.AppImage"; - sha256 = "d2cd73d280a265149fedb24161ec7c575523596c4d30898ad6b5875e09b3f34a"; + sha256 = "sha256-APNtzfeV6z8IF20bomcgMq7mwcK1fbDdFF77Xr0UPOs="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in appimageTools.wrapType2 { @@ -22,8 +21,8 @@ in appimageTools.wrapType2 { extraInstallCommands = '' mv $out/bin/${name} $out/bin/${pname} - install -m 444 -D ${appimageContents}/via.desktop -t $out/share/applications - substituteInPlace $out/share/applications/via.desktop \ + install -m 444 -D ${appimageContents}/via-nativia.desktop -t $out/share/applications + substituteInPlace $out/share/applications/via-nativia.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' cp -r ${appimageContents}/usr/share/icons $out/share @@ -34,7 +33,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "Yet another keyboard configurator"; homepage = "https://caniusevia.com/"; - license = licenses.unfree; + license = licenses.gpl3; maintainers = with maintainers; [ emilytrau ]; platforms = [ "x86_64-linux" ]; }; From d09eccecd57c78c7f34774a3cb48fb97edcdc0cf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Aug 2022 18:09:49 +0200 Subject: [PATCH 30/59] python310Packages.sensor-state-data: 2.2.0 -> 2.3.1 --- pkgs/development/python-modules/sensor-state-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix index a3abd9f4037b..c9b113c9a121 100644 --- a/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/pkgs/development/python-modules/sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.2.0"; + version = "2.3.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-ThROGmCNsOOJ65sOXRS1FefwN8Wf2DmHP294y3JVQvk="; + hash = "sha256-jAg/xz7HqXiQuC/fNtUS1gKHdISduHfiWPaWucGAPMY="; }; nativeBuildInputs = [ From c454db9d00083579b49d0d1e21a2652cd0b6a185 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 18 Aug 2022 16:53:37 +0000 Subject: [PATCH 31/59] =?UTF-8?q?gcr:=203.41.0=20=E2=86=92=203.41.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gcr/-/compare/3.41.0...3.41.1 - Enabled API docs since they now switched to gi-docgen. - Freezing updates since the next version is API-incompatible gcr4. Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/gcr/default.nix | 33 +++++++++------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 6c1c3de08a2e..c7f98843e37a 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl -, fetchpatch , pkg-config , meson , ninja @@ -17,7 +17,7 @@ , systemd , gobject-introspection , wrapGAppsHook -, libxslt +, gi-docgen , vala , gnome , python3 @@ -26,25 +26,15 @@ stdenv.mkDerivation rec { pname = "gcr"; - version = "3.41.0"; + version = "3.41.1"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "CQn8SeqK1IMtJ1ZP8v0dxmZpbioHxzlBxIgp5gVy2gE="; + sha256 = "u3Eoo8L+u/7pwDuQ131JjQzrI3sHiYAtYBhcccS+ok8="; }; - patches = [ - # Pull upstream fix for meson-0.60: - # https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/81 - (fetchpatch { - name = "meson-0.60.patch"; - url = "https://gitlab.gnome.org/GNOME/gcr/-/commit/b3ca1d02bb0148ca787ac4aead164d7c8ce2c4d8.patch"; - sha256 = "15gwxkcm5q5p87p5lrqwgykpzx5gmk179xd3481yak93yhbvy165"; - }) - ]; - nativeBuildInputs = [ pkg-config meson @@ -52,7 +42,7 @@ stdenv.mkDerivation rec { ninja gettext gobject-introspection - libxslt + gi-docgen wrapGAppsHook vala shared-mime-info @@ -79,7 +69,6 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=false" # We are still using ssh-agent from gnome-keyring. # https://github.com/NixOS/nixpkgs/issues/140824 "-Dssh_agent=false" @@ -90,15 +79,21 @@ stdenv.mkDerivation rec { PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; postPatch = '' - patchShebangs build/ gcr/fixtures/ + patchShebangs gcr/fixtures/ chmod +x meson_post_install.py patchShebangs meson_post_install.py ''; + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; + freeze = true; }; }; From 187ee7a4bee8af2ffbacaec97738e8df2a7a0cc9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Aug 2022 18:10:09 +0200 Subject: [PATCH 32/59] python310Packages.qingping-ble: 0.2.3 -> 0.2.4 --- pkgs/development/python-modules/qingping-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qingping-ble/default.nix b/pkgs/development/python-modules/qingping-ble/default.nix index 8cbc94a87cfc..e494bb73acfc 100644 --- a/pkgs/development/python-modules/qingping-ble/default.nix +++ b/pkgs/development/python-modules/qingping-ble/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "qingping-ble"; - version = "0.2.3"; + version = "0.2.4"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = pname; rev = "v${version}"; - hash = "sha256-+iUZIsaSYgptHXtNSc9sJiBU8CUEFPDsLVGuFR5WvDw="; + hash = "sha256-ggIRUW7JC7vgdwd42aw73T2+fNaSYRlg20CxwwwcE/U="; }; nativeBuildInputs = [ From 986c8b28de192942ba792547e5b0018553b1f7e7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Aug 2022 20:23:23 +0200 Subject: [PATCH 33/59] python310Packages.atc-ble: init at 0.1.0 --- .../python-modules/atc-ble/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/atc-ble/default.nix diff --git a/pkgs/development/python-modules/atc-ble/default.nix b/pkgs/development/python-modules/atc-ble/default.nix new file mode 100644 index 000000000000..fd4aad6d4035 --- /dev/null +++ b/pkgs/development/python-modules/atc-ble/default.nix @@ -0,0 +1,55 @@ +{ lib +, bluetooth-sensor-state-data +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pycryptodomex +, pytestCheckHook +, pythonOlder +, sensor-state-data +}: + +buildPythonPackage rec { + pname = "atc-ble"; + version = "0.1.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "v${version}"; + hash = "sha256-rwOFKxUlbbNIDJRdCmZpHstXwxcTnvlExgcVDdGbIVY="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + bluetooth-sensor-state-data + pycryptodomex + sensor-state-data + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=atc_ble --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "atc_ble" + ]; + + meta = with lib; { + description = "Library for ATC devices with custom firmware"; + homepage = "https://github.com/Bluetooth-Devices/atc-ble"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 37e657c5f325..dfb4af2c65ef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -811,6 +811,8 @@ in { asysocks = callPackage ../development/python-modules/asysocks { }; + atc-ble = callPackage ../development/python-modules/atc-ble { }; + atenpdu = callPackage ../development/python-modules/atenpdu { }; atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { }; From 4b76218dcb05ec4890c6f3d7b32b950e66ce5c1c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Aug 2022 20:49:33 +0200 Subject: [PATCH 34/59] python310Packages.fastcore: 1.5.17 -> 1.5.18 --- pkgs/development/python-modules/fastcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index 8f0b244723ba..e399686c4b7a 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.5.17"; + version = "1.5.18"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-glDjqcNLnk2p4zqfICiTLtENMYQ5S6UshwkP797NljY="; + sha256 = "sha256-Ur12ewTfJyUUzrQyTP8qydzjxnHFcJDAw9xChN+mZ1Y="; }; propagatedBuildInputs = [ From 7d23e75d63a9dd8a15c5d5e011a8183f9adf615e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Aug 2022 21:11:25 +0200 Subject: [PATCH 35/59] python310Packages.aioecowitt: 2022.7.0 -> 2022.08.2 --- pkgs/development/python-modules/aioecowitt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioecowitt/default.nix b/pkgs/development/python-modules/aioecowitt/default.nix index 32a6152efc12..22da8e2f404d 100644 --- a/pkgs/development/python-modules/aioecowitt/default.nix +++ b/pkgs/development/python-modules/aioecowitt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "aioecowitt"; - version = "2022.7.0"; + version = "2022.08.2"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GALBhapE31CM2mqBrgcdQf5SJV+edN3kj35r0cf7BcU="; + hash = "sha256-y0oPEsCW3jdd7jzBelCsUnrvDpzxP+Dtb/pQRrGTYDQ="; }; propagatedBuildInputs = [ From b1fb66a624bd19c1ce2558c518d09da84fd27a4e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Aug 2022 21:42:25 +0200 Subject: [PATCH 36/59] python310Packages.bless: init at 0.2.4 --- .../python-modules/bless/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/bless/default.nix diff --git a/pkgs/development/python-modules/bless/default.nix b/pkgs/development/python-modules/bless/default.nix new file mode 100644 index 000000000000..1bb92c410d8d --- /dev/null +++ b/pkgs/development/python-modules/bless/default.nix @@ -0,0 +1,45 @@ +{ lib +, aioconsole +, bleak +, buildPythonPackage +, fetchFromGitHub +, numpy +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "bless"; + version = "0.2.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "kevincar"; + repo = pname; + rev = "v${version}"; + hash = "sha256-lC1M6/9uawi4KpcK4/fAygENa9rZv9c7qCVdsZYtl5Q="; + }; + + propagatedBuildInputs = [ + bleak + ]; + + checkInputs = [ + aioconsole + numpy + pytestCheckHook + ]; + + pythonImportsCheck = [ + "bless" + ]; + + meta = with lib; { + description = "Library for creating a BLE Generic Attribute Profile (GATT) server"; + homepage = "https://github.com/kevincar/bless"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53b1d402a3b1..18e67dbcdbef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1363,6 +1363,8 @@ in { blebox-uniapi = callPackage ../development/python-modules/blebox-uniapi { }; + bless = callPackage ../development/python-modules/bless { }; + blessed = callPackage ../development/python-modules/blessed { }; blessings = callPackage ../development/python-modules/blessings { }; From e0377f4a23a3a43f7d1433bc9ab3e0bed9dbcad4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Aug 2022 20:25:31 +0000 Subject: [PATCH 37/59] cbmc: 5.63.0 -> 5.64.0 --- pkgs/applications/science/logic/cbmc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/cbmc/default.nix b/pkgs/applications/science/logic/cbmc/default.nix index ba06a3e4b7a2..53a0330030cd 100644 --- a/pkgs/applications/science/logic/cbmc/default.nix +++ b/pkgs/applications/science/logic/cbmc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cbmc"; - version = "5.63.0"; + version = "5.64.0"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-4tn3wsmaYdo5/QaZc3MLxVGF0x8dmRKeygF/8A+Ww1o="; + sha256 = "sha256-FQoUNJV5eq/qGc6fdNlMHQADGipx9dxkb4EFRNX7h6w="; }; nativeBuildInputs = [ From 7cc1d78d20e3ba41af5167ab811bae4e68220cd5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Aug 2022 22:33:24 +0200 Subject: [PATCH 38/59] python310Packages.pyskyqremote: 0.3.15 -> 0.3.16 --- pkgs/development/python-modules/pyskyqremote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyskyqremote/default.nix b/pkgs/development/python-modules/pyskyqremote/default.nix index abfb8838207e..610be681a6a3 100644 --- a/pkgs/development/python-modules/pyskyqremote/default.nix +++ b/pkgs/development/python-modules/pyskyqremote/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pyskyqremote"; - version = "0.3.15"; + version = "0.3.16"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "RogerSelwyn"; repo = "skyq_remote"; rev = "refs/tags/${version}"; - sha256 = "sha256-K21ASxMcFsT0qevjXDPmVIQjdW56UT8QMOuyT7e2yDc="; + sha256 = "sha256-zzVUXjpFCeyoYcerKJuK12nCf7tVJ7WdDvMDruGgAhc="; }; propagatedBuildInputs = [ From f3cea6317f9bc27a7093410785f240fdc5121daa Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Tue, 16 Aug 2022 17:04:48 +0200 Subject: [PATCH 39/59] hostapd-mana: init at 2.6.5 --- .../tools/networking/hostapd-mana/default.nix | 87 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 89 insertions(+) create mode 100644 pkgs/tools/networking/hostapd-mana/default.nix diff --git a/pkgs/tools/networking/hostapd-mana/default.nix b/pkgs/tools/networking/hostapd-mana/default.nix new file mode 100644 index 000000000000..56527fb15531 --- /dev/null +++ b/pkgs/tools/networking/hostapd-mana/default.nix @@ -0,0 +1,87 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, pkg-config +, libnl +, openssl +}: + +stdenv.mkDerivation rec { + pname = "hostapd-mana"; + version = "2.6.5"; + + src = fetchFromGitHub { + owner = "sensepost"; + repo = pname; + rev = version; + hash = "sha256-co5LMJAUYSdcvhLv1gfjDvdVqdSXgjtFoiQ7+KxR07M="; + }; + + patches = [ + # Fix compile errors with GCC 10 on newer Kali + (fetchpatch { + url = "https://github.com/sensepost/hostapd-mana/commit/8581994d8d19646da63e1e37cde27dd4c966e526.patch"; + hash = "sha256-UBkhuqvX1nFiceECAIC9B13ReKbrAAUtPKjqD17mQgg="; + }) + ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libnl openssl ]; + + extraConfig = '' + CONFIG_DRIVER_WIRED=y + CONFIG_LIBNL32=y + CONFIG_EAP_SIM=y + CONFIG_EAP_AKA=y + CONFIG_EAP_AKA_PRIME=y + CONFIG_EAP_PAX=y + CONFIG_EAP_PWD=y + CONFIG_EAP_SAKE=y + CONFIG_EAP_GPSK=y + CONFIG_EAP_GPSK_SHA256=y + CONFIG_EAP_FAST=y + CONFIG_EAP_IKEV2=y + CONFIG_EAP_TNC=y + CONFIG_EAP_EKE=y + CONFIG_RADIUS_SERVER=y + CONFIG_IEEE80211R=y + CONFIG_IEEE80211N=y + CONFIG_IEEE80211AC=y + CONFIG_FULL_DYNAMIC_VLAN=y + CONFIG_VLAN_NETLINK=y + CONFIG_TLS=openssl + CONFIG_TLSV11=y + CONFIG_TLSV12=y + CONFIG_INTERNETWORKING=y + CONFIG_HS20=y + CONFIG_ACS=y + CONFIG_GETRANDOM=y + CONFIG_SAE=y + ''; + + postPatch = '' + substituteInPlace hostapd/Makefile --replace /usr/local $out + ''; + + configurePhase = '' + runHook preConfigure + cd hostapd + cp -v defconfig .config + echo "$extraConfig" >> .config + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libnl-${lib.versions.major libnl.version}.0)" + runHook postConfigure + ''; + + preInstall = '' + mkdir -p $out/bin + ''; + + meta = with lib; { + homepage = "https://github.com/sensepost/hostapd-mana"; + description = "A featureful rogue wifi access point tool"; + license = licenses.bsd3; + maintainers = with maintainers; [ lourkeur ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95fdb4978bc2..89171b7010aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1447,6 +1447,8 @@ with pkgs; hercules = callPackage ../applications/emulators/hercules { }; + hostapd-mana = callPackage ../tools/networking/hostapd-mana { }; + image-analyzer = callPackage ../applications/emulators/cdemu/analyzer.nix { }; kega-fusion = pkgsi686Linux.callPackage ../applications/emulators/kega-fusion { }; From 5cfcb62e178cdf4b25aba15bc3ddee0627f37c6b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 16 Aug 2022 11:38:56 +0200 Subject: [PATCH 40/59] blackfire.updateScript: fix on different systems Running `update-source-version` with `--system` flag passes it to `nix-build -A $attr.src`, which requires that an appropriate builders are set on the system. It previously worked for me because I had aarch64-linux builder configured but broke down once Darwin support was added to the package. --- .../tools/misc/blackfire/default.nix | 67 +++++++++---------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index 107076963b77..535b758ef4f2 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -8,39 +8,15 @@ , common-updater-scripts }: -let - version = "2.8.1"; - - sources = { - "x86_64-linux" = fetchurl { - url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "znaM00jM6yrpb+bGTxzJUxViCUzv4G+CYK2EB5dxhfY="; - }; - "i686-linux" = fetchurl { - url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "QIY4qGm333H5MWhe3CIfEieqTEk8st5A7SJHkwGnnxw="; - }; - "aarch64-linux" = fetchurl { - url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "eZbKoKYC2tt4Rxn5OJr7iA1aJlYFC0tpRmbLq7qSrIU="; - }; - "aarch64-darwin" = fetchurl { - url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "tn2vF3v7KfF7CfWqyydL5Iyh5tP9Tez87PJH+URgSIw="; - }; - "x86_64-darwin" = fetchurl { - url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "CRFlnqpX4j2CMGzS+UvXwNty2mHpONOjym6UJPE2Yg4="; - }; - }; -in stdenv.mkDerivation rec { pname = "blackfire"; - inherit version; + version = "2.8.1"; - src = sources.${stdenv.hostPlatform.system}; + src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); - nativeBuildInputs = lib.optionals stdenv.isLinux [ dpkg ]; + nativeBuildInputs = lib.optionals stdenv.isLinux [ + dpkg + ]; dontUnpack = true; @@ -78,7 +54,30 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = writeShellScript "update-${pname}" '' + sources = { + "x86_64-linux" = fetchurl { + url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; + sha256 = "znaM00jM6yrpb+bGTxzJUxViCUzv4G+CYK2EB5dxhfY="; + }; + "i686-linux" = fetchurl { + url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; + sha256 = "QIY4qGm333H5MWhe3CIfEieqTEk8st5A7SJHkwGnnxw="; + }; + "aarch64-linux" = fetchurl { + url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; + sha256 = "eZbKoKYC2tt4Rxn5OJr7iA1aJlYFC0tpRmbLq7qSrIU="; + }; + "aarch64-darwin" = fetchurl { + url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; + sha256 = "tn2vF3v7KfF7CfWqyydL5Iyh5tP9Tez87PJH+URgSIw="; + }; + "x86_64-darwin" = fetchurl { + url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; + sha256 = "CRFlnqpX4j2CMGzS+UvXwNty2mHpONOjym6UJPE2Yg4="; + }; + }; + + updateScript = writeShellScript "update-blackfire" '' set -o errexit export PATH="${lib.makeBinPath [ curl jq common-updater-scripts ]}" NEW_VERSION=$(curl -s https://blackfire.io/api/v1/releases | jq .cli --raw-output) @@ -88,9 +87,9 @@ stdenv.mkDerivation rec { exit 0 fi - for platform in ${lib.concatStringsSep " " meta.platforms}; do - update-source-version "blackfire" "0" "${lib.fakeSha256}" "--system=$platform" - update-source-version "blackfire" "$NEW_VERSION" "--system=$platform" --ignore-same-hash + for platform in ${lib.escapeShellArgs meta.platforms}; do + update-source-version "blackfire" "0" "${lib.fakeSha256}" --source-key="sources.$platform" + update-source-version "blackfire" "$NEW_VERSION" --source-key="sources.$platform" done ''; }; @@ -101,6 +100,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ jtojnar shyim ]; - platforms = [ "x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "i686-linux" "x86_64-darwin" ]; }; } From 5e8529d6f1da4122fa9f2eaa466e578fdf1c50d8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 16 Aug 2022 10:43:48 +0000 Subject: [PATCH 41/59] =?UTF-8?q?blackfire:=202.8.1=20=E2=86=92=202.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/misc/blackfire/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index 535b758ef4f2..244833d28bbc 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.8.1"; + version = "2.10.0"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "znaM00jM6yrpb+bGTxzJUxViCUzv4G+CYK2EB5dxhfY="; + sha256 = "kyYmPU/y7pR2kx5ymDMuJvinTo5hpKs0Jy3LZPjDJyw="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "QIY4qGm333H5MWhe3CIfEieqTEk8st5A7SJHkwGnnxw="; + sha256 = "swaZmlEoKSmH95pqAYW3ygOzQKkedWhc7FOMy3RnJFs="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "eZbKoKYC2tt4Rxn5OJr7iA1aJlYFC0tpRmbLq7qSrIU="; + sha256 = "QjrLn+gxoJovMlLsIe24BNKVaFK3vgFk9BwRHSl/y3M="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "tn2vF3v7KfF7CfWqyydL5Iyh5tP9Tez87PJH+URgSIw="; + sha256 = "pBzSswicNK8z/asmGhj+IhBSS0mPJSf91XBX75AGAtY="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "CRFlnqpX4j2CMGzS+UvXwNty2mHpONOjym6UJPE2Yg4="; + sha256 = "ekeA/+N59mgDtkchEP1p4jz74goaPySmvZ6urCLcUNw="; }; }; From a0f033f18182d18e9448e6ca28ab07a7f5c6bdbe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Aug 2022 01:21:28 +0200 Subject: [PATCH 42/59] metasploit: 6.2.12 -> 6.2.13 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 16 +++++++-------- pkgs/tools/security/metasploit/default.nix | 4 ++-- pkgs/tools/security/metasploit/gemset.nix | 22 ++++++++++----------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 4d3d7f1d04d4..3df96f282baf 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.12" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.13" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 64aeff5b112f..d6a3bb6991fa 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 38794f11b8a4c685c1f90b832a9a77974f5e0471 - ref: refs/tags/6.2.12 + revision: 6241267e515db4b2902831fda1bc41773fb24529 + ref: refs/tags/6.2.13 specs: - metasploit-framework (6.2.12) + metasploit-framework (6.2.13) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -130,13 +130,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.618.0) + aws-partitions (1.619.0) aws-sdk-core (3.132.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.327.0) + aws-sdk-ec2 (1.328.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.69.0) @@ -252,7 +252,7 @@ GEM metasploit_payloads-mettle (1.0.18) method_source (1.0.0) mini_portile2 (2.8.0) - minitest (5.16.2) + minitest (5.16.3) mqtt (0.5.0) msgpack (1.5.4) multi_json (1.15.0) @@ -402,7 +402,7 @@ GEM ttfunk (1.7.0) tzinfo (2.0.5) concurrent-ruby (~> 1.0) - tzinfo-data (1.2022.2) + tzinfo-data (1.2022.3) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext @@ -439,4 +439,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.3.9 + 2.3.20 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 8c2f6ef311d7..2cc25a9728e3 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.2.12"; + version = "6.2.13"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-KIpPThnT0hMeJu75yvv1YIXxb2B5SJhS2SibMAn+EU8="; + sha256 = "sha256-95G9iqejcc2t4pUmzNoDE9/9f6NstPjLDJigQhZAo4E="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index bdd22a1fdfa2..e962b2571420 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wv819cag3bhq07d4xjspinakqdfw97chpd9s6qqr70xicpl43zn"; + sha256 = "0vgbfpxpybq5hr87knpc65ha0cyckbq2i00y8wd8sc3j663sffm2"; type = "gem"; }; - version = "1.618.0"; + version = "1.619.0"; }; aws-sdk-core = { groups = ["default"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gdqf0dfkqk4q6x9rz9dq0sliqmybdfkbfzyifm4y2pvqaiybgir"; + sha256 = "1x9wcq89bp8785qqx8jlj4isbqq5w5kisfdd275r6p2chmm1mw47"; type = "gem"; }; - version = "1.327.0"; + version = "1.328.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -614,12 +614,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "38794f11b8a4c685c1f90b832a9a77974f5e0471"; - sha256 = "0kqizq4k16r8v599hj3rc1pz31b0ypxwmygf4qg17lnk3574z2i8"; + rev = "6241267e515db4b2902831fda1bc41773fb24529"; + sha256 = "10d380b4584q1k5zid3cldzzvpqk0gdcq9lmwanwswd3ly5bv4gp"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.2.12"; + version = "6.2.13"; }; metasploit-model = { groups = ["default"]; @@ -686,10 +686,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1"; + sha256 = "0516ypqlx0mlcfn5xh7qppxqc3xndn1fnadxawa8wld5dkcimy30"; type = "gem"; }; - version = "5.16.2"; + version = "5.16.3"; }; mqtt = { groups = ["default"]; @@ -1447,10 +1447,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0792pfxr0n143r424ibl4ahpd5yl9yxnnwifiy8qdc14j2c7bsz8"; + sha256 = "0k62nrh30sinsfbs17w8cahydf3vm3j14l0l0ba78vfh429cv4i3"; type = "gem"; }; - version = "1.2022.2"; + version = "1.2022.3"; }; unf = { groups = ["default"]; From eedf89041cc2a909659e5501b98606c50a0cd1e8 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 19 Aug 2022 01:02:17 +0200 Subject: [PATCH 43/59] gcr: fix build on darwin --- pkgs/development/libraries/gcr/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index c7f98843e37a..cb833272923f 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { pango libsecret openssh + ] ++ lib.optionals stdenv.isLinux [ systemd ]; @@ -72,6 +73,8 @@ stdenv.mkDerivation rec { # We are still using ssh-agent from gnome-keyring. # https://github.com/NixOS/nixpkgs/issues/140824 "-Dssh_agent=false" + ] ++ lib.optionals (!stdenv.isLinux) [ + "-Dsystemd=disabled" ]; doCheck = false; # fails 21 out of 603 tests, needs dbus daemon @@ -83,6 +86,7 @@ stdenv.mkDerivation rec { chmod +x meson_post_install.py patchShebangs meson_post_install.py + substituteInPlace meson_post_install.py --replace ".so" "${stdenv.hostPlatform.extensions.sharedLibrary}" ''; postFixup = '' From 4ae5da539489d31697a1e163b9de190e150ca63e Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Fri, 19 Aug 2022 02:22:47 +0200 Subject: [PATCH 44/59] nixos/network-interfaces-systemd: do not ignore /0 gateway routes While it might seem odd, 0.0.0.0/0 or ::/0 gateways are valid and commonly used on point-to-point links (e.g. a wireguard tunnel) to indicate that all traffic needs to be sent to a given interface. systemd-networkd actually documents this as a valid configuration in its man pages [1]. Tested to do the right thing in one of my NixOS containers using a Wireguard tunnel as its default route. [1] https://www.freedesktop.org/software/systemd/man/systemd.network.html#DefaultRouteOnDevice= --- nixos/modules/tasks/network-interfaces-systemd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 1657fabcd9b1..b24b29c32d4a 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -134,7 +134,7 @@ in # Most of these route options have not been tested. # Please fix or report any mistakes you may find. routeConfig = - optionalAttrs (route.prefixLength > 0) { + optionalAttrs (route.address != null && route.prefixLength != null) { Destination = "${route.address}/${toString route.prefixLength}"; } // optionalAttrs (route.options ? fastopen_no_cookie) { From 2d52abcbef2f326a9cc9cfa4ee268fd0072c2600 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 19 Aug 2022 11:21:34 +1000 Subject: [PATCH 45/59] yt-dlp: 2022.8.14 -> 2022.8.19 https://github.com/yt-dlp/yt-dlp/releases/tag/2022.08.19 --- pkgs/tools/misc/yt-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 2da719887583..681888539ca3 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2022.8.14"; + version = "2022.8.19"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mizrdqTMSKqAEn7/ioU9nIt+/ovhIcISPcv9PQa8lF8="; + sha256 = "sha256-zCkKyKH+xiaEF2X+0S96Hr3+AXka5cXzeU7fzjXYGEM="; }; propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ]; From c5f2d8be81a708d049cbca42e5a99140b04c8e8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Aug 2022 04:01:56 +0000 Subject: [PATCH 46/59] python310Packages.google-cloud-audit-log: 0.2.3 -> 0.2.4 --- .../python-modules/google-cloud-audit-log/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/pkgs/development/python-modules/google-cloud-audit-log/default.nix index 2fae768eb3a3..e1effd0ac2a2 100644 --- a/pkgs/development/python-modules/google-cloud-audit-log/default.nix +++ b/pkgs/development/python-modules/google-cloud-audit-log/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-audit-log"; - version = "0.2.3"; + version = "0.2.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Yi8baD1TgpLr1zNH2i+CBeY+3gwL7Aq5nnmgZcSSZr0="; + sha256 = "sha256-qr5VQ2ceT4qcekwOPqmoe6K6K5b5/61vqgIgmQDh8wg="; }; propagatedBuildInputs = [ googleapis-common-protos protobuf ]; From c0c9ca57c35f426bff6496ca694d7880fdcce40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Reu=C3=9Fe?= Date: Wed, 6 Jul 2022 16:44:47 +0200 Subject: [PATCH 47/59] maintainers: add eigengrau --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index be0cfb4930ca..f012c1b4495d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3744,6 +3744,12 @@ githubId = 537775; name = "Emery Hemingway"; }; + eigengrau = { + email = "seb@schattenkopie.de"; + name = "Sebastian Reuße"; + github = "eigengrau"; + githubId = 4939947; + }; eikek = { email = "eike.kettner@posteo.de"; github = "eikek"; From 1be3859507a2ffd57a30349d3aac9ff8507b5dec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Reu=C3=9Fe?= Date: Thu, 7 Jul 2022 08:41:08 +0200 Subject: [PATCH 48/59] ballerina: init at 2201.1.0 --- .../compilers/ballerina/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/compilers/ballerina/default.nix diff --git a/pkgs/development/compilers/ballerina/default.nix b/pkgs/development/compilers/ballerina/default.nix new file mode 100644 index 000000000000..6de0bebb7863 --- /dev/null +++ b/pkgs/development/compilers/ballerina/default.nix @@ -0,0 +1,32 @@ +{ lib, makeWrapper, fetchzip, stdenv, openjdk }: +let + version = "2201.1.0"; + codeName = "swan-lake"; +in stdenv.mkDerivation { + pname = "ballerina"; + inherit version; + + src = fetchzip { + url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip"; + sha256 = "sha256-WZ6CvgnES1indYeMSuC3odDqwR2J27k+D8RktvHsELs="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + cp -rv distributions/ballerina-${version} $out + runHook postInstall + ''; + preFixup = '' + wrapProgram $out/bin/bal --set JAVA_HOME ${openjdk}/lib/openjdk + ''; + + meta = with lib; { + description = "An open-source programming language for the cloud"; + license = licenses.asl20; + platforms = openjdk.meta.platforms; + maintainers = with maintainers; [ eigengrau ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0f42fc7ef6d..9d45b70d5045 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12810,6 +12810,8 @@ with pkgs; avra = callPackage ../development/compilers/avra { }; + ballerina = callPackage ../development/compilers/ballerina { }; + beekeeper-studio = callPackage ../development/tools/database/beekeeper-studio { }; bigloo = callPackage ../development/compilers/bigloo { }; From cd3591f562d507782697887b03abace44e383a0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Reu=C3=9Fe?= Date: Tue, 12 Jul 2022 14:43:04 +0200 Subject: [PATCH 49/59] ballerina: add smoke test --- pkgs/development/compilers/ballerina/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ballerina/default.nix b/pkgs/development/compilers/ballerina/default.nix index 6de0bebb7863..1776d5a23c7b 100644 --- a/pkgs/development/compilers/ballerina/default.nix +++ b/pkgs/development/compilers/ballerina/default.nix @@ -1,4 +1,4 @@ -{ lib, makeWrapper, fetchzip, stdenv, openjdk }: +{ ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }: let version = "2201.1.0"; codeName = "swan-lake"; @@ -22,6 +22,19 @@ in stdenv.mkDerivation { wrapProgram $out/bin/bal --set JAVA_HOME ${openjdk}/lib/openjdk ''; + passthru.tests.smokeTest = let + helloWorld = writeText "hello-world.bal" '' + import ballerina/io; + public function main() { + io:println("Hello, World!"); + } + ''; + in runCommand "ballerina-${version}-smoketest" { } '' + ${ballerina}/bin/bal run ${helloWorld} >$out + read result <$out + [[ $result = "Hello, World!" ]] + ''; + meta = with lib; { description = "An open-source programming language for the cloud"; license = licenses.asl20; From 77c71e63291bae656c73dc1bf1de582992dbd9db Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 11 Aug 2022 12:56:02 +0200 Subject: [PATCH 50/59] python310Packages.atsim_potentials: Unbreak package --- .../atsim_potentials/default.nix | 47 ++++++++++++------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/atsim_potentials/default.nix b/pkgs/development/python-modules/atsim_potentials/default.nix index b692c9009776..d77dbfa4aae2 100644 --- a/pkgs/development/python-modules/atsim_potentials/default.nix +++ b/pkgs/development/python-modules/atsim_potentials/default.nix @@ -1,49 +1,62 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , configparser , pyparsing -, pytest +, pytestCheckHook , future , openpyxl , wrapt +, scipy +, cexprtk +, deepdiff +, sympy }: buildPythonPackage rec { version = "0.4.0"; - pname = "atsim.potentials"; + pname = "atsim-potentials"; - src = fetchPypi { - inherit pname version; - sha256 = "0c3e4e2323e969880f17a9924642e0991be5761f50b254bcbadd046db3be6390"; + src = fetchFromGitHub { + owner = "mjdrushton"; + repo = pname; + rev = version; + sha256 = "sha256-MwjRVd54qa8uJOi9yRXU+Vrve50ndftJUl+TFZKVzQM="; }; - checkInputs = [ pytest ]; + postPatch = '' + # Remove conflicting openpyxl dependency version check + sed -i '/openpyxl==2.6.4/d' setup.py + ''; + propagatedBuildInputs = [ + cexprtk configparser future openpyxl pyparsing + scipy + sympy wrapt ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "wrapt==1.11.2" "wrapt~=1.11" - ''; + checkInputs = [ + deepdiff + pytestCheckHook + ]; - # tests are not included with release - doCheck = false; + disabledTests = [ + # Missing lammps executable + "eam_tabulate_example2TestCase" + "test_pymath" + ]; - checkPhase = '' - py.test - ''; + pythonImportsCheck = [ "atsim.potentials" ]; meta = with lib; { homepage = "https://github.com/mjdrushton/atsim-potentials"; description = "Provides tools for working with pair and embedded atom method potential models including tabulation routines for DL_POLY and LAMMPS"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; - broken = true; # missing cexprtk package }; } From 59174d46dbed2b9f316ecc0b93b00b8c8c6f27e9 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 11 Aug 2022 13:00:44 +0200 Subject: [PATCH 51/59] python310Packages.cexprtk: init at 0.4.0 --- .../python-modules/cexprtk/default.nix | 26 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/cexprtk/default.nix diff --git a/pkgs/development/python-modules/cexprtk/default.nix b/pkgs/development/python-modules/cexprtk/default.nix new file mode 100644 index 000000000000..e75efe1c6397 --- /dev/null +++ b/pkgs/development/python-modules/cexprtk/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchPypi +, buildPythonPackage +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "cexprtk"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-c7QXB+oXzkRveiPpNrW/HY8pMtpZx/RtDpJMVE7fY/A="; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "cexprtk" ]; + + meta = with lib; { + description = "Mathematical expression parser, cython wrapper"; + homepage = "https://github.com/mjdrushton/cexprtk"; + license = licenses.cpl10; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c286acfdc9c..191e0011c25e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1600,6 +1600,8 @@ in { censys = callPackage ../development/python-modules/censys { }; + cexprtk = callPackage ../development/python-modules/cexprtk { }; + coincurve = callPackage ../development/python-modules/coincurve { inherit (pkgs) secp256k1; }; From c7f4385e84c77917cbdd55c333996213ec452af8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Aug 2022 20:37:19 +0000 Subject: [PATCH 52/59] cosign: 1.10.1 -> 1.11.0 --- pkgs/tools/security/cosign/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix index c698fa4fa9e9..9679ebb53c40 100644 --- a/pkgs/tools/security/cosign/default.nix +++ b/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DMNjzTor22uyTzieWsni9wvscfU7uCFuf3AXOYP4LRo="; + sha256 = "sha256-fEgcxxDbSr8rVZ35MwLjT7tinQ1JuqddWRtftTjDdpY="; }; buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) @@ -16,7 +16,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorSha256 = "sha256-onRfo3ZK/+uEa0xR7P9IlEsd2aXy9foJjZl0UBO/cbs="; + vendorSha256 = "sha256-AdsXijxqpsx2Mh0xAvUoie6Oy3ywnGJ1WMg9ZBLWHgc="; subPackages = [ "cmd/cosign" From a90bd9287f6c484e20b135d8c4224a1ccbe150f9 Mon Sep 17 00:00:00 2001 From: grindhold Date: Fri, 19 Aug 2022 09:29:18 +0200 Subject: [PATCH 53/59] caroline: init at 0.3.1 (#178459) * caroline: init at 0.3.1 * Update pkgs/development/libraries/caroline/default.nix Co-authored-by: Sandro --- .../libraries/caroline/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/libraries/caroline/default.nix diff --git a/pkgs/development/libraries/caroline/default.nix b/pkgs/development/libraries/caroline/default.nix new file mode 100644 index 000000000000..6b94df2f64a1 --- /dev/null +++ b/pkgs/development/libraries/caroline/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, vala, meson, ninja, pkg-config, glib, libgee, gtk3 }: + +stdenv.mkDerivation rec { + pname = "caroline"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "dcharles525"; + repo = pname; + rev = version; + hash = "sha256-v423h9EC/h6B9VABhkvmYcyYXKPpvqhI8O7ZjbO637k"; + }; + + nativeBuildInputs = [ + vala + meson + ninja + pkg-config + ]; + + buildInputs = [ + glib + libgee + gtk3 + ]; + + meta = with lib; { + description = " A simple Cairo Chart Library for GTK and Vala"; + homepage = "https://github.com/dcharles525/Caroline"; + maintainers = with maintainers; [ grindhold ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27d6e5aa67e2..f5f43c276ef5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -327,6 +327,8 @@ with pkgs; buildMaven = callPackage ../build-support/build-maven.nix {}; + caroline = callPackage ../development/libraries/caroline { }; + castget = callPackage ../applications/networking/feedreaders/castget { }; castxml = callPackage ../development/tools/castxml { From fe5485327e503f86d0153db625549e0908a39668 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Tue, 19 Jul 2022 22:54:59 -0700 Subject: [PATCH 54/59] gpsd: fix cross-compilation Prior to this commit, builds of `pkgsCross.*.gpsd` were failing. `gpsd` expects `CCVERSION` to be set, and fails if it is not set. Scons does not guarantee that `CCVERSION` will be set, nor does it specify under what circumstances it will or will not be set: "This may or may not be set, depending on the specific C compiler being used." https://scons.org/doc/production/HTML/scons-man.html#cv-CCVERSION Apparently cross-compilation triggers one of those unspecified circumstances. There are several bug reports to scons relating to this: https://github.com/SCons/scons/issues/1723 https://github.com/SCons/scons/issues?q=is%3Aissue+ccversion+is%3Aclosed `gpsd` does not use `CCVERSION` for any purpose other than printing a log message at the start of the build: https://gitlab.com/gpsd/gpsd/-/commit/d0558636038e18d90eb886f668ff5004538f7839 This commit modifies the log message, replacing `env['CCVERSION']` with `env['CC']`, since `CC` is always set when using nixpkgs' standard builder. With this commit, `pkgsCross.mips64el-linux-gnuabi64.gpsd` and `pkgsCross.powernv.gpsd` build correctly on x86_64. Prior to this commit, they would fail with: ``` scons: Reading SConscript files ... scons version: 4.1.0 scons is running under Python version: 3.10.5.final.0 gpsd version: 3.23.1 This system is: linux KeyError: 'CCVERSION': File "/build/gpsd-3.23.1/SConstruct", line 69: SConscript('SConscript', File "/nix/store/0vmqv6f2s8bj2a50gk8g05jcb5scnifb-scons-4.1.0/lib/python3.10/site-packages/SCons/Script/SConscript.py", line 654: return method(*args, **kw) File "/nix/store/0vmqv6f2s8bj2a50gk8g05jcb5scnifb-scons-4.1.0/lib/python3.10/site-packages/SCons/Script/SConscript.py", line 591: return _SConscript(self.fs, *files, **subst_kw) File "/nix/store/0vmqv6f2s8bj2a50gk8g05jcb5scnifb-scons-4.1.0/lib/python3.10/site-packages/SCons/Script/SConscript.py", line 280: exec(compile(scriptdata, scriptname, 'exec'), call_stack[-1].globals) File "/build/gpsd-3.23.1/gpsd-3.23.1/SConscript", line 883: announce("cc is %s, version %s" % (env['CC'], env['CCVERSION'])) File "/nix/store/0vmqv6f2s8bj2a50gk8g05jcb5scnifb-scons-4.1.0/lib/python3.10/site-packages/SCons/Environment.py", line 388: return self._dict[key] ``` --- pkgs/servers/gpsd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 2bf07ff70aaa..1327ea5d7399 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -81,6 +81,7 @@ stdenv.mkDerivation rec { patchShebangs . sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConscript export TAR=noop + substituteInPlace SConscript --replace "env['CCVERSION']" "env['CC']" sconsFlags+=" udevdir=$out/lib/udev" sconsFlags+=" python_libdir=$out/lib/${python3Packages.python.libPrefix}/site-packages" From 98a92cbe17e319673a13205176e53eed79f2630e Mon Sep 17 00:00:00 2001 From: kilianar Date: Fri, 19 Aug 2022 11:26:53 +0200 Subject: [PATCH 55/59] starship: 1.10.1 -> 1.10.2 https://github.com/starship/starship/releases/tag/v1.10.2 --- pkgs/tools/misc/starship/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 608b495a8fa5..12bd663d657d 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ujv2lqhzsug9Qpco+4doMGH+0yG5cZZzLmSLr0MBmZk="; + sha256 = "sha256-RSARAcId8U5b6vH4m5Zr6FqV1OFolqC+wyfqZbJZH4w="; }; nativeBuildInputs = [ installShellFiles cmake ]; @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { --zsh <($out/bin/starship completions zsh) ''; - cargoSha256 = "sha256-iZvjU/GzC/ssXcd+UeV57IA0hKT45cQ09VBB4BNYw50="; + cargoSha256 = "sha256-UhTbrORUp+aP0SF1XjgpTunS0bpRvYxvUwEKBH7wFnQ="; preCheck = '' HOME=$TMPDIR From 329c65f7144e0259ce06452f4a8f7c7bc3604bae Mon Sep 17 00:00:00 2001 From: snaar Date: Fri, 19 Aug 2022 06:31:28 -0400 Subject: [PATCH 56/59] zerotierone: 1.10.0 -> 1.10.1 (#187297) --- pkgs/tools/networking/zerotierone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index e06d8bb2f41d..5faebe9bdadd 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -15,13 +15,13 @@ let pname = "zerotierone"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "sha256-2lxXgQArHTFCuSBbKRSaLka42p2INLDg0z3TZ+J5msc="; + sha256 = "sha256-Y0klfE7ANQl1uYMkRg+AaIiJYSVPT6zME7tDMg2xbOk="; }; in stdenv.mkDerivation { inherit pname version src; @@ -29,7 +29,7 @@ in stdenv.mkDerivation { cargoDeps = rustPlatform.fetchCargoTarball { src = "${src}/zeroidc"; name = "${pname}-${version}"; - sha256 = "sha256-Q9uBUD5xxo5gcTQTedVqQv+Z7B1TTPWtaTSuWo7WEPM="; + sha256 = "sha256-8K4zAXo85MT4pfIsg7DZAO+snfwzdo2TozVw17KhX4Q="; }; postPatch = "cp ${src}/zeroidc/Cargo.lock Cargo.lock"; From eeba9b884feb763b9352aa413383f559284d33c5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 19 Aug 2022 03:31:43 -0700 Subject: [PATCH 57/59] python310Packages.jupyterlab: 3.4.4 -> 3.4.5 (#187390) --- pkgs/development/python-modules/jupyterlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 7093f4109519..cc4888619b27 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.4.4"; + version = "3.4.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WioP3SK9hiitRbYY41IDh8MqSBjjrxEtutH2STBN/CA="; + sha256 = "sha256-Ry9reZbHX2mRWSSDwm2f4gWlmnHMvOFYQkABVdxk9Zs="; }; nativeBuildInputs = [ From f6a079f3f87652afcbd531ef9da087af6ba1d7a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Aug 2022 05:13:14 +0000 Subject: [PATCH 58/59] prometheus-postgres-exporter: 0.11.0 -> 0.11.1 --- pkgs/servers/monitoring/prometheus/postgres-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index 4d382360614a..aeca7c90eb9a 100644 --- a/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "postgres_exporter"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "postgres_exporter"; rev = "v${version}"; - sha256 = "sha256-XrCO77R/rfkhSvebMjYwhe8JJ/Ley4VrXMqi5jax86k="; + sha256 = "sha256-Bi24tg/ukFLmSbhAY3gZqT7qc0xWwLlLQxGB6F+qiUQ="; }; vendorSha256 = "sha256-ocapAJAQD84zISbTduAf3QyjaZ0UroNMdQig6IBNDpw="; From 11d8a148a10a54322df21431a861908c805342b0 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Sat, 15 Jan 2022 07:33:42 +1000 Subject: [PATCH 59/59] obs-backgroundremoval: init at 0.4.0 --- .../video/obs-studio/plugins/default.nix | 1 + .../obs-backgroundremoval-includes.patch | 36 +++++++++++++++ .../plugins/obs-backgroundremoval.nix | 45 +++++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval-includes.patch create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval.nix diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 9b46ae4de357..3d547b4c2dd4 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -11,4 +11,5 @@ obs-nvfbc = callPackage ./obs-nvfbc.nix {}; obs-pipewire-audio-capture = callPackage ./obs-pipewire-audio-capture.nix {}; obs-vkcapture = callPackage ./obs-vkcapture.nix {}; + obs-backgroundremoval = callPackage ./obs-backgroundremoval.nix {}; } diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval-includes.patch b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval-includes.patch new file mode 100644 index 000000000000..2a1b59a6b128 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval-includes.patch @@ -0,0 +1,36 @@ +diff --git a/src/Model.h b/src/Model.h +index 5c21eae..74b8078 100644 +--- a/src/Model.h ++++ b/src/Model.h +@@ -1,13 +1,8 @@ + #ifndef MODEL_H + #define MODEL_H + +-#if defined(__APPLE__) + #include + #include +-#else +-#include +-#include +-#endif + #ifdef _WIN32 + #ifdef WITH_CUDA + #include +diff --git a/src/background-filter.cpp b/src/background-filter.cpp +index 9fa5794..5d66aee 100644 +--- a/src/background-filter.cpp ++++ b/src/background-filter.cpp +@@ -1,13 +1,8 @@ + #include + #include + +-#if defined(__APPLE__) + #include + #include +-#else +-#include +-#include +-#endif + #ifdef _WIN32 + #ifdef WITH_CUDA + #include diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval.nix b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval.nix new file mode 100644 index 000000000000..6175a48a1b96 --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, obs-studio +, onnxruntime +, opencv +}: + +stdenv.mkDerivation rec { + pname = "obs-backgroundremoval"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "royshil"; + repo = "obs-backgroundremoval"; + rev = "v${version}"; + sha256 = "sha256-TI1FlhE0+JL50gAZCSsI+g8savX8GRQkH3jYli/66hQ="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio onnxruntime opencv ]; + + dontWrapQtApps = true; + + cmakeFlags = [ + "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs" + "-DOnnxruntime_INCLUDE_DIRS=${onnxruntime.dev}/include/onnxruntime/core/session" + ]; + + patches = [ ./obs-backgroundremoval-includes.patch ]; + + prePatch = '' + sed -i 's/version_from_git()/set(VERSION "${version}")/' CMakeLists.txt + ''; + + meta = with lib; { + description = "OBS plugin to replace the background in portrait images and video"; + homepage = "https://github.com/royshil/obs-backgroundremoval"; + maintainers = with maintainers; [ puffnfresh ]; + license = licenses.mit; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +}