From 48619f77a4b2c02ebc964a3b7afd7341c65dda11 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sun, 8 Aug 2021 12:00:00 +0000 Subject: [PATCH 001/103] nixos/tt-rss: make all php files read only Fixes: #55300 --- nixos/modules/services/web-apps/tt-rss.nix | 70 +++++++++++----------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index ed13845915c4..bc18c824f394 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -6,10 +6,6 @@ let configVersion = 26; - cacheDir = "cache"; - lockDir = "lock"; - feedIconsDir = "feed-icons"; - dbPort = if cfg.database.port == null then (if cfg.database.type == "pgsql" then 5432 else 3306) else cfg.database.port; @@ -32,10 +28,10 @@ let 0 from pg_tables where tableowner = user"} \ | tail -n+3 | head -n-2 | sed -e 's/[ \n\t]*//') @@ -639,7 +641,7 @@ let serviceConfig = { User = "${cfg.user}"; Group = "tt_rss"; - ExecStart = "${pkgs.php}/bin/php ${cfg.root}/update.php --daemon --quiet"; + ExecStart = "${pkgs.php}/bin/php ${cfg.root}/www/update.php --daemon --quiet"; Restart = "on-failure"; RestartSec = "60"; SyslogIdentifier = "tt-rss"; From 94d837e3cbad9fdb230463c010e40f97adf0e655 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 05:42:44 +0000 Subject: [PATCH 002/103] go-tools: 2021.1 -> 2021.1.1 --- pkgs/development/tools/go-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index 69059578e273..38ed470cbe90 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "go-tools"; - version = "2021.1"; + version = "2021.1.1"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "sha256-QhTjzrERhbhCSkPzyLQwFyxrktNoGL9ris+XfE7n5nQ="; + sha256 = "sha256-Vj5C+PIzZUSD16U4KFO3jR/Gq11P8v3my5eODWb//4c="; }; vendorSha256 = "sha256-EjCOMdeJ0whp2pHZvm4VV2K78UNKzl98Z/cQvGhWSyY="; From 0798ed1abf5ccf993111696601c946d363c0db0c Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 3 Aug 2021 10:44:20 -0400 Subject: [PATCH 003/103] nixos/nzbget: add settings option --- nixos/modules/services/misc/nzbget.nix | 54 +++++++++++++++++--------- nixos/tests/nzbget.nix | 18 ++++++++- 2 files changed, 53 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/misc/nzbget.nix b/nixos/modules/services/misc/nzbget.nix index 715ec891cd68..27c5f2e395f6 100644 --- a/nixos/modules/services/misc/nzbget.nix +++ b/nixos/modules/services/misc/nzbget.nix @@ -7,24 +7,12 @@ let pkg = pkgs.nzbget; stateDir = "/var/lib/nzbget"; configFile = "${stateDir}/nzbget.conf"; - configOpts = concatStringsSep " " (mapAttrsToList (name: value: "-o ${name}=${value}") nixosOpts); - - nixosOpts = { - # allows nzbget to run as a "simple" service - OutputMode = "loggable"; - # use journald for logging - WriteLog = "none"; - ErrorTarget = "screen"; - WarningTarget = "screen"; - InfoTarget = "screen"; - DetailTarget = "screen"; - # required paths - ConfigTemplate = "${pkg}/share/nzbget/nzbget.conf"; - WebDir = "${pkg}/share/nzbget/webui"; - # nixos handles package updates - UpdateCheck = "none"; - }; - + configOpts = concatStringsSep " " (mapAttrsToList (name: value: "-o ${name}=${escapeShellArg (toStr value)}") cfg.settings); + toStr = v: + if v == true then "yes" + else if v == false then "no" + else if isInt v then toString v + else v; in { imports = [ @@ -50,12 +38,41 @@ in default = "nzbget"; description = "Group under which NZBGet runs"; }; + + settings = mkOption { + type = with types; attrsOf (oneOf [ bool int str ]); + default = {}; + description = '' + NZBGet configuration, passed via command line using switch -o. Refer to + + for details on supported values. + ''; + example = { + MainDir = "/data"; + }; + }; }; }; # implementation config = mkIf cfg.enable { + services.nzbget.settings = { + # allows nzbget to run as a "simple" service + OutputMode = "loggable"; + # use journald for logging + WriteLog = "none"; + ErrorTarget = "screen"; + WarningTarget = "screen"; + InfoTarget = "screen"; + DetailTarget = "screen"; + # required paths + ConfigTemplate = "${pkg}/share/nzbget/nzbget.conf"; + WebDir = "${pkg}/share/nzbget/webui"; + # nixos handles package updates + UpdateCheck = "none"; + }; + systemd.services.nzbget = { description = "NZBGet Daemon"; after = [ "network.target" ]; @@ -64,6 +81,7 @@ in unrar p7zip ]; + preStart = '' if [ ! -f ${configFile} ]; then ${pkgs.coreutils}/bin/install -m 0700 ${pkg}/share/nzbget/nzbget.conf ${configFile} diff --git a/nixos/tests/nzbget.nix b/nixos/tests/nzbget.nix index d6111ba079c8..fe5a4bc3df91 100644 --- a/nixos/tests/nzbget.nix +++ b/nixos/tests/nzbget.nix @@ -8,13 +8,21 @@ import ./make-test-python.nix ({ pkgs, ...} : { server = { ... }: { services.nzbget.enable = true; + # provide some test settings + services.nzbget.settings = { + "MainDir" = "/var/lib/nzbget"; + "DirectRename" = true; + "DiskSpace" = 0; + "Server1.Name" = "this is a test"; + }; + # hack, don't add (unfree) unrar to nzbget's path, # so we can run this test in CI systemd.services.nzbget.path = pkgs.lib.mkForce [ pkgs.p7zip ]; }; }; - testScript = '' + testScript = { nodes, ... }: '' start_all() server.wait_for_unit("nzbget.service") @@ -26,5 +34,13 @@ import ./make-test-python.nix ({ pkgs, ...} : { server.succeed( "${pkgs.nzbget}/bin/nzbget -n -o Control_iP=127.0.0.1 -o Control_port=6789 -o Control_password=tegbzn6789 -V" ) + + config = server.succeed("${nodes.server.config.systemd.services.nzbget.serviceConfig.ExecStart} --printconfig") + + # confirm the test settings are applied + assert 'MainDir = "/var/lib/nzbget"' in config + assert 'DirectRename = "yes"' in config + assert 'DiskSpace = "0"' in config + assert 'Server1.Name = "this is a test"' in config ''; }) From d5b697b1a47a46caa9b815d5bbe86f1febf147d6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 23:11:35 +0000 Subject: [PATCH 004/103] sentry-cli: 1.66.0 -> 1.68.0 --- 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 884c0edfb735..25a9d60bd8cb 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -12,13 +12,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "1.66.0"; + version = "1.68.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-ivQBn5GGb64Jq0gpywAg20309QQMpasg/Bu5sHKj02Y="; + sha256 = "sha256-JhKRfeAaSs4KwfcI88UbqIXNw0aZytPkIxkwrg1d2xM="; }; doCheck = false; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl file rpm ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-xS88KZWYkg3v8TJZUVVgQhR++CrZGD0DQnLPktSUJQk="; + cargoSha256 = "sha256-iV3D4ka8Sg1FMRne3A6npmZm3hFP9Qi/NdmT62BtO+8="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; From c149e8f22af796980e663bb575e8a6261b01f8bd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 08:38:34 +0000 Subject: [PATCH 005/103] python38Packages.elasticsearch-dsl: 7.3.0 -> 7.4.0 --- pkgs/development/python-modules/elasticsearch-dsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index a2f2ff038db0..5f55a3ac4733 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "elasticsearch-dsl"; - version = "7.3.0"; + version = "7.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0ed75f6ff037e36b2397a8e92cae0ddde79b83adc70a154b8946064cb62f7301"; + sha256 = "c4a7b93882918a413b63bed54018a1685d7410ffd8facbc860ee7fd57f214a6d"; }; propagatedBuildInputs = [ elasticsearch python-dateutil six ] From c4ba197a55620178c21951f498d4cf67fb76c091 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Fri, 20 Aug 2021 12:09:11 -0400 Subject: [PATCH 006/103] nzbget: add nixos test to passthru.tests --- pkgs/tools/networking/nzbget/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 375896258bc7..b7c3436d6096 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, libxml2, ncurses, libsigcxx, libpar2 -, gnutls, libgcrypt, zlib, openssl }: +, gnutls, libgcrypt, zlib, openssl, nixosTests }: stdenv.mkDerivation rec { pname = "nzbget"; @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { inherit (nixosTests) nzbget; }; + meta = with lib; { homepage = "https://nzbget.net"; license = licenses.gpl2Plus; From c326a3f39f0ddbde7de1d9bc20b167444e6d392a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 06:37:45 +0000 Subject: [PATCH 007/103] stripe-cli: 1.5.12 -> 1.7.0 --- pkgs/tools/admin/stripe-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix index 13620d164e67..d812cd4b294f 100644 --- a/pkgs/tools/admin/stripe-cli/default.nix +++ b/pkgs/tools/admin/stripe-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.5.12"; + version = "1.7.0"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eMxukwaJqsXL0+Euvk5mM+pcAsT3GsF9filuyRL4tXg="; + sha256 = "sha256-CO+2BpMIUSaOhdia75zDGR4RZQSaxY05Z6TOKxBlKIw="; }; - vendorSha256 = "sha256-e7EZ5o30vDpS904/R1y7/Mds7HxQNmsIftrnc1Bj2bc="; + vendorSha256 = "sha256-LOSHoEP0YRjfHav3MXSYPPrrjX6/ItxeVMOihRx0DTQ="; subPackages = [ "cmd/stripe" From 1ecaf6d1619fb14be3c630c12328a383507ad50b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 07:12:15 +0000 Subject: [PATCH 008/103] joker: 0.17.1 -> 0.17.2 --- pkgs/development/interpreters/joker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 8a2130050bfa..652e828eb5f4 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "joker"; - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "sha256-3OimYXcQ3KPav44sClbC60220/YK4Jhq+l5UfRFYoJI="; + sha256 = "sha256-rboyRancRTyrSY+13Blrz7OsIzclDS4X4hkHGD6cpyk="; }; vendorSha256 = "sha256-AYoespfzFLP/jIIxbw5K653wc7sSfLY8K7di8GZ64wA="; From 701cce0f84445fbe41d79a97b941338294c5dc4f Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 24 Aug 2021 13:59:00 +0100 Subject: [PATCH 009/103] buf: 0.51.1 -> 0.52.0 --- pkgs/development/tools/buf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index f3271b0563df..8bc4aee935b9 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -9,15 +9,15 @@ buildGoModule rec { pname = "buf"; - version = "0.51.1"; + version = "0.52.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iFSmanP+2PgmOXtubDdLfa+AIQSAWHFNpyB1IP6IF5I="; + sha256 = "sha256-WFL+ztFR8kV6cRY1Ax2TheH+xpA58CLnW69jDpMhe3M="; }; - vendorSha256 = "sha256-0rVHINb04GZlH6DSjMt/h7UdNtZJERAyO1S99rAxUyY="; + vendorSha256 = "sha256-vbphThpEYDDm1iipcY0QXhKKuLSD87sAxiIUi7SfrAc="; patches = [ # Skip a test that requires networking to be available to work. From a8ee46597c6caa9eb1ba1703151eb390052bf083 Mon Sep 17 00:00:00 2001 From: Mica Semrick Date: Tue, 24 Aug 2021 20:43:02 -0700 Subject: [PATCH 010/103] wlc: 1.11 -> 1.12 --- pkgs/tools/misc/wlc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/wlc/default.nix b/pkgs/tools/misc/wlc/default.nix index 874e31ca6ef1..dd7c5f7942f8 100644 --- a/pkgs/tools/misc/wlc/default.nix +++ b/pkgs/tools/misc/wlc/default.nix @@ -6,11 +6,11 @@ with python3.pkgs; buildPythonPackage rec { pname = "wlc"; - version = "1.11"; + version = "1.12"; src = fetchPypi { inherit pname version; - sha256 = "sha256:0ysx250v2qycy1m3jj0wxmyf2f5n8fxf6br69vcbyq2cnqw609nx"; + sha256 = "sha256:01c1qxq6dxvpn8rgpbqs4iw5daa0rmlgygb3xhhfj7xpqv1v84ir"; }; propagatedBuildInputs = [ From b0483dff7550760e072f760d4053310cca6723f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 08:10:08 +0000 Subject: [PATCH 011/103] libquotient: 0.6.7 -> 0.6.8 --- pkgs/development/libraries/libquotient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index 7c89e98576af..6264a9de3691 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libquotient"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; rev = version; - sha256 = "sha256-fAzYv9OsanXqocEvbSB3OA9OVicwcZ0xT9uYbrFPEHc="; + sha256 = "sha256-CrAK0yq1upB1+C2z6mqKkSArCmzI+TDEEHTIBWB29Go="; }; buildInputs = [ qtbase qtmultimedia ]; From d90ad10b3b069a030d21005972a4ea42c37ec925 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 02:09:58 +0000 Subject: [PATCH 012/103] cjson: 1.7.14 -> 1.7.15 --- pkgs/development/libraries/cjson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cjson/default.nix b/pkgs/development/libraries/cjson/default.nix index b75b91508cbe..ccf3311317aa 100644 --- a/pkgs/development/libraries/cjson/default.nix +++ b/pkgs/development/libraries/cjson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cjson"; - version = "1.7.14"; + version = "1.7.15"; src = fetchFromGitHub { owner = "DaveGamble"; repo = "cJSON"; rev = "v${version}"; - sha256 = "1a3i9ydl65dgwgmlg79n5q8qilmjkaakq56sam1w25zcrd8jy11q"; + sha256 = "sha256-PpUVsLklcs5hCCsQcsXw0oEVIWecKnQO16Hy0Ba8ov8="; }; nativeBuildInputs = [ cmake ]; From e86c9d40de11d516c7dcab9327920e7988a64b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 25 Aug 2021 19:15:37 -0700 Subject: [PATCH 013/103] deltachat-desktop: use libdeltachat 1.56.0 --- .../deltachat-desktop/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index a4f3a2212432..41c7470a26d9 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -8,11 +8,26 @@ , makeWrapper , nodePackages , pkg-config +, rustPlatform , stdenv , CoreServices }: let + libdeltachat' = libdeltachat.overrideAttrs (old: rec { + version = "1.56.0"; + src = fetchFromGitHub { + owner = "deltachat"; + repo = "deltachat-core-rust"; + rev = version; + sha256 = "07vcwbvpzcnvpls0hmpapi7v1npca8ydbx2i235k26xym8il89b7"; + }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${old.pname}-${version}"; + sha256 = "0pb1rcv45xa95ziqap94yy52fy02vh401iqsgi18nm1j6iyyngc8"; + }; + }); electronExec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else @@ -37,7 +52,7 @@ in nodePackages.deltachat-desktop.override rec { ]; buildInputs = [ - libdeltachat + libdeltachat' ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; From 448983cc4d2a6a720d11b60775093ba3d5b7af0c Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 25 Aug 2021 22:29:33 -0400 Subject: [PATCH 014/103] genact: init at 0.11.0 --- pkgs/applications/misc/genact/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/misc/genact/default.nix diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/applications/misc/genact/default.nix new file mode 100644 index 000000000000..44e4bd2a0b38 --- /dev/null +++ b/pkgs/applications/misc/genact/default.nix @@ -0,0 +1,22 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "genact"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "svenstaro"; + repo = pname; + rev = "v${version}"; + sha256 = "1hc4jwk5rr1yw3pfvriash7b03j181k8c9y7m3sglkk8xnff219c"; + }; + + cargoSha256 = "0a5ic6c7fvmg2kh3qprzffnpw40cmrgbscrlhxxs3m7nxfjdh7bc"; + + meta = with lib; { + description = "A nonsense activity generator"; + homepage = "https://github.com/svenstaro/genact"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afae38acb69b..1663b0e186ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24314,6 +24314,8 @@ with pkgs; geany = callPackage ../applications/editors/geany { }; geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { }; + genact = callPackage ../applications/misc/genact { }; + genxword = callPackage ../applications/misc/genxword { }; geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { }; From 50968f23415a656a127502a55aaa732ed585f99a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 25 Aug 2021 19:32:08 -0700 Subject: [PATCH 015/103] libdeltachat: 1.56.0 -> 1.59.0 https://github.com/deltachat/deltachat-core-rust/blob/1.59.0/CHANGELOG.md --- pkgs/development/libraries/libdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 6a0a6ae5c874..c61636bfb95f 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.56.0"; + version = "1.59.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - sha256 = "sha256-ZyVEI6q+GzHLEFH01TxS7NqwT7zqVgg0vduyf/fibB8="; + sha256 = "1lwck5gb2kys7wxg08q3pnb8cqhzwwqy6nxcf2yc030gmnwm4sya"; }; patches = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "0pb1rcv45xa95ziqap94yy52fy02vh401iqsgi18nm1j6iyyngc8"; + sha256 = "13zzc8c50cy6fknrxzw5gf6rcclsn5bcb2bi3z9mmzsl29ga32gx"; }; nativeBuildInputs = [ From cd0fa6156f486c583988d334202946ffa4b9ebe8 Mon Sep 17 00:00:00 2001 From: urlordjames Date: Thu, 26 Aug 2021 00:05:13 -0400 Subject: [PATCH 016/103] drogon: 1.7.1 -> 1.7.2 --- pkgs/development/libraries/drogon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/drogon/default.nix b/pkgs/development/libraries/drogon/default.nix index 2b418ee4c6a9..f669d663379e 100644 --- a/pkgs/development/libraries/drogon/default.nix +++ b/pkgs/development/libraries/drogon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "drogon"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "drogonframework"; repo = "drogon"; rev = "v${version}"; - sha256 = "0rhwbz3m5x3vy5zllfs8r347wqprg29pff5q7i53f25bh8y0n49i"; + sha256 = "0g2fm8xb2gi7qaib6mxvg6k6y4g2d0a2jg4k5qvsjbd0n7j8746j"; fetchSubmodules = true; }; From d1d6f694677e2b56f223aea37be56d2b51607e42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 05:56:56 +0000 Subject: [PATCH 017/103] goreleaser: 0.175.0 -> 0.176.0 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 35fc8343b5a1..ccc248dea6b5 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.175.0"; + version = "0.176.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4mdQTcaIIGNZ0pgVNfy3LBtc1te2dpkMA29nAUzg9aE="; + sha256 = "sha256-7xqzt/QJOkZLVY3MbBf7QYBrEgO500ft6ahvngaw9rs="; }; - vendorSha256 = "sha256-7I/955dPHV8Rkp6VevkebkZaNtSlbzIsGc8qFjtcMXk="; + vendorSha256 = "sha256-xdK98JWfxvufewcXiMjo6hslFrCbmWrgTAwJM7f00n4="; buildFlagsArray = [ "-ldflags=" From b0d9437ce506034946e539a8892d49893b6895c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 13:27:14 +0000 Subject: [PATCH 018/103] sensu-go-backend: 6.2.7 -> 6.4.1 --- pkgs/servers/monitoring/sensu-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index 881d677b3e59..f2799385b6f1 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -4,19 +4,19 @@ let generic = { subPackages, pname, postInstall ? "" }: buildGoModule rec { inherit pname; - version = "6.2.7"; + version = "6.4.1"; shortRev = "3a1ac58"; # for internal version info src = fetchFromGitHub { owner = "sensu"; repo = "sensu-go"; rev = "v${version}"; - sha256 = "sha256-JPX7MfxdlI6jLHVybAR4xtd/IiVGDrhrYUSlXohhpGc="; + sha256 = "sha256-tVmjBfRvQQ1+VtARP1lN8Fu06tujZhZj9IpGVF0mKqA="; }; inherit subPackages postInstall; - vendorSha256 = "sha256-bGQADjT9SMxZnWb3k7wVSsF7VWWuESBL/VDG76vj+Tk="; + vendorSha256 = "sha256-fStGEKAR9fzA6Uom6r59jFGTBUfTTj0TzytoJWuicbU="; doCheck = false; From 41564319a1ee3b2a0ff009c4fe5d300d621e0f9a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Aug 2021 03:26:46 +0000 Subject: [PATCH 019/103] python38Packages.dropbox: 11.16.0 -> 11.18.0 --- pkgs/development/python-modules/dropbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 73b0b87b0108..7406e6dc21b3 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.16.0"; + version = "11.18.0"; src = fetchPypi { inherit pname version; - sha256 = "99e84367d5b983815a3680eea2c7e67bff14637c4702010c5c58611eb714dfe2"; + sha256 = "fa512c87521809e93502fc6a27b1d57ffbcef2281468c8f93575eab6a9ad5f05"; }; postPatch = '' From 6e3451a6a8219ded3f124fc1a7d9e63cdc70d28e Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 27 Aug 2021 09:45:06 +0200 Subject: [PATCH 020/103] mu: 1.6.4 -> 1.6.5 --- pkgs/tools/networking/mu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 694c1f5e721f..fe1e8e7da736 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "rRBi6bgxkVQ94wLBqVQikIE0jVkvm1fjtEzFMsQTJz8="; + sha256 = "ZHEUJiEJzQzSwWgY07dDflY5GRiD1We435htY/7IOdQ="; }; postPatch = lib.optionalString (batchSize != null) '' From e4591b39178324c7881239904bb45b99ee3536c2 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 27 Aug 2021 09:46:59 +0200 Subject: [PATCH 021/103] mu: add chvp as maintainer --- pkgs/tools/networking/mu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index fe1e8e7da736..db8f9bdb9d1a 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; homepage = "https://www.djcbsoftware.nl/code/mu/"; changelog = "https://github.com/djcb/mu/releases/tag/${version}"; - maintainers = with maintainers; [ antono peterhoeg ]; + maintainers = with maintainers; [ antono chvp peterhoeg ]; platforms = platforms.mesaPlatforms; }; } From bae65a3c06ae03c17edc91be35bfbf067d27ed23 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 27 Aug 2021 11:41:30 +0200 Subject: [PATCH 022/103] nixos/mautrix-telegram: loosen umask to keep `config.json` writable This is needed because `mautrix-telegram --generate-registration` appears to need write-access to `config.json` as well. Closes #135884 --- nixos/modules/services/misc/mautrix-telegram.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/mautrix-telegram.nix b/nixos/modules/services/misc/mautrix-telegram.nix index 0ae5797fea04..717cf7936ead 100644 --- a/nixos/modules/services/misc/mautrix-telegram.nix +++ b/nixos/modules/services/misc/mautrix-telegram.nix @@ -128,7 +128,7 @@ in { # https://github.com/tulir/mautrix-telegram/issues/584 [ -f ${settingsFile} ] && rm -f ${settingsFile} old_umask=$(umask) - umask 0277 + umask 0177 ${pkgs.envsubst}/bin/envsubst \ -o ${settingsFile} \ -i ${settingsFileUnsubstituted} From eaeb4fe04ee5a5ffae4f7dc03d3f072d59d80337 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 27 Aug 2021 20:21:25 +0200 Subject: [PATCH 023/103] nixos/nextcloud: remove invalid `--database-table-prefix` option This doesn't work anymore and thus breaks the installation leaving a broken `/var/lib/nextcloud`. It isn't a big deal since we set this value in the override config before, so the correct table-prefix is still used. In order to confirm that, I decided to add a custom prefix to the basic test. --- nixos/modules/services/web-apps/nextcloud.nix | 2 -- nixos/tests/nextcloud/basic.nix | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 5e15aaba0966..ba5f6582cbec 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -502,8 +502,6 @@ in { ${if c.dbport != null then "--database-port" else null} = ''"${toString c.dbport}"''; ${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"''; "--database-pass" = dbpass; - ${if c.dbtableprefix != null - then "--database-table-prefix" else null} = ''"${toString c.dbtableprefix}"''; "--admin-user" = ''"${c.adminuser}"''; "--admin-pass" = adminpass; "--data-dir" = ''"${cfg.home}/data"''; diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index 76f7f68dc960..c4ce34748ace 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -37,6 +37,7 @@ in { config = { # Don't inherit adminuser since "root" is supposed to be the default inherit adminpass; + dbtableprefix = "nixos_"; }; autoUpdateApps = { enable = true; From 6642509bac4ca9d85f9c6a9fe0f41379e2dbc24b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 27 Aug 2021 22:18:04 +0000 Subject: [PATCH 024/103] stm32flash: 0.5 -> 0.6 --- pkgs/development/embedded/stm32/stm32flash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/embedded/stm32/stm32flash/default.nix b/pkgs/development/embedded/stm32/stm32flash/default.nix index bc33d417f885..52b301154993 100644 --- a/pkgs/development/embedded/stm32/stm32flash/default.nix +++ b/pkgs/development/embedded/stm32/stm32flash/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "stm32flash"; - version = "0.5"; + version = "0.6"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "01p396daqw3zh6nijffbfbwyqza33bi2k4q3m5yjzs02xwi99alp"; + sha256 = "sha256-7ptA1NPlzSi5k+CK4qLDxVm2vqhzDNfh1Acn3tsd2gk="; }; buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; From 0a7137a2dfe05ba080381fb8e4f311b43c534a01 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 28 Aug 2021 00:04:20 +0000 Subject: [PATCH 025/103] yt-dlp: use PyPI tarball --- pkgs/tools/misc/yt-dlp/default.nix | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 17d75fa4935d..ac6d841c725b 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -1,12 +1,11 @@ -{ lib, buildPythonPackage -, zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc -, fetchFromGitHub +{ lib, buildPythonPackage, fetchPypi +, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome , websockets, mutagen , ffmpegSupport ? true , rtmpSupport ? true , phantomjsSupport ? false , hlsEncryptedSupport ? true -, installShellFiles, makeWrapper }: +}: buildPythonPackage rec { pname = "yt-dlp"; @@ -15,15 +14,18 @@ buildPythonPackage rec { # to the latest stable release. version = "2021.08.10"; - src = fetchFromGitHub { - owner = "yt-dlp"; - repo = "yt-dlp"; - rev = version; - sha256 = "sha256-8mOjIvbC3AFHCXKV5G66cFy7SM7sULzM8czXcqQKbms="; + src = fetchPypi { + inherit pname; + version = builtins.replaceStrings [ ".0" ] [ "." ] version; + sha256 = "8da1bf4dc4641d37d137443c4783109ee8393caad5e0d270d9d1d534e8f25240"; }; - nativeBuildInputs = [ installShellFiles makeWrapper ]; - buildInputs = [ zip pandoc ]; + # build_lazy_extractors assumes this directory exists but it is not present in + # the PyPI package + postPatch = '' + mkdir -p ytdlp_plugins/extractor + ''; + propagatedBuildInputs = [ websockets mutagen ] ++ lib.optional hlsEncryptedSupport pycryptodome; @@ -48,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/yt-dlp/yt-dlp/"; description = "Command-line tool to download videos from YouTube.com and other sites (youtube-dl fork)"; + changelog = "https://github.com/yt-dlp/yt-dlp/raw/${version}/Changelog.md"; longDescription = '' yt-dlp is a youtube-dl fork based on the now inactive youtube-dlc. @@ -56,7 +59,7 @@ buildPythonPackage rec { youtube-dl is released to the public domain, which means you can modify it, redistribute it or use it however you like. ''; - license = licenses.publicDomain; + license = licenses.unlicense; maintainers = with maintainers; [ mkg20001 ]; }; } From 081d39eee2a7a497069512857cc200384515cc5e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 28 Aug 2021 00:04:20 +0000 Subject: [PATCH 026/103] ncspot: 0.8.1 -> 0.8.2 https://github.com/hrkfdn/ncspot/releases/tag/v0.8.2 --- pkgs/applications/audio/ncspot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index a2209368518d..012315a7d723 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "0sgnd6n8j8lygmb9qvv6i2ir28fdsrpmzlviz7d0gbx684qj0zkc"; + sha256 = "1rs1jy7zzfgqzr64ld8whn0wlw8n7rk1svxx0xfxm3ynmgc7sd68"; }; - cargoSha256 = "0piipqf5y5bczbwkaplv6niqh3rp2di1gn7wwpd0gaa2cw7ylbb1"; + cargoSha256 = "10g7gdi1iz751wa60vr4fs0cvfsgs3pfcp8pnywicl0vsdp25fmc"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; From 1d9b5a62e01fad75e5473aea3d86c506ba6c59ba Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 28 Aug 2021 00:04:20 +0000 Subject: [PATCH 027/103] elvish: 0.16.1 -> 0.16.3 --- pkgs/shells/elvish/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 0916c9b25b59..961f765dd872 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "elvish"; - version = "0.16.1"; + version = "0.16.3"; excludedPackages = [ "website" ]; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "elves"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i7RJiR1Mta2TrWBSUk0WM3InMV2cwbdlp3KHUdZgQ8I="; + sha256 = "1na2fswqp4rbgvlagz9nj3cmlxavlhi2gj6k6jpjq05mcbkxr3bd"; }; - vendorSha256 = "sha256-5tZwGrp/L9L+pf/yp8zlbb0voe60+if+NNf8ua2MujI="; + vendorSha256 = "06rx09vs08d9arim53al73z22hb40xj2101kbvafz6wbyp6pqws1"; doCheck = false; @@ -29,7 +29,6 @@ buildGoModule rec { homepage = "https://elv.sh/"; license = licenses.bsd2; maintainers = with maintainers; [ vrthra AndersonTorres ]; - platforms = with platforms; linux ++ darwin; }; passthru = { From 7a9526d433c35e515b7692904f51a3e733842374 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 28 Aug 2021 00:04:20 +0000 Subject: [PATCH 028/103] sentry-cli: fix build on Darwin --- pkgs/development/tools/sentry-cli/default.nix | 11 ++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index 25a9d60bd8cb..32f362a834b8 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -2,13 +2,10 @@ , fetchFromGitHub , lib , openssl -, file -, rpm , pkg-config , stdenv -, curl , Security -, runCommand +, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; @@ -25,7 +22,7 @@ rustPlatform.buildRustPackage rec { # Needed to get openssl-sys to use pkgconfig. OPENSSL_NO_VENDOR = 1; - buildInputs = [ openssl file rpm ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; cargoSha256 = "sha256-iV3D4ka8Sg1FMRne3A6npmZm3hFP9Qi/NdmT62BtO+8="; @@ -33,8 +30,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { homepage = "https://docs.sentry.io/cli/"; license = licenses.bsd3; - description = "A command line utility to work with Sentry."; + description = "A command line utility to work with Sentry"; + changelog = "https://github.com/getsentry/sentry-cli/raw/${version}/CHANGELOG.md"; maintainers = with maintainers; [ rizary ]; - platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c22f05c298e..c63049c8b352 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9883,7 +9883,7 @@ with pkgs; }; sentry-cli = callPackage ../development/tools/sentry-cli { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; sentry-native = callPackage ../development/libraries/sentry-native { }; From a54208d9afe8496b77f31e1f7d7b11ae9775f46f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 28 Aug 2021 00:04:20 +0000 Subject: [PATCH 029/103] gopass: 1.12.7 -> 1.12.8 https://github.com/gopasspw/gopass/releases/tag/v1.12.8 --- pkgs/tools/security/gopass/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 9e56b4c1a4bb..6a099299e905 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.12.7"; + version = "1.12.8"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "08mzm03vhc8pqyl17y8dkrcpgy3ckmb84x84b6ap3cja3y8gmj5x"; + sha256 = "0f3nnhipx2p8w04rxva0pcf7g1nhr4f5bz5dbvr2m76lkiaz5q3v"; }; - vendorSha256 = "0ym6f1h51bj3qlzxs936fz3p47l63nad4xckl16m13iy0k7z5flg"; + vendorSha256 = "14khs15k9d5m5dms3l4a5bi0s3zl1irm0i4s9pf86gpyz7b55l6a"; subPackages = [ "." ]; @@ -60,7 +60,7 @@ buildGoModule rec { homepage = "https://www.gopass.pw/"; license = licenses.mit; maintainers = with maintainers; [ andir rvolosatovs ]; - changelog = "https://github.com/gopasspw/gopass/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/gopasspw/gopass/raw/v${version}/CHANGELOG.md"; longDescription = '' gopass is a rewrite of the pass password manager in Go with the aim of From 4ca57d8219b4ffca43a5b0f1ed2e957cc7c03dc9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Aug 2021 00:15:09 +0000 Subject: [PATCH 030/103] scid-vs-pc: 4.21 -> 4.22 --- pkgs/games/scid-vs-pc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix index 9d3cdeb02e93..e6fb00eb76cf 100644 --- a/pkgs/games/scid-vs-pc/default.nix +++ b/pkgs/games/scid-vs-pc/default.nix @@ -2,11 +2,11 @@ tcl.mkTclDerivation rec { pname = "scid-vs-pc"; - version = "4.21"; + version = "4.22"; src = fetchurl { url = "mirror://sourceforge/scidvspc/scid_vs_pc-${version}.tgz"; - sha256 = "1lsm5s2hlhqbmwm6f38jlg2kc4j6lwp86lg6z3w6nc3jibzgvsay"; + sha256 = "sha256-PSHDPrfhJI/DyEVQLo8Ckargqf/iUG5PgvUbO/4WNJM="; }; nativeBuildInputs = [ makeWrapper ]; From ff3aa121fdcb16c29374a924714f03e32f56181d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Aug 2021 00:22:39 +0000 Subject: [PATCH 031/103] simgear: 2020.3.8 -> 2020.3.11 --- pkgs/development/libraries/simgear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index b5df83a0b90c..6167d63544f4 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -4,7 +4,7 @@ , curl }: let - version = "2020.3.8"; + version = "2020.3.11"; shortVersion = builtins.substring 0 6 version; in stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/flightgear/release-${shortVersion}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-UXcWV9MPu7c+QlFjrhxtQ6ruAcxuKtewwphu4tt5dWc="; + sha256 = "sha256-u438vCo7AUPR/88B0alh5WbvId0z2cx2jW2apYcdTzw="; }; nativeBuildInputs = [ cmake ]; From f8f60445d97a3d510192559fe03fbd2190fed4ca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Aug 2021 02:05:31 +0000 Subject: [PATCH 032/103] cloudflared: 2021.8.3 -> 2021.8.6 --- pkgs/applications/networking/cloudflared/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 617d84e43db6..ffdd8b7ed040 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.8.3"; + version = "2021.8.6"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-gipLjABvJ1QK98uX7Gl6feHXUei95yHlSNkqlQ7pVg4="; + sha256 = "sha256-dMZu4IRdchPeoYylz1XDZeJsAW+V8HZApNndpeu+RbA="; }; vendorSha256 = null; From 4f9e77d17cfb4fb9f93bdc7db92763771c3ededb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Aug 2021 03:09:52 +0000 Subject: [PATCH 033/103] dnsproxy: 0.39.2 -> 0.39.4 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 3debf67f81a9..77f1bf694459 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.39.2"; + version = "0.39.4"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FuPNWoLsqPvz4J+ymfEKBjPmLlxwDUp/196REDnGPmQ="; + sha256 = "sha256-dF3xyyOqWzjHW8cFdGlb3BCCGVy+eWW5OesKEK7pEjw="; }; vendorSha256 = null; From f108efaa01d5fd6b7c984c46f7e82aa0fa67b4a6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Aug 2021 05:18:39 +0000 Subject: [PATCH 034/103] python38Packages.internetarchive: 2.0.3 -> 2.1.0 --- pkgs/development/python-modules/internetarchive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 20e7986188c5..60a946291ad9 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "internetarchive"; - version = "2.0.3"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "2ce0ab89fea37e5b2311bc7d163955e84f73f6beeac3942e17e9d51ad7cc9ffa"; + sha256 = "72094f05df39bb1463f61f928f3a7fa0dd236cab185cb8b7e8eb6c85e09acdc4"; }; propagatedBuildInputs = [ From 86632bc0eae73f3023b2fdd5d1f45f3749246e4f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Aug 2021 06:16:35 +0000 Subject: [PATCH 035/103] python38Packages.django-haystack: 3.0 -> 3.1.1 --- pkgs/development/python-modules/django-haystack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix index 14e66a159c18..c207a37ebf15 100644 --- a/pkgs/development/python-modules/django-haystack/default.nix +++ b/pkgs/development/python-modules/django-haystack/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-haystack"; - version = "3.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "d490f920afa85471dd1fa5000bc8eff4b704daacbe09aee1a64e75cbc426f3be"; + sha256 = "6d05756b95d7d5ec1dbd4668eb999ced1504b47f588e2e54be53b1404c516a82"; }; checkInputs = [ pysolr whoosh python-dateutil geopy coverage nose mock coverage requests ]; From b8c5c06aab9e84ba9304b2016428a1d4df4dc512 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 28 Aug 2021 02:18:38 -0400 Subject: [PATCH 036/103] snakemake: 6.6.1 -> 6.7.0 --- pkgs/applications/science/misc/snakemake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 419323cfa31f..4ff751ff8d18 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "6.6.1"; + version = "6.7.0"; propagatedBuildInputs = with python3Packages; [ appdirs @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "91637a801342f3bc349c033b284fef7c0201b4e5e29d5650cb6c7f69096d4184"; + sha256 = "6f53d54044c5d1718c7858f45286beeffb220c794fe5f602a5c20bf0caf8ec07"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json From 8d9814b4d082a42b33dcdd46deeed46ba98379e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Aug 2021 09:34:15 +0200 Subject: [PATCH 037/103] python3Packages.tldextract: 3.1.0 -> 3.1.1 --- pkgs/development/python-modules/tldextract/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index d5b257abedf5..09f35a4c64f8 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "tldextract"; - version = "3.1.0"; + version = "3.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "cfae9bc8bda37c3e8c7c8639711ad20e95dc85b207a256b60b0b23d7ff5540ea"; + sha256 = "sha256-HViDxJbaOoqnHR9NpIYs43TcfM9F5Ltn3rIBbsNPjTM="; }; nativeBuildInputs = [ setuptools-scm ]; From 4e04f84aacea7760d97a244a03c999d379081875 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 28 Aug 2021 09:48:57 +0200 Subject: [PATCH 038/103] tfsec: 0.58.4 -> 0.58.5 --- pkgs/development/tools/analysis/tfsec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 2ea5ce3090e5..5c4f07482c90 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.58.4"; + version = "0.58.5"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gnipQyjisi1iY1SSmESrwNvxyacq9fsva8IY3W6Gpd8="; + sha256 = "sha256-awTRECHHNGebzV08Qy2I6rX4eS2z07NZLsQFPoA0UXA="; }; goPackagePath = "github.com/aquasecurity/tfsec"; From c7cccc55fe2fb39761ce6427294a102af865971a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Aug 2021 10:12:03 +0000 Subject: [PATCH 039/103] python38Packages.ntc-templates: 2.2.2 -> 2.3.0 --- pkgs/development/python-modules/ntc-templates/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index 33921406fe1d..67c6783a4649 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ntc-templates"; - version = "2.2.2"; + version = "2.3.0"; format = "pyproject"; disabled = isPy27; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "v${version}"; - sha256 = "1f2hmayj95j3fzkyh9qvl58z0l9j9mlsi8b2r9aa2fy753y5a73b"; + sha256 = "1a9v2j9s7niyacglhgp58zg1wcynakacz9zg4zcv2q85hb87m2m9"; }; nativeBuildInputs = [ From 420ae3f0410b836e922bced1e9f1808be07c6727 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Mon, 23 Aug 2021 10:28:41 -0700 Subject: [PATCH 040/103] racket: 8.1 -> 8.2 --- pkgs/development/interpreters/racket/default.nix | 4 ++-- pkgs/development/interpreters/racket/minimal.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 0b5084d43584..5737241bb7e5 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { pname = "racket"; - version = "8.1"; # always change at once with ./minimal.nix + version = "8.2"; # always change at once with ./minimal.nix src = (lib.makeOverridable ({ name, sha256 }: fetchurl { @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { } )) { name = "${pname}-${version}"; - sha256 = "0wlgp9dlibhv1d181arz309fszz31l5gb5gl94bqzfcav014g3k8"; + sha256 = "10kl9xxl9swz8hdpycpy1vjc8biah5h07dzaygsf0ylfjdrczwx0"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 4cfb178d42de..cf3f322b4e7e 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec { name = "racket-minimal-${oldAttrs.version}"; src = oldAttrs.src.override { inherit name; - sha256 = "1q54n16s0hmnry8q381wd7zfpyjndfjswn97vsbd4isngwz3w12k"; + sha256 = "1iw4z962vp287q6wwvky36iqmwg1mqyxxpbk96aqr2ckfjqwnkbg"; }; meta = oldAttrs.meta // { From 33359f518b3e9254889fdbebca3be5509541f140 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Aug 2021 03:50:49 +0000 Subject: [PATCH 041/103] esbuild: 0.12.23 -> 0.12.24 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index bd080d235bc7..ad88f368e8ad 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.12.23"; + version = "0.12.24"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-WS3Vy//5lL7xnMOgSeLh6RHAlonQDPQ3K2L+MIK+j7A="; + sha256 = "sha256-oD8QjjolEfmfxs+Q4duVUCbEp74HzIWaPrmH8Vn1H+o="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; From 2784f1bd6908b37ed0d686778f347e63692c0f84 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 29 Jul 2021 15:12:42 +0200 Subject: [PATCH 042/103] pkgsMusl.python*: disable LTO MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit LTO fails to build with musl with the following linker error: ``` rm -f libpython3.9.a if test libpython3.9.so.1.0 != libpython3.9.so; then \ gcc -shared -L/nix/store/1dlhc7w4dlacgmkjbcx9454givv4kdqj-zlib-1.2.11/lib -L/nix/store/6fdwln0ac2p100dhifk2picm0c2d0bw3-bzip2-1.0.6.0.2/lib -L/nix/store/540aidi6ppgnjdd60ky4m6sm6ml824sp-expat-2.4.1/lib -L/nix/store/b493yxrr0glvv3988mkagqlq5k8rg5g1-xz-5.2.5/lib -L/nix/store/2145y7j63691khrjqhn66gc3srb52af8-libffi-3.3/lib -L/nix/store/4h0qimk9kkkrd1v9j6j0v3r3gqg6w22a-gdbm-1.20/lib -L/nix/store/b8n0k1vhjdg0r95x8d2ybgrmbdlhw738-sqlite-3.35.5/lib -L/nix/store/f4y7v8k7ar3n05h3446k6z4aa1c77n22-readline-6.3p08/lib -L/nix/store/j79lxjyfin611lz3rm0mzc26afxm3dgm-ncurses-6.2/lib -L/nix/store/mqs20xckz2gj0asgy2hv60h5dg1i3ci5-openssl-1.1.1k/lib -L/nix/store/hbfls4hgbjn8cb0d4m0kgz4a4cwlcbx5-tzdata-2021a/lib -L/nix/store/1dlhc7w4dlacgmkjbcx9454givv4kdqj-zlib-1.2.11/lib -L/nix/store/6fdwln0ac2p100dhifk2picm0c2d0bw3-bzip2-1.0.6.0.2/lib -L/nix/store/540aidi6ppgnjdd60ky4m6sm6ml824sp-expat-2.4.1/lib -L/nix/store/b493yxrr0glvv3988mkagqlq5k8rg5g1-xz-5.2.5/lib -L/nix/store/2145y7j63691khrjqhn66gc3srb52af8-libffi-3.3/lib -L/nix/store/4h0qimk9kkkrd1v9j6j0v3r3gqg6w22a-gdbm-1.20/lib -L/nix/store/b8n0k1vhjdg0r95x8d2ybgrmbdlhw738-sqlite-3.35.5/lib -L/nix/store/f4y7v8k7ar3n05h3446k6z4aa1c77n22-readline-6.3p08/lib -L/nix/store/j79lxjyfin611lz3rm0mzc26afxm3dgm-ncurses-6.2/lib -L/nix/store/mqs20xckz2gj0asgy2hv60h5dg1i3ci5-openssl-1.1.1k/lib -L/nix/store/hbfls4hgbjn8cb0d4m0kgz4a4cwlcbx5-tzdata-2021a/lib -flto -fuse-linker-plugin -ffat-lto-objects -flto-partition=none -g -Wl,-hlibpython3.9.so.1.0 -o libpython3.9.so.1.0 Modules/getbuildinfo.o Parser/acceler.o Parser/grammar1.o Parser/listnode.o Parser/node.o Parser/parser.o Parser/token.o Parser/pegen/pegen.o Parser/pegen/parse.o Parser/pegen/parse_string.o Parser/pegen/peg_api.o Parser/myreadline.o Parser/parsetok.o Parser/tokenizer.o Objects/abstract.o Objects/accu.o Objects/boolobject.o Objects/bytes_methods.o Objects/bytearrayobject.o Objects/bytesobject.o Objects/call.o Objects/capsule.o Objects/cellobject.o Objects/classobject.o Objects/codeobject.o Objects/complexobject.o Objects/descrobject.o Objects/enumobject.o Objects/exceptions.o Objects/genericaliasobject.o Objects/genobject.o Objects/fileobject.o Objects/floatobject.o Objects/frameobject.o Objects/funcobject.o Objects/interpreteridobject.o Objects/iterobject.o Objects/listobject.o Objects/longobject.o Objects/dictobject.o Objects/odictobject.o Objects/memoryobject.o Objects/methodobject.o Objects/moduleobject.o Objects/namespaceobject.o Objects/object.o Objects/obmalloc.o Objects/picklebufobject.o Objects/rangeobject.o Objects/setobject.o Objects/sliceobject.o Objects/structseq.o Objects/tupleobject.o Objects/typeobject.o Objects/unicodeobject.o Objects/unicodectype.o Objects/weakrefobject.o Python/_warnings.o Python/Python-ast.o Python/asdl.o Python/ast.o Python/ast_opt.o Python/ast_unparse.o Python/bltinmodule.o Python/ceval.o Python/codecs.o Python/compile.o Python/context.o Python/dynamic_annotations.o Python/errors.o Python/frozenmain.o Python/future.o Python/getargs.o Python/getcompiler.o Python/getcopyright.o Python/getplatform.o Python/getversion.o Python/graminit.o Python/hamt.o Python/hashtable.o Python/import.o Python/importdl.o Python/initconfig.o Python/marshal.o Python/modsupport.o Python/mysnprintf.o Python/mystrtoul.o Python/pathconfig.o Python/peephole.o Python/preconfig.o Python/pyarena.o Python/pyctype.o Python/pyfpe.o Python/pyhash.o Python/pylifecycle.o Python/pymath.o Python/pystate.o Python/pythonrun.o Python/pytime.o Python/bootstrap_hash.o Python/structmember.o Python/symtable.o Python/sysmodule.o Python/thread.o Python/traceback.o Python/getopt.o Python/pystrcmp.o Python/pystrtod.o Python/pystrhex.o Python/dtoa.o Python/formatter_unicode.o Python/fileutils.o Python/dynload_shlib.o Modules/config.o Modules/getpath.o Modules/main.o Modules/gcmodule.o Modules/posixmodule.o Modules/errnomodule.o Modules/pwdmodule.o Modules/_sre.o Modules/_codecsmodule.o Modules/_weakref.o Modules/_functoolsmodule.o Modules/_operator.o Modules/_collectionsmodule.o Modules/_abc.o Modules/itertoolsmodule.o Modules/atexitmodule.o Modules/signalmodule.o Modules/_stat.o Modules/timemodule.o Modules/_threadmodule.o Modules/_localemodule.o Modules/_iomodule.o Modules/iobase.o Modules/fileio.o Modules/bytesio.o Modules/bufferedio.o Modules/textio.o Modules/stringio.o Modules/faulthandler.o Modules/_tracemalloc.o Modules/_peg_parser.o Modules/symtablemodule.o Modules/xxsubtype.o Python/frozen.o -ldl -lcrypt -lncurses -lm -lm; \ ln -f libpython3.9.so.1.0 libpython3.9.so; \ else \ gcc -shared -L/nix/store/1dlhc7w4dlacgmkjbcx9454givv4kdqj-zlib-1.2.11/lib -L/nix/store/6fdwln0ac2p100dhifk2picm0c2d0bw3-bzip2-1.0.6.0.2/lib -L/nix/store/540aidi6ppgnjdd60ky4m6sm6ml824sp-expat-2.4.1/lib -L/nix/store/b493yxrr0glvv3988mkagqlq5k8rg5g1-xz-5.2.5/lib -L/nix/store/2145y7j63691khrjqhn66gc3srb52af8-libffi-3.3/lib -L/nix/store/4h0qimk9kkkrd1v9j6j0v3r3gqg6w22a-gdbm-1.20/lib -L/nix/store/b8n0k1vhjdg0r95x8d2ybgrmbdlhw738-sqlite-3.35.5/lib -L/nix/store/f4y7v8k7ar3n05h3446k6z4aa1c77n22-readline-6.3p08/lib -L/nix/store/j79lxjyfin611lz3rm0mzc26afxm3dgm-ncurses-6.2/lib -L/nix/store/mqs20xckz2gj0asgy2hv60h5dg1i3ci5-openssl-1.1.1k/lib -L/nix/store/hbfls4hgbjn8cb0d4m0kgz4a4cwlcbx5-tzdata-2021a/lib -L/nix/store/1dlhc7w4dlacgmkjbcx9454givv4kdqj-zlib-1.2.11/lib -L/nix/store/6fdwln0ac2p100dhifk2picm0c2d0bw3-bzip2-1.0.6.0.2/lib -L/nix/store/540aidi6ppgnjdd60ky4m6sm6ml824sp-expat-2.4.1/lib -L/nix/store/b493yxrr0glvv3988mkagqlq5k8rg5g1-xz-5.2.5/lib -L/nix/store/2145y7j63691khrjqhn66gc3srb52af8-libffi-3.3/lib -L/nix/store/4h0qimk9kkkrd1v9j6j0v3r3gqg6w22a-gdbm-1.20/lib -L/nix/store/b8n0k1vhjdg0r95x8d2ybgrmbdlhw738-sqlite-3.35.5/lib -L/nix/store/f4y7v8k7ar3n05h3446k6z4aa1c77n22-readline-6.3p08/lib -L/nix/store/j79lxjyfin611lz3rm0mzc26afxm3dgm-ncurses-6.2/lib -L/nix/store/mqs20xckz2gj0asgy2hv60h5dg1i3ci5-openssl-1.1.1k/lib -L/nix/store/hbfls4hgbjn8cb0d4m0kgz4a4cwlcbx5-tzdata-2021a/lib -flto -fuse-linker-plugin -ffat-lto-objects -flto-partition=none -g -o libpython3.9.so Modules/getbuildinfo.o Parser/acceler.o Parser/grammar1.o Parser/listnode.o Parser/node.o Parser/parser.o Parser/token.o Parser/pegen/pegen.o Parser/pegen/parse.o Parser/pegen/parse_string.o Parser/pegen/peg_api.o Parser/myreadline.o Parser/parsetok.o Parser/tokenizer.o Objects/abstract.o Objects/accu.o Objects/boolobject.o Objects/bytes_methods.o Objects/bytearrayobject.o Objects/bytesobject.o Objects/call.o Objects/capsule.o Objects/cellobject.o Objects/classobject.o Objects/codeobject.o Objects/complexobject.o Objects/descrobject.o Objects/enumobject.o Objects/exceptions.o Objects/genericaliasobject.o Objects/genobject.o Objects/fileobject.o Objects/floatobject.o Objects/frameobject.o Objects/funcobject.o Objects/interpreteridobject.o Objects/iterobject.o Objects/listobject.o Objects/longobject.o Objects/dictobject.o Objects/odictobject.o Objects/memoryobject.o Objects/methodobject.o Objects/moduleobject.o Objects/namespaceobject.o Objects/object.o Objects/obmalloc.o Objects/picklebufobject.o Objects/rangeobject.o Objects/setobject.o Objects/sliceobject.o Objects/structseq.o Objects/tupleobject.o Objects/typeobject.o Objects/unicodeobject.o Objects/unicodectype.o Objects/weakrefobject.o Python/_warnings.o Python/Python-ast.o Python/asdl.o Python/ast.o Python/ast_opt.o Python/ast_unparse.o Python/bltinmodule.o Python/ceval.o Python/codecs.o Python/compile.o Python/context.o Python/dynamic_annotations.o Python/errors.o Python/frozenmain.o Python/future.o Python/getargs.o Python/getcompiler.o Python/getcopyright.o Python/getplatform.o Python/getversion.o Python/graminit.o Python/hamt.o Python/hashtable.o Python/import.o Python/importdl.o Python/initconfig.o Python/marshal.o Python/modsupport.o Python/mysnprintf.o Python/mystrtoul.o Python/pathconfig.o Python/peephole.o Python/preconfig.o Python/pyarena.o Python/pyctype.o Python/pyfpe.o Python/pyhash.o Python/pylifecycle.o Python/pymath.o Python/pystate.o Python/pythonrun.o Python/pytime.o Python/bootstrap_hash.o Python/structmember.o Python/symtable.o Python/sysmodule.o Python/thread.o Python/traceback.o Python/getopt.o Python/pystrcmp.o Python/pystrtod.o Python/pystrhex.o Python/dtoa.o Python/formatter_unicode.o Python/fileutils.o Python/dynload_shlib.o Modules/config.o Modules/getpath.o Modules/main.o Modules/gcmodule.o Modules/posixmodule.o Modules/errnomodule.o Modules/pwdmodule.o Modules/_sre.o Modules/_codecsmodule.o Modules/_weakref.o Modules/_functoolsmodule.o Modules/_operator.o Modules/_collectionsmodule.o Modules/_abc.o Modules/itertoolsmodule.o Modules/atexitmodule.o Modules/signalmodule.o Modules/_stat.o Modules/timemodule.o Modules/_threadmodule.o Modules/_localemodule.o Modules/_iomodule.o Modules/iobase.o Modules/fileio.o Modules/bytesio.o Modules/bufferedio.o Modules/textio.o Modules/stringio.o Modules/faulthandler.o Modules/_tracemalloc.o Modules/_peg_parser.o Modules/symtablemodule.o Modules/xxsubtype.o Python/frozen.o -ldl -lcrypt -lncurses -lm -lm; \ fi ar rcs libpython3.9.a Modules/getbuildinfo.o Parser/acceler.o Parser/grammar1.o Parser/listnode.o Parser/node.o Parser/parser.o Parser/token.o Parser/pegen/pegen.o Parser/pegen/parse.o Parser/pegen/parse_string.o Parser/pegen/peg_api.o Parser/myreadline.o Parser/parsetok.o Parser/tokenizer.o Objects/abstract.o Objects/accu.o Objects/boolobject.o Objects/bytes_methods.o Objects/bytearrayobject.o Objects/bytesobject.o Objects/call.o Objects/capsule.o Objects/cellobject.o Objects/classobject.o Objects/codeobject.o Objects/complexobject.o Objects/descrobject.o Objects/enumobject.o Objects/exceptions.o Objects/genericaliasobject.o Objects/genobject.o Objects/fileobject.o Objects/floatobject.o Objects/frameobject.o Objects/funcobject.o Objects/interpreteridobject.o Objects/iterobject.o Objects/listobject.o Objects/longobject.o Objects/dictobject.o Objects/odictobject.o Objects/memoryobject.o Objects/methodobject.o Objects/moduleobject.o Objects/namespaceobject.o Objects/object.o Objects/obmalloc.o Objects/picklebufobject.o Objects/rangeobject.o Objects/setobject.o Objects/sliceobject.o Objects/structseq.o Objects/tupleobject.o Objects/typeobject.o Objects/unicodeobject.o Objects/unicodectype.o Objects/weakrefobject.o Python/_warnings.o Python/Python-ast.o Python/asdl.o Python/ast.o Python/ast_opt.o Python/ast_unparse.o Python/bltinmodule.o Python/ceval.o Python/codecs.o Python/compile.o Python/context.o Python/dynamic_annotations.o Python/errors.o Python/frozenmain.o Python/future.o Python/getargs.o Python/getcompiler.o Python/getcopyright.o Python/getplatform.o Python/getversion.o Python/graminit.o Python/hamt.o Python/hashtable.o Python/import.o Python/importdl.o Python/initconfig.o Python/marshal.o Python/modsupport.o Python/mysnprintf.o Python/mystrtoul.o Python/pathconfig.o Python/peephole.o Python/preconfig.o Python/pyarena.o Python/pyctype.o Python/pyfpe.o Python/pyhash.o Python/pylifecycle.o Python/pymath.o Python/pystate.o Python/pythonrun.o Python/pytime.o Python/bootstrap_hash.o Python/structmember.o Python/symtable.o Python/sysmodule.o Python/thread.o Python/traceback.o Python/getopt.o Python/pystrcmp.o Python/pystrtod.o Python/pystrhex.o Python/dtoa.o Python/formatter_unicode.o Python/fileutils.o Python/dynload_shlib.o Modules/config.o Modules/getpath.o Modules/main.o Modules/gcmodule.o Modules/posixmodule.o Modules/errnomodule.o Modules/pwdmodule.o Modules/_sre.o Modules/_codecsmodule.o Modules/_weakref.o Modules/_functoolsmodule.o Modules/_operator.o Modules/_collectionsmodule.o Modules/_abc.o Modules/itertoolsmodule.o Modules/atexitmodule.o Modules/signalmodule.o Modules/_stat.o Modules/timemodule.o Modules/_threadmodule.o Modules/_localemodule.o Modules/_iomodule.o Modules/iobase.o Modules/fileio.o Modules/bytesio.o Modules/bufferedio.o Modules/textio.o Modules/stringio.o Modules/faulthandler.o Modules/_tracemalloc.o Modules/_peg_parser.o Modules/symtablemodule.o Modules/xxsubtype.o Python/frozen.o In function ‘assemble_lnotab’, inlined from ‘assemble_emit’ at Python/compile.c:5717:0, inlined from ‘assemble’ at Python/compile.c:6056:0: Python/compile.c:5671: warning: writing 1 byte into a region of size 0 [8;;https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html#index-Wstringop-overflow=-Wstringop-overflow=8;;] 5671 | *lnotab++ = k; | /nix/store/vf20zcyqr3qzcjhdidzk377qankcqsqa-binutils-2.35.1/bin/ld: libpython3.9.so.1.0.lto.o: warning: relocation against `PyDictValues_Type' in read-only section `.text' /nix/store/vf20zcyqr3qzcjhdidzk377qankcqsqa-binutils-2.35.1/bin/ld: libpython3.9.so.1.0.lto.o: relocation R_X86_64_PC32 against symbol `PyBool_Type' can not be used when making a shared object; recompile with -fPIC /nix/store/vf20zcyqr3qzcjhdidzk377qankcqsqa-binutils-2.35.1/bin/ld: final link failed: bad value collect2: error: ld returned 1 exit status ln: failed to access 'libpython3.9.so.1.0': No such file or directory ``` This should be investigated (since it should be possible), but disabling it for now seems better than having a significant percentage of pkgsMusl broken. Ref https://github.com/NixOS/nixpkgs/issues/131557. --- pkgs/development/interpreters/python/cpython/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index f52255f4748b..5b5060b58842 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -45,7 +45,9 @@ # enableLTO is a subset of the enableOptimizations flag that doesn't harm reproducibility. # enabling LTO on 32bit arch causes downstream packages to fail when linking # enabling LTO on *-darwin causes python3 to fail when linking. -, enableLTO ? stdenv.is64bit && stdenv.isLinux +# enabling LTO with musl and dynamic linking fails with a linker error although it should +# be possible as alpine is doing it: https://github.com/alpinelinux/aports/blob/a8ccb04668c7729e0f0db6c6ff5f25d7519e779b/main/python3/APKBUILD#L82 +, enableLTO ? stdenv.is64bit && stdenv.isLinux && !(stdenv.hostPlatform.isMusl && !stdenv.hostPlatform.isStatic) , reproducibleBuild ? true , pythonAttr ? "python${sourceVersion.major}${sourceVersion.minor}" }: From 934622990298da37d08e89f62094e4c747cb1037 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 27 Aug 2021 09:54:40 -0400 Subject: [PATCH 043/103] inferno: init at 0.10.6 --- pkgs/development/tools/inferno/default.nix | 31 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/tools/inferno/default.nix diff --git a/pkgs/development/tools/inferno/default.nix b/pkgs/development/tools/inferno/default.nix new file mode 100644 index 000000000000..ce12a72dc979 --- /dev/null +++ b/pkgs/development/tools/inferno/default.nix @@ -0,0 +1,31 @@ +{ fetchCrate, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "inferno"; + version = "0.10.6"; + + # github version doesn't have a Cargo.lock + src = fetchCrate { + inherit pname version; + sha256 = "1pn3ask36mv8byd62xhm8bjv59k12i1s533jgb5syml64w1cnn12"; + }; + + cargoSha256 = "0w5w9pyv34x0iy9knr79491kb9bgbcagh6251pq72mv4pvx0axip"; + + # these tests depend on a patched version of flamegraph which is included in + # the github repository as a submodule, but absent from the crates version + checkFlags = [ + "--skip=collapse::dtrace::tests::test_collapse_multi_dtrace" + "--skip=collapse::dtrace::tests::test_collapse_multi_dtrace_simple" + "--skip=collapse::perf::tests::test_collapse_multi_perf" + "--skip=collapse::perf::tests::test_collapse_multi_perf_simple" + ]; + + meta = with lib; { + description = "A port of parts of the flamegraph toolkit to Rust"; + homepage = "https://github.com/jonhoo/inferno"; + changelog = "https://github.com/jonhoo/inferno/blob/v${version}/CHANGELOG.md"; + license = licenses.cddl; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b777ba8f7b14..bebdc797d2e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6086,6 +6086,8 @@ with pkgs; inetutils = callPackage ../tools/networking/inetutils { }; + inferno = callPackage ../development/tools/inferno { }; + inform6 = callPackage ../development/compilers/inform6 { }; inform7 = callPackage ../development/compilers/inform7 { }; From 3d245b3a377b0a91f1be6f819b77cc04cbf24a7d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 28 Aug 2021 16:58:44 +0200 Subject: [PATCH 044/103] Revert "Revert "openssl: 1.1.1k -> 1.1.1l" (#135999)" This reverts commit b2b0115e70003e0070a50a1e0217a43c7e081588. --- .../openssl/1.1/macos-yosemite-compat.patch | 56 +++++++++++++++++++ .../development/libraries/openssl/default.nix | 6 +- 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/openssl/1.1/macos-yosemite-compat.patch diff --git a/pkgs/development/libraries/openssl/1.1/macos-yosemite-compat.patch b/pkgs/development/libraries/openssl/1.1/macos-yosemite-compat.patch new file mode 100644 index 000000000000..b0e37e325611 --- /dev/null +++ b/pkgs/development/libraries/openssl/1.1/macos-yosemite-compat.patch @@ -0,0 +1,56 @@ +From cef404f1e7a598166cbc2fd2e0048f7e2d752ad5 Mon Sep 17 00:00:00 2001 +From: David Carlier +Date: Tue, 24 Aug 2021 22:40:14 +0100 +Subject: [PATCH] Darwin platform allows to build on releases before + Yosemite/ios 8. + +issue #16407 #16408 +--- + crypto/rand/rand_unix.c | 5 +---- + include/crypto/rand.h | 10 ++++++++++ + 2 files changed, 11 insertions(+), 4 deletions(-) + +diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c +index 43f1069d151d..0f4525106af7 100644 +--- a/crypto/rand/rand_unix.c ++++ b/crypto/rand/rand_unix.c +@@ -34,9 +34,6 @@ + #if defined(__OpenBSD__) + # include + #endif +-#if defined(__APPLE__) +-# include +-#endif + + #if defined(OPENSSL_SYS_UNIX) || defined(__DJGPP__) + # include +@@ -381,7 +378,7 @@ static ssize_t syscall_random(void *buf, size_t buflen) + if (errno != ENOSYS) + return -1; + } +-# elif defined(__APPLE__) ++# elif defined(OPENSSL_APPLE_CRYPTO_RANDOM) + if (CCRandomGenerateBytes(buf, buflen) == kCCSuccess) + return (ssize_t)buflen; + +diff --git a/include/crypto/rand.h b/include/crypto/rand.h +index 5350d3a93119..674f840fd13c 100644 +--- a/include/crypto/rand.h ++++ b/include/crypto/rand.h +@@ -20,6 +20,16 @@ + + # include + ++# if defined(__APPLE__) && !defined(OPENSSL_NO_APPLE_CRYPTO_RANDOM) ++# include ++# if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || \ ++ (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) ++# define OPENSSL_APPLE_CRYPTO_RANDOM 1 ++# include ++# include ++# endif ++# endif ++ + /* forward declaration */ + typedef struct rand_pool_st RAND_POOL; + diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index fc2c2fad1959..2d3f1c313caa 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -192,14 +192,16 @@ in { }; openssl_1_1 = common { - version = "1.1.1k"; - sha256 = "1rdfzcrxy9y38wqdw5942vmdax9hjhgrprzxm42csal7p5shhal9"; + version = "1.1.1l"; + sha256 = "sha256-C3o+XlnDSCf+DDp0t+yLrvMCuY+oAIjX+RU6oW+na9E="; patches = [ ./1.1/nix-ssl-cert-file.patch (if stdenv.hostPlatform.isDarwin then ./1.1/use-etc-ssl-certs-darwin.patch else ./1.1/use-etc-ssl-certs.patch) + ] ++ lib.optionals (stdenv.isDarwin) [ + ./1.1/macos-yosemite-compat.patch ]; withDocs = true; }; From ca20a96b5ff3318eb136c93b44d4996e2a88fb61 Mon Sep 17 00:00:00 2001 From: polykernel <81340136+polykernel@users.noreply.github.com> Date: Sat, 28 Aug 2021 11:18:03 -0400 Subject: [PATCH 045/103] treewide: concatStrings (intersperse ...) -> concatStringsSep ... Update all usage of lib.concatStrings (lib.intersperse ...) to lib.concatStringsSep. This produces the same result as per https://github.com/NixOS/nixpkgs/pull/135843, however it yields a performance benefit on Nix versions that support the builtins.concatStringsSep primop. --- pkgs/applications/misc/keepass/default.nix | 2 +- pkgs/applications/video/vdr/wrapper.nix | 2 +- pkgs/desktops/xfce/core/thunar/wrapper.nix | 2 +- pkgs/development/compilers/gcc/common/configure-flags.nix | 3 +-- pkgs/misc/emulators/retroarch/wrapper.nix | 2 +- pkgs/tools/graphics/diagrams-builder/default.nix | 2 +- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 336bd5a7f64d..f2846de37d3f 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -84,7 +84,7 @@ with builtins; buildDotnetPackage rec { # after loading. It is brought into plugins bin/ directory using # buildEnv in the plugin derivation. Wrapper below makes sure it # is found and does not pollute output path. - binPaths = lib.concatStrings (lib.intersperse ":" (map (x: x + "/bin") plugins)); + binPaths = lib.concatStringsSep ":" (map (x: x + "/bin") plugins); dynlibPath = lib.makeLibraryPath [ gtk2 ]; diff --git a/pkgs/applications/video/vdr/wrapper.nix b/pkgs/applications/video/vdr/wrapper.nix index 50d3b9d65a8d..04984212b249 100644 --- a/pkgs/applications/video/vdr/wrapper.nix +++ b/pkgs/applications/video/vdr/wrapper.nix @@ -24,7 +24,7 @@ in symlinkJoin { inherit license homepage; description = description + " (with plugins: " - + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) plugins)) + + lib.concatStringsSep ", " (map (x: ""+x.name) plugins) + ")"; }; } diff --git a/pkgs/desktops/xfce/core/thunar/wrapper.nix b/pkgs/desktops/xfce/core/thunar/wrapper.nix index 4e9732ce1c4a..5381dceae4a4 100644 --- a/pkgs/desktops/xfce/core/thunar/wrapper.nix +++ b/pkgs/desktops/xfce/core/thunar/wrapper.nix @@ -36,6 +36,6 @@ symlinkJoin { description = thunar.meta.description + optionalString (0 != length thunarPlugins) - " (with plugins: ${concatStrings (intersperse ", " (map (x: x.name) thunarPlugins))})"; + " (with plugins: ${concatStringsSep ", " (map (x: x.name) thunarPlugins)})"; }; } diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 4686a387712f..6744ad8b0bfe 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -133,7 +133,7 @@ let "--with-system-zlib" "--enable-static" "--enable-languages=${ - lib.concatStrings (lib.intersperse "," + lib.concatStringsSep "," ( lib.optional langC "c" ++ lib.optional langCC "c++" ++ lib.optional langD "d" @@ -146,7 +146,6 @@ let ++ lib.optionals crossDarwin [ "objc" "obj-c++" ] ++ lib.optional langJit "jit" ) - ) }" ] diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/misc/emulators/retroarch/wrapper.nix index 40d9f07846b7..4cc7ad404be0 100644 --- a/pkgs/misc/emulators/retroarch/wrapper.nix +++ b/pkgs/misc/emulators/retroarch/wrapper.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { inherit license homepage platforms maintainers; description = description + " (with cores: " - + lib.concatStrings (lib.intersperse ", " (map (x: ""+x.name) cores)) + + lib.concatStringsSep ", " (map (x: ""+x.name) cores) + ")"; }; } diff --git a/pkgs/tools/graphics/diagrams-builder/default.nix b/pkgs/tools/graphics/diagrams-builder/default.nix index 9337d5cca23b..85f4fdc83efa 100644 --- a/pkgs/tools/graphics/diagrams-builder/default.nix +++ b/pkgs/tools/graphics/diagrams-builder/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; buildCommand = with lib; - concatStrings (intersperse "\n" (map exeWrapper backends)); + concatStringsSep "\n" (map exeWrapper backends); # Will be faster to build the wrapper locally then to fetch it from a binary cache. preferLocalBuild = true; From e2551a696b32560164388d9e6b4a5b828cd25575 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Aug 2021 16:50:51 +0000 Subject: [PATCH 046/103] charge-lnd: 0.2.2 -> 0.2.3 --- pkgs/applications/blockchains/charge-lnd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/charge-lnd/default.nix b/pkgs/applications/blockchains/charge-lnd/default.nix index b2d28ed8942b..c76da7ae7464 100644 --- a/pkgs/applications/blockchains/charge-lnd/default.nix +++ b/pkgs/applications/blockchains/charge-lnd/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "charge-lnd"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "accumulator"; repo = pname; rev = "v${version}"; - sha256 = "087y60hpld17bg2ya5nlh4m4sam4s6mx8vrqhm48idj1rmlcpfws"; + sha256 = "1cj8ggahnbn55wlkxzf5b9n8rvm30mc95vgcw8b60pzs47q6vncp"; }; propagatedBuildInputs = with python3Packages; [ From 4fecb8b2d0c31caf963a35b4525b4a884adecec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20H=C3=BCrlimann?= <645664+p-h@users.noreply.github.com> Date: Sat, 28 Aug 2021 18:26:03 +0000 Subject: [PATCH 047/103] nixos/airsonic: make path to war file and jre configurable (#135709) * nixos/airsonic: make path to war file and jre configurable * Apply suggestions from code review Co-authored-by: Sumner Evans Co-authored-by: Sumner Evans --- nixos/modules/services/misc/airsonic.nix | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/airsonic.nix b/nixos/modules/services/misc/airsonic.nix index a572f1f6d6f5..490f6c5a5c06 100644 --- a/nixos/modules/services/misc/airsonic.nix +++ b/nixos/modules/services/misc/airsonic.nix @@ -82,6 +82,25 @@ in { ''; }; + jre = mkOption { + type = types.package; + default = pkgs.jre8; + defaultText = literalExample "pkgs.jre8"; + description = '' + JRE package to use. + + Airsonic only supports Java 8, airsonic-advanced requires at least + Java 11. + ''; + }; + + war = mkOption { + type = types.path; + default = "${pkgs.airsonic}/webapps/airsonic.war"; + defaultText = "\${pkgs.airsonic}/webapps/airsonic.war"; + description = "Airsonic war file to use."; + }; + jvmOptions = mkOption { description = '' Extra command line options for the JVM running AirSonic. @@ -118,7 +137,7 @@ in { ''; serviceConfig = { ExecStart = '' - ${pkgs.jre8}/bin/java -Xmx${toString cfg.maxMemory}m \ + ${cfg.jre}/bin/java -Xmx${toString cfg.maxMemory}m \ -Dairsonic.home=${cfg.home} \ -Dserver.address=${cfg.listenAddress} \ -Dserver.port=${toString cfg.port} \ @@ -128,7 +147,7 @@ in { "-Dserver.use-forward-headers=true"} \ ${toString cfg.jvmOptions} \ -verbose:gc \ - -jar ${pkgs.airsonic}/webapps/airsonic.war + -jar ${cfg.war} ''; Restart = "always"; User = "airsonic"; From b6ea4c478b163cda1dfefc420cb2cb51d74ed2dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 25 Aug 2021 19:36:13 -0700 Subject: [PATCH 048/103] deltachat-cursed: 0.2.0 -> 0.3.0 https://github.com/adbenitez/deltachat-cursed/blob/v0.3.0/CHANGELOG.md --- .../instant-messengers/deltachat-cursed/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix index e7263b1d1617..8a04d75f5a63 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-cursed/default.nix @@ -8,19 +8,22 @@ python3.pkgs.buildPythonApplication rec { pname = "deltachat-cursed"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "adbenitez"; repo = "deltachat-cursed"; rev = "v${version}"; - sha256 = "0kbb7lh17dbkd85mcqf438qwk5masz2fxsy8ljdh23kis55nksh8"; + sha256 = "0zzzrzc8yxw6ffwfirbrr5ahbidbvlwdvgdg82zjsdjjbarxph8c"; }; nativeBuildInputs = [ + python3.pkgs.setuptools-scm wrapGAppsHook ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + buildInputs = [ gobject-introspection libnotify @@ -28,6 +31,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ deltachat + notify-py pygobject3 urwid-readline ]; From a544b2b3782b4b30d626ed0d7870d4339808257a Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 28 Aug 2021 19:24:43 +0000 Subject: [PATCH 049/103] electron_13: 13.2.2 -> 13.2.3 https://github.com/electron/electron/releases/tag/v13.2.3 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 7bef2cb4ef7f..0e5b67bbe18d 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -115,13 +115,13 @@ rec { headers = "0sg8ybnrmx11xm7yc0lj8yy0g57ln48gvqhrr9g725zimzza9v3l"; }; - electron_13 = mkElectron "13.2.2" { - x86_64-linux = "3d64bc0eab8dc1fd162693a5492ad694bb65b110fc846293faa3e8ed5c7b6a4b"; - x86_64-darwin = "276916b97960d9e49944b9c6dcd35746feb3b55e86747b4ed0e0eb569c47ec0f"; - i686-linux = "b4bcb41473d240d2078b9ca1d71fd879f5e89a8e6cafd13fa8bdcc615b77fe68"; - armv7l-linux = "fd5fab50764f50dcf4b77c7617fe69895ea177d787fe58a54cc0adb5de026801"; - aarch64-linux = "c4f112945d41304c796a7460018721df4598114cc087c1114c72f1e41d985d11"; - aarch64-darwin = "1bc30f12cf6ff3cedde5f90e138b604cd610176be63bb87a9f023146c2f7c81d"; - headers = "1992ss04078drjybh7pn0lmfmk2kcg9y2jdq9z24caf2xlabfb2d"; + electron_13 = mkElectron "13.2.3" { + x86_64-linux = "495b0c96427c63f6f4d08c5b58d6379f9ee3c6c81148fbbe8a7a6a872127df6d"; + x86_64-darwin = "c02f116484a5e1495d9f7451638bc0d3dea8fa2fde2e4c9c88a17cff98192ddc"; + i686-linux = "03fb8cad91fcbb578027b814119b09cd1ddd414f159c9012850655f9171847c1"; + armv7l-linux = "d8aaf2b49b9ab0a46caa31ed7d4358a3223efeaf90941d3d5e272532718ed754"; + aarch64-linux = "cbbf9f98b1cfbee3fcd0869632a03542408dfd35f2e4d5b72cd823ce9448f659"; + aarch64-darwin = "ef375063e30bc51bbcbe16fb7e5d85933eb60888ccc159c391aefc4f6d616faa"; + headers = "0ayiklr84x7xhh5nz2dfzq2fkqivb9y9axfy7q9n4ps08xbqycyr"; }; } From f3840694a6673dfbe964427b4d77fd028c7e982c Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 28 Aug 2021 19:25:35 +0000 Subject: [PATCH 050/103] electron_12: 12.0.17 -> 12.0.18 https://github.com/electron/electron/releases/tag/v12.0.18 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 0e5b67bbe18d..1262819fbc2d 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -105,14 +105,14 @@ rec { headers = "0gb56pxdkn8970z141l3p30lkizqca6kqj1cvgbp685xmb231hzq"; }; - electron_12 = mkElectron "12.0.17" { - x86_64-linux = "00c05d20372a14b84984f1c30e4c6f293480ef0c35c63949468e9d1ab4918db7"; - x86_64-darwin = "3600d64945474c7a7f7ef5ac9cbc7241432bf778096004d13fe05603a43407c2"; - i686-linux = "3ee6c565f74492b658b5fd4c648dbd0b5d556c8a193125e5f7ee840b088823d7"; - armv7l-linux = "fa1cde8a59c1118baf0f98c1a22b9c99ffac51fd40c65a9fef490c938106ad96"; - aarch64-linux = "92c129b50c17f8a7977c2c61eb721f0c8b831201d3fa1bdcc7d93f63df705ee0"; - aarch64-darwin = "58cdcefa89d4d3d8e669290fd8caced636f969e327d6c772444fda2482df3244"; - headers = "0sg8ybnrmx11xm7yc0lj8yy0g57ln48gvqhrr9g725zimzza9v3l"; + electron_12 = mkElectron "12.0.18" { + x86_64-linux = "09a7908b98a1783bd3840fa289f0ce8d2badada698ddc9daff4398a969292ef2"; + x86_64-darwin = "ab5071568614998adc3b12c93966f82b27da2f13a7317433a32252dd83593d08"; + i686-linux = "0fbf1cb8cd3e5581ee80f49453c86673b4e91c7f599fdcb53af040c6d1992cb8"; + armv7l-linux = "da064a1b86f42a5091ee1162fcad55b1a1f8a8168534a86e37dabd056b54ecbd"; + aarch64-linux = "7197e1ae54af3cc20f312b01a200c75f6a6e0a1b38d0ca48492ead178a607edc"; + aarch64-darwin = "aed2fbafb955f879c65099aebef504fd8076a452d25ccd1cd38d4d1b8758770e"; + headers = "1m1ycv1ysr3aram1d3rj7b4w5dy63irq67x3ff355h33n6dhi4cf"; }; electron_13 = mkElectron "13.2.3" { From 680c2e60c9cf5d0bbeb81a31cfec2ca0c77b903a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 27 Aug 2021 16:44:00 +0200 Subject: [PATCH 051/103] llvm/update-git.py: Automatically commit the changes --- pkgs/development/compilers/llvm/update-git.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/llvm/update-git.py b/pkgs/development/compilers/llvm/update-git.py index 880cad1c72b1..488f415f4394 100755 --- a/pkgs/development/compilers/llvm/update-git.py +++ b/pkgs/development/compilers/llvm/update-git.py @@ -79,8 +79,14 @@ hash = nix_prefetch_url(f'https://github.com/llvm/llvm-project/archive/{commit[" print('Updating default.nix...') with fileinput.FileInput(DEFAULT_NIX, inplace=True) as f: for line in f: + if match := re.search(r'^ rev-version = "unstable-(.+)";', line): + old_date = match.group(1) result = re.sub(r'^ release_version = ".+";', f' release_version = "{release_version}";', line) result = re.sub(r'^ rev = ".*";', f' rev = "{commit["sha"]}";', result) result = re.sub(r'^ rev-version = ".+";', f' rev-version = "{version}";', result) result = re.sub(r'^ sha256 = ".+";', f' sha256 = "{hash}";', result) print(result, end='') +# Commit the result: +commit_message = f"llvmPackages_git: {old_date} -> {date}" +subprocess.run(['git', 'add', DEFAULT_NIX], check=True) +subprocess.run(['git', 'commit', '--file=-'], input=commit_message.encode(), check=True) From 00e380f1be5f393b7ea8ec9848d89284dd5254ce Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 27 Aug 2021 16:56:21 +0200 Subject: [PATCH 052/103] llvmPackages/update.sh: Support LLVM 13+ --- pkgs/development/compilers/llvm/update.sh | 33 ++++++++++++++--------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/llvm/update.sh b/pkgs/development/compilers/llvm/update.sh index 8f28d34073cd..603c603f275b 100755 --- a/pkgs/development/compilers/llvm/update.sh +++ b/pkgs/development/compilers/llvm/update.sh @@ -19,19 +19,26 @@ sed -Ei \ "$FILE" readonly ATTRSET="llvmPackages_$VERSION_MAJOR" -readonly SOURCES=( - "clang-unwrapped.src" - "compiler-rt.src" - "clang-unwrapped.clang-tools-extra_src" - "libcxx.src" - "libcxxabi.src" - "libunwind.src" - "lld.src" - "lldb.src" - "llvm.src" - "llvm.polly_src" - "openmp.src" -) + +if [ "$VERSION_MAJOR" -ge "13" ]; then + readonly SOURCES=( + "llvm.src" + ) +else + readonly SOURCES=( + "clang-unwrapped.src" + "compiler-rt.src" + "clang-unwrapped.clang-tools-extra_src" + "libcxx.src" + "libcxxabi.src" + "libunwind.src" + "lld.src" + "lldb.src" + "llvm.src" + "llvm.polly_src" + "openmp.src" + ) +fi for SOURCE in "${SOURCES[@]}"; do echo "Updating the hash of $SOURCE:" From 186315def77d62b53ad6ccdf57ec9593edbe8bc3 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 28 Aug 2021 23:12:27 +0200 Subject: [PATCH 053/103] chromium: Move the version helper functions into default.nix Those functions can be required anywhere in the Nix expressions for Chromium and therefore they should be defined in default.nix and inherited where necessary. This fixes the chromiumBeta build which failed because I forgot to update the channel conditional when the beta channel advanced to M94. This is exactly why the version based conditionals should be used everywhere. --- .../networking/browsers/chromium/browser.nix | 9 ++++-- .../networking/browsers/chromium/common.nix | 14 ++------- .../networking/browsers/chromium/default.nix | 30 +++++++++++++++---- 3 files changed, 32 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 26c2909da54a..8b80f8f8a6ef 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -1,4 +1,7 @@ -{ lib, mkChromiumDerivation, channel, enableWideVine, ungoogled }: +{ lib, mkChromiumDerivation +, channel, chromiumVersionAtLeast +, enableWideVine, ungoogled +}: with lib; @@ -16,8 +19,8 @@ mkChromiumDerivation (base: rec { cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" - ${lib.optionalString (channel != "dev") ''cp -v "$buildPath/crashpad_handler" "$libExecPath/"''} - ${lib.optionalString (channel == "dev") ''cp -v "$buildPath/chrome_crashpad_handler" "$libExecPath/"''} + ${lib.optionalString (!chromiumVersionAtLeast "94") ''cp -v "$buildPath/crashpad_handler" "$libExecPath/"''} + ${lib.optionalString (chromiumVersionAtLeast "94") ''cp -v "$buildPath/chrome_crashpad_handler" "$libExecPath/"''} cp -v "$buildPath/chrome" "$libExecPath/$packageName" # Swiftshader diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 64f951141afe..be3eff9bd955 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,6 +1,8 @@ { stdenv, lib, fetchurl, fetchpatch # Channel data: , channel, upstream-info +# Helper functions: +, chromiumVersionAtLeast, versionRange # Native build inputs: , ninja, pkg-config @@ -106,18 +108,6 @@ let buildPath = "out/${buildType}"; libExecPath = "$out/libexec/${packageName}"; - warnObsoleteVersionConditional = min-version: result: - let ungoogled-version = (importJSON ./upstream-info.json).ungoogled-chromium.version; - in warnIf (versionAtLeast ungoogled-version min-version) "chromium: ungoogled version ${ungoogled-version} is newer than a conditional bounded at ${min-version}. You can safely delete it." - result; - chromiumVersionAtLeast = min-version: - let result = versionAtLeast upstream-info.version min-version; - in warnObsoleteVersionConditional min-version result; - versionRange = min-version: upto-version: - let inherit (upstream-info) version; - result = versionAtLeast version min-version && versionOlder version upto-version; - in warnObsoleteVersionConditional upto-version result; - ungoogler = ungoogled-chromium { inherit (upstream-info.deps.ungoogled-patches) rev sha256; }; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index db11bda740be..86ee33f3510f 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -22,15 +22,31 @@ let llvmPackages = llvmPackages_12; stdenv = llvmPackages.stdenv; + upstream-info = (lib.importJSON ./upstream-info.json).${channel}; + + # Helper functions for changes that depend on specific versions: + warnObsoleteVersionConditional = min-version: result: + let ungoogled-version = (lib.importJSON ./upstream-info.json).ungoogled-chromium.version; + in lib.warnIf + (lib.versionAtLeast ungoogled-version min-version) + "chromium: ungoogled version ${ungoogled-version} is newer than a conditional bounded at ${min-version}. You can safely delete it." + result; + chromiumVersionAtLeast = min-version: + let result = lib.versionAtLeast upstream-info.version min-version; + in warnObsoleteVersionConditional min-version result; + versionRange = min-version: upto-version: + let inherit (upstream-info) version; + result = lib.versionAtLeast version min-version && lib.versionOlder version upto-version; + in warnObsoleteVersionConditional upto-version result; + callPackage = newScope chromium; chromium = rec { - inherit stdenv llvmPackages; - - upstream-info = (lib.importJSON ./upstream-info.json).${channel}; + inherit stdenv llvmPackages upstream-info; mkChromiumDerivation = callPackage ./common.nix ({ - inherit channel gnome2 gnomeSupport gnomeKeyringSupport proprietaryCodecs + inherit channel chromiumVersionAtLeast versionRange; + inherit gnome2 gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport ungoogled; gnChromium = gn.overrideAttrs (oldAttrs: { inherit (upstream-info.deps.gn) version; @@ -38,12 +54,14 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); - } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "93") rec { + } // lib.optionalAttrs (chromiumVersionAtLeast "93") rec { llvmPackages = llvmPackages_13; stdenv = llvmPackages.stdenv; }); - browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; }; + browser = callPackage ./browser.nix { + inherit channel chromiumVersionAtLeast enableWideVine ungoogled; + }; ungoogled-chromium = callPackage ./ungoogled.nix {}; }; From ea4364b2f7d3d92e200b1b5b7b831e2be8f1b896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 25 Aug 2021 19:17:17 -0700 Subject: [PATCH 054/103] kdeltachat: unstable-2021-08-02 -> unstable-2021-08-28 --- .../instant-messengers/kdeltachat/default.nix | 27 ++++--------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index dabec65b3cd4..eda47b56b796 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -11,34 +11,17 @@ , qtimageformats , qtmultimedia , qtwebengine -, rustPlatform }: -let - libdeltachat' = libdeltachat.overrideAttrs (old: rec { - inherit (old) pname; - version = "1.58.0"; - src = fetchFromGitHub { - owner = "deltachat"; - repo = "deltachat-core-rust"; - rev = version; - sha256 = "03xc0jlfmvmdcipmzavbzkq010qlxzf3mj1zi7wcix7kpl8gwmy7"; - }; - cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - sha256 = "1zijxyc1xjlbyh1gh2lyw44xjcrhz1msykrlqgfkw5w1w0yh78hd"; - }; - }); -in mkDerivation rec { +mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2021-08-02"; + version = "unstable-2021-08-28"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "950f4f22c01ab75f613479ef831bdf38f395d1dd"; - sha256 = "007gazqkzcc0w0rq2i8ysa9f50ldj7n9f5gp1mh8bi86bdvdkzsy"; + rev = "4d051bc35611fa5b75865769df7a512d90a13c65"; + sha256 = "1p8pb3pwgvxy5bvr6by54f1f62imdlddy2mk52qxcvrx8f833bml"; }; nativeBuildInputs = [ @@ -49,7 +32,7 @@ in mkDerivation rec { buildInputs = [ kirigami2 - libdeltachat' + libdeltachat qtimageformats qtmultimedia qtwebengine From 22a588bca25e6dd6f9edf41041ac22509f7c696b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 29 Aug 2021 03:52:51 +0000 Subject: [PATCH 055/103] python38Packages.portalocker: 2.3.1 -> 2.3.2 --- pkgs/development/python-modules/portalocker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index 11016043ce11..abe7ce698208 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "2.3.1"; + version = "2.3.2"; pname = "portalocker"; src = fetchPypi { inherit pname version; - sha256 = "5ff2e494eccd3ff1cbaba8e4defd45bc7edb8eea3908c74f6de5d40641a1ed92"; + sha256 = "75cfe02f702737f1726d83e04eedfa0bda2cc5b974b1ceafb8d6b42377efbd5f"; }; propagatedBuildInputs = [ From ad4883cb96307bcf5094cbbae761411743ebb8a4 Mon Sep 17 00:00:00 2001 From: Romanos Skiadas Date: Fri, 27 Aug 2021 23:28:27 +0300 Subject: [PATCH 056/103] gnucash: Add patch that fixes enableDebugging gnucash I wouldn't be able to say exactly why this is the case, but with the flags that enableDebugging adds to the gnucash derivation, the build fails. The patch added fixes the warning that causes the build to fail and makes enableDebugging gnucash work. --- pkgs/applications/office/gnucash/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 22c9eef5d095..d4dad44d7da8 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -33,6 +33,15 @@ stdenv.mkDerivation rec { sha256 = "0csp8iddhc901vv09gl5lj970g6ili696vwj4vdpkiprp7gh26r5"; }; + patches = [ + # Fixes a warning about an initialized variable that kills enableDebugging gnucash builds on nix. + # This will most likely be part of the 4.7 release, it will be safe to remove then. + (fetchpatch { + url = "https://github.com/Gnucash/gnucash/commit/b42052464ba9701a3d1834fc58fa0deb32ab9afe.patch"; + sha256 = "092957c8jqj4v70fv0ia1wpgl6x34hbwjrichxfbk5ja8l6535gc"; + }) + ]; + nativeBuildInputs = [ pkg-config makeWrapper cmake gtest swig ]; buildInputs = [ From 1025f271896570f8110368dfddb64fc26b7cbfb3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 29 Aug 2021 08:38:08 +0000 Subject: [PATCH 057/103] python38Packages.vyper: 0.2.15 -> 0.2.16 --- pkgs/development/compilers/vyper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/vyper/default.nix b/pkgs/development/compilers/vyper/default.nix index 6d1f7a374dae..431afe5ec205 100644 --- a/pkgs/development/compilers/vyper/default.nix +++ b/pkgs/development/compilers/vyper/default.nix @@ -14,11 +14,11 @@ in buildPythonPackage rec { pname = "vyper"; - version = "0.2.15"; + version = "0.2.16"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cNnKHVKwIx0miC2VhGYBzcSckTnyWYmjNzW0bEzP4bU="; + sha256 = "6cf347440716964012d46686faefc9c689f01872f19736287a63aa8652ac3ddd"; }; nativeBuildInputs = [ pytest-runner ]; From 9e8fcb0184170a97b4d0a933783bd7c83aff2ab2 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 29 Aug 2021 11:02:31 +0200 Subject: [PATCH 058/103] nixos/fonts: fixup dd38ae1f --- nixos/modules/config/fonts/fonts.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix index 60a0885103d2..f87e61e3ef9f 100644 --- a/nixos/modules/config/fonts/fonts.nix +++ b/nixos/modules/config/fonts/fonts.nix @@ -8,7 +8,7 @@ let # If not running a fancy desktop environment, the cursor is likely set to # the default `cursor.pcf` bitmap font. This is 17px wide, so it's very # small and almost invisible on 4K displays. - fontcursormisc_hidpi = pkgs.xorg.fontcursormisc.overrideAttrs (old: + fontcursormisc_hidpi = pkgs.xorg.fontxfree86type1.overrideAttrs (old: let # The scaling constant is 230/96: the scalable `left_ptr` glyph at # about 23 points is rendered as 17px, on a 96dpi display. From b991f1e4483a2356b351d97dcaafe7bfc9822331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Sun, 29 Aug 2021 11:14:55 +0200 Subject: [PATCH 059/103] syncthing: add autoAcceptFolders to devices config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub Sokołowski --- nixos/modules/services/networking/syncthing.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 2e92fe51e90a..2efb7a9ed932 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -9,7 +9,7 @@ let devices = mapAttrsToList (name: device: { deviceID = device.id; - inherit (device) name addresses introducer; + inherit (device) name addresses introducer autoAcceptFolders; }) cfg.devices; folders = mapAttrsToList ( _: folder: { @@ -149,6 +149,15 @@ in { ''; }; + autoAcceptFolders = mkOption { + type = types.bool; + default = false; + description = '' + Automatically create or share folders that this device advertises at the default path. + See . + ''; + }; + }; })); }; From 972a3654888f23f67caefa817889a0033d88a755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Sun, 29 Aug 2021 11:20:02 +0200 Subject: [PATCH 060/103] syncthing: add extraFlags option that adjust service MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is useful for situations in which you might want to reset certain things using `--reset-database` or `--reset-deltas` or debug certain things using any of the debug options like `--debug-perf-stats`. Signed-off-by: Jakub Sokołowski --- nixos/modules/services/networking/syncthing.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 2efb7a9ed932..d77562701492 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -434,6 +434,15 @@ in { defaultText = literalExample "dataDir${optionalString cond " + \"/.config/syncthing\""}"; }; + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + example = [ "--reset-deltas" ]; + description = '' + Extra flags passed to the syncthing command in the service definition. + ''; + }; + openDefaultPorts = mkOption { type = types.bool; default = false; @@ -526,7 +535,7 @@ in { ${cfg.package}/bin/syncthing \ -no-browser \ -gui-address=${cfg.guiAddress} \ - -home=${cfg.configDir} + -home=${cfg.configDir} ${escapeShellArgs cfg.extraFlags} ''; MemoryDenyWriteExecute = true; NoNewPrivileges = true; From 66fb849432beb8cae0c150445496803424f34402 Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Sun, 29 Aug 2021 19:21:06 +0800 Subject: [PATCH 061/103] proxychains: revert commit e6b5d5401e42346a0a2190a Fixes #136093. --- pkgs/tools/networking/proxychains/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix index 56a553c0c803..b93c6ae12cfb 100644 --- a/pkgs/tools/networking/proxychains/default.nix +++ b/pkgs/tools/networking/proxychains/default.nix @@ -19,10 +19,6 @@ stdenv.mkDerivation rec { substituteInPlace Makefile --replace "-Werror" "-Werror -Wno-stringop-truncation" ''; - postInstall = '' - cp src/proxychains.conf $out/etc - ''; - meta = with lib; { description = "Proxifier for SOCKS proxies"; homepage = "http://proxychains.sourceforge.net"; From 224cbafe165f096f825097663677117d8c245628 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 7 Jun 2021 00:33:24 +0300 Subject: [PATCH 062/103] =?UTF-8?q?merkaartor:=200.18.4=20=E2=86=92=200.19?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/merkaartor/default.nix | 28 ++++++------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 010d28eef591..bb28be72deb7 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -2,14 +2,13 @@ , lib , stdenv , fetchFromGitHub -, fetchpatch , qmake , qttools , qttranslations , gdal , proj , qtsvg -, qtwebkit +, qtwebengine , withGeoimage ? true, exiv2 , withGpsdlib ? (!stdenv.isDarwin), gpsd , withLibproxy ? false, libproxy @@ -18,31 +17,18 @@ mkDerivation rec { pname = "merkaartor"; - version = "0.18.4"; + version = "0.19.0"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "merkaartor"; rev = version; - sha256 = "vwO4/a7YF9KbpxcFGTFCdG6SfwEyhISlEtcA+rMebUA="; + sha256 = "sha256-Gx+gnVbSY8JnG03kO5vVQNlSZRl/hrKTdDbh7lyIMbA="; }; - patches = [ - # Fix build with Qt 5.15 (missing QPainterPath include) - (fetchpatch { - url = "https://github.com/openstreetmap/merkaartor/commit/e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c.patch"; - sha256 = "NAisplnS3xHSlRpX+fH15NpbaD+uM57OCsTYGKlIR7U="; - }) - # Added a condition to use the new timespec_t on gpsd APIs >= 9 - (fetchpatch { - url = "https://github.com/openstreetmap/merkaartor/commit/13b358fa7899bb34e277b32a4c0d92833050f2c6.patch"; - sha256 = "129fpjm7illz7ngx3shps5ivrxwf14apw55842xhskwwb0rf5szb"; - }) - ]; - nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ gdal proj qtsvg qtwebkit ] + buildInputs = [ gdal proj qtsvg qtwebengine ] ++ lib.optional withGeoimage exiv2 ++ lib.optional withGpsdlib gpsd ++ lib.optional withLibproxy libproxy @@ -52,8 +38,10 @@ mkDerivation rec { lrelease src/src.pro ''; - qmakeFlags = [ "TRANSDIR_SYSTEM=${qttranslations}/translations" ] - ++ lib.optional withGeoimage "GEOIMAGE=1" + qmakeFlags = [ + "TRANSDIR_SYSTEM=${qttranslations}/translations" + "USEWEBENGINE=1" + ] ++ lib.optional withGeoimage "GEOIMAGE=1" ++ lib.optional withGpsdlib "GPSDLIB=1" ++ lib.optional withLibproxy "LIBPROXY=1" ++ lib.optional withZbar "ZBAR=1"; From 8d8a28b47b7c41aeb4ad01a2bd8b7d26986c3512 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 28 Aug 2021 16:19:09 +0800 Subject: [PATCH 063/103] goimapnotify: 2.0 -> 2.3.2 --- .../tools/networking/goimapnotify/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/goimapnotify/default.nix b/pkgs/tools/networking/goimapnotify/default.nix index 619e364c884f..968d5774b5b5 100644 --- a/pkgs/tools/networking/goimapnotify/default.nix +++ b/pkgs/tools/networking/goimapnotify/default.nix @@ -1,23 +1,23 @@ -{ buildGoPackage, fetchFromGitLab, lib, runtimeShell }: +{ buildGoModule, fetchFromGitLab, lib, runtimeShell }: -buildGoPackage rec { +buildGoModule rec { pname = "goimapnotify"; - version = "2.0"; - - goPackagePath = "gitlab.com/shackra/goimapnotify"; + version = "2.3.2"; src = fetchFromGitLab { owner = "shackra"; repo = "goimapnotify"; rev = version; - sha256 = "1d42gd3m2rkvy985d181dbcm5i3f7xsg2z8z6s4bpvw24pfnzs42"; + sha256 = "sha256-pkpdIkabxz9bu0LnyU1/wu1qqPc/pQqCn8tePc2fIfg="; }; - postPatch = '' - substituteInPlace command.go --replace '"sh"' '"${runtimeShell}"' - ''; + vendorSha256 = "sha256-4+2p/7BAEk+1V0TII9Q2O2YNX0rvBiw2Ss7k1dsvUbk="; - goDeps = ./deps.nix; + postPatch = '' + for f in command.go command_test.go; do + substituteInPlace $f --replace '"sh"' '"${runtimeShell}"' + done + ''; meta = with lib; { description = From f7286acdae6382fc868c7764943ac9b1c4799090 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Fri, 6 Aug 2021 21:22:13 +0300 Subject: [PATCH 064/103] linuxPackages.tuxedo-keyboard: 3.0.7 -> 3.0.8 --- pkgs/os-specific/linux/tuxedo-keyboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index 17f8b3a28c4e..57098d1576ad 100644 --- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tuxedo-keyboard-${kernel.version}"; - version = "3.0.7"; + version = "3.0.8"; src = fetchFromGitHub { owner = "tuxedocomputers"; repo = "tuxedo-keyboard"; rev = "v${version}"; - sha256 = "sha256-JloLwfJfDdVowx1hOehjxPbnaKBCAMn7SZe09SE03HU="; + sha256 = "1rv3ns4n61v18cpnp36zi47jpnqhj410yzi8b307ghiyriapbijv"; }; buildInputs = [ linuxHeaders ]; From 2e6d563067c620d42c9d63911a637793698273eb Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Fri, 6 Aug 2021 21:27:29 +0300 Subject: [PATCH 065/103] linuxPackages.tuxedo-keyboard: expose all kernel modules This commit exposes in addition to the tuxedo-keyboard module: - clevo_acpi - clevo_wmi - tuxedo_io These modules are required to run the Tuxedo Control Center. --- pkgs/os-specific/linux/tuxedo-keyboard/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index 57098d1576ad..563e1333b87f 100644 --- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -17,7 +17,10 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out/lib/modules/${kernel.modDirVersion}" - mv src/tuxedo_keyboard.ko $out/lib/modules/${kernel.modDirVersion} + + for module in clevo_acpi.ko clevo_wmi.ko tuxedo_keyboard.ko tuxedo_io/tuxedo_io.ko; do + mv src/$module $out/lib/modules/${kernel.modDirVersion} + done ''; meta = with lib; { From e5ad4c72a48cd0f3a81d2a78ad8d02930e75b7ae Mon Sep 17 00:00:00 2001 From: Alexander Kiselyov Date: Sun, 29 Aug 2021 23:10:43 +0300 Subject: [PATCH 066/103] iperf: 3.9 -> 3.10.1 (#136027) --- pkgs/tools/networking/iperf/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index 5ab3f7f30fbd..f32a4249c006 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iperf"; - version = "3.9"; + version = "3.10.1"; src = fetchurl { url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz"; - sha256 = "0f601avdmzpwsa3lbi0ppjhkrdipm5wifhhxy5czf99370k3mdi4"; + sha256 = "0nkisr2215w68ivadg3sx3q50iwamznwigs63lclb8jlrih9gg03"; }; buildInputs = [ openssl ]; From 4a67110bee8c006e94c3f4243963da7edeebe4a8 Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Sun, 29 Aug 2021 18:10:59 -0400 Subject: [PATCH 067/103] silver-searcher: add meta.mainProgram --- pkgs/tools/text/silver-searcher/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 8cd67b99263c..757c65eed848 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ggreer/the_silver_searcher/"; description = "A code-searching tool similar to ack, but faster"; maintainers = with maintainers; [ madjar ]; + mainProgram = "ag"; platforms = platforms.all; license = licenses.asl20; }; From 0a913855a1acaf3a5525f12946ba9f700e2d3970 Mon Sep 17 00:00:00 2001 From: "\"Matthieu Coudron\"" <"mcoudron@hotmail.com"> Date: Mon, 30 Aug 2021 00:15:29 +0200 Subject: [PATCH 068/103] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 1054 +++++++++++++-------------- 1 file changed, 527 insertions(+), 527 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 45e72bc23cd2..25804216adf0 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4,7 +4,7 @@ final: prev: { a-vim = buildVimPluginFrom2Nix { - pname = "a-vim"; + pname = "a.vim"; version = "2010-11-06"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -16,7 +16,7 @@ final: prev: }; ack-vim = buildVimPluginFrom2Nix { - pname = "ack-vim"; + pname = "ack.vim"; version = "2018-02-27"; src = fetchFromGitHub { owner = "mileszs"; @@ -40,7 +40,7 @@ final: prev: }; aerial-nvim = buildVimPluginFrom2Nix { - pname = "aerial-nvim"; + pname = "aerial.nvim"; version = "2021-07-17"; src = fetchFromGitHub { owner = "stevearc"; @@ -64,7 +64,7 @@ final: prev: }; alchemist-vim = buildVimPluginFrom2Nix { - pname = "alchemist-vim"; + pname = "alchemist.vim"; version = "2020-04-27"; src = fetchFromGitHub { owner = "slashmili"; @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-08-21"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "f896744feec260fb196d38bba23308080c04192c"; - sha256 = "1j30gi0arpmya26cjcd5spdb1l7p4djkvpkfvd267bs2fdyh958q"; + rev = "d53a085096306c890897385692693ee653aaddce"; + sha256 = "1szqvs8dzi14pgpx8pyphc5ihkn5n9rd97zrgizf6kv475h14w43"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -136,7 +136,7 @@ final: prev: }; arcanist-vim = buildVimPluginFrom2Nix { - pname = "arcanist-vim"; + pname = "arcanist.vim"; version = "2016-05-27"; src = fetchFromGitHub { owner = "solarnz"; @@ -148,7 +148,7 @@ final: prev: }; argtextobj-vim = buildVimPluginFrom2Nix { - pname = "argtextobj-vim"; + pname = "argtextobj.vim"; version = "2010-10-18"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -160,7 +160,7 @@ final: prev: }; async-vim = buildVimPluginFrom2Nix { - pname = "async-vim"; + pname = "async.vim"; version = "2021-03-21"; src = fetchFromGitHub { owner = "prabirshrestha"; @@ -172,7 +172,7 @@ final: prev: }; asyncomplete-vim = buildVimPluginFrom2Nix { - pname = "asyncomplete-vim"; + pname = "asyncomplete.vim"; version = "2021-08-19"; src = fetchFromGitHub { owner = "prabirshrestha"; @@ -233,18 +233,18 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-08-16"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "acd1a7031e71ed053348c2cd4ef3408f4fdfbb19"; - sha256 = "0vxk17p37a2fs9gm68wdlfqfyw8jzw3hp1yjg0n3b4yppl9j50r5"; + rev = "153ec834cf533519cf4951900b70edc3f5e01732"; + sha256 = "0ilv67h2ppp1gv31j50qdhyz2y5ls1lwdqxnpqrbx2hcjgi1vh5j"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; autoload_cscope-vim = buildVimPluginFrom2Nix { - pname = "autoload_cscope-vim"; + pname = "autoload_cscope.vim"; version = "2011-01-28"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -280,7 +280,7 @@ final: prev: }; barbar-nvim = buildVimPluginFrom2Nix { - pname = "barbar-nvim"; + pname = "barbar.nvim"; version = "2021-08-16"; src = fetchFromGitHub { owner = "romgrk"; @@ -304,7 +304,7 @@ final: prev: }; bats-vim = buildVimPluginFrom2Nix { - pname = "bats-vim"; + pname = "bats.vim"; version = "2013-07-03"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -316,7 +316,7 @@ final: prev: }; bclose-vim = buildVimPluginFrom2Nix { - pname = "bclose-vim"; + pname = "bclose.vim"; version = "2018-10-10"; src = fetchFromGitHub { owner = "rbgrouleff"; @@ -328,7 +328,7 @@ final: prev: }; BetterLua-vim = buildVimPluginFrom2Nix { - pname = "BetterLua-vim"; + pname = "BetterLua.vim"; version = "2020-08-14"; src = fetchFromGitHub { owner = "euclidianAce"; @@ -340,7 +340,7 @@ final: prev: }; bracey-vim = buildVimPluginFrom2Nix { - pname = "bracey-vim"; + pname = "bracey.vim"; version = "2021-08-20"; src = fetchFromGitHub { owner = "turbio"; @@ -364,7 +364,7 @@ final: prev: }; bufdelete-nvim = buildVimPluginFrom2Nix { - pname = "bufdelete-nvim"; + pname = "bufdelete.nvim"; version = "2021-07-24"; src = fetchFromGitHub { owner = "famiu"; @@ -388,19 +388,19 @@ final: prev: }; bufferline-nvim = buildVimPluginFrom2Nix { - pname = "bufferline-nvim"; - version = "2021-08-23"; + pname = "bufferline.nvim"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "21fda2cfb4c692f91e4df486dc2e28a37c628a76"; - sha256 = "05wi1zb1b3b08av3l8i40jggvb2mpkqmg0w8dqhxannblfkk8h8c"; + rev = "f7385058be7822d01fcbec9991ed7e76b26fc2c8"; + sha256 = "1xz617k543wi9pj4mmm71y6pmsv1aydnkkgnjripm6g37mgxgk1v"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; BufOnly-vim = buildVimPluginFrom2Nix { - pname = "BufOnly-vim"; + pname = "BufOnly.vim"; version = "2010-10-18"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -412,7 +412,7 @@ final: prev: }; calendar-vim = buildVimPluginFrom2Nix { - pname = "calendar-vim"; + pname = "calendar.vim"; version = "2021-01-30"; src = fetchFromGitHub { owner = "itchyny"; @@ -436,7 +436,7 @@ final: prev: }; caw-vim = buildVimPluginFrom2Nix { - pname = "caw-vim"; + pname = "caw.vim"; version = "2021-08-21"; src = fetchFromGitHub { owner = "tyru"; @@ -449,18 +449,18 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-08-23"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "d8089b752346fdccdd4fe85cec82c0f9919823fa"; - sha256 = "12nn4467jhhfi2vwsywzf6fqadwjsymmmmny5d4jsbz3l5xhcfmz"; + rev = "72e7b5df88eebc9ddf73a9b8bff7d5b13129b5c3"; + sha256 = "08j0l6p63sv2gjdyydzw2r4gl7nh90zcr82y0gj3pghdn0w690wn"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; changeColorScheme-vim = buildVimPluginFrom2Nix { - pname = "changeColorScheme-vim"; + pname = "changeColorScheme.vim"; version = "2010-10-18"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -508,7 +508,7 @@ final: prev: }; clever-f-vim = buildVimPluginFrom2Nix { - pname = "clever-f-vim"; + pname = "clever-f.vim"; version = "2021-07-07"; src = fetchFromGitHub { owner = "rhysd"; @@ -532,7 +532,7 @@ final: prev: }; cmd-parser-nvim = buildVimPluginFrom2Nix { - pname = "cmd-parser-nvim"; + pname = "cmd-parser.nvim"; version = "2021-05-30"; src = fetchFromGitHub { owner = "winston0410"; @@ -545,96 +545,96 @@ final: prev: cmp-buffer = buildVimPluginFrom2Nix { pname = "cmp-buffer"; - version = "2021-08-11"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-buffer"; - rev = "5742a1b18ebb4ffc21cd07a312bf8bacba4c81ae"; - sha256 = "0nh53gqzbm500rvwc59hbl1sg12qzpk8za3z6rvsg04s6rqv479f"; + rev = "a5774490b5ea8df8ce9e80ef4ec131cb4541702e"; + sha256 = "0zhcrx4bxcqbfs6ri31qrqd285w46fvljgmk2cymwgcm4h0bm0vx"; }; meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; }; cmp-calc = buildVimPluginFrom2Nix { pname = "cmp-calc"; - version = "2021-08-08"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-calc"; - rev = "bac4f988d14665a6a681df3646ff1baa2affc2da"; - sha256 = "09g5pglbfzgnzl0lbn1fa27fh88a5pv2s2agmbw0gh4idnrvi66x"; + rev = "cda036bfd147288c107b840e917fdd0a3e18f404"; + sha256 = "1s2sx9pzafrs0132qh7jym9kppyz9rk2hs3sdnizj62m4d3lwm5l"; }; meta.homepage = "https://github.com/hrsh7th/cmp-calc/"; }; cmp-emoji = buildVimPluginFrom2Nix { pname = "cmp-emoji"; - version = "2021-08-09"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-emoji"; - rev = "a80d20b3461b802b3ff6f4cd60f7b99399fd7757"; - sha256 = "0q70zbd4fw6x62zar7ph1dp6zwri6dqnyprl58p6w3k5n4xgpdrf"; + rev = "bbdcc00ecbae3bba18c648a6520d78f354853ce0"; + sha256 = "0zsda2dhhvqd1968xr6p8ndpai4vhb8xmk08nv038zg9csrqkqac"; }; meta.homepage = "https://github.com/hrsh7th/cmp-emoji/"; }; cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2021-08-23"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "899f70af0786d4100fb29987b9ab03eac7eedd6a"; - sha256 = "1gw478b77smkn3k42h2q3ddq2kcd7vm6mnmjmksvbsfv5xp9pln0"; + rev = "9af212372c41e94d55603dea8ad9700f6c31573d"; + sha256 = "1r460l4rr5g94zpsknlxb3jxvbznd37f8zsqphapzb12fmxbs814"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; cmp-nvim-lua = buildVimPluginFrom2Nix { pname = "cmp-nvim-lua"; - version = "2021-08-17"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lua"; - rev = "6bcd10433e48dc50f5330d113bd6ec6647f128dc"; - sha256 = "1nkncgrp95li2403wkcph1bglcdnlbj2pjybqx5rp27pazpi5rga"; + rev = "8046f26eb6b225890987517b55f611d4fe6d1cf3"; + sha256 = "1wii287lbphnf6w6xqbbqg1nby13wrnm2g4v5l0fqiwpgrc9p82q"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lua/"; }; cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; - version = "2021-08-09"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-path"; - rev = "175a3854242f7dd43d706e2e0acc4f08ab1ed9ee"; - sha256 = "1pimzhp5hh9gg7f37x4mklxxg44a7fnzli7mv46p73b3w97vkbl4"; + rev = "48df45154ee644edf1b955d325be60928dd28d47"; + sha256 = "0c8y3i0p2li0r0jqg4ngw2cfh9jy21832nl9x45yfbwmh6gfw8qd"; }; meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; cmp-vsnip = buildVimPluginFrom2Nix { pname = "cmp-vsnip"; - version = "2021-08-13"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-vsnip"; - rev = "1f7c99719adbb2258c697dc43c31729ab73a8d99"; - sha256 = "1a252mzi5nzcml2g52g5nwlih40dh19yshns6dlk5gmfwa0mf3z6"; + rev = "1588c35bf8f637e8f5287477f31895781858f970"; + sha256 = "0q3z0f7d53cbqidx8qd3z48b46a83l5ay54iw525w22j1kki3aaw"; }; meta.homepage = "https://github.com/hrsh7th/cmp-vsnip/"; }; cmp_luasnip = buildVimPluginFrom2Nix { pname = "cmp_luasnip"; - version = "2021-08-21"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "saadparwaiz1"; repo = "cmp_luasnip"; - rev = "fc033ce441b29f1755fd2314125772d21e5c5127"; - sha256 = "1np6x7wybh7w1m06h03sczv35a7ag3j37a8sk0yjcm95vysmwikd"; + rev = "da37737ab9c569013827d60915f8d598c1483bbc"; + sha256 = "1gjgghy9kbj6j7d4s73b0nlwwk91raf7nd67b2hmpqkfrnfavb38"; }; meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; @@ -677,12 +677,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-07-22"; + version = "2021-08-24"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "b9b2b1c0991ab1a5d3b5822296c341815da00f6c"; - sha256 = "1f6g0vhd8x90j75f60j4k7ii1zi9y0nhzrahk5h04gr2qm9pnvsf"; + rev = "94583be510649b80de60a9263095fbbbbfee06e6"; + sha256 = "1qjwks027hlbv637cbkimp5f9957rg73my1zfhq8d7a0r4gzv643"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -712,7 +712,7 @@ final: prev: }; coc-nvim = buildVimPluginFrom2Nix { - pname = "coc-nvim"; + pname = "coc.nvim"; version = "2021-08-23"; src = fetchFromGitHub { owner = "neoclide"; @@ -724,7 +724,7 @@ final: prev: }; codi-vim = buildVimPluginFrom2Nix { - pname = "codi-vim"; + pname = "codi.vim"; version = "2021-01-11"; src = fetchFromGitHub { owner = "metakirby5"; @@ -736,7 +736,7 @@ final: prev: }; colorbuddy-nvim = buildVimPluginFrom2Nix { - pname = "colorbuddy-nvim"; + pname = "colorbuddy.nvim"; version = "2021-04-16"; src = fetchFromGitHub { owner = "tjdevries"; @@ -785,7 +785,7 @@ final: prev: }; committia-vim = buildVimPluginFrom2Nix { - pname = "committia-vim"; + pname = "committia.vim"; version = "2020-08-27"; src = fetchFromGitHub { owner = "rhysd"; @@ -834,12 +834,12 @@ final: prev: compe-tmux = buildVimPluginFrom2Nix { pname = "compe-tmux"; - version = "2021-08-19"; + version = "2021-08-24"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "compe-tmux"; - rev = "9109c5e39881cc300518888d5cd501606cbb7e0f"; - sha256 = "15n1r2dnxbbx49xv5i4aq5vkxf8rn3fviwz886hpcxvzxp39gw35"; + rev = "881b5255e12fef6c28e1039f4afeb77626205b24"; + sha256 = "1l2bvjhwi2s33cp6m58gvi9k2hpg3sdv9048ah8xk0rjd7kb2adn"; }; meta.homepage = "https://github.com/andersevenrud/compe-tmux/"; }; @@ -905,7 +905,7 @@ final: prev: }; concealedyank-vim = buildVimPluginFrom2Nix { - pname = "concealedyank-vim"; + pname = "concealedyank.vim"; version = "2013-03-24"; src = fetchFromGitHub { owner = "chikatoike"; @@ -917,7 +917,7 @@ final: prev: }; conflict-marker-vim = buildVimPluginFrom2Nix { - pname = "conflict-marker-vim"; + pname = "conflict-marker.vim"; version = "2020-09-23"; src = fetchFromGitHub { owner = "rhysd"; @@ -941,7 +941,7 @@ final: prev: }; context_filetype-vim = buildVimPluginFrom2Nix { - pname = "context_filetype-vim"; + pname = "context_filetype.vim"; version = "2021-08-08"; src = fetchFromGitHub { owner = "Shougo"; @@ -953,7 +953,7 @@ final: prev: }; coq-vim = buildVimPluginFrom2Nix { - pname = "coq-vim"; + pname = "coq.vim"; version = "2013-01-16"; src = fetchFromGitHub { owner = "jvoorhis"; @@ -966,18 +966,18 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-08-23"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "b292682c16176f961e11e1e68eb799d9b1b3e4e9"; - sha256 = "1278z0rgvg65kprxyg02yl2fixrfy9pg5fj3d796nc607ipzdhvb"; + rev = "13147545ffe61def7d3bb1123c5c843715e9565c"; + sha256 = "0jr6c0s7g54ra8w5r5b8j6hx16ch7cg9rj60jakbqfc1qdi5y9jm"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; cosco-vim = buildVimPluginFrom2Nix { - pname = "cosco-vim"; + pname = "cosco.vim"; version = "2018-08-07"; src = fetchFromGitHub { owner = "lfilho"; @@ -1013,7 +1013,7 @@ final: prev: }; csv-vim = buildVimPluginFrom2Nix { - pname = "csv-vim"; + pname = "csv.vim"; version = "2021-06-29"; src = fetchFromGitHub { owner = "chrisbra"; @@ -1061,7 +1061,7 @@ final: prev: }; ctrlp-vim = buildVimPluginFrom2Nix { - pname = "ctrlp-vim"; + pname = "ctrlp.vim"; version = "2021-04-18"; src = fetchFromGitHub { owner = "ctrlpvim"; @@ -1121,7 +1121,7 @@ final: prev: }; defx-nvim = buildVimPluginFrom2Nix { - pname = "defx-nvim"; + pname = "defx.nvim"; version = "2021-08-18"; src = fetchFromGitHub { owner = "Shougo"; @@ -1169,25 +1169,25 @@ final: prev: }; denite-nvim = buildVimPluginFrom2Nix { - pname = "denite-nvim"; - version = "2021-08-21"; + pname = "denite.nvim"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "bde582bc5c898ce849c586255a71cec5eccef194"; - sha256 = "0p090sh70n1kxdv0wl7nby596gvlkyk7p2rbgl5z4igqqdaizdh3"; + rev = "6260889ce501ea6f09967e23295bc2adf5cc480f"; + sha256 = "1akps9sxcyi9q07mg0vrn4fqhanmzx82npbillq0qbv8y41s75f5"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { - pname = "deol-nvim"; - version = "2021-08-18"; + pname = "deol.nvim"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "a2c6bbcf4125c9256773c1c8cfb48b4179686e77"; - sha256 = "04afx7hfch9vyvm2s2i93vylk5ar1sjc8sdqszqqj7fnlz53f8db"; + rev = "355ae1f71be51faacd40a38e1046f1b1edef5788"; + sha256 = "1zwmhcjd5ygd3qq7jcb5yvprv081azwmp4x2cg3ijlazgh610ssa"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -1411,19 +1411,19 @@ final: prev: }; deoplete-nvim = buildVimPluginFrom2Nix { - pname = "deoplete-nvim"; - version = "2021-08-11"; + pname = "deoplete.nvim"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "4caf12730256579921d77e80423b339b8128c5b6"; - sha256 = "0zcaxqgmjkps4vlrgd8vdq2b6ys9raj2fhg9xkvlkn5q1pz764f2"; + rev = "ec9f260e5c37ee3023ab12d2e6d40d81b615d9c4"; + sha256 = "1d62fmmj68n1zn847w0j9jgjfd32fxqzh1ynbvws2awiv2vzaiga"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; devdocs-vim = buildVimPluginFrom2Nix { - pname = "devdocs-vim"; + pname = "devdocs.vim"; version = "2018-08-27"; src = fetchFromGitHub { owner = "rhysd"; @@ -1459,7 +1459,7 @@ final: prev: }; diffview-nvim = buildVimPluginFrom2Nix { - pname = "diffview-nvim"; + pname = "diffview.nvim"; version = "2021-08-20"; src = fetchFromGitHub { owner = "sindrets"; @@ -1471,7 +1471,7 @@ final: prev: }; direnv-vim = buildVimPluginFrom2Nix { - pname = "direnv-vim"; + pname = "direnv.vim"; version = "2020-11-20"; src = fetchFromGitHub { owner = "direnv"; @@ -1495,7 +1495,7 @@ final: prev: }; DoxygenToolkit-vim = buildVimPluginFrom2Nix { - pname = "DoxygenToolkit-vim"; + pname = "DoxygenToolkit.vim"; version = "2010-11-06"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -1519,7 +1519,7 @@ final: prev: }; echodoc-vim = buildVimPluginFrom2Nix { - pname = "echodoc-vim"; + pname = "echodoc.vim"; version = "2021-08-12"; src = fetchFromGitHub { owner = "Shougo"; @@ -1532,12 +1532,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-08-10"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "c13057303e04f32c2f6c5682f553e2f3e744e262"; - sha256 = "1mqsi5i6zxylgpcn40qmgf6r9f3z2v8w0f8ngyb41v4z05zychxg"; + rev = "5e6f2796eb21c0111b251daf7b78763cb4b03352"; + sha256 = "0nx5ihgrspnfaa5q0al3v159xix8y70l3h7j8br2zk85zmc8bmnp"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -1556,7 +1556,7 @@ final: prev: }; editorconfig-nvim = buildVimPluginFrom2Nix { - pname = "editorconfig-nvim"; + pname = "editorconfig.nvim"; version = "2021-08-18"; src = fetchFromGitHub { owner = "gpanders"; @@ -1580,7 +1580,7 @@ final: prev: }; elvish-vim = buildVimPluginFrom2Nix { - pname = "elvish-vim"; + pname = "elvish.vim"; version = "2019-06-29"; src = fetchFromGitHub { owner = "dmix"; @@ -1653,7 +1653,7 @@ final: prev: }; far-vim = buildVimPluginFrom2Nix { - pname = "far-vim"; + pname = "far.vim"; version = "2021-02-19"; src = fetchFromGitHub { owner = "brooth"; @@ -1677,7 +1677,7 @@ final: prev: }; fcitx-vim = buildVimPluginFrom2Nix { - pname = "fcitx-vim"; + pname = "fcitx.vim"; version = "2021-08-20"; src = fetchFromGitHub { owner = "lilydjwg"; @@ -1689,19 +1689,19 @@ final: prev: }; feline-nvim = buildVimPluginFrom2Nix { - pname = "feline-nvim"; - version = "2021-07-30"; + pname = "feline.nvim"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "famiu"; repo = "feline.nvim"; - rev = "9977073d8f5c064785ff6b44aad30cbc6d887da0"; - sha256 = "1cpk0jyhgx93bvjpc76gjp671k53av8mj6d19j4zwm3xm5v1by2p"; + rev = "6fd862ecd5232c59647949c836b2f7f4409ef3d1"; + sha256 = "1wpwyn3mbkfg8g7yzsmckfs1wv1mdyj4ppvs6m3n2cdab91diq8a"; }; meta.homepage = "https://github.com/famiu/feline.nvim/"; }; fennel-vim = buildVimPluginFrom2Nix { - pname = "fennel-vim"; + pname = "fennel.vim"; version = "2020-11-15"; src = fetchFromGitHub { owner = "bakpakin"; @@ -1713,7 +1713,7 @@ final: prev: }; fern-vim = buildVimPluginFrom2Nix { - pname = "fern-vim"; + pname = "fern.vim"; version = "2021-08-08"; src = fetchFromGitHub { owner = "lambdalisue"; @@ -1749,7 +1749,7 @@ final: prev: }; FixCursorHold-nvim = buildVimPluginFrom2Nix { - pname = "FixCursorHold-nvim"; + pname = "FixCursorHold.nvim"; version = "2021-04-16"; src = fetchFromGitHub { owner = "antoinemadec"; @@ -1774,7 +1774,7 @@ final: prev: }; float-preview-nvim = buildVimPluginFrom2Nix { - pname = "float-preview-nvim"; + pname = "float-preview.nvim"; version = "2020-11-03"; src = fetchFromGitHub { owner = "ncm2"; @@ -1786,7 +1786,7 @@ final: prev: }; floating-nvim = buildVimPluginFrom2Nix { - pname = "floating-nvim"; + pname = "floating.nvim"; version = "2021-07-19"; src = fetchFromGitHub { owner = "fhill2"; @@ -1810,13 +1810,13 @@ final: prev: }; formatter-nvim = buildVimPluginFrom2Nix { - pname = "formatter-nvim"; - version = "2021-07-28"; + pname = "formatter.nvim"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "51f10c8acc610d787cad2257224cee92b40216e5"; - sha256 = "15jkrypcd3fa6vcz035yvcpd1rfrxcwvp93mqnihm0g1a74klrql"; + rev = "c80405aca78fda2f8da586d7d087c13fdd500d85"; + sha256 = "07s7yw0l9xbf55x67yqcxi5r1y9nj5pjx69rl38jffw1l6lnnbgj"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; @@ -1835,12 +1835,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-08-23"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "d438b0fc71447c502029320377f0ed53603b9e0c"; - sha256 = "0hnn5rlm9gb59afbfi78rs5lp9fq844x8qrpqnwi0kcz8b3d6bp7"; + rev = "53c823f92f159107efa238ad1a5837f63ecb4c2b"; + sha256 = "0sb8l0f7wzbhyr0aq5kjmn4c4llhi49ka9brhwkn24rhkizyyl51"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -1858,19 +1858,19 @@ final: prev: }; fugitive-gitlab-vim = buildVimPluginFrom2Nix { - pname = "fugitive-gitlab-vim"; - version = "2019-10-24"; + pname = "fugitive-gitlab.vim"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "shumphrey"; repo = "fugitive-gitlab.vim"; - rev = "f3e56ff60fe3fb5ebc891cbe5fd12cd8c59ae6ef"; - sha256 = "0cx3zd7f09prxjfrj201139j00wsw66fx5crw6dhblf4z6mfpgnx"; + rev = "ff66c9cd338733a130d22422179a0071feebdc28"; + sha256 = "1l0qskjgl08izy1vw1sqk5218w1dh94003g1bsjrkik04slq6q0z"; }; meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/"; }; fwatch-nvim = buildVimPluginFrom2Nix { - pname = "fwatch-nvim"; + pname = "fwatch.nvim"; version = "2021-07-25"; src = fetchFromGitHub { owner = "rktjmp"; @@ -1882,7 +1882,7 @@ final: prev: }; fzf-checkout-vim = buildVimPluginFrom2Nix { - pname = "fzf-checkout-vim"; + pname = "fzf-checkout.vim"; version = "2021-06-25"; src = fetchFromGitHub { owner = "stsewd"; @@ -1894,7 +1894,7 @@ final: prev: }; fzf-lsp-nvim = buildVimPluginFrom2Nix { - pname = "fzf-lsp-nvim"; + pname = "fzf-lsp.nvim"; version = "2021-06-20"; src = fetchFromGitHub { owner = "gfanto"; @@ -1906,7 +1906,7 @@ final: prev: }; fzf-vim = buildVimPluginFrom2Nix { - pname = "fzf-vim"; + pname = "fzf.vim"; version = "2021-08-17"; src = fetchFromGitHub { owner = "junegunn"; @@ -1918,7 +1918,7 @@ final: prev: }; galaxyline-nvim = buildVimPluginFrom2Nix { - pname = "galaxyline-nvim"; + pname = "galaxyline.nvim"; version = "2021-04-25"; src = fetchFromGitHub { owner = "glepnir"; @@ -1930,7 +1930,7 @@ final: prev: }; gen_tags-vim = buildVimPluginFrom2Nix { - pname = "gen_tags-vim"; + pname = "gen_tags.vim"; version = "2020-10-12"; src = fetchFromGitHub { owner = "jsfaint"; @@ -1943,12 +1943,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2021-07-16"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "14aec3bde121c797f9131da0d4b18a932598bb8f"; - sha256 = "1mcn4dhwjay5c0y650y2rxz9acxwfsninwrvp20ssgi4gcw2vg76"; + rev = "481e8732b8fc4fba3ff5be02f0f8b48f612a556f"; + sha256 = "0iilbkc3jf6lkjbj2cw64nd05nhwmlfmj4kvj27mmhyx1z2hv72n"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -1978,7 +1978,7 @@ final: prev: }; gina-vim = buildVimPluginFrom2Nix { - pname = "gina-vim"; + pname = "gina.vim"; version = "2021-06-12"; src = fetchFromGitHub { owner = "lambdalisue"; @@ -1990,7 +1990,7 @@ final: prev: }; git-blame-nvim = buildVimPluginFrom2Nix { - pname = "git-blame-nvim"; + pname = "git-blame.nvim"; version = "2021-06-14"; src = fetchFromGitHub { owner = "f-person"; @@ -2002,7 +2002,7 @@ final: prev: }; git-messenger-vim = buildVimPluginFrom2Nix { - pname = "git-messenger-vim"; + pname = "git-messenger.vim"; version = "2021-06-06"; src = fetchFromGitHub { owner = "rhysd"; @@ -2014,19 +2014,19 @@ final: prev: }; git-worktree-nvim = buildVimPluginFrom2Nix { - pname = "git-worktree-nvim"; - version = "2021-08-18"; + pname = "git-worktree.nvim"; + version = "2021-08-24"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "git-worktree.nvim"; - rev = "57359f59bfa391360744236c6ca01f38374257fd"; - sha256 = "1v0wqzp6sp214m83hy2fxx59b0h5lihfw3rkrvk07hixi3qg71dm"; + rev = "e562d8a3baa6c96d148944592a2d7c88f48927f2"; + sha256 = "1c78pjycvnkq28ar7bp0xiadyd3jml596hsw0fsxvbdwba4a7ikk"; }; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; gitignore-vim = buildVimPluginFrom2Nix { - pname = "gitignore-vim"; + pname = "gitignore.vim"; version = "2014-03-16"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -2038,7 +2038,7 @@ final: prev: }; gitlinker-nvim = buildVimPluginFrom2Nix { - pname = "gitlinker-nvim"; + pname = "gitlinker.nvim"; version = "2021-07-15"; src = fetchFromGitHub { owner = "ruifm"; @@ -2050,13 +2050,13 @@ final: prev: }; gitsigns-nvim = buildVimPluginFrom2Nix { - pname = "gitsigns-nvim"; - version = "2021-08-23"; + pname = "gitsigns.nvim"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "1ddb1f64f5fb15dac2d02e52af918d1fb11feb2d"; - sha256 = "0y33dsxhw55h28kvqq3655cmnl4nq4z497v69xa72872gf1dsi80"; + rev = "daa233aabb4dbc7c870ea7300bcfeef96d49c2a3"; + sha256 = "0y0il8v0g8kvsyzir4hbkwvzv9wk2iqs1apxlvijk9ccfdk9ya0p"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2074,7 +2074,7 @@ final: prev: }; gleam-vim = buildVimPluginFrom2Nix { - pname = "gleam-vim"; + pname = "gleam.vim"; version = "2020-06-24"; src = fetchFromGitHub { owner = "gleam-lang"; @@ -2086,13 +2086,13 @@ final: prev: }; glow-nvim = buildVimPluginFrom2Nix { - pname = "glow-nvim"; - version = "2021-08-20"; + pname = "glow.nvim"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "a6ee89368525e59fd4e834ee59bd5df6327ee949"; - sha256 = "1nh06qipvyb66kzgc20c7b3fjxdibjmdazc6lkbkk2gbc42nghb7"; + rev = "39af2f2e38f7485218c0557bb173713bc4326e7c"; + sha256 = "0w3jk9dcxwnnrx9j9v5idh57wh3knp4pwm3lcvhk9gs9511i5iyq"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -2134,7 +2134,7 @@ final: prev: }; goyo-vim = buildVimPluginFrom2Nix { - pname = "goyo-vim"; + pname = "goyo.vim"; version = "2020-08-29"; src = fetchFromGitHub { owner = "junegunn"; @@ -2170,7 +2170,7 @@ final: prev: }; gruvbox-flat-nvim = buildVimPluginFrom2Nix { - pname = "gruvbox-flat-nvim"; + pname = "gruvbox-flat.nvim"; version = "2021-08-17"; src = fetchFromGitHub { owner = "eddyekofo94"; @@ -2183,18 +2183,18 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2021-08-10"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "04fc67660a87adc2edbbc0b4b39d379e45c3baf8"; - sha256 = "03yi4n4xx3a2sbnl2s61wk8w1ncrjm4f9hpi2i4566a4fmh6mm1p"; + rev = "a4981196553db1aaf8b071a807f2d0cf131171aa"; + sha256 = "0m0q8pmwkdyn4yqjm2k5i7gsf1b0xij03vvpghnp8k1khv11r8sx"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { - pname = "gruvbox-nvim"; + pname = "gruvbox.nvim"; version = "2021-08-19"; src = fetchFromGitHub { owner = "ellisonleao"; @@ -2206,7 +2206,7 @@ final: prev: }; gundo-vim = buildVimPluginFrom2Nix { - pname = "gundo-vim"; + pname = "gundo.vim"; version = "2021-02-21"; src = fetchFromGitHub { owner = "sjl"; @@ -2218,13 +2218,13 @@ final: prev: }; gv-vim = buildVimPluginFrom2Nix { - pname = "gv-vim"; - version = "2021-05-27"; + pname = "gv.vim"; + version = "2021-08-24"; src = fetchFromGitHub { owner = "junegunn"; repo = "gv.vim"; - rev = "5f902f4f7d06ef084ffd6cddcd1ee7d3c9a793c6"; - sha256 = "0am6sip4q14v2cvf9dmq6jkh37nhdhbvs466619qyd48qxcf9k9n"; + rev = "6f6a3afe73a2cb52d8517d1a95ecfc9b09fb3e92"; + sha256 = "1j1yqanqcndxzi3r3d3pvgjh14bw28sfy0ik5jh8zvggkl240sqn"; }; meta.homepage = "https://github.com/junegunn/gv.vim/"; }; @@ -2278,7 +2278,7 @@ final: prev: }; hologram-nvim = buildVimPluginFrom2Nix { - pname = "hologram-nvim"; + pname = "hologram.nvim"; version = "2021-08-01"; src = fetchFromGitHub { owner = "edluffy"; @@ -2290,7 +2290,7 @@ final: prev: }; hoon-vim = buildVimPluginFrom2Nix { - pname = "hoon-vim"; + pname = "hoon.vim"; version = "2020-11-09"; src = fetchFromGitHub { owner = "urbit"; @@ -2302,7 +2302,7 @@ final: prev: }; hop-nvim = buildVimPluginFrom2Nix { - pname = "hop-nvim"; + pname = "hop.nvim"; version = "2021-07-13"; src = fetchFromGitHub { owner = "phaazon"; @@ -2314,7 +2314,7 @@ final: prev: }; i3config-vim = buildVimPluginFrom2Nix { - pname = "i3config-vim"; + pname = "i3config.vim"; version = "2021-06-23"; src = fetchFromGitHub { owner = "mboughaba"; @@ -2326,7 +2326,7 @@ final: prev: }; iceberg-vim = buildVimPluginFrom2Nix { - pname = "iceberg-vim"; + pname = "iceberg.vim"; version = "2020-12-25"; src = fetchFromGitHub { owner = "cocopon"; @@ -2386,7 +2386,7 @@ final: prev: }; incsearch-easymotion-vim = buildVimPluginFrom2Nix { - pname = "incsearch-easymotion-vim"; + pname = "incsearch-easymotion.vim"; version = "2016-01-18"; src = fetchFromGitHub { owner = "haya14busa"; @@ -2398,7 +2398,7 @@ final: prev: }; incsearch-vim = buildVimPluginFrom2Nix { - pname = "incsearch-vim"; + pname = "incsearch.vim"; version = "2017-11-24"; src = fetchFromGitHub { owner = "haya14busa"; @@ -2410,13 +2410,13 @@ final: prev: }; indent-blankline-nvim = buildVimPluginFrom2Nix { - pname = "indent-blankline-nvim"; - version = "2021-08-21"; + pname = "indent-blankline.nvim"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "f912393a296194e7201523a2a0b0bcd6a009de90"; - sha256 = "093bxpv3l2q25wr6xvdsnr4krlwxds0rq3168nnfwf0hy8645c7c"; + rev = "a702f809ce85b16a83c44016bf10fe5a5765e98d"; + sha256 = "0dizl286642y0h10wa7r6rs6r25rvghkg09g1zvq6dxvi7acfmgm"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2446,7 +2446,7 @@ final: prev: }; investigate-vim = buildVimPluginFrom2Nix { - pname = "investigate-vim"; + pname = "investigate.vim"; version = "2020-02-29"; src = fetchFromGitHub { owner = "keith"; @@ -2482,7 +2482,7 @@ final: prev: }; is-vim = buildVimPluginFrom2Nix { - pname = "is-vim"; + pname = "is.vim"; version = "2020-10-27"; src = fetchFromGitHub { owner = "haya14busa"; @@ -2494,7 +2494,7 @@ final: prev: }; jdaddy-vim = buildVimPluginFrom2Nix { - pname = "jdaddy-vim"; + pname = "jdaddy.vim"; version = "2014-02-22"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -2531,7 +2531,7 @@ final: prev: }; jellybeans-vim = buildVimPluginFrom2Nix { - pname = "jellybeans-vim"; + pname = "jellybeans.vim"; version = "2019-06-22"; src = fetchFromGitHub { owner = "nanotech"; @@ -2555,7 +2555,7 @@ final: prev: }; jq-vim = buildVimPluginFrom2Nix { - pname = "jq-vim"; + pname = "jq.vim"; version = "2019-05-21"; src = fetchFromGitHub { owner = "vito-c"; @@ -2580,12 +2580,12 @@ final: prev: kommentary = buildVimPluginFrom2Nix { pname = "kommentary"; - version = "2021-08-17"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "b3nj5m1n"; repo = "kommentary"; - rev = "a5d7cd90059ad99b5e80a1d40d655756d86b5dad"; - sha256 = "1bgi9dzzlw09llyq09jgnyg7n64s1nk5s5knlkhijrhsw0jmxjkk"; + rev = "09d332c66b7155b14eb22c9129aee44d9d2ff496"; + sha256 = "1cdzsqilnb90wqicjb9v58wiayp8a7wa44q4aw7a5a74yyxysfhy"; }; meta.homepage = "https://github.com/b3nj5m1n/kommentary/"; }; @@ -2603,7 +2603,7 @@ final: prev: }; lalrpop-vim = buildVimPluginFrom2Nix { - pname = "lalrpop-vim"; + pname = "lalrpop.vim"; version = "2017-11-22"; src = fetchFromGitHub { owner = "qnighy"; @@ -2627,7 +2627,7 @@ final: prev: }; LanguageTool-nvim = buildVimPluginFrom2Nix { - pname = "LanguageTool-nvim"; + pname = "LanguageTool.nvim"; version = "2020-10-19"; src = fetchFromGitHub { owner = "vigoux"; @@ -2663,7 +2663,7 @@ final: prev: }; lazygit-nvim = buildVimPluginFrom2Nix { - pname = "lazygit-nvim"; + pname = "lazygit.nvim"; version = "2021-08-07"; src = fetchFromGitHub { owner = "kdheepak"; @@ -2676,18 +2676,18 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2021-08-18"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "bafe5cda6371035220ec7c12351e6922afd691b3"; - sha256 = "13naynadf8ahz85k7wm9rmcl3mxrc8d1q0lnr23xraksbhv72lg5"; + rev = "fc59ea2b340aefe628b689f6cc22576a578ae6e1"; + sha256 = "08fmsb0rwzfnfhv57f6s7hpjxd8jf12w47p2wyk72ip1g65paqdr"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; lean-vim = buildVimPluginFrom2Nix { - pname = "lean-vim"; + pname = "lean.vim"; version = "2021-06-07"; src = fetchFromGitHub { owner = "leanprover"; @@ -2699,7 +2699,7 @@ final: prev: }; lens-vim = buildVimPluginFrom2Nix { - pname = "lens-vim"; + pname = "lens.vim"; version = "2021-05-30"; src = fetchFromGitHub { owner = "camspiers"; @@ -2711,7 +2711,7 @@ final: prev: }; lessspace-vim = buildVimPluginFrom2Nix { - pname = "lessspace-vim"; + pname = "lessspace.vim"; version = "2019-09-12"; src = fetchFromGitHub { owner = "thirtythreeforty"; @@ -2723,7 +2723,7 @@ final: prev: }; lexima-vim = buildVimPluginFrom2Nix { - pname = "lexima-vim"; + pname = "lexima.vim"; version = "2021-08-12"; src = fetchFromGitHub { owner = "cohama"; @@ -2735,7 +2735,7 @@ final: prev: }; lf-vim = buildVimPluginFrom2Nix { - pname = "lf-vim"; + pname = "lf.vim"; version = "2021-02-18"; src = fetchFromGitHub { owner = "ptzz"; @@ -2795,7 +2795,7 @@ final: prev: }; lightline-gruvbox-vim = buildVimPluginFrom2Nix { - pname = "lightline-gruvbox-vim"; + pname = "lightline-gruvbox.vim"; version = "2018-03-23"; src = fetchFromGitHub { owner = "shinchu"; @@ -2807,7 +2807,7 @@ final: prev: }; lightline-vim = buildVimPluginFrom2Nix { - pname = "lightline-vim"; + pname = "lightline.vim"; version = "2021-05-30"; src = fetchFromGitHub { owner = "itchyny"; @@ -2819,19 +2819,19 @@ final: prev: }; lightspeed-nvim = buildVimPluginFrom2Nix { - pname = "lightspeed-nvim"; - version = "2021-08-23"; + pname = "lightspeed.nvim"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "9a613fb6ea8b8a41e7956f272c8cd0dc9a65102b"; - sha256 = "1l19cn04ibw0pd1isw02mllqxzp4gy4jd0mnv4mzf24ydjkyixkn"; + rev = "038ff96d30088128ece3b227ac63cc82cec8faa7"; + sha256 = "0rrn0chz06al9j8xxydkbhfmy136q5rx2qmw0m985q9yd82rb4bk"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; limelight-vim = buildVimPluginFrom2Nix { - pname = "limelight-vim"; + pname = "limelight.vim"; version = "2020-10-13"; src = fetchFromGitHub { owner = "junegunn"; @@ -2843,19 +2843,19 @@ final: prev: }; lir-nvim = buildVimPluginFrom2Nix { - pname = "lir-nvim"; - version = "2021-08-15"; + pname = "lir.nvim"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "tamago324"; repo = "lir.nvim"; - rev = "2704b9374c541db9a1cb0da1f095d800cf1c5af3"; - sha256 = "1ixqq5jigm5fdbcgp611sjybvr8fyvfnm7z55g5nk9zk5gql4xma"; + rev = "ccbae9636949afa9d3afbcba93f35dba3437ad94"; + sha256 = "1lxh6vh4nnfldxqivnv1f03300pmm7cb5pvapa2afv6h8src8hzs"; }; meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; lispdocs-nvim = buildVimPluginFrom2Nix { - pname = "lispdocs-nvim"; + pname = "lispdocs.nvim"; version = "2021-05-16"; src = fetchFromGitHub { owner = "tami5"; @@ -2867,7 +2867,7 @@ final: prev: }; lsp-colors-nvim = buildVimPluginFrom2Nix { - pname = "lsp-colors-nvim"; + pname = "lsp-colors.nvim"; version = "2021-04-30"; src = fetchFromGitHub { owner = "folke"; @@ -2879,7 +2879,7 @@ final: prev: }; lsp-rooter-nvim = buildVimPluginFrom2Nix { - pname = "lsp-rooter-nvim"; + pname = "lsp-rooter.nvim"; version = "2021-08-13"; src = fetchFromGitHub { owner = "ahmedkhalf"; @@ -2891,7 +2891,7 @@ final: prev: }; lsp-status-nvim = buildVimPluginFrom2Nix { - pname = "lsp-status-nvim"; + pname = "lsp-status.nvim"; version = "2021-05-20"; src = fetchFromGitHub { owner = "nvim-lua"; @@ -2903,7 +2903,7 @@ final: prev: }; lsp_extensions-nvim = buildVimPluginFrom2Nix { - pname = "lsp_extensions-nvim"; + pname = "lsp_extensions.nvim"; version = "2021-06-25"; src = fetchFromGitHub { owner = "nvim-lua"; @@ -2915,13 +2915,13 @@ final: prev: }; lsp_signature-nvim = buildVimPluginFrom2Nix { - pname = "lsp_signature-nvim"; - version = "2021-08-20"; + pname = "lsp_signature.nvim"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "ea9525f20297220ddfb6c6eb0423dad80301980e"; - sha256 = "1hqrmn6ggl6xadx5klb8z5jh3szwd7p8xyb7pclxds628l9rr9sp"; + rev = "8fcba5cfe114bec9aee5a0bc7ee867099abfb89b"; + sha256 = "02hwp524mac7sbyyl6k5w9zj1hg1iri3qcas5x4as4b47rwb80lj"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -2939,7 +2939,7 @@ final: prev: }; lspsaga-nvim = buildVimPluginFrom2Nix { - pname = "lspsaga-nvim"; + pname = "lspsaga.nvim"; version = "2021-04-25"; src = fetchFromGitHub { owner = "glepnir"; @@ -2963,7 +2963,7 @@ final: prev: }; lualine-nvim = buildVimPluginFrom2Nix { - pname = "lualine-nvim"; + pname = "lualine.nvim"; version = "2021-05-27"; src = fetchFromGitHub { owner = "hoob3rt"; @@ -2976,24 +2976,24 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-08-23"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "2ee1dfa64e14201a1016cd7088b612a0d2a116e2"; - sha256 = "0hqj4xv3mxdcknjqhazvnsk01jdc3x6qqgyyf6sy5d4kxm5q9q0w"; + rev = "9548bc3a3475966f8fd6bc45a0a81e5e041d94cd"; + sha256 = "1fwszxxsyhrwfa9dxis78jxfkxnafnjp4xjks8ljba9cjxba8ffz"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; lush-nvim = buildVimPluginFrom2Nix { - pname = "lush-nvim"; - version = "2021-08-08"; + pname = "lush.nvim"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "08f64bcf46afc3a1116ef23c95822de914d14abe"; - sha256 = "02m0kshj9q61dihhgckp801gh6r2jz1hw5s3vx46ha2zvzxbvf93"; + rev = "88edaae6086059a7d2e36d390c7c1d11b3fd7c54"; + sha256 = "170r1pj5xhdsaa4cfjz1s592rdh8n1mf4sc54hqxq6ibnzkzg0p5"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3011,7 +3011,7 @@ final: prev: }; markdown-preview-nvim = buildVimPluginFrom2Nix { - pname = "markdown-preview-nvim"; + pname = "markdown-preview.nvim"; version = "2021-03-10"; src = fetchFromGitHub { owner = "iamcco"; @@ -3023,7 +3023,7 @@ final: prev: }; matchit-zip = buildVimPluginFrom2Nix { - pname = "matchit-zip"; + pname = "matchit.zip"; version = "2010-10-18"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -3048,12 +3048,12 @@ final: prev: mattn-calendar-vim = buildVimPluginFrom2Nix { pname = "mattn-calendar-vim"; - version = "2020-12-29"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "mattn"; repo = "calendar-vim"; - rev = "9a32891101990dd88b86befb50c46575ef8a364e"; - sha256 = "0i6nxap9fx8z9dx6q33pc9hz8s8vc2ghz5zchyxxmdn2mb5fki53"; + rev = "24394ce720fcee4a672249fcdde4b088d62ed4b1"; + sha256 = "0smmwgdnby0n0hg4511wf63vbm387l4d3dw75sid3m9cm8xlpwgl"; }; meta.homepage = "https://github.com/mattn/calendar-vim/"; }; @@ -3071,13 +3071,13 @@ final: prev: }; minimap-vim = buildVimPluginFrom2Nix { - pname = "minimap-vim"; - version = "2021-07-21"; + pname = "minimap.vim"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "d389e2b0c67f5cedd5ec5edfe53afc847f8daf61"; - sha256 = "180grx6317ic6ip98awvqnfjc4zkzqh91rglls5pvwcq1w5m5vwb"; + rev = "45a8eabefd500ab4496ee790d3ac178eb4de9fb9"; + sha256 = "13mlcjkdbhpfgcg45m7whylxsaylgx1lysr5npc7gk6a85l2slzq"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -3107,7 +3107,7 @@ final: prev: }; moonlight-nvim = buildVimPluginFrom2Nix { - pname = "moonlight-nvim"; + pname = "moonlight.nvim"; version = "2021-05-16"; src = fetchFromGitHub { owner = "shaunsingh"; @@ -3348,18 +3348,18 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2021-08-20"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "5acaca6d173e1566b207c5477f06e7e49efe1a76"; - sha256 = "040jliyl8zs617kdw7xa4kjxyxakdz16gk5vp1j0zmaynwlfwf8n"; + rev = "31e5725ab5666396921d86bcec2f0b6ea0028ce7"; + sha256 = "1mm827a9d848ypp6x77paqii37a1j70vwh3hayp8p7g3pv4cimjl"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; neocomplete-vim = buildVimPluginFrom2Nix { - pname = "neocomplete-vim"; + pname = "neocomplete.vim"; version = "2021-02-18"; src = fetchFromGitHub { owner = "Shougo"; @@ -3371,7 +3371,7 @@ final: prev: }; neodark-vim = buildVimPluginFrom2Nix { - pname = "neodark-vim"; + pname = "neodark.vim"; version = "2019-12-04"; src = fetchFromGitHub { owner = "KeitaNakamura"; @@ -3396,18 +3396,18 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-08-21"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "06000011b9a8b1f2f843489c32afdb487e163c14"; - sha256 = "1qy7w190z3zvmb04pybcgxkc75hkivkj8msksbw1xlyhj7n9vz9h"; + rev = "9b3e19a8732c98f36c6ee2443efa716687531c2c"; + sha256 = "1qqam7s18clm1bdp4yzv1r1pz6yir2r1khfa17y27zfl8qvp90zz"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; neoinclude-vim = buildVimPluginFrom2Nix { - pname = "neoinclude-vim"; + pname = "neoinclude.vim"; version = "2020-09-13"; src = fetchFromGitHub { owner = "Shougo"; @@ -3431,7 +3431,7 @@ final: prev: }; neomru-vim = buildVimPluginFrom2Nix { - pname = "neomru-vim"; + pname = "neomru.vim"; version = "2020-02-05"; src = fetchFromGitHub { owner = "Shougo"; @@ -3444,24 +3444,24 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2021-08-01"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "vhyrro"; repo = "neorg"; - rev = "156bfdab640c6f57a6933e5e4fa60f9648f19857"; - sha256 = "0x3rryszciai5012c6kv7dyb8jlyn3w04j22k9x7n9nids42xhqx"; + rev = "45ded3cbd52da312b71bffd8b8a6b9bed1367500"; + sha256 = "1792j7h2an4kfc9jp6p8fa7mwri7295rb30siar35c0diapzai32"; }; meta.homepage = "https://github.com/vhyrro/neorg/"; }; neoscroll-nvim = buildVimPluginFrom2Nix { - pname = "neoscroll-nvim"; - version = "2021-08-15"; + pname = "neoscroll.nvim"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "54879c6957ee5e833924064ff7fc17c144502ae9"; - sha256 = "0r5dxb2qh2nkchiq7ib7aqnr46gy82i9wpv21z3h0kdj03lb12sc"; + rev = "cd4278795ed8ee120a97078b03aa6436802126d9"; + sha256 = "0byd108bmiz5rhnm4jh4sb4sqma9rcac7h8q6i89hhjwn5r0qqif"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -3479,7 +3479,7 @@ final: prev: }; neosnippet-vim = buildVimPluginFrom2Nix { - pname = "neosnippet-vim"; + pname = "neosnippet.vim"; version = "2021-08-22"; src = fetchFromGitHub { owner = "Shougo"; @@ -3516,12 +3516,12 @@ final: prev: neovim-ayu = buildVimPluginFrom2Nix { pname = "neovim-ayu"; - version = "2021-07-17"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "Shatur"; repo = "neovim-ayu"; - rev = "755b4a379ef4812f9656fb3f59220cf3a45c2070"; - sha256 = "0irjjpfrl6i7hfvay6b187i7dkkjq40fdcrx53xxfk9qq47l1z13"; + rev = "c9accf0e2f1cf70e84c2a64407a3e961fb6ef986"; + sha256 = "1va9mmc9pyif86sb7s6szw864z7a2zmsayjf452h55fgww0l2flb"; }; meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; @@ -3551,7 +3551,7 @@ final: prev: }; neoyank-vim = buildVimPluginFrom2Nix { - pname = "neoyank-vim"; + pname = "neoyank.vim"; version = "2020-12-20"; src = fetchFromGitHub { owner = "Shougo"; @@ -3599,7 +3599,7 @@ final: prev: }; neuron-vim = buildVimPluginFrom2Nix { - pname = "neuron-vim"; + pname = "neuron.vim"; version = "2020-12-06"; src = fetchFromGitHub { owner = "fiatjaf"; @@ -3611,7 +3611,7 @@ final: prev: }; nginx-vim = buildVimPluginFrom2Nix { - pname = "nginx-vim"; + pname = "nginx.vim"; version = "2021-02-25"; src = fetchFromGitHub { owner = "chr4"; @@ -3623,7 +3623,7 @@ final: prev: }; nim-vim = buildVimPluginFrom2Nix { - pname = "nim-vim"; + pname = "nim.vim"; version = "2020-10-16"; src = fetchFromGitHub { owner = "zah"; @@ -3635,7 +3635,7 @@ final: prev: }; nlua-nvim = buildVimPluginFrom2Nix { - pname = "nlua-nvim"; + pname = "nlua.nvim"; version = "2021-06-15"; src = fetchFromGitHub { owner = "tjdevries"; @@ -3647,7 +3647,7 @@ final: prev: }; nnn-vim = buildVimPluginFrom2Nix { - pname = "nnn-vim"; + pname = "nnn.vim"; version = "2021-08-11"; src = fetchFromGitHub { owner = "mcchrish"; @@ -3671,7 +3671,7 @@ final: prev: }; nord-nvim = buildVimPluginFrom2Nix { - pname = "nord-nvim"; + pname = "nord.nvim"; version = "2021-08-20"; src = fetchFromGitHub { owner = "shaunsingh"; @@ -3695,31 +3695,31 @@ final: prev: }; nterm-nvim = buildVimPluginFrom2Nix { - pname = "nterm-nvim"; - version = "2021-08-10"; + pname = "nterm.nvim"; + version = "2021-08-24"; src = fetchFromGitHub { owner = "jlesquembre"; repo = "nterm.nvim"; - rev = "9f37152269ae0fe520899f454355ad2158eee1b3"; - sha256 = "1d15l57krygxcg686naqk47g9bl802dbz3mghcihybqhw5sxdn56"; + rev = "bb612046c7775c6986e706b8ab31057ed8ca19b2"; + sha256 = "1r50z8c3jjx1ysazih298ni2iikblmj48gxh3k9p722kngfdsxjg"; }; meta.homepage = "https://github.com/jlesquembre/nterm.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { - pname = "null-ls-nvim"; - version = "2021-08-23"; + pname = "null-ls.nvim"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "414ed4690583315705955c80cdf52e86cfc134aa"; - sha256 = "084n4x0ikhxh9h33cqyzr3ajxd9zm9x7lh2q8dv0i5jlyxyb1grf"; + rev = "f1a2eaba4f00b7ff2729aed48ea98585413c9f39"; + sha256 = "0c6lvxzyw6s5dgz1kzb3d9mzlz24rq0hc29ghbq2iwyavqvsq4cj"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; numb-nvim = buildVimPluginFrom2Nix { - pname = "numb-nvim"; + pname = "numb.nvim"; version = "2021-07-12"; src = fetchFromGitHub { owner = "nacro90"; @@ -3731,7 +3731,7 @@ final: prev: }; nvcode-color-schemes-vim = buildVimPluginFrom2Nix { - pname = "nvcode-color-schemes-vim"; + pname = "nvcode-color-schemes.vim"; version = "2021-07-03"; src = fetchFromGitHub { owner = "ChristianChiarulli"; @@ -3756,24 +3756,24 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-08-14"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "afd3b224a0d508af38270dc87d836fc55b347561"; - sha256 = "1xgcp0s9j551l5a573rln1h47xkf9md8gb6wrvwjrxsjkinksl90"; + rev = "70ed2702c988a00f65c450a6f142b7f3df2656e1"; + sha256 = "0lzydpv90bys8rgv9sx3fmh21myazqjlz16lfzaxz783mfirx761"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-base16 = buildVimPluginFrom2Nix { pname = "nvim-base16"; - version = "2021-06-26"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "3be30f3165278e31333b44a6dcc937653893f623"; - sha256 = "1rzj8fqbbvbyjvcdkvy5p9q02f24m0fc0sbzh1wl2wk91yb42vqb"; + rev = "bb06f63bacdd6ca0ea6e5874843e5854ea01cb6f"; + sha256 = "1qginyalp9j9pv1pb0448ngvfjphhj03n30jjsnk7zq11pdcdrwg"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; @@ -3816,18 +3816,18 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2021-08-21"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "f3a54918944d2c8778e6f13e2fc3ec4251863afb"; - sha256 = "0zjmvpxx46dy1q7jg1a7r51nqc7wzqa8vjzd8ff8nphs0j5zlvfn"; + rev = "3a612d425a2bd60877a574bfc98a0a4352de00c1"; + sha256 = "0yvgcnb1b9pbk5dp7rvjsbagfmlbakiv7kc8cgzpbxs5955zr8sk"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; nvim-colorizer-lua = buildVimPluginFrom2Nix { - pname = "nvim-colorizer-lua"; + pname = "nvim-colorizer.lua"; version = "2020-06-11"; src = fetchFromGitHub { owner = "norcalli"; @@ -3840,12 +3840,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-08-19"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "253ec47cac406ff6e68020b6d18a05de323267d2"; - sha256 = "0ij5s82v7snk2iwy3w402dqxvbsb3207pv62h5fachpcdj7ybi9s"; + rev = "dc39f945e54b4547c998dc9e686df419d1077b60"; + sha256 = "0dc6nkx5648z96hgycins4gpagl4j4400vpgsqrlhk70d09q8w06"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3864,12 +3864,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-08-17"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "46cb5996c8c71c7ce96afb6a4a034693c93f7424"; - sha256 = "1fc5ivv9lkfamvcr6dlqk9dwr5j3bs4x98k43sr213z4z0a6xa75"; + rev = "42e1eec29d14a2ed159cffcf1b3c0d1b6018b855"; + sha256 = "1g9125qdf8a5g93rfsfdqkfil9sf3h2mmyqa1540z6w821wigkfz"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -3924,42 +3924,42 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2021-08-23"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "a4be468d8991840641c8db5cc6bbbffc3dafd79d"; - sha256 = "09mn8gysbs54bhicg9s52s87c472h10cmvi76fyljgxrkpbjssw3"; + rev = "243a4527a592d89e9647bc2ae6914e17cd19d5a6"; + sha256 = "07gdh6jj4w5z7hxgbjzm5rr024444afgi0l0a8skgr857qy86sw7"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-08-22"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "671869d981c47ccb2f7370145062a9cd9967d17b"; - sha256 = "14fs6h79ccb0mp9mcllqz42pkqialvs7gwp83xlpgy0kphgksndf"; + rev = "0299850d59a04f6685b6efabe198985d5961b4dc"; + sha256 = "0xl4ac9dc4gmm0h666saahacajyjq5yfhslz6mbn1mwryspish0h"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-08-19"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "5b31ffe949774218ab4bf4857a2d027b396d502d"; - sha256 = "0h5dwa52sgqg90jw044bic2akhvm4nd7ya9jf59yj8dhwcwjsk27"; + rev = "fb2e93dde66f56aae2cafec8535e3e1e60805bf0"; + sha256 = "0isq93zgrjp34dfxxddmshbsc2a8b14l1rw426v2vbc5wm39y5y7"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; nvim-hs-vim = buildVimPluginFrom2Nix { - pname = "nvim-hs-vim"; + pname = "nvim-hs.vim"; version = "2020-08-29"; src = fetchFromGitHub { owner = "neovimhaskell"; @@ -3972,12 +3972,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-08-11"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "e04105f551a982663b8d7707a064b733ab71db9b"; - sha256 = "0vfslh8qbl03c1prg5sfff6bxpyjbpdczxfc0r3i8hl9mwvdc4zx"; + rev = "f52ed6ef5c71f5af976134e11674fec9720e70c9"; + sha256 = "1z8m1jch7mqy19f5v170a4qxi3y9snmhqfh6c9sn9lkgry4j33x3"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3996,12 +3996,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-08-22"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "5b0fa84ee35006e06142f98b8a5b28d79cfa5000"; - sha256 = "0in0r3irawmgxp1prwryw3dpxj7gd6pviv14w8a7hnw1sd2g84l8"; + rev = "0eccc1a0ebf909aecfa1ac238d940061162ae84f"; + sha256 = "1ph5zskgvhxvs3h3x5vfscyxzc5hs3gv6nazv5dq8ljh5n1nfs91"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4032,12 +4032,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2021-08-06"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "2ee19cd937c98d4d40d77ae729c70fe0923a2b8c"; - sha256 = "0zldabxim43380x7i9cnan8mwjhbdffcg3vgk9zcpm4b5phr3j9z"; + rev = "280a08ca5d005b1f504fbc4906db69c23f109ccc"; + sha256 = "0kyg2acck8d1skprh06pfkjs7881x2nsqxzcn4vw8z0scbkysvgb"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4067,7 +4067,7 @@ final: prev: }; nvim-terminal-lua = buildVimPluginFrom2Nix { - pname = "nvim-terminal-lua"; + pname = "nvim-terminal.lua"; version = "2019-10-17"; src = fetchFromGitHub { owner = "norcalli"; @@ -4079,13 +4079,13 @@ final: prev: }; nvim-tree-lua = buildVimPluginFrom2Nix { - pname = "nvim-tree-lua"; - version = "2021-08-21"; + pname = "nvim-tree.lua"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "c75e4a63b73f223a80835ab3b75f602dc3e60e66"; - sha256 = "0n3h9pv029nplr2d102p8gj7ygx69iha9hgpzy7kfn4pwsaz7vzq"; + rev = "802bc0848517ce0036c8f99398ca21e7715f253c"; + sha256 = "11c8rdqlb9cdb003b9cymldd8hm9hpl8mxyilphi2zpkddj2abn0"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; @@ -4164,12 +4164,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-08-17"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "68afca45319e155e9b948163192182e6649562fb"; - sha256 = "1handw02d6wqsn3f8v549z0x4z7a481xcy2g3wsmxzlf2665l4fz"; + rev = "aa27d56bc53a82f501cd89cd797969f5e2211c61"; + sha256 = "1xaigr825wd1q4kxayki8a1pqfcyps07llfl6naa05k5x4g59izv"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -4187,7 +4187,7 @@ final: prev: }; nvim-whichkey-setup-lua = buildVimPluginFrom2Nix { - pname = "nvim-whichkey-setup-lua"; + pname = "nvim-whichkey-setup.lua"; version = "2021-04-16"; src = fetchFromGitHub { owner = "AckslD"; @@ -4223,7 +4223,7 @@ final: prev: }; nvimdev-nvim = buildVimPluginFrom2Nix { - pname = "nvimdev-nvim"; + pname = "nvimdev.nvim"; version = "2019-10-09"; src = fetchFromGitHub { owner = "neovim"; @@ -4271,7 +4271,7 @@ final: prev: }; onedark-nvim = buildVimPluginFrom2Nix { - pname = "onedark-nvim"; + pname = "onedark.nvim"; version = "2021-08-13"; src = fetchFromGitHub { owner = "olimorris"; @@ -4283,7 +4283,7 @@ final: prev: }; onedark-vim = buildVimPluginFrom2Nix { - pname = "onedark-vim"; + pname = "onedark.vim"; version = "2021-08-12"; src = fetchFromGitHub { owner = "joshdick"; @@ -4307,7 +4307,7 @@ final: prev: }; open-browser-github-vim = buildVimPluginFrom2Nix { - pname = "open-browser-github-vim"; + pname = "open-browser-github.vim"; version = "2021-03-21"; src = fetchFromGitHub { owner = "tyru"; @@ -4319,7 +4319,7 @@ final: prev: }; open-browser-vim = buildVimPluginFrom2Nix { - pname = "open-browser-vim"; + pname = "open-browser.vim"; version = "2020-05-20"; src = fetchFromGitHub { owner = "tyru"; @@ -4331,19 +4331,19 @@ final: prev: }; packer-nvim = buildVimPluginFrom2Nix { - pname = "packer-nvim"; - version = "2021-08-11"; + pname = "packer.nvim"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "add255996af31fcec142cb28faa99998c2d5ac4e"; - sha256 = "0k7xsrs83fqm738lmnjcd5adyiw3ld26v0ybvg5wsydi0nirwryd"; + rev = "09cc2d615bbc14bca957f941052e49e489d76537"; + sha256 = "1n7vhavf46vdpvpjk25i0w14w88lbm3nmlfac0rmikn6h5vma0kq"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; palenight-vim = buildVimPluginFrom2Nix { - pname = "palenight-vim"; + pname = "palenight.vim"; version = "2020-10-20"; src = fetchFromGitHub { owner = "drewtempelmeyer"; @@ -4379,7 +4379,7 @@ final: prev: }; pears-nvim = buildVimPluginFrom2Nix { - pname = "pears-nvim"; + pname = "pears.nvim"; version = "2021-05-27"; src = fetchFromGitHub { owner = "steelsojka"; @@ -4391,7 +4391,7 @@ final: prev: }; peskcolor-vim = buildVimPluginFrom2Nix { - pname = "peskcolor-vim"; + pname = "peskcolor.vim"; version = "2016-06-11"; src = fetchFromGitHub { owner = "andsild"; @@ -4403,7 +4403,7 @@ final: prev: }; pig-vim = buildVimPluginFrom2Nix { - pname = "pig-vim"; + pname = "pig.vim"; version = "2017-06-08"; src = fetchFromGitHub { owner = "motus"; @@ -4439,7 +4439,7 @@ final: prev: }; plenary-nvim = buildVimPluginFrom2Nix { - pname = "plenary-nvim"; + pname = "plenary.nvim"; version = "2021-08-19"; src = fetchFromGitHub { owner = "nvim-lua"; @@ -4476,7 +4476,7 @@ final: prev: }; popup-nvim = buildVimPluginFrom2Nix { - pname = "popup-nvim"; + pname = "popup.nvim"; version = "2021-08-09"; src = fetchFromGitHub { owner = "nvim-lua"; @@ -4488,7 +4488,7 @@ final: prev: }; presence-nvim = buildVimPluginFrom2Nix { - pname = "presence-nvim"; + pname = "presence.nvim"; version = "2021-08-15"; src = fetchFromGitHub { owner = "andweeb"; @@ -4584,7 +4584,7 @@ final: prev: }; quickfix-reflector-vim = buildVimPluginFrom2Nix { - pname = "quickfix-reflector-vim"; + pname = "quickfix-reflector.vim"; version = "2019-12-11"; src = fetchFromGitHub { owner = "stefandtw"; @@ -4620,7 +4620,7 @@ final: prev: }; rainbow_parentheses-vim = buildVimPluginFrom2Nix { - pname = "rainbow_parentheses-vim"; + pname = "rainbow_parentheses.vim"; version = "2013-03-05"; src = fetchFromGitHub { owner = "kien"; @@ -4632,7 +4632,7 @@ final: prev: }; random-vim = buildVimPluginFrom2Nix { - pname = "random-vim"; + pname = "random.vim"; version = "2010-10-18"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -4644,7 +4644,7 @@ final: prev: }; range-highlight-nvim = buildVimPluginFrom2Nix { - pname = "range-highlight-nvim"; + pname = "range-highlight.nvim"; version = "2021-08-03"; src = fetchFromGitHub { owner = "winston0410"; @@ -4656,7 +4656,7 @@ final: prev: }; ranger-vim = buildVimPluginFrom2Nix { - pname = "ranger-vim"; + pname = "ranger.vim"; version = "2021-04-25"; src = fetchFromGitHub { owner = "rafaqz"; @@ -4668,7 +4668,7 @@ final: prev: }; readline-vim = buildVimPluginFrom2Nix { - pname = "readline-vim"; + pname = "readline.vim"; version = "2019-12-28"; src = fetchFromGitHub { owner = "ryvnf"; @@ -4680,7 +4680,7 @@ final: prev: }; Recover-vim = buildVimPluginFrom2Nix { - pname = "Recover-vim"; + pname = "Recover.vim"; version = "2021-07-22"; src = fetchFromGitHub { owner = "chrisbra"; @@ -4692,19 +4692,19 @@ final: prev: }; refactoring-nvim = buildVimPluginFrom2Nix { - pname = "refactoring-nvim"; - version = "2021-08-21"; + pname = "refactoring.nvim"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "df03980e5fcdbcf1d126c63713be2781e3c0ba42"; - sha256 = "0z93igf1adnm183zamk3y10lbqg6diy42grg1k853a2xrrmjbhfk"; + rev = "d1625dd23e691b1ab7632e751917d1c79b1a4e30"; + sha256 = "1zm0pg70dznrph63h90ikvpwqzlwh07i5mkli1sd7pa2q24qmzqx"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; registers-nvim = buildVimPluginFrom2Nix { - pname = "registers-nvim"; + pname = "registers.nvim"; version = "2021-08-11"; src = fetchFromGitHub { owner = "tversteeg"; @@ -4740,7 +4740,7 @@ final: prev: }; riv-vim = buildVimPluginFrom2Nix { - pname = "riv-vim"; + pname = "riv.vim"; version = "2021-08-09"; src = fetchFromGitHub { owner = "gu-fan"; @@ -4776,7 +4776,7 @@ final: prev: }; rspec-vim = buildVimPluginFrom2Nix { - pname = "rspec-vim"; + pname = "rspec.vim"; version = "2020-08-20"; src = fetchFromGitHub { owner = "keith"; @@ -4800,19 +4800,19 @@ final: prev: }; rust-tools-nvim = buildVimPluginFrom2Nix { - pname = "rust-tools-nvim"; - version = "2021-08-15"; + pname = "rust-tools.nvim"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "c5f8e2d8e05eff2e3142f6808c675f5df087785f"; - sha256 = "1qx2rz5a37dw5q3dn6p02cjsdhkfaip9mwfzi2prrk7hjcf9ix5m"; + rev = "54a7a24cc7afd9cec765a3c30e23859b974e731d"; + sha256 = "16y4mdxmvbdgb5k6lds4kwd1xh005g1v1vlnbykjd1lnkfz4h4kq"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; rust-vim = buildVimPluginFrom2Nix { - pname = "rust-vim"; + pname = "rust.vim"; version = "2021-08-01"; src = fetchFromGitHub { owner = "rust-lang"; @@ -4824,7 +4824,7 @@ final: prev: }; sad-vim = buildVimPluginFrom2Nix { - pname = "sad-vim"; + pname = "sad.vim"; version = "2019-02-18"; src = fetchFromGitHub { owner = "hauleth"; @@ -4848,7 +4848,7 @@ final: prev: }; scrollbar-nvim = buildVimPluginFrom2Nix { - pname = "scrollbar-nvim"; + pname = "scrollbar.nvim"; version = "2021-06-04"; src = fetchFromGitHub { owner = "Xuyuanp"; @@ -4872,7 +4872,7 @@ final: prev: }; semantic-highlight-vim = buildVimPluginFrom2Nix { - pname = "semantic-highlight-vim"; + pname = "semantic-highlight.vim"; version = "2020-09-11"; src = fetchFromGitHub { owner = "jaxbot"; @@ -4896,7 +4896,7 @@ final: prev: }; seoul256-vim = buildVimPluginFrom2Nix { - pname = "seoul256-vim"; + pname = "seoul256.vim"; version = "2020-06-21"; src = fetchFromGitHub { owner = "junegunn"; @@ -4908,7 +4908,7 @@ final: prev: }; shabadou-vim = buildVimPluginFrom2Nix { - pname = "shabadou-vim"; + pname = "shabadou.vim"; version = "2016-07-19"; src = fetchFromGitHub { owner = "osyo-manga"; @@ -4920,7 +4920,7 @@ final: prev: }; Shade-nvim = buildVimPluginFrom2Nix { - pname = "Shade-nvim"; + pname = "Shade.nvim"; version = "2021-04-29"; src = fetchFromGitHub { owner = "sunjon"; @@ -4944,7 +4944,7 @@ final: prev: }; sideways-vim = buildVimPluginFrom2Nix { - pname = "sideways-vim"; + pname = "sideways.vim"; version = "2021-07-15"; src = fetchFromGitHub { owner = "AndrewRadev"; @@ -4969,7 +4969,7 @@ final: prev: }; skim-vim = buildVimPluginFrom2Nix { - pname = "skim-vim"; + pname = "skim.vim"; version = "2020-11-11"; src = fetchFromGitHub { owner = "lotabout"; @@ -4981,7 +4981,7 @@ final: prev: }; sky-color-clock-vim = buildVimPluginFrom2Nix { - pname = "sky-color-clock-vim"; + pname = "sky-color-clock.vim"; version = "2018-11-03"; src = fetchFromGitHub { owner = "mopp"; @@ -4993,7 +4993,7 @@ final: prev: }; smartpairs-vim = buildVimPluginFrom2Nix { - pname = "smartpairs-vim"; + pname = "smartpairs.vim"; version = "2018-01-01"; src = fetchFromGitHub { owner = "gorkunov"; @@ -5017,7 +5017,7 @@ final: prev: }; snippets-nvim = buildVimPluginFrom2Nix { - pname = "snippets-nvim"; + pname = "snippets.nvim"; version = "2020-09-09"; src = fetchFromGitHub { owner = "norcalli"; @@ -5030,18 +5030,18 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-08-10"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "0e1af11d2297ae65ba504419cd8d6bbd6ed3534d"; - sha256 = "1m6kzdyam2syly0abcjd3j4pimkmhvd9x1872lzw35bfqhbxq947"; + rev = "cb10268587c0f0616242ecb5503e22240a915136"; + sha256 = "0f7qmlmky8fx157lp4ffhp679w656r1vfbp0sy4gqwncm434vzh9"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; sourcemap-vim = buildVimPluginFrom2Nix { - pname = "sourcemap-vim"; + pname = "sourcemap.vim"; version = "2012-09-19"; src = fetchFromGitHub { owner = "chikatoike"; @@ -5065,7 +5065,7 @@ final: prev: }; Spacegray-vim = buildVimPluginFrom2Nix { - pname = "Spacegray-vim"; + pname = "Spacegray.vim"; version = "2021-07-06"; src = fetchFromGitHub { owner = "ackyshake"; @@ -5101,7 +5101,7 @@ final: prev: }; specs-nvim = buildVimPluginFrom2Nix { - pname = "specs-nvim"; + pname = "specs.nvim"; version = "2021-05-05"; src = fetchFromGitHub { owner = "edluffy"; @@ -5113,7 +5113,7 @@ final: prev: }; splice-vim = buildVimPluginFrom2Nix { - pname = "splice-vim"; + pname = "splice.vim"; version = "2020-01-15"; src = fetchFromGitHub { owner = "sjl"; @@ -5125,7 +5125,7 @@ final: prev: }; split-term-vim = buildVimPluginFrom2Nix { - pname = "split-term-vim"; + pname = "split-term.vim"; version = "2018-09-30"; src = fetchFromGitHub { owner = "vimlab"; @@ -5137,7 +5137,7 @@ final: prev: }; splitjoin-vim = buildVimPluginFrom2Nix { - pname = "splitjoin-vim"; + pname = "splitjoin.vim"; version = "2021-08-02"; src = fetchFromGitHub { owner = "AndrewRadev"; @@ -5150,13 +5150,13 @@ final: prev: }; sql-nvim = buildVimPluginFrom2Nix { - pname = "sql-nvim"; - version = "2021-08-23"; + pname = "sql.nvim"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "tami5"; repo = "sql.nvim"; - rev = "a0370391af2998e11c6320ba08a57d5a1827c0ed"; - sha256 = "13k9rdjwrmrv6vm2rn2b3ga02fcmig2ainllh8dxzpln3c3idwbp"; + rev = "c258857a5d981eb6daa6221b4e01d4887574db0b"; + sha256 = "052fxn4740b6adsn0knpm6nhw7qs5lbf99raprr422rmnj3sqd3a"; }; meta.homepage = "https://github.com/tami5/sql.nvim/"; }; @@ -5186,7 +5186,7 @@ final: prev: }; starsearch-vim = buildVimPluginFrom2Nix { - pname = "starsearch-vim"; + pname = "starsearch.vim"; version = "2014-09-21"; src = fetchFromGitHub { owner = "darfink"; @@ -5198,7 +5198,7 @@ final: prev: }; suda-vim = buildVimPluginFrom2Nix { - pname = "suda-vim"; + pname = "suda.vim"; version = "2021-07-21"; src = fetchFromGitHub { owner = "lambdalisue"; @@ -5210,7 +5210,7 @@ final: prev: }; SudoEdit-vim = buildVimPluginFrom2Nix { - pname = "SudoEdit-vim"; + pname = "SudoEdit.vim"; version = "2020-02-27"; src = fetchFromGitHub { owner = "chrisbra"; @@ -5246,7 +5246,7 @@ final: prev: }; swift-vim = buildVimPluginFrom2Nix { - pname = "swift-vim"; + pname = "swift.vim"; version = "2021-08-05"; src = fetchFromGitHub { owner = "keith"; @@ -5258,13 +5258,13 @@ final: prev: }; symbols-outline-nvim = buildVimPluginFrom2Nix { - pname = "symbols-outline-nvim"; - version = "2021-08-23"; + pname = "symbols-outline.nvim"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "6f376ef4ceb88ff7f0d9e3141dbe2a2e0854e785"; - sha256 = "1882gb76hp4zpwyljrzl26qjwyyvnavhfv529nj5z5x41vyhsks5"; + rev = "80490ad0c697d7277cbd4ea24883120f6de32db0"; + sha256 = "16gl8jc7bqszmpw3yj0sxkxdq9zch6lfj8n0cd6jihd6i9ans564"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -5307,7 +5307,7 @@ final: prev: }; taboo-vim = buildVimPluginFrom2Nix { - pname = "taboo-vim"; + pname = "taboo.vim"; version = "2019-08-27"; src = fetchFromGitHub { owner = "gcmt"; @@ -5319,7 +5319,7 @@ final: prev: }; tabpagebuffer-vim = buildVimPluginFrom2Nix { - pname = "tabpagebuffer-vim"; + pname = "tabpagebuffer.vim"; version = "2014-09-30"; src = fetchFromGitHub { owner = "Shougo"; @@ -5343,7 +5343,7 @@ final: prev: }; tagalong-vim = buildVimPluginFrom2Nix { - pname = "tagalong-vim"; + pname = "tagalong.vim"; version = "2021-08-19"; src = fetchFromGitHub { owner = "AndrewRadev"; @@ -5356,18 +5356,18 @@ final: prev: tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2021-08-06"; + version = "2021-08-24"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "ab6f2d5a683041a46c48b28418d4a2a01bbd5551"; - sha256 = "1xgcgmp1nbf038wzs3v6ja9wpn1grgh4a1d89a5big6rnjcvfmc1"; + rev = "bb8ca482a5d14a771f718bd794b5945be3a6ff74"; + sha256 = "074dvmc7cnwqjx7dy8zsp6ikdzh9gxralf41vs17z8qr6pd4y7g0"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; taglist-vim = buildVimPluginFrom2Nix { - pname = "taglist-vim"; + pname = "taglist.vim"; version = "2010-10-18"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -5379,7 +5379,7 @@ final: prev: }; targets-vim = buildVimPluginFrom2Nix { - pname = "targets-vim"; + pname = "targets.vim"; version = "2019-12-08"; src = fetchFromGitHub { owner = "wellle"; @@ -5415,7 +5415,7 @@ final: prev: }; telescope-dap-nvim = buildVimPluginFrom2Nix { - pname = "telescope-dap-nvim"; + pname = "telescope-dap.nvim"; version = "2021-03-26"; src = fetchFromGitHub { owner = "nvim-telescope"; @@ -5427,7 +5427,7 @@ final: prev: }; telescope-frecency-nvim = buildVimPluginFrom2Nix { - pname = "telescope-frecency-nvim"; + pname = "telescope-frecency.nvim"; version = "2021-08-22"; src = fetchFromGitHub { owner = "nvim-telescope"; @@ -5439,19 +5439,19 @@ final: prev: }; telescope-fzf-native-nvim = buildVimPluginFrom2Nix { - pname = "telescope-fzf-native-nvim"; - version = "2021-08-14"; + pname = "telescope-fzf-native.nvim"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "9fb0d2d2297f7e313abf33a80331fadf4df716a5"; - sha256 = "1dqdh1ay56z9gx2f9qx5zbb8xidn3n6n8lnby7lkmixn3plmbsx0"; + rev = "66c8705414483d768b25f7e19d445e3df0d62625"; + sha256 = "1hg908k21zbmdc4qmdnpq5kz4lfwdrghmxibcm5li6c5shb0rs1q"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; telescope-fzf-writer-nvim = buildVimPluginFrom2Nix { - pname = "telescope-fzf-writer-nvim"; + pname = "telescope-fzf-writer.nvim"; version = "2021-04-16"; src = fetchFromGitHub { owner = "nvim-telescope"; @@ -5463,7 +5463,7 @@ final: prev: }; telescope-fzy-native-nvim = buildVimPluginFrom2Nix { - pname = "telescope-fzy-native-nvim"; + pname = "telescope-fzy-native.nvim"; version = "2021-04-08"; src = fetchFromGitHub { owner = "nvim-telescope"; @@ -5476,7 +5476,7 @@ final: prev: }; telescope-project-nvim = buildVimPluginFrom2Nix { - pname = "telescope-project-nvim"; + pname = "telescope-project.nvim"; version = "2021-08-03"; src = fetchFromGitHub { owner = "nvim-telescope"; @@ -5488,7 +5488,7 @@ final: prev: }; telescope-symbols-nvim = buildVimPluginFrom2Nix { - pname = "telescope-symbols-nvim"; + pname = "telescope-symbols.nvim"; version = "2021-08-07"; src = fetchFromGitHub { owner = "nvim-telescope"; @@ -5500,7 +5500,7 @@ final: prev: }; telescope-z-nvim = buildVimPluginFrom2Nix { - pname = "telescope-z-nvim"; + pname = "telescope-z.nvim"; version = "2021-08-12"; src = fetchFromGitHub { owner = "nvim-telescope"; @@ -5512,19 +5512,19 @@ final: prev: }; telescope-nvim = buildVimPluginFrom2Nix { - pname = "telescope-nvim"; - version = "2021-08-23"; + pname = "telescope.nvim"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "79dc995f820150d5de880c08e814af327ff7e965"; - sha256 = "0acyzc0k14dvd7j4ihvg84fz9lp1alwbf6qbnq083y6pd37mhj7b"; + rev = "dcee6c81f4cd5f9bc4a4cea782135a0669aa74bd"; + sha256 = "0d5hs640mcvsca97p8sxj35hr7vfjq842lra0ymnhl6smk1vknbx"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; tender-vim = buildVimPluginFrom2Nix { - pname = "tender-vim"; + pname = "tender.vim"; version = "2021-05-24"; src = fetchFromGitHub { owner = "jacoborus"; @@ -5536,7 +5536,7 @@ final: prev: }; termwrapper-nvim = buildVimPluginFrom2Nix { - pname = "termwrapper-nvim"; + pname = "termwrapper.nvim"; version = "2021-03-28"; src = fetchFromGitHub { owner = "oberblastmeister"; @@ -5560,7 +5560,7 @@ final: prev: }; thesaurus_query-vim = buildVimPluginFrom2Nix { - pname = "thesaurus_query-vim"; + pname = "thesaurus_query.vim"; version = "2021-07-08"; src = fetchFromGitHub { owner = "ron89"; @@ -5572,7 +5572,7 @@ final: prev: }; thumbnail-vim = buildVimPluginFrom2Nix { - pname = "thumbnail-vim"; + pname = "thumbnail.vim"; version = "2021-01-11"; src = fetchFromGitHub { owner = "itchyny"; @@ -5596,7 +5596,7 @@ final: prev: }; tmux-complete-vim = buildVimPluginFrom2Nix { - pname = "tmux-complete-vim"; + pname = "tmux-complete.vim"; version = "2021-03-26"; src = fetchFromGitHub { owner = "wellle"; @@ -5608,7 +5608,7 @@ final: prev: }; todo-comments-nvim = buildVimPluginFrom2Nix { - pname = "todo-comments-nvim"; + pname = "todo-comments.nvim"; version = "2021-08-05"; src = fetchFromGitHub { owner = "folke"; @@ -5620,7 +5620,7 @@ final: prev: }; todo-txt-vim = buildVimPluginFrom2Nix { - pname = "todo-txt-vim"; + pname = "todo.txt-vim"; version = "2021-03-20"; src = fetchFromGitHub { owner = "freitass"; @@ -5633,19 +5633,19 @@ final: prev: }; toggleterm-nvim = buildVimPluginFrom2Nix { - pname = "toggleterm-nvim"; - version = "2021-08-23"; + pname = "toggleterm.nvim"; + version = "2021-08-24"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "317caf587448fc8d42189d2dc27dab076857aeb0"; - sha256 = "1gl27njvik0dfg9412gwnqi6ar6nqhpfhliyjm5w96pxaa6xlafp"; + rev = "ef7a882a818d1bf2598bc58ca0bc158d097d499d"; + sha256 = "0sdp260jnal7qmdqskxwk5cg1c846fz65xr66b18s0y0lm5z53c2"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; tokyonight-nvim = buildVimPluginFrom2Nix { - pname = "tokyonight-nvim"; + pname = "tokyonight.nvim"; version = "2021-08-06"; src = fetchFromGitHub { owner = "folke"; @@ -5657,19 +5657,19 @@ final: prev: }; traces-vim = buildVimPluginFrom2Nix { - pname = "traces-vim"; - version = "2021-07-22"; + pname = "traces.vim"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "4b06ca24de8aeb8b512727a27f2d1b3ba7b20ff6"; - sha256 = "0lyqbwjyb0sczzqhfd7nmg3hzqn9pqxbrg14szg56a14mmm59mxf"; + rev = "419ce02f68b13aa892735febc1d1887a9a11d5db"; + sha256 = "07va4rr9xfmr93qq4nn0d3ssay4mwdvxzl4f92akib36kxnv0m69"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; train-nvim = buildVimPluginFrom2Nix { - pname = "train-nvim"; + pname = "train.nvim"; version = "2020-09-10"; src = fetchFromGitHub { owner = "tjdevries"; @@ -5693,7 +5693,7 @@ final: prev: }; trouble-nvim = buildVimPluginFrom2Nix { - pname = "trouble-nvim"; + pname = "trouble.nvim"; version = "2021-08-05"; src = fetchFromGitHub { owner = "folke"; @@ -5705,7 +5705,7 @@ final: prev: }; tslime-vim = buildVimPluginFrom2Nix { - pname = "tslime-vim"; + pname = "tslime.vim"; version = "2020-09-09"; src = fetchFromGitHub { owner = "jgdavey"; @@ -5729,7 +5729,7 @@ final: prev: }; twilight-nvim = buildVimPluginFrom2Nix { - pname = "twilight-nvim"; + pname = "twilight.nvim"; version = "2021-08-06"; src = fetchFromGitHub { owner = "folke"; @@ -5754,12 +5754,12 @@ final: prev: ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2021-07-26"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "8803960a4e09daf1ad4d82e16a25bbdb4c78530e"; - sha256 = "09d86328387f0qvrn3afh69889bcc67n3fxqxysxfrsifwsxqy74"; + rev = "53e1921e3ef015ef658e540c0aa9c4835f9c18a6"; + sha256 = "1ayx52rc8gki3qj6j88ij1klasn6iggn035cgmp0vvspcsrs795c"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -5777,7 +5777,7 @@ final: prev: }; unicode-vim = buildVimPluginFrom2Nix { - pname = "unicode-vim"; + pname = "unicode.vim"; version = "2021-08-11"; src = fetchFromGitHub { owner = "chrisbra"; @@ -5789,7 +5789,7 @@ final: prev: }; unite-vim = buildVimPluginFrom2Nix { - pname = "unite-vim"; + pname = "unite.vim"; version = "2021-02-06"; src = fetchFromGitHub { owner = "Shougo"; @@ -5801,7 +5801,7 @@ final: prev: }; utl-vim = buildVimPluginFrom2Nix { - pname = "utl-vim"; + pname = "utl.vim"; version = "2010-10-18"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -5813,7 +5813,7 @@ final: prev: }; vader-vim = buildVimPluginFrom2Nix { - pname = "vader-vim"; + pname = "vader.vim"; version = "2020-02-13"; src = fetchFromGitHub { owner = "junegunn"; @@ -5825,7 +5825,7 @@ final: prev: }; vCoolor-vim = buildVimPluginFrom2Nix { - pname = "vCoolor-vim"; + pname = "vCoolor.vim"; version = "2020-10-14"; src = fetchFromGitHub { owner = "KabbAmine"; @@ -5837,7 +5837,7 @@ final: prev: }; verilog_systemverilog-vim = buildVimPluginFrom2Nix { - pname = "verilog_systemverilog-vim"; + pname = "verilog_systemverilog.vim"; version = "2021-01-16"; src = fetchFromGitHub { owner = "vhda"; @@ -6150,12 +6150,12 @@ final: prev: vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2021-08-15"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "e3e3fce70997a8d3ebd08f28b212d58c5daded11"; - sha256 = "0z1zcmry9vmagz03wh0y7smxfwsaf2fc2frhkza48clafx324rf0"; + rev = "98d5cef20ef1e706132705abb01cd53833275f5e"; + sha256 = "0201ji3mnfx09022h73kv5gv4n12dhjwgdq5ri7ysvjsbp1k12dj"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; @@ -6354,12 +6354,12 @@ final: prev: vim-capslock = buildVimPluginFrom2Nix { pname = "vim-capslock"; - version = "2021-07-13"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-capslock"; - rev = "a910e686986b239a7885e67ab6914638f88e914b"; - sha256 = "0aiqs4m5vfc22lcjkb2iphpb2qi7bz994lbjr2frsb8g8h508h18"; + rev = "252a9166fecf79e2e2a0b2ee4e0712364472e825"; + sha256 = "06l2q7mmp72kag009fgyks4ajm0apfqkcqhkfc40ysad19ghn65l"; }; meta.homepage = "https://github.com/tpope/vim-capslock/"; }; @@ -6402,12 +6402,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-08-21"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "299a5d23f6c8d8f51bbd4aeb01f8c1c27d4a0604"; - sha256 = "090hm59p6n44740irfkxv5r40iyr4mady30zqcswbx4r1xhd8vzc"; + rev = "38bc6b1eb5278b8f5bd2ef59ae5477de167408d0"; + sha256 = "1xg8ds5rbsq8619wmkdjmsrqpphg3vq5sbjn0lhnfg0cdg3w6pfs"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -6678,24 +6678,24 @@ final: prev: vim-dadbod-completion = buildVimPluginFrom2Nix { pname = "vim-dadbod-completion"; - version = "2021-05-12"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-completion"; - rev = "a3f8ea8e666f4bebe12739d8854a4bd31544dfbb"; - sha256 = "04m7drx86r8zqq7rq29wa9zq5ckzf5bqxzyhdc5hqn82jxcvxmpz"; + rev = "ed79f2b0ece53d38aabc056551b582f18fee48e6"; + sha256 = "034dckb589lam2c2c581asilh0psj9516pxh2n9rcpx0m1f4bpyd"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; vim-dadbod-ui = buildVimPluginFrom2Nix { pname = "vim-dadbod-ui"; - version = "2021-08-03"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "e79b6cca4bfd7c56542353775d337a08dcbd9486"; - sha256 = "1m5ipmgw45svdlqp8rj5kpdfczzn03rgav2j7qraqrl37bwlkxzd"; + rev = "5f2bd8499f1627c1938300256e6d9abb1ae4856d"; + sha256 = "1a2icyz84lc54y4nq5amf3l51cc0f2yyzyqz5zx6m7dwb1r3nhpn"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; @@ -6918,12 +6918,12 @@ final: prev: vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2021-06-16"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "58084475c1e523caeac97ffff62c154f7f8fcc66"; - sha256 = "09nv87iqjnwpfkvbspgwxibjlf1aj4syw0nv885fyw8fjpbhf06l"; + rev = "c29c1ede8f9f12d9c76b7c8b5b8ead7690c5792c"; + sha256 = "1rz24r97z3dlzxn3b8m3s4m697f9vhs5688jbqgs4fcbki2wrsyj"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -7134,12 +7134,12 @@ final: prev: vim-flog = buildVimPluginFrom2Nix { pname = "vim-flog"; - version = "2021-05-02"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "cabecb166bde31d9fe86caac7e51284cff575da2"; - sha256 = "13ybny4i20p6xi6rp6vzngbrjwjpikvcrhg8spj1g9n2z5wcc2xz"; + rev = "670b4efd759da01da051edf8839daa789c7f86f2"; + sha256 = "0c76vqwl0mdjsg6bk7jsdhqwkjygq4vbwfc99gf3b5c2m5kxx375"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; @@ -7182,12 +7182,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-08-23"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "8cdb51622fbdbf780edff35ee22d74ad9983698e"; - sha256 = "18073gnl90n7h8j3rk6shs79455svwa47n5jxyb44m1957hvzfgb"; + rev = "10b44345b0d1d31409641b71c5b697774bf99d83"; + sha256 = "18kv3rc92hniz525ij7np9any4v0slmx7lp6vjrx5jaf022nblws"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7242,12 +7242,12 @@ final: prev: vim-git = buildVimPluginFrom2Nix { pname = "vim-git"; - version = "2021-07-10"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-git"; - rev = "75047b7d812cbe182ee04f0956bb31ba7efd46b0"; - sha256 = "00hz040ar9ka3mcf2pgjc6iwznh7baqi6q09xkpr0pnjhm9k0bci"; + rev = "3d68c6dcaa303f0144b7657e00b46ef98f0deb82"; + sha256 = "060djzwpx5imlw3lb3kifp3gl0drn32a2dvb5baddg0kacahdvky"; }; meta.homepage = "https://github.com/tpope/vim-git/"; }; @@ -7759,12 +7759,12 @@ final: prev: vim-jinja = buildVimPluginFrom2Nix { pname = "vim-jinja"; - version = "2021-07-19"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "lepture"; repo = "vim-jinja"; - rev = "2f0eeefe583ea477cb7605f972d57d7d5e55e13f"; - sha256 = "0r8508h9s2bikmv3wvw4iaq3j8i5n564k7s06aqx9j79i16asn22"; + rev = "7c54e2320c5f676636cdd8697480782eebfb2bf2"; + sha256 = "153qirdl5xrnj1jc0ivlvf2rk7gdby96vn3prf6ky0l0gqxlzd8g"; }; meta.homepage = "https://github.com/lepture/vim-jinja/"; }; @@ -8024,12 +8024,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-07-20"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "7ba553effb021293c9ff5176b91e76da71797825"; - sha256 = "1phfqzn94m2j7g10aifh12a4gyyrhqnj1vn2bpdp29lpm1n179yg"; + rev = "52ded667a5c8426d6845b53b943d2a5f6cc3fd6a"; + sha256 = "01jynlb339pbg9pqjnfdgq62n4hccg8ay13j9anvkvjmrpbdg7y4"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -8133,12 +8133,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2021-08-15"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "96738bdb81c493a4313b4bc5586ad540bd4ba6ce"; - sha256 = "0nan8crcsixwxmjj1xdbiizr50882102idd1ylynv7ihbf7hgmv8"; + rev = "4bbb22d694e1ca1132a9bbee4f491b48041e1710"; + sha256 = "035bf331rr4xbxi8mlnlhnvrg3q97lnpgzkgw1gc7d7rsbf0gz6p"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -8229,12 +8229,12 @@ final: prev: vim-mucomplete = buildVimPluginFrom2Nix { pname = "vim-mucomplete"; - version = "2021-03-14"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "lifepillar"; repo = "vim-mucomplete"; - rev = "83cd9b3775438faafc3475f9f9d5fbb8da4dfa5b"; - sha256 = "1l8rdmy9i81zq2ck0zvlsmqs7hfqpcxa0b8psf5nw72mwhbvv1np"; + rev = "2bac2066672e18a3eb9f40ca62d02917835795e0"; + sha256 = "1r8pn5as9k9ps4zky1hsn923m0hc7z0p638r6q9m1g3nzqfxlbds"; }; meta.homepage = "https://github.com/lifepillar/vim-mucomplete/"; }; @@ -8649,12 +8649,12 @@ final: prev: vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2021-04-30"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "fc2813ef4484c7a5c080021ceaa6d1f70390d920"; - sha256 = "0fsl8w17z15sj21x5gd5ah5p5fjsnk0gzdx2n2p0jnkcb05bwzck"; + rev = "66e038d443310315e23feb939b3ca28c2a67e236"; + sha256 = "1wg6sgvvqd1k7hddv8acz8p9cgdan3kl47yk4sa8m1b6ipfb7vf6"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -8937,12 +8937,12 @@ final: prev: vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2021-08-21"; + version = "2021-08-24"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "e804fb67b75697f98f500f67ed11e891e370bd04"; - sha256 = "11cifxc6i2h00f71w28f2q5zr76198672g9ccx8ah5i7xw5a949x"; + rev = "e4f7fb8a1b48afe5bb93e1460a2a5bdd67573c33"; + sha256 = "0m7srvzrg0c8kcs7xh236yi5d302476xldq6qp238jmn0w2lpavh"; }; meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; @@ -8997,12 +8997,12 @@ final: prev: vim-sandwich = buildVimPluginFrom2Nix { pname = "vim-sandwich"; - version = "2020-12-15"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "9e6340affe9f53c11a6975a5f50b9bf48adb692c"; - sha256 = "0ghli93qzr3i8ai90waikylwas3xgy5bdgykng55b9mqgpmc3faf"; + rev = "04f775510011606ab2b9081e3758aa0c11018c5c"; + sha256 = "1796xqfa8anbcyjb9adqdcqbpvm6l5506r4n04lx7980ivpqz6bz"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -9249,12 +9249,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-08-19"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "9e5219ae92f9b1b2ee23aff067618a6008a74fa5"; - sha256 = "1zv17p6ri0xs5qypva45afvwigw1hpkx06zf6ngk00nmi1vqd4cb"; + rev = "e081212205f767fc5b050977c0a2b0f1536a3bdf"; + sha256 = "1z7dbhjz7y9wl9gvv35pn4v25pksaavibblxakw3pxv6xk5c5kxf"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -9562,12 +9562,12 @@ final: prev: vim-textobj-variable-segment = buildVimPluginFrom2Nix { pname = "vim-textobj-variable-segment"; - version = "2019-12-30"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "Julian"; repo = "vim-textobj-variable-segment"; - rev = "78457d4322b44bf89730e708b62b69df48c39aa3"; - sha256 = "14dcrnk83hj4ixrkdgjrk9cf0193f82wqckdzd4w0b76adf3habj"; + rev = "30f7bc94bc8a87d923631f5e440200b662becb1a"; + sha256 = "1168qylhs0f0xzvy68kh07p8w01ypc78h2cb4pklv8079c869k30"; }; meta.homepage = "https://github.com/Julian/vim-textobj-variable-segment/"; }; @@ -9658,12 +9658,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2021-08-18"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "a69dbbcccdc31fddbffd63d4db00d08daec1fff8"; - sha256 = "1pn4582qlivipy07nqyg2kigjscsprjx2vdal21jqxwrf49gh1fa"; + rev = "88e7302f705ffe60a26ee25619c27c60681bf6fe"; + sha256 = "0cgmxls4y1h7mx91mibfia2860zamfdr8k7k6qipwdmcmchmrawa"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -9706,12 +9706,12 @@ final: prev: vim-twiggy = buildVimPluginFrom2Nix { pname = "vim-twiggy"; - version = "2021-07-16"; + version = "2021-08-25"; src = fetchFromGitHub { owner = "sodapopcan"; repo = "vim-twiggy"; - rev = "cd7286702319d676c622a5f5891dc68563bf6ad5"; - sha256 = "1xmcnhbny74hr0zciy55gq8c8agds2x1xvdsr1wrghkcr2k15w46"; + rev = "3561237047481c212b55942d9507c937841d3bc8"; + sha256 = "1099bnpagw6sv5j2rigsp2b9qc58dcyi4520hb0xz48zdvynkaac"; }; meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; }; @@ -9742,12 +9742,12 @@ final: prev: vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2021-08-15"; + version = "2021-08-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "aee3455e19686ce84225752de678a9725866248b"; - sha256 = "0j6xz4m8p351dmvhssi0f699609wpm5nz5q9xysy15vpwxds3nl9"; + rev = "c147741c643e2fef3458e8e44834c11ef85bdd9b"; + sha256 = "0lz2kdp8wmrnrcflsbfhmv42l81gvv00s3qfgf6926zxsr7r5kpl"; }; meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; @@ -9850,12 +9850,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2021-08-15"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "37544a5d3f028d93f9ad8c4445cd1dc623d08c5e"; - sha256 = "1s8q8hch38ydkfr2fd7259swgbpchs70shjharahl5vm3x72jpgy"; + rev = "1bef11e2f277984214a7bdca250c09199b57a80b"; + sha256 = "01f3mrbcpdg3dxhy0h2khjaj1fz63f4x8iwmbqbk9vp6r1qzwkkl"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -10018,12 +10018,12 @@ final: prev: vimade = buildVimPluginFrom2Nix { pname = "vimade"; - version = "2021-04-07"; + version = "2021-08-27"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "9b9254340e39dab3dad64c05b10af0fd85490b71"; - sha256 = "0sbk9lf5w136lwl3ca866m594993s23zad5ss4whzm9j0qknihl3"; + rev = "b58f6cb0c8ab804fc16cd4d6dc452b336681f24c"; + sha256 = "1l2ks77ix9yp3nr8hvp1zrq41smlwp2npwi7kdqknhk4sjhpsas8"; }; meta.homepage = "https://github.com/TaDaa/vimade/"; }; @@ -10053,7 +10053,7 @@ final: prev: }; vimfiler-vim = buildVimPluginFrom2Nix { - pname = "vimfiler-vim"; + pname = "vimfiler.vim"; version = "2020-07-13"; src = fetchFromGitHub { owner = "Shougo"; @@ -10101,7 +10101,7 @@ final: prev: }; vimproc-vim = buildVimPluginFrom2Nix { - pname = "vimproc-vim"; + pname = "vimproc.vim"; version = "2020-06-23"; src = fetchFromGitHub { owner = "Shougo"; @@ -10125,7 +10125,7 @@ final: prev: }; vimshell-vim = buildVimPluginFrom2Nix { - pname = "vimshell-vim"; + pname = "vimshell.vim"; version = "2019-07-16"; src = fetchFromGitHub { owner = "Shougo"; @@ -10151,12 +10151,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-08-22"; + version = "2021-08-28"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "058f139985f4eede396d83f45a6b2e7b3924a012"; - sha256 = "1nxxw6k0y5ccsvm39h4mfrk93ply2xh5y1lihhwy17vaigwyx687"; + rev = "f1db6a544ba4096e1df1704bea721b4a146e51ac"; + sha256 = "11sgr1zzmxmy2m2191ax47hpi133sp1wfwnp5vay9cmhn9lym8k7"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -10174,7 +10174,7 @@ final: prev: }; vimway-lsp-diag-nvim = buildVimPluginFrom2Nix { - pname = "vimway-lsp-diag-nvim"; + pname = "vimway-lsp-diag.nvim"; version = "2021-08-04"; src = fetchFromGitHub { owner = "onsails"; @@ -10210,7 +10210,7 @@ final: prev: }; vissort-vim = buildVimPluginFrom2Nix { - pname = "vissort-vim"; + pname = "vissort.vim"; version = "2014-01-31"; src = fetchFromGitHub { owner = "navicore"; @@ -10222,7 +10222,7 @@ final: prev: }; vista-vim = buildVimPluginFrom2Nix { - pname = "vista-vim"; + pname = "vista.vim"; version = "2021-08-03"; src = fetchFromGitHub { owner = "liuchengxu"; @@ -10234,7 +10234,7 @@ final: prev: }; Vundle-vim = buildVimPluginFrom2Nix { - pname = "Vundle-vim"; + pname = "Vundle.vim"; version = "2019-08-17"; src = fetchFromGitHub { owner = "VundleVim"; @@ -10246,7 +10246,7 @@ final: prev: }; wal-vim = buildVimPluginFrom2Nix { - pname = "wal-vim"; + pname = "wal.vim"; version = "2020-11-08"; src = fetchFromGitHub { owner = "dylanaraps"; @@ -10270,7 +10270,7 @@ final: prev: }; which-key-nvim = buildVimPluginFrom2Nix { - pname = "which-key-nvim"; + pname = "which-key.nvim"; version = "2021-08-05"; src = fetchFromGitHub { owner = "folke"; @@ -10282,19 +10282,19 @@ final: prev: }; wilder-nvim = buildVimPluginFrom2Nix { - pname = "wilder-nvim"; - version = "2021-08-17"; + pname = "wilder.nvim"; + version = "2021-08-29"; src = fetchFromGitHub { owner = "gelguy"; repo = "wilder.nvim"; - rev = "3b1844d9d69972bec131aa66562afa545b00c883"; - sha256 = "1lr5vp2rr3i18qjv2h83d0bzrlc0617acwsimyd5jb105qa8rs09"; + rev = "73b754d3e9c6ecb163640d9d7df1102f52ac0ea3"; + sha256 = "0759l9y2bw1p814a35ay1zvs3g11bihln0qgf8fa19az5f0fsfi7"; }; meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; wildfire-vim = buildVimPluginFrom2Nix { - pname = "wildfire-vim"; + pname = "wildfire.vim"; version = "2021-05-10"; src = fetchFromGitHub { owner = "gcmt"; @@ -10306,7 +10306,7 @@ final: prev: }; wmgraphviz-vim = buildVimPluginFrom2Nix { - pname = "wmgraphviz-vim"; + pname = "wmgraphviz.vim"; version = "2018-04-26"; src = fetchFromGitHub { owner = "wannesm"; @@ -10318,7 +10318,7 @@ final: prev: }; wombat256-vim = buildVimPluginFrom2Nix { - pname = "wombat256-vim"; + pname = "wombat256.vim"; version = "2010-10-18"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -10342,7 +10342,7 @@ final: prev: }; wstrip-vim = buildVimPluginFrom2Nix { - pname = "wstrip-vim"; + pname = "wstrip.vim"; version = "2021-03-14"; src = fetchFromGitHub { owner = "tweekmonster"; @@ -10366,7 +10366,7 @@ final: prev: }; xterm-color-table-vim = buildVimPluginFrom2Nix { - pname = "xterm-color-table-vim"; + pname = "xterm-color-table.vim"; version = "2014-01-01"; src = fetchFromGitHub { owner = "guns"; @@ -10378,7 +10378,7 @@ final: prev: }; YankRing-vim = buildVimPluginFrom2Nix { - pname = "YankRing-vim"; + pname = "YankRing.vim"; version = "2015-07-29"; src = fetchFromGitHub { owner = "vim-scripts"; @@ -10390,7 +10390,7 @@ final: prev: }; yats-vim = buildVimPluginFrom2Nix { - pname = "yats-vim"; + pname = "yats.vim"; version = "2021-07-10"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; @@ -10416,7 +10416,7 @@ final: prev: }; YUNOcommit-vim = buildVimPluginFrom2Nix { - pname = "YUNOcommit-vim"; + pname = "YUNOcommit.vim"; version = "2014-11-26"; src = fetchFromGitHub { owner = "esneider"; @@ -10428,7 +10428,7 @@ final: prev: }; zeavim-vim = buildVimPluginFrom2Nix { - pname = "zeavim-vim"; + pname = "zeavim.vim"; version = "2019-06-07"; src = fetchFromGitHub { owner = "KabbAmine"; @@ -10464,7 +10464,7 @@ final: prev: }; zig-vim = buildVimPluginFrom2Nix { - pname = "zig-vim"; + pname = "zig.vim"; version = "2021-06-24"; src = fetchFromGitHub { owner = "ziglang"; @@ -10476,7 +10476,7 @@ final: prev: }; zoomwintab-vim = buildVimPluginFrom2Nix { - pname = "zoomwintab-vim"; + pname = "zoomwintab.vim"; version = "2020-10-13"; src = fetchFromGitHub { owner = "troydm"; From 8f36abb5288b2d7942bfad4e4b7caf301ff23600 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 30 Aug 2021 01:00:44 +0200 Subject: [PATCH 069/103] nixos/ipfs: run profile applications offline --- nixos/modules/services/network-filesystems/ipfs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 2748571be1f7..1d5c03787496 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -226,8 +226,8 @@ in { ${optionalString (! cfg.localDiscovery) "--profile=server"} else ${if cfg.localDiscovery - then "ipfs config profile apply local-discovery" - else "ipfs config profile apply server" + then "ipfs --offline config profile apply local-discovery" + else "ipfs --offline config profile apply server" } fi '' + optionalString cfg.autoMount '' From c33c7c3d5fa99fb13d39fd9af265b38a161abaf1 Mon Sep 17 00:00:00 2001 From: Tom Repetti Date: Sun, 29 Aug 2021 19:31:30 -0400 Subject: [PATCH 070/103] clang_11: Fix RISC-V builds for compiler-rt. (#135718) Closes: #135628 --- pkgs/development/compilers/llvm/11/compiler-rt/default.nix | 3 +++ pkgs/development/compilers/llvm/11/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/11/compiler-rt/default.nix b/pkgs/development/compilers/llvm/11/compiler-rt/default.nix index 89b47df405fe..e5b79692ae24 100644 --- a/pkgs/development/compilers/llvm/11/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/11/compiler-rt/default.nix @@ -112,5 +112,8 @@ stdenv.mkDerivation { # "All of the code in the compiler-rt project is dual licensed under the MIT # license and the UIUC License (a BSD-like license)": license = with lib.licenses; [ mit ncsa ]; + # compiler-rt requires a Clang stdenv on 32-bit RISC-V: + # https://reviews.llvm.org/D43106#1019077 + broken = stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.is32bit && !stdenv.cc.isClang; }; } diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index 661e60e24b18..9834ce30cdd2 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -227,7 +227,7 @@ let compiler-rt-libc = callPackage ./compiler-rt { inherit llvm_meta; - stdenv = if (stdenv.hostPlatform.useLLVM or false) || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) + stdenv = if (stdenv.hostPlatform.useLLVM or false) || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) || (stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.is32bit) then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc else stdenv; }; @@ -240,7 +240,7 @@ let }; # N.B. condition is safe because without useLLVM both are the same. - compiler-rt = if stdenv.hostPlatform.isAndroid || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) + compiler-rt = if stdenv.hostPlatform.isAndroid || (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) || (stdenv.hostPlatform.libc == "newlib") then libraries.compiler-rt-libc else libraries.compiler-rt-no-libc; From 4d83b2529c19f5f01866721688e4eb850827bb6b Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 26 Aug 2021 13:14:21 +0900 Subject: [PATCH 071/103] vector: 0.15.2 -> 0.16.0 --- pkgs/tools/misc/vector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 49e07b7507a2..6faaf5506306 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -28,16 +28,16 @@ rustPlatform.buildRustPackage rec { pname = "vector"; - version = "0.15.2"; + version = "0.16.0"; src = fetchFromGitHub { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-u/KHiny9o/q74dh/w3cShAb6oEkMxNaTMF2lOFx+1po="; + sha256 = "sha256-xLlVM4K5yDur2jhrninZL6foFWq935u6mZXUbtQofsE="; }; - cargoSha256 = "sha256-wUNF+810Yh4hPQzraWo2mDi8KSmRKp9Z9D+4kwKQ+IU="; + cargoSha256 = "sha256-mIUmYDSPCIvuZDK/5HHH3mf5Yc8D5wnhGUvgsuXrAFQ="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; From fc87d9a067dfb13739388afd4318241c96e66b6a Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 27 Aug 2021 10:32:08 +0900 Subject: [PATCH 072/103] vector: 0.16.0 -> 0.16.1 --- pkgs/tools/misc/vector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 6faaf5506306..4778ecd4fb8e 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -28,16 +28,16 @@ rustPlatform.buildRustPackage rec { pname = "vector"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "timberio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xLlVM4K5yDur2jhrninZL6foFWq935u6mZXUbtQofsE="; + sha256 = "sha256-10e0cWt6XW8msNR/RXbaOpdwTAlRLm6jVvDed905rho="; }; - cargoSha256 = "sha256-mIUmYDSPCIvuZDK/5HHH3mf5Yc8D5wnhGUvgsuXrAFQ="; + cargoSha256 = "sha256-ezQ/tX/uKzJprLQt2xIUZwGuUOmuRmTO+gPsf3MLEv8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; From f082ab00bd29de3bea7faa1a9654fc45151f86a2 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 29 Aug 2021 09:33:29 +0900 Subject: [PATCH 073/103] vector: disable flaky tests --- pkgs/tools/misc/vector/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 4778ecd4fb8e..6c559ada9632 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -53,7 +53,16 @@ rustPlatform.buildRustPackage rec { # dev dependency includes httpmock which depends on iashc which depends on curl-sys with http2 feature enabled # compilation fails because of a missing http2 include doCheck = !stdenv.isDarwin; - checkPhase = "TZDIR=${tzdata}/share/zoneinfo cargo test --no-default-features --features ${lib.concatStringsSep "," features} -- --test-threads 1"; + # healthcheck_grafana_cloud is trying to make a network access + # test_stream_errors is flaky on linux-aarch64 + checkPhase = '' + TZDIR=${tzdata}/share/zoneinfo cargo test \ + --no-default-features \ + --features ${lib.concatStringsSep "," features} \ + -- --test-threads 1 \ + --skip=sinks::loki::tests::healthcheck_grafana_cloud \ + --skip=kubernetes::api_watcher::tests::test_stream_errors + ''; # recent overhauls of DNS support in 0.9 mean that we try to resolve # vector.dev during the checkPhase, which obviously isn't going to work. From 2c4c91c248e83f17dd68d5a1a2bdece188305b84 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Aug 2021 04:07:26 +0000 Subject: [PATCH 074/103] python38Packages.gensim: 4.0.1 -> 4.1.0 --- pkgs/development/python-modules/gensim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 548dd1214fa7..8972b356805a 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "gensim"; - version = "4.0.1"; + version = "4.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b4d0b9562796968684028e06635e0f7aff39ffb33719057fd1667754ea09a6e4"; + sha256 = "0b09983048a97c7915ab50500bc53eeec438d26366041598709ec156db3eef1f"; }; propagatedBuildInputs = [ smart-open numpy six scipy ]; From fc467e5797c3b088f690087f8d76566f05ff6483 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 28 Aug 2021 00:04:20 +0000 Subject: [PATCH 075/103] mcfly: 0.5.8 -> 0.5.9 https://github.com/cantino/mcfly/releases/tag/v0.5.9 --- pkgs/tools/misc/mcfly/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index a6d635a6f7ed..0d55da7fdfa4 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -2,30 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.5.8"; + version = "0.5.9"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "sha256-D8ScF/3qyT0VuMGmWkkeGRyCu4LdOXt1wvR9whbNURE="; + sha256 = "0i3qjgq1b8h3bzc7rxa60kq1yc2im9m6dgzrvial086a1zk8s81r"; }; - postInstall = '' - substituteInPlace mcfly.bash --replace '$(which mcfly)' $out/bin/mcfly - substituteInPlace mcfly.zsh --replace '$(which mcfly)' $out/bin/mcfly - substituteInPlace mcfly.fish --replace '(which mcfly)' $out/bin/mcfly - install -Dm644 -t $out/share/mcfly mcfly.bash - install -Dm644 -t $out/share/mcfly mcfly.zsh - install -Dm644 -t $out/share/mcfly mcfly.fish - ''; - - cargoSha256 = "sha256-VZgxfVmAa5lPfdLNbsotNoRpTLe3HID36sF8T/0mywI="; + cargoSha256 = "084v4fsdi25ahz068ssq29z7d5d3k3jh3s8b07irwybdsy18c629"; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now"; - changelog = "https://github.com/cantino/mcfly/blob/v${version}/CHANGELOG.txt"; + changelog = "https://github.com/cantino/mcfly/raw/v${version}/CHANGELOG.txt"; license = licenses.mit; maintainers = [ maintainers.melkor333 ]; }; From 39067594f5d668caa701fc3e014a8b4bf73a9ac0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 26 Aug 2021 12:06:13 +0200 Subject: [PATCH 076/103] =?UTF-8?q?ocaml-ng.ocamlPackages=5F4=5F13.ocaml:?= =?UTF-8?q?=204.13.0-=CE=B12=20=E2=86=92=204.13.0-=CE=B21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/ocaml/4.13.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ocaml/4.13.nix b/pkgs/development/compilers/ocaml/4.13.nix index 008d2cd6d075..723b597b88dc 100644 --- a/pkgs/development/compilers/ocaml/4.13.nix +++ b/pkgs/development/compilers/ocaml/4.13.nix @@ -1,9 +1,9 @@ import ./generic.nix { major_version = "4"; minor_version = "13"; - patch_version = "0-alpha2"; + patch_version = "0-beta1"; src = fetchTarball { - url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~alpha2.tar.xz"; - sha256 = "0krb0254i6ihbymjn6mwgzcfrzsvpk9hbagl0agm6wml21zpcsif"; + url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~beta1.tar.xz"; + sha256 = "0dbz69p1kqabjvzaasy2malfdfn4b93s504x2xs0dl5l3fa3p6c3"; }; } From 8c22b541cf605dea63d479510629a728ba231d27 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 29 Aug 2021 21:22:55 +0200 Subject: [PATCH 077/103] libreswan: 4.4 -> 4.5 --- pkgs/tools/networking/libreswan/default.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix index 24b7176e82b5..766a1030fd7e 100644 --- a/pkgs/tools/networking/libreswan/default.nix +++ b/pkgs/tools/networking/libreswan/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , nixosTests , pkg-config , systemd @@ -43,11 +42,11 @@ in stdenv.mkDerivation rec { pname = "libreswan"; - version = "4.4"; + version = "4.5"; src = fetchurl { url = "https://download.libreswan.org/${pname}-${version}.tar.gz"; - sha256 = "0xj974yc0y1r7235zl4jhvxqz3bpb8js2fy9ic820zq9swh0lgsz"; + sha256 = "18whvmaxqfmaqbmq72calyzk21wyvxa0idddcsxd8x36vhdza0q7"; }; strictDeps = true; @@ -70,14 +69,6 @@ stdenv.mkDerivation rec { python3 bash ] ++ lib.optional stdenv.isLinux libselinux; - patches = [ - # Fix compilation on aarch64, remove on next update - (fetchpatch { - url = "https://github.com/libreswan/libreswan/commit/ea50d36d2886e44317ba5ba841de1d1bf91aee6c.patch"; - sha256 = "1jp89rm9jp55zmiyimyhg7yadj0fwwxaw7i5gyclrs38w3y1aacj"; - }) - ]; - prePatch = '' # Correct iproute2 path sed -e 's|"/sbin/ip"|"${iproute2}/bin/ip"|' \ @@ -111,10 +102,8 @@ stdenv.mkDerivation rec { -i configs/Makefile ''; - # Set appropriate paths for build - preBuild = "export INC_USRLOCAL=\${out}"; - makeFlags = [ + "PREFIX=$(out)" "INITSYSTEM=systemd" "UNITDIR=$(out)/etc/systemd/system/" "TMPFILESDIR=$(out)/lib/tmpfiles.d/" From 9203210f36daed43fbd8073183d96ff9c4a81955 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 21 Aug 2021 19:18:42 +0200 Subject: [PATCH 078/103] ceph: 16.2.4 -> 16.2.5 --- pkgs/tools/filesystems/ceph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 0ccc96ce1885..426aff81f069 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -146,10 +146,10 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "16.2.4"; + version = "16.2.5"; src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "sha256-J6FVK7feNN8cGO5BSDlfRGACAzchmRUSWR+a4ZgeWy0="; + sha256 = "sha256-uCBpFvp5k+A5SgwxoJVkuGb9E69paKrs3qda5RpsRt4="; }; in rec { ceph = stdenv.mkDerivation { From 78d20f22007a9e615c8bf1a7bf12afea518e1d39 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 27 Aug 2021 12:16:30 +0000 Subject: [PATCH 079/103] pkgsMusl.libiscsi: fix build --- pkgs/development/libraries/libiscsi/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libiscsi/default.nix b/pkgs/development/libraries/libiscsi/default.nix index adc721bc6d07..6dd23d219d95 100644 --- a/pkgs/development/libraries/libiscsi/default.nix +++ b/pkgs/development/libraries/libiscsi/default.nix @@ -13,8 +13,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; + # This can be removed after >=1.20.0, or if the build suceeds with + # pie enabled (default on Musl). + hardeningDisable = [ "pie" ]; + # This problem is gone on libiscsi master. - NIX_CFLAGS_COMPILE = if stdenv.hostPlatform.is32bit then "-Wno-error=sign-compare" else null; + NIX_CFLAGS_COMPILE = + lib.optional stdenv.hostPlatform.is32bit "-Wno-error=sign-compare"; meta = with lib; { description = "iscsi client library and utilities"; From a850ed0be80728fba3bc2c482f7714ba2df5a906 Mon Sep 17 00:00:00 2001 From: Matthew Leach Date: Mon, 30 Aug 2021 09:12:52 +0100 Subject: [PATCH 080/103] portaudio: remove Werror (#136060) --- pkgs/development/libraries/portaudio/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 4666850c5849..9a43d5a921e5 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -23,7 +23,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-mac-universal" "--enable-cxx" ]; - NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=deprecated-declarations -Wno-error=nullability-completeness-on-arrays"; + postConfigure = '' + substituteInPlace Makefile --replace "-Werror" "" + ''; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AudioUnit AudioToolbox CoreAudio CoreServices Carbon ]; From 3257b73c94f239de5eb67afb0e26572d4c9d69dc Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 30 Aug 2021 02:05:12 +0200 Subject: [PATCH 081/103] vimPlugins: assign original name to pname instead of the normalized_name. there is no need to rename the plugin ?! and it can upset packages for instance packer.nvim generates a config/nvim/plugin/packer_compiled.lua that does vim.api.nvim_command('packadd packer.nvim') which doesnt work on nixpkgs since the "packer.nvim" folder is renamed to "packer-nvim --- pkgs/misc/vim-plugins/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py index 6f15f5dd271d..126b0d3e7d8d 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/misc/vim-plugins/update.py @@ -66,7 +66,7 @@ class VimEditor(pluginupdate.Editor): f.write(textwrap.indent(textwrap.dedent( f""" {plugin.normalized_name} = buildVimPluginFrom2Nix {{ - pname = "{plugin.normalized_name}"; + pname = "{plugin.name}"; version = "{plugin.version}"; src = fetchFromGitHub {{ owner = "{owner}"; From 87e5bc2cc2222a4e63ae2699be805725103db904 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 27 Aug 2021 07:39:32 +0200 Subject: [PATCH 082/103] =?UTF-8?q?ocamlPackages.ocsigen-toolkit:=202.7.0?= =?UTF-8?q?=20=E2=86=92=202.12.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/ocsigen-toolkit/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index eccdcf80d7cc..0e430e2ba291 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -5,27 +5,27 @@ stdenv.mkDerivation rec { pname = "ocsigen-toolkit"; name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "2.7.0"; + version = "2.12.2"; propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ]; buildInputs = [ ocaml findlib opaline ]; - installPhase = - '' + installPhase = '' + runHook preInstall + mkdir -p $OCAMLFIND_DESTDIR export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH make install opaline -prefix $out + runHook postInstall ''; src = fetchFromGitHub { owner = "ocsigen"; repo = pname; rev = version; - sha256 = "0jan5779nc0jf993hmvfii15ralcs20sm4mcnqwqrnhjbq6f6zpk"; + sha256 = "1fqrh7wrzs76qj3nvmxqy76pzqvsja2dwzqxyl8rkh5jg676vmqy"; }; - createFindlibDestdir = true; - meta = { homepage = "http://ocsigen.org/ocsigen-toolkit/"; description = " User interface widgets for Ocsigen applications"; From 36cf478468c707fa2e867227ce04b1a729fdf6f7 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 12:53:12 +0900 Subject: [PATCH 083/103] rabbitmq: nixpkgs-fmt --- nixos/modules/services/amqp/rabbitmq.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix index fc8a1bc3c23c..2db28210262d 100644 --- a/nixos/modules/services/amqp/rabbitmq.nix +++ b/nixos/modules/services/amqp/rabbitmq.nix @@ -7,12 +7,13 @@ let inherit (builtins) concatStringsSep; - config_file_content = lib.generators.toKeyValue {} cfg.configItems; + config_file_content = lib.generators.toKeyValue { } cfg.configItems; config_file = pkgs.writeText "rabbitmq.conf" config_file_content; advanced_config_file = pkgs.writeText "advanced.config" cfg.config; -in { +in +{ ###### interface options = { services.rabbitmq = { @@ -79,7 +80,7 @@ in { }; configItems = mkOption { - default = {}; + default = { }; type = types.attrsOf types.str; example = literalExample '' { @@ -123,13 +124,13 @@ in { }; plugins = mkOption { - default = []; + default = [ ]; type = types.listOf types.str; description = "The names of plugins to enable"; }; pluginDirs = mkOption { - default = []; + default = [ ]; type = types.listOf types.path; description = "The list of directories containing external plugins"; }; @@ -180,7 +181,7 @@ in { RABBITMQ_ENABLED_PLUGINS_FILE = pkgs.writeText "enabled_plugins" '' [ ${concatStringsSep "," cfg.plugins} ]. ''; - } // optionalAttrs (cfg.config != "") { RABBITMQ_ADVANCED_CONFIG_FILE = advanced_config_file; }; + } // optionalAttrs (cfg.config != "") { RABBITMQ_ADVANCED_CONFIG_FILE = advanced_config_file; }; serviceConfig = { ExecStart = "${cfg.package}/sbin/rabbitmq-server"; From f091420c1d194ad398142959266f18493da1ff83 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 17:11:49 +0900 Subject: [PATCH 084/103] rabbitmq: add option to enable management plugin --- nixos/modules/services/amqp/rabbitmq.nix | 27 ++++++++++++++++++++++++ nixos/tests/rabbitmq.nix | 6 +++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix index 2db28210262d..8fdfda9a66d8 100644 --- a/nixos/modules/services/amqp/rabbitmq.nix +++ b/nixos/modules/services/amqp/rabbitmq.nix @@ -134,6 +134,28 @@ in type = types.listOf types.path; description = "The list of directories containing external plugins"; }; + + managementPlugin = mkOption { + description = "The options to run the management plugin"; + type = types.submodule { + options = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable the management plugin + ''; + }; + port = mkOption { + default = 15672; + type = types.port; + description = '' + On which port to run the management plugin + ''; + }; + }; + }; + }; }; }; @@ -158,8 +180,13 @@ in services.rabbitmq.configItems = { "listeners.tcp.1" = mkDefault "${cfg.listenAddress}:${toString cfg.port}"; + } // optionalAttrs cfg.managementPlugin.enable { + "management.tcp.port" = toString cfg.managementPlugin.port; + "management.tcp.ip" = cfg.listenAddress; }; + services.rabbitmq.plugins = optional cfg.managementPlugin.enable "rabbitmq_management"; + systemd.services.rabbitmq = { description = "RabbitMQ Server"; diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix index 69be29b0f9e5..03f1fa46d29e 100644 --- a/nixos/tests/rabbitmq.nix +++ b/nixos/tests/rabbitmq.nix @@ -7,7 +7,10 @@ import ./make-test-python.nix ({ pkgs, ... }: { }; machine = { - services.rabbitmq.enable = true; + services.rabbitmq = { + enable = true; + managementPlugin.enable = true; + }; # Ensure there is sufficient extra disk space for rabbitmq to be happy virtualisation.diskSize = 1024; }; @@ -19,5 +22,6 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.wait_until_succeeds( 'su -s ${pkgs.runtimeShell} rabbitmq -c "rabbitmqctl status"' ) + machine.wait_for_open_port("15672") ''; }) From 7e495c1b557f8801b538de4a49dac1a5bcae44ba Mon Sep 17 00:00:00 2001 From: Jonas Chevalier Date: Mon, 30 Aug 2021 11:55:59 +0200 Subject: [PATCH 085/103] terraform-providers.fastly: 0.16.1 -> 0.34.0 (#136158) --- .../cluster/terraform-providers/providers.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3071bba71f60..eefc5f1a6272 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -332,11 +332,13 @@ "version": "2.1.0" }, "fastly": { - "owner": "terraform-providers", + "owner": "fastly", + "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v0.16.1", - "sha256": "1pjrcw03a86xgkzcx778f7kk79svv8csy05b7qi0m5x77zy4pws7", - "version": "0.16.1" + "rev": "v0.34.0", + "sha256": "1za00gzmyxr6wfzzq92m3spi9563pbpjwj24sm95kj34l6mfwpyx", + "vendorSha256": null, + "version": "0.34.0" }, "flexibleengine": { "owner": "terraform-providers", From ab2501bd171f2c930ebd3f3bf6b6a1a228477a08 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 09:07:44 +0000 Subject: [PATCH 086/103] lttng-ust: 2.10.5 -> 2.13.0; clarify license Also enable parallel building; tested at -j48. --- pkgs/development/tools/misc/lttng-ust/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 94d2e4a33f29..244d6442c15f 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, liburcu, python3 }: +{ lib, stdenv, fetchurl, pkg-config, liburcu, numactl, python3 }: # NOTE: # ./configure ... @@ -13,14 +13,15 @@ stdenv.mkDerivation rec { pname = "lttng-ust"; - version = "2.10.5"; + version = "2.13.0"; src = fetchurl { url = "https://lttng.org/files/lttng-ust/${pname}-${version}.tar.bz2"; - sha256 = "0ddwk0nl28bkv2xb78gz16a2bvlpfbjmzwfbgwf5p1cq46dyvy86"; + sha256 = "0l0p6y2zrd9hgd015dhafjmpcj7waz762n6wf5ws1xlwcwrwkr2l"; }; - buildInputs = [ python3 ]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ numactl python3 ]; preConfigure = '' patchShebangs . @@ -28,10 +29,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ liburcu ]; + enableParallelBuilding = true; + meta = with lib; { description = "LTTng Userspace Tracer libraries"; homepage = "https://lttng.org/"; - license = licenses.lgpl21Plus; + license = with licenses; [ lgpl21Only gpl2Only mit ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; From 0f5094de5d1fc6c0438916b8cfa7318e7c64454c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 09:08:48 +0000 Subject: [PATCH 087/103] lttng-tools: 2.11.0 -> 2.13.0; clarify license Also enable parallel building; tested at -j48. --- pkgs/development/tools/misc/lttng-tools/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 223e10d04ab5..71485a2da3da 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,20 +2,22 @@ stdenv.mkDerivation rec { pname = "lttng-tools"; - version = "2.11.0"; + version = "2.13.0"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "1g0g7ypxvc7wd5x4d4ixmfgl9yk0lxax3ymm95hcjwxn5p497r6w"; + sha256 = "1ri93h45q5z6l3qmg4dakm9aj0ghfmf38i63q51yjh58lzwr9j4d"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ popt libuuid liburcu lttng-ust libxml2 kmod ]; + enableParallelBuilding = true; + meta = with lib; { description = "Tracing tools (kernel + user space) for Linux"; homepage = "https://lttng.org/"; - license = licenses.lgpl21; + license = with licenses; [ lgpl21Only gpl2Only ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; From 990897205571afe001a4d5b4f4c96f8ffe23a978 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 09:11:08 +0000 Subject: [PATCH 088/103] linuxPackages.lttng-modules: 2.12.6 -> 2.13.0 Fixes build with linuxPackages_5_14. --- pkgs/os-specific/linux/lttng-modules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 7f4036c775ff..e5645438567a 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lttng-modules-${kernel.version}"; - version = "2.12.6"; + version = "2.13.0"; src = fetchurl { url = "https://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2"; - sha256 = "sha256-lawqLPkthdI/+9rKah7A18FnIR0eD7hQq5AASj9HXqo="; + sha256 = "0mikc3fdjd0w6rrcyksjzmv0czvgba6yk8dfmz4a3cr8s4y2pgsy"; }; buildInputs = kernel.moduleBuildDependencies; From 0c8415335fe3fb3347bd1f75813c6da1991f1112 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 30 Aug 2021 18:48:10 +1000 Subject: [PATCH 089/103] nix-update: 0.4.0 -> 0.5.0 https://github.com/Mic92/nix-update/releases/tag/0.5.0 --- pkgs/tools/package-management/nix-update/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index c205550b267d..1345e2caa406 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -9,13 +9,13 @@ buildPythonApplication rec { pname = "nix-update"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "sha256-n3YuNypKFaBtO5Fhf7Z3Wgh0+WH5bQWR0W0uHCYKtuY="; + sha256 = "sha256-D1N7ISLZJ3A8G9X5dvtCbRse5h0MRJoeZM3CHkFpqlE="; }; makeWrapperArgs = [ From a8331640b1bd4cac9595f4e0d4e77dc796fd0a91 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 30 Aug 2021 12:37:43 +0200 Subject: [PATCH 090/103] slurm: 20.11.8.1 -> 21.08.0.1 --- pkgs/servers/computing/slurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 49beef53fe67..6468f12c3d9c 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "20.11.8.1"; + version = "21.08.0.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "0id2b01rvq81zd2p34il0gg880f94g9ip4gn1pyh20zz5bxlnbjc"; + sha256 = "0f1i64vby1qa2y9gv9a9x595s58p6dpw4yhljbgrc2wr7glvnfi3"; }; outputs = [ "out" "dev" ]; From 8a56ac5db3e83a1e19bbe3a696cab83c6f21c359 Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 27 Aug 2021 16:47:11 +0900 Subject: [PATCH 091/103] epmd: add ipv6 assertion --- nixos/modules/services/networking/epmd.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/epmd.nix b/nixos/modules/services/networking/epmd.nix index f7cdc0fe79c0..6fc8ed2aa0ef 100644 --- a/nixos/modules/services/networking/epmd.nix +++ b/nixos/modules/services/networking/epmd.nix @@ -4,9 +4,7 @@ with lib; let cfg = config.services.epmd; - in - { ###### interface options.services.epmd = { @@ -27,16 +25,31 @@ in an Erlang runtime that is already installed for other purposes. ''; }; + listenStream = mkOption + { + type = types.str; + default = null; + description = '' + the listenStream used by the systemd socket. + see https://www.freedesktop.org/software/systemd/man/systemd.socket.html#ListenStream= for more informations. + use this to change the port epmd will run on. + if not defined, epmd will use "[::]:4369" + ''; + }; }; ###### implementation config = mkIf cfg.enable { + assertions = [{ + assertion = cfg.listenStream == null -> config.networking.enableIPv6; + message = "epmd listens by default on ipv6, enable ipv6 or change config.services.epmd.listenStream"; + }]; systemd.sockets.epmd = rec { description = "Erlang Port Mapper Daemon Activation Socket"; wantedBy = [ "sockets.target" ]; before = wantedBy; socketConfig = { - ListenStream = "4369"; + ListenStream = if cfg.listenStream != null then cfg.listenStream else "[::]:4369"; Accept = "false"; }; }; From bc9e07ba1007b03d15427bac5275bea5b32f10ca Mon Sep 17 00:00:00 2001 From: Jonas Chevalier Date: Mon, 30 Aug 2021 13:13:36 +0200 Subject: [PATCH 092/103] terraform-providers.aws: 3.43.0 -> 3.56.0 (#136102) --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index eefc5f1a6272..3779472fdf10 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -80,10 +80,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v3.43.0", - "sha256": "05rv93y9hf0l869q6i581748rw4bahvsgggj0h7cwjnf7xap0sxj", - "vendorSha256": "1m6pkrpknslqnv60cz5739gp5nxc7xhga402wkl37gdagmadkmrk", - "version": "3.43.0" + "rev": "v3.56.0", + "sha256": "0fa61i172maanxmxz28mj7mkgrs9a5bs61mlvb0d5y97lv6pm2xg", + "vendorSha256": "1s22k4b2zq5n0pz6iqbqsf6f7chsbvkpdn432rvyshcryxlklfvl", + "version": "3.56.0" }, "azuread": { "owner": "hashicorp", From bf6c90bd91545013f2fc7128de83fb22a98305b7 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 29 Aug 2021 16:04:47 +0200 Subject: [PATCH 093/103] =?UTF-8?q?ocamlPackages.ppx=5Foptcomp:=200.14.1?= =?UTF-8?q?=20=E2=86=92=200.14.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/janestreet/0.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index e348c5d9325a..5717dd07b423 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -545,8 +545,8 @@ with self; ppx_optcomp = janePackage { pname = "ppx_optcomp"; - version = "0.14.1"; - hash = "0j5smqa0hig1yn8wfrb4mv0y59kkwsalmqkm5asbd7kcc6589ap4"; + version = "0.14.3"; + hash = "1iflgfzs23asw3k6098v84al5zqx59rx2qjw0mhvk56avlx71pkw"; minimumOCamlVersion = "4.04.2"; meta.description = "Optional compilation for OCaml"; propagatedBuildInputs = [ ppxlib ]; From 526d290b7ce8391eafb693af09281ebaa09bf00b Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Mon, 30 Aug 2021 11:01:35 +0200 Subject: [PATCH 094/103] dbeaver: 21.1.5 -> 21.2.0 --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 963da1839fe6..ed3f07713e93 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.1.5"; # When updating also update fetchedMavenDeps.sha256 + version = "21.2.0"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sk19Gfu+s7KG1V4f28bFsskagGAuAsEBJEFJzvNh25M="; + sha256 = "UYLX8oUHHfdsNiby+emunLRPIHo8ht3bfiredXOjkWs="; }; fetchedMavenDeps = stdenv.mkDerivation { From 97389b76507e359679d7758afae84b4b6f41dd99 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 10:25:29 +0000 Subject: [PATCH 095/103] linuxPackages.rtl8188eus-aircrack: parallel build So much faster. Tested at -j48. --- pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix b/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix index 93a91f0447a4..100683ed37ba 100644 --- a/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl8188eus-aircrack/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; + enableParallelBuilding = true; + meta = with lib; { description = "RealTek RTL8188eus WiFi driver with monitor mode & frame injection support"; homepage = "https://github.com/aircrack-ng/rtl8188eus"; From db1f8c596dda9dcf62cb65cd042de0483c5ea5f9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 10:45:06 +0000 Subject: [PATCH 096/103] linuxPackages.rtl8812au: parallel build So much faster. Tested at -j48. --- pkgs/os-specific/linux/rtl8812au/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 43396a99b963..7fa5ee42670d 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko ''; + enableParallelBuilding = true; + meta = with lib; { description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod"; homepage = "https://github.com/gordboy/rtl8812au-5.9.3.2"; From ec33cdf902a9c5cd74831b5c3cb725ef8b4c113c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 10:46:36 +0000 Subject: [PATCH 097/103] linuxPackages.rtl8814au: parallel build So much faster. Tested at -j48. --- pkgs/os-specific/linux/rtl8814au/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index 2b0fb9622a4b..f8c74f9d22e2 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; + enableParallelBuilding = true; + meta = with lib; { description = "Realtek 8814AU USB WiFi driver"; homepage = "https://github.com/morrownr/8814au"; From 177074e3cb1415aa729947f811d431824f4a08f7 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 10:47:16 +0000 Subject: [PATCH 098/103] linuxPackages.rtl8821au: parallel build So much faster. Tested at -j48. --- pkgs/os-specific/linux/rtl8821au/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index 08e097b0d5f3..1f7d07f7326d 100644 --- a/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { nuke-refs $out/lib/modules/*/kernel/net/wireless/*.ko ''; + enableParallelBuilding = true; + meta = with lib; { description = "rtl8821AU and rtl8812AU chipset driver with firmware"; homepage = "https://github.com/morrownr/8821au"; From 6da5cc14c7636eeb58d27e2aa1dd128e814e329d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 10:48:06 +0000 Subject: [PATCH 099/103] linuxPackages.rtl8821ce: parallel build So much faster. Tested at -j48. --- pkgs/os-specific/linux/rtl8821ce/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/rtl8821ce/default.nix b/pkgs/os-specific/linux/rtl8821ce/default.nix index b4def6f001ca..27ee57ba7553 100644 --- a/pkgs/os-specific/linux/rtl8821ce/default.nix +++ b/pkgs/os-specific/linux/rtl8821ce/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; + enableParallelBuilding = true; + meta = with lib; { description = "Realtek rtl8821ce driver"; homepage = "https://github.com/tomaspinho/rtl8821ce"; From 9ef6829aead59a31a5e0c3bffa814191c0922d4a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 10:48:37 +0000 Subject: [PATCH 100/103] linuxPackages.rtl8821cu: parallel build Tested at -j48. --- pkgs/os-specific/linux/rtl8821cu/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/rtl8821cu/default.nix b/pkgs/os-specific/linux/rtl8821cu/default.nix index 556fd7939156..2ea555ff0b8a 100644 --- a/pkgs/os-specific/linux/rtl8821cu/default.nix +++ b/pkgs/os-specific/linux/rtl8821cu/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; + enableParallelBuilding = true; + meta = with lib; { description = "Realtek rtl8821cu driver"; homepage = "https://github.com/morrownr/8821cu"; From 66a079fc31c10c44e05d53b6dc9faa0c056412c0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 10:49:43 +0000 Subject: [PATCH 101/103] linuxPackages.rtl88x2bu: parallel build So much faster. Tested at -j48. --- pkgs/os-specific/linux/rtl88x2bu/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/rtl88x2bu/default.nix b/pkgs/os-specific/linux/rtl88x2bu/default.nix index 4b194bb2f335..cbd604b72ed1 100644 --- a/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; + enableParallelBuilding = true; + meta = with lib; { description = "Realtek rtl88x2bu driver"; homepage = "https://github.com/morrownr/88x2bu"; From 3e25f7feaaf09c15167d0410999fc38da3872e6c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 10:51:24 +0000 Subject: [PATCH 102/103] linuxPackages.rtl88xxau-aircrack: parallel build So much faster. Tested at -j48. --- pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix index d65a601fd9e2..8d3340e16fb3 100644 --- a/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix +++ b/pkgs/os-specific/linux/rtl88xxau-aircrack/default.nix @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" ''; + enableParallelBuilding = true; + meta = with lib; { description = "Aircrack-ng kernel module for Realtek 88XXau network cards\n(8811au, 8812au, 8814au and 8821au chipsets) with monitor mode and injection support."; homepage = "https://github.com/aircrack-ng/rtl8812au"; From d874a520155a73111f227744672254de0624aae5 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 30 Aug 2021 20:49:47 +0900 Subject: [PATCH 103/103] epmd: provide default --- nixos/modules/services/networking/epmd.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/epmd.nix b/nixos/modules/services/networking/epmd.nix index 6fc8ed2aa0ef..3899d164f16a 100644 --- a/nixos/modules/services/networking/epmd.nix +++ b/nixos/modules/services/networking/epmd.nix @@ -28,7 +28,7 @@ in listenStream = mkOption { type = types.str; - default = null; + default = "[::]:4369"; description = '' the listenStream used by the systemd socket. see https://www.freedesktop.org/software/systemd/man/systemd.socket.html#ListenStream= for more informations. @@ -41,7 +41,7 @@ in ###### implementation config = mkIf cfg.enable { assertions = [{ - assertion = cfg.listenStream == null -> config.networking.enableIPv6; + assertion = cfg.listenStream == "[::]:4369" -> config.networking.enableIPv6; message = "epmd listens by default on ipv6, enable ipv6 or change config.services.epmd.listenStream"; }]; systemd.sockets.epmd = rec { @@ -49,7 +49,7 @@ in wantedBy = [ "sockets.target" ]; before = wantedBy; socketConfig = { - ListenStream = if cfg.listenStream != null then cfg.listenStream else "[::]:4369"; + ListenStream = cfg.listenStream; Accept = "false"; }; };