From c1d7587923c11f2c95a645c95ff26775aa19cdb7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Aug 2021 14:43:06 +0000 Subject: [PATCH 01/49] lokalise2-cli: 2.6.4 -> 2.6.7 --- pkgs/tools/misc/lokalise2-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/lokalise2-cli/default.nix b/pkgs/tools/misc/lokalise2-cli/default.nix index 6c1f1759084e..087a5ce7f9a3 100644 --- a/pkgs/tools/misc/lokalise2-cli/default.nix +++ b/pkgs/tools/misc/lokalise2-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lokalise2-cli"; - version = "2.6.4"; + version = "2.6.7"; src = fetchFromGitHub { owner = "lokalise"; repo = "lokalise-cli-2-go"; rev = "v${version}"; - sha256 = "sha256-D/I1I7r3IuDz1MZZrzKVMhdLIZxbN2bYeGmqJVlUU6g="; + sha256 = "sha256-p3JvaDDebbIgOvTh0e7yYe3qOXvj1pLSG95hpK62M7s="; }; - vendorSha256 = "sha256-iWYlbGeLp/SiF8/OyWGIHJQB1RJjma9/EDc3zOsjNG8="; + vendorSha256 = "sha256-KJ8haktP9qoG5QsKnTOkvE8L+SQ9Z6hrsjUeS0wrdLs="; doCheck = false; From 8688684d48a06dc4a28476a048190013c9ce1aca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 08:59:44 +0000 Subject: [PATCH 02/49] microplane: 0.0.33 -> 0.0.34 --- pkgs/tools/misc/microplane/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/microplane/default.nix b/pkgs/tools/misc/microplane/default.nix index 9dbdd9e2e7e9..26ae9f4f16db 100644 --- a/pkgs/tools/misc/microplane/default.nix +++ b/pkgs/tools/misc/microplane/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "microplane"; - version = "0.0.33"; + version = "0.0.34"; src = fetchFromGitHub { owner = "Clever"; repo = "microplane"; rev = "v${version}"; - sha256 = "sha256-Z0/on7u8QemACuHUDfffZm1Bmmo38vAxlSqzsgUQRmg="; + sha256 = "sha256-ZrBkVXRGZp8yGFIBo7sLGvJ8pMQq7Cq0xJiko57z164="; }; vendorSha256 = "sha256-PqSjSFTVrIsQ065blIxZ9H/ARku6BEcnjboH+0K0G14="; From 68d65417d3972e4940e60a4c94ff860d7b2d9f70 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Aug 2021 12:33:17 +0200 Subject: [PATCH 03/49] exploitdb: 2021-08-14 -> 2021-08-17 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 0eba7b465fc8..5197fa96cc01 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-08-14"; + version = "2021-08-17"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-7nXcegB0ZuNXIExf6LWqSrjrdD+5ahGJb00O/G6lXmk="; + sha256 = "sha256-rtnlPt5fsiN44AlaAZ6v7Z2u6by+OFvtMtwtWVYQvdg="; }; installPhase = '' From 8bc8715275ab32ad68f3babda74cf2e99c660a84 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 10:45:25 +0000 Subject: [PATCH 04/49] osslsigncode: 2.1 -> 2.2 --- pkgs/development/tools/osslsigncode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/development/tools/osslsigncode/default.nix index e9dd2f08d3ae..aa72c10fda0c 100644 --- a/pkgs/development/tools/osslsigncode/default.nix +++ b/pkgs/development/tools/osslsigncode/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "osslsigncode"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "mtrojnar"; repo = pname; rev = version; - sha256 = "0iwxdzqan2bswz62pmwjcyh01vs6ifpdcannw3s192gqzac1lgg3"; + sha256 = "sha256-/YKj6JkVbQ4Fz+KSmBIRQ7F7A8fxi5Eg+pvKwhjpGYQ="; }; nativeBuildInputs = [ autoreconfHook libgsf pkg-config openssl curl ]; From da926dea5c06d62e7bf63313b00d732182d5b384 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 12:10:38 +0000 Subject: [PATCH 05/49] pcb2gcode: 2.3.1 -> 2.4.0 --- pkgs/tools/misc/pcb2gcode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pcb2gcode/default.nix b/pkgs/tools/misc/pcb2gcode/default.nix index d7f6a3d87394..48fc7bc32b41 100644 --- a/pkgs/tools/misc/pcb2gcode/default.nix +++ b/pkgs/tools/misc/pcb2gcode/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "pcb2gcode"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "pcb2gcode"; repo = "pcb2gcode"; rev = "v${version}"; - sha256 = "sha256-blbfpMBe7X3OrNbBiz8fNzKcS/bbViQUTXtdxZpXPBk="; + sha256 = "sha256-3VQlYtSi6yWWNuxTlBzvBtkM5hAss47xat+sEW+P79E="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From c1821209d8b70e1e73f9d4f73d5c41a537b6d572 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 17 Aug 2021 14:34:49 +0200 Subject: [PATCH 06/49] osslsigncode: drop libgsf from buildInputs - not needed anymore, see https://github.com/mtrojnar/osslsigncode/releases/tag/2.2 --- pkgs/development/tools/osslsigncode/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/development/tools/osslsigncode/default.nix index aa72c10fda0c..fb4abb21c58b 100644 --- a/pkgs/development/tools/osslsigncode/default.nix +++ b/pkgs/development/tools/osslsigncode/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , autoreconfHook -, libgsf , pkg-config -, openssl , curl +, openssl }: stdenv.mkDerivation rec { @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-/YKj6JkVbQ4Fz+KSmBIRQ7F7A8fxi5Eg+pvKwhjpGYQ="; }; - nativeBuildInputs = [ autoreconfHook libgsf pkg-config openssl curl ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; + + buildInputs = [ curl openssl ]; meta = with lib; { homepage = "https://github.com/mtrojnar/osslsigncode"; From 90654cce7d17ea5485efd5489673bb34f7578d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Mon, 16 Aug 2021 22:38:17 +0200 Subject: [PATCH 07/49] coqPackages.mkCoqDerivation: fix useDune2 - Reuse build phase from the `buildDunePackage` function. - Only install the package that was just built (useful for monorepo support). - Introduces `opam-name` to override the default package name to build with Dune. --- doc/languages-frameworks/coq.section.md | 1 + pkgs/build-support/coq/default.nix | 10 ++++++++-- pkgs/development/coq-modules/multinomials/default.nix | 3 +++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md index 0674c5a4702e..39b60d83ac7d 100644 --- a/doc/languages-frameworks/coq.section.md +++ b/doc/languages-frameworks/coq.section.md @@ -33,6 +33,7 @@ The recommended way of defining a derivation for a Coq library, is to use the `c * `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `extraBuildInputs` to depend on the same package set Coq was built against. * `useDune2ifVersion` (optional, default to `(x: false)` uses Dune2 to build the package if the provided predicate evaluates to true on the version, e.g. `useDune2if = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`, * `useDune2` (optional, defaults to `false`) uses Dune2 to build the package if set to true, the presence of this attribute overrides the behavior of the previous one. +* `opam-name` (optional, defaults to `coq-` followed by the value of `pname`), name of the Dune package to build. * `enableParallelBuilding` (optional, defaults to `true`), since it is activated by default, we provide a way to disable it. * `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variable `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation. * `setCOQBIN` (optional, defaults to `true`), by default, the environment variable `$COQBIN` is set to the current Coq's binary, but one can disable this behavior by setting it to `false`, diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix index ba300f2f8cf5..5f2b5e646b0b 100644 --- a/pkgs/build-support/coq/default.nix +++ b/pkgs/build-support/coq/default.nix @@ -27,6 +27,7 @@ in dropDerivationAttrs ? [], useDune2ifVersion ? (x: false), useDune2 ? false, + opam-name ? "coq-${pname}", ... }@args: let @@ -34,7 +35,7 @@ let "version" "fetcher" "repo" "owner" "domain" "releaseRev" "displayVersion" "defaultVersion" "useMelquiondRemake" "release" "extraBuildInputs" "extraPropagatedBuildInputs" "namePrefix" - "meta" "useDune2ifVersion" "useDune2" + "meta" "useDune2ifVersion" "useDune2" "opam-name" "extraInstallFlags" "setCOQBIN" "mlPlugin" "dropAttrs" "dropDerivationAttrs" "keepAttrs" ] ++ dropAttrs) keepAttrs; fetch = import ../coq/meta-fetch/default.nix @@ -90,9 +91,14 @@ stdenv.mkDerivation (removeAttrs ({ extraInstallFlags; }) // (optionalAttrs useDune2 { + buildPhase = '' + runHook preBuild + dune build -p ${opam-name} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} + runHook postBuild + ''; installPhase = '' runHook preInstall - dune install --prefix=$out + dune install ${opam-name} --prefix=$out mv $out/lib/coq $out/lib/TEMPORARY mkdir $out/lib/coq/ mv $out/lib/TEMPORARY $out/lib/coq/${coq.coq-version} diff --git a/pkgs/development/coq-modules/multinomials/default.nix b/pkgs/development/coq-modules/multinomials/default.nix index dfa6a63571fd..acbb602a54ef 100644 --- a/pkgs/development/coq-modules/multinomials/default.nix +++ b/pkgs/development/coq-modules/multinomials/default.nix @@ -4,7 +4,10 @@ with lib; mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; pname = "multinomials"; + opam-name = "coq-mathcomp-multinomials"; + owner = "math-comp"; + inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ { cases = [ (range "8.10" "8.13") "1.12.0" ]; out = "1.5.4"; } From 98e23395453a69115a27fda26baa41f24d3c0c63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Tue, 17 Aug 2021 10:07:59 +0200 Subject: [PATCH 08/49] coqPackages.gaia: init at 1.11 and 1.12 --- pkgs/development/coq-modules/gaia/default.nix | 24 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/coq-modules/gaia/default.nix diff --git a/pkgs/development/coq-modules/gaia/default.nix b/pkgs/development/coq-modules/gaia/default.nix new file mode 100644 index 000000000000..57a1beead497 --- /dev/null +++ b/pkgs/development/coq-modules/gaia/default.nix @@ -0,0 +1,24 @@ +{ lib, mkCoqDerivation, coq, mathcomp, version ? null }: + +with lib; mkCoqDerivation { + pname = "gaia"; + + release."1.11".sha256 = "sha256:0gwb0blf37sv9gb0qpn34dab71zdcx7jsnqm3j9p58qw65cgsqn5"; + release."1.12".sha256 = "sha256:0c6cim4x6f9944g8v0cp0lxs244lrhb04ms4y2s6y1wh321zj5mi"; + releaseRev = (v: "v${v}"); + + inherit version; + defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.10" "8.13") "1.12.0" ]; out = "1.12"; } + { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "1.11"; } + ] null; + + propagatedBuildInputs = + [ mathcomp.ssreflect mathcomp.algebra ]; + + meta = { + description = "Implementation of books from Bourbaki's Elements of Mathematics in Coq"; + maintainers = with maintainers; [ Zimmi48 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 35cde1b123e3..074b8a09708a 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -40,6 +40,7 @@ let fiat_HEAD = callPackage ../development/coq-modules/fiat/HEAD.nix {}; flocq = callPackage ../development/coq-modules/flocq {}; fourcolor = callPackage ../development/coq-modules/fourcolor {}; + gaia = callPackage ../development/coq-modules/gaia {}; gappalib = callPackage ../development/coq-modules/gappalib {}; goedel = callPackage ../development/coq-modules/goedel {}; graph-theory = callPackage ../development/coq-modules/graph-theory {}; From ff96901dbd04d4f70f3e5ef52b24a8f0c9227529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Tue, 17 Aug 2021 10:25:41 +0200 Subject: [PATCH 09/49] coqPackages.hydra-battles: 0.3 -> 0.4 --- .../coq-modules/hydra-battles/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/coq-modules/hydra-battles/default.nix b/pkgs/development/coq-modules/hydra-battles/default.nix index a74eec4b64fc..6c3c9d88e0cb 100644 --- a/pkgs/development/coq-modules/hydra-battles/default.nix +++ b/pkgs/development/coq-modules/hydra-battles/default.nix @@ -1,28 +1,32 @@ -{ lib, mkCoqDerivation, coq, mathcomp, equations, paramcoq, version ? null }: +{ lib, mkCoqDerivation, coq, equations, version ? null }: with lib; mkCoqDerivation { pname = "hydra-battles"; owner = "coq-community"; - release."0.3".rev = "v0.3"; - release."0.3".sha256 = "sha256-rXP/vJqVEg2tN/I9LWV13YQ1+C7M6lzGu3oI+7pSZzg="; + release."0.4".sha256 = "sha256:1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp"; + releaseRev = (v: "v${v}"); inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.11"; out = "0.3"; } + { case = isGe "8.11"; out = "0.4"; } ] null; - propagatedBuildInputs = [ mathcomp equations paramcoq ]; + propagatedBuildInputs = [ equations ]; + + useDune2 = true; meta = { - description = "Variations on Kirby & Paris' hydra battles and other entertaining math in Coq"; + description = "Exploration of some properties of Kirby and Paris' hydra battles, with the help of Coq"; longDescription = '' - Variations on Kirby & Paris' hydra battles and other - entertaining math in Coq (collaborative, documented, includes - exercises) + An exploration of some properties of Kirby and Paris' hydra + battles, with the help of the Coq Proof assistant. This + development includes the study of several representations of + ordinal numbers, and a part of the so-called Ketonen and Solovay + machinery (combinatorial properties of epsilon0). ''; - maintainers = with maintainers; [ siraben ]; + maintainers = with maintainers; [ siraben Zimmi48 ]; license = licenses.mit; platforms = platforms.unix; }; From 58c1ab9158216fe13ec1cd7f7384d32fdaeea3a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Tue, 17 Aug 2021 10:40:13 +0200 Subject: [PATCH 10/49] coqPackages.addition-chains: init at 0.4 --- .../coq-modules/addition-chains/default.nix | 33 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/coq-modules/addition-chains/default.nix diff --git a/pkgs/development/coq-modules/addition-chains/default.nix b/pkgs/development/coq-modules/addition-chains/default.nix new file mode 100644 index 000000000000..f2ddacf2e308 --- /dev/null +++ b/pkgs/development/coq-modules/addition-chains/default.nix @@ -0,0 +1,33 @@ +{ lib, mkCoqDerivation, coq, mathcomp-ssreflect, mathcomp-algebra, paramcoq +, version ? null }: +with lib; + +mkCoqDerivation { + pname = "addition-chains"; + repo = "hydra-battles"; + + release."0.4".sha256 = "sha256:1f7pc4w3kir4c9p0fjx5l77401bx12y72nmqxrqs3qqd3iynvqlp"; + releaseRev = (v: "v${v}"); + + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.11"; out = "0.4"; } + ] null; + + propagatedBuildInputs = [ mathcomp-ssreflect mathcomp-algebra paramcoq ]; + + useDune2 = true; + + meta = { + description = "Exponentiation algorithms following addition chains"; + longDescription = '' + Addition chains are algorithms for computations of the p-th + power of some x, with the least number of multiplication as + possible. We present a few implementations of addition chains, + with proofs of their correctness. + ''; + maintainers = with maintainers; [ Zimmi48 ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 074b8a09708a..63f52fec2cb4 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -14,6 +14,7 @@ let (callPackage ../development/coq-modules/contribs {}); aac-tactics = callPackage ../development/coq-modules/aac-tactics {}; + addition-chains = callPackage ../development/coq-modules/addition-chains {}; autosubst = callPackage ../development/coq-modules/autosubst {}; bignums = if lib.versionAtLeast coq.coq-version "8.6" then callPackage ../development/coq-modules/bignums {} From 7f972a2f9505b8514a3e945837227333d491d947 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20B=C3=BChler?= Date: Tue, 17 Aug 2021 15:00:12 +0200 Subject: [PATCH 11/49] emacs/agda2-mode: deprecate phases (#133523) --- .../editors/emacs/elisp-packages/manual-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 00cc118a7030..5d32fdab7ea3 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -46,7 +46,7 @@ pname = "agda-mode"; version = pkgs.haskellPackages.Agda.version; - phases = [ "buildPhase" "installPhase" ]; + dontUnpack = true; # already byte-compiled by Agda builder buildPhase = '' From d4c84fed3f14e475e3dca0442a0baa8390945c6b Mon Sep 17 00:00:00 2001 From: Michael Raitza Date: Tue, 17 Aug 2021 12:50:23 +0200 Subject: [PATCH 12/49] vivaldi: 4.0.2312.38-1 -> 4.1.2369.18-1 --- .../networking/browsers/vivaldi/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index ad58a048c3e9..d13687386641 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -18,11 +18,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "4.0.2312.38-1"; + version = "4.1.2369.18-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "1sdg22snphjsrmxi3fvy41dnjsxpajbhni9bpidk8msa9xgxvzpx"; + sha256 = "062zh7a4mr52h9m09dnqrdc48ajnkq887kcbcvzcd20wsnvivi48"; }; unpackPhase = '' @@ -49,10 +49,12 @@ in stdenv.mkDerivation rec { buildPhase = '' runHook preBuild echo "Patching Vivaldi binaries" - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}" \ - opt/${vivaldiName}/vivaldi-bin + for f in crashpad_handler vivaldi-bin vivaldi-sandbox ; do + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}" \ + opt/${vivaldiName}/$f + done '' + lib.optionalString proprietaryCodecs '' ln -s ${vivaldi-ffmpeg-codecs}/lib/libffmpeg.so opt/${vivaldiName}/libffmpeg.so.''${version%\.*\.*} '' + '' From 26e1c41f93659fc9f12537e4c26112e09fcc9c48 Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 17 Aug 2021 10:27:07 +0900 Subject: [PATCH 13/49] caddy: 2.4.1 -> 2.4.3 --- pkgs/servers/caddy/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index a2cd3c7eb097..b4c85de84ebc 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "caddy"; - version = "2.4.1"; + version = "2.4.3"; subPackages = [ "cmd/caddy" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Wc7eNw5FZWoUT6IP84NhROC59bf4/RCw/gOWLuYI2dc="; + sha256 = "sha256-Z3BVx7gCkls5Hy+H6lA3DOBequRutwa2F34FDt9n+8I="; }; - vendorSha256 = "sha256-ZOrhR03m+cs+mTQio3qEIf+1B0IP0i2+x+vcml5AMco="; + vendorSha256 = "sha256-Zwpakw/vyDVngc1Bn+RdRPECNweruwGxsT4dfvMELkQ="; passthru.tests = { inherit (nixosTests) caddy; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b3823351c4a..295755039c6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2174,7 +2174,9 @@ with pkgs; ''; }); - caddy = callPackage ../servers/caddy { }; + caddy = callPackage ../servers/caddy { + buildGoModule = buildGo115Module; + }; traefik = callPackage ../servers/traefik { }; From 839354e312e604e0001d80d114df917788f711a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Tue, 17 Aug 2021 15:59:06 +0200 Subject: [PATCH 14/49] coqPackages.mathcomp: change default version for Coq 8.10+ Fix the build of mathcomp-analysis with Coq 8.12 (by selecting a version which is compatible with HB 1.1.0). --- pkgs/development/coq-modules/mathcomp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index 4637edebdb77..ddbad5eea874 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -19,7 +19,7 @@ let owner = "math-comp"; withDoc = single && (args.withDoc or false); defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.13"; out = "1.12.0"; } # lower version of coq to 8.10 when all mathcomp packages are ported + { case = isGe "8.10"; out = "1.12.0"; } { case = range "8.7" "8.12"; out = "1.11.0"; } { case = range "8.7" "8.11"; out = "1.10.0"; } { case = range "8.7" "8.11"; out = "1.9.0"; } From 0c7e82e299a6dff270a279a47815da10bbcdb086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Wed, 9 Jun 2021 15:15:11 +0200 Subject: [PATCH 15/49] coqPackages.serapi: init at multiple versions --- .../coq-modules/serapi/default.nix | 72 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/development/coq-modules/serapi/default.nix diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix new file mode 100644 index 000000000000..5505713eb479 --- /dev/null +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -0,0 +1,72 @@ +{ lib, fetchzip, mkCoqDerivation, coq, version ? null }: + +let + ocamlPackages = + coq.ocamlPackages.overrideScope' + (self: super: { + ppxlib = super.ppxlib.override { version = "0.15.0"; }; + # the following does not work + ppx_sexp_conv = super.ppx_sexp_conv.overrideAttrs (_: { + src = fetchzip { + url = "https://github.com/janestreet/ppx_sexp_conv/archive/v0.14.1.tar.gz"; + sha256 = "04bx5id99clrgvkg122nx03zig1m7igg75piphhyx04w33shgkz2"; + }; + }); + }); + + release = { + "8.13.0+0.13.0".sha256 = "sha256:0k69907xn4k61w4mkhwf8kh8drw9pijk9ynijsppihw98j8w38fy"; + "8.12.0+0.12.1".sha256 = "sha256:048x3sgcq4h845hi6hm4j4dsfca8zfj70dm42w68n63qcm6xf9hn"; + "8.11.0+0.11.1".sha256 = "sha256:1phmh99yqv71vlwklqgfxiq2vj99zrzxmryj2j4qvg5vav3y3y6c"; + "8.10.0+0.7.2".sha256 = "sha256:1ljzm63hpd0ksvkyxcbh8rdf7p90vg91gb4h0zz0941v1zh40k8c"; + }; +in + +(with lib; mkCoqDerivation rec { + pname = "serapi"; + inherit version release; + + defaultVersion = with versions; switch coq.version [ + { case = isEq "8.13"; out = "8.13.0+0.13.0"; } + { case = isEq "8.12"; out = "8.12.0+0.12.1"; } + { case = isEq "8.11"; out = "8.11.0+0.11.1"; } + { case = isEq "8.10"; out = "8.10.0+0.7.2"; } + ] null; + + useDune2 = true; + + propagatedBuildInputs = + with ocamlPackages; [ + cmdliner + findlib # run time dependency of SerAPI + ppx_deriving + ppx_deriving_yojson + ppx_import + ppx_sexp_conv + sexplib + yojson + zarith # needed because of Coq + ]; + + installPhase = '' + runHook preInstall + dune install --prefix $out --libdir $OCAMLFIND_DESTDIR coq-serapi + runHook postInstall + ''; + + meta = with lib; { + homepage = https://github.com/ejgallego/coq-serapi; + description = "SerAPI is a library for machine-to-machine interaction with the Coq proof assistant"; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.Zimmi48 ]; + }; +}).overrideAttrs(o: + let inherit (o) version; in { + src = fetchzip { + url = "https://github.com/ejgallego/coq-serapi/releases/download/${version}/coq-serapi-${ + if version == "8.11.0+0.11.1" then version + else builtins.replaceStrings [ "+" ] [ "." ] version + }.tbz"; + sha256 = release."${version}".sha256; + }; +}) diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 63f52fec2cb4..2b707d3d3efd 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -80,6 +80,7 @@ let reglang = callPackage ../development/coq-modules/reglang {}; relation-algebra = callPackage ../development/coq-modules/relation-algebra {}; semantics = callPackage ../development/coq-modules/semantics {}; + serapi = callPackage ../development/coq-modules/serapi {}; simple-io = callPackage ../development/coq-modules/simple-io { }; stdpp = callPackage ../development/coq-modules/stdpp { }; StructTact = callPackage ../development/coq-modules/StructTact {}; From 1dcebe9cf57f173ad80b9e307cdfa2799ccb2057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Tue, 20 Jul 2021 12:27:32 +0200 Subject: [PATCH 16/49] python3Packages.alectryon: init at 1.3.1 --- .../python-modules/alectryon/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/alectryon/default.nix diff --git a/pkgs/development/python-modules/alectryon/default.nix b/pkgs/development/python-modules/alectryon/default.nix new file mode 100644 index 000000000000..30ae647b0510 --- /dev/null +++ b/pkgs/development/python-modules/alectryon/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, pygments, dominate, beautifulsoup4, docutils, sphinx }: + +buildPythonPackage rec { + pname = "alectryon"; + owner = "cpitclaudel"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256:0mca25jv917myb4n91ccpl5fz058aiqsn8cniflwfw5pp6lqnfg7"; + }; + + propagatedBuildInputs = [ + pygments + dominate + beautifulsoup4 + docutils + sphinx + ]; + + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/cpitclaudel/alectryon"; + description = "A collection of tools for writing technical documents that mix Coq code and prose"; + license = licenses.mit; + maintainers = with maintainers; [ Zimmi48 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f6fe67374fac..e64b45f8e633 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -397,6 +397,8 @@ in { alarmdecoder = callPackage ../development/python-modules/alarmdecoder { }; + alectryon = callPackage ../development/python-modules/alectryon { }; + alembic = callPackage ../development/python-modules/alembic { }; algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { }; From 891e537592bc6460dc06c44d734a4c4ea47a1ae3 Mon Sep 17 00:00:00 2001 From: Malte Tammena Date: Tue, 17 Aug 2021 16:55:50 +0200 Subject: [PATCH 17/49] Fix `security.pam.yubico.challengeResponsePath` type The config is optional and may be left `null`. --- nixos/modules/security/pam.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 9a6c7d178257..5400ba1ef989 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -828,7 +828,7 @@ in }; challengeResponsePath = mkOption { default = null; - type = types.path; + type = types.nullOr types.path; description = '' If not null, set the path used by yubico pam module where the challenge expected response is stored. From 104ecb53dfac6b77c3e1c888a3220f0baacc8ca0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 14:56:49 +0000 Subject: [PATCH 18/49] precice: 2.2.0 -> 2.2.1 --- pkgs/development/libraries/precice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/precice/default.nix b/pkgs/development/libraries/precice/default.nix index c3c75e2413f0..68084eb52b3b 100644 --- a/pkgs/development/libraries/precice/default.nix +++ b/pkgs/development/libraries/precice/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "precice"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "precice"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AQc+p/twsfkzwpWeznGpLLSqINKSrWCwH+PdNIrdYA8="; + sha256 = "sha256-XEdrKhxG0dhsfJH6glrzc+JZeCgPEVIswj0ofP838lg="; }; cmakeFlags = [ From 4c1f5a6391355eb751fee74974392c7cb95f9085 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 15:07:34 +0000 Subject: [PATCH 19/49] promscale: 0.4.1 -> 0.5.1 --- pkgs/servers/monitoring/prometheus/promscale.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix index 5b0b308c5ec5..0727616de311 100644 --- a/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/pkgs/servers/monitoring/prometheus/promscale.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "promscale"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = version; - sha256 = "sha256-RdhsQtrD+I8eAgFNr1hvW83Ho22aNhWBX8crCM0b8jU="; + sha256 = "sha256-u9qlABTuQ4EWEfyei6nN/AZ7j9QJXQ61GvyhP8wEmK0="; }; - vendorSha256 = "sha256-82E82O0yaLbu+oSTX7AQoYXFYy3wYVdBCevV7pHZVOA="; + vendorSha256 = "sha256-DFDTYT7UK1cYwGeCgeQcJmrCoqGPDzicusRPPUbH0Gs="; buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/promscale/pkg/version.Version=${version} -X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ]; From 398a3226726dd6b2d269e32c6a1a87e337a6fd99 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 15:19:17 +0000 Subject: [PATCH 20/49] protonmail-bridge: 1.6.9 -> 1.8.7 --- pkgs/applications/networking/protonmail-bridge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 618234e6ff91..c15720ffc380 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "1.6.9"; + version = "1.8.7"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "br-${version}"; - sha256 = "0p2315smxc5knxzr9413w62z65647znh9j9vyb6w5x4dqfp7vhz9"; + sha256 = "sha256-bynPuAdeX4WxYdbjMkR9ANuYWYOINB0OHnKTmIrCB6E="; }; - vendorSha256 = "04aa7syp5hhpqxdpqlsmmbwywnbrh4ia0diym2935jbrqccnvm1k"; + vendorSha256 = "sha256-g2vl1Ctxr2U+D/k9u9oXuZ1OWaABIJs0gmfhWh13ZFM="; nativeBuildInputs = [ pkg-config ]; From dba043d448fef9a882e6cccb0a681baa45d6ff84 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Mon, 16 Aug 2021 10:30:31 -0600 Subject: [PATCH 21/49] element-{web,desktop}: 1.7.34 -> 1.8.1 --- .../element/element-desktop-package.json | 7 +- .../element/element-desktop-yarndeps.nix | 360 +++++++++++++++++- .../element/element-desktop.nix | 4 +- .../element/element-web.nix | 4 +- 4 files changed, 356 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 7968c96fb7a2..4dd59aa5eee3 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.7.34", + "version": "1.8.1", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -54,6 +54,7 @@ "@types/minimist": "^1.2.1", "@typescript-eslint/eslint-plugin": "^4.17.0", "@typescript-eslint/parser": "^4.17.0", + "allchange": "^1.0.0", "asar": "^2.0.1", "chokidar": "^3.5.2", "electron": "^13.1.7", @@ -63,7 +64,7 @@ "electron-notarize": "^1.0.0", "eslint": "7.18.0", "eslint-config-google": "^0.14.0", - "eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#main", + "eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#2306b3d4da4eba908b256014b979f1d3d43d2945", "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", @@ -73,7 +74,7 @@ "node-pre-gyp": "^0.15.0", "pacote": "^11.3.5", "rimraf": "^3.0.2", - "tar": "^6.1.0", + "tar": "^6.1.2", "typescript": "^4.1.3" }, "hakDependencies": { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix index 45395cdb6077..7af8cc7dc2fa 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix @@ -9,6 +9,30 @@ sha1 = "9274ec7460652f9c632c59addf24efb1684ef876"; }; } + { + name = "_actions_core___core_1.4.0.tgz"; + path = fetchurl { + name = "_actions_core___core_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/@actions/core/-/core-1.4.0.tgz"; + sha1 = "cf2e6ee317e314b03886adfeb20e448d50d6e524"; + }; + } + { + name = "_actions_github___github_5.0.0.tgz"; + path = fetchurl { + name = "_actions_github___github_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/@actions/github/-/github-5.0.0.tgz"; + sha1 = "1754127976c50bd88b2e905f10d204d76d1472f8"; + }; + } + { + name = "_actions_http_client___http_client_1.0.11.tgz"; + path = fetchurl { + name = "_actions_http_client___http_client_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/@actions/http-client/-/http-client-1.0.11.tgz"; + sha1 = "c58b12e9aa8b159ee39e7dd6cbd0e91d905633c0"; + }; + } { name = "_babel_code_frame___code_frame_7.14.5.tgz"; path = fetchurl { @@ -481,6 +505,134 @@ sha1 = "f250a0c5e1a08a792d775a315d0ff42fc3a51e1d"; }; } + { + name = "_octokit_auth_token___auth_token_2.4.5.tgz"; + path = fetchurl { + name = "_octokit_auth_token___auth_token_2.4.5.tgz"; + url = "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.5.tgz"; + sha1 = "568ccfb8cb46f36441fac094ce34f7a875b197f3"; + }; + } + { + name = "_octokit_core___core_3.5.1.tgz"; + path = fetchurl { + name = "_octokit_core___core_3.5.1.tgz"; + url = "https://registry.yarnpkg.com/@octokit/core/-/core-3.5.1.tgz"; + sha1 = "8601ceeb1ec0e1b1b8217b960a413ed8e947809b"; + }; + } + { + name = "_octokit_endpoint___endpoint_6.0.12.tgz"; + path = fetchurl { + name = "_octokit_endpoint___endpoint_6.0.12.tgz"; + url = "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.12.tgz"; + sha1 = "3b4d47a4b0e79b1027fb8d75d4221928b2d05658"; + }; + } + { + name = "_octokit_graphql___graphql_4.6.4.tgz"; + path = fetchurl { + name = "_octokit_graphql___graphql_4.6.4.tgz"; + url = "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.6.4.tgz"; + sha1 = "0c3f5bed440822182e972317122acb65d311a5ed"; + }; + } + { + name = "_octokit_openapi_types___openapi_types_9.3.0.tgz"; + path = fetchurl { + name = "_octokit_openapi_types___openapi_types_9.3.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-9.3.0.tgz"; + sha1 = "160347858d727527901c6aae7f7d5c2414cc1f2e"; + }; + } + { + name = "_octokit_openapi_types___openapi_types_9.7.0.tgz"; + path = fetchurl { + name = "_octokit_openapi_types___openapi_types_9.7.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-9.7.0.tgz"; + sha1 = "9897cdefd629cd88af67b8dbe2e5fb19c63426b2"; + }; + } + { + name = "_octokit_plugin_paginate_rest___plugin_paginate_rest_2.15.1.tgz"; + path = fetchurl { + name = "_octokit_plugin_paginate_rest___plugin_paginate_rest_2.15.1.tgz"; + url = "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.1.tgz"; + sha1 = "264189dd3ce881c6c33758824aac05a4002e056a"; + }; + } + { + name = "_octokit_plugin_paginate_rest___plugin_paginate_rest_2.15.0.tgz"; + path = fetchurl { + name = "_octokit_plugin_paginate_rest___plugin_paginate_rest_2.15.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.0.tgz"; + sha1 = "9c956c3710b2bd786eb3814eaf5a2b17392c150d"; + }; + } + { + name = "_octokit_plugin_request_log___plugin_request_log_1.0.4.tgz"; + path = fetchurl { + name = "_octokit_plugin_request_log___plugin_request_log_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz"; + sha1 = "5e50ed7083a613816b1e4a28aeec5fb7f1462e85"; + }; + } + { + name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.6.0.tgz"; + path = fetchurl { + name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.6.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.6.0.tgz"; + sha1 = "c28833b88d0f07bf94093405d02d43d73c7de99b"; + }; + } + { + name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.8.0.tgz"; + path = fetchurl { + name = "_octokit_plugin_rest_endpoint_methods___plugin_rest_endpoint_methods_5.8.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.8.0.tgz"; + sha1 = "33b342fe41f2603fdf8b958e6652103bb3ea3f3b"; + }; + } + { + name = "_octokit_request_error___request_error_2.1.0.tgz"; + path = fetchurl { + name = "_octokit_request_error___request_error_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.1.0.tgz"; + sha1 = "9e150357831bfc788d13a4fd4b1913d60c74d677"; + }; + } + { + name = "_octokit_request___request_5.6.0.tgz"; + path = fetchurl { + name = "_octokit_request___request_5.6.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.0.tgz"; + sha1 = "6084861b6e4fa21dc40c8e2a739ec5eff597e672"; + }; + } + { + name = "_octokit_rest___rest_18.8.0.tgz"; + path = fetchurl { + name = "_octokit_rest___rest_18.8.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.8.0.tgz"; + sha1 = "ba24f7ba554f015a7ae2b7cc2aecef5386ddfea5"; + }; + } + { + name = "_octokit_types___types_6.23.0.tgz"; + path = fetchurl { + name = "_octokit_types___types_6.23.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/types/-/types-6.23.0.tgz"; + sha1 = "b39f242b20036e89fa8f34f7962b4e9b7ff8f65b"; + }; + } + { + name = "_octokit_types___types_6.25.0.tgz"; + path = fetchurl { + name = "_octokit_types___types_6.25.0.tgz"; + url = "https://registry.yarnpkg.com/@octokit/types/-/types-6.25.0.tgz"; + sha1 = "c8e37e69dbe7ce55ed98ee63f75054e7e808bf1a"; + }; + } { name = "_sindresorhus_is___is_0.14.0.tgz"; path = fetchurl { @@ -745,6 +897,14 @@ sha1 = "2fb45e0e5fcbc0813326c1c3da535d1881bb0571"; }; } + { + name = "allchange___allchange_1.0.0.tgz"; + path = fetchurl { + name = "allchange___allchange_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/allchange/-/allchange-1.0.0.tgz"; + sha1 = "f5177b7d97f8e97a2d059a1524db9a72d94dc6d2"; + }; + } { name = "ansi_align___ansi_align_3.0.0.tgz"; path = fetchurl { @@ -1041,6 +1201,14 @@ sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; } + { + name = "before_after_hook___before_after_hook_2.2.2.tgz"; + path = fetchurl { + name = "before_after_hook___before_after_hook_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz"; + sha1 = "a6e8ca41028d90ee2c24222f201c90956091613e"; + }; + } { name = "binary_extensions___binary_extensions_2.2.0.tgz"; path = fetchurl { @@ -1297,6 +1465,14 @@ sha1 = "ddd5035d25094fce220e9cab40a45840a440318f"; }; } + { + name = "cli_color___cli_color_2.0.0.tgz"; + path = fetchurl { + name = "cli_color___cli_color_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/cli-color/-/cli-color-2.0.0.tgz"; + sha1 = "11ecfb58a79278cf6035a60c54e338f9d837897c"; + }; + } { name = "cli_truncate___cli_truncate_1.1.0.tgz"; path = fetchurl { @@ -1529,6 +1705,14 @@ sha1 = "408086d409550c2631155619e9fa7bcadc3b991b"; }; } + { + name = "d___d_1.0.1.tgz"; + path = fetchurl { + name = "d___d_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz"; + sha1 = "8698095372d58dbee346ffd0c7093f99f8f9eb5a"; + }; + } { name = "dashdash___dashdash_1.14.1.tgz"; path = fetchurl { @@ -1641,6 +1825,14 @@ sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; }; } + { + name = "deprecation___deprecation_2.3.1.tgz"; + path = fetchurl { + name = "deprecation___deprecation_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz"; + sha1 = "6368cbdb40abf3373b525ac87e4a260c3a700919"; + }; + } { name = "detect_libc___detect_libc_1.0.3.tgz"; path = fetchurl { @@ -1881,6 +2073,14 @@ sha1 = "23c2f3b756ffdfc608d30e27c9a941024807e7f9"; }; } + { + name = "es5_ext___es5_ext_0.10.53.tgz"; + path = fetchurl { + name = "es5_ext___es5_ext_0.10.53.tgz"; + url = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz"; + sha1 = "93c5a3acfdbef275220ad72644ad02ee18368de1"; + }; + } { name = "es6_error___es6_error_4.1.1.tgz"; path = fetchurl { @@ -1889,6 +2089,30 @@ sha1 = "9e3af407459deed47e9a91f9b885a84eb05c561d"; }; } + { + name = "es6_iterator___es6_iterator_2.0.3.tgz"; + path = fetchurl { + name = "es6_iterator___es6_iterator_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz"; + sha1 = "a7de889141a05a94b0854403b2d0a0fbfa98f3b7"; + }; + } + { + name = "es6_symbol___es6_symbol_3.1.3.tgz"; + path = fetchurl { + name = "es6_symbol___es6_symbol_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz"; + sha1 = "bad5d3c1bcdac28269f4cb331e431c78ac705d18"; + }; + } + { + name = "es6_weak_map___es6_weak_map_2.0.3.tgz"; + path = fetchurl { + name = "es6_weak_map___es6_weak_map_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz"; + sha1 = "b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"; + }; + } { name = "escalade___escalade_3.1.1.tgz"; path = fetchurl { @@ -1930,11 +2154,11 @@ }; } { - name = "50d6bdf6704dd95016d5f1f824f00cac6eaa64e1"; + name = "2306b3d4da4eba908b256014b979f1d3d43d2945"; path = fetchurl { - name = "50d6bdf6704dd95016d5f1f824f00cac6eaa64e1"; - url = "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/50d6bdf6704dd95016d5f1f824f00cac6eaa64e1"; - sha1 = "ecd130b39eb8bc2f11acdfb859b3529748a364e1"; + name = "2306b3d4da4eba908b256014b979f1d3d43d2945"; + url = "https://codeload.github.com/matrix-org/eslint-plugin-matrix-org/tar.gz/2306b3d4da4eba908b256014b979f1d3d43d2945"; + sha1 = "e82e07e6163d15ee5243d8df073947540bf0efc9"; }; } { @@ -2041,6 +2265,14 @@ sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; }; } + { + name = "event_emitter___event_emitter_0.3.5.tgz"; + path = fetchurl { + name = "event_emitter___event_emitter_0.3.5.tgz"; + url = "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz"; + sha1 = "df8c69eef1647923c7157b9ce83840610b02cc39"; + }; + } { name = "except___except_0.1.3.tgz"; path = fetchurl { @@ -2065,6 +2297,14 @@ sha1 = "0bdd92e87d5285d267daa8171d0eb06159689692"; }; } + { + name = "ext___ext_1.4.0.tgz"; + path = fetchurl { + name = "ext___ext_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz"; + sha1 = "89ae7a07158f79d35517882904324077e4379244"; + }; + } { name = "extend___extend_3.0.2.tgz"; path = fetchurl { @@ -2833,6 +3073,22 @@ sha1 = "d231362e53a07ff2b0e0ea7fed049161ffd16283"; }; } + { + name = "is_plain_object___is_plain_object_5.0.0.tgz"; + path = fetchurl { + name = "is_plain_object___is_plain_object_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz"; + sha1 = "4427f50ab3429e9025ea7d52e9043a9ef4159344"; + }; + } + { + name = "is_promise___is_promise_2.2.2.tgz"; + path = fetchurl { + name = "is_promise___is_promise_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz"; + sha1 = "39ab959ccbf9a774cf079f7b40c7a26f763135f1"; + }; + } { name = "is_typedarray___is_typedarray_1.0.0.tgz"; path = fetchurl { @@ -3050,11 +3306,11 @@ }; } { - name = "jszip___jszip_3.6.0.tgz"; + name = "jszip___jszip_3.7.1.tgz"; path = fetchurl { - name = "jszip___jszip_3.6.0.tgz"; - url = "https://registry.yarnpkg.com/jszip/-/jszip-3.6.0.tgz"; - sha1 = "839b72812e3f97819cc13ac4134ffced95dd6af9"; + name = "jszip___jszip_3.7.1.tgz"; + url = "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz"; + sha1 = "bd63401221c15625a1228c556ca8a68da6fda3d9"; }; } { @@ -3185,6 +3441,14 @@ sha1 = "679591c564c3bffaae8454cf0b3df370c3d6911c"; }; } + { + name = "loglevel___loglevel_1.7.1.tgz"; + path = fetchurl { + name = "loglevel___loglevel_1.7.1.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz"; + sha1 = "005fde2f5e6e47068f935ff28573e125ef72f197"; + }; + } { name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; path = fetchurl { @@ -3209,6 +3473,14 @@ sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; }; } + { + name = "lru_queue___lru_queue_0.1.0.tgz"; + path = fetchurl { + name = "lru_queue___lru_queue_0.1.0.tgz"; + url = "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz"; + sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3"; + }; + } { name = "make_dir___make_dir_3.1.0.tgz"; path = fetchurl { @@ -3241,6 +3513,14 @@ sha1 = "efbc392e3523669d20b812a6dae2f6efb49b888d"; }; } + { + name = "memoizee___memoizee_0.4.15.tgz"; + path = fetchurl { + name = "memoizee___memoizee_0.4.15.tgz"; + url = "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.15.tgz"; + sha1 = "e6f3d2da863f318d02225391829a6c5956555b72"; + }; + } { name = "merge2___merge2_1.4.1.tgz"; path = fetchurl { @@ -3481,6 +3761,22 @@ sha1 = "feacf7ccf525a77ae9634436a64883ffeca346fb"; }; } + { + name = "next_tick___next_tick_1.1.0.tgz"; + path = fetchurl { + name = "next_tick___next_tick_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz"; + sha1 = "1836ee30ad56d67ef281b22bd199f709449b35eb"; + }; + } + { + name = "next_tick___next_tick_1.0.0.tgz"; + path = fetchurl { + name = "next_tick___next_tick_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz"; + sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c"; + }; + } { name = "node_addon_api___node_addon_api_1.7.2.tgz"; path = fetchurl { @@ -3489,6 +3785,14 @@ sha1 = "3df30b95720b53c24e59948b49532b662444f54d"; }; } + { + name = "node_fetch___node_fetch_2.6.1.tgz"; + path = fetchurl { + name = "node_fetch___node_fetch_2.6.1.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz"; + sha1 = "045bd323631f76ed2e2b55573394416b639a0052"; + }; + } { name = "node_gyp___node_gyp_7.1.2.tgz"; path = fetchurl { @@ -4610,11 +4914,11 @@ }; } { - name = "tar___tar_6.1.0.tgz"; + name = "tar___tar_6.1.2.tgz"; path = fetchurl { - name = "tar___tar_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz"; - sha1 = "d1724e9bcc04b977b18d5c573b333a2207229a83"; + name = "tar___tar_6.1.2.tgz"; + url = "https://registry.yarnpkg.com/tar/-/tar-6.1.2.tgz"; + sha1 = "1f045a90a6eb23557a603595f41a16c57d47adc6"; }; } { @@ -4633,6 +4937,14 @@ sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; }; } + { + name = "timers_ext___timers_ext_0.1.7.tgz"; + path = fetchurl { + name = "timers_ext___timers_ext_0.1.7.tgz"; + url = "https://registry.yarnpkg.com/timers-ext/-/timers-ext-0.1.7.tgz"; + sha1 = "6f57ad8578e07a3fb9f91d9387d65647555e25c6"; + }; + } { name = "timm___timm_1.7.1.tgz"; path = fetchurl { @@ -4809,6 +5121,22 @@ sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; }; } + { + name = "type___type_1.2.0.tgz"; + path = fetchurl { + name = "type___type_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz"; + sha1 = "848dd7698dafa3e54a6c479e759c4bc3f18847a0"; + }; + } + { + name = "type___type_2.5.0.tgz"; + path = fetchurl { + name = "type___type_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz"; + sha1 = "0a2e78c2e77907b252abe5f298c1b01c63f0db3d"; + }; + } { name = "typedarray_to_buffer___typedarray_to_buffer_3.1.5.tgz"; path = fetchurl { @@ -4857,6 +5185,14 @@ sha1 = "39c6451f81afb2749de2b233e3f7c5e8843bd89d"; }; } + { + name = "universal_user_agent___universal_user_agent_6.0.0.tgz"; + path = fetchurl { + name = "universal_user_agent___universal_user_agent_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-6.0.0.tgz"; + sha1 = "3381f8503b251c0d9cd21bc1de939ec9df5480ee"; + }; + } { name = "universalify___universalify_0.1.2.tgz"; path = fetchurl { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index fd7074f005eb..a82fe8ce344b 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -19,12 +19,12 @@ let executableName = "element-desktop"; - version = "1.7.34"; + version = "1.8.1"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-4d2IOngiRcKd4k0jnilAR3Sojkfru3dlqtoBYi3zeLY="; + sha256 = "sha256-FIKbyfnRuHBbmtjwxNC//n5UiGTCQNr+PeiZEi3+RGI="; }; electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; in diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 8b14820656a5..a40ccf49f773 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.34"; + version = "1.8.1"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-0M2LuVSHIGRwzq00wgzlzTVWh3WItNN+JDNf+u+9V30="; + sha256 = "sha256-C2oWYpPxMeSgGKyjUe6Ih13ggZliN4bmAX5cakzW1u8="; }; installPhase = '' From 924c44b9ce0e53b601054f6f3acf557de0e70aaf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 15:43:39 +0000 Subject: [PATCH 22/49] pure-prompt: 1.17.0 -> 1.17.1 --- pkgs/shells/zsh/pure-prompt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/pure-prompt/default.nix b/pkgs/shells/zsh/pure-prompt/default.nix index 0ba449870b83..d5ed2641d536 100644 --- a/pkgs/shells/zsh/pure-prompt/default.nix +++ b/pkgs/shells/zsh/pure-prompt/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "pure-prompt"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "sindresorhus"; repo = "pure"; rev = "v${version}"; - sha256 = "sha256-6j6QZtsA5ZgfXthYjXRrND2zAJwZx0/6WRI1f3c+2mE="; + sha256 = "sha256-bWp04xT+/Xhgxj1Rm0FgTkRtLH9nuSFtqBsO3B7Exvo="; }; installPhase = '' From dce69cf8b80088cda0a973ea0f52b69aa3c898cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 15:48:28 +0000 Subject: [PATCH 23/49] pwndbg: 2020.07.23 -> 2021.06.22 --- pkgs/development/tools/misc/pwndbg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/pwndbg/default.nix b/pkgs/development/tools/misc/pwndbg/default.nix index 764fa6677345..9aa11f35957f 100644 --- a/pkgs/development/tools/misc/pwndbg/default.nix +++ b/pkgs/development/tools/misc/pwndbg/default.nix @@ -21,14 +21,14 @@ let in stdenv.mkDerivation rec { pname = "pwndbg"; - version = "2020.07.23"; + version = "2021.06.22"; format = "other"; src = fetchFromGitHub { owner = "pwndbg"; repo = "pwndbg"; rev = version; - sha256 = "0w1dmjy8ii12367wza8c35a9q9x204fppf6x328q75bhb3gd845c"; + sha256 = "sha256-8jaWhpn7Q3X7FBHURX6nyOAhu+C113DnC4KBSE3FBuE="; }; nativeBuildInputs = [ makeWrapper ]; From 2eb78543edaafd4956c963a2dfe4ebeba28efe8e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 16:00:07 +0000 Subject: [PATCH 24/49] opendht: 2.1.6 -> 2.2.0 --- pkgs/development/libraries/opendht/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 7f4f186c923d..3669a4aed850 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.1.6"; + version = "2.2.0"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "0sjb2a3yqnabwgmmn8gapc1dq9m8vp9z8w85zhsj654i5h3gp6zv"; + sha256 = "sha256-u4MWMUbnq2q4FH0TMpbrbhS5erAfT4/3HYGLXaLTz+I="; }; nativeBuildInputs = From 57752827de69351d9c3caace0772eec49a74e943 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 15 Aug 2021 20:55:53 +0100 Subject: [PATCH 25/49] opendht: enable for darwin --- pkgs/development/libraries/opendht/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 3669a4aed850..3cf29b7351e9 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, darwin , cmake, pkg-config , asio, nettle, gnutls, msgpack, readline, libargon2 }: @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { msgpack readline libargon2 + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security ]; outputs = [ "out" "lib" "dev" "man" ]; @@ -35,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/savoirfairelinux/opendht"; license = licenses.gpl3Plus; maintainers = with maintainers; [ taeer olynch thoughtpolice ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From ac532514c580d7e84f7678c6acf944698948aa5b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 16:18:17 +0000 Subject: [PATCH 26/49] qogir-theme: 2021-06-25 -> 2021-08-02 --- pkgs/data/themes/qogir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix index c4f97ebfbdad..c85b5259f62c 100644 --- a/pkgs/data/themes/qogir/default.nix +++ b/pkgs/data/themes/qogir/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-theme"; - version = "2021-06-25"; + version = "2021-08-02"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "178lk0zffm4nd8fc872rfpm2aii1nszq0k389gkiyxkqphmknn4n"; + sha256 = "sha256-U048qNBfxjx/5iHIXcqAwXfIwmux+sw4hVQkN3TDLzk="; }; buildInputs = [ gdk-pixbuf librsvg ]; From 6ca6cc20447e2094bd8e5427e28eb3ccbf418d2c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 17 Aug 2021 16:58:55 +0000 Subject: [PATCH 27/49] rabbitmq-server: 3.9.1 -> 3.9.3 --- pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 7ac41ec5438a..6f6ca2a16331 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.9.1"; + version = "3.9.3"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "1qba783ja0y5k1npxh9lprpxs0vx2i6aci5j78di91m60pgyf1hc"; + sha256 = "sha256-33nrS29t/a8D8Rl+d/ipRU2923QKr+EAN3rgxisCR0U="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ]; From 10d15c0775a4367a3663f1bc9b74f5fd90bd0104 Mon Sep 17 00:00:00 2001 From: Marvin Strangfeld Date: Tue, 17 Aug 2021 19:23:27 +0200 Subject: [PATCH 28/49] helmfile: fix wrong sha256 of sources --- pkgs/applications/networking/cluster/helmfile/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 1f32d5f1cd85..af2771f98587 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-Y1BlvUudxEZ1G893dwYU+R6k2QAYohx4+0yysYaUM0E="; + sha256 = "sha256-D9CyJE6/latz4541NfOtvKy+kui3CVmD483SkdEJzyU="; }; vendorSha256 = "sha256-QYI5HxEUNrZKSjk0LlbhjvxXlWCbbLup51Ht3HJDNC8="; From 5dd7c7a079e0b0c9799c5275714de5699fb0ffc3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 17 Aug 2021 19:27:34 +0200 Subject: [PATCH 29/49] monotone: fix key encryption --- .../version-management/monotone/default.nix | 5 ++++- .../monotone/monotone-1.1-adapt-to-botan2.patch | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/version-management/monotone/monotone-1.1-adapt-to-botan2.patch diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 48af459260df..6ea66b296d74 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -30,7 +30,10 @@ stdenv.mkDerivation rec { hash = "sha256:1hfy8vaap3184cd7h3qhz0da7c992idkc6q2nz9frhma45c5vgmd"; }; - patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ]; + patches = [ + ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch + ./monotone-1.1-adapt-to-botan2.patch + ]; postPatch = '' sed -e 's@/usr/bin/less@${less}/bin/less@' -i src/unix/terminal.cc diff --git a/pkgs/applications/version-management/monotone/monotone-1.1-adapt-to-botan2.patch b/pkgs/applications/version-management/monotone/monotone-1.1-adapt-to-botan2.patch new file mode 100644 index 000000000000..1df6a4717d5a --- /dev/null +++ b/pkgs/applications/version-management/monotone/monotone-1.1-adapt-to-botan2.patch @@ -0,0 +1,15 @@ +Botan2 has switched the parameter order in encryption descriptions + +--- monotone-upstream/src/botan_glue.hh 2021-08-17 19:06:32.736753732 +0200 ++++ monotone-patched/src/botan_glue.hh 2021-08-17 19:07:44.437750535 +0200 +@@ -45,7 +45,9 @@ + // In Botan revision d8021f3e (back when it still used monotone) the name + // of SHA-1 changed to SHA-160. + const static char * PBE_PKCS5_KEY_FORMAT = +-#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,11,0) ++#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(2,0,0) ++ "PBE-PKCS5v20(TripleDES/CBC,SHA-160)"; ++#elif BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,11,0) + "PBE-PKCS5v20(SHA-160,TripleDES/CBC)"; + #else + "PBE-PKCS5v20(SHA-1,TripleDES/CBC)"; From c9fc751673898ee095d2c873c136e1a5505d5551 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sat, 5 Dec 2020 19:11:21 +0100 Subject: [PATCH 30/49] nixos/navidrome: init module and test Co-authored-by: aciceri Co-authored-by: nyanloutre --- .../from_md/release-notes/rl-2111.section.xml | 10 +++ .../manual/release-notes/rl-2111.section.md | 3 + nixos/modules/module-list.nix | 1 + nixos/modules/services/audio/navidrome.nix | 71 +++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/navidrome.nix | 12 ++++ pkgs/servers/misc/navidrome/default.nix | 4 +- 7 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/audio/navidrome.nix create mode 100644 nixos/tests/navidrome.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 20c64f2a6710..2b1619cf3c9f 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -172,6 +172,16 @@ + + + + navidrome, + a personal music streaming server with subsonic-compatible + api. Available as + navidrome. + + +
Backward Incompatibilities diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 87747e0fc1ba..40c286f69bc7 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -53,6 +53,9 @@ pt-services.clipcat.enable). - [isso](https://posativ.org/isso/), a commenting server similar to Disqus. Available as [isso](#opt-services.isso.enable) +* [navidrome](https://www.navidrome.org/), a personal music streaming server with +subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable). + ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} - The `staticjinja` package has been upgraded from 1.0.4 to 3.0.1 diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 270e30704063..7b638afc2070 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -254,6 +254,7 @@ ./services/audio/mopidy.nix ./services/audio/networkaudiod.nix ./services/audio/roon-bridge.nix + ./services/audio/navidrome.nix ./services/audio/roon-server.nix ./services/audio/slimserver.nix ./services/audio/snapserver.nix diff --git a/nixos/modules/services/audio/navidrome.nix b/nixos/modules/services/audio/navidrome.nix new file mode 100644 index 000000000000..c2fe429f9844 --- /dev/null +++ b/nixos/modules/services/audio/navidrome.nix @@ -0,0 +1,71 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.navidrome; + settingsFormat = pkgs.formats.json {}; +in { + options = { + services.navidrome = { + + enable = mkEnableOption pkgs.navidrome.meta.description; + + settings = mkOption rec { + type = settingsFormat.type; + apply = recursiveUpdate default; + default = { + Address = "127.0.0.1"; + Port = 4533; + }; + example = { + MusicFolder = "/mnt/music"; + }; + description = '' + Configuration for Navidrome, see for supported values. + ''; + }; + + }; + }; + + config = mkIf cfg.enable { + systemd.services.navidrome = { + description = "Navidrome Media Server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${pkgs.navidrome}/bin/navidrome --configfile ${settingsFormat.generate "navidrome.json" cfg.settings} + ''; + DynamicUser = true; + StateDirectory = "navidrome"; + WorkingDirectory = "/var/lib/navidrome"; + RuntimeDirectory = "navidrome"; + RootDirectory = "/run/navidrome"; + ReadWritePaths = ""; + BindReadOnlyPaths = [ + builtins.storeDir + ] ++ lib.optional (cfg.settings ? MusicFolder) cfg.settings.MusicFolder; + CapabilityBoundingSet = ""; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + PrivateDevices = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; + RestrictRealtime = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + UMask = "0066"; + ProtectHostname = true; + }; + }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b1c3ccf782d1..c3dd50007aab 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -283,6 +283,7 @@ in nat.firewall = handleTest ./nat.nix { withFirewall = true; }; nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; }; nat.standalone = handleTest ./nat.nix { withFirewall = false; }; + navidrome = handleTest ./navidrome.nix {}; ncdns = handleTest ./ncdns.nix {}; ndppd = handleTest ./ndppd.nix {}; nebula = handleTest ./nebula.nix {}; diff --git a/nixos/tests/navidrome.nix b/nixos/tests/navidrome.nix new file mode 100644 index 000000000000..42e14720b2ed --- /dev/null +++ b/nixos/tests/navidrome.nix @@ -0,0 +1,12 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "navidrome"; + + machine = { ... }: { + services.navidrome.enable = true; + }; + + testScript = '' + machine.wait_for_unit("navidrome") + machine.wait_for_open_port("4533") + ''; +}) diff --git a/pkgs/servers/misc/navidrome/default.nix b/pkgs/servers/misc/navidrome/default.nix index 065184b77136..1e7e3200731e 100644 --- a/pkgs/servers/misc/navidrome/default.nix +++ b/pkgs/servers/misc/navidrome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ffmpeg, ffmpegSupport ? true, makeWrapper }: +{ lib, stdenv, fetchurl, ffmpeg, ffmpegSupport ? true, makeWrapper, nixosTests }: with lib; @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { --prefix PATH : ${makeBinPath (optional ffmpegSupport ffmpeg)} ''; + passthru.tests.navidrome = nixosTests.navidrome; + meta = { description = "Navidrome Music Server and Streamer compatible with Subsonic/Airsonic"; homepage = "https://www.navidrome.org/"; From 73b3e147ea0b5fcbdc3ccda6d50c35634a132d56 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 16:11:45 +0000 Subject: [PATCH 31/49] openhantek6022: 3.2.3 -> 3.2.4 --- .../science/electronics/openhantek6022/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/applications/science/electronics/openhantek6022/default.nix index d2cdf20ab87c..1b9d7773669c 100644 --- a/pkgs/applications/science/electronics/openhantek6022/default.nix +++ b/pkgs/applications/science/electronics/openhantek6022/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "openhantek6022"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "OpenHantek"; repo = "OpenHantek6022"; rev = version; - sha256 = "0hnd3rdmv76dwwlmkykzwhp5sbxd1fr5ss8zdfdybxw28cxlpq8r"; + sha256 = "sha256-Rb0bd2fnnNWEm1n2EVRB2Leb0Or9vxi5oj+FKNY4GSc="; }; nativeBuildInputs = [ cmake makeWrapper ]; From d1355cb7bebfcc92c903037d8f2fd86dafb0d67f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 17:13:49 +0000 Subject: [PATCH 32/49] orcania: 2.2.0 -> 2.2.1 --- pkgs/development/libraries/orcania/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix index 157769c7772f..1058eaa1f631 100644 --- a/pkgs/development/libraries/orcania/default.nix +++ b/pkgs/development/libraries/orcania/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tArXiXmoWHd42IGBZKtc4QJIBy3USPlSeW+Dv5xl1EU="; + sha256 = "sha256-6Libn+S5c7sCmKGq8KojiUhI18zO37rgiiVwQxP3p4o="; }; nativeBuildInputs = [ cmake ]; From d9543806d6eeff70d983c27af8391658421d3db1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 17:04:48 +0000 Subject: [PATCH 33/49] operator-sdk: 1.10.0 -> 1.11.0 --- pkgs/development/tools/operator-sdk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix index 2818b75ede58..908a5e6c23da 100644 --- a/pkgs/development/tools/operator-sdk/default.nix +++ b/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "1qvwk2gyawa3ihi5zqynrimxf426x22kplr3gdb91m9bx9dwqs3v"; + sha256 = "sha256-5eW2yrlUI0B5YNi9BtDjPsTC2vwavEXAMppa5rv5xhE="; }; - vendorSha256 = "1chfiqxljpq6rad4fnqf3dcri63qr9vb765kphw98ly4s0mwm1aj"; + vendorSha256 = "sha256-gATpYjGKxOfXUnfSZ5uXrVbIydiEbijYR2axPluE5YU="; doCheck = false; From ee1986256792528be2c55ff440945916c5ff34b7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 13:14:30 +0000 Subject: [PATCH 34/49] nvtop: 1.1.0 -> 1.2.2 --- pkgs/tools/system/nvtop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index fdbfeb1c31f3..d310c1a7e8f1 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nvtop"; - version = "1.1.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "Syllo"; repo = "nvtop"; rev = version; - sha256 = "1h24ppdz7l6l0znwbgir49f7r1fshzjavc6i5j33c6bvr318dpqb"; + sha256 = "sha256-B/SRTOMp3VYShjSGxnF1ll58ijddJG7w/7nPK1fMltk="; }; cmakeFlags = [ From f1a4392196153042e918daae55498afd978772bd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 16:16:58 +0000 Subject: [PATCH 35/49] openimagedenoise: 1.4.0 -> 1.4.1 --- pkgs/development/libraries/openimagedenoise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openimagedenoise/default.nix b/pkgs/development/libraries/openimagedenoise/default.nix index 6547c321db70..c44dccbb5d51 100644 --- a/pkgs/development/libraries/openimagedenoise/default.nix +++ b/pkgs/development/libraries/openimagedenoise/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "openimagedenoise"; - version = "1.4.0"; + version = "1.4.1"; # The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs src = fetchzip { url = "https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz"; - sha256 = "sha256-UsiZT3ufRVo1BQ/md/A3CXpUfMPrJR1DhZg9hrjOG2A="; + sha256 = "sha256-TQ7cL0/6pnSTuW21DESA5I3S/C1BHStrWK9yaPoim6E="; }; nativeBuildInputs = [ cmake python3 ispc ]; From 5bc28eea131531212f08ae251ae88a6811a789ba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 15:00:52 +0000 Subject: [PATCH 36/49] openapi-generator-cli: 5.1.0 -> 5.2.0 --- pkgs/tools/networking/openapi-generator-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 34d2c22fb242..606b3b4ee9e6 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { callPackage, lib, stdenv, fetchurl, jre, makeWrapper }: let this = stdenv.mkDerivation rec { - version = "5.1.0"; + version = "5.2.0"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "06dvy4pwgpyf209n0b27qwkjj7zlgadg2czwxapy94fd1wpq9yb2"; + sha256 = "sha256-mZYGCIR7XOvONnNFDM86qSM7iug48noNgBcHdik81vk="; }; dontUnpack = true; From 643f3985cfeaddca6189d5284f2704490e51d912 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 13:07:17 +0000 Subject: [PATCH 37/49] nuraft: 1.2.0 -> 1.3.0 --- pkgs/development/libraries/nuraft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nuraft/default.nix b/pkgs/development/libraries/nuraft/default.nix index f9ae9d5ffe64..232fdfc512f0 100644 --- a/pkgs/development/libraries/nuraft/default.nix +++ b/pkgs/development/libraries/nuraft/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuraft"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "eBay"; repo = "NuRaft"; rev = "v${version}"; - sha256 = "sha256-1k+AWmpAiHcQVEB5kUaMtNWhOnTBnmJiNU8zL1J/PEk="; + sha256 = "sha256-Fyy9B5CXyMcDSOdqaeJ4ejo1svM90ESXuNL0rzsTZpE="; }; nativeBuildInputs = [ cmake ]; From a9e551a6f808a4c64ae1eaf5697ed9646825d100 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 16:30:43 +0000 Subject: [PATCH 38/49] opensm: 3.3.23 -> 3.3.24 --- pkgs/tools/networking/opensm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/opensm/default.nix b/pkgs/tools/networking/opensm/default.nix index a21fe68e8163..6026292f386f 100644 --- a/pkgs/tools/networking/opensm/default.nix +++ b/pkgs/tools/networking/opensm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "opensm"; - version = "3.3.23"; + version = "3.3.24"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "opensm"; rev = version; - sha256 = "0r0nw7b2711ca6mrj19ymg97x862hdxv54fhhm4kiqvdh6n75y0s"; + sha256 = "sha256-/bqo5r9pVt7vg29xaRRO/9k21AMlmoe2327Ot5gVIwc="; }; nativeBuildInputs = [ autoconf automake libtool bison flex ]; From e3da6faca4a3a11a92e3d7c0535c8ae6a4f6f3d6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 12:31:25 +0000 Subject: [PATCH 39/49] python38Packages.hvac: 0.10.14 -> 0.11.0 --- pkgs/development/python-modules/hvac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 70cd9ca5abd9..5eaf6f1199eb 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "0.10.14"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DGFvKdZkKtqrzUCKBEaTdO2DvhKyRQG7M36PN7rf7yI="; + sha256 = "9d5504e35388e665db5086edf75d2425831573c6569bb0bf3c2c6eaff30e034e"; }; propagatedBuildInputs = [ From ba19c8982c70645cf458a7578ef07a1b4ff75c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Tue, 17 Aug 2021 15:44:27 +0200 Subject: [PATCH 40/49] rabbitmq-server: Add myself as maintainer --- pkgs/servers/amqp/rabbitmq-server/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 6f6ca2a16331..a3ff060f9337 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { description = "An implementation of the AMQP messaging protocol"; license = licenses.mpl20; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ turion ]; }; } From c5422e77efadd050e0e5566fc8862e344adc77b8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 12:44:03 +0000 Subject: [PATCH 41/49] nfdump: 1.6.22 -> 1.6.23 --- pkgs/tools/networking/nfdump/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix index 1319e7997dde..30ab31013bcd 100644 --- a/pkgs/tools/networking/nfdump/default.nix +++ b/pkgs/tools/networking/nfdump/default.nix @@ -2,7 +2,7 @@ , autoconf, automake, libtool, pkg-config , bzip2, libpcap, flex, bison }: -let version = "1.6.22"; in +let version = "1.6.23"; in stdenv.mkDerivation { pname = "nfdump"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "phaag"; repo = "nfdump"; rev = "v${version}"; - sha256 = "14x2k85ard1kp99hhd90zsmvyw24g03m84rn13gb4grm9gjggzrj"; + sha256 = "sha256-aM7U+JD8EtxEusvObsRgqS0aqfTfF3vYxCqvw0bgX20="; }; nativeBuildInputs = [ autoconf automake flex libtool pkg-config bison ]; From 67219e4bb020e6cd674c9ee3def96e063b2f9bf7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 12:48:28 +0000 Subject: [PATCH 42/49] nfpm: 2.3.1 -> 2.6.0 --- pkgs/tools/package-management/nfpm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 521616a5472d..69d2f0d29f78 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.3.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zS8HXzu0oX66oVmupMU9YZKXGF+IQ/tCrO32PXfHPGY="; + sha256 = "sha256-GKdfi4hdvpB9VY8VqGYNjTezmPxotrzL/XSm1H5VLQs="; }; - vendorSha256 = "sha256-1zPrCmC+J9LbD3tRKzdJbyWbyTtD6SiPZ6efc9CSjsg="; + vendorSha256 = "sha256-APF6WHuH+YzgX3GbkSzZArGdiE7xPsLljEzCu96BvO4="; doCheck = false; From 94d15b60723477f3d70646ecc5a7a3aa8adfb60d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 12:14:20 +0000 Subject: [PATCH 43/49] nats-streaming-server: 0.21.1 -> 0.22.1 --- pkgs/servers/nats-streaming-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix index bf6d95b65d45..3de95b4f1133 100644 --- a/pkgs/servers/nats-streaming-server/default.nix +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -4,14 +4,14 @@ with lib; buildGoPackage rec { pname = "nats-streaming-server"; - version = "0.21.1"; + version = "0.22.1"; goPackagePath = "github.com/nats-io/${pname}"; src = fetchFromGitHub { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-GqnIGnXcOcfbAgUruVxsTSvi6pH1E3QugEmZr3tPiIY="; + sha256 = "sha256-VdYyui0fyoNf1q3M1xTg/UMlxIFABqAbqQaD0bLpKCY="; }; meta = { From 717688295b205467aa3e5797c626c73285c194f6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 11:47:46 +0000 Subject: [PATCH 44/49] mxt-app: 1.32 -> 1.33 --- pkgs/misc/mxt-app/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix index 099300634e8c..df812d516ecc 100644 --- a/pkgs/misc/mxt-app/default.nix +++ b/pkgs/misc/mxt-app/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, libtool }: stdenv.mkDerivation rec { - version="1.32"; + version="1.33"; pname = "mxt-app"; src = fetchFromGitHub { owner = "atmel-maxtouch"; repo = "mxt-app"; rev = "v${version}"; - sha256 = "1z1g5h14j3yw3r9phgir33s9j07ns9c0r5lkl49940pzqycnrwbj"; + sha256 = "sha256-PgIIxoyR7UA5y4UZ6meJERrbi1Bov03pJkN5St4BWss="; }; nativeBuildInputs = [ autoreconfHook ]; From 1a9b997088ca4785329b34c2ed9dc4ae57d44b1a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 10:57:28 +0000 Subject: [PATCH 45/49] mpdevil: 1.1.1 -> 1.3.0 --- pkgs/applications/audio/mpdevil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mpdevil/default.nix b/pkgs/applications/audio/mpdevil/default.nix index 09256911f872..6dd9b07bdb2a 100644 --- a/pkgs/applications/audio/mpdevil/default.nix +++ b/pkgs/applications/audio/mpdevil/default.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "mpdevil"; - version = "1.1.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "SoongNoonien"; repo = pname; rev = "v${version}"; - sha256 = "0l7mqv7ys05al2hds4icb32hf14fqi3n7b0f5v1yx54cbl9cqfap"; + sha256 = "1wa5wkkv8kvzlxrhqmmhjmrzcm5v2dij516dk4vlpv9sazc6gzkm"; }; nativeBuildInputs = [ From 0b137d54707b2a0ebac067e9e3362f6743c5eb3d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 11:28:18 +0000 Subject: [PATCH 46/49] multus-cni: 3.7.1 -> 3.7.2 --- pkgs/applications/networking/cluster/multus-cni/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/multus-cni/default.nix b/pkgs/applications/networking/cluster/multus-cni/default.nix index d44e0441d8fa..9e91589478b4 100644 --- a/pkgs/applications/networking/cluster/multus-cni/default.nix +++ b/pkgs/applications/networking/cluster/multus-cni/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "multus-cni"; - version = "3.7.1"; + version = "3.7.2"; src = fetchFromGitHub { owner = "k8snetworkplumbingwg"; repo = pname; rev = "v${version}"; - sha256 = "04rn7ypd0cw2c33wqb9wqy1dp6ajvcp7rcv7zybffb1d40mdlds1"; + sha256 = "sha256-eVYRbMijOEa+DNCm4w/+WVrTI9607NF9/l5YKkXJuFs="; }; buildFlagsArray = let From 87f4f2f1032d3f6fee2fd00d95c24052a661ee08 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 11:57:48 +0000 Subject: [PATCH 47/49] namecoin: nc0.20.1 -> nc0.21.1 --- pkgs/applications/blockchains/namecoin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/namecoin/default.nix b/pkgs/applications/blockchains/namecoin/default.nix index dccee1dc0561..37a57fac5b10 100644 --- a/pkgs/applications/blockchains/namecoin/default.nix +++ b/pkgs/applications/blockchains/namecoin/default.nix @@ -3,14 +3,14 @@ with lib; stdenv.mkDerivation rec { - version = "nc0.20.1"; + version = "nc0.21.1"; name = "namecoin" + toString (optional (!withGui) "d") + "-" + version; src = fetchFromGitHub { owner = "namecoin"; repo = "namecoin-core"; rev = version; - sha256 = "1wpfp9y95lmfg2nk1xqzchwck1wk6gwkya1rj07mf5in9jngxk9z"; + sha256 = "sha256-dA4BGhxHm0EdvqMq27zzWp2vOPyKbCgV1i1jt17TVxU="; }; nativeBuildInputs = [ From 5f7996595882262cd741547d594620439b4af821 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 11:14:22 +0000 Subject: [PATCH 48/49] mubeng: 0.4.5 -> 0.5.2 --- pkgs/tools/networking/mubeng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/mubeng/default.nix b/pkgs/tools/networking/mubeng/default.nix index 11ebe338c90b..2c560cffb07b 100644 --- a/pkgs/tools/networking/mubeng/default.nix +++ b/pkgs/tools/networking/mubeng/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mubeng"; - version = "0.4.5"; + version = "0.5.2"; src = fetchFromGitHub { owner = "kitabisa"; repo = pname; rev = "v${version}"; - sha256 = "03hm4wqlvsbi06g0ijrhvbk9i2ahmd1m8l80wbcijznhbdl5msl8"; + sha256 = "sha256-jwBDa/TfXrD+f0q4nyQkpi52Jwl1XWZrMd3fPowNzgA="; }; - vendorSha256 = "1qcxix6724ly0klsr8bw3nv6pxn0wixqiqcgqkcp6sia4dxbbg14"; + vendorSha256 = "sha256-/K1kBuxGEDUCBC7PiSpQRv1NEvTKwN+vNg2rz7pg838="; meta = with lib; { description = "Proxy checker and IP rotator"; From f840a1559ed03dab1539ac8841257fde8292b9fa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 15 Aug 2021 12:08:47 +0000 Subject: [PATCH 49/49] nats-server: 2.2.1 -> 2.3.4 --- pkgs/servers/nats-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 4f62c6f7773d..0d7904d69ccc 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "nats-server"; - version = "2.2.1"; + version = "2.3.4"; goPackagePath = "github.com/nats-io/${pname}"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "nats-io"; repo = pname; - sha256 = "sha256-LQ817nZrFkF1zdj2m2SQK58BqDbUPSnncSWR+Woi+Ao="; + sha256 = "sha256-VNnL1v7R8cko9C/494XJh4aMRZv459tAHys9nmrA9QE="; }; meta = {