From 841cccb5793fa26271f16561b8205f8830aaa8e7 Mon Sep 17 00:00:00 2001 From: Sofi Date: Sat, 2 Jul 2022 17:58:31 +0200 Subject: [PATCH 01/30] tt-rss-plugin-auth-ldap: fix ldaps connection issue --- pkgs/servers/tt-rss/plugin-auth-ldap/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix index 23425b0a2d0..7bff424d9f7 100644 --- a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix +++ b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation rec { url = "https://github.com/hydrian/TTRSS-Auth-LDAP/commit/557811efa15bab3b5044c98416f9e37264f11c9a.patch"; sha256 = "sha256-KtDY0J1OYNTLwK7834lI+2XL1N1FkOk5zhinGY90/4A="; }) + # https://github.com/hydrian/TTRSS-Auth-LDAP/pull/34 + (fetchpatch { + url = "https://github.com/hydrian/TTRSS-Auth-LDAP/commit/b1a873f6a7d18231d2ac804d0146d6e048c8382c.patch"; + sha256 = "sha256-t5bDQM97dGwr7tHSS9cSO7qApf2M8KNaIuIxbAjExrs="; + }) ]; installPhase = '' From 0e291be64432dd355747de6abdf2a1cadd5844e8 Mon Sep 17 00:00:00 2001 From: revol-xut Date: Tue, 6 Sep 2022 22:17:07 +0200 Subject: [PATCH 02/30] mediawiki: fix correctly setting --dbtype flag --- nixos/modules/services/web-apps/mediawiki.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix index 0260af77711..a32db718848 100644 --- a/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixos/modules/services/web-apps/mediawiki.nix @@ -449,6 +449,7 @@ in --dbuser ${cfg.database.user} \ ${optionalString (cfg.database.passwordFile != null) "--dbpassfile ${cfg.database.passwordFile}"} \ --passfile ${cfg.passwordFile} \ + --dbtype ${cfg.database.type} \ ${cfg.name} \ admin From b03b12a1d4467a032f089e7a76a67485df25d1a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 10 Sep 2022 00:12:25 +0000 Subject: [PATCH 03/30] limesuite: 20.10.0 -> 22.09.0 --- pkgs/applications/radio/limesuite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index 4272075a042..072d2d15b7e 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "limesuite"; - version = "20.10.0"; + version = "22.09.0"; src = fetchFromGitHub { owner = "myriadrf"; repo = "LimeSuite"; rev = "v${version}"; - sha256 = "04wzfhzqmxjsa6bgcr4zd518fln9rbwnbabf48kha84d70vzkdlx"; + sha256 = "sha256-HV0ejx7ImJ7GvAyCi0a7OPB0/2UiLQxxhYR2bc2uYCA="; }; nativeBuildInputs = [ cmake ]; From 07290f1eb63c1550957982421921e7e5d7911c0d Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 15 Aug 2022 17:06:39 -0300 Subject: [PATCH 04/30] omnisharp-roslyn: add tests --- .../tools/omnisharp-roslyn/default.nix | 43 ++++++++++++++++++- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 31d0b534356..505f19c5427 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -5,11 +5,13 @@ , lib , patchelf , stdenv +, runCommand +, expect }: let inherit (dotnetCorePackages) sdk_6_0; in -buildDotnetModule rec { +let finalPackage = buildDotnetModule rec { pname = "omnisharp-roslyn"; version = "1.39.1"; @@ -72,6 +74,43 @@ buildDotnetModule rec { rm $out/lib/omnisharp-roslyn/System.Configuration.ConfigurationManager.dll ''; + passthru.tests = { + no-sdk = runCommand "no-sdk" { nativeBuildInputs = [ finalPackage expect ]; meta.timeout = 60; } '' + HOME=$TMPDIR + expect <<"EOF" + spawn OmniSharp + expect_before timeout { + send_error "timeout!\n" + exit 1 + } + expect "\"ERROR\",\"Name\":\"OmniSharp.MSBuild.Discovery.Providers.SdkInstanceProvider\"" + expect eof + catch wait result + if { [lindex $result 3] == 0 } { + exit 1 + } + EOF + touch $out + ''; + + with-sdk = runCommand "with-sdk" { nativeBuildInputs = [ finalPackage sdk_6_0 expect ]; meta.timeout = 60; } '' + HOME=$TMPDIR + expect <<"EOF" + spawn OmniSharp + expect_before timeout { + send_error "timeout!\n" + exit 1 + } + expect "{\"Event\":\"started\"," + send \x03 + expect eof + catch wait result + exit [lindex $result 3] + EOF + touch $out + ''; + }; + meta = with lib; { description = "OmniSharp based on roslyn workspaces"; homepage = "https://github.com/OmniSharp/omnisharp-roslyn"; @@ -83,4 +122,4 @@ buildDotnetModule rec { maintainers = with maintainers; [ tesq0 ericdallo corngood mdarocha ]; mainProgram = "OmniSharp"; }; -} +}; in finalPackage From 3e29754650fc9e7b96b7b1827e87052608e3ac29 Mon Sep 17 00:00:00 2001 From: Gabriel Volpe Date: Wed, 14 Sep 2022 11:08:03 +0200 Subject: [PATCH 05/30] scala-cli: 0.1.12 -> 0.1.14 --- .../development/tools/build-managers/scala-cli/sources.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index 46392eb382e..4fcc136e19d 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,13 +1,13 @@ { - "version": "0.1.12", + "version": "0.1.14", "assets": { "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "1gg5w676h1dm6rmbjbc8fjrz8q2kpq1062xn0r3gm6jwjgjsbw6v" + "sha256": "1h20bd8rabpxgjp6czbn9m5yhmz77vkvpbsxmnf6src942ihb7sn" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "1ihfkfgfwsvryk2hpiflakmi512m8xjaksny33fymn52cpv8n2gw" + "sha256": "1n4f920qpwhnarky1dh79sk1r3ayriinf4ah53704xvscc083c70" } } } From e5299b3ae1fc97b5c6072f2affef8caf9712d030 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 02:31:51 +0000 Subject: [PATCH 06/30] cirrus-cli: 0.85.0 -> 0.86.0 --- .../tools/continuous-integration/cirrus-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 4df160fff30..60bda337d03 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.85.0"; + version = "0.86.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hFL7ImtaQrNeoxNLE/RL79SHRBHSit1dQ6Wn8gq8dns="; + sha256 = "sha256-ilQNwxqi7PMj6zgJ7SbpKfHDiTEjfIey3jV/Owrbddc="; }; vendorSha256 = "sha256-GRCcKIUimPFdeAhnz6RC5arZ0E+z+SpaAC1uDaxpJkI="; From 96c7dae2d5f6ec45fd97ade55e5710a34d39dab6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 02:51:32 +0000 Subject: [PATCH 07/30] cloudfoundry-cli: 8.4.0 -> 8.5.0 --- .../networking/cluster/cloudfoundry-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index b7992e2c723..b4c2d6c304e 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.4.0"; + version = "8.5.0"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-+UP1abTDYLn+lhMvo9G57X0nlColai7isNswog+3Y40="; + sha256 = "sha256-+fQnit2J3WQpir4HldkWKCex6byfp2IqEWCi4oJ5HgU="; }; - vendorSha256 = "sha256-opVnj6dTtHrPYM1v+EFw39XDMF/fampAn7n+JvlBcJk="; + vendorSha256 = "sha256-Wz5OoCrIY/xEXk+eqXtqtgVGD8oGUPmhzT5mOcZRD8w="; subPackages = [ "." ]; From bd85869a133bf79333b3f86495dfcccae4e3b305 Mon Sep 17 00:00:00 2001 From: davidak Date: Thu, 15 Sep 2022 05:03:56 +0200 Subject: [PATCH 08/30] ghr: simplify test also rename to common name --- .../version-management/git-and-tools/ghr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/ghr/default.nix b/pkgs/applications/version-management/git-and-tools/ghr/default.nix index b5188c97f07..8993498609f 100644 --- a/pkgs/applications/version-management/git-and-tools/ghr/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghr/default.nix @@ -22,9 +22,9 @@ buildGoModule rec { doCheck = false; doInstallCheck = true; - passthru.tests.testVersion = testers.testVersion { + passthru.tests.version = testers.testVersion { package = ghr; - version = "ghr version v${version}"; + version = "v${version}"; }; meta = with lib; { From ac4c07982a009a467926b32477fac642504518f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 03:30:00 +0000 Subject: [PATCH 09/30] barman: 3.0.1 -> 3.1.0 --- pkgs/tools/misc/barman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/tools/misc/barman/default.nix index d63b02b92b7..281a2ce1c17 100644 --- a/pkgs/tools/misc/barman/default.nix +++ b/pkgs/tools/misc/barman/default.nix @@ -4,13 +4,13 @@ }: python3Packages.buildPythonApplication rec { pname = "barman"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "EnterpriseDB"; repo = pname; rev = "refs/tags/release/${version}"; - sha256 = "sha256-e6euOtvJx+xUq5pWmWK6l7nv/twOa+0OABUTYvMd8Ow="; + sha256 = "sha256-xRyKCpO2eBe5lI0pQW8wUee/5ZMDEo7/FLORrp3Sduk="; }; patches = [ From 5c5c2622a7425a39264fe97463c6fe857dfedcf9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 06:01:27 +0000 Subject: [PATCH 10/30] armadillo: 11.2.3 -> 11.2.4 --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 6277ec4f87e..2eea7e2c0e9 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "11.2.3"; + version = "11.2.4"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-TC6XzmBwf8HzSPRPevDLbSRm0KrQ0OpL9dXcGA5sukE="; + sha256 = "sha256-3EyRlUqxFJC/ZNLfzFSoAvFDk8dWqNVFrBVe7v+n/ZM="; }; nativeBuildInputs = [ cmake ]; From 25556b66568668b5dfcfe46c908c013020e401bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 06:58:16 +0000 Subject: [PATCH 11/30] cargo-nextest: 0.9.35 -> 0.9.36 --- pkgs/development/tools/rust/cargo-nextest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 889a7558eba..2264252f94b 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.35"; + version = "0.9.36"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - sha256 = "sha256-tNpE0bEnN4eJZ0nTkGFNrUW5Lam+GK6gUqQZBBYSeEI="; + sha256 = "sha256-gp/XEhSNdoEs3+KXbbgbjRg29xHyHuAbYLBVvNDIgLw="; }; - cargoSha256 = "sha256-p6K3GumMpLlnFsTegnH/ij+VDTjAB/dXYea0cWtCOGw="; + cargoSha256 = "sha256-mz2zJwA05Wg6g+u7LfANMt+wwoZIQzb2mH3Y+b4SBr0="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From 703466e462bad08634df88251359efc688da6ea2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 07:52:58 +0000 Subject: [PATCH 12/30] boundary: 0.10.3 -> 0.10.5 --- pkgs/tools/networking/boundary/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index c1db56b067a..2779eda9d9e 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.10.3"; + version = "0.10.5"; src = let @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-MflcfTX0Ap8KEP0NDSZMHKM+fPsCoorUcUHV3WDXmBE="; - aarch64-linux = "sha256-WeSmRpi50dfnv5quLPQTYNKQcQlBwno1iwPUyTeJrW4="; - x86_64-darwin = "sha256-Ff4mu/g2K1wAeBj2IpOMT80gKcIP/dZjhWA8czokpxc="; - aarch64-darwin = "sha256-Ove3Tgj7FnR5ZTzVZlmFDRoUaVlO2xA6CzMqIdobZxQ="; + x86_64-linux = "sha256-lVv+mC9pNYzQes9k8KqkrHULuwETSHUCBF0FNw7kR+8="; + aarch64-linux = "sha256-0GVANhtzrAJUl4hktgiCdzUMhlhh7jyMAWS7/DyVuiU="; + x86_64-darwin = "sha256-N14Lynd/Q/eIGrM6ljAKnZdse/ShkvPaKSz6Q9DtYC0="; + aarch64-darwin = "sha256-iScNf6YM5nUjBqWMWb0eM5j9f3WiVvWOtjq7eoABfUM="; }; in fetchzip { From 59203db20e69b038f7bce5be99bef477f7b8e50a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 08:54:20 +0000 Subject: [PATCH 13/30] fclones: 0.27.3 -> 0.28.0 --- pkgs/tools/misc/fclones/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index abccd8e0024..bbe11102cbb 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.27.3"; + version = "0.28.0"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IAo7FKHh4oRPEmToEJca6b6E+TZvTeICPRYxol6Ppwo="; + sha256 = "sha256-OOFmyTEiaZnCx15gkoMGooC4qlevKMBS7umawiKVZqE="; }; - cargoSha256 = "sha256-S4F/2kf9jbOA3o3kj5Ouo3QvCULbVILh3QbBLXUeOzc="; + cargoSha256 = "sha256-jWYiZ6YNeGtmcHgqCgC8A7dEdJ29n3W/RdE0wQbOUOA="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit From 9a35a9c19220229215912cf299c326893f025f5a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 09:51:27 +0000 Subject: [PATCH 14/30] gomplate: 3.11.2 -> 3.11.3 --- pkgs/development/tools/gomplate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix index 2df0e8ed941..ada936ed540 100644 --- a/pkgs/development/tools/gomplate/default.nix +++ b/pkgs/development/tools/gomplate/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gomplate"; - version = "3.11.2"; + version = "3.11.3"; owner = "hairyhenderson"; rev = "v${version}"; src = fetchFromGitHub { inherit owner rev; repo = pname; - sha256 = "sha256-NIepoz1JToaX2EJCL/kqkpBJigJVy2Tkz0jGn4ukfvI="; + sha256 = "sha256-NvTwiGyBHhHiVHdWeXnJONNkHkrvsc1zmHPK8rSHaQw="; }; - vendorSha256 = "sha256-fXbwNX+GoujciZVxxe7Tl21MxWhyAD4cW/p8PCAAElw="; + vendorSha256 = "sha256-BIcOErtlcnE70Mo6fjmA/btvSpw95RaKLqNWsgyJgpc="; postPatch = '' # some tests require network access From be6bb3c407e8685cb2cd00680ec089223100d6df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Thu, 15 Sep 2022 12:45:46 +0200 Subject: [PATCH 15/30] tree-sitter: add nickel grammar --- .../tools/parsing/tree-sitter/grammars/default.nix | 1 + .../tree-sitter/grammars/tree-sitter-nickel.json | 11 +++++++++++ pkgs/development/tools/parsing/tree-sitter/update.nix | 4 ++++ 3 files changed, 16 insertions(+) create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 28330e19c58..18c7ebd1c3c 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -54,6 +54,7 @@ tree-sitter-lua = lib.importJSON ./tree-sitter-lua.json; tree-sitter-make = lib.importJSON ./tree-sitter-make.json; tree-sitter-markdown = lib.importJSON ./tree-sitter-markdown.json; + tree-sitter-nickel = lib.importJSON ./tree-sitter-nickel.json; tree-sitter-nix = lib.importJSON ./tree-sitter-nix.json; tree-sitter-norg = lib.importJSON ./tree-sitter-norg.json; tree-sitter-ocaml = lib.importJSON ./tree-sitter-ocaml.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json new file mode 100644 index 00000000000..cb5c3f541a0 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/nickel-lang/tree-sitter-nickel", + "rev": "9d83db400b6c11260b9106f131f93ddda8131933", + "date": "2022-07-06T11:43:01+02:00", + "path": "/nix/store/i7arz4binnq34j1k0hwlpl4apd9b4j4x-tree-sitter-nickel", + "sha256": "0rm63fnxja59zzkm7gz4vbzics8mdf7d6ijazcy9394kdqrcdzi6", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 4f778429b11..b92eb6cca06 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -339,6 +339,10 @@ let orga = "ambroisie"; repo = "tree-sitter-tiger"; }; + "tree-sitter-nickel" = { + orga = "nickel-lang"; + repo = "tree-sitter-nickel"; + }; }; allGrammars = From 30e4ff0857749967e1acd50c75b9020517635669 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 14:37:33 +0000 Subject: [PATCH 16/30] boulder: 2022-09-06 -> 2022-09-14 --- pkgs/tools/admin/boulder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/boulder/default.nix b/pkgs/tools/admin/boulder/default.nix index b39e565eadd..057c2ecb927 100644 --- a/pkgs/tools/admin/boulder/default.nix +++ b/pkgs/tools/admin/boulder/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "boulder"; - version = "2022-09-06"; + version = "2022-09-14"; src = fetchFromGitHub { owner = "letsencrypt"; @@ -19,7 +19,7 @@ buildGoModule rec { git rev-parse --short=8 HEAD 2>/dev/null >$out/COMMIT find "$out" -name .git -print0 | xargs -0 rm -rf ''; - hash = "sha256-BteHJAjIMPckbNIxgZCSSZV2iUc/yKVd0Px+S9ZwwUI="; + hash = "sha256-AviTVALFI1+0cFohLLdaKR1Lw3b9yURIIlrzweuiN7w="; }; vendorHash = null; From 269bbfe56943f8dd7d40eb07626b85c324ca4a6a Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Thu, 15 Sep 2022 07:56:17 -0700 Subject: [PATCH 17/30] cargo-spellcheck: 0.11.2 -> 0.12.1 --- pkgs/development/tools/rust/cargo-spellcheck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/development/tools/rust/cargo-spellcheck/default.nix index 2eda19afd83..fd97d798c14 100644 --- a/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-spellcheck"; - version = "0.11.2"; + version = "0.12.1"; src = fetchFromGitHub { owner = "drahnr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZiRa4XYnY4fwbMenRLnvFQms66tIyGbm5saK8gN39ag="; + sha256 = "sha256-PyNO+kBxTYeqXgZh1XhE18G9ZK7suo/acKSE57zCbcY="; }; - cargoSha256 = "sha256-gWQbhFPdBDhPZY1LHxFlWO9xG4AXfyhZp0UnZ3Y86/Y="; + cargoSha256 = "sha256-i6AvKF34Gh3QhwvYVd+QTYCPMW9D0/vhz7WoY5d4kHU="; buildInputs = lib.optional stdenv.isDarwin Security; From 9b65473a3b76f2144acd5f4aabce059e3d5e344b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Thu, 15 Sep 2022 17:06:41 +0200 Subject: [PATCH 18/30] vimPlugins.vim-nickel: init at 2022-03-16 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 5b473ef8c49..c602ff209ae 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -10628,6 +10628,18 @@ final: prev: meta.homepage = "https://github.com/kana/vim-niceblock/"; }; + vim-nickel = buildVimPluginFrom2Nix { + pname = "vim-nickel"; + version = "2022-03-16"; + src = fetchFromGitHub { + owner = "nickel-lang"; + repo = "vim-nickel"; + rev = "2f0f5f8ce2a8e719a5e39d7210ca914ae403374c"; + sha256 = "1li3wc5164mcqrvj42dc8zh3j8wml10gpgffapnjilwa5c85kv3q"; + }; + meta.homepage = "https://github.com/nickel-lang/vim-nickel/"; + }; + vim-ninja-feet = buildVimPluginFrom2Nix { pname = "vim-ninja-feet"; version = "2021-05-27"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 92910fdff01..8639d8a4af3 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -892,6 +892,7 @@ https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/,, https://github.com/jistr/vim-nerdtree-tabs/,, https://github.com/nfnty/vim-nftables/,, https://github.com/kana/vim-niceblock/,, +https://github.com/nickel-lang/vim-nickel/,main, https://github.com/tommcdo/vim-ninja-feet/,, https://github.com/LnL7/vim-nix/,, https://github.com/symphorien/vim-nixhash/,, From f1b8493bda0e287f720960448c9d1c8c9e81b4ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 17:14:45 +0000 Subject: [PATCH 19/30] fulcrum: 1.7.0 -> 1.8.0 --- pkgs/applications/blockchains/fulcrum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/applications/blockchains/fulcrum/default.nix index d9085ff734d..73d338ec149 100644 --- a/pkgs/applications/blockchains/fulcrum/default.nix +++ b/pkgs/applications/blockchains/fulcrum/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fulcrum"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "cculianu"; repo = "Fulcrum"; rev = "v${version}"; - sha256 = "sha256-FIa6eAE6yyJR5UdlCXB2Gx3DqN528POxb0eYOCpVjJk="; + sha256 = "sha256-g80XL7dzq2Ed08zAcgBjrHfL1Qqxhr5sL9koaE4fl/I="; }; nativeBuildInputs = [ pkg-config qmake ]; From 17df953dc09be5c2fe6a33498bba9740cd44b54a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 17:37:40 +0000 Subject: [PATCH 20/30] glooctl: 1.12.15 -> 1.12.17 --- pkgs/applications/networking/cluster/glooctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 41398ae2a82..bde95292141 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "glooctl"; - version = "1.12.15"; + version = "1.12.17"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-HOWBigwW5JagFG1MfcFIXSzveGAj1BWjLbJL9ESLgAQ="; + hash = "sha256-6lwjfJOW1T+pRU9nrZ9Pit0N0je+t829jeKmlDn9TgA="; }; subPackages = [ "projects/gloo/cli/cmd" ]; - vendorSha256 = "sha256-6AgsnPrkLtUgvPMcXDZ9qVngnlN/65pwjdtBPdf0Jzw="; + vendorSha256 = "sha256-584gGED37p5QycoquFwp3hNR9x70kB1EsO5aoZTEJ1Y="; nativeBuildInputs = [ installShellFiles ]; From b8a992605d99fa5bd44d738b9054103b5d003e65 Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 13 Sep 2022 11:07:29 +0200 Subject: [PATCH 21/30] perlPackages.Po4a: disable TextWrapI18n dependency on musl This dependency is only used for formatting error message and pulls in a dependency on glibc because it needs the /usr/bin/locale binary. --- pkgs/development/perl-modules/Po4a/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/perl-modules/Po4a/default.nix b/pkgs/development/perl-modules/Po4a/default.nix index 92a184f4ea0..aabf897ac4c 100644 --- a/pkgs/development/perl-modules/Po4a/default.nix +++ b/pkgs/development/perl-modules/Po4a/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, docbook_xsl, docbook_xsl_ns, gettext, libxslt, glibcLocales, docbook_xml_dtd_412, docbook_sgml_dtd_41, texlive, opensp +{ stdenv, lib, fetchurl, docbook_xsl, docbook_xsl_ns, gettext, libxslt, glibcLocales, docbook_xml_dtd_412, docbook_sgml_dtd_41, texlive, opensp , perl, buildPerlPackage, ModuleBuild, TextWrapI18N, LocaleGettext, TermReadKey, SGMLSpm, UnicodeLineBreak, PodParser, YAMLTiny }: buildPerlPackage rec { @@ -9,7 +9,7 @@ buildPerlPackage rec { sha256 = "0eb510a66f59de68cf7a205342036cc9fc08b39334b91f1456421a5f3359e68b"; }; nativeBuildInputs = [ docbook_xsl docbook_xsl_ns ModuleBuild ]; - propagatedBuildInputs = [ TextWrapI18N LocaleGettext SGMLSpm UnicodeLineBreak PodParser YAMLTiny ]; + propagatedBuildInputs = lib.optional (!stdenv.hostPlatform.isMusl) TextWrapI18N ++ [ LocaleGettext SGMLSpm UnicodeLineBreak PodParser YAMLTiny ]; # TODO: TermReadKey was temporarily removed from propagatedBuildInputs to unfreeze the build buildInputs = [ gettext libxslt glibcLocales docbook_xml_dtd_412 docbook_sgml_dtd_41 texlive.combined.scheme-basic opensp ]; LC_ALL = "en_US.UTF-8"; From fec315a167a1e308d3e1f4ccdea655b82d06334a Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 13 Sep 2022 11:11:34 +0200 Subject: [PATCH 22/30] perlPackages.Po4a: disable tests on musl Void linux package have investigated the failure and tracked it down to differences in gettext behavior. They decided to disable tests. https://github.com/void-linux/void-packages/pull/34029#issuecomment-973267880 Alpine packagers have not worried about running the tests until now: https://git.alpinelinux.org/aports/tree/main/po4a/APKBUILD#n11 --- pkgs/development/perl-modules/Po4a/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/perl-modules/Po4a/default.nix b/pkgs/development/perl-modules/Po4a/default.nix index aabf897ac4c..11941490785 100644 --- a/pkgs/development/perl-modules/Po4a/default.nix +++ b/pkgs/development/perl-modules/Po4a/default.nix @@ -19,6 +19,14 @@ buildPerlPackage rec { export PERL_MB_OPT="--install_base=$out --prefix=$out" ''; buildPhase = "perl Build.PL --install_base=$out --install_path=\"lib=$out/${perl.libPrefix}\"; ./Build build"; + + # Disabling tests on musl + # Void linux package have investigated the failure and tracked it down to differences in gettext behavior. They decided to disable tests. + # https://github.com/void-linux/void-packages/pull/34029#issuecomment-973267880 + # Alpine packagers have not worried about running the tests until now: + # https://git.alpinelinux.org/aports/tree/main/po4a/APKBUILD#n11 + doCheck = !stdenv.hostPlatform.isMusl; + checkPhase = '' export SGML_CATALOG_FILES=${docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat ./Build test From 1315a28f885a82c3e84cf7e713fe5b6347bdd4c0 Mon Sep 17 00:00:00 2001 From: Yuka Date: Thu, 15 Sep 2022 20:38:48 +0200 Subject: [PATCH 23/30] musl: apply patch for optional fields in fstab (#191033) --- pkgs/os-specific/linux/musl/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index b73c0ae04cd..bef1fa6e33a 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -67,6 +67,12 @@ stdenv.mkDerivation rec { url = "https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch"; sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n"; }) + + # fix parsing lines with optional fields in fstab etc. NOTE: Remove for the next release since it has been merged upstream + (fetchurl { + url = "https://git.musl-libc.org/cgit/musl/patch/?id=751bee0ee727e8d8b003c87cff77ac76f1dbecd6"; + sha256 = "sha256-qCw132TCSaZrkISmtDb8Q8ufyt8sAJdwACkvfwuoi/0="; + }) ]; CFLAGS = [ "-fstack-protector-strong" ] ++ lib.optional stdenv.hostPlatform.isPower "-mlong-double-64"; From ee7e9f273f4a6f8c5dab52a1ae4f8b6b93839ded Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 15 Sep 2022 11:47:53 -0700 Subject: [PATCH 24/30] libwpe: 1.12.2 -> 1.12.3 (#188186) --- pkgs/development/libraries/libwpe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwpe/default.nix b/pkgs/development/libraries/libwpe/default.nix index 1e0b6ac789b..d895574d527 100644 --- a/pkgs/development/libraries/libwpe/default.nix +++ b/pkgs/development/libraries/libwpe/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libwpe"; - version = "1.12.2"; + version = "1.12.3"; src = fetchurl { url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-SsT9CotWK3Ib/9D0aunwbCtaMRRAdYGXi+h1qdZRZCo="; + sha256 = "sha256-uE/b+8hJzk/fCEuyi1jlRjsbS2zI8gDcd7QfhUXVMp0="; }; nativeBuildInputs = [ From 55cfe0ace065b84239268b0ffd632d7c2a38937b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 19:22:50 +0000 Subject: [PATCH 25/30] hound: 0.5.1 -> 0.6.0 --- pkgs/development/tools/misc/hound/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index 7e46fadf362..ff9253e4b03 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "hound"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "hound-search"; repo = "hound"; rev = "v${version}"; - sha256 = "sha256-1URhb+ZrtP5eGS2o7lBxvAxQJR/J6oE+pCbJ7sQb0X4="; + sha256 = "sha256-M1c4lsD7DQo5+RCCDdyn9FeGuGngMsg1qSrxM2wCzpg="; }; vendorSha256 = "sha256-ZgF/PB3VTPx367JUkhOkSEK1uvqENNG0xuNXvCGENnQ="; From 3b104056ffa3264b71b06f32b9bfe95cc5474dee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Sep 2022 08:19:00 +0000 Subject: [PATCH 26/30] rofi-emoji: 3.0.1 -> 3.1.0 --- pkgs/applications/misc/rofi-emoji/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix index 7797b6dccac..0357681b749 100644 --- a/pkgs/applications/misc/rofi-emoji/default.nix +++ b/pkgs/applications/misc/rofi-emoji/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "rofi-emoji"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "Mange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pYNeAz8MKBM3VSkQfP4hgTbEy9haGmBmPf/nu9tvKts="; + sha256 = "sha256-YMQG0XO6zVei6GfBdgI7jtB7px12e+xvOMxZ1QHf5kQ="; }; patches = [ From 160bb2906eccd678b5e86ab2fc83758802aafd8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 20:20:00 +0000 Subject: [PATCH 27/30] jsonnet-language-server: 0.9.0 -> 0.9.1 --- pkgs/development/tools/jsonnet-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/jsonnet-language-server/default.nix b/pkgs/development/tools/jsonnet-language-server/default.nix index a56ec42f570..e6b9470a54b 100644 --- a/pkgs/development/tools/jsonnet-language-server/default.nix +++ b/pkgs/development/tools/jsonnet-language-server/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "jsonnet-language-server"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "grafana"; repo = "jsonnet-language-server"; rev = "v${version}"; - sha256 = "sha256-Qp01JcgDdIK1yqXJCasZkh6rWXujdCHSFVxHSVySj50="; + sha256 = "sha256-JNRMV52sSA45lp1UdJ4wBGrhlGIFhYHhgZU0lop1HcI="; }; vendorSha256 = "sha256-tsVevkMHuCv70A9Ohg9L+ghH5+v52X4sToI4bMlDzzo="; From 3fcf17c3484955b73d2e92efd3ab0da3176e02b1 Mon Sep 17 00:00:00 2001 From: Lily Ritter Date: Thu, 15 Sep 2022 16:18:52 -0400 Subject: [PATCH 28/30] discord: 0.0.19 -> 0.0.20 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index f8a10e48f52..852e1baba71 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,7 +1,7 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.19"; + stable = "0.0.20"; ptb = "0.0.29"; canary = "0.0.139"; } else { @@ -14,7 +14,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "GfSyddbGF8WA6JmHo4tUM27cyHV5kRAyrEiZe1jbA5A="; + sha256 = "3f7yuxigEF3e8qhCetCHKBtV4XUHsx/iYiaCCXjspYw="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; From 742604c1056b026257c9f0bd08da23f371e4ee3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 16:59:37 +0000 Subject: [PATCH 29/30] etcd_3_4: 3.4.20 -> 3.4.21 --- pkgs/servers/etcd/3.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/etcd/3.4.nix b/pkgs/servers/etcd/3.4.nix index da8bb495476..bbf7d3a0d52 100644 --- a/pkgs/servers/etcd/3.4.nix +++ b/pkgs/servers/etcd/3.4.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "etcd"; - version = "3.4.20"; + version = "3.4.21"; vendorSha256 = "sha256-P3EQTraMdZ2fAHDue5cKAxyHbh6nNeFV9ykT0rH7KPs="; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "sha256-JfwjkgD57FqSmwgWZ5NbxshmY5JZUUWsk3bdYx15BKo="; + sha256 = "sha256-+IU1l23sN9v48ZhJLGncUa3t5kPHBFcqQ/ojaZXzMU4="; }; buildPhase = '' From 6c40872147f3159634e7c9db64229e9ae1f76090 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Sun, 11 Sep 2022 19:50:54 +0200 Subject: [PATCH 30/30] doc/testers: testVersion -> testers.testVersion, add example --- doc/builders/testers.chapter.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/doc/builders/testers.chapter.md b/doc/builders/testers.chapter.md index c6fb71de018..ad1e1036d50 100644 --- a/doc/builders/testers.chapter.md +++ b/doc/builders/testers.chapter.md @@ -14,19 +14,25 @@ for example when using an 'old' hash in a fixed-output derivation. Examples: ```nix -passthru.tests.version = testVersion { package = hello; }; +passthru.tests.version = testers.testVersion { package = hello; }; -passthru.tests.version = testVersion { +passthru.tests.version = testers.testVersion { package = seaweedfs; command = "weed version"; }; -passthru.tests.version = testVersion { +passthru.tests.version = testers.testVersion { package = key; command = "KeY --help"; # Wrong '2.5' version in the code. Drop on next version. version = "2.5"; }; + +passthru.tests.version = testers.testVersion { + package = ghr; + # The output needs to contain the 'version' string without any prefix or suffix. + version = "v${version}"; +}; ``` ## `testEqualDerivation` {#tester-testEqualDerivation} @@ -42,7 +48,7 @@ Otherwise, the build log explains the difference via `nix-diff`. Example: ```nix -testEqualDerivation +testers.testEqualDerivation "The hello package must stay the same when enabling checks." hello (hello.overrideAttrs(o: { doCheck = true; })) @@ -73,7 +79,7 @@ fixed output derivation. Example: ```nix -tests.fetchgit = invalidateFetcherByDrvHash fetchgit { +tests.fetchgit = testers.invalidateFetcherByDrvHash fetchgit { name = "nix-source"; url = "https://github.com/NixOS/nix"; rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";